From bad81ade7667c781e6180dbd076aa844753c83c8 Mon Sep 17 00:00:00 2001
From: Danilo Egea Gondolfo <danilo@FreeBSD.org>
Date: Thu, 21 Jun 2018 21:52:59 +0000
Subject: [PATCH] - 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
---
 mail/amavis-logwatch/Makefile                 |  1 +
 .../files/patch-amavis-logwatch               | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 mail/amavis-logwatch/files/patch-amavis-logwatch

diff --git a/mail/amavis-logwatch/Makefile b/mail/amavis-logwatch/Makefile
index 24ee2b5fdf16..c4c511dcd868 100644
--- a/mail/amavis-logwatch/Makefile
+++ b/mail/amavis-logwatch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	amavis-logwatch
 PORTVERSION=	1.51.03
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF/logreporters/${PORTNAME}/release/${PORTVERSION}
 
diff --git a/mail/amavis-logwatch/files/patch-amavis-logwatch b/mail/amavis-logwatch/files/patch-amavis-logwatch
new file mode 100644
index 000000000000..fe2ba01e94c9
--- /dev/null
+++ b/mail/amavis-logwatch/files/patch-amavis-logwatch
@@ -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;
+       }