From owner-svn-ports-all@FreeBSD.ORG Thu Jan 23 20:12:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2C8273D8; Thu, 23 Jan 2014 20:12:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0D18115F2; Thu, 23 Jan 2014 20:12:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0NKCssN008719; Thu, 23 Jan 2014 20:12:54 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0NKCsoP008713; Thu, 23 Jan 2014 20:12:54 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201401232012.s0NKCsoP008713@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Thu, 23 Jan 2014 20:12:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340857 - 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.17 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: Thu, 23 Jan 2014 20:12:55 -0000 Author: danilo Date: Thu Jan 23 20:12:54 2014 New Revision: 340857 URL: http://svnweb.freebsd.org/changeset/ports/340857 QAT: https://qat.redports.org/buildarchive/r340857/ Log: - Update from 3.3 to 3.3.1 - Add some experimental backends while here - Convert USE_LUA to USES PR: ports/185824 Submitted by: Ralf van der Enden (maintainer) Added: head/dns/powerdns/files/patch-pdns__Makefile.in (contents, props changed) Deleted: head/dns/powerdns/files/patch-pdns_Makefile_in Modified: head/dns/powerdns/Makefile head/dns/powerdns/distinfo Modified: head/dns/powerdns/Makefile ============================================================================== --- head/dns/powerdns/Makefile Thu Jan 23 20:12:18 2014 (r340856) +++ head/dns/powerdns/Makefile Thu Jan 23 20:12:54 2014 (r340857) @@ -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} @@ -14,12 +14,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libboost_serialization.so:${PORTSDIR}/devel/boost-libs -USE_LUA= 5.1 -LUA_COMPS= lua - CONFLICTS= powerdns-devel-[2-3].[0-9]* -USES= pkgconfig gmake +USES= gmake lua:51 pkgconfig USE_SUBMAKE= YES USE_AUTOTOOLS= libtool USE_LDCONFIG= YES @@ -39,10 +36,11 @@ SUB_FILES= pkg-message 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,13 +55,21 @@ DNSSEC_DESC= Extra DNSSEC options 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 OPTIONS_SUB= yes -TOOLS_CONFIGURE_ENABLE= tools +# Don't use CONFIGURE_ENABLE, the configure script +# has a bug. The options are being enabled even using --disable- + +TOOLS_CONFIGURE_ON= --enable-tools PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} PGSQL_CONFIGURE_OFF= --without-pgsql @@ -75,29 +81,41 @@ MYSQL_CONFIGURE_OFF= --without-mysql 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_ON= --enable-remotebackend-http +REMOTE_HTTP_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl + +CRYPTOPP_CONFIGURE_ON= --enable-cryptopp + SQLITE3_USE= SQLITE=3 OPENDBX_LIB_DEPENDS= libopendbx.so:${PORTSDIR}/databases/opendbx -BOTAN110_CONFIGURE_ENABLE= botan1.10 +BOTAN110_CONFIGURE_ON= --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" + .include .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 @@ SUB_LIST+= MYSQL_REQ= .endif .if ${PORT_OPTIONS:MOPENLDAP} -MODULES+= "ldap" +MODULES+= ldap .endif .if ${PORT_OPTIONS:MOPENLDAP_LOCAL} @@ -123,15 +141,30 @@ SUB_LIST+= SLAPD_REQ= .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 Modified: head/dns/powerdns/distinfo ============================================================================== --- head/dns/powerdns/distinfo Thu Jan 23 20:12:18 2014 (r340856) +++ head/dns/powerdns/distinfo Thu Jan 23 20:12:54 2014 (r340857) @@ -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 Added: head/dns/powerdns/files/patch-pdns__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/powerdns/files/patch-pdns__Makefile.in Thu Jan 23 20:12:54 2014 (r340857) @@ -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 \