X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=amavisd-new-config.patch;h=b62567d98df1ea41ba4e0d7dea9f0e7babf3f848;hb=e0c5f1c00f141a0a9d1ef2511a69d4fd72878890;hp=06efe31f8714a055a75749034bbafecec3441c7e;hpb=44d144bbda2bfb9ec8ee3ef8fb23028f87559247;p=packages%2Famavisd-new.git diff --git a/amavisd-new-config.patch b/amavisd-new-config.patch index 06efe31..b62567d 100644 --- a/amavisd-new-config.patch +++ b/amavisd-new-config.patch @@ -1,18 +1,17 @@ -diff -uNr amavisd-new-20030616/amavisd.conf amavisd-new-20030616~/amavisd.conf ---- amavisd-new-20030616/amavisd.conf Tue Mar 9 03:21:38 2004 -+++ amavisd-new-20030616~/amavisd.conf Sat Mar 13 17:13:34 2004 -@@ -51,19 +51,24 @@ +--- ./amavisd.conf-sample.org 2006-05-23 12:01:01.000000000 +0200 ++++ ./amavisd.conf-sample 2006-05-23 11:59:26.000000000 +0200 +@@ -63,27 +63,31 @@ # $MYHOME serves as a quick default for some other configuration settings. # More refined control is available with each individual setting further down. # $MYHOME is not 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 = '/var/spool/amavis'; # (default is '/var/amavis') # $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 = 'example.com'; # (no useful default) ++#$mydomain = 'example.com'; # (no useful default) + +# This seems to be prefixed to host's domain name. +# You may get mail rejects of virus information as send from not @@ -23,129 +22,135 @@ diff -uNr amavisd-new-20030616/amavisd.conf amavisd-new-20030616~/amavisd.conf # Set the user and group to which the daemon will change if started as root # (otherwise just keeps 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) +-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis) +-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis or sweep) ++$daemon_user = 'amavis'; # (no default; customary: vscan or amavis) ++$daemon_group = 'amavis'; # (no default; customary: vscan or amavis or sweep) # Runtime working directory (cwd), and a place where # temporary directories for unpacking mail are created. -@@ -143,7 +148,8 @@ + # (no trailing slash, may be a scratch file system) +-$TEMPBASE = $MYHOME; # (must be set if other config vars use is) +-#$TEMPBASE = "$MYHOME/tmp"; # prefer to keep home dir /var/amavis clean? ++$TEMPBASE = "$MYHOME/runtime"; # (must be set if other config vars use is) + +-#$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db" ++$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db" + + # $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 +97,8 @@ + # Run the daemon in the specified chroot jail if nonempty: + #$daemon_chroot_dir = $MYHOME; # (default is undef, meaning: do not chroot) + +-#$pid_file = "$MYHOME/amavisd.pid"; # (default is "$MYHOME/amavisd.pid") +-#$lock_file = "$MYHOME/amavisd.lock"; # (default is "$MYHOME/amavisd.lock") ++$pid_file = "/var/run/amavisd/amavisd.pid"; # (default is "$MYHOME/amavisd.pid") ++$lock_file = "/var/run/amavisd/amavisd.lock"; # (default is "$MYHOME/amavisd.lock") + + # set environment variables if you want (no defaults): + $ENV{TMPDIR} = $TEMPBASE; # wise to set TMPDIR, but not obligatory +@@ -112,6 +116,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 +177,7 @@ # and see further down what these two lookup lists really mean. # - # @bypass_virus_checks_acl = qw( . ); # uncomment to DISABLE anti-virus code --# @bypass_spam_checks_acl = qw( . ); # uncomment to DISABLE anti-spam code -+@bypass_spam_checks_acl = qw( . ); # uncomment to DISABLE anti-spam code -+ + # @bypass_virus_checks_maps = (1); # uncomment to DISABLE anti-virus code +-# @bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code ++@bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code # # Any setting can be changed with a new assignment, so make sure # you do not unintentionally override these settings further down! -@@ -179,7 +185,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: - # --#read_hash(\%local_domains, '/var/amavis/local_domains'); -+#read_hash(\%local_domains, '/var/spool/amavis/local_domains'); # PLD path - - #or alternatively(B), using a list of regular expressions: - # $local_domains_re = new_RE( qr'[@.]example\.com$'i ); -@@ -267,7 +273,7 @@ - #$SYSLOG_LEVEL = 'user.info'; # (facility.priority, default 'mail.info') +@@ -217,8 +223,8 @@ + # AMAVIS-CLIENT PROTOCOL INPUT SETTINGS (e.g. with sendmail milter) + # (used with amavis helper clients like amavis-milter.c and amavis.c, + # NOT needed for Postfix or Exim or dual-sendmail - keep it undefined. +-$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 +307,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) ++#$LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log) #NOTE: levels are not strictly observed and are somewhat arbitrary # 0: startup/exit/failure messages, viruses detected -@@ -276,7 +282,7 @@ +@@ -310,7 +316,7 @@ # 3: server, client # 4: decompose parts # 5: more debug details -$log_level = 2; # (defaults to 0) -+# $log_level = 2; # (defaults to 0) ++#$log_level = 2; # (defaults to 0) # Customizable template for the most interesting log file entry (e.g. with # $log_level=0) (take care to properly quote Perl special characters like '\') -@@ -408,21 +414,21 @@ - # Bounces or rejects produce non-delivery status notification anyway. - - # Notify virus sender? --#$warnvirussender = 1; # (defaults to false (undef)) -+$warnvirussender = 1; # (defaults to false (undef)) - - # Notify spam sender? --#$warnspamsender = 1; # (defaults to false (undef)) -+$warnspamsender = 1; # (defaults to false (undef)) - - # Notify sender of banned files? --#$warnbannedsender = 1; # (defaults to false (undef)) -+$warnbannedsender = 1; # (defaults to false (undef)) - - # Notify sender of syntactically invalid header containing non-ASCII characters? --#$warnbadhsender = 1; # (defaults to false (undef)) -+# $warnbadhsender = 1; # (defaults to false (undef)) - - # Notify virus (or banned files) RECIPIENT? - # (not very useful, but some policies demand it) --#$warnvirusrecip = 1; # (defaults to false (undef)) --#$warnbannedrecip = 1; # (defaults to false (undef)) -+$warnvirusrecip = 1; # (defaults to false (undef)) -+$warnbannedrecip = 1; # (defaults to false (undef)) - - # Notify also non-local virus/banned recipients if $warn*recip is true? - # (including those not matching local_domains*) -@@ -516,7 +522,8 @@ +@@ -684,7 +690,8 @@ # or a directory (no trailing slash) # (the default value is undef, meaning no quarantine) # -$QUARANTINEDIR = '/var/virusmails'; -+# $QUARANTINEDIR = '/var/virusmails'; ++#$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 -@@ -1193,13 +1200,12 @@ + #$quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine + +@@ -1788,13 +1795,13 @@ # ['Sophos SAVI', \&sophos_savi ], # ### http://www.clamav.net/ --# ['Clam Antivirus-clamd', +-# ['ClamAV-clamd', -# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"], -# qr/\bOK$/, qr/\bFOUND$/, -# qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], --# # NOTE: run clamd under the same user as amavisd; match the socket --# # name (LocalSocket) in clamav.conf to the socket name in this entry +-# # NOTE: the easiest is to run clamd under the same user as amavisd; match the +-# # socket name (LocalSocket) in clamav.conf to the socket name in this entry -# # When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"], -+ ['Clam Antivirus-clamd', -+ \&ask_daemon, ["CONTSCAN {}\n", '/var/lib/clamav/clamd.socket'], -+ qr/\bOK$/, qr/\bFOUND$/, -+ qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], -+ -+# NOTE: match the socket name in clamav.conf to the socket name in this entry - - # ### http://www.openantivirus.org/ - # ['OpenAntiVirus ScannerDaemon (OAV)', -@@ -1316,9 +1322,10 @@ - '-sec -nex {}', [0], [100], - qr/was infected by virus (.+)/ ], - -- ['MkS_Vir for Linux (beta)', ['mks32','mks'], -- '-s {}/*', [0], [1,2], -- qr/--[ \t]*(.+)/ ], ++ ['Clam AntiVirus-clamd', ++ \&ask_daemon, ["CONTSCAN {}\n", "/var/lib/clamav/clamd.socket"], ++ qr/\bOK$/, qr/\bFOUND$/, ++ qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], ++ # NOTE: the easiest is to run clamd under the same user as amavisd; match the ++ # socket name (LocalSocket) in clamav.conf to the socket name in this entry ++ # When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"], + + # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred) + # ['Mail::ClamAV', \&ask_clamav, "*", [0], [1], qr/^INFECTED: (.+)/], +@@ -1956,10 +1963,11 @@ + '-s {}/*', [0], [1,2], + qr/--[ \t]*(.+)/ ], + +- ### http://mks.com.pl/english.html +- ['MkS_Vir daemon', 'mksscan', +- '-s -q {}', [0], [1..7], +- qr/^... (\S+)/ ], +# Moved to secondary scanner -+# ['MkS_Vir for Linux (beta)', ['mks32','mks'], -+# '-s {}/*', [0], [1,2], -+# qr/--[ \t]*(.+)/ ], - - ['MkS_Vir daemon', - 'mksscan', '-s -q {}', [0], [1..7], -@@ -1444,6 +1451,12 @@ ++# ### http://mks.com.pl/english.html ++# ['MkS_Vir daemon', 'mksscan', ++# '-s -q {}', [0], [1..7], ++# qr/^... (\S+)/ ], + + ### http://www.nod32.com/ + ['ESET Software NOD32 Command Line Interface v 2.51', 'nod32cli', +@@ -2157,6 +2165,10 @@ # ], # # other options to consider: -mime -oe -idedir=/usr/local/sav -+ ['MkS_Vir for Linux (beta)', ['mks32','mks'], -+ '-s {}/*', [0], [1,2], -+ qr/--[ \t]*(.+)/ ], ++ ['MkS_Vir for Linux (beta)', ['mks32','mks'], ++ '-s {}/*', [0], [1,2], ++ qr/--[ \t]*(.+)/ ], + # always succeeds (uncomment to consider mail clean if all other scanners fail) # ['always-clean', sub {0}],