update to 3.6.8, from Frank Denis

- fixes the PostgreSQL backend that failed to connect
- allows clients to link against libdspam when LDAP is turned on
This commit is contained in:
todd 2006-06-08 14:41:08 +00:00
parent c9fa958a0c
commit 0ae9789410
6 changed files with 26 additions and 25 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2006/05/15 12:01:25 todd Exp $
# $OpenBSD: Makefile,v 1.15 2006/06/08 14:41:08 todd Exp $
COMMENT= "anti-spam filter"
VERSION= 3.6.6
VERSION= 3.6.8
DISTNAME= dspam-${VERSION}
SHARED_LIBS= dspam 7.0
CATEGORIES= mail

View File

@ -1,4 +1,4 @@
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
MD5 (dspam-3.6.8.tar.gz) = c4b1a7079690ee16d8b0f36b2a2a90a4
RMD160 (dspam-3.6.8.tar.gz) = 93a70db14070cb61bd2ef1b0ca55a18be1dbfd7b
SHA1 (dspam-3.6.8.tar.gz) = e8c413882eadf1e02837e4a2ffcfc98b801eded1
SIZE (dspam-3.6.8.tar.gz) = 743275

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dspam_c,v 1.6 2006/05/15 12:01:25 todd Exp $
--- 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 (
$OpenBSD: patch-src_dspam_c,v 1.7 2006/06/08 14:41:08 todd Exp $
--- src/dspam.c.orig Tue May 30 17:03:55 2006
+++ src/dspam.c Wed Jun 7 13:36:39 2006
@@ -387,7 +387,7 @@ process_message (
CTX->confidence = 1.0;
STATUS("A virus was detected in the message contents");
result = DSR_ISSPAM;
@ -10,7 +10,7 @@ $OpenBSD: patch-src_dspam_c,v 1.6 2006/05/15 12:01:25 todd Exp $
internally_canned = 1;
}
}
@@ -396,7 +396,7 @@ process_message (
@@ -400,7 +400,7 @@ process_message (
result = DSR_ISSPAM;
CTX->probability = 1.0;
CTX->confidence = 1.0;
@ -19,7 +19,7 @@ $OpenBSD: patch-src_dspam_c,v 1.6 2006/05/15 12:01:25 todd Exp $
internally_canned = 1;
}
@@ -416,7 +416,7 @@ process_message (
@@ -420,7 +420,7 @@ process_message (
result = DSR_ISSPAM;
CTX->probability = 1.0;
CTX->confidence = 1.0;
@ -28,7 +28,7 @@ $OpenBSD: patch-src_dspam_c,v 1.6 2006/05/15 12:01:25 todd Exp $
internally_canned = 1;
}
}
@@ -747,10 +747,10 @@ process_message (
@@ -751,10 +751,10 @@ process_message (
switch (CTX->result) {
case DSR_ISSPAM:
@ -41,7 +41,7 @@ $OpenBSD: patch-src_dspam_c,v 1.6 2006/05/15 12:01:25 todd Exp $
break;
}
@@ -1015,7 +1015,7 @@ int tag_message(AGENT_CTX *ATX, ds_messa
@@ -1019,7 +1019,7 @@ int tag_message(AGENT_CTX *ATX, ds_messa
int tagged = 0;
char spam_subject[16];
@ -50,7 +50,7 @@ $OpenBSD: patch-src_dspam_c,v 1.6 2006/05/15 12:01:25 todd Exp $
if (_ds_pref_val(ATX->PTX, "spamSubject")[0] != '\n' &&
_ds_pref_val(ATX->PTX, "spamSubject")[0] != 0)
{
@@ -1589,7 +1589,7 @@ int process_users(AGENT_CTX *ATX, buffer
@@ -1593,7 +1593,7 @@ int process_users(AGENT_CTX *ATX, buffer
if (parse_message == NULL) {
LOG(LOG_CRIT, ERR_MEM_ALLOC);
presult->exitcode = ERC_PROCESS;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_mysql_drv_c,v 1.4 2006/05/15 12:01:25 todd Exp $
--- 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)
$OpenBSD: patch-src_mysql_drv_c,v 1.5 2006/06/08 14:41:08 todd Exp $
--- src/mysql_drv.c.orig Sat Jun 3 05:15:49 2006
+++ src/mysql_drv.c Wed Jun 7 13:36:39 2006
@@ -1361,7 +1361,7 @@ _ds_get_nextuser (DSPAM_CTX * CTX)
virtual_username,
virtual_table);
#else

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_pgsql_drv_c,v 1.2 2006/03/23 17:17:40 todd Exp $
--- src/pgsql_drv.c.orig Thu Feb 2 11:15:36 2006
+++ src/pgsql_drv.c Sat Mar 4 19:08:13 2006
@@ -1133,7 +1133,7 @@ _ds_get_signature (DSPAM_CTX * CTX, stru
$OpenBSD: patch-src_pgsql_drv_c,v 1.3 2006/06/08 14:41:08 todd Exp $
--- src/pgsql_drv.c.orig Tue Jun 6 17:46:06 2006
+++ src/pgsql_drv.c Wed Jun 7 13:36:39 2006
@@ -1146,7 +1146,7 @@ _ds_get_signature (DSPAM_CTX * CTX, stru
p = _pgsql_drv_getpwuid (CTX, uid);
if (!p) {
@ -10,7 +10,7 @@ $OpenBSD: patch-src_pgsql_drv_c,v 1.2 2006/03/23 17:17:40 todd Exp $
return EFAILURE;
}
username = strdup(p->pw_name);
@@ -1392,7 +1392,7 @@ _ds_get_nextuser (DSPAM_CTX * CTX)
@@ -1405,7 +1405,7 @@ _ds_get_nextuser (DSPAM_CTX * CTX)
virtual_username,
virtual_table);
#else

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2006/05/15 12:01:25 todd Exp $
@comment $OpenBSD: PLIST,v 1.6 2006/06/08 14:41:08 todd Exp $
@newgroup _dspam:540
@newuser _dspam:540:540:daemon:DSPAM Account:/var/dspam:/sbin/nologin
%%SHARED%%
@ -21,6 +21,7 @@ include/dspam/decode.h
include/dspam/diction.h
include/dspam/error.h
include/dspam/heap.h
include/dspam/ldap_client.h
include/dspam/libdspam.h
include/dspam/libdspam_objects.h
include/dspam/nodetree.h