From: Ivan Rako <Ivan.Rako@CARNet.hr>
Date: Thu, 21 Feb 2008 22:45:54 +0000 (+0000)
Subject: r26:
X-Git-Tag: v2.6.4-1~25
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=9639f8270b6d25fba28032e8ffdc3b4f79340005;p=amavisd-cn.git

r26:
---

diff --git a/changelog.CARNet b/changelog.CARNet
index 76f4d73..b36e009 100644
--- a/changelog.CARNet
+++ b/changelog.CARNet
@@ -1,6 +1,7 @@
 amavisd-cn (3:2.4.2-3) stable; urgency=low
 
   * Maknut konflikt sa sweep-cn
+  * Dodane definicije za Sweep i SAVI
 
  -- Ivan Rako <Ivan.Rako@CARNet.hr>  Thu, 21 Feb 2008 23:34:59 +0100
 
diff --git a/templates/40-carnet b/templates/40-carnet
index f93356e..d4fe258 100644
--- a/templates/40-carnet
+++ b/templates/40-carnet
@@ -70,7 +70,7 @@ $first_infected_stops_scan = 1;        # default is false, all scanners are call
 push @av_scanners, (
 
 # ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/
-# ['Sophos SAVI', \&sophos_savi ],
+ ['Sophos SAVI', \&sophos_savi ],
 
 );
 
@@ -78,8 +78,20 @@ push @av_scanners, (
 #
 push @av_scanners_backup, (
 
+# Commented out because the name 'sweep' clashes with Debian and FreeBSD
+# package/port of an audio editor. Make sure the correct 'sweep' is found
+# in the path when enabling.
+#
+# ### http://www.sophos.com/   - backs up Sophie or SAVI-Perl
+ ['Sophos Anti Virus (sweep)', 'sweep',
+   '-nb -f -all -rec -ss -sc -archive -cab -tnef --no-reset-atime {}',
+   [0,2], qr/Virus .*? found/,
+   qr/^>>> Virus(?: fragment)? '?(.*?)'? found/,
+ ],
+ # other options to consider: -mime -oe -idedir=/usr/local/sav
+
 # always succeeds (uncomment to consider mail clean if all other scanners fail)
-['always-clean', sub {0}],
+ ['always-clean', sub {0}],
 
 );