SF.net SVN: logwatch:[296] trunk/scripts/services

Revision: 296
          http://sourceforge.net/p/logwatch/code/296
Author:   opoplawski
Date:     2015-10-22 15:43:37 +0000 (Thu, 22 Oct 2015)
Log Message:
-----------
Escape braces in regexes as required by perl 5.22

Modified Paths:
--------------
    trunk/scripts/services/amavis
    trunk/scripts/services/postfix

Modified: trunk/scripts/services/amavis
===================================================================
--- trunk/scripts/services/amavis	2015-10-13 22:20:20 UTC (rev 295)
+++ trunk/scripts/services/amavis	2015-10-22 15:43:37 UTC (rev 296)
@@ -2283,7 +2283,7 @@
       #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;
       }

Modified: trunk/scripts/services/postfix
===================================================================
--- trunk/scripts/services/postfix	2015-10-13 22:20:20 UTC (rev 295)
+++ trunk/scripts/services/postfix	2015-10-22 15:43:37 UTC (rev 296)
@@ -1847,7 +1847,7 @@
         # KeyboardInterrupt 
         $line =~ /^Read line: "/ or
         $line =~ /^Found the end of entry$/ or
-        $line =~ /^Config: {/ or
+        $line =~ /^Config: \{/ or
         $line =~ /^spfcheck: pyspf result/ or
         $line =~ /^Starting$/ or
         $line =~ /^Normal exit$/ or

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------