net/bind916: Update to 9.16.17

Feature Changes:
- After the network manager was introduced to named to handle incoming traffic,
  it was discovered that recursive performance had degraded compared to
  previous BIND 9 versions. This has now been fixed by processing internal
  tasks inside network manager worker threads, preventing resource contention
  among two sets of threads.

- Zone dumping tasks are now run on separate asynchronous thread pools. This
  change prevents zone dumping from blocking network I/O.

- inline-signing was incorrectly described as being inherited from the
  options/view levels and was incorrectly accepted at those levels without
  effect. This has been fixed; named.conf files with inline-signing at those
  levels no longer load.


Full changelog:
https://bind9.readthedocs.io/en/v9_16/notes.html#notes-for-bind-9-16-17

7 files changed, 11 insertions, 103 deletions

diff --git a/net/bind916/Makefile b/net/bind916/Makefile
index 0557368e9a8..6adb5300050 100644
--- a/net/bind916/Makefile
+++ b/net/bind916/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/06/02 15:37:30 taca Exp $
+# $NetBSD: Makefile,v 1.17 2021/06/17 09:04:45 otis Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
@@ -15,7 +15,7 @@ CONFLICTS+=	host-[0-9]*
 
 MAKE_JOBS_SAFE=	no
 
-BIND_VERSION=	9.16.16
+BIND_VERSION=	9.16.17
 
 BUILD_DEFS+=	BIND_DIR VARBASE
 
diff --git a/net/bind916/PLIST b/net/bind916/PLIST
index 6eaca5a1878..ce60f379055 100644
--- a/net/bind916/PLIST
+++ b/net/bind916/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2021/03/21 04:16:17 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/06/17 09:04:45 otis Exp $
 bin/arpaname
 bin/delv
 bin/dig
@@ -131,6 +131,7 @@ include/isc/assertions.h
 include/isc/astack.h
 include/isc/atomic.h
 include/isc/backtrace.h
+include/isc/barrier.h
 include/isc/base32.h
 include/isc/base64.h
 include/isc/bind9.h
@@ -169,6 +170,7 @@ include/isc/likely.h
 include/isc/list.h
 include/isc/log.h
 include/isc/magic.h
+include/isc/managers.h
 include/isc/md.h
 include/isc/mem.h
 include/isc/meminfo.h
@@ -220,9 +222,9 @@ include/isc/taskpool.h
 include/isc/thread.h
 include/isc/time.h
 include/isc/timer.h
-include/isc/tls.h
 include/isc/tm.h
 include/isc/types.h
+include/isc/url.h
 include/isc/utf8.h
 include/isc/util.h
 include/isc/version.h
diff --git a/net/bind916/distinfo b/net/bind916/distinfo
index c1fd2878353..2b05c8d6486 100644
--- a/net/bind916/distinfo
+++ b/net/bind916/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2021/06/04 21:56:50 otis Exp $
+$NetBSD: distinfo,v 1.15 2021/06/17 09:04:45 otis Exp $
 
-SHA1 (bind-9.16.16.tar.xz) = dc37a919ba83674d1ff48558b640907b7a7dd0a7
-RMD160 (bind-9.16.16.tar.xz) = 3e6d92c834b91bd25122278ac6e9f41795040213
-SHA512 (bind-9.16.16.tar.xz) = 264aa70d0d111ddb2a62c65f57e3eeb7eb93afdebcc523166d236e8f23d61d1e4f91b5a2df8dffa49e6f8e3c7101a2689c38dd6d77ecdedb79e2b163990e6093
-Size (bind-9.16.16.tar.xz) = 5016864 bytes
+SHA1 (bind-9.16.17.tar.xz) = 03861dea0d98a1f9dcdbccc8888c93b268892257
+RMD160 (bind-9.16.17.tar.xz) = 7dcaf7c809f8a1f7ff4215485147267365b2405b
+SHA512 (bind-9.16.17.tar.xz) = 983d7d0ecd17ae926db2811c4af0354bafcfbaa96c82625f419be3dc81132ed23d599d1273351a3924ee9df79b358d67d88f42a91ad48c2dc596ff01904c83c3
+Size (bind-9.16.17.tar.xz) = 5021984 bytes
 SHA1 (patch-bin_dig_dighost.c) = b1073911d80ecd519af98b6678968296ff8c0c98
 SHA1 (patch-bin_dig_include_dig_dig.h) = 10166f5bb98b208c7b10d63eb31e8253f704acc8
 SHA1 (patch-bin_named_Makefile.in) = f1367da6a226ba44d0ee13acf00b8abeb5b1b7eb
