1 diff -Nur old/amavis/amavis.conf.in new/amavis/amavis.conf.in
2 --- old/amavis/amavis.conf.in 1970-01-01 00:00:00.000000000 +0000
3 +++ new/amavis/amavis.conf.in 2004-07-12 16:20:42.000000000 +0000
5 +################################################################################
6 +# Customisable variable from here on
7 +################################################################################
12 +# NAI AntiVirus (uvscan)
13 +$uvscan = "@uvscan@";
16 +$antivir = "@antivir@";
18 +# Sophos Anti Virus (sweep)
19 +$sophos = "@sophos@";
20 +$sophos_ide_path = "@sophos_ide@";
22 +# KasperskyLab AntiViral Toolkit Pro (AVP)
24 +$AVPDIR = dirname($avp);
26 +# KasperskyLab AVPDaemon / AvpDaemonClient
28 +# use AvpDaemon and AvpDaemonClient
29 +# Note: AvpDaemon must be started before amavisd!
30 +# AvpDaemon should be started at boot time as AvpDaemon -* /var/amavis
36 +# Trend Micro FileScanner
43 +$inocucmd = "@inocucmd@";
45 +# GeCAD RAV Antivirus 8
48 +# ESET Software NOD32
51 +# ESET Software NOD32 (Client/Server Version)
52 +$nod32cli = "@nod32cli@";
54 +# Command AntiVirus for Linux
57 +# VirusBuster (Daemon + Client)
58 +$vbengcl = "@vbengcl@";
60 +# Symantec CarrierScan via Symantec Command Line Scannner
61 +$cscmdline = "@cscmdline@";
62 +$scs_host = "@scs_host@"; # host/IP CarrierScan runs on
63 +$scs_port = "@scs_port@"; # port CarrierScan listens on
65 +# Sophie (Sophos SAVI)
66 +$sophie_sockname = "@sophie_sockname@";
68 +# Trophie (Trend API)
69 +$trophie_sockname = "@trophie_sockname@";
74 +# FRISK F-Prot Daemon
75 +$fprotd = "@fprotd@";
77 +# Panda Antivirus for Linux
80 +# CentralCommand Vexira
81 +$vexira = "@vexira@";
83 +# OpenAntiVirus ScannerDaemon
86 +# DrWeb Antivirus for Linux/FreeBSD/Solaris
89 +# MkS_Vir for Linux (beta)
92 +# MkS_Vir Daemon for Linux (beta)
95 +# Norman Virus Control
96 +$norman = "@norman@";
99 +$clamscan = "@clamscan@";
104 +$ikarus = "@ikarus@";
113 +# yes - syslog, no - file logging
114 +$do_syslog = "@do_syslog@";
116 +# Directory to put log entries (if not using syslog)
117 +$LOGDIR = "@logdir@";
118 +$LOGFILE = "amavis.log";
120 +# 0: default - startup/exit/failure messages
121 +# 1: args passed from client
122 +# 2: virus scanner output
124 +# 4: decompose parts
130 +# Notify admin/sender/recipient [yes/no]?
131 +$warnadmin = "@warnadmin@";
132 +$warnsender = "@warnsender@";
133 +$warnrecip = "@warnrecip@";
135 +# Notify off-site recipients?
136 +$warn_offsite = "no";
138 +# requeue if all virus scanners failed
139 +$requeue_on_scanner_errors = "yes";
142 +$viruses_that_fake_sender_re = qr(/(?i)nimda|hybris|klez|bugbear|yaha|braid|sobig|fizzer|palyh|peido|holar|tanatos|lentin|bridex|mimail|trojan\.dropper|dumaru|parite|spaces|dloader|galil|gibe|swen|netwatch|bics|sbrowse|sober|rox|val(hal)?la|be?agle/);
144 +# List of local domains
145 +# e.g. @local_domains = qw( dom.ain other.dom.ain );
146 +@local_domains = qw();
148 +# Location to put infected mail - leave empty for not quarantining
149 +$QUARANTINEDIR = "@virusdir@";
151 +# Add X-Virus-Scanned line to mail?
152 +$X_HEADER_TAG = "X-Virus-Scanned";
153 +# Leave empty to add no header
154 +$X_HEADER_LINE = "by AMaViS @VERSION@";
160 +$bunzip = "@bunzip2@";
164 +$uncompress = "@uncompress@";
169 +# MTA specific stuff
172 +$QMAILDIR = "@qmaildir@";
175 +$smtp_port = "@smtp_port@";
176 +$localhost_name = "localhost";
177 +$localhost_ip = "127.0.0.1";
180 +# Do we use amavis on a mail relay/gateway type setup?
181 +$enable_relay = "@enable_relay@";
184 +$sendmail_cf_orig = "@sendmail_cf_orig@";
186 +# What sendmail wrapper to use
187 +$sendmail_wrapper = "@sendmail_wrapper@";
188 +$sendmail_wrapper_args = "@sendmail_wrapper_args@";
193 +# The next three are resource limitations - exit with EX_TEMPFAIL if exceeded
194 +# Maximum overall recursion level for extraction/decoding
195 +# default: 20 - DO NOT SET THIS TO 0
196 +$MAXLEVELS = @maxlevel@;
198 +# Maximum nesting level for compressing archive formats
199 +# default: 3. If set to 0, feature is disabled
200 +$MAX_ARCHIVE_NESTING = @maxdepth@;
202 +# Maximum number of extracted files
203 +# default: 500. If set to 0, feature is disabled
204 +$MAXFILES = @maxfiles@;
206 +# Magic number to detect DoS attacks
207 +# default: 14. if set to 0, feature is disabled (change with care!)
210 +# Who reports are sent from
211 +$mailfrom = '@mailfrom@';
213 +# Where to send virus reports
214 +$mailto = '@mailto@';
216 +# Display AMaViS credits to users [yes/no]
217 +$credits = "@credits@";
219 +################################################################################
220 +# End of customisation section
221 +################################################################################
222 +1; # this must be the last line
223 \ Brak znaku nowej linii na koƱcu pliku
224 diff -Nur old/amavis/amavis.in new/amavis/amavis.in
225 --- old/amavis/amavis.in 2004-01-26 17:24:59.000000000 +0000
226 +++ new/amavis/amavis.in 2004-07-12 16:21:33.000000000 +0000
227 @@ -103,223 +103,8 @@
228 $pkg_home_url = "@PKG_HOME_URL@";
231 -################################################################################
232 -# Customisable variable from here on
233 -################################################################################
238 -# NAI AntiVirus (uvscan)
239 -$uvscan = "@uvscan@";
242 -$antivir = "@antivir@";
244 -# Sophos Anti Virus (sweep)
245 -$sophos = "@sophos@";
246 -$sophos_ide_path = "@sophos_ide@";
248 -# KasperskyLab AntiViral Toolkit Pro (AVP)
250 -$AVPDIR = dirname($avp);
252 -# KasperskyLab AVPDaemon / AvpDaemonClient
254 -# use AvpDaemon and AvpDaemonClient
255 -# Note: AvpDaemon must be started before amavisd!
256 -# AvpDaemon should be started at boot time as AvpDaemon -* /var/amavis
259 -# F-Secure Antivirus
262 -# Trend Micro FileScanner
269 -$inocucmd = "@inocucmd@";
271 -# GeCAD RAV Antivirus 8
274 -# ESET Software NOD32
277 -# ESET Software NOD32 (Client/Server Version)
278 -$nod32cli = "@nod32cli@";
280 -# Command AntiVirus for Linux
283 -# VirusBuster (Daemon + Client)
284 -$vbengcl = "@vbengcl@";
286 -# Symantec CarrierScan via Symantec Command Line Scannner
287 -$cscmdline = "@cscmdline@";
288 -$scs_host = "@scs_host@"; # host/IP CarrierScan runs on
289 -$scs_port = "@scs_port@"; # port CarrierScan listens on
291 -# Sophie (Sophos SAVI)
292 -$sophie_sockname = "@sophie_sockname@";
294 -# Trophie (Trend API)
295 -$trophie_sockname = "@trophie_sockname@";
300 -# FRISK F-Prot Daemon
301 -$fprotd = "@fprotd@";
303 -# Panda Antivirus for Linux
306 -# CentralCommand Vexira
307 -$vexira = "@vexira@";
309 -# OpenAntiVirus ScannerDaemon
312 -# DrWeb Antivirus for Linux/FreeBSD/Solaris
315 -# MkS_Vir for Linux (beta)
318 -# MkS_Vir Daemon for Linux (beta)
321 -# Norman Virus Control
322 -$norman = "@norman@";
325 -$clamscan = "@clamscan@";
330 -$ikarus = "@ikarus@";
339 -# yes - syslog, no - file logging
340 -$do_syslog = "@do_syslog@";
342 -# Directory to put log entries (if not using syslog)
343 -$LOGDIR = "@logdir@";
344 -$LOGFILE = "amavis.log";
346 -# 0: default - startup/exit/failure messages
347 -# 1: args passed from client
348 -# 2: virus scanner output
350 -# 4: decompose parts
356 -# Notify admin/sender/recipient [yes/no]?
357 -$warnadmin = "@warnadmin@";
358 -$warnsender = "@warnsender@";
359 -$warnrecip = "@warnrecip@";
361 -# Notify off-site recipients?
362 -$warn_offsite = "no";
364 -# requeue if all virus scanners failed
365 -$requeue_on_scanner_errors = "yes";
368 -$viruses_that_fake_sender_re = qr(/(?i)nimda|hybris|klez|bugbear|yaha|braid|sobig|fizzer|palyh|peido|holar|tanatos|lentin|bridex|mimail|trojan\.dropper|dumaru|parite|spaces|dloader|galil|gibe|swen|netwatch|bics|sbrowse|sober|rox|val(hal)?la|be?agle/);
370 -# List of local domains
371 -# e.g. @local_domains = qw( dom.ain other.dom.ain );
372 -@local_domains = qw();
374 -# Location to put infected mail - leave empty for not quarantining
375 -$QUARANTINEDIR = "@virusdir@";
377 -# Add X-Virus-Scanned line to mail?
378 -$X_HEADER_TAG = "X-Virus-Scanned";
379 -# Leave empty to add no header
380 -$X_HEADER_LINE = "by AMaViS @VERSION@";
386 -$bunzip = "@bunzip2@";
390 -$uncompress = "@uncompress@";
395 -# MTA specific stuff
398 -$QMAILDIR = "@qmaildir@";
401 -$smtp_port = "@smtp_port@";
402 -$localhost_name = "localhost";
403 -$localhost_ip = "127.0.0.1";
406 -# Do we use amavis on a mail relay/gateway type setup?
407 -$enable_relay = "@enable_relay@";
410 -$sendmail_cf_orig = "@sendmail_cf_orig@";
412 -# What sendmail wrapper to use
413 -$sendmail_wrapper = "@sendmail_wrapper@";
414 -$sendmail_wrapper_args = "@sendmail_wrapper_args@";
419 -# The next three are resource limitations - exit with EX_TEMPFAIL if exceeded
420 -# Maximum overall recursion level for extraction/decoding
421 -# default: 20 - DO NOT SET THIS TO 0
422 -$MAXLEVELS = @maxlevel@;
424 -# Maximum nesting level for compressing archive formats
425 -# default: 3. If set to 0, feature is disabled
426 -$MAX_ARCHIVE_NESTING = @maxdepth@;
428 -# Maximum number of extracted files
429 -# default: 500. If set to 0, feature is disabled
430 -$MAXFILES = @maxfiles@;
432 -# Magic number to detect DoS attacks
433 -# default: 14. if set to 0, feature is disabled (change with care!)
436 -# Who reports are sent from
437 -$mailfrom = '@mailfrom@';
439 -# Where to send virus reports
440 -$mailto = '@mailto@';
442 -# Display AMaViS credits to users [yes/no]
443 -$credits = "@credits@";
445 -################################################################################
446 -# End of customisation section
447 -################################################################################
449 +do '/etc/amavis.conf';
453 diff -Nur old/configure.in new/configure.in
454 --- old/configure.in 2004-01-22 12:25:38.000000000 +0000
455 +++ new/configure.in 2004-07-12 11:09:48.000000000 +0000
456 @@ -1056,6 +1056,7 @@
457 amavis/checkaccount \
463 test -f amavis/amavis && chmod 755 amavis/amavis