ports/99688: Patch to update amavisd-new to 2.4.2
Michael Scheidell
scheidell at secnap.net
Sat Jul 1 13:20:20 UTC 2006
>Number: 99688
>Category: ports
>Synopsis: Patch to update amavisd-new to 2.4.2
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 01 13:20:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Michael Scheidell
>Release: FreeBSD 4.11-RELEASE-p11 i386
>Organization:
SECNAP Network Security
>Environment:
System: FreeBSD smtp1.454.com 4.11-RELEASE-p11 FreeBSD 4.11-RELEASE-p11 #2: Fri Aug 19 05:00:40 EDT 2005 admin at smtp1.454.com:/usr/obj/usr/src/sys/HACKERTRAP_750 i386
>Description:
see: http://www.ijs.si/software/amavisd/release-notes.txt
BUG FIXES AND CHANGES since 2.4.1:
- LDAP.schema: add missing LDAP attribute amavisSpamQuarantineCutoffLevel
to the list of allowed attributes in objectclass amavisAccount;
pointed out by Paolo Cravero;
- ensure that notification would not be sent if notification template is empty,
solving the following problem: when recipient notifications for bad headers
is enabled, and a message is spam with bad headers, recipient would receive
an empty notification message (because message contents category is spam
and recipient notification template for spam is empty); reported by Alex;
>How-To-Repeat:
Run amavisd-new 2.4.1 with conditions in release noted or above
>Fix:
Need to remove ../files/patch-LDAP.schema (already fixed in
2.4.2. attached patch when run with -E option should remove file)
Apply this patch to fix: with -E option to remove patch-LDAP.schema
empty file
(wrapped lines may need to be fixed here)
diff -bBruN ./Makefile /tmp/amavisd.new/Makefile
--- ./Makefile Fri May 26 11:41:47 2006
+++ /tmp/amavisd.new/Makefile Thu Jun 29 16:02:27 2006
@@ -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/ \
diff -bBruN ./distinfo /tmp/amavisd.new/distinfo
--- ./distinfo Thu May 11 22:30:43 2006
+++ /tmp/amavisd.new/distinfo Thu Jun 29 16:05:04 2006
@@ -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
diff -bBruN ./files/patch-LDAP.schema /tmp/amavisd.new/files/patch-LDAP.schema
--- ./files/patch-LDAP.schema Thu May 11 22:30:43 2006
+++ /tmp/amavisd.new/files/patch-LDAP.schema Wed Dec 31 19:00:00 1969
@@ -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 ) )
-
diff -bBruN ./files/patch-amavisd-sample.conf /tmp/amavisd.new/files/patch-amavisd-sample.conf
--- ./files/patch-amavisd-sample.conf Mon Aug 16 13:19:16 2004
+++ /tmp/amavisd.new/files/patch-amavisd-sample.conf Thu Jun 29 16:24:38 2006
@@ -1,40 +1,40 @@
---- 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 @@
+--- amavisd.conf-sample.orig Tue Jun 27 07:31:44 2006
++++ amavisd.conf-sample Thu Jun 29 16:23:11 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')
-+$MYHOME = '%%AMAVISDIR%%'; # (default is '/var/amavis')
+-#$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.
-@@ -69,8 +69,8 @@
+@@ -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)
--$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)
+-$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.
-@@ -284,7 +284,7 @@
+@@ -310,7 +310,7 @@
# 3: server, client
# 4: decompose parts
# 5: more debug details
--$log_level = 2; # (defaults to 0)
-+$log_level = 0; # (defaults to 0)
+-$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 '\')
-@@ -567,7 +567,7 @@
+@@ -684,7 +684,7 @@
# or a directory (no trailing slash)
# (the default value is undef, meaning no quarantine)
#
--$QUARANTINEDIR = '/var/virusmails';
-+$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';
+-$QUARANTINEDIR = '/var/virusmails'; # -Q
++$QUARANTINEDIR = '%%AMAVISQUARANTINE%%'; # -Q
+
+ #$quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine
- #$virus_quarantine_method = 'local:virus-%i-%n'; # default
- #$spam_quarantine_method = 'local:spam-%b-%i-%n'; # default
diff -bBruN ./files/patch-amavisd.conf /tmp/amavisd.new/files/patch-amavisd.conf
--- ./files/patch-amavisd.conf Mon Apr 25 10:51:44 2005
+++ /tmp/amavisd.new/files/patch-amavisd.conf Thu Jun 29 16:29:45 2006
@@ -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 Jun 27 07:31:50 2006
++++ amavisd.conf Thu Jun 29 16:29:03 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
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list