Updated to latest release, 3.4.3. Updated and defuzzed patches. Added cryptopp

and zeromq options, which are disabled by default. ChangeLog:

PowerDNS Authoritative Server 3.4.3

Warning: Version 3.4.3 of the PowerDNS Authoritative Server is a major upgrade if you are coming from 2.9.x. Additionally, if you are coming from any 3.x version (including 3.3.1), there is a mandatory SQL schema upgrade. Please refer to the Upgrade documentation for important information on correct and stable operation, as well as notes on performance and memory use.

Released March 2nd, 2015


Bug fixes:

    commit ceb49ce: pdns_control: exit 1 on unknown command (Ruben Kerkhof)
    commit 1406891: evaluate KSK ZSK pairs per algorithm (Kees Monshouwer)
    commit 3ca050f: always set di.notified_serial in getAllDomains (Kees Monshouwer)
    commit d9d09e1: pdns_control: don't open socket in /tmp (Ruben Kerkhof)

New features:

    commit 2f67952: Limit who can send us AXFR notify queries (Ruben Kerkhof)

Improvements:

    commit d7bec64: respond REFUSED instead of NOERROR for "unknown zone" situations
    commit ebeb9d7: Check for Lua 5.3 (Ruben Kerkhof)
    commit d09931d: Check compiler for relro support instead of linker (Ruben Kerkhof)
    commit c4b0d0c: Replace PacketHandler with UeberBackend where possible (Christian Hofstaedtler)
    commit 5a85152: PacketHandler: Share UeberBackend with DNSSECKeeper (Christian Hofstaedtler)
    commit 97bd444: fix building with GCC 5

Experimental API changes (Christian Hofstaedtler):

    commit ca44706: API: move shared DomainInfo reader into it's own function
    commit 102602f: API: allow writing to domains.account field
    commit d82f632: API: read and expose domain account field
    commit 2b06977: API: be more strict when parsing record contents
    commit 2f72b7c: API: Reject unknown types (TYPE0)
    commit d82f632: API: read and expose domain account field

PowerDNS Authoritative Server 3.4.2

Warning: Version 3.4.2 of the PowerDNS Authoritative Server is a major upgrade if you are coming from 2.9.x. Additionally, if you are coming from any 3.x version (including 3.3.1), there is a mandatory SQL schema upgrade. Please refer to the Upgrade documentation for important information on correct and stable operation, as well as notes on performance and memory use.

Released February 3rd, 2015

Find the downloads on our download page.

This is a performance and bugfix update to 3.4.1 and any earlier version. For high traffic setups, including those using DNSSEC, upgrading to 3.4.2 may show tremendous performance increases.

A list of changes since 3.4.1 follows.

Improvements:

    commit 73004f1: implement CORS for the HTTP API
    commit 4d9c289: qtype is now case insensitive in API and database
    commit 13af5d8, commit 223373a, commit 1d5a68d, commit 705a73f, commit b418d52: Allow (optional) PIE hardening
    commit 2f86f20: json-api: remove priority from json
    commit cefcf9f: backport remotebackend fixes
    commit 920f987, commit dd8853c: Support Lua 5.3
    commit 003aae5: support single-type ZSK signing
    commit 1c57e1d: Potential fix for ticket #1907, we now try to trigger libgcc_s.so.1 to load before we chroot. I can't reproduce the bug on my local system, but this "should" help. Seriously.
    commit 031ab21: update polarssl to 1.3.9

Bug fixes:

    commit 60b2b7c, commit d962fbc: refuse overly long labels in names
    commit a64fd6a: auth: limit long version strings to 63 characters and catch exceptions in secpoll
    commit fa52e02: pdnssec: fix ttl check for RRSIG records
    commit 0678b25: fix up latency reporting for sub-millisecond latencies (would clip to 0)
    commit d45c1f1: make sure we don't throw an exception on "pdns_control show" of an unknown variable
    commit 63c8088: fix startup race condition with carbon thread already trying to broadcast uninitialized data
    commit 796321c: make qsize-q more robust
    commit 407867c: mind04 discovered we count corrupt packets and EAGAIN situations as validly received packets, skewing the udp questions/answers graphs on auth.
    commit f06d069: make latency & qsize reporting 'live'. Plus fix that we only reported the qsize of the first distributor.
    commit 2f3498e: fix up statbag for carbon protocol and function pointers
    commit 0f2f999: get priority from table in Lua axfrfilter; fixes ticket #1857
    commit 96963e2, commit bbcbbbe, commit d5c9c07: various backends: fix records pointing at root
    commit e94c2c4: remove additional layer of trailing . stripping, which broke MX records to the root in the BIND backend. Should close ticket #1243.
    commit 8f35ba2: api: use uncached results for getKeys()
    commit c574336: read ALLOW-AXFR-FROM from the backend with the metadata

Minor changes:

    commit 1e39b4c: move manpages to section 1
    commit b3992d9: secpoll: Replace ~ with _
    commit 9799ef5: only zones with an active ksk are secure
    commit d02744f: api: show keys for zones without active ksk

