7 files changed, 164 insertions, 33 deletions

diff --git a/mail/dspam-devel/files/310_to_320.my.sql b/mail/dspam-devel/files/310_to_320.my.sql
new file mode 100644
index 000000000000..7eb8148d52c3
--- /dev/null
+++ b/mail/dspam-devel/files/310_to_320.my.sql
@@ -0,0 +1,6 @@
+/** 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
new file mode 100644
index 000000000000..84093c43fd6c
--- /dev/null
+++ b/mail/dspam-devel/files/310_to_320.pg.sql
@@ -0,0 +1,35 @@
+/** 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
new file mode 100644
index 000000000000..92af4fb7c7c5
--- /dev/null
+++ b/mail/dspam-devel/files/UPDATING
@@ -0,0 +1,123 @@
+This file documents some of the problems you may encounter when
+upgrading dspam port.  I will try our best to minimize these disruptions,
+but sometimes they are unavoidable.
+
+You should get into the habit of checking this file for changes each
+time before attempting any port upgrade.
+
+This file concetrate on the FreeBSD / port specific changes and one should read
+also the UPGRADING enclosed in the dspam distribution. You can see it by doing
+in the port directory:
+make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
+
+
+############################################################################
+# dspam-devel-3.3.0.a.20041125.0945
+#
+
+- changed the naming scheme because of to many upstream modification in 
+tarball naming - right now it lacks any version (for the same reason the 
+distfile is renamed from snapshot.tar.gz to PKGNAME and sits on my server); 
+\ it is now made up of:
+PORTNAME:		dspam-devel
+next MINOR_VERSION:	3.3.0
+we're in pre-beta:	a
+SNAPSHOT_DATE:		20041125.0945
+\ the strange ``a'' is necessary for pkg_version to work correctly when we will
+have the 3.3.0 beta's, rc's and release (tested with pkg_version -t)
+
+- follow the update procedure from the entry bellow
+
+- there is a new and very useful dspam.conf option:
+ MaxMessageSize - specify a maximum message size to process
+\ I suggest setting it somewhere between 100 and 300 KB, it is unlikely the
+spam you are receiving is bigger and this will improve performance as big
+messages won't stuck the databese 
+
+- tum mode has been enhanced and it should outperform teft 
+
+###############################################################################
+# dspam-devel-3.2.0-20041027.0930 (never comited in the cvs, don't ask me why):
+#
+
+- dspam configuration is now done via dspam.conf
+
+- please remove any OPTION
+
+- the following OPTIONS should be set now in dspam.conf
+OPTION                  .conf name                      def. value
+-------------------------------------------------------------------------------
+DSPAM_HOME              Home                            /var/dspam
+WITH_*_LDA              TrustedDeliveryAgent            mail.local
+                        UntrustedDeliveryAgent          /usr/libexec/mail.local d %u
+QUARANTINE_AGENT        QuarantineAgent                 #
+
+WITH_SPAM_SUBJ          Preference "spamAction=tag"     #
+                        Preference "spamSubject=SPAM"   #
+USER_LOGGING            UserLog                         on
+SYSTEM_LOGGING          SystemLog                       on
+WEBMAIL                 TrainPristine                   off
+WITH_OPT_IN             Opt                             out
+SAT                     TrackSources spam ham           #
+PARSE_TO_HEADERS        ParseToHeaders                  on
+BROKEN_MTA              Broken lineStripping            #
+BROKEN_ERR_CODES        Broken returnCodes              #
+SIGNATURE_HEADERS       Preference "signatureLocation=  message" # headers
+
+- the following OPTIONS should does not exist anymore:
+SIGNATURE_ATACH WITH_HOMEDIR_DOT
+
+- the following OPTIONS have their name changed to follow vedor names
+TRAD_BAYES              GRAHAM_BAYES
+ALT_BAYES               BURTON_BAYES
+WITH_SIGNATURE_LIFE     SIGNATURE_LIFE
+
+- new OPTIONS
+OPTION                       port default
+----------------------------------------------
+LOG_DIR                         /var/log/dspam
+WITH_USER_HOMEDIR             
+DSPAM_HOME_OWNER
+DSPAM_HOME_GROUP
+DSPAM_HOME_MODE
+DSPAM_MODE
+DSPAM_OWNER
+DSPAM_GROUP
+
+To upgrade you should:
+
+0. Read docs enclosed with teh dpsam distribution, beginnig with UPGRADING and
+README
+
+1. Adjust your OPTIONs
+( make rmconfig config in dspam port dir, command line, pkg_tools.conf )
+
+2. make VARs.......
+in dspam port dir with appropiate OPTIONS adn VARs (see changes above)
+
+3. stop you MTA or deactivate dspam from it
+
+5. make VARs........ install
+
+4.a) If using MySQL 4.0.xx or PostgreSQL:
+- back-up the database
+- use the appropiate migration script from files dir of dspam port dir
+(if using MySQL 4.1.x or 3.xx you're on your own for now)
+
+5. Back-up and them move the files from the old DSPAM_HOME 
+(defaulted: /usr/loca/etc/dspam) to the new DSPAM_HOME (default /vad/db/dspam) 
+or where ever you defined DSPA_HOME in 2 above.
+
+6. Adjust you new dspam.conf according with your setup OPTIONS and VARs defined
+on make / mak install step.
+
+7. Remove the old setup files (you have them in the back-up, right ?)
+
+7. Enable dspam in the MTA setup, but only locally or something and start testing.
+
+If something ain't working is one of:
+- permissions problems (hint: with what UID 
+is dspam called from your MTA vs. DSPAM_HOME and DSPAM_LOG_DIR)
+- something wrong in dspam.conf (hint: you didn't remove old config files 
+and they are still used ?)
+
diff --git a/mail/dspam-devel/files/mysql.data b/mail/dspam-devel/files/mysql.data
deleted file mode 100644
index 1a48d14863f8..000000000000
--- a/mail/dspam-devel/files/mysql.data
+++ /dev/null
@@ -1,5 +0,0 @@
-/tmp/mysql.sock
-
-user
-password
-database
diff --git a/mail/dspam-devel/files/patch-Makefile.in b/mail/dspam-devel/files/patch-Makefile.in
deleted file mode 100644
index bffbd6d73240..000000000000
--- a/mail/dspam-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Thu Jun 24 18:32:38 2004
-+++ Makefile.in	Thu Jun 24 18:37:09 2004
-@@ -242,7 +242,7 @@
- man_MANS = dspam.1 dspam_stats.1 dspam_corpus.1 dspam_clean.1 dspam_dump.1 \
-   dspam_merge.1
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = dspam.pc
- EXTRA_DIST = autogen.sh RELEASE.NOTES CHANGELOG LICENSE example.c \
-   dspam-button.gif dspam.1 dspam_stats.1 dspam_corpus.1 dspam_clean.1 \
diff --git a/mail/dspam-devel/files/patch-configure b/mail/dspam-devel/files/patch-configure
deleted file mode 100644
index cb3208b2c46a..000000000000
--- a/mail/dspam-devel/files/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	Wed Nov 26 14:35:34 2003
-+++ configure	Thu Dec 11 14:00:18 2003
-@@ -7548,7 +7548,8 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="%%LIBTOOLFLAGS%% $ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/mail/dspam-devel/files/pgsql.data b/mail/dspam-devel/files/pgsql.data
deleted file mode 100644
index bb564dca581b..000000000000
--- a/mail/dspam-devel/files/pgsql.data
+++ /dev/null
@@ -1,5 +0,0 @@
-/tmp
-
-username
-password
-dspam_database