Update postscreen-rejects patch with a fix for IPv6 addresses. Kudos to Juri Haberlan...

diff --git a/debian/changelog b/debian/changelog
index e4c4ec228c4e4fd3742752c56826dfdff1c5822a..c85c3fa2c3539f3ce2345b3c125982be61d83016 100644 (file)
--- 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.
 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 74e56fd6961c31ac615fc7095ca812fe7b0879b6..a04f91b083688b58d32e1aacd76b8f85adbc3e04 100644 (file)
--- 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
 ===================================================================
 --- 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
 +    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"
      }
   
      # "mach.host.dom"/"mach.host.do.co" to "host.dom"/"host.do.co"