From: Sven Höxter <sven.hoexter@rewe-digital.com>
Date: Sat, 4 Apr 2020 17:56:06 +0000 (+0200)
Subject: Update postscreen-rejects patch with a fix for IPv6 addresses. Kudos to Juri Haberlan... 
X-Git-Tag: debian/1.1.5-6~2
X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fpflogsumm.git;a=commitdiff_plain;h=d8295ec9b758e079ca00051f5cbdf81f186e657d

Update postscreen-rejects patch with a fix for IPv6 addresses. Kudos to Juri Haberland <juri@sapienti-sat.org> for the fix. (Closes: 955627)
---

diff --git a/debian/changelog b/debian/changelog
index e4c4ec2..c85c3fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pflogsumm (1.1.5-6) UNRELEASED; urgency=medium
+
+  * Update postscreen-rejects patch with a fix for IPv6
+    addresses. Kudos to Juri Haberland <juri@sapienti-sat.org>
+    for the fix. (Closes: 955627)
+
+ -- Sven Hoexter <hoexter@debian.org>  Sat, 04 Apr 2020 19:46:48 +0200
+
 pflogsumm (1.1.5-5) unstable; urgency=medium
 
   * Add patch to count milter rejects provided by Matus Uhlar.
diff --git a/debian/patches/postscreen-rejects b/debian/patches/postscreen-rejects
index 74e56fd..a04f91b 100644
--- a/debian/patches/postscreen-rejects
+++ b/debian/patches/postscreen-rejects
@@ -1,4 +1,4 @@
-Index: pflogsumm.pl
+Index: pflogsumm/pflogsumm.pl
 ===================================================================
 --- pflogsumm.orig/pflogsumm.pl
 +++ pflogsumm/pflogsumm.pl
@@ -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"