gentoo resync : 05.04.2019

7 files changed, 5 insertions, 203 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 359d88530dad..f54574ad793c 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest
index bc50e4144222..0d05256d230a 100644
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@@ -1,4 +1,4 @@
 AUX lynis.cron-new 72 BLAKE2B 1f2d683c74e9e85f142c23277f24e8c81b33e4d1691a6f171694194bd5d81a5e1473532afe2c6fca23c995d9c7bd08d18d6eed78a07661618c12e22b35e9ff81 SHA512 1cdaaee433912c2ccdec8ad7c9b88be55fe3f1d68e2fca79cc6e0e10112d465a70cfbe0a049623437f604bfc9793e0d29b709e035cbf710d4d38ba48acc5355f
-DIST lynis-2.7.1.tar.gz 278069 BLAKE2B 0e138a4dcdb1c68373e095a134f4ef1446402ae699e7d7e6afa146d593865c2855dcf7a809b9c19b0b996722256d2d98142cc1adc9c6f08d15e79aa842d3f643 SHA512 4ad1d9b79bbb7e74f3b171b9ee76eced1bb7812c560df4ac5a8445d4a6a5a0a46d9fc3fa7969509ba54d6658c466809f3286a59c91be69e40f03e7fd5902917b
-EBUILD lynis-2.7.1.ebuild 945 BLAKE2B 4c0a17b4a85bcbf375c6ec0c7dc7b38e2431529aa4e1faa96bd4efd2d6f1876f4f2b93545d2b0264ed6241f90507e286c8fbbb4e2542609dc19fa3cf89c9ac50 SHA512 dbb5cfde02f4904b44acbf5f0e59042371d65162ba44bdc30bddd50222ca4e51f9c2c638802c659303a9ddf6bebb76c24622ac856673afe74b8bff50da0b4b9d
+DIST lynis-2.7.3.tar.gz 282609 BLAKE2B 68dcb9d1fc9f81007c15a5f1074d9f42b6f558f7bc62dfba134adffb7b6d858604a10e188abea298eb51e82f8ec1ea5f270563d16a87a68de25dab8e13a1f1c1 SHA512 eb50d5d1769f0276a8383a5c6c664b390ced75248678edd80b00a7c344e8567d9c5fcc7a1f4a1a0e20a26c03bb3648d3b81f165266b3654e75bbec5061ab3837
+EBUILD lynis-2.7.3.ebuild 945 BLAKE2B 4c0a17b4a85bcbf375c6ec0c7dc7b38e2431529aa4e1faa96bd4efd2d6f1876f4f2b93545d2b0264ed6241f90507e286c8fbbb4e2542609dc19fa3cf89c9ac50 SHA512 dbb5cfde02f4904b44acbf5f0e59042371d65162ba44bdc30bddd50222ca4e51f9c2c638802c659303a9ddf6bebb76c24622ac856673afe74b8bff50da0b4b9d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-forensics/lynis/lynis-2.7.1.ebuild b/app-forensics/lynis/lynis-2.7.3.ebuild
index 1701f39cc6f0..1701f39cc6f0 100644
--- a/app-forensics/lynis/lynis-2.7.1.ebuild
+++ b/app-forensics/lynis/lynis-2.7.3.ebuild
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index e7607ce26160..42c294c57bc1 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -1,9 +1,7 @@
-AUX rkhunter-1.3.cron 3927 BLAKE2B f33bcec5a474a32fabfd8d9e9a16df9aad6700b5c760be6f42d6ab915f96e84492647286fe9a33838c37dcf8c1e1eb9fe4c187b3e836b8d8c8cd1d659736ea98 SHA512 a99eb535c12b6715031aa367ba0ae70ed1761a03b74c57d173512006e466ef56bfc7ffb15364d4f36d39597277a8cf3b35e7286462bfd6ec9d44877dd1653d4d
 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-1.4.cron 4002 BLAKE2B 4effc65dbff981fc90370dfae3c5e6b7d6d6f60e5aabc4e008cf29990fb490baacd83db3405ec49631f33082de88031afc2b98d7387b17c4deaffe7cda05de68 SHA512 84e5a366aa1199e432999e5ededa8627026075dbabdc3e39dfb5059fa5f77efe214395288d3ecab3a4b105a0dd0e70ddddf895160fc2a03945227ba820ccb1b9
 AUX rkhunter.bash-completion 2499 BLAKE2B 5cc845f3780e5b92acb84aad8141147b87245d554770282b91ba04771d7d8e727691872bdee129f25c7dd1a1440944e4b6959b9981c9c73683f1fddd479b225c SHA512 8fba540f5425169810b8baaf2e801638e3286aa93a69d4a96f5916e3bc9b632edaef6b509b8ca58f8047a7c7d4bb4bf348ad7923e855edce3dd0432725a944e7
 DIST rkhunter-1.4.6.tar.gz 302137 BLAKE2B 89c61386b57f743f4205f8c826eaa8a9dc9a0d413ac47efb26b6f93d8d642f619f35b7a4c021521b662547c02a16071b8980d158cfb9e081a64870558dbaeff0 SHA512 c51a21b6b66ed1f73a19d8ce04eaba35999eefcb666acc824989c3bf53ac56d24a33ac4fec290be942e33fe24674406b371eafff73f7e697b9e03ec031b37216
-EBUILD rkhunter-1.4.6-r1.ebuild 1427 BLAKE2B e5f3ff7c3e0002c2c9389415c15b89eba6c9f69743f73369be5a13bd4848701a737ee23c4250f2daa186d8a69d9b729a638758c86051ea2252619048963c7fb3 SHA512 49cceaf2940df65d676ce6923323abf76e5435d18925a626d6d0944f5389000237b110f4fe06eb54cf5fa926c269d904cbf3fc62453da165def512e5dbefc559
-EBUILD rkhunter-1.4.6.ebuild 1423 BLAKE2B a49684b03e9b4dc56f1cb21d598f311f84fc7347637cd671cbb4af35107543b828961337d795ce067a232012797a22207aa81e87309b087a59ed029b53f42276 SHA512 ad425d6abe7a02a0d15dbc28c1e737e2b91792d89acd5c56be7b4ba867c8e28e1423e37453112ef1834978326b169ac23ca37f79d9f2ac221b8899e8ef33a4de
+EBUILD rkhunter-1.4.6-r1.ebuild 1420 BLAKE2B 9440661ab564c0ece1236204ab2117113f236a4cb31d4e4ee0f97f820fd855824bef5c5261d2b97af9b5661a1f784d05a3c01d70c68a818630fc80ff1236d218 SHA512 c50fb5ebb5dadaaae122e88180069787f8dc4e59b6046ca424fa2cf48ad4f3ae78729964a21d2fa6ce3fa43b4a4fd34a3a96aba73134abd03d38bbbed7f26ca8
 MISC metadata.xml 299 BLAKE2B 3b8af7fccff4006181f81391d616527950fa356ea54ff55e9fba97406ceb4d3d247210c80f5e42b3f67fb8b861c7118363ba3fa4916cba0f855e2bde8f6872d2 SHA512 00fc15df938f0b0d31061fd8a7195e08fd64ec7a0f02458bdd3df443d8963f85703264a4ea59bf98c935ef9ec7c8fbe2536daddb9056fee22282df1c04cc9768
