Date: Thu, 21 Jun 2018 21:52:59 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473006 - in head/mail/amavis-logwatch: . files Message-ID: <201806212152.w5LLqxO5077910@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Thu Jun 21 21:52:59 2018 New Revision: 473006 URL: https://svnweb.freebsd.org/changeset/ports/473006 Log: - Fix regex handling with the new perl version [1] [1] Unescaped left brace in regex is deprecated, passed through in regex PR: 227896 Submitted by: zeising Added: head/mail/amavis-logwatch/files/ head/mail/amavis-logwatch/files/patch-amavis-logwatch (contents, props changed) Modified: head/mail/amavis-logwatch/Makefile Modified: head/mail/amavis-logwatch/Makefile ============================================================================== --- head/mail/amavis-logwatch/Makefile Thu Jun 21 21:50:43 2018 (r473005) +++ head/mail/amavis-logwatch/Makefile Thu Jun 21 21:52:59 2018 (r473006) @@ -3,6 +3,7 @@ PORTNAME= amavis-logwatch PORTVERSION= 1.51.03 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF/logreporters/${PORTNAME}/release/${PORTVERSION} Added: head/mail/amavis-logwatch/files/patch-amavis-logwatch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/amavis-logwatch/files/patch-amavis-logwatch Thu Jun 21 21:52:59 2018 (r473006) @@ -0,0 +1,22 @@ +--- amavis-logwatch.orig 2018-05-01 11:57:52 UTC ++++ amavis-logwatch +@@ -1333,6 +1333,10 @@ sub print_summary_report (\@) { + sprintf "$fmt %-42s %6.2f%%\n", $total, $desc, + $$divisor == $Totals{$keyname} ? 100.00 : $Totals{$keyname} * 100 / $$divisor; + } ++ elsif ($extra eq '') { ++ push @{$lines[$cur_level]}, ++ sprintf "$fmt %-23s\n", $total, $desc; ++ } + else { + push @{$lines[$cur_level]}, + sprintf "$fmt %-23s $extra\n", $total, $desc, commify ($Totals{$keyname}); +@@ -2283,7 +2287,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; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806212152.w5LLqxO5077910>