- update to 20030314.p2

- remove the locale hack in the startup script; it's no
  longer necessary

PR:		52066
Submitted by:	maintainer

4 files changed, 7 insertions, 19 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 87a37b14771d..8edb3fbe0796 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -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 --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index aa51daa67c61..87e061e8e155 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1 +1 @@
-MD5 (amavisd-new-20030314-p1.tar.gz) = 3dcee8ad46afbf23d09bdea64621e5a3
+MD5 (amavisd-new-20030314-p2.tar.gz) = a6c5c52237e3bc352bc2db07fface5af
diff --git a/security/amavisd-new/files/amavisd.sh.tmpl b/security/amavisd-new/files/amavisd.sh.tmpl
index 51becce9b859..656954de4596 100644
--- a/security/amavisd-new/files/amavisd.sh.tmpl
+++ b/security/amavisd-new/files/amavisd.sh.tmpl
@@ -17,9 +17,6 @@ start)
 		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 --git a/security/amavisd-new/files/patch-amavisd.conf b/security/amavisd-new/files/patch-amavisd.conf
index dc875f5ff5d2..1e74a685b018 100644
--- a/security/amavisd-new/files/patch-amavisd.conf
+++ b/security/amavisd-new/files/patch-amavisd.conf
@@ -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>