Attachment #49565 for bug #75665

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





PORTNAME=	dspam
PORTVERSION=	3.2.3${SNAP_DATE}
PORTREVISION=	0
CATEGORIES=	mail
MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/dspam/sources/
DISTFILES=	dspam.3.2.3.cvs.stable${SNAP_DATE}.tar.gz


WRKSRC=		${WRKDIR}/dspam-cvs-stable${SNAP_DATE}

SNAP_DATE=	.20041229.1945

## debug / log / admin options
OPTIONS=	DEBUG "Enable debugging logging" on
OPTIONS+=	VERBOSE_DEBUG "Enable debug in LOGDIR/dspam.debug" off
#OPTIONS+=	USER_LOGGING	"Log mail in DSPAM_HOME/data/user/user.log" off
#OPTIONS+=	SYSTEM_LOGGING	"Log some info DSPAM_HOME/system.log" on
#OPTIONS+=	SAT "Log spam source addresses to syslog" on
#OPTIONS+=	PARSE_TO_HEADERS "Get user from To header on fp spam" off
OPTIONS+=	PREF_EXT "Preferences in database not in files" off

## algorithm options

OPTIONS+=	NEURAL_NET "Enable neural networking" off

## run-time configure  options
#OPTIONS+=	HOMEDIR_DOT "Dot files in ~/USER not DSPAM_HOME" off
OPTIONS+=	USER_HOMEDIR "Store user data in ~/.dspam" off
#OPTIONS+=	OPT_IN "Run only for users with .dspam" off
OPTIONS+=	TRUSTED_USERS "Disable trusted user security" off

## mesage taging options
#OPTIONS+=	SPAM_SUBJ "Prepends SPAM to the Subject header" off
#OPTIONS+=	SIGNATURE_HEADERS "Put signatures IDs ONLY in headers" off
#OPTIONS+=	WEBMAIL "Only with mail stored server-side" off

## back-end
OPTIONS+=	MYSQL40 "Use MySQL 4.0.x as back-end" off
OPTIONS+=	MYSQL41 "Use MySQL 4.1.x as back-end" off

OPTIONS+=	MYSQL_COMPRESS "Compress dspam <--> MySQL" off
OPTIONS+=	POSTGRESQL73 "Use PostgreSQL v.7.3 as back-end" off
OPTIONS+=	POSTGRESQL74 "Use PostgreSQL v.7.4 as back-end" off
#OPTIONS+=	PGSQL_INSTALLED "You have the client installed" on
OPTIONS+=	ORACLE "Use Oracle as back-end (BROKEN)" off
OPTIONS+=	BDB4 "Use BDB4 as back-end (not recomanded)" off
OPTIONS+=	SQLITE2 "Use SQLite v2.x as back-end" on

OPTIONS+=	SENDMAIL "Play nice with sendmail server" off
OPTIONS+=	POSTFIX_MBC "Dspam as mailbox_command in Postfix" off
OPTIONS+=	QMAIL "Play nice with Qmail mail server" off
#OPTIONS+=	BROKEN_ERR_CODES "99=spam, 0=not, other=error (qmailish)" off
#OPTIONS+=	BROKEN_MTA "Enable if MTA pases ^M to dspam" off

OPTIONS+=	CGI "Install CGI (pulls in apache)" off

USE_GNOME=	pkgconfig
#USE_INC_LIBTOOL_VER=13
USE_LIBTOOL_VER=15
USE_REINPLACE=	yes
INSTALLS_SHLIB=	yes


PKGMESSAGE=	${WRKSRC}/README.FreeBSD

UPD_LINE_NO=	11

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

SIGNATURE_LIFE?=	15

_VAR_DIR=	/var
LOG_DIR?=	${_VAR_DIR}/log/dspam
DSPAM_HOME?=	${_VAR_DIR}/db/dspam
DSPAM_HOME_MODE?=	0660

DSPAM_MODE?=	4510
DSPAM_OWNER?=	root
DSPAM_GROUP?=	mail

