From: Sven Hoexter <sven@stormbind.net>
Date: Wed, 4 Jan 2023 12:08:43 +0000 (+0100)
Subject: Fix milter-rejects patch regex. Kudos to Andreas Jaggi <debianbug@jaggi.info> for... 
X-Git-Tag: debian/1.1.5-8~6
X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fpflogsumm.git;a=commitdiff_plain;h=4836e4ef662ca668c01ad388683bfd199c5e4c87

Fix milter-rejects patch regex. Kudos to Andreas Jaggi <debianbug@jaggi.info> for the report and patch. (Closes: #1027829)
---

diff --git a/debian/changelog b/debian/changelog
index 1d8d663..70fb577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pflogsumm (1.1.5-8) UNRELEASED; urgency=medium
+
+  * Fix regex in milter-rejects patch. Kudos to Andreas Jaggi
+    <debianbug@jaggi.info> for the report and patch. (Closes: #1027829)
+
+ -- Sven Hoexter <hoexter@debian.org>  Wed, 04 Jan 2023 13:08:05 +0100
+
 pflogsumm (1.1.5-7) unstable; urgency=medium
 
   * Re-Release for a source only upload. Package is unchanged.
diff --git a/debian/patches/milter-rejects b/debian/patches/milter-rejects
index 2e15cca..b03d9aa 100644
--- a/debian/patches/milter-rejects
+++ b/debian/patches/milter-rejects
@@ -7,7 +7,7 @@ Index: pflogsumm/pflogsumm.pl
      # regexp rejects happen in "cleanup"
      if($cmd eq "cleanup" && (my($rejSubTyp, $rejReas, $rejRmdr) = $logRmdr =~
 -	/\/cleanup\[\d+\]: .*?\b(reject|warning|hold|discard): (header|body) (.*)$/) == 3)
-+       /\/cleanup\[\d+\]: .*?\b((?:milter-)reject|warning|hold|discard): (header|body|END-OF-MESSAGE) (.*)$/) == 3)
++       /\/cleanup\[\d+\]: .*?\b((?:milter-)?reject|warning|hold|discard): (header|body|END-OF-MESSAGE) (.*)$/) == 3)
      {
  	$rejRmdr =~ s/( from \S+?)?; from=<.*$// unless($opts{'verbMsgDetail'});
  	$rejRmdr = string_trimmer($rejRmdr, 64, $opts{'verbMsgDetail'});