Attachment #61649 for bug #92335

View | Details | Raw Unified | Return to bug 92335
Collapse All | Expand All




#
# $FreeBSD: ports/mail/dspam-devel/Makefile,v 1.42 2005/12/15 06:42:15 az Exp $
#
# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.16 2006/01/25 00:31:26 itetcu Exp $
#

# Note to commiters: If don't commit a maintainer patch and as a result PKGNAME


PORTNAME=	dspam-devel
PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
#PORTREVISION=	0
CATEGORIES=	mail
MASTER_SITES=	# set later

MAINTAINER=	itetcu@people.tecnik93.com
COMMENT=	Bayesian spam filter - development version

PORTVER_MAJ=	3.6.3
#SNAP_DATE=	.20051211.2134

.ifdef(SNAP_DATE)
MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
WRKSRC=		${WRKDIR}/dspam-cvs-devel${SNAP_DATE}
.else
MASTER_SITES=	http://dspam.irontec.com/sources/ \
	http://dspam.nuclearelephant.com/sources/ \
	http://dspam.systemadministrator.org/sources/ \
	http://dspam.sourceforge.net/sources/ \
	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
DISTFILES=	dspam-${PORTVER_MAJ}.tar.gz
WRKSRC=		${WRKDIR}/dspam-${PORTVER_MAJ}
.endif


