# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1257197548 -3600
# Node ID 8b7e29d77c375a40358e0a4b04619cfdb6072ff2
# Parent  b0dde56e4a08603541268f8fbb76f03a769e699e
Adapt to default behaviour of postfix logger on clamav-milter rejections.

diff -r b0dde56e4a08 -r 8b7e29d77c37 postfix-mailgraph/postfix-mailgraph.patch
--- a/postfix-mailgraph/postfix-mailgraph.patch	Mon Nov 02 22:31:34 2009 +0100
+++ b/postfix-mailgraph/postfix-mailgraph.patch	Mon Nov 02 22:32:28 2009 +0100
@@ -63,7 +63,21 @@
  			elsif($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: /) {
  				event($time, 'rejected');
  			}
-@@ -924,6 +939,7 @@
+@@ -628,7 +643,12 @@
+ 			}
+ 		}
+ 		elsif($prog eq 'cleanup') {
+-			if($text =~ /^[0-9A-Z]+: (?:reject|discard): /) {
++			if($text =~ /^(?:[0-9A-Z]+: )?milter-reject: /) {
++				if($text =~ /Intercepted/) {
++					event($time, 'virus');
++				}
++			}
++			elsif($text =~ /^[0-9A-Z]+: (?:reject|discard): /) {
+ 				event($time, 'rejected');
+ 			}
+ 		}
+@@ -924,6 +944,7 @@
   --rrd-name=NAME    use NAME.rrd and NAME_virus.rrd for the rrd files
   --rbl-is-spam      count rbl rejects as spam
   --virbl-is-virus   count virbl rejects as viruses
diff -r b0dde56e4a08 -r 8b7e29d77c37 postfix-mailgraph/postfix-mailgraph.spec
--- a/postfix-mailgraph/postfix-mailgraph.spec	Mon Nov 02 22:31:34 2009 +0100
+++ b/postfix-mailgraph/postfix-mailgraph.spec	Mon Nov 02 22:32:28 2009 +0100
@@ -32,7 +32,7 @@
 Group:        Mail
 License:      GPL
 Version:      1.14
-Release:      20090420
+Release:      20091101
 
 #   list of sources
 Source0:      http://mailgraph.schweikert.ch/pub/mailgraph-%{version}.tar.gz