<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[145378] trunk/dports/security/logwatch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/145378">145378</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-02-03 07:37:37 -0800 (Wed, 03 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>logwatch: apply upstream patches to remore perl 5.22 deprecation warnings (#50323).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssecuritylogwatchPortfile">trunk/dports/security/logwatch/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssecuritylogwatchfilesperl522deprecationsdiff">trunk/dports/security/logwatch/files/perl5.22-deprecations.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssecuritylogwatchPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/security/logwatch/Portfile (145377 => 145378)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name logwatch
</span><span class="cx"> version 7.4.1
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> distname logwatch-${version}
</span><span class="cx"> categories security
</span><span class="cx"> license MIT
</span><span class="lines">@@ -30,7 +30,8 @@
</span><span class="cx"> checksums rmd160 dd9539b3880b3a9ce2d0772f09e52de238a89405 \
</span><span class="cx"> sha256 35ec31f9fe981aaa727b144ab3ff2eb655997d8ccabaf66586458f5dfc3a56eb
</span><span class="cx">
</span><del>-patchfiles scripts_logwatch.pl.diff
</del><ins>+patchfiles scripts_logwatch.pl.diff \
+ perl5.22-deprecations.diff
</ins><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx"> build {
</span></span></pre></div>
<a id="trunkdportssecuritylogwatchfilesperl522deprecationsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/security/logwatch/files/perl5.22-deprecations.diff (0 => 145378)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,82 @@
</span><ins>+--- 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;
+ }
</ins></span></pre>
</div>
</div>
</body>
</html>