diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveBlockMax mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveBlockMax
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveBlockMax	2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveBlockMax	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-no
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxCompressionRatio mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxCompressionRatio
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxCompressionRatio	2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxCompressionRatio	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-300
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxFiles mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxFiles
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxFiles	2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxFiles	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-1500
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxFileSize mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxFileSize
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxFileSize	2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxFileSize	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-15M
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxRecursion mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxRecursion
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxRecursion	2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxRecursion	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-8
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxFiles mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxFiles
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxFiles	1969-12-31 17:00:00.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxFiles	2005-05-05 19:53:26.000000000 -0600
@@ -0,0 +1 @@
+1500
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxFileSize mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxFileSize
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxFileSize	1969-12-31 17:00:00.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxFileSize	2005-05-05 19:53:26.000000000 -0600
@@ -0,0 +1 @@
+15M
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxRecursion mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxRecursion
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxRecursion	1969-12-31 17:00:00.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxRecursion	2005-05-05 19:53:26.000000000 -0600
@@ -0,0 +1 @@
+8
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/migrate/40clamav93 mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/migrate/40clamav93
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/migrate/40clamav93	1969-12-31 17:00:00.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/migrate/40clamav93	2008-04-18 10:56:34.000000000 -0600
@@ -0,0 +1,15 @@
+{
+    my $smtpd = $DB->get('clamav') or return;
+
+    if (my $maxFileSize = $DB->get_prop_and_delete('clamav', 'ArchiveMaxFileSize')) {
+        $smtpd->merge_props('MaxFileSize', $maxFileSize);
+    }
+
+    if (my $maxRecursion = $DB->get_prop_and_delete('clamav', 'ArchiveMaxRecursion')) {
+        $smtpd->merge_props('MaxRecursion', $maxRecursion);
+    }
+
+    if (my $maxFiles = $DB->get_prop_and_delete('clamav', 'ArchiveMaxFiles')) {
+        $smtpd->merge_props('MaxFiles', $maxFiles);
+    }
+}
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax	2008-04-18 11:02:08.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-ArchiveBlockMax { $clamav{ArchiveBlockMax} || 'no' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxCompressionRatio mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxCompressionRatio
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxCompressionRatio	2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxCompressionRatio	1969-12-31 17:00:00.000000000 -0700
@@ -1,6 +0,0 @@
-{
-# If a file in an archive is compressed more than ArchiveMaxCompressionRatio
-# times it will be marked as a virus (Oversized.ArchiveType, e.g. Oversized.Zip)
-# Value of 0 disables the limit.
-   "ArchiveMaxCompressionRatio $clamav{ArchiveMaxCompressionRatio}";
-}
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxFiles mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxFiles
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxFiles	2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxFiles	1969-12-31 17:00:00.000000000 -0700
@@ -1,5 +0,0 @@
-{
-# Number of files to be scanned within an archive.
-# Value of 0 disables the limit.
-    "ArchiveMaxFiles $clamav{ArchiveMaxFiles}";
-}
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxFileSize mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxFileSize
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxFileSize	2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxFileSize	1969-12-31 17:00:00.000000000 -0700
@@ -1,5 +0,0 @@
-{
-# Files in archives larger than this limit won't be scanned.
-# Value of 0 disables the limit.
-    "ArchiveMaxFileSize $clamav{ArchiveMaxFileSize}";
-}
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxRecursion mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxRecursion
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxRecursion	2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxRecursion	1969-12-31 17:00:00.000000000 -0700
@@ -1,7 +0,0 @@
-{
-# Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR
-# file, all files within it will also be scanned. This options specifies how
-# deep the process should be continued.
-# Value of 0 disables the limit.
-    "ArchiveMaxRecursion $clamav{ArchiveMaxRecursion}";
-}
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxFiles mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxFiles
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxFiles	1969-12-31 17:00:00.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxFiles	2008-04-18 10:59:33.000000000 -0600
@@ -0,0 +1,5 @@
+{
+# Number of files to be scanned within an archive.
+# Value of 0 disables the limit.
+    "MaxFiles $clamav{MaxFiles}";
+}
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxFileSize mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxFileSize
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxFileSize	1969-12-31 17:00:00.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxFileSize	2008-04-18 10:59:29.000000000 -0600
@@ -0,0 +1,5 @@
+{
+# Files in archives larger than this limit won't be scanned.
+# Value of 0 disables the limit.
+    "MaxFileSize $clamav{MaxFileSize}";
+}
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxRecursion mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxRecursion
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxRecursion	1969-12-31 17:00:00.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxRecursion	2008-04-18 10:59:26.000000000 -0600
@@ -0,0 +1,7 @@
+{
+# Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR
+# file, all files within it will also be scanned. This options specifies how
+# deep the process should be continued.
+# Value of 0 disables the limit.
+    "MaxRecursion $clamav{MaxRecursion}";
+}
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/sbin/e-smith/smeserver-clamscan mezzanine_patched_smeserver-clamav-1.2.0/root/sbin/e-smith/smeserver-clamscan
--- smeserver-clamav-1.2.0/root/sbin/e-smith/smeserver-clamscan	2008-04-18 11:02:07.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/sbin/e-smith/smeserver-clamscan	2008-04-18 11:01:20.000000000 -0600
@@ -29,8 +29,6 @@
 
 my $MailReport = $db->get_prop("clamav", "FilesystemScanReportTo") || 'admin';
 
-my $ArchiveRatio = $db->get_prop("clamav", "ArchiveMaxCompressionRatio") || 0;
-
 my $clamscan_opts = " --recursive --infected --stdout" .
 		    " --log /var/log/clamd/clamscan.log";
 
@@ -44,8 +42,6 @@
 
 $clamscan_opts .= " --exclude=$_" for (@exclude);
 
-$clamscan_opts .= " --max-ratio=$ArchiveRatio";
-
 $clamscan_opts .= " --no-html"
       if ($db->get_prop("clamav", "ScanHTML") || "yes") eq "no";