CVS commit: pkgsrc/net/powerdns-recursor

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Sep 29 12:47:31 UTC 2022

Modified Files:
        pkgsrc/net/powerdns-recursor: Makefile distinfo
        pkgsrc/net/powerdns-recursor/patches: patch-qtype.hh
Added Files:
        pkgsrc/net/powerdns-recursor/patches: patch-portsmplexer.cc
Removed Files:
        pkgsrc/net/powerdns-recursor/patches: patch-iputils.cc

Log Message:
powerdns-recursor: Update to 4.7.3.

The changelogs are very long and unwieldly, even trying to use the raw versions
as they're written in RST, so please see the following URLs for the full list
of changes (which are very many) since 4.4.2:

  https://doc.powerdns.com/recursor/changelog/4.7.html
  https://doc.powerdns.com/recursor/changelog/4.6.html
  https://doc.powerdns.com/recursor/changelog/4.5.html
  https://doc.powerdns.com/recursor/changelog/4.4.html


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/net/powerdns-recursor/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/powerdns-recursor/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/net/powerdns-recursor/patches/patch-iputils.cc
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/net/powerdns-recursor/patches/patch-portsmplexer.cc
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/powerdns-recursor/patches/patch-qtype.hh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/powerdns-recursor/Makefile
diff -u pkgsrc/net/powerdns-recursor/Makefile:1.42 pkgsrc/net/powerdns-recursor/Makefile:1.43
--- pkgsrc/net/powerdns-recursor/Makefile:1.42  Fri Sep 10 11:00:27 2021
+++ pkgsrc/net/powerdns-recursor/Makefile       Thu Sep 29 12:47:31 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2021/09/10 11:00:27 nia Exp $
+# $NetBSD: Makefile,v 1.43 2022/09/29 12:47:31 jperkin Exp $
 
-DISTNAME=      pdns-recursor-4.4.2
+DISTNAME=      pdns-recursor-4.7.3
 PKGNAME=       ${DISTNAME:S/pdns/powerdns/}
 CATEGORIES=    net
 MASTER_SITES=  http://downloads.powerdns.com/releases/

Index: pkgsrc/net/powerdns-recursor/distinfo
diff -u pkgsrc/net/powerdns-recursor/distinfo:1.39 pkgsrc/net/powerdns-recursor/distinfo:1.40
--- pkgsrc/net/powerdns-recursor/distinfo:1.39  Tue Oct 26 11:06:31 2021
+++ pkgsrc/net/powerdns-recursor/distinfo       Thu Sep 29 12:47:31 2022
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.39 2021/10/26 11:06:31 nia Exp $
+$NetBSD: distinfo,v 1.40 2022/09/29 12:47:31 jperkin Exp $
 
-BLAKE2s (pdns-recursor-4.4.2.tar.bz2) = 00e93a1ee53a5d7035fad9452df3912a05edc4472319425ada13e83828cdeac5
-SHA512 (pdns-recursor-4.4.2.tar.bz2) = 31fdf62d87e5ee8f9570c6b738339bc8cc65c43800f18c7fb49aa5c53fc9ad76a1ddf02cc44f7129e06b41700b5cb3768ff8f81cc521c28147ea6538c73f8781
-Size (pdns-recursor-4.4.2.tar.bz2) = 1396763 bytes
+BLAKE2s (pdns-recursor-4.7.3.tar.bz2) = e5de87edce1ef60555d6c4b3d908cdf25fccb00e7ef6812046ece974e0a51cc9
+SHA512 (pdns-recursor-4.7.3.tar.bz2) = e7d9fa32dd53e9b382689e6e735f35b12dbd9f2bb0e8b3031ab58f53a61b5cdc947cb5e857a991768afd1b403bc02d20d434dded5800be450ad45368c9d1dc0e
+Size (pdns-recursor-4.7.3.tar.bz2) = 1597064 bytes
 SHA1 (patch-dns.hh) = 7e9c1b10a066a605b74ebdbee2d894aed50f6c68
 SHA1 (patch-ext_json11_json11.cpp) = 2de8ea8b51556bd3e3c1a88f681697eff239ab1a
-SHA1 (patch-iputils.cc) = a7a25d76293bc2e68efc749c661ae1595167fab7
-SHA1 (patch-qtype.hh) = f14eb9ad7efc7dd4a0ce220c1f93044ef69e99c2
+SHA1 (patch-portsmplexer.cc) = 46d762b82ec2dd0ba67dab744f5f4531f09c6dec
+SHA1 (patch-qtype.hh) = 567c9f36fa0b414e605e6788ba5b7a9f293476a5
 SHA1 (patch-version.cc) = 26226a02198edd9d8890a5199ee5a8051334fe41

Index: pkgsrc/net/powerdns-recursor/patches/patch-qtype.hh
diff -u pkgsrc/net/powerdns-recursor/patches/patch-qtype.hh:1.1 pkgsrc/net/powerdns-recursor/patches/patch-qtype.hh:1.2
--- pkgsrc/net/powerdns-recursor/patches/patch-qtype.hh:1.1     Thu Mar  9 13:43:49 2017
+++ pkgsrc/net/powerdns-recursor/patches/patch-qtype.hh Thu Sep 29 12:47:31 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-qtype.hh,v 1.1 2017/03/09 13:43:49 fhajny Exp $
+$NetBSD: patch-qtype.hh,v 1.2 2022/09/29 12:47:31 jperkin Exp $
 
 Avoid symbol pollution on SunOS.
 
---- qtype.hh.orig      2017-01-13 08:55:55.000000000 +0000
+--- qtype.hh.orig      2022-09-19 10:31:34.000000000 +0000
 +++ qtype.hh
 @@ -26,6 +26,10 @@
- #include <vector>
+ 
  #include "namespaces.hh"
  
 +#if defined(__sun) && defined(DS)

Added files:

Index: pkgsrc/net/powerdns-recursor/patches/patch-portsmplexer.cc
diff -u /dev/null pkgsrc/net/powerdns-recursor/patches/patch-portsmplexer.cc:1.4
--- /dev/null   Thu Sep 29 12:47:31 2022
+++ pkgsrc/net/powerdns-recursor/patches/patch-portsmplexer.cc  Thu Sep 29 12:47:31 2022
@@ -0,0 +1,36 @@
+$NetBSD: patch-portsmplexer.cc,v 1.4 2022/09/29 12:47:31 jperkin Exp $
+
+Fix build on SunOS.
+
+--- portsmplexer.cc.orig       2022-09-19 10:31:34.000000000 +0000
++++ portsmplexer.cc
+@@ -39,9 +39,9 @@ private:
+   std::vector<port_event_t> d_pevents;
+ };
+ 
+-static FDMultiplexer* makePorts(unsigned int)
++static FDMultiplexer* makePorts(unsigned int maxEventsHint)
+ {
+-  return new PortsFDMultiplexer();
++  return new PortsFDMultiplexer(maxEventsHint);
+ }
+ 
+ static struct PortsRegisterOurselves
+@@ -94,7 +94,7 @@ void PortsFDMultiplexer::getAvailableFDs
+   timeoutspec.tv_sec = timeout / 1000;
+   timeoutspec.tv_nsec = (timeout % 1000) * 1000000;
+   unsigned int numevents = 1;
+-  int ret = port_getn(d_portfd, d_pevents.data(), min(PORT_MAX_LIST, d_pevents.size()), &numevents, &timeoutspec);
++  int ret = port_getn(d_portfd, d_pevents.data(), min(PORT_MAX_LIST, static_cast<int>(d_pevents.size())), &numevents, &timeoutspec);
+ 
+   /* port_getn has an unusual API - (ret == -1, errno == ETIME) can
+      mean partial success; you must check (*numevents) in this case
+@@ -155,7 +155,7 @@ int PortsFDMultiplexer::run(struct timev
+   timeoutspec.tv_sec = timeout / 1000;
+   timeoutspec.tv_nsec = (timeout % 1000) * 1000000;
+   unsigned int numevents = 1;
+-  int ret = port_getn(d_portfd, d_pevents.data(), min(PORT_MAX_LIST, d_pevents.size()), &numevents, &timeoutspec);
++  int ret = port_getn(d_portfd, d_pevents.data(), min(PORT_MAX_LIST, static_cast<int>(d_pevents.size())), &numevents, &timeoutspec);
+ 
+   /* port_getn has an unusual API - (ret == -1, errno == ETIME) can
+      mean partial success; you must check (*numevents) in this case