dnsdist: updated to 1.5.0

1.5.0

Improvements
Use explicit flag for the specific version of c++ we are targeting.
Prevent a copy of a pool’s backends when selecting a server.

Bug Fixes
Fix compilation with h2o_socket_get_ssl_server_name().
Prevent a possible overflow via large Proxy Protocol values. (Valentei Sergey)
Avoid name clashes on Solaris derived systems.
Resize hostname to final size in getCarbonHostname(). (Aki Tuomi)
Fix compilation on OpenBSD/amd64.
Handle calling PacketCache methods on a nil object.


1.4.0

Improvements
Fix the default value of setMaxUDPOutstanding in the console’s help (phonedph1)
Add bindings for the noerrors and drops members of StatNode
Fix -Wshadow warnings (Aki Tuomi)
Fix typo: settting to setting (Chris Hofstaedtler)

Bug Fixes
Lowercase the name blocked by a SMT dynamic block

misc
Prefer the cipher suite from the server by default (DoH, DoT)

6 files changed, 20 insertions, 90 deletions

diff --git a/net/dnsdist/Makefile b/net/dnsdist/Makefile
index 5a7033a4df0..489f5812b24 100644
--- a/net/dnsdist/Makefile
+++ b/net/dnsdist/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2020/01/18 21:50:11 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2020/08/06 16:28:03 adam Exp $
 
-DISTNAME=	dnsdist-1.3.3
-PKGREVISION=	1
+DISTNAME=	dnsdist-1.5.0
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.powerdns.com/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -32,10 +31,10 @@ CONF_FILES+=	share/examples/dnsdist/dnsdist.conf \
 CONFIGURE_ARGS+=	--enable-dns-over-tls
 CONFIGURE_ARGS+=	--enable-dnscrypt
 CONFIGURE_ARGS+=	--enable-fstrm
-CONFIGURE_ARGS+=	--enable-libsodium
-CONFIGURE_ARGS+=	--enable-libssl
-CONFIGURE_ARGS+=	--enable-re2
+CONFIGURE_ARGS+=	--with-libsodium
+CONFIGURE_ARGS+=	--with-libssl
 CONFIGURE_ARGS+=	--with-protobuf
+CONFIGURE_ARGS+=	--with-re2
 CONFIGURE_ARGS+=	--without-net-snmp
 CONFIGURE_ENV+=		LIBEDIT_CFLAGS="-I${BUILDLINK_PREFIX.libedit}/include"
 CONFIGURE_ENV+=		LIBEDIT_LIBS="-L${BUILDLINK_PREFIX.libedit}/lib -ledit"
diff --git a/net/dnsdist/distinfo b/net/dnsdist/distinfo
index 8ade58d82ea..3b9071d724c 100644
--- a/net/dnsdist/distinfo
+++ b/net/dnsdist/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.8 2020/04/23 07:43:30 jperkin Exp $
+$NetBSD: distinfo,v 1.9 2020/08/06 16:28:03 adam Exp $
 
-SHA1 (dnsdist-1.3.3.tar.bz2) = 18f667b8e7f7918723c5d6721160c3aed8ebd0a1
-RMD160 (dnsdist-1.3.3.tar.bz2) = c543146e87a148cfffbf0112a07504e9572a05cb
-SHA512 (dnsdist-1.3.3.tar.bz2) = c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad
-Size (dnsdist-1.3.3.tar.bz2) = 971253 bytes
-SHA1 (patch-devpollmplexer.cc) = f942ab6fc962496ac8d8e02c95fc4e0bf41d2f06
-SHA1 (patch-dnsdist-console.cc) = 88807410b017e6e6480ace24d0f65a3f235f0c5e
-SHA1 (patch-dnsdist.cc) = d5a77b8868b84198262ca55e0eac54f5e7645919
+SHA1 (dnsdist-1.5.0.tar.bz2) = 34fd90b536976d0ed4dd72e9904519261d0bdbab
+RMD160 (dnsdist-1.5.0.tar.bz2) = 0dd88ed4b3abc8da54d568c35f29f6503b9b626a
+SHA512 (dnsdist-1.5.0.tar.bz2) = df6f8caae001f152f0d264176c570778842979484d16e4199afe0e2591006392444245dd8ce23287cdcf9613e2c40a9e3564f5236e5f5a6fd67b89d6ea0d9ed4
+Size (dnsdist-1.5.0.tar.bz2) = 1067645 bytes
+SHA1 (patch-dnsdist-console.cc) = 4675ca40e738e3d9e15d9a3c6993e1adce102a30
+SHA1 (patch-dnsdist.cc) = 8d3f167e38b6b67bb4d9b7f06dcc0245cf6c904f
 SHA1 (patch-ext_json11_json11.cpp) = 9fb12578d80103b8b92e984a483cbda98fd83db8
 SHA1 (patch-iputils.hh) = 09207cd894162d634cd832f12209e38a0c253624
-SHA1 (patch-portsmplexer.cc) = 9f1b0dc40d0baaa0bf7297d0c4c783abffb16c33
 SHA1 (patch-qtype.hh) = 4551be1e303a31d34030c363849398923f5ff987
