Date: Fri, 01 Feb 2013 14:03:33 +0100 From: Ralf van der Enden <tremere@cainites.net> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/175480: [MAINTAINER] dns/powerdns: update to 3.2 Message-ID: <510BBD25.3010502@cainites.net> In-Reply-To: <201301211450.r0LEo0Je005826@freefall.freebsd.org> References: <201301211450.r0LEo0Je005826@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------090106080903080702010002 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, Since my previous patch was ninja'd by a boost-libs chase (and I found an issue with the cryptopp dependency), I've attached a new patch that should apply without issues. Best regards, Ralf Op 21-1-2013 15:50, FreeBSD-gnats-submit@FreeBSD.org schreef: > Thank you very much for your problem report. > It has the internal identification `ports/175480'. > The individual assigned to look at your > report is: freebsd-ports-bugs. > > You can access the state of your problem report at any time > via this link: > > http://www.freebsd.org/cgi/query-pr.cgi?pr=175480 > >> Category: ports >> Responsible: freebsd-ports-bugs >> Synopsis: [MAINTAINER] dns/powerdns: update to 3.2 >> Arrival-Date: Mon Jan 21 14:50:00 UTC 2013 --------------090106080903080702010002 Content-Type: text/plain; charset=windows-1252; name="powerdns-3.2.new.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="powerdns-3.2.new.patch" Index: Makefile =================================================================== --- Makefile (revision 311369) +++ Makefile (working copy) @@ -1,11 +1,10 @@ # $FreeBSD$ PORTNAME= powerdns -PORTVERSION= 3.1 -PORTREVISION?= 2 +PORTVERSION= 3.2 +PORTREVISION?= 0 CATEGORIES= dns ipv6 -MASTER_SITES= http://downloads.powerdns.com/releases/ \ - http://mirrors.evolva.ro/powerdns.com/releases/ +MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} MAINTAINER= tremere@cainites.net @@ -13,9 +12,7 @@ LICENSE= GPLv2 -BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost-jam LIB_DEPENDS= boost_serialization:${PORTSDIR}/devel/boost-libs -# botan.0:${PORTSDIR}/security/botan USE_LUA= 5.1 LUA_COMPS= lua @@ -24,6 +21,7 @@ USE_GMAKE= YES USE_SUBMAKE= YES +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= YES CXXFLAGS+= -I${LOCALBASE}/include @@ -32,7 +30,6 @@ --with-dynmodules="pipe ${CONFIGURE_MODULES}" \ --sysconfdir="${PREFIX}/etc/pdns" \ --with-boost="${LOCALBASE}" -# --enable-botan1.8 SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ CURDIR2="${.CURDIR}" \ MKDIR="${MKDIR}" \ @@ -43,6 +40,8 @@ SUB_FILES= pkg-message OPTIONS_DEFINE= PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL SQLITE SQLITE3 OPENDBX OPENLDAP OPENLDAP_LOCAL GEO DNSSEC +OPTIONS_SINGLE=DNSSEC +OPTIONS_SINGLE_DNSSEC= BOTAN CRYPTOPP PGSQL_DESC= PostgreSQL backend PGSQL_LOCAL_DESC= RUN_DEPEND on PostgreSQL server @@ -55,8 +54,10 @@ OPENLDAP_LOCAL_DESC= RUN_DEPEND on OpenLDAP server GEO_DESC= Geo backend DNSSEC_DESC= Enable extra DNSSEC algorithms (13 & 14) +BOTAN_DESC= Use Botan +CRYPTOPP_DESC= Use Crypto++ -OPTIONS_DEFAULT= PGSQL +OPTIONS_DEFAULT= PGSQL CRYPTOPP .include <bsd.port.options.mk> @@ -157,7 +158,12 @@ PLIST_SUB+= WITHOPENDBX="@comment " .endif -.if ${PORT_OPTIONS:MDNSSEC} +.if ${PORT_OPTIONS:MBOTAN} +LIB_DEPENDS+= botan.0:${PORTSDIR}/security/botan +CONFIGURE_ARGS+= --enable-botan1.8 +.endif + +.if ${PORT_OPTIONS:MCRYPTOPP} BUILD_DEPENDS+= ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp CONFIGURE_ARGS+= --enable-cryptopp .endif Index: distinfo =================================================================== --- distinfo (revision 311369) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (pdns-3.1.tar.gz) = 1400f7bd659207c0b1f4b8296092e559a7b7bf6a2434951970217d9af06922a1 -SIZE (pdns-3.1.tar.gz) = 1268532 +SHA256 (pdns-3.2.tar.gz) = d1895aba065446dc68e5d7cc792d5303626c71759f61a455531ed65d59c06572 +SIZE (pdns-3.2.tar.gz) = 1293593 Index: files/patch-pdns_Makefile_in =================================================================== --- files/patch-pdns_Makefile_in (revision 311369) +++ files/patch-pdns_Makefile_in (working copy) @@ -1,23 +1,19 @@ --- pdns/Makefile.in.orig 2011-07-22 13:26:07.000000000 +0200 -+++ pdns/Makefile.in 2011-08-09 10:11:41.000000000 +0200 -@@ -51,16 +51,16 @@ - dnslog$(EXEEXT) nproxy$(EXEEXT) notify$(EXEEXT) \ - pdnssec$(EXEEXT) dnsbulktest$(EXEEXT) - @BOTAN110_TRUE@am__append_1 = botan110signers.cc botansigners.cc --@BOTAN110_TRUE@am__append_2 = -lbotan-1.10 -lgmp -+@BOTAN110_TRUE@am__append_2 = -lbotan-1.10 - @BOTAN18_TRUE@am__append_3 = botan18signers.cc botansigners.cc --@BOTAN18_TRUE@am__append_4 = -lbotan -lgmp -+@BOTAN18_TRUE@am__append_4 = -lbotan - @CRYPTOPP_TRUE@am__append_5 = cryptoppsigners.cc - @CRYPTOPP_TRUE@am__append_6 = -lcryptopp - @SQLITE3_TRUE@am__append_7 = ssqlite3.cc ssqlite3.hh - @BOTAN110_TRUE@am__append_8 = botan110signers.cc botansigners.cc --@BOTAN110_TRUE@am__append_9 = -lbotan-1.10 -lgmp -+@BOTAN110_TRUE@am__append_9 = -lbotan-1.10 - @BOTAN18_TRUE@am__append_10 = botan18signers.cc botansigners.cc --@BOTAN18_TRUE@am__append_11 = -lbotan -lgmp -+@BOTAN18_TRUE@am__append_11 = -lbotan - @CRYPTOPP_TRUE@am__append_12 = cryptoppsigners.cc - @CRYPTOPP_TRUE@am__append_13 = -lcryptopp - @SQLITE3_TRUE@am__append_14 = ssqlite3.cc ssqlite3.hh \ No newline at end of file ++++ pdns/Makefile.in 2013-01-17 13:23:49.892508749 +0100 +@@ -55,14 +55,14 @@ + @BOTAN110_TRUE@am__append_3 = botan110signers.cc botansigners.cc + @BOTAN110_TRUE@am__append_4 = $(BOTAN110_LIBS) -lgmp -lrt + @BOTAN18_TRUE@am__append_5 = botan18signers.cc botansigners.cc +-@BOTAN18_TRUE@am__append_6 = $(BOTAN18_LIBS) -lgmp ++@BOTAN18_TRUE@am__append_6 = $(BOTAN18_LIBS) + @CRYPTOPP_TRUE@am__append_7 = cryptoppsigners.cc + @CRYPTOPP_TRUE@am__append_8 = -lcryptopp + @SQLITE3_TRUE@am__append_9 = ssqlite3.cc ssqlite3.hh + @BOTAN110_TRUE@am__append_10 = botan110signers.cc botansigners.cc + @BOTAN110_TRUE@am__append_11 = $(BOTAN110_LIBS) -lgmp -lrt + @BOTAN18_TRUE@am__append_12 = botan18signers.cc botansigners.cc +-@BOTAN18_TRUE@am__append_13 = $(BOTAN18_LIBS) -lgmp ++@BOTAN18_TRUE@am__append_13 = $(BOTAN18_LIBS) + @CRYPTOPP_TRUE@am__append_14 = cryptoppsigners.cc + @CRYPTOPP_TRUE@am__append_15 = -lcryptopp + @SQLITE3_TRUE@am__append_16 = ssqlite3.cc ssqlite3.hh Index: pkg-plist =================================================================== --- pkg-plist (revision 311369) +++ pkg-plist (working copy) @@ -1,6 +1,7 @@ bin/dnsreplay bin/pdns_control bin/pdnssec +bin/zone2json bin/zone2ldap bin/zone2sql sbin/pdns_server --------------090106080903080702010002--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?510BBD25.3010502>