[gentoo-commits] repo/gentoo:master commit in: sys-apps/logwatch/files/, sys-apps/logwatch/

[Lars Wendler]

commit:     26b09c54f989e5fb46dddc5f9013d9ca6c3adafd
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  7 09:17:48 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 09:17:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b09c54

sys-apps/logwatch: Bump to version 7.4.2

Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-apps/logwatch/Manifest                         |  1 +
 .../files/logwatch-7.4.2-openssh-hpn.patch         | 16 ++++
 sys-apps/logwatch/logwatch-7.4.2.ebuild            | 85 ++++++++++++++++++++++
 3 files changed, 102 insertions(+)

diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 8bbcd3b..18e0247 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,3 +1,4 @@
 DIST logwatch-7.4.0.tar.gz 294398 SHA256 b8fd136a07a6b79962380d68b26328cdccc8b6a20310195e24e39b0bfd3287c4 SHA512 d556a5768ceeedc21396a38f02f2b2d8ca3556de92274038819840a6d41770437673a531d91f54cf3a905b6b4b8d72fa4011b838f81ed04b02265bde39b7b3c7 WHIRLPOOL 7643cb55ed330dacda223d5ff06dca16a29df2a8c50a6f4b2bded1ba764c07126101bce08422e5531cc7dd531960e6dd9a29114ac5e43987a3d2d9b796204d21
 DIST logwatch-7.4.0_p170.tar.gz 455794 SHA256 27f4ae2692190aa96a3af997d66b39a595e9c72e4a078cbdfa7c13f5c885a42f SHA512 6c07cfb20c0bd121b698b48f060d50b45e018b81b2ed78c96d33c5b8cb43fd23a139cf95c64af9c3148c99fe1f9e9d2c0936e1d2ab6dfba105e4ad621db2fcdb WHIRLPOOL 6af221787ce7d71f0c238fbb18d3b272cfe42cb18a3a24a70fbf617f2a6d39fd41d4978dd2c8b67687fa003594300e4beb2fc0b2f0c2425cc1c6fd1d501cda50
 DIST logwatch-7.4.1.tar.gz 464970 SHA256 35ec31f9fe981aaa727b144ab3ff2eb655997d8ccabaf66586458f5dfc3a56eb SHA512 f53400e6654b498371265ade82d51f0625904a33400f7f82b2dc8522ad561c8998fd9f23d569281f031142bb527fc1b38af1d7534fe3b3aef23780b0152e67d4 WHIRLPOOL 947f0796f5313c9eb5aff3cca8b47a861eda3ff0b3b65134a11792ddca2262fbd8fd0bdf83ce430d06efb4905187ca82a6978e6b5ae656ade63a7d181cc3faac
+DIST logwatch-7.4.2.tar.gz 491073 SHA256 006e122a1973bb12b92eb79622ebc93716ec0766a6987e73b4ae5387509e5ade SHA512 aed19220ccbe70a39148e0cdcfe421e7cf744d06d01e4decc88980f3e9e97f85f1cc40aee9a8857fb123a41ffb001afa75eeccdfcdc001073057d39a01875cb2 WHIRLPOOL 1b05288e4af8f0a608aa658df43a351dec6b958f77b0646d2eb45d8349ad7c5030327745a2a8ebc1e2e432dc74abf20a1303f266ef97cf24f89b74bef5cb141f

diff --git a/sys-apps/logwatch/files/logwatch-7.4.2-openssh-hpn.patch b/sys-apps/logwatch/files/logwatch-7.4.2-openssh-hpn.patch
new file mode 100644
index 0000000..49513a7
--- /dev/null
+++ b/sys-apps/logwatch/files/logwatch-7.4.2-openssh-hpn.patch
@@ -0,0 +1,16 @@
+Add an 'ignore' line for the HPN patch that we enable on our openssh by default.
+
+http://sourceforge.net/tracker/?func=detail&aid=3257504&group_id=312875&atid=1316824
+
+--- logwatch-7.4.2/scripts/services/sshd
++++ logwatch-7.4.2/scripts/services/sshd
+@@ -297,7 +297,8 @@
+        ($ThisLine =~ /Starting session: (forced-command|subsystem|shell|command)/ ) or
+        ($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/)
++       ($ThisLine =~ /Nasty PTR record .* is set up for [\da-fA-F.:]+, ignoring/) or
++       ($ThisLine =~ /^SSH: Server;L[Tt]ype: /)
+    ) {
+       # Ignore these
+    } elsif ( my ($Method,$User,$Host,$Port,$Key) = ($ThisLine =~ /^Accepted (\S+) for ((?:invalid user )?\S+) from ([\d\.:a-f]+) port (\d+) ssh[12](?:: (\w+))?/) ) {

diff --git a/sys-apps/logwatch/logwatch-7.4.2.ebuild b/sys-apps/logwatch/logwatch-7.4.2.ebuild
new file mode 100644
index 0000000..9618d77
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.4.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="http://www.logwatch.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/cron
+	virtual/mta
+	virtual/mailx
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/DateManip
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-7.4.2-openssh-hpn.patch
+}
+
+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
+
+	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() {
+	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
+}