Index: head/dns/powerdns/Makefile =================================================================== --- head/dns/powerdns/Makefile (revision 455510) +++ head/dns/powerdns/Makefile (revision 455511) @@ -1,134 +1,133 @@ # $FreeBSD$ PORTNAME= powerdns -PORTVERSION= 4.0.4 -PORTREVISION= 6 +DISTVERSION= 4.1.0 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ -DISTNAME= pdns-${PORTVERSION} +DISTNAME= pdns-${DISTVERSION} MAINTAINER= tremere@cainites.net COMMENT= Advanced DNS server with multiple backends including SQL LICENSE= GPLv2 BROKEN_powerpc64= Does not build: undefined reference to std::__throw_out_of_range_fmt BROKEN_sparc64= Does not compile: error: to_string is not a member of std LIB_DEPENDS= libboost_serialization.so:devel/boost-libs USES= compiler:c++11-lib cpe gmake libtool localbase:ldflags pathfix pkgconfig ssl \ tar:bzip2 USE_LDCONFIG= YES USE_SUBMAKE= YES GNU_CONFIGURE= YES INSTALL_TARGET= install-strip CONFIGURE_ARGS= --disable-static \ --with-modules="" \ --with-dynmodules="pipe bind ${MODULES}" \ --docdir="${PREFIX}/share/doc/powerdns" \ --sysconfdir="${PREFIX}/etc/pdns" \ --with-boost="${LOCALBASE}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ CURDIR2="${.CURDIR}" \ MKDIR="${MKDIR}" \ DISTNAME="${DISTNAME}" \ POWERDNS_OPTIONS="${POWERDNS_OPTIONS}" SUB_FILES= pkg-message USE_RC_SUBR= pdns OPTIONS_DEFINE= GEOIP MYDNS MYSQL OPENDBX OPENLDAP OPTALGO PGSQL PROTOBUF REMOTE SQLITE3 TINYDNS TOOLS UNIXODBC OPTIONS_GROUP= EXPERIMENTAL REMOTEOPT OPTIONS_GROUP_EXPERIMENTAL= LUABACKEND OPTIONS_GROUP_REMOTEOPT= ZEROMQ OPTIONS_SINGLE= LUASG OPTIONS_SINGLE_LUASG= LUA LUAJIT ZEROMQ_IMPLIES= REMOTE OPTIONS_DEFAULT= LUA PGSQL OPTIONS_SUB= yes GEOIP_LIB_DEPENDS= libyaml-cpp.so:devel/yaml-cpp \ libGeoIP.so:net/GeoIP GEOIP_VARS= MODULES+=geoip LUA_CONFIGURE_WITH= lua LUA_USES= lua LUABACKEND_VARS= MODULES+=lua LUAJIT_CONFIGURE_WITH= luajit LUAJIT_LIB_DEPENDS= libluajit-5.1.so.2:lang/luajit MYDNS_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYDNS_USES= mysql MYDNS_VARS= MODULES+=mydns MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYSQL_CONFIGURE_OFF= --without-mysql MYSQL_USES= mysql MYSQL_VARS= MODULES+=gmysql OPENDBX_LIB_DEPENDS= libopendbx.so:databases/opendbx OPENDBX_VARS= MODULES+=opendbx OPENLDAP_CXXFLAGS= -DLDAP_DEPRECATED=1 OPENLDAP_USE= OPENLDAP=YES OPENLDAP_VARS= MODULES+=ldap -OPTALGO_CONFIGURE_ON= --enable-botan1.10 \ +OPTALGO_CONFIGURE_ON= --enable-botan \ --enable-libsodium -OPTALGO_LIB_DEPENDS= libbotan-1.10.so:security/botan110 \ +OPTALGO_LIB_DEPENDS= libbotan-2.so:security/botan2 \ libsodium.so:security/libsodium PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} PGSQL_CONFIGURE_OFF= --without-pgsql PGSQL_USES= pgsql PGSQL_VARS= MODULES+=gpgsql PROTOBUF_CONFIGURE_WITH= protobuf PROTOBUF_LIB_DEPENDS= libprotobuf.so:devel/protobuf REMOTE_VARS= MODULES+=remote SQLITE3_USES= sqlite:3 SQLITE3_VARS= MODULES+=gsqlite3 TINYDNS_CONFIGURE_ON= CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include" TINYDNS_LIB_DEPENDS= libcdb.so:databases/tinycdb TINYDNS_VARS= MODULES+=tinydns TOOLS_CONFIGURE_ENABLE= tools UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC UNIXODBC_VARS= MODULES+=godbc ZEROMQ_CONFIGURE_ARGS= --enable-remotebackend-zeromq ZEROMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 GEOIP_DESC= GeoIP backend LUASG_DESC= Lua Engine LUABACKEND_DESC= Lua backend LUAJIT_DESC= Enable LuaJIT MYDNS_DESC= MyDNS backend MYSQL_DESC= MySQL backend OPENDBX_DESC= OpenDBX backend OPENLDAP_DESC= OpenLDAP backend OPTALGO_DESC= Enable optional algorithms (12 & 15) PGSQL_DESC= PostgreSQL backend PROTOBUF_DESC= Protobuf support REMOTE_DESC= Remote backend REMOTEOPT_DESC= Remote backend connectors SQLITE3_DESC= SQLite 3 backend TINYDNS_DESC= TinyDNS backend TOOLS_DESC= Build extra tools ZEROMQ_DESC= Enable ZeroMQ connector (Implies REMOTE enabled) post-install:: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @${STAGEDIR}${LOCALBASE}/sbin/pdns_server --module-dir=${STAGEDIR}${LOCALBASE}/lib/pdns --launch="pipe bind ${MODULES}" --config > ${STAGEDIR}${EXAMPLESDIR}/pdns.conf @${REINPLACE_CMD} -e 's;${STAGEDIR};;' -i '' ${STAGEDIR}${EXAMPLESDIR}/pdns.conf .include Index: head/dns/powerdns/distinfo =================================================================== --- head/dns/powerdns/distinfo (revision 455510) +++ head/dns/powerdns/distinfo (revision 455511) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498217242 -SHA256 (pdns-4.0.4.tar.bz2) = d974ab89de69477c7f581a3233bc731eacbb43d479291e472b2c531c83b6d763 -SIZE (pdns-4.0.4.tar.bz2) = 1320327 +TIMESTAMP = 1512047293 +SHA256 (pdns-4.1.0.tar.bz2) = db9193b0f0255c24dfbfc31ecff8bd39e21fec05ff7526e5aea963abc517f0f3 +SIZE (pdns-4.1.0.tar.bz2) = 1116905 Index: head/dns/powerdns/files/patch-ext_json11_json11.cpp =================================================================== --- head/dns/powerdns/files/patch-ext_json11_json11.cpp (revision 455510) +++ head/dns/powerdns/files/patch-ext_json11_json11.cpp (nonexistent) @@ -1,37 +0,0 @@ ---- ext/json11/json11.cpp.orig 2017-01-18 18:06:37 UTC -+++ ext/json11/json11.cpp -@@ -37,11 +37,21 @@ using std::make_shared; - using std::initializer_list; - using std::move; - -+/* Helper for representing null - just a do-nothing struct, plus comparison -+ * operators so the helpers in JsonValue work. We can't use nullptr_t because -+ * it may not be orderable. -+*/ -+ -+struct NullStruct { -+ bool operator==(NullStruct) const { return true; } -+ bool operator<(NullStruct) const { return false; } -+}; -+ - /* * * * * * * * * * * * * * * * * * * * - * Serialization - */ - --static void dump(std::nullptr_t, string &out) { -+static void dump(NullStruct, string &out) { - out += "null"; - } - -@@ -204,9 +214,9 @@ public: - explicit JsonObject(Json::object &&value) : Value(move(value)) {} - }; - --class JsonNull final : public Value { -+class JsonNull final : public Value { - public: -- JsonNull() : Value(nullptr) {} -+ JsonNull() : Value({}) {} - }; - - /* * * * * * * * * * * * * * * * * * * * Property changes on: head/dns/powerdns/files/patch-ext_json11_json11.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/dns/powerdns/files/patch-pdns_botan110signers.cc =================================================================== --- head/dns/powerdns/files/patch-pdns_botan110signers.cc (revision 455510) +++ head/dns/powerdns/files/patch-pdns_botan110signers.cc (nonexistent) @@ -1,15 +0,0 @@ -https://github.com/PowerDNS/pdns/pull/5498/commits/0f8f34997afc2c3609b2f3df72ca808940d2a778#diff-a69f1deeeb9a0d7ebabc200a4c24c9f9L184 ---- pdns/botan110signers.cc.orig 2017-08-31 08:52:49 UTC -+++ pdns/botan110signers.cc -@@ -181,8 +181,9 @@ std::string GOSTDNSCryptoKeyEngine::getP - - std::string GOSTDNSCryptoKeyEngine::getPublicKeyString() const - { -- const BigInt&x =d_key->public_point().get_affine_x(); -- const BigInt&y =d_key->public_point().get_affine_y(); -+ std::shared_ptr pk = d_pubkey ? d_pubkey : d_key; -+ const BigInt&x =pk->public_point().get_affine_x(); -+ const BigInt&y =pk->public_point().get_affine_y(); - - size_t part_size = std::max(x.bytes(), y.bytes()); - Property changes on: head/dns/powerdns/files/patch-pdns_botan110signers.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/dns/powerdns/pkg-plist =================================================================== --- head/dns/powerdns/pkg-plist (revision 455510) +++ head/dns/powerdns/pkg-plist (revision 455511) @@ -1,71 +1,73 @@ bin/pdns_control bin/pdnsutil bin/zone2json bin/zone2sql sbin/pdns_server %%PROTOBUF%%bin/dnspcap2protobuf %%TOOLS%%bin/dnsbulktest %%TOOLS%%bin/dnsgram %%TOOLS%%bin/dnsreplay %%TOOLS%%bin/dnsscan %%TOOLS%%bin/dnsscope %%TOOLS%%bin/dnstcpbench %%TOOLS%%bin/dnswasher %%TOOLS%%bin/dumresp %%TOOLS%%bin/ixplore %%TOOLS%%bin/nproxy %%TOOLS%%bin/nsec3dig %%TOOLS%%bin/pdns_notify %%TOOLS%%bin/saxfr %%TOOLS%%bin/sdig %%TOOLS%%bin/stubquery lib/pdns/libbindbackend.so lib/pdns/libpipebackend.so %%GEOIP%%lib/pdns/libgeoipbackend.so %%LUABACKEND%%lib/pdns/libluabackend.so %%MYDNS%%lib/pdns/libmydnsbackend.so %%MYSQL%%lib/pdns/libgmysqlbackend.so %%OPENDBX%%lib/pdns/libopendbxbackend.so %%OPENLDAP%%lib/pdns/libldapbackend.so %%OPENLDAP%%bin/zone2ldap %%PGSQL%%lib/pdns/libgpgsqlbackend.so %%REMOTE%%lib/pdns/libremotebackend.so %%SQLITE3%%lib/pdns/libgsqlite3backend.so %%TINYDNS%%lib/pdns/libtinydnsbackend.so %%UNIXODBC%%lib/pdns/libgodbcbackend.so -man/man1/calidns.1.gz -man/man1/dnsbulktest.1.gz -man/man1/dnsgram.1.gz -man/man1/dnsscan.1.gz -man/man1/dumresp.1.gz -man/man1/ixplore.1.gz -man/man1/nproxy.1.gz -man/man1/nsec3dig.1.gz -man/man1/pdns_notify.1.gz +%%TOOLS%%man/man1/calidns.1.gz +%%TOOLS%%man/man1/dnsbulktest.1.gz +%%TOOLS%%man/man1/dnsgram.1.gz +%%TOOLS%%man/man1/dnsscan.1.gz +%%TOOLS%%man/man1/dumresp.1.gz +%%TOOLS%%man/man1/ixplore.1.gz +%%TOOLS%%man/man1/nproxy.1.gz +%%TOOLS%%man/man1/nsec3dig.1.gz +%%TOOLS%%man/man1/pdns_notify.1.gz man/man1/pdnsutil.1.gz -man/man1/saxfr.1.gz -man/man1/sdig.1.gz +%%TOOLS%%man/man1/saxfr.1.gz +%%TOOLS%%man/man1/sdig.1.gz man/man1/pdns_control.1.gz man/man1/pdns_server.1.gz man/man1/zone2json.1.gz man/man1/zone2ldap.1.gz man/man1/zone2sql.1.gz %%PROTOBUF%%man/man1/dnspcap2protobuf.1.gz %%TOOLS%%man/man1/dnstcpbench.1.gz %%TOOLS%%man/man1/dnsreplay.1.gz %%TOOLS%%man/man1/dnsscope.1.gz %%TOOLS%%man/man1/dnswasher.1.gz @sample etc/pdns/pdns.conf-dist etc/pdns/pdns.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdns.conf %%PORTEXAMPLES%%@dir %%EXAMPLESDIR%% +%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/3.4.0_to_4.1.0_schema.mysql.sql +%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/3.4.0_to_4.1.0_schema.pgsql.sql %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/dnssec-3.x_to_3.4.0_schema.mysql.sql %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dnssec-3.x_to_3.4.0_schema.pgsql.sql %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dnssec-3.x_to_3.4.0_schema.sqlite3.sql %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/nodnssec-3.x_to_3.4.0_schema.mysql.sql %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/nodnssec-3.x_to_3.4.0_schema.pgsql.sql %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql %%MYDNS%%%%PORTDOCS%%%%DOCSDIR%%/schema.mydns.sql %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/schema.mysql.sql %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/schema.pgsql.sql %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/schema.sqlite3.sql %%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/schema.mssql.sql