ports/70933: MAINTAINER UPDATE: security/amavisd-new

[Blaz Zupan]

The following reply was made to PR ports/70933; it has been noted by GNATS.

From: Blaz Zupan <blaz at amis.net>
To: FreeBSD-gnats-submit at 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
 +