[pkgsrc/trunk]: pkgsrc/net/powerdns-recursor net/powerdns-recursor: Update to...

[otis <otis%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/71da1fabd532
branches:  trunk
changeset: 439946:71da1fabd532
user:      otis <otis%pkgsrc.org@localhost>
date:      Wed Sep 30 11:53:07 2020 +0000

description:
net/powerdns-recursor: Update to 4.3.4

Changelog for 4.3.4:
Released: 8th of September 2020
* Improvements:
  - Ensure runtime dirs for virtual services differ.

* Bug Fixes:
  - Allow some more depth headroom for the no-qname-minimization fallback case
  - Resize hostname to final size in getCarbonHostname().

Changelog for 4.3.3:
Released: 17th of July 2020
* Bug Fixes:
  - Validate cached DNSKEYs against the DSs, not the RRSIGs only.
  - Ignore cache-only for DNSKEYs and DS retrieval.
  - A ServFail while retrieving DS/DNSKEY records is just that.
  - Refuse DS records received from child zones.
  - Better exception handling in houseKeeping/handlePolicyHit.
  - Take initial refresh time from loaded zone.

pkgsrc-specific changes:
  - Move pdns socket directory to /var/run/pdns-recursor
    to reduce diff
  - Introduce SMF method script that also creates the
    socket directory on platforms where /var/run is not
    persistent (i.e. swap or tmpfs-mounted)

diffstat:

 net/powerdns-recursor/Makefile                        |   9 ++++--
 net/powerdns-recursor/distinfo                        |  13 ++++----
 net/powerdns-recursor/files/pdns_recursor.sh          |   4 +-
 net/powerdns-recursor/files/smf/manifest.xml          |   5 ++-
 net/powerdns-recursor/files/smf/pdns_recursor.sh      |  24 ++++++++++++++++
 net/powerdns-recursor/patches/patch-iputils.cc        |  28 +++++++++++++++++++
 net/powerdns-recursor/patches/patch-pdns__recursor.cc |  22 --------------
 net/powerdns-recursor/patches/patch-rec__control.cc   |  22 --------------
 8 files changed, 69 insertions(+), 58 deletions(-)

diffs (195 lines):

diff -r b2ee84a2876f -r 71da1fabd532 net/powerdns-recursor/Makefile
--- a/net/powerdns-recursor/Makefile    Wed Sep 30 10:28:08 2020 +0000
+++ b/net/powerdns-recursor/Makefile    Wed Sep 30 11:53:07 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2020/07/01 14:53:13 otis Exp $
+# $NetBSD: Makefile,v 1.38 2020/09/30 11:53:07 otis Exp $
 
-DISTNAME=      pdns-recursor-4.3.2
+DISTNAME=      pdns-recursor-4.3.4
 PKGNAME=       ${DISTNAME:S/pdns/powerdns/}
 CATEGORIES=    net
 MASTER_SITES=  http://downloads.powerdns.com/releases/
@@ -18,7 +18,10 @@
 # currently not portable
 CONFIGURE_ENV.NetBSD+= ac_cv_search_pthread_setaffinity_np=no
 
-RCD_SCRIPTS+=          pdns_recursor
+RCD_SCRIPTS=           pdns_recursor
+
+SMF_NAME=              pdns-recursor
+SMF_METHODS=           pdns_recursor
 
 EGDIR=                 ${PREFIX}/share/examples/pdns-recursor
 
diff -r b2ee84a2876f -r 71da1fabd532 net/powerdns-recursor/distinfo
--- a/net/powerdns-recursor/distinfo    Wed Sep 30 10:28:08 2020 +0000
+++ b/net/powerdns-recursor/distinfo    Wed Sep 30 11:53:07 2020 +0000
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.33 2020/07/01 14:53:13 otis Exp $
+$NetBSD: distinfo,v 1.34 2020/09/30 11:53:07 otis Exp $
 
-SHA1 (pdns-recursor-4.3.2.tar.bz2) = 1bbe98f8eb726a0468d274f6c6c6dc5dc373df77
-RMD160 (pdns-recursor-4.3.2.tar.bz2) = e1618a3901b34df1df477f889705b2d65516a7fe
-SHA512 (pdns-recursor-4.3.2.tar.bz2) = d1ca566dc8785fda3764838a0ea598acc4106b6261ebdbbe43fc6a6e4a82c375f7ef3f6d23fbd9b216067eb9cf56fcae6d460bfc7957ba4c201d466ad15d75d7
-Size (pdns-recursor-4.3.2.tar.bz2) = 1354549 bytes
+SHA1 (pdns-recursor-4.3.4.tar.bz2) = 1ade30bb1f9ee78438be59e1ed76d96eb95f7f62
+RMD160 (pdns-recursor-4.3.4.tar.bz2) = 097a0f32f8bc988063cacde2de407d231d37b809
+SHA512 (pdns-recursor-4.3.4.tar.bz2) = cfc34f42ed95c7fd2be1ab7ba172672e5e1db96b4ced171c1eae7bd60fb7db482aed928028811b133d326550de35c506a8fc480b12ae39ab7fa142408e0b42d8
+Size (pdns-recursor-4.3.4.tar.bz2) = 1359380 bytes
 SHA1 (patch-dns.hh) = 7e9c1b10a066a605b74ebdbee2d894aed50f6c68
 SHA1 (patch-ext_json11_json11.cpp) = 2de8ea8b51556bd3e3c1a88f681697eff239ab1a
-SHA1 (patch-pdns__recursor.cc) = 69bb4aa20e691e557f9a8cac3a3ebf30c52febef
+SHA1 (patch-iputils.cc) = a7a25d76293bc2e68efc749c661ae1595167fab7
 SHA1 (patch-qtype.hh) = f14eb9ad7efc7dd4a0ce220c1f93044ef69e99c2
-SHA1 (patch-rec__control.cc) = 876a4527c871c4df05e0f14a2ea858e411ffefbd
 SHA1 (patch-version.cc) = 26226a02198edd9d8890a5199ee5a8051334fe41
 SHA1 (patch-webserver.cc) = 2b34430b990c8398daf565d4811fd12848234c6a
 SHA1 (patch-ws-recursor.cc) = 24d8582cff7207d84458dc123cc9976806c310b9
diff -r b2ee84a2876f -r 71da1fabd532 net/powerdns-recursor/files/pdns_recursor.sh
--- a/net/powerdns-recursor/files/pdns_recursor.sh      Wed Sep 30 10:28:08 2020 +0000
+++ b/net/powerdns-recursor/files/pdns_recursor.sh      Wed Sep 30 11:53:07 2020 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pdns_recursor.sh,v 1.1.1.1 2009/04/21 14:16:47 roy Exp $
+# $NetBSD: pdns_recursor.sh,v 1.2 2020/09/30 11:53:07 otis Exp $
 #
 
 # PROVIDE: pdns_recursor
@@ -12,7 +12,7 @@
 rcvar=$name
 command="@PREFIX@/sbin/pdns_recursor"
 command_args="--daemon=yes 2>/dev/null"
-pidfile=/var/run/${name}.pid
+pidfile=/var/run/pdns-recursor/${name}.pid
 required_files="@PKG_SYSCONFDIR@/recursor.conf"
 
 load_rc_config $name
diff -r b2ee84a2876f -r 71da1fabd532 net/powerdns-recursor/files/smf/manifest.xml
--- a/net/powerdns-recursor/files/smf/manifest.xml      Wed Sep 30 10:28:08 2020 +0000
+++ b/net/powerdns-recursor/files/smf/manifest.xml      Wed Sep 30 11:53:07 2020 +0000
@@ -11,8 +11,9 @@
       <service_fmri value="svc:/system/filesystem/local" />
     </dependency>
     <method_context></method_context>
-    <exec_method type="method" name="start" exec="@PREFIX@/sbin/pdns_recursor --daemon" timeout_seconds="60" />
-    <exec_method type="method" name="stop" exec="@PREFIX@/bin/rec_control quit" timeout_seconds="60" />
+    <exec_method type='method' name='start' exec='@PREFIX@/@SMF_METHOD_FILE.pdns_recursor@ start' timeout_seconds='30' />
+    <exec_method type='method' name='stop' exec='@PREFIX@/@SMF_METHOD_FILE.pdns_recursor@ stop' timeout_seconds='30' />
+    <exec_method type='method' name='refresh' exec='@PREFIX@/@SMF_METHOD_FILE.pdns_recursor@ refresh' timeout_seconds='30' />
     <property_group name="startd" type="framework">
       <propval name="duration" type="astring" value="contract" />
       <propval name="ignore_error" type="astring" value="core,signal" />
diff -r b2ee84a2876f -r 71da1fabd532 net/powerdns-recursor/files/smf/pdns_recursor.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/powerdns-recursor/files/smf/pdns_recursor.sh  Wed Sep 30 11:53:07 2020 +0000
@@ -0,0 +1,24 @@
+#!@SMF_METHOD_SHELL@
+#
+# $NetBSD: pdns_recursor.sh,v 1.1 2020/09/30 11:53:07 otis Exp $
+#
+
+. /lib/svc/share/smf_include.sh
+
+if [ ! -d @VARBASE@/run/pdns-recursor ]; then
+       @MKDIR@ @VARBASE@/run/pdns-recursor
+       @CHMOD@ 0755 @VARBASE@/run/pdns-recursor
+fi
+
+case "$1" in
+   start)
+      @PREFIX@/sbin/pdns_recursor --daemon
+      ;;
+   stop)
+      @PREFIX@/bin/rec_control quit
+      ;;
+   refresh)
+      $0 stop
+      $0 start
+      ;;
+esac
diff -r b2ee84a2876f -r 71da1fabd532 net/powerdns-recursor/patches/patch-iputils.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/powerdns-recursor/patches/patch-iputils.cc    Wed Sep 30 11:53:07 2020 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-iputils.cc,v 1.3 2020/09/30 11:53:07 otis Exp $
+
+Silence the warning about defined but not used variable on
+apropriate platforms.
+
+--- iputils.cc.orig    2020-09-04 17:20:52.000000000 +0000
++++ iputils.cc
+@@ -322,7 +322,9 @@ size_t sendMsgWithOptions(int fd, const
+   msgh.msg_flags = 0;
+ 
+   size_t sent = 0;
++#ifdef MSG_FASTOPEN
+   bool firstTry = true;
++#endif
+ 
+   do {
+ 
+@@ -342,8 +344,10 @@ size_t sendMsgWithOptions(int fd, const
+         return sent;
+       }
+ 
++#ifdef MSG_FASTOPEN
+       /* partial write */
+       firstTry = false;
++#endif
+       iov.iov_len -= written;
+       iov.iov_base = reinterpret_cast<void*>(reinterpret_cast<char*>(iov.iov_base) + written);
+       written = 0;
diff -r b2ee84a2876f -r 71da1fabd532 net/powerdns-recursor/patches/patch-pdns__recursor.cc
--- a/net/powerdns-recursor/patches/patch-pdns__recursor.cc     Wed Sep 30 10:28:08 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-pdns__recursor.cc,v 1.6 2020/06/17 22:55:11 otis Exp $
-
---- pdns_recursor.cc.orig      2020-05-08 09:31:59.000000000 +0000
-+++ pdns_recursor.cc
-@@ -4673,7 +4673,7 @@ int main(int argc, char **argv)
-     ::arg().set("socket-group","Group of socket")="";
-     ::arg().set("socket-mode", "Permissions for socket")="";
- 
--    ::arg().set("socket-dir",string("Where the controlsocket will live, ")+LOCALSTATEDIR+"/pdns-recursor when unset and not chrooted" )="";
-+    ::arg().set("socket-dir",string("Where the controlsocket will live, ")+LOCALSTATEDIR+" when unset and not chrooted" )="";
-     ::arg().set("delegation-only","Which domains we only accept delegations from")="";
-     ::arg().set("query-local-address","Source IP address for sending queries")="0.0.0.0";
-     ::arg().set("query-local-address6","Source IPv6 address for sending queries. IF UNSET, IPv6 WILL NOT BE USED FOR OUTGOING QUERIES")="";
-@@ -4848,7 +4848,7 @@ int main(int argc, char **argv)
- 
-     if (::arg()["socket-dir"].empty()) {
-       if (::arg()["chroot"].empty())
--        ::arg().set("socket-dir") = std::string(LOCALSTATEDIR) + "/pdns-recursor";
-+        ::arg().set("socket-dir") = std::string(LOCALSTATEDIR);
-       else
-         ::arg().set("socket-dir") = "/";
-     }
diff -r b2ee84a2876f -r 71da1fabd532 net/powerdns-recursor/patches/patch-rec__control.cc
--- a/net/powerdns-recursor/patches/patch-rec__control.cc       Wed Sep 30 10:28:08 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-rec__control.cc,v 1.1 2020/06/17 22:55:11 otis Exp $
-
---- rec_control.cc.orig        2020-05-08 09:30:45.000000000 +0000
-+++ rec_control.cc
-@@ -39,7 +39,7 @@ static void initArguments(int argc, char
- {
-   arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
- 
--  arg().set("socket-dir",string("Where the controlsocket will live, ")+LOCALSTATEDIR+"/pdns-recursor when unset and not chrooted" )="";
-+  arg().set("socket-dir",string("Where the controlsocket will live, ")+LOCALSTATEDIR+" when unset and not chrooted" )="";
-   arg().set("chroot","switch to chroot jail")="";
-   arg().set("process","When controlling multiple recursors, the target process number")="";
-   arg().set("timeout", "Number of seconds to wait for the recursor to respond")="5";
-@@ -72,7 +72,7 @@ static void initArguments(int argc, char
- 
-   if (::arg()["socket-dir"].empty()) {
-     if (::arg()["chroot"].empty())
--      ::arg().set("socket-dir") = std::string(LOCALSTATEDIR) + "/pdns-recursor";
-+      ::arg().set("socket-dir") = std::string(LOCALSTATEDIR);
-     else
-       ::arg().set("socket-dir") = ::arg()["chroot"] + "/";
-   } else if (!::arg()["chroot"].empty()) {