Add logwatch-7.4.0_p170-r1 to fix a file collision.

diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
new file mode 100644 (file)
index 0000000..9e44bb4
--- /dev/null
+++ b/sys-apps/logwatch/Manifest
@@ -0,0 +1,5 @@
+AUX logwatch 95 SHA256 6b1012405b4e3cf7df768fb88c390e5475202bc0dc50e0cea7cdfef9f823df51 SHA512 e8aeee6bb3b00f910585853d970720633022ced8059abc93070a5be41e113390be0d2ca887324e29470d2f5f1edf106fe6eda3a01d74ddfe010705b8c5009840 WHIRLPOOL c7176923d61c7e5dc83e9eea401a5bc5821e4e0cb18e80c8447363c41868d3b6598f5fb4887b3fd4c5523bbffd613fc0cd7945a380274a4a4f091bad3d806fbb
+AUX logwatch-7.4.0-openssh-hpn.patch 946 SHA256 26c6215b7b4ee091cf45620fce62e752e90775789a18763fc8e3bb39d2ce1a10 SHA512 1238f8760a93fe9128f4435e6d5088bc5a20778bfd425a1bc5042b51a783a8f9a60130fdfd1662b9a81109ea9e9d313164924dee4d339b34f08ed9a062750b9e WHIRLPOOL 5cac4629a86e1bc0121e0ac7544b2b8c678bbbb2ae5e766019bd6c75ee479fb01509f12c813d53cc780bd349814bb9e52a4738c9ee68e7ce9553c17cf307eecf
+DIST logwatch-7.4.0_p170.tar.gz 455794 SHA256 27f4ae2692190aa96a3af997d66b39a595e9c72e4a078cbdfa7c13f5c885a42f SHA512 6c07cfb20c0bd121b698b48f060d50b45e018b81b2ed78c96d33c5b8cb43fd23a139cf95c64af9c3148c99fe1f9e9d2c0936e1d2ab6dfba105e4ad621db2fcdb WHIRLPOOL 6af221787ce7d71f0c238fbb18d3b272cfe42cb18a3a24a70fbf617f2a6d39fd41d4978dd2c8b67687fa003594300e4beb2fc0b2f0c2425cc1c6fd1d501cda50
+EBUILD logwatch-7.4.0_p170-r1.ebuild 2159 SHA256 46c1972a3da062b00fbaaf756a9386bb1a3a8f53707c06c1ec2ee61d2b5d858e SHA512 655a11b7d038c67b822756bcfda1fa8f2cc6b599204fdc1f9229c9fa4a72c71e3c67f4e93e4c62a703c7d087f72bbe240c4a3b6d857ffc55c38c9d85f1d59f83 WHIRLPOOL 02f5428bcaf29cc799712b46460c869b9252964232914b7385574b981da6e7b4c8decfa8714de58696ad4e03a3cbfd089ebbc7e3dd5295282514867014e98f66
+MISC metadata.xml 165 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a SHA512 3f1bee5d098a4e5874df3af56169397cc3ed526f9c56004b9ccaa4c5cf02d4affd894400b88f50f3c19bf5ba3ae06f3d4d2cfa5c15e97b7d4c33053e5f0f63c5 WHIRLPOOL 070ba3ff0b1ea000c90d8af13cdac14693dc5d9dcc8d8ba89cf9bdbe91196e3cf9e72bd2f01cd5efc1ddab63b83184159298d1ee891bc123107ea6891ad612d2

diff --git a/sys-apps/logwatch/files/logwatch b/sys-apps/logwatch/files/logwatch
new file mode 100755 (executable)
index 0000000..4d4a222
--- /dev/null
+++ b/sys-apps/logwatch/files/logwatch
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -x /usr/sbin/logwatch.pl ] ; then
+       exec /usr/sbin/logwatch.pl --output mail
+fi

diff --git a/sys-apps/logwatch/files/logwatch-7.4.0-openssh-hpn.patch b/sys-apps/logwatch/files/logwatch-7.4.0-openssh-hpn.patch
new file mode 100644 (file)
index 0000000..7eeed3b
--- /dev/null
+++ b/sys-apps/logwatch/files/logwatch-7.4.0-openssh-hpn.patch
@@ -0,0 +1,19 @@
+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
+
+diff --git a/scripts/services/sshd b/scripts/services/sshd
+index a4c3354..50e8cf2 100755
+--- a/scripts/services/sshd
++++ b/scripts/services/sshd
+@@ -290,7 +290,8 @@ while (defined(my $ThisLine = <STDIN>)) {
+        ($ThisLine =~ /^Failed keyboard-interactive for <invalid username> from/ ) or
+        ($ThisLine =~ /^Keyboard-interactive \(PAM\) userauth failed/ ) or
+        ($ThisLine =~ /^debug1: /) 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) = ($ThisLine =~ /^Accepted (\S+) for (\S+) from ([\d\.:a-f]+) port (\d+)/) ) {

diff --git a/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild b/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild
new file mode 100644 (file)
index 0000000..f4579fb
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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"
+SRC_URI="http://dev.gentoo.org/~polynomial-c/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+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}/${P/_p*}-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
+       keepdir /var/cache/logwatch
+
+       newsbin scripts/logwatch.pl logwatch.pl || die "dosbin logwatch failed"
+
+       for i in scripts/logfiles/* ; do
+               exeinto /usr/share/logwatch/$i
+               doexe $i/* || die "doexe $i failed"
+       done
+
+       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
+}
+
+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
+}

diff --git a/sys-apps/logwatch/metadata.xml b/sys-apps/logwatch/metadata.xml
new file mode 100644 (file)
index 0000000..659da0c
--- /dev/null
+++ b/sys-apps/logwatch/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+       <herd>base-system</herd>
+</pkgmetadata>