-diff -ur amavisd-new-20030314.orig/amavisd amavisd-new-20030314/amavisd
---- amavisd-new-20030314.orig/amavisd Sat Mar 22 01:52:53 2003
-+++ amavisd-new-20030314/amavisd Tue May 6 14:49:15 2003
-@@ -240,7 +240,7 @@
- $unicode_aware = $]>=5.008 && length("\x{263a}")==1 && eval { require Encode };
-
- # serves only as a quick default for other configuration settings
--$MYHOME = '/var/amavis';
-+$MYHOME = '/var/spool/amavis/runtime';
- $mydomain = '!change-mydomain-variable!.example.com';# purposely broken default
-
- # Create debugging output - yes: log to stderr; no: log to syslog/file
-diff -ur amavisd-new-20030314.orig/amavisd.conf amavisd-new-20030314/amavisd.conf
---- amavisd-new-20030314.orig/amavisd.conf Fri Mar 21 18:19:23 2003
-+++ amavisd-new-20030314/amavisd.conf Tue May 6 14:53:29 2003
-@@ -41,17 +41,17 @@
+--- amavisd-new-2.4.5/amavisd.conf-sample.orig 2007-01-30 23:12:24.000000000 +0000
++++ amavisd-new-2.4.5/amavisd.conf-sample 2007-03-04 00:19:16.457106000 +0000
+@@ -63,7 +63,7 @@
# $MYHOME serves as a quick default for some other configuration settings.
# More refined control is available with each individual setting further down.
- # $MYHOME is never used directly by the program. No trailing slash!
--#$MYHOME = '/var/lib/amavis'; # (default is '/var/amavis')
-+#$MYHOME = '/var/spool/amavis/runtime'; # (default is '/var/amavis')
+ # $MYHOME is not used directly by the program. No trailing slash!
+-#$MYHOME = '/var/lib/amavis'; # (default is '/var/amavis'), -H
++$MYHOME = '/var/spool/amavis'; # (default is '/var/amavis'), -H
# $mydomain serves as a quick default for some other configuration settings.
# More refined control is available with each individual setting further down.
- # $mydomain is never used directly by the program.
--$mydomain = 'example.com'; # (no useful default)
-+$mydomain = 'localhost'; # (no useful default)
+@@ -74,16 +74,16 @@
# Set the user and group to which the daemon will change if started as root
- # (otherwise just keep the UID unchanged, and these settings have no effect):
--$daemon_user = 'vscan'; # (no default; customary: vscan or amavis)
--$daemon_group = 'sweep'; # (no default; customary: vscan or amavis)
-+$daemon_user = 'amavis'; # (no default; customary: vscan or amavis)
-+$daemon_group = 'amavis'; # (no default; customary: vscan or amavis)
+ # (otherwise just keeps the UID unchanged, and these settings have no effect):
+-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
+-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
++$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u
++$daemon_group = 'amavis'; # (no default; customary: vscan or amavis), -g
# Runtime working directory (cwd), and a place where
# temporary directories for unpacking mail are created.
-@@ -164,7 +164,7 @@
- # directly, or read from a file, one domain per line; comments and empty lines
- # are ignored, a dot before a domain name implies its subdomains:
+ # (no trailing slash, may be a scratch file system)
+-$TEMPBASE = $MYHOME; # (must be set if other config vars use is), -T
++$TEMPBASE = "$MYHOME/runtime"; # (must be set if other config vars use is), -T
+ #$TEMPBASE = "$MYHOME/tmp"; # prefer to keep home dir /var/amavis clean?
+
+-#$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D
++$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D
+
+ # $helpers_home sets environment variable HOME, and is passed as option
+ # 'home_dir_for_helpers' to Mail::SpamAssassin::new. It should be a directory
+@@ -93,8 +93,8 @@
+ # Run the daemon in the specified chroot jail if nonempty:
+ #$daemon_chroot_dir = $MYHOME; # (default is undef, meaning: do not chroot), -R
+
+-#$pid_file = "$MYHOME/amavisd.pid"; # (default is "$MYHOME/amavisd.pid"), -P
+-#$lock_file = "$MYHOME/amavisd.lock"; # (default is "$MYHOME/amavisd.lock"), -L
++$pid_file = "/var/run/amavisd/amavisd.pid"; # (default is "$MYHOME/amavisd.pid"), -P
++$lock_file = "/var/run/amavisd/amavisd.lock"; # (default is "$MYHOME/amavisd.lock"), -L
+
+ # set environment variables if you want (no defaults):
+ $ENV{TMPDIR} = $TEMPBASE; # wise to set TMPDIR, but not obligatory
+@@ -112,6 +112,8 @@
+ #$forward_method = 'smtp:[127.0.0.1]:10025'; # where to forward checked mail
+ #$notify_method = $forward_method; # where to submit notifications
+
++#@auth_mech_avail = ('PLAIN','LOGIN'); # empty list disables incoming AUTH
++
+ #$os_fingerprint_method = 'p0f:127.0.0.1:2345'; # query p0f-analyzer.pl
+
+ # To make it possible for several hosts to share one content checking daemon,
+@@ -171,7 +173,7 @@
+ # and see further down what these two lookup lists really mean.
#
--#read_hash(\%local_domains, '/var/amavis/local_domains');
-+#read_hash(\%local_domains, '/var/spool/amavis/local_domains');
-
- #or alternatively(B), using a list of regular expressions:
- # $local_domains_re = new_RE( qr'[@.]example\.com$'i );
-@@ -297,12 +297,12 @@
- # or later; second argument is ignored otherwise. See PerlIO::encoding,
- # Encode::PerlIO and perluniintro man pages.
+ # @bypass_virus_checks_maps = (1); # controls running of anti-virus code
+-# @bypass_spam_checks_maps = (1); # controls running of anti-spam code
++@bypass_spam_checks_maps = (1); # controls running of anti-spam code
+ # $bypass_decode_parts = 1; # controls running of decoders&dearchivers
#
--# $notify_sender_templ = read_text('/var/amavis/notify_sender.txt');
--# $notify_virus_sender_templ= read_text('/var/amavis/notify_virus_sender.txt');
--# $notify_virus_admin_templ = read_text('/var/amavis/notify_virus_admin.txt');
--# $notify_virus_recips_templ= read_text('/var/amavis/notify_virus_recips.txt');
--# $notify_spam_sender_templ = read_text('/var/amavis/notify_spam_sender.txt');
--# $notify_spam_admin_templ = read_text('/var/amavis/notify_spam_admin.txt');
-+# $notify_sender_templ = read_text('/var/spool/amavis/notify_sender.txt');
-+# $notify_virus_sender_templ= read_text('/var/spool/amavis/notify_virus_sender.txt');
-+# $notify_virus_admin_templ = read_text('/var/spool/amavis/notify_virus_admin.txt');
-+# $notify_virus_recips_templ= read_text('/var/spool/amavis/notify_virus_recips.txt');
-+# $notify_spam_sender_templ = read_text('/var/spool/amavis/notify_spam_sender.txt');
-+# $notify_spam_admin_templ = read_text('/var/spool/amavis/notify_spam_admin.txt');
-
-
- # Here is an overall picture (sequence of events) of how pieces fit together
-@@ -468,7 +468,7 @@
+ # Any setting can be changed with a new assignment, so make sure
+@@ -217,8 +219,8 @@
+ # AMAVIS-CLIENT PROTOCOL INPUT SETTINGS (e.g. with amavisd-release, or
+ # sendmail milter through helper clients like amavis-milter.c and amavis.c)
+ # option(s) -p overrides $inet_socket_port and $unix_socketname
+-$unix_socketname = "$MYHOME/amavisd.sock"; # amavis helper protocol socket
+-#$unix_socketname = undef; # disable listening on a unix socket
++#$unix_socketname = "/var/run/amavisd/amavisd.sock"; # amavis helper protocol socket
++$unix_socketname = undef; # disable listening on a unix socket
+ # (default is undef, i.e. disabled)
+ # (usual setting is $MYHOME/amavisd.sock)
+
+@@ -301,7 +303,7 @@
+ # choose from: emerg, alert, crit, err, warning, notice, info, debug
+
+ # Log file (if not using syslog)
+-$LOGFILE = "$MYHOME/amavis.log"; # (defaults to empty, no log)
++#$LOGFILE = "$MYHOME/amavis.log"; # (defaults to empty, no log)
+
+ #NOTE: levels are not strictly observed and are somewhat arbitrary
+ # 0: startup/exit/failure messages, viruses detected
+@@ -310,7 +312,7 @@
+ # 3: server, client
+ # 4: decompose parts
+ # 5: more debug details
+-$log_level = 2; # (defaults to 0), -d
++#$log_level = 2; # (defaults to 0), -d
+
+ # Customizable template for the most interesting log file entry (e.g. with
+ # $log_level=0) (take care to properly quote Perl special characters like '\')
+@@ -689,7 +691,8 @@
# or a directory (no trailing slash)
# (the default value is undef, meaning no quarantine)
#
--$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
+
projects / packages / amavisd-new.git / blobdiff