cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 3.6.6, provided by Frank Dennis

Browse Source 
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
This commit is contained in:
todd 2006-05-15 12:01:25 +00:00
parent 43190c7cd9
commit a7d3c4d53e
8 changed files with 32 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mail/dspam/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2006/04/28 01:13:36 brad Exp $
# $OpenBSD: Makefile,v 1.14 2006/05/15 12:01:25 todd Exp $
COMMENT= "anti-spam filter"
VERSION= 3.6.5
VERSION= 3.6.6
DISTNAME= dspam-${VERSION}
SHARED_LIBS= dspam 7.0
CATEGORIES= mail
@ -44,7 +44,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/dspam
DRIVER=
DAEMON_SUPPORT=
FLAVORS= sqlite3 sqlite mysql pgsql hash clamav ldap
FLAVORS= sqlite3 sqlite mysql pgsql hash clamav ldap preferences
FLAVOR?= sqlite3
.if ${FLAVOR:L:Mmysql}
@ -125,6 +125,10 @@ CONFIGURE_ARGS+= --enable-daemon
WANTLIB+= pthread
.endif
.if ${FLAVOR:L:Mpreferences}
CONFIGURE_ARGS+= --enable-preferences-extension
.endif
post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKBUILD}/src/dspam.conf \

8
mail/dspam/distinfo
View File

@ -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

14
mail/dspam/patches/patch-src_Makefile_in
View File

@ -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: patch-src_Makefile_in,v 1.2 2006/05/15 12:01:25 todd Exp $
--- 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)
@DYNAMIC_DRIVER_TRUE@libdb4_drv_la_SOURCES = \
@DYNAMIC_DRIVER_TRUE@ libdb4_drv.c libdb4_drv.h
@DYNAMIC_DRIVER_TRUE@libmysql_drv_la_SOURCES = \
@DYNAMIC_DRIVER_TRUE@ mysql_drv.c mysql_drv.h

18
mail/dspam/patches/patch-src_dspam_c
View File

@ -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 (
$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 (
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.5 2006/04/28 01:13:37 brad Exp $
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 @@ $OpenBSD: patch-src_dspam_c,v 1.5 2006/04/28 01:13:37 brad Exp $
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 @@ $OpenBSD: patch-src_dspam_c,v 1.5 2006/04/28 01:13:37 brad Exp $
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 @@ $OpenBSD: patch-src_dspam_c,v 1.5 2006/04/28 01:13:37 brad Exp $
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 @@ $OpenBSD: patch-src_dspam_c,v 1.5 2006/04/28 01:13:37 brad Exp $
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;

21
mail/dspam/patches/patch-src_libdb3_drv_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_libdb3_drv_c,v 1.1 2005/10/26 06:18:39 jakob Exp $
--- src/libdb3_drv.c.orig Sat Sep 24 19:49:49 2005
+++ src/libdb3_drv.c Mon Oct 17 14:48:42 2005
@@ -90,7 +90,7 @@ _libdb3_drv_get_spamtotals (DSPAM_CTX *
memset (&key, 0, sizeof (DBT));
memset (&data, 0, sizeof (DBT));
- strcpy (hashkey, "_TOTALS");
+ strlcpy (hashkey, "_TOTALS", sizeof (hashkey));
key.data = hashkey;
key.size = strlen (hashkey);
@@ -141,7 +141,7 @@ _libdb3_drv_set_spamtotals (DSPAM_CTX *
memset (&key, 0, sizeof (DBT));
memset (&data, 0, sizeof (DBT));
- strcpy (hashkey, "_TOTALS");
+ strlcpy (hashkey, "_TOTALS", sizeof (hashkey));
key.data = hashkey;
key.size = strlen (hashkey);
data.data = &CTX->totals;

21
mail/dspam/patches/patch-src_libdb4_drv_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_libdb4_drv_c,v 1.1 2005/10/26 06:18:39 jakob Exp $
--- src/libdb4_drv.c.orig Sat Sep 24 19:49:49 2005
+++ src/libdb4_drv.c Mon Oct 17 14:48:42 2005
@@ -89,7 +89,7 @@ _libdb4_drv_get_spamtotals (DSPAM_CTX *
memset (&key, 0, sizeof (DBT));
memset (&data, 0, sizeof (DBT));
- strcpy (hashkey, "_TOTALS");
+ strlcpy (hashkey, "_TOTALS", sizeof (hashkey));
key.data = hashkey;
key.size = strlen (hashkey);
@@ -140,7 +140,7 @@ _libdb4_drv_set_spamtotals (DSPAM_CTX *
memset (&key, 0, sizeof (DBT));
memset (&data, 0, sizeof (DBT));
- strcpy (hashkey, "_TOTALS");
+ strlcpy (hashkey, "_TOTALS", sizeof (hashkey));
key.data = hashkey;
key.size = strlen (hashkey);
data.data = &CTX->totals;

8
mail/dspam/patches/patch-src_mysql_drv_c
View File

@ -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)
$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)
virtual_username,
virtual_table);
#else

5
mail/dspam/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2006/04/20 15:59:42 aanriot Exp $
@comment $OpenBSD: PLIST,v 1.5 2006/05/15 12:01:25 todd Exp $
@newgroup _dspam:540
@newuser _dspam:540:540:daemon:DSPAM Account:/var/dspam:/sbin/nologin
%%SHARED%%
@ -6,10 +6,8 @@ bin/dspam
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/
lib/pkgconfig/dspam.pc
@man man/man1/dspam.1
@man man/man1/dspam_clean.1
@man man/man1/dspam_corpus.1
@man man/man1/dspam_dump.1
@man man/man1/dspam_merge.1
@man man/man1/dspam_stats.1