Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Jan 2013 15:40:02 +0100
From:      Ralf van der Enden <tremere@cainites.net>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/175480: [MAINTAINER] dns/powerdns: update to 3.2
Message-ID:  <E1TxIXa-0008hz-HI@cainites.net>
Resent-Message-ID: <201301211450.r0LEo06o005852@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         175480
>Category:       ports
>Synopsis:       [MAINTAINER] dns/powerdns: update to 3.2
>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:   Mon Jan 21 14:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Ralf van der Enden
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD lan.cainites.net 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Tue Dec 4 18:00:28 CET 2012 root@lan.cainites.net:/usr/obj/usr/src/sys/HELLKERNEL amd64


	
>Description:
	
- Update to PowerDNS 3.2
The DNSSEC option now lets you choose either botan or crypto++ to support algorithms 13 and 14 (if you had it enabled, crypto++ is enabled by default)
Added USE_PKGCONFIG to fix building with poudriere
Removed dead mirror from MASTER_SITES

Changelog: http://rtfm.powerdns.com/changelog.html#changelog-auth-3-2
>How-To-Repeat:
	
>Fix:

	


--- powerdns-3.2.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 310767)
+++ Makefile	(working copy)
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	powerdns
-PORTVERSION=	3.1
-PORTREVISION?=	1
+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.[4-9]:${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,8 +158,13 @@
 PLIST_SUB+=		WITHOPENDBX="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MDNSSEC}
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
+.if ${PORT_OPTIONS:MBOTAN}
+LIB_DEPENDS+=		botan.0:${PORTSDIR}/security/botan
+CONFIGURE_ARGS+=	--enable-botan1.8
+.endif
+
+.if ${PORT_OPTIONS:MCRYPTOPP}
+LIB_DEPENDS+=		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
 CONFIGURE_ARGS+=	--enable-cryptopp
 .endif
 
Index: distinfo
===================================================================
--- distinfo	(revision 310767)
+++ 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 310767)
+++ 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 310767)
+++ pkg-plist	(working copy)
@@ -1,6 +1,7 @@
 bin/dnsreplay
 bin/pdns_control
 bin/pdnssec
+bin/zone2json
 bin/zone2ldap
 bin/zone2sql
 sbin/pdns_server
--- powerdns-3.2.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?E1TxIXa-0008hz-HI>