Date: Sun, 29 Sep 2013 21:25:21 +0200 From: Ralf van der Enden <tremere@cainites.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/182494: [MAINTAINER] dns/powerdns-devel: update to 3.3,1 Message-ID: <E1VQMcL-0003O5-Ki@cainites.net> Resent-Message-ID: <201309291930.r8TJU0D3018999@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182494 >Category: ports >Synopsis: [MAINTAINER] dns/powerdns-devel: update to 3.3,1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Sep 29 19:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Ralf van der Enden >Release: FreeBSD 9.1-RELEASE-p7 amd64 >Organization: >Environment: System: FreeBSD lan.cainites.net 9.1-RELEASE-p7 FreeBSD 9.1-RELEASE-p7 #2 r255462: Wed Sep 11 10:10:45 CEST >Description: - Update to 3.3 - Switch to github to make tracking release candidates easier in the future - Added dependencies to bootstrap (autoconf, automake) and compile (bison, ragel) - Hopefully fix building on 10-CURRENT Generated with FreeBSD Port Tools 0.99_8 (mode: update, diff: SVN) >How-To-Repeat: >Fix: --- powerdns-devel-3.3,1.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 328725) +++ Makefile (working copy) @@ -1,13 +1,12 @@ # $FreeBSD$ PORTNAME= powerdns -PORTVERSION= 3.3.r1 +PORTVERSION= 3.3 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= dns ipv6 -MASTER_SITES= http://powerdnssec.org/downloads/ PKGNAMESUFFIX= -devel -DISTNAME= pdns-${PORTVERSION:S/.r/-rc/} +DISTNAME= auth-${PORTVERSION:S/.r/-rc/} MAINTAINER= tremere@cainites.net COMMENT= An advanced DNS server with multiple backends including SQL @@ -14,8 +13,15 @@ LICENSE= GPLv2 +BUILD_DEPENDS= ragel:${PORTSDIR}/devel/ragel LIB_DEPENDS= boost_serialization:${PORTSDIR}/devel/boost-libs +USE_GITHUB= YES +GH_ACCOUNT= PowerDNS +GH_PROJECT= pdns +GH_TAGNAME= auth-3.3 +GH_COMMIT= b8fe1df + USE_LUA= 5.1 LUA_COMPS= lua @@ -23,10 +29,9 @@ NO_LATEST_LINK= YES -USES= pkgconfig -USE_GMAKE= YES +USES= bison gmake pkgconfig USE_SUBMAKE= YES -USE_AUTOTOOLS= libtool +USE_AUTOTOOLS= autoconf automake libtool USE_LDCONFIG= YES CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -43,7 +48,8 @@ SUB_FILES= pkg-message -OPTIONS_DEFINE= PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL SQLITE SQLITE3 OPENDBX OPENLDAP OPENLDAP_LOCAL GEO DNSSEC POLARSSL +OPTIONS_DEFINE= PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL SQLITE SQLITE3 \ + OPENDBX OPENLDAP OPENLDAP_LOCAL GEO POLARSSL TOOLS OPTIONS_MULTI= DNSSEC OPTIONS_MULTI_DNSSEC= BOTAN110 CRYPTOPP @@ -61,6 +67,7 @@ BOTAN110_DESC= Faster signing + ECDSA & GOST algorithms CRYPTOPP_DESC= ECDSA algorithms POLARSSL_DESC= Use embedded PolarSSL +TOOLS_DESC= Build extra tools OPTIONS_DEFAULT= PGSQL DNSSEC BOTAN110 POLARSSL @@ -71,6 +78,13 @@ USE_RC_SUBR+= pdns-devel +.if ${PORT_OPTIONS:MTOOLS} +CONFIGURE_ARGS+= --enable-tools +PLIST_SUB+= WITHTOOLS="" +.else +PLIST_SUB+= WITHTOOLS="@comment " +.endif + .if ${PORT_OPTIONS:MGEO} CONFIGURE_MODULES+= "geo" PLIST_SUB+= WITHGEO="" @@ -180,6 +194,13 @@ CONFIGURE_ARGS+= --enable-cryptopp .endif +pre-patch: + ${REINPLACE_CMD} -e "s;/bin/bash;/usr/bin/env bash;" \ + -e "s;ssed -r;sed -E -e;g" \ + -e "s;-i;-i .bak;g" \ + ${WRKSRC}/build-scripts/set-version-auth + @(cd ${WRKSRC} && ${WRKSRC}/build-scripts/set-version-auth git-${GH_TAGNAME} 0.0.${GH_TAGNAME} 0.0.${GH_TAGNAME} && ${WRKSRC}/bootstrap) + post-patch: .if ${PORT_OPTIONS:MOPENLDAP} ${REINPLACE_CMD} -e 's;-I. ;-I. -I${LOCALBASE}/include ;' \ Index: distinfo =================================================================== --- distinfo (revision 328725) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (pdns-3.3-rc1.tar.gz) = 06269412693aae5925c338f8f03ea32d60584e1b206310dffc451a15039694e9 -SIZE (pdns-3.3-rc1.tar.gz) = 1333561 +SHA256 (auth-3.3.tar.gz) = 0f6e85f6ee3041718dcc5d3aa97c8e48f7dc5ab33678c5c40b2bc4e585c6a4d6 +SIZE (auth-3.3.tar.gz) = 1794516 Index: files/patch-modules_gpgsqlbackend_OBJECTLIBS =================================================================== --- files/patch-modules_gpgsqlbackend_OBJECTLIBS (revision 328725) +++ files/patch-modules_gpgsqlbackend_OBJECTLIBS (working copy) @@ -1,7 +0,0 @@ ---- modules/gpgsqlbackend/OBJECTLIBS.orig Sat Apr 23 23:40:15 2005 -+++ modules/gpgsqlbackend/OBJECTLIBS Mon Jul 18 14:21:17 2005 -@@ -1,3 +1,3 @@ ---lpq -lssl -lcrypto -lcrypt -lresolv -lnsl -+-lpq -lssl -lcrypto - - Index: files/patch-pdns_Makefile_in =================================================================== --- files/patch-pdns_Makefile_in (revision 328725) +++ files/patch-pdns_Makefile_in (working copy) @@ -1,38 +1,38 @@ ---- pdns/Makefile.in.orig 2013-05-28 08:12:43.000000000 +0200 -+++ pdns/Makefile.in 2013-06-03 11:39:18.377503664 +0200 -@@ -53,7 +53,7 @@ - dnsscan$(EXEEXT) nproxy$(EXEEXT) notify$(EXEEXT) \ - pdnssec$(EXEEXT) dnsbulktest$(EXEEXT) nsec3dig$(EXEEXT) - @BOTAN110_TRUE@am__append_3 = botan110signers.cc botansigners.cc --@BOTAN110_TRUE@am__append_4 = $(BOTAN110_LIBS) -lgmp -lrt -+@BOTAN110_TRUE@am__append_4 = $(BOTAN110_LIBS) - @BOTAN18_TRUE@am__append_5 = botan18signers.cc botansigners.cc - @BOTAN18_TRUE@am__append_6 = $(BOTAN18_LIBS) -lgmp - @CRYPTOPP_TRUE@am__append_7 = cryptoppsigners.cc -@@ -61,7 +61,7 @@ - @SQLITE3_TRUE@am__append_9 = ssqlite3.cc ssqlite3.hh - @ORACLE_TRUE@am__append_10 = $(ORACLE_LIBS) - @BOTAN110_TRUE@am__append_11 = botan110signers.cc botansigners.cc --@BOTAN110_TRUE@am__append_12 = $(BOTAN110_LIBS) -lgmp -lrt -+@BOTAN110_TRUE@am__append_12 = $(BOTAN110_LIBS) - @BOTAN18_TRUE@am__append_13 = botan18signers.cc botansigners.cc - @BOTAN18_TRUE@am__append_14 = $(BOTAN18_LIBS) -lgmp - @CRYPTOPP_TRUE@am__append_15 = cryptoppsigners.cc -@@ -752,7 +752,7 @@ +--- pdns/Makefile.in.orig 2013-06-27 13:47:04.000000000 +0200 ++++ pdns/Makefile.in 2013-06-28 10:28:35.191325678 +0200 +@@ -49,7 +49,7 @@ + nproxy$(EXEEXT) notify$(EXEEXT) pdnssec$(EXEEXT) \ + dnsbulktest$(EXEEXT) nsec3dig$(EXEEXT) + @BOTAN110_TRUE@am__append_4 = botan110signers.cc botansigners.cc +-@BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS) -lgmp -lrt ++@BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS) + @BOTAN18_TRUE@am__append_6 = botan18signers.cc botansigners.cc + @BOTAN18_TRUE@am__append_7 = $(BOTAN18_LIBS) -lgmp + @CRYPTOPP_TRUE@am__append_8 = cryptoppsigners.cc +@@ -57,7 +57,7 @@ + @SQLITE3_TRUE@am__append_10 = ssqlite3.cc ssqlite3.hh + @ORACLE_TRUE@am__append_11 = $(ORACLE_LIBS) + @BOTAN110_TRUE@am__append_12 = botan110signers.cc botansigners.cc +-@BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS) -lgmp -lrt ++@BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS) + @BOTAN18_TRUE@am__append_14 = botan18signers.cc botansigners.cc + @BOTAN18_TRUE@am__append_15 = $(BOTAN18_LIBS) -lgmp + @CRYPTOPP_TRUE@am__append_16 = cryptoppsigners.cc +@@ -766,7 +766,7 @@ pdns_server_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic pdns_server_LDADD = ext/polarssl-1.1.2/library/libpolarssl.a \ $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) \ -- $(LIBCURL_LIBS) $(MYSQL_lib) $(am__append_4) $(am__append_6) \ -+ $(am__append_4) $(am__append_6) \ - $(am__append_8) $(am__append_10) +- $(LIBCURL_LIBS) $(MYSQL_lib) $(am__append_5) $(am__append_7) \ ++ $(am__append_5) $(am__append_7) \ + $(am__append_9) $(am__append_11) pdnssec_SOURCES = pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc \ dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh misc.cc \ -@@ -775,7 +775,7 @@ +@@ -789,7 +789,7 @@ pdnssec_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) pdnssec_LDADD = ext/polarssl-1.1.2/library/libpolarssl.a \ $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) \ -- $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib) $(am__append_12) \ -+ $(SQLITE3_LIBS) $(am__append_12) \ - $(am__append_14) $(am__append_16) $(am__append_18) +- $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib) $(am__append_13) \ ++ $(SQLITE3_LIBS) $(am__append_13) \ + $(am__append_15) $(am__append_17) $(am__append_19) sdig_SOURCES = sdig.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnslabeltext.cc dnswriter.hh \ misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh unix_utility.cc \ Index: pkg-plist =================================================================== --- pkg-plist (revision 328725) +++ pkg-plist (working copy) @@ -1,4 +1,3 @@ -bin/dnsreplay bin/pdns_control bin/pdnssec bin/zone2json @@ -5,6 +4,14 @@ bin/zone2ldap bin/zone2sql sbin/pdns_server +%%WITHTOOLS%%bin/dnsbulktest +%%WITHTOOLS%%bin/dnsreplay +%%WITHTOOLS%%bin/dnsscan +%%WITHTOOLS%%bin/dnsscope +%%WITHTOOLS%%bin/dnstcpbench +%%WITHTOOLS%%bin/dnswasher +%%WITHTOOLS%%bin/nproxy +%%WITHTOOLS%%bin/nsec3dig %%WITHPGSQL%%lib/libgpgsqlbackend.a %%WITHPGSQL%%lib/libgpgsqlbackend.la %%WITHPGSQL%%lib/libgpgsqlbackend.so --- powerdns-devel-3.3,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1VQMcL-0003O5-Ki>