- Update to 3.6.5

- Default MySQL backend is now 5.0

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

2 files changed, 70 insertions, 13 deletions

diff --git a/mail/dspam/files/UPDATING b/mail/dspam/files/UPDATING
index 946af3851619..401e0cea8cd9 100644
--- a/mail/dspam/files/UPDATING
+++ b/mail/dspam/files/UPDATING
@@ -1,5 +1,5 @@
+# $Tecnik: ports/mail/dspam/files/UPDATING,v 1.10 2006/04/30 10:04:19 itetcu Exp $
 # $FreeBSD$
-# $Tecnik: ports/mail/dspam/files/UPDATING,v 1.8 2006/02/09 19:52:34 itetcu Exp $
 #
 # for each PKGNAME or user option change an entry should be added in this file
 # each entry 
@@ -17,6 +17,58 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-3.6.5
+#
+
+New features:
+- support for reading from multiple mysql servers; support for separate
+read/write servers to be used with mysql_drv; see dspam.conf
+- SYSLOG options knob: log to via syslog if "on" or in flat file if "off"
+- dspam_stats: -t for displaying a total of all stats included in the
+original query
+
+Bugfixes:
+- fixed a bug causing --deliver=summary to return no output when used in
+dspamc
+- fixed a segfault which can occur if TrainingMode is not specified in
+dspam.conf
+- invalid read/segfault (dspam.c)
+- segfault on problems establishing connectivity to clamav (dspam.c)
+- segfault on NULL username (mysql_drv.c)
+- bug causing writing of flat-file preferences to fail (pref.c)
+- fragment file overwritten on retrain (cgi)
+- corrects the output of "dspam_admin aggr pref" (tools/dspam_admin.c)
+- prevent quarantining of message when delivering summary
+
+WebUI: a lot of fixes and improvements
+
+PostgeSQL: improvements to purge scripts and object creation script
+
+Port changes:
+-------------
+
+Add MySQL 5.1 as backend. [1]
+Default MySQL version is now 5.0
+
+Optionally depend on LightHTTPD instead of Apache if WITH_CGI=on [2]
+
+Add dspam_debug rc.d options (default off): starts dspam with debug
+logging (you need at least WITH_DEBUG).
+
+Fix OPTIONS handling for INDEX (describe); this is a long standing bug
+and a *big* pontyhat for me; it affected _only_ dependecies recorded in
+INDEX _if_ OPTIONS were not set (like for package building); however,
+the package itself was always built right, dependecies recorded OK, etc.
+
+Add SCE-tindy as MASTER_SITE, much faster site that my other server. [3]
+
+Requested by:   Odhiambo WASHINGTON <odhiambo.raburu@wananchi.com> [1]
+Submitted by:   "Daniel S. Haischt"
+                <me@daniel.stefan.haischt.name> [2] (based on)
+My thanks again to Joey Freeland for this machine and the bandwidth [3]
+
+
+###########################################################################
 # dspam-3.6.4
 #
 
diff --git a/mail/dspam/files/dspam.in b/mail/dspam/files/dspam.in
index 1d35cf670382..e9256859a06c 100644
--- a/mail/dspam/files/dspam.in
+++ b/mail/dspam/files/dspam.in
@@ -1,7 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 # formerly $ FreeBSD: ports/mail/dspam/files/dspam,v 1.1 2005/05/05 21:03:37 pav Exp $
-# $Tecnik: ports/mail/dspam/files/dspam.sh.in,v 1.6 2006/02/09 19:14:29 itetcu Exp $
 #
 
 # PROVIDE: dspam
@@ -11,32 +10,38 @@
 
 #
 # Add the following lines to /etc/rc.conf[.local] to enable dspam:
-#
 # dspam_enable="YES"
+#
+# dspam_debug="YES" will start dspam with debug logging (you need ar least WITH_DEBUG)
 # you can also set the pid file via dspam_pidfile
 #
 
 . %%RC_SUBR%%
 
-name=dspam
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-
-: ${dspam_enable="NO"}
-: ${dspam_pidfile:-/var/run/dspam.pid}
+name="dspam"
+rcvar=${name}_enable
 
 command=%%PREFIX%%/bin/${name}
-command_args="--daemon  > /dev/null 2>&1 &"
+if checkyesno dspam_debug
+then
+	command_args="--daemon --debug > /dev/null 2>&1 &"
+else
+	command_args="--daemon > /dev/null 2>&1 &"
+fi
 required_dirs=%%DSPAM_HOME%%
 required_files=%%PREFIX%%/etc/${name}.conf
 
 extra_commands=reload
-
 reload()
 {
  kill -HUP `cat $pidfile`
 }
 
+load_rc_config $name
+
+#defaults
+: ${dspam_enable="NO"}
+: ${dspam_debug="NO"}
+: ${dspam_pidfile:-/var/run/dspam.pid}
+
 run_rc_command "$1"