net/bind916: update to 9.16.30

	--- 9.16.30 released ---

5899.	[func]		Don't try to process DNSSEC-related and ZONEMD records
			in catz. [GL #3380]

5890.	[bug]		When the fetches-per-server quota was adjusted
			because of an authoritative server timing out more
			or less frequently, it was incorrectly set to 1
			rather than the intended value.  This has been
			fixed. [GL #3327]

5888.	[bug]		Only write key files if the dnssec-policy keymgr has
			changed the metadata. [GL #3302]

5823.	[func]		Replace hazard pointers based lock-free list with
			locked-list based queue that's simpler and has no or
			little performance impact. [GL #3180]

4 files changed, 17 insertions, 19 deletions

diff --git a/net/bind916/Makefile b/net/bind916/Makefile
index 1931076ef27..0619fa715fa 100644
--- a/net/bind916/Makefile
+++ b/net/bind916/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2022/05/18 15:05:07 taca Exp $
+# $NetBSD: Makefile,v 1.42 2022/06/15 14:02:36 taca 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.29
+BIND_VERSION=	9.16.30
 
 BUILD_DEFS+=	BIND_DIR VARBASE
 
diff --git a/net/bind916/PLIST b/net/bind916/PLIST
index 79a13849129..9924f0d1602 100644
--- a/net/bind916/PLIST
+++ b/net/bind916/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2022/04/21 14:14:46 taca Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/06/15 14:02:36 taca Exp $
 bin/arpaname
 bin/delv
 bin/dig
@@ -157,7 +157,6 @@ include/isc/hash.h
 include/isc/heap.h
 include/isc/hex.h
 include/isc/hmac.h
-include/isc/hp.h
 include/isc/ht.h
 include/isc/httpd.h
 include/isc/interfaceiter.h
@@ -190,7 +189,6 @@ include/isc/platform.h
 include/isc/pool.h
 include/isc/portset.h
 include/isc/print.h
-include/isc/queue.h
 include/isc/quota.h
 include/isc/radix.h
 include/isc/random.h
diff --git a/net/bind916/distinfo b/net/bind916/distinfo
index 48f6bb4a003..7f012da9085 100644
--- a/net/bind916/distinfo
+++ b/net/bind916/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.36 2022/05/18 15:05:07 taca Exp $
+$NetBSD: distinfo,v 1.37 2022/06/15 14:02:36 taca Exp $
 
-BLAKE2s (bind-9.16.29.tar.xz) = 580a49934d45635f83c5590a80562d9f6ddfaf8e7cd1b1e00e169034bcf3b676
-SHA512 (bind-9.16.29.tar.xz) = b4acbafed370438ac53e73468ccb5ea5745a1c8f764dd96f9c9a027594a3b7ce0d486e7f01138b39795b456265e0e6116cd76e44f5a3329687cd718550ca79fb
-Size (bind-9.16.29.tar.xz) = 5088348 bytes
+BLAKE2s (bind-9.16.30.tar.xz) = c612f144648611fdadb406a7e5effc7009c012f40871c66891a60f8dac5f0b9d
+SHA512 (bind-9.16.30.tar.xz) = cc9bcbedf63c2efe0a23f14db3e57fdae46f0509aac58e5840a6805ce4fbd76cad5bfde4d461442adb88c4d947f8d79bf979aeb24aeb9303b6adc8d169b7118c
+Size (bind-9.16.30.tar.xz) = 5086288 bytes
 SHA1 (patch-bin_dig_dighost.c) = b1073911d80ecd519af98b6678968296ff8c0c98
 SHA1 (patch-bin_dig_include_dig_dig.h) = 10166f5bb98b208c7b10d63eb31e8253f704acc8
 SHA1 (patch-bin_named_Makefile.in) = f1367da6a226ba44d0ee13acf00b8abeb5b1b7eb
@@ -39,7 +39,7 @@ SHA1 (patch-lib_isc_backtrace.c) = 1b6bca9b3de7f7298882c6c88274b0baf1dad507
 SHA1 (patch-lib_isc_include_isc_netmgr.h) = 48ac44c6a9b81e6b442deba6c075653d3691464b
 SHA1 (patch-lib_isc_include_isc_socket.h) = 8da4ab9c12090199914aa6826e212b0aa861a4f1
 SHA1 (patch-lib_isc_include_isc_types.h) = e5fcf15ee03d1d032a67f2e6d23b2e409042ab64
-SHA1 (patch-lib_isc_netmgr_netmgr-int.h) = 9f493b33e00f09f45c78b6a66ebf7bfd52083792
+SHA1 (patch-lib_isc_netmgr_netmgr-int.h) = d84993edf254605f85421fbdd2fc523255c7316d
 SHA1 (patch-lib_isc_netmgr_netmgr.c) = 3df1d37061f6ceb37e309a0dc4f782fc35863146
 SHA1 (patch-lib_isc_rwlock.c) = 1d114248ddee20db7a7429afab446f8b2f0dca82
 SHA1 (patch-lib_isc_siphash.c) = 8999deb002e4fdb6b13e6f297298ef73c97042c3
diff --git a/net/bind916/patches/patch-lib_isc_netmgr_netmgr-int.h b/net/bind916/patches/patch-lib_isc_netmgr_netmgr-int.h
index 60d7185c49f..450d5b1412d 100644
--- a/net/bind916/patches/patch-lib_isc_netmgr_netmgr-int.h
+++ b/net/bind916/patches/patch-lib_isc_netmgr_netmgr-int.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_isc_netmgr_netmgr-int.h,v 1.1 2021/10/24 06:40:28 taca Exp $
+$NetBSD: patch-lib_isc_netmgr_netmgr-int.h,v 1.2 2022/06/15 14:02:36 taca Exp $
 
 * Take from NetBSD base.
 
---- lib/isc/netmgr/netmgr-int.h.orig	2021-09-07 09:37:05.000000000 +0000
+--- lib/isc/netmgr/netmgr-int.h.orig	2022-06-02 19:34:02.000000000 +0000
 +++ lib/isc/netmgr/netmgr-int.h
-@@ -377,13 +377,13 @@ typedef struct isc__netievent__socket {
+@@ -408,13 +408,13 @@ typedef struct isc__netievent__socket {
  } isc__netievent__socket_t;
  
  #define NETIEVENT_SOCKET_TYPE(type) \
@@ -20,7 +20,7 @@ $NetBSD: patch-lib_isc_netmgr_netmgr-int.h,v 1.1 2021/10/24 06:40:28 taca Exp $
  
  #define NETIEVENT_SOCKET_DEF(type)                                             \
  	isc__netievent_##type##_t *isc__nm_get_netievent_##type(               \
-@@ -407,13 +407,13 @@ typedef struct isc__netievent__socket_re
+@@ -438,13 +438,13 @@ typedef struct isc__netievent__socket_re
  } isc__netievent__socket_req_t;
  
  #define NETIEVENT_SOCKET_REQ_TYPE(type) \
@@ -36,7 +36,7 @@ $NetBSD: patch-lib_isc_netmgr_netmgr-int.h,v 1.1 2021/10/24 06:40:28 taca Exp $
  
  #define NETIEVENT_SOCKET_REQ_DEF(type)                                         \
  	isc__netievent_##type##_t *isc__nm_get_netievent_##type(               \
-@@ -440,14 +440,14 @@ typedef struct isc__netievent__socket_re
+@@ -470,14 +470,14 @@ typedef struct isc__netievent__socket_re
  } isc__netievent__socket_req_result_t;
  
  #define NETIEVENT_SOCKET_REQ_RESULT_TYPE(type) \
@@ -53,7 +53,7 @@ $NetBSD: patch-lib_isc_netmgr_netmgr-int.h,v 1.1 2021/10/24 06:40:28 taca Exp $
  
  #define NETIEVENT_SOCKET_REQ_RESULT_DEF(type)                                  \
  	isc__netievent_##type##_t *isc__nm_get_netievent_##type(               \
-@@ -474,13 +474,13 @@ typedef struct isc__netievent__socket_ha
+@@ -504,13 +504,13 @@ typedef struct isc__netievent__socket_ha
  } isc__netievent__socket_handle_t;
  
  #define NETIEVENT_SOCKET_HANDLE_TYPE(type) \
@@ -69,7 +69,7 @@ $NetBSD: patch-lib_isc_netmgr_netmgr-int.h,v 1.1 2021/10/24 06:40:28 taca Exp $
  
  #define NETIEVENT_SOCKET_HANDLE_DEF(type)                                      \
  	isc__netievent_##type##_t *isc__nm_get_netievent_##type(               \
-@@ -506,13 +506,13 @@ typedef struct isc__netievent__socket_qu
+@@ -536,13 +536,13 @@ typedef struct isc__netievent__socket_qu
  } isc__netievent__socket_quota_t;
  
  #define NETIEVENT_SOCKET_QUOTA_TYPE(type) \
@@ -85,8 +85,8 @@ $NetBSD: patch-lib_isc_netmgr_netmgr-int.h,v 1.1 2021/10/24 06:40:28 taca Exp $
  
  #define NETIEVENT_SOCKET_QUOTA_DEF(type)                                       \
  	isc__netievent_##type##_t *isc__nm_get_netievent_##type(               \
-@@ -571,12 +571,12 @@ typedef struct isc__netievent {
- 	isc__netievent_type type;
+@@ -603,12 +603,12 @@ typedef struct isc__netievent {
+ 	ISC_LINK(isc__netievent_t) link;
  } isc__netievent_t;
  
 -#define NETIEVENT_TYPE(type) typedef isc__netievent_t isc__netievent_##type##_t;