From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 25 08:40:18 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C2C037B404 for ; Wed, 25 Jun 2003 08:40:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C423743F85 for ; Wed, 25 Jun 2003 08:40:16 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5PFeGUp082891 for ; Wed, 25 Jun 2003 08:40:16 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5PFeG9r082890; Wed, 25 Jun 2003 08:40:16 -0700 (PDT) Resent-Date: Wed, 25 Jun 2003 08:40:16 -0700 (PDT) Resent-Message-Id: <200306251540.h5PFeG9r082890@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rob Evers Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 844B837B401 for ; Wed, 25 Jun 2003 08:39:15 -0700 (PDT) Received: from haha.debank.tv (c92069.upc-c.chello.nl [212.187.92.69]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87DDD43F85 for ; Wed, 25 Jun 2003 08:39:11 -0700 (PDT) (envelope-from rob@debank.tv) Received: from haha.debank.tv (localhost [127.0.0.1]) by haha.debank.tv (8.12.9/8.12.9) with ESMTP id h5PFd8Zc000554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 25 Jun 2003 17:39:08 +0200 (CEST) (envelope-from rob@debank.tv) Received: (from rob@localhost) by haha.debank.tv (8.12.9/8.12.9/Submit) id h5PFcwOt000552; Wed, 25 Jun 2003 17:38:58 +0200 (CEST) Message-Id: <200306251538.h5PFcwOt000552@haha.debank.tv> Date: Wed, 25 Jun 2003 17:38:58 +0200 (CEST) From: Rob Evers To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: blaz@si.FreeBSD.org Subject: ports/53728: Upgrade of security/amavisd-new from 20030314.p2 to 20030616.p1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Rob Evers List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jun 2003 15:40:18 -0000 >Number: 53728 >Category: ports >Synopsis: Upgrade of security/amavisd-new from 20030314.p2 to 20030616.p1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Jun 25 08:40:15 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Rob Evers >Release: FreeBSD 4.8-STABLE i386 >Organization: >Environment: System: FreeBSD haha.debank.tv 4.8-STABLE FreeBSD 4.8-STABLE #2: Sun Jun 8 23:25:20 CEST 2003 rob@haha.debank.tv:/usr/obj/usr/src/sys/HAH A i386 >Description: Upgrade of security/amavisd-new from 20030314.p2 to 20030616.p1 >How-To-Repeat: >Fix: --- amavisd-new.diff begins here --- diff -r -u amavisd-new.orig/Makefile amavisd-new/Makefile --- amavisd-new.orig/Makefile Wed Jun 25 16:35:46 2003 +++ amavisd-new/Makefile Wed Jun 25 16:45:32 2003 @@ -7,8 +7,7 @@ # Based on amavisd ports makefile. PORTNAME= amavisd-new -PORTVERSION= 20030314.p2 -PORTREVISION= 1 +PORTVERSION= 20030616.p1 CATEGORIES= security MASTER_SITES= http://www.ijs.si/software/amavisd/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-p/} Only in amavisd-new.orig/: amavisd-new diff -r -u amavisd-new.orig/distinfo amavisd-new/distinfo --- amavisd-new.orig/distinfo Wed Jun 25 16:35:46 2003 +++ amavisd-new/distinfo Wed Jun 25 16:44:09 2003 @@ -1 +1 @@ -MD5 (amavisd-new-20030314-p2.tar.gz) = a6c5c52237e3bc352bc2db07fface5af +MD5 (amavisd-new-20030616-p1.tar.gz) = ac64ca3ad0c3f04403f1499ca29e45b8 diff -r -u amavisd-new.orig/files/patch-amavisd.conf amavisd-new/files/patch-amavisd.conf --- amavisd-new.orig/files/patch-amavisd.conf Wed Jun 25 16:35:45 2003 +++ amavisd-new/files/patch-amavisd.conf Wed Jun 25 17:28:58 2003 @@ -1,9 +1,9 @@ ---- amavisd.conf.orig Wed Apr 30 19:04:16 2003 -+++ amavisd.conf Sun May 18 20:18:14 2003 +--- amavisd.conf.orig Wed Jun 25 17:22:46 2003 ++++ amavisd.conf Wed Jun 25 17:26:42 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! + # $MYHOME is not used directly by the program. No trailing slash! -#$MYHOME = '/var/lib/amavis'; # (default is '/var/amavis') +$MYHOME = '%%AMAVISDIR%%'; # (default is '/var/amavis') @@ -15,12 +15,12 @@ # (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) ++$daemon_user = '%%AMAVISUSER%%'; # (no default; customary: vscan or amavis) ++$daemon_group = '%%AMAVISGROUP%%'; # (no default; customary: vscan or amavis) # Runtime working directory (cwd), and a place where # temporary directories for unpacking mail are created. -@@ -269,7 +269,7 @@ +@@ -271,7 +271,7 @@ # 3: server, client # 4: decompose parts # 5: more debug details @@ -29,16 +29,7 @@ # 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 @@ +@@ -496,7 +496,7 @@ # or a directory (no trailing slash) # (the default value is undef, meaning no quarantine) # diff -r -u amavisd-new.orig/pkg-plist amavisd-new/pkg-plist --- amavisd-new.orig/pkg-plist Wed Jun 25 16:35:46 2003 +++ amavisd-new/pkg-plist Wed Jun 25 16:48:01 2003 @@ -7,6 +7,7 @@ %%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.exim_v4_app2 %%PORTDOCS%%share/doc/amavisd-new/README.lookups %%PORTDOCS%%share/doc/amavisd-new/README.milter %%PORTDOCS%%share/doc/amavisd-new/README.old.scanners --- amavisd-new.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: