mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

- Fix regex handling with the new perl version [1]

Browse Source 
[1] Unescaped left brace in regex is deprecated, passed through in regex

PR:		227896
Submitted by:	zeising
This commit is contained in:
Danilo Egea Gondolfo 2018-06-21 21:52:59 +00:00
parent cc76e2af16
commit bad81ade76
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=473006
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mail/amavis-logwatch/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= amavis-logwatch
PORTVERSION= 1.51.03
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= SF/logreporters/${PORTNAME}/release/${PORTVERSION}

22
mail/amavis-logwatch/files/patch-amavis-logwatch Normal file
View File

@ -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;
}