diff --git a/net/bind916/patches/patch-lib_isc_include_isc_types.h b/net/bind916/patches/patch-lib_isc_include_isc_types.h
deleted file mode 100644
index 4bae6d0019e..00000000000
--- a/net/bind916/patches/patch-lib_isc_include_isc_types.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_isc_include_isc_types.h,v 1.1 2020/08/09 15:20:22 taca Exp $
-
-* Take from NetBSD base.
-
---- lib/isc/include/isc/types.h.orig	2020-05-06 09:59:35.000000000 +0000
-+++ lib/isc/include/isc/types.h
-@@ -84,7 +84,7 @@ typedef struct isc_socket      isc_socke
- typedef struct isc_socketevent isc_socketevent_t;    /*%< Socket Event */
- typedef struct isc_socketmgr   isc_socketmgr_t;	     /*%< Socket Manager */
- typedef struct isc_stats       isc_stats_t;	     /*%< Statistics */
--#if defined(_WIN32) && !defined(_WIN64)
-+#if defined(_WIN32) && !defined(_WIN64) || !defined(_LP64)
- typedef int_fast32_t isc_statscounter_t; /*%< Statistics Counter */
- #else  /* if defined(_WIN32) && !defined(_WIN64) */
- typedef int_fast64_t isc_statscounter_t;
diff --git a/net/bind916/patches/patch-lib_isc_include_isc_util.h b/net/bind916/patches/patch-lib_isc_include_isc_util.h
deleted file mode 100644
index 0e1713918f7..00000000000
--- a/net/bind916/patches/patch-lib_isc_include_isc_util.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-lib_isc_include_isc_util.h,v 1.1 2021/06/04 21:56:50 otis Exp $
-
-Fix build on SmartOS where priorities are not
-supported with gcc 7.5
-
---- lib/isc/include/isc/util.h.orig	2021-05-12 09:53:16.000000000 +0000
-+++ lib/isc/include/isc/util.h
-@@ -48,9 +48,12 @@
- #define ISC_NONSTRING
- #endif /* __GNUC__ */
- 
--#if HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR && HAVE_FUNC_ATTRIBUTE_DESTRUCTOR
-+#if HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR && HAVE_FUNC_ATTRIBUTE_DESTRUCTOR && !defined(__sun)
- #define ISC_CONSTRUCTOR(priority) __attribute__((constructor(priority)))
- #define ISC_DESTRUCTOR(priority)  __attribute__((destructor(priority)))
-+#elif defined(__sun)
-+#define ISC_CONSTRUCTOR(priority) __attribute__((constructor))
-+#define ISC_DESTRUCTOR(priority)  __attribute__((destructor))
- #elif WIN32
- #define ISC_CONSTRUCTOR(priority)
- #define ISC_DESTRUCTOR(priority)
diff --git a/net/bind916/patches/patch-lib_isc_task.c b/net/bind916/patches/patch-lib_isc_task.c
deleted file mode 100644
index d8a0da6d447..00000000000
--- a/net/bind916/patches/patch-lib_isc_task.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_isc_task.c,v 1.2 2021/06/02 15:37:06 taca Exp $
-
-* Take from NetBSD base.
-
---- lib/isc/task.c.orig	2021-05-12 09:53:16.000000000 +0000
-+++ lib/isc/task.c
-@@ -1412,7 +1412,7 @@ isc_taskmgr_create(isc_mem_t *mctx, unsi
- 		isc_thread_create(run, &manager->queues[i],
- 				  &manager->queues[i].thread);
- 		char name[21];
--		snprintf(name, sizeof(name), "isc-worker%04u", i);
-+		snprintf(name, sizeof(name), "work-%u", i);
- 		isc_thread_setname(manager->queues[i].thread, name);
- 	}
- 	UNLOCK(&manager->lock);
diff --git a/net/bind916/patches/patch-lib_ns_client.c b/net/bind916/patches/patch-lib_ns_client.c
deleted file mode 100644
index 9a17bad9a2e..00000000000
--- a/net/bind916/patches/patch-lib_ns_client.c
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-lib_ns_client.c,v 1.2 2021/02/17 21:36:03 wiz Exp $
-
-* Take from NetBSD base.
-
---- lib/ns/client.c.orig	2021-02-04 11:35:16.000000000 +0000
-+++ lib/ns/client.c
-@@ -87,8 +87,8 @@
- 	isc_log_write(ns_lctx, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_CLIENT, \
- 		      ISC_LOG_DEBUG(3), "clientmgr @%p: %s", manager, (m))
- #else /* ifdef NS_CLIENT_TRACE */
--#define CTRACE(m) ((void)(m))
--#define MTRACE(m) ((void)(m))
-+#define CTRACE(m) ((void)/*LINTED*/(m))
-+#define MTRACE(m) ((void)/*LINTED*/(m))
- #endif /* ifdef NS_CLIENT_TRACE */
- 
- #define TCP_CLIENT(c) (((c)->attributes & NS_CLIENTATTR_TCP) != 0)
-@@ -126,7 +126,7 @@
-  * Number of tasks to be used by clients - those are used only when recursing
-  */
- 
--#if defined(_WIN32) && !defined(_WIN64)
-+#if (defined(_WIN32) && !defined(_WIN64)) || !defined(_LP64)
- LIBNS_EXTERNAL_DATA atomic_uint_fast32_t ns_client_requests;
- #else  /* if defined(_WIN32) && !defined(_WIN64) */
- LIBNS_EXTERNAL_DATA atomic_uint_fast64_t ns_client_requests;
-@@ -2309,6 +2309,8 @@ ns__client_setup(ns_client_t *client, ns
- 		 * Retain these values from the existing client, but
- 		 * zero every thing else.
- 		 */
-+#ifndef __lint__
-+/* XXX: bug ? */
- 		*client = (ns_client_t){ .magic = 0,
- 					 .mctx = oldmctx,
- 					 .manager = oldmgr,
-@@ -2317,6 +2319,7 @@ ns__client_setup(ns_client_t *client, ns
- 					 .sendbuf = sendbuf,
- 					 .message = message,
- 					 .query = query };
-+#endif
- 	}
- 
- 	client->query.attributes &= ~NS_QUERYATTR_ANSWERED;