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

[Julien Valroff]

The following commit has been merged in the master branch:
commit 37a297e8694f270005e21f81146204ceb4bbed12
Author: Julien Valroff <julien at kirya.net>
Date:   Sun Jan 8 09:27:32 2012 +0100

    Add commented entries for etckeeper hidden files and directories (Closes: #655055)

diff --git a/debian/changelog b/debian/changelog
index 44c5e1a..7ce8927 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,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 
+  * Add commented entries for etckeeper hidden files and directories
+    (Closes: #655055)
 
- -- Julien Valroff <julien at debian.org>  Tue, 15 Nov 2011 21:06:51 +0100
+ -- Julien Valroff <julien at debian.org>  Sun, 08 Jan 2012 09:19:40 +0100
 
 rkhunter (1.3.8-10) unstable; urgency=low
 
diff --git a/debian/patches/05_custom_conffile.diff b/debian/patches/05_custom_conffile.diff
index 37c655b..ad69fe6 100644
--- a/debian/patches/05_custom_conffile.diff
+++ b/debian/patches/05_custom_conffile.diff
@@ -69,7 +69,7 @@ Forwarded: not-needed
  
  #
  # Allow the specified commands to have the immutable attribute set.
-@@ -490,7 +506,6 @@
+@@ -490,11 +506,11 @@
  # may use wildcard characters.
  #
  #ALLOWHIDDENDIR="/etc/.java"
@@ -77,15 +77,22 @@ Forwarded: not-needed
  #ALLOWHIDDENDIR="/dev/.static"
  #ALLOWHIDDENDIR="/dev/.initramfs"
  #ALLOWHIDDENDIR="/dev/.SRC-unix"
-@@ -519,6 +534,7 @@
+ #ALLOWHIDDENDIR="/dev/.mdadm"
++#ALLOWHIDDENDIR="/etc/.etckeeper"
+ 
+ #
+ # Allow the specified hidden files to be whitelisted.
+@@ -519,6 +535,9 @@
  #ALLOWHIDDENFILE="/usr/lib/hmaccalc/sha384hmac.hmac"
  #ALLOWHIDDENFILE="/usr/lib/hmaccalc/sha512hmac.hmac"
  #ALLOWHIDDENFILE="/usr/sbin/.sshd.hmac"
 +#ALLOWHIDDENFILE="/usr/share/man/man5/.k5login.5.gz"
++#ALLOWHIDDENFILE="/etc/.gitignore"
++#ALLOWHIDDENFILE="/etc/.bzrignore"
  
  #
  # Allow the specified processes to use deleted files. The
-@@ -532,8 +548,10 @@
+@@ -532,8 +551,10 @@
  # may be specified more than once.
  #
  #ALLOWPROCDELFILE="/sbin/cardmgr /usr/sbin/gpm:/etc/X11/abc"
@@ -97,7 +104,7 @@ Forwarded: not-needed
  
  #
  # Allow the specified processes to listen on any network interface.
-@@ -544,7 +562,6 @@
+@@ -544,7 +565,6 @@
  #ALLOWPROCLISTEN="/sbin/dhclient /usr/bin/dhcpcd"
  #ALLOWPROCLISTEN="/usr/sbin/pppoe /usr/sbin/tcpdump"
  #ALLOWPROCLISTEN="/usr/sbin/snort-plain"
@@ -105,7 +112,7 @@ Forwarded: not-needed
  
  #
  # Allow the specified network interfaces to be in promiscuous mode.
-@@ -644,7 +661,7 @@
+@@ -644,7 +664,7 @@
  # The option may be specified more than once. The option may use
  # wildcard characters.
  #
@@ -114,7 +121,7 @@ Forwarded: not-needed
  
  #
  # This setting tells rkhunter the pathname to the file containing the
-@@ -665,7 +682,7 @@
+@@ -665,7 +685,7 @@
  # NOTE: For *BSD systems you will probably need to use this option
  # for the 'toor' account.
  #
@@ -123,7 +130,7 @@ Forwarded: not-needed
  
  #
  # Allow the following accounts to have no password. NIS/YP entries do
-@@ -783,7 +800,7 @@
+@@ -783,7 +803,7 @@
  # specified, then RKH will assume the O/S release information is on the
  # first non-blank line of the file.
  #
@@ -132,7 +139,7 @@ Forwarded: not-needed
  
  #
  # The following two options can be used to whitelist files and directories
-@@ -975,4 +992,6 @@
+@@ -975,4 +995,6 @@
  # of 2 will disable the Ruby 'unhide.rb' program. The default value is 0. To disable
  # both programs, then disable the 'hidden_procs' test.
  #

-- 
debian-forensics/rkhunter