New features:

    commit 1b97ba0: add signatures metric to auth, so we can plot signatures/second
    commit 92cef2d: pdns_control: make it posible to notify all zones at once
    commit f648752: JSON API: provide flush-cache, notify, axfr-retrieve
    commit 02653a7: add 'bench-db' to do very simple database backend performance benchmark
    commit a83257a: enable callback based metrics to statbas, and add 5 such metrics: uptime, sys-msec, user-msec, key-cache-size, meta-cache-size, signature-cache-size

Performance improvements:

    commit a37fe8c: better key for packetcache
    commit e5217bb: don't do time(0) under signature cache lock
    commit d061045, commit 135db51, commit 7d0f392: shard the packet cache, closing ticket #1910.
    commit d71a712: with thanks to Jack Lloyd, this works around the default Botan allocator slowing down for us during production use.

24 files changed, 118 insertions, 130 deletions

diff --git a/net/powerdns/Makefile.common b/net/powerdns/Makefile.common
index c7ade8741c4..47573f8e8f0 100644
--- a/net/powerdns/Makefile.common
+++ b/net/powerdns/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.10 2014/12/10 14:50:08 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.11 2015/03/27 23:37:52 rodent Exp $
 
-PDNS_VERSION=		3.4.1
+PDNS_VERSION=		3.4.3
 DISTNAME=		pdns-${PDNS_VERSION}
 CATEGORIES=		net
 MASTER_SITES=		http://downloads.powerdns.com/releases/
@@ -10,11 +10,13 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.powerdns.com/
 LICENSE=		gnu-gpl-v2
 
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		bison flex gmake pkg-config
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
+BUILD_DEPENDS+=		ragel-[0-9]*:../../devel/ragel
+
 GNU_CONFIGURE_LIBSUBDIR=pdns
 
 CONFIGURE_ARGS+=	--enable-pdns_server
@@ -23,6 +25,7 @@ CONFIGURE_ARGS+=	--without-lua
 
 BUILDLINK_TRANSFORM+=	rm:-fstack-protector
 
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
diff --git a/net/powerdns/PLIST b/net/powerdns/PLIST
index 37bf6b617ae..1c2b0a1eae0 100644
--- a/net/powerdns/PLIST
+++ b/net/powerdns/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2014/12/10 14:50:08 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/03/27 23:37:52 rodent Exp $
 ${PLIST.tools}bin/dnsbulktest
 ${PLIST.tools}bin/dnsdist
 ${PLIST.tools}bin/dnsreplay
@@ -22,14 +22,15 @@ ${PLIST.remote}lib/pdns/pdns/libremotebackend.la
 ${PLIST.sqlite}lib/pdns/pdns/libgsqlite3backend.la
 ${PLIST.tools}man/man1/dnsdist.1
 ${PLIST.tools}man/man1/dnstcpbench.1
-${PLIST.tools}man/man8/dnsreplay.8
-${PLIST.tools}man/man8/dnsscope.8
-${PLIST.tools}man/man8/dnswasher.8
-man/man8/pdns_control.8
-man/man8/pdns_server.8
-man/man8/pdnssec.8
-man/man8/zone2ldap.8
-man/man8/zone2sql.8
+${PLIST.tools}man/man1/dnsreplay.1
+${PLIST.tools}man/man1/dnsscope.1
+${PLIST.tools}man/man1/dnstcpbench.1
+${PLIST.tools}man/man1/dnswasher.1
+man/man1/pdns_control.1
+man/man1/pdns_server.1
+man/man1/pdnssec.1
+man/man1/zone2ldap.1
+man/man1/zone2sql.1
 sbin/pdns_server
 ${PLIST.sqlite}share/doc/pdns/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
 ${PLIST.sqlite}share/doc/pdns/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
diff --git a/net/powerdns/distinfo b/net/powerdns/distinfo
index c64ce8b9353..5eba50bca6b 100644
--- a/net/powerdns/distinfo
+++ b/net/powerdns/distinfo
@@ -1,26 +1,25 @@
-$NetBSD: distinfo,v 1.17 2015/02/17 02:00:07 rodent Exp $
+$NetBSD: distinfo,v 1.18 2015/03/27 23:37:52 rodent Exp $
 
-SHA1 (pdns-3.4.1.tar.bz2) = e4d807b4dc27ef130a49e0efaf82a74cb66f5b11
-RMD160 (pdns-3.4.1.tar.bz2) = fe9df921ac82db834bc011c7c20ad9b436c70cec
-Size (pdns-3.4.1.tar.bz2) = 1237002 bytes
-SHA1 (patch-aa) = 7fc9bf227c21983d5492f7359d313a3b4e56e43f
-SHA1 (patch-ab) = 705a7f5f7035a46ab72b08ef24b1db888a406122
-SHA1 (patch-configure) = ef0dc268eb81470c3449eab39cde6ddf9f49175f
-SHA1 (patch-modules_luabackend_luabackend.hh) = fd1d04d71ff560efd92137bd468475d5e5c165ce
-SHA1 (patch-modules_pipebackend_pipebackend.cc) = 51cd06282231768df2e6f82c01e30575dc390a95
+SHA1 (pdns-3.4.3.tar.bz2) = 578968d94fda8578473bdb357df77ce8e4cb7448
+RMD160 (pdns-3.4.3.tar.bz2) = e8ab5774ceb12178853d6207c4777b60e6c82933
+Size (pdns-3.4.3.tar.bz2) = 1332686 bytes
+SHA1 (patch-aa) = 5d7a2f6d7b74139fbdcd7673181ccaeb91f1e565
+SHA1 (patch-ab) = a816def3825c0260642dab85f518bebaf4ba904b
+SHA1 (patch-modules_luabackend_luabackend.hh) = 23ae1a2c047f367a51b7bfa10a546aeb91cccea4
+SHA1 (patch-modules_pipebackend_pipebackend.cc) = 975cf47dc92bf4402167b5a25f85eaf527398c06
 SHA1 (patch-modules_pipebackend_pipebackend.hh) = 3ff9f666a1b348810be38ffe67fd740521390630
-SHA1 (patch-pdns_botan18signers.cc) = 6827a3e2eade467c53d710b57352bd9ed978b47c
-SHA1 (patch-pdns_dns.hh) = ced89abc892e4790f2968858122fca5a02b17a30
-SHA1 (patch-pdns_dnspacket.cc) = 9b3abf3e572d0cdf978d18caca82b601d55f3cc1
-SHA1 (patch-pdns_dnsparser.cc) = ec1a279a48825a2adbc528a644b711d225a7e728
-SHA1 (patch-pdns_dnsparser.hh) = d9480c40b97fb8c7d8f1dbbe1777c42ef270d9d1
-SHA1 (patch-pdns_dnsscope.cc) = cc38014e1eb20ed3c65b59714e2725a8283f6391
-SHA1 (patch-pdns_dynloader.cc) = 6ef7957917936f077307a4b6c79afe5a4a6ef7c7
-SHA1 (patch-pdns_htimer.cc) = 43eb784a58dcad9b3cedca4a6aeae777e33bd2f9
-SHA1 (patch-pdns_misc.cc) = 989bd75074f6349b7e0720a490ff99a4af558f6e
-SHA1 (patch-pdns_nameserver.cc) = 0b6b888edc0656d9428dda760b4891c0c19f9e47
-SHA1 (patch-pdns_pdns_recursor.cc) = df9465d337fceb93caaff7ffc32d17681a8fe77d
-SHA1 (patch-pdns_receiver.cc) = 4411bfeccb2814550b834ddabee930918631c666
-SHA1 (patch-pdns_recursor__cache.cc) = a4c63c20a3e58d996a631c8a7754b8afb45cdb86
-SHA1 (patch-pdns_resolver.cc) = 3b03f3dde04217d527f6e841ad9d5f19bbc79f53
-SHA1 (patch-pdns_tcpreceiver.cc) = 3d86e0e87fe82c034210f61d6a3c57cd7ab9d3ba
+SHA1 (patch-pdns_botan18signers.cc) = 58df2d630ac46ea2fd1ce2699ce7a3bd927de177
+SHA1 (patch-pdns_dns.hh) = 6f47292c573d1a01cdd2ba3312edf17e216c2dbc
+SHA1 (patch-pdns_dnspacket.cc) = 822d8f1758069cbdc90f09b29e538257af5f5141
+SHA1 (patch-pdns_dnsparser.cc) = 3b7f1929013261d09112394e525dede41e03afff
+SHA1 (patch-pdns_dnsparser.hh) = 1ad7090312992915a0ad9bf8b006d229262936c3
+SHA1 (patch-pdns_dnsscope.cc) = a42bbda2d5d9e2bc2a0004ffc77efcd5d5beeb28
+SHA1 (patch-pdns_dynloader.cc) = 9a4119a17a5ed2144737d2b6161aceaa633f66c6
+SHA1 (patch-pdns_htimer.cc) = 6064c73db33d2e7cc65979757e90ecdf8d7c16e6
+SHA1 (patch-pdns_misc.cc) = 832cf6bd2f0b018d66a49e5b0f9f879a107c1a90
+SHA1 (patch-pdns_nameserver.cc) = 13011d7cd1e6915c4b547f7817fa72e595ac2a3a
+SHA1 (patch-pdns_pdns_recursor.cc) = 97f3688baef5a7520514764a4590d0b92fa51fda
+SHA1 (patch-pdns_receiver.cc) = 11e096024b007d53528d61083a65fd5e941fe6eb
+SHA1 (patch-pdns_recursor__cache.cc) = 36dc4c4691f6d88fb7b6cc452cda19dc07a1b53b
+SHA1 (patch-pdns_resolver.cc) = 0f3de1aef64d1e24a5b0f87bfdd866c75ff3c1ff
+SHA1 (patch-pdns_tcpreceiver.cc) = 0624ac68b2b1f609febb46be97e14c3d358f37b9
diff --git a/net/powerdns/options.mk b/net/powerdns/options.mk
index 0d21fe5d450..9bb36d415c5 100644
--- a/net/powerdns/options.mk
+++ b/net/powerdns/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2014/12/10 14:50:08 fhajny Exp $
+# $NetBSD: options.mk,v 1.2 2015/03/27 23:37:52 rodent Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.powerdns
-PKG_SUPPORTED_OPTIONS=	bind botan pipe random remote sqlite tools
+PKG_SUPPORTED_OPTIONS=	bind botan cryptopp pipe random remote sqlite tools
+PKG_SUPPORTED_OPTIONS+=	zeromq
 PKG_SUGGESTED_OPTIONS=	bind pipe random
 
 .include "../../mk/bsd.options.mk"
