SOURCES: amavisd-new-config.patch - updated to 2.6.3

Thu Apr 23 08:28:18 CEST 2009

Author: paszczus                     Date: Thu Apr 23 06:28:18 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 2.6.3

---- Files affected:
SOURCES:
   amavisd-new-config.patch (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SOURCES/amavisd-new-config.patch
diff -u SOURCES/amavisd-new-config.patch:1.27 SOURCES/amavisd-new-config.patch:1.28

--- SOURCES/amavisd-new-config.patch:1.27	Thu Jan  8 13:57:06 2009
+++ SOURCES/amavisd-new-config.patch	Thu Apr 23 08:28:12 2009
@@ -1,5 +1,6 @@
---- 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
+diff -ur amavisd-new-2.6.3/amavisd.conf-sample amavisd-new-2.6.3.new/amavisd.conf-sample
+--- amavisd-new-2.6.3/amavisd.conf-sample	2009-04-22 02:23:58.000000000 +0200
++++ amavisd-new-2.6.3.new/amavisd.conf-sample	2009-04-23 08:27:32.281461340 +0200
 @@ -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.
@@ -22,7 +23,7 @@
  # temporary directories for unpacking mail are created.
  # (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/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
@@ -40,8 +41,8 @@
 +$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 @@
+ $ENV{TMPDIR} = $TEMPBASE; # used for SA temporary files, by some decoders, etc.
+@@ -114,6 +114,8 @@
  #$forward_method = 'smtp:[127.0.0.1]:10025';  # where to forward checked mail
  #$notify_method = $forward_method;            # where to submit notifications
  
@@ -50,7 +51,7 @@
  #$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 @@
+@@ -173,7 +175,7 @@
  # and see further down what these two lookup lists really mean.
  #
  # @bypass_virus_checks_maps = (1);  # controls running of anti-virus code
@@ -59,7 +60,7 @@
  # $bypass_decode_parts = 1;         # controls running of decoders&dearchivers
  #
  # Any setting can be changed with a new assignment, so make sure
-@@ -217,8 +219,8 @@
+@@ -223,8 +225,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
@@ -70,7 +71,7 @@
                                    # (default is undef, i.e. disabled)
                                    # (usual setting is $MYHOME/amavisd.sock)
  
-@@ -301,7 +303,7 @@
+@@ -307,7 +309,7 @@
             # choose from: emerg, alert, crit, err, warning, notice, info, debug
  
  # Log file (if not using syslog)
@@ -79,7 +80,7 @@
  
  #NOTE: levels are not strictly observed and are somewhat arbitrary
  # 0: startup/exit/failure messages, viruses detected
-@@ -310,7 +312,7 @@
+@@ -316,7 +318,7 @@
  # 3: server, client
  # 4: decompose parts
  # 5: more debug details
@@ -88,7 +89,7 @@
  
  # 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 @@
+@@ -694,7 +696,8 @@
  #   or a directory (no trailing slash)
  #   (the default value is undef, meaning no quarantine)
  #
@@ -98,13 +99,14 @@
  
  #$quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
  
-@@ -1900,15 +1903,15 @@
+@@ -1918,16 +1921,15 @@
+ # ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/
  # ['Sophos SAVI', \&sophos_savi ],
  
- # ### http://www.clamav.net/
+-# ### http://www.clamav.net/
 -# ['ClamAV-clamd',
 -#   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
--#   qr/\bOK$/, qr/\bFOUND$/,
+-#   qr/\bOK$/m, qr/\bFOUND$/m,
 -#   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
@@ -122,8 +124,8 @@
 +#   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 that Mail::ClamAV requires perl to be build with threading!
+@@ -2107,16 +2109,21 @@
      # NOTE: requires suid wrapper around inocmd32; consider flag: -mod reviewer
      # see http://marc.theaimsgroup.com/?l=amavis-user&m=109229779912783
  
@@ -139,14 +141,14 @@
  
    ### http://mks.com.pl/english.html
    ['MkS_Vir daemon', 'mksscan',
-@@ -2298,6 +2302,10 @@
- # ],
- # # other options to consider: -idedir=/usr/local/sav
+     '-s -q {}', [0], [1..7],
+     qr/^... (\S+)/m ],
  
 +  ['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
- 
+ # ### http://www.nod32.com/,  version v2.52 (old)
+ # ['ESET NOD32 for Linux Mail servers',
+ #   ['/opt/eset/nod32/bin/nod32cli', 'nod32cli'],
+Tylko w amavisd-new-2.6.3.new/: amavisd.conf-sample~
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/amavisd-new-config.patch?r1=1.27&r2=1.28&f=u

