From blaz.zupan@amis.net  Sun May 18 11:28:24 2003
Return-Path: <blaz.zupan@amis.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 99D7637B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 18 May 2003 11:28:24 -0700 (PDT)
Received: from stingray.amis.net (stingray.amis.net [212.18.32.19])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3A46143FAF
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 18 May 2003 11:28:23 -0700 (PDT)
	(envelope-from blaz.zupan@amis.net)
Received: from localhost (localhost [127.0.0.1])
	by stingray.amis.net (Postfix) with ESMTP id DBE193865CF
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 18 May 2003 20:28:21 +0200 (CEST)
Received: from stingray.amis.net ([127.0.0.1])
 by localhost (stingray.amis.net [127.0.0.1]) (amavisd-new, port 10024)
 with LMTP id 13539-05 for <FreeBSD-gnats-submit@freebsd.org>;
 Sun, 18 May 2003 20:28:21 +0200 (CEST)
Received: from titanic.medinet.si (titanic.medinet.si [212.18.42.5])
	by stingray.amis.net (Postfix) with ESMTP id 1CFBE3865A2
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 18 May 2003 20:28:21 +0200 (CEST)
Received: by titanic.medinet.si (Postfix, from userid 1000)
	id F2A2A55404; Sun, 18 May 2003 20:28:20 +0200 (CEST)
Message-Id: <20030518182820.F2A2A55404@titanic.medinet.si>
Date: Sun, 18 May 2003 20:28:20 +0200 (CEST)
From: Blaz Zupan <blaz@si.FreeBSD.org>
Reply-To: Blaz Zupan <blaz@si.FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject:
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         52399
>Category:       ports
>Synopsis:       Maintainer-update security/amavisd-new
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 18 11:30:20 PDT 2003
>Closed-Date:    Mon May 19 05:56:58 PDT 2003
>Last-Modified:  Mon May 19 05:56:58 PDT 2003
>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@bigbrother.amis.net:/db/obj/usr/src/sys/TITANIC i386


	
>Description:
Update for the amavisd-new port:
- 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)

>How-To-Repeat:
	
>Fix:

diff -urN amavisd-new.old/Makefile amavisd-new/Makefile
--- amavisd-new.old/Makefile	Fri May 16 06:51:27 2003
+++ amavisd-new/Makefile	Sun May 18 20:11:27 2003
@@ -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 @@
 	${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 -urN amavisd-new.old/files/patch-amavisd.conf amavisd-new/files/patch-amavisd.conf
--- amavisd-new.old/files/patch-amavisd.conf	Fri May 16 06:51:27 2003
+++ amavisd-new/files/patch-amavisd.conf	Sun May 18 20:18:34 2003
@@ -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 -urN amavisd-new.old/pkg-plist amavisd-new/pkg-plist
--- amavisd-new.old/pkg-plist	Sun Apr 20 12:54:09 2003
+++ amavisd-new/pkg-plist	Sun May 18 20:11:40 2003
@@ -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
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: arved 
State-Changed-When: Mon May 19 05:56:48 PDT 2003 
State-Changed-Why:  
Committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=52399 
>Unformatted:
