powerdns: updated to 4.2.1

4.2.1
This release fixes several bugs and makes a few features more robust or intuitive. It also contains a few performance improvements for API users.

New Features
Add SLAVE-RENOTIFY zone metadata support
Add configurable timeout for inbound AXFR
Add CentOS 8 as builder target
gmysql backend, add an option to send the SSL capability flag

Improvements
API: reduce number of database connections
Register a few known RR types and remove an unknown one
bindbackend: use metadata for also-notifies as well
pdnsutil increase-serial: under SOA-EDIT=INCEPTION-EPOCH, bump as if it is EPOCH
API: optionally do not return dnssec info in domain list
Basic validation of $GENERATE parameters

Bug Fixes
LUA view: do not crash on empty IP list
API: Accept headers without spaces
Avoid database state-related SERVFAILs after a LUA error
Just before 4.2.0, some SQL-related fixes broke edit-zone and other features with the LMDB backend. This has been fixed now.
rfc2136, pdnsutil: somewhat improve duplicate record handling


4.2.0
Compared to the last release candidate, one more bug has been fixed.

The LMDB backend is incomplete in this version. Slaving zones works, loading zones with pdnsutil works, but more fine grained edits (using edit-zone, or the REST API) fail. We hope to fix this soon in a 4.2.x release.

For an overview of features new since 4.1.x, please see the 4.2.0 announcement blog post.

Bug Fixes
bind getAllDomains: ignore per-zone exceptions

14 files changed, 61 insertions, 121 deletions

diff --git a/net/powerdns-ldap/Makefile b/net/powerdns-ldap/Makefile
index b4d6a57fe09..681c3761a50 100644
--- a/net/powerdns-ldap/Makefile
+++ b/net/powerdns-ldap/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.19 2020/01/18 21:50:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2020/03/17 19:04:49 adam Exp $
 
-PKGREVISION= 1
 .include "../../net/powerdns/Makefile.backend"
 
 PKGNAME=		${DISTNAME:S/pdns/powerdns-ldap/}
diff --git a/net/powerdns-mysql/PLIST b/net/powerdns-mysql/PLIST
index 97002cb6232..c126f6ccc41 100644
--- a/net/powerdns-mysql/PLIST
+++ b/net/powerdns-mysql/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2018/01/02 12:18:15 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/03/17 19:04:49 adam Exp $
 lib/pdns/libgmysqlbackend.la
 share/doc/pdns/3.4.0_to_4.1.0_schema.mysql.sql
+share/doc/pdns/4.1.0_to_4.2.0_schema.mysql.sql
 share/doc/pdns/dnssec-3.x_to_3.4.0_schema.mysql.sql
 share/doc/pdns/nodnssec-3.x_to_3.4.0_schema.mysql.sql
 share/doc/pdns/schema.mysql.sql
diff --git a/net/powerdns-odbc/PLIST b/net/powerdns-odbc/PLIST
index 568077fdd3c..435d5251fcd 100644
--- a/net/powerdns-odbc/PLIST
+++ b/net/powerdns-odbc/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/01/02 12:18:15 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/03/17 19:04:49 adam Exp $
 lib/pdns/libgodbcbackend.la
+share/doc/pdns/4.0.0_to_4.2.0_schema.mssql.sql
 share/doc/pdns/schema.mssql.sql
diff --git a/net/powerdns-pgsql/PLIST b/net/powerdns-pgsql/PLIST
index dadce9682ab..1edfb324d66 100644
--- a/net/powerdns-pgsql/PLIST
+++ b/net/powerdns-pgsql/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2018/01/02 12:18:16 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/03/17 19:04:50 adam Exp $
 lib/pdns/libgpgsqlbackend.la
 share/doc/pdns/3.4.0_to_4.1.0_schema.pgsql.sql
+share/doc/pdns/4.1.0_to_4.2.0_schema.pgsql.sql
 share/doc/pdns/dnssec-3.x_to_3.4.0_schema.pgsql.sql
 share/doc/pdns/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
 share/doc/pdns/schema.pgsql.sql
