Update to 3.6.5 (provided by Unex in PR pkg/33427):

RELEASE 3.6.5-STABLE

MAINT: PgSQL SQL tuning
MAINT: WebUI aesthetic and functional fixes
MAINT: Added --disable-syslog and --with-logfile= configuration flags
MAINT: Added -t flag for dspam_stats to total stats
MAINT: Markov result used as X-DSPAM-Confidence when Markov used
MAINT: Support for separate read/write servers to be used with mysql_drv
BUGFIX: Spam are quarantined when --deliver=summary
BUGFIX: Admin graphs malformatted when subject contains newline character
BUGFIX: WebUI does not use MAX_COL_LEN
BUGFIX: Output for dspam_admin aggr pref incorrect
BUGFIX: Flat-file preference writes fail on some systems
BUGFIX: Failure to connect to ClamAV causes segmentation fault
BUGFIX: NULL username in system causes segmentation fault
BUGFIX: ClamAV processing and cleanup issues
BUGFIX: Fragment files overwritten on retrain
BUGFIX: Miscellaneous invalid read / segmentation fault bugs
BUGFIX: If TrainingMode not specified in dspam.conf or passed in, segmentation fault
BUGFIX: No output returned when using --deliver=summary with dspamc

RELEASE 3.6.4-STABLE

DOC: Documented user preferences in README
MAINT: Added dspam_train tool, replacing most functions of dspam_corpus
MAINT: Code cleanup and performance improvements
MAINT: Significant improvements in accuracy, specifically reduced false pos.
MAINT: Removed experimental neural collaboration functions
MAINT: Added ClassAlias configuration directive to dspam.conf
MAINT: Added undo option for retraining via WebUI
MAINT: Added storeFragments support to WebUI
MAINT: Added mass-retraining support to WebUI
BUGFIX: DSPAM segfaults when invalid UID specified using UIDInSignature
BUGFIX: No output when using --classify with --client
BUGFIX: dspam_corpus overrides default dspam.conf settings
BUGFIX: Multi-driver builds fail when preferences-extension is not supported

5 files changed, 42 insertions, 26 deletions

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index fb3caf7f96b..e9505e55592 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2006/04/22 09:22:10 rillig Exp $
+# $NetBSD: Makefile,v 1.50 2006/05/06 08:36:10 xtraeme Exp $
 
-DISTNAME=	dspam-3.6.3
+DISTNAME=	dspam-3.6.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.nuclearelephant.com/projects/dspam/sources/
 
@@ -12,8 +12,8 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
 USE_TOOLS+=		perl:run pkg-config
-REPLACE_PERL=		tools/dspam_genaliases.in			\
-			tools/dspam_corpus.in				\
+REPLACE_PERL=		src/tools/dspam_genaliases.in			\
+			src/tools/dspam_corpus.in			\
 			webui/cgi-bin/*.cgi webui/cgi-bin/configure.pl.in
 
 PKGCONFIG_OVERRIDE+=	src/dspam.pc.in
@@ -37,6 +37,7 @@ BUILD_DEFS+=		DSPAM_SIGNATURE_LIFE
 BUILD_DEFS+=		DSPAM_USER DSPAM_GROUP
 BUILD_DEFS+=		DSPAM_BINMODE
 BUILD_DEFS+=		DSPAM_LOGDIR
+BUILD_DEFS+=		DSPAM_LOGFILE
 BUILD_DEFS+=		DSPAM_DOMAIN
 BUILD_DEFS+=		DSPAM_WWWHOME
 BUILD_DEFS+=		DSPAM_PIDDIR
@@ -51,6 +52,7 @@ DSPAM_BINMODE?=		4511
 DSPAM_USER?=		dspam
 DSPAM_GROUP?=		dspam
 DSPAM_LOGDIR?=		${DSPAM_HOME}/log
+DSPAM_LOGFILE?=		${DSPAM_LOGDIR}/dspam.log
 DSPAM_DOMAIN?=		yourdomain.com
 DSPAM_WWWHOME?=		/dspam
 DSPAM_PIDDIR?=		${VARBASE}/run/dspam
diff --git a/mail/dspam/PLIST b/mail/dspam/PLIST
index 96d1a8d6021..1caeff1b685 100644
--- a/mail/dspam/PLIST
+++ b/mail/dspam/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/03/02 18:38:20 jwise Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/05/06 08:36:10 xtraeme Exp $
 ${HASH}bin/cssstat
 ${HASH}bin/csscompress
 ${HASH}bin/cssclean
@@ -14,6 +14,7 @@ bin/dspam_genaliases
 bin/dspam_logrotate
 bin/dspam_merge
 bin/dspam_stats
+bin/dspam_train
 bin/dspamc
 include/dspam/buffer.h
 include/dspam/config.h
@@ -35,6 +36,7 @@ man/man1/dspam_corpus.1
 man/man1/dspam_dump.1
 man/man1/dspam_merge.1
 man/man1/dspam_stats.1
+man/man1/dspam_train.1
 man/man3/dspam_addattribute.3
 man/man3/dspam_attach.3
 man/man3/dspam_create.3
@@ -60,6 +62,9 @@ share/doc/dspam/qmail.txt
 share/doc/dspam/relay.txt
 share/doc/dspam/sendmail.txt
 share/doc/dspam/sqlite_drv.txt
+share/dspam/txt/firstrun.txt
+share/dspam/txt/firstspam.txt
+share/dspam/txt/quarantinefull.txt
 share/dspam/webui/cgi-bin/admin.cgi
 share/dspam/webui/cgi-bin/admingraph.cgi
 share/dspam/webui/cgi-bin/dspam.cgi
@@ -72,6 +77,7 @@ share/dspam/webui/cgi-bin/templates/nav_admin_user.html
 share/dspam/webui/cgi-bin/templates/nav_alerts.html
 share/dspam/webui/cgi-bin/templates/nav_analysis.html
 share/dspam/webui/cgi-bin/templates/nav_error.html
+share/dspam/webui/cgi-bin/templates/nav_fragment.html
 share/dspam/webui/cgi-bin/templates/nav_history.html
 share/dspam/webui/cgi-bin/templates/nav_performance.html
 share/dspam/webui/cgi-bin/templates/nav_preferences.html
@@ -92,23 +98,20 @@ ${PGSQL}share/dspam/pgsql/purge.sql
 ${PGSQL}share/dspam/pgsql/virtual_users.sql
 ${SQLITE}share/dspam/sqlite/purge-2.sql
 ${SQLITE}share/dspam/sqlite/purge-3.sql
-share/dspam/txt/firstrun.txt
-share/dspam/txt/firstspam.txt
-share/dspam/txt/quarantinefull.txt
 share/examples/dspam/cgi-admins
 share/examples/dspam/cgi-default.prefs
 share/examples/dspam/configure.pl
 share/examples/dspam/dspam.conf
 share/examples/rc.d/dspam
 @dirrm share/examples/dspam
-@dirrm share/dspam/txt
 ${PGSQL}@dirrm share/dspam/pgsql
 ${MYSQL}@dirrm share/dspam/mysql
 ${SQLITE}@dirrm share/dspam/sqlite
+@dirrm share/dspam/webui/htdocs
 @dirrm share/dspam/webui/cgi-bin/templates
 @dirrm share/dspam/webui/cgi-bin
-@dirrm share/dspam/webui/htdocs
 @dirrm share/dspam/webui
+@dirrm share/dspam/txt
 @dirrm share/dspam
 @dirrm share/doc/dspam
 @dirrm include/dspam
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
index d786145afa3..6887522f0f7 100644
--- a/mail/dspam/distinfo
+++ b/mail/dspam/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2006/01/18 21:26:33 xtraeme Exp $
+$NetBSD: distinfo,v 1.27 2006/05/06 08:36:10 xtraeme Exp $
 
-SHA1 (dspam-3.6.3.tar.gz) = 37d0a0b1caddd085483712286505aa4016dde008
-RMD160 (dspam-3.6.3.tar.gz) = e70719cb9524b9aa7c786b4e6fddeed6516a9f2a
-Size (dspam-3.6.3.tar.gz) = 740097 bytes
+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 (patch-aa) = 04e94e3da9de06c15863425d0a827858b5dd4a6c
-SHA1 (patch-ad) = ec80ac306fa6fcd62b4f531b11de773a7a28833f
+SHA1 (patch-ad) = cfa68c01cb3f5ce0556c7a3b008dc214bdfbbd95
diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk
index 44c24313ac3..2d1ef4aceac 100644
--- a/mail/dspam/options.mk
+++ b/mail/dspam/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2006/01/02 19:59:33 adrianp Exp $
+# $NetBSD: options.mk,v 1.15 2006/05/06 08:36:10 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 debug verbose-debug
+			neural clamav ldap syslog debug verbose-debug
 
 .include "../../mk/bsd.options.mk"
 
@@ -200,6 +200,17 @@ CONFIGURE_ARGS+=	--enable-clamav
 .endif
 
 ###
+### Enable syslog support, otherwise
+### set flat logfile pathname for logging
+###
+.if !empty(PKG_OPTIONS:Msyslog)
+CONFIGURE_ARGS+=--enable-syslog
+.else
+CONFIGURE_ARGS+=--disable-syslog
+CONFIGURE_ARGS+=--with-logfile=${DSPAM_LOGFILE}
+.endif
+
+###
 ### Enable debugging support for DSPAM.
 ### Don't enable this unless something needs testing!
 ###
diff --git a/mail/dspam/patches/patch-ad b/mail/dspam/patches/patch-ad
index 620011e1aa6..892051bdaba 100644
--- a/mail/dspam/patches/patch-ad
+++ b/mail/dspam/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2005/10/20 08:33:13 adrianp Exp $
+$NetBSD: patch-ad,v 1.2 2006/05/06 08:36:10 xtraeme Exp $
 
---- src/dspam.conf.in.orig	2005-10-10 14:52:21.000000000 +0100
-+++ src/dspam.conf.in
-@@ -24,7 +24,7 @@ Home @dspam_home@
+--- src/dspam.conf.in.orig	2006-02-15 22:06:35.000000000 +0200
++++ src/dspam.conf.in	2006-05-05 23:44:16.000000000 +0300
+@@ -24,7 +24,7 @@
  # this option. If you do not wish to lose all of your data, you will need to
  # migrate it to the new backend before making this change.
  #
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1 2005/10/20 08:33:13 adrianp Exp $
  
  #
  # Trusted Delivery Agent: Specifies the local delivery agent DSPAM should call 
-@@ -53,7 +53,7 @@ TrustedDeliveryAgent "@delivery_agent@"
+@@ -53,7 +53,7 @@
  # the user DSPAM is processing mail for. This configuration parameter is only 
  # necessary if you plan on allowing untrusted processing.
  #
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.1 2005/10/20 08:33:13 adrianp Exp $
  
  #
  # SMTP or LMTP Delivery: Alternatively, you may wish to use SMTP or LMTP 
-@@ -73,7 +73,7 @@ TrustedDeliveryAgent "@delivery_agent@"
+@@ -76,7 +76,7 @@
  # a quarantine agent which will be called with all messages DSPAM thinks is
  # spam. Use %u to specify the user DSPAM is processing mail for.
  #
@@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.1 2005/10/20 08:33:13 adrianp Exp $
  
  #
  # DSPAM can optionally process "plused users" (addresses in the user+detail
-@@ -249,7 +249,7 @@ AllowOverride whitelistThreshold
+@@ -264,7 +264,7 @@
  # Storage driver settings: Specific to a particular storage driver. Uncomment
  # the configuration specific to your installation, if applicable.
  #
@@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.1 2005/10/20 08:33:13 adrianp Exp $
  #MySQLPort
  #MySQLUser 	     	dspam
  #MySQLPass    		changeme
-@@ -590,9 +590,9 @@ Opt out
+@@ -633,9 +633,9 @@
  # specified. If you want the client machine to perform delivery, use
  # the --stdout option in conjunction with a local setup. 
  #
@@ -50,7 +50,7 @@ $NetBSD: patch-ad,v 1.1 2005/10/20 08:33:13 adrianp Exp $
  
  #
  # ServerMode specifies the type of LMTP server to start. This can be one of:
-@@ -646,7 +646,7 @@ Opt out
+@@ -689,7 +689,7 @@
  # If you are a reporting streamlined blackhole list participant, you can
  # touch ip addresses within the directory the rabl_client process is watching.
  #