diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | mail/dspam/Makefile | 5 | ||||
| -rw-r--r-- | mail/dspam/distinfo | 7 | ||||
| -rw-r--r-- | mail/dspam/patches/patch-ab | 109 |
4 files changed, 7 insertions, 117 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index b3867b2b938..5f949223932 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.7648 2004/11/01 23:08:44 xtraeme Exp $ +$NetBSD: CHANGES,v 1.7649 2004/11/01 23:15:15 xtraeme Exp $ Changes to the packages collection and infrastructure in 2004: @@ -5011,3 +5011,4 @@ Changes to the packages collection and infrastructure in 2004: Added php5-mysqli-5.0.2 [jdolecek 2004-11-01] Updated swapd to 1.0.2 [xtraeme 2004-11-01] Updated clamsmtp to 1.1 [xtraeme 2004-11-01] + Updated dspam to 3.2.1 [xtraeme 2004-11-01] diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index 21410f54967..a50f769d40f 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2004/10/28 10:12:47 adrianp Exp $ +# $NetBSD: Makefile,v 1.16 2004/11/01 23:15:16 xtraeme Exp $ -DISTNAME= dspam-3.2.0 -PKGREVISION= 1 +DISTNAME= dspam-3.2.1 CATEGORIES= mail MASTER_SITES= http://www.nuclearelephant.com/projects/dspam/sources/ diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo index 8f148df4961..e0be90b10a9 100644 --- a/mail/dspam/distinfo +++ b/mail/dspam/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.5 2004/10/28 06:03:18 xtraeme Exp $ +$NetBSD: distinfo,v 1.6 2004/11/01 23:15:16 xtraeme Exp $ -SHA1 (dspam-3.2.0.tar.gz) = 45dd9addddf42bf8e891c3f35fd9009f4fae9a5f -Size (dspam-3.2.0.tar.gz) = 617716 bytes +SHA1 (dspam-3.2.1.tar.gz) = dfbd8ff5b74e0962e95d7eaba21c77ce84540ffc +Size (dspam-3.2.1.tar.gz) = 618780 bytes SHA1 (patch-aa) = 0f5ca6fc4c03ea0b73ccd1214f047fec6ffe4cb3 -SHA1 (patch-ab) = fc4a308ddce93b7fa9248bf55e5936895f3de0c2 diff --git a/mail/dspam/patches/patch-ab b/mail/dspam/patches/patch-ab deleted file mode 100644 index 4cbcb82b05e..00000000000 --- a/mail/dspam/patches/patch-ab +++ /dev/null @@ -1,109 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2004/10/27 23:27:00 xtraeme Exp $ - -Fix for MySQL 4.1.x users: - -http://dspam.nuclearelephant.com/dspam-users/5709.html - ---- mysql_drv.c.orig 2004-10-28 01:01:32.000000000 +0200 -+++ mysql_drv.c 2004-10-28 01:07:44.000000000 +0200 -@@ -512,10 +512,10 @@ - struct _ds_spam_stat stat, stat2; - struct lht_node *node_lht; - struct lht_c c_lht; -- buffer *query, *insert; -+ buffer *query; - char scratch[1024]; - struct passwd *p; -- int update_one = 0, insert_one = 0; -+ int update_one = 0; - - if (s->dbh == NULL) - { -@@ -546,14 +546,6 @@ - return EUNKNOWN; - } - -- insert = buffer_create(NULL); -- if (insert == NULL) -- { -- buffer_destroy(query); -- LOG (LOG_CRIT, ERROR_MEM_ALLOC); -- return EUNKNOWN; -- } -- - if (s->control_token == 0) - { - node_lht = c_lht_first (freq, &c_lht); -@@ -585,9 +577,6 @@ - - buffer_cat (query, scratch); - -- buffer_copy (insert, "insert into dspam_token_data(uid, token, spam_hits, " -- "innocent_hits, last_hit) values"); -- - node_lht = c_lht_first (freq, &c_lht); - while (node_lht != NULL) - { -@@ -605,7 +594,7 @@ - - if (stat2.disk != 'Y') - { -- char ins[1024]; -+ char insert[1024]; - - /* If we're processing a message with a MERGED group, assign it based on - an empty count and not the current count (since the current count -@@ -615,25 +604,27 @@ - on the actual count (so that tools like dspam_merge don't break) */ - - if (CTX->flags & DSF_MERGED) { -- snprintf (ins, sizeof (ins), -- "%s(%d, '%llu', %d, %d, current_date())", -- (insert_one) ? ", " : "", -+ snprintf (insert, sizeof (insert), -+ "insert into dspam_token_data(uid, token, spam_hits, " -+ "innocent_hits, last_hit) values(%d, '%llu', %d, %d, " -+ "current_date())", - p->pw_uid, - node_lht->key, - stat.spam_hits > s->control_sh ? 1 : 0, - stat.innocent_hits > s->control_ih ? 1 : 0); - } else { -- snprintf (ins, sizeof (ins), -- "%s(%d, '%llu', %ld, %ld, current_date())", -- (insert_one) ? ", " : "", -+ snprintf(insert, sizeof (insert), -+ "insert into dspam_token_data(uid, token, spam_hits, " -+ "innocent_hits, last_hit) values(%d, '%llu', %ld, %ld, " -+ "current_date())", - p->pw_uid, - node_lht->key, - stat2.spam_hits, - stat2.innocent_hits); - } - -- insert_one = 1; -- buffer_cat(insert, ins); -+ if (MYSQL_RUN_QUERY (s->dbh, insert)) -+ stat2.disk = 'Y'; - } - - if (stat2.disk == 'Y') -@@ -675,17 +666,6 @@ - } - } - -- if (insert_one) -- { -- if (MYSQL_RUN_QUERY (s->dbh, insert->data)) -- { -- _mysql_drv_query_error (mysql_error (s->dbh), insert->data); -- buffer_destroy(insert); -- return EFAILURE; -- } -- } -- -- buffer_destroy (insert); - buffer_destroy (query); - return 0; - } |