diff --git a/net/powerdns/Makefile b/net/powerdns/Makefile
index 30c40381cad..fcaf6d73997 100644
--- a/net/powerdns/Makefile
+++ b/net/powerdns/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.48 2020/01/18 21:50:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.49 2020/03/17 19:04:49 adam Exp $
 
-PKGREVISION= 4
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME:S/pdns/powerdns/}
diff --git a/net/powerdns/Makefile.backend b/net/powerdns/Makefile.backend
index 22807b754f7..e97b4995912 100644
--- a/net/powerdns/Makefile.backend
+++ b/net/powerdns/Makefile.backend
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.backend,v 1.6 2017/03/09 13:52:34 fhajny Exp $
+# $NetBSD: Makefile.backend,v 1.7 2020/03/17 19:04:49 adam Exp $
 # used by net/powerdns-geoip/Makefile
 # used by net/powerdns-ldap/Makefile
 # used by net/powerdns-mysql/Makefile
@@ -12,6 +12,7 @@ DEPENDS+=		powerdns>=${PDNS_VERSION}:../../net/powerdns
 DISTINFO_FILE=		${.CURDIR}/../../net/powerdns/distinfo
 PATCHDIR=		${.CURDIR}/../../net/powerdns/patches
 
+CONFIGURE_ARGS+=	--disable-lua-records
 CONFIGURE_ARGS+=	--disable-pdns_server
 CONFIGURE_ARGS+=	--with-modules=""
 
diff --git a/net/powerdns/Makefile.common b/net/powerdns/Makefile.common
index 04197658513..174b23e023e 100644
--- a/net/powerdns/Makefile.common
+++ b/net/powerdns/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.27 2019/04/25 18:42:41 adam Exp $
+# $NetBSD: Makefile.common,v 1.28 2020/03/17 19:04:49 adam Exp $
 
-PDNS_VERSION=	4.1.8
+PDNS_VERSION=	4.2.1
 DISTNAME=	pdns-${PDNS_VERSION}
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.powerdns.com/releases/
@@ -17,7 +17,6 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		bison flex gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-headers}
-CONFIGURE_ARGS+=	--without-lua
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/net/powerdns/PLIST b/net/powerdns/PLIST
index 85979dd0e6b..a4b92cde56c 100644
--- a/net/powerdns/PLIST
+++ b/net/powerdns/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.12 2019/04/25 18:42:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2020/03/17 19:04:49 adam Exp $
 ${PLIST.tools}bin/calidns
 ${PLIST.tools}bin/dnsbulktest
 ${PLIST.tools}bin/dnsgram
+bin/dnspcap2calidns
 ${PLIST.tools}bin/dnsreplay
 ${PLIST.tools}bin/dnsscan
 ${PLIST.tools}bin/dnsscope
@@ -21,12 +22,14 @@ bin/zone2json
 bin/zone2sql
 ${PLIST.bind}lib/pdns/libbindbackend.la
 ${PLIST.sqlite}lib/pdns/libgsqlite3backend.la
+${PLIST.lua}lib/pdns/libluabackend.la
 ${PLIST.pipe}lib/pdns/libpipebackend.la
 ${PLIST.random}lib/pdns/librandombackend.la
 ${PLIST.remote}lib/pdns/libremotebackend.la
 ${PLIST.tools}man/man1/calidns.1
 man/man1/dnsbulktest.1
 ${PLIST.tools}man/man1/dnsgram.1
+man/man1/dnspcap2calidns.1
 ${PLIST.tools}man/man1/dnsreplay.1
 ${PLIST.tools}man/man1/dnsscan.1
 ${PLIST.tools}man/man1/dnsscope.1
@@ -45,6 +48,8 @@ ${PLIST.tools}man/man1/sdig.1
 man/man1/zone2json.1
 man/man1/zone2sql.1
 sbin/pdns_server