@@ -18,6 +19,17 @@ CONFIGURE_ARGS+=	--enable-botan1.8
 .include "../../security/botan/buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS:Mcryptopp)
+.include "../../security/crypto++/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-cryptopp=yes
+CRYPTOPP_CFLAGS=	-I${BUILDLINK_PREFIX.cryptopp}/include
+CRYPTOPP_LIBS=		-L${BUILDLINK_PREFIX.cryptopp}/lib -Wl,-R${BUILDLINK_PREFIX.cryptopp}/lib -lcryptopp
+CONFIGURE_ENV+=		CRYPTOPP_CFLAGS=${CRYPTOPP_CFLAGS:Q}
+CONFIGURE_ENV+=		CRYPTOPP_LIBS=${CRYPTOPP_LIBS:Q}
+.else
+CONFIGURE_ARGS+=	--enable-cryptopp=no
+.endif
+
 .if !empty(PKG_OPTIONS:Mpipe)
 PLIST.pipe=		yes
 PDNS_MODULES+=		pipe
@@ -43,3 +55,10 @@ PLIST.sqlite=		yes
 CONFIGURE_ARGS+=	--enable-tools
 PLIST.tools=		yes
 .endif
+
+.if !empty(PKG_OPTIONS:Mzeromq)
+.include "../../net/zeromq/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-remotebackend-zeromq=yes
+.else
+CONFIGURE_ARGS+=	--enable-remotebackend-zeromq=no
+.endif
diff --git a/net/powerdns/patches/patch-aa b/net/powerdns/patches/patch-aa
index 08a5c8ae5a8..0193bc795e5 100644
--- a/net/powerdns/patches/patch-aa
+++ b/net/powerdns/patches/patch-aa
@@ -1,9 +1,20 @@
-$NetBSD: patch-aa,v 1.4 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-aa,v 1.5 2015/03/27 23:37:52 rodent Exp $
+
+Handle CONF_FILES. `hostname -f` is not portable.
 
 Installation destination for example config file.
---- pdns/Makefile.in.orig	2014-10-30 10:18:39.000000000 +0000
+--- pdns/Makefile.in.orig	2015-03-02 13:17:27.000000000 +0000
 +++ pdns/Makefile.in
-@@ -1627,18 +1627,18 @@ clean-libtool:
+@@ -1176,7 +1176,7 @@ misc.cc unix_utility.cc qtype.cc
+ pdns_control_LDFLAGS = $(THREADFLAGS)
+ @UNIT_TESTS_TRUE@TESTS_ENVIRONMENT = env BOOST_TEST_LOG_LEVEL=message
+ build_date = $(shell LC_TIME=C date '+%Y%m%d%H%M%S')
+-build_host = $(shell id -u -n)@$(shell hostname -f)
++build_host = $(shell id -u -n)@$(shell hostname)
+ # Do the test in shell, so we don't confuse automake with ifeq/ifneq.
+ @RELEASE_BUILD_FALSE@pdns_version = $(shell test -z "$(git_version)" && echo UNKNOWN || echo "git-$(git_version)")
+ @RELEASE_BUILD_TRUE@pdns_version = $(PACKAGE_VERSION)
+@@ -1632,18 +1632,18 @@ clean-libtool:
  	-rm -rf .libs _libs
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
diff --git a/net/powerdns/patches/patch-ab b/net/powerdns/patches/patch-ab
index 7ac7c7a28ec..8a28ea444e3 100644
--- a/net/powerdns/patches/patch-ab
+++ b/net/powerdns/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.4 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-ab,v 1.5 2015/03/27 23:37:52 rodent Exp $
 
 Default paths.
---- pdns/pdns.conf-dist.orig	2014-10-28 10:41:09.000000000 +0000
+--- pdns/pdns.conf-dist.orig	2015-03-02 13:17:12.000000000 +0000
 +++ pdns/pdns.conf-dist
-@@ -52,7 +52,7 @@
+@@ -57,7 +57,7 @@
  #################################
  # config-dir	Location of configuration directory (pdns.conf)
  #
@@ -12,7 +12,7 @@ Default paths.
  
  #################################
  # config-name	Name of this virtual configuration - will rename the binary image
