From blaz@medinet.si  Wed Aug 25 10:48:24 2004
Return-Path: <blaz@medinet.si>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AB6AF16A4EF
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 25 Aug 2004 10:48:24 +0000 (GMT)
Received: from out-2.mail.amis.net (out-2.mail.amis.net [212.18.32.14])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9BB3043D48
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 25 Aug 2004 10:48:23 +0000 (GMT)
	(envelope-from blaz@medinet.si)
Received: from localhost (in-1.mail.amis.net [212.18.32.15])
	by out-2.mail.amis.net (Postfix) with ESMTP id 50FDA106964
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 25 Aug 2004 12:48:22 +0200 (CEST)
Received: from in-1.mail.amis.net ([127.0.0.1])
 by localhost (in-1.mail.amis.net [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 26812-02 for <FreeBSD-gnats-submit@freebsd.org>;
 Wed, 25 Aug 2004 12:48:17 +0200 (CEST)
Received: from piranha.amis.net (piranha.amis.net [212.18.32.3])
	by in-1.mail.amis.net (Postfix) with ESMTP id 398BC3C90DF
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 25 Aug 2004 12:48:17 +0200 (CEST)
Received: from titanic.medinet.si (titanic.medinet.si [212.18.42.5])
	by piranha.amis.net (Postfix) with ESMTP id 24EEDFDA7
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 25 Aug 2004 12:48:17 +0200 (CEST)
Received: by titanic.medinet.si (Postfix, from userid 1000)
	id 158DD5547B; Wed, 25 Aug 2004 12:48:17 +0200 (CEST)
Message-Id: <20040825104817.158DD5547B@titanic.medinet.si>
Date: Wed, 25 Aug 2004 12:48:17 +0200 (CEST)
From: Blaz Zupan <blaz@medinet.si>
Reply-To: Blaz Zupan <blaz@medinet.si>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: MAINTAINER UPDATE: security/amavisd-new 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         70933
>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:   Wed Aug 25 10:50:27 GMT 2004
>Closed-Date:    Thu Aug 26 18:52:31 GMT 2004
>Last-Modified:  Thu Aug 26 18:52:31 GMT 2004
>Originator:     Blaz Zupan
>Release:        FreeBSD 4.10-RELEASE i386
>Organization:
>Environment:
System: FreeBSD titanic.medinet.si 4.10-RELEASE FreeBSD 4.10-RELEASE #1: Sun Jun 27 16:39:26 CEST 2004 root@bigbrother.amis.net:/usr/obj/usr/src/sys/TITANIC i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

diff -urN amavisd-new.old/Makefile amavisd-new/Makefile
--- amavisd-new.old/Makefile	Mon Aug 16 19:19:16 2004
+++ amavisd-new/Makefile	Wed Aug 25 12:41:25 2004
@@ -7,7 +7,7 @@
 # Based on amavisd ports makefile.
 
 PORTNAME=	amavisd-new
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
diff -urN amavisd-new.old/distinfo amavisd-new/distinfo
--- amavisd-new.old/distinfo	Mon Aug 16 19:19:16 2004
+++ amavisd-new/distinfo	Wed Aug 25 12:41:05 2004
@@ -1,2 +1,2 @@
-MD5 (amavisd-new-2.1.0.tar.gz) = 200b0568ac9d14819c80575989617db6
-SIZE (amavisd-new-2.1.0.tar.gz) = 464610
+MD5 (amavisd-new-2.1.1.tar.gz) = 85f1dff7d1f3add4c7556269daee15d9
+SIZE (amavisd-new-2.1.1.tar.gz) = 462664
diff -urN amavisd-new.old/files/patch-amavisd-nanny amavisd-new/files/patch-amavisd-nanny
--- amavisd-new.old/files/patch-amavisd-nanny	Mon Aug 16 19:19:16 2004
+++ amavisd-new/files/patch-amavisd-nanny	Wed Aug 25 12:42:40 2004
@@ -1,11 +1,11 @@
---- amavisd-nanny.orig	Wed Aug 11 02:39:16 2004
-+++ amavisd-nanny	Mon Aug 16 11:41:56 2004
-@@ -61,7 +61,7 @@
- # main program starts here
-   $SIG{INT} = sub { die "\n" };
-   my($env) = BerkeleyDB::Env->new(
--    '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
-+    '-Home'=>'%%AMAVISDIR%%/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
-   defined $env or die "BDB no env: $BerkeleyDB::Error $!";
-   my($db) = BerkeleyDB::Hash->new(
-     '-Filename'=>'nanny.db', '-Env'=>$env );
+--- amavisd-nanny.orig	Tue Aug 24 16:34:51 2004
++++ amavisd-nanny	Wed Aug 25 12:42:23 2004
+@@ -52,7 +52,7 @@
+ my($activettl) = 10*60; # stuck active children are sent a SIGTERM after this
+                         # many seconds
+ 
+-my($db_home) = '/var/amavis/db';  # DB databases directory
++my($db_home) = '%%AMAVISDIR%%';  # DB databases directory
+ my($dbfile)  = 'nanny.db';
+ my($wakeuptime) = 2;  # seconds
+ 
>Release-Note:
>Audit-Trail:

From: Blaz Zupan <blaz@amis.net>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/70933: MAINTAINER UPDATE: security/amavisd-new 
Date: Wed, 25 Aug 2004 12:56:10 +0200 (CEST)

 Oops, previous version has a stupid mistake, please commit this one instead:
 
 diff -urN amavisd-new.old/Makefile amavisd-new/Makefile
 --- amavisd-new.old/Makefile	Mon Aug 16 19:19:16 2004
 +++ amavisd-new/Makefile	Wed Aug 25 12:41:25 2004
 @@ -7,7 +7,7 @@
  # Based on amavisd ports makefile.
 
  PORTNAME=	amavisd-new
 -PORTVERSION=	2.1.0
 +PORTVERSION=	2.1.1
  PORTEPOCH=	1
  CATEGORIES=	security
  MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
 diff -urN amavisd-new.old/distinfo amavisd-new/distinfo
 --- amavisd-new.old/distinfo	Mon Aug 16 19:19:16 2004
 +++ amavisd-new/distinfo	Wed Aug 25 12:41:05 2004
 @@ -1,2 +1,2 @@
 -MD5 (amavisd-new-2.1.0.tar.gz) = 200b0568ac9d14819c80575989617db6
 -SIZE (amavisd-new-2.1.0.tar.gz) = 464610
 +MD5 (amavisd-new-2.1.1.tar.gz) = 85f1dff7d1f3add4c7556269daee15d9
 +SIZE (amavisd-new-2.1.1.tar.gz) = 462664
 diff -urN amavisd-new.old/files/patch-amavisd-nanny amavisd-new/files/patch-amavisd-nanny
 --- amavisd-new.old/files/patch-amavisd-nanny	Mon Aug 16 19:19:16 2004
 +++ amavisd-new/files/patch-amavisd-nanny	Wed Aug 25 12:42:40 2004
 @@ -1,11 +1,11 @@
 ---- amavisd-nanny.orig	Wed Aug 11 02:39:16 2004
 -+++ amavisd-nanny	Mon Aug 16 11:41:56 2004
 -@@ -61,7 +61,7 @@
 - # main program starts here
 -   $SIG{INT} = sub { die "\n" };
 -   my($env) = BerkeleyDB::Env->new(
 --    '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
 -+    '-Home'=>'%%AMAVISDIR%%/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
 -   defined $env or die "BDB no env: $BerkeleyDB::Error $!";
 -   my($db) = BerkeleyDB::Hash->new(
 -     '-Filename'=>'nanny.db', '-Env'=>$env );
 +--- amavisd-nanny.orig	Tue Aug 24 16:34:51 2004
 ++++ amavisd-nanny	Wed Aug 25 12:42:23 2004
 +@@ -52,7 +52,7 @@
 + my($activettl) = 10*60; # stuck active children are sent a SIGTERM after this
 +                         # many seconds
 +
 +-my($db_home) = '/var/amavis/db';  # DB databases directory
 ++my($db_home) = '%%AMAVISDIR%%/db';  # DB databases directory
 + my($dbfile)  = 'nanny.db';
 + my($wakeuptime) = 2;  # seconds
 +

From: Blaz Zupan <blaz@amis.net>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/70933: MAINTAINER UPDATE: security/amavisd-new 
Date: Wed, 25 Aug 2004 17:59:31 +0200 (CEST)

 Have just been informed by the amavisd-new author that he forgot to increment
 the version number so amavisd-new logs the old version number (2.1.0) through
 syslog. He asked me to patch this in the FreeBSD port. Here is a improved
 update patch that fixes this omission, please commit this one.
 
 diff -urN amavisd-new.orig/Makefile amavisd-new/Makefile
 --- amavisd-new.orig/Makefile	Mon Aug 16 19:19:16 2004
 +++ amavisd-new/Makefile	Wed Aug 25 12:41:25 2004
 @@ -7,7 +7,7 @@
  # Based on amavisd ports makefile.
 
  PORTNAME=	amavisd-new
 -PORTVERSION=	2.1.0
 +PORTVERSION=	2.1.1
  PORTEPOCH=	1
  CATEGORIES=	security
  MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
 diff -urN amavisd-new.orig/distinfo amavisd-new/distinfo
 --- amavisd-new.orig/distinfo	Mon Aug 16 19:19:16 2004
 +++ amavisd-new/distinfo	Wed Aug 25 12:41:05 2004
 @@ -1,2 +1,2 @@
 -MD5 (amavisd-new-2.1.0.tar.gz) = 200b0568ac9d14819c80575989617db6
 -SIZE (amavisd-new-2.1.0.tar.gz) = 464610
 +MD5 (amavisd-new-2.1.1.tar.gz) = 85f1dff7d1f3add4c7556269daee15d9
 +SIZE (amavisd-new-2.1.1.tar.gz) = 462664
 diff -urN amavisd-new.orig/files/patch-amavisd amavisd-new/files/patch-amavisd
 --- amavisd-new.orig/files/patch-amavisd	Sun Jul 18 12:05:50 2004
 +++ amavisd-new/files/patch-amavisd	Wed Aug 25 17:54:26 2004
 @@ -1,6 +1,15 @@
 ---- amavisd.orig	Sun Jul  4 03:19:35 2004
 -+++ amavisd	Sun Jul  4 11:28:36 2004
 -@@ -7367,7 +7367,7 @@
 +--- amavisd.orig	Tue Aug 24 16:25:52 2004
 ++++ amavisd	Wed Aug 25 17:54:10 2004
 +@@ -371,7 +371,7 @@
 +   !defined($var) ? [] : !ref($var) ? [$var] : $var;
 + }
 +
 +-$myversion = 'amavisd-new-2.1.0';
 ++$myversion = 'amavisd-new-2.1.1';
 +
 + $eol = "\n";  # native record separator in files: LF or CRLF or even CR
 + $unicode_aware = $]>=5.008 && length("\x{263a}")==1 && eval { require Encode };
 +@@ -7409,7 +7409,7 @@
   $Amavis::Conf::log_recip_templ = $1
     if $Amavis::Conf::log_recip_templ=~/^(.*?)[\r\n]+\z/s;
 
 diff -urN amavisd-new.orig/files/patch-amavisd-nanny amavisd-new/files/patch-amavisd-nanny
 --- amavisd-new.orig/files/patch-amavisd-nanny	Mon Aug 16 19:19:16 2004
 +++ amavisd-new/files/patch-amavisd-nanny	Wed Aug 25 12:55:00 2004
 @@ -1,11 +1,11 @@
 ---- amavisd-nanny.orig	Wed Aug 11 02:39:16 2004
 -+++ amavisd-nanny	Mon Aug 16 11:41:56 2004
 -@@ -61,7 +61,7 @@
 - # main program starts here
 -   $SIG{INT} = sub { die "\n" };
 -   my($env) = BerkeleyDB::Env->new(
 --    '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
 -+    '-Home'=>'%%AMAVISDIR%%/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
 -   defined $env or die "BDB no env: $BerkeleyDB::Error $!";
 -   my($db) = BerkeleyDB::Hash->new(
 -     '-Filename'=>'nanny.db', '-Env'=>$env );
 +--- amavisd-nanny.orig	Tue Aug 24 16:34:51 2004
 ++++ amavisd-nanny	Wed Aug 25 12:42:23 2004
 +@@ -52,7 +52,7 @@
 + my($activettl) = 10*60; # stuck active children are sent a SIGTERM after this
 +                         # many seconds
 +
 +-my($db_home) = '/var/amavis/db';  # DB databases directory
 ++my($db_home) = '%%AMAVISDIR%%/db';  # DB databases directory
 + my($dbfile)  = 'nanny.db';
 + my($wakeuptime) = 2;  # seconds
 +
State-Changed-From-To: open->closed 
State-Changed-By: sem 
State-Changed-When: Thu Aug 26 18:52:19 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

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