+${PLIST.sqlite}share/doc/pdns/3.4.0_to_4.0.0_schema.sqlite3.sql
+${PLIST.sqlite}share/doc/pdns/4.0.0_to_4.2.0_schema.sqlite3.sql
 ${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
 ${PLIST.sqlite}share/doc/pdns/schema.sqlite3.sql
diff --git a/net/powerdns/distinfo b/net/powerdns/distinfo
index 349d808c280..c1a2f2185ce 100644
--- a/net/powerdns/distinfo
+++ b/net/powerdns/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.37 2019/04/25 18:42:41 adam Exp $
+$NetBSD: distinfo,v 1.38 2020/03/17 19:04:49 adam Exp $
 
-SHA1 (pdns-4.1.8.tar.bz2) = c1b2220781ead0dbd5363f6335535e377283e85b
-RMD160 (pdns-4.1.8.tar.bz2) = 2552af0d6cb9176da6090435a362a2df5dfa987c
-SHA512 (pdns-4.1.8.tar.bz2) = 1113745cdaa8fba591c176721893fb478e976861beee0cb6c0240e5afa6b68c9afae286579036b2ed77fffe76ca1e6f103cda915f8b7b875bcdc1253931ad935
-Size (pdns-4.1.8.tar.bz2) = 1116996 bytes
-SHA1 (patch-configure) = 8218324a863217f954ba63adf242c65c1b864038
+SHA1 (pdns-4.2.1.tar.bz2) = 81a4edb44f53f3f2c36793760ce30f81429fbc97
+RMD160 (pdns-4.2.1.tar.bz2) = 0efc805e4ed45ebdaf16cd97e2e797a37e000ca3
+SHA512 (pdns-4.2.1.tar.bz2) = 40b5533c755d7c0d41cfb273b704a45a3006dafc98c79bf41cae43d9e2d03bbd7a663996a7f209c390a89c5f7161f2f6246389beef18fbac48e95907e1b7936a
+Size (pdns-4.2.1.tar.bz2) = 1252829 bytes
+SHA1 (patch-configure) = 1503efadf2d8baaaa0887b61bd4f7672ea33a043
 SHA1 (patch-ext_json11_json11.cpp) = a8ffe67156a836841aef8a6bba134a82283f381e
-SHA1 (patch-m4_pdns__check__os.m4) = c7a8d91c519ae7ca0616dfc08fa04402fca950d0
-SHA1 (patch-pdns_dns.hh) = 626eb4e29b7fcd82fbe056036c157c1e85fa49ca
 SHA1 (patch-pdns_dnsscope.cc) = b289b750686b25041c3e291fb0d3d562beb36eaf
 SHA1 (patch-pdns_iputils.cc) = fbd3bb210216bb98c3cd73b702b6dea486c51dec
 SHA1 (patch-pdns_iputils.hh) = 714277322ea721ea0439fc6aa0265bd290219e8b
 SHA1 (patch-pdns_qtype.hh) = 0f8bca4c0cafea9a5257a08077fa42b4c52127f5
-SHA1 (patch-pdns_version.cc) = be2035a37a554f64b8e6dad8f7faa112aba10f6c
+SHA1 (patch-pdns_version.cc) = 25917c329dafa34e657fa31c7a9abd99110bb4b0
diff --git a/net/powerdns/options.mk b/net/powerdns/options.mk
index 1a5f3d0d392..74b78bbfd9a 100644
--- a/net/powerdns/options.mk
+++ b/net/powerdns/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.6 2018/01/02 12:18:15 fhajny Exp $
+# $NetBSD: options.mk,v 1.7 2020/03/17 19:04:49 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.powerdns
-PKG_SUPPORTED_OPTIONS=	bind botan pipe random remote sqlite tools zeromq
+PKG_SUPPORTED_OPTIONS=	bind botan lua pipe random remote sqlite tools zeromq
 PKG_SUGGESTED_OPTIONS=	bind pipe random
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		bind pipe random remote sqlite tools
+PLIST_VARS+=		bind lua pipe random remote sqlite tools
 
 .if !empty(PKG_OPTIONS:Mbind)
 PDNS_MODULES+=		bind
@@ -18,6 +18,16 @@ PLIST.bind=		yes
 .include "../../security/botan-devel/buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS:Mlua)
+.include "../../lang/lua/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+PLIST.lua=		yes
+PDNS_MODULES+=		lua
+.else
+CONFIGURE_ARGS+=	--disable-lua-records
+CONFIGURE_ARGS+=	--without-lua
+.endif
+
 .if !empty(PKG_OPTIONS:Mpipe)
 PLIST.pipe=		yes
 PDNS_MODULES+=		pipe
diff --git a/net/powerdns/patches/patch-configure b/net/powerdns/patches/patch-configure
index 069c84cde98..112efb8380c 100644
--- a/net/powerdns/patches/patch-configure
+++ b/net/powerdns/patches/patch-configure
@@ -1,40 +1,22 @@
-$NetBSD: patch-configure,v 1.8 2018/02/02 10:03:05 jperkin Exp $
+$NetBSD: patch-configure,v 1.9 2020/03/17 19:04:49 adam Exp $
 
-Regen after excluding -latomic test on NetBSD.
+Do not add default compiler flags.
 Leave pkgsrc to handle security features.
 
---- configure.orig	2017-11-30 09:43:31.000000000 +0000
+--- configure.orig	2019-11-29 19:23:06.000000000 +0000
 +++ configure
-@@ -5569,9 +5569,14 @@ else
- fi
+@@ -3721,8 +3721,8 @@ case $host_os in *\ *) host_os=`echo "$h
  
  
--  case "$host" in
--  mips* | powerpc-* )
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5
-+  case "$host_os" in
-+  netbsd*)
-+    : # no -latomic
-+    ;;
-+  *)
-+    case "$host" in
-+    mips* | powerpc-* )
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5
- $as_echo_n "checking whether the linker accepts -latomic... " >&6; }
-     LDFLAGS="-latomic $LDFLAGS"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -5593,7 +5598,9 @@ else
+ # Add some default CFLAGS and CXXFLAGS, can be appended to using the environment variables
+-CFLAGS="-Wall -g -O2 $CFLAGS"
+-CXXFLAGS="-Wall -g -O2 $CXXFLAGS"
++CFLAGS="-Wall $CFLAGS"
++CXXFLAGS="-Wall $CXXFLAGS"
  
- fi
- rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
-+      conftest$ac_exeext conftest.$ac_ext
-+      ;;
-+    esac
-     ;;
-   esac
- 
-@@ -6797,7 +6804,7 @@ rm -f core conftest.err conftest.$ac_obj
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7884,7 +7884,7 @@ rm -f core conftest.err conftest.$ac_obj
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__fstack_protector" >&5
  $as_echo "$gl_cv_warn_cxx__fstack_protector" >&6; }
@@ -43,7 +25,7 @@ Leave pkgsrc to handle security features.
  
          CFLAGS="-fstack-protector $CFLAGS"
          CXXFLAGS="-fstack-protector $CXXFLAGS"
-@@ -20586,7 +20593,7 @@ fi
+@@ -22723,7 +22723,7 @@ fi
  
    if test "x$PG_CONFIG" != "x" -o "x$PGSQL_LIBS" = "x"; then :
  
@@ -52,7 +34,7 @@ Leave pkgsrc to handle security features.
  
        # Extract the first word of "pg_config", so it can be a program name with args.
  set dummy pg_config; ac_word=$2
-@@ -20630,7 +20637,7 @@ fi
+@@ -22767,7 +22767,7 @@ fi
  
  
  fi
diff --git a/net/powerdns/patches/patch-m4_pdns__check__os.m4 b/net/powerdns/patches/patch-m4_pdns__check__os.m4
deleted file mode 100644
index 8b342dd2654..00000000000
--- a/net/powerdns/patches/patch-m4_pdns__check__os.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-m4_pdns__check__os.m4,v 1.2 2018/01/02 12:18:15 fhajny Exp $
-
-Don't insist on -latomic on mips & powerpc if on NetBSD.
-
---- m4/pdns_check_os.m4.orig	2017-11-30 09:43:22.000000000 +0000
-+++ m4/pdns_check_os.m4
-@@ -35,14 +35,21 @@ AC_DEFUN([PDNS_CHECK_OS],[
-   AM_CONDITIONAL([HAVE_LINUX], [test "x$have_linux" = "xyes"])
-   AM_CONDITIONAL([HAVE_SOLARIS], [test "x$have_solaris" = "xyes"])
- 
--  case "$host" in
--  mips* | powerpc-* )
--    AC_MSG_CHECKING([whether the linker accepts -latomic])
--    LDFLAGS="-latomic $LDFLAGS"
--    AC_LINK_IFELSE([m4_default([],[AC_LANG_PROGRAM()])],
--      [AC_MSG_RESULT([yes])],
--      [AC_MSG_ERROR([Unable to link against libatomic, cannot continue])]
--    )
-+  case "$host_os" in
-+  netbsd*)
-+    : # no -latomic
-+    ;;
-+  *)
-+    case "$host" in
-+    mips* | powerpc-* )
-+      AC_MSG_CHECKING([whether the linker accepts -latomic])
-+      LDFLAGS="-latomic $LDFLAGS"
-+      AC_LINK_IFELSE([m4_default([],[AC_LANG_PROGRAM()])],
-+        [AC_MSG_RESULT([yes])],
-+        [AC_MSG_ERROR([Unable to link against libatomic, cannot continue])]
-+      )
-+      ;;
-+    esac
-     ;;
-   esac
- 
diff --git a/net/powerdns/patches/patch-pdns_dns.hh b/net/powerdns/patches/patch-pdns_dns.hh
deleted file mode 100644
index daeaff5d800..00000000000
--- a/net/powerdns/patches/patch-pdns_dns.hh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-pdns_dns.hh,v 1.5 2017/03/09 13:32:54 fhajny Exp $
-
-Add NetBSD support.
-
---- pdns/dns.hh.orig	2017-01-17 08:43:49.000000000 +0000
-+++ pdns/dns.hh
-@@ -146,7 +146,7 @@ struct EDNS0Record
- 
- static_assert(sizeof(EDNS0Record) == 4, "EDNS0Record size must be 4");
- 
--#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__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__
- # include <endian.h>
diff --git a/net/powerdns/patches/patch-pdns_version.cc b/net/powerdns/patches/patch-pdns_version.cc
index 9c918dcdcbf..ea0308c931d 100644
--- a/net/powerdns/patches/patch-pdns_version.cc
+++ b/net/powerdns/patches/patch-pdns_version.cc
@@ -1,20 +1,15 @@
-$NetBSD: patch-pdns_version.cc,v 1.1 2018/01/13 15:30:54 adam Exp $
+$NetBSD: patch-pdns_version.cc,v 1.2 2020/03/17 19:04:49 adam Exp $
 
-Do not store configure arguments; they have references to the build directory.
+Do not store configure args, as they contain workdir references.
 
---- pdns/version.cc.orig	2018-01-13 15:13:31.000000000 +0000
+--- pdns/version.cc.orig	2020-02-29 22:23:50.000000000 +0000
 +++ pdns/version.cc
-@@ -117,13 +117,6 @@ void showBuildConfiguration()
+@@ -145,7 +145,7 @@ void showBuildConfiguration()
    // Auth only
-   theL()<<Logger::Warning<<"Built-in modules: "<<PDNS_MODULES<<endl;
+   g_log<<Logger::Warning<<"Built-in modules: "<<PDNS_MODULES<<endl;
  #endif
 -#ifdef PDNS_CONFIG_ARGS
--#define double_escape(s) #s
--#define escape_quotes(s) double_escape(s)
--  theL()<<Logger::Warning<<"Configured with: "<<escape_quotes(PDNS_CONFIG_ARGS)<<endl;
--#undef escape_quotes
--#undef double_escape
--#endif
- }
- 
- string fullVersionString()
++#if 0
+ #define double_escape(s) #s
+ #define escape_quotes(s) double_escape(s)
+   g_log<<Logger::Warning<<"Configured with: "<<escape_quotes(PDNS_CONFIG_ARGS)<<endl;