- updated to 20040701

Changed files:
    amavisd-new-config.patch -> 1.13
    amavisd-new-dirperms.patch -> 1.2

diff --git a/amavisd-new-config.patch b/amavisd-new-config.patch
index 8c9095f4c956aa3a1f907fe27d03d3fbfa52bd57..d31f91935052baa5518cd2a35253c8b975871f77 100644 (file)
--- a/amavisd-new-config.patch
+++ b/amavisd-new-config.patch
@@ -1,12 +1,12 @@
-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 Sun Mar 14 13:37:30 2004
-@@ -51,19 +51,24 @@
+diff -uNr amavisd-new-20030616/amavisd.conf-sample amavisd-new-20030616~/amavisd.conf-sample
+--- amavisd-new-20030616/amavisd.conf-sample   Tue Mar  9 03:21:38 2004
++++ amavisd-new-20030616~/amavisd.conf-sample  Sun Mar 14 13:37:30 2004
+@@ -51,25 +51,29 @@
  # $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.
@@ -30,25 +30,23 @@ diff -uNr amavisd-new-20030616/amavisd.conf amavisd-new-20030616~/amavisd.conf
  
  # Runtime working directory (cwd), and a place where
  # 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)
+-#$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"
+ 
 @@ -143,7 +148,8 @@
  # 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')
  
@@ -67,7 +65,7 @@ diff -uNr amavisd-new-20030616/amavisd.conf amavisd-new-20030616~/amavisd.conf
  
  # 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 @@
+@@ -408,22 +414,22 @@
  # Bounces or rejects produce non-delivery status notification anyway.
  
  # Notify virus sender?
@@ -86,12 +84,14 @@ diff -uNr amavisd-new-20030616/amavisd.conf amavisd-new-20030616~/amavisd.conf
 -#$warnbadhsender = 1; # (defaults to false (undef))
 +# $warnbadhsender = 1;        # (defaults to false (undef))
  
- # Notify virus (or banned files) RECIPIENT?
+ # 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*)
@@ -109,7 +109,7 @@ diff -uNr amavisd-new-20030616/amavisd.conf amavisd-new-20030616~/amavisd.conf
  # ['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$/ ],

diff --git a/amavisd-new-dirperms.patch b/amavisd-new-dirperms.patch
index 7adb6e0d8de90f16a94be9ceb683eb5371ee129c..36c63325b99a304cc23f833f128765a279757da5 100644 (file)
--- a/amavisd-new-dirperms.patch
+++ b/amavisd-new-dirperms.patch
@@ -1,24 +1,6 @@
 diff -Nur amavisd-new-20030616.orig/helper-progs/amavis-milter-based-on-1.1.2.3.2.40-v2.c amavisd-new-20030616/helper-progs/amavis-milter-based-on-1.1.2.3.2.40-v2.c
 --- amavisd-new-20030616.orig/helper-progs/amavis-milter-based-on-1.1.2.3.2.40-v2.c    2004-04-01 02:42:23.000000000 +0200
 +++ amavisd-new-20030616/helper-progs/amavis-milter-based-on-1.1.2.3.2.40-v2.c 2004-05-06 16:29:22.000000000 +0200
-@@ -202,7 +202,7 @@
-     int count = 0;
- 
-     if (use_fixed_name) {
--      if (mkdir(s, S_IRWXU) == 0) return s;  /* succeeded */
-+      if (mkdir(s, S_IRWXU|S_IRWXG) == 0) return s;  /* succeeded */
-       amavis_syslog(DBG_FATAL, "(amavis_mkdtemp) creating directory %s failed: %s",
-                     s, strerror(errno));
-     }
-@@ -234,7 +234,7 @@
-       }
- # endif
-       if (stt) {
--          if (!mkdir(s, S_IRWXU)) {
-+          if (!mkdir(s, S_IRWXU|S_IRWXG)) {
-               return s;
-           } else {
-               continue;
 @@ -884,7 +884,7 @@
      srand48(time(NULL) ^ (mypid + (mypid << 15)));
  #endif