From c2f5bc0c81d6afbbb92084ed60816c7d761fc362 Mon Sep 17 00:00:00 2001 From: Ion-Mihai Tetcu Date: Mon, 5 Jun 2006 09:35:19 +0000 Subject: Update to 3.6.7, a bugfix release; see files/UPDATING for details. Drop old sql migration scripts. Approved by: lawrance (mentor, implicit) --- mail/dspam/Makefile | 11 ++++++----- mail/dspam/distinfo | 6 +++--- mail/dspam/files/2x_to_3x_db.sql | 16 ---------------- mail/dspam/files/310_to_320.my.sql | 6 ------ mail/dspam/files/310_to_320.pg.sql | 35 ----------------------------------- mail/dspam/files/UPDATING | 18 +++++++++++++++++- 6 files changed, 26 insertions(+), 66 deletions(-) delete mode 100644 mail/dspam/files/2x_to_3x_db.sql delete mode 100644 mail/dspam/files/310_to_320.my.sql delete mode 100644 mail/dspam/files/310_to_320.pg.sql (limited to 'mail/dspam') diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index ac5885f5fa34..48de01611cef 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -2,7 +2,7 @@ # Date created: 3 August 2003 # Whom: Dominic Marks # -# $Tecnik: ports/mail/dspam/Makefile,v 1.12 2006/04/30 10:04:15 itetcu Exp $ +# $Tecnik: ports/mail/dspam/Makefile,v 1.16 2006/06/05 09:21:42 itetcu Exp $ # $FreeBSD$ # @@ -20,9 +20,9 @@ MASTER_SITES= # set later MAINTAINER= itetcu@FreeBSD.org COMMENT= Bayesian spam filter - stable maintenance version -PORTVER_MAJ= 3.6.6 +PORTVER_MAJ= 3.6.7 #SNAP_DATE= .20060421.2101 -_UPD_LINE_NO= 11 +_UPD_LINE_NO= 14 MIN_OPTIONS_VER= ${PORTNAME}-3.6.6 @@ -36,7 +36,6 @@ MASTER_SITES= http://dspam.irontec.com/sources/ \ http://dspam.systemadministrator.org/sources/ \ http://dspam.sourceforge.net/sources/ \ http://sce-tindy.tecnik93.com/FreeBSD/ports/${PORTNAME}/sources/ \ - http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/ .endif ## debug / log / admin options @@ -634,7 +633,9 @@ post-install: check-options-version: .ifdef(_OPTIONS_READ) @(if ${PKG_VERSION} -t ${_OPTIONS_READ} ${MIN_OPTIONS_VER} | ${GREP} -q '<'; \ - then ${ECHO_CMD} "You have unsupported (old) OPTIONS, please do a 'make config; make'\n" \ + then ${ECHO_CMD} ""; \ + ${ECHO_CMD} "===> You have unsupported (old) OPTIONS, please do a 'make config; make'"; \ + ${ECHO_CMD} ""; \ exit 1; \ fi) .endif diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo index d0096dd47427..9902e8da6f98 100644 --- a/mail/dspam/distinfo +++ b/mail/dspam/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-3.6.7.tar.gz) = 3d16fcdaa7428aef13e13c37510481e3 +SHA256 (dspam-3.6.7.tar.gz) = 8527dd0a6b907d6ecf03ea6c3e0656723cdaa263a7c4542bd8207dfd50667c51 +SIZE (dspam-3.6.7.tar.gz) = 743169 diff --git a/mail/dspam/files/2x_to_3x_db.sql b/mail/dspam/files/2x_to_3x_db.sql deleted file mode 100644 index 489965907a7c..000000000000 --- a/mail/dspam/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/files/310_to_320.my.sql b/mail/dspam/files/310_to_320.my.sql deleted file mode 100644 index 7eb8148d52c3..000000000000 --- a/mail/dspam/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/files/310_to_320.pg.sql b/mail/dspam/files/310_to_320.pg.sql deleted file mode 100644 index 84093c43fd6c..000000000000 --- a/mail/dspam/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/files/UPDATING b/mail/dspam/files/UPDATING index 708f8418e4a1..c29e5dde8353 100644 --- a/mail/dspam/files/UPDATING +++ b/mail/dspam/files/UPDATING @@ -1,4 +1,4 @@ -# $Tecnik: ports/mail/dspam/files/UPDATING,v 1.10 2006/04/30 10:04:19 itetcu Exp $ +# $Tecnik: ports/mail/dspam/files/UPDATING,v 1.13 2006/06/05 09:21:46 itetcu Exp $ # $FreeBSD$ # # for each PKGNAME or user option change an entry should be added in this file @@ -16,6 +16,21 @@ 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.6.7 +# + +Bugfixes: +- Using UIDInSignature, wrong UID is written to message when using groups +- PostgreSQL driver does not reconnect on failure in daemon mode +- X-DSPAM-Probability sometimes misreported when multiple algorithms used +- Agent segfaults when DeliveryHost or ClientHost not specified, --client +- Agent segfaults on some systems when syslog is used +- Agent segfaults when dlopen() to storage library fails +- Infinite loop created when deleting preference, not using extensions +- ATX (agent context) does not hold enough bits for 'flags' variable + + ########################################################################### # dspam-3.6.6 # @@ -28,6 +43,7 @@ Bugfixes: - segfault fix for when correcting messages using UIDInSignature with MySQL - when using logfile, write errors result in segfault + ########################################################################### # dspam-3.6.5 # -- cgit v1.2.3