gentoo resync : 29.12.2022

8 files changed, 10 insertions, 244 deletions

diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index d953d2b384a4..f80346ad77b0 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1,10 +1,5 @@
-AUX all-server-ports-busy-lines.patch 2510 BLAKE2B 152a38abfc0caff5aaa8bce0a0b0c9adbf259a3317503506ad73a29c85745751960e594efca1d58cf7a39f401a443034ccca1bb8d80bc8bc25fa0b8e215d6602 SHA512 01edf0e1fb6db7799618e9e03f7201470e00a71ca4a43539e6a3555c81bab5846007f140ff868fd48a436c3a7a8f0fe6de70edd285887402fd97edfec636506d
-AUX data-without-valid-rcpt.patch 1054 BLAKE2B d2990e75dcf506672372dcc50ab3a2e817ec330e8aa0021abf1c6158d14b6070860be8efadcf7b488c58245cfd7da15d1428426440663e6f1ab3fc414e24b39c SHA512 11f2b607531716e438d11cabd339622e8ca63efd5884d5ea7cfd9cd43f926762f27a7adc4eb3325f8c2895760fbb368c316ccbb119c6d57d39f4865e1b292a4f
-AUX multi-digit-enhanced-status.patch 1479 BLAKE2B b8364d035aa3662b539523ec63cf6d011ccf33d700cb45382b764342b42680621d1f1f376ecc66c1bbb7321fee1bf06f226a7e21cf7cceaad6048de526edc599 SHA512 6f732591637c5a076532b210a0b9378904609e7927ed5549c1b3e976e45a38e080ed0a754b230d04f4fd0b1904ddc75acd4c420032e23bd663276398cb35a5c7
-AUX redundant-argument-to-sprintf.patch 1744 BLAKE2B d251a7e894dd4ebe09d61984a55ad2e7a0771310a88042da952c6e7d13b98952648e2da995e32cac92818e26d2df2e0d83f08a16fed093cfb07fe81187f5aaf6 SHA512 31e35603cee7c51ffe126ba0caeadbbca564694439101d92293d2163d3b674be552ac3e781d4b10fab11435d072bf3bb540e3070bd3a839dd6297fff02cf5b04
-AUX unescaped-left-brace.patch 1277 BLAKE2B 3dc055f3321b958cbe35e0e51336c64e41b4e71e4221ea025c6b4c86eff8af710652ab2f97bde52944ec17ba047039319356b338b10af6594dc50167811535df SHA512 dcfdb1fc7793fcf8a1e41fd890023c901bccff5c241601f99a5aef398fe35c1eae82d786064e189ef2113aad9d2081a67d8451d9c58ceefc78192e22ac5d3033
-DIST postfix-logwatch-1.40.03.tgz 107065 BLAKE2B 153f83c3414d2773ec528260369a564624aacc6de5627ee1da77d1eea89b276fb014c045785bc8ae1fbf7e6da2279a0d309ab171ff55d1087d3379466570c5ea SHA512 7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341
 DIST postfix-logwatch-1.40.04.tar.xz 78996 BLAKE2B fea2a08a7bc776cf0106a60bc0f86730c562d6c893629a1028183150a246803bda8ada6a5ec7e264685fe40016b82ce4140031af7e508ac4b1d9a34e552b865d SHA512 194917fe4d05e9808893da0c175859e932d5e48956d1dda96129dd5de7f9ee23131ae1831b558c8c2d32d03ffda80aa95cfd5048543b7766a0486a71efa6c19b
