Index: branches/2018Q2/dns/powerdns/Makefile
===================================================================
--- branches/2018Q2/dns/powerdns/Makefile	(revision 469752)
+++ branches/2018Q2/dns/powerdns/Makefile	(revision 469753)
@@ -1,130 +1,129 @@
 # $FreeBSD$
 
 PORTNAME=	powerdns
-DISTVERSION=	4.1.1
-PORTREVISION=	1
+DISTVERSION=	4.1.2
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 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 LUAJIT MYDNS MYSQL OPENDBX OPENLDAP OPTALGO PGSQL PROTOBUF REMOTE SQLITE3 TINYDNS TOOLS UNIXODBC
 OPTIONS_GROUP=	EXPERIMENTAL REMOTEOPT
 OPTIONS_GROUP_EXPERIMENTAL=	LUABACKEND
 OPTIONS_GROUP_REMOTEOPT=	ZEROMQ
 ZEROMQ_IMPLIES=			REMOTE
 
 OPTIONS_DEFAULT=	MYSQL PGSQL
 OPTIONS_SUB=		yes
 
 GEOIP_LIB_DEPENDS=	libyaml-cpp.so:devel/yaml-cpp \
 			libGeoIP.so:net/GeoIP
 GEOIP_VARS=		MODULES+=geoip
 
 LUABACKEND_VARS=	MODULES+=lua
 
 LUAJIT_CONFIGURE_WITH=	luajit
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so.2:lang/luajit
 LUAJIT_USES_OFF=	lua
 
 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-botan \
 			--enable-libdecaf \
 			--enable-libsodium
 OPTALGO_LIB_DEPENDS=	libbotan-2.so:security/botan2 \
 			libdecaf.so:security/libdecaf \
 			libsodium.so:security/libsodium
 
 PGSQL_CONFIGURE_ON=	--with-pg-config=${LOCALBASE}/bin/pg_config
 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
 LUABACKEND_DESC=	Lua backend
 LUAJIT_DESC=		Use LuaJIT instead of Lua
 MYDNS_DESC=		MyDNS backend
 MYSQL_DESC=		MySQL backend
 OPENDBX_DESC=		OpenDBX backend
 OPENLDAP_DESC=		OpenLDAP backend
 OPTALGO_DESC=		Enable optional algorithms (12, 15 & 16)
 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 <bsd.port.mk>
Index: branches/2018Q2/dns/powerdns/distinfo
===================================================================
--- branches/2018Q2/dns/powerdns/distinfo	(revision 469752)
+++ branches/2018Q2/dns/powerdns/distinfo	(revision 469753)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518797353
-SHA256 (pdns-4.1.1.tar.bz2) = 08d388321c8a2c24ebe8d7e539f34a0ba2c0973313c168a1b5ecf507e4fb04ba
-SIZE (pdns-4.1.1.tar.bz2) = 1113659
+TIMESTAMP = 1525871919
+SHA256 (pdns-4.1.2.tar.bz2) = 86d8be0171d1ba85c2c6496d62ebf9198a5d522135aa0df3714c0d487a725695
+SIZE (pdns-4.1.2.tar.bz2) = 1117225
Index: branches/2018Q2/dns/powerdns/files/patch-pdns_opensslsigners.cc
===================================================================
--- branches/2018Q2/dns/powerdns/files/patch-pdns_opensslsigners.cc	(nonexistent)
+++ branches/2018Q2/dns/powerdns/files/patch-pdns_opensslsigners.cc	(revision 469753)
@@ -0,0 +1,12 @@
+--- pdns/opensslsigners.cc.orig	2018-02-16 09:52:29 UTC
++++ pdns/opensslsigners.cc
+@@ -33,7 +33,8 @@
+ #include "opensslsigners.hh"
+ #include "dnssecinfra.hh"
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || defined LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || \
++	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
+ /* OpenSSL < 1.1.0 needs support for threading/locking in the calling application. */
+ static pthread_mutex_t *openssllocks;
+ 

Property changes on: branches/2018Q2/dns/powerdns/files/patch-pdns_opensslsigners.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q2/dns/powerdns/pkg-plist
===================================================================
--- branches/2018Q2/dns/powerdns/pkg-plist	(revision 469752)
+++ branches/2018Q2/dns/powerdns/pkg-plist	(revision 469753)
@@ -1,73 +1,75 @@
 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
 %%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
 %%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
+%%OPENLDAP%%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
+%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/dnsdomain2.schema
+%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/pdns-domaininfo.schema
 %%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