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

(-)dspam/Makefile (-108 / +171 lines)
Lines 1-26 Link Here
1
# New ports collection makefile for:	dspam
1
# New ports collection makefile for:	dspam
2
# Date created:			3 August 2003
2
# Date created:				3 August 2003
3
# Whom:				Dominic Marks <dom@wirespeed.org.uk>
3
# Whom:					Dominic Marks <dom@wirespeed.org.uk>
4
#
4
#
5
# $FreeBSD: ports/mail/dspam/Makefile,v 1.37 2005/04/12 03:25:56 obrien Exp $
5
# $FreeBSD: ports/mail/dspam/Makefile,v 1.37 2005/04/12 03:25:56 obrien Exp $
6
#
6
#
7
7
8
# Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
8
# Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
9
# or user variables (WITH*) changes please and an entry in ${FILESDIR}/UPDATING and
9
# or user variables (WITH*) changes please add an entry in ${FILESDIR}/UPDATING and
10
# modify UPD_LINE_NO=(no_of_added_lines-1) in this Makefile
10
# modify _UPD_LINE_NO=(no_of_added_lines-1) in this Makefile
11
# else the port will be broken. Thanks.
11
# else the port will be broken. Thanks.
12
12
13
PORTNAME=	dspam
13
PORTNAME=	dspam
14
PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
14
PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
15
PORTREVISION=	0
15
PORTREVISION=	0
16
CATEGORIES=	mail
16
CATEGORIES=	mail
17
MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/dspam/sources/
17
MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
18
18
19
MAINTAINER=	itetcu@people.tecnik93.com
19
MAINTAINER=	itetcu@people.tecnik93.com
20
COMMENT=	Bayesian spam filter - stable maintenance version
20
COMMENT=	Bayesian spam filter - stable maintenance version
21
21
22
PORTVER_MAJ=	3.2.8
22
PORTVER_MAJ=	3.4.5
23
#SNAP_DATE=	.20050302.1330
23
#SNAP_DATE=	.20050417.0700
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 39-52 Link Here
39
## debug / log / admin options
39
## debug / log / admin options
40
OPTIONS=	DEBUG "Enable debugging logging" on
40
OPTIONS=	DEBUG "Enable debugging logging" on
41
OPTIONS+=	VERBOSE_DEBUG "Enable debug in LOGDIR/dspam.debug" off
41
OPTIONS+=	VERBOSE_DEBUG "Enable debug in LOGDIR/dspam.debug" off
42
OPTIONS+=	BNR_DEBUG "Enable debug for BNR" off
42
OPTIONS+=	PREF_EXT "Preferences in database not in files" off
43
OPTIONS+=	PREF_EXT "Preferences in database not in files" off
44
OPTIONS+=	DAEMON "Daemonize dspam" on
43
45
44
## algorithm options
46
## algorithm options
45
OPTIONS+=	GRAHAM_BAYES "Enable Graham (traditional) bayesian" on
47
OPTIONS+=	GRAHAM_BAYES "Enable Graham (traditional) bayesian" on
46
OPTIONS+=	BURTON_BAYES "Enable Burton (alternative) bayesian" on
48
OPTIONS+=	BURTON_BAYES "Enable Burton (alternative) bayesian" on
47
OPTIONS+=	RNB "Use Robinson Naive Bayesian calculation" off
49
OPTIONS+=	RNB "Use Robinson Naive Bayesian calculation" off
48
OPTIONS+=	CHI_SQUARE "Use Fisher-Robinson Inv Chi-Square" off
50
OPTIONS+=	CHI_SQUARE "Use Fisher-Robinson Inv Chi-Square" off
49
OPTIONS+=	RPV "Use Robinson technique combining p-values" off
51
OPTIONS+=	RPV "Use Robinson technique combining p-values" on
50
OPTIONS+=	TEST_COND "More inoculous results rapidly, risk fps" on
52
OPTIONS+=	TEST_COND "More inoculous results rapidly, risk fps" on
51
OPTIONS+=	NO_BIAS "No bias toward innocent mail" off
53
OPTIONS+=	NO_BIAS "No bias toward innocent mail" off
52
OPTIONS+=	NEURAL_NET "Enable neural networking" off
54
OPTIONS+=	NEURAL_NET "Enable neural networking" off
Lines 57-69 Link Here
57
59
58
## back-end
60
## back-end
59
OPTIONS+=	MYSQL40 "Use MySQL 4.0.x as back-end" off
61
OPTIONS+=	MYSQL40 "Use MySQL 4.0.x as back-end" off
60
OPTIONS+=	MYSQL41 "Use MySQL 4.1.x as back-end" off
62
OPTIONS+=	MYSQL41 "Use MySQL 4.1.x as back-end" on
61
OPTIONS+=	MYSQL50 "Use MySQL 5.0.x as back-end" off
63
OPTIONS+=	MYSQL50 "Use MySQL 5.0.x as back-end" off
62
OPTIONS+=	MYSQL_COMPRESS "Compress dspam <--> MySQL" off
64
OPTIONS+=	MYSQL_COMPRESS "Compress dspam <--> MySQL" off
63
OPTIONS+=	POSTGRESQL "Use PostgreSQL as back-end" off
65
OPTIONS+=	POSTGRESQL "Use PostgreSQL as back-end" off
64
#OPTIONS+=	ORACLE "Use Oracle as back-end (BROKEN)" off
66
#OPTIONS+=	ORACLE "Use Oracle as back-end (BROKEN)" off
65
OPTIONS+=	BDB4 "Use BDB4 as back-end (not recomanded)" off
67
OPTIONS+=	BDB4 "Use BDB4 as back-end (not recomanded)" off
66
OPTIONS+=	SQLITE2 "Use SQLite v2.x as back-end" on
68
OPTIONS+=	SQLITE2 "Use SQLite v2.x as back-end" off
69
OPTIONS+=	SQLITE3 "Use SQLite v3.x as back-end" off
67
OPTIONS+=	VIRT_USERS "Enable virtual users (needs SQL back-end)" off
70
OPTIONS+=	VIRT_USERS "Enable virtual users (needs SQL back-end)" off
68
OPTIONS+=	LONG_USERNAMES "Usernames longer that OS supports" off
71
OPTIONS+=	LONG_USERNAMES "Usernames longer that OS supports" off
69
OPTIONS+=	LARGE_SCALE "File structure for large scale" off
72
OPTIONS+=	LARGE_SCALE "File structure for large scale" off
Lines 95-105 Link Here
95
CFLAGS+=	-g -DDEBUG
98
CFLAGS+=	-g -DDEBUG
96
.endif
99
.endif
97
100
98
PKGMESSAGE=	${WRKSRC}/README.FreeBSD
101
PKGMESSAGE=	 ${WRKSRC}/src/README.FreeBSD
99
102
100
UPD_LINE_NO=	6
103
_UPD_LINE_NO=	16
101
104
102
CONFLICTS=	dspam-2* dspam-devel-[0-9]*
105
CONFLICTS=	dspam-2* dspam-3*
103
106
104
SIGNATURE_LIFE?=	15
107
SIGNATURE_LIFE?=	15
105
108
Lines 117-128 Link Here
117
120
118
.include <bsd.port.pre.mk>
121
.include <bsd.port.pre.mk>
119
122
123
## Actually Thu Feb 10 17:38:05 EET 2005 works
124
#.if ${OSVERSION} >= 500036
125
#.	if	${OSVERSION} < 503102
126
#IGNORE=	Need newer pthread support, please upgrade your system
127
#.	endif
128
#.endif
129
120
CONFIGURE_ARGS+=	--with-logdir=${LOG_DIR}
130
CONFIGURE_ARGS+=	--with-logdir=${LOG_DIR}
121
PLIST_SUB+=	LOG_DIR=${LOG_DIR}
131
PLIST_SUB+=	LOG_DIR=${LOG_DIR}
122
132
123
CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME}
133
CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME}
124
PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME}
125
126
CONFIGURE_ARGS+=	--with-dspam-home-owner=${DSPAM_HOME_OWNER}
134
CONFIGURE_ARGS+=	--with-dspam-home-owner=${DSPAM_HOME_OWNER}
127
CONFIGURE_ARGS+=	--with-dspam-home-group=${DSPAM_HOME_GROUP}
135
CONFIGURE_ARGS+=	--with-dspam-home-group=${DSPAM_HOME_GROUP}
128
CONFIGURE_ARGS+=	--with-dspam-home-mode=${DSPAM_HOME_MODE}
136
CONFIGURE_ARGS+=	--with-dspam-home-mode=${DSPAM_HOME_MODE}
Lines 130-143 Link Here
130
138
131
CONFIGURE_ARGS+=	--with-dspam-owner=${DSPAM_OWNER}
139
CONFIGURE_ARGS+=	--with-dspam-owner=${DSPAM_OWNER}
132
CONFIGURE_ARGS+=	--with-dspam-group=${DSPAM_GROUP}
140
CONFIGURE_ARGS+=	--with-dspam-group=${DSPAM_GROUP}
133
# we set DSPAM_MODE at the end as some LDA want specific mode
141
# we set DSPAM_MODE at the end as some LDA whant specific mode
134
142
135
SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
143
_SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
136
		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