DSPAM_HOME?=	${_VAR_DIR}/db/dspam
DSPAM_HOME_OWNER?=	${DSPAM_OWNER}
DSPAM_HOME_GROUP?=	${DSPAM_GROUP}
DSPAM_HOME_MODE?=	0770

.include <bsd.port.pre.mk>

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

CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME}
PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME}

.if defined(DSPAM_HOME_OWNER)
CONFIGURE_ARGS+=	--with-dspam-home-owner=${DSPAM_HOME_OWNER}
.endif
.if defined(DSPAM_HOME_GROUP)
CONFIGURE_ARGS+=	--with-dspam-home-group=${DSPAM_HOME_GROUP}
.endif
.if defined(DSPAM_HOME_MODE)
CONFIGURE_ARGS+=	--with-dspam-home-mode=${DSPAM_HOME_MODE}
PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME}

CONFIGURE_ARGS+=	--with-dspam-owner=${DSPAM_OWNER}
CONFIGURE_ARGS+=	--with-dspam-group=${DSPAM_GROUP}
# we set DSPAM_MODE at the end as some LDA whant specific mode
CONFIGURE_ARGS+=	--with-dspam-mode=${DSPAM_MODE}
.endif

SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \

CONFIGURE_ARGS+=	--enable-verbose-debug
.endif

# conf option
#.if defined(WITH_SYSTEM_LOGGING)
#CONFIGURE_ARGS+=	--enable-logging
#.else
#CONFIGURE_ARGS+=	--disable-system-logging
#.endif

# conf option
#.if defined(WITH_USER_LOGGING)
#CONFIGURE_ARGS+=	--enable-user-logging
#.else
#CONFIGURE_ARGS+=	--disable-user-logging
#.endif

# conf
#.if defined(WITH_SAT)
#CONFIGURE_ARGS+=	--enable-source-address-tracking
#.endif

# conf
#.if defined(PARSE_TO_HEADERS)
#CONFIGURE_ARGS+=	--enable-parse-to-headers
#.endif

.if defined(WITH_PREF_EXT)
CONFIGURE_ARGS+=	--enable-preferences-extension
.endif

CONFIGURE_ARGS+=	--enable-neural-networking
.endif

#.if defined(WITH_HOMEDIR_DOT)
#CONFIGURE_ARGS+=	  --enable-homedir-dotfiles
#.endif

.if defined(WITH_USER_HOMEDIR)
CONFIGURE_ARGS+=	--enable-homedir
## XXXXXXXX
# to check incompatibility with CGI and warn user
# to install setuid root
.endif

# conf
#.if defined(WITH_OPT_IN)
#CONFIGURE_ARGS+=	  --enable-opt-in
#.endif

.if defined(WITH_TRUSTED_USERS)
CONFIGURE_ARGS+=	--disable-trusted-user-security
.endif

# conf
#.if defined(WITH_SPAM_SUBJ)
#CONFIGURE_ARGS+=	--enable-spam-subject
#.endif

# .conf option
#.if defined(WITH_SIGNATURE_HEADERS)
#CONFIGURE_ARGS+=	--enable-signature-headers
#SED_SCRIPT+=	-e 's,%%SIGHDR%%,,g'
#.else
#SED_SCRIPT+=	-e '/%%SIGHDR%%/D'
#.endif

# not supported anymore
#.if defined(SIGNATURE_ATACH)
#CONFIGURE_ARGS+=	--enable-signature-attachments
#.endif

#.if defined(WITH_WEBMAIL)
#CONFIGURE_ARGS+=	--enable-webmail
#.endif

DBDRV_TOTAL_COUNT=	oooooooo # 8
DBDRV_COUNT=	${DBDRV_TOTAL_COUNT}

.ifdef(WITH_MYSQL40)
WANT_MYSQL_VER=	40
#PKGNAMESUFFIX=	-mysql40
.elifdef(WITH_MYSQL41)
WANT_MYSQL_VER=	41
#PKGNAMESUFFIX=	-mysql41
.elifdef(WITH_MYSQL50)
WANT_MYSQL_VER=	50
#PKGNAMESUFFIX=	-mysql50
.endif

