- updated for 2.4.1

Changed files:
    amavisd-new-config.patch -> 1.21

diff --git a/amavisd-new-config.patch b/amavisd-new-config.patch
index 633920b49ab77a1e0b957e0a3ae6d77477f8750b..b62567d98df1ea41ba4e0d7dea9f0e7babf3f848 100644 (file)
--- a/amavisd-new-config.patch
+++ b/amavisd-new-config.patch
@@ -1,6 +1,6 @@
---- amavisd-new-2.2.1/amavisd.conf-sample      2004-12-23 01:38:23.000000000 +0000
-+++ amavisd-new-2.2.1.new/amavisd.conf-sample  2004-12-23 20:18:27.372867424 +0000
-@@ -62,27 +62,31 @@
+--- ./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!
@@ -32,14 +32,14 @@
  # (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)
++$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"
++$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
-@@ -92,8 +96,8 @@
+@@ -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)
  
@@ -50,17 +50,16 @@
  
  # set environment variables if you want (no defaults):
  $ENV{TMPDIR} = $TEMPBASE;       # wise to set TMPDIR, but not obligatory
-@@ -111,6 +115,9 @@
+@@ -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,
- # the IP address and/or the port number in $forward_method and $notify_method
- # may be spacified as an asterisk. An asterisk in the colon-separated
-@@ -164,7 +171,7 @@
+@@ -171,7 +177,7 @@
  # and see further down what these two lookup lists really mean.
  #
  # @bypass_virus_checks_maps = (1);  # uncomment to DISABLE anti-virus code
@@ -69,75 +68,46 @@
  #
  # Any setting can be changed with a new assignment, so make sure
  # you do not unintentionally override these settings further down!
-@@ -209,7 +216,7 @@
+@@ -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
++$unix_socketname = undef;        # disable listening on a unix socket
                                    # (default is undef, i.e. disabled)
                                    # (usual setting is $MYHOME/amavisd.sock)
-@@ -279,7 +286,7 @@
- #$SYSLOG_LEVEL = 'user.info';     # (facility.priority, default 'mail.info')
+ 
+@@ -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
-@@ -288,7 +295,8 @@
+@@ -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 '\')
-@@ -471,22 +479,22 @@
- # Bounces or rejects produce non-delivery status notification regardless.
- 
- # 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 or bad headers) RECIPIENT?
- #  (not very useful, but some policies demand it)
--#$warnvirusrecip = 1; # (defaults to false (undef))
--#$warnbannedrecip = 1;        # (defaults to false (undef))
--#$warnbadhrecip = 1;  # (defaults to false (undef))
-+$warnvirusrecip = 1;  # (defaults to false (undef))
-+$warnbannedrecip = 1; # (defaults to false (undef))
-+$warnbadhrecip = 1;   # (defaults to false (undef))
- 
- # Notify also non-local virus/banned recipients if $warn*recip is true?
- #  (including those not matching local_domains*)
-@@ -587,7 +595,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
-@@ -1600,13 +1609,12 @@
+ #$quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
+ 
+@@ -1788,13 +1795,13 @@
  # ['Sophos SAVI', \&sophos_savi ],
  
  # ### http://www.clamav.net/
@@ -148,39 +118,39 @@
 -# # 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
++ ['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: (.+)/],
-@@ -1740,10 +1748,11 @@
-     # NOTE: requires suid wrapper around inocmd32; consider flag: -mod reviewer
-     # see http://marc.theaimsgroup.com/?l=amavis-user&m=109229779912783
+@@ -1956,10 +1963,11 @@
+     '-s {}/*', [0], [1,2],
+     qr/--[ \t]*(.+)/ ],
  
 -  ### http://mks.com.pl/english.html
--  ['MkS_Vir for Linux (beta)', ['mks32','mks'],
--    '-s {}/*', [0], [1,2],
--    qr/--[ \t]*(.+)/ ],
+-  ['MkS_Vir daemon', 'mksscan',
+-    '-s -q {}', [0], [1..7],
+-    qr/^... (\S+)/ ],
 +#  Moved to secondary scanner
 +#  ### http://mks.com.pl/english.html
-+#  ['MkS_Vir for Linux (beta)', ['mks32','mks'],
-+#    '-s {}/*', [0], [1,2],
-+#    qr/--[ \t]*(.+)/ ],
++#  ['MkS_Vir daemon', 'mksscan',
++#    '-s -q {}', [0], [1..7],
++#    qr/^... (\S+)/ ],
  
-   ### http://mks.com.pl/english.html
-   ['MkS_Vir daemon', 'mksscan',
-@@ -1938,6 +1947,11 @@
+   ### 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}],