Attachment #147430 for bug #193693




# Created by: Dominic Marks <dom@wirespeed.org.uk>
# $FreeBSD: head/mail/dspam/Makefile 367990 2014-09-11 21:54:45Z tijl $

# Note to committers: If don't commit a maintainer patch and as a result PKGNAME
# or user variables (WITH*) changes please add an entry in ${FILESDIR}/UPDATING
# Thanks.

PORTNAME=	dspam
PORTVERSION=	3.10.2
PORTREVISION=	0
CATEGORIES=	mail
MASTER_SITES=	SF 
		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

MAINTAINER=	danny@dannywarren.com
COMMENT=	Bayesian spam filter

LICENSE=	AGPLv3

OPTIONS_SUB=	yes

OPTIONS_DEFINE=	SYSLOG DEBUG VERBOSE_DEBUG BNR_DEBUG PREF_EXT DAEMON \
		CLAMAV CLAMAV_LOCAL EXTERNAL_LOOKUP \


OPTIONS_RADIO=	LDA
OPTIONS_RADIO_LDA=	CYRUS23 CYRUS24 DOVECOT1 \
			DOVECOT2 EXIM MAILDROP PROCMAIL SAFECAT SENDMAIL

OPTIONS_DEFAULT=	SYSLOG DEBUG DAEMON CLAMAV CLAMAV_LOCAL \
			HASH MYSQL MYSQL_COMPRESS PGSQL SQLITE3



VERBOSE_DEBUG_DESC=	Debug in LOGDIR/dspam.debug
BNR_DEBUG_DESC=		Debug for Bayesian Noise Reduction
PREF_EXT_DESC=		Preferences in database not in files
DAEMON_DESC=		Daemonize dspam; speaks LMTP or DLMTP
CLAMAV_DESC=		ClamAV support
CLAMAV_LOCAL_DESC=	RUN_DEPEND on selected ClamAV
MYSQL_DESC=		MySQL 5.X.x as back-end
MYSQL_COMPRESS_DESC=	Compress dspam <--> MySQL
MYSQL_LOCAL_DESC=	RUN_DEPEND on MySQL server
PGSQL_DESC=		PostgreSQL as back-end
PGSQL_LOCAL_DESC=	RUN_DEPEND on PostgreSQL server
SQLITE2_DESC=		SQLite v2.x as back-end
SQLITE3_DESC=		SQLite v3.x as back-end
HASH_DESC=		Hash driver
EXTERNAL_LOOKUP_DESC=	RCPT verification via extlookup
USER_HOMEDIR_DESC=	Store user data in ~/.dspam
TRUSTED_USERS_DESC=	Disable trusted user security

LONG_USERNAMES_DESC=	Usernames longer that OS supports
LARGE_SCALE_DESC=	File structure for large scale
DOMAIN_SCALE_DESC=	File structure for multiple domains
CYRUS23_DESC=		Cyrus's 2.3 deliver as LDA
CYRUS24_DESC=		Cyrus's 2.4 deliver as LDA
DOVECOT1_DESC=		Dovecot 1.2 deliver as LDA
DOVECOT2_DESC=		Dovecot 2.2 dovecot-lda as LDA
EXIM_DESC=		Exim as local delivery agent
MAILDROP_DESC=		Maildrop as local delivery agent
PROCMAIL_DESC=		Procmail as local delivery agent
SAFECAT_DESC=		Safecat as local delivery agent
SENDMAIL_DESC=		Sendmail as local delivery agent
NICESENDMAIL_DESC=	Play nice with sendmail server
POSTFIX_MBC_DESC=	Dspam as mailbox_command in Postfix
QMAIL_DESC=		Play nice with Qmail mail server
WEBUI_DESC=		Install WebUI, pulls in Apache or see below

OPTIONS_DEFAULT=	SYSLOG DEBUG DAEMON CLAMAV CLAMAV_LOCAL \
			HASH MYSQL MYSQL_COMPRESS PGSQL SQLITE3

MAKE_JOBS_UNSAFE=	yes
USES=		perl5 libtool shebangfix

LDFLAGS+=	-L${LOCALBASE}/lib

SHEBANG_FILES=	src/tools/dspam_logrotate \
		src/tools/dspam_notify.in \
		src/tools/dspam_train.in \
		webui/cgi-bin/templates/*/strings.pl \
		webui/cgi-bin/templates/strings.pl \
		webui/cgi-bin/*.cgi \
		webui/cgi-bin/*.pl
		webui/cgi-bin/templates/pt-br/strings.pl \
		webui/cgi-bin/*.cgi

.ifdef(GDBS)
CFLAGS+=	-g -DDEBUG

DSPAM_HOME_GROUP?=	${DSPAM_GROUP}
DSPAM_HOME_MODE?=	0770

PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME} \
		DSPAM_OWNER=${DSPAM_OWNER} \
		DSPAM_GROUP=${DSPAM_GROUP} \
		DSPAM_MODE=${DSPAM_MODE} \
		DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \
		DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \
		DSPAM_HOME_MODE=${DSPAM_HOME_MODE}

CONFIGURE_ARGS+=	--sysconfdir=${DSPAM_ETC}
CONFIGURE_ARGS+=	--with-logdir=${LOG_DIR}

CONFIGURE_ARGS+=	--with-dspam-home-owner=${DSPAM_HOME_OWNER}
CONFIGURE_ARGS+=	--with-dspam-home-group=${DSPAM_HOME_GROUP}
CONFIGURE_ARGS+=	--with-dspam-home-mode=${DSPAM_HOME_MODE}
PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME} \
		DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \
		DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \
		DSPAM_HOME_MODE=${DSPAM_HOME_MODE}

CONFIGURE_ARGS+=	--with-dspam-owner=${DSPAM_OWNER}
CONFIGURE_ARGS+=	--with-dspam-group=${DSPAM_GROUP}
# we set DSPAM_MODE at the end as some LDAs want specific mode
PLIST_SUB+=	DSPAM_OWNER=${DSPAM_OWNER} \
		DSPAM_GROUP=${DSPAM_GROUP} \
		DSPAM_MODE=${DSPAM_MODE} 

_SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
		-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g' \
		-e 's,%%PORTNAME%%,${PORTNAME},g' \
		-e 's,%%_VAR_DIR%%,${_VAR_DIR},g' \
		-e '/^%%FreeBSD/D'

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MSYSLOG}
CONFIGURE_ARGS+=	--enable-syslog

.if ${PORT_OPTIONS:MEXTERNAL_LOOKUP}
CONFIGURE_ARGS+=	--enable-external-lookup
USE_OPENLDAP=	YES
#CPPFLAGS+=	-I${LOCALBASE}/include
#LDFLAGS+=	-lldap -llber
#CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.endif

.if ${PORT_OPTIONS:MUSER_HOMEDIR}

	@${ECHO_CMD} ""
	@${ECHO_CMD} "Last ${FILESDIR}/UPDATING entry:"
	@${ECHO_CMD} "###########################################################################"
	@${SED} -n < ${FILESDIR}/UPDATING "/^# ${PORTNAME}-${PORTVERSION}/,/^#####/p"
	@${ECHO_CMD} ""
	@sleep 5
.endif

pre-extract:

		@${ECHO_CMD} "${WWWDIR}"
.	endif
	@${ECHO_CMD} ""
	@sleep 5
.endif

post-patch:

		${WRKSRC}/src/tools.sqlite_drv/purge-2.sql
	@${REINPLACE_CMD} -e "s|where julianday('now')-julianday(created_on) > 14;|where julianday('now')-julianday(created_on) > ${SIGNATURE_LIFE};|" \
		 ${WRKSRC}/src/tools.sqlite_drv/purge-3.sql
	@${REINPLACE_CMD} -e "s^%%PERL%%^${PERL}^" \
		${WRKSRC}/src/tools/dspam_train.in \
		${WRKSRC}/src/tools/dspam_notify.in

pre-configure:
.if ${PORT_OPTIONS:MVIRT_USERS} && !( defined(USE_MYSQL) || \

########
# stupid hack until I figure out where/how to patch
	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/dspam.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dspam.pc
	${TEST} `ls -1 ${STAGEDIR}${PREFIX}/lib/pkgconfig | wc -l` -eq 0 && \
		${RM} -R ${STAGEDIR}${PREFIX}/lib/pkgconfig || true

.if ${PORT_OPTIONS:MEXAMPLES}
.ifdef(USE_MYSQL)

	@cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${STAGEDIR}${DOCSDIR}/UPDATING
.endif

	@${MKDIR} ${STAGEDIR}${DSPAM_HOME}
.for _file in firstrun.txt firstspam.txt quarantinefull.txt
	@if ! ${TEST} -e ${WRKSRC}/txt/${_file}.sample;\
	then\


	@${MKDIR} -m ${DSPAM_HOME_MODE} ${STAGEDIR}${LOG_DIR}

	@${CAT} ${WRKSRC}/README.FreeBSD

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)dspam-merge/distinfo (-2 / +2 lines)
1	SHA256 (dspam-3.9.0.tar.gz) = fb2b0d0e49d44e077e665041041035c3a882d858c03265dd0955664c0fa934ae	1	SHA256 (dspam-3.10.2.tar.gz) = ae76569604021f35b741fb95198a1e611a8c64c3838661973a6cf360bba593a9
2	SIZE (dspam-3.9.0.tar.gz) = 973232	2	SIZE (dspam-3.10.2.tar.gz) = 1035054




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

###########################################################################
# dspam-3.10.2
#

Upstream Changes:
- Support for Postgresql 9.1 added
- Support for Postgresql <8.1 dropped (EOL)
- Support for MySQL 5.5 added
- Support for MySQL <5.0 dropped
- Updated license from GPLv2 to AGPLv3
- Bug in RSET handling during LHLO phase
- Location of configuration files in dspam home (/var/dspam) can be changed
  through dspam.conf
- Various fixes to the webui templates
- Various small bugs and memleaks
- Missing documentation added to tarball
- Many bugfixes

Port Changes:
- Merge mail/dspam-devel and mail/dspam (PR #193693)
- Port cleanup by various submitters, thanks! [1][2][3][4][5]

[1] Patch from <yds@CoolRat.org> (PR #180695, #191610)
[2] Patch from Radim Kolar <hsn@sendmail.cz> (PR #167289)
[3] Patch from Olli Hauer <ohauer@FreeBSD.org> (PR #148485)
[4] Patch from <mtomasek4@gmail.com> (PR #191610)
[5] Patch from Rene Ladan <rene@FreeBSD.org> (PR #191797)


###########################################################################
# dspam-3.9.0
#





#!/bin/sh
# $FreeBSD: head/mail/dspam/files/dspam.in 340872 2014-01-24 00:14:07Z mat $
# formerly $ FreeBSD: ports/mail/dspam/files/dspam,v 1.1 2005/05/05 21:03:37 pav Exp $
#

# PROVIDE: dspam

#defaults
: ${dspam_enable="NO"}
: ${dspam_debug="NO"}
: ${dspam_pidfile:-/var/run/dspam.pid}

command=%%PREFIX%%/bin/${name}
start_precmd=dspam_checkdebug
required_files=%%PREFIX%%/etc/${name}.conf

start_precmd=dspam_checkdebug
extra_commands=reload

required_dirs=%%DSPAM_HOME%%
required_files=%%PREFIX%%/etc/${name}.conf
 kill -HUP `cat $pidfile`
}

dspam_checkdebug()
{

	fi
}

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

run_rc_command "$1"




--- src/dspam.conf.in.orig	2014-09-18 00:33:02.874722063 -0700
+++ src/dspam.conf.in	2014-09-18 00:41:49.434685786 -0700
@@ -56,6 +56,7 @@
 # necessary if you plan on allowing untrusted processing.
 #
 #UntrustedDeliveryAgent "/usr/bin/procmail -d %u"
+#UntrustedDeliveryAgent "@delivery_agent@"
 
 #
 # SMTP or LMTP Delivery: Alternatively, you may wish to use SMTP or LMTP
@@ -350,7 +351,7 @@
 # Storage driver settings: Specific to a particular storage driver. Uncomment
 # the configuration specific to your installation, if applicable.
 #

 #MySQLPort		
 #MySQLUser		dspam
 #MySQLPass		changeme
@@ -361,7 +362,7 @@
 # If you are using replication for clustering, you can also specify a separate
 # server to perform all writes to.
 #

 #MySQLWritePort		
 #MySQLWriteUser		dspam
 #MySQLWritePass		changeme
@@ -406,7 +407,7 @@
 # in /var/run/postgresql/.s.PGSQL.5432 specify just the path where the socket
 # resits (without .s.PGSQL.5432).
 #ServerQueueSize	32
+# keep this is sync with /usr/local/etc/rc.d/dspam[.sh] rc.d script
 #ServerPID		/var/run/dspam.pid
 
-#PgSQLServer		/var/run/postgresql/
+#PgSQLServer		/tmp/
 #PgSQLPort		
 #PgSQLUser		dspam
 #PgSQLPass		changeme
@@ -845,14 +846,14 @@
 # you are running the client and server on the same machine, as it eliminates
 # much of the bandwidth overhead.
 #
-#ServerDomainSocketPath	"/tmp/dspam.sock"
+#ServerDomainSocketPath	"/var/run/dspam.sock"
+#ServerDomainSocketPath  "/var/run/dspam.sock"
 
 #
 # Client Mode: If you are running DSPAM in client/server mode, uncomment and

Lines 4-7 Link Here

(-)dspam-merge/pkg-descr (-1 / +1 lines)
4	for mail clients, other anti-spam tools, and similar projects	4	for mail clients, other anti-spam tools, and similar projects
5	requiring drop-in spam filtering.	5	requiring drop-in spam filtering.
6		6
7	WWW: http://dspam.nuclearelephant.com	7	WWW: http://dspam.sourceforge.net/




-------------------------------------------------------------------------------
 Reporting problems, asking questions:
 - FreeBSD specific port-related problems/questions/patches: maintainer
(and ports@ if you feel the need); send-pr only if you get no timely reply
 - dspam specific questions: dspam/dspam-dev mailing list (maintainer cc'ed)
 - dspam specific patches: dspam/dspam-dev mailing list (maintainer cc'ed)
 Please be sure to include in your email/pr relevant information such as:
 uname -a, dspam --version, %%_VAR_DIR%%/db/ports/%%PORTNAME%%/options, MTA setup.

###########################################################################
the developers.

%%WebUI%%  The CGI files had been installed to:
%%WebUI%%    %%WWWDIR%%
%%WebUI%%
%%DAEMON%%  To enable the dspam deamon set dspam_enable="YES" in:
%%DAEMON%%    /etc/rc.conf
%%WebUI%% %%WWWDIR%%/default.prefs
%%WebUI%% and edit it to your needs.
%%WebUI%% Copy
%%WebUI%% %%WWWDIR%%/configure.pl.sample
%%WebUI%% to
%%WebUI%% %%WWWDIR%%/configure.pl
%%WebUI%% and edit it to your needs.
%%WebUI%% If you symlink this file in %%DSPAM_HOME%%/
%%WebUI%% an administrator can edit these options in the DSPAM Admin Suite.
%%WebUI%% Define administrators by copying 
%%WebUI%% %%WWWDIR%%/admins.sample
%%WebUI%% to
%%WebUI%% %%WWWDIR%%/admins 
%%WebUI%% and edit the file to your needs. 
%%WebUI%% If you have problems (after upgrading) check permissions.
%%DAEMON%%
  Additional setup instructions can be found at:
    %%DOCSDIR%%
    %%EXAMPLESDIR%%

###########################################################################

 You'll find additional setup instructions under
 %%DOCSDIR%%
and
 %%EXAMPLESDIR%%
------------------------------------------------------------------------------

Lines 1-8 Link Here

(-)dspam-merge/pkg-plist (-15 / +37 lines)
1	%%HASH%%bin/cssstat
2	%%HASH%%bin/csscompress
3	%%HASH%%bin/cssclean	1	%%HASH%%bin/cssclean
		2	%%HASH%%bin/csscompress
4	%%HASH%%bin/cssconvert	3	%%HASH%%bin/cssconvert
		4	%%HASH%%bin/cssstat
		5	@owner %%DSPAM_OWNER%%
		6	@group %%DSPAM_GROUP%%
		7	@mode %%DSPAM_MODE%%
5	bin/dspam	8	bin/dspam
		9	@exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F
		10	@exec chmod %%DSPAM_MODE%% %D/%F
		11	@mode
		12	@group wheel
		13	@owner root
6	bin/dspamc	14	bin/dspamc
7	bin/dspam_2sql	15	bin/dspam_2sql
8	bin/dspam_admin	16	bin/dspam_admin
Lines 11-33 Link Here
11	bin/dspam_dump	19	bin/dspam_dump
12	bin/dspam_logrotate	20	bin/dspam_logrotate
13	bin/dspam_merge	21	bin/dspam_merge
		22	bin/dspam_notify
14	%%PGSQL%%bin/dspam_pg2int8	23	%%PGSQL%%bin/dspam_pg2int8
15	bin/dspam_stats	24	bin/dspam_stats
16	bin/dspam_train	25	bin/dspam_train
		26	@mode 0640
17	@owner %%DSPAM_OWNER%%	27	@owner %%DSPAM_OWNER%%
18	@group %%DSPAM_GROUP%%	28	@group %%DSPAM_GROUP%%
19	@mode 640
20	@sample etc/dspam.conf.sample	29	@sample etc/dspam.conf.sample
		30	@exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F
		31	@exec chmod 0640 %D/%F
		32	@group wheel
		33	@owner root
21	@mode	34	@mode
22	@group
23	@owner
24	include/dspam/buffer.h	35	include/dspam/buffer.h
25	include/dspam/config.h	36	include/dspam/config.h
26	include/dspam/config_shared.h	37	include/dspam/config_shared.h
27	include/dspam/decode.h	38	include/dspam/decode.h
28	include/dspam/diction.h	39	include/dspam/diction.h
29	include/dspam/error.h	40	include/dspam/error.h
30	include/dspam/external_lookup.h
31	include/dspam/heap.h	41	include/dspam/heap.h
32	include/dspam/libdspam.h	42	include/dspam/libdspam.h
33	include/dspam/libdspam_objects.h	43	include/dspam/libdspam_objects.h
Lines 41-60 Link Here
41	lib/libdspam.so.7	51	lib/libdspam.so.7
42	lib/libdspam.so.7.0.0	52	lib/libdspam.so.7.0.0
43	man/man1/dspam.1.gz	53	man/man1/dspam.1.gz
		54	man/man1/dspam_admin.1.gz
44	man/man1/dspam_clean.1.gz	55	man/man1/dspam_clean.1.gz
		56	man/man1/dspam_crc.1.gz
45	man/man1/dspam_dump.1.gz	57	man/man1/dspam_dump.1.gz
		58	man/man1/dspam_logrotate.1.gz
46	man/man1/dspam_merge.1.gz	59	man/man1/dspam_merge.1.gz
47	man/man1/dspam_stats.1.gz	60	man/man1/dspam_stats.1.gz
48	man/man1/dspam_train.1.gz	61	man/man1/dspam_train.1.gz
49	man/man3/libdspam.3.gz
50	man/man3/dspam_init.3.gz
51	man/man3/dspam_create.3.gz
52	man/man3/dspam_addattribute.3.gz	62	man/man3/dspam_addattribute.3.gz
53	man/man3/dspam_attach.3.gz	63	man/man3/dspam_attach.3.gz
54	man/man3/dspam_process.3.gz	64	man/man3/dspam_clearattributes.3.gz
55	man/man3/dspam_getsource.3.gz	65	man/man3/dspam_create.3.gz
56	man/man3/dspam_destroy.3.gz	66	man/man3/dspam_destroy.3.gz
57	man/man3/dspam_detach.3.gz	67	man/man3/dspam_detach.3.gz
		68	man/man3/dspam_getsource.3.gz
		69	man/man3/dspam_init.3.gz
		70	man/man3/dspam_process.3.gz
		71	man/man3/libdspam.3.gz
58	%%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.a	72	%%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.a
59	%%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.so	73	%%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.so
60	%%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.so.7	74	%%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.so.7
Lines 76-83 Link Here
76	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG	90	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
77	%%PORTDOCS%%%%DOCSDIR%%/LICENSE	91	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
78	%%PORTDOCS%%%%DOCSDIR%%/README	92	%%PORTDOCS%%%%DOCSDIR%%/README
79	%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES
80	%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD	93	%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
		94	%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES
		95	%%PORTDOCS%%%%DOCSDIR%%/UPDATING
		96	%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
81	%%PORTDOCS%%%%DOCSDIR%%/courier.txt	97	%%PORTDOCS%%%%DOCSDIR%%/courier.txt
82	%%PORTDOCS%%%%DOCSDIR%%/exim.txt	98	%%PORTDOCS%%%%DOCSDIR%%/exim.txt
83	%%PORTDOCS%%%%DOCSDIR%%/markov.txt	99	%%PORTDOCS%%%%DOCSDIR%%/markov.txt
Lines 89-96 Link Here
89	%%PORTDOCS%%%%DOCSDIR%%/relay.txt	105	%%PORTDOCS%%%%DOCSDIR%%/relay.txt
90	%%PORTDOCS%%%%DOCSDIR%%/sendmail.txt	106	%%PORTDOCS%%%%DOCSDIR%%/sendmail.txt
91	%%PORTDOCS%%%%DOCSDIR%%/sqlite_drv.txt	107	%%PORTDOCS%%%%DOCSDIR%%/sqlite_drv.txt
92	%%PORTDOCS%%%%DOCSDIR%%/UPDATING
93	%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
94	%%PORTDOCS%%@dirrm %%DOCSDIR%%	108	%%PORTDOCS%%@dirrm %%DOCSDIR%%
95	%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql	109	%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
96	%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql	110	%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
Lines 228-233 Link Here
228	firstspam.txt.sample	242	firstspam.txt.sample
229	quarantinefull.txt.sample	243	quarantinefull.txt.sample
230	@cwd /	244	@cwd /
231	@dirrmtry %%LOG_DIR%%	245	@owner %%DSPAM_HOME_OWNER%%
		246	@group %%DSPAM_HOME_GROUP%%
		247	@mode %%DSPAM_HOME_MODE%%
232	@dirrm %%DSPAM_HOME%%	248	@dirrm %%DSPAM_HOME%%
		249	@mode
233	@exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%DSPAM_HOME%%	250	@exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%DSPAM_HOME%%
		251	@exec chmod %%DSPAM_HOME_MODE%% %%DSPAM_HOME%%
		252	@exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%LOG_DIR%%
		253	@dirrmtry %%LOG_DIR%%
		254	@group wheel
		255	@owner root

Return to bug 193693

Lines 1-22 Link Here

(-)dspam-merge/Makefile (-56 / +65 lines)
1	# Created by: Dominic Marks <dom@wirespeed.org.uk>	1	# Created by: Dominic Marks <dom@wirespeed.org.uk>
2	# $FreeBSD: head/mail/dspam/Makefile 368416 2014-09-17 20:43:12Z cs $	2	# $FreeBSD: head/mail/dspam/Makefile 367990 2014-09-11 21:54:45Z tijl $
3		3
4	# Note to committers: If don't commit a maintainer patch and as a result PKGNAME	4	# Note to committers: If don't commit a maintainer patch and as a result PKGNAME
5	# or user variables (WITH*) changes please add an entry in ${FILESDIR}/UPDATING	5	# or user variables (WITH*) changes please add an entry in ${FILESDIR}/UPDATING
6	# Thanks.	6	# Thanks.
7		7
8	PORTNAME= dspam	8	PORTNAME= dspam
9	PORTVERSION= 3.9.0	9	PORTVERSION= 3.10.2
10	PORTREVISION= 8	10	PORTREVISION= 0
11	CATEGORIES= mail	11	CATEGORIES= mail
12	MASTER_SITES= SF \	12	MASTER_SITES= SF
13	http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
14	MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	13	MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
15		14
16	MAINTAINER= danny@dannywarren.com	15	MAINTAINER= danny@dannywarren.com
17	COMMENT= Bayesian spam filter	16	COMMENT= Bayesian spam filter
18		17
19	MIN_OPTIONS_VER= ${PORTNAME}-3.9.0	18	LICENSE= AGPLv3
		19
		20	OPTIONS_SUB= yes
20		21
21	OPTIONS_DEFINE= SYSLOG DEBUG VERBOSE_DEBUG BNR_DEBUG PREF_EXT DAEMON \	22	OPTIONS_DEFINE= SYSLOG DEBUG VERBOSE_DEBUG BNR_DEBUG PREF_EXT DAEMON \
22	CLAMAV CLAMAV_LOCAL EXTERNAL_LOOKUP \	23	CLAMAV CLAMAV_LOCAL EXTERNAL_LOOKUP \
Lines 30-51 Link Here
30		31
31	OPTIONS_RADIO= LDA	32	OPTIONS_RADIO= LDA
32	OPTIONS_RADIO_LDA= CYRUS23 CYRUS24 DOVECOT1 \	33	OPTIONS_RADIO_LDA= CYRUS23 CYRUS24 DOVECOT1 \
33	DOVECOT2 EXIM MAILDROP PROCMAIL SAFECAT SENDMAIL	34	DOVECOT2 EXIM MAILDROP PROCMAIL SAFECAT SENDMAIL
		35
		36	OPTIONS_DEFAULT= SYSLOG DEBUG DAEMON CLAMAV CLAMAV_LOCAL \
		37	HASH MYSQL MYSQL_COMPRESS PGSQL SQLITE3
		38
		39
34		40
35	VERBOSE_DEBUG_DESC= Debug in LOGDIR/dspam.debug	41	VERBOSE_DEBUG_DESC= Debug in LOGDIR/dspam.debug
36	BNR_DEBUG_DESC= Debug for BNR	42	BNR_DEBUG_DESC= Debug for Bayesian Noise Reduction
37	PREF_EXT_DESC= Preferences in database not in files	43	PREF_EXT_DESC= Preferences in database not in files
38	DAEMON_DESC= Daemonize dspam; speaks LMTP or DLMTP	44	DAEMON_DESC= Daemonize dspam; speaks LMTP or DLMTP
39	CLAMAV_DESC= ClamAV support	45	CLAMAV_DESC= ClamAV support
40	CLAMAV_LOCAL_DESC= RUN_DEPEND on selected ClamAV	46	CLAMAV_LOCAL_DESC= RUN_DEPEND on selected ClamAV
41	MYSQL_DESC= MySQL 5.X.x as back-end	47	MYSQL_DESC= MySQL 5.X.x as back-end
42	MYSQL_COMPRESS_DESC= Compress dspam <--> MySQL	48	MYSQL_COMPRESS_DESC= Compress dspam <--> MySQL
43	MYSQL_LOCAL_DESC= RUN_DEPEND on MySQL server	49	MYSQL_LOCAL_DESC= RUN_DEPEND on MySQL server
44	PGSQL_DESC= PostgreSQL as back-end	50	PGSQL_DESC= PostgreSQL as back-end
45	PGSQL_LOCAL_DESC= RUN_DEPEND on PostgreSQL server	51	PGSQL_LOCAL_DESC= RUN_DEPEND on PostgreSQL server
46	SQLITE2_DESC= SQLite v2.x as back-end	52	SQLITE2_DESC= SQLite v2.x as back-end
47	SQLITE3_DESC= SQLite v3.x as back-end	53	SQLITE3_DESC= SQLite v3.x as back-end
48	HASH_DESC= Hash driver	54	HASH_DESC= Hash driver
49	EXTERNAL_LOOKUP_DESC= RCPT verification via extlookup	55	EXTERNAL_LOOKUP_DESC= RCPT verification via extlookup
50	USER_HOMEDIR_DESC= Store user data in ~/.dspam	56	USER_HOMEDIR_DESC= Store user data in ~/.dspam
51	TRUSTED_USERS_DESC= Disable trusted user security	57	TRUSTED_USERS_DESC= Disable trusted user security
Lines 53-74 Link Here
53	LONG_USERNAMES_DESC= Usernames longer that OS supports	59	LONG_USERNAMES_DESC= Usernames longer that OS supports
54	LARGE_SCALE_DESC= File structure for large scale	60	LARGE_SCALE_DESC= File structure for large scale
55	DOMAIN_SCALE_DESC= File structure for multiple domains	61	DOMAIN_SCALE_DESC= File structure for multiple domains
56	CYRUS23_DESC= Cyrus's 2.3 deliver as LDA	62	CYRUS23_DESC= Cyrus's 2.3 deliver as LDA
57	CYRUS24_DESC= Cyrus's 2.4 deliver as LDA	63	CYRUS24_DESC= Cyrus's 2.4 deliver as LDA
58	DOVECOT1_DESC= Dovecot 1.2 deliver as LDA	64	DOVECOT1_DESC= Dovecot 1.2 deliver as LDA
59	DOVECOT2_DESC= Dovecot 2.2 dovecot-lda as LDA	65	DOVECOT2_DESC= Dovecot 2.2 dovecot-lda as LDA
60	EXIM_DESC= Exim as local delivery agent	66	EXIM_DESC= Exim as local delivery agent
61	MAILDROP_DESC= Maildrop as local delivery agent	67	MAILDROP_DESC= Maildrop as local delivery agent
62	PROCMAIL_DESC= Procmail as local delivery agent	68	PROCMAIL_DESC= Procmail as local delivery agent
63	SAFECAT_DESC= Safecat as local delivery agent	69	SAFECAT_DESC= Safecat as local delivery agent
64	SENDMAIL_DESC= Sendmail as local delivery agent	70	SENDMAIL_DESC= Sendmail as local delivery agent
65	NICESENDMAIL_DESC= Play nice with sendmail server	71	NICESENDMAIL_DESC= Play nice with sendmail server
66	POSTFIX_MBC_DESC= Dspam as mailbox_command in Postfix	72	POSTFIX_MBC_DESC= Dspam as mailbox_command in Postfix
67	QMAIL_DESC= Play nice with Qmail mail server	73	QMAIL_DESC= Play nice with Qmail mail server
68	WEBUI_DESC= Install WebUI, pulls in Apache or see below	74	WEBUI_DESC= Install WebUI, pulls in Apache or see below
69
70	OPTIONS_DEFAULT= SYSLOG DEBUG DAEMON CLAMAV CLAMAV_LOCAL \
71	HASH MYSQL MYSQL_COMPRESS PGSQL SQLITE3
72		75
73	MAKE_JOBS_UNSAFE= yes	76	MAKE_JOBS_UNSAFE= yes
74	USES= perl5 libtool shebangfix	77	USES= perl5 libtool shebangfix
Lines 78-91 Link Here
78	LDFLAGS+= -L${LOCALBASE}/lib	81	LDFLAGS+= -L${LOCALBASE}/lib
79		82
80	SHEBANG_FILES= src/tools/dspam_logrotate \	83	SHEBANG_FILES= src/tools/dspam_logrotate \
81	src/tools/dspam_notify.pl \	84	src/tools/dspam_notify.in \
82	src/tools/dspam_train.in \	85	src/tools/dspam_train.in \
83	webui/cgi-bin/templates/de/strings.pl \	86	webui/cgi-bin/templates/*/strings.pl \
84	webui/cgi-bin/templates/strings.pl \	87	webui/cgi-bin/templates/strings.pl \
85	webui/cgi-bin/templates/fr/strings.pl \	88	webui/cgi-bin/*.cgi \
86	webui/cgi-bin/templates/es-es/strings.pl \	89	webui/cgi-bin/*.pl
87	webui/cgi-bin/templates/pt-br/strings.pl \
88	webui/cgi-bin/*.cgi
89		90
90	.ifdef(GDBS)	91	.ifdef(GDBS)
91	CFLAGS+= -g -DDEBUG	92	CFLAGS+= -g -DDEBUG
Lines 112-122 Link Here
112	DSPAM_HOME_GROUP?= ${DSPAM_GROUP}	113	DSPAM_HOME_GROUP?= ${DSPAM_GROUP}
113	DSPAM_HOME_MODE?= 0770	114	DSPAM_HOME_MODE?= 0770
114		115
115	.for s in OWNER GROUP HOME_OWNER HOME_GROUP	116	PLIST_SUB+= DSPAM_HOME=${DSPAM_HOME} \
116	PLIST_SUB+= DSPAM_$s=${DSPAM_$s}	117	DSPAM_OWNER=${DSPAM_OWNER} \
117	.endfor	118	DSPAM_GROUP=${DSPAM_GROUP} \
118		119	DSPAM_MODE=${DSPAM_MODE} \
119	.include <bsd.port.pre.mk>	120	DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \
		121	DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \
		122	DSPAM_HOME_MODE=${DSPAM_HOME_MODE}
120		123
121	CONFIGURE_ARGS+= --sysconfdir=${DSPAM_ETC}	124	CONFIGURE_ARGS+= --sysconfdir=${DSPAM_ETC}
122	CONFIGURE_ARGS+= --with-logdir=${LOG_DIR}	125	CONFIGURE_ARGS+= --with-logdir=${LOG_DIR}
Lines 126-144 Link Here
126	CONFIGURE_ARGS+= --with-dspam-home-owner=${DSPAM_HOME_OWNER}	129	CONFIGURE_ARGS+= --with-dspam-home-owner=${DSPAM_HOME_OWNER}
127	CONFIGURE_ARGS+= --with-dspam-home-group=${DSPAM_HOME_GROUP}	130	CONFIGURE_ARGS+= --with-dspam-home-group=${DSPAM_HOME_GROUP}
128	CONFIGURE_ARGS+= --with-dspam-home-mode=${DSPAM_HOME_MODE}	131	CONFIGURE_ARGS+= --with-dspam-home-mode=${DSPAM_HOME_MODE}
129	PLIST_SUB+= DSPAM_HOME=${DSPAM_HOME}	132	PLIST_SUB+= DSPAM_HOME=${DSPAM_HOME} \
		133	DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \
		134	DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \
		135	DSPAM_HOME_MODE=${DSPAM_HOME_MODE}
130		136
131	CONFIGURE_ARGS+= --with-dspam-owner=${DSPAM_OWNER}	137	CONFIGURE_ARGS+= --with-dspam-owner=${DSPAM_OWNER}
132	CONFIGURE_ARGS+= --with-dspam-group=${DSPAM_GROUP}	138	CONFIGURE_ARGS+= --with-dspam-group=${DSPAM_GROUP}
133	# we set DSPAM_MODE at the end as some LDAs want specific mode	139	# we set DSPAM_MODE at the end as some LDAs want specific mode
		140	PLIST_SUB+= DSPAM_OWNER=${DSPAM_OWNER} \
		141	DSPAM_GROUP=${DSPAM_GROUP} \
		142	DSPAM_MODE=${DSPAM_MODE}
134		143
135	_SED_SCRIPT= -e 's,%%DOCSDIR%%,${DOCSDIR},g' \	144	_SED_SCRIPT= -e 's,%%DOCSDIR%%,${DOCSDIR},g' \
136	-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \	145	-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
137	-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g' \	146	-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g' \
138	-e 's,%%PORTNAME%%,${PORTNAME},g' \	147	-e 's,%%PORTNAME%%,${PORTNAME},g' \
139	-e 's,%%_VAR_DIR%%,${_VAR_DIR},g' \	148	-e 's,%%_VAR_DIR%%,${_VAR_DIR},g' \
140	-e '/^%%FreeBSD/D' \	149	-e '/^%%FreeBSD/D'
141	-e '/^%%Tecnik%%/D'	150
		151	.include <bsd.port.options.mk>
142		152
143	.if ${PORT_OPTIONS:MSYSLOG}	153	.if ${PORT_OPTIONS:MSYSLOG}
144	CONFIGURE_ARGS+= --enable-syslog	154	CONFIGURE_ARGS+= --enable-syslog
Lines 267-275 Link Here
267	.if ${PORT_OPTIONS:MEXTERNAL_LOOKUP}	277	.if ${PORT_OPTIONS:MEXTERNAL_LOOKUP}
268	CONFIGURE_ARGS+= --enable-external-lookup	278	CONFIGURE_ARGS+= --enable-external-lookup
269	USE_OPENLDAP= YES	279	USE_OPENLDAP= YES
270	#CPPFLAGS+= -I${LOCALBASE}/include
271	#LDFLAGS+= -lldap -llber
272	#CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
273	.endif	280	.endif
274		281
275	.if ${PORT_OPTIONS:MUSER_HOMEDIR}	282	.if ${PORT_OPTIONS:MUSER_HOMEDIR}
Lines 395-403 Link Here
395	@${ECHO_CMD} ""	402	@${ECHO_CMD} ""
396	@${ECHO_CMD} "Last ${FILESDIR}/UPDATING entry:"	403	@${ECHO_CMD} "Last ${FILESDIR}/UPDATING entry:"
397	@${ECHO_CMD} "###########################################################################"	404	@${ECHO_CMD} "###########################################################################"
398	@${SED} -n < ${FILESDIR}/UPDATING "/^# ${PKGNAME}/,/^#####/p"	405	@${SED} -n < ${FILESDIR}/UPDATING "/^# ${PORTNAME}-${PORTVERSION}/,/^#####/p"
399	@${ECHO_CMD} ""	406	@${ECHO_CMD} ""
400	@sleep 5
401	.endif	407	.endif
402		408
403	pre-extract:	409	pre-extract:
Lines 424-430 Link Here
424	@${ECHO_CMD} "${WWWDIR}"	430	@${ECHO_CMD} "${WWWDIR}"
425	. endif	431	. endif
426	@${ECHO_CMD} ""	432	@${ECHO_CMD} ""
427	@sleep 5
428	.endif	433	.endif
429		434
430	post-patch:	435	post-patch:
Lines 438-444 Link Here
438	${WRKSRC}/src/tools.sqlite_drv/purge-2.sql	443	${WRKSRC}/src/tools.sqlite_drv/purge-2.sql
439	@${REINPLACE_CMD} -e "s\|where julianday('now')-julianday(created_on) > 14;\|where julianday('now')-julianday(created_on) > ${SIGNATURE_LIFE};\|" \	444	@${REINPLACE_CMD} -e "s\|where julianday('now')-julianday(created_on) > 14;\|where julianday('now')-julianday(created_on) > ${SIGNATURE_LIFE};\|" \
440	${WRKSRC}/src/tools.sqlite_drv/purge-3.sql	445	${WRKSRC}/src/tools.sqlite_drv/purge-3.sql
441	@${REINPLACE_CMD} -e "s\|%%PERL%%\|${PERL}\|; s\|%%DSPAM_PATH%%\|${PREFIX}/bin\|" ${WRKSRC}/scripts/train.pl	446	@${REINPLACE_CMD} -e "s^%%PERL%%^${PERL}^" \
		447	${WRKSRC}/src/tools/dspam_train.in \
		448	${WRKSRC}/src/tools/dspam_notify.in
442		449
443	pre-configure:	450	pre-configure:
444	.if ${PORT_OPTIONS:MVIRT_USERS} && !( defined(USE_MYSQL) \|\| \	451	.if ${PORT_OPTIONS:MVIRT_USERS} && !( defined(USE_MYSQL) \|\| \
Lines 478-486 Link Here
478	########	485	########
479	# stupid hack until I figure out where/how to patch	486	# stupid hack until I figure out where/how to patch
480	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig	487	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
481	@${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/dspam.pc \	488	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/dspam.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dspam.pc
482	${STAGEDIR}${PREFIX}/libdata/pkgconfig/dspam.pc	489	${TEST} `ls -1 ${STAGEDIR}${PREFIX}/lib/pkgconfig \| wc -l` -eq 0 && \
483	${RM} -R ${STAGEDIR}${PREFIX}/lib/pkgconfig \|\| true	490	${RM} -R ${STAGEDIR}${PREFIX}/lib/pkgconfig \|\| true
484		491
485	.if ${PORT_OPTIONS:MEXAMPLES}	492	.if ${PORT_OPTIONS:MEXAMPLES}
486	.ifdef(USE_MYSQL)	493	.ifdef(USE_MYSQL)
Lines 540-546 Link Here
540	@cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${STAGEDIR}${DOCSDIR}/UPDATING	547	@cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${STAGEDIR}${DOCSDIR}/UPDATING
541	.endif	548	.endif
542		549
543	@${MKDIR} -m ${DSPAM_HOME_MODE} ${STAGEDIR}${DSPAM_HOME}	550	@${MKDIR} ${STAGEDIR}${DSPAM_HOME}
544	.for _file in firstrun.txt firstspam.txt quarantinefull.txt	551	.for _file in firstrun.txt firstspam.txt quarantinefull.txt
545	@if ! ${TEST} -e ${WRKSRC}/txt/${_file}.sample;\	552	@if ! ${TEST} -e ${WRKSRC}/txt/${_file}.sample;\
546	then\	553	then\
Lines 553-556 Link Here
553		560
554	@${MKDIR} -m ${DSPAM_HOME_MODE} ${STAGEDIR}${LOG_DIR}	561	@${MKDIR} -m ${DSPAM_HOME_MODE} ${STAGEDIR}${LOG_DIR}
555		562
556	.include <bsd.port.post.mk>	563	@${CAT} ${WRKSRC}/README.FreeBSD
		564
		565	.include <bsd.port.mk>

Lines 17-22 Link Here

(-)dspam-merge/files/UPDATING (+29 lines)
17	make extract; more `find . -type f -maxdepth 2 -name UPGRADING`	17	make extract; more `find . -type f -maxdepth 2 -name UPGRADING`
18		18
19	###########################################################################	19	###########################################################################
		20	# dspam-3.10.2
		21	#
		22
		23	Upstream Changes:
		24	- Support for Postgresql 9.1 added
		25	- Support for Postgresql <8.1 dropped (EOL)
		26	- Support for MySQL 5.5 added
		27	- Support for MySQL <5.0 dropped
		28	- Updated license from GPLv2 to AGPLv3
		29	- Bug in RSET handling during LHLO phase
		30	- Location of configuration files in dspam home (/var/dspam) can be changed
		31	through dspam.conf
		32	- Various fixes to the webui templates
		33	- Various small bugs and memleaks
		34	- Missing documentation added to tarball
		35	- Many bugfixes
		36
		37	Port Changes:
		38	- Merge mail/dspam-devel and mail/dspam (PR #193693)
		39	- Port cleanup by various submitters, thanks! [1][2][3][4][5]
		40
		41	[1] Patch from <yds@CoolRat.org> (PR #180695, #191610)
		42	[2] Patch from Radim Kolar <hsn@sendmail.cz> (PR #167289)
		43	[3] Patch from Olli Hauer <ohauer@FreeBSD.org> (PR #148485)
		44	[4] Patch from <mtomasek4@gmail.com> (PR #191610)
		45	[5] Patch from Rene Ladan <rene@FreeBSD.org> (PR #191797)
		46
		47
		48	###########################################################################
20	# dspam-3.9.0	49	# dspam-3.9.0
21	#	50	#
22		51

Lines 1-6 Link Here

(-)dspam-merge/files/dspam.in (-9 / +8 lines)
1	#!/bin/sh	1	#!/bin/sh
2	# $FreeBSD: head/mail/dspam/files/dspam.in 340872 2014-01-24 00:14:07Z mat $	2	# $FreeBSD: head/mail/dspam/files/dspam.in 340872 2014-01-24 00:14:07Z mat $
3	# formerly $ FreeBSD: ports/mail/dspam/files/dspam,v 1.1 2005/05/05 21:03:37 pav Exp $
4	#	3	#
5		4
6	# PROVIDE: dspam	5	# PROVIDE: dspam
Lines 26-43 Link Here
26	#defaults	25	#defaults
27	: ${dspam_enable="NO"}	26	: ${dspam_enable="NO"}
28	: ${dspam_debug="NO"}	27	: ${dspam_debug="NO"}
29	pidfile=${dspam_pidfile:-/var/run/dspam.pid}	28	: ${dspam_pidfile:-/var/run/dspam.pid}
30		29
31	command=%%PREFIX%%/bin/${name}	30	command=%%PREFIX%%/bin/${name}
32	start_precmd=dspam_checkdebug
33	required_files=%%PREFIX%%/etc/${name}.conf
34		31
		32	start_precmd=dspam_checkdebug
35	extra_commands=reload	33	extra_commands=reload
36		34
37	reload()	35	required_dirs=%%DSPAM_HOME%%
38	{	36	required_files=%%PREFIX%%/etc/${name}.conf
39	kill -HUP `cat $pidfile`
40	}
41		37
42	dspam_checkdebug()	38	dspam_checkdebug()
43	{	39	{
Lines 49-54 Link Here
49	fi	45	fi
50	}	46	}
51		47
52	required_dirs=%%DSPAM_HOME%%	48	reload()
		49	{
		50	kill -HUP `cat $pidfile`
		51	}
53		52
54	run_rc_command "$1"	53	run_rc_command "$1"

Lines 1-14 Link Here

(-)dspam-merge/files/patch-src__dspam.conf.in (-16 / +16 lines)
1	--- ./src/dspam.conf.in.orig 2010-01-11 23:21:58.000000000 +0200	1	--- src/dspam.conf.in.orig 2014-09-18 00:33:02.874722063 -0700
2	+++ ./src/dspam.conf.in 2010-01-17 18:49:37.000000000 +0200	2	+++ src/dspam.conf.in 2014-09-18 00:41:49.434685786 -0700
3	@@ -56,6 +56,7 @@	3	@@ -56,6 +56,7 @@
4	# necessary if you plan on allowing untrusted processing.	4	# necessary if you plan on allowing untrusted processing.
5	#	5	#
6	#UntrustedDeliveryAgent "/usr/bin/procmail -d %u"	6	#UntrustedDeliveryAgent "/usr/bin/procmail -d %u"
7	+#QuarantineAgent "@delivery_agent@"	7	+#UntrustedDeliveryAgent "@delivery_agent@"
8		8
9	#	9	#
10	# SMTP or LMTP Delivery: Alternatively, you may wish to use SMTP or LMTP	10	# SMTP or LMTP Delivery: Alternatively, you may wish to use SMTP or LMTP
11	@@ -330,7 +331,7 @@	11	@@ -350,7 +351,7 @@
12	# Storage driver settings: Specific to a particular storage driver. Uncomment	12	# Storage driver settings: Specific to a particular storage driver. Uncomment
13	# the configuration specific to your installation, if applicable.	13	# the configuration specific to your installation, if applicable.
14	#	14	#
Lines 17-23 Link Here
17	#MySQLPort	17	#MySQLPort
18	#MySQLUser dspam	18	#MySQLUser dspam
19	#MySQLPass changeme	19	#MySQLPass changeme
20	@@ -341,7 +342,7 @@	20	@@ -361,7 +362,7 @@
21	# If you are using replication for clustering, you can also specify a separate	21	# If you are using replication for clustering, you can also specify a separate
22	# server to perform all writes to.	22	# server to perform all writes to.
23	#	23	#
Lines 26-46 Link Here
26	#MySQLWritePort	26	#MySQLWritePort
27	#MySQLWriteUser dspam	27	#MySQLWriteUser dspam
28	#MySQLWritePass changeme	28	#MySQLWritePass changeme
29	@@ -778,6 +779,7 @@	29	@@ -406,7 +407,7 @@
30	#ServerHost 127.0.0.1	30	# in /var/run/postgresql/.s.PGSQL.5432 specify just the path where the socket
31	#ServerPort 24	31	# resits (without .s.PGSQL.5432).
32	#ServerQueueSize 32
33	+# keep this is sync with /usr/local/etc/rc.d/dspam[.sh] rc.d script
34	#ServerPID /var/run/dspam.pid
35		32
36	#	33	-#PgSQLServer /var/run/postgresql/
37	@@ -814,14 +816,15 @@	34	+#PgSQLServer /tmp/
		35	#PgSQLPort
		36	#PgSQLUser dspam
		37	#PgSQLPass changeme
		38	@@ -845,14 +846,14 @@
38	# you are running the client and server on the same machine, as it eliminates	39	# you are running the client and server on the same machine, as it eliminates
39	# much of the bandwidth overhead.	40	# much of the bandwidth overhead.
40	#	41	#
41	-#ServerDomainSocketPath "/tmp/dspam.sock"	42	-#ServerDomainSocketPath "/tmp/dspam.sock"
42	+# keep this is sync with /usr/local/etc/rc.d/dspam[.sh] rc.d script	43	+#ServerDomainSocketPath "/var/run/dspam.sock"
43	+#ServerDomainSocketPath "/var/run/dspam.sock"
44		44
45	#	45	#
46	# Client Mode: If you are running DSPAM in client/server mode, uncomment and	46	# Client Mode: If you are running DSPAM in client/server mode, uncomment and

Lines 1-41 Link Here

(-)dspam-merge/pkg-message (-37 / +11 lines)
1	-------------------------------------------------------------------------------
2	Reporting problems, asking questions:
3	- FreeBSD specific port-related problems/questions/patches: maintainer
4	(and ports@ if you feel the need); send-pr only if you get no timely reply
5	- dspam specific questions: dspam/dspam-dev mailing list (maintainer cc'ed)
6	- dspam specific patches: dspam/dspam-dev mailing list (maintainer cc'ed)
7	Please be sure to include in your email/pr relevant information such as:
8	uname -a, dspam --version, %%_VAR_DIR%%/db/ports/%%PORTNAME%%/options, MTA setup.
9		1
10	Asking about updates or telling me there is one: there's no need, I am one of	2	###########################################################################
11	the developers.
12		3
13	%%WebUI%% The CGI files had been installed in	4	%%WebUI%% The CGI files had been installed to:
14	%%WebUI%% %%WWWDIR%%	5	%%WebUI%% %%WWWDIR%%
15	%%WebUI%% Copy	6	%%WebUI%%
16	%%WebUI%% %%WWWDIR%%/default.prefs.sample	7	%%DAEMON%% To enable the dspam deamon set dspam_enable="YES" in:
17	%%WebUI%% to	8	%%DAEMON%% /etc/rc.conf
18	%%WebUI%% %%WWWDIR%%/default.prefs
19	%%WebUI%% and edit it to your needs.
20	%%WebUI%% Copy
21	%%WebUI%% %%WWWDIR%%/configure.pl.sample
22	%%WebUI%% to
23	%%WebUI%% %%WWWDIR%%/configure.pl
24	%%WebUI%% and edit it to your needs.
25	%%WebUI%% If you symlink this file in %%DSPAM_HOME%%/
26	%%WebUI%% an administrator can edit these options in the DSPAM Admin Suite.
27	%%WebUI%% Define administrators by copying
28	%%WebUI%% %%WWWDIR%%/admins.sample
29	%%WebUI%% to
30	%%WebUI%% %%WWWDIR%%/admins
31	%%WebUI%% and edit the file to your needs.
32	%%WebUI%% If you have problems (after upgrading) check permissions.
33	%%DAEMON%%	9	%%DAEMON%%
34	%%DAEMON%% To enable the dspam deamon put dspam_enable="YES" in your	10	Additional setup instructions can be found at:
35	%%DAEMON%% /etc/rc.conf	11	%%DOCSDIR%%
		12	%%EXAMPLESDIR%%
		13
		14	###########################################################################
36		15
37	You'll find additional setup instructions under
38	%%DOCSDIR%%
39	and
40	%%EXAMPLESDIR%%
41	------------------------------------------------------------------------------