diff options
-rw-r--r-- | security/amavisd-new/Makefile | 10 | ||||
-rw-r--r-- | security/amavisd-new/PLIST | 5 | ||||
-rw-r--r-- | security/amavisd-new/distinfo | 10 | ||||
-rw-r--r-- | security/amavisd-new/patches/patch-aa | 28 |
4 files changed, 27 insertions, 26 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 8a4c227b1cf..0e1f6fa1690 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,15 +1,13 @@ -# $NetBSD: Makefile,v 1.23 2006/07/22 04:46:18 rillig Exp $ +# $NetBSD: Makefile,v 1.24 2006/10/02 12:39:30 obache Exp $ 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-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-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 diff --git a/security/amavisd-new/PLIST b/security/amavisd-new/PLIST index ba80d98c838..1730993d2f9 100644 --- a/security/amavisd-new/PLIST +++ b/security/amavisd-new/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2005/08/22 09:47:30 cube Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/10/02 12:39:30 obache Exp $ ${MILTER}sbin/amavis ${MILTER}sbin/amavis-milter sbin/amavisd @@ -12,12 +12,14 @@ share/doc/amavisd-new/README.banned share/doc/amavisd-new/README.chroot share/doc/amavisd-new/README.contributed share/doc/amavisd-new/README.courier +share/doc/amavisd-new/README.courier-old share/doc/amavisd-new/README.customize share/doc/amavisd-new/README.exim_v3 share/doc/amavisd-new/README.exim_v3_app share/doc/amavisd-new/README.exim_v4 share/doc/amavisd-new/README.exim_v4_app share/doc/amavisd-new/README.exim_v4_app2 +share/doc/amavisd-new/README.ldap share/doc/amavisd-new/README.lookups share/doc/amavisd-new/README.milter share/doc/amavisd-new/README.old.scanners @@ -27,6 +29,7 @@ share/doc/amavisd-new/README.postfix share/doc/amavisd-new/README.protocol share/doc/amavisd-new/README.sendmail share/doc/amavisd-new/README.sendmail-dual +share/doc/amavisd-new/README.sendmail-dual.old share/doc/amavisd-new/README.sql share/doc/amavisd-new/RELEASE_NOTES share/doc/amavisd-new/amavisd-new-docs.html diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo index cafa9a5b280..91131311fca 100644 --- a/security/amavisd-new/distinfo +++ b/security/amavisd-new/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2005/09/04 20:23:14 recht Exp $ +$NetBSD: distinfo,v 1.7 2006/10/02 12:39:30 obache 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) = 5fc651ecc78240d82f9346f68eb25f17de946ea4 diff --git a/security/amavisd-new/patches/patch-aa b/security/amavisd-new/patches/patch-aa index 7ab78d6054b..7c51dbbedd2 100644 --- a/security/amavisd-new/patches/patch-aa +++ b/security/amavisd-new/patches/patch-aa @@ -1,28 +1,28 @@ -$NetBSD: patch-aa,v 1.3 2005/08/22 09:47:30 cube Exp $ +$NetBSD: patch-aa,v 1.4 2006/10/02 12:39:30 obache Exp $ ---- amavisd.conf.orig 2005-05-09 20:22:36.000000000 +0200 +--- amavisd.conf.orig 2006-06-27 11:31:50.000000000 +0000 +++ amavisd.conf @@ -14,15 +14,15 @@ use strict; # @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 @@ $mailfrom_to_quarantine = ''; # null ret # $recipient_delimiter = '+'; # undef disables address extensions altogether # when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+ |