head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.38 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.36 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.34 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.32 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.30 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.28 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.26 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.24 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.22 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.20 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.18 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.16 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.14 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.12 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.10 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.8 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.6 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.4 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.2 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.3.0.2 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.2.0.6 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2; locks; strict; comment @# @; 1.4 date 2005.10.20.08.33.13; author adrianp; state dead; branches; next 1.3; 1.3 date 2005.08.24.01.44.07; author jwise; state Exp; branches; next 1.2; 1.2 date 2004.11.01.23.15.16; author xtraeme; state dead; branches; next 1.1; 1.1 date 2004.10.27.23.27.00; author xtraeme; state Exp; branches; next ; desc @@ 1.4 log @Update to dspam 3.60 ok'ed xtraeme@@ From the RELEASE file: Automatic Whitelisting Improvements Dynamically Loadable Storage Driver Support PostgreSQL Performance Enhancements LDAP Verification Unified Spam Alias / UID in Signature Support Domain Based Delivery Hosts Integrated Clam A/V Support Markovian Discrimination Self-Contained Hash Driver Fallback Domain-Based User Support Improved, Unified Logging Activity logging has also been improved Plused Detail Support Message Fragments Support Domain Blocklisting Support User preferences made case-insensitive LMTP error codes now include messages from relay host RBLInoculate option allows RBL'd emails to be quarantined or learned as spam MySQL and PgSQL object creation scripts updated to improve performance Added 'date' to quarantine display and sorted most recent at top Significant code cleanup and audit Domain-based groups changed from @@domain.tld to *@@domain.tld X-DSPAM-Result expanded to support Virus, Blacklisted, and Blocklisted results DSPAM WebUI now supports history paging Rewritten documentation for ease of installation @ text @--- src/dspam.c.orig 2005-04-20 10:07:19.000000000 -0400 +++ src/dspam.c 2005-04-28 10:49:13.000000000 -0400 @@@@ -3094,6 +3094,10 @@@@ DRIVER_CTX DTX; char *pidfile; +#ifdef __NetBSD__ + daemon(0, 0); +#endif + __daemon_run = 1; __num_threads = 0; __hup = 0; @ 1.3 log @Add a small patch for daemon mode -- if running on NetBSD, call daemon() to properly dissociate ourselves from the controlling terminal (and more). This is still not enough to make daemon mode stable for me on 3.0_BETA, but it's certainly a step in the right direction. @ text @@ 1.2 log @Update mail/dspam to 3.2.1. Version 3.2.1 is a maintenance release and contains bugfixes to v3.2.0 only. BUGFIX: PGP Messages cause pop3filter to hang BUGFIX: Invalid read of free()'d memory caused by parsing multi-line headers BUGFIX: SQLite driver fails to call PRAMA specified in dspam.conf BUGFIX: MySQL generates DUPLICATE KEY errors on simultaneous inserts BUGFIX: Memory leaks in dspam_clean BUGFIX: dspam_clean crashes with SQLite driver BUGFIX: Signatures include leading whitespace when in loose match BUGFIX: Some versions of PostgreSQL don't support PQfreemem() BUGFIX: Memory mishandling in PostgreSQL driver BUGFIX: Message delimiters mangled when processing a PGP signed message BUGFIX: --with-delivery-agent configure option no longer present BUGFIX: Default log directory /var/log not writable by some installs BUGFIX: Man page installation doesn't prefix with $(DESTDIR) BUGFIX: Emails ending with http:// cause invalid memory read @ text @d1 13 a13 109 $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; } @ 1.1 log @Apply patch from dspam CVS to fix some errors when using MySQL-4.1.x. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @