Attachment #53890 for bug #81527

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




COMMENT=	Bayesian spam filter - stable maintenance version

PORTVER_MAJ=	3.4.6
SNAP_DATE=	.20050523.0845

.ifdef(SNAP_DATE)
WRKSRC=		${WRKDIR}/dspam-cvs-stable${SNAP_DATE}


PKGMESSAGE=	 ${WRKSRC}/src/README.FreeBSD

_UPD_LINE_NO=	10

CONFLICTS=	dspam-devel-[0-9]*



.ifdef(WITH_DAEMON)
CONFIGURE_ARGS+=	--enable-daemon
RC_DIR=		${PREFIX}/etc/rc.d
RC_SUFX=	.sh
USE_RC_SUBR=	${PORTNAME}${RC_SUFX}
PLIST_FILES+=	etc/rc.d/dspam${RC_SUFX}
_SED_SCRIPT+=	-e 's,%%DAEMON%%,,g'
SUB_LIST+=	DSPAM_HOME=${DSPAM_HOME}
		-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g'
.else
_SED_SCRIPT+=	-e '/%%DAEMON%%/D'
.endif

.if !defined(WITH_GRAHAM_BAYES)

PLIST_SUB+=	SQLITE=""
#_SED_SCRIPT+=	-e '/%%MYSQL%%/D'
#_SED_SCRIPT+=	-e '/%%PGSQL%%/D'
#_SED_SCRIPT+=	-e 's/%%SQLITE%%//g'
#PKGNAMESUFFIX=	-sqlite2
DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
.endif

PLIST_SUB+=	MYSQL=""
PLIST_SUB+=	PGSQL="@comment "
PLIST_SUB+=	SQLITE="@comment "
#_SED_SCRIPT+=	-e 's/%%MYSQL%%//g'
#_SED_SCRIPT+=	-e '/%%PGSQL%%/D'
#_SED_SCRIPT+=	-e '/%%SQLITE%%/D'
DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
.	if defined(WITH_MYSQL_COMPRESS)
CONFIGURE_ARGS+=	--enable-client-compression
.	endif
#_SED_RC_SCRIPT+=		-e 's/%%MYSQL%%/mysql/g'
SUB_LIST+=	MYSQL=mysql
.else
#_SED_RC_SCRIPT+=		-e 's/%%MYSQL%%//'
SUB_LIST+=	MYSQL=
.endif

.if defined(WITH_VIRT_USERS)


.if defined(WITH_POSTFIX_MBC)
DSPAM_MODE=	4511
#_SED_SCRIPT+=	-e 's/%%POSTFIX_MBC%%//g'
.else
#_SED_SCRIPT+=	-e '/%%POSTFIX_MBC%%/D'
.endif

USE_PERL5_RUN=	yes
PLIST_SUB+=	CGI=""
CGI_PATH?=	${PREFIX}/www/vhosts/dspam
_SED_SCRIPT+=	-e 's/%%CGI%%//g'
_SED_SCRIPT+=	-e 's/%%CGI_PATH%%/${CGI_PATH}/g'
#SED_FILES=	${LS}  ${WRKSRC}/cgi/*.pl
#SED_FILES+=	${LS} $PWRKSRC}/cgi/*.cgi
.else

	@${REINPLACE_CMD} -e 's|where SYSDATE-created_on > 14|where SYSDATE-created_on > ${SIGNATURE_LIFE};|'  ${WRKSRC}/src/tools.ora_drv/purge.sql
	@${REINPLACE_CMD} -e "s|where date('now')-date(created_on) > 14;|where date('now')-date(created_on) > ${SIGNATURE_LIFE};|"  ${WRKSRC}/src/tools.sqlite_drv/purge.sql
.if defined(WITH_DAEMON)
#	@${CP} ${FILESDIR}/dspam ${WRKSRC}
#	@${REINPLACE_CMD} ${_SED_RC_SCRIPT} ${WRKSRC}/dspam
.endif

pre-configure:

		${INSTALL} -o ${DSPAM_OWNER} -g ${DSPAM_GROUP} -m 0640 \
			dspam.conf.sample ${PREFIX}/etc
.if defined(WITH_DAEMON)
#	${INSTALL_SCRIPT} ${WRKSRC}/dspam ${RC_DIR}/dspam${RC_SUFX}
.endif

