Update amavisd-new port to 20030314.p1.

Don't remove amavis user/group and directories, just remind user that they
should do it manually if they don't want to use the port anymore.

PR:		51153
Submitted by:	Blaz Zupan <blaz.zupan@amis.net>

8 files changed, 79 insertions, 64 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 664369ab1a7f..87a37b14771d 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -7,8 +7,7 @@
 # Based on amavisd ports makefile.
 
 PORTNAME=	amavisd-new
-PORTVERSION=	20021227.p2
-PORTREVISION=	2
+PORTVERSION=	20030314.p1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-p/}
@@ -34,8 +33,6 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/IO/Socket/UNIX.pm:${PORTSDIR}/devel/p5-IO
 		${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
 		${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo
 
-SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
 USE_PERL5_RUN=	yes
 
 PKGINSTALL=	${WRKDIR}/INSTALL
@@ -75,7 +72,7 @@ pre-build:
 		       -e 's,%%PREFIX%%,${PREFIX},g' \
 	               < ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
 	done
-	for file in amavisd.conf amavisd amavisdconf; do \
+	for file in amavisd.conf amavisd; do \
 		${SED} -e 's,%%AMAVISUSER%%,${AMAVISUSER},g' \
 		       -e 's,%%AMAVISGROUP%%,${AMAVISGROUP},g' \
 		       -e 's,%%AMAVISDIR%%,${AMAVISDIR},g' \
@@ -93,7 +90,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${PREFIX}/sbin
 .endif
 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKDIR}/amavisdconf ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist
 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.sh ${PREFIX}/etc/rc.d
 .if !defined(NOPORTDOCS)
@@ -102,7 +98,7 @@ do-install:
 	README_FILES/README.customize README_FILES/README.exim_v3 \
 	README_FILES/README.exim_v4 README_FILES/README.exim_v4_app \
 	README_FILES/README.lookups README_FILES/README.milter \
-	README_FILES/README.old README_FILES/README.old.scanners \
+	README_FILES/README.chroot README_FILES/README.old.scanners \
 	README_FILES/README.performance README_FILES/README.postfix \
 	README_FILES/README.sendmail RELEASE_NOTES
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index 8a1e4d7efeea..aa51daa67c61 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1 +1 @@
-MD5 (amavisd-new-20021227-p2.tar.gz) = b147d532730cf7c77fef71114234ff65
+MD5 (amavisd-new-20030314-p1.tar.gz) = 3dcee8ad46afbf23d09bdea64621e5a3
diff --git a/security/amavisd-new/files/DEINSTALL.tmpl b/security/amavisd-new/files/DEINSTALL.tmpl
index 53e7a696dc43..7f0bf9ea0cc2 100644
--- a/security/amavisd-new/files/DEINSTALL.tmpl
+++ b/security/amavisd-new/files/DEINSTALL.tmpl
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/security/amavisd-new/files/Attic/DEINSTALL.tmpl,v 1.2 2003-01-04 10:59:25 demon Exp $
+#	$FreeBSD: /tmp/pcvs/ports/security/amavisd-new/files/Attic/DEINSTALL.tmpl,v 1.3 2003-04-20 10:02:44 leeym Exp $
 #
 
 USER=%%AMAVISUSER%%
@@ -11,18 +11,15 @@ QUARANTINE=%%AMAVISQUARANTINE%%
 if [ "$2" = "POST-DEINSTALL" ]; then
 
     if /usr/sbin/pw group show "${GROUP}" 2>&1 >/dev/null; then
-	/usr/sbin/pw groupdel ${GROUP}
-	echo "Deleted group \"${GROUP}\"."
+	echo "You should manually remove the \"${GROUP}\" group."
     fi
 
     if /usr/sbin/pw user show "${USER}" 2>&1 >/dev/null; then
-	/usr/sbin/pw userdel ${USER}
-	echo "Deleted user \"${USER}\"."
+	echo "You should manually remove the \"${USER}\" user."
     fi
 
     if [ -e ${DIR} ]; then
-	/bin/rm -rf ${DIR}
-	echo "Deleted \"${DIR}\" directory."
+	echo "You should manually remove the \"${DIR}\" directory."
     fi
     
     if [ -e ${QUARANTINE} ]; then
diff --git a/security/amavisd-new/files/patch-amavisd.conf b/security/amavisd-new/files/patch-amavisd.conf
index 9419a5d3497f..dc875f5ff5d2 100644
--- a/security/amavisd-new/files/patch-amavisd.conf
+++ b/security/amavisd-new/files/patch-amavisd.conf
@@ -1,35 +1,40 @@
---- amavisd.conf.orig	Fri Dec 27 16:04:17 2002
-+++ amavisd.conf	Fri Jan  3 22:29:45 2003
-@@ -36,11 +36,11 @@
- #
- 
- # Set the user and group to which the daemon will change when started as root:
--$daemon_user  = 'amavis';	# (no default;  customary: vscan or amavis)
--$daemon_group = 'amavis';	# (no default)
-+$daemon_user  = '%%AMAVISUSER%%';	# (no default;  customary: vscan or amavis)
-+$daemon_group = '%%AMAVISGROUP%%';	# (no default)
+--- amavisd.conf.orig	Sat Mar 22 01:19:23 2003
++++ amavisd.conf	Sun Apr 20 17:45:36 2003
+@@ -41,7 +41,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!
+-#$MYHOME = '/var/lib/amavis';   # (default is '/var/amavis')
++$MYHOME = '%%AMAVISDIR%%';   # (default is '/var/amavis')
  
- # Runtime directory (no trailing slash, defaults to '/var/amavis')
--$TEMPBASE = '/var/amavis';
-+$TEMPBASE = '%%AMAVISDIR%%';
+ # $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 @@
  
+ # 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):
+-$daemon_user  = 'vscan';	# (no default;  customary: vscan or amavis)
+-$daemon_group = 'sweep';	# (no default;  customary: vscan or amavis)
++$daemon_user  = '%%AMAVISUSER%%';	# (no default;  customary: vscan or amavis)
++$daemon_group = '%%AMAVISGROUP%%';	# (no default;  customary: vscan or amavis)
  
- # MTA SETTINGS, UNCOMMENT AS APPROPRIATE, defaults to 'smtp:127.0.0.1:10025'
-@@ -309,7 +309,7 @@
+ # Runtime working directory (cwd), and a place where
+ # temporary directories for unpacking mail are created.
+@@ -468,7 +468,7 @@
  #   or a directory (no trailing slash)
- # (the default value is undef, meaning no quarantine)
+ #   (the default value is undef, meaning no quarantine)
  #
 -$QUARANTINEDIR = '/var/virusmails';
 +$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';
  
- 
- # A finer control of quarantining is available through variable
-@@ -638,7 +638,7 @@
- # a hash lookup table can be read from a file,
- # one address per line, comments and empty lines are permitted:
- #
--read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
-+#read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
- 
- # ... or set directly:
- map { $whitelist_sender{lc($_)}=1 } (qw(
+ #$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>
diff --git a/security/amavisd-new/files/patch-amavisdconf b/security/amavisd-new/files/patch-amavisdconf
deleted file mode 100644
index 2f1bd8907560..000000000000
--- a/security/amavisd-new/files/patch-amavisdconf
+++ /dev/null
@@ -1,20 +0,0 @@
---- amavisdconf.orig	Fri Dec 27 14:56:01 2002
-+++ amavisdconf	Thu Mar  6 21:18:16 2003
-@@ -9,7 +9,7 @@
- #  (none) show the value as will be used by amavisd;
- #   -d  show default value as in the absence of the config file;
- #   -n  only show variable if its value is different from the default.
--#   -c conf-file ... use the specified file instead of /etc/amavisd.conf
-+#   -c conf-file ... use the specified file instead of %%PREFIX%%/etc/amavisd.conf
- #
- # If a variable is specified, show only that variable, otherwise show
- # all configurable variables. (Note: the leading $, @ or % must be included
-@@ -179,7 +179,7 @@
-   }
- 
-   my($what,$onevar);
--  my($config_file) = '/etc/amavisd.conf';
-+  my($config_file) = '%%PREFIX%%/etc/amavisd.conf';
-   while (@ARGV) {
-     if (@ARGV >= 1 && $ARGV[0] =~ /^-([nd])$/) {
-       $what = $1; shift @ARGV;
diff --git a/security/amavisd-new/files/patch-config.h.in b/security/amavisd-new/files/patch-config.h.in
new file mode 100644
index 000000000000..43f81a0cc14b
--- /dev/null
+++ b/security/amavisd-new/files/patch-config.h.in
@@ -0,0 +1,15 @@
+--- helper-progs/config.h.in.orig	Fri Mar  7 22:56:50 2003
++++ helper-progs/config.h.in	Sat Mar 15 16:15:40 2003
+@@ -14,10 +14,10 @@
+ #define X_HEADER_LINE "by-amavisd-new-via-milter"
+
+ /* Define if you have the mkdtemp function, undefine otherwise */
+-#undef HAVE_MKDTEMP
++#define HAVE_MKDTEMP
+
+ /* Define if you have the mktemp function, undefine otherwise */
+-#define HAVE_MKTEMP
++#undef HAVE_MKTEMP
+
+ /* Define if we have the snprintf function, undefine otherwise */
+ #undef HAVE_SNPRINTF
diff --git a/security/amavisd-new/files/patch-configure b/security/amavisd-new/files/patch-configure
new file mode 100644
index 000000000000..b3d30c3ca068
--- /dev/null
+++ b/security/amavisd-new/files/patch-configure
@@ -0,0 +1,23 @@
+--- helper-progs/configure.orig	Thu Dec 26 12:35:33 2002
++++ helper-progs/configure	Sat Apr 19 10:54:31 2003
+@@ -2041,20 +2041,3 @@
+ 
+ 
+ 
+-if test "$AMAVISUSER" != "" ; then
+-   id $AMAVISUSER > /dev/null 2>&1
+-   if test "$?" != 0 ; then
+-      echo ""
+-      echo "Note:  The Amavis user '$AMAVISUSER' does not seem to"
+-      echo "exist.  Please create this user before continuing."
+-   fi
+-fi
+-
+-if test "$SENDMAILPROG" != "no" ; then
+-        sendmailversion=`$SENDMAILPROG -bv -d0.1 | $AWK '/Version/ {print $2}'`
+-        echo ""
+-        echo "Note: sendmail version $sendmailversion detected"
+-        echo "check http://www.sendmail.org/~ca/email/sm-812.html for sendmail bugs and patches"
+-        echo "It's advised to run sendmail latest versions when using MILTER"
+-        echo ""
+-fi
diff --git a/security/amavisd-new/pkg-plist b/security/amavisd-new/pkg-plist
index 82e85858cb78..783c6f034035 100644
--- a/security/amavisd-new/pkg-plist
+++ b/security/amavisd-new/pkg-plist
@@ -1,13 +1,13 @@
 %%PORTDOCS%%share/doc/amavisd-new/AAAREADME.first
 %%PORTDOCS%%share/doc/amavisd-new/INSTALL
 %%PORTDOCS%%share/doc/amavisd-new/LICENSE
+%%PORTDOCS%%share/doc/amavisd-new/README.chroot
 %%PORTDOCS%%share/doc/amavisd-new/README.customize
 %%PORTDOCS%%share/doc/amavisd-new/README.exim_v3
 %%PORTDOCS%%share/doc/amavisd-new/README.exim_v4
 %%PORTDOCS%%share/doc/amavisd-new/README.exim_v4_app
 %%PORTDOCS%%share/doc/amavisd-new/README.lookups
 %%PORTDOCS%%share/doc/amavisd-new/README.milter
-%%PORTDOCS%%share/doc/amavisd-new/README.old
 %%PORTDOCS%%share/doc/amavisd-new/README.old.scanners
 %%PORTDOCS%%share/doc/amavisd-new/README.performance
 %%PORTDOCS%%share/doc/amavisd-new/README.postfix
@@ -19,4 +19,3 @@ etc/rc.d/amavisd.sh
 %%AMAVIS_NOMILTER%%sbin/amavis
 %%AMAVIS_NOMILTER%%sbin/amavis-milter
 sbin/amavisd
-sbin/amavisdconf