summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache>2008-07-24 13:49:22 +0000
committerobache <obache>2008-07-24 13:49:22 +0000
commit5bf0ca348f939811add956cacecddb3caca60c5d (patch)
treed9199e4c36cd0eaef0e7a68557f22827c11a18e8
parentad05762231c200db9341c1fbe43d4c7271490ca4 (diff)
downloadpkgsrc-5bf0ca348f939811add956cacecddb3caca60c5d.tar.gz
Update amavisd-new to 2.6.1.
Based on maintainer update request in PR 39196. 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
-rw-r--r--security/amavisd-new/Makefile9
-rw-r--r--security/amavisd-new/distinfo10
-rw-r--r--security/amavisd-new/patches/patch-aa14
3 files changed, 18 insertions, 15 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 1142a0438f7..1bd4c85a782 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.38 2008/06/12 02:14:44 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2008/07/24 13:49:22 obache Exp $
DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL}
PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
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
@@ -23,6 +25,7 @@ DEPENDS+= p5-Compress-Zlib>=1.35:../../devel/p5-Compress-Zlib
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
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index 6324e277715..c100cfe07ab 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2008/02/19 16:20:15 reed Exp $
+$NetBSD: distinfo,v 1.14 2008/07/24 13:49:22 obache 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
diff --git a/security/amavisd-new/patches/patch-aa b/security/amavisd-new/patches/patch-aa
index f18f46cafd3..8f45e40a7ed 100644
--- a/security/amavisd-new/patches/patch-aa
+++ b/security/amavisd-new/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.5 2007/06/01 04:41:07 xtraeme Exp $
+$NetBSD: patch-aa,v 1.6 2008/07/24 13:49:22 obache 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 @@ $NetBSD: patch-aa,v 1.5 2007/06/01 04:41:07 xtraeme Exp $
-$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=+