summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-mail/amavis-logwatch/files/unescaped-left-brace.patch')
-rw-r--r--net-mail/amavis-logwatch/files/unescaped-left-brace.patch38
1 files changed, 0 insertions, 38 deletions
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 <michael@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
-