X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fpflogsumm.git;a=blobdiff_plain;f=debian%2Fpatches%2Fpostscreen-rejects;h=a04f91b083688b58d32e1aacd76b8f85adbc3e04;hp=aedb249d22c2b96f6a6b49fe3b67bf6fed3829c3;hb=d8295ec9b758e079ca00051f5cbdf81f186e657d;hpb=7e846149c4eed7bead8214199eebc637a66b6333

diff --git a/debian/patches/postscreen-rejects b/debian/patches/postscreen-rejects
index aedb249..a04f91b 100644
--- a/debian/patches/postscreen-rejects
+++ b/debian/patches/postscreen-rejects
@@ -1,7 +1,7 @@
-Index: pflogsumm.pl
+Index: pflogsumm/pflogsumm.pl
 ===================================================================
---- pflogsumm.pl.orig
-+++ pflogsumm.pl
+--- pflogsumm.orig/pflogsumm.pl
++++ pflogsumm/pflogsumm.pl
 @@ -713,7 +713,7 @@ while(<>) {
  			  \${$msgsPerDay{$revMsgDateStr}}[4]);
      } elsif($cmd eq 'master') {
@@ -20,7 +20,8 @@ Index: pflogsumm.pl
 +    unless((($domain, $ipAddr) = /^([^\[]*)\[((?:\d{1,3}\.){3}\d{1,3})\]/) == 2||
 +           (($domain, $ipAddr) = /^([^\/]*)\/([0-9a-f.:]+)/i) == 2) {
  	# more exhaustive method
-         ($domain, $ipAddr) = /^([^\[\(\/]+)[\[\(\/]([^\]\)]+)[\]\)]?:?\s*$/;
+-        ($domain, $ipAddr) = /^([^\[\(\/]+)[\[\(\/]([^\]\)]+)[\]\)]?:?\s*$/;
++        ($domain, $ipAddr) = /^([^\[\(\/]*)[\[\(\/]([^\]\)]+)[\]\)]:?\d*$/;
      }
   
      # "mach.host.dom"/"mach.host.do.co" to "host.dom"/"host.do.co"