[Forensics-changes] [SCM] debian-forensics/rkhunter branch, master, updated. debian/1.3.8-10-2-g2074885

[Julien Valroff]

The following commit has been merged in the master branch:
commit cf2ef982ab92d7493cf9c5f9c918ff0a6e62ea36
Author: Julien Valroff <julien at kirya.net>
Date:   Tue Nov 15 21:09:30 2011 +0100

    Apply patch from upstream to add the '--list propfiles' option. This dumps out the file names used to build the file properties database

diff --git a/debian/changelog b/debian/changelog
index 0491470..44c5e1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rkhunter (1.3.8-11) unstable; urgency=low
+
+  * Apply patch from upstream to add the '--list propfiles' option. This dumps
+    out the file names used to build the file properties database 
+
+ -- Julien Valroff <julien at debian.org>  Tue, 15 Nov 2011 21:06:51 +0100
+
 rkhunter (1.3.8-10) unstable; urgency=low
 
   * Remove all references to now inexistant /dev/.udev* directories in the
diff --git a/debian/patches/30_add-list-propfiles-option.diff b/debian/patches/30_add-list-propfiles-option.diff
new file mode 100644
index 0000000..ef1f653
--- /dev/null
+++ b/debian/patches/30_add-list-propfiles-option.diff
@@ -0,0 +1,89 @@
+Description: Add the '--list propfiles' option. This dumps out the
+ file names used to build the file properties database
+Origin: upstream
+Bug: https://sourceforge.net/tracker/?func=detail&atid=794189&aid=3140239&group_id=155034
+Last-Update: 2011-11-15
+
+--- a/files/rkhunter
++++ b/files/rkhunter
+@@ -5885,9 +5885,6 @@
+ 		done
+ 	done
+ 
+-	chmod 640 ${RKH_FILEPROP_LIST} >/dev/null 2>&1
+-
+-
+ 	#
+ 	# Now we add any user specified absolute
+ 	# pathnames to be included in the list.
+@@ -5909,6 +5906,8 @@
+ 		done
+ 	fi
+ 
++	chmod 640 ${RKH_FILEPROP_LIST} >/dev/null 2>&1
++
+ 	return
+ }
+ 
+@@ -16283,6 +16282,29 @@
+ }
+ 
+ 
++display_propfiles() {
++
++	#
++	# This function is used to display the list of files which
++	# would be searched for when using the '--propupd' function.
++	#
++
++	# Get any user-supplied files and directories.
++	get_user_fileprop_list
++
++	# Get the builtin list of files and directories.
++	set_file_prop_dirs_files
++
++	# Create the file of entries used by the '--propupd' function.
++	create_rkh_file_prop_list
++
++	# Finally just dump out the list of file names.
++	awk -F'/' '{ print $NF }' ${RKH_FILEPROP_LIST} | sort | uniq
++
++	return
++}
++
++
+ display_rootkits() {
+ 
+ 	#
+@@ -16385,7 +16407,7 @@
+ 	echo $ECHOOPT ""
+ 	echo $ECHOOPT "Usage: rkhunter {--check | --unlock | --update | --versioncheck |"
+ 	echo $ECHOOPT "                 --propupd [{filename | directory | package name},...] |"
+-	echo $ECHOOPT "                 --list [{tests | {lang | languages} | rootkits | perl}] |"
++	echo $ECHOOPT "                 --list [{tests | {lang | languages} | rootkits | perl | propfiles}] |"
+ 	echo $ECHOOPT "                 --config-check | --version | --help} [options]"
+ 	echo $ECHOOPT ""
+ 
+@@ -16412,8 +16434,9 @@
+ 	echo $ECHOOPT "     -h, --help                        Display this help menu, then exit"
+ 	echo $ECHOOPT " --lang, --language <language>         Specify the language to use"
+ 	echo $ECHOOPT "                                       (Default is English)"
+-	echo $ECHOOPT "         --list [tests | languages |   List the available test names, languages, checked"
+-	echo $ECHOOPT "                 rootkits | perl]      for rootkits, or perl module status, then exit"
++	echo $ECHOOPT "         --list [tests | languages |   List the available test names, languages,"
++	echo $ECHOOPT "                 rootkits | perl |     rootkit names, perl module status"
++	echo $ECHOOPT "                 propfiles]            or file properties database, then exit"
+ 	echo $ECHOOPT "     -l, --logfile [file]              Write to a logfile"
+ 	echo $ECHOOPT "                                       (Default is $DFLT_LOGFILE)"
+ 	echo $ECHOOPT "         --noappend-log                Do not append to the logfile, overwrite it"
+@@ -17124,6 +17147,10 @@
+ 			shift
+ 			LIST_OPT="${LIST_OPT} perl "
+ 			;;
++		propfiles)
++			shift
++			LIST_OPT="${LIST_OPT} propfiles "
++			;;
+ 		"")
+ 			LIST_OPT="${LIST_OPT} tests languages rootkits perl "
+ 			;;
diff --git a/debian/patches/series b/debian/patches/series
index 5da2865..007bac2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 15_remove-empty-dir.diff
 20_fix-deleted_files.diff
 25_support-newer-file-versions.diff
+30_add-list-propfiles-option.diff

-- 
debian-forensics/rkhunter