gentoo resync : 10.11.2017

5 files changed, 225 insertions, 0 deletions

diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index d773bfa96fbc..72ae2c6c8106 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,7 +1,12 @@
 AUX logwatch 125 SHA256 6f65d08d413b7129730816988e4ff49ece532f59e50ccf6a345b2797a854ec6d SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504 WHIRLPOOL b26d6d421f53c51a5e76dcda5669bd2571843d6b3bf52d862adf553eb6b6793d26b25cebf5aae9273c74c5c71009761031e820aa3a9cd714571e02be9b8a7dbc
 AUX logwatch-7.4.2-openssh-hpn.patch 880 SHA256 2ec29c7cb32b3ef62f8a86dab548f9e7a5efef943c9eefbfbc980984448ce49d SHA512 f80ef051e07254869dad4c7221564d09d2f52c2fceb2fa4c802f67b83f4569ed9405d07d85b21a1fc67f75b552a82fa4b4a9e69578829f51a5e49e50cb79f0b8 WHIRLPOOL 3a70bc3d56b45b7cc608c8a1313982605974a5cec09b8f17e00e8d80e4af8c5f6dff3bad8e5a6b6a0a480abf6e96dc05647d83ac5177053f026e9197b158a90e
+AUX logwatch-7.4.3+-openssh-hpn.patch 885 SHA256 56634909fa3c537244e6ebad97db8ed5889601f8b1586fca444901a5594e3a4c SHA512 5a11509507631c1f8f74830e1ef24fc522fe62dffd5f3778849b82462b8e73c1b5cb0ab6c7ed2f1ea35e9d2c4b5674eee532a650b0d69e71219cf029e41b978a WHIRLPOOL 7165dedb590d4f4a931910fbba3bd0f825d15dc749d7f9b1ff6b0509fd627c3da28fdc83eb4e5bc243140f4a7708c808d83d28519639e4f3a1adf1e8b69f8d7a
+AUX logwatch.tmpfile 39 SHA256 659fb7ec74bd0795c8ada05ecdacc6b4ead1da28af46526bc21b8ea06d5716b0 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd WHIRLPOOL 38986fc0733d3ca823a6a0d92e8913bbadb456c65f146b2fec93ec6d3bfb56288a4d8e0c075d9409cd868bd1054d295f6bc7d86fbedc9471c88b282e0649c032
 DIST logwatch-7.4.3.tar.gz 462552 SHA256 1dbdc48d65e150f2dbb43f1e4f4700d94166e053b1c7bbbdedf4ad670283720e SHA512 716d87238f487010f2bdf230fc66c16f3c3fe769e6bef04b0e7881c6b0563e1a4b4741235b8a40a16ab21d3803562e87e6bcf5cfbd0ace42414f1d1feae7a13a WHIRLPOOL abe7870020029f86f037f4c96dff96b6c542eb36df9f110c755d6de28965c6418dd4d03a2e6932ff8db7079f22ea396d352aa6b8ebba81576b588017b4694d02
+DIST logwatch-7.4.3_p20171025.zip 704529 SHA256 8e93ffb0ecbccb30d35ad01ba838879456e98b7b74bc274f90bab1b63ec37568 SHA512 aeaf57aa8d4e89b716766bf89a6b58dcb18f1ba6de864b913d93474f784f382e322b6dbfdf9671c8b91404d399d770146ead9959b1202e91b4672e70f6abb268 WHIRLPOOL e40e65acf1bbc0c6c5ec0dfe43ca396b19d001900eb0e11bf7df95d4cc8359a82c9630761fd1745a91be0da40452999fc17baaa5cf1343a4cde036121696589a
 EBUILD logwatch-7.4.3.ebuild 2051 SHA256 d349249dd7a1e0ad82bec946b75df4c71854e5f85d57459cae37db818cd0dcff SHA512 311e5ce37341ce3ff2ab033b301f0264df8f6dcb6615efb2ea2920a7d365c1a6b19244d9a7d6644c249f33348c2371076935b86df2470378e0659476518aa457 WHIRLPOOL bf942c975248bb181c23592154a75b31fc8c6214c8a8a34120bc5338c4fb0b6bf8bdad079829ffc864205a80707ecc00a22bd7d5101c518dec7d4674d013a171
