net-mail/postfix-logwatch: remove old v1.40.03 and its patches.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>

7 files changed, 0 insertions, 261 deletions

diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index d7d14eaf1743..dcdbf05f981c 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1,2 +1 @@
-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
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.03-r4.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild
deleted file mode 100644
index 9bf2ef83569d..000000000000
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A log analyzer for postfix"
-HOMEPAGE="http://logreporters.sourceforge.net/"
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-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.
-	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
-	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
-	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
-		|| 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
-	dobin ${PN}
-	insinto /etc
-	doins ${PN}.conf
-}