From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 8 11:00:29 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 6467916A4D0 for ; Thu, 8 Jan 2004 11:00:29 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 706FC43D5D for ; Thu, 8 Jan 2004 11:00:25 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i08J0PFR068203 for ; Thu, 8 Jan 2004 11:00:25 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i08J0P7q068202; Thu, 8 Jan 2004 11:00:25 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 8 Jan 2004 11:00:25 -0800 (PST) Resent-Message-Id: <200401081900.i08J0P7q068202@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 2790016A4CE for ; Thu, 8 Jan 2004 10:58:16 -0800 (PST) Received: from haha.debank.tv (c92069.upc-c.chello.nl [212.187.92.69]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBE5843D39 for ; Thu, 8 Jan 2004 10:58:08 -0800 (PST) (envelope-from rob@debank.tv) Received: from haha.debank.tv (localhost [127.0.0.1]) by haha.debank.tv (8.12.9p2/8.12.9) with ESMTP id i08Iw6aq012857 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Jan 2004 19:58:06 +0100 (CET) (envelope-from rob@debank.tv) Received: (from rob@localhost) by haha.debank.tv (8.12.9p2/8.12.9/Submit) id i08Iw6iL012856; Thu, 8 Jan 2004 19:58:06 +0100 (CET) (envelope-from rob) Message-Id: <200401081858.i08Iw6iL012856@haha.debank.tv> Date: Thu, 8 Jan 2004 19:58:06 +0100 (CET) From: Rob Evers To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: mark@reidel.info Subject: ports/61089: [Maintainer Update] mail/dspam 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: Thu, 08 Jan 2004 19:00:29 -0000 >Number: 61089 >Category: ports >Synopsis: [Maintainer Update] mail/dspam >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: Thu Jan 08 11:00:24 PST 2004 >Closed-Date: >Last-Modified: >Originator: Rob Evers >Release: FreeBSD 4.9-RELEASE i386 >Organization: >Environment: System: FreeBSD haha.debank.tv 4.9-RELEASE FreeBSD 4.9-RELEASE #1: Thu Nov 13 01:17:26 CET 2003 rob@haha.debank.tv:/usr/obj/usr/src/sys/HAHA i386 >Description: Update mail/dspam Add ENABLE_SPAM_DELIVERY knob Make dspam play with qmail Install MySQL documentation Install a dummy mysql.data file Submitted by: Mark Daniel Reidel , Thanks !! >How-To-Repeat: >Fix: New file files/mysql.data --- dspam.patch begins here --- diff -ruN dspam.orig/Makefile dspam/Makefile --- dspam.orig/Makefile Mon Dec 22 20:13:51 2003 +++ dspam/Makefile Thu Jan 8 19:50:22 2004 @@ -7,6 +7,7 @@ PORTNAME= dspam PORTVERSION= 2.8.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.nuclearelephant.com/projects/dspam/sources/ @@ -20,16 +21,24 @@ USE_LIBTOOL= yes USE_REINPLACE= yes +SED_SCRIPT= -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ + -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \ + -e 's,%%LOCALBASE%%,${LOCALBASE},g' + .if defined(WITH_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+= --with-storage-driver=mysql_drv \ --with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libraries=${LOCALBASE}/lib/mysql PLIST_SUB+= DB4="@comment " +PLIST_SUB+= MYSQL="" +SED_SCRIPT+= -e 's,%%MYSQL%%,,g' .else LIB_DEPENDS= db41.1:${PORTSDIR}/databases/db41 CONFIGURE_ARGS+= --with-db4-includes=${LOCALBASE}/include/db41 PLIST_SUB+= DB4="" +PLIST_SUB+= MYSQL="@comment " +SED_SCRIPT+= -e '/%%MYSQL%%/D' .endif .if defined(WITH_MAILDROP) @@ -42,6 +51,14 @@ CONFIGURE_ARGS+= --with-local-delivery-agent='${LOCALBASE}/bin/procmail $u' .endif +.if defined(WITH_QMAIL) +CONFIGURE_ARGS+= --with-dspam-mode=4511 +.endif + +.if defined(ENABLE_SPAM_DELIVERY) +CONFIGURE_ARGS+= --enable-spam-delivery +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g ; \ s|-ldb-4.1|-ldb41|g' ${WRKSRC}/configure @@ -51,7 +68,19 @@ @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/CHANGE \ ${DOCSDIR} +.if defined(WITH_MYSQL) + @${MKDIR} ${DOCSDIR}/mysql + @${INSTALL_DATA} ${WRKSRC}/tools.mysql_drv/README \ + ${WRKSRC}/tools.mysql_drv/mysql_objects.sql \ + ${WRKSRC}/tools.mysql_drv/virtual_users.sql \ + ${WRKSRC}/tools.mysql_drv/purge.sql \ + ${DOCSDIR}/mysql + @${MKDIR} ${EXAMPLESDIR} +.endif +.endif +.if defined(WITH_MYSQL) + @${INSTALL_DATA} ${FILESDIR}/mysql.data ${EXAMPLESDIR} .endif - @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE} + @${SED} ${SED_SCRIPT} ${PKGMESSAGE} .include diff -ruN dspam.orig/files/mysql.data dspam/files/mysql.data --- dspam.orig/files/mysql.data Thu Jan 1 01:00:00 1970 +++ dspam/files/mysql.data Thu Jan 8 19:40:28 2004 @@ -0,0 +1,5 @@ +/tmp/mysql.sock + +user +password +database diff -ruN dspam.orig/pkg-message dspam/pkg-message --- dspam.orig/pkg-message Mon Aug 4 13:38:19 2003 +++ dspam/pkg-message Thu Jan 8 19:33:46 2004 @@ -1,7 +1,16 @@ -------------------------------------------------------------------- - See the file %%PREFIX%%/share/doc/dspam/README for advice about + See the file %%DOCSDIR%%/README for advice about how to configure DSPAM with your MTA. Examples are provided for sendmail, exim and other popular MTAs. +%%MYSQL%% +%%MYSQL%% See %%DOCSDIR%%/mysql/README +%%MYSQL%% for instructions on how to configure MySQL +%%MYSQL%% for use with DSPAM. +%%MYSQL%% +%%MYSQL%% %%EXAMPLESDIR%%/mysql.data +%%MYSQL%% contains an example configuration for use with MySQL. +%%MYSQL%% Edit and install as +%%MYSQL%% %%LOCALBASE%%/etc/dspam/mysql.data -------------------------------------------------------------------- diff -ruN dspam.orig/pkg-plist dspam/pkg-plist --- dspam.orig/pkg-plist Mon Dec 22 20:13:51 2003 +++ dspam/pkg-plist Thu Jan 8 19:33:46 2004 @@ -18,5 +18,12 @@ @comment lib/libdspam.la %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/CHANGE +%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/mysql/README +%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/mysql/mysql_objects.sql +%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/mysql/virtual_users.sql +%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/mysql/purge.sql +%%PORTDOCS%%%%MYSQL%%@dirrm %%DOCSDIR%%/mysql %%PORTDOCS%%@dirrm %%DOCSDIR%% +%%MYSQL%%%%EXAMPLESDIR%%/mysql.data +%%MYSQL%%@dirrm %%EXAMPLESDIR%% @dirrm etc/dspam --- dspam.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: