Attachment 67749 Details for Bug 99785 – amavisd-new.diff

[patch] amavisd-new.diff

amavisd-new.diff (text/plain), 8.73 KB, created by Gabor Kovesdan on 2006-07-04 17:20:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gabor Kovesdan

Created: 2006-07-04 17:20:17 UTC

Size: 8.73 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /usr/cvs/ports/security/amavisd-new/Makefile,v
>retrieving revision 1.37
>diff -u -r1.37 Makefile
>--- Makefile	26 May 2006 15:41:47 -0000	1.37
>+++ Makefile	28 Jun 2006 20:22:35 -0000
>@@ -7,8 +7,7 @@
> # Based on amavisd ports makefile.
> 
> PORTNAME=	amavisd-new
>-PORTVERSION=	2.4.1
>-PORTREVISION=	1
>+PORTVERSION=	2.4.2
> PORTEPOCH=	1
> CATEGORIES=	security
> MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
>Index: distinfo
>===================================================================
>RCS file: /usr/cvs/ports/security/amavisd-new/distinfo,v
>retrieving revision 1.25
>diff -u -r1.25 distinfo
>--- distinfo	12 May 2006 02:30:43 -0000	1.25
>+++ distinfo	28 Jun 2006 20:23:29 -0000
>@@ -1,3 +1,3 @@
>-MD5 (amavisd-new-2.4.1.tar.gz) = bf770a3c7eee8a9c93932a04485e6a35
>-SHA256 (amavisd-new-2.4.1.tar.gz) = c067cbae60ccff3932574fcaf7971c04b118f6b2e9fe6db772d33538b53b0a54
>-SIZE (amavisd-new-2.4.1.tar.gz) = 841988
>+MD5 (amavisd-new-2.4.2.tar.gz) = d750176de7481498ebd1011e08a488da
>+SHA256 (amavisd-new-2.4.2.tar.gz) = 80023cc0397560d082dd4152c96b7efc49d3cc2695b4d578ed01b08c3af2bb9a
>+SIZE (amavisd-new-2.4.2.tar.gz) = 854326
>Index: files/patch-LDAP.schema
>===================================================================
>RCS file: files/patch-LDAP.schema
>diff -N files/patch-LDAP.schema
>--- files/patch-LDAP.schema	12 May 2006 02:30:43 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- LDAP.schema.orig	Thu May 11 12:49:37 2006
>-+++ LDAP.schema    Thu May 11 12:50:50 2006
>-@@ -406,7 +406,7 @@
>-         amavisWarnBadHeaderRecip $ amavisVirusAdmin $ amavisNewVirusAdmin $
>-         amavisSpamAdmin $ amavisBannedAdmin $ amavisBadHeaderAdmin $
>-         amavisBannedRuleNames $
>--        amavisSpamDsnCutoffLevel $ amavisSpamSubjectTag $
>-+        amavisSpamDsnCutoffLevel $ amavisSpamQuarantineCutoffLevel $
>-         amavisSpamSubjectTag $ amavisSpamSubjectTag2 $
>-         cn $ description ) )
>- 
>Index: files/patch-amavisd-sample.conf
>===================================================================
>RCS file: files/patch-amavisd-sample.conf
>diff -N files/patch-amavisd-sample.conf
>--- files/patch-amavisd-sample.conf	16 Aug 2004 17:19:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,40 +0,0 @@
>---- amavisd.conf-sample.orig	Mon Aug 16 03:03:09 2004
>-+++ amavisd.conf-sample	Mon Aug 16 10:47:54 2004
>-@@ -58,7 +58,7 @@
>- # $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 = '%%AMAVISDIR%%';   # (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.
>-@@ -69,8 +69,8 @@
>- 
>- # 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 = 'vscan';   # (no default;  customary: vscan or amavis or sweep)
>-+$daemon_user  = '%%AMAVISUSER%%';   # (no default;  customary: vscan or amavis)
>-+$daemon_group = '%%AMAVISGROUP%%';   # (no default;  customary: vscan or amavis or sweep)
>- 
>- # Runtime working directory (cwd), and a place where
>- # temporary directories for unpacking mail are created.
>-@@ -284,7 +284,7 @@
>- # 3: server, client
>- # 4: decompose parts
>- # 5: more debug details
>--$log_level = 2;		  # (defaults to 0)
>-+$log_level = 0;		  # (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 '\')
>-@@ -567,7 +567,7 @@
>- #   or a directory (no trailing slash)
>- #   (the default value is undef, meaning no quarantine)
>- #
>--$QUARANTINEDIR = '/var/virusmails';
>-+$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';
>- 
>- #$virus_quarantine_method        = 'local:virus-%i-%n';    # default
>- #$spam_quarantine_method         = 'local:spam-%b-%i-%n';  # default
>Index: files/patch-amavisd.conf
>===================================================================
>RCS file: /usr/cvs/ports/security/amavisd-new/files/patch-amavisd.conf,v
>retrieving revision 1.12
>diff -u -r1.12 patch-amavisd.conf
>--- files/patch-amavisd.conf	25 Apr 2005 14:51:44 -0000	1.12
>+++ files/patch-amavisd.conf	4 Jul 2006 09:20:41 -0000
>@@ -1,22 +1,22 @@
>---- amavisd.conf.orig	Mon Apr 25 01:23:26 2005
>-+++ amavisd.conf	Mon Apr 25 09:58:07 2005
>+--- amavisd.conf.orig	Tue Jul  4 11:13:34 2006
>++++ amavisd.conf	Tue Jul  4 11:17:15 2006
> @@ -14,15 +14,15 @@
>  # @bypass_spam_checks_maps  = (1);  # uncomment to DISABLE anti-spam code
>  
>- $max_servers = 2;            # number of pre-forked children (2..15 is common)
>--$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis)
>--$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis)
>-+$daemon_user  = '%%AMAVISUSER%%';     # (no default;  customary: vscan or amavis)
>-+$daemon_group = '%%AMAVISGROUP%%';     # (no default;  customary: vscan or amavis)
>+ $max_servers = 2;            # num of pre-forked children (2..15 is common), -m
>+-$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis), -u
>+-$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis), -g
>++$daemon_user  = '%%AMAVISUSER%%';     # (no default;  customary: vscan or amavis), -u
>++$daemon_group = '%%AMAVISGROUP%%';     # (no default;  customary: vscan or amavis), -g
>  
>  $mydomain = 'example.com';   # a convenient default for other settings
>  
>--$MYHOME   = '/var/amavis';   # a convenient default for other settings
>-+$MYHOME   = '%%AMAVISDIR%%';   # a convenient default for other settings
>- $TEMPBASE = "$MYHOME/tmp";   # working directory, needs to be created manually
>+-# $MYHOME = '/var/amavis';   # a convenient default for other settings, -H
>++# $MYHOME = '%%AMAVISDIR%%';   # a convenient default for other settings, -H
>+ $TEMPBASE = "$MYHOME/tmp";   # working directory, needs to exist, -T
>  $ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR
>--$QUARANTINEDIR = '/var/virusmails';
>-+$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';
>+-$QUARANTINEDIR = '/var/virusmails';  # -Q
>++$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';  # -Q
>  # $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
>  
>- # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef
>+ # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef, -R
>Index: files/patch-amavisd.conf-sample
>===================================================================
>RCS file: files/patch-amavisd.conf-sample
>diff -N files/patch-amavisd.conf-sample
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-amavisd.conf-sample	4 Jul 2006 09:09:36 -0000
>@@ -0,0 +1,40 @@
>+--- amavisd.conf-sample.orig	Tue Jul  4 11:06:53 2006
>++++ amavisd.conf-sample	Tue Jul  4 11:09:07 2006
>+@@ -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.
>+ # $MYHOME is not used directly by the program. No trailing slash!
>+-#$MYHOME = '/var/lib/amavis';   # (default is '/var/amavis'), -H
>++#$MYHOME = '%%AMAVISDIR%%';   # (default is '/var/amavis'), -H
>+ 
>+ # $mydomain serves as a quick default for some other configuration settings.
>+ # More refined control is available with each individual setting further down.
>+@@ -74,8 +74,8 @@
>+ 
>+ # 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), -u
>+-$daemon_group = 'vscan';   # (no default;  customary: vscan or amavis), -g
>++$daemon_user  = '%%AMAVISUSER%%';   # (no default;  customary: vscan or amavis), -u
>++$daemon_group = '%%AMAVISGROUP%%';   # (no default;  customary: vscan or amavis), -g
>+ 
>+ # Runtime working directory (cwd), and a place where
>+ # temporary directories for unpacking mail are created.
>+@@ -310,7 +310,7 @@
>+ # 3: server, client
>+ # 4: decompose parts
>+ # 5: more debug details
>+-$log_level = 2;		   # (defaults to 0), -d
>++$log_level = 0;		   # (defaults to 0), -d
>+ 
>+ # Customizable template for the most interesting log file entry (e.g. with
>+ # $log_level=0) (take care to properly quote Perl special characters like '\')
>+@@ -684,7 +684,7 @@
>+ #   or a directory (no trailing slash)
>+ #   (the default value is undef, meaning no quarantine)
>+ #
>+-$QUARANTINEDIR = '/var/virusmails';  # -Q
>++$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';  # -Q
>+ 
>+ #$quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
>+

Actions: View | Diff

Attachments on bug 99785: 67749