Hello,
Here's an update for dspam to release 3.6.6-STABLE.
This is a maintenance release that fixes two critical bugs:
BUGFIX: When using logfile, write errors result in segfault
BUGFIX: MySQLUIDInSignature causes segfault on retrain
BerkeleyDB backends were phased out, but they were already unmaintained
and there was intentionnaly no FLAVOR for it. patches/patch-src_libdb* can
be deleted.
Tested on i386 and amd64.
Best regards,
--
Frank Denis - frank [at] nailbox.fr - Young Nails / Akzentz nail tech
http://forum.manucure.info
Index: Makefile
===================================================================
RCS file: /cvs/openbsd/ports/mail/dspam/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 28 Apr 2006 01:13:36 -0000 1.13
+++ Makefile 14 May 2006 19:40:26 -0000
@@ -2,7 +2,7 @@
COMMENT= "anti-spam filter"
-VERSION= 3.6.5
+VERSION= 3.6.6
DISTNAME= dspam-${VERSION}
SHARED_LIBS= dspam 7.0
CATEGORIES= mail
Index: distinfo
===================================================================
RCS file: /cvs/openbsd/ports/mail/dspam/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo 28 Apr 2006 01:13:36 -0000 1.9
+++ distinfo 14 May 2006 19:40:26 -0000
@@ -1,4 +1,4 @@
-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
+MD5 (dspam-3.6.6.tar.gz) = 72dbf9d802ac3645c93b715c81cc9f50
+RMD160 (dspam-3.6.6.tar.gz) = 2416908398e7e8e6a180e97dbebd4f9aee6088d7
+SHA1 (dspam-3.6.6.tar.gz) = 6113966122597c277d51b7f27539b899c3dcf847
+SIZE (dspam-3.6.6.tar.gz) = 725502
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/openbsd/ports/mail/dspam/patches/patch-src_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 26 Dec 2005 13:17:35 -0000 1.1
+++ patches/patch-src_Makefile_in 14 May 2006 19:40:26 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2005/12/26 13:17:35 steven Exp $
---- src/Makefile.in.orig Sun Dec 25 19:58:07 2005
-+++ src/Makefile.in Sun Dec 25 19:59:15 2005
-@@ -442,7 +442,7 @@ libdspam_la_LIBADD = $(adapter_objects)
- libdspam_la_DEPENDENCIES = $(adapter_objects) $(am__append_12)
+$OpenBSD$
+--- src/Makefile.in.orig Sun May 14 21:32:29 2006
++++ src/Makefile.in Sun May 14 21:33:38 2006
+@@ -412,7 +412,7 @@ libdspam_la_LIBADD = $(adapter_objects)
+ libdspam_la_DEPENDENCIES = $(adapter_objects) $(am__append_10)
# current:revision:age
-libdspam_la_LDFLAGS = -rpath '$(libdir)' -version-info $(libversion)
+libdspam_la_LDFLAGS = -rpath '$(libdir)' $(librealdspam_la_LDFLAGS)
- @[EMAIL PROTECTED] = \
- @DYNAMIC_DRIVER_TRUE@ libdb4_drv.c libdb4_drv.h
+ @[EMAIL PROTECTED] = \
+ @DYNAMIC_DRIVER_TRUE@ mysql_drv.c mysql_drv.h
Index: patches/patch-src_dspam_c
===================================================================
RCS file: /cvs/openbsd/ports/mail/dspam/patches/patch-src_dspam_c,v
retrieving revision 1.5
diff -u -r1.5 patch-src_dspam_c
--- patches/patch-src_dspam_c 28 Apr 2006 01:13:37 -0000 1.5
+++ patches/patch-src_dspam_c 14 May 2006 19:40:26 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dspam_c,v 1.5 2006/04/28 01:13:37 brad Exp $
---- 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 (
+--- src/dspam.c.orig Sat May 13 14:17:30 2006
++++ src/dspam.c Sun May 14 21:32:13 2006
+@@ -383,7 +383,7 @@ process_message (
CTX->confidence = 1.0;
STATUS("A virus was detected in the message contents");
result = DSR_ISSPAM;
@@ -10,7 +10,7 @@
internally_canned = 1;
}
}
-@@ -395,7 +395,7 @@ process_message (
+@@ -396,7 +396,7 @@ process_message (
result = DSR_ISSPAM;
CTX->probability = 1.0;
CTX->confidence = 1.0;
@@ -19,7 +19,7 @@
internally_canned = 1;
}
-@@ -415,7 +415,7 @@ process_message (
+@@ -416,7 +416,7 @@ process_message (
result = DSR_ISSPAM;
CTX->probability = 1.0;
CTX->confidence = 1.0;
@@ -28,7 +28,7 @@
internally_canned = 1;
}
}
-@@ -744,10 +744,10 @@ process_message (
+@@ -747,10 +747,10 @@ process_message (
switch (CTX->result) {
case DSR_ISSPAM:
@@ -41,7 +41,7 @@
break;
}
-@@ -1012,7 +1012,7 @@ int tag_message(AGENT_CTX *ATX, ds_messa
+@@ -1015,7 +1015,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)
{
-@@ -1586,7 +1586,7 @@ int process_users(AGENT_CTX *ATX, buffer
+@@ -1589,7 +1589,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.3
diff -u -r1.3 patch-src_mysql_drv_c
--- patches/patch-src_mysql_drv_c 28 Apr 2006 01:13:37 -0000 1.3
+++ patches/patch-src_mysql_drv_c 14 May 2006 19:40:26 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_mysql_drv_c,v 1.3 2006/04/28 01:13:37 brad Exp $
---- 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)
+--- src/mysql_drv.c.orig Sat May 13 14:17:30 2006
++++ src/mysql_drv.c Sun May 14 21:32:13 2006
+@@ -1358,7 +1358,7 @@ _ds_get_nextuser (DSPAM_CTX * CTX)
virtual_username,
virtual_table);
#else
Index: pkg/PLIST
===================================================================
RCS file: /cvs/openbsd/ports/mail/dspam/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 20 Apr 2006 15:59:42 -0000 1.4
+++ pkg/PLIST 14 May 2006 19:40:26 -0000
@@ -6,10 +6,8 @@
bin/dspam_2sql
bin/dspam_admin
bin/dspam_clean
-bin/dspam_corpus
bin/dspam_crc
bin/dspam_dump
-bin/dspam_genaliases
bin/dspam_logrotate
bin/dspam_merge
bin/dspam_stats
@@ -34,7 +32,6 @@
lib/pkgconfig/dspam.pc
@man man/man1/dspam.1
@man man/man1/dspam_clean.1
[EMAIL PROTECTED] man/man1/dspam_corpus.1
@man man/man1/dspam_dump.1
@man man/man1/dspam_merge.1
@man man/man1/dspam_stats.1