-EBUILD postfix-logwatch-1.40.03-r4.ebuild 1160 BLAKE2B 9c269a1abd9c561a8f514ac99e991d57344286705b91cbfa53b464a4267e024442ab324b4973c5962e27bec8da601feb6bf550969bae4fb030d05651642a0e6e SHA512 5c9d736880a06bd66c2ea75827d75610b826392e95573c7b75a654cd613afada7aadcc6bcfa8d0cfe365ade3c5ae7e9944c6c7bb304c4bce657a897220336cfe
-EBUILD postfix-logwatch-1.40.04.ebuild 796 BLAKE2B cc8aab5fd6c69efb2c31d14559a48539fcae3cede5659f53f79001d554d55c955b39993fe4dfd69aea7e8c0842e53687a7a285825282a6ae871d05c22cf34b47 SHA512 ea8dbfd64225f7aed6847b46641aff571ed171237845c693b9976d554482043877260f06e8954d7437f6648dbaa0d487ba024f44559536d2fcd17212121816bf
+DIST postfix-logwatch-1.40.05.tar.xz 79504 BLAKE2B 5d45a43ef2206b77092a90cd463a1718fada286fdd499df4416739aea7246c79b0670503585e7e057174ac715986767e3a72974d9790f33a2cd251221d883687 SHA512 15ba438701be110ce75c59bb6803cbb308bd53876428b01a457f42b3fb12e565c9b0c2d4559d71451475ec4986fccfc9f06854760035b4653c72508b968d5a0d
+EBUILD postfix-logwatch-1.40.04.ebuild 794 BLAKE2B 0658e0adb712ffae2973819c7ffc0c309f0030b209eaad9430284911c393e8d33440ad5bfdf72e1ece11cf34114eaec8200c7b79465f8b66490d9bc5a3166982 SHA512 d3b60889f683414a8ea6fa58d4c43068e20a96d1b004c4899f7e0404389d096764c33a93fe52427153574aae778483ad83c3ecd0ce179448ced50657ca8ec859
+EBUILD postfix-logwatch-1.40.05.ebuild 796 BLAKE2B 0ab46353e3f9518186cc515f4c37cdc703d4c8b9ae7fe72f6f06aa9f95bfa5217971009665fc134f4b104c3860030616db3a9eff86a0a536c353fa34805914f7 SHA512 5d833f806fc1d3fbec465dacadd2c6d6a6a6df1cd9d95ccb725608ef1188e4e70d27cbc3400a0b03d20985697e96140a9ff67150d221fcd683e373f1e30b49f8
 MISC metadata.xml 219 BLAKE2B 27094593eb47f098fe9df926d3a827b65c2ca39ac6b03d392efe2c19d646274e5b462f65a7177ba2556a9167c994544688e53a3df810dc7f86ae43c4a75fd59e SHA512 e990bf6d766d6c0380344187a03b66380e4ed7a1554dd7a900ccf1f6f2dd3a51b06b382cedd5c73e0ad75301436b351fea0e7f1fb720c3d1345a8958554d341c