144
		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
137
		-e 's,%%LOCALBASE%%,${LOCALBASE},g' \
145
		-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g' \
138
		-e 's,%%PREFIX%%,${PREFIX},g' \
146
		-e 's,%%PORTNAME%%,${PORTNAME},g' \
139
		-e 's,%%PKGNAME%%,${PKGNAME},g' \
147
		-e 's,%%_VAR_DIR%%,${_VAR_DIR},g'
140
		-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g'
148
#		-e 's,%%LOCALBASE%%,${LOCALBASE},g' \
149
#		-e 's,%%PREFIX%%,${PREFIX},g' \
150
#		-e 's,%%PKGNAME%%,${PKGNAME},g' \
141
151
142
.if defined(WITH_DEBUG)
152
.if defined(WITH_DEBUG)
143
CONFIGURE_ARGS+=	--enable-debug
153
CONFIGURE_ARGS+=	--enable-debug
Lines 147-156 Link Here
147
CONFIGURE_ARGS+=	--enable-verbose-debug
157
CONFIGURE_ARGS+=	--enable-verbose-debug
148
.endif
158
.endif
149
159
160
.if defined(WITH_BNR_DEBUG)
161
CONFIGURE_ARGS+=	--enable-bnr-debug
162
.endif
163
150
.if defined(WITH_PREF_EXT)
164
.if defined(WITH_PREF_EXT)
151
CONFIGURE_ARGS+=	--enable-preferences-extension
165
CONFIGURE_ARGS+=	--enable-preferences-extension
152
.endif
166
.endif
153
167
168
####
169
# quick hack to build the package with daemon
170
.ifndef(WITHOUT_DAEMON)
171
WITH_DAEMON=	on
172
.endif
173
174
.ifdef(WITH_DAEMON)
175
CONFIGURE_ARGS+=	--enable-daemon
176
RC_DIR=		${PREFIX}/etc/rc.d
177
RC_SUFX=	.sh
178
USE_RC_SUBR=	yes
179
PLIST_FILES+=	etc/rc.d/dspam${RC_SUFX}
180
_SED_SCRIPT+=	-e 's,%%DAEMON%%,,g'
181
_SED_RC_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
182
		-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g'
183
.else
184
_SED_SCRIPT+=	-e ',%%DAEMON%%,D'
185
.endif
186
154
.if !defined(WITH_GRAHAM_BAYES)
187
.if !defined(WITH_GRAHAM_BAYES)
155
CONFIGURE_ARGS+=	--disable-traditional-bayesian
188
CONFIGURE_ARGS+=	--disable-traditional-bayesian
156
.endif
189
.endif
Lines 191-228 Link Here
191
CONFIGURE_ARGS+=	--disable-trusted-user-security
224
CONFIGURE_ARGS+=	--disable-trusted-user-security
192
.endif
225
.endif
193
226
194
DBDRV_TOTAL_COUNT=	ooooooo # 7
227
DBDRV_TOTAL_COUNT=	ooooooooo # 8
195
DBDRV_COUNT=	${DBDRV_TOTAL_COUNT}
228
DBDRV_COUNT=	${DBDRV_TOTAL_COUNT}
196
229
197
.ifdef(WITH_MYSQL40)
198
WANT_MYSQL_VER=	40
199
#PKGNAMESUFFIX=	-mysql40
200
.elifdef(WITH_MYSQL41)
201
WANT_MYSQL_VER=	41
202
#PKGNAMESUFFIX=	-mysql41
203
.elifdef(WITH_MYSQL50)
204
WANT_MYSQL_VER=	50
205
#PKGNAMESUFFIX=	-mysql50
206
.endif
207
208
.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) || defined(WITH_MYSQL50)
209
USE_MYSQL=	yes
210
CONFIGURE_ARGS+=	--with-storage-driver=mysql_drv \
211
		--with-mysql-includes=${LOCALBASE}/include/mysql \
212
		--with-mysql-libraries=${LOCALBASE}/lib/mysql
213
PLIST_SUB+=	DB4="@comment "
214
PLIST_SUB+=	MYSQL=""
215
PLIST_SUB+=	PGSQL="@comment "
216
PLIST_SUB+=	SQLITE="@comment "
217
SED_SCRIPT+=	-e 's,%%MYSQL%%,,g'
218
SED_SCRIPT+=	-e '/%%PGSQL%%/D'
219
SED_SCRIPT+=	-e '/%%SQLITE%%/D'
220
DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
221
.if defined(WITH_MYSQL_COMPRESS)
222
CONFIGURE_ARGS+=	--enable-client-compression
223
.endif
224
.endif
225
226
.if defined(WITH_POSTGRESQL)
230
.if defined(WITH_POSTGRESQL)
227
USE_PGSQL=	yes
231
USE_PGSQL=	yes
228
CONFIGURE_ARGS+=	--with-storage-driver=pgsql_drv \
232
CONFIGURE_ARGS+=	--with-storage-driver=pgsql_drv \
Lines 232-246 Link Here
232
PLIST_SUB+=	MYSQL="@comment "
236
PLIST_SUB+=	MYSQL="@comment "
233
PLIST_SUB+=	PGSQL=""
237
PLIST_SUB+=	PGSQL=""
234
PLIST_SUB+=	SQLITE="@comment "
238
PLIST_SUB+=	SQLITE="@comment "
235
SED_SCRIPT+=	-e '/%%MYSQL%%/D'
239
#_SED_SCRIPT+=	-e '/%%MYSQL%%/D'
236
SED_SCRIPT+=	-e 's,%%PGSQL%%,,g'
240
#_SED_SCRIPT+=	-e 's,%%PGSQL%%,,g'
237
SED_SCRIPT+=	-e '/%%SQLITE%%/D'
241
#_SED_SCRIPT+=	-e '/%%SQLITE%%/D'
238
#PKGNAMESUFFIX=	-pgsql
242
#PKGNAMESUFFIX=	-pgsql
239
DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
243
DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
240
.endif
244
.endif
241
245
242
.if defined(WITH_ORACLE)
246
.if defined(WITH_ORACLE)
243
BUILD_DEPENDS+=	${LOCALBASE}/oracle7/rdbms/lib/libnlsrtl3.a:\
247
BUILD_DEPENDS=	${LOCALBASE}/oracle7/rdbms/lib/libnlsrtl3.a:\
244
	${PORTSDIR}/databases/oracle7-client
