ports/180875: [MAINTAINER] dns/powerdns: update to 3.3

Ralf van der Enden tremere at cainites.net
Fri Jul 26 09:10:00 UTC 2013 

>Number:         180875
>Category:       ports
>Synopsis:       [MAINTAINER] dns/powerdns: update to 3.3
>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:   Fri Jul 26 09:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Ralf van der Enden
>Release:        FreeBSD 9.1-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD lan.cainites.net 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #1 r251925: Tue Jun 18 11:55:15 CEST
>Description:
- Update to PowerDNS 3.3
Changelog: http://rtfm.powerdns.com/changelog.html#changelog-auth-3-3

Changes to the port:
- Now uses Botan 1.10 instead of 1.8 due to better performance. Also make it the default instead of Crypto++ (as per author's recommendation).
- Both Botan and Crypto++ can be compiled in now.
- Also support MySQL forks like MariaDB
- Ability to choose embedded or system-installed PolarSSL

Generated with FreeBSD Port Tools 0.99_8 (mode: update, diff: SVN)
>How-To-Repeat:
>Fix:

--- powerdns-3.3.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 323704)
+++ Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	powerdns
-PORTVERSION=	3.2
+PORTVERSION=	3.3
 PORTREVISION?=	0
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
@@ -39,11 +39,11 @@
 
 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
+OPTIONS_DEFINE=	PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL SQLITE SQLITE3 OPENDBX OPENLDAP OPENLDAP_LOCAL GEO POLARSSL
+OPTIONS_MULTI=DNSSEC
+OPTIONS_MULTI_DNSSEC=	BOTAN110 CRYPTOPP
 
-PGSQL_DESC=		PostgreSQL backend
+PGSQL_DESC=		PostgreSQL backend (Default:ON)
 PGSQL_LOCAL_DESC=	RUN_DEPEND on PostgreSQL server
 MYSQL_DESC=		MySQL backend
 MYSQL_LOCAL_DESC=	RUN_DEPEND on MySQL server
@@ -53,11 +53,12 @@
 OPENLDAP_DESC=		OpenLDAP backend
 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++
+DNSSEC_DESC=		Extra DNSSEC options
+BOTAN110_DESC=		Faster signing + ECDSA & GOST algorithms (Default:ON)
+CRYPTOPP_DESC=		ECDSA algorithms
+POLARSSL_DESC=		Use embedded PolarSSL (Default:ON)
 
-OPTIONS_DEFAULT=	PGSQL DNSSEC CRYPTOPP
+OPTIONS_DEFAULT=	PGSQL DNSSEC BOTAN110 POLARSSL
 
 .include <bsd.port.options.mk>
 
@@ -90,8 +91,6 @@
 USE_MYSQL?=		YES
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 CONFIGURE_MODULES+=	"gmysql"
-#CXXFLAGS+=		-I${LOCALBASE}/include/mysql
-#LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 PLIST_SUB+=		WITHMYSQL=""
 .else
 CONFIGURE_ARGS+=	--without-mysql
@@ -100,8 +99,7 @@
 
 .if ${PORT_OPTIONS:MOPENDBX} || ${PORT_OPTIONS:MPGSQL}
 .	if ${PORT_OPTIONS:MPGSQL_LOCAL}
-USE_PGSQL?=		YES
-RUN_DEPENDS+=	postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
+USE_PGSQL=		server
 SUB_LIST+=	PGSQL=postgresql
 .	endif
 .else
@@ -109,8 +107,7 @@
 .endif
 .if ${PORT_OPTIONS:MOPENDBX} || ${PORT_OPTIONS:MMYSQL}
 .	if ${PORT_OPTIONS:MMYSQL_LOCAL}
-USE_MYSQL?=		YES
-RUN_DEPENDS+=	mysql-server>=0:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
+USE_MYSQL=	server
 SUB_LIST+=	MYSQL=mysql
 .	endif
 .else
@@ -123,7 +120,7 @@
 CXXFLAGS+=		-L${LOCALBASE}/lib -DLDAP_DEPRECATED=1
 PLIST_SUB+=		WITHOPENLDAP=""
 .	if ${PORT_OPTIONS:MOPENLDAP_LOCAL}
-RUN_DEPENDS+=	openldap-server>=0:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-server
+RUN_DEPENDS+=	openldap-server>=0:${PORTSDIR}/net/openldap${OPENLDAP_VER}-server
 SUB_LIST+=	SLAPD=slapd
 .	else
 SUB_LIST+=	SLAPD=
@@ -158,13 +155,23 @@
 PLIST_SUB+=		WITHOPENDBX="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MBOTAN}
-LIB_DEPENDS+=		botan.0:${PORTSDIR}/security/botan
-CONFIGURE_ARGS+=	--enable-botan1.8
+.if ${PORT_OPTIONS:MPOLARSSL}
+CONFIGURE_ARGS+=	--without-system-polarssl
+.else
+LIB_DEPENDS+=		polarssl:${PORTSDIR}/security/polarssl
 .endif
 
+.if ${PORT_OPTIONS:MBOTAN110}
+CONFIGURE_ARGS+=	--enable-botan1.10
+LIB_DEPENDS+=		botan-1.10:${PORTSDIR}/security/botan110
+.endif
+
 .if ${PORT_OPTIONS:MCRYPTOPP}
