summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Valroff <julien@kirya.net>2011-01-19 18:29:04 +0100
committerJulien Valroff <julien@kirya.net>2011-01-19 18:29:04 +0100
commit982e6b293a7b08667530df850726d0b3b1995b43 (patch)
treeb61af16ede26982f8aab9b4205d6bc130cdc9b50
parent5f7aa065a939f9488e0a75a05111fa7dac061ae1 (diff)
Add patch to fix behaviour with clamav-milter
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/102_clamav-milter.diff16
-rw-r--r--debian/patches/series1
3 files changed, 20 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index deb7804..e0cfffb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ mailgraph (1.14-7) unstable; urgency=low
* Make use of perl:Depends substvar
* Update copyright information
+ * Add patch from Adrian von Bidder <avbidder@fortytwo.ch> to fix virus
+ detection with clamav-milter (Closes: #610521)
- -- Julien Valroff <julien@debian.org> Sat, 08 Jan 2011 13:25:53 +0100
+ -- Julien Valroff <julien@debian.org> Wed, 19 Jan 2011 18:28:20 +0100
mailgraph (1.14-6) unstable; urgency=low
diff --git a/debian/patches/102_clamav-milter.diff b/debian/patches/102_clamav-milter.diff
new file mode 100644
index 0000000..c9eac04
--- /dev/null
+++ b/debian/patches/102_clamav-milter.diff
@@ -0,0 +1,16 @@
+Description: Fix for clamav-milter >= 0.96
+Author: Adrian von Bidder <avbidder@fortytwo.ch>
+Forwarded: no
+
+--- a/mailgraph.pl
++++ b/mailgraph.pl
+@@ -820,6 +820,9 @@
+ if($text =~ /Intercepted/) {
+ event($time, 'virus');
+ }
++ elsif($text =~ /Message.*infected by/) {
++ event($time, 'virus');
++ }
+ }
+ # uncommment for clamassassin:
+ #elsif($prog eq 'clamd') {
diff --git a/debian/patches/series b/debian/patches/series
index 52266f0..ecd554a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
001_path-to-rrd.diff
002_script-name.diff
101_dspam-virus-notifications.diff
+102_clamav-milter.diff