Changes 2.6.4:

Bug Fixes
* amavisd failed to start when spam scanning was disabled either
  by @bypass_spam_checks_maps=(1) or by @spam_scanners=(), giving:
    Can't locate object method "new" via package "Amavis::SpamControl"
  As a workaround one could use a @spam_scanners=(undef) to disable spam
  scanning;
* several decoders failed to propagate "Exceeded storage quota" exception,
  so the protection of AV scanners against mail bombs was ineffective;
  reported by Jorgen Lundman;
* milter usage (AM.PDP): verbatim header edits inserted a header body of
  "1" instead of the correct string
* updated AV entry for BitDefender's bdscan to recognize tabs around
  a colon in its output; contributed by Steve;
* fix parsing of a combined result from DSPAM (option --classify), as
  earlier versions of DSPAM did not include a signature with a combined
  result line; problem reported by Marijan Vidmar;
New Features
* provide a true SNMP agent and a MIB, facilitating monitoring the health
  of a content filtering system, its performance and mail characteristics;
* a new AV interface to SMTP-based antivirus scanners;
* allow customizing SMTP-status response reason text for blocked messages;
* prevent inserting fake copies of certain important mail header fields
  without breaking a DKIM signature;

2 files changed, 18 insertions, 18 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index a3b7a0e9319..35e24c73964 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2009/04/11 23:15:21 sno Exp $
+# $NetBSD: Makefile,v 1.42 2010/11/08 18:06:57 adam Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
-PKGREVISION=	1
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
 		http://mirrors.catpipe.net/amavisd-new/ \
@@ -10,12 +9,13 @@ MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
 		http://mirror.cedratnet.com/amavisd-new/ \
 		http://mirror.omroep.nl/amavisd-new/
 
-VERSION=	2.6.2
-PATCHLEVEL=	# empty
-
 MAINTAINER=	jdunn@aquezada.com
 HOMEPAGE=	http://www.ijs.si/software/amavisd/
-COMMENT=	daemonized interface between MTA and content checkers
+COMMENT=	Daemonized interface between MTA and content checkers
+LICENSE=	gnu-gpl-v2
+
+VERSION=	2.6.4
+PATCHLEVEL=	# empty
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -55,9 +55,9 @@ MESSAGE_SRC=		${PKGDIR}/MESSAGE
 PKG_GROUPS_VARS+=	AMAVIS_GROUP
 PKG_USERS_VARS+=	AMAVIS_USER
 BUILD_DEFS+=		AMAVIS_DIR AMAVIS_QUARANTINE
-FILES_SUBST+=		AMAVIS_USER=${AMAVIS_USER:Q}
-FILES_SUBST+=		AMAVIS_GROUP=${AMAVIS_GROUP:Q}
-FILES_SUBST+=		AMAVIS_DIR=${AMAVIS_DIR:Q}
+FILES_SUBST+=		AMAVIS_USER=${AMAVIS_USER}
+FILES_SUBST+=		AMAVIS_GROUP=${AMAVIS_GROUP}
+FILES_SUBST+=		AMAVIS_DIR=${AMAVIS_DIR}
 FILES_SUBST+=		AMAVIS_QUARANTINE=${AMAVIS_QUARANTINE:Q}
 
 PKG_GROUPS=	${AMAVIS_GROUP}
@@ -78,13 +78,13 @@ PKG_SUPPORTED_OPTIONS=	milter
 PLIST_VARS+=		milter
 .if !empty(PKG_OPTIONS:Mmilter)
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-runtime-dir=${AMAVIS_DIR:Q}
+CONFIGURE_ARGS+=	--with-runtime-dir=${AMAVIS_DIR}
 CONFIGURE_ARGS+=	--with-sockname=${AMAVIS_DIR}/amavisd.sock
-CONFIGURE_ARGS+=	--with-user=${AMAVIS_USER:Q}
+CONFIGURE_ARGS+=	--with-user=${AMAVIS_USER}
 CONFIGURE_ARGS+=	--with-milterinc=${BUILDLINK_PREFIX.libmilter}/include
 CONFIGURE_ARGS+=	--with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib
-CONFIGURE_DIRS=		${WRKSRC}/helper-progs
-BUILD_DIRS=		${WRKSRC}/helper-progs
+CONFIGURE_DIRS=		helper-progs
+BUILD_DIRS=		helper-progs
 RCD_SCRIPTS+=		amavismilter
 MESSAGE_SRC+=		${PKGDIR}/MESSAGE.milter
 PLIST.milter=		yes
@@ -129,7 +129,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README_FILES/amavisd-new-docs.html ${DESTDIR}${DOCDIR}
 	for file in README_FILES/README.*; do				\
-		${INSTALL_DATA} ${WRKSRC}/$$file ${DESTDIR}${DOCDIR};		\
+		${INSTALL_DATA} ${WRKSRC}/$$file ${DESTDIR}${DOCDIR};	\
 	done
 	${INSTALL_DATA} ${WRKSRC}/amavisd.conf ${DESTDIR}${EGDIR}/amavisd.conf-minimal
 	${INSTALL_DATA} ${WRKSRC}/amavisd.conf-default ${DESTDIR}${EGDIR}
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index 4861845822c..2c4c3949149 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2009/01/01 14:30:02 obache Exp $
+$NetBSD: distinfo,v 1.16 2010/11/08 18:06:57 adam Exp $
 
-SHA1 (amavisd-new-2.6.2.tar.gz) = 14131c7e0febdda7cd8bc360a6423599c0535d87
-RMD160 (amavisd-new-2.6.2.tar.gz) = 50dcb614d7deaa16f5b02d8d336912fad54f2834
-Size (amavisd-new-2.6.2.tar.gz) = 903818 bytes
+SHA1 (amavisd-new-2.6.4.tar.gz) = 993b7ca839ce038fd13f65351950f0ef03d99ff9
+RMD160 (amavisd-new-2.6.4.tar.gz) = 010dd9bf49a3c7553996c49553fd0fa84ca7bdab
+Size (amavisd-new-2.6.4.tar.gz) = 947596 bytes
 SHA1 (patch-aa) = d8bc17da9b1d3ef883331d462ee06d534f5ff5b0