gentoo resync : 23.03.2018

6 files changed, 158 insertions, 5 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index e3eb85d87de2..aaee46ad7404 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index bec5a39a4e57..f5b4fc3597a9 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -1,8 +1,12 @@
 AUX rkhunter-1.3.cron 3927 BLAKE2B f33bcec5a474a32fabfd8d9e9a16df9aad6700b5c760be6f42d6ab915f96e84492647286fe9a33838c37dcf8c1e1eb9fe4c187b3e836b8d8c8cd1d659736ea98 SHA512 a99eb535c12b6715031aa367ba0ae70ed1761a03b74c57d173512006e466ef56bfc7ffb15364d4f36d39597277a8cf3b35e7286462bfd6ec9d44877dd1653d4d
 AUX rkhunter-1.4.2.conf.patch 1250 BLAKE2B b07d4b981895ab740ec96905aee70470f32cc642ab252cebed6ccf20191a236cb8e0ddbb844475a66e4aa0a79b2116404f57ad9273e1a46385efb1b96fc7b882 SHA512 654887bea5d3b7388c11c9a59d3d924d763268c3552bee82a0bcf9b5077803eaa0cf16b7346aeaac44e817bfdd30e5d74abd10d12eb07f0bc1a97c57b850aefe
+AUX rkhunter-1.4.6-conf.patch 1044 BLAKE2B a71c895f2fd295bb3d64e4fe95fa7d89e2c6544d30ec362cc2d048ce7b0892a0733576a0960231ec2f98077b8122ed15bdc87e46412e7114cce6843c9a612106 SHA512 4e1493c84be60427edd572fdddc1fb576ed6d7d81bc61289722c39add0d200808fe1c09584e76380432763006a670afd9f86a8abfc26538db9b60e6f90251949
+AUX rkhunter-1.4.6-no-insecure-web.patch 1805 BLAKE2B 4e2926f91f2f799f1c30119a6beae5f3492ab9736747cd447581e5279ec582f97ee7782f38e6b9eb5b9c460102cbcc3521bc5b6ae961324bf4a3d8d77ce5109f SHA512 5c006726644a5ffdbd55d82325087bae3f034ab30a01bb39ae005a916f6def656919466f7b7b3017d0e8fa5dc55ecec6349b3028618c95bc339fbefee2685747
 AUX rkhunter.bash-completion 2499 BLAKE2B 5cc845f3780e5b92acb84aad8141147b87245d554770282b91ba04771d7d8e727691872bdee129f25c7dd1a1440944e4b6959b9981c9c73683f1fddd479b225c SHA512 8fba540f5425169810b8baaf2e801638e3286aa93a69d4a96f5916e3bc9b632edaef6b509b8ca58f8047a7c7d4bb4bf348ad7923e855edce3dd0432725a944e7
 DIST rkhunter-1.4.2.tar.gz 277707 BLAKE2B 97968801ce5dccefc7d5eb246fd8031091447b9090c5bc9b958ea64835c47661d1f40b5a6352e0c92608a514f237ac2946a7f84498915418581a71d16b497f61 SHA512 a4e45caaaf5b8262619ebb890784c75c4e30db4c6c0eba305f86d419142b4796c95bc55fe8846dce8d58bc7636bdb365a4a8c41707f64d4d81373687c5a3b0d4
 DIST rkhunter-1.4.4.tar.gz 297626 BLAKE2B 9d9a50e3541817d8dfec6c76665ae84b92f49ed3128244cb5359f2149203ccdc7cdaa05db3da87f6aa6ee79fa84491f40cdc3443d77359b64c23947cb685516e SHA512 87e9c617220765678cc4519eee27d1d56185c3a7fb1d6338c8fb984ac4f5176c31bb54b69e1de615d66a0cf1e72b672e66b368e37851a459def69463cbb8661e
