diff options
| author | Juergen Daubert <juergen.daubert@t-online.de> | 2006-03-20 07:36:06 +0000 |
|---|---|---|
| committer | Juergen Daubert <juergen.daubert@t-online.de> | 2006-03-20 07:36:06 +0000 |
| commit | ff58839991bfb969e77180a5e04a688594db2087 (patch) | |
| tree | e021d4d0563ade91e708919eff68406986d43839 /samhain | |
| parent | 7b09b69c4af90136ef300d49db67100099402d13 (diff) | |
| download | opt-ff58839991bfb969e77180a5e04a688594db2087.tar.gz opt-ff58839991bfb969e77180a5e04a688594db2087.tar.xz | |
samhain: update to 2.1.3
Diffstat (limited to 'samhain')
| -rw-r--r-- | samhain/.md5sum | 3 | ||||
| -rw-r--r-- | samhain/Pkgfile | 6 | ||||
| -rw-r--r-- | samhain/samhain_hide.patch | 71 |
3 files changed, 3 insertions, 77 deletions
diff --git a/samhain/.md5sum b/samhain/.md5sum index 3fa8d7ee6..699001405 100644 --- a/samhain/.md5sum +++ b/samhain/.md5sum @@ -1,2 +1 @@ -1324b8b519587d9abfebf469c4deaa11 samhain_hide.patch -9e009035d7a04a6203a6b0ce404c385c samhain_signed-2.1.2.tar.gz +bc85d4ce0d92cea47eab3e355bb0341f samhain_signed-2.1.3.tar.gz diff --git a/samhain/Pkgfile b/samhain/Pkgfile index bed813383..f4393a8f2 100644 --- a/samhain/Pkgfile +++ b/samhain/Pkgfile @@ -3,15 +3,13 @@ # Maintainer: Jürgen Daubert, juergen dot daubert at t-online dot de name=samhain -version=2.1.2 +version=2.1.3 release=1 -source=(http://la-samhna.de/$name/${name}_signed-$version.tar.gz - samhain_hide.patch) +source=(http://la-samhna.de/$name/${name}_signed-$version.tar.gz) build () { tar xfz $name-$version.tar.gz cd $name-$version - patch -p1 < $SRC/samhain_hide.patch ./configure --prefix=/usr \ --mandir=/usr/man \ --localstatedir=/var \ diff --git a/samhain/samhain_hide.patch b/samhain/samhain_hide.patch deleted file mode 100644 index c7969276f..000000000 --- a/samhain/samhain_hide.patch +++ /dev/null @@ -1,71 +0,0 @@ -Index: trunk/src/samhain_hide.c -=================================================================== ---- trunk/src/samhain_hide.c (revision 1) -+++ trunk/src/samhain_hide.c (revision 6) -@@ -318,4 +318,5 @@ - int status = 0; /* Return value from original getdents */ - struct inode * dir_inode; -+ struct file * fd_file; - int dir_is_proc = 0; - -@@ -337,5 +338,5 @@ - printk("STATUS %d\n", status); - #endif -- -+ - /* 0: end of directory. - * -1: some error -@@ -346,11 +347,22 @@ - return (status); - } -- -+ - /* Handle directory caching. dir_inode is the inode of the directory. - */ -+#if defined(files_fdtable) -+ { -+ struct fdtable *fdt = files_fdtable(current->files); -+ fd_file = rcu_dereference(fdt->fd[fd]); -+ } -+#else -+ { -+ fd_file = current->files->fd[fd]; -+ } -+#endif -+ - #if defined(__LINUX_DCACHE_H) -- dir_inode = current->files->fd[fd]->f_dentry->d_inode; -+ dir_inode = fd_file->f_dentry->d_inode; - #else -- dir_inode = current->files->fd[fd]->f_inode; -+ dir_inode = fd_file->f_inode; - #endif - -@@ -499,4 +511,5 @@ - long status = 0; /* Return value from original getdents */ - struct inode * dir_inode; -+ struct file * fd_file; - int dir_is_proc = 0; - -@@ -530,8 +543,19 @@ - /* Handle directory caching. dir_inode is the inode of the directory. - */ -+#if defined(files_fdtable) -+ { -+ struct fdtable *fdt = files_fdtable(current->files); -+ fd_file = rcu_dereference(fdt->fd[fd]); -+ } -+#else -+ { -+ fd_file = current->files->fd[fd]; -+ } -+#endif -+ - #if defined(__LINUX_DCACHE_H) -- dir_inode = current->files->fd[fd]->f_dentry->d_inode; -+ dir_inode = fd_file->f_dentry->d_inode; - #else -- dir_inode = current->files->fd[fd]->f_inode; -+ dir_inode = fd_file->f_inode; - #endif - |