From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 11 18:10:17 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 D18FF16A41C for ; Mon, 11 Jul 2005 18:10:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F357443D4C for ; Mon, 11 Jul 2005 18:10:16 +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 j6BIAG2t066269 for ; Mon, 11 Jul 2005 18:10:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6BIAGxd066268; Mon, 11 Jul 2005 18:10:16 GMT (envelope-from gnats) Resent-Date: Mon, 11 Jul 2005 18:10:16 GMT Resent-Message-Id: <200507111810.j6BIAGxd066268@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, Marcus Grando Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C202D16A41C for ; Mon, 11 Jul 2005 18:10:10 +0000 (GMT) (envelope-from root@corp.grupos.com.br) Received: from gwmail1.grupos.com.br (gwmail1.grupos.com.br [66.90.64.125]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A14A43D49 for ; Mon, 11 Jul 2005 18:10:09 +0000 (GMT) (envelope-from root@corp.grupos.com.br) Received: from corp.grupos.com.br (unknown [150.162.166.55]) by gwmail1.grupos.com.br (Postfix) with ESMTP id D62323BD15 for ; Mon, 11 Jul 2005 15:10:07 -0300 (BRT) Received: from corp.grupos.com.br (localhost [127.0.0.1]) by corp.grupos.com.br (Postfix) with ESMTP id 5620D5581 for ; Mon, 11 Jul 2005 15:10:06 -0300 (BRT) Received: by corp.grupos.com.br (Postfix, from userid 0) id 36C80556B; Mon, 11 Jul 2005 15:10:06 -0300 (BRT) Message-Id: <20050711181006.36C80556B@corp.grupos.com.br> Date: Mon, 11 Jul 2005 15:10:06 -0300 (BRT) From: Marcus Grando To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/83279: Update port: mail/libspf to 1.0.0-p3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Marcus Grando List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 18:10:18 -0000 >Number: 83279 >Category: ports >Synopsis: Update port: mail/libspf to 1.0.0-p3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jul 11 18:10:16 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Marcus Grando >Release: FreeBSD 4.11-STABLE i386 >Organization: Grupos Internet S/A >Environment: System: FreeBSD corp.grupos.com.br 4.11-STABLE FreeBSD 4.11-STABLE #0: Mon Jul 11 10:07:29 BRT 2005 root@corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386 >Description: Update port: mail/libspf to 1.0.0-p3 - Update to 1.0.0-p3 - Change MAINTAINER - Many changes in libspf/Makefile - Removed DEPRECATED and EXPIRATION_DATE Removed: files/patch-spf.h files/ pkg-message >How-To-Repeat: >Fix: --- libspf.patch begins here --- diff -ruN libspf.orig/Makefile libspf/Makefile --- libspf.orig/Makefile Tue May 31 14:02:58 2005 +++ libspf/Makefile Mon Jul 11 15:00:11 2005 @@ -6,101 +6,73 @@ # PORTNAME= libspf -PORTVERSION= 0.25.b +PORTVERSION= ${DISTVERSION:S/-/./} CATEGORIES= mail -MASTER_SITES= http://www.libspf.org/files/ -DISTNAME= ${PORTNAME}.${PORTVERSION}eta +MASTER_SITES= http://www.libspf.org/files/src/ -DEPRECATED= "stale, try mail/libspf2" -EXPIRATION_DATE=2005-07-31 - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= marcus@corp.grupos.com.br COMMENT= Sender Policy Framework (SPF) library and client -NOT_FOR_ARCHS= amd64 alpha +DISTVERSION= 1.0.0-p3 -USE_GETOPT_LONG=yes USE_BZIP2= yes -WRKSRC= ${WRKDIR}/${PORTNAME}.25 -USE_GMAKE= yes -USE_REINPLACE= yes -INSTALLS_SHLIB= yes -LIBSPF_REV= 1 -PLIST_SUB= PORTNAME=${PORTNAME} LIBSPF_REV=${LIBSPF_REV} -LDFLAGS+= -L${WRKSRC} - -# Supported tunables: -# -# WITH_SPF_LOG_FILE=/foo/bar enable transaction logfile (if unset: no log) -# WITH_SPF_DEBUG=yes enable debugging -# WITH_SPF_DEBUG_FILE=/foo/baz enable debug logfile (if unset: stdout/stderr) - -.if defined(WITH_SPF_LOG_FILE) -SPF_LOG_FILE= ${WITH_SPF_LOG_FILE} -.else -SPF_LOG_FILE= /dev/null -.endif +USE_LIBTOOL_VER= 15 +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX} + +OPTIONS= RFC_RECURSION "Change SPF recursion to 20 (as per RFC)" no \ + LOGFILE_STATS "Enables logfile stats" no \ + DEBUG "Enables debug option" no + +.include -.if defined(WITH_SPF_DEBUG) -SPF_CFLAGS= -ggdb -DDEBUG -D_SPF_DEBUG -.if defined(WITH_SPF_DEBUG_FILE) -SPF_CFLAGS+= -D_SPF_DEBUG_LOGFILE +.if !defined(WITHOUT_RFC_RECURSION) +CONFIGURE_ARGS+= --enable-rfc-recursion .endif + +.if !defined(WITHOUT_LOGFILE_STATS) +CONFIGURE_ARGS+= --enable-logfile-stats .endif -.if defined(WITH_SPF_DEBUG_FILE) -SPF_DEBUG_FILE= ${WITH_SPF_DEBUG_FILE} -.else -SPF_DEBUG_FILE= /dev/null +.if !defined(WITHOUT_DEBUG) +CONFIGURE_ARGS+= --enable-debug .endif -SPF_CFLAGS+= -DDEBUG_LOG_FILE=\\\"${SPF_DEBUG_FILE}\\\" \ - -DOUTPUT_LOG_FILE=\\\"${SPF_LOG_FILE}\\\" +.if !defined(NOPORTDOCS) +PORTDOCS= * +.endif -# This is all a bit messy, but given the inconvenient original Makefile, -# this seems to be the best way to make this port work in this version. -# The author of libspf is working on autotools support, so this ugliness -# should have an end soon. -post-patch: - @${REINPLACE_CMD} \ - -e 's,^CFLAGS:=.*,CFLAGS+=-Wall -D_BSD_SOURCE ${SPF_CFLAGS},' \ - -e 's/^CPPFLAGS:=/#CPPFLAGS:=/' \ - -e 's/^LDFLAGS:=/#LDFLAGS:=/' \ - -e 's/make /${GMAKE} /g' \ - -e 's/-lresolv//g' \ - -e 's/libspf.a : -lc/libspf.a :/g' \ - -e 's/libspf\.so\.1\.0\.1/libspf.so.${LIBSPF_REV}/g' \ - -e 's/-soname,libspf\.so\.1/-soname,libspf.so.${LIBSPF_REV}/g' \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} \ - -e 's,^CFLAGS:=,CFLAGS:=${CFLAGS} ${CPPFLAGS},' \ - -e 's,^CPPFLAGS:=,CPPFLAGS:=${CPPFLAGS},' \ - -e 's,^LDFLAGS:=.*,LDFLAGS=${LDFLAGS},' \ - -e 's/make /${GMAKE} /g' \ - -e 's/-o spfquery/-o spfquery-${PORTNAME}/g' \ - ${WRKSRC}/tools/Makefile - @${REINPLACE_CMD} \ - -e 's/#include "error.h"//' \ - ${WRKSRC}/main.c ${WRKSRC}/dns.c - @${REINPLACE_CMD} \ - -e 's,\(#define DEBUG_LOG_FILE.*\),/* \1 */,' \ - -e 's,\(#define OUTPUT_LOG_FILE.*\),/* \1 */,' \ - ${WRKSRC}/util.h - @${REINPLACE_CMD} \ - -e 's/spfquery /spfquery-${PORTNAME} /' \ - -e 's/getopt_long_only/getopt_long/g' \ - -E -e '/stderr/s/ -([a-z]{2,})/ --\1/g' \ - ${WRKSRC}/tools/spfquery.c - -post-build: - @(cd ${WRKSRC}/tools; ${SETENV} ${MAKE_ENV} ${GMAKE} shared ) - -do-install: - ${INSTALL_DATA} ${WRKSRC}/spf.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/libspf.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/libspf.so.${LIBSPF_REV} ${PREFIX}/lib - (cd ${PREFIX}/lib ; ${LN} -sf libspf.so.${LIBSPF_REV} libspf.so) - ${INSTALL_PROGRAM} ${WRKSRC}/tools/spfquery-${PORTNAME} ${PREFIX}/bin - @${CAT} ${PKGMESSAGE} +post-install: +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + @${FIND} ${WRKSRC}/docs -type d -name CVS | ${XARGS} ${RM} -rf +.for i in docs docs/API docs/API/doxygen docs/API/doxygen/html docs/RFC docs/qmail \ + docs/qmail/1.03 docs/qmail/1.04 docs/qmail/1.05 docs/spfqtool docs/Postfix \ + docs/Postfix/2.1.x docs/Sendmail docs/Sendmail/8.12.x docs/Sendmail/8.13.x \ + docs/Courier-MTA docs/history + @${MKDIR} ${DOCSDIR}/${i} + @for f in `${FIND} ${WRKSRC}/${i} ! -type d -maxdepth 1`; do \ + ${INSTALL_DATA} $${f} ${DOCSDIR}/${i}; \ + done +.endfor +.endif + @${MKDIR} ${EXAMPLESDIR} + @${FIND} ${WRKSRC}/examples -type d -name CVS | ${XARGS} ${RM} -rf +.for i in examples/qmail examples/qmail/control examples/Sendmail + @${MKDIR} ${EXAMPLESDIR}/${i} + @for f in `${FIND} ${WRKSRC}/${i} ! -type d -maxdepth 1`; do \ + ${INSTALL_DATA} $${f} ${EXAMPLESDIR}/${i}; \ + done +.endfor + @${MKDIR} ${DATADIR} + @${FIND} ${WRKSRC}/patches -type d -name CVS | ${XARGS} ${RM} -rf +.for i in patches patches/qmail patches/qmail/1.03 patches/qmail/1.05 patches/Postfix \ + patches/Postfix/2.1.x patches/Sendmail patches/Sendmail/8.12.x patches/Sendmail/8.13.x \ + patches/Courier-MTA + @${MKDIR} ${DATADIR}/${i} + @for f in `${FIND} ${WRKSRC}/${i} ! -type d -maxdepth 1`; do \ + ${INSTALL_DATA} $${f} ${DATADIR}/${i}; \ + done +.endfor -.include +.include diff -ruN libspf.orig/distinfo libspf/distinfo --- libspf.orig/distinfo Sat May 22 04:52:58 2004 +++ libspf/distinfo Mon Jul 11 10:49:38 2005 @@ -1,2 +1,2 @@ -MD5 (libspf.0.25.beta.tar.bz2) = 79b3a37888082428ed86dfa0f612a6f2 -SIZE (libspf.0.25.beta.tar.bz2) = 61406 +MD5 (libspf-1.0.0-p3.tar.bz2) = 8cc31c6f3e79e350b941b04ca7bfb145 +SIZE (libspf-1.0.0-p3.tar.bz2) = 1038651 diff -ruN libspf.orig/files/patch-spf.h libspf/files/patch-spf.h --- libspf.orig/files/patch-spf.h Sat May 22 04:52:58 2004 +++ libspf/files/patch-spf.h Wed Dec 31 21:00:00 1969 @@ -1,10 +0,0 @@ ---- spf.h.orig Fri May 14 18:49:30 2004 -+++ spf.h Fri May 21 17:13:30 2004 -@@ -47,6 +47,7 @@ - #define _SPF_H 1 - - #include /* typedefs */ -+#include - #include /* in_addr struct */ - - __BEGIN_DECLS diff -ruN libspf.orig/pkg-message libspf/pkg-message --- libspf.orig/pkg-message Sat May 22 04:52:58 2004 +++ libspf/pkg-message Wed Dec 31 21:00:00 1969 @@ -1,6 +0,0 @@ ------------------------------------------------------------------------ -Note: This port installs the SPF userspace tools with a filename suffix - of -libspf in order to avoid conflicts with other SPF ports - providing tools of the same name. - Please create convenience symlinks manually, if desired. ------------------------------------------------------------------------ diff -ruN libspf.orig/pkg-plist libspf/pkg-plist --- libspf.orig/pkg-plist Sat May 22 04:52:58 2004 +++ libspf/pkg-plist Mon Jul 11 14:00:35 2005 @@ -1,5 +1,57 @@ +bin/spfqtool +bin/spfqtool_static +include/_stdint.h include/spf.h +lib/libspf-1.0.so +lib/libspf-1.0.so.0 lib/libspf.a lib/libspf.so -lib/libspf.so.%%LIBSPF_REV%% -bin/spfquery-%%PORTNAME%% +%%EXAMPLESDIR%%/examples/Sendmail/sendmail.cf +%%EXAMPLESDIR%%/examples/Sendmail/sendmail.mc.example +%%EXAMPLESDIR%%/examples/Sendmail/spf.m4 +%%EXAMPLESDIR%%/examples/qmail/control/spfaction +%%EXAMPLESDIR%%/examples/qmail/control/spfbestguess +%%EXAMPLESDIR%%/examples/qmail/control/spfdebugstate +%%EXAMPLESDIR%%/examples/qmail/control/spfexplainstate +%%EXAMPLESDIR%%/examples/qmail/control/spfexplanation +%%EXAMPLESDIR%%/examples/qmail/control/spfguessstate +%%EXAMPLESDIR%%/examples/qmail/control/spfheaderstate +%%EXAMPLESDIR%%/examples/qmail/control/spftarpit +%%EXAMPLESDIR%%/examples/qmail/control/spftarpittime +%%EXAMPLESDIR%%/examples/qmail/control/spftrustedforwarder +%%EXAMPLESDIR%%/examples/qmail/control/spftrustedstate +%%DATADIR%%/patches/Courier-MTA/courier-0.45.4-spf.diff +%%DATADIR%%/patches/Postfix/2.1.x/postfix-2.1.4-libspf-1.0-RC6.diff +%%DATADIR%%/patches/Postfix/README +%%DATADIR%%/patches/README +%%DATADIR%%/patches/Sendmail/8.12.x/sendmail-8.12.10-libspf.0.24.diff +%%DATADIR%%/patches/Sendmail/8.12.x/sendmail-8.12.11-libspf.0.25.diff +%%DATADIR%%/patches/Sendmail/8.12.x/sendmail-8.12.11-libspf.0.25.fixed.diff +%%DATADIR%%/patches/Sendmail/8.13.x/sendmail-8.13.0-libspf-1.0-RC3.diff +%%DATADIR%%/patches/Sendmail/8.13.x/sendmail-8.13.1-libspf-1.0-RC5.diff +%%DATADIR%%/patches/Sendmail/8.13.x/sendmail-8.13.1-libspf-1.0-RC6.diff +%%DATADIR%%/patches/Sendmail/8.13.x/sendmail-8.13.4-libspf-1.0.diff +%%DATADIR%%/patches/Sendmail/README +%%DATADIR%%/patches/qmail/1.03/qmail-1.03.solaris.patch +%%DATADIR%%/patches/qmail/1.05/Makefile-dynamic-1.05.diff +%%DATADIR%%/patches/qmail/1.05/Makefile-static-1.05.diff +%%DATADIR%%/patches/qmail/1.05/netqmail-1.05-libspf-0.25.diff +%%DATADIR%%/patches/qmail/1.05/netqmail-1.05-libspf-1.0.0-RC5.diff +%%DATADIR%%/patches/qmail/1.05/netqmail-1.05-libspf-1.0.0-RC6.diff +%%DATADIR%%/patches/qmail/README +@dirrm %%DATADIR%%/patches/qmail/1.05 +@dirrm %%DATADIR%%/patches/qmail/1.03 +@dirrm %%DATADIR%%/patches/qmail +@dirrm %%DATADIR%%/patches/Sendmail/8.13.x +@dirrm %%DATADIR%%/patches/Sendmail/8.12.x +@dirrm %%DATADIR%%/patches/Sendmail +@dirrm %%DATADIR%%/patches/Postfix/2.1.x +@dirrm %%DATADIR%%/patches/Postfix +@dirrm %%DATADIR%%/patches/Courier-MTA +@dirrm %%DATADIR%%/patches +@dirrm %%DATADIR%% +@dirrm %%EXAMPLESDIR%%/examples/qmail/control +@dirrm %%EXAMPLESDIR%%/examples/qmail +@dirrm %%EXAMPLESDIR%%/examples/Sendmail +@dirrm %%EXAMPLESDIR%%/examples +@dirrm %%EXAMPLESDIR%% --- libspf.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: