>Number: 52066
>Category: ports
>Synopsis: [MAINTAINER UPDATE] Update amavisd-new to 20030314.p2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun May 11 01:10:11 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Blaz Zupan
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
System: FreeBSD titanic.medinet.si 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Sun Apr 6 14:13:39 CEST 2003 root at bigbrother.amis.net:/db/obj/usr/src/sys/TITANIC i386
>Description:
Update amavisd-new to 20030314.p2. Remove locale hack from startup file
because it is not needed for newer releases.
>How-To-Repeat:
>Fix:
diff -urN amavisd-new.old/Makefile amavisd-new/Makefile
--- amavisd-new.old/Makefile Sun Apr 20 12:54:09 2003
+++ amavisd-new/Makefile Sun May 11 09:48:13 2003
@@ -7,7 +7,7 @@
# Based on amavisd ports makefile.
PORTNAME= amavisd-new
-PORTVERSION= 20030314.p1
+PORTVERSION= 20030314.p2
CATEGORIES= security
MASTER_SITES= http://www.ijs.si/software/amavisd/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-p/}
diff -urN amavisd-new.old/distinfo amavisd-new/distinfo
--- amavisd-new.old/distinfo Sun Apr 20 12:54:09 2003
+++ amavisd-new/distinfo Sun May 11 09:48:18 2003
@@ -1 +1 @@
-MD5 (amavisd-new-20030314-p1.tar.gz) = 3dcee8ad46afbf23d09bdea64621e5a3
+MD5 (amavisd-new-20030314-p2.tar.gz) = a6c5c52237e3bc352bc2db07fface5af
diff -urN amavisd-new.old/files/amavisd.sh.tmpl amavisd-new/files/amavisd.sh.tmpl
--- amavisd-new.old/files/amavisd.sh.tmpl Mon Apr 7 06:54:00 2003
+++ amavisd-new/files/amavisd.sh.tmpl Sun May 11 09:50:52 2003
@@ -17,9 +17,6 @@
if [ -e $MILTERFLAG ]; then
su %%AMAVISUSER%% -c "${PREFIX}/sbin/amavis-milter -D -p $DIR/amavis-milter.sock"
fi
- export LANG="C"
- export LC_ALL="C"
- export LC_TIME="C"
su %%AMAVISUSER%% -c "${PREFIX}/sbin/amavisd > /dev/null 2>&1" && echo -n ' amavisd'
fi
;;
diff -urN amavisd-new.old/files/patch-amavisd.conf amavisd-new/files/patch-amavisd.conf
--- amavisd-new.old/files/patch-amavisd.conf Sun Apr 20 12:54:09 2003
+++ amavisd-new/files/patch-amavisd.conf Sun May 11 09:49:06 2003
@@ -1,6 +1,6 @@
---- amavisd.conf.orig Sat Mar 22 01:19:23 2003
-+++ amavisd.conf Sun Apr 20 17:45:36 2003
-@@ -41,7 +41,7 @@
+--- amavisd.conf.orig Wed Apr 30 19:04:16 2003
++++ amavisd.conf Sun May 11 09:48:22 2003
+@@ -51,7 +51,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 never used directly by the program. No trailing slash!
@@ -9,7 +9,7 @@
# $mydomain serves as a quick default for some other configuration settings.
# More refined control is available with each individual setting further down.
-@@ -50,8 +50,8 @@
+@@ -60,8 +60,8 @@
# Set the user and group to which the daemon will change if started as root
# (otherwise just keep the UID unchanged, and these settings have no effect):
@@ -20,7 +20,7 @@
# Runtime working directory (cwd), and a place where
# temporary directories for unpacking mail are created.
-@@ -468,7 +468,7 @@
+@@ -479,7 +479,7 @@
# or a directory (no trailing slash)
# (the default value is undef, meaning no quarantine)
#
@@ -29,12 +29,3 @@
#$virus_quarantine_method = "local:virus-%i-%n"; # default
#$spam_quarantine_method = "local:spam-%b-%i-%n"; # default
-@@ -1118,7 +1118,7 @@
-
- ### <A HREF="http://drweb.imshop.de/">http://drweb.imshop.de/</A>
- ['DrWeb Antivirus for Linux/FreeBSD/Solaris', 'drweb',
-- '-al -ar -fm -go -ha -ml -ni -ot -sd -up {}',
-+ '-al -ar -fm -go -ha -ml -ot -sd -up {}',
- [0], [1], sub {('no-name')} ],
-
- ### <A HREF="http://www.f-secure.com/products/anti-virus/">http://www.f-secure.com/products/anti-virus/</A>
>Release-Note:
>Audit-Trail:
>Unformatted: