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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/logwatch/files/, sys-apps/logwatch/
@ 2016-03-07  9:19 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2016-03-07  9:19 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/logwatch/files/, sys-apps/logwatch/
@ 2017-01-29 21:59 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2017-01-29 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     9873906d501f95c2c33e293942656b66b4970dee
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 21:55:11 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 21:59:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9873906d

sys-apps/logwatch: Old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/logwatch/Manifest                         |  2 -
 .../files/logwatch-7.4.0-openssh-hpn.patch         | 19 -----
 sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild    | 87 ----------------------
 sys-apps/logwatch/logwatch-7.4.2.ebuild            | 85 ---------------------
 4 files changed, 193 deletions(-)

diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index a7e7022..2925647 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,3 +1 @@
-DIST logwatch-7.4.0_p170.tar.gz 455794 SHA256 27f4ae2692190aa96a3af997d66b39a595e9c72e4a078cbdfa7c13f5c885a42f SHA512 6c07cfb20c0bd121b698b48f060d50b45e018b81b2ed78c96d33c5b8cb43fd23a139cf95c64af9c3148c99fe1f9e9d2c0936e1d2ab6dfba105e4ad621db2fcdb WHIRLPOOL 6af221787ce7d71f0c238fbb18d3b272cfe42cb18a3a24a70fbf617f2a6d39fd41d4978dd2c8b67687fa003594300e4beb2fc0b2f0c2425cc1c6fd1d501cda50
-DIST logwatch-7.4.2.tar.gz 491073 SHA256 006e122a1973bb12b92eb79622ebc93716ec0766a6987e73b4ae5387509e5ade SHA512 aed19220ccbe70a39148e0cdcfe421e7cf744d06d01e4decc88980f3e9e97f85f1cc40aee9a8857fb123a41ffb001afa75eeccdfcdc001073057d39a01875cb2 WHIRLPOOL 1b05288e4af8f0a608aa658df43a351dec6b958f77b0646d2eb45d8349ad7c5030327745a2a8ebc1e2e432dc74abf20a1303f266ef97cf24f89b74bef5cb141f
 DIST logwatch-7.4.3.tar.gz 462552 SHA256 1dbdc48d65e150f2dbb43f1e4f4700d94166e053b1c7bbbdedf4ad670283720e SHA512 716d87238f487010f2bdf230fc66c16f3c3fe769e6bef04b0e7881c6b0563e1a4b4741235b8a40a16ab21d3803562e87e6bcf5cfbd0ace42414f1d1feae7a13a WHIRLPOOL abe7870020029f86f037f4c96dff96b6c542eb36df9f110c755d6de28965c6418dd4d03a2e6932ff8db7079f22ea396d352aa6b8ebba81576b588017b4694d02

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
deleted file mode 100644
index 4c87ade..00000000
--- a/sys-apps/logwatch/files/logwatch-7.4.0-openssh-hpn.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-
-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
deleted file mode 100644
index 126299e..00000000
--- a/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/${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/Date-Manip
-	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
-
-	for i in scripts/logfiles/* ; do
-		exeinto /usr/share/logwatch/$i
-		doexe $i/*
-	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/logwatch-7.4.2.ebuild b/sys-apps/logwatch/logwatch-7.4.2.ebuild
deleted file mode 100644
index 454da10..00000000
--- a/sys-apps/logwatch/logwatch-7.4.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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/Date-Manip
-	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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/logwatch/files/, sys-apps/logwatch/
@ 2017-11-04 18:21 Thomas Deutschmann
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2017-11-04 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     130fd3900a6254296acd6f14f8d7129992418ae5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  4 18:19:22 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 18:21:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=130fd390

sys-apps/logwatch: Bump to v7.4.3_p20171025 (snapshot release)

- We are now creating /var/cache/logwatch via tmpfile (bug #607668)

- Snapshot release should address missed dovecot log entires (bug #633916)

Closes: https://bugs.gentoo.org/607668
Closes: https://bugs.gentoo.org/633916
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 sys-apps/logwatch/Manifest                         |   1 +
 .../files/logwatch-7.4.3+-openssh-hpn.patch        |  16 +++
 sys-apps/logwatch/files/logwatch.tmpfile           |   1 +
 sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild  | 108 +++++++++++++++++++++
 4 files changed, 126 insertions(+)

diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 2925647b769..a34ef6ebd1f 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1 +1,2 @@
 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

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 00000000000..426253df85d
--- /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 00000000000..86bd4cc7b3b
--- /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 00000000000..2cb75e82997
--- /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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/logwatch/files/, sys-apps/logwatch/
@ 2019-06-08 12:55 Thomas Deutschmann
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2019-06-08 12:55 UTC (permalink / raw
  To: gentoo-commits

commit:     c04553861ff206dfcc5b90e9104f15e8e434d6c1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  8 12:54:51 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jun  8 12:54:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0455386

sys-apps/logwatch: drop old

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-apps/logwatch/Manifest                         |   2 -
 .../files/logwatch-7.4.2-openssh-hpn.patch         |  16 ---
 .../files/logwatch-7.4.3+-openssh-hpn.patch        |  16 ---
 sys-apps/logwatch/logwatch-7.4.3.ebuild            |  84 ----------------
 sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild  | 108 ---------------------
 5 files changed, 226 deletions(-)

diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 2935d869fd0..aabad0546e0 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,3 +1 @@
-DIST logwatch-7.4.3.tar.gz 462552 BLAKE2B 98ecba949d9fa2737da6b22ff2cced14d384ff4f119a7a8e613a66869102ea76ce1093ef5f0b38e6d4e948a8e9e0dafe8b4071e028c5f5f5be2ee48e9b1f186b SHA512 716d87238f487010f2bdf230fc66c16f3c3fe769e6bef04b0e7881c6b0563e1a4b4741235b8a40a16ab21d3803562e87e6bcf5cfbd0ace42414f1d1feae7a13a
-DIST logwatch-7.4.3_p20171025.zip 704529 BLAKE2B 12f4e34d9cd044f677b1b4cbe473c425e9b3ab2f222e781a0a3df95b9cbc088cf16321ccd67ec9acaa4c21b8da3deac4d58d84cba2259b272717337c5c87c3ff SHA512 aeaf57aa8d4e89b716766bf89a6b58dcb18f1ba6de864b913d93474f784f382e322b6dbfdf9671c8b91404d399d770146ead9959b1202e91b4672e70f6abb268
 DIST logwatch-7.5.1.tar.gz 469715 BLAKE2B 706352c60370d13b4f72047d08965ab0dd36837194a03bf44e08ec43641eddb8d80d655c783d4f25c8fa757853a4e069997b80676b781561c5e0a23b44a393c9 SHA512 945e66192a9e198169426497f7b5167fcbec2af9565dfead728aa91bfdac5f7e1b2ce2f5f404b6f03841fe6b978f70fb969b47d4f60f02f9a8ccea865c5c782c

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
deleted file mode 100644
index 80e6ee06b76..00000000000
--- a/sys-apps/logwatch/files/logwatch-7.4.2-openssh-hpn.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-
---- 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/files/logwatch-7.4.3+-openssh-hpn.patch b/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch
deleted file mode 100644
index 426253df85d..00000000000
--- a/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/logwatch-7.4.3.ebuild b/sys-apps/logwatch/logwatch-7.4.3.ebuild
deleted file mode 100644
index 1f058e2a889..00000000000
--- a/sys-apps/logwatch/logwatch-7.4.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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 arm64 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/Date-Manip
-	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
-}

diff --git a/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild b/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild
deleted file mode 100644
index 391f0f2e953..00000000000
--- a/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 ~arm64 ~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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/logwatch/files/, sys-apps/logwatch/
@ 2024-08-29  1:55 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-08-29  1:55 UTC (permalink / raw
  To: gentoo-commits

commit:     13fff84b5b28506385d889aa843011883355160a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 01:40:15 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 01:40:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13fff84b

sys-apps/logwatch: add 7.11

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/logwatch/Manifest                         |   1 +
 .../logwatch/files/logwatch-7.11-openssh-9.8.patch |  37 ++++++++
 sys-apps/logwatch/logwatch-7.11.ebuild             | 100 +++++++++++++++++++++
 3 files changed, 138 insertions(+)

diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 31260357e110..727a74bfcc0a 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,2 +1,3 @@
 DIST logwatch-7.10.tar.gz 511766 BLAKE2B 66d7cb09f4c73ca55a3bad9eb2e9a46eabdc0da444e5361ddc10e7bee28de2e58f2c10530f75d40b2689d33624d612f439171b995e9f21a7e48bf211db1f2bd2 SHA512 838bcc7a3b12eb31450a20195fe2ca4ab238500051bb2f50bd1775272fefa412e0a2473c0294a5495ef594fa530b00dac0dc6d18b93e124f36614686502e55cb
+DIST logwatch-7.11.tar.gz 513041 BLAKE2B 074b9b1d58bd199c82edc6fb40703b71f9488966e2acb8afc015fde93806740d11a3c8705303139716bbc50c353f3e8c3f4c0e9cf1d5f870cbb8599fbdd526d1 SHA512 1af075ad2459fade202396af5fa50b705b4635b71b5fc3be832df80c491baa1dd726b3023f84ecbb621e0e19004a0f8cdb017e657c4511bcd4cbd3205177ce22
 DIST logwatch-7.9.tar.gz 501086 BLAKE2B ebfc65c88036244840fe4fbf42c0bea668cac3063771f0042827a2f583d654403b75bdfa428f50a7fdac5f0098ec08ef5a27006db7f7576b361653594462d607 SHA512 d091fbbeb0cac4b661fb066118fd384dbdeabe137c699ea6892d53567a45978c0742b1be9cf2f8b8c2e522314351ee6c2e3710ac2e61bbf1a3c8d63f78a3646f

diff --git a/sys-apps/logwatch/files/logwatch-7.11-openssh-9.8.patch b/sys-apps/logwatch/files/logwatch-7.11-openssh-9.8.patch
new file mode 100644
index 000000000000..1162115f3f09
--- /dev/null
+++ b/sys-apps/logwatch/files/logwatch-7.11-openssh-9.8.patch
@@ -0,0 +1,37 @@
+https://sourceforge.net/p/logwatch/patches/84/
+--- a/conf/services/secure.conf
++++ b/conf/services/secure.conf
+@@ -24,7 +24,7 @@ $secure_ip_lookup = No
+ # Use this to ignore certain services in the secure log.
+ # You can ignore as many services as you would like.
+ # (we ignore sshd because its entries are processed by the sshd script)
+-$ignore_services = sshd Pluto stunnel proftpd saslauthd imapd postfix/smtpd
++$ignore_services = sshd sshd-session Pluto stunnel proftpd saslauthd imapd postfix/smtpd
+ 
+ # For these services, summarize only (i.e. don't least each IP, just
+ # list the number of connections total)
+--- a/conf/services/sshd.conf
++++ b/conf/services/sshd.conf
+@@ -19,7 +19,7 @@ LogFile = secure
+ LogFile = messages
+ 
+ # Only give lines pertaining to the sshd service...
+-*OnlyService = sshd
++*OnlyService = (sshd|sshd-session)
+ *RemoveHeaders
+ 
+ # Variable $sshd_ignore_host is used to filter out hosts that login
+--- a/scripts/services/sshd
++++ b/scripts/services/sshd
+@@ -246,9 +246,9 @@ while (defined(my $ThisLine = <STDIN>)) {
+       $NoIdent{$name}++;
+    } elsif (
+       ($ThisLine =~ m/^(?:error:.*|fatal:) Connection closed by remote host/ ) or
+-      ($ThisLine =~ m/^(|fatal: )Read error from remote host(| [^ ]+): Connection reset by peer/ ) or
++      ($ThisLine =~ m/^(|fatal: )Read error from remote host(| [^ ]+)(| port \d+): Connection reset by peer/ ) or
+       ($ThisLine =~ m/^error: .*: read: Connection reset by peer/ ) or
+-      ($ThisLine =~ m/^Read error from remote host [^ ]+: (Connection timed out|No route to host)/ ) or
++      ($ThisLine =~ m/^Read error from remote host [^ ]+(| port \d+): (Connection timed out|No route to host)/ ) or
+       ($ThisLine =~ m/^fatal: Read from socket failed: No route to host/) or
+       ($ThisLine =~ m/^fatal: Write failed: Network is unreachable/ ) or
+       ($ThisLine =~ m/^fatal: Write failed: Broken pipe/) or

diff --git a/sys-apps/logwatch/logwatch-7.11.ebuild b/sys-apps/logwatch/logwatch-7.11.ebuild
new file mode 100644
index 000000000000..b495a9f557bd
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.11.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tmpfiles
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="https://sourceforge.net/projects/logwatch/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="selinux"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/Date-Manip
+	dev-perl/HTML-Parser
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo
+	virtual/cron
+	virtual/mta
+	virtual/mailx
+	selinux? ( sec-policy/selinux-logwatch )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-openssh-9.8.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
+
+	# 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 (bug #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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-08-29  1:55 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-29  1:55 [gentoo-commits] repo/gentoo:master commit in: sys-apps/logwatch/files/, sys-apps/logwatch/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2019-06-08 12:55 Thomas Deutschmann
2017-11-04 18:21 Thomas Deutschmann
2017-01-29 21:59 Jeroen Roovers
2016-03-07  9:19 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox