>Number:         34041
>Category:       pkg
>Synopsis:       updating amavisd-new to 2.4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jul 19 19:35:00 +0000 2006
>Originator:     Julian Dunn
>Release:        NetBSD 3.0
>Organization:
	Aquezada Productions
>Environment:
	
	
System: NetBSD netbsd3.acf.aquezada.com 3.0 NetBSD 3.0 (GENERIC) #0: Mon Dec 19 01:04:02 UTC 2005 builds@works.netbsd.org:/home/builds/ab/netbsd-3-0-RELEASE/i386/200512182024Z-obj/home/builds/ab/netbsd-3-0-RELEASE/src/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
	This is an update of security/amavisd-new to 2.4.2. It will also
	fix the problem of "Don't know how to make replace-interpreter"
	which was introduced by recent changes in the pkgsrc framework.

>How-To-Repeat:
	
>Fix:


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/amavisd-new/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	23 Apr 2006 00:12:41 -0000	1.21
+++ Makefile	19 Jul 2006 18:00:00 -0000
@@ -2,14 +2,12 @@
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
-PKGREVISION=	3
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
 		http://mirrors.catpipe.net/amavisd-new/ \
-		http://ftp.cfu.net/pub/amavisd-new/ \
-		ftp://ftp.cfu.net/pub/amavisd-new/
+		http://mirror.mainloop.se/amavisd/
 
-VERSION=	2.3.3
+VERSION=	2.4.2
 PATCHLEVEL=	# empty
 
 MAINTAINER=	jdunn@aquezada.com
@@ -23,7 +21,7 @@
 DEPENDS+=	p5-Convert-TNEF-[0-9]*:../../converters/p5-Convert-TNEF
 DEPENDS+=	p5-Convert-UUlib>=1.05:../../converters/p5-Convert-UUlib
 DEPENDS+=	p5-Digest-MD5>=2.22:../../security/p5-Digest-MD5
-DEPENDS+=	p5-MIME-tools>=5.415:../../mail/p5-MIME-tools
+DEPENDS+=	p5-MIME-tools>=5.417:../../mail/p5-MIME-tools
 DEPENDS+=	p5-MailTools>=1.58:../../mail/p5-MailTools
 DEPENDS+=	p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
 DEPENDS+=	p5-Net>=1.16:../../net/p5-Net
@@ -88,7 +86,6 @@
 .  include "../../mk/pthread.buildlink3.mk"
 .else
 USE_LANGUAGES=		# empty
-NO_CONFIGURE=		yes
 PLIST_SUBST+=		MILTER="@comment "
 
 do-build:	replace-interpreter
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/amavisd-new/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo	4 Sep 2005 20:23:14 -0000	1.6
+++ distinfo	19 Jul 2006 18:00:00 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.6 2005/09/04 20:23:14 recht Exp $
 
-SHA1 (amavisd-new-2.3.3.tar.gz) = 5676f7df377b5af8349c989b9da8fd07ce383242
-RMD160 (amavisd-new-2.3.3.tar.gz) = c2213190582fe8fea9b8f1736e3b3e49b2906887
-Size (amavisd-new-2.3.3.tar.gz) = 772280 bytes
-SHA1 (patch-aa) = c669fda0df16424c9234ad4ba7dcb080e8b66354
+SHA1 (amavisd-new-2.4.2.tar.gz) = 48893e23b03bb4ef493473b0f066e4f4d65ff1b7
+RMD160 (amavisd-new-2.4.2.tar.gz) = fd82a0f3a1166d7f70846651b7b91af147b3fb70
+Size (amavisd-new-2.4.2.tar.gz) = 854326 bytes
+SHA1 (patch-aa) = 497681d7adf6a9d2b349264619336173f29e84fe
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/security/amavisd-new/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- patches/patch-aa	22 Aug 2005 09:47:30 -0000	1.3
+++ patches/patch-aa	19 Jul 2006 18:00:00 -0000
@@ -1,28 +1,28 @@
-$NetBSD: patch-aa,v 1.3 2005/08/22 09:47:30 cube Exp $
+$Id$
 
---- amavisd.conf.orig	2005-05-09 20:22:36.000000000 +0200
-+++ amavisd.conf
-@@ -14,15 +14,15 @@ use strict;
+--- amavisd.conf.orig	2006-06-27 07:31:50.000000000 -0400
++++ amavisd.conf	2006-07-18 16:39:22.000000000 -0400
+@@ -14,15 +14,15 @@
  # @bypass_spam_checks_maps  = (1);  # uncomment to DISABLE anti-spam code
  
- $max_servers = 2;            # number of pre-forked children (2..15 is common)
--$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis)
--$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis)
-+$daemon_user  = '@AMAVIS_USER@';     # (no default;  customary: vscan or amavis)
-+$daemon_group = '@AMAVIS_GROUP@';     # (no default;  customary: vscan or amavis)
+ $max_servers = 2;            # num of pre-forked children (2..15 is common), -m
+-$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis), -u
+-$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis), -g
++$daemon_user  = '@AMAVIS_USER@';     # (no default;  customary: vscan or amavis), -u
++$daemon_group = '@AMAVIS_GROUP@';     # (no default;  customary: vscan or amavis), -g
  
  $mydomain = 'example.com';   # a convenient default for other settings
  
--$MYHOME   = '/var/amavis';   # a convenient default for other settings
-+$MYHOME   = '@AMAVIS_DIR@';   # a convenient default for other settings
- $TEMPBASE = "$MYHOME/tmp";   # working directory, needs to be created manually
+-# $MYHOME = '/var/amavis';   # a convenient default for other settings, -H
++$MYHOME = '@AMAVIS_DIR@';   # a convenient default for other settings, -H
+ $TEMPBASE = "$MYHOME/tmp";   # working directory, needs to exist, -T
  $ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR
--$QUARANTINEDIR = '/var/virusmails';
-+$QUARANTINEDIR = '@AMAVIS_QUARANTINE@';
+-$QUARANTINEDIR = '/var/virusmails';  # -Q
++$QUARANTINEDIR = '@AMAVIS_QUARANTINE@';  # -Q
  # $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
  
- # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef
-@@ -79,7 +79,7 @@ $mailfrom_to_quarantine = ''; # null ret
+ # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef, -R
+@@ -91,7 +91,7 @@
  # $recipient_delimiter = '+';  # undef disables address extensions altogether
  # when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+
  

>Unformatted: