Attachment 139557 Details for Bug 185824 – powerdns-3.3.1.patch

[patch] powerdns-3.3.1.patch

powerdns-3.3.1.patch (text/plain), 11.15 KB, created by Ralf van der Enden on 2014-01-16 15:50:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2014-01-16 15:50:02 UTC

Size: 11.15 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 339921)
>+++ Makefile	(working copy)
>@@ -1,8 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	powerdns
>-PORTVERSION=	3.3
>-PORTREVISION?=	1
>+PORTVERSION=	3.3.1
>+PORTREVISION?=	0
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://downloads.powerdns.com/releases/
> DISTNAME=	pdns-${PORTVERSION}
>@@ -19,7 +19,7 @@
> 
> CONFLICTS=	powerdns-devel-[2-3].[0-9]*
> 
>-USES=		pkgconfig gmake
>+USES=		gmake pkgconfig
> USE_SUBMAKE=	YES
> USE_AUTOTOOLS=	libtool
> USE_LDCONFIG=	YES
>@@ -39,10 +39,11 @@
> 
> USE_RC_SUBR=	pdns
> 
>-OPTIONS_DEFINE=	PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL \
>-		OPENDBX OPENLDAP OPENLDAP_LOCAL GEO POLARSSL SQLITE3 TOOLS
>-OPTIONS_MULTI=	DNSSEC
>-OPTIONS_MULTI_DNSSEC=	BOTAN110 CRYPTOPP
>+OPTIONS_DEFINE=	GEO MYSQL MYSQL_LOCAL OPENDBX OPENLDAP OPENLDAP_LOCAL \
>+		PGSQL PGSQL_LOCAL POLARSSL SQLITE3 TOOLS
>+OPTIONS_GROUP=	DNSSEC EXPERIMENTAL
>+OPTIONS_GROUP_DNSSEC=	BOTAN110 CRYPTOPP
>+OPTIONS_GROUP_EXPERIMENTAL=	LUA MYDNS REMOTE REMOTE_HTTP TINYDNS
> 
> PGSQL_DESC=		PostgreSQL backend
> PGSQL_LOCAL_DESC=	RUN_DEPEND on PostgreSQL server
>@@ -57,6 +58,11 @@
> BOTAN110_DESC=		Faster signing + ECDSA & GOST algorithms
> CRYPTOPP_DESC=		ECDSA algorithms
> POLARSSL_DESC=		Use embedded PolarSSL
>+LUA_DESC=		Lua backend
>+MYDNS_DESC=		MyDNS backend
>+REMOTE_DESC=		Remote backend
>+REMOTE_HTTP_DESC=	Enable HTTP for the Remote backed
>+TINYDNS_DESC=		TinyDNS backend
> TOOLS_DESC=		Build extra tools
> 
> OPTIONS_DEFAULT=	PGSQL DNSSEC BOTAN110 POLARSSL
>@@ -75,10 +81,17 @@
> MYSQL_USE=		MYSQL=YES
> MYSQL_LOCAL_USE=	MYSQL=server
> 
>+MYDNS_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
>+MYDNS_USE=		MYSQL=YES
>+MYDNS_LOCAL_USE=	MYSQL=server
>+
> OPENLDAP_CXXFLAGS=	-DLDAP_DEPRECATED=1
> OPENLDAP_USE=		OPENLDAP=YES
> OPENLDAP_LOCAL_RUN_DEPENDS=	openldap-server>=0:${PORTSDIR}/net/openldap24-server
> 
>+REMOTE_HTTP_CONFIGURE_ENABLE=	remotebackend-http
>+REMOTE_HTTP_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
>+
> SQLITE3_USE=	SQLITE=3
> 
> OPENDBX_LIB_DEPENDS=	libopendbx.so:${PORTSDIR}/databases/opendbx
>@@ -86,18 +99,23 @@
> BOTAN110_CONFIGURE_ENABLE=	botan1.10
> BOTAN110_LIB_DEPENDS=		libbotan-1.10.so:${PORTSDIR}/security/botan110
> 
>+TINYDNS_LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
>+TINYDNS_CONFIGURE_ON=	CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include"
>+
>+CRYPTOPP_CONFIGURE_ENABLE=	cryptopp
>+
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MGEO}
>-MODULES+=	"geo"
>+MODULES+=	geo
> .endif
> 
> .if ${PORT_OPTIONS:MPGSQL}
>-MODULES+=	"gpgsql"
>+MODULES+=	gpgsql
> .endif
> 
> .if ${PORT_OPTIONS:MMYSQL}
>-MODULES+=	"gmysql"
>+MODULES+=	gmysql
> .endif
> 
> .if ${PORT_OPTIONS:MPGSQL_LOCAL}
>@@ -113,7 +131,7 @@
> .endif
> 
> .if ${PORT_OPTIONS:MOPENLDAP}
>-MODULES+=	"ldap"
>+MODULES+=	ldap
> .endif
> 
> .if ${PORT_OPTIONS:MOPENLDAP_LOCAL}
>@@ -123,15 +141,30 @@
> .endif
> 
> .if ${PORT_OPTIONS:MSQLITE3}
>-MODULES+=	"gsqlite3"
>+MODULES+=	gsqlite3
> .endif
> 
>+.if ${PORT_OPTIONS:MLUA}
>+MODULES+=	lua
>+.endif
>+
>+.if ${PORT_OPTIONS:MMYDNS}
>+MODULES+=	mydns
>+.endif
>+
>+.if ${PORT_OPTIONS:MREMOTE}
>+MODULES+=	remote
>+.endif
>+
>+.if ${PORT_OPTIONS:MTINYDNS}
>+MODULES+=	tinydns
>+.endif
>+
> .if ${PORT_OPTIONS:MOPENDBX}
>-MODULES+=	"opendbx"
>+MODULES+=	opendbx
> .endif
> 
> .if ${PORT_OPTIONS:MCRYPTOPP}
>-CONFIGURE_ARGS+=	--enable-cryptopp
> .	if exists(${LOCALBASE}/lib/libcryptopp.so)
> LIB_DEPENDS+=	libcryptopp.so:${PORTSDIR}/security/cryptopp
> .	else
>Index: distinfo
>===================================================================
>--- distinfo	(revision 339921)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (pdns-3.3.tar.gz) = 93417bb418ccd1eaf85fc98aa9f687ed175de388fa2624a1978b7cd40dc2b0b6
>-SIZE (pdns-3.3.tar.gz) = 1360167
>+SHA256 (pdns-3.3.1.tar.gz) = feb566994725e049391e9b862c9437ca545f1bb970143d2387e474a6ff645bf3
>+SIZE (pdns-3.3.1.tar.gz) = 1403435
>Index: files/patch-modules__remotebackend__Makefile.in
>===================================================================
>--- files/patch-modules__remotebackend__Makefile.in	(revision 0)
>+++ files/patch-modules__remotebackend__Makefile.in	(working copy)
>@@ -0,0 +1,11 @@
>+--- ./modules/remotebackend/Makefile.in.orig	2013-12-17 14:47:45.000000000 +0100
>++++ ./modules/remotebackend/Makefile.in	2014-01-16 13:37:09.323941191 +0100
>+@@ -473,7 +473,7 @@
>+ EXTRA_LTLIBRARIES = libtestremotebackend.la
>+ lib_LTLIBRARIES = libremotebackend.la 
>+ libremotebackend_la_SOURCES = remotebackend.hh remotebackend.cc unixconnector.cc httpconnector.cc pipeconnector.cc 
>+-libremotebackend_la_LDFLAGS = -module -avoid-version
>++libremotebackend_la_LDFLAGS = -module -avoid-version $(LIBCURL_LIBS)
>+ libremotebackend_la_LIBS = $(LIBCURL_LIBS)
>+ TESTS_ENVIRONMENT = env BOOST_TEST_LOG_LEVEL=message REMOTEBACKEND_HTTP=$(REMOTEBACKEND_HTTP) ./testrunner.sh 
>+ BUILT_SOURCES = ../../pdns/dnslabeltext.cc
>Index: files/patch-pdns_Makefile_in
>===================================================================
>--- files/patch-pdns_Makefile_in	(revision 339921)
>+++ files/patch-pdns_Makefile_in	(working copy)
>@@ -1,49 +0,0 @@
>---- ./pdns/Makefile.in.orig	2013-07-05 03:30:48.000000000 -0300
>-+++ ./pdns/Makefile.in	2013-10-09 16:39:02.000000000 -0300
>-@@ -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
>-@@ -717,8 +717,8 @@
>- top_srcdir = @top_srcdir@
>- @HAVE_LIBPOLARSSL_FALSE@AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -Iext/polarssl-1.1.2/include -Iext/rapidjson/include
>- @HAVE_LIBPOLARSSL_TRUE@AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -I ext/rapidjson/include
>--AM_CPPFLAGS = -Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ \
>--	$(LIBCURL_CFLAGS) $(am__append_1) $(am__append_2)
>-+AM_CPPFLAGS = -Ibackends/bind @THREADFLAGS@ \
>-+	$(am__append_1) $(am__append_2) $(BOOST_CPPFLAGS)
>- EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_control.8  \
>- 	docs/pdns_server.8 docs/zone2sql.8 docs/zone2ldap.8 docs/pdnssec.8 \
>- 	docs/dnsreplay.8 docs/dnsscope.8 docs/dnswasher.8 docs/pdnssec.8 docs/zone2ldap.8 \
>-@@ -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_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 \
>-@@ -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_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: files/patch-pdns__Makefile.in
>===================================================================
>--- files/patch-pdns__Makefile.in	(revision 0)
>+++ files/patch-pdns__Makefile.in	(working copy)
>@@ -0,0 +1,49 @@
>+--- ./pdns/Makefile.in.orig	2013-12-17 14:47:45.000000000 +0100
>++++ ./pdns/Makefile.in	2014-01-16 13:37:09.328942976 +0100
>+@@ -66,7 +66,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
>+@@ -74,7 +74,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
>+@@ -750,8 +750,8 @@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+ AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -Iext/rapidjson/include
>+-AM_CPPFLAGS = -Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ \
>+-	$(LIBCURL_CFLAGS) $(am__append_1) $(am__append_2)
>++AM_CPPFLAGS = -Ibackends/bind @THREADFLAGS@ \
>++	$(am__append_1) $(am__append_2) $(BOOST_CPPFLAGS)
>+ EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_control.8  \
>+ 	docs/pdns_server.8 docs/zone2sql.8 docs/zone2ldap.8 docs/pdnssec.8 \
>+ 	docs/dnsreplay.8 docs/dnsscope.8 docs/dnswasher.8 docs/pdnssec.8 docs/zone2ldap.8 \
>+@@ -797,7 +797,7 @@
>+ #
>+ pdns_server_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic
>+ pdns_server_LDADD = $(POLARSSL_LIBS) $(BOOST_SERIALIZATION_LIBS) \
>+-	$(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(am__append_5) \
>++	$(LUA_LIBS) $(SQLITE3_LIBS) $(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 \
>+@@ -819,7 +819,7 @@
>+ 	$(am__append_18)
>+ pdnssec_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) 
>+ pdnssec_LDADD = $(POLARSSL_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) \
>+-	$(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) \
>++	$(BOOST_SERIALIZATION_LIBS) $(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 \

Actions: View | Diff

Attachments on bug 185824: 139557 | 139558