Pullup ticket #6227 - requested by otis

net/powerdns: bugfixes

Revisions pulled up:
- net/powerdns/Makefile                                         1.55
- net/powerdns/Makefile.common                                  1.29
- net/powerdns/distinfo                                         1.40
- net/powerdns/patches/patch-pdns_iputils.hh                    deleted

---
   Module Name:    pkgsrc
   Committed By:   otis
   Date:           Sun Jun  7 18:55:13 UTC 2020

   Modified Files:
           pkgsrc/net/powerdns: Makefile Makefile.common distinfo
   Removed Files:
           pkgsrc/net/powerdns/patches: patch-pdns_iputils.hh

   Log Message:
   net/powerdns: Update to 4.2.2

   Changes since 4.2.1:

   * Released:
     - 9th of April 2020

   * New Features:
     - api: add includerings option to statistics endpoint

   * Improvements:
     - cache: strictly enforce maximum size, and improve cleanup routine

   * Bug Fixes:
     - fix records ending up in wrong packet section

     - avoid IXFR-in corruption when deltas come in close together.
       Please see the IXFR-in corruption upgrade notes

     - fix out-of-bound access for zero length "serialized" string when
       using lmdbbackend.

     - bind backend: pthread_mutex_t should be inited and destroyed and not be copied

   * Reference:
     - https://doc.powerdns.com/authoritative/changelog/4.2.html#change-4.2.2

3 files changed, 7 insertions, 26 deletions

diff --git a/net/powerdns/Makefile.common b/net/powerdns/Makefile.common
index 174b23e023e..d54ebfd9a8b 100644
--- a/net/powerdns/Makefile.common
+++ b/net/powerdns/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.28 2020/03/17 19:04:49 adam Exp $
+# $NetBSD: Makefile.common,v 1.28.2.1 2020/06/08 19:00:34 bsiegert Exp $
 
-PDNS_VERSION=	4.2.1
+PDNS_VERSION=	4.2.2
 DISTNAME=	pdns-${PDNS_VERSION}
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.powerdns.com/releases/
diff --git a/net/powerdns/distinfo b/net/powerdns/distinfo
index c1a2f2185ce..b5c870df31d 100644
--- a/net/powerdns/distinfo
+++ b/net/powerdns/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.38 2020/03/17 19:04:49 adam Exp $
+$NetBSD: distinfo,v 1.38.2.1 2020/06/08 19:00:34 bsiegert Exp $
 
-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 (pdns-4.2.2.tar.bz2) = d4cbc7b95bedc4aa0eb45fc28c65f43479d3a843
+RMD160 (pdns-4.2.2.tar.bz2) = 5debff3422eeb0f5857ff5406b41395cdc6b0127
+SHA512 (pdns-4.2.2.tar.bz2) = b9d0daadd89f4ab009981305d2c323ab75e283b59b94f764d53c37984a2b6200debe4e514572eac49973fcba2034df65214afb949ce3b1b4ff57b07b07f6e608
+Size (pdns-4.2.2.tar.bz2) = 1256587 bytes
 SHA1 (patch-configure) = 1503efadf2d8baaaa0887b61bd4f7672ea33a043
 SHA1 (patch-ext_json11_json11.cpp) = a8ffe67156a836841aef8a6bba134a82283f381e
 SHA1 (patch-pdns_dnsscope.cc) = b289b750686b25041c3e291fb0d3d562beb36eaf
diff --git a/net/powerdns/patches/patch-pdns_iputils.hh b/net/powerdns/patches/patch-pdns_iputils.hh
deleted file mode 100644
index 75784d17e24..00000000000
--- a/net/powerdns/patches/patch-pdns_iputils.hh
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-pdns_iputils.hh,v 1.3 2018/01/02 12:18:15 fhajny Exp $
-
-- Do not use IP_PKTINFO on NetBSD, the structure is not as expected.
-- Backport fix for SunOS segfault problem, see:
-  https://github.com/PowerDNS/pdns/pull/4877
-
---- pdns/iputils.hh.orig	2017-01-17 08:43:49.000000000 +0000
-+++ pdns/iputils.hh
-@@ -40,6 +40,10 @@
- 
- #include "namespaces.hh"
- 
-+#if defined(__NetBSD__) && defined(IP_PKTINFO)
-+#undef IP_PKTINFO
-+#endif
-+
- #ifdef __APPLE__
- #include <libkern/OSByteOrder.h>
-