From owner-svn-ports-all@FreeBSD.ORG Sun Feb 10 08:12:16 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C9791265; Sun, 10 Feb 2013 08:12:16 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B9F45E6E; Sun, 10 Feb 2013 08:12:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1A8CGaX079464; Sun, 10 Feb 2013 08:12:16 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1A8CGlh079459; Sun, 10 Feb 2013 08:12:16 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201302100812.r1A8CGlh079459@svn.freebsd.org> From: Martin Wilke Date: Sun, 10 Feb 2013 08:12:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312010 - in head/dns/powerdns: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Feb 2013 08:12:16 -0000 Author: miwi Date: Sun Feb 10 08:12:15 2013 New Revision: 312010 URL: http://svnweb.freebsd.org/changeset/ports/312010 Log: - Update to 3.2 PR: 175480 Submitted by: maintainer Modified: head/dns/powerdns/Makefile (contents, props changed) head/dns/powerdns/distinfo (contents, props changed) head/dns/powerdns/files/patch-pdns_Makefile_in head/dns/powerdns/pkg-plist (contents, props changed) Modified: head/dns/powerdns/Makefile ============================================================================== --- head/dns/powerdns/Makefile Sun Feb 10 08:03:28 2013 (r312009) +++ head/dns/powerdns/Makefile Sun Feb 10 08:12:15 2013 (r312010) @@ -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 @@ COMMENT= An advanced DNS server with mul 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 @@ CONFLICTS= powerdns-devel-[2-3].[0-9]* USE_GMAKE= YES USE_SUBMAKE= YES +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= YES CXXFLAGS+= -I${LOCALBASE}/include @@ -32,7 +30,6 @@ CONFIGURE_ARGS= --with-modules="" \ --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 @@ MAN8= pdns_control.8 pdns_server.8 zone 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_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++ -OPTIONS_DEFAULT= PGSQL +OPTIONS_DEFAULT= PGSQL CRYPTOPP .include @@ -157,7 +158,12 @@ CXXFLAGS+= -L${LOCALBASE}/lib 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 Modified: head/dns/powerdns/distinfo ============================================================================== --- head/dns/powerdns/distinfo Sun Feb 10 08:03:28 2013 (r312009) +++ head/dns/powerdns/distinfo Sun Feb 10 08:12:15 2013 (r312010) @@ -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 Modified: head/dns/powerdns/files/patch-pdns_Makefile_in ============================================================================== --- head/dns/powerdns/files/patch-pdns_Makefile_in Sun Feb 10 08:03:28 2013 (r312009) +++ head/dns/powerdns/files/patch-pdns_Makefile_in Sun Feb 10 08:12:15 2013 (r312010) @@ -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 ++++ 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 Modified: head/dns/powerdns/pkg-plist ============================================================================== --- head/dns/powerdns/pkg-plist Sun Feb 10 08:03:28 2013 (r312009) +++ head/dns/powerdns/pkg-plist Sun Feb 10 08:12:15 2013 (r312010) @@ -1,6 +1,7 @@ bin/dnsreplay bin/pdns_control bin/pdnssec +bin/zone2json bin/zone2ldap bin/zone2sql sbin/pdns_server