[145378] trunk/dports/security/logwatch
devans at macports.org
devans at macports.org
Wed Feb 3 07:37:37 PST 2016
Revision: 145378
https://trac.macports.org/changeset/145378
Author: devans at macports.org
Date: 2016-02-03 07:37:37 -0800 (Wed, 03 Feb 2016)
Log Message:
-----------
logwatch: apply upstream patches to remore perl 5.22 deprecation warnings (#50323).
Modified Paths:
--------------
trunk/dports/security/logwatch/Portfile
Added Paths:
-----------
trunk/dports/security/logwatch/files/perl5.22-deprecations.diff
Modified: trunk/dports/security/logwatch/Portfile
===================================================================
--- trunk/dports/security/logwatch/Portfile 2016-02-03 14:13:48 UTC (rev 145377)
+++ trunk/dports/security/logwatch/Portfile 2016-02-03 15:37:37 UTC (rev 145378)
@@ -5,7 +5,7 @@
name logwatch
version 7.4.1
-revision 2
+revision 3
distname logwatch-${version}
categories security
license MIT
@@ -30,7 +30,8 @@
checksums rmd160 dd9539b3880b3a9ce2d0772f09e52de238a89405 \
sha256 35ec31f9fe981aaa727b144ab3ff2eb655997d8ccabaf66586458f5dfc3a56eb
-patchfiles scripts_logwatch.pl.diff
+patchfiles scripts_logwatch.pl.diff \
+ perl5.22-deprecations.diff
use_configure no
build {
Added: trunk/dports/security/logwatch/files/perl5.22-deprecations.diff
===================================================================
--- trunk/dports/security/logwatch/files/perl5.22-deprecations.diff (rev 0)
+++ trunk/dports/security/logwatch/files/perl5.22-deprecations.diff 2016-02-03 15:37:37 UTC (rev 145378)
@@ -0,0 +1,82 @@
+--- scripts/services/amavis
++++ scripts/services/amavis
+@@ -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;
+ }
+--- scripts/services/postfix
++++ scripts/services/postfix
+@@ -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
+--- scripts/services/http
++++ scripts/services/http
+@@ -1,5 +1,5 @@
+ ##########################################################################
+-# $Id: http 233 2014-09-09 15:52:31Z stefjakobs $
++# $Id: http 305 2016-01-06 19:28:18Z stefjakobs $
+ ##########################################################################
+
+ #####################################################
+@@ -310,10 +310,10 @@
+ } elsif ($logformat =~ /\G%O/gc) {
+ $parse_field[$parse_index][$parse_subindex++] = "bytes_out";
+ $parse_string[$parse_index] .= "(-|\\d*)";
+- } elsif ($logformat =~ /\G%{Referer}i/gci) {
++ } elsif ($logformat =~ /\G%\{Referer}i/gci) {
+ $parse_string[$parse_index] .= "(.*)";
+ $parse_field[$parse_index][$parse_subindex++] = "referrer";
+- } elsif ($logformat =~ /\G%{User-Agent}i/gci) {
++ } elsif ($logformat =~ /\G%\{User-Agent}i/gci) {
+ $parse_string[$parse_index] .= "(.*)";
+ $parse_field[$parse_index][$parse_subindex++] = "agent";
+ } elsif ($logformat =~ /\G%({.*?})?./gc) {
+--- scripts/services/secure
++++ scripts/services/secure
+@@ -1,5 +1,5 @@
+ #########################################################################
+-# $Id: secure 231 2014-09-09 12:59:24Z stefjakobs $
++# $Id: secure 305 2016-01-06 19:28:18Z stefjakobs $
+ ##########################################################################
+ # $Log: secure,v $
+ # Revision 1.86 2009/11/14 16:26:41 kirk
+@@ -505,7 +505,7 @@
+ $DeniedAccess{"$User,$Reason"}++;
+ } elsif ($ThisLine =~ /^request-key: Cannot find command to construct key/) {
+ $RequestKeyFailures++;
+- } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes {[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (ISSUE|UNKNOWN_SERVER): authtime [0-9]+, (?:etypes {rep=[0-9]+ tkt=[0-9]+ ses=[0-9]+},)? ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
++ } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes \{[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (ISSUE|UNKNOWN_SERVER): authtime [0-9]+, (?:etypes \{rep=[0-9]+ tkt=[0-9]+ ses=[0-9]+},)? ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
+ if($service=~/^krbtgt\/([^@]+)@\1/) {
+ $service='Login';
+ }
+@@ -514,7 +514,7 @@
+ $e='';
+ }
+ $KerbList{$response}{$type}{$from}{$service}{$client}{$e}++;
+- } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes {[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (NEEDED_PREAUTH|PREAUTH_FAILED|CLIENT_NOT_FOUND): ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
++ } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes \{[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (NEEDED_PREAUTH|PREAUTH_FAILED|CLIENT_NOT_FOUND): ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
+ if($service=~/^krbtgt\/([^@]+)@\1/) {
+ $service='Login';
+ }
+--- scripts/services/amavis
++++ scripts/services/amavis
+@@ -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;
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160203/8ac4ae70/attachment.html>
More information about the macports-changes
mailing list