diff --git a/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch b/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch
deleted file mode 100644
index dd5ae5869eb2..000000000000
--- a/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 7b3930a9d44f91a63f0edbe765c75dc8f6128b7c Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 26 Dec 2018 12:54:15 -0500
-Subject: [PATCH 1/1] Match postscreen "all server ports busy" lines.
-
-Lines that look like
-
-  NOQUEUE: reject: CONNECT from [192.168.0.1]:39410: all server ports busy
-
-were not being matched. There were two similar matches, one for a
-specific "too many connections" error
-
- NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections
-
-and another for a more general form intended to match "all screening
-ports busy" errors from postscreen:
-
- reject: connect from [192.168.0.1]:21225: all screening ports busy
-
-The general form is preferable in my opinion, but the "screening
-ports" message is a bit of a black sheep. As a result, even the more
-general regular expression didn't match the other two errors due to
-their beginning with "NOQUEUE" and using an uppercase "CONNECT".
-
-To fix this, the general regular expression was made even more
-general. Now, a leading "NOQUEUE: " is optional, and the "CONNECT" can
-be capitalized. Thus, one regular expression now catches all three
-messages.
----
- postfix-logwatch | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/postfix-logwatch b/postfix-logwatch
-index 827dfe0..648ba7a 100644
---- a/postfix-logwatch
-+++ b/postfix-logwatch
-@@ -4399,14 +4399,11 @@ sub postfix_postscreen {
-       }
-    }
- 
--   elsif ($line =~ /^NOQUEUE: reject: CONNECT from \[([^]]+)\](?::\d+)?: too many connections/) {
--      # NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections
--      $Counts{'postscreen'}{'reject'}{'Too many connections'}{$1}{$END_KEY}++      if $Collecting{'postscreen'};
--   }
--
--   elsif ($line =~ /^reject: connect from \[([^]]+)\](?::\d+)?: (.+)$/) {
--      # reject: connect from [192.168.0.1]:21225: all screening ports busy
--      $Counts{'postscreen'}{'reject'}{"\u$2"}{$1}{$END_KEY}++      if $Collecting{'postscreen'};
-+   elsif ($line =~ /^(NOQUEUE: )?reject: (connect|CONNECT) from \[([^]]+)\](?::\d+)?: (.+)$/) {
-+       # NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections
-+       # NOQUEUE: reject: CONNECT from [192.168.0.1]:39410: all server ports busy
-+       # reject: connect from [192.168.0.1]:21225: all screening ports busy
-+      $Counts{'postscreen'}{'reject'}{"\u$4"}{$3}{$END_KEY}++      if $Collecting{'postscreen'};
-    }
- 
-    elsif ($line =~ /^(?:WHITELIST VETO) \[([^]]+)\](?::\d+)?$/) {
--- 
-2.19.2
-
diff --git a/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch b/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch
deleted file mode 100644
index 4c743a21c17a..000000000000
--- a/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 891b5ce1780e10cd94d230efacf6e8b5cb33a931 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 15 Apr 2020 08:04:02 -0400
-Subject: [PATCH 1/1] Ignore postscreen "BDAT/DATA without valid RCPT" lines.
-
-Postscreen now emits a notice when clients send BDAT or DATA
-prematurely (after postscreen rejects the recipient):
-
-  DATA without valid RCPT from [192.168.0.1]:48580
-
-These are merely informational, since the connection was rejected for
-some other reason, so this commit ignores them.
----
- postfix-logwatch | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/postfix-logwatch b/postfix-logwatch
-index 648ba7a..1b89ad6 100644
---- a/postfix-logwatch
-+++ b/postfix-logwatch
-@@ -4359,7 +4359,8 @@ sub postfix_postscreen {
-       $line =~ /discarding EHLO keywords: / or
-       $line =~ /: discard_mask / or
-       $line =~ /: sq=\d+ cq=\d+ event/ or
--      $line =~ /: replacing command "/
-+      $line =~ /: replacing command "/ or
-+      $line =~ /^(DATA|BDAT) without valid RCPT/
-    );
- 
- 
--- 
-2.24.1
-
diff --git a/net-mail/postfix-logwatch/files/multi-digit-enhanced-status.patch b/net-mail/postfix-logwatch/files/multi-digit-enhanced-status.patch
deleted file mode 100644
index f07ab22813c9..000000000000
--- a/net-mail/postfix-logwatch/files/multi-digit-enhanced-status.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ced6e6fcbf1a025419e8ee9f940e5022ed440532 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 5 Sep 2017 09:19:44 -0400
-Subject: [PATCH 1/1] Allow multi-digit numbers in enhanced SMTP status codes.
-
-The re_DSN regular expression is intended to match a response like
-"550 1.2.3", where "1.2.3" is an enhanced status code. However, the
-regular expression was only expecting single-digit numbers between the
-dots; thus it was missing codes like "550 5.7.23". The expression has
-been updated to accept any number of digits between the dots.
-
-This fixes unmatched rejection lines that begin with,
-
-  550 5.7.23 <user@example.com>: Recipient address rejected...
-
-Such lines appear with newer versions of the python SPF policy daemon.
----
- postfix-logwatch | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/postfix-logwatch b/postfix-logwatch
-index 92ed621..827dfe0 100644
---- a/postfix-logwatch
-+++ b/postfix-logwatch
-@@ -66,7 +66,9 @@ my $re_QID_s   = qr/[A-Z\d]+/;
- my $re_QID_l   = qr/(?:NOQUEUE|[bcdfghjklmnpqrstvwxyzBCDFGHJKLMNPQRSTVWXYZ\d]+)/;
- our $re_QID;
- 
--our $re_DSN     = qr/(?:(?:\d{3})?(?: ?\d\.\d\.\d)?)/;
-+# The enhanced status codes can contain two-digit (or more) numbers;
-+# for example, "550 5.7.23".
-+our $re_DSN     = qr/(?:(?:\d{3})?(?: ?\d+\.\d+\.\d+)?)/;
- our $re_DDD     = qr/(?:(?:conn_use=\d+ )?delay=-?[\d.]+(?:, delays=[\d\/.]+)?(?:, dsn=[\d.]+)?)/;
- 
- #MODULE: ../Logreporters/Utils.pm
--- 
-2.13.0
-
diff --git a/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch b/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch
deleted file mode 100644
index ee0e79bd41d9..000000000000
--- a/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 6afb8e258a5a2a0e7c72c4c25927dde9d1e2ad89 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 24 Aug 2017 07:34:36 -0400
-Subject: [PATCH 2/2] Fix redundant argument to sprintf warning.
-
-Perl 5.22 now warns about redundant (i.e. extra) arguments to the
-sprintf function. If your format string only has two place-holders but
-you pass three place-fillers, you get warned:
-
-  Redundant argument in sprintf at ./postfix-logwatch line 1382...
-
-The issue there was that the format string passed to sprintf was
-constructed dynamically; sometimes it would contain two place-holders,
-and sometimes three. Three place-fillers were always passed, so when
-only two place-holders were used, the warning would be thrown. This was
-fixed by testing whether or not there are two or three place-holders,
-and passing the appropriate number of place-fillers.
----
- postfix-logwatch | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/postfix-logwatch b/postfix-logwatch
-index 1e58a95..92ed621 100644
---- a/postfix-logwatch
-+++ b/postfix-logwatch
-@@ -1378,8 +1378,17 @@ sub print_summary_report (\@) {
-                      $$divisor == $Totals{$keyname} ? 100.00 : $Totals{$keyname} * 100 / $$divisor;
-             }
-             else {
--               push @{$lines[$cur_level]}, 
--                  sprintf "$fmt  %-23s $extra\n", $total, $desc, commify ($Totals{$keyname});
-+		my $new_line;
-+		if ($extra eq '') {
-+		    $new_line = sprintf("$fmt  %-23s \n", $total, $desc);
-+		}
-+		else {
-+		    $new_line = sprintf("$fmt  %-23s $extra\n",
-+					$total,
-+					$desc,
-+					commify ($Totals{$keyname}));
-+		}
-+		push @{$lines[$cur_level]}, $new_line
-             }
-          }
-       }
--- 
-2.13.0
-
diff --git a/net-mail/postfix-logwatch/files/unescaped-left-brace.patch b/net-mail/postfix-logwatch/files/unescaped-left-brace.patch
deleted file mode 100644
index 65139a3aff14..000000000000
--- a/net-mail/postfix-logwatch/files/unescaped-left-brace.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 84f9fb47783e63757f27e5990ee606ff01e079a9 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 24 Aug 2017 07:09:28 -0400
-Subject: [PATCH 1/2] Fix unescaped left brace warning for "Config: {".
-
-New versions of Perl are starting to complain about unescaped braces
-in regular expressions, and supposedly the warning will become a fatal
-error in Perl 5.30. This particular warning is,
-
-  Unescaped left brace in regex is deprecated, passed through in regex;
-  marked by <-- HERE in m/^Config: { <-- HERE / at ./postfix-logwatch
-  line 1850.
-
-and it was fixed by going to line 1850 and putting a backslash before
-the left brace.
-
-Bug: https://sourceforge.net/p/logreporters/bugs/4/
----
- postfix-logwatch | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/postfix-logwatch b/postfix-logwatch
-index 3e4a673..1e58a95 100644
---- a/postfix-logwatch
-+++ b/postfix-logwatch
-@@ -1847,7 +1847,7 @@ sub postfix_policy_spf($) {
-         # KeyboardInterrupt 
-         $line =~ /^Read line: "/ or
-         $line =~ /^Found the end of entry$/ or
--        $line =~ /^Config: {/ or
-+        $line =~ /^Config: \{/ or
-         $line =~ /^spfcheck: pyspf result/ or
-         $line =~ /^Starting$/ or
-         $line =~ /^Normal exit$/ or
--- 
-2.13.0
-
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
index bab89768c04c..43edbac64654 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
index 9bf2ef83569d..dc661eb713af 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
@@ -1,26 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="A log analyzer for postfix"
-HOMEPAGE="http://logreporters.sourceforge.net/"
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
+HOMEPAGE="http://michael.orlitzky.com/code/postfix-logwatch.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-lang/perl"
 
-PATCHES=(
-	"${FILESDIR}/unescaped-left-brace.patch"
-	"${FILESDIR}/redundant-argument-to-sprintf.patch"
-	"${FILESDIR}/multi-digit-enhanced-status.patch"
-	"${FILESDIR}/all-server-ports-busy-lines.patch"
-	"${FILESDIR}/data-without-valid-rcpt.patch"
-)
-
 src_prepare() {
 	default
 	# Replace the default config file location with ours.
@@ -30,12 +22,6 @@ src_prepare() {
 		|| die 'failed to update the default config location'
 }
 
-src_compile() {
-	# The default make target just outputs instructions. We don't want
-	# the user to see these, so we avoid the default emake.
-	:
-}
-
 src_install() {
 	dodoc Bugs Changes README ${PN}.conf-topn
 	doman ${PN}.1