+EBUILD logwatch-7.4.3_p20171025.ebuild 2832 SHA256 8372be9d2f340fd35d075a15b3f7288c6838018cdf3868180537720a3a458ec9 SHA512 2c8a06ee255b6c4f2ca8d42805668cd58eeb287b95d91758118da8edd7c5cb80f04addfe175d1bdde5a87b5c1136fbfd435287029d9e22f35c917ff6ba62177e WHIRLPOOL 15f55fef46bf8bab27aed2dfd17e4283f4171d17594491cb2aa50e2ae5963e76a8b36e5a888ccec233064d3d380e1614a1cfbab6fcd5d82fa62d89adc761f0e2
+EBUILD logwatch-9999.ebuild 2426 SHA256 42505c752a9817bde5bf891015160ede0c7e53cd8b1d46d6f624b0d205bf664a SHA512 ccbe5db0bc4ad431766e82c7b1a680c2cc1288a93fb3fa653eb744591ae32aab920467853792cf79ae2b3d2b62f03652bb1f7b6a6207615daac88716bf6d2252 WHIRLPOOL e2d2919793f05d75205445be8099ab92508bcca4664b95bf4736fd333ef08732ca72a28143218e767e119bf2a49b50cf23aa4c5aff539317a90dcdae32a16662
 MISC ChangeLog 4905 SHA256 002324069f7c6bffeb8659aabc079c51ba260f4e3dee482766e80435621c477b SHA512 1b4b5395d556705f1bb545541cea88b71b9d7e8605975d7b3e468f17d626df52e6279f3b3ae1d2be19b2af4db1cab288ccf729f1642e5abb88502948b61b8cfc WHIRLPOOL ca56c2d5faa38f0cef09a8b340a7d08e8f6567deba8bf246634baedc9752c0b71ae1600032a5897288797d017bbdf2e520b703a91bc93d0379327f8dc787dd31
 MISC ChangeLog-2015 13525 SHA256 4adbda52a29f2728dceda9277c0449d6cc909769feb9fe1f0067cdae8a9a1b5d SHA512 1a893ca5ce4d97a206889a6ccb5d75988f1ad545a4194194dd83ec06a8213bac6cfe5db216b7a6b21ca003f812ea317cf593d6a8a28fdc2dd13f7593c6ada015 WHIRLPOOL b235fb5914b612e4c4d404734246b8b62b1b3639c0b15f7caa4582647153215e684084a8c6f777c83af4e77a205d360da06bf397f15ae3be352c66fce5ed1d3c
 MISC metadata.xml 328 SHA256 4086b273d7f5312bef52d8ab72297b42180cd1385c32de9d0841f5f0bf7a459d SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7 WHIRLPOOL 1895fcd2b76d48f16d7485eb4de486665573a823dc346212008222a0a516728e0070345b9926636f5a475d6018396eb13e5804c9e4dba01755144caf4c4f36b0
