Revision: 7241
http://svn.sourceforge.net/mahogany/?rev=7241&view=rev
Author: vadz
Date: 2007-04-24 08:37:08 -0700 (Tue, 24 Apr 2007)
Log Message:
-----------
update to dspam 3.8.0
Modified Paths:
--------------
vendor/dspam/current/CHANGELOG
vendor/dspam/current/RELEASE.NOTES
vendor/dspam/current/configure.ac
vendor/dspam/current/man/dspam.1
vendor/dspam/current/man/dspam_clean.1
vendor/dspam/current/man/dspam_dump.1
vendor/dspam/current/man/dspam_merge.1
vendor/dspam/current/man/dspam_stats.1
vendor/dspam/current/man/dspam_train.1
vendor/dspam/current/man/libdspam.3
vendor/dspam/current/src/decode.c
vendor/dspam/current/src/decode.h
vendor/dspam/current/src/dspam.c
Removed Paths:
-------------
vendor/dspam/current/man/dspam_corpus.1
vendor/dspam/current/src/tools.pgsql_drv/purge-pe.sql
Modified: vendor/dspam/current/CHANGELOG
===================================================================
--- vendor/dspam/current/CHANGELOG 2007-04-24 15:32:33 UTC (rev 7240)
+++ vendor/dspam/current/CHANGELOG 2007-04-24 15:37:08 UTC (rev 7241)
@@ -1,8 +1,13 @@
-$Id: CHANGELOG,v 1.459 2006/08/18 15:00:31 jonz Exp $
+$Id: CHANGELOG,v 1.462 2007/03/18 17:08:49 jonz Exp $
-Version NEXT
-------------
+Version 3.8.0
+-------------
+[20061210.1435] jonz: fixed message corruption problems with direct delivery
+
+when using direct delivery (e.g. DeliveryHost), certain servers require a
+linefeed after carriage return otherwise the message will become malformatted.
+
[20060818.0700] jonz: added msg tagging support
added ability to add tagline to messages based on their classification; see
@@ -138,9 +143,6 @@
WARNING: This is an API change and constitutes a new major version. Third
party applications may fail to compile/run against this.
-Version 3.6.6
--------------
-
[20060414.1145] jonz: fix for segfault on log write err
when using --with-logfile, if file cannot be opened, dspam segfaulted
Modified: vendor/dspam/current/RELEASE.NOTES
===================================================================
--- vendor/dspam/current/RELEASE.NOTES 2007-04-24 15:32:33 UTC (rev 7240)
+++ vendor/dspam/current/RELEASE.NOTES 2007-04-24 15:37:08 UTC (rev 7241)
@@ -1,6 +1,6 @@
-$Id: RELEASE.NOTES,v 1.67 2006/05/16 20:11:22 jonz Exp $
+$Id: RELEASE.NOTES,v 1.68 2007/03/18 16:53:23 jonz Exp $
RELEASE 3.8.0-STABLE
-3.8.0 is a major version release
-
+3.8.0 is a major release. Please see UPGRADING and CHANGELOG for a detailed
+explanation of the differences from previous versions.
Modified: vendor/dspam/current/configure.ac
===================================================================
--- vendor/dspam/current/configure.ac 2007-04-24 15:32:33 UTC (rev 7240)
+++ vendor/dspam/current/configure.ac 2007-04-24 15:37:08 UTC (rev 7241)
@@ -9,7 +9,7 @@
dnl
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2002-2006 Jonathan A. Zdziarski])
-AC_INIT([dspam],[CVS],[EMAIL PROTECTED])
+AC_INIT([dspam],[3.8.0],[EMAIL PROTECTED])
CONFIGURE_ARGS=$@
AC_CONFIG_SRCDIR(./src)
Modified: vendor/dspam/current/man/dspam.1
===================================================================
--- vendor/dspam/current/man/dspam.1 2007-04-24 15:32:33 UTC (rev 7240)
+++ vendor/dspam/current/man/dspam.1 2007-04-24 15:37:08 UTC (rev 7241)
@@ -1,7 +1,7 @@
-.\" $Id: dspam.1,v 1.12 2006/05/14 15:37:30 jonz Exp $
+.\" $Id: dspam.1,v 1.13 2007/03/18 16:55:07 jonz Exp $
.\" -*- nroff -*-
.\"
-.\" dspam3.2
+.\" dspam3.8
.\"
.\" Authors: Jonathan A. Zdziarski <[EMAIL PROTECTED]>
.\"
Modified: vendor/dspam/current/man/dspam_clean.1
===================================================================
--- vendor/dspam/current/man/dspam_clean.1 2007-04-24 15:32:33 UTC (rev
7240)
+++ vendor/dspam/current/man/dspam_clean.1 2007-04-24 15:37:08 UTC (rev
7241)
@@ -1,7 +1,7 @@
-.\" $Id: dspam_clean.1,v 1.5 2006/05/14 15:37:30 jonz Exp $
+.\" $Id: dspam_clean.1,v 1.6 2007/03/18 16:55:07 jonz Exp $
.\" -*- nroff -*-
.\"
-.\" dspam_clean3.2
+.\" dspam_clean3.8
.\"
.\" Authors: Jonathan A. Zdziarski <[EMAIL PROTECTED]>
.\"
Deleted: vendor/dspam/current/man/dspam_corpus.1
===================================================================
--- vendor/dspam/current/man/dspam_corpus.1 2007-04-24 15:32:33 UTC (rev
7240)
+++ vendor/dspam/current/man/dspam_corpus.1 2007-04-24 15:37:08 UTC (rev
7241)
@@ -1,89 +0,0 @@
-.\" $Id: dspam_corpus.1,v 1.5 2006/05/13 01:12:58 jonz Exp $
-.\" -*- nroff -*-
-.\"
-.\" dspam_corpus3.2
-.\"
-.\" Authors: Jonathan A. Zdziarski <[EMAIL PROTECTED]>
-.\"
-.\" Copyright (c) 2002-2006 Jonathan A. Zdziarski
-.\" All rights reserved
-.\"
-.TH dspam_corpus 1 "May 31, 2004" "DSPAM" "DSPAM"
-
-.SH NAME
-dspam_corpus - corpus-feed a corpus of mail
-
-.SH SYNOPSIS
-.na
-.B dspam_corpus
-[\c
-.I \--spam|--nonspam\fR\c
-]
-[\c
-.I \--quiet\fR\c
-]
-[\c
-.BI \ username \fR
-]
-[\c
-.BI \ filename \fR
-]
-
-.ad
-.SH DESCRIPTION
-.LP
-.B dspam_corpus
-is used to feed a corpus of mail (in mailbox format). This tool may be used
-to build a database of spam, nonspam, or both. NOTE: It is recommended that
-dspam_train be used instead of dspam_corpus for day-to-day training. The
-dspam_corpus tool is useful for building corpuses of data, but this is likely
-to be far less accurate in real-world use than dspam_train.
-
-.SH OPTIONS
-.LP
-.ne 3
-.TP
-.BI \--spam|--nonspam\fR\c
-Identifies that the corpus being trained is a corpus of spam or nonspam.
-
-.n3
-.TP
-.BI \--quiet\fR\c
-Quiet mode. Supresses output.
-
-.n3 3
-.TP
-.BI [username]\c
-Specifies the user to train.
-
-.n3 3
-.TP
-.BI [filename]\c
-Specifies the pathname to the mailbox file containing the corpus mail.
-
-.SH EXIT VALUE
-.LP
-.ne 3
-.PD 0
-.TP
-.B 0
-Operation was successful.
-.ne 3
-.TP
-.B other
-Operation resulted in an error.
-.PD
-
-.SH AUTHORS
-.LP
-
-Jonathan A. Zdziarski
-
-For more information, see http://www.nuclearelephant.com.
-
-.SH SEE ALSO
-.BR dspam (1),
-.BR dspam_stats (1),
-.BR dspam_clean (1),
-.BR dspam_dump (1),
-.BR dspam_merge (1)
Modified: vendor/dspam/current/man/dspam_dump.1
===================================================================
--- vendor/dspam/current/man/dspam_dump.1 2007-04-24 15:32:33 UTC (rev
7240)
+++ vendor/dspam/current/man/dspam_dump.1 2007-04-24 15:37:08 UTC (rev
7241)
@@ -1,7 +1,7 @@
-.\" $Id: dspam_dump.1,v 1.5 2006/05/14 15:37:30 jonz Exp $
+.\" $Id: dspam_dump.1,v 1.6 2007/03/18 16:55:07 jonz Exp $
.\" -*- nroff -*-
.\"
-.\" dspam_dump3.2
+.\" dspam_dump3.8
.\"
.\" Authors: Jonathan A. Zdziarski <[EMAIL PROTECTED]>
.\"
Modified: vendor/dspam/current/man/dspam_merge.1
===================================================================
--- vendor/dspam/current/man/dspam_merge.1 2007-04-24 15:32:33 UTC (rev
7240)
+++ vendor/dspam/current/man/dspam_merge.1 2007-04-24 15:37:08 UTC (rev
7241)
@@ -1,7 +1,7 @@
-.\" $Id: dspam_merge.1,v 1.5 2006/05/14 15:37:30 jonz Exp $
+.\" $Id: dspam_merge.1,v 1.6 2007/03/18 16:55:07 jonz Exp $
.\" -*- nroff -*-
.\"
-.\" dspam_merge3.2
+.\" dspam_merge3.8
.\"
.\" Authors: Jonathan A. Zdziarski <[EMAIL PROTECTED]>
.\"
Modified: vendor/dspam/current/man/dspam_stats.1
===================================================================
--- vendor/dspam/current/man/dspam_stats.1 2007-04-24 15:32:33 UTC (rev
7240)
+++ vendor/dspam/current/man/dspam_stats.1 2007-04-24 15:37:08 UTC (rev
7241)
@@ -1,7 +1,7 @@
-.\" $Id: dspam_stats.1,v 1.7 2006/05/14 15:37:30 jonz Exp $
+.\" $Id: dspam_stats.1,v 1.8 2007/03/18 16:55:07 jonz Exp $
.\" -*- nroff -*-
.\"
-.\" dspam_stats3.2
+.\" dspam_stats3.8
.\"
.\" Authors: Jonathan A. Zdziarski <[EMAIL PROTECTED]>
.\"
Modified: vendor/dspam/current/man/dspam_train.1
===================================================================
--- vendor/dspam/current/man/dspam_train.1 2007-04-24 15:32:33 UTC (rev
7240)
+++ vendor/dspam/current/man/dspam_train.1 2007-04-24 15:37:08 UTC (rev
7241)
@@ -1,7 +1,7 @@
-.\" $Id: dspam_train.1,v 1.3 2006/05/14 15:37:30 jonz Exp $
+.\" $Id: dspam_train.1,v 1.4 2007/03/18 16:55:07 jonz Exp $
.\" -*- nroff -*-
.\"
-.\" dspam_train3.6
+.\" dspam_train3.8
.\"
.\" Authors: Jonathan A. Zdziarski <[EMAIL PROTECTED]>
.\"
Modified: vendor/dspam/current/man/libdspam.3
===================================================================
--- vendor/dspam/current/man/libdspam.3 2007-04-24 15:32:33 UTC (rev 7240)
+++ vendor/dspam/current/man/libdspam.3 2007-04-24 15:37:08 UTC (rev 7241)
@@ -1,7 +1,7 @@
-.\" $Id: libdspam.3,v 1.6 2006/05/14 15:37:30 jonz Exp $
+.\" $Id: libdspam.3,v 1.7 2007/03/18 16:55:07 jonz Exp $
.\" -*- nroff -*-
.\"
-.\" dspam3.2
+.\" dspam3.8
.\"
.\" Authors: Jonathan A. Zdziarski <[EMAIL PROTECTED]>
.\"
Modified: vendor/dspam/current/src/decode.c
===================================================================
--- vendor/dspam/current/src/decode.c 2007-04-24 15:32:33 UTC (rev 7240)
+++ vendor/dspam/current/src/decode.c 2007-04-24 15:37:08 UTC (rev 7241)
@@ -912,7 +912,7 @@
*/
char *
-_ds_assemble_message (ds_message_t message)
+_ds_assemble_message (ds_message_t message, const char *newline)
{
buffer *out = buffer_create (NULL);
struct nt_node *node_nt, *node_header;
@@ -952,18 +952,18 @@
heading = malloc(
((current_header->heading) ? strlen(current_header->heading) : 0)
+ ((data) ? strlen(data) : 0)
- + 4);
+ + 3 + strlen(newline));
if (current_header->heading != NULL &&
(!strncmp (current_header->heading, "From ", 5) ||
!strncmp (current_header->heading, "--", 2)))
- sprintf (heading, "%s:%s\n",
+ sprintf (heading, "%s:%s%s",
(current_header->heading) ? current_header->heading : "",
- (data) ? data: "");
+ (data) ? data : "", newline);
else
- sprintf (heading, "%s: %s\n",
+ sprintf (heading, "%s: %s%s",
(current_header->heading) ? current_header->heading : "",
- (data) ? data : "");
+ (data) ? data : "", newline);
buffer_cat (out, heading);
free(heading);
@@ -971,7 +971,7 @@
}
}
- buffer_cat (out, "\n");
+ buffer_cat (out, newline);
/* Assemble bodies */
@@ -990,7 +990,7 @@
i++;
if (node_nt != NULL && node_nt->ptr != NULL)
- buffer_cat (out, "\n");
+ buffer_cat (out, newline);
}
copyback = out->data;
Modified: vendor/dspam/current/src/decode.h
===================================================================
--- vendor/dspam/current/src/decode.h 2007-04-24 15:32:33 UTC (rev 7240)
+++ vendor/dspam/current/src/decode.h 2007-04-24 15:37:08 UTC (rev 7241)
@@ -107,7 +107,7 @@
ds_message_t _ds_actualize_message (const char *message);
-char * _ds_assemble_message (ds_message_t message);
+char * _ds_assemble_message (ds_message_t message, const char *newline);
char * _ds_find_header (ds_message_t message, const char *heading, int flags);
ds_message_part_t _ds_create_message_part (void);
Modified: vendor/dspam/current/src/dspam.c
===================================================================
--- vendor/dspam/current/src/dspam.c 2007-04-24 15:32:33 UTC (rev 7240)
+++ vendor/dspam/current/src/dspam.c 2007-04-24 15:37:08 UTC (rev 7241)
@@ -762,7 +762,7 @@
/* Reassemble message from components */
- copyback = _ds_assemble_message (CTX->message);
+ copyback = _ds_assemble_message (CTX->message, (USE_LMTP || USE_SMTP) ?
"\r\n" : "\n");
buffer_clear (message);
buffer_cat (message, copyback);
free (copyback);
Deleted: vendor/dspam/current/src/tools.pgsql_drv/purge-pe.sql
===================================================================
--- vendor/dspam/current/src/tools.pgsql_drv/purge-pe.sql 2007-04-24
15:32:33 UTC (rev 7240)
+++ vendor/dspam/current/src/tools.pgsql_drv/purge-pe.sql 2007-04-24
15:37:08 UTC (rev 7241)
@@ -1,33 +0,0 @@
-/* $Id: purge-pe.sql,v 1.5 2006/04/21 20:39:36 jonz Exp $ */
-
-DELETE FROM dspam_token_data
- WHERE (innocent_hits*2) + spam_hits < 5
- AND last_hit < CURRENT_DATE - 60;
-
-DELETE FROM dspam_token_data
- WHERE innocent_hits = 0 AND spam_hits = 1
- AND last_hit < CURRENT_DATE - 15;
-
-DELETE FROM dspam_token_data
- WHERE innocent_hits = 1 AND spam_hits = 0
- AND last_hit < CURRENT_DATE - 15;
-
-DELETE FROM dspam_token_data
- WHERE last_hit < CURRENT_DATE - 90
- AND uid NOT IN
- (SELECT uid FROM dspam_preferences
- WHERE preference = 'trainingMode'
- AND value IN('TOE','TUM','NOTRAIN'));
-
-DELETE FROM dspam_token_data
- WHERE uid IN
- (SELECT uid FROM dspam_preferences
- WHERE preference = 'trainingMode'
- AND value = 'TUM')
- AND last_hit < CURRENT_DATE - 90
- AND innocent_hits + spam_hits < 50;
-
-DELETE FROM dspam_signature_data
- WHERE created_on < CURRENT_DATE - 14;
-
-VACUUM ANALYSE;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
