1 |
slords |
1.1 |
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 |
2 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveBlockMax 2005-05-05 19:53:26.000000000 -0600 |
3 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveBlockMax 1969-12-31 17:00:00.000000000 -0700 |
4 |
|
|
@@ -1 +0,0 @@ |
5 |
|
|
-no |
6 |
|
|
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 |
7 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxCompressionRatio 2005-05-05 19:53:26.000000000 -0600 |
8 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxCompressionRatio 1969-12-31 17:00:00.000000000 -0700 |
9 |
|
|
@@ -1 +0,0 @@ |
10 |
|
|
-300 |
11 |
|
|
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 |
12 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxFiles 2005-05-05 19:53:26.000000000 -0600 |
13 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxFiles 1969-12-31 17:00:00.000000000 -0700 |
14 |
|
|
@@ -1 +0,0 @@ |
15 |
|
|
-1500 |
16 |
|
|
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 |
17 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxFileSize 2005-05-05 19:53:26.000000000 -0600 |
18 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxFileSize 1969-12-31 17:00:00.000000000 -0700 |
19 |
|
|
@@ -1 +0,0 @@ |
20 |
|
|
-15M |
21 |
|
|
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 |
22 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxRecursion 2005-05-05 19:53:26.000000000 -0600 |
23 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/ArchiveMaxRecursion 1969-12-31 17:00:00.000000000 -0700 |
24 |
|
|
@@ -1 +0,0 @@ |
25 |
|
|
-8 |
26 |
|
|
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 |
27 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxFiles 1969-12-31 17:00:00.000000000 -0700 |
28 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxFiles 2005-05-05 19:53:26.000000000 -0600 |
29 |
|
|
@@ -0,0 +1 @@ |
30 |
|
|
+1500 |
31 |
|
|
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 |
32 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxFileSize 1969-12-31 17:00:00.000000000 -0700 |
33 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxFileSize 2005-05-05 19:53:26.000000000 -0600 |
34 |
|
|
@@ -0,0 +1 @@ |
35 |
|
|
+15M |
36 |
|
|
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 |
37 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxRecursion 1969-12-31 17:00:00.000000000 -0700 |
38 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/defaults/clamav/MaxRecursion 2005-05-05 19:53:26.000000000 -0600 |
39 |
|
|
@@ -0,0 +1 @@ |
40 |
|
|
+8 |
41 |
|
|
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 |
42 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/migrate/40clamav93 1969-12-31 17:00:00.000000000 -0700 |
43 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/db/configuration/migrate/40clamav93 2008-04-18 10:56:34.000000000 -0600 |
44 |
|
|
@@ -0,0 +1,15 @@ |
45 |
|
|
+{ |
46 |
|
|
+ my $smtpd = $DB->get('clamav') or return; |
47 |
|
|
+ |
48 |
|
|
+ if (my $maxFileSize = $DB->get_prop_and_delete('clamav', 'ArchiveMaxFileSize')) { |
49 |
|
|
+ $smtpd->merge_props('MaxFileSize', $maxFileSize); |
50 |
|
|
+ } |
51 |
|
|
+ |
52 |
|
|
+ if (my $maxRecursion = $DB->get_prop_and_delete('clamav', 'ArchiveMaxRecursion')) { |
53 |
|
|
+ $smtpd->merge_props('MaxRecursion', $maxRecursion); |
54 |
|
|
+ } |
55 |
|
|
+ |
56 |
|
|
+ if (my $maxFiles = $DB->get_prop_and_delete('clamav', 'ArchiveMaxFiles')) { |
57 |
|
|
+ $smtpd->merge_props('MaxFiles', $maxFiles); |
58 |
|
|
+ } |
59 |
|
|
+} |
60 |
|
|
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 |
61 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax 2008-04-18 11:02:08.000000000 -0600 |
62 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax 1969-12-31 17:00:00.000000000 -0700 |
63 |
|
|
@@ -1 +0,0 @@ |
64 |
|
|
-ArchiveBlockMax { $clamav{ArchiveBlockMax} || 'no' } |
65 |
|
|
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 |
66 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxCompressionRatio 2005-05-05 19:53:26.000000000 -0600 |
67 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxCompressionRatio 1969-12-31 17:00:00.000000000 -0700 |
68 |
|
|
@@ -1,6 +0,0 @@ |
69 |
|
|
-{ |
70 |
|
|
-# If a file in an archive is compressed more than ArchiveMaxCompressionRatio |
71 |
|
|
-# times it will be marked as a virus (Oversized.ArchiveType, e.g. Oversized.Zip) |
72 |
|
|
-# Value of 0 disables the limit. |
73 |
|
|
- "ArchiveMaxCompressionRatio $clamav{ArchiveMaxCompressionRatio}"; |
74 |
|
|
-} |
75 |
|
|
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 |
76 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxFiles 2005-05-05 19:53:26.000000000 -0600 |
77 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxFiles 1969-12-31 17:00:00.000000000 -0700 |
78 |
|
|
@@ -1,5 +0,0 @@ |
79 |
|
|
-{ |
80 |
|
|
-# Number of files to be scanned within an archive. |
81 |
|
|
-# Value of 0 disables the limit. |
82 |
|
|
- "ArchiveMaxFiles $clamav{ArchiveMaxFiles}"; |
83 |
|
|
-} |
84 |
|
|
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 |
85 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxFileSize 2005-05-05 19:53:26.000000000 -0600 |
86 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxFileSize 1969-12-31 17:00:00.000000000 -0700 |
87 |
|
|
@@ -1,5 +0,0 @@ |
88 |
|
|
-{ |
89 |
|
|
-# Files in archives larger than this limit won't be scanned. |
90 |
|
|
-# Value of 0 disables the limit. |
91 |
|
|
- "ArchiveMaxFileSize $clamav{ArchiveMaxFileSize}"; |
92 |
|
|
-} |
93 |
|
|
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 |
94 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxRecursion 2005-05-05 19:53:26.000000000 -0600 |
95 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveMaxRecursion 1969-12-31 17:00:00.000000000 -0700 |
96 |
|
|
@@ -1,7 +0,0 @@ |
97 |
|
|
-{ |
98 |
|
|
-# Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR |
99 |
|
|
-# file, all files within it will also be scanned. This options specifies how |
100 |
|
|
-# deep the process should be continued. |
101 |
|
|
-# Value of 0 disables the limit. |
102 |
|
|
- "ArchiveMaxRecursion $clamav{ArchiveMaxRecursion}"; |
103 |
|
|
-} |
104 |
|
|
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 |
105 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxFiles 1969-12-31 17:00:00.000000000 -0700 |
106 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxFiles 2008-04-18 10:59:33.000000000 -0600 |
107 |
|
|
@@ -0,0 +1,5 @@ |
108 |
|
|
+{ |
109 |
|
|
+# Number of files to be scanned within an archive. |
110 |
|
|
+# Value of 0 disables the limit. |
111 |
|
|
+ "MaxFiles $clamav{MaxFiles}"; |
112 |
|
|
+} |
113 |
|
|
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 |
114 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxFileSize 1969-12-31 17:00:00.000000000 -0700 |
115 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxFileSize 2008-04-18 10:59:29.000000000 -0600 |
116 |
|
|
@@ -0,0 +1,5 @@ |
117 |
|
|
+{ |
118 |
|
|
+# Files in archives larger than this limit won't be scanned. |
119 |
|
|
+# Value of 0 disables the limit. |
120 |
|
|
+ "MaxFileSize $clamav{MaxFileSize}"; |
121 |
|
|
+} |
122 |
|
|
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 |
123 |
|
|
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxRecursion 1969-12-31 17:00:00.000000000 -0700 |
124 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/MaxRecursion 2008-04-18 10:59:26.000000000 -0600 |
125 |
|
|
@@ -0,0 +1,7 @@ |
126 |
|
|
+{ |
127 |
|
|
+# Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR |
128 |
|
|
+# file, all files within it will also be scanned. This options specifies how |
129 |
|
|
+# deep the process should be continued. |
130 |
|
|
+# Value of 0 disables the limit. |
131 |
|
|
+ "MaxRecursion $clamav{MaxRecursion}"; |
132 |
|
|
+} |
133 |
|
|
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 |
134 |
|
|
--- smeserver-clamav-1.2.0/root/sbin/e-smith/smeserver-clamscan 2008-04-18 11:02:07.000000000 -0600 |
135 |
|
|
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/sbin/e-smith/smeserver-clamscan 2008-04-18 11:01:20.000000000 -0600 |
136 |
|
|
@@ -29,8 +29,6 @@ |
137 |
|
|
|
138 |
|
|
my $MailReport = $db->get_prop("clamav", "FilesystemScanReportTo") || 'admin'; |
139 |
|
|
|
140 |
|
|
-my $ArchiveRatio = $db->get_prop("clamav", "ArchiveMaxCompressionRatio") || 0; |
141 |
|
|
- |
142 |
|
|
my $clamscan_opts = " --recursive --infected --stdout" . |
143 |
|
|
" --log /var/log/clamd/clamscan.log"; |
144 |
|
|
|
145 |
|
|
@@ -44,8 +42,6 @@ |
146 |
|
|
|
147 |
|
|
$clamscan_opts .= " --exclude=$_" for (@exclude); |
148 |
|
|
|
149 |
|
|
-$clamscan_opts .= " --max-ratio=$ArchiveRatio"; |
150 |
|
|
- |
151 |
|
|
$clamscan_opts .= " --no-html" |
152 |
|
|
if ($db->get_prop("clamav", "ScanHTML") || "yes") eq "no"; |
153 |
|
|
|