diff --git a/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch b/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch
new file mode 100644
index 000000000000..426253df85d0
--- /dev/null
+++ b/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch
@@ -0,0 +1,16 @@
+Add an 'ignore' line for the HPN patch that we enable on our openssh by default.
+
+https://sourceforge.net/tracker/?func=detail&aid=3257504&group_id=312875&atid=1316824
+
+--- a/scripts/services/sshd
++++ b/scripts/services/sshd
+@@ -315,7 +315,8 @@ while (defined(my $ThisLine = <STDIN>)) {
+        ($ThisLine =~ /Found matching \w+ key:/ ) or
+        ($ThisLine =~ /User child is on pid \d/ ) or
+        ($ThisLine =~ /Nasty PTR record .* is set up for [\da-fA-F.:]+, ignoring/) or
+-       ($ThisLine =~ /Disconnected from [\da-fA-F.:]* port \d*/ )
++       ($ThisLine =~ /Disconnected from [\da-fA-F.:]* port \d*/ ) or
++       ($ThisLine =~ /^SSH: Server;L[Tt]ype: /)
+    ) {
+       # Ignore these
+    } elsif ( my ($Method,$User,$Host,$Port,$Key,$FingerP) = ($ThisLine =~ /^Accepted (\S+) for ((?:invalid user )?\S+) from ([\d\.:a-f]+)(?:%\w+)? port (\d+) ssh[12](?:: (\w+) (.+))?/) ) {
diff --git a/sys-apps/logwatch/files/logwatch.tmpfile b/sys-apps/logwatch/files/logwatch.tmpfile
new file mode 100644
index 000000000000..86bd4cc7b3bf
--- /dev/null
+++ b/sys-apps/logwatch/files/logwatch.tmpfile
@@ -0,0 +1 @@
+d /var/cache/logwatch 0770 root root -
diff --git a/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild b/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild
new file mode 100644
index 000000000000..2cb75e82997f
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit tmpfiles
+
+MY_COMMIT="d36589f22a322a5ec4d77618b408803f4d193c2e"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4.3+-openssh-hpn.patch )
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://sourceforge.net/code-snapshots/git/l/lo/logwatch/git.git/logwatch-git-${MY_COMMIT}.zip -> ${P}.zip"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="http://www.logwatch.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/cron
+	virtual/mta
+	virtual/mailx
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/Date-Manip
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo"
+
+S="${WORKDIR}/${PN}-git-${MY_COMMIT}"
+
+src_prepare() {
+	default
+
+	sed \
+		-e "s:my \$Version = '7.4.3';:my \$Version = '${PV}';:" \
+		-e "s:my \$VDate = '04/27/16';:my \$VDate = '10/25/17';:" \
+		-i scripts/logwatch.pl || die
+}
+
+src_install() {
+	dodir /usr/share/logwatch/lib
+	dodir /usr/share/logwatch/scripts/services
+	dodir /usr/share/logwatch/scripts/shared
+	dodir /usr/share/logwatch/default.conf/logfiles
+	dodir /usr/share/logwatch/default.conf/services
+	dodir /usr/share/logwatch/default.conf/html
+	keepdir /etc/logwatch
+
+	# logwatch.pl requires cache dir (bug #607668)
+	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
+
+	newsbin scripts/logwatch.pl logwatch.pl
+
+	exeinto /usr/share/logwatch/lib
+	doexe lib/*.pm
+
+	exeinto /usr/share/logwatch/scripts/services
+	doexe scripts/services/*
+
+	exeinto /usr/share/logwatch/scripts/shared
+	doexe scripts/shared/*
+
+	insinto /usr/share/logwatch/default.conf
+	doins conf/logwatch.conf
+
+	insinto /usr/share/logwatch/default.conf/logfiles
+	doins conf/logfiles/*
+
+	insinto /usr/share/logwatch/default.conf/services
+	doins conf/services/*
+
+	insinto /usr/share/logwatch/default.conf/html
+	doins conf/html/*
+
+	# Make sure logwatch is run before anything else #100243
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/logwatch 00-logwatch
+
+	doman logwatch.8
+	dodoc README HOWTO-Customize-LogWatch
+
+	# Do last due to insopts modification.
+	insinto /usr/share/logwatch/scripts/logfiles
+	insopts -m755
+	doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
+	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
+			|| ewarn "You have two logwatch files in /etc/cron.daily/"
+	fi
+
+	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
+	tmpfiles_process ${PN}.conf
+}
diff --git a/sys-apps/logwatch/logwatch-9999.ebuild b/sys-apps/logwatch/logwatch-9999.ebuild
new file mode 100644
index 000000000000..93f1e8caf378
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-9999.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit tmpfiles
+
+PATCHES=()
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="http://www.logwatch.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/cron
+	virtual/mta
+	virtual/mailx
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/Date-Manip
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo"
+
+src_install() {
+	dodir /usr/share/logwatch/lib
+	dodir /usr/share/logwatch/scripts/services
+	dodir /usr/share/logwatch/scripts/shared
+	dodir /usr/share/logwatch/default.conf/logfiles
+	dodir /usr/share/logwatch/default.conf/services
+	dodir /usr/share/logwatch/default.conf/html
+	keepdir /etc/logwatch
+
+	# logwatch.pl requires cache dir (bug #607668)
+	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
+
+	newsbin scripts/logwatch.pl logwatch.pl
+
+	exeinto /usr/share/logwatch/lib
+	doexe lib/*.pm
+
+	exeinto /usr/share/logwatch/scripts/services
+	doexe scripts/services/*
+
+	exeinto /usr/share/logwatch/scripts/shared
+	doexe scripts/shared/*
+
+	insinto /usr/share/logwatch/default.conf
+	doins conf/logwatch.conf
+
+	insinto /usr/share/logwatch/default.conf/logfiles
+	doins conf/logfiles/*
+
+	insinto /usr/share/logwatch/default.conf/services
+	doins conf/services/*
+
+	insinto /usr/share/logwatch/default.conf/html
+	doins conf/html/*
+
+	# Make sure logwatch is run before anything else #100243
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/logwatch 00-logwatch
+
+	doman logwatch.8
+	dodoc README HOWTO-Customize-LogWatch
+
+	# Do last due to insopts modification.
+	insinto /usr/share/logwatch/scripts/logfiles
+	insopts -m755
+	doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
+	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
+			|| ewarn "You have two logwatch files in /etc/cron.daily/"
+	fi
+
+	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
+	tmpfiles_process ${PN}.conf
+}