- Update to 3.2.2 snapshot 20041117.1515

PR:		ports/74377
Submitted by:	Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com> (maintainer)

8 files changed, 151 insertions, 78 deletions

diff --git a/mail/dspam/files/310_to_320.my.sql b/mail/dspam/files/310_to_320.my.sql
new file mode 100644
index 000000000000..7eb8148d52c3
--- /dev/null
+++ b/mail/dspam/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/files/310_to_320.pg.sql b/mail/dspam/files/310_to_320.pg.sql
new file mode 100644
index 000000000000..84093c43fd6c
--- /dev/null
+++ b/mail/dspam/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/files/README.cgi b/mail/dspam/files/README.cgi
deleted file mode 100644
index b30a5c731821..000000000000
--- a/mail/dspam/files/README.cgi
+++ /dev/null
@@ -1,56 +0,0 @@
-DSPAM CGI
-
-   The CGI will need to function in the same group as the dspam agent.  The
-   best way to do this is to create a separate virtualhost specifically for
-   the CGI and assign it to run in the MTA group.  If you are using
-   procmail, additional configuration may also be necessary (see below).
-   Please note that Apache users running under suexec do NOT take on the 
-   identity of the groups specified in /etc/group; e.g. you will need to 
-   specifically assign the group in httpd.conf.
-
-   NOTE: Because the DSPAM CGI is a script, DSPAM will not retain its 
-         privileges when called. If you are running procmail, this will become
-         a problem as procmail requires root privileges to deliver. The easiest
-         hack around this is to create a procmail.dspam binary and make it
-         setuid root, then make it executable only by the mail group (or 
-         whatever group DSPAM and the CGI run in).
-
-   The DSPAM CGI has a minimal configuration inside the dspam.cgi file. You'll
-   want to check dspam.cgi and make sure all of the settings are correct. In
-   most cases, the only that will be necessary to change are the large-scale
-   or domain-scale flags.
-
-   Once you've configured the CGI, there are two more things you'll want to do.
-   
-   1. Edit templates/nav_performance.html
-      Change yourdomain to whatever your domain name is.
-
-   2. Make any changes to default.prefs. This will set the default preferences
-      for a user. The file should reflect your system wide defaults. An example
-      is provided in the cgi directory...
-
-trainingMode=TEFT
-spamAction=quarantine
-spamSubject=[SPAM]
-enableBNR=on
-enableWhitelist=on
-
-     By default, the parameters specified on the commandline will be used. If,
-     however, a preference is found for the particular user those preferences
-     will override the commandline. As a result, you'll want to remove any
-     options from the CGI that you don't want users to set (possibly
-     training mode).
-
-   If you plan on leaving DSPAM's logging function enabled, and would like to
-   produce pretty graphs for your users, the graph.cgi script requires the
-   following be installed on your machine:
-
-   - GD Graphics Library (http://www.boutell.com/gd/)
-   - The following PERL modules:
-     (http://www.perl.com/CPAN/modules/by-module/GD/)
-
-     . GD
-     . GD-Graph3d
-     . GDGraph
-     . GDTextUtil
-
diff --git a/mail/dspam/files/UPDATING b/mail/dspam/files/UPDATING
new file mode 100644
index 000000000000..f47ae515ad83
--- /dev/null
+++ b/mail/dspam/files/UPDATING
@@ -0,0 +1,99 @@
+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-3.2.2.20041117.1515:
+#
+
+- 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 and 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 scripts from files dir of dspam port dir
+( for MySQL you should use 2x_to_3x_db.sql then 310_to_320.my.sql)
+(if using MySQL 4.1.x or 3.xx you're on your own for now; the same for 
+PostgreSQL, but take a look in the UPDATING and 310_to_320.pg.sql)
+
+5. Back-up and them move the files from the old DSPAM_HOME 
+(defaulted: /usr/loca/etc/dspam) to the new DSPAM_HOME (default /var/db/dspam) 
+or where ever you defined DSPAM_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 ?)
+
+8. 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/files/mysql.data b/mail/dspam/files/mysql.data
deleted file mode 100644
index 1a48d14863f8..000000000000
--- a/mail/dspam/files/mysql.data
+++ /dev/null
@@ -1,5 +0,0 @@
-/tmp/mysql.sock
-
-user
-password
-database
diff --git a/mail/dspam/files/patch-Makefile.in b/mail/dspam/files/patch-Makefile.in
new file mode 100644
index 000000000000..bffbd6d73240
--- /dev/null
+++ b/mail/dspam/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- 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/files/patch-configure b/mail/dspam/files/patch-configure
deleted file mode 100644
index 7cb007066691..000000000000
--- a/mail/dspam/files/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	Sat Jul  3 14:18:37 2004
-+++ configure	Sat Jul  3 14:18:57 2004
-@@ -19272,7 +19272,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/files/pgsql.data b/mail/dspam/files/pgsql.data
deleted file mode 100644
index bb564dca581b..000000000000
--- a/mail/dspam/files/pgsql.data
+++ /dev/null
@@ -1,5 +0,0 @@
-/tmp
-
-username
-password
-dspam_database