gentoo auto-resync : 29:08:2024 - 12:00:47

4 files changed, 142 insertions, 2 deletions

diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 606a0bfc20c6..2cea93b6d581 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,8 +1,11 @@
 AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab478326e8a05051077cfd6ee604d3ebd7aaa2329687a0f3facdb2741e99bf9ea4207a939a16f885 SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504
+AUX logwatch-7.11-openssh-9.8.patch 1898 BLAKE2B aebc8ce19b7b49ea2624330c4a5d63ec6df4afecebffbe03ab449f772cd03cf54b21006c7dc41ec300d64bacb858cbbc462789a4d8e55853c285c5ecd372453a SHA512 9068c18b8d70f234c9b3343f15c6c130a262d0f7b6454668ec67cc74dd6d67288567048b8d056c485d1bce015f6d5008c43d6c880d1d9350405262715bda483d
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
 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
 EBUILD logwatch-7.10.ebuild 2497 BLAKE2B acebe4f6d92304edffc1b569ec8c3b168beffb3f0c1e1332c9605ef553e099ecc222655f323cbed250d7417528a2ae05641e0a369fe64aa0a56d729b76e9d115 SHA512 eb0c9f9177d40ca3ad4565d30b95c167cec6ce7e0669427cee18d8ee69d386fde7a8f2f6a9869a91ee48d5f16af41dd15f16b82cac3c4e44cd6606c74f5ebca9
+EBUILD logwatch-7.11.ebuild 2550 BLAKE2B 34f24051846e26737f272c505a61f25529541105252e5e6cf58ad6c0b98e1f7005cb9f552abb15f62da4709e78958df7a98d84a14704afb36a80eb33e56cdb7a SHA512 e680f51e32381e155b435e29fd527112a0550f127b2939860dae3b813fad61c3fb19bd64f028fd8361b5f4d994691e1d2697ae7bb8410a650f589b5c84127c29
 EBUILD logwatch-7.9.ebuild 2497 BLAKE2B acebe4f6d92304edffc1b569ec8c3b168beffb3f0c1e1332c9605ef553e099ecc222655f323cbed250d7417528a2ae05641e0a369fe64aa0a56d729b76e9d115 SHA512 eb0c9f9177d40ca3ad4565d30b95c167cec6ce7e0669427cee18d8ee69d386fde7a8f2f6a9869a91ee48d5f16af41dd15f16b82cac3c4e44cd6606c74f5ebca9
-EBUILD logwatch-9999.ebuild 2505 BLAKE2B a76da9f65d238e001ce261e1d687ea417dbbb7d6ad21749834d234675c3d9e4cc1b2e4b5d4385d9d134fffb831516aaf338393d7f2b03eea0c6bf558d5755d15 SHA512 1434655b7c3262ccef68a805cb6e29d0796ae129b818e083b293db921d8b0c6b75c3ac7eddadcc1d8bfb927fa6fcca932135b6623789477d788e25eb8cbf253b
+EBUILD logwatch-9999.ebuild 2499 BLAKE2B 0286401822c73b2ad3557db063bb0d97a913b111c5983b5e83051433874546c44abe0857d0e3d64068f15a70b660296cdb523b5fd6fb3a634e7f9869e863b7cb SHA512 3a972e6717453956a979ae5f6d40d8161d433efe9dae4a3065b79f3053ca90c6d1920be100d928ef00cd67d3b07d50252fdbec86f064833900fc12738b19fdc7
 MISC metadata.xml 329 BLAKE2B ae6bfb6282dd2f5ddc01959eb57e894cc12a69de5fea771439d9b2a95110754fd7c35db97ee238865cfb81333800dcdcfb42654d12572e16cde12c7212a505c5 SHA512 a523f269535d7e0272f2d66b903319197f52477dbf40b32729eff93b5788f9c8b8756a4750128f894b4ab0d05b9effbac5d350e5ae2ab68474ef4fa39022710a
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..65e89de2a50a
--- /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"
+	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
+}
diff --git a/sys-apps/logwatch/logwatch-9999.ebuild b/sys-apps/logwatch/logwatch-9999.ebuild
index 751955f3a7e9..873b9ebc6bc0 100644
--- a/sys-apps/logwatch/logwatch-9999.ebuild
+++ b/sys-apps/logwatch/logwatch-9999.ebuild
@@ -9,7 +9,7 @@ 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}"
+	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git"
 	inherit git-r3
 else
 	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}/${P}.tar.gz"