.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) || defined(WITH_MYSQL50)
USE_MYSQL=	yes
CONFIGURE_ARGS+=	--with-storage-driver=mysql_drv \
		--with-mysql-includes=${LOCALBASE}/include/mysql \
		--with-mysql-libraries=${LOCALBASE}/lib/mysql

.endif

# add one 'o' here for each new LDA
LDA_TOTAL_COUNT=	ooooooo	# 7
LDA_COUNT=	${LDA_TOTAL_COUNT}

.if defined(WITH_CYRUS21_LDA)
RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:${PORTSDIR}/mail/cyrus-imapd2
#CONFIGURE_ARGS+=\
#--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver -e -r $${sender} -m $${extension} $${user} $$u'
CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
LDA_COUNT:=	${LDA_COUNT:S/o//}
.endif

.if defined(WITH_CYRUS22_LDA)
RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:${PORTSDIR}/mail/cyrus-imapd22
#CONFIGURE_ARGS+=\
#--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver -e -r $${sender} -m $${extension} $${user} $$u'
CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
LDA_COUNT:=	${LDA_COUNT:S/o//}
.endif

.if defined(WITH_MAILDROP_LDA)
RUN_DEPENDS+=	maildrop:${PORTSDIR}/mail/maildrop
CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/maildrop -d $$u'
CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/maildrop'
LDA_COUNT:=	${LDA_COUNT:S/o//}
.endif

.if defined(WITH_PROCMAIL_LDA)
RUN_DEPENDS+=	procmail:${PORTSDIR}/mail/procmail
CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/procmail -d $$u'
CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/procmail'
LDA_COUNT:=	${LDA_COUNT:S/o//}
.endif


.else
.	if defined(WITH_SENDMAIL_LDA) && exists(${LOCALBASE}/sbin/sendmail)
CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/sbin/sendmail'
CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/sbin/sendmail'
LDA_COUNT:=	${LDA_COUNT:S/o//}
.	endif
.endif

.if defined(WITH_SENDMAIL)
DSPAM_MODE=	4511
.endif

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

.if defined(WITH_QMAIL)
DSPAM_MODE=	4511
.endif

.if defined(DSPAM_MODE)
CONFIGURE_ARGS+=	--with-dspam-mode=${DSPAM_MODE}
#CONFIGURE_ARGS+=	--enable-broken-return-codes
#.endif

# conf
#.if defined(WITH_BROKEN_MTA)
#CONFIGURE_ARGS+=	--enable-broken-mta
#.endif

# conf option
.if defined(QUARANTINE_AGENT)
CONFIGURE_ARGS+=	--with-quarantine-agent=${QUARANTINE_AGENT}
.endif

.if defined(WITH_CGI)

	@${ECHO_CMD} "Last ${FILESDIR}/UPDATING entry:"
	@${GREP} -B 1 -A ${UPD_LINE_NO} ${PKGNAME} ${FILESDIR}/UPDATING
	@${ECHO_CMD} ""
	@${ECHO_CMD} "#############################################################################"
	@${ECHO_CMD} ""

pre-extract:
	@${ECHO_CMD} ""
.if defined(WITH_EXIM_LDA) && defined(WITH_POSTGRESQL73)
	@${ECHO_CMD} "******************************************************************"
	@${ECHO_CMD} "You have both EXIM_LDA and POSTGRESQL73 defined. To have exim"


	@${ECHO_CMD} "Define vars below before make-ing if you need:"
	@${ECHO_CMD} ""
	@${ECHO_CMD} "SIGNATURE_LIFE=${SIGNATURE_LIFE} (default 15)"
	@${ECHO_CMD} "DSPAM_OWNER=${DSPAM_OWNER} (default: root)"
	@${ECHO_CMD} "DSPAM_GROUP=${DSPAM_GROUP} (default: mail)"
	@${ECHO_CMD} "DSPAM_MODE=${DSPAM_MODE}"
	@${ECHO_CMD} "DSPAM_HOME=${DSPAM_HOME} (default: ${_VAR_DIR}/db/dspam)"
	@${ECHO_CMD} "DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER}"
	@${ECHO_CMD} "DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP}"
	@${ECHO_CMD} "DSPAM_HOME_MODE=${DSPAM_HOME_MODE} (default: 0770)"
	@${ECHO_CMD} "LOG_DIR=${LOG_DIR} (default: ${_VAR_DIR}/log/dspam)"
	@${ECHO_CMD} "QUARANTINE_AGENT (default: mail.local)"
.	if defined(WITH_CGI)
		@${ECHO_CMD} "Define CGI_PATH before make-ing if you need the CGI files"
		@${ECHO_CMD} "installed in other place that this installation's default"

.for old_opt in MAILDROP PROCMAIL TRAD_BAYES ALT_BAYES WITH_SPAM_SUBJ \
	USER_LOGGING SYSTEM_LOGGING WEBMAIL OPT_IN SAT PARSE_TO_HEADERS \
	BROKEN_MTA BROKEN_ERR_CODES SIGNATURE_HEADERS SIGNATURE_ATACH \
	HOMEDIR_DOT SIGNATURE_LIFE SQLITE QUARANTINE_AGENT
.	if defined(WITH_${old_opt}) || defined(WITHOUT_${old_opt})
	@${ECHO_CMD} ""
	@${ECHO_CMD} "******************************************************************"

.endfor

post-patch:
	@${REINPLACE_CMD} -e 's|%%PORTNAME%%|${PORTNAME}|; \
		s|%%PKGNAME%%|${PKGNAME}|; s|%%MAINTAINER%%|${MAINTAINER}|; \
		s|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g; \
		s|-ldb-4.1|-ldb41|g;' ${WRKSRC}/configure

		${WRKSRC}/Makefile.in
	@${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
	@${REINPLACE_CMD} -e 's|WHERE CURRENT_DATE - created_on > 14;|WHERE CURRENT_DATE - created_on > ${SIGNATURE_LIFE};|' ${WRKSRC}/tools.pgsql_drv/purge.sql
	@${REINPLACE_CMD} -e 's|where SYSDATE-created_on > 14|where SYSDATE-created_on > ${SIGNATURE_LIFE};|' ${WRKSRC}/tools.ora_drv/purge.sql

	@${ECHO_CMD} "You need MySQL or POSTGRESQL to use neural networking."
	@${FALSE}
.endif
.if defined(WITH_VIRT_USERS) && !(defined(USE_MYSQL) || \
	defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) || defined(WITH_ORACLE))
	@${ECHO_CMD} "You need MySQL, POSTGRESQL or ORACLE for virtual users."
	@${FALSE}
.endif
.if defined(WITH_PREF_EXT) && !( defined(USE_MYSQL) || \
	defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) )
	@${ECHO_CMD} "You need MySQL or Postgres for preferences extension"
	@${FALSE}

	@${FALSE}
.endif

#pre-install:
### to patch dspam.conf
#	${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|g' ${WRKSRC}/dspam.conf.in

post-install:
	${CP} ${WRKSRC}/dspam.conf ${WRKSRC}/dspam.conf.sample
	cd ${WRKSRC}/ && \

#	@${MKDIR} ${LOG_DIR}
#	@${MKDIR} ${DSPAM_HOME}

.if defined(USE_MYSQL)
	@${MKDIR} ${EXAMPLESDIR}/mysql
	cd ${WRKSRC}/tools.mysql_drv && \
		${INSTALL_DATA} README mysql_objects-space.sql \

	@${MKDIR} ${EXAMPLESDIR}/pgsql
	@cd ${WRKSRC}/tools.pgsql_drv && \
		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/pgsql
#	${INSTALL_DATA} ${FILESDIR}/pgsql.data ${EXAMPLESDIR}/pgsql
.endif
.if defined(WITH_SQLITE2)
	@${MKDIR} ${EXAMPLESDIR}/sqlite

		${INSTALL_DATA} default.prefs ${CGI_PATH}/default.prefs.sample
	cd ${WRKSRC}/cgi && \
		${INSTALL_DATA} admins ${CGI_PATH}/admins.sample
#	cd ${WRKSRC}/cgi && \
#		${INSTALL_DATA} configure.pl.sample ${CGI_PATH}/configure.pl.sample
	@${MKDIR} ${CGI_PATH}/templates && cd ${WRKSRC}/cgi/templates && \
		${INSTALL_DATA} *.html ${CGI_PATH}/templates/
.endif

Lines 1-2 Link Here

(-)dspam/distinfo (-2 / +2 lines)
1	MD5 (dspam.3.2.3.cvs.stable.20041218.2100.tar.gz) = 272859a935c7c6582f54c4d6d749ce1b	1	MD5 (dspam.3.2.3.cvs.stable.20041229.1945.tar.gz) = 24ad7d7a70f70ff07be5d1fb8818b758
2	SIZE (dspam.3.2.3.cvs.stable.20041218.2100.tar.gz) = 620733	2	SIZE (dspam.3.2.3.cvs.stable.20041229.1945.tar.gz) = 620800




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

#############################################################################
# dspam-3.2.3.20041229.1945
#

- drop QUARANTINE_AGENT as is not supported by ./configure anymore and
set in dspam.conf UntrustedDeliveryAgent and QuarantineAgent to default to
TrustedDeliveryAgent, but leave them commented out
(ports/75548 by Julien Gabel)
- change default DSPAM_HOME_MODE to 0770
(ports/75549 by Julien Gabel <jpeg@thilelli.net>)
- DSPAM_HOME_{OWNER,GROUP} default to DSPAM_{OWNER,GROUP}
- fix make describe by USE_MYSQL


#############################################################################
# dspam-3.2.3.20041218.2100_1
#





--- dspam.conf.in.orig	Thu Dec 30 19:18:14 2004
+++ dspam.conf.in	Thu Dec 30 19:20:02 2004
@@ -34,7 +34,7 @@
 # the user DSPAM is processing mail for. This configuration parameter is only 
 # necessary if you plan on allowing untrusted processing.
 #
-#UntrustedDeliveryAgent "/usr/bin/procmail -d %u"
+#UntrustedDeliveryAgent "@delivery_agent@"
 
 #
 # Quarantine Agent: DSPAM's default behavior is to quarantine all mail it 
@@ -42,7 +42,7 @@
 # a quarantine agent which will be called with all messages DSPAM thinks is
 # spam. Use %u to specify the user DSPAM is processing mail for.
 #
-#QuarantineAgent	"/usr/bin/procmail -d spam"
+#QuarantineAgent	"@delivery_agent@"
 
 #
 # OnFail: What to do if local delivery or quarantine should fail. If set
@@ -169,7 +169,7 @@
 # Storage driver settings: Specific to a particular storage driver. Uncomment
 # the configuration specific to your installation, if applicable.
 #
-#MySQLServer    /var/lib/mysql/mysql.sock
+#MySQLServer    /tmp/mysql.sock
 #MySQLPort
 #MySQLUser      dspam
 #MySQLPass      changeme

Return to bug 75665

Lines 11-16 Link Here

(-)dspam/files/UPDATING (+14 lines)
11	make extract; more `find . -type f -maxdepth 2 -name UPGRADING`	11	make extract; more `find . -type f -maxdepth 2 -name UPGRADING`
12		12
13	#############################################################################	13	#############################################################################
		14	# dspam-3.2.3.20041229.1945
		15	#
		16
		17	- drop QUARANTINE_AGENT as is not supported by ./configure anymore and
		18	set in dspam.conf UntrustedDeliveryAgent and QuarantineAgent to default to
		19	TrustedDeliveryAgent, but leave them commented out
		20	(ports/75548 by Julien Gabel)
		21	- change default DSPAM_HOME_MODE to 0770
		22	(ports/75549 by Julien Gabel <jpeg@thilelli.net>)
		23	- DSPAM_HOME_{OWNER,GROUP} default to DSPAM_{OWNER,GROUP}
		24	- fix make describe by USE_MYSQL
		25
		26
		27	#############################################################################
14	# dspam-3.2.3.20041218.2100_1	28	# dspam-3.2.3.20041218.2100_1
15	#	29	#
16		30

Line 0 Link Here

(-)dspam/files/patch-dspam.conf.in (+29 lines)
	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