[Forensics-changes] [SCM] debian-forensics/rkhunter branch, master, updated. debian/1.3.8-10-12-g7cae801
Julien Valroff
julien at kirya.net
Sat May 26 10:37:33 UTC 2012
The following commit has been merged in the master branch:
commit 3ee5b095486ca556784f89e46fcc3ee2b0e2b3fa
Author: Julien Valroff <julien at kirya.net>
Date: Sat May 26 12:30:35 2012 +0200
Delete patches merged upstream
diff --git a/debian/changelog b/debian/changelog
index 0dc6fc2..6152cc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rkhunter (1.4.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Delete patches merged upstream
+
+ -- Julien Valroff <julien at debian.org> Sat, 26 May 2012 08:41:02 +0200
+
rkhunter (1.3.8-11) unstable; urgency=low
* Backport patch from upstream to add the '--list propfiles' option. This
diff --git a/debian/patches/05_custom_conffile.diff b/debian/patches/05_custom_conffile.diff
index eb98933..0e768e0 100644
--- a/debian/patches/05_custom_conffile.diff
+++ b/debian/patches/05_custom_conffile.diff
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/files/rkhunter.conf
+++ b/files/rkhunter.conf
-@@ -93,17 +93,17 @@
+@@ -99,17 +99,17 @@
# important files will be written to this directory, so be
# sure that the directory permissions are tight.
#
@@ -24,8 +24,8 @@ Forwarded: not-needed
+SCRIPTDIR=/usr/share/rkhunter/scripts
#
- # Specify the root directory to use.
-@@ -254,8 +254,15 @@
+ # This option can be used to modify the command directory list used
+@@ -255,8 +255,15 @@
# Please read the README file for more details about enabling and disabling
# tests, the test names, and how rkhunter behaves when these options are used.
#
@@ -42,7 +42,7 @@ Forwarded: not-needed
#
# The HASH_FUNC option can be used to specify the command to use
-@@ -323,6 +330,9 @@
+@@ -324,6 +331,9 @@
#
# Whenever this option is changed 'rkhunter --propupd' must be run.
#
@@ -52,7 +52,7 @@ Forwarded: not-needed
#PKGMGR=NONE
#
-@@ -464,8 +474,14 @@
+@@ -466,8 +476,14 @@
# be specified more than once. The option may use wildcard
# characters.
#
@@ -69,7 +69,7 @@ Forwarded: not-needed
#
# Allow the specified commands to have the immutable attribute set.
-@@ -490,11 +506,9 @@
+@@ -492,11 +508,9 @@
# may use wildcard characters.
#
#ALLOWHIDDENDIR="/etc/.java"
@@ -82,7 +82,7 @@ Forwarded: not-needed
#
# Allow the specified hidden files to be whitelisted.
-@@ -519,6 +533,9 @@
+@@ -521,6 +535,9 @@
#ALLOWHIDDENFILE="/usr/lib/hmaccalc/sha384hmac.hmac"
#ALLOWHIDDENFILE="/usr/lib/hmaccalc/sha512hmac.hmac"
#ALLOWHIDDENFILE="/usr/sbin/.sshd.hmac"
@@ -92,19 +92,19 @@ Forwarded: not-needed
#
# Allow the specified processes to use deleted files. The
-@@ -532,8 +549,10 @@
- # may be specified more than once.
+@@ -535,8 +552,10 @@
+ # characters, but only in the file names.
#
#ALLOWPROCDELFILE="/sbin/cardmgr /usr/sbin/gpm:/etc/X11/abc"
-#ALLOWPROCDELFILE="/usr/libexec/gconfd-2"
+#ALLOWPROCDELFILE="/usr/lib/libgconf2-4/gconfd-2"
- #ALLOWPROCDELFILE="/usr/sbin/mysqld"
+ #ALLOWPROCDELFILE="/usr/sbin/mysqld:/tmp/ib*"
+#ALLOWPROCDELFILE="/usr/lib/iceweasel/firefox-bin"
+#ALLOWPROCDELFILE="/usr/bin/file-roller"
#
# Allow the specified processes to listen on any network interface.
-@@ -544,7 +563,6 @@
+@@ -547,7 +566,6 @@
#ALLOWPROCLISTEN="/sbin/dhclient /usr/bin/dhcpcd"
#ALLOWPROCLISTEN="/usr/sbin/pppoe /usr/sbin/tcpdump"
#ALLOWPROCLISTEN="/usr/sbin/snort-plain"
@@ -112,7 +112,7 @@ Forwarded: not-needed
#
# Allow the specified network interfaces to be in promiscuous mode.
-@@ -644,7 +662,7 @@
+@@ -647,7 +665,7 @@
# The option may be specified more than once. The option may use
# wildcard characters.
#
@@ -121,7 +121,7 @@ Forwarded: not-needed
#
# This setting tells rkhunter the pathname to the file containing the
-@@ -665,7 +683,7 @@
+@@ -668,7 +686,7 @@
# NOTE: For *BSD systems you will probably need to use this option
# for the 'toor' account.
#
@@ -130,7 +130,7 @@ Forwarded: not-needed
#
# Allow the following accounts to have no password. NIS/YP entries do
-@@ -783,7 +801,7 @@
+@@ -786,7 +804,7 @@
# specified, then RKH will assume the O/S release information is on the
# first non-blank line of the file.
#
@@ -139,7 +139,7 @@ Forwarded: not-needed
#
# The following two options can be used to whitelist files and directories
-@@ -975,4 +993,6 @@
+@@ -979,4 +997,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.
#
diff --git a/debian/patches/10_fix-man.diff b/debian/patches/10_fix-man.diff
deleted file mode 100644
index 53f82ee..0000000
--- a/debian/patches/10_fix-man.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Various fixes for the manpage
-Author: Julien Valroff <julien at debian.org>
-Forwarded: no
-
-
---- a/files/rkhunter.8
-+++ b/files/rkhunter.8
-@@ -4,10 +4,10 @@
- .SH NAME
- rkhunter \- RootKit Hunter
- .SH SYNOPSIS
--\fBrkhunter\fP {--check | --unlock | --update | --versioncheck |
-- --propupd [{filename | directory | package name},...] |
-- --list [tests | {lang | languages} | rootkits | perl] |
-- --config\-check | --version | --help} [options]
-+\fBrkhunter\fP {-\-check | -\-unlock | -\-update | -\-versioncheck |
-+ -\-propupd [{filename | directory | package name},...] |
-+ -\-list [tests | {lang | languages} | rootkits | perl] |
-+ -\-config\-check | -\-version | -\-help} [options]
-
- .SH DESCRIPTION
- \fBrkhunter\fP is a shell script which carries out various checks on the local
-@@ -131,7 +131,7 @@
- on the command\-line and in the configuration files. That is, only the
- configuration options for tests which would normally run are checked. In
- order to check all the configured options, then use the \fB--enable all
----disable none\fP options on the command line. Additionally, the program will
-+-\-disable none\fP options on the command line. Additionally, the program will
- check to see if there are any unrecognised configuration options. If any
- configuration problems are found, then they will be displayed and the return
- code will be set to 1.
-@@ -395,7 +395,7 @@
- .IP \fBhashes\fP
- .IP \fBhidden_ports\fP
- .IP \fBhidden_procs\fP
--.IP \fBimmutable known_rkts\fP
-+.IP "\fBimmutable known_rkts\fP"
- .IP \fBloaded_modules\fP
- .IP \fBlocal_host\fP
- .IP \fBmalware\fP
-@@ -421,7 +421,7 @@
- .IP \fBstrings\fP
- .IP \fBsuspscan\fP
- .IP \fBsystem_commands\fP
--.IP \fBsystem_configs trojans\fP
-+.IP "\fBsystem_configs trojans\fP"
-
-
- .SH FILES
diff --git a/debian/patches/15_remove-empty-dir.diff b/debian/patches/15_remove-empty-dir.diff
index 888e4ab..9d16f1e 100644
--- a/debian/patches/15_remove-empty-dir.diff
+++ b/debian/patches/15_remove-empty-dir.diff
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/installer.sh
+++ b/installer.sh
-@@ -656,7 +656,7 @@
+@@ -700,7 +700,7 @@
if [ "${RKHINST_LAYOUT}" = "oldschool" ]; then
RKHDIR_LIST="${RKHINST_DIRS}"
else
diff --git a/debian/patches/20_fix-deleted_files.diff b/debian/patches/20_fix-deleted_files.diff
deleted file mode 100644
index 4dac490..0000000
--- a/debian/patches/20_fix-deleted_files.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-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/25_support-newer-file-versions.diff b/debian/patches/25_support-newer-file-versions.diff
deleted file mode 100644
index 8c82629..0000000
--- a/debian/patches/25_support-newer-file-versions.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-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/30_add-list-propfiles-option.diff b/debian/patches/30_add-list-propfiles-option.diff
deleted file mode 100644
index b2bbb58..0000000
--- a/debian/patches/30_add-list-propfiles-option.diff
+++ /dev/null
@@ -1,103 +0,0 @@
-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,10 +17147,11 @@
- shift
- LIST_OPT="${LIST_OPT} perl "
- ;;
-- "")
-- LIST_OPT="${LIST_OPT} tests languages rootkits perl "
-+ propfiles)
-+ shift
-+ LIST_OPT="${LIST_OPT} propfiles "
- ;;
-- -*)
-+ "")
- LIST_OPT="${LIST_OPT} tests languages rootkits perl "
- ;;
- *)
-@@ -17433,6 +17457,9 @@
- perl)
- display_perl_modules
- ;;
-+ propfiles)
-+ display_propfiles
-+ ;;
- *)
- display_rootkits
- ;;
diff --git a/debian/patches/series b/debian/patches/series
index 007bac2..9ef2bcc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,2 @@
05_custom_conffile.diff
-10_fix-man.diff
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
More information about the forensics-changes
mailing list