- installs two new README files that I missed in the previous update

- adds an entry to amavisd.conf for the Fizzer worm because it fakes
  the sender address (suggested by mutt@free.fr)
- set the log level back to 0, because apparently it was set to 2 by
  mistake by the author (suggested by mutt@free.fr)

- Bump PORTREVISION

PR:		52399
Submitted by:	maintainer

3 files changed, 23 insertions, 8 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 8edb3fbe0796..2e6510fe0c96 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	amavisd-new
 PORTVERSION=	20030314.p2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-p/}
@@ -94,13 +95,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.sh ${PREFIX}/etc/rc.d
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for FILE in AAAREADME.first INSTALL LICENSE \
-	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.chroot README_FILES/README.old.scanners \
-	README_FILES/README.performance README_FILES/README.postfix \
-	README_FILES/README.sendmail RELEASE_NOTES
+.for FILE in AAAREADME.first INSTALL LICENSE RELEASE_NOTES README_FILES/*
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
 
diff --git a/security/amavisd-new/files/patch-amavisd.conf b/security/amavisd-new/files/patch-amavisd.conf
index 1e74a685b018..011f0a4c4fd8 100644
--- a/security/amavisd-new/files/patch-amavisd.conf
+++ b/security/amavisd-new/files/patch-amavisd.conf
@@ -1,5 +1,5 @@
 --- amavisd.conf.orig	Wed Apr 30 19:04:16 2003
-+++ amavisd.conf	Sun May 11 09:48:22 2003
++++ amavisd.conf	Sun May 18 20:18:14 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.
@@ -20,6 +20,24 @@
  
  # Runtime working directory (cwd), and a place where
  # temporary directories for unpacking mail are created.
+@@ -269,7 +269,7 @@
+ # 3: server, client
+ # 4: decompose parts
+ # 5: more debug details
+-$log_level = 2;		  # (defaults to 0)
++$log_level = 0;		  # (defaults to 0)
+ 
+ # Customizeable template for the most interesting log file entry (e.g. with
+ # $log_level=0) (take care to properly quote Perl special characters like '\')
+@@ -413,7 +413,7 @@
+ # See README.lookups for syntax.
+ #
+ $viruses_that_fake_sender_re = new_RE(
+-  qr'nimda|hybris|klez|bugbear|yaha|braid|sobig'i );
++  qr'nimda|hybris|klez|bugbear|yaha|braid|sobig|fizzer'i );
+ 
+ 
+ # where to send ADMIN VIRUS NOTIFICATIONS (should be a fully qualified address)
 @@ -479,7 +479,7 @@
  #   or a directory (no trailing slash)
  #   (the default value is undef, meaning no quarantine)
diff --git a/security/amavisd-new/pkg-plist b/security/amavisd-new/pkg-plist
index 783c6f034035..4b428310ae20 100644
--- a/security/amavisd-new/pkg-plist
+++ b/security/amavisd-new/pkg-plist
@@ -2,6 +2,7 @@
 %%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.contributed
 %%PORTDOCS%%share/doc/amavisd-new/README.customize
 %%PORTDOCS%%share/doc/amavisd-new/README.exim_v3
 %%PORTDOCS%%share/doc/amavisd-new/README.exim_v4
@@ -12,6 +13,7 @@
 %%PORTDOCS%%share/doc/amavisd-new/README.performance
 %%PORTDOCS%%share/doc/amavisd-new/README.postfix
 %%PORTDOCS%%share/doc/amavisd-new/README.sendmail
+%%PORTDOCS%%share/doc/amavisd-new/README.sendmail-dual
 %%PORTDOCS%%share/doc/amavisd-new/RELEASE_NOTES
 %%PORTDOCS%%@dirrm share/doc/amavisd-new
 etc/amavisd.conf-dist