Date: Mon, 15 Jul 2013 15:08:15 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323060 - in head/dns/powerdns-devel: . files Message-ID: <201307151508.r6FF8Fel039710@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Mon Jul 15 15:08:14 2013 New Revision: 323060 URL: http://svnweb.freebsd.org/changeset/ports/323060 Log: - Update to 3.3.r1 PR: 179379 Submitted by: maintainer Added: head/dns/powerdns-devel/files/patch-pdns_Makefile_in (contents, props changed) Deleted: head/dns/powerdns-devel/files/patch-pdns_cryptoppsigners_cc Modified: head/dns/powerdns-devel/Makefile head/dns/powerdns-devel/distinfo head/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in (contents, props changed) head/dns/powerdns-devel/pkg-descr (contents, props changed) Modified: head/dns/powerdns-devel/Makefile ============================================================================== --- head/dns/powerdns-devel/Makefile Mon Jul 15 15:07:06 2013 (r323059) +++ head/dns/powerdns-devel/Makefile Mon Jul 15 15:08:14 2013 (r323060) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= powerdns -PORTVERSION= 3.2.r4 -PORTREVISION?= 1 +PORTVERSION= 3.3.r1 +PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://powerdnssec.org/downloads/ @@ -23,6 +23,7 @@ CONFLICTS= powerdns-[2-3].[0-9]* NO_LATEST_LINK= YES +USES= pkgconfig USE_GMAKE= YES USE_SUBMAKE= YES USE_AUTOTOOLS= libtool @@ -32,7 +33,7 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-modules="" \ --with-dynmodules="pipe ${CONFIGURE_MODULES}" \ --sysconfdir="${PREFIX}/etc/pdns" \ - --with-boost="${LOCALBASE}" \ + --with-boost="${LOCALBASE}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ CURDIR2="${.CURDIR}" \ MKDIR="${MKDIR}" \ @@ -42,7 +43,9 @@ 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_DEFINE= PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL SQLITE SQLITE3 OPENDBX OPENLDAP OPENLDAP_LOCAL GEO DNSSEC POLARSSL +OPTIONS_MULTI= DNSSEC +OPTIONS_MULTI_DNSSEC= BOTAN110 CRYPTOPP PGSQL_DESC= PostgreSQL backend PGSQL_LOCAL_DESC= RUN_DEPEND on PostgreSQL server @@ -54,9 +57,12 @@ OPENDBX_DESC= OpenDBX backend OPENLDAP_DESC= OpenLDAP backend OPENLDAP_LOCAL_DESC= RUN_DEPEND on OpenLDAP server GEO_DESC= Geo backend -DNSSEC_DESC= Enable extra DNSSEC algorithms (13 & 14) +DNSSEC_DESC= Enable extra DNSSEC options +BOTAN110_DESC= Faster signing + ECDSA & GOST algorithms +CRYPTOPP_DESC= ECDSA algorithms +POLARSSL_DESC= Use embedded PolarSSL -OPTIONS_DEFAULT= PGSQL +OPTIONS_DEFAULT= PGSQL DNSSEC BOTAN110 POLARSSL .include <bsd.port.options.mk> @@ -72,7 +78,7 @@ PLIST_SUB+= WITHGEO="@comment " .endif .if ${PORT_OPTIONS:MSQLITE} && ${PORT_OPTIONS:MSQLITE3} -BROKEN= choose only one SQLite backend version +BROKEN= choose only one SQLite backend version .endif .if ${PORT_OPTIONS:MPGSQL} @@ -89,8 +95,6 @@ PLIST_SUB+= WITHPGSQL="@comment " 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 @@ -99,21 +103,19 @@ PLIST_SUB+= WITHMYSQL="@comment " .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 -SUB_LIST+= PGSQL=postgresql +USE_PGSQL?= server +SUB_LIST+= PGSQL=postgresql . endif .else -SUB_LIST+= PGSQL= +SUB_LIST+= PGSQL= .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 -SUB_LIST+= MYSQL=mysql +USE_MYSQL?= server +SUB_LIST+= MYSQL=mysql . endif .else -SUB_LIST+= MYSQL= +SUB_LIST+= MYSQL= .endif .if ${PORT_OPTIONS:MOPENLDAP} @@ -122,10 +124,10 @@ CONFIGURE_MODULES+= "ldap" 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 -SUB_LIST+= SLAPD=slapd +RUN_DEPENDS+= openldap-server>=0:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-server +SUB_LIST+= SLAPD=slapd . else -SUB_LIST+= SLAPD= +SUB_LIST+= SLAPD= . endif .else PLIST_SUB+= WITHOPENLDAP="@comment " @@ -157,8 +159,23 @@ CXXFLAGS+= -L${LOCALBASE}/lib PLIST_SUB+= WITHOPENDBX="@comment " .endif -.if ${PORT_OPTIONS:MDNSSEC} +.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 Modified: head/dns/powerdns-devel/distinfo ============================================================================== --- head/dns/powerdns-devel/distinfo Mon Jul 15 15:07:06 2013 (r323059) +++ head/dns/powerdns-devel/distinfo Mon Jul 15 15:08:14 2013 (r323060) @@ -1,2 +1,2 @@ -SHA256 (pdns-3.2-rc4.tar.gz) = adcf5f651811fb979f9033a3c156492c5637b3f9c872f335ac24ffa046a60934 -SIZE (pdns-3.2-rc4.tar.gz) = 1292662 +SHA256 (pdns-3.3-rc1.tar.gz) = 06269412693aae5925c338f8f03ea32d60584e1b206310dffc451a15039694e9 +SIZE (pdns-3.3-rc1.tar.gz) = 1333561 Modified: head/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in ============================================================================== --- head/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in Mon Jul 15 15:07:06 2013 (r323059) +++ head/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in Mon Jul 15 15:08:14 2013 (r323060) @@ -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@PGSQL_incdir@ -+INCLUDES = -I@includedir@ -I@PGSQL_incdir@ - libgpgsqlbackend_la_SOURCES = gpgsqlbackend.cc gpgsqlbackend.hh \ - spgsql.hh spgsql.cc - Added: head/dns/powerdns-devel/files/patch-pdns_Makefile_in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/powerdns-devel/files/patch-pdns_Makefile_in Mon Jul 15 15:08:14 2013 (r323060) @@ -0,0 +1,38 @@ +--- pdns/Makefile.in.orig 2013-05-28 08:12:43.000000000 +0200 ++++ pdns/Makefile.in 2013-06-03 11:39:18.377503664 +0200 +@@ -53,7 +53,7 @@ + dnsscan$(EXEEXT) nproxy$(EXEEXT) notify$(EXEEXT) \ + pdnssec$(EXEEXT) dnsbulktest$(EXEEXT) nsec3dig$(EXEEXT) + @BOTAN110_TRUE@am__append_3 = botan110signers.cc botansigners.cc +-@BOTAN110_TRUE@am__append_4 = $(BOTAN110_LIBS) -lgmp -lrt ++@BOTAN110_TRUE@am__append_4 = $(BOTAN110_LIBS) + @BOTAN18_TRUE@am__append_5 = botan18signers.cc botansigners.cc + @BOTAN18_TRUE@am__append_6 = $(BOTAN18_LIBS) -lgmp + @CRYPTOPP_TRUE@am__append_7 = cryptoppsigners.cc +@@ -61,7 +61,7 @@ + @SQLITE3_TRUE@am__append_9 = ssqlite3.cc ssqlite3.hh + @ORACLE_TRUE@am__append_10 = $(ORACLE_LIBS) + @BOTAN110_TRUE@am__append_11 = botan110signers.cc botansigners.cc +-@BOTAN110_TRUE@am__append_12 = $(BOTAN110_LIBS) -lgmp -lrt ++@BOTAN110_TRUE@am__append_12 = $(BOTAN110_LIBS) + @BOTAN18_TRUE@am__append_13 = botan18signers.cc botansigners.cc + @BOTAN18_TRUE@am__append_14 = $(BOTAN18_LIBS) -lgmp + @CRYPTOPP_TRUE@am__append_15 = cryptoppsigners.cc +@@ -752,7 +752,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_4) $(am__append_6) \ ++ $(am__append_4) $(am__append_6) \ + $(am__append_8) $(am__append_10) + pdnssec_SOURCES = pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc \ + dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh misc.cc \ +@@ -775,7 +775,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_12) \ ++ $(SQLITE3_LIBS) $(am__append_12) \ + $(am__append_14) $(am__append_16) $(am__append_18) + 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 \ Modified: head/dns/powerdns-devel/pkg-descr ============================================================================== --- head/dns/powerdns-devel/pkg-descr Mon Jul 15 15:07:06 2013 (r323059) +++ head/dns/powerdns-devel/pkg-descr Mon Jul 15 15:08:14 2013 (r323060) @@ -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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307151508.r6FF8Fel039710>