3.6.5 is a maintenance release.
Port tested on i386 and amd64.
MAINT: PgSQL SQL tuning
MAINT: WebUI aesthetic and functional fixes
MAINT: Added --disable-syslog and --with-logfile= configuration flags
MAINT: Added -t flag for dspam_stats to total stats
MAINT: Markov result used as X-DSPAM-Confidence when Markov used
MAINT: Support for separate read/write servers to be used with mysql_drv
BUGFIX: Spam are quarantined when --deliver=summary
BUGFIX: Admin graphs malformatted when subject contains newline character
BUGFIX: WebUI does not use MAX_COL_LEN
BUGFIX: Output for dspam_admin aggr pref incorrect
BUGFIX: Flat-file preference writes fail on some systems
BUGFIX: Failure to connect to ClamAV causes segmentation fault
BUGFIX: NULL username in system causes segmentation fault
BUGFIX: ClamAV processing and cleanup issues
BUGFIX: Fragment files overwritten on retrain
BUGFIX: Miscellaneous invalid read / segmentation fault bugs
BUGFIX: If TrainingMode not specified in dspam.conf or passed in,
segmentation fault
BUGFIX: No output returned when using --deliver=summary with dspamc
--
Frank Denis - frank [at] nailbox.fr
Young Nails / Akzentz nail tech
Index: Makefile
===================================================================
RCS file: /cvs/openbsd/ports/mail/dspam/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 20 Apr 2006 15:59:42 -0000 1.12
+++ Makefile 27 Apr 2006 12:28:08 -0000
@@ -2,9 +2,8 @@
COMMENT= "anti-spam filter"
-VERSION= 3.6.4
+VERSION= 3.6.5
DISTNAME= dspam-${VERSION}
-PKGNAME= dspam-${VERSION}p1
SHARED_LIBS= dspam 7.0
CATEGORIES= mail
Index: distinfo
===================================================================
RCS file: /cvs/openbsd/ports/mail/dspam/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo 23 Mar 2006 17:17:40 -0000 1.8
+++ distinfo 27 Apr 2006 12:28:08 -0000
@@ -1,4 +1,4 @@
-MD5 (dspam-3.6.4.tar.gz) = e9fdb00a23a99e05c9e4c22aa8aa3655
-RMD160 (dspam-3.6.4.tar.gz) = fcd431205e3fd737cfdfb90b695ba7c84bbb27d5
-SHA1 (dspam-3.6.4.tar.gz) = bc11d8c1584175de9cdeed7ed20e11c2a49bf53a
-SIZE (dspam-3.6.4.tar.gz) = 743664
+MD5 (dspam-3.6.5.tar.gz) = da4f0e00633bff49d71fde418caaf14b
+RMD160 (dspam-3.6.5.tar.gz) = 363217410de515f15baaa0a864ee23617ae8f6c2
+SHA1 (dspam-3.6.5.tar.gz) = 031d3fbeb1fb0d8008dcc1cf7589d4d955e7f933
+SIZE (dspam-3.6.5.tar.gz) = 747196
Index: patches/patch-src_client_c
===================================================================
RCS file: /cvs/openbsd/ports/mail/dspam/patches/patch-src_client_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_client_c
--- patches/patch-src_client_c 23 Mar 2006 17:17:40 -0000 1.2
+++ patches/patch-src_client_c 27 Apr 2006 12:28:08 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_client_c,v 1.2 2006/03/23 17:17:40 todd Exp $
---- src/client.c.orig Tue Jan 31 14:25:46 2006
-+++ src/client.c Mon Mar 6 17:08:36 2006
+--- src/client.c.orig Wed Feb 15 21:06:35 2006
++++ src/client.c Thu Apr 27 10:03:28 2006
@@ -108,7 +108,7 @@ int client_process(AGENT_CTX *ATX, buffe
/* RCPT TO - Send recipient information */
@@ -10,17 +10,17 @@
node_nt = c_nt_first(ATX->users, &c_nt);
while(node_nt != NULL) {
const char *ptr = (const char *) node_nt->ptr;
-@@ -165,7 +165,7 @@ int client_process(AGENT_CTX *ATX, buffe
- char *line = NULL;
- int head = !(ATX->flags & DAF_STDOUT);
+@@ -170,7 +170,7 @@ int client_process(AGENT_CTX *ATX, buffe
+ if (ATX->flags & DAF_SUMMARY)
+ head = 1;
- line = client_getline(&TTX, 300);
+ line = client_getline(&TTX, 900);
while(line != NULL && strcmp(line, ".")) {
chomp(line);
-@@ -185,7 +185,7 @@ int client_process(AGENT_CTX *ATX, buffe
- printf("%s\n", line);
+@@ -192,7 +192,7 @@ int client_process(AGENT_CTX *ATX, buffe
+ break;
}
free(line);
- line = client_getline(&TTX, 300);
@@ -28,7 +28,7 @@
if (line) chomp(line);
}
free(line);
-@@ -193,7 +193,7 @@ int client_process(AGENT_CTX *ATX, buffe
+@@ -200,7 +200,7 @@ int client_process(AGENT_CTX *ATX, buffe
goto BAIL;
} else {
for(i=0;i<ATX->users->items;i++) {
@@ -37,7 +37,7 @@
char *x;
int code = 500;
-@@ -306,7 +306,7 @@ int client_connect(AGENT_CTX *ATX, int f
+@@ -313,7 +313,7 @@ int client_connect(AGENT_CTX *ATX, int f
if (domain) {
sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
saun.sun_family = AF_UNIX;
@@ -46,7 +46,7 @@
addr_len = sizeof(saun.sun_family) + strlen(saun.sun_path) + 1;
LOGDEBUG(INFO_CLIENT_CONNECTING, host, 0);
-@@ -436,7 +436,7 @@ char * client_expect(THREAD_CTX *TTX, in
+@@ -443,7 +443,7 @@ char * client_expect(THREAD_CTX *TTX, in
char *inp, *dup, *ptr, *ptrptr;
int recv_code;
@@ -55,7 +55,7 @@
while(inp != NULL) {
recv_code = 0;
dup = strdup(inp);
-@@ -460,7 +460,7 @@ char * client_expect(THREAD_CTX *TTX, in
+@@ -467,7 +467,7 @@ char * client_expect(THREAD_CTX *TTX, in
strlcpy(err, inp, len);
free(inp);
@@ -64,7 +64,7 @@
}
return NULL;
-@@ -505,13 +505,13 @@ int client_getcode(THREAD_CTX *TTX, char
+@@ -512,13 +512,13 @@ int client_getcode(THREAD_CTX *TTX, char
char *inp, *ptr, *ptrptr;
int i;
Index: patches/patch-src_dspam_c
===================================================================
RCS file: /cvs/openbsd/ports/mail/dspam/patches/patch-src_dspam_c,v
retrieving revision 1.4
diff -u -r1.4 patch-src_dspam_c
--- patches/patch-src_dspam_c 23 Mar 2006 17:17:40 -0000 1.4
+++ patches/patch-src_dspam_c 27 Apr 2006 12:28:08 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dspam_c,v 1.4 2006/03/23 17:17:40 todd Exp $
---- src/dspam.c.orig Tue Jan 31 14:25:46 2006
-+++ src/dspam.c Sat Mar 4 19:04:44 2006
+--- src/dspam.c.orig Fri Apr 21 22:51:52 2006
++++ src/dspam.c Thu Apr 27 10:03:28 2006
@@ -382,7 +382,7 @@ process_message (
CTX->confidence = 1.0;
STATUS("A virus was detected in the message contents");
@@ -28,7 +28,7 @@
internally_canned = 1;
}
}
-@@ -743,10 +743,10 @@ process_message (
+@@ -744,10 +744,10 @@ process_message (
switch (CTX->result) {
case DSR_ISSPAM:
@@ -41,7 +41,7 @@
break;
}
-@@ -1011,7 +1011,7 @@ int tag_message(AGENT_CTX *ATX, ds_messa
+@@ -1012,7 +1012,7 @@ int tag_message(AGENT_CTX *ATX, ds_messa
int tagged = 0;
char spam_subject[16];
@@ -50,7 +50,7 @@
if (_ds_pref_val(ATX->PTX, "spamSubject")[0] != '\n' &&
_ds_pref_val(ATX->PTX, "spamSubject")[0] != 0)
{
-@@ -1585,7 +1585,7 @@ int process_users(AGENT_CTX *ATX, buffer
+@@ -1586,7 +1586,7 @@ int process_users(AGENT_CTX *ATX, buffer
if (parse_message == NULL) {
LOG(LOG_CRIT, ERR_MEM_ALLOC);
presult->exitcode = ERC_PROCESS;
Index: patches/patch-src_mysql_drv_c
===================================================================
RCS file: /cvs/openbsd/ports/mail/dspam/patches/patch-src_mysql_drv_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_mysql_drv_c
--- patches/patch-src_mysql_drv_c 23 Mar 2006 17:17:40 -0000 1.2
+++ patches/patch-src_mysql_drv_c 27 Apr 2006 12:28:08 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-src_mysql_drv_c,v 1.2 2006/03/23 17:17:40 todd Exp $
---- src/mysql_drv.c.orig Thu Feb 2 11:15:36 2006
-+++ src/mysql_drv.c Sat Mar 4 19:04:44 2006
-@@ -1353,7 +1353,7 @@ _ds_get_nextuser (DSPAM_CTX * CTX)
+--- src/mysql_drv.c.orig Tue Apr 18 20:54:25 2006
++++ src/mysql_drv.c Thu Apr 27 10:03:29 2006
+@@ -1360,7 +1360,7 @@ _ds_get_nextuser (DSPAM_CTX * CTX)
virtual_username,
virtual_table);
#else
- strcpy (query, "select distinct uid from dspam_stats");
+ strlcpy (query, "select distinct uid from dspam_stats", sizeof (query));
#endif
- if (MYSQL_RUN_QUERY (s->dbh, query))
+ if (MYSQL_RUN_QUERY (s->dbt->dbh_read, query))
{
Index: patches/patch-src_tools_pgsql_drv_pgsql_objects_sql
===================================================================
RCS file:
/cvs/openbsd/ports/mail/dspam/patches/patch-src_tools_pgsql_drv_pgsql_objects_sql,v
retrieving revision 1.1
diff -u -r1.1 patch-src_tools_pgsql_drv_pgsql_objects_sql
--- patches/patch-src_tools_pgsql_drv_pgsql_objects_sql 23 Mar 2006 17:17:40
-0000 1.1
+++ patches/patch-src_tools_pgsql_drv_pgsql_objects_sql 27 Apr 2006 12:28:08
-0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_tools_pgsql_drv_pgsql_objects_sql,v 1.1 2006/03/23
17:17:40 todd Exp $
---- src/tools.pgsql_drv/pgsql_objects.sql.orig Tue Jan 24 09:46:14 2006
-+++ src/tools.pgsql_drv/pgsql_objects.sql Mon Mar 20 17:28:38 2006
-@@ -55,3 +55,16 @@ begin
- return;
- end;';
-
-+--
-+-- For much better performance
-+-- see http://archives.postgresql.org/pgsql-performance/2004-11/msg00416.php
-+-- and http://archives.postgresql.org/pgsql-performance/2004-11/msg00417.php
-+-- for details
-+--
-+
-+alter table "dspam_token_data" alter "token" set statistics 200;
-+alter table dspam_signature_data alter signature set statistics 200;
-+alter table dspam_token_data alter innocent_hits set statistics 200;
-+alter table dspam_token_data alter spam_hits set statistics 200;
-+CREATE INDEX id_token_data_sumhits ON dspam_token_data ((spam_hits +
innocent_hits));
-+analyze;
Index: patches/patch-src_tools_pgsql_drv_purge_sql
===================================================================
RCS file:
/cvs/openbsd/ports/mail/dspam/patches/patch-src_tools_pgsql_drv_purge_sql,v
retrieving revision 1.1
diff -u -r1.1 patch-src_tools_pgsql_drv_purge_sql
--- patches/patch-src_tools_pgsql_drv_purge_sql 23 Mar 2006 17:17:40 -0000
1.1
+++ patches/patch-src_tools_pgsql_drv_purge_sql 27 Apr 2006 12:28:08 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-src_tools_pgsql_drv_purge_sql,v 1.1 2006/03/23 17:17:40 todd
Exp $
---- src/tools.pgsql_drv/purge.sql.orig Sun Jan 22 17:02:03 2006
-+++ src/tools.pgsql_drv/purge.sql Sun Jan 22 17:02:06 2006
-@@ -2,20 +2,20 @@
-
- DELETE FROM dspam_token_data
- WHERE (innocent_hits*2) + spam_hits < 5
-- AND CURRENT_DATE - last_hit > 60;
-+ AND last_hit < CURRENT_DATE - 60;
-
- DELETE FROM dspam_token_data
- WHERE innocent_hits = 1 AND spam_hits = 0
-- AND CURRENT_DATE - last_hit > 15;
-+ AND last_hit < CURRENT_DATE - 15;
-
- DELETE FROM dspam_token_data
- WHERE innocent_hits = 0 AND spam_hits = 1
-- AND CURRENT_DATE - last_hit > 15;
-+ AND last_hit < CURRENT_DATE - 15;
-
- DELETE FROM dspam_token_data
-- WHERE CURRENT_DATE - last_hit > 90;
-+ WHERE last_hit < CURRENT_DATE - 90;
-
- DELETE FROM dspam_signature_data
-- WHERE CURRENT_DATE - created_on > 14;
-+ WHERE created_on < CURRENT_DATE - 14;
-
- VACUUM ANALYSE;
