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

[Julien Valroff]

The following commit has been merged in the master branch:
commit c60d023a38ff81aa251ba2cc3666defe389194b0
Author: Julien Valroff <julien at kirya.net>
Date:   Sun Sep 11 21:20:22 2011 +0200

    Apply patch from upstream to add support for newer versions of 'file' command when reporting scripts (Closes: #641217)

diff --git a/debian/changelog b/debian/changelog
index 1cb913d..3ff799d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rkhunter (1.3.8-8) unstable; urgency=low
+
+  * Apply patch from upstream to add support for newer versions of 'file'
+    command when reporting scripts (Closes: #641217) 
+
+ -- Julien Valroff <julien at debian.org>  Sun, 11 Sep 2011 21:19:19 +0200
+
 rkhunter (1.3.8-7) unstable; urgency=low
 
   * Point to GPL-2 license text in debian/copyright 
diff --git a/debian/patches/25_support-newer-file-versions.diff b/debian/patches/25_support-newer-file-versions.diff
new file mode 100644
index 0000000..8c82629
--- /dev/null
+++ b/debian/patches/25_support-newer-file-versions.diff
@@ -0,0 +1,19 @@
+Description: Fix for newer versions of 'file' command when reporting scripts
+Author: John Horne <jhorne AT users.sourceforge.net>
+Origin: upstream, http://rkhunter.cvs.sourceforge.net/viewvc/rkhunter/rkhunter/files/rkhunter?revision=1.397&view=markup
+Bug-Debian: http://bugs.debian.org/641217
+
+--- a/files/rkhunter
++++ b/files/rkhunter
+@@ -9880,9 +9880,9 @@
+ 					test -n "${BASENAME_CMD}" && RKHTMPVAR=`${BASENAME_CMD} ${FNAME}` || RKHTMPVAR=`echo "${FNAME}" | sed -e 's:^.*/::'`
+ 
+ 					if [ "${RKHTMPVAR}" = "rkhunter" ]; then
+-						SYSSCRIPT=`${FILE_CMD} ${FNAME} 2>&1 | tr -s '	' ' ' | cat -v | egrep -i -v '(shell|/bin/sh) script( |$)'`
++						SYSSCRIPT=`${FILE_CMD} ${FNAME} 2>&1 | tr -s '	' ' ' | cat -v | egrep -i -v '(shell|/bin/sh) script( |,|$)'`
+ 					else
+-						SYSSCRIPT=`${FILE_CMD} ${FNAME} 2>&1 | tr -s '	' ' ' | cat -v | egrep -i ' script( |$)'`
++						SYSSCRIPT=`${FILE_CMD} ${FNAME} 2>&1 | tr -s '	' ' ' | cat -v | egrep -i ' script( |,|$)'`
+ 					fi
+ 
+ 					test -n "${SYSSCRIPT}" && TEST_RESULT="${TEST_RESULT} script"
diff --git a/debian/patches/series b/debian/patches/series
index 129b44a..5da2865 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 10_fix-man.diff
 15_remove-empty-dir.diff
 20_fix-deleted_files.diff
+25_support-newer-file-versions.diff

-- 
debian-forensics/rkhunter