-@@ -287,7 +287,7 @@
+@@ -292,7 +292,7 @@
  #################################
  # module-dir	Default directory for modules
  #
diff --git a/net/powerdns/patches/patch-configure b/net/powerdns/patches/patch-configure
deleted file mode 100644
index 08e1b224b27..00000000000
--- a/net/powerdns/patches/patch-configure
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2014/12/10 14:50:09 fhajny Exp $
-
-Portability.
---- configure.orig	2014-10-30 10:18:31.000000000 +0000
-+++ configure
-@@ -19403,7 +19403,7 @@ fi
-   if test "x$MYSQL_config_check" != "xskip"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_config" >&5
- $as_echo_n "checking for mysql_config... " >&6; }
--    if test "x$MYSQL_config_check" == "x"; then
-+    if test "x$MYSQL_config_check" = "x"; then
-       # check if it's in path
-       for m in /bin /usr/bin /usr/local/bin /opt/csw/bin; do
-         if test -x $m/mysql_config; then
-@@ -19412,7 +19412,7 @@ $as_echo_n "checking for mysql_config...
-         fi
-       done
- 
--      if test "x$MYSQL_config" == "x"; then
-+      if test "x$MYSQL_config" = "x"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
- $as_echo "not found" >&6; }
-       else
-@@ -19518,7 +19518,7 @@ fi
- # Check whether --with-pgsql-config was given.
- if test "${with_pgsql_config+set}" = set; then :
-   withval=$with_pgsql_config; PGSQL_pg_config="$withval"
--     if test "x$PGSQL_pg_config" == "xyes" || test ! -x "$PGSQL_pg_config"; then
-+     if test "x$PGSQL_pg_config" = "xyes" || test ! -x "$PGSQL_pg_config"; then
-        as_fn_error $? "--with-pgsql-config must provide a valid path to pg_config executable" "$LINENO" 5
-      fi
- 
-@@ -19568,10 +19568,10 @@ fi
- 
- 
-   if test "x$PGSQL_pg_config" != "x"; then
--    if test "x$PGSQL_lib_check" == "x"; then
-+    if test "x$PGSQL_lib_check" = "x"; then
-       PGSQL_lib_check=$($PGSQL_pg_config --libdir)
-     fi
--    if test "x$PGSQL_inc_check" == "x"; then
-+    if test "x$PGSQL_inc_check" = "x"; then
-       PGSQL_inc_check=$($PGSQL_pg_config --includedir)
-     fi
-     PGSQL_CFLAGS=
diff --git a/net/powerdns/patches/patch-modules_luabackend_luabackend.hh b/net/powerdns/patches/patch-modules_luabackend_luabackend.hh
index 7ea743214fb..0e853bbdd9f 100644
--- a/net/powerdns/patches/patch-modules_luabackend_luabackend.hh
+++ b/net/powerdns/patches/patch-modules_luabackend_luabackend.hh
@@ -1,7 +1,7 @@
-$NetBSD: patch-modules_luabackend_luabackend.hh,v 1.1 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-modules_luabackend_luabackend.hh,v 1.2 2015/03/27 23:37:52 rodent Exp $
 
 u_int32_t not defined on SunOS.
---- modules/luabackend/luabackend.hh.orig	2014-02-04 11:33:04.000000000 +0000
+--- modules/luabackend/luabackend.hh.orig	2015-03-02 13:17:08.000000000 +0000
 +++ modules/luabackend/luabackend.hh
 @@ -17,6 +17,9 @@ using std::string;
  
diff --git a/net/powerdns/patches/patch-modules_pipebackend_pipebackend.cc b/net/powerdns/patches/patch-modules_pipebackend_pipebackend.cc
index e46407e031f..8c007cee832 100644
--- a/net/powerdns/patches/patch-modules_pipebackend_pipebackend.cc
+++ b/net/powerdns/patches/patch-modules_pipebackend_pipebackend.cc
@@ -1,7 +1,7 @@
-$NetBSD: patch-modules_pipebackend_pipebackend.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-modules_pipebackend_pipebackend.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $
 
 Resolve boost symbol ambiguity.
