MFH: r499039 r505025 r505486

dns/powerdns: update to 4.1.8

PR:		236717
Submitted by:	Ralf van der Enden <tremere@cainites.net> (maintainer)

Similar to r502813 for dns/powerdns-recursor, fix build on GCC-based
systems:

  Don't add -L/usr/lib unconditionally, it makes gcc8 (used on GCC-based
  systems) link to base libstdc++.

Given that this is a build fix that does not affect clang-based systems,
there should be no need to bump portrevision.

PR:		238742
Reported by:	pkubaj
Approved by:	maintainer

dns/powerdns: update to 4.1.10

PR:		238705
Submitted by:	Ralf van der Enden <tremere@cainites.net> (maintainer)
Security:	1c21f6a3-9415-11e9-95ec-6805ca2fa271

Approved by:	ports-secteam (implicit)

3 files changed, 71 insertions, 54 deletions

diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index ec8814c3f4da..f38e4d462c87 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	powerdns
-DISTVERSION=	4.1.7
-PORTREVISION=	1
+DISTVERSION=	4.1.9
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${DISTVERSION}
@@ -13,85 +12,103 @@ 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
+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
+USES=		compiler:c++11-lib cpe gmake libtool localbase:ldflags pathfix \
+		pkgconfig ssl tar:bzip2
 
 USE_LDCONFIG=	YES
+USE_RC_SUBR=	pdns
 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}"
+		--with-boost="${LOCALBASE}" \
+		--with-dynmodules="pipe bind ${MODULES}" \
+		--with-modules=""
+
+INSTALL_TARGET=	install-strip
+SCRIPTS_ENV=	CURDIR2="${.CURDIR}" DISTNAME="${DISTNAME}" MKDIR="${MKDIR}" \
+		POWERDNS_OPTIONS="${POWERDNS_OPTIONS}" \
+		WRKDIRPREFIX="${WRKDIRPREFIX}"
 
 SUB_FILES=	pkg-message
 
-USE_RC_SUBR=	pdns
+OPTIONS_DEFINE=		DOCS EXAMPLES LUAJIT MYDNS MYSQL OPENDBX OPENLDAP \
+			OPTALGO PGSQL PROTOBUF REMOTE SQLITE3 TINYDNS TOOLS \
+			UNIXODBC
+OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE3
 
-OPTIONS_DEFINE=	DOCS EXAMPLES LUAJIT MYDNS MYSQL OPENDBX OPENLDAP OPTALGO PGSQL PROTOBUF REMOTE SQLITE3 TINYDNS TOOLS UNIXODBC
-OPTIONS_GROUP=	EXPERIMENTAL REMOTEOPT
+OPTIONS_GROUP=			EXPERIMENTAL REMOTEOPT
 OPTIONS_GROUP_EXPERIMENTAL=	LUABACKEND
 OPTIONS_GROUP_REMOTEOPT=	ZEROMQ
-ZEROMQ_IMPLIES=			REMOTE
 
-OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE3
-OPTIONS_SUB=		yes
+OPTIONS_SUB=	yes
+
+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
+REMOTEOPT_DESC=		Remote backend connectors
+REMOTE_DESC=		Remote backend
+SQLITE3_DESC=		SQLite 3 backend
+TINYDNS_DESC=		TinyDNS backend
+TOOLS_DESC=		Build extra tools
+ZEROMQ_DESC=		Enable ZeroMQ connector (Implies REMOTE enabled)
 
 LUABACKEND_VARS=	MODULES+=lua
 
-LUAJIT_CONFIGURE_WITH=	luajit
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so.2:lang/luajit
 LUAJIT_USES_OFF=	lua
+LUAJIT_CONFIGURE_WITH=	luajit
 
-MYDNS_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
 MYDNS_USES=		mysql
+MYDNS_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
 MYDNS_VARS=		MODULES+=mydns
 
-MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
-MYSQL_CONFIGURE_OFF=	--without-mysql
 MYSQL_USES=		mysql
+MYSQL_CONFIGURE_OFF=	--without-mysql
+MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
 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_CXXFLAGS=	-DLDAP_DEPRECATED=1
 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
+OPTALGO_CONFIGURE_ON=	--enable-botan \
+			--enable-libdecaf \
+			--enable-libsodium
 
-PGSQL_CONFIGURE_ON=	--with-pg-config=${LOCALBASE}/bin/pg_config
 PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_ON=	--with-pg-config=${LOCALBASE}/bin/pg_config
 PGSQL_VARS=		MODULES+=gpgsql
 
+PROTOBUF_LIB_DEPENDS=		libprotobuf.so:devel/protobuf
 PROTOBUF_CONFIGURE_WITH=	protobuf
-PROTOBUF_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
-REMOTE_VARS=		MODULES+=remote
+REMOTE_VARS=	MODULES+=remote
 
-SQLITE3_USES=		sqlite:3
-SQLITE3_VARS=		MODULES+=gsqlite3
+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_CONFIGURE_ON=	CDB_CFLAGS="-I${LOCALBASE}/include" \
+			CDB_LIBS="-L${LOCALBASE}/lib -lcdb"
 TINYDNS_VARS=		MODULES+=tinydns
 
 TOOLS_CONFIGURE_ENABLE=	tools
@@ -99,24 +116,9 @@ TOOLS_CONFIGURE_ENABLE=	tools
 UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 UNIXODBC_VARS=		MODULES+=godbc
 
-ZEROMQ_CONFIGURE_ARGS=	--enable-remotebackend-zeromq
+ZEROMQ_IMPLIES=		REMOTE
 ZEROMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
-
-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)
+ZEROMQ_CONFIGURE_ON=	--enable-remotebackend-zeromq
 
 post-install::
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/dns/powerdns/distinfo b/dns/powerdns/distinfo
index 86cc93156f9d..c8a45860cd57 100644
--- a/dns/powerdns/distinfo
+++ b/dns/powerdns/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552984219
-SHA256 (pdns-4.1.7.tar.bz2) = 6421de8e8c32f148c9197574135f90378075354c744950615ccb1bbc2ac88485
-SIZE (pdns-4.1.7.tar.bz2) = 1116191
+TIMESTAMP = 1560855838
+SHA256 (pdns-4.1.9.tar.bz2) = d352f7ddd510a7d21421289950a0e4a90e6e19d7274b63029e0c9ff7fb19bdb6
+SIZE (pdns-4.1.9.tar.bz2) = 1117241
diff --git a/dns/powerdns/files/patch-configure b/dns/powerdns/files/patch-configure
new file mode 100644
index 000000000000..e07547e68394
--- /dev/null
+++ b/dns/powerdns/files/patch-configure
@@ -0,0 +1,15 @@
+--- configure.orig	2019-03-22 11:48:09 UTC
++++ configure
+@@ -18170,8 +18170,10 @@ fi
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl/crypto.h in $ssldir" >&5
+ $as_echo_n "checking for openssl/crypto.h in $ssldir... " >&6; }
+             if test -f "$ssldir/include/openssl/crypto.h"; then
+-                LIBCRYPTO_INCLUDES="-I$ssldir/include"
+-                LIBCRYPTO_LDFLAGS="-L$ssldir/lib"
++                if test $ssldir != /usr; then
++                    LIBCRYPTO_INCLUDES="-I$ssldir/include"
++                    LIBCRYPTO_LDFLAGS="-L$ssldir/lib"
++                fi
+                 LIBCRYPTO_LIBS="-lcrypto"
+                 found=true
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5