pkg/39196: maintainer update: security/amavisd-new to 2.6.1

[jdunn%aquezada.com@localhost (Julian C. Dunn)]

>Number:         39196
>Category:       pkg
>Synopsis:       Maintainer update of security/amavisd-new to 2.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Jul 23 02:55:01 +0000 2008
>Originator:     Julian Dunn
>Release:        NetBSD 4.0_STABLE
>Organization:
        
>Environment:
System: NetBSD netbsd4.acf.aquezada.com 4.0_STABLE NetBSD 4.0_STABLE 
(QEMUKTEST) #0: Wed Jul 16 02:37:22 EDT 2008 
root%netbsd4.acf.aquezada.com@localhost:/usr/obj/sys/arch/i386/compile/QEMUKTEST
 i386
Architecture: i386
Machine: i386
>Description:
Maintainer update of security/amavisd-new to 2.6.1. There are a lot of
changes and some incompatabilities with 2.5.3 (current version in pkgsrc)
particularly as respects SQL schema. Consult vendor's releases notes for
more detail: http://www.ijs.si/software/amavisd/release-notes.txt

>How-To-Repeat:

Not applicable

>Fix:

Commit following patch.


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/amavisd-new/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- Makefile    12 Jun 2008 02:14:44 -0000      1.38
+++ Makefile    23 Jul 2008 02:50:20 -0000
@@ -5,9 +5,11 @@
 CATEGORIES=    security mail
 MASTER_SITES=  http://www.ijs.si/software/amavisd/ \
                http://mirrors.catpipe.net/amavisd-new/ \
-               http://mirror.mainloop.se/amavisd/
+               http://mirror.mainloop.se/amavisd/ \
+               http://mirror.cedratnet.com/amavisd-new/ \
+               http://mirror.omroep.nl/amavisd-new/
 
-VERSION=       2.5.3
+VERSION=       2.6.1
 PATCHLEVEL=    # empty
 
 MAINTAINER=    jdunn%aquezada.com@localhost
@@ -23,6 +25,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-Mail-DKIM>=0.31:../../mail/p5-Mail-DKIM
 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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/amavisd-new/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo    19 Feb 2008 16:20:15 -0000      1.13
+++ distinfo    23 Jul 2008 02:50:20 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.13 2008/02/19 16:20:15 reed Exp $
 
-SHA1 (amavisd-new-2.5.3.tar.gz) = 2e1460ad505ad4251a876ec506d021a392c7c0c0
-RMD160 (amavisd-new-2.5.3.tar.gz) = 49b97ff3782b42f8aaba7beb73440398d83638d9
-Size (amavisd-new-2.5.3.tar.gz) = 789275 bytes
-SHA1 (patch-aa) = ce833a7fe370391b44fc413e84789fbca557cc4a
+SHA1 (amavisd-new-2.6.1.tar.gz) = 51e3e3d9c2aaa33f6a41a84092c82adb94e2a806
+RMD160 (amavisd-new-2.6.1.tar.gz) = c9e248540bfaf9cc6ab967776bd98e164b636db8
+Size (amavisd-new-2.6.1.tar.gz) = 911740 bytes
+SHA1 (patch-aa) = d8bc17da9b1d3ef883331d462ee06d534f5ff5b0
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/security/amavisd-new/patches/patch-aa,v
retrieving revision 1.5
diff -u -r1.5 patch-aa
--- patches/patch-aa    1 Jun 2007 04:41:07 -0000       1.5
+++ patches/patch-aa    23 Jul 2008 02:50:20 -0000
@@ -1,11 +1,11 @@
 $NetBSD: patch-aa,v 1.5 2007/06/01 04:41:07 xtraeme Exp $
 
---- amavisd.conf.orig  2007-06-01 06:33:09.000000000 +0200
-+++ amavisd.conf       2007-06-01 06:36:24.000000000 +0200
+--- amavisd.conf.orig  2008-06-24 22:23:05.000000000 -0400
++++ amavisd.conf       2008-06-24 22:25:53.000000000 -0400
 @@ -15,15 +15,15 @@
  # $bypass_decode_parts = 1;         # controls running of decoders&dearchivers
  
- $max_servers = 2;            # num of pre-forked children (2..15 is common), 
-m
+ $max_servers = 2;            # num of pre-forked children (2..30 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
@@ -20,9 +20,9 @@
 -$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, -R
-@@ -124,7 +124,7 @@
+ # $release_format = 'resend';     # 'attach', 'plain', 'resend'
+ # $report_format  = 'arf';        # 'attach', 'plain', 'resend', 'arf'
+@@ -130,7 +130,7 @@
  # $recipient_delimiter = '+';  # undef disables address extensions altogether
  # when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+