commit: 423b051601ba365d33b9da6d09c5546ecb0fdbc5 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Tue Jun 7 20:15:38 2022 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Tue Jun 7 20:16:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=423b0516
net-mail/amavis-logwatch: remove old v1.51.03 and its patches. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> net-mail/amavis-logwatch/Manifest | 1 - .../amavis-logwatch-1.51.03-r5.ebuild | 51 ---------------------- .../files/SANITIZED-NULL-bytes-messages.patch | 34 --------------- .../files/file-libmagic-errors.patch | 35 --------------- .../files/handle-clamd-select-failed.patch | 38 ---------------- .../files/ignore-all-sd_notify-lines.patch | 33 -------------- .../ignore-amavis-startup-notifications.patch | 31 ------------- .../files/ignore-utf8smtp-lines.patch | 32 -------------- .../files/no-pid_file-configured.patch | 27 ------------ .../files/redundant-argument-to-sprintf.patch | 48 -------------------- .../files/unchecked-encrypted.patch | 41 ----------------- .../files/unescaped-left-brace.patch | 38 ---------------- .../amavis-logwatch/files/will-bind-to-lines.patch | 29 ------------ 13 files changed, 438 deletions(-) diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest index 44094c53ca96..e51474a8f5d9 100644 --- a/net-mail/amavis-logwatch/Manifest +++ b/net-mail/amavis-logwatch/Manifest @@ -1,2 +1 @@ -DIST amavis-logwatch-1.51.03.tgz 87304 BLAKE2B 08b49d6f67e406edee062659c6de0a2c5823286bc24db35030c2b63bc3f0a06617eecdcf0da7f1f66d8eda8f9743254aa752ada82a9963bfac76a1a467503344 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5 DIST amavis-logwatch-1.51.04.tar.xz 66036 BLAKE2B da2ae91db65586497e5e5bf53b94f8eab84f26ebbad26f563d14ff11960d5c3bd2e046f0a056c28c53c5ce40c6193a812abb4f93db5d7a18747c40444b954d3f SHA512 aec2f6ccc1af7744364e734e2893adc68e034bfab8c9f96bd32e74c6c947c1b39faef2d442d32e50f2578fbc4687dfd2b339856624330aef64ae6cf4e408456f diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild deleted file mode 100644 index 17b9ad2d5afe..000000000000 --- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A log analyzer for amavisd-new" -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}/ignore-amavis-startup-notifications.patch" - "${FILESDIR}/ignore-utf8smtp-lines.patch" - "${FILESDIR}/unchecked-encrypted.patch" - "${FILESDIR}/file-libmagic-errors.patch" - "${FILESDIR}/ignore-all-sd_notify-lines.patch" - "${FILESDIR}/no-pid_file-configured.patch" - "${FILESDIR}/will-bind-to-lines.patch" - "${FILESDIR}/SANITIZED-NULL-bytes-messages.patch" - "${FILESDIR}/handle-clamd-select-failed.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 - doman ${PN}.1 - dobin ${PN} - insinto /etc - doins ${PN}.conf -} diff --git a/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch b/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch deleted file mode 100644 index 0cc27f0bd226..000000000000 --- a/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6d985d29d8be2b70ee7e4048a7ae95e2b4013f17 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -Date: Fri, 28 Dec 2018 10:01:56 -0500 -Subject: [PATCH 4/4] Ignore "SANITIZED ... NULL byte(s)" messages. - -Newer versions of the amavisd daemon sanitize NULL bytes within the -body of a message for the benefit of Cyrus IMAP. When it does this, -the number of bytes sanitized is logged. This is an informational -message only as far as I can tell, so it's been added to the list of -messages to ignore. ---- - amavis-logwatch | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 250a6ba..044c94d 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2052,6 +2052,12 @@ sub create_ignore_list() { - # describe what is being sent to the systemd notification socket, - # if one exists. - push @ignore_list_final, qr/^sd_notify( \(no socket\))?:/; -+ -+ # In amavisd-new-2.11.0-rc1 and later, amavis will replace any null -+ # bytes that it finds in the body of a message with a "modified -+ # UTF-8" encoded null. The number of times it does this is then -+ # logged with the following message. -+ push @ignore_list_final, qr/^smtp forwarding: SANITIZED (\d+) NULL byte\(s\)/; - } - - # Notes: --- -2.19.2 - diff --git a/net-mail/amavis-logwatch/files/file-libmagic-errors.patch b/net-mail/amavis-logwatch/files/file-libmagic-errors.patch deleted file mode 100644 index 2a28c4ee623b..000000000000 --- a/net-mail/amavis-logwatch/files/file-libmagic-errors.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 63421f1c92403149be838c64ebb731778c148dde Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -Date: Thu, 7 Sep 2017 07:36:39 -0400 -Subject: [PATCH 1/1] Ignore errors from the File::LibMagic describe_filename - function. - -Newer versions of amavisd-new can make use of the File::LibMagic -library (as opposed to the "file" executable) to get information about -attachments. Using the library should be faster, but when it fails, it -does so in a novel way: - - (02859-21) File::LibMagic::describe_filename failed on p003: libmagic - JPEG image data, Exif standard: [TIFF image data, big-endian,... - -This commit adds such lines to the global ignore list, since they -don't provide us with any useful information. ---- - amavis-logwatch | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 448de3a..ac93cbc 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2033,6 +2033,7 @@ sub create_ignore_list() { - - push @ignore_list_final, qr/^Inserting header field: X-Amavis-Hold: /; - push @ignore_list_final, qr/^Decoding of .* failed, leaving it unpacked: /; -+ push @ignore_list_final, qr/^File::LibMagic::describe_filename failed on p\d+: /; - - # various forms of "Using ..." - # more specific, interesting variants already captured: search "Using" --- -2.13.0 - diff --git a/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch b/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch deleted file mode 100644 index 83dad161e18a..000000000000 --- a/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 869fa9d8b2113f50c3a97ef9f4a1f95171702be4 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -Date: Wed, 13 Feb 2019 11:25:33 -0500 -Subject: [PATCH 1/1] Catch "Select failed: Interrupted system call" entries - from clamd. - -When a select() call in clamd is interrupted, amavis logs the -following warning: - - ClamAV-clamd: Select failed: Interrupted system call at /usr/sbin/amavisd - line 8472, <GEN16> line 296., retrying (1) - -These are harmless in and of themselves, but we would like to classify -them as warnings. Currently they are unmatched. This commit adds a -pattern for them, moving them from the "Unmatched Entries" heading to -"Miscellaneous warnings" instead. Afterwards, the report looks like, - - 24 Miscellaneous warnings -------------------------------- - 2 ClamAV-clamd: Select failed: Interrupted system call ---- - amavis-logwatch | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 044c94d..4c9b59f 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2817,6 +2817,7 @@ while (<>) { - ($p1 =~ /^TROUBLE/) or - ($p1 =~ /Can't (?:connect to UNIX|send to) socket/) or - ($p1 =~ /: Empty result from /) or -+ ($p1 =~ /: Select failed: Interrupted system call/) or - ($p1 =~ /: Error reading from socket: Connection reset by peer/) or - ($p1 =~ /open\(.*\): Permission denied/) or - ($p1 =~ /^_?WARN: /) or --- -2.19.2 - diff --git a/net-mail/amavis-logwatch/files/ignore-all-sd_notify-lines.patch b/net-mail/amavis-logwatch/files/ignore-all-sd_notify-lines.patch deleted file mode 100644 index f3ce1d1091af..000000000000 --- a/net-mail/amavis-logwatch/files/ignore-all-sd_notify-lines.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 653f988ba163c74f3ebdb6e53f57db9d8e569b1f Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -Date: Fri, 28 Dec 2018 09:23:52 -0500 -Subject: [PATCH 1/4] Ignore all "sd_notify" lines. - -Lines beginning with either "sd_notify:" or "sd_notify (no socket):" -contain information about what is being sent to the systemd -notification socket, if one exists. One such line was already being -ignored, but we don't want any of them. So, the existing -@ignore_list_final entry was expanded to encompass all such messages. ---- - amavis-logwatch | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/amavis-logwatch b/amavis-logwatch -index ac93cbc..ffb502b 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2047,7 +2047,10 @@ sub create_ignore_list() { - push @ignore_list_final, qr/\bRUSAGE\b/; - push @ignore_list_final, qr/: Sending .* to UNIX socket/; - -- push @ignore_list_final, qr/sd_notify \(no socket\): STATUS=Starting child process\(es\), ready for work./ -+ # Lines beginning with "sd_notify:" or "sd_notify (no socket):" -+ # describe what is being sent to the systemd notification socket, -+ # if one exists. -+ push @ignore_list_final, qr/^sd_notify( \(no socket\))?:/; - } - - # Notes: --- -2.19.2 - diff --git a/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch b/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch deleted file mode 100644 index 4dd019186e41..000000000000 --- a/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 15bf4096ea496a28210e2f4c1f34ab28b413566a Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -Date: Thu, 24 Aug 2017 08:52:18 -0400 -Subject: [PATCH 3/4] Ignore amavisd-new "starting child processes" - notifications. - -Newer versions of amavisd-new log the following constantly: - - sd_notify (no socket): STATUS=Starting child process(es), ready for work. - -It's of no use to us, so add it to the global "ignore" list. ---- - amavis-logwatch | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 1aab787..06b60c8 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2044,6 +2044,8 @@ sub create_ignore_list() { - # unanchored - push @ignore_list_final, qr/\bRUSAGE\b/; - push @ignore_list_final, qr/: Sending .* to UNIX socket/; -+ -+ push @ignore_list_final, qr/sd_notify \(no socket\): STATUS=Starting child process\(es\), ready for work./ - } - - # Notes: --- -2.13.0 - diff --git a/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch b/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch deleted file mode 100644 index 83fd4cb80a42..000000000000 --- a/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a8dac25fe398e42abdb89b85b1435d52386827b4 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -Date: Thu, 24 Aug 2017 09:05:04 -0400 -Subject: [PATCH 4/4] Ignore UTF8SMTP lines. - -Lines that look like, - - UTF8SMTP :10024 /var/...: <sen...@example.net> -> <r...@example.com> - BODY=8BITMIME SMTPUTF8 Received: from mx.example.com ([127.0.0.1]) by... - -were previously unmatched because of the relatively-new "UTF8SMTP". -Similar lines that have "ESMTP" instead of "UTF8SMTP" are already -ignored, so it makes sense to ignore the "UTF8SMTP" lines too. ---- - amavis-logwatch | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 06b60c8..deb9146 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2132,6 +2132,7 @@ while (<>) { - or ($p1 =~ /^SpamControl/) - or ($p1 =~ /^Perl/) - or ($p1 =~ /^ESMTP/) -+ or ($p1 =~ /^UTF8SMTP/) - or ($p1 =~ /^(?:\(!+\))?(\S+ )?(?:FWD|SEND) from /) # log level 4 - or ($p1 =~ /^(?:\(!+\))?(\S+ )?(?:ESMTP|FWD|SEND) via /) # log level 4 - or ($p1 =~ /^tempdir being removed/) --- -2.13.0 - diff --git a/net-mail/amavis-logwatch/files/no-pid_file-configured.patch b/net-mail/amavis-logwatch/files/no-pid_file-configured.patch deleted file mode 100644 index 5f23955366e3..000000000000 --- a/net-mail/amavis-logwatch/files/no-pid_file-configured.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a93ee5d433308d2cac76ac9502e34c953ff96337 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -Date: Fri, 28 Dec 2018 09:33:07 -0500 -Subject: [PATCH 2/4] Ignore "no $pid_file configured, not checking it" lines. - -When no PID file is configured (for example, when amavisd is running -in the foreground), this message is logged. We already ignore the -other types of PID file notifications, so ignore this one too. ---- - amavis-logwatch | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/amavis-logwatch b/amavis-logwatch -index ffb502b..6d06793 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -1958,6 +1958,7 @@ sub create_ignore_list() { - push @ignore_list_final, qr/^fish_out_ip_from_received: /; - push @ignore_list_final, qr/^Waiting for the process \S+ to terminate/; - push @ignore_list_final, qr/^Valid PID file \(younger than sys uptime/; -+ push @ignore_list_final, qr/^no \$pid_file configured, not checking it/; - push @ignore_list_final, qr/^Sending SIG\S+ to amavisd/; - push @ignore_list_final, qr/^Can't send SIG\S+ to process/; - push @ignore_list_final, qr/^killing process/; --- -2.19.2 - diff --git a/net-mail/amavis-logwatch/files/redundant-argument-to-sprintf.patch b/net-mail/amavis-logwatch/files/redundant-argument-to-sprintf.patch deleted file mode 100644 index 91f456afdd11..000000000000 --- a/net-mail/amavis-logwatch/files/redundant-argument-to-sprintf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 02cf771776d2f1ad9d7872f3959e41a548adfab9 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -Date: Thu, 24 Aug 2017 08:20:59 -0400 -Subject: [PATCH 2/4] 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 ./amavis-logwatch line 1338... - -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. ---- - amavis-logwatch | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 8972497..1aab787 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -1334,8 +1334,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/amavis-logwatch/files/unchecked-encrypted.patch b/net-mail/amavis-logwatch/files/unchecked-encrypted.patch deleted file mode 100644 index 33c2214a2d09..000000000000 --- a/net-mail/amavis-logwatch/files/unchecked-encrypted.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e9f83dde1b241ce449264db7a517124bb115dd99 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -Date: Wed, 6 Sep 2017 09:19:42 -0400 -Subject: [PATCH 1/1] Catch mail that is passed UNCHECKED-ENCRYPTED. - -Some encrypted mail can pass through the system with a log line like, - - (01495-17) Passed UNCHECKED-ENCRYPTED {RelayedTaggedInbound}, ... - -These were unmatched, because the "-ENCRYPTED" suffix is new. One -regular expression and a dictionary have been updated to catch those -lines and dump them into the "unchecked" bin with the rest of the -UNCHECKED lines. ---- - amavis-logwatch | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/amavis-logwatch b/amavis-logwatch -index deb9146..448de3a 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -1799,6 +1799,7 @@ my %ccatmajor_to_sectkey = ( - 'INFECTED' => 'malware', - 'BANNED' => 'bannedname', - 'UNCHECKED' => 'unchecked', -+ 'UNCHECKED-ENCRYPTED' => 'unchecked', - 'SPAM' => 'spam', - 'SPAMMY' => 'spammy', - 'BAD-HEADER' => 'badheader', -@@ -2295,7 +2296,7 @@ while (<>) { - #XXX elsif (($action, $key, $ip, $from, $to) = ( $p1 =~ /^(?:Virus found - quarantined|(?:(Passed|Blocked) )?INFECTED) \(([^\)]+)\),[A-Z .]*(?: \[($re_IP)\])?(?: \[$re_IP\])* [<(]([^>)]*)[>)] -> [(<]([^(<]+)[(>]/o )) - - # the first IP is the envelope sender. -- if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: \{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) { -+ if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|UNCHECKED-ENCRYPTED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: \{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) { - inc_unmatched('passblock'); - next; - } --- -2.13.0 - diff --git a/net-mail/amavis-logwatch/files/unescaped-left-brace.patch b/net-mail/amavis-logwatch/files/unescaped-left-brace.patch deleted file mode 100644 index 2cb293b89e8b..000000000000 --- a/net-mail/amavis-logwatch/files/unescaped-left-brace.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 79f37650aa72fe3feeed682ee2b79686ee2b6547 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -Date: Thu, 24 Aug 2017 08:16:05 -0400 -Subject: [PATCH 1/4] Fix unescaped left brace warning in monster regex. - -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/^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\) - |BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: - { <-- HERE [^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), - (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/ at - /usr/bin/amavis-logwatch line 2286. - -and it was fixed by going to line 2286 and putting a backslash before -the left brace. ---- - amavis-logwatch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 4ad07f6..8972497 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2283,7 +2283,7 @@ while (<>) { - #XXX elsif (($action, $key, $ip, $from, $to) = ( $p1 =~ /^(?:Virus found - quarantined|(?:(Passed|Blocked) )?INFECTED) \(([^\)]+)\),[A-Z .]*(?: \[($re_IP)\])?(?: \[$re_IP\])* [<(]([^>)]*)[>)] -> [(<]([^(<]+)[(>]/o )) - - # the first IP is the envelope sender. -- if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: {[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) { -+ if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: \{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) { - inc_unmatched('passblock'); - next; - } --- -2.13.0 - diff --git a/net-mail/amavis-logwatch/files/will-bind-to-lines.patch b/net-mail/amavis-logwatch/files/will-bind-to-lines.patch deleted file mode 100644 index 464a85b1c56d..000000000000 --- a/net-mail/amavis-logwatch/files/will-bind-to-lines.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e53948a6909e98b63c63c97749c7d0eb534fa274 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -Date: Fri, 28 Dec 2018 09:40:36 -0500 -Subject: [PATCH 3/4] Ignore "will bind to" lines in addition to "bind to" - lines. - -In amavisd-new-2.11.0-rc1, the informational "bind to..." messages -were changed to say "will bind to..." instead. This commit updates the -@ignore_list_final regular expression to match both forms. ---- - amavis-logwatch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 6d06793..250a6ba 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2029,7 +2029,7 @@ sub create_ignore_list() { - push @ignore_list_final, qr/^address modified \(/; - push @ignore_list_final, qr/^Request: AM\.PDP /; - push @ignore_list_final, qr/^DSPAM result: /; -- push @ignore_list_final, qr/^bind to \//; -+ push @ignore_list_final, qr/^(will )?bind to \//; - push @ignore_list_final, qr/^ZMQ enabled: /; - - push @ignore_list_final, qr/^Inserting header field: X-Amavis-Hold: /; --- -2.19.2 -