diff --git a/net/dnsdist/patches/patch-devpollmplexer.cc b/net/dnsdist/patches/patch-devpollmplexer.cc
deleted file mode 100644
index 22fe4fb0800..00000000000
--- a/net/dnsdist/patches/patch-devpollmplexer.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-devpollmplexer.cc,v 1.1 2018/08/08 15:39:55 fhajny Exp $
-
-This include is not distributed anymore.
-
---- devpollmplexer.cc.orig	2018-07-10 12:43:20.000000000 +0000
-+++ devpollmplexer.cc
-@@ -33,7 +33,6 @@
- #include <iostream>
- #include <unistd.h>
- #include "misc.hh"
--#include "syncres.hh"
- 
- #include "namespaces.hh"
- 
diff --git a/net/dnsdist/patches/patch-dnsdist-console.cc b/net/dnsdist/patches/patch-dnsdist-console.cc
index 1d4aa48e7be..77585b7e93e 100644
--- a/net/dnsdist/patches/patch-dnsdist-console.cc
+++ b/net/dnsdist/patches/patch-dnsdist-console.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-dnsdist-console.cc,v 1.4 2020/04/23 07:43:30 jperkin Exp $
+$NetBSD: patch-dnsdist-console.cc,v 1.5 2020/08/06 16:28:03 adam Exp $
 
 Always use the pkgsrc editline layout.
 
---- dnsdist-console.cc.orig	2018-11-08 10:15:21.000000000 +0000
+--- dnsdist-console.cc.orig	2020-07-28 07:39:28.000000000 +0000
 +++ dnsdist-console.cc
 @@ -24,7 +24,7 @@
  #include <pwd.h>
@@ -10,6 +10,6 @@ Always use the pkgsrc editline layout.
  
 -#if defined (__OpenBSD__) || defined(__NetBSD__)
 +#if 1
+ // If this is not undeffed, __attribute__ wil be redefined by /usr/include/readline/rlstdc.h
+ #undef __STRICT_ANSI__
  #include <readline/readline.h>
- #include <readline/history.h>
- #else
diff --git a/net/dnsdist/patches/patch-dnsdist.cc b/net/dnsdist/patches/patch-dnsdist.cc
index 3545250293b..af7bf451c41 100644
--- a/net/dnsdist/patches/patch-dnsdist.cc
+++ b/net/dnsdist/patches/patch-dnsdist.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-dnsdist.cc,v 1.5 2020/04/23 07:43:30 jperkin Exp $
+$NetBSD: patch-dnsdist.cc,v 1.6 2020/08/06 16:28:03 adam Exp $
 
 Always use the pkgsrc editline layout.
 
---- dnsdist.cc.orig	2018-11-08 10:15:21.000000000 +0000
+--- dnsdist.cc.orig	2020-07-29 16:09:33.000000000 +0000
 +++ dnsdist.cc
 @@ -31,7 +31,7 @@
  #include <sys/resource.h>
@@ -10,6 +10,6 @@ Always use the pkgsrc editline layout.
  
 -#if defined (__OpenBSD__) || defined(__NetBSD__)
 +#if 1
+ // If this is not undeffed, __attribute__ wil be redefined by /usr/include/readline/rlstdc.h
+ #undef __STRICT_ANSI__
  #include <readline/readline.h>
- #else
- #include <editline/readline.h>
diff --git a/net/dnsdist/patches/patch-portsmplexer.cc b/net/dnsdist/patches/patch-portsmplexer.cc
deleted file mode 100644
index fdd6614fe9f..00000000000
--- a/net/dnsdist/patches/patch-portsmplexer.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-portsmplexer.cc,v 1.1 2018/08/08 15:39:55 fhajny Exp $
-
-Fix stale code and add missing getAvailableFDs() implementation.
-
---- portsmplexer.cc.orig	2018-07-10 12:43:20.000000000 +0000
-+++ portsmplexer.cc
-@@ -24,10 +24,11 @@ public:
-   }
- 
-   virtual int run(struct timeval* tv, int timeout=500);
-+  virtual void getAvailableFDs(std::vector<int>& fds, int timeout) override;
- 
-   virtual void addFD(callbackmap_t& cbmap, int fd, callbackfunc_t toDo, const boost::any& parameter);
-   virtual void removeFD(callbackmap_t& cbmap, int fd);
--  string getName()
-+  string getName() const override
-   {
-     return "solaris completion ports";
-   }
-@@ -78,6 +79,22 @@ void PortsFDMultiplexer::removeFD(callba
-     throw FDMultiplexerException("Removing fd from port set: "+stringerror());
- }
- 
-+void PortsFDMultiplexer::getAvailableFDs(std::vector<int>& fds, int timeout)
-+{
-+  struct timespec timeoutspec;
-+  timeoutspec.tv_sec = timeout / 1000;
-+  timeoutspec.tv_nsec = (timeout % 1000) * 1000000;
-+  unsigned int numevents=1;
-+  int ret= port_getn(d_portfd, d_pevents.get(), min(PORT_MAX_LIST, s_maxevents), &numevents, &timeoutspec);
-+
-+  if(ret < 0 && errno!=EINTR)
-+    throw FDMultiplexerException("ports returned error: "+stringerror());
-+
-+  for(int n=0; n < ret; ++n) {
-+    fds.push_back(d_pevents[n].portev_object);
-+  }
-+}
-+
- int PortsFDMultiplexer::run(struct timeval* now, int timeout)
- {
-   if(d_inrun) {
-@@ -85,8 +102,8 @@ int PortsFDMultiplexer::run(struct timev
-   }
-   
-   struct timespec timeoutspec;
--  timeoutspec.tv_sec = time / 1000;
--  timeoutspec.tv_nsec = (time % 1000) * 1000000;
-+  timeoutspec.tv_sec = timeout / 1000;
-+  timeoutspec.tv_nsec = (timeout % 1000) * 1000000;
-   unsigned int numevents=1;
-   int ret= port_getn(d_portfd, d_pevents.get(), min(PORT_MAX_LIST, s_maxevents), &numevents, &timeoutspec);
-