---- modules/pipebackend/pipebackend.cc.orig	2014-10-30 10:18:22.000000000 +0000
+--- modules/pipebackend/pipebackend.cc.orig	2015-03-02 13:17:08.000000000 +0000
 +++ modules/pipebackend/pipebackend.cc
 @@ -92,7 +92,7 @@ PipeBackend::PipeBackend(const string &s
     signal(SIGCHLD, SIG_IGN);
diff --git a/net/powerdns/patches/patch-pdns_botan18signers.cc b/net/powerdns/patches/patch-pdns_botan18signers.cc
index abec876b76f..72a0570ed6d 100644
--- a/net/powerdns/patches/patch-pdns_botan18signers.cc
+++ b/net/powerdns/patches/patch-pdns_botan18signers.cc
@@ -1,7 +1,7 @@
-$NetBSD: patch-pdns_botan18signers.cc,v 1.1 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-pdns_botan18signers.cc,v 1.2 2015/03/27 23:37:52 rodent Exp $
 
 Resolve boost symbol ambiguity.
---- pdns/botan18signers.cc.orig	2013-04-26 19:54:34.000000000 +0000
+--- pdns/botan18signers.cc.orig	2015-03-02 13:17:09.000000000 +0000
 +++ pdns/botan18signers.cc
 @@ -36,8 +36,8 @@ public:
  
diff --git a/net/powerdns/patches/patch-pdns_dns.hh b/net/powerdns/patches/patch-pdns_dns.hh
index cb8b9060443..9f414a6066f 100644
--- a/net/powerdns/patches/patch-pdns_dns.hh
+++ b/net/powerdns/patches/patch-pdns_dns.hh
@@ -1,13 +1,13 @@
-$NetBSD: patch-pdns_dns.hh,v 1.3 2015/02/17 02:00:07 rodent Exp $
+$NetBSD: patch-pdns_dns.hh,v 1.4 2015/03/27 23:37:52 rodent Exp $
 
 Add DragonFly support.
---- pdns/dns.hh.orig	2014-10-30 10:18:22.000000000 +0000
+--- pdns/dns.hh.orig	2015-03-02 13:17:09.000000000 +0000
 +++ pdns/dns.hh
 @@ -207,7 +207,7 @@ enum  {
          ns_t_any = 255,         /* Wildcard match. */
  };
  
--#if __FreeBSD__ || __APPLE__ || __OpenBSD__ ||  defined(__FreeBSD_kernel__)
+-#if __FreeBSD__ || __APPLE__ || __OpenBSD__ || __DragonFly__ || defined(__FreeBSD_kernel__)
 +#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
  #include <machine/endian.h>
  #elif __linux__ || __GNU__
diff --git a/net/powerdns/patches/patch-pdns_dnspacket.cc b/net/powerdns/patches/patch-pdns_dnspacket.cc
index 8ef8cf93183..3252615535b 100644
--- a/net/powerdns/patches/patch-pdns_dnspacket.cc
+++ b/net/powerdns/patches/patch-pdns_dnspacket.cc
@@ -1,9 +1,9 @@
-$NetBSD: patch-pdns_dnspacket.cc,v 1.3 2015/01/12 11:40:43 jperkin Exp $
+$NetBSD: patch-pdns_dnspacket.cc,v 1.4 2015/03/27 23:37:52 rodent Exp $
 
 Resolve boost symbol ambiguity.
 Avoid ambiguous abs() call.
 
---- pdns/dnspacket.cc.orig	2014-10-30 10:18:22.000000000 +0000
+--- pdns/dnspacket.cc.orig	2015-03-02 13:17:09.000000000 +0000
 +++ pdns/dnspacket.cc
 @@ -312,7 +312,7 @@ void DNSPacket::wrapup()
            pos->content=".";
diff --git a/net/powerdns/patches/patch-pdns_dnsparser.cc b/net/powerdns/patches/patch-pdns_dnsparser.cc
index 7876541dec0..35eb8e0cff0 100644
--- a/net/powerdns/patches/patch-pdns_dnsparser.cc
+++ b/net/powerdns/patches/patch-pdns_dnsparser.cc
@@ -1,7 +1,7 @@
-$NetBSD: patch-pdns_dnsparser.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-pdns_dnsparser.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $
 
 Resolve boost symbol ambiguity.
---- pdns/dnsparser.cc.orig	2014-08-29 14:33:20.000000000 +0000
+--- pdns/dnsparser.cc.orig	2015-03-02 13:17:09.000000000 +0000
 +++ pdns/dnsparser.cc
 @@ -109,7 +109,7 @@ static const string EncodeDNSLabel(const
  }
diff --git a/net/powerdns/patches/patch-pdns_dnsparser.hh b/net/powerdns/patches/patch-pdns_dnsparser.hh
index 969028280b4..31c01601ac0 100644
--- a/net/powerdns/patches/patch-pdns_dnsparser.hh
+++ b/net/powerdns/patches/patch-pdns_dnsparser.hh
@@ -1,7 +1,7 @@
-$NetBSD: patch-pdns_dnsparser.hh,v 1.2 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-pdns_dnsparser.hh,v 1.3 2015/03/27 23:37:52 rodent Exp $
 
 Resolve boost symbol ambiguity.
---- pdns/dnsparser.hh.orig	2014-04-25 09:42:01.000000000 +0000
+--- pdns/dnsparser.hh.orig	2015-03-02 13:17:09.000000000 +0000
 +++ pdns/dnsparser.hh
 @@ -183,7 +183,7 @@ public:
      return record;
diff --git a/net/powerdns/patches/patch-pdns_dnsscope.cc b/net/powerdns/patches/patch-pdns_dnsscope.cc
index c9ba522a955..3c02f96c626 100644
--- a/net/powerdns/patches/patch-pdns_dnsscope.cc
+++ b/net/powerdns/patches/patch-pdns_dnsscope.cc
@@ -1,7 +1,7 @@
-$NetBSD: patch-pdns_dnsscope.cc,v 1.1 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-pdns_dnsscope.cc,v 1.2 2015/03/27 23:37:52 rodent Exp $
 
 IP_OFFMASK not defined on SunOS.
---- pdns/dnsscope.cc.orig	2014-06-26 11:22:02.000000000 +0000
+--- pdns/dnsscope.cc.orig	2015-03-02 13:17:10.000000000 +0000
 +++ pdns/dnsscope.cc
 @@ -16,6 +16,10 @@
  #include "namespaces.hh"
diff --git a/net/powerdns/patches/patch-pdns_dynloader.cc b/net/powerdns/patches/patch-pdns_dynloader.cc
index 09831d86bec..b37784ea04d 100644
--- a/net/powerdns/patches/patch-pdns_dynloader.cc
+++ b/net/powerdns/patches/patch-pdns_dynloader.cc
@@ -1,21 +1,21 @@
-$NetBSD: patch-pdns_dynloader.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-pdns_dynloader.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $
 
 Resolve boost symbol ambiguity.
---- pdns/dynloader.cc.orig	2014-04-29 11:02:00.000000000 +0000
+--- pdns/dynloader.cc.orig	2015-03-02 13:17:11.000000000 +0000
 +++ pdns/dynloader.cc
-@@ -103,9 +103,9 @@ int main(int argc, char **argv)
- 
+@@ -97,9 +97,9 @@ int main(int argc, char **argv)
+   
    try {
      string command=commands[0];
 -    shared_ptr<DynMessenger> D;
 +    boost::shared_ptr<DynMessenger> D;
      if(::arg()["remote-address"].empty())
--      D=shared_ptr<DynMessenger>(new DynMessenger(localdir,socketname));
-+      D=boost::shared_ptr<DynMessenger>(new DynMessenger(localdir,socketname));
+-      D=shared_ptr<DynMessenger>(new DynMessenger(socketname));
++      D=boost::shared_ptr<DynMessenger>(new DynMessenger(socketname));
      else {
        uint16_t port;
        try {
-@@ -116,7 +116,7 @@ int main(int argc, char **argv)
+@@ -110,7 +110,7 @@ int main(int argc, char **argv)
          exit(99);
        }
        
diff --git a/net/powerdns/patches/patch-pdns_htimer.cc b/net/powerdns/patches/patch-pdns_htimer.cc
index 11ae737d74d..50f1e9a61f6 100644
--- a/net/powerdns/patches/patch-pdns_htimer.cc
+++ b/net/powerdns/patches/patch-pdns_htimer.cc
@@ -1,7 +1,7 @@
-$NetBSD: patch-pdns_htimer.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-pdns_htimer.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $
 
 Resolve boost symbol ambiguity.
---- pdns/htimer.cc.orig	2013-12-17 17:42:51.000000000 +0000
+--- pdns/htimer.cc.orig	2015-03-02 13:17:11.000000000 +0000
 +++ pdns/htimer.cc
 @@ -128,7 +128,7 @@ int main()
      HTimerSentinel hts=htloop.getSentinel();
diff --git a/net/powerdns/patches/patch-pdns_misc.cc b/net/powerdns/patches/patch-pdns_misc.cc
index fc1a77b6421..a3a5b9028b2 100644
--- a/net/powerdns/patches/patch-pdns_misc.cc
+++ b/net/powerdns/patches/patch-pdns_misc.cc
@@ -1,7 +1,7 @@
-$NetBSD: patch-pdns_misc.cc,v 1.1 2014/12/15 12:56:41 fhajny Exp $
+$NetBSD: patch-pdns_misc.cc,v 1.2 2015/03/27 23:37:52 rodent Exp $
 
 Do not use IP_PKTINFO on NetBSD.
---- pdns/misc.cc.orig	2014-10-30 10:18:22.000000000 +0000
+--- pdns/misc.cc.orig	2015-03-02 13:17:12.000000000 +0000
 +++ pdns/misc.cc
 @@ -802,7 +802,7 @@ void addCMsgSrcAddr(struct msghdr* msgh,
      msgh->msg_controllen = cmsg->cmsg_len; // makes valgrind happy and is slightly better style
diff --git a/net/powerdns/patches/patch-pdns_nameserver.cc b/net/powerdns/patches/patch-pdns_nameserver.cc
index ce4e1f60982..95ffd80e14a 100644
--- a/net/powerdns/patches/patch-pdns_nameserver.cc
+++ b/net/powerdns/patches/patch-pdns_nameserver.cc
@@ -1,7 +1,7 @@
-$NetBSD: patch-pdns_nameserver.cc,v 1.3 2014/12/15 12:56:41 fhajny Exp $
+$NetBSD: patch-pdns_nameserver.cc,v 1.4 2015/03/27 23:37:52 rodent Exp $
 
 Do not use IP_PKTINFO on NetBSD.
---- pdns/nameserver.cc.orig	2014-10-30 10:18:22.000000000 +0000
+--- pdns/nameserver.cc.orig	2015-03-02 13:17:12.000000000 +0000
 +++ pdns/nameserver.cc
 @@ -81,7 +81,7 @@ extern StatBag S;
      The main() of PowerDNS can be found in receiver.cc - start reading there for further insights into the operation of the nameserver
diff --git a/net/powerdns/patches/patch-pdns_pdns_recursor.cc b/net/powerdns/patches/patch-pdns_pdns_recursor.cc
index cd8d523762a..b238ab222ca 100644
--- a/net/powerdns/patches/patch-pdns_pdns_recursor.cc
+++ b/net/powerdns/patches/patch-pdns_pdns_recursor.cc
@@ -1,7 +1,7 @@
-$NetBSD: patch-pdns_pdns_recursor.cc,v 1.3 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-pdns_pdns_recursor.cc,v 1.4 2015/03/27 23:37:52 rodent Exp $
 
 Resolve boost symbol ambiguity.
---- pdns/pdns_recursor.cc.orig	2014-10-30 10:18:22.000000000 +0000
+--- pdns/pdns_recursor.cc.orig	2015-03-02 13:17:12.000000000 +0000
 +++ pdns/pdns_recursor.cc
 @@ -80,9 +80,9 @@ uint64_t g_latencyStatSize;
  bool g_logCommonErrors;
diff --git a/net/powerdns/patches/patch-pdns_receiver.cc b/net/powerdns/patches/patch-pdns_receiver.cc
index 97221acaa89..c6825d5c3e0 100644
--- a/net/powerdns/patches/patch-pdns_receiver.cc
+++ b/net/powerdns/patches/patch-pdns_receiver.cc
@@ -1,9 +1,9 @@
-$NetBSD: patch-pdns_receiver.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-pdns_receiver.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $
 
 Limit inclusion of boost headers to only those necessary to avoid conflicting
 types errors on Solaris.
 
---- pdns/receiver.cc.orig	2014-09-02 08:02:05.000000000 +0000
+--- pdns/receiver.cc.orig	2015-03-02 13:17:12.000000000 +0000
 +++ pdns/receiver.cc
 @@ -42,7 +42,7 @@
  #include <sys/mman.h>
diff --git a/net/powerdns/patches/patch-pdns_recursor__cache.cc b/net/powerdns/patches/patch-pdns_recursor__cache.cc
index 39609656583..a72b6ff44ed 100644
--- a/net/powerdns/patches/patch-pdns_recursor__cache.cc
+++ b/net/powerdns/patches/patch-pdns_recursor__cache.cc
@@ -1,7 +1,7 @@
-$NetBSD: patch-pdns_recursor__cache.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-pdns_recursor__cache.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $
 
 Resolve boost symbol ambiguity.
---- pdns/recursor_cache.cc.orig	2014-10-30 10:18:22.000000000 +0000
+--- pdns/recursor_cache.cc.orig	2015-03-02 13:17:12.000000000 +0000
 +++ pdns/recursor_cache.cc
 @@ -53,7 +53,7 @@ DNSResourceRecord String2DNSRR(const str
        rr.content=".";
diff --git a/net/powerdns/patches/patch-pdns_resolver.cc b/net/powerdns/patches/patch-pdns_resolver.cc
index 721a9f5a1bc..054caf5846f 100644
--- a/net/powerdns/patches/patch-pdns_resolver.cc
+++ b/net/powerdns/patches/patch-pdns_resolver.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-pdns_resolver.cc,v 1.3 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-pdns_resolver.cc,v 1.4 2015/03/27 23:37:52 rodent Exp $
 
 Limit inclusion of boost headers to only those necessary to avoid conflicting
 types errors on Solaris.
 Resolve boost symbol ambiguity.
 
---- pdns/resolver.cc.orig	2014-10-30 10:18:22.000000000 +0000
+--- pdns/resolver.cc.orig	2015-03-02 13:17:12.000000000 +0000
 +++ pdns/resolver.cc
 @@ -33,7 +33,7 @@
  #include <cstring>
diff --git a/net/powerdns/patches/patch-pdns_tcpreceiver.cc b/net/powerdns/patches/patch-pdns_tcpreceiver.cc
index af6ce474be3..cdcc1feb0fe 100644
--- a/net/powerdns/patches/patch-pdns_tcpreceiver.cc
+++ b/net/powerdns/patches/patch-pdns_tcpreceiver.cc
@@ -1,7 +1,7 @@
-$NetBSD: patch-pdns_tcpreceiver.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $
+$NetBSD: patch-pdns_tcpreceiver.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $
 
 Resolve boost symbol ambiguity.
---- pdns/tcpreceiver.cc.orig	2014-10-21 11:31:14.000000000 +0000
+--- pdns/tcpreceiver.cc.orig	2015-03-02 13:17:13.000000000 +0000
 +++ pdns/tcpreceiver.cc
 @@ -173,7 +173,7 @@ void connectWithTimeout(int fd, struct s
    ;