Update to 3.6.7:

3.6.7 is a maintenance release

BUGFIX: Using UIDInSignature, wrong UID is written to message when using groups
BUGFIX: PostgreSQL driver does not reconnect on failure in daemon mode
BUGFIX: X-DSPAM-Probability sometimes misreported when multiple algorithms used
BUGFIX: Agent segfaults when DeliveryHost or ClientHost not specified, --client
BUGFIX: Agent segfaults on some systems when syslog is used
BUGFIX: Agent segfaults when dlopen() to storage library fails
BUGFIX: Infinite loop created when deleting preference, not using extensions
BUGFIX: ATX (agent context) does not hold enough bits for 'flags' variable

3.6.6 is a maintenance release

MAINT: Phased out deprecated Berkeley DB drivers
MAINT: Phased out legacy tools (dspam_corpus, dspam_genaliases)
BUGFIX: When using logfile, write errors result in segfault
BUGFIX: Compiler warnings with sqlite_drv and sqlite3_drv
BUGFIX: MySQLUIDInSignature causes segfault on retrain
BUGFIX: trainPristine preference "off" does not override default

4 files changed, 9 insertions, 24 deletions

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index e9505e55592..3269ee5e785 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2006/05/06 08:36:10 xtraeme Exp $
+# $NetBSD: Makefile,v 1.51 2006/06/05 15:49:05 xtraeme Exp $
 
-DISTNAME=	dspam-3.6.5
+DISTNAME=	dspam-3.6.7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.nuclearelephant.com/projects/dspam/sources/
 
diff --git a/mail/dspam/PLIST b/mail/dspam/PLIST
index 1caeff1b685..d5d60e86007 100644
--- a/mail/dspam/PLIST
+++ b/mail/dspam/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/05/06 08:36:10 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/06/05 15:49:05 xtraeme Exp $
 ${HASH}bin/cssstat
 ${HASH}bin/csscompress
 ${HASH}bin/cssclean
@@ -7,10 +7,8 @@ bin/dspam
 bin/dspam_2sql
 bin/dspam_admin
 bin/dspam_clean
-bin/dspam_corpus
 bin/dspam_crc
 bin/dspam_dump
-bin/dspam_genaliases
 bin/dspam_logrotate
 bin/dspam_merge
 bin/dspam_stats
@@ -32,7 +30,6 @@ lib/libdspam.la
 lib/pkgconfig/dspam.pc
 man/man1/dspam.1
 man/man1/dspam_clean.1
-man/man1/dspam_corpus.1
 man/man1/dspam_dump.1
 man/man1/dspam_merge.1
 man/man1/dspam_stats.1
@@ -92,7 +89,6 @@ ${MYSQL}share/dspam/mysql/purge.sql
 ${MYSQL}share/dspam/mysql/purge-4.1.sql
 ${MYSQL}share/dspam/mysql/virtual_users.sql
 ${MYSQL}share/dspam/mysql/virtual_user_aliases.sql
-${MYSQL}share/dspam/mysql/neural.sql
 ${PGSQL}share/dspam/pgsql/pgsql_objects.sql
 ${PGSQL}share/dspam/pgsql/purge.sql
 ${PGSQL}share/dspam/pgsql/virtual_users.sql
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
index 6887522f0f7..927e1f2f3e3 100644
--- a/mail/dspam/distinfo
+++ b/mail/dspam/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.27 2006/05/06 08:36:10 xtraeme Exp $
+$NetBSD: distinfo,v 1.28 2006/06/05 15:49:05 xtraeme Exp $
 
-SHA1 (dspam-3.6.5.tar.gz) = 031d3fbeb1fb0d8008dcc1cf7589d4d955e7f933
-RMD160 (dspam-3.6.5.tar.gz) = 363217410de515f15baaa0a864ee23617ae8f6c2
-Size (dspam-3.6.5.tar.gz) = 747196 bytes
+SHA1 (dspam-3.6.7.tar.gz) = 5d34d86a4c0a4a2d2cccc32b598c22d29c030a58
+RMD160 (dspam-3.6.7.tar.gz) = 4f33be032362ce2617820d5a70375713f57798f7
+Size (dspam-3.6.7.tar.gz) = 743169 bytes
 SHA1 (patch-aa) = 04e94e3da9de06c15863425d0a827858b5dd4a6c
 SHA1 (patch-ad) = cfa68c01cb3f5ce0556c7a3b008dc214bdfbbd95
diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk
index 2d1ef4aceac..614144db200 100644
--- a/mail/dspam/options.mk
+++ b/mail/dspam/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2006/05/06 08:36:10 xtraeme Exp $
+# $NetBSD: options.mk,v 1.16 2006/06/05 15:49:05 xtraeme Exp $
 
 .if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
 DSPAM_DELIVERY_AGENT:=	${DSPAM_DELIVERY_AGENT_ARGS}
@@ -7,7 +7,7 @@ DSPAM_DELIVERY_AGENT:=	${DSPAM_DELIVERY_AGENT_ARGS}
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dspam
 PKG_SUPPORTED_OPTIONS=	largescale homedir long-usernames graphs \
 			domainscale virtualusers preferences-extension \
-			neural clamav ldap syslog debug verbose-debug
+			clamav ldap syslog debug verbose-debug
 
 .include "../../mk/bsd.options.mk"
 
@@ -169,17 +169,6 @@ CONFIGURE_ARGS+=	--enable-domain-scale
 .endif
 
 ###
-### EXPERIMENTAL:
-### Support for neural networking, please take a look at the docs.
-###
-.if !empty(DSPAM_STORAGE_DRIVER:Mmysql) || !empty(DSPAM_STORAGE_DRIVER:Mpgsql)
-PKG_SUPPORTED_OPTIONS+=	neural
-.  if !empty(PKG_OPTIONS:Mneural)
-CONFIGURE_ARGS+=	--enable-neural-networking
-.  endif
-.endif
-
-###
 ### These are the flags used when invoking ps(1) to list all processes.
 ###
 BUILD_DEFS+=		DSPAM_PSFLAGS