+DIST rkhunter-1.4.6.tar.gz 302137 BLAKE2B 89c61386b57f743f4205f8c826eaa8a9dc9a0d413ac47efb26b6f93d8d642f619f35b7a4c021521b662547c02a16071b8980d158cfb9e081a64870558dbaeff0 SHA512 c51a21b6b66ed1f73a19d8ce04eaba35999eefcb666acc824989c3bf53ac56d24a33ac4fec290be942e33fe24674406b371eafff73f7e697b9e03ec031b37216
 EBUILD rkhunter-1.4.2.ebuild 1411 BLAKE2B 4090fb0822368a4b4ee1db677c8e6d3ce79e542fd691c6ecac2baed9333388fc3531ec382ed63898606076cc4a5b95bb55e87e62a369f5784cd151d3b23307c4 SHA512 e4b2f70f6417f3a44d918ab310460dd45f7fae760458f7b9804752a79beffabea832dd195c85efeb8e31d1b71d7196b1df70a8cdc5a562d0a4ef575888820ada
 EBUILD rkhunter-1.4.4.ebuild 1433 BLAKE2B 08e75ad6333bc16ddca749807809421d25fdc1870588cd9b43093bad3ba39664a54dc9219577bf0512f9fcd8ad6c808a89806ec74c9022e4463784c6a475a0f5 SHA512 b35bcfd29d9a8e7f5054975d777cd0b52c251d80df5fb38ec81000b6d6b4f12c6cd81433e4bcf0761a67442dba90049d6f35c3ba8f43e51bfeaed535605184c7
-MISC metadata.xml 250 BLAKE2B 1a6730f91097a664fe704e117a22206d76afb3ac7bc5a3f2f0b0be8b8acafc2d4dd02d0692d6da7df34600134028371f48fdd12a6a8dd0031f1aea2c626cab15 SHA512 ab31238a72b35a1f33056cf1736628bbf367fc20f4dc93735d11617ed668f295567e1865844d727e666de07c56d84f8b5cfd1eec41c91cd836789a420ea2dda9
+EBUILD rkhunter-1.4.6.ebuild 1427 BLAKE2B cc36b22f48f23902aa6bfc7cdac405a2a1fa61bf389c0f595aec47809f3f7cb1de5b61931e1a2a6209eda4eee2fea148582da809942b92e991809669c3d01f75 SHA512 81bcf4a56f2911c5bb9062f35ffbc75bcbb4b3b819bf57852e7573d22fd8b5e5045faf19ee7568db48563a820ce567115e81aa38003cc36de49dc988728ae5b0
+MISC metadata.xml 299 BLAKE2B 3b8af7fccff4006181f81391d616527950fa356ea54ff55e9fba97406ceb4d3d247210c80f5e42b3f67fb8b861c7118363ba3fa4916cba0f855e2bde8f6872d2 SHA512 00fc15df938f0b0d31061fd8a7195e08fd64ec7a0f02458bdd3df443d8963f85703264a4ea59bf98c935ef9ec7c8fbe2536daddb9056fee22282df1c04cc9768
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
diff --git a/app-forensics/rkhunter/metadata.xml b/app-forensics/rkhunter/metadata.xml
index df05a2cbf56a..d82e93e73a98 100644
--- a/app-forensics/rkhunter/metadata.xml
+++ b/app-forensics/rkhunter/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">rkhunter</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">rkhunter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-forensics/rkhunter/rkhunter-1.4.6.ebuild b/app-forensics/rkhunter/rkhunter-1.4.6.ebuild
new file mode 100644
index 000000000000..149c587a14b8
--- /dev/null
+++ b/app-forensics/rkhunter/rkhunter-1.4.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Rootkit Hunter scans for known and unknown rootkits, backdoors, and sniffers"
+HOMEPAGE="http://rkhunter.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	app-shells/bash
+	dev-lang/perl
+	sys-process/lsof[rpc]
+"
+
+S="${WORKDIR}/${P}/files"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.6-conf.patch"
+	"${FILESDIR}/${PN}-1.4.6-no-insecure-web.patch"
+)
+
+src_install() {
+	# rkhunter requires to be root
+	dosbin ${PN}
+
+	insinto /etc
+	doins ${PN}.conf
+
+	exeinto /usr/lib/${PN}/scripts
+	doexe *.pl
+
+	insinto /var/lib/${PN}/db
+	doins *.dat
+
+	insinto /var/lib/${PN}/db/i18n
+	doins i18n/*
+
+	doman ${PN}.8
+	dodoc ACKNOWLEDGMENTS CHANGELOG FAQ README
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}/${PN}-1.3.cron" ${PN}
+
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" ${PN}
+}
+
+pkg_postinst() {
+	elog "A cron script has been installed to /etc/cron.daily/rkhunter."
+	elog "To enable it, edit /etc/cron.daily/rkhunter and follow the"
+	elog "directions."
+	elog "If you want ${PN} to send mail, you will need to install"
+	elog "virtual/mailx or alter the EMAIL_CMD variable in the"
+	elog "cron script and possibly the MAIL_CMD variable in the"
+	elog "${PN}.conf file to use another mail client."
+}