248
	${PORTSDIR}/databases/oracle7-client
245
CONFIGURE_ARGS+=	--with-storage-driver=ora_drv \
249
CONFIGURE_ARGS+=	--with-storage-driver=ora_drv \
246
		--with-oracle-home=	${LOCALBASE}/oracle7
250
		--with-oracle-home=	${LOCALBASE}/oracle7
Lines 256-271 Link Here
256
PLIST_SUB+=	MYSQL="@comment "
260
PLIST_SUB+=	MYSQL="@comment "
257
PLIST_SUB+=	PGSQL="@comment "
261
PLIST_SUB+=	PGSQL="@comment "
258
PLIST_SUB+=	SQLITE="@comment "
262
PLIST_SUB+=	SQLITE="@comment "
259
SED_SCRIPT+=	-e '/%%MYSQL%%/D'
263
#_SED_SCRIPT+=	-e '/%%MYSQL%%/D'
260
SED_SCRIPT+=	-e '/%%PGSQL%%/D'
264
#_SED_SCRIPT+=	-e '/%%PGSQL%%/D'
261
SED_SCRIPT+=	-e '/%%SQLITE%%/D'
265
#_SED_SCRIPT+=	-e '/%%SQLITE%%/D'
262
#PKGNAMESUFFIX=	-bdb
266
#PKGNAMESUFFIX=	-bdb
263
DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
267
DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
264
.endif
268
.endif
265
269
266
.if ${DBDRV_TOTAL_COUNT}==${DBDRV_COUNT} || defined(WITH_SQLITE2)
270
.if defined(WITH_SQLITE3)
267
WITH_SQLITE2=	on
271
HAVE_SQLITE=	yes
272
LIB_DEPENDS+=	sqlite.3:${PORTSDIR}/databases/sqlite3
273
.endif
274
275
.if defined(WITH_SQLITE2)
276
HAVE_SQLITE=	yes
268
LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
277
LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
278
.endif
279
280
.if defined(HAVE_SQLITE)
269
CONFIGURE_ARGS+=	--with-storage-driver=sqlite_drv \
281
CONFIGURE_ARGS+=	--with-storage-driver=sqlite_drv \
270
	--with-sqlite-includes=${LOCALBASE}/include \
282
	--with-sqlite-includes=${LOCALBASE}/include \
271
	--with-sqlite-libraries=${LOCALBASE}/lib
283
	--with-sqlite-libraries=${LOCALBASE}/lib
Lines 273-285 Link Here
273
PLIST_SUB+=	MYSQL="@comment "
285
PLIST_SUB+=	MYSQL="@comment "
274
PLIST_SUB+=	PGSQL="@comment "
286
PLIST_SUB+=	PGSQL="@comment "
275
PLIST_SUB+=	SQLITE=""
287
PLIST_SUB+=	SQLITE=""
276
SED_SCRIPT+=	-e '/%%MYSQL%%/D'
288
#_SED_SCRIPT+=	-e '/%%MYSQL%%/D'
277
SED_SCRIPT+=	-e '/%%PGSQL%%/D'
289
#_SED_SCRIPT+=	-e '/%%PGSQL%%/D'
278
SED_SCRIPT+=	-e 's,%%SQLITE%%,,g'
290
#_SED_SCRIPT+=	-e 's,%%SQLITE%%,,g'
279
#PKGNAMESUFFIX=	-sqlite2
291
#PKGNAMESUFFIX=	-sqlite2
280
DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
292
DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
281
.endif
293
.endif
282
294
295
.ifdef(WITH_MYSQL40)
296
WANT_MYSQL_VER=	40
297
#PKGNAMESUFFIX=	-mysql40
298
.elifdef(WITH_MYSQL41)
299
WANT_MYSQL_VER=	41
300
#PKGNAMESUFFIX=	-mysql41
301
.elifdef(WITH_MYSQL50)
302
WANT_MYSQL_VER=	50
303
#PKGNAMESUFFIX=	-mysql50
304
.endif
305
306
.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) || defined(WITH_MYSQL50) || ${DBDRV_TOTAL_COUNT}==${DBDRV_COUNT}
307
USE_MYSQL=	yes
308
CONFIGURE_ARGS+=	--with-storage-driver=mysql_drv \
309
		--with-mysql-includes=${LOCALBASE}/include/mysql \
310
		--with-mysql-libraries=${LOCALBASE}/lib/mysql
