X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fpflogsumm.git;a=blobdiff_plain;f=debian%2Fpatches%2Fmilter-rejects;fp=debian%2Fpatches%2Fmilter-rejects;h=2e15cca5653214ca445c0523b2f2caf695fbd15f;hp=0000000000000000000000000000000000000000;hb=4bdc1b42ae2e9cf4e0c78a33ae239a7171f954a6;hpb=0c2440c3aa761b0198d8b31e0d9f0f8244803d6d

diff --git a/debian/patches/milter-rejects b/debian/patches/milter-rejects
new file mode 100644
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") {