ports/75665: mail/dspam: fix make describe, update, fix DSPAM_HOME perdefault permissions
Ion-Mihai IOnut Tetcu
itetcu at people.tecnik93.com
Thu Dec 30 17:50:31 UTC 2004
>Number: 75665
>Category: ports
>Synopsis: mail/dspam: fix make describe, update, fix DSPAM_HOME perdefault permissions
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 30 17:50:29 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Ion-Mihai "IOnut" Tetcu
>Release: FreeBSD 5.3-STABLE i386
>Organization:
Tecnik'93
>Environment:
System: FreeBSD 5.3-STABLE #13: Mon Dec 20 15:25:02 EET 2004
>Description:
FreeBSD 4.x user please report problems ASAP so I can fix them before release.
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 at thilelli.net>)
- DSPAM_HOME_{OWNER,GROUP} default to DSPAM_{OWNER,GROUP}
- fix make describe by USE_MYSQL
- beautify
- Makefile clean-up
>How-To-Repeat:
>Fix:
--- dspam-3.2.3.20041218.2100_1_to_dspam-3.2.3.20041229.1945.diff begins here ---
diff -urN dspam.cvs/Makefile dspam/Makefile
--- dspam.cvs/Makefile Mon Dec 27 18:44:23 2004
+++ dspam/Makefile Thu Dec 30 18:47:38 2004
@@ -7,7 +7,7 @@
PORTNAME= dspam
PORTVERSION= 3.2.3${SNAP_DATE}
-PORTREVISION= 1
+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
@@ -17,15 +17,11 @@
WRKSRC= ${WRKDIR}/dspam-cvs-stable${SNAP_DATE}
-SNAP_DATE= .20041218.2100
+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
@@ -40,16 +36,9 @@
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
@@ -57,7 +46,6 @@
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
@@ -78,13 +66,10 @@
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 lthack
-#USE_INC_LIBTOOL_VER=13
+USE_GNOME= pkgconfig
USE_LIBTOOL_VER=15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
@@ -94,19 +79,24 @@
PKGMESSAGE= ${WRKSRC}/README.FreeBSD
-UPD_LINE_NO= 3
+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}
@@ -115,21 +105,14 @@
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}
-.endif
+PLIST_SUB+= DSPAM_HOME=${DSPAM_HOME}
CONFIGURE_ARGS+= --with-dspam-owner=${DSPAM_OWNER}
CONFIGURE_ARGS+= --with-dspam-group=${DSPAM_GROUP}
-.if defined(DSPAM_MODE)
-CONFIGURE_ARGS+= --with-dspam-mode=${DSPAM_MODE}
-.endif
+# we set DSPAM_MODE at the end as some LDA whant specific mode
SED_SCRIPT= -e 's,%%DOCSDIR%%,${DOCSDIR},g' \
-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
@@ -146,30 +129,6 @@
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
@@ -210,64 +169,30 @@
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}
-.if defined(WITH_MYSQL40)
+.ifdef(WITH_MYSQL40)
WANT_MYSQL_VER= 40
#PKGNAMESUFFIX= -mysql40
-.elseif defined(WITH_MYSQL41)
+.elifdef(WITH_MYSQL41)
WANT_MYSQL_VER= 41
#PKGNAMESUFFIX= -mysql41
-.elseif defined(WITH_MYSQL50)
+.elifdef(WITH_MYSQL50)
WANT_MYSQL_VER= 50
#PKGNAMESUFFIX= -mysql50
.endif
.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) || defined(WITH_MYSQL50)
-HAVE_MYSQL= yes
+USE_MYSQL= yes
CONFIGURE_ARGS+= --with-storage-driver=mysql_drv \
--with-mysql-includes=${LOCALBASE}/include/mysql \
--with-mysql-libraries=${LOCALBASE}/lib/mysql
@@ -374,21 +299,17 @@
.endif
# add one 'o' here for each new LDA
-LDA_TOTAL_COUNT= ooooooo #7
+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
@@ -410,14 +331,12 @@
.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
@@ -427,39 +346,27 @@
.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)
-CONFIGURE_ARGS+= --with-dspam-mode=4511
+DSPAM_MODE= 4511
.endif
.if defined(WITH_POSTFIX_MBC)
-CONFIGURE_ARGS+= --with-dspam-mode=4511
+DSPAM_MODE= 4511
SED_SCRIPT+= -e 's,%%POSTFIX_MBC%%,,g'
.else
SED_SCRIPT+= -e '/%%POSTFIX_MBC%%/D'
.endif
.if defined(WITH_QMAIL)
-CONFIGURE_ARGS+= --with-dspam-mode=4511
+DSPAM_MODE= 4511
.endif
-# conf
-#.if defined(WITH_BROKEN_ERR_CODES)
-#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}
+.if defined(DSPAM_MODE)
+CONFIGURE_ARGS+= --with-dspam-mode=${DSPAM_MODE}
.endif
.if defined(WITH_CGI)
@@ -504,11 +411,9 @@
@${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"
@@ -522,16 +427,15 @@
@${ECHO_CMD} "Define vars below before make-ing if you need:"
@${ECHO_CMD} ""
- @${ECHO_CMD} "SIGNATURE_LIFE (default 15)"
- @${ECHO_CMD} "DSPAM_OWNER (default: root)"
- @${ECHO_CMD} "DSPAM_GROUP (default: mail)"
- @${ECHO_CMD} "DSPAM_MODE"
- @${ECHO_CMD} "DSPAM_HOME (default: ${_VAR_DIR}/dspam)"
- @${ECHO_CMD} "DSPAM_HOME_OWNER"
- @${ECHO_CMD} "DSPAM_HOME_GROUP"
- @${ECHO_CMD} "DSPAM_HOME_MODE (default: 0660)"
- @${ECHO_CMD} "LOG_DIR (default: ${_VAR_DIR}/log/dspam)"
- @${ECHO_CMD} "QUARANTINE_AGENT (default: mail.local)"
+ @${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)"
. 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"
@@ -543,7 +447,7 @@
.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
+ HOMEDIR_DOT SIGNATURE_LIFE SQLITE QUARANTINE_AGENT
. if defined(WITH_${old_opt}) || defined(WITHOUT_${old_opt})
@${ECHO_CMD} ""
@${ECHO_CMD} "******************************************************************"
@@ -567,12 +471,11 @@
.endfor
post-patch:
- ${REINPLACE_CMD} -e 's|%%PORTNAME%%|${PORTNAME}|; \
+ @${REINPLACE_CMD} -e 's|%%PORTNAME%%|${PORTNAME}|; \
s|%%PKGNAME%%|${PKGNAME}|; s|%%MAINTAINER%%|${MAINTAINER}|; \
s|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g; \
s|-ldb-4.1|-ldb41|g;' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
- ${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
@@ -594,12 +497,12 @@
@${ECHO_CMD} "You need MySQL or POSTGRESQL to use neural networking."
@${FALSE}
.endif
-.if defined(WITH_VIRT_USERS) && !(defined(HAVE_MYSQL) || \
+.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(HAVE_MYSQL) || \
+.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}
@@ -609,10 +512,6 @@
@${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}/ && \
@@ -621,7 +520,7 @@
# @${MKDIR} ${LOG_DIR}
# @${MKDIR} ${DSPAM_HOME}
-.if defined(HAVE_MYSQL)
+.if defined(USE_MYSQL)
@${MKDIR} ${EXAMPLESDIR}/mysql
cd ${WRKSRC}/tools.mysql_drv && \
${INSTALL_DATA} README mysql_objects-space.sql \
@@ -635,7 +534,6 @@
@${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
@@ -662,8 +560,6 @@
${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
diff -urN dspam.cvs/distinfo dspam/distinfo
--- dspam.cvs/distinfo Sun Dec 26 14:45:11 2004
+++ dspam/distinfo Thu Dec 30 19:00:21 2004
@@ -1,2 +1,2 @@
-MD5 (dspam.3.2.3.cvs.stable.20041218.2100.tar.gz) = 272859a935c7c6582f54c4d6d749ce1b
-SIZE (dspam.3.2.3.cvs.stable.20041218.2100.tar.gz) = 620733
+MD5 (dspam.3.2.3.cvs.stable.20041229.1945.tar.gz) = 24ad7d7a70f70ff07be5d1fb8818b758
+SIZE (dspam.3.2.3.cvs.stable.20041229.1945.tar.gz) = 620800
diff -urN dspam.cvs/files/UPDATING dspam/files/UPDATING
--- dspam.cvs/files/UPDATING Mon Dec 27 18:44:23 2004
+++ dspam/files/UPDATING Thu Dec 30 18:46:14 2004
@@ -11,6 +11,20 @@
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 at thilelli.net>)
+- DSPAM_HOME_{OWNER,GROUP} default to DSPAM_{OWNER,GROUP}
+- fix make describe by USE_MYSQL
+
+
+#############################################################################
# dspam-3.2.3.20041218.2100_1
#
diff -urN dspam.cvs/files/patch-dspam.conf.in dspam/files/patch-dspam.conf.in
--- dspam.cvs/files/patch-dspam.conf.in Thu Jan 1 02:00:00 1970
+++ dspam/files/patch-dspam.conf.in Thu Dec 30 19:20:41 2004
@@ -0,0 +1,29 @@
+--- 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
--- dspam-3.2.3.20041218.2100_1_to_dspam-3.2.3.20041229.1945.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list