Date: Tue, 27 Apr 2004 00:57:31 +0200 From: Rob Evers <rob@debank.tv> To: ports@FreeBSD.org Cc: Andreas Klemm <andreas@klemm.apsfilter.org> Subject: Re: [dspam-users] thanks for dspam, my experiences on FreeBSD, suggestions Message-ID: <408D93DB.5060404@debank.tv> In-Reply-To: <20040426104719.3182a631@it.buh.cameradicommercio.ro> References: <20040425115758.GA40483@titan.klemm.apsfilter.org> <20040426004411.756cc842@it.buh.cameradicommercio.ro> <20040426062108.GA2118@titan.klemm.apsfilter.org> <20040426104719.3182a631@it.buh.cameradicommercio.ro>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------050506000004060602030301 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hi all, Ion-Mihai Tetcu wrote: >[ as we're discussing more FreeBSD specific details, I've cc'ed >ports@FreeBSD.org if you feel this goes off-topic for dspam-users let's >follow up there ] > > > Good idea. I've prepared a merged patch that I'll submit shortly, if you have any comments or ideas please let me know. Thanks for your input and patches. Rob Evers. I'm sorry, forgot the pkg-plist, this is an updated version. Rob --------------050506000004060602030301 Content-Type: text/plain; name="dspam.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="dspam.patch" diff -ruN dspam.orig/Makefile dspam/Makefile --- dspam.orig/Makefile Mon Apr 26 23:39:17 2004 +++ dspam/Makefile Tue Apr 27 00:39:20 2004 @@ -6,7 +6,7 @@ # PORTNAME= dspam -PORTVERSION= 2.10.3 +PORTVERSION= 2.10.6 CATEGORIES= mail MASTER_SITES= http://www.nuclearelephant.com/projects/dspam/sources/ @@ -14,25 +14,36 @@ COMMENT= A server-side bayesian spam filter OPTIONS= MYSQL "Use MySQL and not db4 as database" off \ + MYSQL_COMPRESS "Compress dspam <--> MySQL" off \ MAILDROP "Use Maildrop as local delivery agent" off \ PROCMAIL "Use Procmail as local delivery agent" off \ + SENDMAIL "Play nice with sendmail server" off \ QMAIL "Play nice with Qmail mail server" off \ ENABLE_SPAM_DELIVERY "Deliver messages marked as spam" off \ SIGNATURE_HEADERS "Put signatures in the header" off \ - WHITELIST "Automatic whitelisting of ham" off + WHITELIST "Automatic whitelisting of ham" off \ + OPT_IN "Enable opt in" off \ + TRUSTED_USERS "Disable trusted user security" off \ + TUM "Enables TuM (Train until Mature)" on \ + ALT_BAYESIAN "Enable alternative-bayesian" on \ + NO_BIAS "Disable bias" off \ + VIRT_USERS "Enable virtual users (need MYSQL)" off \ + SAT "Enable spam source address logging" off \ + VERBOSE_DEBUG "Enable verbose debug" off USE_LIBTOOL_VER=13 USE_REINPLACE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-userdir=${PREFIX}/etc/dspam CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} SED_SCRIPT= -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \ -e 's,%%LOCALBASE%%,${LOCALBASE},g' +WITH_SIGNATURE_LIFE?= 28 + .include <bsd.port.pre.mk> .if defined(WITH_MYSQL) @@ -51,6 +62,16 @@ SED_SCRIPT+= -e '/%%MYSQL%%/D' .endif +.if defined(WITH_MYSQL_COMPRESS) +CONFIGURE_ARGS+= --enable-client-compression +.endif + +.if defined(DSPAM_USERDIR) +CONFIGURE_ARGS+=--with-userdir=${DSPAM_USERDIR} +.else +CONFIGURE_ARGS+=--with-userdir=${PREFIX}/etc/dspam +.endif + .if defined(WITH_MAILDROP) RUN_DEPENDS= maildrop:${PORTSDIR}/mail/maildrop CONFIGURE_ARGS+= --with-local-delivery-agent='${LOCALBASE}/bin/maildrop $u' @@ -61,6 +82,10 @@ CONFIGURE_ARGS+= --with-local-delivery-agent='${LOCALBASE}/bin/procmail $u' .endif +.if defined(WITH_SENDMAIL) +CONFIGURE_ARGS+= --with-dspam-mode=4511 +.endif + .if defined(WITH_QMAIL) CONFIGURE_ARGS+= --with-dspam-mode=4511 .endif @@ -81,6 +106,38 @@ CONFIGURE_ARGS+= --enable-whitelist .endif +.if defined(WITH_OPT_IN) +CONFIGURE_ARGS+= --enable-opt-in +.endif + +.if defined(WITH_TRUSTED_USERS) +CONFIGURE_ARGS+= --disable-trusted-user-security +.endif + +.if defined(WITH_TUM) +CONFIGURE_ARGS+= --enable-tum +.endif + +.if defined(WITH_ALT_BAYESIAN) +CONFIGURE_ARGS+= --enable-alternative-bayesian +.endif + +.if defined(WITH_NO_BIAS) +CONFIGURE_ARGS+= --disable-bias +.endif + +.if defined(WITH_VIRT_USERS) +CONFIGURE_ARGS+= --enable-virtual-users +.endif + +.if defined(WITH_SAT) +CONFIGURE_ARGS+= --enable-source-address-tracking +.endif + +.if defined(WITH_VERBOSE_DEBUG) +CONFIGURE_ARGS+= --enable-verbose-debug +.endif + DOCS= CHANGE README post-patch: @@ -91,7 +148,7 @@ .if defined(WITH_MYSQL) @${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC}/tools.mysql_drv && \ - ${INSTALL_DATA} README *.sql ${EXAMPLESDIR} + ${INSTALL_DATA} README *.sql.* ${EXAMPLESDIR} ${INSTALL_DATA} ${FILESDIR}/mysql.data ${EXAMPLESDIR} .endif .if !defined(NOPORTDOCS) diff -ruN dspam.orig/distinfo dspam/distinfo --- dspam.orig/distinfo Mon Apr 26 23:39:17 2004 +++ dspam/distinfo Tue Apr 27 00:14:00 2004 @@ -1,2 +1,2 @@ -MD5 (dspam-2.10.3.tar.gz) = 9ae2d1b21bc54807454c76f0e444717d -SIZE (dspam-2.10.3.tar.gz) = 485053 +MD5 (dspam-2.10.6.tar.gz) = ddb40d26cc923d7569d48b3072e61715 +SIZE (dspam-2.10.6.tar.gz) = 485466 diff -ruN dspam.orig/files/patch-dspam.c dspam/files/patch-dspam.c --- dspam.orig/files/patch-dspam.c Thu Jan 1 01:00:00 1970 +++ dspam/files/patch-dspam.c Mon Apr 26 23:59:49 2004 @@ -0,0 +1,17 @@ +--- dspam.c.orig Fri Apr 2 18:34:35 2004 ++++ dspam.c Mon Apr 26 23:59:03 2004 +@@ -2422,12 +2422,12 @@ + i++; + } + } +- arg = strsep (&margs, " "); +- ++ + if (arg != NULL) { + strlcat (args, a, sizeof(args)); + strlcat (args, " ", sizeof (args)); + } ++ arg = strsep (&margs, " "); + } + free (mmargs); + diff -ruN dspam.orig/pkg-plist dspam/pkg-plist --- dspam.orig/pkg-plist Mon Apr 26 23:39:17 2004 +++ dspam/pkg-plist Tue Apr 27 00:54:57 2004 @@ -20,7 +20,8 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%% %%MYSQL%%%%EXAMPLESDIR%%/README %%MYSQL%%%%EXAMPLESDIR%%/mysql.data -%%MYSQL%%%%EXAMPLESDIR%%/mysql_objects.sql +%%MYSQL%%%%EXAMPLESDIR%%/mysql_objects.sql.space.optimized +%%MYSQL%%%%EXAMPLESDIR%%/mysql_objects.sql.speed.optimized %%MYSQL%%%%EXAMPLESDIR%%/purge.sql %%MYSQL%%%%EXAMPLESDIR%%/virtual_users.sql %%MYSQL%%@dirrm %%EXAMPLESDIR%% --------------050506000004060602030301--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?408D93DB.5060404>