########

Lines 1-2 Link Here

(-)dspam/distinfo (-2 / +2 lines)
1	MD5 (dspam-3.4.6.20050512.1145.tar.gz) = 2e8ac4294df68f5dd0415c06205b2c1f	1	MD5 (dspam-3.4.6.20050523.0845.tar.gz) = edda53118c5d088661afda5ce21d0afa
2	SIZE (dspam-3.4.6.20050512.1145.tar.gz) = 699466	2	SIZE (dspam-3.4.6.20050523.0845.tar.gz) = 699538




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

###########################################################################
# dspam-3.4.6.20050523.0845
# 

BUGFIX: fix for managed groups where delivery of false positives would fail
due to the managed group not being recognized

BUGFIX: fixed bug where messages lacking a terminating boundary would fail
to receive a signature in the message body


###########################################################################
# dspam-3.4.6.20050512.1145
#





#!/bin/sh
#
# $FreeBSD: ports/mail/dspam/files/dspam,v 1.1 2005/05/05 21:03:37 pav Exp $
#

# PROVIDE: dspam
# REQUIRE: LOGIN NETWORKING SERVERS %%MYSQL%%
# BEFORE: mail
# KEYWORD: shutdown

#
# Add the following lines to /etc/rc.conf[.local] to enable dspam:
#
# dspam_enable="YES"
#

. /etc/rc.subr

name=dspam
rcvar=`set_rcvar`

command=%%PREFIX%%/bin/${name}
command_args="--daemon  > /dev/null 2>&1 &"
pidfile=/var/run/${name}.pid
required_dirs=%%DSPAM_HOME%%
required_files=%%PREFIX%%/etc/${name}.conf

extra_commands=reload

reload()
{
 kill -HUP `cat $pidfile`
}

# set defaults

dspam_enable=${dspam_enable:-"NO"}
#dspam_flags=${dspam_flags:-"--daemon &"}

load_rc_config $name
run_rc_command "$1"




#!/bin/sh
# $FreeBSD$
# formerly $ FreeBSD: ports/mail/dspam/files/dspam,v 1.1 2005/05/05 21:03:37 pav Exp $
#

# PROVIDE: dspam
# REQUIRE: LOGIN NETWORKING SERVERS %%MYSQL%%
# BEFORE: mail
# KEYWORD: shutdown

#
# Add the following lines to /etc/rc.conf[.local] to enable dspam:
#
# dspam_enable="YES"
#

. /etc/rc.subr

name=dspam
rcvar=`set_rcvar`

command=%%PREFIX%%/bin/${name}
command_args="--daemon  > /dev/null 2>&1 &"
pidfile=/var/run/${name}.pid
required_dirs=%%DSPAM_HOME%%
required_files=%%PREFIX%%/etc/${name}.conf

extra_commands=reload

reload()
{
 kill -HUP `cat $pidfile`
}

# set defaults

dspam_enable=${dspam_enable:-"NO"}
#dspam_flags=${dspam_flags:-"--daemon &"}

load_rc_config $name
run_rc_command "$1"

Lines 4-10 Link Here