311
PLIST_SUB+=	DB4="@comment "
312
PLIST_SUB+=	MYSQL=""
313
PLIST_SUB+=	PGSQL="@comment "
314
PLIST_SUB+=	SQLITE="@comment "
315
#_SED_SCRIPT+=	-e 's,%%MYSQL%%,,g'
316
#_SED_SCRIPT+=	-e '/%%PGSQL%%/D'
317
#_SED_SCRIPT+=	-e '/%%SQLITE%%/D'
318
DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
319
.	if defined(WITH_MYSQL_COMPRESS)
320
CONFIGURE_ARGS+=	--enable-client-compression
321
.	endif
322
_SED_RC_SCRIPT+=		-e 's,%%MYSQL%%,mysql,g'
323
.else
324
_SED_RC_SCRIPT+=		-e 's,%%MYSQL%%,,'
325
.endif
326
283
.if defined(WITH_VIRT_USERS)
327
.if defined(WITH_VIRT_USERS)
284
CONFIGURE_ARGS+=	--enable-virtual-users
328
CONFIGURE_ARGS+=	--enable-virtual-users
285
.endif
329
.endif
Lines 313-319 Link Here
313
.if defined(WITH_EXIM_LDA)
357
.if defined(WITH_EXIM_LDA)
314
.	if defined(WITH_MYSQL40) || (WITH_MYSQL41)
358
.	if defined(WITH_MYSQL40) || (WITH_MYSQL41)
315
_EXIM_EXT=	-mysql
359
_EXIM_EXT=	-mysql
316
.	elseif defined(WITH_POSTGRESQL)
360
.	elif defined(WITH_POSTGRESQL)
317
_EXIM_EXT=	-postgresql
361
_EXIM_EXT=	-postgresql
318
.	endif
362
.	endif
319
RUN_DEPENDS+=	exim:${PORTSDIR}/mail/exim${_EXIM_EXT}
363
RUN_DEPENDS+=	exim:${PORTSDIR}/mail/exim${_EXIM_EXT}
Lines 323-335 Link Here
323
367
324
.if defined(WITH_MAILDROP_LDA)
368
.if defined(WITH_MAILDROP_LDA)
325
RUN_DEPENDS+=	maildrop:${PORTSDIR}/mail/maildrop
369
RUN_DEPENDS+=	maildrop:${PORTSDIR}/mail/maildrop
326
CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/maildrop -d $$u'
370
CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/maildrop'
327
LDA_COUNT:=	${LDA_COUNT:S/o//}
371
LDA_COUNT:=	${LDA_COUNT:S/o//}
328
.endif
372
.endif
329
373
330
.if defined(WITH_PROCMAIL_LDA)
374
.if defined(WITH_PROCMAIL_LDA)
331
RUN_DEPENDS+=	procmail:${PORTSDIR}/mail/procmail
375
RUN_DEPENDS+=	procmail:${PORTSDIR}/mail/procmail
332
CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/procmail -d $$u'
376
CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/procmail'
333
LDA_COUNT:=	${LDA_COUNT:S/o//}
377
LDA_COUNT:=	${LDA_COUNT:S/o//}
334
.endif
378
.endif
335
379
Lines 349-357 Link Here
349
393
350
.if defined(WITH_POSTFIX_MBC)
394
.if defined(WITH_POSTFIX_MBC)
351
DSPAM_MODE=	4511
395
DSPAM_MODE=	4511
352
SED_SCRIPT+=	-e 's,%%POSTFIX_MBC%%,,g'
396
#_SED_SCRIPT+=	-e 's,%%POSTFIX_MBC%%,,g'
353
.else
397
.else
354
SED_SCRIPT+=	-e '/%%POSTFIX_MBC%%/D'
398
#_SED_SCRIPT+=	-e '/%%POSTFIX_MBC%%/D'
355
.endif
399
.endif
356
400
357
.if defined(WITH_QMAIL)
401
.if defined(WITH_QMAIL)
Lines 374-386 Link Here
374
USE_PERL5_RUN=	yes
418
USE_PERL5_RUN=	yes
375
PLIST_SUB+=	CGI=""
419
PLIST_SUB+=	CGI=""
376
CGI_PATH?=	${PREFIX}/www/vhosts/dspam
420
CGI_PATH?=	${PREFIX}/www/vhosts/dspam
377
SED_SCRIPT+=	-e 's,%%CGI%%,,g'
421
_SED_SCRIPT+=	-e 's,%%CGI%%,,g'
378
SED_SCRIPT+=	-e 's,%%CGI_PATH%%,${CGI_PATH},g'
422
_SED_SCRIPT+=	-e 's,%%CGI_PATH%%,${CGI_PATH},g'
379
#SED_FILES=      ${LS} ${WRKSRC}/cgi/*.pl
423
#SED_FILES=	${LS}  ${WRKSRC}/cgi/*.pl
380
#SED_FILES+=     ${LS} $PWRKSRC}/cgi/*.cgi
424
#SED_FILES+=	${LS} $PWRKSRC}/cgi/*.cgi
381
.else
425
.else
382
PLIST_SUB+=	CGI="@comment "
426
PLIST_SUB+=	CGI="@comment "
383
SED_SCRIPT+=	-e '/%%CGI%%/D'
427
_SED_SCRIPT+=	-e '/%%CGI%%/D'
384
.endif
428
.endif
385
429
386
MAN1=	dspam.1 dspam_clean.1 dspam_corpus.1 dspam_dump.1 dspam_merge.1 \
430
MAN1=	dspam.1 dspam_clean.1 dspam_corpus.1 dspam_dump.1 dspam_merge.1 \
Lines 395-415 Link Here
395
MLINKS+=	libdspam.3 dspam_destroy.3
439
MLINKS+=	libdspam.3 dspam_destroy.3
396
MLINKS+=	libdspam.3 dspam_detach.3
440
MLINKS+=	libdspam.3 dspam_detach.3
397
441
398
DOCS=	CHANGELOG LICENSE README README.FreeBSD README.courier README.exim \
442
_DOCS=	CHANGELOG LICENSE README README.FreeBSD RELEASE.NOTES UPGRADING
399
	README.pop3filter README.postfix README.qmail README.sendmail \
443
_DOCSL=	appliance.txt exim.txt ora_drv.txt pgsql_drv.txt postfix.txt \
400
	RELEASE.NOTES
444
	sendmail.txt courier.txt mysql_drv.txt pop3filter.txt qmail.txt \
445
	sqlite_drv.txt
401
446
402
.ifndef(MAINT)
447
.ifndef(MAINT)
403
pre-everything::
448
pre-everything::
404
	@${ECHO_CMD} ""
449
	@${ECHO_CMD} ""
405
	@${ECHO_CMD} "Last ${FILESDIR}/UPDATING entry:"
450
	@${ECHO_CMD} "Last ${FILESDIR}/UPDATING entry:"
406
	@${GREP} -B 1 -A ${UPD_LINE_NO} ${PKGNAME} ${FILESDIR}/UPDATING
451
	@${GREP} -B 1 -A ${_UPD_LINE_NO} ${PKGNAME} ${FILESDIR}/UPDATING
407
	@${ECHO_CMD} ""
408
	@${ECHO_CMD} ""
452
	@${ECHO_CMD} ""
409
.else	# maintainer only
453
	@sleep 5
454
.else # maintainer only
410
post-fetch:
455
post-fetch:
411
.	ifndef(STOP)
456
.	ifndef(STOP)
412
.		include "/root/ports/upd"
457
#.		include "/root/ports/upd"
413
.	endif
458
.	endif
414
.endif
459
.endif
415
460
Lines 431-436 Link Here
431
		@${ECHO_CMD} "installed in other place that this installation's default"
476
		@${ECHO_CMD} "installed in other place that this installation's default"
432
		@${ECHO_CMD} "${PREFIX}/www/vhosts/dspam"
477
		@${ECHO_CMD} "${PREFIX}/www/vhosts/dspam"
433
.	endif
478
.	endif
479
	@${ECHO_CMD} "Define WITHOUT_DAEMON if not using OPTIONS and do not want daemon."
434
	@${ECHO_CMD} ""
480
	@${ECHO_CMD} ""
435
	@sleep 5
481
	@sleep 5
436
482
Lines 438-444 Link Here
438
	USER_LOGGING SYSTEM_LOGGING WEBMAIL OPT_IN SAT PARSE_TO_HEADERS \
484
	USER_LOGGING SYSTEM_LOGGING WEBMAIL OPT_IN SAT PARSE_TO_HEADERS \
439
	BROKEN_MTA BROKEN_ERR_CODES SIGNATURE_HEADERS SIGNATURE_ATACH \
485
	BROKEN_MTA BROKEN_ERR_CODES SIGNATURE_HEADERS SIGNATURE_ATACH \
440
	HOMEDIR_DOT SIGNATURE_LIFE SQLITE QUARANTINE_AGENT WHITELIST \
486
	HOMEDIR_DOT SIGNATURE_LIFE SQLITE QUARANTINE_AGENT WHITELIST \
441
	POSTGRESQL73 POSTGRESQL74 ORACLE
487
	POSTGRESQL73 POSTGRESQL74
442
.	if defined(WITH_${old_opt}) || defined(WITHOUT_${old_opt})
488
.	if defined(WITH_${old_opt}) || defined(WITHOUT_${old_opt})
443
	@${ECHO_CMD} ""
489
	@${ECHO_CMD} ""
444
	@${ECHO_CMD} "******************************************************************"
490
	@${ECHO_CMD} "******************************************************************"
Lines 450-459 Link Here
450
	@${ECHO_CMD} "You shold always read ${PORTSDIR}/UPDATING before installing/updating"
496
	@${ECHO_CMD} "You shold always read ${PORTSDIR}/UPDATING before installing/updating"
451
	@${ECHO_CMD} "any port. Please remove/adjust your pkgtools.conf, environment and"
497
	@${ECHO_CMD} "any port. Please remove/adjust your pkgtools.conf, environment and"
452
	@${ECHO_CMD} "your make command-line and/or do 'make rmconfig' as appropiate."
498
	@${ECHO_CMD} "your make command-line and/or do 'make rmconfig' as appropiate."
453
	@${ECHO_CMD} "But before read ${FILESDIR}/UPDATING"
499
	@${ECHO_CMD} "But before read ${FILESDIR}/UPDATING as a lot of things have changed."
454
	@${ECHO_CMD} "as a lot of things have changed, notably the majority of"
455
	@${ECHO_CMD} "compile-time options can/must now be set in"
456
	@${ECHO_CMD} "${PREFIX}/etc/dspam.conf"
457
	@${ECHO_CMD} "******************************************************************"
500
	@${ECHO_CMD} "******************************************************************"
458
	@${ECHO_CMD} "******************************************************************"
501
	@${ECHO_CMD} "******************************************************************"
459
	@${ECHO_CMD} ""
502
	@${ECHO_CMD} ""
Lines 465-476 Link Here
465
	@${REINPLACE_CMD} -e 's|%%PORTNAME%%|${PORTNAME}|; \
508
	@${REINPLACE_CMD} -e 's|%%PORTNAME%%|${PORTNAME}|; \
466
		s|%%PKGNAME%%|${PKGNAME}|; s|%%MAINTAINER%%|${MAINTAINER}|; \
509
		s|%%PKGNAME%%|${PKGNAME}|; s|%%MAINTAINER%%|${MAINTAINER}|; \
467
		s|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g; \
510
		s|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g; \
468
		s|-ldb-4.1|-ldb41|g;' ${WRKSRC}/configure
511
		s|-ldb-4.1|-ldb41|g;'  ${WRKSRC}/configure
469
512
	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
470
	@${REINPLACE_CMD} -e 's|where @a-14 > to_days(created_on);|where @a-${SIGNATURE_LIFE} > to_days(created_on);|' ${WRKSRC}/tools.mysql_drv/purge.sql
513
		${WRKSRC}/Makefile.in
471
	@${REINPLACE_CMD} -e 's|WHERE CURRENT_DATE - created_on > 14;|WHERE CURRENT_DATE - created_on > ${SIGNATURE_LIFE};|' ${WRKSRC}/tools.pgsql_drv/purge.sql
514
472
	@${REINPLACE_CMD} -e 's|where SYSDATE-created_on > 14|where SYSDATE-created_on > ${SIGNATURE_LIFE};|' ${WRKSRC}/tools.ora_drv/purge.sql
515
	@${REINPLACE_CMD} -e 's|where @a-14 > to_days(created_on);|where @a-${SIGNATURE_LIFE} > to_days(created_on);|'  ${WRKSRC}/src/tools.mysql_drv/purge.sql
473
	@${REINPLACE_CMD} -e "s|where date('now')-date(created_on) > 14;|where date('now')-date(created_on) > ${SIGNATURE_LIFE};|" ${WRKSRC}/tools.sqlite_drv/purge.sql
516
	@${REINPLACE_CMD} -e 's|WHERE CURRENT_DATE - created_on > 14;|WHERE CURRENT_DATE - created_on > ${SIGNATURE_LIFE};|'  ${WRKSRC}/src/tools.pgsql_drv/purge.sql
517
	@${REINPLACE_CMD} -e 's|where SYSDATE-created_on > 14|where SYSDATE-created_on > ${SIGNATURE_LIFE};|'  ${WRKSRC}/src/tools.ora_drv/purge.sql
518
	@${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
519
.if defined(WITH_DAEMON)
520
	@${CP} ${FILESDIR}/dspam.rc ${WRKSRC}
521
	@${REINPLACE_CMD} ${_SED_RC_SCRIPT} ${WRKSRC}/dspam.rc
522
.endif
474
523
475
pre-configure:
524
pre-configure:
476
	@${ECHO_CMD}
525
	@${ECHO_CMD}
Lines 498-520 Link Here
498
	@${ECHO_CMD} "You need MySQL or Postgres for preferences extension"
547
	@${ECHO_CMD} "You need MySQL or Postgres for preferences extension"
499
	@${FALSE}
548
	@${FALSE}
500
.endif
549
.endif
550
.if defined(WITH_DAEMON) && !( defined(USE_MYSQL) || \
551
	defined(WITH_POSTGRESQL) )
552
	@${ECHO_CMD} "You need MySQL or Postgres for Daemon mode, because multithreading support is needed"
553
	@${FALSE}
554
.endif
501
.if defined(WITH_USER_HOMEDIR) && defined(WITH_CGI)
555
.if defined(WITH_USER_HOMEDIR) && defined(WITH_CGI)
502
	@${ECHO_CMD} "USER_HOMEDIR and CGI are incopatible"
556
	@${ECHO_CMD} "USER_HOMEDIR and CGI are incopatible"
503
	@${FALSE}
557
	@${FALSE}
504
.endif
558
.endif
505
559
506
post-install:
560
post-install:
507
	${CP} ${WRKSRC}/dspam.conf ${WRKSRC}/dspam.conf.sample
561
	${CP} ${WRKSRC}/src/dspam.conf ${WRKSRC}/src/dspam.conf.sample
508
	cd ${WRKSRC}/ && \
562
	cd ${WRKSRC}/src/ && \
509
		${INSTALL} -o ${DSPAM_OWNER} -g ${DSPAM_GROUP} -m 0640 \
563
		${INSTALL} -o ${DSPAM_OWNER} -g ${DSPAM_GROUP} -m 0640 \
510
			 dspam.conf.sample ${PREFIX}/etc
564
			dspam.conf.sample ${PREFIX}/etc
511
#	@${MKDIR} ${LOG_DIR}
565
.if defined(WITH_DAEMON)
512
#	@${MKDIR} ${DSPAM_HOME}
566
	${INSTALL_SCRIPT} ${WRKSRC}/dspam.rc ${RC_DIR}/dspam${RC_SUFX}
567
.endif
568
569
########
570
# stupid hack until I figure out where/how to patch
571
	@${MKDIR} ${PREFIX}/libdata/pkgconfig
572
	@${MV} ${PREFIX}/lib/pkgconfig/dspam.pc ${PREFIX}/libdata/pkgconfig/dspam.pc
573
	${TEST} `ls -1 ${PREFIX}/lib/pkgconfig | wc -l` -eq 0 && \
574
		${RM} -R ${PREFIX}/lib/pkgconfig || true
513
575
514
.if defined(USE_MYSQL)
576
.if defined(USE_MYSQL)
515
	@${MKDIR} ${EXAMPLESDIR}/mysql
577
	@${MKDIR} ${EXAMPLESDIR}/mysql
516
	cd ${WRKSRC}/tools.mysql_drv && \
578
	cd  ${WRKSRC}/src/tools.mysql_drv && \
517
		${INSTALL_DATA} README mysql_objects-space.sql \
579
		${INSTALL_DATA} mysql_objects-space.sql \
518
			mysql_objects-speed.sql purge.sql \
580
			mysql_objects-speed.sql purge.sql \
519
			virtual_users.sql mysql_objects-4.1.sql \
581
			virtual_users.sql mysql_objects-4.1.sql \
520
			purge-4.1.sql neural.sql  ${EXAMPLESDIR}/mysql
582
			purge-4.1.sql neural.sql  ${EXAMPLESDIR}/mysql
Lines 523-540 Link Here
523
.endif
585
.endif
524
.if defined(WITH_POSTGRESQL)
586
.if defined(WITH_POSTGRESQL)
525
	@${MKDIR} ${EXAMPLESDIR}/pgsql
587
	@${MKDIR} ${EXAMPLESDIR}/pgsql
526
	@cd ${WRKSRC}/tools.pgsql_drv && \
588
	@cd  ${WRKSRC}/src/tools.pgsql_drv && \
527
		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/pgsql
589
		${INSTALL_DATA} *.sql ${EXAMPLESDIR}/pgsql
528
.endif
590
.endif
529
.if defined(WITH_SQLITE2)
591
.if defined(HAVE_SQLITE)
530
	@${MKDIR} ${EXAMPLESDIR}/sqlite
592
	@${MKDIR} ${EXAMPLESDIR}/sqlite
531
	cd ${WRKSRC}/tools.sqlite_drv && \
593
	cd ${WRKSRC}/src/tools.sqlite_drv && \
532
		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/sqlite
594
		${INSTALL_DATA} *.sql ${EXAMPLESDIR}/sqlite
533
.endif
595
.endif
534
.if defined(WITH_ORACLE)
596
.if defined(WITH_ORACLE)
535
	@${MKDIR} ${EXAMPLESDIR}/oracle
597
	@${MKDIR} ${EXAMPLESDIR}/oracle
536
	cd ${WRKSRC}/tools.ora_drv && \
598
	cd ${WRKSRC}/src/tools.ora_drv && \
537
		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/oracle
599
		${INSTALL_DATA} *.sql ${EXAMPLESDIR}/oracle
538
.endif
600
.endif
539
601
540
.if defined(WITH_CGI)
602
.if defined(WITH_CGI)
Lines 555-565 Link Here
555
		${INSTALL_DATA} *.html ${CGI_PATH}/templates/
617
		${INSTALL_DATA} *.html ${CGI_PATH}/templates/
556
.endif
618
.endif
557
619
558
	@${SED} ${SED_SCRIPT} ${.CURDIR}/pkg-message > ${WRKSRC}/README.FreeBSD
620
	@${SED} ${_SED_SCRIPT} ${.CURDIR}/pkg-message > ${WRKSRC}/README.FreeBSD
559
.if !defined(NOPORTDOCS)
621
.if !defined(NOPORTDOCS)
560
	@${MKDIR} ${DOCSDIR}
622
	@${MKDIR} ${DOCSDIR}
561
	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
623
	cd ${WRKSRC} && ${INSTALL_DATA} ${_DOCS} ${DOCSDIR}
562
	cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${DOCSDIR}
624
	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${_DOCSL} ${DOCSDIR}
625
	cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${DOCSDIR}/UPDATING
563
.endif
626
.endif
564
627
565
	@${MKDIR} -m ${DSPAM_HOME_MODE} ${DSPAM_HOME}
628
	@${MKDIR} -m ${DSPAM_HOME_MODE} ${DSPAM_HOME}
(-)dspam/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (dspam-3.2.8.tar.gz) = e2cf80ef0a10ff8c123cb4fda5f2411d
1
MD5 (dspam-3.4.5.tar.gz) = fcb16a275e343baaa657eda045123e06
2
SIZE (dspam-3.2.8.tar.gz) = 621195
2
SIZE (dspam-3.4.5.tar.gz) = 698456
(-)dspam/files/UPDATING (+17 lines)
Lines 15-20 Link Here
15
in the port directory:
15
in the port directory:
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
###########################################################################
19
# dspam-3.4.5
20
#
21
22
This is the post-3.4 devel branch. A lot of things have changed and your
23
existing dspam.conf won't probably work anymore. Please compare it with the
24
dspam.conf.sample located in the same etc/ directory.
25
26
Most notable addition is the SMTP delivery which together with "standard"
27
inbound LMTP make a very nice content and light (e.g. it's the fastest setup
28
I've had so far) filter.
29
30
Database structure is roughly the same but you may wish to check your
31
existing database structure with the *.sql corresponding to you database
32
driver from EXAMPLESDIR (Mysql 4.1.x is now default as it's _much_ faster).
33
Please read carefully distributed docs like README and UPGRADING.
34
18
#############################################################################
35
#############################################################################
19
# dspam-3.2.8
36
# dspam-3.2.8
20
#
37
#
(-)dspam/files/dspam.rc (+41 lines)
Line 0 Link Here
1
#!/bin/sh
2
#
3
# $FreeBSD: ports/mail/dspam-devel/files/dspam.rc,v 1.2 2005/02/25 03:09:26 leeym 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"
(-)dspam/files/patch-Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- Makefile.in.orig	Thu Jun 24 18:32:38 2004
2
+++ Makefile.in	Thu Jun 24 18:37:09 2004
3
@@ -242,7 +242,7 @@
4
 man_MANS = dspam.1 dspam_stats.1 dspam_corpus.1 dspam_clean.1 dspam_dump.1 \
5
   dspam_merge.1
6
 
7
-pkgconfigdir = $(libdir)/pkgconfig
8
+pkgconfigdir = $(prefix)/libdata/pkgconfig
9
 pkgconfig_DATA = dspam.pc
10
 EXTRA_DIST = autogen.sh RELEASE.NOTES CHANGELOG LICENSE example.c \
11
   dspam-button.gif dspam.1 dspam_stats.1 dspam_corpus.1 dspam_clean.1 \
(-)dspam/files/patch-dspam.c (+23 lines)
Line 0 Link Here
1
--- src/dspam.c.dist	Sun Apr 10 15:49:29 2005
2
+++ src/dspam.c	Sun Apr 10 15:52:48 2005
3
@@ -2733,8 +2733,9 @@
4
             LOG (LOG_CRIT, ERROR_MEM_ALLOC);
5
         }
6
 
7
-        if (CTX->result == DSR_ISSPAM)
8
-        {
9
+// FreeBSD port patch: put the user in all emails, extremely usefull for scripts
10
+//        if (CTX->result == DSR_ISSPAM)
11
+//        {
12
           snprintf(data, sizeof(data), "X-DSPAM-User: %s", CTX->username);
13
           head = _ds_create_header_field(data);
14
           if (head != NULL)
15
@@ -2746,7 +2747,7 @@
16
           }
17
           else
18
             LOG (LOG_CRIT, ERROR_MEM_ALLOC);
19
-        }
20
+//        } // end of FreeBSD port patch
21
 
22
         if (!strcmp(_ds_pref_val(PTX, "showFactors"), "on")) {
23
 
(-)dspam/files/patch-dspam.conf.in (-29 lines)
Lines 1-29 Link Here
1
--- dspam.conf.in.orig	Thu Dec 30 19:18:14 2004
2
+++ dspam.conf.in	Thu Dec 30 19:20:02 2004
3
@@ -34,7 +34,7 @@
4
 # the user DSPAM is processing mail for. This configuration parameter is only 
5
 # necessary if you plan on allowing untrusted processing.
6
 #
7
-#UntrustedDeliveryAgent "/usr/bin/procmail -d %u"
8
+#UntrustedDeliveryAgent "@delivery_agent@"
9
 
10
 #
11
 # Quarantine Agent: DSPAM's default behavior is to quarantine all mail it 
12
@@ -42,7 +42,7 @@
13
 # a quarantine agent which will be called with all messages DSPAM thinks is
14
 # spam. Use %u to specify the user DSPAM is processing mail for.
15
 #
16
-#QuarantineAgent	"/usr/bin/procmail -d spam"
17
+#QuarantineAgent	"@delivery_agent@"
18
 
19
 #
20
 # OnFail: What to do if local delivery or quarantine should fail. If set
21
@@ -169,7 +169,7 @@
22
 # Storage driver settings: Specific to a particular storage driver. Uncomment
23
 # the configuration specific to your installation, if applicable.
24
 #
25
-#MySQLServer    /var/lib/mysql/mysql.sock
26
+#MySQLServer    /tmp/mysql.sock
27
 #MySQLPort
28
 #MySQLUser      dspam
29
 #MySQLPass      changeme
(-)dspam/files/patch-src_dspam.conf.in (+53 lines)
Line 0 Link Here
1
--- src/dspam.conf.in.dist	Fri Feb 25 23:08:31 2005
2
+++ src/dspam.conf.in	Fri Feb 25 23:19:02 2005
3
@@ -35,6 +35,7 @@
4
 # necessary if you plan on allowing untrusted processing.
5
 #
6
 #UntrustedDeliveryAgent "/usr/bin/procmail -d %u"
7
+#UntrustedDeliveryAgent "@delivery_agent@"
8
 
9
 #
10
 # LMTP Delivery: Alternatively, you may wish to use LMTP delivery to deliver
11
@@ -53,6 +54,7 @@
12
 # spam. Use %u to specify the user DSPAM is processing mail for.
13
 #
14
 #QuarantineAgent	"/usr/bin/procmail -d spam"
15
+#QuarantineAgent       "@delivery_agent@"
16
 
17
 #
18
 # OnFail: What to do if local delivery or quarantine should fail. If set
19
@@ -179,7 +181,7 @@
20
 # Storage driver settings: Specific to a particular storage driver. Uncomment
21
 # the configuration specific to your installation, if applicable.
22
 #
23
-#MySQLServer    	/var/lib/mysql/mysql.sock
24
+#MySQLServer    	/tmp/mysql.sock
25
 #MySQLPort
26
 #MySQLUser 	     	dspam
27
 #MySQLPass    		changeme
28
@@ -385,6 +387,7 @@
29
 # without processing. Value is in bytes.
30
 #
31
 #MaxMessageSize 4194304
32
+MaxMessageSize 307200
33
 
34
 #
35
 # Daemonized Server: If you are running DSPAM as a daemonized server using
36
@@ -396,6 +399,7 @@
37
 #
38
 #ServerPort		24
39
 #ServerQueueSize	32
40
+# keep this is sync with /usr/local/etc/rc.d/dspam.rc script
41
 #ServerPID              /var/run/dspam.pid
42
 
43
 #
44
@@ -422,7 +426,8 @@
45
 # you are running the client and server on the same machine, as it eliminates
46
 # much of the bandwidth overhead.
47
 #
48
-#ServerDomainSocketPath  "/tmp/dspam.sock"
49
+# keep this is sync with /usr/local/etc/rd.d/dspam.rc script
50
+#ServerDomainSocketPath  "/var/run/dspam.sock"
51
 
52
 #
53
 # Client Mode: If you are running DSPAM in client/server mode, uncomment and
(-)dspam/files/patch-tools_dspam_clean.c (-18 lines)
Lines 1-18 Link Here
1
Index: tools/dspam_clean.c
2
===================================================================
3
RCS file: /usr/local/cvsroot/dspam-3.2/tools/dspam_clean.c,v
4
retrieving revision 1.5
5
diff -u -r1.5 dspam_clean.c
6
--- tools/dspam_clean.c	25 Oct 2004 22:57:56 -0000	1.5
7
+++ tools/dspam_clean.c	28 Jan 2005 19:58:49 -0000
8
@@ -188,7 +188,7 @@
9
       nt_add(users, argv[i]);
10
   }
11
 
12
-  if (!do_probs && !do_sigs && !do_unused) {
13
+  if (help || !do_probs && !do_sigs && !do_unused) {
14
     fprintf(stderr, "%s", CLEANSYNTAX);
15
     _ds_destroy_attributes(agent_config);
16
     nt_destroy(users);
17
18
L.
(-)dspam/pkg-message (-70 / +15 lines)
Lines 1-41 Link Here
1
1
2
-------------------------------------------------------------------------------
2
-------------------------------------------------------------------------------
3
 Reporting problems, asking questions:
4
 - FreeBSD specific port-related problems/questions/paches: maintainer
5
(and ports@ if you fell the need); send-pr only if you get no timely reply
6
 - dspam specific questions: dspam/dspam-dev mailling list (maintainer cc'ed)
7
 - dspam specific patches: dspam/dspam-dev mailling list (maintainer cc'ed if)
8
 Please be sure to include in your email/pr relevant information such as:
9
 uname -a, dspam --version, %%_VAR_DIR%%/db/ports/%%PORTNAME%%/options, MTA setup.
3
10
4
 See the file %%DOCSDIR%%/README for advice about 
5
 how to configure DSPAM and
6
 %%DOCSDIR%%/README.your_mta_name 
7
 for MTA or pop3 integration; examples for:
8
 courier, exim, pop3filter, postfix, qmail and sendmail.
9
 Keep in mind that while this port obeys our hier(7) this thing is not
10
 reflected in distributed files because I lack the time for patching them.
11
12
%%MYSQL%%
13
%%MYSQL%% See %%EXAMPLESDIR%%/mysql/README
14
%%MYSQL%% for instructions on how to configure DSPAM - MySQL interaction.
15
%%MYSQL%%
16
%%MYSQL%% BACKUP FIRST !!!
17
%%MYSQL%%
18
%%MYSQL%% To modify a 2.x database use and use it with dspam 3.x use:
19
%%MYSQL%% %%EXAMPLESDIR%%/mysql/2x_to_3x_db.sql
20
%%MYSQL%% To modify a 3.1.0  *mysql4.0* use :
21
%%MYSQL%% %%EXAMPLESDIR%%/mysql/310_to_320.my.sql
22
%%MYSQL%%
23
%%PGSQL%%
24
%%PGSQL%% See %%EXAMPLESDIR%%/pgsql/README
25
%%PGSQL%% for instructions on how to configure PostrgreSQL
26
%%PGSQL%% for use with DSPAM.
27
%%PGSQL%% 
28
%%SQLITE%%
29
%%SQLITE%% See %%EXAMPLESDIR%%/sqlite/README
30
%%SQLITE%% for suggestion on SQLite back-end. It should work out-of-the-box.
31
%%SQLITE%%
32
%%SQLITE%% You'll always want to run dspam_clean -p0 and 
33
%%SQLITE%% sqlite %%DSPAM_HOME%%/data/user/user.sdb < vacuum 
34
%%SQLITE%% after a corpusfeed.
35
%%SQLITE%% There are  most likely 70%+ junk tokens that need to be removed.
36
%%SQLITE%% This will have a HUGE impact on the disk space your db uses.
37
%%SQLITE%%
38
%%CGI%%
39
%%CGI%% The CGI files had been installed in
11
%%CGI%% The CGI files had been installed in
40
%%CGI%% %%CGI_PATH%%
12
%%CGI%% %%CGI_PATH%%
41
%%CGI%% Copy
13
%%CGI%% Copy
Lines 55-94 Link Here
55
%%CGI%% to
27
%%CGI%% to
56
%%CGI%% %%CGI_PATH%%/admins 
28
%%CGI%% %%CGI_PATH%%/admins 
57
%%CGI%% and edit the file to your needs. 
29
%%CGI%% and edit the file to your needs. 
58
%%CGI%% See %%DOCSDIR%%/README 
59
%%CGI%% especially the CGI and Trusted Users sections for more info.
60
%%CGI%% If you have problems (after upgrading) check permissions.
30
%%CGI%% If you have problems (after upgrading) check permissions.
61
31
%%DAEMON%%
62
  See %%DOCSDIR%%/RELEASE.NOTES 
32
%%DAEMON%% To enable the dspam deamon put dspam_enable="YES" in your
63
  for new things in this %%PKGNAME%% and 
33
%%DAEMON%% /etc/rc.conf
64
  %%DOCSDIR%%/CHANGELOG
34
65
  for the full list from 3.0.0 stable.
35
 You'll find additional setup instructions under
66
  Preference extensions are NOT yet integrated in this port, 
36
 %%DOCSDIR%%
67
  feel free to test and send patches.
37
and
68
38
 %%EXAMPLESDIR%%
69
 ***************************** WARNING: ***************************************
70
 Almost everything regarding how dspam must be configured has changed.
71
 If you are upgrading from 2.x or 3.x be sure to read
72
 %%DOCSDIR%%/UPDATING
73
 ******************************************************************************
74
75
 ---- %%PKGNAME%% is considered to be a STABLE release.  ---
76
 Reporting problems, asking questions:
77
 - small typos, etc. to the maintainer
78
 - FreeBSD specific port-related problems/questions: ports@, maintainer cc'ed
79
 - FreeBSD specific patches, doc enhancements: send-pr maintainer cc'ed
80
 - dspam specific questions: dspam mailling list (maintainer cc'ed if you like)
81
 - dspam specific patches: dspam/dspam-dev mailling list (maintainer cc'ed if you like)
82
 Please be sure to include in your email/pr relevant information such as:
83
 uname -a, dspam --version, /var/db/ports/dspam-devel/options, MTA setup.
84
 If needed rebuild WITH_DEBUG and to turn on debugging see DebugOpt in dsapm.conf
85
86
 Please send unified diff's (diff -u).
87
 
88
 If you don't want to see in your maillog : 
89
 "query error: verbose debug INFO ONLY: see sql.errors for more details"
90
 please recompile withOUT verbose debug; those who will report this "error" will
91
 be sent to spen their night in a room with a cardassian, a klingonian and a romulan.
92
93
				-- Thanks for making both our lives easier.
94
------------------------------------------------------------------------------
39
------------------------------------------------------------------------------
(-)dspam/pkg-plist (-11 / +18 lines)
Lines 1-4 Link Here
1
bin/dspam
1
bin/dspam
2
bin/dspamc
2
bin/dspam_2sql
3
bin/dspam_2sql
3
bin/dspam_admin
4
bin/dspam_admin
4
bin/dspam_clean
5
bin/dspam_clean
Lines 6-25 Link Here
6
bin/dspam_crc
7
bin/dspam_crc
7
bin/dspam_dump
8
bin/dspam_dump
8
bin/dspam_genaliases
9
bin/dspam_genaliases
10
bin/dspam_logrotate
9
bin/dspam_merge
11
bin/dspam_merge
12
%%PGSQL%%bin/dspam_pg2int8
10
bin/dspam_stats
13
bin/dspam_stats
11
@unexec if cmp -s %D/etc/dspam.conf %D/etc/dspam.conf.sample; then rm -f %D/etc/dspam.conf; fi
14
@unexec if cmp -s %D/etc/dspam.conf %D/etc/dspam.conf.sample; then rm -f %D/etc/dspam.conf; fi
12
etc/dspam.conf.sample
15
etc/dspam.conf.sample
13
include/dspam/buffer.h
16
include/dspam/buffer.h
14
include/dspam/config.h
17
include/dspam/config.h
18
include/dspam/config_shared.h
15
include/dspam/decode.h
19
include/dspam/decode.h
20
include/dspam/diction.h
16
include/dspam/error.h
21
include/dspam/error.h
17
include/dspam/lht.h
22
include/dspam/heap.h
18
include/dspam/libdspam.h
23
include/dspam/libdspam.h
19
include/dspam/libdspam_objects.h
24
include/dspam/libdspam_objects.h
20
include/dspam/nodetree.h
25
include/dspam/nodetree.h
21
include/dspam/storage_driver.h
26
include/dspam/storage_driver.h
22
include/dspam/tbt.h
23
lib/libdspam.a
27
lib/libdspam.a
24
lib/libdspam.so
28
lib/libdspam.so
25
lib/libdspam.so.6
29
lib/libdspam.so.6
Lines 30-46 Link Here
30
%%PORTDOCS%%%%DOCSDIR%%/README
34
%%PORTDOCS%%%%DOCSDIR%%/README
31
%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES
35
%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES
32
%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
36
%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
33
%%PORTDOCS%%%%DOCSDIR%%/README.courier
37
%%PORTDOCS%%%%DOCSDIR%%/appliance.txt
34
%%PORTDOCS%%%%DOCSDIR%%/README.exim
38
%%PORTDOCS%%%%DOCSDIR%%/courier.txt
35
%%PORTDOCS%%%%DOCSDIR%%/README.pop3filter
39
%%PORTDOCS%%%%DOCSDIR%%/exim.txt
36
%%PORTDOCS%%%%DOCSDIR%%/README.postfix
40
%%PORTDOCS%%%%DOCSDIR%%/mysql_drv.txt
37
%%PORTDOCS%%%%DOCSDIR%%/README.qmail
41
%%PORTDOCS%%%%DOCSDIR%%/ora_drv.txt
38
%%PORTDOCS%%%%DOCSDIR%%/README.sendmail
42
%%PORTDOCS%%%%DOCSDIR%%/pgsql_drv.txt
43
%%PORTDOCS%%%%DOCSDIR%%/pop3filter.txt
44
%%PORTDOCS%%%%DOCSDIR%%/postfix.txt
45
%%PORTDOCS%%%%DOCSDIR%%/qmail.txt
46
%%PORTDOCS%%%%DOCSDIR%%/sendmail.txt
47
%%PORTDOCS%%%%DOCSDIR%%/sqlite_drv.txt
39
%%PORTDOCS%%%%DOCSDIR%%/UPDATING
48
%%PORTDOCS%%%%DOCSDIR%%/UPDATING
49
%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
40
%%PORTDOCS%%@dirrm %%DOCSDIR%%
50
%%PORTDOCS%%@dirrm %%DOCSDIR%%
41
%%MYSQL%%%%EXAMPLESDIR%%/mysql/2x_to_3x_db.sql
51
%%MYSQL%%%%EXAMPLESDIR%%/mysql/2x_to_3x_db.sql
42
%%MYSQL%%%%EXAMPLESDIR%%/mysql/310_to_320.my.sql
52
%%MYSQL%%%%EXAMPLESDIR%%/mysql/310_to_320.my.sql
43
%%MYSQL%%%%EXAMPLESDIR%%/mysql/README
44
%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
53
%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
45
%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
54
%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
46
%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql
55
%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql
Lines 50-62 Link Here
50
%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_users.sql
59
%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_users.sql
51
%%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
60
%%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
52
%%MYSQL%%@dirrm %%EXAMPLESDIR%%
61
%%MYSQL%%@dirrm %%EXAMPLESDIR%%
53
%%PGSQL%%%%EXAMPLESDIR%%/pgsql/README
54
%%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
62
%%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
55
%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
63
%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
56
%%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
64
%%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
57
%%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
65
%%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
58
%%PGSQL%%@dirrm %%EXAMPLESDIR%%
66
%%PGSQL%%@dirrm %%EXAMPLESDIR%%
59
%%SQLITE%%%%EXAMPLESDIR%%/sqlite/README
60
%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge.sql
67
%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge.sql
61
%%SQLITE%%@dirrm %%EXAMPLESDIR%%/sqlite
68
%%SQLITE%%@dirrm %%EXAMPLESDIR%%/sqlite
62
%%SQLITE%%@dirrm %%EXAMPLESDIR%%
69
%%SQLITE%%@dirrm %%EXAMPLESDIR%%

Return to bug 80442