diff options
Diffstat (limited to 'security/amavisd-new/patches/patch-aa')
| -rw-r--r-- | security/amavisd-new/patches/patch-aa | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/security/amavisd-new/patches/patch-aa b/security/amavisd-new/patches/patch-aa index 7c51dbbedd2..f18f46cafd3 100644 --- a/security/amavisd-new/patches/patch-aa +++ b/security/amavisd-new/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.4 2006/10/02 12:39:30 obache Exp $ +$NetBSD: patch-aa,v 1.5 2007/06/01 04:41:07 xtraeme Exp $ ---- amavisd.conf.orig 2006-06-27 11:31:50.000000000 +0000 -+++ amavisd.conf -@@ -14,15 +14,15 @@ use strict; - # @bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code +--- amavisd.conf.orig 2007-06-01 06:33:09.000000000 +0200 ++++ amavisd.conf 2007-06-01 06:36:24.000000000 +0200 +@@ -15,15 +15,15 @@ + # $bypass_decode_parts = 1; # controls running of decoders&dearchivers $max_servers = 2; # num of pre-forked children (2..15 is common), -m -$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u @@ -14,15 +14,15 @@ $NetBSD: patch-aa,v 1.4 2006/10/02 12:39:30 obache Exp $ $mydomain = 'example.com'; # a convenient default for other settings -# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H -+$MYHOME = '@AMAVIS_DIR@'; # a convenient default for other settings, -H ++$MYHOME = '@AMAVIS_DIR@'; # a convenient default for other settings, -H $TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T - $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR + $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc. -$QUARANTINEDIR = '/var/virusmails'; # -Q +$QUARANTINEDIR = '@AMAVIS_QUARANTINE@'; # -Q # $quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine # $daemon_chroot_dir = $MYHOME; # chroot directory or undef, -R -@@ -91,7 +91,7 @@ $mailfrom_to_quarantine = ''; # null ret +@@ -124,7 +124,7 @@ # $recipient_delimiter = '+'; # undef disables address extensions altogether # when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+ |