(-)dspam/files/patch-dspam.c (-1 / +1 lines)
4	LOG (LOG_CRIT, ERROR_MEM_ALLOC);	4	LOG (LOG_CRIT, ERROR_MEM_ALLOC);
5	}	5	}
6		6
7	- if (CTX->result == DSR_ISSPAM)	7	- if (CTX->result == DSR_ISSPAM && ATX->managed_group[0])
8	- {	8	- {
9	+// FreeBSD port patch: put the user in all emails, extremely usefull for scripts	9	+// FreeBSD port patch: put the user in all emails, extremely usefull for scripts
10	+// if (CTX->result == DSR_ISSPAM)	10	+// if (CTX->result == DSR_ISSPAM)

Return to bug 81527

Lines 20-26 Link Here

(-)dspam/Makefile (-18 / +17 lines)
20	COMMENT= Bayesian spam filter - stable maintenance version	20	COMMENT= Bayesian spam filter - stable maintenance version
21		21
22	PORTVER_MAJ= 3.4.6	22	PORTVER_MAJ= 3.4.6
23	SNAP_DATE= .20050512.1145	23	SNAP_DATE= .20050523.0845
24		24
25	.ifdef(SNAP_DATE)	25	.ifdef(SNAP_DATE)
26	WRKSRC= ${WRKDIR}/dspam-cvs-stable${SNAP_DATE}	26	WRKSRC= ${WRKDIR}/dspam-cvs-stable${SNAP_DATE}
Lines 104-110 Link Here
104		104
105	PKGMESSAGE= ${WRKSRC}/src/README.FreeBSD	105	PKGMESSAGE= ${WRKSRC}/src/README.FreeBSD
106		106
107	_UPD_LINE_NO= 6	107	_UPD_LINE_NO= 10
108		108
109	CONFLICTS= dspam-devel-[0-9]*	109	CONFLICTS= dspam-devel-[0-9]*
110		110
Lines 170-184 Link Here
170		170
171	.ifdef(WITH_DAEMON)	171	.ifdef(WITH_DAEMON)
172	CONFIGURE_ARGS+= --enable-daemon	172	CONFIGURE_ARGS+= --enable-daemon
173	RC_DIR= ${PREFIX}/etc/rc.d
174	RC_SUFX= .sh	173	RC_SUFX= .sh
175	USE_RC_SUBR= yes	174	USE_RC_SUBR= ${PORTNAME}${RC_SUFX}
176	PLIST_FILES+= etc/rc.d/dspam${RC_SUFX}
177	_SED_SCRIPT+= -e 's,%%DAEMON%%,,g'	175	_SED_SCRIPT+= -e 's,%%DAEMON%%,,g'
178	_SED_RC_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \	176	SUB_LIST+= DSPAM_HOME=${DSPAM_HOME}
179	-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g'
180	.else	177	.else
181	_SED_SCRIPT+= -e ',%%DAEMON%%,D'	178	_SED_SCRIPT+= -e '/%%DAEMON%%/D'
182	.endif	179	.endif
183		180
184	.if !defined(WITH_GRAHAM_BAYES)	181	.if !defined(WITH_GRAHAM_BAYES)
Lines 295-301 Link Here
295	PLIST_SUB+= SQLITE=""	292	PLIST_SUB+= SQLITE=""
296	#_SED_SCRIPT+= -e '/%%MYSQL%%/D'	293	#_SED_SCRIPT+= -e '/%%MYSQL%%/D'
297	#_SED_SCRIPT+= -e '/%%PGSQL%%/D'	294	#_SED_SCRIPT+= -e '/%%PGSQL%%/D'
298	#_SED_SCRIPT+= -e 's,%%SQLITE%%,,g'	295	#_SED_SCRIPT+= -e 's/%%SQLITE%%//g'
299	#PKGNAMESUFFIX= -sqlite2	296	#PKGNAMESUFFIX= -sqlite2
300	DBDRV_COUNT:= ${DBDRV_COUNT:S/o//}	297	DBDRV_COUNT:= ${DBDRV_COUNT:S/o//}
301	.endif	298	.endif
Lines 320-335 Link Here
320	PLIST_SUB+= MYSQL=""	317	PLIST_SUB+= MYSQL=""
321	PLIST_SUB+= PGSQL="@comment "	318	PLIST_SUB+= PGSQL="@comment "
322	PLIST_SUB+= SQLITE="@comment "	319	PLIST_SUB+= SQLITE="@comment "
323	#_SED_SCRIPT+= -e 's,%%MYSQL%%,,g'	320	#_SED_SCRIPT+= -e 's/%%MYSQL%%//g'
324	#_SED_SCRIPT+= -e '/%%PGSQL%%/D'	321	#_SED_SCRIPT+= -e '/%%PGSQL%%/D'
325	#_SED_SCRIPT+= -e '/%%SQLITE%%/D'	322	#_SED_SCRIPT+= -e '/%%SQLITE%%/D'
326	DBDRV_COUNT:= ${DBDRV_COUNT:S/o//}	323	DBDRV_COUNT:= ${DBDRV_COUNT:S/o//}
327	. if defined(WITH_MYSQL_COMPRESS)	324	. if defined(WITH_MYSQL_COMPRESS)
328	CONFIGURE_ARGS+= --enable-client-compression	325	CONFIGURE_ARGS+= --enable-client-compression
329	. endif	326	. endif
330	_SED_RC_SCRIPT+= -e 's,%%MYSQL%%,mysql,g'	327	#_SED_RC_SCRIPT+= -e 's/%%MYSQL%%/mysql/g'
		328	SUB_LIST+= MYSQL=mysql
331	.else	329	.else
332	_SED_RC_SCRIPT+= -e 's,%%MYSQL%%,,'	330	#_SED_RC_SCRIPT+= -e 's/%%MYSQL%%//'
		331	SUB_LIST+= MYSQL=
333	.endif	332	.endif
334		333
335	.if defined(WITH_VIRT_USERS)	334	.if defined(WITH_VIRT_USERS)
Lines 401-407 Link Here
401		400
402	.if defined(WITH_POSTFIX_MBC)	401	.if defined(WITH_POSTFIX_MBC)
403	DSPAM_MODE= 4511	402	DSPAM_MODE= 4511
404	#_SED_SCRIPT+= -e 's,%%POSTFIX_MBC%%,,g'	403	#_SED_SCRIPT+= -e 's/%%POSTFIX_MBC%%//g'
405	.else	404	.else
406	#_SED_SCRIPT+= -e '/%%POSTFIX_MBC%%/D'	405	#_SED_SCRIPT+= -e '/%%POSTFIX_MBC%%/D'
407	.endif	406	.endif
Lines 426-433 Link Here
426	USE_PERL5_RUN= yes	425	USE_PERL5_RUN= yes
427	PLIST_SUB+= CGI=""	426	PLIST_SUB+= CGI=""
428	CGI_PATH?= ${PREFIX}/www/vhosts/dspam	427	CGI_PATH?= ${PREFIX}/www/vhosts/dspam
429	_SED_SCRIPT+= -e 's,%%CGI%%,,g'	428	_SED_SCRIPT+= -e 's/%%CGI%%//g'
430	_SED_SCRIPT+= -e 's,%%CGI_PATH%%,${CGI_PATH},g'	429	_SED_SCRIPT+= -e 's/%%CGI_PATH%%/${CGI_PATH}/g'
431	#SED_FILES= ${LS} ${WRKSRC}/cgi/*.pl	430	#SED_FILES= ${LS} ${WRKSRC}/cgi/*.pl
432	#SED_FILES+= ${LS} $PWRKSRC}/cgi/*.cgi	431	#SED_FILES+= ${LS} $PWRKSRC}/cgi/*.cgi
433	.else	432	.else
Lines 525-532 Link Here
525	@${REINPLACE_CMD} -e 's\|where SYSDATE-created_on > 14\|where SYSDATE-created_on > ${SIGNATURE_LIFE};\|' ${WRKSRC}/src/tools.ora_drv/purge.sql	524	@${REINPLACE_CMD} -e 's\|where SYSDATE-created_on > 14\|where SYSDATE-created_on > ${SIGNATURE_LIFE};\|' ${WRKSRC}/src/tools.ora_drv/purge.sql
526	@${REINPLACE_CMD} -e "s\|where date('now')-date(created_on) > 14;\|where date('now')-date(created_on) > ${SIGNATURE_LIFE};\|" ${WRKSRC}/src/tools.sqlite_drv/purge.sql	525	@${REINPLACE_CMD} -e "s\|where date('now')-date(created_on) > 14;\|where date('now')-date(created_on) > ${SIGNATURE_LIFE};\|" ${WRKSRC}/src/tools.sqlite_drv/purge.sql
527	.if defined(WITH_DAEMON)	526	.if defined(WITH_DAEMON)
528	@${CP} ${FILESDIR}/dspam ${WRKSRC}	527	# @${CP} ${FILESDIR}/dspam ${WRKSRC}
529	@${REINPLACE_CMD} ${_SED_RC_SCRIPT} ${WRKSRC}/dspam	528	# @${REINPLACE_CMD} ${_SED_RC_SCRIPT} ${WRKSRC}/dspam
530	.endif	529	.endif
531		530
532	pre-configure:	531	pre-configure:
Lines 575-581 Link Here
575	${INSTALL} -o ${DSPAM_OWNER} -g ${DSPAM_GROUP} -m 0640 \	574	${INSTALL} -o ${DSPAM_OWNER} -g ${DSPAM_GROUP} -m 0640 \
576	dspam.conf.sample ${PREFIX}/etc	575	dspam.conf.sample ${PREFIX}/etc
577	.if defined(WITH_DAEMON)	576	.if defined(WITH_DAEMON)
578	${INSTALL_SCRIPT} ${WRKSRC}/dspam ${RC_DIR}/dspam${RC_SUFX}	577	# ${INSTALL_SCRIPT} ${WRKSRC}/dspam ${RC_DIR}/dspam${RC_SUFX}
579	.endif	578	.endif
580		579
581	########	580	########

Lines 16-21 Link Here

(-)dspam/files/UPDATING (+11 lines)
16	make extract; more `find . -type f -maxdepth 2 -name UPGRADING`	16	make extract; more `find . -type f -maxdepth 2 -name UPGRADING`
17		17
18	###########################################################################	18	###########################################################################
		19	# dspam-3.4.6.20050523.0845
		20	#
		21
		22	BUGFIX: fix for managed groups where delivery of false positives would fail
		23	due to the managed group not being recognized
		24
		25	BUGFIX: fixed bug where messages lacking a terminating boundary would fail
		26	to receive a signature in the message body
		27
		28
		29	###########################################################################
19	# dspam-3.4.6.20050512.1145	30	# dspam-3.4.6.20050512.1145
20	#	31	#
21		32

Lines 1-41 Link Here

(-)dspam/files/dspam.rc (-41 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD: ports/mail/dspam/files/dspam,v 1.1 2005/05/05 21:03:37 pav Exp $
4	#
5
6	# PROVIDE: dspam
7	# REQUIRE: LOGIN NETWORKING SERVERS %%MYSQL%%
8	# BEFORE: mail
9	# KEYWORD: shutdown
10
11	#
12	# Add the following lines to /etc/rc.conf[.local] to enable dspam:
13	#
14	# dspam_enable="YES"
15	#
16
17	. /etc/rc.subr
18
19	name=dspam
20	rcvar=`set_rcvar`
21
22	command=%%PREFIX%%/bin/${name}
23	command_args="--daemon > /dev/null 2>&1 &"
24	pidfile=/var/run/${name}.pid
25	required_dirs=%%DSPAM_HOME%%
26	required_files=%%PREFIX%%/etc/${name}.conf
27
28	extra_commands=reload
29
30	reload()
31	{
32	kill -HUP `cat $pidfile`
33	}
34
35	# set defaults
36
37	dspam_enable=${dspam_enable:-"NO"}
38	#dspam_flags=${dspam_flags:-"--daemon &"}
39
40	load_rc_config $name
41	run_rc_command "$1"

Line 0 Link Here

(-)dspam/files/dspam.sh.in (+41 lines)
	1	#!/bin/sh
	2	# $FreeBSD$
	3	# formerly $ FreeBSD: ports/mail/dspam/files/dspam,v 1.1 2005/05/05 21:03:37 pav Exp $
	4	#
	5
	6	# PROVIDE: dspam
	7	# REQUIRE: LOGIN NETWORKING SERVERS %%MYSQL%%
	8	# BEFORE: mail
	9	# KEYWORD: shutdown
	10
	11	#
	12	# Add the following lines to /etc/rc.conf[.local] to enable dspam:
	13	#
	14	# dspam_enable="YES"
	15	#
	16
	17	. /etc/rc.subr
	18
	19	name=dspam
	20	rcvar=`set_rcvar`
	21
	22	command=%%PREFIX%%/bin/${name}
	23	command_args="--daemon > /dev/null 2>&1 &"
	24	pidfile=/var/run/${name}.pid
	25	required_dirs=%%DSPAM_HOME%%
	26	required_files=%%PREFIX%%/etc/${name}.conf
	27
	28	extra_commands=reload
	29
	30	reload()
	31	{
	32	kill -HUP `cat $pidfile`
	33	}
	34
	35	# set defaults
	36
	37	dspam_enable=${dspam_enable:-"NO"}
	38	#dspam_flags=${dspam_flags:-"--daemon &"}
	39
	40	load_rc_config $name
	41	run_rc_command "$1"