gentoo resync : 23.03.2018

2 files changed, 84 insertions, 0 deletions

diff --git a/app-forensics/rkhunter/files/rkhunter-1.4.6-conf.patch b/app-forensics/rkhunter/files/rkhunter-1.4.6-conf.patch
new file mode 100644
index 000000000000..5642436ed412
--- /dev/null
+++ b/app-forensics/rkhunter/files/rkhunter-1.4.6-conf.patch
@@ -0,0 +1,38 @@
+
+--- a/rkhunter.conf
++++ b/rkhunter.conf
+@@ -72,6 +72,7 @@
+ # to use.
+ #
+ 
++INSTALLDIR=/usr
+ 
+ #
+ # If this option is set to '1', it specifies that the mirrors file
+@@ -154,7 +155,7 @@
+ # subsequently commented out or removed, then the program will assume a
+ # default directory beneath the installation directory.
+ #
+-#TMPDIR=/var/lib/rkhunter/tmp
++TMPDIR=/var/lib/rkhunter
+ 
+ #
+ # This option specifies the database directory to use.
+@@ -163,7 +164,7 @@
+ # subsequently commented out or removed, then the program will assume a
+ # default directory beneath the installation directory.
+ #
+-#DBDIR=/var/lib/rkhunter/db
++DBDIR=/var/lib/rkhunter/db
+ 
+ #
+ # This option specifies the script directory to use.
+@@ -171,7 +172,7 @@
+ # The installer program will set the default directory. If this default is
+ # subsequently commented out or removed, then the program will not run.
+ #
+-#SCRIPTDIR=/usr/local/lib/rkhunter/scripts
++SCRIPTDIR=/usr/lib/rkhunter/scripts
+ 
+ #
+ # This option can be used to modify the command directory list used by rkhunter
diff --git a/app-forensics/rkhunter/files/rkhunter-1.4.6-no-insecure-web.patch b/app-forensics/rkhunter/files/rkhunter-1.4.6-no-insecure-web.patch
new file mode 100644
index 000000000000..ed3b68c669bc
--- /dev/null
+++ b/app-forensics/rkhunter/files/rkhunter-1.4.6-no-insecure-web.patch
@@ -0,0 +1,46 @@
+Disable insecure web operations (CVE-2017-7480).
+
+Bug: https://bugs.gentoo.org/623150
+
+--- a/rkhunter
++++ b/rkhunter
+@@ -19462,7 +19462,7 @@
+ 	#
+ 
+ 	echo $ECHOOPT ""
+-	echo $ECHOOPT "Usage: rkhunter {--check | --unlock | --update | --versioncheck |"
++	echo $ECHOOPT "Usage: rkhunter {--check | --unlock |"
+ 	echo $ECHOOPT "                 --propupd [{filename | directory | package name},...] |"
+ 	echo $ECHOOPT "                 --list [{tests | {lang | languages} | rootkits | perl | propfiles}] |"
+ 	echo $ECHOOPT "                 --config-check | --version | --help} [options]"
+@@ -19518,10 +19518,8 @@
+ 	echo $ECHOOPT "                                       (Default level is $SYSLOG_DFLT_PRIO)"
+ 	echo $ECHOOPT "         --tmpdir <directory>          Use the specified temporary directory"
+ 	echo $ECHOOPT "         --unlock                      Unlock (remove) the lock file"
+-	echo $ECHOOPT "         --update                      Check for updates to database files"
+ 	echo $ECHOOPT "   --vl, --verbose-logging             Use verbose logging (on by default)"
+ 	echo $ECHOOPT "     -V, --version                     Display the version number, then exit"
+-	echo $ECHOOPT "         --versioncheck                Check for latest version of program"
+ 	echo $ECHOOPT "     -x, --autox                       Automatically detect if X is in use"
+ 	echo $ECHOOPT "     -X, --no-autox                    Do not automatically detect if X is in use"
+ 	echo $ECHOOPT ""
+@@ -20396,9 +20394,6 @@
+ 	--unlock)
+ 		UNLOCK=1
+ 		;;
+-	--update)
+-		UPDATE=1
+-		;;
+ 	--vl | --verboselogging | --verbose-logging)
+ 		VERBOSE_LOGGING=1
+ 		;;
+@@ -20407,9 +20402,6 @@
+ 		echo "${PROGRAM_blurb}"
+ 		exit 0
+ 		;;
+-	--versioncheck | --version-check)
+-		VERSIONCHECK=1
+-		;;
+ 	-x | --autox)
+ 		AUTO_X_OPT=1
+ 		AUTO_X_DTCT=1