From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 19 14:00:45 2005 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 C6F7D16A4CE for ; Tue, 19 Apr 2005 14:00:45 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83D6843D48 for ; Tue, 19 Apr 2005 14:00:45 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3JE0jBb058098 for ; Tue, 19 Apr 2005 14:00:45 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3JE0jPH058097; Tue, 19 Apr 2005 14:00:45 GMT (envelope-from gnats) Resent-Date: Tue, 19 Apr 2005 14:00:45 GMT Resent-Message-Id: <200504191400.j3JE0jPH058097@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, Blaz Zupan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7FD5916A4CE for ; Tue, 19 Apr 2005 13:51:27 +0000 (GMT) Received: from titanic.medinet.si (titanic.medinet.si [212.18.42.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05F2A43D3F for ; Tue, 19 Apr 2005 13:51:27 +0000 (GMT) (envelope-from blaz@titanic.medinet.si) Received: by titanic.medinet.si (Postfix, from userid 1000) id DA1E355475; Tue, 19 Apr 2005 15:51:24 +0200 (CEST) Message-Id: <20050419135124.DA1E355475@titanic.medinet.si> Date: Tue, 19 Apr 2005 15:51:24 +0200 (CEST) From: Blaz Zupan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/80103: MAINTAINER UPDATE: mail/gld to 1.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Blaz Zupan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Apr 2005 14:00:46 -0000 >Number: 80103 >Category: ports >Synopsis: MAINTAINER UPDATE: mail/gld to 1.5 >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Apr 19 14:00:44 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Blaz Zupan >Release: FreeBSD 4.10-RELEASE i386 >Organization: >Environment: System: FreeBSD titanic.medinet.si 4.10-RELEASE FreeBSD 4.10-RELEASE #1: Sun Jun 27 16:39:26 CEST 2004 root@bigbrother.amis.net:/usr/obj/usr/src/sys/TITANIC i386 >Description: - upgrade gld to 1.5 (contains important security fixes) - add PostgreSQL support >How-To-Repeat: >Fix: diff -urN gld.old/Makefile gld/Makefile --- gld.old/Makefile Tue Apr 19 13:17:14 2005 +++ gld/Makefile Tue Apr 19 15:38:04 2005 @@ -6,30 +6,44 @@ # PORTNAME= gld -PORTVERSION= 1.4 -PORTREVISION= 1 +PORTVERSION= 1.5 CATEGORIES= mail MASTER_SITES= http://www.gasmi.net/down/ EXTRACT_SUFX= .tgz +WRKSRC= ${WRKDIR}/${DISTNAME}.1 MAINTAINER= blaz@si.FreeBSD.org COMMENT= Greylisting daemon for Postfix -FORBIDDEN= http://vuxml.FreeBSD.org/6c2d4f29-af3e-11d9-837d-000e0c2e438a.html - -USE_MYSQL= yes USE_REINPLACE= yes USE_RC_SUBR= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --with-mysql=${PREFIX} - PKGMESSAGE= ${WRKDIR}/MESSAGE +OPTIONS= MYSQL "MySQL support" on \ + PGSQL "PgSQL support" off + SED_SCRIPT= -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ -e 's,%%PREFIX%%,${PREFIX},g' \ -e 's,%%RC_SUBR%%,${RC_SUBR},g' +.include + +.if defined(WITH_MYSQL) && defined(WITH_PGSQL) +BROKEN= "Cannot compile with both MySQL and PgSQL support" +.endif + +.if defined(WITH_MYSQL) +CONFIGURE_ARGS+= --with-mysql=${PREFIX} +USE_MYSQL= yes +.endif + +.if defined(WITH_PGSQL) +CONFIGURE_ARGS+= --with-pgsql=${PREFIX} +USE_PGSQL= yes +.endif + pre-build: ${REINPLACE_CMD} -e 's,"/etc/gld.conf","${PREFIX}/etc/gld.conf",' ${WRKSRC}/gld.h for f in gld.sh MESSAGE; do \ @@ -42,7 +56,7 @@ ${INSTALL_SCRIPT} ${WRKDIR}/gld.sh ${PREFIX}/etc/rc.d .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for FILE in HISTORY LICENCE README tables.sql +.for FILE in HISTORY LICENCE README table-whitelist.sql tables.mysql tables.pgsql ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} .endfor .endif @@ -50,4 +64,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include +.include diff -urN gld.old/distinfo gld/distinfo --- gld.old/distinfo Sat Aug 21 21:27:11 2004 +++ gld/distinfo Tue Apr 19 15:35:29 2005 @@ -1,2 +1,2 @@ -MD5 (gld-1.4.tgz) = 0913b8e940a02f1ea011c6601474f08b -SIZE (gld-1.4.tgz) = 35714 +MD5 (gld-1.5.tgz) = 0696b6c469a19bfb92bf93b19955cab6 +SIZE (gld-1.5.tgz) = 39132 diff -urN gld.old/pkg-plist gld/pkg-plist --- gld.old/pkg-plist Fri Jul 16 04:44:15 2004 +++ gld/pkg-plist Tue Apr 19 15:35:29 2005 @@ -4,5 +4,7 @@ %%PORTDOCS%%%%DOCSDIR%%/HISTORY %%PORTDOCS%%%%DOCSDIR%%/LICENCE %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/tables.sql +%%PORTDOCS%%%%DOCSDIR%%/table-whitelist.sql +%%PORTDOCS%%%%DOCSDIR%%/tables.mysql +%%PORTDOCS%%%%DOCSDIR%%/tables.pgsql %%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: