Update to a new CVS HEAD snapshot. Please note that, among other changes, this

update breaks Dspam API/ABI. Also this is different from upcomming 3.6.7
update for mail/dspam, which will be only a bug-fix release.

Dropped (very) old sql migration scripts.

Approved by:	lawrance (mentor, implicit)

7 files changed, 45 insertions, 64 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 74af2da6eac4..d5eba15aa346 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -2,7 +2,7 @@
 # Date created:		24 Jun 2004
 # Whom:			Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>
 #
-# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.52 2006/05/13 11:53:53 itetcu Exp $
+# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.55 2006/06/05 08:41:24 itetcu Exp $
 # $FreeBSD$
 #
 
@@ -19,9 +19,9 @@ MASTER_SITES=	# set later
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Bayesian spam filter - development version
 
-PORTVER_MAJ=	3.6.6
-#SNAP_DATE=	.20060513.1125
-_UPD_LINE_NO=	9
+PORTVER_MAJ=	3.6.7
+SNAP_DATE=	.20060604.1555
+_UPD_LINE_NO=	36
 
 MIN_OPTIONS_VER=	${PORTNAME}-3.6.6
 
diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo
index d0096dd47427..88a19c719eed 100644
--- a/mail/dspam-devel/distinfo
+++ b/mail/dspam-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (dspam-3.6.6.tar.gz) = 72dbf9d802ac3645c93b715c81cc9f50
-SHA256 (dspam-3.6.6.tar.gz) = af9b9429ee3b69c5d1fe8e8891f21c8640ca572f6244a794835646301ce84e91
-SIZE (dspam-3.6.6.tar.gz) = 725502
+MD5 (dspam-devel-3.6.7.20060604.1555.tar.gz) = 9ecaa92f994ccdf5d6955751908b468f
+SHA256 (dspam-devel-3.6.7.20060604.1555.tar.gz) = 4249ebae581e5fb8b4d0e3f5da88fb58855700688eb9e039d8723f35d7cd0a76
+SIZE (dspam-devel-3.6.7.20060604.1555.tar.gz) = 383595
diff --git a/mail/dspam-devel/files/2x_to_3x_db.sql b/mail/dspam-devel/files/2x_to_3x_db.sql
deleted file mode 100644
index 489965907a7c..000000000000
--- a/mail/dspam-devel/files/2x_to_3x_db.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-alter table dspam_stats add spam_learned int;
-alter table dspam_stats add innocent_learned int;
-alter table dspam_stats add spam_classified int;
-alter table dspam_stats add innocent_classified int;
-update dspam_stats set spam_learned = total_spam;
-update dspam_stats set innocent_learned = total_innocent;
-update dspam_stats set spam_classified = 0, innocent_classified = 0;
-alter table dspam_stats drop column total_spam;
-alter table dspam_stats drop column total_innocent;
-alter table dspam_stats add spam_misclassified int;
-alter table dspam_stats add innocent_misclassified int;
-update dspam_stats set spam_misclassified = spam_misses;
-update dspam_stats set innocent_misclassified = false_positives;
-alter table dspam_stats drop column spam_misses;
-alter table dspam_stats drop column false_positives;
-
diff --git a/mail/dspam-devel/files/310_to_320.my.sql b/mail/dspam-devel/files/310_to_320.my.sql
deleted file mode 100644
index 7eb8148d52c3..000000000000
--- a/mail/dspam-devel/files/310_to_320.my.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-/** dspam 3.1.0 to 3.2.0 mysql migration script */
-/** set  myisam_sort_buffer_size to a high value to make this faster */
-
-ALTER TABLE dspam_signature_data DROP COLUMN snr;
-CREATE INDEX id_signature_data_02 ON dspam_signature_data(created_on);
-DROP TABLE dspam_snr_data;
diff --git a/mail/dspam-devel/files/310_to_320.pg.sql b/mail/dspam-devel/files/310_to_320.pg.sql
deleted file mode 100644
index 84093c43fd6c..000000000000
--- a/mail/dspam-devel/files/310_to_320.pg.sql
+++ /dev/null
@@ -1,35 +0,0 @@
-/** dspam 3.1.0 to 3.2.0 pgsql migration script */
-
-CREATE INDEX id_token_data_03 ON dspam_token_data(token);
-
-CREATE TABLE dspam_signature_data_tmp (
-  uid smallint,
-  signature varchar(128),
-  data bytea,
-  length int,
-  created_on date,
-  UNIQUE (signature, uid)
-);
-INSERT INTO dspam_signature_data_tmp SELECT * FROM dspam_signature_data;
-DROP TABLE dspam_signature_data;
-ALTER TABLE dspam_signature_data_tmp RENAME TO dspam_signature_data;
-
-CREATE TABLE dspam_neural_decisions_tmp (
-  uid smallint,
-  signature varchar(128),
-  data bytea,
-  length smallint,
-  length int,
-  created_on date,
-  UNIQUE (signature, uid)
-);
-INSERT INTO dspam_neural_decisions_tmp SELECT * FROM dspam_neural_decisions;
-DROP TABLE dspam_neural_decisions;
-ALTER TABLE dspam_neural_decisions_tmp  RENAME TO dspam_neural_decisions;
-
-CREATE TABLE dspam_preferences (
-  uid smallint,
-  preference varchar(128),
-  value varchar(128),
-  UNIQUE (preference, uid)
-);
diff --git a/mail/dspam-devel/files/UPDATING b/mail/dspam-devel/files/UPDATING
index cee55b9b2576..5c615b3a2060 100644
--- a/mail/dspam-devel/files/UPDATING
+++ b/mail/dspam-devel/files/UPDATING
@@ -11,6 +11,43 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-devel-3.6.7.20060604.1555
+#
+
+Change features:
+- API change !!
+- SupressWebStats is now WebStats in dspam.conf, and setting is inverted.
+- The 'Tokenizer' setting in 3.8.0 replaces tokenizer definitions in the 
+"Feature" clause of previous version configurations. See dspam.conf.
+- if using hash_drv storage driver, you should run cssconvert to upgrade
+your .css files to a fully malaligned format.
+- Earlier versions of 3.6 did not prepend a leading "-l" flag to specifying
+log file selection. This is now required.
+- renamed PValue "graham" to "bcr"
+- dspam_train now works with filenames containing spaces
+- +various optimizations to: tokenizer core, hash_drv driver (store offset
+for writes), libdspam (preference lookups), osb/sbph
+- HashMaxSeek defaults to 10
+
+New features:
+- OSB tokenizer
+- ProcessorURLContext has been added to toggle whether URL specific tokens
+are created in the tokenizer process. The "on" value is default for
+previous versions of DSPAM.
+- HashPctIncrease; see dspam.conf
+- --client support for dspam_train
+- cache runtime user information in daemon mode
+- added logging of viruses (and the source)
+
+Bug fixes:
+- infinite loop on all non-preference-extension calls to delete a preference
+- segfault when dlopen() to storage driver library fails
+- segfault caused by bad use of va_args when vsyslog is called
+- segfault in daemon mode when DeliveryHost or ClientHost is not specified
+- added a connection check for pgsql, to reconnect on failure in daemon mode
+- in hash_drv fixed some bugs which may have caused a crash
+
+###########################################################################
 # dspam-devel-3.6.6 (stable release)
 #
 
diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist
index 8899330d3438..8620fa070b30 100644
--- a/mail/dspam-devel/pkg-plist
+++ b/mail/dspam-devel/pkg-plist
@@ -79,6 +79,7 @@ libdata/pkgconfig/dspam.pc
 %%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
 %%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
 %%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
+%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge-pe.sql
 %%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
 %%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
 %%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-2.sql