--$QUARANTINEDIR = '/var/virusmails';
-+$QUARANTINEDIR = '/var/spool/amavis/virusmails';
-
- #$virus_quarantine_method = "local:virus-%i-%n"; # default
- #$spam_quarantine_method = "local:spam-%b-%i-%n"; # default
-@@ -835,7 +835,7 @@
- # a hash lookup table can be read from a file,
- # one address per line, comments and empty lines are permitted:
- #
--# read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
-+# read_hash(\%whitelist_sender, '/var/spool/amavis/whitelist_sender');
-
- # ... or set directly:
- map { $whitelist_sender{lc($_)}=1 } (qw(
-Only in amavisd-new-20030314: amavisd.conf.orig
-Only in amavisd-new-20030314: amavisd.conf.rej
-Only in amavisd-new-20030314: amavisd.conf~
+-$QUARANTINEDIR = '/var/virusmails'; # -Q
++#$QUARANTINEDIR = '/var/virusmails'; # -Q
++$QUARANTINEDIR = '/var/spool/amavis/virusmails'; # -Q
+
+ #$quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine
+
+@@ -1900,15 +1903,15 @@
+ # ['Sophos SAVI', \&sophos_savi ],
+
+ # ### http://www.clamav.net/
+-# ['ClamAV-clamd',
+-# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
+-# qr/\bOK$/, qr/\bFOUND$/,
+-# qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
+-# # NOTE: run clamd under the same user as amavisd, or run it under its own
+-# # uid such as clamav, add user clamav to the amavis group, and then add
+-# # AllowSupplementaryGroups to clamd.conf;
+-# # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
+-# # this entry; when running chrooted one may prefer socket "$MYHOME/clamd".
++['ClamAV-clamd',
++ \&ask_daemon, ["CONTSCAN {}\n", "/var/lib/clamav/clamd.socket"],
++ qr/\bOK$/, qr/\bFOUND$/,
++ qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
++# NOTE: run clamd under the same user as amavisd, or run it under its own
++# uid such as clamav, add user clamav to the amavis group, and then add
++# AllowSupplementaryGroups to clamd.conf;
++# NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
++# this entry; when running chrooted one may prefer socket "$MYHOME/clamd".
+
+ # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred)
+ # ['Mail::ClamAV', \&ask_clamav, "*", [0], [1], qr/^INFECTED: (.+)/],
+@@ -2070,10 +2073,11 @@
+ # NOTE: requires suid wrapper around inocmd32; consider flag: -mod reviewer
+ # see http://marc.theaimsgroup.com/?l=amavis-user&m=109229779912783
+
+- ### http://mks.com.pl/english.html
+- ['MkS_Vir for Linux (beta)', ['mks32','mks'],
+- '-s {}/*', [0], [1,2],
+- qr/--[ \t]*(.+)/m ],
++# Moved to secondary scanner
++# ### http://mks.com.pl/english.html
++# ['MkS_Vir for Linux (beta)', ['mks32','mks'],
++# '-s {}/*', [0], [1,2],
++# qr/--[ \t]*(.+)/m ],
+
+ ### http://mks.com.pl/english.html
+ ['MkS_Vir daemon', 'mksscan',
+@@ -2298,6 +2302,10 @@
+ # ],
+ # # other options to consider: -idedir=/usr/local/sav
+
++ ['MkS_Vir for Linux (beta)', ['mks32','mks'],
++ '-s {}/*', [0], [1,2],
++ qr/--[ \t]*(.+)/m ],
++
+ # Always succeeds and considers mail clean.
+ # Potentially useful when all other scanners fail and it is desirable
+