+.if exists(${LOCALBASE}/lib/libcryptopp.so)
+LIB_DEPENDS+=		cryptopp:${PORTSDIR}/security/cryptopp
+.else
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
+.endif
 CONFIGURE_ARGS+=	--enable-cryptopp
 .endif
 
Index: distinfo
===================================================================
--- distinfo	(revision 323704)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (pdns-3.2.tar.gz) = d1895aba065446dc68e5d7cc792d5303626c71759f61a455531ed65d59c06572
-SIZE (pdns-3.2.tar.gz) = 1293593
+SHA256 (pdns-3.3.tar.gz) = 93417bb418ccd1eaf85fc98aa9f687ed175de388fa2624a1978b7cd40dc2b0b6
+SIZE (pdns-3.3.tar.gz) = 1360167
Index: files/patch-modules_gpgsqlbackend_Makefile_in
===================================================================
--- files/patch-modules_gpgsqlbackend_Makefile_in	(revision 323704)
+++ files/patch-modules_gpgsqlbackend_Makefile_in	(working copy)
@@ -1,11 +0,0 @@
---- modules/gpgsqlbackend/Makefile.in.org	2009-01-28 10:55:21.000000000 +0100
-+++ modules/gpgsqlbackend/Makefile.in	2009-01-28 11:02:29.000000000 +0100
-@@ -217,8 +217,8 @@
- AM_CPPFLAGS = @THREADFLAGS@
- lib_LTLIBRARIES = libgpgsqlbackend.la
- EXTRA_DIST = OBJECTFILES OBJECTLIBS
--INCLUDES = -I at PGSQL_incdir@
-+INCLUDES = -I at includedir@ -I at PGSQL_incdir@
- libgpgsqlbackend_la_SOURCES = gpgsqlbackend.cc gpgsqlbackend.hh \
- 		spgsql.hh spgsql.cc
- 
Index: files/patch-modules_gpgsqlbackend_OBJECTLIBS
===================================================================
--- files/patch-modules_gpgsqlbackend_OBJECTLIBS	(revision 323704)
+++ 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 323704)
+++ files/patch-pdns_Makefile_in	(working copy)
@@ -1,19 +1,38 @@
---- pdns/Makefile.in.orig	2011-07-22 13:26:07.000000000 +0200
-+++ pdns/Makefile.in	2013-01-17 13:23:49.892508749 +0100
-@@ -55,14 +55,14 @@
- @BOTAN110_TRUE at am__append_3 = botan110signers.cc botansigners.cc
- @BOTAN110_TRUE at am__append_4 = $(BOTAN110_LIBS) -lgmp -lrt
- @BOTAN18_TRUE at am__append_5 = botan18signers.cc botansigners.cc
-- at BOTAN18_TRUE@am__append_6 = $(BOTAN18_LIBS) -lgmp
-+ at BOTAN18_TRUE@am__append_6 = $(BOTAN18_LIBS)
- @CRYPTOPP_TRUE at am__append_7 = cryptoppsigners.cc
- @CRYPTOPP_TRUE at am__append_8 = -lcryptopp
- @SQLITE3_TRUE at am__append_9 = ssqlite3.cc ssqlite3.hh
- @BOTAN110_TRUE at am__append_10 = botan110signers.cc botansigners.cc
- @BOTAN110_TRUE at am__append_11 = $(BOTAN110_LIBS) -lgmp -lrt
- @BOTAN18_TRUE at am__append_12 = botan18signers.cc botansigners.cc
-- at BOTAN18_TRUE@am__append_13 = $(BOTAN18_LIBS) -lgmp
-+ at BOTAN18_TRUE@am__append_13 = $(BOTAN18_LIBS)
- @CRYPTOPP_TRUE at am__append_14 = cryptoppsigners.cc
- @CRYPTOPP_TRUE at am__append_15 = -lcryptopp
- @SQLITE3_TRUE at am__append_16 = ssqlite3.cc ssqlite3.hh
+--- 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 at am__append_4 = botan110signers.cc botansigners.cc
+- at BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS) -lgmp -lrt
++ at BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS)
+ @BOTAN18_TRUE at am__append_6 = botan18signers.cc botansigners.cc
+ @BOTAN18_TRUE at am__append_7 = $(BOTAN18_LIBS) -lgmp
+ @CRYPTOPP_TRUE at am__append_8 = cryptoppsigners.cc
+@@ -57,7 +57,7 @@
+ @SQLITE3_TRUE at am__append_10 = ssqlite3.cc ssqlite3.hh
+ @ORACLE_TRUE at am__append_11 = $(ORACLE_LIBS)
+ @BOTAN110_TRUE at am__append_12 = botan110signers.cc botansigners.cc
+- at BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS) -lgmp -lrt
++ at BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS)
+ @BOTAN18_TRUE at am__append_14 = botan18signers.cc botansigners.cc
+ @BOTAN18_TRUE at am__append_15 = $(BOTAN18_LIBS) -lgmp
+ @CRYPTOPP_TRUE at 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_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: pkg-descr
===================================================================
--- pkg-descr	(revision 323704)
+++ pkg-descr	(working copy)
@@ -1,4 +1,4 @@
 PowerDNS is an advanced DNS server, which allows for several different
 backends. Current backends include MySQL, PostgreSQL, bind, etc.
 
-WWW:	http://www.powerdns.com/
+WWW: http://www.powerdns.com/
--- powerdns-3.3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list