From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 3 04:40:15 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E054D16A4CE for ; Mon, 3 May 2004 04:40:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67EAA43D5C for ; Mon, 3 May 2004 04:40:15 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i43BeFHY089201 for ; Mon, 3 May 2004 04:40:15 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i43BeFqa089200; Mon, 3 May 2004 04:40:15 -0700 (PDT) (envelope-from gnats) Resent-Date: Mon, 3 May 2004 04:40:15 -0700 (PDT) Resent-Message-Id: <200405031140.i43BeFqa089200@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rob Evers Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 64AB916A544 for ; Mon, 3 May 2004 04:31:54 -0700 (PDT) Received: from flappie.debank.tv (flappie.debank.tv [212.206.127.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CE3D43D46 for ; Mon, 3 May 2004 04:31:53 -0700 (PDT) (envelope-from rob@debank.tv) Received: from localhost (localhost.debank.tv [127.0.0.1]) by flappie.debank.tv (Postfix) with ESMTP id B3F125405 for ; Mon, 3 May 2004 13:31:51 +0200 (CEST) Received: from flappie.debank.tv ([127.0.0.1]) by localhost (flappie.debank.tv [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 86957-02-2 for ; Mon, 3 May 2004 13:31:49 +0200 (CEST) Received: by flappie.debank.tv (Postfix, from userid 1001) id 6EB685404; Mon, 3 May 2004 13:31:49 +0200 (CEST) Message-Id: <20040503113149.6EB685404@flappie.debank.tv> Date: Mon, 3 May 2004 13:31:49 +0200 (CEST) From: Rob Evers To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/66199: Update mail/dspam to 2.10.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Rob Evers List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2004 11:40:16 -0000 >Number: 66199 >Category: ports >Synopsis: Update mail/dspam to 2.10.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon May 03 04:40:15 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Rob Evers >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD flappie.debank.tv 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sun Feb 29 20:35:15 CET 2004 rob@flappie.debank.tv:/usr/obj/usr/src/sys/FLAPPIE i386 >Description: Update mail/dspam to 2.10.6 -Added lots of OPTIONS -make userdir configurable -fixed pkg-plist -use longer signature life (configurable) -patch for dspam.c (Ion-Mihai Tetcu) Based on patches by Ion-Mihai Tetcu and Andreas Klemm. >How-To-Repeat: >Fix: --- dspam.patch begins here --- diff -ruN dspam.orig/Makefile dspam/Makefile --- dspam.orig/Makefile Mon Apr 26 23:39:17 2004 +++ dspam/Makefile Mon May 3 13:16:57 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)" off \ + ALT_BAYESIAN "Enable alternative-bayesian" on \ + NO_BIAS "Disable bias" off \ + VIRT_USERS "Enable virtual users (needs 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 .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,17 +106,59 @@ 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: @${REINPLACE_CMD} -e 's|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g ; \ s|-ldb-4.1|-ldb41|g' ${WRKSRC}/configure +pre-configure: +.if defined(WITH_MAILDROP) && defined(WITH_PROCMAIL) + @${ECHO_CMD} "You can only use one local delivery agent at once." + @${FALSE} +.endif +.if defined(WITH_VIRT_USERS) && !defined(WITH_MYSQL) + @${ECHO_CMD} "You need MySQL support to use this feature." + @${FALSE} +.endif + post-install: .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 Mon May 3 12:35:34 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 Mon May 3 12:35:34 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%% --- dspam.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: