[Forensics-changes] [rkhunter] 09/23: Fix NONE/none and ALL/all mess in config file (closes: #780903)

[Francois Marier]

This is an automated email from the git hooks/post-receive script.

francois pushed a commit to branch master
in repository rkhunter.

commit 8e80620dcc0c9ba5adbeda78921f6be225e4e482
Author: Francois Marier <francois at debian.org>
Date:   Sun Apr 26 00:33:28 2015 +1200

    Fix NONE/none and ALL/all mess in config file (closes: #780903)
---
 debian/changelog                       |  1 +
 debian/patches/05_custom_conffile.diff | 24 +++++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2dfa5a6..a85c86f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ rkhunter (1.4.2-1) unstable; urgency=medium
   * Better default configuration (closes: #765898)
   * Comment out lwp-request in the config file (closes: #773974)
   * Fix config entries for etckeeper (closes: #779702)
+  * Fix NONE/none and ALL/all mess in config file (closes: #780903)
 
   * Bump Standards-Version up to 3.9.6
   * Bump debhelper compatibility to 9
diff --git a/debian/patches/05_custom_conffile.diff b/debian/patches/05_custom_conffile.diff
index c10c82f..5a8bc63 100644
--- a/debian/patches/05_custom_conffile.diff
+++ b/debian/patches/05_custom_conffile.diff
@@ -41,7 +41,13 @@ Last-Update: 2015-04-26
  
  #
  # This option can be used to modify the command directory list used by rkhunter
-@@ -264,7 +264,7 @@ LOGFILE=/var/log/rkhunter.log
+@@ -259,12 +259,12 @@ LOGFILE=/var/log/rkhunter.log
+ #
+ #     USE_SYSLOG=authpriv.warning
+ #
+-# Setting the value to 'NONE', or just leaving the option commented out,
++# Setting the value to 'none', or just leaving the option commented out,
+ # disables the use of syslog.
  #
  # The default value is not to use syslog.
  #
@@ -50,10 +56,23 @@ Last-Update: 2015-04-26
  
  #
  # Set the following option to '1' if the second colour set is to be used. This
+@@ -330,8 +330,8 @@ AUTO_X_DETECT=1
+ 
+ #
+ # These two options determine which tests are to be performed. The ENABLE_TESTS
+-# option can use the word 'ALL' to refer to all of the available tests. The
+-# DISABLE_TESTS option can use the word 'NONE' to mean that no tests are
++# option can use the word 'all' to refer to all of the available tests. The
++# DISABLE_TESTS option can use the word 'none' to mean that no tests are
+ # disabled. The list of disabled tests is applied to the list of enabled tests.
+ #
+ # Both options are space-separated lists of test names, and both options may
 @@ -349,8 +349,15 @@ AUTO_X_DETECT=1
  # either of the options below are specified, then they will override the
  # program defaults.
  #
+-ENABLE_TESTS=ALL
+-DISABLE_TESTS=suspscan hidden_ports hidden_procs deleted_files packet_cap_apps
 +# hidden_procs test requires the unhide and/or unhide.rb commands which are
 +# part of the unhide respectively unhide.rb packages in Debian.
 +#
@@ -61,8 +80,7 @@ Last-Update: 2015-04-26
 +# applications (and warns about possible security risk: we better trust
 +# the Debian Security Team).
 +#
- ENABLE_TESTS=ALL
--DISABLE_TESTS=suspscan hidden_ports hidden_procs deleted_files packet_cap_apps
++ENABLE_TESTS=all
 +DISABLE_TESTS=suspscan hidden_procs deleted_files packet_cap_apps apps
  
  #

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/rkhunter.git