FETCH_BEFORE_ARGS=	-v -o ${DISTDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
.endif

_UPD_LINE_NO=	19

## debug / log / admin options
OPTIONS=	DEBUG "Enable debugging logging" on

OPTIONS+=	TRAIN_SCRIPT "Install trainning script (needs perl)" off

USE_AUTOTOOLS=	libtool:15
USE_REINPLACE=	yes
INSTALLS_SHLIB=	yes
GNU_CONFIGURE=	yes
#CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"

Lines 1-3 Link Here

(-)dspam-devel/distinfo (-3 / +3 lines)
1	MD5 (dspam-devel-3.6.2.tar.gz) = cde38b1fe37daf531475251e95253033	1	MD5 (dspam-3.6.3.tar.gz) = db1aedb9677e6bf5c7a47a72d4f130e5
2	SHA256 (dspam-devel-3.6.2.tar.gz) = c99b4ba5b414df6dbd8e252243ebd1a079591669de91deee456ac64a802d1178	2	SHA256 (dspam-3.6.3.tar.gz) = 6283c067c192f589a4fb925b845ba1bd9b51fe1b3df93d7f03897d7617a4aa7a
3	SIZE (dspam-devel-3.6.2.tar.gz) = 740001	3	SIZE (dspam-3.6.3.tar.gz) = 740097




make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`

###########################################################################
# dspam-devel-3.6.3
#

BUGFIX: fixed bug causing "no trusted delivery agent configured" error when
calling dspam withot an agent configured, but not delivering - or when using
--classify
BUGFIX: fixed minor bug causing ChangeUserOnParse to format incorrectly

Notable changes:
- rewrote some routines that were strdup'ing message body repeatedly
- changes to tokenization and probability assignment make a noticeable
difference in accuracy
- updated dspam_stats "-S" output to use more widely accepted readings:
SHR: Spam Hit Rate (true positive rate)
HSR: Ham Strike Rate (false positive rate)
OCA: Overall Classification Accuracy
-  add large-scale support to dspam_logrotate


###########################################################################
# dspam-devel-3.6.2_1 (2005-12-11 19:18)
#


Lines 1-7 Link Here

(-)dspam-devel/files/dspam-devel.sh.in (-1 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2	# $FreeBSD: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.4 2005/12/15 06:42:16 az Exp $	2	# $FreeBSD: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.4 2005/12/15 06:42:16 az Exp $
3	# formerly $ FreeBSD: ports/mail/dspam-devel/files/dspam.rc,v 1.2 2005/02/25 03:09:26 leeym Exp $	3	# formerly $ FreeBSD: ports/mail/dspam-devel/files/dspam.rc,v 1.2 2005/02/25 03:09:26 leeym Exp $
4	# $Tecnik: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.3 2005/12/13 21:09:37 itetcu Exp $	4	# $Tecnik: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.4 2006/01/24 20:52:44 itetcu Exp $
5		5
6	# PROVIDE: dspam	6	# PROVIDE: dspam
7	# REQUIRE: DAEMON %%MYSQL%% %%PGSQL%% %%CLAMD%%	7	# REQUIRE: DAEMON %%MYSQL%% %%PGSQL%% %%CLAMD%%

Lines 1-22 Link Here

(-)dspam-devel/files/patch-CHANGELOG (-22 lines)
1	Index: CHANGELOG
2	===================================================================
3	RCS file: /usr/local/cvsroot/dspam/CHANGELOG,v
4	retrieving revision 1.387
5	retrieving revision 1.388
6	diff -u -r1.387 -r1.388
7	--- CHANGELOG 25 Nov 2005 17:46:31 -0000 1.387
8	+++ CHANGELOG 2 Dec 2005 05:06:11 -0000 1.388
9	@@ -1,4 +1,12 @@
10	-$Id: CHANGELOG,v 1.387 2005/11/25 17:46:31 jonz Exp $
11	+$Id: CHANGELOG,v 1.388 2005/12/02 05:06:11 jonz Exp $
12	+
13	+Version NEXT
14	+------------
15	+
16	+[20051201.0000] jonz: fix for ldap calls
17	+
18	+fix to close connections to ldap after calls
19	+fix to fail database creation on ldap failure
20
21	Version 3.6.2
22	-------------

Lines 1-25 Link Here

(-)dspam-devel/files/patch-src_ldap_client.c (-25 lines)
1	Index: src/ldap_client.c
2	===================================================================
3	RCS file: /usr/local/cvsroot/dspam/src/ldap_client.c,v
4	retrieving revision 1.2
5	retrieving revision 1.3
6	diff -u -r1.2 -r1.3
7	--- src/ldap_client.c 24 Sep 2005 17:48:59 -0000 1.2
8	+++ src/ldap_client.c 2 Dec 2005 05:06:11 -0000 1.3
9	@@ -1,4 +1,4 @@
10	-/* $Id: ldap_client.c,v 1.2 2005/09/24 17:48:59 jonz Exp $ */
11	+/* $Id: ldap_client.c,v 1.3 2005/12/02 05:06:11 jonz Exp $ */
12
13	/*
14	DSPAM
15	@@ -80,7 +80,9 @@
16	return EFAILURE;
17	}
18
19	- result = ldap_count_entries(ld, msg);
20	+ result = ldap_count_entries(ld, msg) > 0;
21	+ ldap_msgfree (msg);
22	+ ldap_unbind(ld);
23	return result;
24	}
25

Lines 1-25 Link Here

(-)dspam-devel/files/patch-src_libdspam.c (-25 lines)
1	Index: dspam/src/libdspam.c
2	===================================================================
3	RCS file: /usr/local/cvsroot/dspam/src/libdspam.c,v
4	retrieving revision 1.144
5	retrieving revision 1.145
6	diff -u -r1.144 -r1.145
7	--- src/libdspam.c 24 Nov 2005 14:09:12 -0000 1.144
8	+++ src/libdspam.c 13 Dec 2005 16:59:45 -0000 1.145
9	@@ -1,4 +1,4 @@
10	-/* $Id: libdspam.c,v 1.144 2005/11/24 14:09:12 jonz Exp $ */
11	+/* $Id: libdspam.c,v 1.145 2005/12/13 16:59:45 jonz Exp $ */
12
13	/*
14	DSPAM
15	@@ -892,7 +892,9 @@
16	/* Apply Bayesian Noise Reduction */
17	if (CTX->flags & DSF_NOISE)
18	{
19	- _ds_apply_bnr(CTX, diction);
20	+ ds_diction_t p = _ds_apply_bnr(CTX, diction);
21	+ if (p)
22	+ ds_diction_destroy(p);
23	}
24
25	if (CTX->flags & DSF_WHITELIST)




Index: src/mysql_drv.c
===================================================================
RCS file: /usr/local/cvsroot/dspam/src/mysql_drv.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- src/mysql_drv.c	1 Oct 2005 15:33:18 -0000	1.57
+++ src/mysql_drv.c	2 Dec 2005 05:06:11 -0000	1.58
@@ -1,4 +1,4 @@
-/* $Id: mysql_drv.c,v 1.57 2005/10/01 15:33:18 jonz Exp $ */
+/* $Id: mysql_drv.c,v 1.58 2005/12/02 05:06:11 jonz Exp $ */
 
 /*
  DSPAM
@@ -1804,7 +1804,7 @@
 
 #ifdef USE_LDAP
   if (_ds_match_attribute(CTX->config->attributes, "LDAPMode", "verify") &&
-      !ldap_verify(CTX, name)) 
+      ldap_verify(CTX, name)<=0) 
   {
     LOGDEBUG("LDAP verification of %s failed: not adding user", name);
     return NULL;




Index: src/pgsql_drv.c
===================================================================
RCS file: /usr/local/cvsroot/dspam/src/pgsql_drv.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- src/pgsql_drv.c	9 Oct 2005 20:29:55 -0000	1.47
+++ src/pgsql_drv.c	2 Dec 2005 05:06:11 -0000	1.48
@@ -1,4 +1,4 @@
-/* $Id: pgsql_drv.c,v 1.47 2005/10/09 20:29:55 jonz Exp $ */
+/* $Id: pgsql_drv.c,v 1.48 2005/12/02 05:06:11 jonz Exp $ */
 
 /*
  DSPAM
@@ -1923,7 +1923,7 @@
 
 #ifdef USE_LDAP
   if (_ds_match_attribute(CTX->config->attributes, "LDAPMode", "verify") &&
-      !ldap_verify(CTX, name))
+      ldap_verify(CTX, name)<=0)
   {
     LOGDEBUG("LDAP verification of %s failed: not adding user", name);
     return NULL;

Return to bug 92335

Lines 4-10 Link Here

(-)dspam-devel/Makefile (-6 / +12 lines)
4	#	4	#
5	# $FreeBSD: ports/mail/dspam-devel/Makefile,v 1.42 2005/12/15 06:42:15 az Exp $	5	# $FreeBSD: ports/mail/dspam-devel/Makefile,v 1.42 2005/12/15 06:42:15 az Exp $
6	#	6	#
7	# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.12 2005/12/13 21:09:01 itetcu Exp $	7	# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.16 2006/01/25 00:31:26 itetcu Exp $
8	#	8	#
9		9
10	# Note to commiters: If don't commit a maintainer patch and as a result PKGNAME	10	# Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
Lines 14-32 Link Here
14		14
15	PORTNAME= dspam-devel	15	PORTNAME= dspam-devel
16	PORTVERSION= ${PORTVER_MAJ}${SNAP_DATE}	16	PORTVERSION= ${PORTVER_MAJ}${SNAP_DATE}
17	PORTREVISION= 1	17	#PORTREVISION= 0
18	CATEGORIES= mail	18	CATEGORIES= mail
19	MASTER_SITES= http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/	19	MASTER_SITES= # set later
20		20
21	MAINTAINER= itetcu@people.tecnik93.com	21	MAINTAINER= itetcu@people.tecnik93.com
22	COMMENT= Bayesian spam filter - development version	22	COMMENT= Bayesian spam filter - development version
23		23
24	PORTVER_MAJ= 3.6.2	24	PORTVER_MAJ= 3.6.3
25	#SNAP_DATE= .20051211.2134	25	#SNAP_DATE= .20051211.2134
26		26
27	.ifdef(SNAP_DATE)	27	.ifdef(SNAP_DATE)
		28	MASTER_SITES= http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
28	WRKSRC= ${WRKDIR}/dspam-cvs-devel${SNAP_DATE}	29	WRKSRC= ${WRKDIR}/dspam-cvs-devel${SNAP_DATE}
29	.else	30	.else
		31	MASTER_SITES= http://dspam.irontec.com/sources/ \
		32	http://dspam.nuclearelephant.com/sources/ \
		33	http://dspam.systemadministrator.org/sources/ \
		34	http://dspam.sourceforge.net/sources/ \
		35	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
		36	DISTFILES= dspam-${PORTVER_MAJ}.tar.gz
30	WRKSRC= ${WRKDIR}/dspam-${PORTVER_MAJ}	37	WRKSRC= ${WRKDIR}/dspam-${PORTVER_MAJ}
31	.endif	38	.endif
32		39
Lines 42-48 Link Here
42	FETCH_BEFORE_ARGS= -v -o ${DISTDIR}/${PORTNAME}-${PORTVERSION}.tar.gz	49	FETCH_BEFORE_ARGS= -v -o ${DISTDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
43	.endif	50	.endif
44		51
45	_UPD_LINE_NO= 6	52	_UPD_LINE_NO= 19
46		53
47	## debug / log / admin options	54	## debug / log / admin options
48	OPTIONS= DEBUG "Enable debugging logging" on	55	OPTIONS= DEBUG "Enable debugging logging" on
Lines 98-104 Link Here
98	OPTIONS+= TRAIN_SCRIPT "Install trainning script (needs perl)" off	105	OPTIONS+= TRAIN_SCRIPT "Install trainning script (needs perl)" off
99		106
100	USE_AUTOTOOLS= libtool:15	107	USE_AUTOTOOLS= libtool:15
101	USE_REINPLACE= yes
102	INSTALLS_SHLIB= yes	108	INSTALLS_SHLIB= yes
103	GNU_CONFIGURE= yes	109	GNU_CONFIGURE= yes
104	#CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"	110	#CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"

Lines 11-16 Link Here

(-)dspam-devel/files/UPDATING (+20 lines)
11	make extract; more `find . -type f -maxdepth 2 -name UPGRADING`	11	make extract; more `find . -type f -maxdepth 2 -name UPGRADING`
12		12
13	###########################################################################	13	###########################################################################
		14	# dspam-devel-3.6.3
		15	#
		16
		17	BUGFIX: fixed bug causing "no trusted delivery agent configured" error when
		18	calling dspam withot an agent configured, but not delivering - or when using
		19	--classify
		20	BUGFIX: fixed minor bug causing ChangeUserOnParse to format incorrectly
		21
		22	Notable changes:
		23	- rewrote some routines that were strdup'ing message body repeatedly
		24	- changes to tokenization and probability assignment make a noticeable
		25	difference in accuracy
		26	- updated dspam_stats "-S" output to use more widely accepted readings:
		27	SHR: Spam Hit Rate (true positive rate)
		28	HSR: Ham Strike Rate (false positive rate)
		29	OCA: Overall Classification Accuracy
		30	- add large-scale support to dspam_logrotate
		31
		32
		33	###########################################################################
14	# dspam-devel-3.6.2_1 (2005-12-11 19:18)	34	# dspam-devel-3.6.2_1 (2005-12-11 19:18)
15	#	35	#
16		36

Lines 1-23 Link Here

(-)dspam-devel/files/patch-src_mysql_drv.c (-23 lines)
1	Index: src/mysql_drv.c
2	===================================================================
3	RCS file: /usr/local/cvsroot/dspam/src/mysql_drv.c,v
4	retrieving revision 1.57
5	retrieving revision 1.58
6	diff -u -r1.57 -r1.58
7	--- src/mysql_drv.c 1 Oct 2005 15:33:18 -0000 1.57
8	+++ src/mysql_drv.c 2 Dec 2005 05:06:11 -0000 1.58
9	@@ -1,4 +1,4 @@
10	-/* $Id: mysql_drv.c,v 1.57 2005/10/01 15:33:18 jonz Exp $ */
11	+/* $Id: mysql_drv.c,v 1.58 2005/12/02 05:06:11 jonz Exp $ */
12
13	/*
14	DSPAM
15	@@ -1804,7 +1804,7 @@
16
17	#ifdef USE_LDAP
18	if (_ds_match_attribute(CTX->config->attributes, "LDAPMode", "verify") &&
19	- !ldap_verify(CTX, name))
20	+ ldap_verify(CTX, name)<=0)
21	{
22	LOGDEBUG("LDAP verification of %s failed: not adding user", name);
23	return NULL;

Lines 1-23 Link Here

(-)dspam-devel/files/patch-src_pgsql_drv.c (-23 lines)
1	Index: src/pgsql_drv.c
2	===================================================================
3	RCS file: /usr/local/cvsroot/dspam/src/pgsql_drv.c,v
4	retrieving revision 1.47
5	retrieving revision 1.48
6	diff -u -r1.47 -r1.48
7	--- src/pgsql_drv.c 9 Oct 2005 20:29:55 -0000 1.47
8	+++ src/pgsql_drv.c 2 Dec 2005 05:06:11 -0000 1.48
9	@@ -1,4 +1,4 @@
10	-/* $Id: pgsql_drv.c,v 1.47 2005/10/09 20:29:55 jonz Exp $ */
11	+/* $Id: pgsql_drv.c,v 1.48 2005/12/02 05:06:11 jonz Exp $ */
12
13	/*
14	DSPAM
15	@@ -1923,7 +1923,7 @@
16
17	#ifdef USE_LDAP
18	if (_ds_match_attribute(CTX->config->attributes, "LDAPMode", "verify") &&
19	- !ldap_verify(CTX, name))
20	+ ldap_verify(CTX, name)<=0)
21	{
22	LOGDEBUG("LDAP verification of %s failed: not adding user", name);
23	return NULL;