diff --git a/app-forensics/rkhunter/files/rkhunter-1.3.cron b/app-forensics/rkhunter/files/rkhunter-1.3.cron
deleted file mode 100644
index 468667cf9d94..000000000000
--- a/app-forensics/rkhunter/files/rkhunter-1.3.cron
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/bash
-# original author: Aaron Walker <ka0ttic@gentoo.org>
-
-########################## Begin Configuration ###############################
-
-# Default options - more options may be added depending on the
-# configuration variables you set below
-# --cronjob implies -c, --nocolor, --sk
-RKHUNTER_OPTS="--cronjob --summary"
-
-# Set this to 'yes' to enable ; this script does nothing otherwise
-ENABLE=no
-
-# Automatically update rkhunter's dat files prior to running?
-UPDATE=no
-
-# Set this to 'yes' if you wish the output to be mailed to you
-SEND_EMAIL=no
-
-# NOTE: the following EMAIL_* variables are only relevant if you set the
-# SEND_EMAIL variable to 'yes'
-EMAIL_SUBJECT="${HOSTNAME}: rkhunter output"
-EMAIL_RECIPIENT=root
-EMAIL_CMD="|mail -s \"${EMAIL_SUBJECT}\" ${EMAIL_RECIPIENT}"
-
-# Log rkhunter output?
-LOG=no
-
-# The default log location is /var/log/rkhunter.log. Set this variable if
-# you'd like to use an alternate location.
-#LOGFILE=""
-
-# By default, the log file created by rkhunter is world-readable (0644). If
-# you'd like to modify the permissions afterwards, set this variable.  The 
-# value of this variable, must be a valid chmod argument such as '0600' or 
-# 'u+rw,go-rwx'.  See the chmod(1) manual page for more information.
-#LOGFILE_PERMS="0600"
-
-# By default, rkhunter overwrites the previous log.  Set this variable
-# to 'yes' if you'd like the log output appended to the logfile, instead
-# of overwriting it.
-SAVE_OLD_LOGS=no
-
-# Set to 1 to recieve only warnings & errors
-# Set to 2 to recieve ALL rkhunter output
-# Set to 3 to recieve rkhunter report
-VERBOSITY=3
-
-########################### End Configuration ################################
-
-# exit immediately, unless enabled
-[[ "${ENABLE}" == "yes" ]] || exit 0
-
-# debug mode?  (mainly for my benefit)
-if [[ -n "${1}" ]] && [[ ${1} = "-d" ]] ; then
-        set -o verbose -o xtrace
-fi
-
-[[ -z "${LOGFILE}" ]] && LOGFILE="/var/log/rkhunter.log"
-
-# moved this out of config section since it'll
-# probably never need to be changed
-RKHUNTER_EXEC="/usr/sbin/rkhunter"
-
-# sanity check
-if [[ ! -x "${RKHUNTER_EXEC}" ]] ; then
-        echo "${RKHUNTER_EXEC} does not exist or is not executable!"
-        exit 1
-fi
-
-# we create a few tmp files, so let's at least make
-# them readable/writable by root only
-umask 0077
-
-# all output goes to this temp file
-_tmpout=$(mktemp /tmp/rkhunter.cron.XXXXXX)
-exec > ${_tmpout} 2>&1
-
-# update data files
-if [[ "${UPDATE}" == "yes" ]] ; then
-        # save the output of --update in a tmp file so that it can be mailed
-        # along with the scan output; otherwise the user will get 2 mails
-        ${RKHUNTER_EXEC} --nocolor --update
-fi
-
-# formulate options string according to user configuration
-[[ "${LOG}" == "yes" ]] && \
-    RKHUNTER_OPTS="${RKHUNTER_OPTS} --createlogfile ${LOGFILE}"
-
-case "${VERBOSITY}" in
-        # warnings and errors only
-        1)      RKHUNTER_OPTS="${RKHUNTER_OPTS} --quiet" ;;
-        # default rkhunter output (no extra options)
-#       2)      ;;
-        # default to option 3
-        *)      ;;
-esac
-
-# save old log
-if [[ "${LOG}" == "yes" && "${SAVE_OLD_LOGS}" == "yes" ]] ; then
-        if [[ -e "${LOGFILE}" ]] ; then
-                _tmpfile=$(mktemp ${LOGFILE}.XXXXXX)
-                mv -f ${LOGFILE} ${_tmpfile}
-                echo -e "--\nrkhunter.cron commencing at: $(date)\n--" >> ${_tmpfile}
-        fi
-fi
-
-# finally, run rkhunter
-CMD="${RKHUNTER_EXEC} ${RKHUNTER_OPTS}"
-eval ${CMD}
-RV=$?
-
-# email output?
-if [[ "${SEND_EMAIL}" == "yes" ]] ; then
-        CMD="cat ${_tmpout} ${EMAIL_CMD}"
-        eval ${CMD}
-fi
-
-# remove temp file
-[[ -n "${_tmpout}" ]] && rm -f ${_tmpout}
-
-[[ "${LOG}" != "yes" ]] && exit ${RV}
-
-# from this point on, we can assume logging is enabled
-
-# append new log to old log and restore
-if [[ -n "${_tmpfile}" ]] ; then
-        cat ${LOGFILE} >> ${_tmpfile}
-        mv ${_tmpfile} ${LOGFILE}
-fi
-
-chmod ${LOGFILE_PERMS:-0644} ${LOGFILE}
-exit ${RV}
diff --git a/app-forensics/rkhunter/rkhunter-1.4.6-r1.ebuild b/app-forensics/rkhunter/rkhunter-1.4.6-r1.ebuild
index e292e6dde3a9..6e1c219ca7b1 100644
--- a/app-forensics/rkhunter/rkhunter-1.4.6-r1.ebuild
+++ b/app-forensics/rkhunter/rkhunter-1.4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="alpha amd64 ~arm ~mips ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-forensics/rkhunter/rkhunter-1.4.6.ebuild b/app-forensics/rkhunter/rkhunter-1.4.6.ebuild
deleted file mode 100644
index b5d9c402d22b..000000000000
--- a/app-forensics/rkhunter/rkhunter-1.4.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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."
-}