Add patch to count milter rejects provided by Matus Uhlar.

diff --git a/debian/changelog b/debian/changelog
index 1a920df8d2d8b9874b772296df17e0eded66b2a9..e2a5be3c6d80afd07eafc678469b3d43baa4709c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pflogsumm (1.1.5-5) unstable; urgency=medium
+
+  * Add patch to count milter rejects provided by Matus Uhlar.
+
+ --
+

 pflogsumm (1.1.5-4) unstable; urgency=medium
 
   * Change Standards-Version to 4.2.1.
 pflogsumm (1.1.5-4) unstable; urgency=medium
 
   * Change Standards-Version to 4.2.1.

diff --git a/debian/patches/milter-rejects b/debian/patches/milter-rejects
new file mode 100644 (file)
index 0000000..2e15cca
--- /dev/null
+++ b/debian/patches/milter-rejects
@@ -0,0 +1,18 @@
+Index: pflogsumm/pflogsumm.pl
+===================================================================
+--- pflogsumm.orig/pflogsumm.pl
++++ pflogsumm/pflogsumm.pl
+@@ -666,11 +666,11 @@ while(<>) {
+ 
+     # 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)
+     {
+       $rejRmdr =~ s/( from \S+?)?; from=<.*$// unless($opts{'verbMsgDetail'});
+       $rejRmdr = string_trimmer($rejRmdr, 64, $opts{'verbMsgDetail'});
+-      if($rejSubTyp eq "reject") {
++       if($rejSubTyp eq "reject" or $rejSubTyp eq "milter-reject") {
+           ++$rejects{$cmd}{$rejReas}{$rejRmdr} unless($opts{'rejectDetail'} == 0);
+           ++$msgsRjctd;
+       } elsif($rejSubTyp eq "warning") {

diff --git a/debian/patches/series b/debian/patches/series
index 5bfce8fa045f192d8084efe1abe77068e1cd71d0..0aeb4ab120cd26248c803f710bba50281491ff30 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 kill-dot-pl
 postscreen-rejects
 kill-dot-pl
 postscreen-rejects

+milter-rejects