[Forensics-changes] [SCM] debian-forensics/rkhunter branch, master, updated. debian/1.3.8-5-1-g69922e9

[Julien Valroff]

The following commit has been merged in the master branch:
commit 69922e9069aed83ddacb46db2b15c3167d9e4f58
Author: Julien Valroff <julien at kirya.net>
Date:   Sat May 14 22:01:16 2011 +0200

    Appy patch from upstream CVS to fix ALLOWPROCDELFILE

diff --git a/debian/changelog b/debian/changelog
index 399aaf9..2b13bd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rkhunter (1.3.8-6) unstable; urgency=low
+
+  * Add patch from upstream CVS fixing ALLOWPROCDELFILE behaviour
+    (Closes: #626643) 
+
+ -- Julien Valroff <julien at debian.org>  Sat, 14 May 2011 21:57:24 +0200
+
 rkhunter (1.3.8-5) unstable; urgency=low
 
   * Fix maintainer address (Closes: #624457) 
diff --git a/debian/patches/20_fix-deleted_files.diff b/debian/patches/20_fix-deleted_files.diff
new file mode 100644
index 0000000..4dac490
--- /dev/null
+++ b/debian/patches/20_fix-deleted_files.diff
@@ -0,0 +1,25 @@
+Description: fix multiple ALLOWPROCDELFILE options
+Author:i John Horne <jhorne AT users.sourceforge.net>
+Origin: upstream, http://rkhunter.cvs.sourceforge.net/viewvc/rkhunter/rkhunter/files/rkhunter?r1=1.390&r2=1.391
+Bug-Debian: http://bugs.debian.org/626643
+
+--- a/files/rkhunter
++++ b/files/rkhunter
+@@ -11956,6 +11956,8 @@
+ 					PROCWHITELISTED=0
+ 					PROCDELFILES_GIVEN=0
+ 
++                    IFS=$RKHIFS
++
+ 					for RKHTMPVAR in ${ALLOWPROCDELFILES}; do
+ 						PROCDELFILES_GIVEN=0
+ 
+@@ -11979,6 +11981,8 @@
+ 						fi
+ 					done
+ 
++                    IFS=$IFSNL
++
+ 					test $HAVE_READLINK -eq 0 && PROC="\"${PROC}\""
+ 
+ 					if [ $PROCWHITELISTED -eq 1 ]; then
diff --git a/debian/patches/series b/debian/patches/series
index 59d35fd..129b44a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 05_custom_conffile.diff
 10_fix-man.diff
 15_remove-empty-dir.diff
+20_fix-deleted_files.diff

-- 
debian-forensics/rkhunter