diff --git a/Add-some-DBC-checks-in-dighost-fix-race-between-clea.patch b/Add-some-DBC-checks-in-dighost-fix-race-between-clea.patch
deleted file mode 100644
index 64f56c5dc8d487353a09890e1390591454709ddc..0000000000000000000000000000000000000000
--- a/Add-some-DBC-checks-in-dighost-fix-race-between-clea.patch
+++ /dev/null
@@ -1,228 +0,0 @@
---- a/bin/dig/dighost.c	2019-04-18 00:14:08.120000000 -0400
-+++ b/bin/dig/dighost_1.c	2019-04-18 02:34:32.947000000 -0400
-@@ -1822,9 +1822,9 @@ clear_query(dig_query_t *query) {
- 
- 	debug("clear_query(%p)", query);
- 
--	if (query->timer != NULL)
-+	if (query->timer != NULL){
- 		isc_timer_detach(&query->timer);
--
-+        }
- 	if (query->waiting_senddone) {
- 		debug("send_done not yet called");
- 		query->pending_free = true;
-@@ -1833,13 +1833,15 @@ clear_query(dig_query_t *query) {
- 
- 	lookup = query->lookup;
- 
--	if (lookup->current_query == query)
-+	if (lookup->current_query == query){
- 		lookup->current_query = NULL;
--
--	if (ISC_LINK_LINKED(query, link))
-+        }
-+	if (ISC_LINK_LINKED(query, link)){
- 		ISC_LIST_UNLINK(lookup->q, query, link);
--	if (ISC_LINK_LINKED(query, clink))
-+        }
-+	if (ISC_LINK_LINKED(query, clink)){
- 		ISC_LIST_UNLINK(lookup->connecting, query, clink);
-+        }
- 	if (ISC_LINK_LINKED(&query->recvbuf, link))
- 		ISC_LIST_DEQUEUE(query->recvlist, &query->recvbuf,
- 				 link);
-@@ -1856,6 +1858,7 @@ clear_query(dig_query_t *query) {
- 	isc_mempool_put(commctx, query->recvspace);
- 	isc_buffer_invalidate(&query->recvbuf);
- 	isc_buffer_invalidate(&query->lengthbuf);
-+        query->magic = 0;
- 	isc_mem_free(mctx, query);
- }
- 
-@@ -2807,13 +2810,14 @@ setup_lookup(dig_lookup_t *lookup) {
- 
- 	for (serv = ISC_LIST_HEAD(lookup->my_server_list);
- 	     serv != NULL;
--	     serv = ISC_LIST_NEXT(serv, link)) {
-+	     serv = ISC_LIST_NEXT(serv, link)) 
-+             {
- 		query = isc_mem_allocate(mctx, sizeof(dig_query_t));
--		if (query == NULL)
-+		if (query == NULL){
- 			fatal("memory allocation failure in %s:%d",
- 			      __FILE__, __LINE__);
--		debug("create query %p linked to lookup %p",
--		       query, lookup);
-+                }
-+		debug("create query %p linked to lookup %p", query, lookup);
- 		query->lookup = lookup;
- 		query->timer = NULL;
- 		query->waiting_connect = false;
-@@ -2838,9 +2842,9 @@ setup_lookup(dig_lookup_t *lookup) {
- 		ISC_LIST_INIT(query->lengthlist);
- 		query->sock = NULL;
- 		query->recvspace = isc_mempool_get(commctx);
--		if (query->recvspace == NULL)
-+		if (query->recvspace == NULL){
- 			fatal("memory allocation failure");
--
-+                }
- 		isc_buffer_init(&query->recvbuf, query->recvspace, COMMSIZE);
- 		isc_buffer_init(&query->lengthbuf, query->lengthspace, 2);
- 		isc_buffer_init(&query->slbuf, query->slspace, 2);
-@@ -2848,6 +2852,7 @@ setup_lookup(dig_lookup_t *lookup) {
- 
- 		ISC_LINK_INIT(query, clink);
- 		ISC_LINK_INIT(query, link);
-+                query->magic = DIG_QUERY_MAGIC;
- 		ISC_LIST_ENQUEUE(lookup->q, query, link);
- 	}
- 
-@@ -2856,9 +2861,10 @@ setup_lookup(dig_lookup_t *lookup) {
- 		extrabytes = 0;
- 		dighost_printmessage(ISC_LIST_HEAD(lookup->q), lookup->sendmsg,
- 			     true);
--		if (lookup->stats)
-+		if (lookup->stats){
- 			printf(";; QUERY SIZE: %u\n\n",
- 			       isc_buffer_usedlength(&lookup->renderbuf));
-+                }
- 	}
- 	return (true);
- }
-@@ -2893,20 +2899,26 @@ send_done(isc_task_t *_task, isc_event_t
- 	}
- 
- 	query = event->ev_arg;
-+        REQUIRE(DIG_VALID_QUERY(query));
- 	query->waiting_senddone = false;
- 	l = query->lookup;
- 
--	if (l->ns_search_only && !l->trace_root && !l->tcp_mode) {
-+	if (!query->pending_free && l->ns_search_only &&
-+            !l->trace_root && !l->tcp_mode)
-+        {
- 		debug("sending next, since searching");
- 		next = ISC_LIST_NEXT(query, link);
--		if (next != NULL)
-+		if (next != NULL){
- 			send_udp(next);
-+                }
- 	}
- 
- 	isc_event_free(&event);
- 
--	if (query->pending_free)
-+	if (query->pending_free){
-+                query->magic = 0;
- 		clear_query(query);
-+        }
- 
- 	check_next_lookup(l);
- 	UNLOCK_LOOKUP;
-@@ -2924,6 +2936,7 @@ cancel_lookup(dig_lookup_t *lookup) {
- 	debug("cancel_lookup()");
- 	query = ISC_LIST_HEAD(lookup->q);
- 	while (query != NULL) {
-+                REQUIRE(DIG_VALID_QUERY(query));
- 		next = ISC_LIST_NEXT(query, link);
- 		if (query->sock != NULL) {
- 			isc_socket_cancel(query->sock, global_task,
-@@ -2943,6 +2956,7 @@ bringup_timer(dig_query_t *query, unsign
- 	dig_lookup_t *l;
- 	unsigned int local_timeout;
- 	isc_result_t result;
-+        REQUIRE(DIG_VALID_QUERY(query));
- 
- 	debug("bringup_timer()");
- 	/*
-@@ -3007,7 +3021,7 @@ send_tcp_connect(dig_query_t *query) {
- 	isc_result_t result;
- 	dig_query_t *next;
- 	dig_lookup_t *l;
--
-+        REQUIRE(DIG_VALID_QUERY(query));
- 	debug("send_tcp_connect(%p)", query);
- 
- 	l = query->lookup;
-@@ -3145,7 +3159,7 @@ send_udp(dig_query_t *query) {
- 	isc_result_t result;
- 	isc_buffer_t *sendbuf;
- 	dig_query_t *next;
--
-+        REQUIRE(DIG_VALID_QUERY(query));
- 	debug("send_udp(%p)", query);
- 
- 	l = query->lookup;
-@@ -3248,6 +3262,7 @@ connect_timeout(isc_task_t *task, isc_ev
- 
- 	LOCK_LOOKUP;
- 	query = event->ev_arg;
-+        REQUIRE(DIG_VALID_QUERY(query));
- 	l = query->lookup;
- 	isc_event_free(&event);
- 
-@@ -3335,7 +3350,7 @@ tcp_length_done(isc_task_t *task, isc_ev
- 	LOCK_LOOKUP;
- 	sevent = (isc_socketevent_t *)event;
- 	query = event->ev_arg;
--
-+        REQUIRE(DIG_VALID_QUERY(query));
- 	recvcount--;
- 	INSIST(recvcount >= 0);
- 
-@@ -3412,7 +3427,7 @@ launch_next_query(dig_query_t *query, is
- 	isc_result_t result;
- 	dig_lookup_t *l;
- 	isc_buffer_t *buffer;
--
-+        REQUIRE(DIG_VALID_QUERY(query));
- 	INSIST(!free_now);
- 
- 	debug("launch_next_query()");
-@@ -3491,7 +3506,7 @@ connect_done(isc_task_t *task, isc_event
- 	LOCK_LOOKUP;
- 	sevent = (isc_socketevent_t *)event;
- 	query = sevent->ev_arg;
--
-+        REQUIRE(DIG_VALID_QUERY(query));
- 	INSIST(query->waiting_connect);
- 
- 	query->waiting_connect = false;
-@@ -4460,6 +4475,7 @@ do_lookup(dig_lookup_t *lookup) {
- 	lookup->pending = true;
- 	query = ISC_LIST_HEAD(lookup->q);
- 	if (query != NULL) {
-+                REQUIRE(DIG_VALID_QUERY(query));
- 		if (lookup->tcp_mode)
- 			send_tcp_connect(query);
- 		else
---- a/bin/dig/include/dig/dig.h	2018-09-04 00:04:41.000000000 -0400
-+++ b/bin/dig/include/dig/dig_1.h	2019-04-18 02:36:44.313000000 -0400
-@@ -24,6 +24,7 @@
- #include <isc/formatcheck.h>
- #include <isc/lang.h>
- #include <isc/list.h>
-+#include <isc/magic.h>
- #include <isc/mem.h>
- #include <isc/print.h>
- #include <isc/sockaddr.h>
-@@ -90,6 +91,9 @@ typedef struct dig_message dig_message_t
- #endif
- typedef ISC_LIST(dig_server_t) dig_serverlist_t;
- typedef struct dig_searchlist dig_searchlist_t;
-+#define DIG_QUERY_MAGIC                ISC_MAGIC('D','i','g','q')
-+
-+#define DIG_VALID_QUERY(x)     ISC_MAGIC_VALID((x), DIG_QUERY_MAGIC)
- 
- /*% The dig_lookup structure */
- struct dig_lookup {
-@@ -199,6 +203,7 @@ isc_boolean_t	sigchase;
- 
- /*% The dig_query structure */
- struct dig_query {
-+        unsigned int magic;
- 	dig_lookup_t *lookup;
- 	bool waiting_connect,
- 		pending_free,
diff --git a/CVE-2020-8622.patch b/CVE-2020-8622.patch
deleted file mode 100644
index 1abc50519334e1932fd70afe289769656d371c13..0000000000000000000000000000000000000000
--- a/CVE-2020-8622.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6ed167ad0a647dff20c8cb08c944a7967df2d415 Mon Sep 17 00:00:00 2001
-From: Mark Andrews <marka@isc.org>
-Date: Wed, 15 Jul 2020 16:07:51 +1000
-Subject: [PATCH] Always keep a copy of the message
-
-this allows it to be available even when dns_message_parse()
-returns a error.
----
- lib/dns/message.c | 24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/lib/dns/message.c b/lib/dns/message.c
-index d9e341a09e..7c813a5cf6 100644
---- a/lib/dns/message.c
-+++ b/lib/dns/message.c
-@@ -1712,6 +1712,19 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source,
- 	msg->header_ok = 0;
- 	msg->question_ok = 0;
- 
-+	if ((options & DNS_MESSAGEPARSE_CLONEBUFFER) == 0) {
-+		isc_buffer_usedregion(&origsource, &msg->saved);
-+	} else {
-+		msg->saved.length = isc_buffer_usedlength(&origsource);
-+		msg->saved.base = isc_mem_get(msg->mctx, msg->saved.length);
-+		if (msg->saved.base == NULL) {
-+			return (ISC_R_NOMEMORY);
-+		}
-+		memmove(msg->saved.base, isc_buffer_base(&origsource),
-+			msg->saved.length);
-+		msg->free_saved = 1;
-+	}
-+
- 	isc_buffer_remainingregion(source, &r);
- 	if (r.length < DNS_MESSAGE_HEADERLEN)
- 		return (ISC_R_UNEXPECTEDEND);
-@@ -1787,17 +1800,6 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source,
- 	}
- 
-  truncated:
--	if ((options & DNS_MESSAGEPARSE_CLONEBUFFER) == 0)
--		isc_buffer_usedregion(&origsource, &msg->saved);
--	else {
--		msg->saved.length = isc_buffer_usedlength(&origsource);
--		msg->saved.base = isc_mem_get(msg->mctx, msg->saved.length);
--		if (msg->saved.base == NULL)
--			return (ISC_R_NOMEMORY);
--		memmove(msg->saved.base, isc_buffer_base(&origsource),
--			msg->saved.length);
--		msg->free_saved = 1;
--	}
- 
- 	if (ret == ISC_R_UNEXPECTEDEND && ignore_tc)
- 		return (DNS_R_RECOVERABLE);
--- 
-GitLab
-
diff --git a/CVE-2020-8623.patch b/CVE-2020-8623.patch
deleted file mode 100644
index 384b73dd1dc0774c640a93213dfc4e496d144f2e..0000000000000000000000000000000000000000
--- a/CVE-2020-8623.patch
+++ /dev/null
@@ -1,398 +0,0 @@
-From 8d807cc21655eaa6e6a08afafeec3682c0f3f2ab Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
-Date: Tue, 21 Jul 2020 14:42:47 +0200
-Subject: [PATCH] Fix crash in pk11_numbits() when native-pkcs11 is used
-
-When pk11_numbits() is passed a user provided input that contains all
-zeroes (via crafted DNS message), it would crash with assertion
-failure.  Fix that by properly handling such input.
----
- lib/dns/pkcs11dh_link.c         | 15 ++++++-
- lib/dns/pkcs11dsa_link.c        |  8 +++-
- lib/dns/pkcs11rsa_link.c        | 79 +++++++++++++++++++++++++--------
- lib/isc/include/pk11/internal.h |  3 +-
- lib/isc/pk11.c                  | 61 ++++++++++++++++---------
- 5 files changed, 121 insertions(+), 45 deletions(-)
-
-diff --git a/lib/dns/pkcs11dh_link.c b/lib/dns/pkcs11dh_link.c
-index e2b60ea7c5..4cd8e32d60 100644
---- a/lib/dns/pkcs11dh_link.c
-+++ b/lib/dns/pkcs11dh_link.c
-@@ -748,6 +748,7 @@ pkcs11dh_fromdns(dst_key_t *key, isc_buffer_t *data) {
- 	CK_BYTE *prime = NULL, *base = NULL, *pub = NULL;
- 	CK_ATTRIBUTE *attr;
- 	int special = 0;
-+	unsigned int bits;
- 	isc_result_t result;
- 
- 	isc_buffer_remainingregion(data, &r);
-@@ -852,7 +853,11 @@ pkcs11dh_fromdns(dst_key_t *key, isc_buffer_t *data) {
- 	pub = r.base;
- 	isc_region_consume(&r, publen);
- 
--	key->key_size = pk11_numbits(prime, plen_);
-+	result = pk11_numbits(prime, plen_, &bits);
-+	if (result != ISC_R_SUCCESS) {
-+		goto cleanup;
-+	}
-+	key->key_size = bits;
- 
- 	dh->repr = (CK_ATTRIBUTE *) isc_mem_get(key->mctx, sizeof(*attr) * 3);
- 	if (dh->repr == NULL)
-@@ -1012,6 +1017,7 @@ pkcs11dh_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
- 	dst_private_t priv;
- 	isc_result_t ret;
- 	int i;
-+	unsigned int bits;
- 	pk11_object_t *dh = NULL;
- 	CK_ATTRIBUTE *attr;
- 	isc_mem_t *mctx;
-@@ -1082,7 +1088,12 @@ pkcs11dh_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
- 
- 	attr = pk11_attribute_bytype(dh, CKA_PRIME);
- 	INSIST(attr != NULL);
--	key->key_size = pk11_numbits(attr->pValue, attr->ulValueLen);
-+
-+	ret = pk11_numbits(attr->pValue, attr->ulValueLen, &bits);
-+	if (ret != ISC_R_SUCCESS) {
-+		goto err;
-+	}
-+	key->key_size = bits;
- 
- 	return (ISC_R_SUCCESS);
- 
-diff --git a/lib/dns/pkcs11dsa_link.c b/lib/dns/pkcs11dsa_link.c
-index 12d707a112..24d4c149ff 100644
---- a/lib/dns/pkcs11dsa_link.c
-+++ b/lib/dns/pkcs11dsa_link.c
-@@ -983,6 +983,7 @@ pkcs11dsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
- 	dst_private_t priv;
- 	isc_result_t ret;
- 	int i;
-+	unsigned int bits;
- 	pk11_object_t *dsa = NULL;
- 	CK_ATTRIBUTE *attr;
- 	isc_mem_t *mctx = key->mctx;
-@@ -1072,7 +1073,12 @@ pkcs11dsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
- 
- 	attr = pk11_attribute_bytype(dsa, CKA_PRIME);
- 	INSIST(attr != NULL);
--	key->key_size = pk11_numbits(attr->pValue, attr->ulValueLen);
-+
-+	ret = pk11_numbits(attr->pValue, attr->ulValueLen, &bits);
-+	if (ret != ISC_R_SUCCESS) {
-+		goto err;
-+	}
-+	key->key_size = bits;
- 
- 	return (ISC_R_SUCCESS);
- 
-diff --git a/lib/dns/pkcs11rsa_link.c b/lib/dns/pkcs11rsa_link.c
-index 096c1a8e91..1d10d26564 100644
---- a/lib/dns/pkcs11rsa_link.c
-+++ b/lib/dns/pkcs11rsa_link.c
-@@ -332,6 +332,7 @@ pkcs11rsa_createctx_verify(dst_key_t *key, unsigned int maxbits,
- 		key->key_alg == DST_ALG_RSASHA256 ||
- 		key->key_alg == DST_ALG_RSASHA512);
- #endif
-+	REQUIRE(maxbits <= RSA_MAX_PUBEXP_BITS);
- 
- 	/*
- 	 * Reject incorrect RSA key lengths.
-@@ -376,6 +377,7 @@ pkcs11rsa_createctx_verify(dst_key_t *key, unsigned int maxbits,
- 	for (attr = pk11_attribute_first(rsa);
- 	     attr != NULL;
- 	     attr = pk11_attribute_next(rsa, attr))
-+	{
- 		switch (attr->type) {
- 		case CKA_MODULUS:
- 			INSIST(keyTemplate[5].type == attr->type);
-@@ -396,12 +398,16 @@ pkcs11rsa_createctx_verify(dst_key_t *key, unsigned int maxbits,
- 			memmove(keyTemplate[6].pValue, attr->pValue,
- 				attr->ulValueLen);
- 			keyTemplate[6].ulValueLen = attr->ulValueLen;
--			if (pk11_numbits(attr->pValue,
--					 attr->ulValueLen) > maxbits &&
--			    maxbits != 0)
-+			unsigned int bits;
-+			ret = pk11_numbits(attr->pValue, attr->ulValueLen,
-+					   &bits);
-+			if (ret != ISC_R_SUCCESS ||
-+			    (bits > maxbits && maxbits != 0)) {
- 				DST_RET(DST_R_VERIFYFAILURE);
-+			}
- 			break;
- 		}
-+	}
- 	pk11_ctx->object = CK_INVALID_HANDLE;
- 	pk11_ctx->ontoken = false;
- 	PK11_RET(pkcs_C_CreateObject,
-@@ -1072,6 +1078,7 @@ pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
- 			keyTemplate[5].ulValueLen = attr->ulValueLen;
- 			break;
- 		case CKA_PUBLIC_EXPONENT:
-+			unsigned int bits;
- 			INSIST(keyTemplate[6].type == attr->type);
- 			keyTemplate[6].pValue = isc_mem_get(dctx->mctx,
- 							    attr->ulValueLen);
-@@ -1080,10 +1087,12 @@ pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
- 			memmove(keyTemplate[6].pValue, attr->pValue,
- 				attr->ulValueLen);
- 			keyTemplate[6].ulValueLen = attr->ulValueLen;
--			if (pk11_numbits(attr->pValue,
--					 attr->ulValueLen)
--				> RSA_MAX_PUBEXP_BITS)
-+			ret = pk11_numbits(attr->pValue, attr->ulValueLen,
-+					   &bits);
-+			if (ret != ISC_R_SUCCESS || bits > RSA_MAX_PUBEXP_BITS)
-+			{
- 				DST_RET(DST_R_VERIFYFAILURE);
-+			}
- 			break;
- 		}
- 	pk11_ctx->object = CK_INVALID_HANDLE;
-@@ -1461,6 +1470,8 @@ pkcs11rsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
- 	CK_BYTE *exponent = NULL, *modulus = NULL;
- 	CK_ATTRIBUTE *attr;
- 	unsigned int length;
-+	unsigned int bits;
-+	isc_result_t ret = ISC_R_SUCCESS;
- 
- 	isc_buffer_remainingregion(data, &r);
- 	if (r.length == 0)
-@@ -1478,9 +1489,7 @@ pkcs11rsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
- 
- 	if (e_bytes == 0) {
- 		if (r.length < 2) {
--			isc_safe_memwipe(rsa, sizeof(*rsa));
--			isc_mem_put(key->mctx, rsa, sizeof(*rsa));
--			return (DST_R_INVALIDPUBLICKEY);
-+			DST_RET(DST_R_INVALIDPUBLICKEY);
- 		}
- 		e_bytes = (*r.base) << 8;
- 		isc_region_consume(&r, 1);
-@@ -1489,16 +1498,18 @@ pkcs11rsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
- 	}
- 
- 	if (r.length < e_bytes) {
--		isc_safe_memwipe(rsa, sizeof(*rsa));
--		isc_mem_put(key->mctx, rsa, sizeof(*rsa));
--		return (DST_R_INVALIDPUBLICKEY);
-+		DST_RET(DST_R_INVALIDPUBLICKEY);
- 	}
- 	exponent = r.base;
- 	isc_region_consume(&r, e_bytes);
- 	modulus = r.base;
- 	mod_bytes = r.length;
- 
--	key->key_size = pk11_numbits(modulus, mod_bytes);
-+	ret = pk11_numbits(modulus, mod_bytes, &bits);
-+	if (ret != ISC_R_SUCCESS) {
-+		goto err;
-+	}
-+	key->key_size = bits;
- 
- 	isc_buffer_forward(data, length);
- 
-@@ -1548,9 +1559,12 @@ pkcs11rsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
- 			    rsa->repr,
- 			    rsa->attrcnt * sizeof(*attr));
- 	}
-+	ret = ISC_R_NOMEMORY;
-+
-+    err:
- 	isc_safe_memwipe(rsa, sizeof(*rsa));
- 	isc_mem_put(key->mctx, rsa, sizeof(*rsa));
--	return (ISC_R_NOMEMORY);
-+	return (ret);
- }
- 
- static isc_result_t
-@@ -1729,6 +1743,7 @@ pkcs11rsa_fetch(dst_key_t *key, const char *engine, const char *label,
- 	pk11_object_t *pubrsa;
- 	pk11_context_t *pk11_ctx = NULL;
- 	isc_result_t ret;
-+	unsigned int bits;
- 
- 	if (label == NULL)
- 		return (DST_R_NOENGINE);
-@@ -1815,7 +1830,11 @@ pkcs11rsa_fetch(dst_key_t *key, const char *engine, const char *label,
- 
- 	attr = pk11_attribute_bytype(rsa, CKA_MODULUS);
- 	INSIST(attr != NULL);
--	key->key_size = pk11_numbits(attr->pValue, attr->ulValueLen);
-+	ret = pk11_numbits(attr->pValue, attr->ulValueLen, &bits);
-+	if (ret != ISC_R_SUCCESS) {
-+		goto err;
-+	}
-+	key->key_size = bits;
- 
- 	return (ISC_R_SUCCESS);
- 
-@@ -1901,6 +1920,7 @@ pkcs11rsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
- 	CK_ATTRIBUTE *attr;
- 	isc_mem_t *mctx = key->mctx;
- 	const char *engine = NULL, *label = NULL;
-+	unsigned int bits;
- 
- 	/* read private key file */
- 	ret = dst__privstruct_parse(key, DST_ALG_RSA, lexer, mctx, &priv);
-@@ -2044,12 +2064,22 @@ pkcs11rsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
- 
- 	attr = pk11_attribute_bytype(rsa, CKA_MODULUS);
- 	INSIST(attr != NULL);
--	key->key_size = pk11_numbits(attr->pValue, attr->ulValueLen);
-+	ret = pk11_numbits(attr->pValue, attr->ulValueLen, &bits);
-+	if (ret != ISC_R_SUCCESS) {
-+		goto err;
-+	}
-+	key->key_size = bits;
- 
- 	attr = pk11_attribute_bytype(rsa, CKA_PUBLIC_EXPONENT);
- 	INSIST(attr != NULL);
--	if (pk11_numbits(attr->pValue, attr->ulValueLen) > RSA_MAX_PUBEXP_BITS)
-+
-+	ret = pk11_numbits(attr->pValue, attr->ulValueLen, &bits);
-+	if (ret != ISC_R_SUCCESS) {
-+		goto err;
-+	}
-+	if (bits > RSA_MAX_PUBEXP_BITS) {
- 		DST_RET(ISC_R_RANGE);
-+	}
- 
- 	dst__privstruct_free(&priv, mctx);
- 	isc_safe_memwipe(&priv, sizeof(priv));
-@@ -2084,6 +2114,7 @@ pkcs11rsa_fromlabel(dst_key_t *key, const char *engine, const char *label,
- 	pk11_context_t *pk11_ctx = NULL;
- 	isc_result_t ret;
- 	unsigned int i;
-+	unsigned int bits;
- 
- 	UNUSED(pin);
- 
-@@ -2178,12 +2209,22 @@ pkcs11rsa_fromlabel(dst_key_t *key, const char *engine, const char *label,
- 
- 	attr = pk11_attribute_bytype(rsa, CKA_PUBLIC_EXPONENT);
- 	INSIST(attr != NULL);
--	if (pk11_numbits(attr->pValue, attr->ulValueLen) > RSA_MAX_PUBEXP_BITS)
-+
-+	ret = pk11_numbits(attr->pValue, attr->ulValueLen, &bits);
-+	if (ret != ISC_R_SUCCESS) {
-+		goto err;
-+	}
-+	if (bits > RSA_MAX_PUBEXP_BITS) {
- 		DST_RET(ISC_R_RANGE);
-+	}
- 
- 	attr = pk11_attribute_bytype(rsa, CKA_MODULUS);
- 	INSIST(attr != NULL);
--	key->key_size = pk11_numbits(attr->pValue, attr->ulValueLen);
-+	ret = pk11_numbits(attr->pValue, attr->ulValueLen, &bits);
-+	if (ret != ISC_R_SUCCESS) {
-+		goto err;
-+	}
-+	key->key_size = bits;
- 
- 	pk11_return_session(pk11_ctx);
- 	isc_safe_memwipe(pk11_ctx, sizeof(*pk11_ctx));
-diff --git a/lib/isc/include/pk11/internal.h b/lib/isc/include/pk11/internal.h
-index aa8907ab08..7cc8ec812b 100644
---- a/lib/isc/include/pk11/internal.h
-+++ b/lib/isc/include/pk11/internal.h
-@@ -25,7 +25,8 @@ void pk11_mem_put(void *ptr, size_t size);
- 
- CK_SLOT_ID pk11_get_best_token(pk11_optype_t optype);
- 
--unsigned int pk11_numbits(CK_BYTE_PTR data, unsigned int bytecnt);
-+isc_result_t
-+pk11_numbits(CK_BYTE_PTR data, unsigned int bytecnt, unsigned int *bits);
- 
- CK_ATTRIBUTE *pk11_attribute_first(const pk11_object_t *obj);
- 
-diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c
-index 012afd968a..4e4052044b 100644
---- a/lib/isc/pk11.c
-+++ b/lib/isc/pk11.c
-@@ -962,13 +962,15 @@ pk11_get_best_token(pk11_optype_t optype) {
- 	return (token->slotid);
- }
- 
--unsigned int
--pk11_numbits(CK_BYTE_PTR data, unsigned int bytecnt) {
-+isc_result_t
-+pk11_numbits(CK_BYTE_PTR data, unsigned int bytecnt, unsigned int *bits) {
- 	unsigned int bitcnt, i;
- 	CK_BYTE top;
- 
--	if (bytecnt == 0)
--		return (0);
-+	if (bytecnt == 0) {
-+		*bits = 0;
-+		return (ISC_R_SUCCESS);
-+	}
- 	bitcnt = bytecnt * 8;
- 	for (i = 0; i < bytecnt; i++) {
- 		top = data[i];
-@@ -976,26 +978,41 @@ pk11_numbits(CK_BYTE_PTR data, unsigned int bytecnt) {
- 			bitcnt -= 8;
- 			continue;
- 		}
--		if (top & 0x80)
--			return (bitcnt);
--		if (top & 0x40)
--			return (bitcnt - 1);
--		if (top & 0x20)
--			return (bitcnt - 2);
--		if (top & 0x10)
--			return (bitcnt - 3);
--		if (top & 0x08)
--			return (bitcnt - 4);
--		if (top & 0x04)
--			return (bitcnt - 5);
--		if (top & 0x02)
--			return (bitcnt - 6);
--		if (top & 0x01)
--			return (bitcnt - 7);
-+		if (top & 0x80) {
-+			*bits = bitcnt;
-+			return (ISC_R_SUCCESS);
-+		}
-+		if (top & 0x40) {
-+			*bits = bitcnt - 1;
-+			return (ISC_R_SUCCESS);
-+		}
-+		if (top & 0x20) {
-+			*bits = bitcnt - 2;
-+			return (ISC_R_SUCCESS);
-+		}
-+		if (top & 0x10) {
-+			*bits = bitcnt - 3;
-+			return (ISC_R_SUCCESS);
-+		}
-+		if (top & 0x08) {
-+			*bits = bitcnt - 4;
-+			return (ISC_R_SUCCESS);
-+		}
-+		if (top & 0x04) {
-+			*bits = bitcnt - 5;
-+			return (ISC_R_SUCCESS);
-+		}
-+		if (top & 0x02) {
-+			*bits = bitcnt - 6;
-+			return (ISC_R_SUCCESS);
-+		}
-+		if (top & 0x01) {
-+			*bits = bitcnt - 7;
-+			return (ISC_R_SUCCESS);
-+		}
- 		break;
- 	}
--	INSIST(0);
--	ISC_UNREACHABLE();
-+	return (ISC_R_RANGE);
- }
- 
- CK_ATTRIBUTE *
--- 
-GitLab
-
diff --git a/CVE-2020-8624.patch b/CVE-2020-8624.patch
deleted file mode 100644
index 54e82f158f41111534d8abcf5eed829af3130d5d..0000000000000000000000000000000000000000
--- a/CVE-2020-8624.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e4cccf9668c7adee4724a7649ec64685f82c8677 Mon Sep 17 00:00:00 2001
-From: Mark Andrews <marka@isc.org>
-Date: Wed, 29 Jul 2020 23:36:03 +1000
-Subject: [PATCH] Update-policy 'subdomain' was incorrectly treated as
- 'zonesub'
-
-resulting in names outside the specified subdomain having the wrong
-restrictions for the given key.
----
- bin/named/zoneconf.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
-index 55f191bad4..b77a07c14a 100644
---- a/bin/named/zoneconf.c
-+++ b/bin/named/zoneconf.c
-@@ -239,7 +239,8 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
- 
- 		str = cfg_obj_asstring(matchtype);
- 		CHECK(dns_ssu_mtypefromstring(str, &mtype));
--		if (mtype == dns_ssumatchtype_subdomain) {
-+		if (mtype == dns_ssumatchtype_subdomain &&
-+		    strcasecmp(str, "zonesub") == 0) {
- 			usezone = true;
- 		}
- 
--- 
-GitLab
-
diff --git a/CVE-2020-8625.patch b/CVE-2020-8625.patch
deleted file mode 100644
index 454d17ef9d76564c09c2b0cf9d9a3a498c3feb74..0000000000000000000000000000000000000000
--- a/CVE-2020-8625.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
-index dea108bad05..13cf15d7404 100644
---- a/lib/dns/spnego.c
-+++ b/lib/dns/spnego.c
-@@ -877,7 +877,7 @@ der_get_oid(const unsigned char *p, size_t len, oid *data, size_t *size) {
- 		return (ASN1_OVERRUN);
- 	}
- 
--	data->components = malloc(len * sizeof(*data->components));
-+	data->components = malloc((len + 1) * sizeof(*data->components));
- 	if (data->components == NULL) {
- 		return (ENOMEM);
- 	}
diff --git a/Changes.md b/Changes.md
new file mode 100644
index 0000000000000000000000000000000000000000..66610342d0e94a868595068956b0ee20c31af0d9
--- /dev/null
+++ b/Changes.md
@@ -0,0 +1,43 @@
+# Significant Changes in BIND9 package
+
+## BIND 9.16
+
+### New features
+
+- *libuv* is used for network subsystem as a mandatory dependency
+- *dnssec-policy* support in named.conf is introduced, providing a a key and signing policy
+  ([KASP](https://gitlab.isc.org/isc-projects/bind9/-/wikis/DNSSEC-Key-and-Signing-Policy-(KASP)))
+- *trusted-keys* and *managed-keys* are deprecated, replaced by *trust-anchors*
+- *trust-anchors* support also anchor in a *DS* format, in addition to *DNSKEY* format
+- **dig, mdig** and **delv** support **+yaml** parameter to print detailed machine parseable output
+
+### Feature changes
+
+- Static trust anchor and *dnssec-validation auto;* are incompatible and cause fatal error, when used together.
+- *DS* and *CDS* now generates only SHA-256 digest, SHA-1 is no longer generated by default
+- SipHash 2-4 DNS Cookie ([RFC 7873](https://www.rfc-editor.org/rfc/rfc7873.html) is now default).
+  Only AES alternative algorithm is kept, HMAC-SHA cookie support were removed.
+- **dnssec-signzone** and **dnssec-verify** commands print output to stdout, *-q* parameter can silence them
+
+### Features removed
+
+- *dnssec-enable* option is obsolete, DNSSEC support is always enabled
+- *dnssec-lookaside* option is deprecated and support for it removed from all tools
+- *cleaning-interval* option is removed
+
+### Upstream release notes
+
+- [9.16.10 notes](https://downloads.isc.org/isc/bind9/9.16.10/doc/arm/html/notes.html#notes-for-bind-9-16-10)
+- [9.16.0 notes](https://downloads.isc.org/isc/bind9/9.16.0/doc/arm/html/notes.html#notes-for-bind-9-16-0)
+
+## BIND 9.14
+
+- single thread support removed. Cannot provide *bind-export-libs* for DHCP
+- *lwres* support completely removed. Both daemon and library
+- common parts of daemon moved into *libns* shared library
+- introduced plugin for filtering aaaa responses
+- some SDB utilities no longer supported
+
+### Upstream release notes
+
+- [9.14.7 notes](https://downloads.isc.org/isc/bind9/9.14.7/RELEASE-NOTES-bind-9.14.7.html)
diff --git a/Fix_the_difference_at_the_macro_definition_using_clock_gettime_instead_of_gettimeofda.patch b/Fix_the_difference_at_the_macro_definition_using_clock_gettime_instead_of_gettimeofda.patch
deleted file mode 100644
index de4837fb6a50a71364bc20ad295a08de33b61825..0000000000000000000000000000000000000000
--- a/Fix_the_difference_at_the_macro_definition_using_clock_gettime_instead_of_gettimeofda.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 33bf90331b48c7378316c141e5e9acb2862dd0ac Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Witold=20Kr=C4=99cicki?= <wpk@isc.org>
-Date: Sun, 9 Dec 2018 00:41:21 +0100
-Subject: [PATCH] use clock_gettime() instead of gettimeofday() for isc_itme
- functions
-
----
- lib/isc/unix/time.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c
-index 9828250..c2ae60e 100644
---- a/lib/isc/unix/time.c
-+++ b/lib/isc/unix/time.c
-@@ -38,7 +38,11 @@
- #define NS_PER_MS	1000000		/*%< Nanoseconds per millisecond. */
- #define US_PER_S	1000000		/*%< Microseconds per second. */
- 
--#define CLOCKSOURCE CLOCK_MONOTONIC
-+#ifdef CLOCK_REALTIME_COARSE
-+#define CLOCKSOURCE CLOCK_REALTIME_COARSE
-+#else
-+#define CLOCKSOURCE CLOCK_REALTIME
-+#endif
- 
- /*%
-  *** Intervals
--- 
-2.23.0
-
diff --git a/README.en.md b/README.en.md
deleted file mode 100644
index 5e0a40041c06568d00ab23397a0da785caf958e3..0000000000000000000000000000000000000000
--- a/README.en.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# bind
-
-#### Description
-{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
diff --git a/README.sdb_pgsql b/README.sdb_pgsql
deleted file mode 100644
index c10c29468907a3a897126e79a11863f7f6a3dc70..0000000000000000000000000000000000000000
--- a/README.sdb_pgsql
+++ /dev/null
@@ -1,79 +0,0 @@
-			PGSQL BIND SDB driver
-
-The postgresql BIND SDB driver is of experimental status and should not be 
-used for production systems.
-
-Usage:
-
-o Use the named_sdb process ( put ENABLE_SDB=yes in /etc/sysconfig/named )
-
-o Edit your named.conf to contain a database zone, eg. :
-  
-zone "pgdb.net." IN {
-        type master;
-        database "pgsql  bind        pgdb     localhost pguser pgpasswd";
-        #                ^- DB name  ^-Table  ^-host    ^-user ^-password
-};
-
-o Create the database zone table
-  The table must contain the columns "name", "rdtype", and "rdata", and
-  is expected to contain a properly constructed zone.  The program "zonetodb"
-  creates such a table.
-  
-  zonetodb usage:
-    
-    zonetodb origin file dbname dbtable
-
-    where
-	origin : zone origin, eg "pgdb.net."
-	file   : master zone database file, eg. pgdb.net.db
-	dbname : name of postgresql database 
-        dbtable: name of table in database
-
-    Eg. to import this zone in the file 'pgdb.net.db' into the 'bind' database 
-        'pgdb' table:
-
----
-#pgdb.net.db:
-$TTL 1H
-@       SOA     localhost.      root.localhost. (       1
-                                                3H
-                                                1H
-                                                1W
-                                                1H )
-        NS      localhost.
-host1   A       192.168.2.1
-host2   A       192.168.2.2
-host3   A       192.168.2.3
-host4   A       192.168.2.4
-host5   A       192.168.2.5
-host6   A       192.168.2.6
-host7   A       192.168.2.7
----
-
-Issue this command as the pgsql user authorized to update the bind database:
- 
-# zonetodb pgdb.net. pgdb.net.db bind pgdb
-
-will create / update the pgdb table in the 'bind' db:
-
-$ psql -dbind -c 'select * from pgdb;'
-      name      | ttl  | rdtype |                        rdata
-----------------+------+--------+-----------------------------------------------------
- pgdb.net       | 3600 | SOA    | localhost. root.localhost. 1 10800 3600 604800 3600
- pgdb.net       | 3600 | NS     | localhost.
- host1.pgdb.net | 3600 | A      | 192.168.2.1
- host2.pgdb.net | 3600 | A      | 192.168.2.2
- host3.pgdb.net | 3600 | A      | 192.168.2.3
- host4.pgdb.net | 3600 | A      | 192.168.2.4
- host5.pgdb.net | 3600 | A      | 192.168.2.5
- host6.pgdb.net | 3600 | A      | 192.168.2.6
- host7.pgdb.net | 3600 | A      | 192.168.2.7
-(9 rows)
-
-I've tested exactly the above configuration with bind-sdb-9.3.1+ and it works OK.
-
-NOTE: If you use pgsqldb SDB, ensure the postgresql service is started before the named
-      service .
-
-USE AT YOUR OWN RISK!
diff --git a/Use-clock_gettime-instead-of-gettimeofday.patch b/Use-clock_gettime-instead-of-gettimeofday.patch
deleted file mode 100644
index bfe25606fc213aa517a8417673ba716c4adef74d..0000000000000000000000000000000000000000
--- a/Use-clock_gettime-instead-of-gettimeofday.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c
-index f06d31a5508c2d3f7227063c21d9d4563789e72a..da25e5bf8e07639c8f70420a5c3f3c98a36a0548 100644
---- a/lib/isc/unix/time.c
-+++ b/lib/isc/unix/time.c
-@@ -36,16 +36,7 @@
- #define NS_PER_MS	1000000		/*%< Nanoseconds per millisecond. */
- #define US_PER_S	1000000		/*%< Microseconds per second. */
- 
--/*
-- * All of the INSIST()s checks of nanoseconds < NS_PER_S are for
-- * consistency checking of the type. In lieu of magic numbers, it
-- * is the best we've got.  The check is only performed on functions which
-- * need an initialized type.
-- */
--
--#ifndef ISC_FIX_TV_USEC
--#define ISC_FIX_TV_USEC 1
--#endif
-+#define CLOCKSOURCE CLOCK_MONOTONIC
- 
- /*%
-  *** Intervals
-@@ -54,32 +49,6 @@
- static const isc_interval_t zero_interval = { 0, 0 };
- const isc_interval_t * const isc_interval_zero = &zero_interval;
- 
--#if ISC_FIX_TV_USEC
--static inline void
--fix_tv_usec(struct timeval *tv) {
--	bool fixed = false;
--
--	if (tv->tv_usec < 0) {
--		fixed = true;
--		do {
--			tv->tv_sec -= 1;
--			tv->tv_usec += US_PER_S;
--		} while (tv->tv_usec < 0);
--	} else if (tv->tv_usec >= US_PER_S) {
--		fixed = true;
--		do {
--			tv->tv_sec += 1;
--			tv->tv_usec -= US_PER_S;
--		} while (tv->tv_usec >=US_PER_S);
--	}
--	/*
--	 * Call syslog directly as was are called from the logging functions.
--	 */
--	if (fixed)
--		(void)syslog(LOG_ERR, "gettimeofday returned bad tv_usec: corrected");
--}
--#endif
--
- void
- isc_interval_set(isc_interval_t *i,
- 		 unsigned int seconds, unsigned int nanoseconds)
-@@ -141,76 +110,52 @@ isc_time_isepoch(const isc_time_t *t) {
- 
- isc_result_t
- isc_time_now(isc_time_t *t) {
--	struct timeval tv;
-+	struct timespec ts;
- 	char strbuf[ISC_STRERRORSIZE];
- 
- 	REQUIRE(t != NULL);
- 
--	if (gettimeofday(&tv, NULL) == -1) {
-+	if (clock_gettime(CLOCKSOURCE, &ts) == -1) {
- 		isc__strerror(errno, strbuf, sizeof(strbuf));
- 		UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", strbuf);
- 		return (ISC_R_UNEXPECTED);
- 	}
- 
--	/*
--	 * Does POSIX guarantee the signedness of tv_sec and tv_usec?  If not,
--	 * then this test will generate warnings for platforms on which it is
--	 * unsigned.  In any event, the chances of any of these problems
--	 * happening are pretty much zero, but since the libisc library ensures
--	 * certain things to be true ...
--	 */
--#if ISC_FIX_TV_USEC
--	fix_tv_usec(&tv);
--	if (tv.tv_sec < 0)
--		return (ISC_R_UNEXPECTED);
--#else
--	if (tv.tv_sec < 0 || tv.tv_usec < 0 || tv.tv_usec >= US_PER_S)
-+	if (ts.tv_sec < 0 || ts.tv_nsec < 0 || ts.tv_nsec >= NS_PER_S) {
- 		return (ISC_R_UNEXPECTED);
--#endif
-+	}
- 
- 	/*
- 	 * Ensure the tv_sec value fits in t->seconds.
- 	 */
--	if (sizeof(tv.tv_sec) > sizeof(t->seconds) &&
--	    ((tv.tv_sec | (unsigned int)-1) ^ (unsigned int)-1) != 0U)
-+	if (sizeof(ts.tv_sec) > sizeof(t->seconds) &&
-+	    ((ts.tv_sec | (unsigned int)-1) ^ (unsigned int)-1) != 0U)
- 		return (ISC_R_RANGE);
- 
--	t->seconds = tv.tv_sec;
--	t->nanoseconds = tv.tv_usec * NS_PER_US;
-+	t->seconds = ts.tv_sec;
-+	t->nanoseconds = ts.tv_nsec;
- 
- 	return (ISC_R_SUCCESS);
- }
- 
- isc_result_t
- isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i) {
--	struct timeval tv;
-+	struct timespec ts;
- 	char strbuf[ISC_STRERRORSIZE];
- 
- 	REQUIRE(t != NULL);
- 	REQUIRE(i != NULL);
- 	INSIST(i->nanoseconds < NS_PER_S);
- 
--	if (gettimeofday(&tv, NULL) == -1) {
-+	if (clock_gettime(CLOCKSOURCE, &ts) == -1) {
- 		isc__strerror(errno, strbuf, sizeof(strbuf));
- 		UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", strbuf);
- 		return (ISC_R_UNEXPECTED);
- 	}
- 
--	/*
--	 * Does POSIX guarantee the signedness of tv_sec and tv_usec?  If not,
--	 * then this test will generate warnings for platforms on which it is
--	 * unsigned.  In any event, the chances of any of these problems
--	 * happening are pretty much zero, but since the libisc library ensures
--	 * certain things to be true ...
--	 */
--#if ISC_FIX_TV_USEC
--	fix_tv_usec(&tv);
--	if (tv.tv_sec < 0)
--		return (ISC_R_UNEXPECTED);
--#else
--	if (tv.tv_sec < 0 || tv.tv_usec < 0 || tv.tv_usec >= US_PER_S)
-+	if (ts.tv_sec < 0 || ts.tv_nsec < 0 || ts.tv_nsec >= NS_PER_S) {
- 		return (ISC_R_UNEXPECTED);
--#endif
-+	}
- 
- 	/*
- 	 * Ensure the resulting seconds value fits in the size of an
-@@ -218,12 +163,12 @@ isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i) {
- 	 * note that even if both values == INT_MAX, then when added
- 	 * and getting another 1 added below the result is UINT_MAX.)
- 	 */
--	if ((tv.tv_sec > INT_MAX || i->seconds > INT_MAX) &&
--	    ((long long)tv.tv_sec + i->seconds > UINT_MAX))
-+	if ((ts.tv_sec > INT_MAX || i->seconds > INT_MAX) &&
-+	    ((long long)ts.tv_sec + i->seconds > UINT_MAX))
- 		return (ISC_R_RANGE);
- 
--	t->seconds = tv.tv_sec + i->seconds;
--	t->nanoseconds = tv.tv_usec * NS_PER_US + i->nanoseconds;
-+	t->seconds = ts.tv_sec + i->seconds;
-+	t->nanoseconds = ts.tv_nsec + i->nanoseconds;
- 	if (t->nanoseconds >= NS_PER_S) {
- 		t->seconds++;
- 		t->nanoseconds -= NS_PER_S;
diff --git a/backport-0001-Do-not-convert-ISC_R_NOSPACE-to-DNS_R_SERVFAIL-too-e.patch b/backport-0001-Do-not-convert-ISC_R_NOSPACE-to-DNS_R_SERVFAIL-too-e.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b89d8630bcedab664340952ca1bfecaa98b206ad
--- /dev/null
+++ b/backport-0001-Do-not-convert-ISC_R_NOSPACE-to-DNS_R_SERVFAIL-too-e.patch
@@ -0,0 +1,39 @@
+From 4ace37bf7386e73af1d295d206b101c27a9edbad Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Wed, 24 Nov 2021 11:03:19 +1100
+Subject: [PATCH] Do not convert ISC_R_NOSPACE to DNS_R_SERVFAIL too early
+
+The parsing loop needs to process ISC_R_NOSPACE to properly
+size the buffer.  If result is still ISC_R_NOSPACE at the end
+of the parsing loop set result to DNS_R_SERVFAIL.
+
+(cherry picked from commit 08f1cba096243cd14041731b7ea1ad45e54e87b0)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/4ace37bf7386e73af1d295d206b101c27a9edbad
+---
+ lib/dns/sdlz.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
+index c8a615a0f3..0b46fb9efd 100644
+--- a/lib/dns/sdlz.c
++++ b/lib/dns/sdlz.c
+@@ -1875,7 +1875,6 @@ dns_sdlz_putrr(dns_sdlzlookup_t *lookup, const char *type, dns_ttl_t ttl,
+ 					    mctx, rdatabuf, &lookup->callbacks);
+ 		if (result != ISC_R_SUCCESS) {
+ 			isc_buffer_free(&rdatabuf);
+-			result = DNS_R_SERVFAIL;
+ 		}
+ 		if (size >= 65535) {
+ 			break;
+@@ -1887,6 +1886,7 @@ dns_sdlz_putrr(dns_sdlzlookup_t *lookup, const char *type, dns_ttl_t ttl,
+ 	} while (result == ISC_R_NOSPACE);
+ 
+ 	if (result != ISC_R_SUCCESS) {
++		result = DNS_R_SERVFAIL;
+ 		goto failure;
+ 	}
+ 
+-- 
+2.23.0
+
diff --git a/backport-0001-Exercise-ISC_R_NOSPACE-path-in-dns_sdlz_putrr.patch b/backport-0001-Exercise-ISC_R_NOSPACE-path-in-dns_sdlz_putrr.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8c378387f760b3eb4f00aa9c72b04e36521e745d
--- /dev/null
+++ b/backport-0001-Exercise-ISC_R_NOSPACE-path-in-dns_sdlz_putrr.patch
@@ -0,0 +1,82 @@
+From bf1eaf46611bdbfcc2a6f6f77871eebf8351a629 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Thu, 25 Nov 2021 13:16:56 +1100
+Subject: [PATCH] Exercise ISC_R_NOSPACE path in dns_sdlz_putrr
+
+Use relative names when adding SOA record and a long domain
+name to create SOA RR where the wire format is longer than
+the initial buffer allocation in dns_sdlz_putrr.
+
+(cherry picked from commit 6dc524860622277bd24fe17d4a82454b30f5f1b5)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/bf1eaf46611bdbfcc2a6f6f77871eebf8351a629
+---
+ bin/tests/system/dlzexternal/driver.c         | 23 +++++++++----------
+ bin/tests/system/dlzexternal/ns1/dlzs.conf.in |  5 ++++
+ 2 files changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/bin/tests/system/dlzexternal/driver.c b/bin/tests/system/dlzexternal/driver.c
+index 26da9c5deb..9c8ed0080f 100644
+--- a/bin/tests/system/dlzexternal/driver.c
++++ b/bin/tests/system/dlzexternal/driver.c
+@@ -238,10 +238,9 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata,
+ 	struct dlz_example_data *state;
+ 	const char *helper_name;
+ 	va_list ap;
+-	char soa_data[1024];
+-	const char *extra;
++	char soa_data[sizeof("@ hostmaster.root 123 900 600 86400 3600")];
+ 	isc_result_t result;
+-	int n;
++	size_t n;
+ 
+ 	UNUSED(dlzname);
+ 
+@@ -275,19 +274,19 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata,
+ 		sprintf(state->zone_name, "%s.", argv[1]);
+ 	}
+ 
++	/*
++	 * Use relative names to trigger ISC_R_NOSPACE in dns_sdlz_putrr.
++	 */
+ 	if (strcmp(state->zone_name, ".") == 0) {
+-		extra = ".root";
++		n = strlcpy(soa_data,
++			    "@ hostmaster.root 123 900 600 86400 3600",
++			    sizeof(soa_data));
+ 	} else {
+-		extra = ".";
++		n = strlcpy(soa_data, "@ hostmaster 123 900 600 86400 3600",
++			    sizeof(soa_data));
+ 	}
+ 
+-	n = sprintf(soa_data, "%s hostmaster%s%s 123 900 600 86400 3600",
+-		    state->zone_name, extra, state->zone_name);
+-
+-	if (n < 0) {
+-		CHECK(ISC_R_FAILURE);
+-	}
+-	if ((unsigned)n >= sizeof(soa_data)) {
++	if (n >= sizeof(soa_data)) {
+ 		CHECK(ISC_R_NOSPACE);
+ 	}
+ 
+diff --git a/bin/tests/system/dlzexternal/ns1/dlzs.conf.in b/bin/tests/system/dlzexternal/ns1/dlzs.conf.in
+index 07bf329b50..c679498118 100644
+--- a/bin/tests/system/dlzexternal/ns1/dlzs.conf.in
++++ b/bin/tests/system/dlzexternal/ns1/dlzs.conf.in
+@@ -21,6 +21,11 @@ dlz "example three" {
+ 	database "dlopen ../driver.@SO@ example.org";
+ };
+ 
++dlz "example four" {
++        // Long zone name to trigger ISC_R_NOSPACE in dns_sdlz_putrr.
++        database "dlopen ../driver.@SO@ 123456789.123456789.123456789.123456789.123456789.example.foo";
++};
++
+ dlz "unsearched1" {
+ 	database "dlopen ../driver.@SO@ other.nil";
+ 	search no;
+-- 
+2.23.0
+
diff --git a/backport-0002-Add-a-regression-test.patch b/backport-0002-Add-a-regression-test.patch
new file mode 100644
index 0000000000000000000000000000000000000000..db07bd6b1da3d34f6e7040a57a1bf162a102914d
--- /dev/null
+++ b/backport-0002-Add-a-regression-test.patch
@@ -0,0 +1,153 @@
+From c243daf8395bf8406f6697dde5ba62a25d188a1b Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Mon, 11 Oct 2021 13:01:20 -0700
+Subject: [PATCH] Add a regression test
+
+Reconfigure the server without catalog-zone configuration, and then
+put it back and reconfigure again, to confirm that there's no crash.
+
+(cherry picked from commit bb411af31dd78ceda7a16f7ecfab483fb3746af9)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/c243daf8395bf8406f6697dde5ba62a25d188a1b
+---
+ .../ns2/{named.conf.in => named1.conf.in}     |  0
+ bin/tests/system/catz/ns2/named2.conf.in      | 60 +++++++++++++++++++
+ bin/tests/system/catz/setup.sh                |  2 +-
+ bin/tests/system/catz/tests.sh                | 16 ++++-
+ 4 files changed, 74 insertions(+), 4 deletions(-)
+ rename bin/tests/system/catz/ns2/{named.conf.in => named1.conf.in} (100%)
+ create mode 100644 bin/tests/system/catz/ns2/named2.conf.in
+
+diff --git a/bin/tests/system/catz/ns2/named.conf.in b/bin/tests/system/catz/ns2/named1.conf.in
+similarity index 100%
+rename from bin/tests/system/catz/ns2/named.conf.in
+rename to bin/tests/system/catz/ns2/named1.conf.in
+diff --git a/bin/tests/system/catz/ns2/named2.conf.in b/bin/tests/system/catz/ns2/named2.conf.in
+new file mode 100644
+index 0000000000..fcd99ca0d4
+--- /dev/null
++++ b/bin/tests/system/catz/ns2/named2.conf.in
+@@ -0,0 +1,60 @@
++/*
++ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
++ *
++ * See the COPYRIGHT file distributed with this work for additional
++ * information regarding copyright ownership.
++ */
++
++include "../../common/rndc.key";
++
++controls {
++	inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
++};
++
++options {
++	query-source address 10.53.0.2;
++	notify-source 10.53.0.2;
++	transfer-source 10.53.0.2;
++	port @PORT@;
++	pid-file "named.pid";
++	listen-on { 10.53.0.2; };
++	listen-on-v6 { fd92:7065:b8e:ffff::2; };
++	notify no;
++	recursion no;
++	serial-query-rate 100;
++	# removed catalog-zone option, otherwise this is
++	# identical to named1.conf.in
++};
++
++zone "catalog1.example" {
++	type secondary;
++	file "catalog1.example.db";
++	primaries { 10.53.0.1; };
++};
++
++zone "catalog2.example" {
++	type secondary;
++	file "catalog2.example.db";
++	primaries { 10.53.0.3; };
++};
++
++zone "catalog3.example" {
++	type secondary;
++	file "catalog3.example.db";
++	primaries { 10.53.0.1; };
++};
++
++zone "catalog4.example" {
++	type secondary;
++	file "catalog4.example.db";
++	primaries { 10.53.0.1; };
++};
++
++key tsig_key. {
++	secret "LSAnCU+Z";
++	algorithm hmac-md5;
++};
+diff --git a/bin/tests/system/catz/setup.sh b/bin/tests/system/catz/setup.sh
+index 960cffe9a7..e23ea4f058 100644
+--- a/bin/tests/system/catz/setup.sh
++++ b/bin/tests/system/catz/setup.sh
+@@ -15,7 +15,7 @@ SYSTEMTESTTOP=..
+ $SHELL clean.sh
+ 
+ copy_setports ns1/named.conf.in ns1/named.conf
+-copy_setports ns2/named.conf.in ns2/named.conf
++copy_setports ns2/named1.conf.in ns2/named.conf
+ copy_setports ns3/named.conf.in ns3/named.conf
+ 
+ cp -f ns1/catalog.example.db.in ns1/catalog1.example.db
+diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh
+index c443b739ff..cd2084e59a 100644
+--- a/bin/tests/system/catz/tests.sh
++++ b/bin/tests/system/catz/tests.sh
+@@ -1179,7 +1179,7 @@ status=$((status+ret))
+ n=$((n+1))
+ echo_i "reconfiguring secondary - adding catalog4 catalog zone ($n)"
+ ret=0
+-sed -e "s/^#T1//g" <  ns2/named.conf.in > ns2/named.conf.tmp
++sed -e "s/^#T1//g" <  ns2/named1.conf.in > ns2/named.conf.tmp
+ copy_setports ns2/named.conf.tmp ns2/named.conf
+ rndccmd 10.53.0.2 reconfig || ret=1
+ if [ $ret -ne 0 ]; then echo_i "failed"; fi
+@@ -1210,7 +1210,7 @@ status=$((status+ret))
+ n=$((n+1))
+ echo_i "reconfiguring secondary - removing catalog4 catalog zone, adding non-existent catalog5 catalog zone ($n)"
+ ret=0
+-sed -e "s/^#T2//" < ns2/named.conf.in > ns2/named.conf.tmp
++sed -e "s/^#T2//" < ns2/named1.conf.in > ns2/named.conf.tmp
+ copy_setports ns2/named.conf.tmp ns2/named.conf
+ $RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reconfig > /dev/null 2>&1 && ret=1
+ if [ $ret -ne 0 ]; then echo_i "failed"; fi
+@@ -1219,7 +1219,7 @@ status=$((status+ret))
+ n=$((n+1))
+ echo_i "reconfiguring secondary - removing non-existent catalog5 catalog zone ($n)"
+ ret=0
+-copy_setports ns2/named.conf.in ns2/named.conf
++copy_setports ns2/named1.conf.in ns2/named.conf
+ rndccmd 10.53.0.2 reconfig || ret=1
+ if [ $ret -ne 0 ]; then echo_i "failed"; fi
+ status=$((status+ret))
+@@ -1730,5 +1730,15 @@ wait_for_no_soa @10.53.0.2 dom16.example. dig.out.test$n || ret=1
+ if [ $ret -ne 0 ]; then echo_i "failed"; fi
+ status=$((status+ret))
+ 
++n=$((n+1))
++echo_i "checking that reconfig can delete and restore catalog zone configuration ($n)"
++ret=0
++copy_setports ns2/named2.conf.in ns2/named.conf
++rndccmd 10.53.0.2 reconfig || ret=1
++copy_setports ns2/named1.conf.in ns2/named.conf
++rndccmd 10.53.0.2 reconfig || ret=1
++if [ $ret -ne 0 ]; then echo_i "failed"; fi
++status=$((status+ret))
++
+ echo_i "exit status: $status"
+ [ $status -eq 0 ] || exit 1
+-- 
+2.23.0
+
diff --git a/backport-0002-Fix-catalog-zone-reconfiguration-crash.patch b/backport-0002-Fix-catalog-zone-reconfiguration-crash.patch
new file mode 100644
index 0000000000000000000000000000000000000000..20996e4e253f4dfaf25f359540d00b81ecfb26ba
--- /dev/null
+++ b/backport-0002-Fix-catalog-zone-reconfiguration-crash.patch
@@ -0,0 +1,119 @@
+From 4b362a82ebf511d0915585bbe55bdb9b989f439a Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Mon, 11 Oct 2021 18:13:39 +0000
+Subject: [PATCH] Fix catalog zone reconfiguration crash
+
+The following scenario triggers a "named" crash:
+
+1. Configure a catalog zone.
+2. Start "named".
+3. Comment out the "catalog-zone" clause.
+4. Run `rndc reconfig`.
+5. Uncomment the "catalog-zone" clause.
+6. Run `rndc reconfig` again.
+
+Implement the required cleanup of the in-memory catalog zone during
+the first `rndc reconfig`, so that the second `rndc reconfig` could
+find it in an expected state.
+
+(cherry picked from commit 43ac2cd229813c04438e027c42c0b93b9661adda)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/4b362a82ebf511d0915585bbe55bdb9b989f439a
+---
+ bin/named/server.c          |  2 ++
+ lib/dns/include/dns/zone.h  | 20 ++++++++++++++++++++
+ lib/dns/win32/libdns.def.in |  2 ++
+ lib/dns/zone.c              | 18 ++++++++++++++++++
+ 4 files changed, 42 insertions(+)
+
+diff --git a/bin/named/server.c b/bin/named/server.c
+index 860ccae8a1..9c0f12f63f 100644
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -6523,6 +6523,8 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
+ 
+ 	if (zone_is_catz) {
+ 		dns_zone_catz_enable(zone, view->catzs);
++	} else if (dns_zone_catz_is_enabled(zone)) {
++		dns_zone_catz_disable(zone);
+ 	}
+ 
+ 	/*
+diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
+index 08e2263c5b..33ab5c60fd 100644
+--- a/lib/dns/include/dns/zone.h
++++ b/lib/dns/include/dns/zone.h
+@@ -2605,6 +2605,26 @@ dns_zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs);
+  * \li	prior to calling, zone->catzs is NULL or is equal to 'catzs'
+  */
+ 
++void
++dns_zone_catz_disable(dns_zone_t *zone);
++/*%<
++ * Disable zone as catalog zone, if it is one.
++ *
++ * Requires:
++ *
++ * \li	'zone' is a valid zone object
++ */
++
++bool
++dns_zone_catz_is_enabled(dns_zone_t *zone);
++/*%<
++ * Return a boolean indicating whether the zone is enabled as catalog zone.
++ *
++ * Requires:
++ *
++ * \li	'zone' is a valid zone object
++ */
++
+ void
+ dns_zone_catz_enable_db(dns_zone_t *zone, dns_db_t *db);
+ /*%<
+diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in
+index 31f511103f..1e0f7cf64a 100644
+--- a/lib/dns/win32/libdns.def.in
++++ b/lib/dns/win32/libdns.def.in
+@@ -1173,8 +1173,10 @@ dns_xfrin_shutdown
+ dns_zone_addnsec3chain
+ dns_zone_asyncload
+ dns_zone_attach
++dns_zone_catz_disable
+ dns_zone_catz_enable
+ dns_zone_catz_enable_db
++dns_zone_catz_is_enabled
+ dns_zone_cdscheck
+ dns_zone_checknames
+ dns_zone_clearforwardacl
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 65a3aacab7..bc33e6ede8 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -1942,6 +1942,24 @@ dns_zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs) {
+ 	UNLOCK_ZONE(zone);
+ }
+ 
++void
++dns_zone_catz_disable(dns_zone_t *zone) {
++	REQUIRE(DNS_ZONE_VALID(zone));
++
++	LOCK_ZONE(zone);
++	if (zone->catzs != NULL) {
++		dns_catz_catzs_detach(&zone->catzs);
++	}
++	UNLOCK_ZONE(zone);
++}
++
++bool
++dns_zone_catz_is_enabled(dns_zone_t *zone) {
++	REQUIRE(DNS_ZONE_VALID(zone));
++
++	return (zone->catzs != NULL);
++}
++
+ /*
+  * If a zone is a catalog zone, attach it to update notification in database.
+  */
+-- 
+2.27.0
+
diff --git a/backport-0003-Improve-the-logging-on-failed-TCP-accept.patch b/backport-0003-Improve-the-logging-on-failed-TCP-accept.patch
new file mode 100644
index 0000000000000000000000000000000000000000..aba4616334374cfe925ff958293dd1b950682d0d
--- /dev/null
+++ b/backport-0003-Improve-the-logging-on-failed-TCP-accept.patch
@@ -0,0 +1,162 @@
+From 75c484e36d6d28da820bfcf530a28b4f785049a6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Wed, 1 Dec 2021 17:41:20 +0100
+Subject: [PATCH] Improve the logging on failed TCP accept
+
+Previously, when TCP accept failed, we have logged a message with
+ISC_LOG_ERROR level.  One common case, how this could happen is that the
+client hits TCP client quota and is put on hold and when resumed, the
+client has already given up and closed the TCP connection.  In such
+case, the named would log:
+
+    TCP connection failed: socket is not connected
+
+This message was quite confusing because it actually doesn't say that
+it's related to the accepting the TCP connection and also it logs
+everything on the ISC_LOG_ERROR level.
+
+Change the log message to "Accepting TCP connection failed" and for
+specific error states lower the severity of the log message to
+ISC_LOG_INFO.
+
+(cherry picked from commit 20ac73eb222e60395399b467b0a72015a4dd8845)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/75c484e36d6d28da820bfcf530a28b4f785049a6
+---
+ lib/isc/netmgr/netmgr-int.h |  3 +++
+ lib/isc/netmgr/netmgr.c     | 27 +++++++++++++++++++++++++++
+ lib/isc/netmgr/tcp.c        | 20 ++------------------
+ lib/isc/netmgr/tcpdns.c     | 22 ++--------------------
+ 4 files changed, 34 insertions(+), 38 deletions(-)
+
+diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
+index f7b54f9..b4299d5 100644
+--- a/lib/isc/netmgr/netmgr-int.h
++++ b/lib/isc/netmgr/netmgr-int.h
+@@ -1576,4 +1576,7 @@ isc__nm_failed_read_cb(isc_nmsocket_t *sock, isc_result_t result, bool async);
+ void
+ isc__nmsocket_connecttimeout_cb(uv_timer_t *timer);
+
++void
++isc__nm_accept_connection_log(isc_result_t result, bool can_log_quota);
++
+ #define STREAM_CLIENTS_PER_CONN 23
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index 3283eb6e4f..54042a9123 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -1967,6 +1967,33 @@ isc__nmsocket_connecttimeout_cb(uv_timer_t *timer) {
+ 	}
+ }
+ 
++void
++isc__nm_accept_connection_log(isc_result_t result, bool can_log_quota) {
++	int level;
++
++	switch (result) {
++	case ISC_R_SUCCESS:
++	case ISC_R_NOCONN:
++		return;
++	case ISC_R_QUOTA:
++	case ISC_R_SOFTQUOTA:
++		if (!can_log_quota) {
++			return;
++		}
++		level = ISC_LOG_INFO;
++		break;
++	case ISC_R_NOTCONNECTED:
++		level = ISC_LOG_INFO;
++		break;
++	default:
++		level = ISC_LOG_ERROR;
++	}
++
++	isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_NETMGR,
++		      level, "Accepting TCP connection failed: %s",
++		      isc_result_totext(result));
++}
++
+ static void
+ isc__nmsocket_readtimeout_cb(uv_timer_t *timer) {
+ 	isc_nmsocket_t *sock = uv_handle_get_data((uv_handle_t *)timer);
+diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
+index 5cca9f5214..1b5e80d3a7 100644
+--- a/lib/isc/netmgr/tcp.c
++++ b/lib/isc/netmgr/tcp.c
+@@ -631,15 +631,7 @@ tcp_connection_cb(uv_stream_t *server, int status) {
+ 
+ 	result = accept_connection(ssock, quota);
+ done:
+-	if (result != ISC_R_SUCCESS && result != ISC_R_NOCONN) {
+-		if ((result != ISC_R_QUOTA && result != ISC_R_SOFTQUOTA) ||
+-		    can_log_tcp_quota()) {
+-			isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
+-				      ISC_LOGMODULE_NETMGR, ISC_LOG_ERROR,
+-				      "TCP connection failed: %s",
+-				      isc_result_totext(result));
+-		}
+-	}
++	isc__nm_accept_connection_log(result, can_log_tcp_quota());
+ }
+ 
+ void
+@@ -934,15 +926,7 @@ isc__nm_async_tcpaccept(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 
+ 	result = accept_connection(sock, ievent->quota);
+-	if (result != ISC_R_SUCCESS && result != ISC_R_NOCONN) {
+-		if ((result != ISC_R_QUOTA && result != ISC_R_SOFTQUOTA) ||
+-		    can_log_tcp_quota()) {
+-			isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
+-				      ISC_LOGMODULE_NETMGR, ISC_LOG_ERROR,
+-				      "TCP connection failed: %s",
+-				      isc_result_totext(result));
+-		}
+-	}
++	isc__nm_accept_connection_log(result, can_log_tcp_quota());
+ }
+ 
+ static isc_result_t
+diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
+index 188790c8b4..b76dcbc66c 100644
+--- a/lib/isc/netmgr/tcpdns.c
++++ b/lib/isc/netmgr/tcpdns.c
+@@ -600,16 +600,7 @@ tcpdns_connection_cb(uv_stream_t *server, int status) {
+ 
+ 	result = accept_connection(ssock, quota);
+ done:
+-	if (result != ISC_R_SUCCESS && result != ISC_R_NOCONN) {
+-		if ((result != ISC_R_QUOTA && result != ISC_R_SOFTQUOTA) ||
+-		    can_log_tcpdns_quota())
+-		{
+-			isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
+-				      ISC_LOGMODULE_NETMGR, ISC_LOG_ERROR,
+-				      "TCP connection failed: %s",
+-				      isc_result_totext(result));
+-		}
+-	}
++	isc__nm_accept_connection_log(result, can_log_tcpdns_quota());
+ }
+ 
+ void
+@@ -905,16 +896,7 @@ isc__nm_async_tcpdnsaccept(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	REQUIRE(ievent->sock->tid == isc_nm_tid());
+ 
+ 	result = accept_connection(ievent->sock, ievent->quota);
+-	if (result != ISC_R_SUCCESS && result != ISC_R_NOCONN) {
+-		if ((result != ISC_R_QUOTA && result != ISC_R_SOFTQUOTA) ||
+-		    can_log_tcpdns_quota())
+-		{
+-			isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
+-				      ISC_LOGMODULE_NETMGR, ISC_LOG_ERROR,
+-				      "TCP connection failed: %s",
+-				      isc_result_totext(result));
+-		}
+-	}
++	isc__nm_accept_connection_log(result, can_log_tcpdns_quota());
+ }
+ 
+ static isc_result_t
+-- 
+2.27.0
+
diff --git a/backport-0004-Stop-leaking-mutex-in-nmworker-and-cond-in-nm-socket.patch b/backport-0004-Stop-leaking-mutex-in-nmworker-and-cond-in-nm-socket.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6796b11d5605eb832e44a12569743c03c136d814
--- /dev/null
+++ b/backport-0004-Stop-leaking-mutex-in-nmworker-and-cond-in-nm-socket.patch
@@ -0,0 +1,46 @@
+From d5cdcf924a6b94cd501e33b0963dd787a72af1f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
+Date: Mon, 6 Dec 2021 11:10:17 +0100
+Subject: [PATCH] Stop leaking mutex in nmworker and cond in nm socket
+
+On FreeBSD, the pthread primitives are not solely allocated on stack,
+but part of the object lives on the heap.  Missing pthread_*_destroy
+causes the heap memory to grow and in case of fast lived object it's
+possible to run out-of-memory.
+
+Properly destroy the leaking mutex (worker->lock) and
+the leaking condition (sock->cond).
+
+(cherry picked from commit 57d0fabaddf0e7ac297a046b084df8fb22d54d51)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/d5cdcf924a6b94cd501e33b0963dd787a72af1f8
+---
+ lib/isc/netmgr/netmgr.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index 54042a9123..e81ad4673e 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -425,6 +425,7 @@ nm_destroy(isc_nm_t **mgr0) {
+ 			isc_mempool_put(mgr->evpool, ievent);
+ 		}
+ 		isc_condition_destroy(&worker->cond_prio);
++		isc_mutex_destroy(&worker->lock);
+ 
+ 		r = uv_loop_close(&worker->loop);
+ 		INSIST(r == 0);
+@@ -1267,8 +1268,9 @@ nmsocket_cleanup(isc_nmsocket_t *sock, bool dofree FLARG) {
+ 
+ 	isc_mem_free(sock->mgr->mctx, sock->ah_frees);
+ 	isc_mem_free(sock->mgr->mctx, sock->ah_handles);
+-	isc_mutex_destroy(&sock->lock);
+ 	isc_condition_destroy(&sock->scond);
++	isc_condition_destroy(&sock->cond);
++	isc_mutex_destroy(&sock->lock);
+ #ifdef NETMGR_TRACE
+ 	LOCK(&sock->mgr->lock);
+ 	ISC_LIST_UNLINK(sock->mgr->active_sockets, sock, active_link);
+-- 
+2.23.0
+
diff --git a/backport-0005-Address-memory-leak-when-processing-dnssec-policy-cl.patch b/backport-0005-Address-memory-leak-when-processing-dnssec-policy-cl.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8f79ff853fd32062b152afd4741a90eca6e11744
--- /dev/null
+++ b/backport-0005-Address-memory-leak-when-processing-dnssec-policy-cl.patch
@@ -0,0 +1,32 @@
+From 8dd1288dca7d6c15e8d27a746ff0e218c8981345 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Thu, 23 Dec 2021 17:42:39 +1100
+Subject: [PATCH] Address memory leak when processing dnssec-policy clauses
+
+A kasp structure was not detached when looking to see if there
+was an existing kasp structure with the same name, causing memory
+to be leaked.  Fixed by calling dns_kasp_detach() to release the
+reference.
+
+(cherry picked from commit 694440e6140bbf410b4abe3b1539491d63a43a33)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/8dd1288dca7d6c15e8d27a746ff0e218c8981345
+---
+ lib/isccfg/kaspconf.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/isccfg/kaspconf.c b/lib/isccfg/kaspconf.c
+index 8a119fb612..15433d9f90 100644
+--- a/lib/isccfg/kaspconf.c
++++ b/lib/isccfg/kaspconf.c
+@@ -272,6 +272,7 @@ cfg_kasp_fromconfig(const cfg_obj_t *config, const char *name, isc_mem_t *mctx,
+ 	result = dns_kasplist_find(kasplist, kaspname, &kasp);
+ 
+ 	if (result == ISC_R_SUCCESS) {
++		dns_kasp_detach(&kasp);
+ 		return (ISC_R_EXISTS);
+ 	}
+ 	if (result != ISC_R_NOTFOUND) {
+-- 
+2.23.0
+
diff --git a/backport-0005-Report-duplicate-dnssec-policy-names.patch b/backport-0005-Report-duplicate-dnssec-policy-names.patch
new file mode 100644
index 0000000000000000000000000000000000000000..907864961886849424f92c28cc6b4b658b53dedb
--- /dev/null
+++ b/backport-0005-Report-duplicate-dnssec-policy-names.patch
@@ -0,0 +1,54 @@
+From 0e0cd6bf17704300cf3a1f69563219ce263da913 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Thu, 23 Dec 2021 17:54:53 +1100
+Subject: [PATCH] Report duplicate dnssec-policy names
+
+Duplicate dnssec-policy names were detected as an error condition
+but were not logged.
+
+(cherry picked from commit b8845454c8c67c5c5650e597936f6303708bdd7d)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/0e0cd6bf17704300cf3a1f69563219ce263da913
+---
+ bin/tests/system/checkconf/bad-kasp-duplicate.conf | 13 +++++++++++++
+ lib/isccfg/kaspconf.c                              |  4 ++++
+ 2 files changed, 17 insertions(+)
+ create mode 100644 bin/tests/system/checkconf/bad-kasp-duplicate.conf
+
+diff --git a/bin/tests/system/checkconf/bad-kasp-duplicate.conf b/bin/tests/system/checkconf/bad-kasp-duplicate.conf
+new file mode 100644
+index 0000000000..8ecc670e0b
+--- /dev/null
++++ b/bin/tests/system/checkconf/bad-kasp-duplicate.conf
+@@ -0,0 +1,13 @@
++/*
++ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
++ *
++ * See the COPYRIGHT file distributed with this work for additional
++ * information regarding copyright ownership.
++ */
++
++dnssec-policy a { };
++dnssec-policy a { };
+diff --git a/lib/isccfg/kaspconf.c b/lib/isccfg/kaspconf.c
+index 15433d9f90..f6f1bc3a10 100644
+--- a/lib/isccfg/kaspconf.c
++++ b/lib/isccfg/kaspconf.c
+@@ -272,6 +272,10 @@ cfg_kasp_fromconfig(const cfg_obj_t *config, const char *name, isc_mem_t *mctx,
+ 	result = dns_kasplist_find(kasplist, kaspname, &kasp);
+ 
+ 	if (result == ISC_R_SUCCESS) {
++		cfg_obj_log(
++			config, logctx, ISC_LOG_ERROR,
++			"dnssec-policy: duplicately named policy found '%s'",
++			kaspname);
+ 		dns_kasp_detach(&kasp);
+ 		return (ISC_R_EXISTS);
+ 	}
+-- 
+2.23.0
+
diff --git a/backport-0006-Prevent-a-shutdown-race-in-catz_create_chg_task.patch b/backport-0006-Prevent-a-shutdown-race-in-catz_create_chg_task.patch
new file mode 100644
index 0000000000000000000000000000000000000000..57611a6fe0ebb707edf067bccba45f5e4e718260
--- /dev/null
+++ b/backport-0006-Prevent-a-shutdown-race-in-catz_create_chg_task.patch
@@ -0,0 +1,65 @@
+From 21b00934403697a6ac98422b38a517d0833c946f Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Tue, 4 Jan 2022 12:08:43 -0800
+Subject: [PATCH] Prevent a shutdown race in catz_create_chg_task()
+
+If a catz event is scheduled while the task manager was being
+shut down, task-exclusive mode is unavailable. This needs to be
+handled as an error rather than triggering an assertion.
+
+(cherry picked from commit 973ac1d8912d8d885e9a002ffee4acbaf23e9c81)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/21b00934403697a6ac98422b38a517d0833c946f
+---
+ bin/named/server.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/bin/named/server.c b/bin/named/server.c
+index 9c0f12f63f..cad992f873 100644
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -2921,11 +2921,16 @@ static isc_result_t
+ catz_create_chg_task(dns_catz_entry_t *entry, dns_catz_zone_t *origin,
+ 		     dns_view_t *view, isc_taskmgr_t *taskmgr, void *udata,
+ 		     isc_eventtype_t type) {
+-	catz_chgzone_event_t *event;
+-	isc_task_t *task;
++	catz_chgzone_event_t *event = NULL;
++	isc_task_t *task = NULL;
+ 	isc_result_t result;
+ 	isc_taskaction_t action = NULL;
+ 
++	result = isc_taskmgr_excltask(taskmgr, &task);
++	if (result != ISC_R_SUCCESS) {
++		return (result);
++	}
++
+ 	switch (type) {
+ 	case DNS_EVENT_CATZADDZONE:
+ 	case DNS_EVENT_CATZMODZONE:
+@@ -2936,6 +2941,7 @@ catz_create_chg_task(dns_catz_entry_t *entry, dns_catz_zone_t *origin,
+ 		break;
+ 	default:
+ 		REQUIRE(0);
++		ISC_UNREACHABLE();
+ 	}
+ 
+ 	event = (catz_chgzone_event_t *)isc_event_allocate(
+@@ -2946,13 +2952,11 @@ catz_create_chg_task(dns_catz_entry_t *entry, dns_catz_zone_t *origin,
+ 	event->origin = NULL;
+ 	event->view = NULL;
+ 	event->mod = (type == DNS_EVENT_CATZMODZONE);
++
+ 	dns_catz_entry_attach(entry, &event->entry);
+ 	dns_catz_zone_attach(origin, &event->origin);
+ 	dns_view_attach(view, &event->view);
+ 
+-	task = NULL;
+-	result = isc_taskmgr_excltask(taskmgr, &task);
+-	REQUIRE(result == ISC_R_SUCCESS);
+ 	isc_task_send(task, ISC_EVENT_PTR(&event));
+ 	isc_task_detach(&task);
+ 
+-- 
+2.23.0
+
diff --git a/backport-0007-Fix-bug-introduced-by-763-related-to-offline-keys.patch b/backport-0007-Fix-bug-introduced-by-763-related-to-offline-keys.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f8d181d015f4c1b644f4c87548e1298316149d79
--- /dev/null
+++ b/backport-0007-Fix-bug-introduced-by-763-related-to-offline-keys.patch
@@ -0,0 +1,129 @@
+From bdb91e3825c194a0750ecf79f8acfd81de8c001d Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Tue, 7 Dec 2021 13:59:42 +0100
+Subject: [PATCH] Fix bug introduced by #763 related to offline keys
+
+In some cases we want to keep expired signatures. For example, if the
+KSK is offline, we don't want to fall back to signing with the ZSK.
+We could remove the signatures, but in any case we end up with a broken
+zone.
+
+The change made for GL #763 prevented the behavior to sign the DNSKEY
+RRset with the ZSK if the KSK was offline (and signatures were expired).
+
+The change causes the definition of "having both keys": if one key is
+offline, we still consider having both keys, so we don't fallback
+signing with the ZSK if KSK is offline.
+
+That change also works the other way, if the ZSK is offline, we don't
+fallback signing with the KSK.
+
+This commit fixes that, so we only fallback signing zone RRsets with
+the KSK, not signing key RRsets with the ZSK.
+
+(cherry picked from commit beeefe35c4a05bb69e9730190039fdf3e9fea1ba)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/bdb91e3825c194a0750ecf79f8acfd81de8c001d
+---
+ lib/dns/update.c |  6 +++---
+ lib/dns/zone.c   | 24 +++++++++++++++---------
+ 2 files changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/lib/dns/update.c b/lib/dns/update.c
+index 71ef7dde46..2a766dc6ba 100644
+--- a/lib/dns/update.c
++++ b/lib/dns/update.c
+@@ -1158,8 +1158,8 @@ add_sigs(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db,
+ 				}
+ 
+ 				/* Don't consider inactive keys, however
+-				 * the key may be temporary offline, so do
+-				 * consider keys which private key files are
++				 * the KSK may be temporary offline, so do
++				 * consider KSKs which private key files are
+ 				 * unavailable.
+ 				 */
+ 				if (dst_key_inactive(keys[j])) {
+@@ -1171,7 +1171,7 @@ add_sigs(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db,
+ 				}
+ 				if (KSK(keys[j])) {
+ 					have_ksk = true;
+-				} else {
++				} else if (dst_key_isprivate(keys[j])) {
+ 					have_nonksk = true;
+ 				}
+ 				both = have_ksk && have_nonksk;
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 27373b34fe..f8eb0aae82 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -3483,7 +3483,8 @@ zone_check_dnskeys(dns_zone_t *zone, dns_db_t *db) {
+ 		result = dns_rdata_tostruct(&rdata, &dnskey, NULL);
+ 		INSIST(result == ISC_R_SUCCESS);
+ 
+-		/* RFC 3110, section 4: Performance Considerations:
++		/*
++		 * RFC 3110, section 4: Performance Considerations:
+ 		 *
+ 		 * A public exponent of 3 minimizes the effort needed to verify
+ 		 * a signature.  Use of 3 as the public exponent is weak for
+@@ -7060,8 +7061,9 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_zone_t *zone,
+ 					continue;
+ 				}
+ 
+-				/* Don't consider inactive keys, however
+-				 * the key may be temporary offline, so do
++				/*
++				 * Don't consider inactive keys, however
++				 * the KSK may be temporary offline, so do
+ 				 * consider keys which private key files are
+ 				 * unavailable.
+ 				 */
+@@ -7074,7 +7076,7 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_zone_t *zone,
+ 				}
+ 				if (KSK(keys[j])) {
+ 					have_ksk = true;
+-				} else {
++				} else if (dst_key_isprivate(keys[j])) {
+ 					have_nonksk = true;
+ 				}
+ 				both = have_ksk && have_nonksk;
+@@ -9705,9 +9707,10 @@ zone_sign(dns_zone_t *zone) {
+ 						       ALG(zone_keys[j]))) {
+ 						continue;
+ 					}
+-					/* Don't consider inactive keys, however
++					/*
++					 * Don't consider inactive keys, however
+ 					 * the key may be temporary offline, so
+-					 * do consider keys which private key
++					 * do consider KSKs which private key
+ 					 * files are unavailable.
+ 					 */
+ 					if (dst_key_inactive(zone_keys[j])) {
+@@ -9718,7 +9721,8 @@ zone_sign(dns_zone_t *zone) {
+ 					}
+ 					if (KSK(zone_keys[j])) {
+ 						have_ksk = true;
+-					} else {
++					} else if (dst_key_isprivate(
++							   zone_keys[j])) {
+ 						have_nonksk = true;
+ 					}
+ 					both = have_ksk && have_nonksk;
+@@ -14744,8 +14748,10 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
+ 		timeout = 30;
+ 	}
+ 
+-	/* Save request parameters so we can reuse them later on
+-	   for resolving missing glue A/AAAA records. */
++	/*
++	 * Save request parameters so we can reuse them later on
++	 * for resolving missing glue A/AAAA records.
++	 */
+ 	cb_args = isc_mem_get(zone->mctx, sizeof(*cb_args));
+ 	cb_args->stub = stub;
+ 	cb_args->tsig_key = key;
+-- 
+2.23.0
+
diff --git a/backport-0007-Only-warn-if-we-could-not-delete-signature.patch b/backport-0007-Only-warn-if-we-could-not-delete-signature.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3d8668991194e7d1cc86970d8f4b31d871e3e3c9
--- /dev/null
+++ b/backport-0007-Only-warn-if-we-could-not-delete-signature.patch
@@ -0,0 +1,58 @@
+From 8e31f6981a4e080bc02158a74f4f99f70144cf45 Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Fri, 3 Dec 2021 16:18:13 +0100
+Subject: [PATCH] Only warn if we could not delete signature
+
+BIND can log this warning:
+
+    zone example.ch/IN (signed): Key example.ch/ECDSAP256SHA256/56340
+      missing or inactive and has no replacement: retaining signatures.
+
+This log can happen when BIND tries to remove signatures because the
+are about to expire or to be resigned. These RRsets may be signed with
+the KSK if the ZSK files has been removed from disk. When we have
+created a new ZSK we can replace the signatures creeated by the KSK
+with signatures from the new ZSK.
+
+It complains about the KSK being missing or inactive, but actually it
+takes the key id from the RRSIG.
+
+The warning is logged if BIND detects the private ZSK file is missing.
+
+The warning is logged even if we were able to delete the signature.
+
+With the change from this commit it only logs this warning if it is not
+okay to delete the signature.
+
+(cherry picked from commit 2d2858841a8a749792f50ff077d03cf50f730981)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/8e31f6981a4e080bc02158a74f4f99f70144cf45
+---
+ lib/dns/zone.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 8bfc5e8bc9..27373b34fe 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -6858,7 +6858,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
+ 				}
+ 				deleted = true;
+ 			}
+-			if (warn) {
++			if (warn && !deleted) {
+ 				/*
+ 				 * At this point, we've got an RRSIG,
+ 				 * which is signed by an inactive key.
+@@ -6868,7 +6868,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
+ 				 * offline will prevent us spinning waiting
+ 				 * for the private part.
+ 				 */
+-				if (incremental && !deleted) {
++				if (incremental) {
+ 					result = offline(db, ver, zonediff,
+ 							 name, rdataset.ttl,
+ 							 &rdata);
+-- 
+2.23.0
+
diff --git a/backport-0007-Replace-RSASHA1-in-autosign-test-with-default-alg.patch b/backport-0007-Replace-RSASHA1-in-autosign-test-with-default-alg.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0ae0496d8525ab16a8d5386b991a9a8e414016e7
--- /dev/null
+++ b/backport-0007-Replace-RSASHA1-in-autosign-test-with-default-alg.patch
@@ -0,0 +1,498 @@
+From 99316385d35dc4a212988be7c69aadd20bc31fa1 Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Wed, 5 Jan 2022 11:39:03 +0100
+Subject: [PATCH] Replace RSASHA1 in autosign test with default alg
+
+Change RSASHA1 to $DEFAULT_ALGORITHM to be FIPS compliant.
+
+There is one RSASHA1 occurence left, to test that dynamically adding an
+NSEC3PARAM record to an NSEC-only zone fails.
+
+(cherry picked from commit 6e9fed2d24bc6bd475132285971ad1a86c0f9dc6)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/99316385d35dc4a212988be7c69aadd20bc31fa1
+---
+ bin/tests/system/autosign/ns3/keygen.sh | 132 ++++++++++++------------
+ bin/tests/system/autosign/tests.sh      |  35 ++++---
+ 2 files changed, 85 insertions(+), 82 deletions(-)
+
+diff --git a/bin/tests/system/autosign/ns3/keygen.sh b/bin/tests/system/autosign/ns3/keygen.sh
+index 633e08360a..1755a499fe 100644
+--- a/bin/tests/system/autosign/ns3/keygen.sh
++++ b/bin/tests/system/autosign/ns3/keygen.sh
+@@ -30,8 +30,8 @@ setup () {
+ 
+ setup secure.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -a RSASHA1 -3 -q -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -a RSASHA1 -3 -q $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -39,8 +39,8 @@ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ #
+ setup secure.nsec3.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -q -a RSASHA1 -3 $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -48,8 +48,8 @@ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ #
+ setup nsec3.nsec3.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -q -a RSASHA1 -3 $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -72,8 +72,8 @@ done
+ #
+ setup optout.nsec3.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -q -a RSASHA1 -3 $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -81,8 +81,8 @@ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ #
+ setup nsec3.example
+ cat $infile dsset-*.${zone}$TP > $zonefile
+-ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -q -a RSASHA1 -3 $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -90,9 +90,9 @@ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ #
+ setup autonsec3.example
+ cat $infile > $zonefile
+-ksk=`$KEYGEN -G -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
++ksk=`$KEYGEN -G -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
+ echo $ksk > ../autoksk.key
+-zsk=`$KEYGEN -G -q -a RSASHA1 -3 $zone 2> kg.out` || dumpit kg.out
++zsk=`$KEYGEN -G -q -a $DEFAULT_ALGORITHM -3 $zone 2> kg.out` || dumpit kg.out
+ echo $zsk > ../autozsk.key
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+@@ -101,8 +101,8 @@ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ #
+ setup secure.optout.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -q -a RSASHA1 -3 $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -110,8 +110,8 @@ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ #
+ setup nsec3.optout.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -q -a RSASHA1 -3 $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -119,8 +119,8 @@ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ #
+ setup optout.optout.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -q -a RSASHA1 -3 $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -128,8 +128,8 @@ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ #
+ setup optout.example
+ cat $infile dsset-*.${zone}$TP > $zonefile
+-ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -q -a RSASHA1 -3 $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -171,8 +171,8 @@ do
+     echo "label${count} IN TXT label${count}" >> $zonefile
+     count=`expr $count + 1`
+ done
+-$KEYGEN -q -a RSASHA1 -fk $zone > kg.out 2>&1 || dumpit kg.out
+-$KEYGEN -q -a RSASHA1 $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -fk $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM $zone > kg.out 2>&1 || dumpit kg.out
+ $SIGNER -PS -s now-1y -e now-6mo -o $zone -f $zonefile.signed $zonefile > s.out || dumpit s.out
+ mv $zonefile.signed $zonefile
+ 
+@@ -189,8 +189,8 @@ $SIGNER -S -3 beef -A -o $zone -f $zonefile $infile > s.out || dumpit s.out
+ # keys via nsupdate
+ #
+ setup secure-to-insecure.example
+-$KEYGEN -a RSASHA1 -q -fk $zone > kg.out 2>&1 || dumpit kg.out
+-$KEYGEN -a RSASHA1 -q $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -q -fk $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -q $zone > kg.out 2>&1 || dumpit kg.out
+ $SIGNER -S -o $zone -f $zonefile $infile > s.out || dumpit s.out
+ 
+ #
+@@ -198,9 +198,9 @@ $SIGNER -S -o $zone -f $zonefile $infile > s.out || dumpit s.out
+ # removal of keys on schedule.
+ #
+ setup secure-to-insecure2.example
+-ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
+ echo $ksk > ../del1.key
+-zsk=`$KEYGEN -q -a RSASHA1 -3 $zone 2> kg.out` || dumpit kg.out
++zsk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone 2> kg.out` || dumpit kg.out
+ echo $zsk > ../del2.key
+ $SIGNER -S -3 beef -o $zone -f $zonefile $infile > s.out || dumpit s.out
+ 
+@@ -209,8 +209,8 @@ $SIGNER -S -3 beef -o $zone -f $zonefile $infile > s.out || dumpit s.out
+ #
+ setup prepub.example
+ infile="secure-to-insecure2.example.db.in"
+-$KEYGEN -a RSASHA1 -3 -q -fk $zone > kg.out 2>&1 || dumpit kg.out
+-$KEYGEN -a RSASHA1 -3 -q $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -fk $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q $zone > kg.out 2>&1 || dumpit kg.out
+ $SIGNER -S -3 beef -o $zone -f $zonefile $infile > s.out || dumpit s.out
+ 
+ #
+@@ -219,35 +219,35 @@ $SIGNER -S -3 beef -o $zone -f $zonefile $infile > s.out || dumpit s.out
+ 
+ # no default key TTL; DNSKEY should get SOA TTL
+ setup ttl1.example
+-$KEYGEN -a RSASHA1 -3 -q -fk $zone > kg.out 2>&1 || dumpit kg.out
+-$KEYGEN -a RSASHA1 -3 -q $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -fk $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q $zone > kg.out 2>&1 || dumpit kg.out
+ cp $infile $zonefile
+ 
+ # default key TTL should be used
+-setup ttl2.example 
+-$KEYGEN -a RSASHA1 -3 -q -fk -L 60 $zone > kg.out 2>&1 || dumpit kg.out
+-$KEYGEN -a RSASHA1 -3 -q -L 60 $zone > kg.out 2>&1 || dumpit kg.out
++setup ttl2.example
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -fk -L 60 $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -L 60 $zone > kg.out 2>&1 || dumpit kg.out
+ cp $infile $zonefile
+ 
+ # mismatched key TTLs, should use shortest
+ setup ttl3.example
+-$KEYGEN -a RSASHA1 -3 -q -fk -L 30 $zone > kg.out 2>&1 || dumpit kg.out
+-$KEYGEN -a RSASHA1 -3 -q -L 60 $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -fk -L 30 $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -L 60 $zone > kg.out 2>&1 || dumpit kg.out
+ cp $infile $zonefile
+ 
+ # existing DNSKEY RRset, should retain TTL
+ setup ttl4.example
+-$KEYGEN -a RSASHA1 -3 -q -L 30 -fk $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -L 30 -fk $zone > kg.out 2>&1 || dumpit kg.out
+ cat ${infile} K${zone}.+*.key > $zonefile
+-$KEYGEN -a RSASHA1 -3 -q -L 180 $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -L 180 $zone > kg.out 2>&1 || dumpit kg.out
+ 
+ #
+ # A zone with a DNSKEY RRset that is published before it's activated
+ #
+ setup delay.example
+-ksk=`$KEYGEN -G -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
++ksk=`$KEYGEN -G -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
+ echo $ksk > ../delayksk.key
+-zsk=`$KEYGEN -G -q -a RSASHA1 -3 $zone 2> kg.out` || dumpit kg.out
++zsk=`$KEYGEN -G -q -a $DEFAULT_ALGORITHM -3 $zone 2> kg.out` || dumpit kg.out
+ echo $zsk > ../delayzsk.key
+ 
+ #
+@@ -255,8 +255,8 @@ echo $zsk > ../delayzsk.key
+ # is missing.
+ #
+ setup noksk.example
+-ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
+-zsk=`$KEYGEN -q -a RSASHA1 -3 $zone 2> kg.out` || dumpit kg.out
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++zsk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone 2> kg.out` || dumpit kg.out
+ $SIGNER -S -P -s now-1mo -e now-1mi -o $zone -f $zonefile ${zonefile}.in > s.out || dumpit s.out
+ echo $ksk > ../noksk-ksk.key
+ rm -f ${ksk}.private
+@@ -266,8 +266,8 @@ rm -f ${ksk}.private
+ # is missing.
+ #
+ setup nozsk.example
+-ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
+-zsk=`$KEYGEN -q -a RSASHA1 -3 $zone 2> kg.out` || dumpit kg.out
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++zsk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone 2> kg.out` || dumpit kg.out
+ $SIGNER -S -P -s now-1mo -e now-1mi -o $zone -f $zonefile ${zonefile}.in > s.out || dumpit s.out
+ echo $ksk > ../nozsk-ksk.key
+ echo $zsk > ../nozsk-zsk.key
+@@ -278,8 +278,8 @@ rm -f ${zsk}.private
+ # is inactive.
+ #
+ setup inaczsk.example
+-ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
+-zsk=`$KEYGEN -q -a RSASHA1 -3 $zone 2> kg.out` || dumpit kg.out
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++zsk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone 2> kg.out` || dumpit kg.out
+ $SIGNER -S -P -s now-1mo -e now-1mi -o $zone -f $zonefile ${zonefile}.in > s.out || dumpit s.out
+ echo $ksk > ../inaczsk-ksk.key
+ echo $zsk > ../inaczsk-zsk.key
+@@ -290,16 +290,16 @@ $SETTIME -I now $zsk > st.out 2>&1 || dumpit st.out
+ #
+ setup reconf.example
+ cp secure.example.db.in $zonefile
+-$KEYGEN -q -a RSASHA1 -3 -fk $zone > kg.out 2>&1 || dumpit kg.out
+-$KEYGEN -q -a RSASHA1 -3 $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone > kg.out 2>&1 || dumpit kg.out
+ 
+ #
+ # A zone which generates CDS and CDNSEY RRsets automatically
+ #
+ setup sync.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -a RSASHA1 -3 -q -fk -P sync now $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -a RSASHA1 -3 -q $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -fk -P sync now $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ echo ns3/$ksk > ../sync.key
+ 
+@@ -308,8 +308,8 @@ echo ns3/$ksk > ../sync.key
+ #
+ setup kskonly.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -a RSASHA1 -3 -q -fk -P sync now $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -a RSASHA1 -3 -q $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -fk -P sync now $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -317,8 +317,8 @@ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ #
+ setup inacksk2.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -a RSASHA1 -3 -q -Pnow -A now+3600 -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -a RSASHA1 -3 -q $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -Pnow -A now+3600 -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -326,8 +326,8 @@ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ #
+ setup inaczsk2.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -a RSASHA1 -3 -q -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -a RSASHA1 -3 -q -P now -A now+3600 $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -P now -A now+3600 $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -335,9 +335,9 @@ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ #
+ setup inacksk3.example
+ cp $infile $zonefile
+-$KEYGEN -a NSEC3RSASHA1 -3 -q -P now -A now+3600 -fk $zone > kg.out 2>&1 || dumpit kg.out
+-ksk=`$KEYGEN -a NSEC3RSASHA1 -3 -q -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -a NSEC3RSASHA1 -3 -q $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -P now -A now+3600 -fk $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -345,9 +345,9 @@ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ #
+ setup inaczsk3.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -a NSEC3RSASHA1 -3 -q -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -a NSEC3RSASHA1 -3 -q $zone > kg.out 2>&1 || dumpit kg.out
+-$KEYGEN -a NSEC3RSASHA1 -3 -q -P now -A now+3600 $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q $zone > kg.out 2>&1 || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -P now -A now+3600 $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+@@ -356,9 +356,9 @@ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ #
+ setup delzsk.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -a NSEC3RSASHA1 -3 -q -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -a NSEC3RSASHA1 -3 -q $zone > kg.out 2>&1 || dumpit kg.out
+-zsk=`$KEYGEN -a NSEC3RSASHA1 -3 -q -I now-1w $zone 2>kg.out` || dumpit kg.out
++ksk=`$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q $zone > kg.out 2>&1 || dumpit kg.out
++zsk=`$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -I now-1w $zone 2>kg.out` || dumpit kg.out
+ echo $zsk > ../delzsk.key
+ 
+ #
+@@ -366,6 +366,6 @@ echo $zsk > ../delzsk.key
+ #
+ setup dname-at-apex-nsec3.example
+ cp $infile $zonefile
+-ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
+-$KEYGEN -q -a RSASHA1 -3 $zone > kg.out 2>&1 || dumpit kg.out
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
+index 33692cd5f5..b5069ce6fe 100755
+--- a/bin/tests/system/autosign/tests.sh
++++ b/bin/tests/system/autosign/tests.sh
+@@ -203,9 +203,9 @@ $DIG $DIGOPTS @10.53.0.3 axfr inacksk3.example > dig.out.ns3.test$n
+ 
+ zskid=`awk '$4 == "DNSKEY" && $5 == 256 { print }' dig.out.ns3.test$n |
+        $DSFROMKEY -A -2 -f - inacksk3.example | awk '{ print $4}'`
+-grep "DNSKEY 7 2 " dig.out.ns3.test$n > /dev/null || ret=1
++grep "DNSKEY ${DEFAULT_ALGORITHM_NUMBER} 2 " dig.out.ns3.test$n > /dev/null || ret=1
+ 
+-pattern="DNSKEY 7 2 [0-9]* [0-9]* [0-9]* ${zskid} "
++pattern="DNSKEY ${DEFAULT_ALGORITHM_NUMBER} 2 [0-9]* [0-9]* [0-9]* ${zskid} "
+ grep "${pattern}" dig.out.ns3.test$n > /dev/null && ret=1
+ 
+ count=`awk 'BEGIN { count = 0 }
+@@ -221,7 +221,8 @@ test $count -eq 3 || ret=1
+ awk='$4 == "RRSIG" && $5 == "DNSKEY" { printf "%05u\n", $11 }'
+ id=`awk "${awk}" dig.out.ns3.test$n`
+ 
+-$SETTIME -D now+5 ns3/Kinacksk3.example.+007+${id} > settime.out.test$n || ret=1
++keyfile=$(printf "ns3/Kinacksk3.example.+%03u+%s" "${DEFAULT_ALGORITHM_NUMBER}" "${id}")
++$SETTIME -D now+5 "${keyfile}" > settime.out.test$n || ret=1
+ ($RNDCCMD 10.53.0.3 loadkeys inacksk3.example 2>&1 | sed 's/^/ns3 /' | cat_i) || ret=1
+ 
+ n=`expr $n + 1`
+@@ -238,8 +239,8 @@ ret=0
+ $DIG $DIGOPTS @10.53.0.3 axfr inaczsk3.example > dig.out.ns3.test$n
+ kskid=`awk '$4 == "DNSKEY" && $5 == 257 { print }' dig.out.ns3.test$n |
+        $DSFROMKEY -2 -f - inaczsk3.example | awk '{ print $4}' `
+-grep "CNAME 7 3 " dig.out.ns3.test$n > /dev/null || ret=1
+-grep "CNAME 7 3 [0-9]* [0-9]* [0-9]* ${kskid} " dig.out.ns3.test$n > /dev/null && ret=1
++grep "CNAME ${DEFAULT_ALGORITHM_NUMBER} 3 " dig.out.ns3.test$n > /dev/null || ret=1
++grep "CNAME ${DEFAULT_ALGORITHM_NUMBER} 3 [0-9]* [0-9]* [0-9]* ${kskid} " dig.out.ns3.test$n > /dev/null && ret=1
+ count=`awk 'BEGIN { count = 0 }
+ 	    $4 == "RRSIG" && $5 == "CNAME" { count++ }
+ 	    END {print count}' dig.out.ns3.test$n`
+@@ -249,7 +250,9 @@ count=`awk 'BEGIN { count = 0 }
+        END {print count}' dig.out.ns3.test$n`
+ test $count -eq 3 || ret=1
+ id=`awk '$4 == "RRSIG" && $5 == "CNAME" { printf "%05u\n", $11 }' dig.out.ns3.test$n`
+-$SETTIME -D now+5 ns3/Kinaczsk3.example.+007+${id} > settime.out.test$n || ret=1
++
++keyfile=$(printf "ns3/Kinaczsk3.example.+%03u+%s" "${DEFAULT_ALGORITHM_NUMBER}" "${id}")
++$SETTIME -D now+5 "${keyfile}" > settime.out.test$n || ret=1
+ ($RNDCCMD 10.53.0.3 loadkeys inaczsk3.example 2>&1 | sed 's/^/ns3 /' | cat_i) || ret=1
+ n=`expr $n + 1`
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+@@ -399,7 +402,7 @@ status=`expr $status + $ret`
+ 
+ echo_i "checking that replaced RRSIGs are not logged (missing ZSK private key) ($n)"
+ ret=0
+-loglines=`grep "Key nozsk.example/NSEC3RSASHA1/$missing .* retaining signatures" ns3/named.run | wc -l`
++loglines=`grep "Key nozsk.example/$DEFAULT_ALGORITHM/$missing .* retaining signatures" ns3/named.run | wc -l`
+ [ "$loglines" -eq 0 ] || ret=1
+ n=`expr $n + 1`
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+@@ -407,7 +410,7 @@ status=`expr $status + $ret`
+ 
+ echo_i "checking that replaced RRSIGs are not logged (inactive ZSK private key) ($n)"
+ ret=0
+-loglines=`grep "Key inaczsk.example/NSEC3RSASHA1/$inactive .* retaining signatures" ns3/named.run | wc -l`
++loglines=`grep "Key inaczsk.example/$DEFAULT_ALGORITHM/$inactive .* retaining signatures" ns3/named.run | wc -l`
+ [ "$loglines" -eq 0 ] || ret=1
+ n=`expr $n + 1`
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+@@ -1065,7 +1068,7 @@ send
+ END
+ [ $ret != 0 ] && echo_i "error: dynamic update add NSEC3PARAM failed"
+ # Create DNSSEC keys in the zone directory.
+-$KEYGEN -a rsasha1 -3 -q -K ns3 jitter.nsec3.example > /dev/null
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -K ns3 jitter.nsec3.example > /dev/null
+ # Trigger zone signing.
+ ($RNDCCMD 10.53.0.3 sign jitter.nsec3.example. 2>&1 | sed 's/^/ns3 /' | cat_i) || ret=1
+ # Wait until zone has been signed.
+@@ -1089,7 +1092,7 @@ ret=0
+ oldserial=`$DIG $DIGOPTS +short soa prepub.example @10.53.0.3 | awk '$0 !~ /SOA/ {print $3}'`
+ oldinception=`$DIG $DIGOPTS +short soa prepub.example @10.53.0.3 | awk '/SOA/ {print $6}' | sort -u`
+ 
+-$KEYGEN -a rsasha1 -3 -q -K ns3 -P 0 -A +6d -I +38d -D +45d prepub.example > /dev/null
++$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -K ns3 -P 0 -A +6d -I +38d -D +45d prepub.example > /dev/null
+ 
+ ($RNDCCMD 10.53.0.3 sign prepub.example 2>&1 | sed 's/^/ns1 /' | cat_i) || ret=1
+ newserial=$oldserial
+@@ -1473,12 +1476,12 @@ $DIG $DIGOPTS @10.53.0.3 axfr inacksk2.example > dig.out.ns3.test$n
+ 
+ zskid=`awk '$4 == "DNSKEY" && $5 == 256 { print }' dig.out.ns3.test$n |
+        $DSFROMKEY -A -2 -f - inacksk2.example | awk '{ print $4}' `
+-pattern="DNSKEY 7 2 [0-9]* [0-9]* [0-9]* ${zskid} "
++pattern="DNSKEY ${DEFAULT_ALGORITHM_NUMBER} 2 [0-9]* [0-9]* [0-9]* ${zskid} "
+ grep "${pattern}" dig.out.ns3.test$n > /dev/null || ret=1
+ 
+ kskid=`awk '$4 == "DNSKEY" && $5 == 257 { print }' dig.out.ns3.test$n |
+        $DSFROMKEY -2 -f - inacksk2.example | awk '{ print $4}' `
+-pattern="DNSKEY 7 2 [0-9]* [0-9]* [0-9]* ${kskid} "
++pattern="DNSKEY ${DEFAULT_ALGORITHM_NUMBER} 2 [0-9]* [0-9]* [0-9]* ${kskid} "
+ grep "${pattern}" dig.out.ns3.test$n > /dev/null && ret=1
+ 
+ n=`expr $n + 1`
+@@ -1488,7 +1491,7 @@ status=`expr $status + $ret`
+ echo_i "check that zone with inactive ZSK and active KSK is properly autosigned ($n)"
+ ret=0
+ $DIG $DIGOPTS @10.53.0.3 axfr inaczsk2.example > dig.out.ns3.test$n
+-grep "SOA 7 2" dig.out.ns3.test$n > /dev/null || ret=1
++grep "SOA ${DEFAULT_ALGORITHM_NUMBER} 2" dig.out.ns3.test$n > /dev/null || ret=1
+ n=`expr $n + 1`
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+ status=`expr $status + $ret`
+@@ -1505,7 +1508,7 @@ $DIG $DIGOPTS @10.53.0.3 axfr inacksk3.example > dig.out.ns3.test$n
+ 
+ zskid=`awk '$4 == "DNSKEY" && $5 == 256 { print }' dig.out.ns3.test$n |
+        $DSFROMKEY -A -2 -f - inacksk3.example | awk '{ print $4}' `
+-pattern="DNSKEY 7 2 [0-9]* [0-9]* [0-9]* ${zskid} "
++pattern="DNSKEY ${DEFAULT_ALGORITHM_NUMBER} 2 [0-9]* [0-9]* [0-9]* ${zskid} "
+ grep "${pattern}" dig.out.ns3.test$n > /dev/null || ret=1
+ 
+ count=`awk 'BEGIN { count = 0 }
+@@ -1532,7 +1535,7 @@ ret=0
+ $DIG $DIGOPTS @10.53.0.3 axfr inaczsk3.example > dig.out.ns3.test$n
+ kskid=`awk '$4 == "DNSKEY" && $5 == 257 { print }' dig.out.ns3.test$n |
+        $DSFROMKEY -2 -f - inaczsk3.example | awk '{ print $4}' `
+-grep "CNAME 7 3 [0-9]* [0-9]* [0-9]* ${kskid} " dig.out.ns3.test$n > /dev/null || ret=1
++grep "CNAME ${DEFAULT_ALGORITHM_NUMBER} 3 [0-9]* [0-9]* [0-9]* ${kskid} " dig.out.ns3.test$n > /dev/null || ret=1
+ count=`awk 'BEGIN { count = 0 }
+        $4 == "RRSIG" && $5 == "CNAME" { count++ }
+        END {print count}' dig.out.ns3.test$n`
+@@ -1606,7 +1609,7 @@ status=`expr $status + $ret`
+ echo_i "check that DNAME at apex with NSEC3 is correctly signed (auto-dnssec maintain) ($n)"
+ ret=0
+ $DIG $DIGOPTS txt dname-at-apex-nsec3.example @10.53.0.3 > dig.out.ns3.test$n || ret=1
+-grep "RRSIG NSEC3 7 3 600" dig.out.ns3.test$n > /dev/null || ret=1
++grep "RRSIG NSEC3 ${DEFAULT_ALGORITHM_NUMBER} 3 600" dig.out.ns3.test$n > /dev/null || ret=1
+ n=`expr $n + 1`
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+ status=`expr $status + $ret`
+-- 
+2.23.0
+
diff --git a/backport-0007-Update-autosign-test.patch b/backport-0007-Update-autosign-test.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f027d5942419ec8ae3562c4457ba503416ffceeb
--- /dev/null
+++ b/backport-0007-Update-autosign-test.patch
@@ -0,0 +1,233 @@
+From 17ae663084bdab626314da73b30aa53fc76ebe16 Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Tue, 7 Dec 2021 14:11:06 +0100
+Subject: [PATCH] Update autosign test
+
+Update the autosign system test with new expected behavior.
+
+The 'nozsk.example' zone should have its expired zone signatures
+deleted and replaced with signatures generated with the KSK.
+
+The 'inaczsk.example' zone should have its expired zone signatures
+deleted and replaced with signatures generated with the KSK.
+
+In both scenarios, signatures are deleted, not retained, so the
+"retaining signatures" warning should not be logged.
+
+Furthermore, thsi commit fixex a test bug where the 'awk' command
+always returned 0.
+
+Finally, this commit adds a test case for an offline KSK, for the zone
+'noksk.example'. In this case the expired signatures should be retained
+(despite the zone being bogus, but resigning the DNSKEY RRset with the
+ZSK won't help here).
+
+(cherry picked from commit fbd559ad0d389948c594a35b72d7fb6d16794702)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/17ae663084bdab626314da73b30aa53fc76ebe16
+---
+ bin/tests/system/autosign/clean.sh            |  3 +-
+ bin/tests/system/autosign/ns3/keygen.sh       | 25 ++++++++++---
+ bin/tests/system/autosign/ns3/named.conf.in   |  7 ++++
+ .../system/autosign/ns3/noksk.example.db.in   | 24 ++++++++++++
+ bin/tests/system/autosign/tests.sh            | 37 +++++++++++++------
+ 5 files changed, 78 insertions(+), 18 deletions(-)
+ create mode 100644 bin/tests/system/autosign/ns3/noksk.example.db.in
+
+diff --git a/bin/tests/system/autosign/clean.sh b/bin/tests/system/autosign/clean.sh
+index 7a1101d6dd..20efc69499 100644
+--- a/bin/tests/system/autosign/clean.sh
++++ b/bin/tests/system/autosign/clean.sh
+@@ -22,7 +22,7 @@ rm -f delayksk.key delayzsk.key autoksk.key autozsk.key
+ rm -f dig.out.*
+ rm -f digcomp.out.test*
+ rm -f digcomp.out.test*
+-rm -f missingzsk.key inactivezsk.key
++rm -f noksk-ksk.key nozsk-ksk.key nozsk-zsk.key inaczsk-zsk.key inaczsk-ksk.key
+ rm -f nopriv.key vanishing.key del1.key del2.key
+ rm -f ns*/managed-keys.bind*
+ rm -f ns*/named.lock
+@@ -43,6 +43,7 @@ rm -f ns3/jitter.nsec3.example.db
+ rm -f ns3/kg.out ns3/s.out ns3/st.out
+ rm -f ns3/kskonly.example.db
+ rm -f ns3/named.ns3.prev
++rm -f ns3/noksk.example.db
+ rm -f ns3/nozsk.example.db ns3/inaczsk.example.db
+ rm -f ns3/nsec.example.db
+ rm -f ns3/nsec3-to-nsec.example.db
+diff --git a/bin/tests/system/autosign/ns3/keygen.sh b/bin/tests/system/autosign/ns3/keygen.sh
+index 4c85d0c87c..633e08360a 100644
+--- a/bin/tests/system/autosign/ns3/keygen.sh
++++ b/bin/tests/system/autosign/ns3/keygen.sh
+@@ -250,15 +250,27 @@ echo $ksk > ../delayksk.key
+ zsk=`$KEYGEN -G -q -a RSASHA1 -3 $zone 2> kg.out` || dumpit kg.out
+ echo $zsk > ../delayzsk.key
+ 
++#
++# A zone with signatures that are already expired, and the private KSK
++# is missing.
++#
++setup noksk.example
++ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
++zsk=`$KEYGEN -q -a RSASHA1 -3 $zone 2> kg.out` || dumpit kg.out
++$SIGNER -S -P -s now-1mo -e now-1mi -o $zone -f $zonefile ${zonefile}.in > s.out || dumpit s.out
++echo $ksk > ../noksk-ksk.key
++rm -f ${ksk}.private
++
+ #
+ # A zone with signatures that are already expired, and the private ZSK
+ # is missing.
+ #
+ setup nozsk.example
+-$KEYGEN -q -a RSASHA1 -3 -fk $zone > kg.out 2>&1 || dumpit kg.out
+-zsk=`$KEYGEN -q -a RSASHA1 -3 $zone`
++ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
++zsk=`$KEYGEN -q -a RSASHA1 -3 $zone 2> kg.out` || dumpit kg.out
+ $SIGNER -S -P -s now-1mo -e now-1mi -o $zone -f $zonefile ${zonefile}.in > s.out || dumpit s.out
+-echo $zsk > ../missingzsk.key
++echo $ksk > ../nozsk-ksk.key
++echo $zsk > ../nozsk-zsk.key
+ rm -f ${zsk}.private
+ 
+ #
+@@ -266,10 +278,11 @@ rm -f ${zsk}.private
+ # is inactive.
+ #
+ setup inaczsk.example
+-$KEYGEN -q -a RSASHA1 -3 -fk $zone > kg.out 2>&1 || dumpit kg.out
+-zsk=`$KEYGEN -q -a RSASHA1 -3 $zone`
++ksk=`$KEYGEN -q -a RSASHA1 -3 -fk $zone 2> kg.out` || dumpit kg.out
++zsk=`$KEYGEN -q -a RSASHA1 -3 $zone 2> kg.out` || dumpit kg.out
+ $SIGNER -S -P -s now-1mo -e now-1mi -o $zone -f $zonefile ${zonefile}.in > s.out || dumpit s.out
+-echo $zsk > ../inactivezsk.key
++echo $ksk > ../inaczsk-ksk.key
++echo $zsk > ../inaczsk-zsk.key
+ $SETTIME -I now $zsk > st.out 2>&1 || dumpit st.out
+ 
+ #
+diff --git a/bin/tests/system/autosign/ns3/named.conf.in b/bin/tests/system/autosign/ns3/named.conf.in
+index 7c8f74f19a..8aa64b2165 100644
+--- a/bin/tests/system/autosign/ns3/named.conf.in
++++ b/bin/tests/system/autosign/ns3/named.conf.in
+@@ -249,6 +249,13 @@ zone "inaczsk.example" {
+ 	auto-dnssec maintain;
+ };
+ 
++zone "noksk.example" {
++	type primary;
++	file "noksk.example.db";
++	allow-update { any; };
++	auto-dnssec maintain;
++};
++
+ zone "sync.example" {
+ 	type primary;
+ 	file "sync.example.db";
+diff --git a/bin/tests/system/autosign/ns3/noksk.example.db.in b/bin/tests/system/autosign/ns3/noksk.example.db.in
+new file mode 100644
+index 0000000000..90dcba9daf
+--- /dev/null
++++ b/bin/tests/system/autosign/ns3/noksk.example.db.in
+@@ -0,0 +1,24 @@
++; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++;
++; This Source Code Form is subject to the terms of the Mozilla Public
++; License, v. 2.0. If a copy of the MPL was not distributed with this
++; file, You can obtain one at http://mozilla.org/MPL/2.0/.
++;
++; See the COPYRIGHT file distributed with this work for additional
++; information regarding copyright ownership.
++
++$TTL 300	; 5 minutes
++@			IN SOA	mname1. . (
++				1          ; serial
++				20         ; refresh (20 seconds)
++				20         ; retry (20 seconds)
++				1814400    ; expire (3 weeks)
++				3600       ; minimum (1 hour)
++				)
++			NS	ns
++ns			A	10.53.0.3
++
++a			A	10.0.0.1
++b			A	10.0.0.2
++d			A	10.0.0.4
++x			CNAME	a
+diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
+index 79c5999d94..33692cd5f5 100755
+--- a/bin/tests/system/autosign/tests.sh
++++ b/bin/tests/system/autosign/tests.sh
+@@ -157,7 +157,7 @@ do
+ 		grep "NS SOA" dig.out.ns2.test$n > /dev/null || ret=1
+ 	done
+ 	for z in bar. example. inacksk2.example. inacksk3.example \
+-		 inaczsk2.example. inaczsk3.example
++		 inaczsk2.example. inaczsk3.example noksk.example nozsk.example
+ 	do
+ 		$DIG $DIGOPTS $z @10.53.0.3 nsec > dig.out.ns3.test$n || ret=1
+ 		grep "NS SOA" dig.out.ns3.test$n > /dev/null || ret=1
+@@ -364,36 +364,51 @@ END
+ echo_i "waiting for change to take effect"
+ sleep 3
+ 
+-echo_i "checking that expired RRSIGs from missing key are not deleted ($n)"
++missing=$(keyfile_to_key_id "$(cat noksk-ksk.key)")
++echo_i "checking that expired RRSIGs from missing KSK $missing are not deleted ($n)"
+ ret=0
+-missing=$(keyfile_to_key_id "$(cat missingzsk.key)")
++$JOURNALPRINT ns3/noksk.example.db.jnl | \
++   awk '{if ($1 == "del" && $5 == "RRSIG" && $12 == id) {error=1}} END {exit error}' id=$missing || ret=1
++n=`expr $n + 1`
++if [ $ret != 0 ]; then echo_i "failed"; fi
++status=`expr $status + $ret`
++
++missing=$(keyfile_to_key_id "$(cat nozsk-zsk.key)")
++ksk=$(keyfile_to_key_id "$(cat nozsk-ksk.key)")
++echo_i "checking that expired RRSIGs from missing ZSK $missing are replaced ($n)"
++ret=0
++$JOURNALPRINT ns3/nozsk.example.db.jnl | \
++   awk '{if ($1 == "del" && $5 == "RRSIG" && $12 == id) {ok=1}} END {exit ok?0:1}' id=$missing || ret=1
+ $JOURNALPRINT ns3/nozsk.example.db.jnl | \
+-   awk '{if ($1 == "del" && $5 == "RRSIG" && $12 == id) {exit 1}} END {exit 0}' id=$missing || ret=1
++   awk '{if ($1 == "add" && $5 == "RRSIG" && $12 == id) {ok=1}} END {exit ok?0:1}' id=$ksk || ret=1
+ n=`expr $n + 1`
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+ status=`expr $status + $ret`
+ 
+-echo_i "checking that expired RRSIGs from inactive key are not deleted ($n)"
++inactive=$(keyfile_to_key_id "$(cat inaczsk-zsk.key)")
++ksk=$(keyfile_to_key_id "$(cat inaczsk-ksk.key)")
++echo_i "checking that expired RRSIGs from inactive ZSK $inactive are replaced ($n)"
+ ret=0
+-inactive=$(keyfile_to_key_id "$(cat inactivezsk.key)")
+ $JOURNALPRINT ns3/inaczsk.example.db.jnl | \
+-   awk '{if ($1 == "del" && $5 == "RRSIG" && $12 == id) {exit 1}} END {exit 0}' id=$inactive || ret=1
++   awk '{if ($1 == "del" && $5 == "RRSIG" && $12 == id) {ok=1}} END {exit ok?0:1}' id=$inactive || ret=1
++$JOURNALPRINT ns3/inaczsk.example.db.jnl | \
++   awk '{if ($1 == "add" && $5 == "RRSIG" && $12 == id) {ok=1}} END {exit ok?0:1}' id=$ksk || ret=1
+ n=`expr $n + 1`
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+ status=`expr $status + $ret`
+ 
+-echo_i "checking that non-replaceable RRSIGs are logged only once (missing private key) ($n)"
++echo_i "checking that replaced RRSIGs are not logged (missing ZSK private key) ($n)"
+ ret=0
+ loglines=`grep "Key nozsk.example/NSEC3RSASHA1/$missing .* retaining signatures" ns3/named.run | wc -l`
+-[ "$loglines" -eq 1 ] || ret=1
++[ "$loglines" -eq 0 ] || ret=1
+ n=`expr $n + 1`
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+ status=`expr $status + $ret`
+ 
+-echo_i "checking that non-replaceable RRSIGs are logged only once (inactive private key) ($n)"
++echo_i "checking that replaced RRSIGs are not logged (inactive ZSK private key) ($n)"
+ ret=0
+ loglines=`grep "Key inaczsk.example/NSEC3RSASHA1/$inactive .* retaining signatures" ns3/named.run | wc -l`
+-[ "$loglines" -eq 1 ] || ret=1
++[ "$loglines" -eq 0 ] || ret=1
+ n=`expr $n + 1`
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+ status=`expr $status + $ret`
+-- 
+2.23.0
+
diff --git a/backport-0008-On-shutdown-return-ISC_R_SHUTTINGDOWN-from-isc_taskm.patch b/backport-0008-On-shutdown-return-ISC_R_SHUTTINGDOWN-from-isc_taskm.patch
new file mode 100644
index 0000000000000000000000000000000000000000..99215cdfe3315c881536407a6461089663e4b362
--- /dev/null
+++ b/backport-0008-On-shutdown-return-ISC_R_SHUTTINGDOWN-from-isc_taskm.patch
@@ -0,0 +1,46 @@
+From 9ec7d78d164991b668cd50371ffe8f9b7b4b5ac3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Wed, 5 Jan 2022 11:48:22 +0100
+Subject: [PATCH] On shutdown, return ISC_R_SHUTTINGDOWN from
+ isc_taskmgr_excltask()
+
+The isc_taskmgr_excltask() would return ISC_R_NOTFOUND either when the
+exclusive task was not set (yet) or when the taskmgr is shutting down
+and the exclusive task has been already cleared.
+
+Distinguish between the two states and return ISC_R_SHUTTINGDOWN when
+the taskmgr is being shut down instead of ISC_R_NOTFOUND.
+
+(cherry picked from commit f9d90159b84831fd83d74594827fedf0f4e9e265)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/9ec7d78d164991b668cd50371ffe8f9b7b4b5ac3
+---
+ lib/isc/task.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lib/isc/task.c b/lib/isc/task.c
+index 2c0d89c2b9..3e894f8dab 100644
+--- a/lib/isc/task.c
++++ b/lib/isc/task.c
+@@ -1130,7 +1130,7 @@ isc_taskmgr_setexcltask(isc_taskmgr_t *mgr, isc_task_t *task) {
+ 
+ isc_result_t
+ isc_taskmgr_excltask(isc_taskmgr_t *mgr, isc_task_t **taskp) {
+-	isc_result_t result = ISC_R_SUCCESS;
++	isc_result_t result;
+ 
+ 	REQUIRE(VALID_MANAGER(mgr));
+ 	REQUIRE(taskp != NULL && *taskp == NULL);
+@@ -1138,6 +1138,9 @@ isc_taskmgr_excltask(isc_taskmgr_t *mgr, isc_task_t **taskp) {
+ 	LOCK(&mgr->excl_lock);
+ 	if (mgr->excl != NULL) {
+ 		isc_task_attach(mgr->excl, taskp);
++		result = ISC_R_SUCCESS;
++	} else if (atomic_load_relaxed(&mgr->exiting)) {
++		result = ISC_R_SHUTTINGDOWN;
+ 	} else {
+ 		result = ISC_R_NOTFOUND;
+ 	}
+-- 
+2.23.0
+
diff --git a/backport-0009-Remove-taskmgr-excl_lock-fix-the-locking-for-taskmgr.patch b/backport-0009-Remove-taskmgr-excl_lock-fix-the-locking-for-taskmgr.patch
new file mode 100644
index 0000000000000000000000000000000000000000..080bdb84a9ed852f7efcb0d198f41d899d97181c
--- /dev/null
+++ b/backport-0009-Remove-taskmgr-excl_lock-fix-the-locking-for-taskmgr.patch
@@ -0,0 +1,179 @@
+From 5be356760dd6855944234980f2fc0f13130267fb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Wed, 5 Jan 2022 13:06:37 +0100
+Subject: [PATCH] Remove taskmgr->excl_lock, fix the locking for
+ taskmgr->exiting
+
+While doing code review, it was found that the taskmgr->exiting is set
+under taskmgr->lock, but accessed under taskmgr->excl_lock in the
+isc_task_beginexclusive().
+
+Additionally, before the change that moved running the tasks to the
+netmgr, the task_ready() subrouting of isc_task_detach() would lock
+mgr->lock, requiring the mgr->excl to be protected mgr->excl_lock
+to prevent deadlock in the code.  After !4918 has been merged, this is
+no longer true, and we can remove taskmgr->excl_lock and use
+taskmgr->lock in its stead.
+
+Solve both issues by removing the taskmgr->excl_lock and exclusively use
+taskmgr->lock to protect both taskmgr->excl and taskmgr->exiting which
+now doesn't need to be atomic_bool, because it's always accessed from
+within the locked section.
+
+(cherry picked from commit e705f213cac8a79e1fa8c20ce20f2e7a28daf3f9)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/5be356760dd6855944234980f2fc0f13130267fb
+---
+ lib/isc/task.c | 54 ++++++++++++++++----------------------------------
+ 1 file changed, 17 insertions(+), 37 deletions(-)
+
+diff --git a/lib/isc/task.c b/lib/isc/task.c
+index 3e894f8dab..caf2c06c47 100644
+--- a/lib/isc/task.c
++++ b/lib/isc/task.c
+@@ -140,14 +140,7 @@ struct isc_taskmgr {
+ 	LIST(isc_task_t) tasks;
+ 	atomic_uint_fast32_t mode;
+ 	atomic_bool exclusive_req;
+-	atomic_bool exiting;
+-
+-	/*
+-	 * Multiple threads can read/write 'excl' at the same time, so we need
+-	 * to protect the access.  We can't use 'lock' since isc_task_detach()
+-	 * will try to acquire it.
+-	 */
+-	isc_mutex_t excl_lock;
++	bool exiting;
+ 	isc_task_t *excl;
+ };
+ 
+@@ -254,13 +247,11 @@ isc_task_create_bound(isc_taskmgr_t *manager, unsigned int quantum,
+ 	INIT_LINK(task, link);
+ 	task->magic = TASK_MAGIC;
+ 
+-	exiting = false;
+ 	LOCK(&manager->lock);
+-	if (!atomic_load_relaxed(&manager->exiting)) {
++	exiting = manager->exiting;
++	if (!exiting) {
+ 		APPEND(manager->tasks, task, link);
+ 		atomic_fetch_add(&manager->tasks_count, 1);
+-	} else {
+-		exiting = true;
+ 	}
+ 	UNLOCK(&manager->lock);
+ 
+@@ -956,7 +947,6 @@ manager_free(isc_taskmgr_t *manager) {
+ 	isc_nm_detach(&manager->netmgr);
+ 
+ 	isc_mutex_destroy(&manager->lock);
+-	isc_mutex_destroy(&manager->excl_lock);
+ 	manager->magic = 0;
+ 	isc_mem_putanddetach(&manager->mctx, manager, sizeof(*manager));
+ }
+@@ -1000,7 +990,6 @@ isc__taskmgr_create(isc_mem_t *mctx, unsigned int default_quantum, isc_nm_t *nm,
+ 	*manager = (isc_taskmgr_t){ .magic = TASK_MANAGER_MAGIC };
+ 
+ 	isc_mutex_init(&manager->lock);
+-	isc_mutex_init(&manager->excl_lock);
+ 
+ 	if (default_quantum == 0) {
+ 		default_quantum = DEFAULT_DEFAULT_QUANTUM;
+@@ -1012,7 +1001,6 @@ isc__taskmgr_create(isc_mem_t *mctx, unsigned int default_quantum, isc_nm_t *nm,
+ 	}
+ 
+ 	INIT_LIST(manager->tasks);
+-	atomic_init(&manager->exiting, false);
+ 	atomic_init(&manager->mode, isc_taskmgrmode_normal);
+ 	atomic_init(&manager->exclusive_req, false);
+ 	atomic_init(&manager->tasks_count, 0);
+@@ -1041,15 +1029,6 @@ isc__taskmgr_shutdown(isc_taskmgr_t *manager) {
+ 	 * that the startup thread is sleeping on.
+ 	 */
+ 
+-	/*
+-	 * Detach the exclusive task before acquiring the manager lock
+-	 */
+-	LOCK(&manager->excl_lock);
+-	if (manager->excl != NULL) {
+-		isc_task_detach((isc_task_t **)&manager->excl);
+-	}
+-	UNLOCK(&manager->excl_lock);
+-
+ 	/*
+ 	 * Unlike elsewhere, we're going to hold this lock a long time.
+ 	 * We need to do so, because otherwise the list of tasks could
+@@ -1058,14 +1037,16 @@ isc__taskmgr_shutdown(isc_taskmgr_t *manager) {
+ 	 * This is also the only function where we will hold both the
+ 	 * task manager lock and a task lock at the same time.
+ 	 */
+-
+ 	LOCK(&manager->lock);
++	if (manager->excl != NULL) {
++		isc_task_detach((isc_task_t **)&manager->excl);
++	}
+ 
+ 	/*
+ 	 * Make sure we only get called once.
+ 	 */
+-	INSIST(atomic_compare_exchange_strong(&manager->exiting,
+-					      &(bool){ false }, true));
++	INSIST(manager->exiting == false);
++	manager->exiting = true;
+ 
+ 	/*
+ 	 * Post shutdown event(s) to every task (if they haven't already been
+@@ -1120,12 +1101,12 @@ isc_taskmgr_setexcltask(isc_taskmgr_t *mgr, isc_task_t *task) {
+ 	REQUIRE(task->threadid == 0);
+ 	UNLOCK(&task->lock);
+ 
+-	LOCK(&mgr->excl_lock);
++	LOCK(&mgr->lock);
+ 	if (mgr->excl != NULL) {
+ 		isc_task_detach(&mgr->excl);
+ 	}
+ 	isc_task_attach(task, &mgr->excl);
+-	UNLOCK(&mgr->excl_lock);
++	UNLOCK(&mgr->lock);
+ }
+ 
+ isc_result_t
+@@ -1135,16 +1116,16 @@ isc_taskmgr_excltask(isc_taskmgr_t *mgr, isc_task_t **taskp) {
+ 	REQUIRE(VALID_MANAGER(mgr));
+ 	REQUIRE(taskp != NULL && *taskp == NULL);
+ 
+-	LOCK(&mgr->excl_lock);
++	LOCK(&mgr->lock);
+ 	if (mgr->excl != NULL) {
+ 		isc_task_attach(mgr->excl, taskp);
+ 		result = ISC_R_SUCCESS;
+-	} else if (atomic_load_relaxed(&mgr->exiting)) {
++	} else if (mgr->exiting) {
+ 		result = ISC_R_SHUTTINGDOWN;
+ 	} else {
+ 		result = ISC_R_NOTFOUND;
+ 	}
+-	UNLOCK(&mgr->excl_lock);
++	UNLOCK(&mgr->lock);
+ 
+ 	return (result);
+ }
+@@ -1159,11 +1140,10 @@ isc_task_beginexclusive(isc_task_t *task) {
+ 
+ 	REQUIRE(task->state == task_state_running);
+ 
+-	LOCK(&manager->excl_lock);
+-	REQUIRE(task == task->manager->excl ||
+-		(atomic_load_relaxed(&task->manager->exiting) &&
+-		 task->manager->excl == NULL));
+-	UNLOCK(&manager->excl_lock);
++	LOCK(&manager->lock);
++	REQUIRE(task == manager->excl ||
++		(manager->exiting && manager->excl == NULL));
++	UNLOCK(&manager->lock);
+ 
+ 	if (!atomic_compare_exchange_strong(&manager->exclusive_req,
+ 					    &(bool){ false }, true))
+-- 
+2.23.0
+
diff --git a/backport-0010-add-UV_ENOTSUP-to-isc___nm_uverr2result.patch b/backport-0010-add-UV_ENOTSUP-to-isc___nm_uverr2result.patch
new file mode 100644
index 0000000000000000000000000000000000000000..09ca63fcca1024585d82123f4bff487a4c58adba
--- /dev/null
+++ b/backport-0010-add-UV_ENOTSUP-to-isc___nm_uverr2result.patch
@@ -0,0 +1,30 @@
+From 464b09a8043e61fb713bd090aac63bf869985248 Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Wed, 12 Jan 2022 10:43:18 -0800
+Subject: [PATCH] add UV_ENOTSUP to isc___nm_uverr2result()
+
+This error code is now mapped to ISC_R_FAMILYNOSUPPORT.
+
+(cherry picked from commit be0bc24c7f7b22d6e42bc73e3c0c978ca3ae3af3)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/464b09a8043e61fb713bd090aac63bf869985248
+---
+ lib/isc/netmgr/uverr2result.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/isc/netmgr/uverr2result.c b/lib/isc/netmgr/uverr2result.c
+index 2a1de20954..5ce953d729 100644
+--- a/lib/isc/netmgr/uverr2result.c
++++ b/lib/isc/netmgr/uverr2result.c
+@@ -89,6 +89,8 @@ isc___nm_uverr2result(int uverr, bool dolog, const char *file,
+ 		return (ISC_R_EOF);
+ 	case UV_EMSGSIZE:
+ 		return (ISC_R_MAXSIZE);
++	case UV_ENOTSUP:
++		return (ISC_R_FAMILYNOSUPPORT);
+ 	default:
+ 		if (dolog) {
+ 			UNEXPECTED_ERROR(
+-- 
+2.23.0
+
diff --git a/backport-0011-rndc-add-an-extra-task-reference.patch b/backport-0011-rndc-add-an-extra-task-reference.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f23c615ba59995f9d9a582bca9310fdff0e2e6f1
--- /dev/null
+++ b/backport-0011-rndc-add-an-extra-task-reference.patch
@@ -0,0 +1,56 @@
+From 075722f8a2ff30396b0b920d4665c1c75dc5f1ba Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Wed, 19 Jan 2022 11:05:00 -0800
+Subject: [PATCH] rndc: add an extra task reference
+
+adding an extra task before launching the rndc app prevents
+a use-after-free when task events fire after the app has been
+shut down by a signal.
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/075722f8a2ff30396b0b920d4665c1c75dc5f1ba
+---
+ bin/rndc/rndc.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
+index 1e74b9b033..6ce9d252f4 100644
+--- a/bin/rndc/rndc.c
++++ b/bin/rndc/rndc.c
+@@ -292,8 +292,6 @@ static void
+ rndc_senddone(isc_task_t *task, isc_event_t *event) {
+ 	isc_socketevent_t *sevent = (isc_socketevent_t *)event;
+ 
+-	UNUSED(task);
+-
+ 	if (sevent->result != ISC_R_SUCCESS) {
+ 		fatal("send failed: %s", isc_result_totext(sevent->result));
+ 	}
+@@ -302,7 +300,7 @@ rndc_senddone(isc_task_t *task, isc_event_t *event) {
+ 	    atomic_load_acquire(&recvs) == 0)
+ 	{
+ 		isc_socket_detach(&sock);
+-		isc_task_shutdown(task);
++		isc_task_detach(&task);
+ 		isc_app_shutdown();
+ 	}
+ }
+@@ -378,7 +376,7 @@ rndc_recvdone(isc_task_t *task, isc_event_t *event) {
+ 	if (atomic_load_acquire(&sends) == 0 &&
+ 	    atomic_load_acquire(&recvs) == 0) {
+ 		isc_socket_detach(&sock);
+-		isc_task_shutdown(task);
++		isc_task_detach(&task);
+ 		isc_app_shutdown();
+ 	}
+ }
+@@ -1058,6 +1056,7 @@ main(int argc, char **argv) {
+ 		get_addresses(servername, (in_port_t)remoteport);
+ 	}
+ 
++	isc_task_attach(task, &(isc_task_t *){ NULL });
+ 	DO("post event", isc_app_onrun(rndc_mctx, task, rndc_start, NULL));
+ 
+ 	result = isc_app_run();
+-- 
+2.23.0
+
diff --git a/backport-0012-Add-a-system-test-for-view-reverting-after-a-failed-.patch b/backport-0012-Add-a-system-test-for-view-reverting-after-a-failed-.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f00db1736c180fa8862094be6d420b91b88ea556
--- /dev/null
+++ b/backport-0012-Add-a-system-test-for-view-reverting-after-a-failed-.patch
@@ -0,0 +1,83 @@
+From 094e416fff2c2c2d0f0d83d4201860e52e65d0ac Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Wed, 29 Dec 2021 09:07:03 +0000
+Subject: [PATCH] Add a system test for view reverting after a failed
+ reconfiguration
+
+Test the view reverting code by introducing a faulty dlz configuration
+in named.conf and using `rndc reconfig` to check if named handles the
+situation correctly.
+
+We use "dlz" because the dlz processing code is located in an ideal
+place in the view configuration function for the test to cover the
+view reverting code.
+
+This test is specifically added to the catz system test to additionally
+cover the catz reconfiguration during the mentioned failed
+reconfiguration attempt.
+
+(cherry picked from commit 62337d433f233506d340acdedb7d46bdc0dd662f)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/094e416fff2c2c2d0f0d83d4201860e52e65d0ac
+---
+ bin/tests/system/catz/ns2/named1.conf.in |  8 ++++++++
+ bin/tests/system/catz/tests.sh           | 24 ++++++++++++++++++++++++
+ 2 files changed, 32 insertions(+)
+
+diff --git a/bin/tests/system/catz/ns2/named1.conf.in b/bin/tests/system/catz/ns2/named1.conf.in
+index 7c5f8c2835..8519802bb0 100644
+--- a/bin/tests/system/catz/ns2/named1.conf.in
++++ b/bin/tests/system/catz/ns2/named1.conf.in
+@@ -46,6 +46,14 @@ options {
+ 	};
+ };
+ 
++# A faulty dlz configuration to check if named and catz survive a certain class
++# of failed configuration attempts (see GL#3060).
++# We use "dlz" because the dlz processing code is located in an ideal place in
++# the view configuration function for the test to cover the view reverting code.
++#T3dlz "bad-dlz" {
++#T3	database "dlopen bad-dlz.so example.org";
++#T3};
++
+ zone "catalog1.example" {
+ 	type secondary;
+ 	file "catalog1.example.db";
+diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh
+index f217103d8f..2f50740374 100644
+--- a/bin/tests/system/catz/tests.sh
++++ b/bin/tests/system/catz/tests.sh
+@@ -370,6 +370,30 @@ wait_for_soa @10.53.0.2 dom3.example. dig.out.test$n || ret=1
+ if [ $ret -ne 0 ]; then echo_i "failed"; fi
+ status=$((status+ret))
+ 
++n=$((n+1))
++echo_i "reconfiguring secondary - checking if catz survives a certain class of failed reconfiguration attempts ($n)"
++ret=0
++sed -e "s/^#T3//" < ns2/named1.conf.in > ns2/named.conf.tmp
++copy_setports ns2/named.conf.tmp ns2/named.conf
++$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
++if [ $ret -ne 0 ]; then echo_i "failed"; fi
++status=$((status+ret))
++
++n=$((n+1))
++echo_i "checking again that dom3.example. is served by secondary ($n)"
++ret=0
++wait_for_soa @10.53.0.2 dom3.example. dig.out.test$n || ret=1
++if [ $ret -ne 0 ]; then echo_i "failed"; fi
++status=$((status+ret))
++
++n=$((n+1))
++echo_i "reconfiguring secondary - reverting the bad configuration ($n)"
++ret=0
++copy_setports ns2/named1.conf.in ns2/named.conf
++rndccmd 10.53.0.2 reconfig || ret=1
++if [ $ret -ne 0 ]; then echo_i "failed"; fi
++status=$((status+ret))
++
+ n=$((n+1))
+ echo_i "removing all records from catalog1 zone ($n)"
+ ret=0
+-- 
+2.23.0
+
diff --git a/backport-0012-Fix-a-memory-leak-in-dns_dlzcreate.patch b/backport-0012-Fix-a-memory-leak-in-dns_dlzcreate.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4137d7a061d14ad427c0c9b80e1b713eae9a607c
--- /dev/null
+++ b/backport-0012-Fix-a-memory-leak-in-dns_dlzcreate.patch
@@ -0,0 +1,33 @@
+From 254cabb558cc6152ae892d2a71e65f7cedbd1a38 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Tue, 4 Jan 2022 18:49:20 +0000
+Subject: [PATCH] Fix a memory leak in dns_dlzcreate()
+
+dns_dlzcreate() fails to free the memory allocated for dlzname
+when an error occurs.
+
+Free dlzname's memory (acquired earlier with isc_mem_strdup())
+by calling isc_mem_free() before returning an error code.
+
+(cherry picked from commit 4a6c66288ff831a3450e6472605d3ef8d668eac7)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/254cabb558cc6152ae892d2a71e65f7cedbd1a38
+---
+ lib/dns/dlz.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/dns/dlz.c b/lib/dns/dlz.c
+index cc0b17e5d2..20e3f545bf 100644
+--- a/lib/dns/dlz.c
++++ b/lib/dns/dlz.c
+@@ -230,6 +230,7 @@ dns_dlzcreate(isc_mem_t *mctx, const char *dlzname, const char *drivername,
+ 
+ 	/* impinfo->methods->create failed. */
+ 	RWUNLOCK(&dlz_implock, isc_rwlocktype_read);
++	isc_mem_free(mctx, db->dlzname);
+ 	isc_mem_put(mctx, db, sizeof(dns_dlzdb_t));
+ 	return (result);
+ }
+-- 
+2.23.0
+
diff --git a/backport-0012-Fix-invalid-control-port-number-in-the-catz-system-t.patch b/backport-0012-Fix-invalid-control-port-number-in-the-catz-system-t.patch
new file mode 100644
index 0000000000000000000000000000000000000000..65a19e4374a0357bb26f3a69562734dc4b3ded56
--- /dev/null
+++ b/backport-0012-Fix-invalid-control-port-number-in-the-catz-system-t.patch
@@ -0,0 +1,51 @@
+From b5735ec37a93d2a660ede2f430d08e7abeaf500b Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Tue, 4 Jan 2022 17:22:32 +0000
+Subject: [PATCH] Fix invalid control port number in the catz system test
+
+When failure is expected, the `rndc` command in the catz system test
+is being called directly instead of using a function, i.e.:
+
+    $RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reconfig \
+        > /dev/null 2>&1 && ret=1
+
+... instead of:
+
+    rndccmd 10.53.0.2 reconfig && ret=1
+
+This is done to suppress messages like "lt-rndc: 'reconfig' failed:
+failure" appearing in the message log of the test, because failure
+is actually expected, and the appearance of that message can be
+confusing.
+
+The port value used in this case is not correct, making the
+`rndc reload` command to fail.  This error was not detected earlier
+only because the failure of the command is actually expected, but
+the failure happens for a "wrong" reason, and the test still passes.
+
+Fix the error by using the existing variable instead of the fixed
+number.
+
+(cherry picked from commit 5f9d4b5db41f074699647cfc3033c6ebba61b72e)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/b5735ec37a93d2a660ede2f430d08e7abeaf500b
+---
+ bin/tests/system/catz/tests.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh
+index 2f50740374..97b7e314b4 100644
+--- a/bin/tests/system/catz/tests.sh
++++ b/bin/tests/system/catz/tests.sh
+@@ -1238,7 +1238,7 @@ echo_i "reconfiguring secondary - removing catalog4 catalog zone, adding non-exi
+ ret=0
+ sed -e "s/^#T2//" < ns2/named1.conf.in > ns2/named.conf.tmp
+ copy_setports ns2/named.conf.tmp ns2/named.conf
+-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reconfig > /dev/null 2>&1 && ret=1
++$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
+ if [ $ret -ne 0 ]; then echo_i "failed"; fi
+ status=$((status+ret))
+ 
+-- 
+2.23.0
+
diff --git a/backport-0012-Improve-the-view-configuration-error-handling-and-re.patch b/backport-0012-Improve-the-view-configuration-error-handling-and-re.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e153eaba77a6cc72427be4c9b4a6645a6e73a5b1
--- /dev/null
+++ b/backport-0012-Improve-the-view-configuration-error-handling-and-re.patch
@@ -0,0 +1,325 @@
+From f555f1d2eb4cf0d0cf2f6aa1203d369aecb7339e Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Tue, 28 Dec 2021 11:51:01 +0000
+Subject: [PATCH] Improve the view configuration error handling and reverting
+ logic
+
+If a view configuration error occurs during a named reconfiguration
+procedure, BIND can end up having twin views (old and new), with some
+zones and internal structures attached to the old one, and others
+attached to the new one, which essentially creates chaos.
+
+Implement some additional view reverting mechanisms to avoid the
+situation described above:
+
+ 1. Revert rpz configuration.
+
+ 2. Revert catz configuration.
+
+ 3. Revert zones to view attachments.
+
+(cherry picked from commit 3697560f048792430640e7f848cdae8547c70d90)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/f555f1d2eb4cf0d0cf2f6aa1203d369aecb7339e
+---
+ bin/named/server.c | 153 +++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 126 insertions(+), 27 deletions(-)
+
+diff --git a/bin/named/server.c b/bin/named/server.c
+index d8993e06b4..721464db8e 100644
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -437,6 +437,10 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
+ 	       cfg_aclconfctx_t *aclconf, bool added, bool old_rpz_ok,
+ 	       bool modify);
+ 
++static void
++configure_zone_setviewcommit(isc_result_t result, const cfg_obj_t *zconfig,
++			     dns_view_t *view);
++
+ static isc_result_t
+ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
+ 		   isc_mem_t *mctx, cfg_aclconfctx_t *actx);
+@@ -2439,7 +2443,7 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element,
+ }
+ 
+ static isc_result_t
+-configure_rpz(dns_view_t *view, const cfg_obj_t **maps,
++configure_rpz(dns_view_t *view, dns_view_t *pview, const cfg_obj_t **maps,
+ 	      const cfg_obj_t *rpz_obj, bool *old_rpz_okp) {
+ 	bool dnsrps_enabled;
+ 	const cfg_listelt_t *zone_element;
+@@ -2453,7 +2457,7 @@ configure_rpz(dns_view_t *view, const cfg_obj_t **maps,
+ 	uint32_t minupdateinterval_default;
+ 	dns_rpz_zones_t *zones;
+ 	const dns_rpz_zones_t *old;
+-	dns_view_t *pview;
++	bool pview_must_detach = false;
+ 	const dns_rpz_zone_t *old_zone;
+ 	isc_result_t result;
+ 	int i;
+@@ -2592,14 +2596,19 @@ configure_rpz(dns_view_t *view, const cfg_obj_t **maps,
+ 		zones->p.nsip_wait_recurse = false;
+ 	}
+ 
+-	pview = NULL;
+-	result = dns_viewlist_find(&named_g_server->viewlist, view->name,
+-				   view->rdclass, &pview);
+-	if (result == ISC_R_SUCCESS) {
++	if (pview != NULL) {
+ 		old = pview->rpzs;
+ 	} else {
+-		old = NULL;
++		result = dns_viewlist_find(&named_g_server->viewlist,
++					   view->name, view->rdclass, &pview);
++		if (result == ISC_R_SUCCESS) {
++			pview_must_detach = true;
++			old = pview->rpzs;
++		} else {
++			old = NULL;
++		}
+ 	}
++
+ 	if (old == NULL) {
+ 		*old_rpz_okp = false;
+ 	} else {
+@@ -2621,7 +2630,7 @@ configure_rpz(dns_view_t *view, const cfg_obj_t **maps,
+ 			add_soa_default, ttl_default, minupdateinterval_default,
+ 			old_zone, old_rpz_okp);
+ 		if (result != ISC_R_SUCCESS) {
+-			if (pview != NULL) {
++			if (pview_must_detach) {
+ 				dns_view_detach(&pview);
+ 			}
+ 			return (result);
+@@ -2658,7 +2667,7 @@ configure_rpz(dns_view_t *view, const cfg_obj_t **maps,
+ 			    view->rpzs->rpz_ver);
+ 	}
+ 
+-	if (pview != NULL) {
++	if (pview_must_detach) {
+ 		dns_view_detach(&pview);
+ 	}
+ 
+@@ -2987,15 +2996,14 @@ catz_modzone(dns_catz_entry_t *entry, dns_catz_zone_t *origin, dns_view_t *view,
+ }
+ 
+ static isc_result_t
+-configure_catz_zone(dns_view_t *view, const cfg_obj_t *config,
+-		    const cfg_listelt_t *element) {
++configure_catz_zone(dns_view_t *view, dns_view_t *pview,
++		    const cfg_obj_t *config, const cfg_listelt_t *element) {
+ 	const cfg_obj_t *catz_obj, *obj;
+ 	dns_catz_zone_t *zone = NULL;
+ 	const char *str;
+ 	isc_result_t result;
+ 	dns_name_t origin;
+ 	dns_catz_options_t *opts;
+-	dns_view_t *pview = NULL;
+ 
+ 	dns_name_init(&origin, NULL);
+ 	catz_obj = cfg_listelt_value(element);
+@@ -3026,9 +3034,7 @@ configure_catz_zone(dns_view_t *view, const cfg_obj_t *config,
+ 	if (result == ISC_R_EXISTS) {
+ 		isc_ht_iter_t *it = NULL;
+ 
+-		result = dns_viewlist_find(&named_g_server->viewlist,
+-					   view->name, view->rdclass, &pview);
+-		RUNTIME_CHECK(result == ISC_R_SUCCESS);
++		RUNTIME_CHECK(pview != NULL);
+ 
+ 		/*
+ 		 * xxxwpk todo: reconfigure the zone!!!!
+@@ -3116,9 +3122,6 @@ configure_catz_zone(dns_view_t *view, const cfg_obj_t *config,
+ 	}
+ 
+ cleanup:
+-	if (pview != NULL) {
+-		dns_view_detach(&pview);
+-	}
+ 	dns_name_free(&origin, view->mctx);
+ 
+ 	return (result);
+@@ -3130,11 +3133,11 @@ static dns_catz_zonemodmethods_t ns_catz_zonemodmethods = {
+ };
+ 
+ static isc_result_t
+-configure_catz(dns_view_t *view, const cfg_obj_t *config,
++configure_catz(dns_view_t *view, dns_view_t *pview, const cfg_obj_t *config,
+ 	       const cfg_obj_t *catz_obj) {
+ 	const cfg_listelt_t *zone_element;
+ 	const dns_catz_zones_t *old = NULL;
+-	dns_view_t *pview = NULL;
++	bool pview_must_detach = false;
+ 	isc_result_t result;
+ 
+ 	/* xxxwpk TODO do it cleaner, once, somewhere */
+@@ -3149,10 +3152,15 @@ configure_catz(dns_view_t *view, const cfg_obj_t *config,
+ 				 view->mctx, named_g_taskmgr,
+ 				 named_g_timermgr));
+ 
+-	result = dns_viewlist_find(&named_g_server->viewlist, view->name,
+-				   view->rdclass, &pview);
+-	if (result == ISC_R_SUCCESS) {
++	if (pview != NULL) {
+ 		old = pview->catzs;
++	} else {
++		result = dns_viewlist_find(&named_g_server->viewlist,
++					   view->name, view->rdclass, &pview);
++		if (result == ISC_R_SUCCESS) {
++			pview_must_detach = true;
++			old = pview->catzs;
++		}
+ 	}
+ 
+ 	if (old != NULL) {
+@@ -3162,7 +3170,7 @@ configure_catz(dns_view_t *view, const cfg_obj_t *config,
+ 	}
+ 
+ 	while (zone_element != NULL) {
+-		CHECK(configure_catz_zone(view, config, zone_element));
++		CHECK(configure_catz_zone(view, pview, config, zone_element));
+ 		zone_element = cfg_list_next(zone_element);
+ 	}
+ 
+@@ -3173,7 +3181,7 @@ configure_catz(dns_view_t *view, const cfg_obj_t *config,
+ 	result = ISC_R_SUCCESS;
+ 
+ cleanup:
+-	if (pview != NULL) {
++	if (pview_must_detach) {
+ 		dns_view_detach(&pview);
+ 	}
+ 
+@@ -3974,6 +3982,9 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
+ 	isc_mem_t *cmctx = NULL, *hmctx = NULL;
+ 	dns_dispatch_t *dispatch4 = NULL;
+ 	dns_dispatch_t *dispatch6 = NULL;
++	bool rpz_configured = false;
++	bool catz_configured = false;
++	bool zones_configured = false;
+ 	bool reused_cache = false;
+ 	bool shared_cache = false;
+ 	int i = 0, j = 0, k = 0;
+@@ -4045,14 +4056,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
+ 	if (view->rdclass == dns_rdataclass_in && need_hints &&
+ 	    named_config_get(maps, "response-policy", &obj) == ISC_R_SUCCESS)
+ 	{
+-		CHECK(configure_rpz(view, maps, obj, &old_rpz_ok));
++		CHECK(configure_rpz(view, NULL, maps, obj, &old_rpz_ok));
++		rpz_configured = true;
+ 	}
+ 
+ 	obj = NULL;
+ 	if (view->rdclass == dns_rdataclass_in && need_hints &&
+ 	    named_config_get(maps, "catalog-zones", &obj) == ISC_R_SUCCESS)
+ 	{
+-		CHECK(configure_catz(view, config, obj));
++		CHECK(configure_catz(view, NULL, config, obj));
++		catz_configured = true;
+ 	}
+ 
+ 	/*
+@@ -4076,6 +4089,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
+ 				     viewlist, kasplist, actx, false,
+ 				     old_rpz_ok, false));
+ 	}
++	zones_configured = true;
+ 
+ 	/*
+ 	 * Check that a master or slave zone was found for each
+@@ -5815,6 +5829,91 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
+ 	result = ISC_R_SUCCESS;
+ 
+ cleanup:
++	/*
++	 * Revert to the old view if there was an error.
++	 */
++	if (result != ISC_R_SUCCESS) {
++		isc_result_t result2;
++
++		result2 = dns_viewlist_find(&named_g_server->viewlist,
++					    view->name, view->rdclass, &pview);
++		if (result2 == ISC_R_SUCCESS) {
++			dns_view_thaw(pview);
++
++			obj = NULL;
++			if (rpz_configured &&
++			    pview->rdclass == dns_rdataclass_in && need_hints &&
++			    named_config_get(maps, "response-policy", &obj) ==
++				    ISC_R_SUCCESS)
++			{
++				/*
++				 * We are swapping the places of the `view` and
++				 * `pview` in the function's parameters list
++				 * because we are reverting the same operation
++				 * done previously in the "correct" order.
++				 */
++				result2 = configure_rpz(pview, view, maps, obj,
++							&old_rpz_ok);
++				if (result2 != ISC_R_SUCCESS) {
++					isc_log_write(named_g_lctx,
++						      NAMED_LOGCATEGORY_GENERAL,
++						      NAMED_LOGMODULE_SERVER,
++						      ISC_LOG_ERROR,
++						      "rpz configuration "
++						      "revert failed for view "
++						      "'%s'",
++						      pview->name);
++				}
++			}
++
++			obj = NULL;
++			if (catz_configured &&
++			    pview->rdclass == dns_rdataclass_in && need_hints &&
++			    named_config_get(maps, "catalog-zones", &obj) ==
++				    ISC_R_SUCCESS)
++			{
++				if (pview->catzs != NULL) {
++					dns_catz_catzs_detach(&pview->catzs);
++				}
++				/*
++				 * We are swapping the places of the `view` and
++				 * `pview` in the function's parameters list
++				 * because we are reverting the same operation
++				 * done previously in the "correct" order.
++				 */
++				result2 = configure_catz(pview, view, config,
++							 obj);
++				if (result2 != ISC_R_SUCCESS) {
++					isc_log_write(named_g_lctx,
++						      NAMED_LOGCATEGORY_GENERAL,
++						      NAMED_LOGMODULE_SERVER,
++						      ISC_LOG_ERROR,
++						      "catz configuration "
++						      "revert failed for view "
++						      "'%s'",
++						      pview->name);
++				}
++			}
++
++			dns_view_freeze(pview);
++		}
++
++		if (pview != NULL) {
++			dns_view_detach(&pview);
++		}
++
++		if (zones_configured) {
++			for (element = cfg_list_first(zonelist);
++			     element != NULL; element = cfg_list_next(element))
++			{
++				const cfg_obj_t *zconfig =
++					cfg_listelt_value(element);
++				configure_zone_setviewcommit(result, zconfig,
++							     view);
++			}
++		}
++	}
++
+ 	if (ntatable != NULL) {
+ 		dns_ntatable_detach(&ntatable);
+ 	}
+-- 
+2.23.0
+
diff --git a/backport-0012-Improve-the-zones-view-reverting-logic-when-a-zone-i.patch b/backport-0012-Improve-the-zones-view-reverting-logic-when-a-zone-i.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c900fb638dc3fa5081e0738319a69b943a55181b
--- /dev/null
+++ b/backport-0012-Improve-the-zones-view-reverting-logic-when-a-zone-i.patch
@@ -0,0 +1,39 @@
+From a663216c0e63bcbf90dc5142f9914bb02edac144 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Tue, 28 Dec 2021 12:08:48 +0000
+Subject: [PATCH] Improve the zones' view reverting logic when a zone is a
+ catalog zone
+
+When a zone is being configured with a new view, the catalog zones
+structure will also be linked to that view. Later on, in case of some
+error, should the zone be reverted to the previous view, the link
+between the catalog zones structure and the view won't be reverted.
+
+Change the dns_zone_setviewrevert() function so it calls
+dns_zone_catz_enable() during a zone revert, which will reset the
+link between `catzs` and view.
+
+(cherry picked from commit 2fd967136ad014f6d7456c1e19e185803f7d99ac)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/a663216c0e63bcbf90dc5142f9914bb02edac144
+---
+ lib/dns/zone.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 9205271574..74ecace4a5 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -1674,6 +1674,9 @@ dns_zone_setviewrevert(dns_zone_t *zone) {
+ 		dns_zone_setview_helper(zone, zone->prev_view);
+ 		dns_view_weakdetach(&zone->prev_view);
+ 	}
++	if (zone->catzs != NULL) {
++		zone_catz_enable(zone, zone->catzs);
++	}
+ 	if (inline_secure(zone)) {
+ 		dns_zone_setviewrevert(zone->raw);
+ 	}
+-- 
+2.23.0
+
diff --git a/backport-0012-Separate-the-locked-parts-of-dns_zone_catz_enable-di.patch b/backport-0012-Separate-the-locked-parts-of-dns_zone_catz_enable-di.patch
new file mode 100644
index 0000000000000000000000000000000000000000..fcdf67524a5b88ec29a7f70d9cb9ffe19a65f088
--- /dev/null
+++ b/backport-0012-Separate-the-locked-parts-of-dns_zone_catz_enable-di.patch
@@ -0,0 +1,85 @@
+From 885e44650b547cff88095d01769e303474582612 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Wed, 5 Jan 2022 09:38:36 +0000
+Subject: [PATCH] Separate the locked parts of dns_zone_catz_enable/disable
+ functions
+
+Separate the locked parts of dns_zone_catz_enable() and
+dns_zone_catz_disable() functions into static functions.  This will
+let us perform those tasks from the other parts of the module while
+the zone is locked, avoiding one pair of additional unlocking and
+locking operations.
+
+(cherry picked from commit 6b937ed5f67a13cf6ad6249380073a6e647d7897)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/885e44650b547cff88095d01769e303474582612
+---
+ lib/dns/zone.c | 28 +++++++++++++++++++++++-----
+ 1 file changed, 23 insertions(+), 5 deletions(-)
+
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 2faf12519e..9205271574 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -871,6 +871,10 @@ static inline void
+ zone_attachdb(dns_zone_t *zone, dns_db_t *db);
+ static inline void
+ zone_detachdb(dns_zone_t *zone);
++static void
++zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs);
++static void
++zone_catz_disable(dns_zone_t *zone);
+ static isc_result_t
+ default_journal(dns_zone_t *zone);
+ static void
+@@ -1930,28 +1934,42 @@ dns_zone_rpz_disable_db(dns_zone_t *zone, dns_db_t *db) {
+ 					     zone->rpzs->zones[zone->rpz_num]);
+ }
+ 
+-void
+-dns_zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs) {
++static void
++zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs) {
+ 	REQUIRE(DNS_ZONE_VALID(zone));
+ 	REQUIRE(catzs != NULL);
+ 
+-	LOCK_ZONE(zone);
+ 	INSIST(zone->catzs == NULL || zone->catzs == catzs);
+ 	dns_catz_catzs_set_view(catzs, zone->view);
+ 	if (zone->catzs == NULL) {
+ 		dns_catz_catzs_attach(catzs, &zone->catzs);
+ 	}
+-	UNLOCK_ZONE(zone);
+ }
+ 
+ void
+-dns_zone_catz_disable(dns_zone_t *zone) {
++dns_zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs) {
+ 	REQUIRE(DNS_ZONE_VALID(zone));
+ 
+ 	LOCK_ZONE(zone);
++	zone_catz_enable(zone, catzs);
++	UNLOCK_ZONE(zone);
++}
++
++static void
++zone_catz_disable(dns_zone_t *zone) {
++	REQUIRE(DNS_ZONE_VALID(zone));
++
+ 	if (zone->catzs != NULL) {
+ 		dns_catz_catzs_detach(&zone->catzs);
+ 	}
++}
++
++void
++dns_zone_catz_disable(dns_zone_t *zone) {
++	REQUIRE(DNS_ZONE_VALID(zone));
++
++	LOCK_ZONE(zone);
++	zone_catz_disable(zone);
+ 	UNLOCK_ZONE(zone);
+ }
+ 
+-- 
+2.27.0
+
diff --git a/backport-0013-Add-log-message-when-hard-quota-is-reached-in-TCP-ac.patch b/backport-0013-Add-log-message-when-hard-quota-is-reached-in-TCP-ac.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5e72dca36eb84ea536c7317a974492a74233a2ca
--- /dev/null
+++ b/backport-0013-Add-log-message-when-hard-quota-is-reached-in-TCP-ac.patch
@@ -0,0 +1,48 @@
+From 00e8bfcdfcb004c7585125b4dddd1de8dcf142ae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Tue, 1 Feb 2022 18:36:12 +0100
+Subject: [PATCH] Add log message when hard quota is reached in TCP accept
+
+When isc_quota_attach_cb() API returns ISC_R_QUOTA (meaning hard quota
+was reached) the accept_connection() would return without logging a
+message about quota reached.
+
+Change the connection callback to log the quota reached message.
+
+(cherry picked from commit 2ae84702ad0482cbbd5da4113b47d63b23ffe386)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/00e8bfcdfcb004c7585125b4dddd1de8dcf142ae
+---
+ lib/isc/netmgr/tcp.c    | 2 +-
+ lib/isc/netmgr/tcpdns.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
+index 05ef8d8cd5..133d6d9e61 100644
+--- a/lib/isc/netmgr/tcp.c
++++ b/lib/isc/netmgr/tcp.c
+@@ -627,7 +627,7 @@ tcp_connection_cb(uv_stream_t *server, int status) {
+ 		if (result == ISC_R_QUOTA) {
+ 			isc__nm_incstats(ssock->mgr,
+ 					 ssock->statsindex[STATID_ACCEPTFAIL]);
+-			return;
++			goto done;
+ 		}
+ 	}
+ 
+diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
+index a1f500b352..38c8c692e1 100644
+--- a/lib/isc/netmgr/tcpdns.c
++++ b/lib/isc/netmgr/tcpdns.c
+@@ -596,7 +596,7 @@ tcpdns_connection_cb(uv_stream_t *server, int status) {
+ 		if (result == ISC_R_QUOTA) {
+ 			isc__nm_incstats(ssock->mgr,
+ 					 ssock->statsindex[STATID_ACCEPTFAIL]);
+-			return;
++			goto done;
+ 		}
+ 	}
+ 
+-- 
+2.23.0
+
diff --git a/backport-0014-Add-TCP-TCPDNS-and-TLSDNS-write-timer.patch b/backport-0014-Add-TCP-TCPDNS-and-TLSDNS-write-timer.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1e124e24ec56c7da5f05b1493927046a2f6573f4
--- /dev/null
+++ b/backport-0014-Add-TCP-TCPDNS-and-TLSDNS-write-timer.patch
@@ -0,0 +1,452 @@
+From 6a88131d034ed58d3f0774721caa1e222fc7c245 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Wed, 9 Feb 2022 11:21:04 +0100
+Subject: [PATCH] Add TCP, TCPDNS and TLSDNS write timer
+
+When the outgoing TCP write buffers are full because the other party is
+not reading the data, the uv_write() could wait indefinitely on the
+uv_loop and never calling the callback.  Add a new write timer that uses
+the `tcp-idle-timeout` value to interrupt the TCP connection when we are
+not able to send data for defined period of time.
+
+(cherry picked from commit 408b3621696e39ac6dfe58be75fad168a37b31ff)
+Conflict: UV_RUNTIME_CHECK to RUNTIME_CHECK
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/6a88131d034ed58d3f0774721caa1e222fc7c245
+---
+ lib/isc/netmgr/netmgr-int.h | 24 ++++++++++++++--
+ lib/isc/netmgr/netmgr.c     | 18 +++++++++++-
+ lib/isc/netmgr/tcp.c        | 51 +++++++++++++++++++++++++++++++--
+ lib/isc/netmgr/tcpdns.c     | 56 ++++++++++++++++++++++++++++++-------
+ lib/isc/netmgr/udp.c        | 32 +++++++++++++++++++--
+ 5 files changed, 162 insertions(+), 19 deletions(-)
+
+diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
+index 6c6cf13..f22ecbc 100644
+--- a/lib/isc/netmgr/netmgr-int.h
++++ b/lib/isc/netmgr/netmgr-int.h
+@@ -753,6 +753,13 @@ struct isc_nmsocket {
+ 	uint64_t read_timeout;
+ 	uint64_t connect_timeout;
+ 
++	/*%
++	 * TCP write timeout timer.
++	 */
++	uv_timer_t write_timer;
++	uint64_t write_timeout;
++	int64_t writes;
++
+ 	/*% outer socket is for 'wrapped' sockets - e.g. tcpdns in tcp */
+ 	isc_nmsocket_t *outer;
+ 
+@@ -1574,9 +1581,22 @@ void
+ isc__nm_failed_read_cb(isc_nmsocket_t *sock, isc_result_t result, bool async);
+ 
+ void
+-isc__nmsocket_connecttimeout_cb(uv_timer_t *timer);
++isc__nm_accept_connection_log(isc_result_t result, bool can_log_quota);
+ 
++/*
++ * Timeout callbacks
++ */
+ void
+-isc__nm_accept_connection_log(isc_result_t result, bool can_log_quota);
++isc__nmsocket_connecttimeout_cb(uv_timer_t *timer);
++void
++isc__nmsocket_readtimeout_cb(uv_timer_t *timer);
++void
++isc__nmsocket_writetimeout_cb(uv_timer_t *timer);
+ 
++/*%<
++ *
++ * Maximum number of simultaneous handles in flight supported for a single
++ * connected TCPDNS socket. This value was chosen arbitrarily, and may be
++ * changed in the future.
++ */
+ #define STREAM_CLIENTS_PER_CONN 23
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index f7acd0c..bbc66cd 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -2000,7 +2000,21 @@ isc__nm_accept_connection_log(isc_result_t result, bool can_log_quota) {
+ 		      isc_result_totext(result));
+ }
+ 
+-static void
++void
++isc__nmsocket_writetimeout_cb(uv_timer_t *timer) {
++	isc_nmsocket_t *sock = uv_handle_get_data((uv_handle_t *)timer);
++
++	int r = uv_timer_stop(&sock->write_timer);
++	UV_RUNTIME_CHECK(uv_timer_stop, r);
++
++	/* The shutdown will be handled in the respective close functions */
++	r = uv_tcp_close_reset(&sock->uv_handle.tcp, NULL);
++	UV_RUNTIME_CHECK(uv_tcp_close_reset, r);
++
++	isc__nmsocket_shutdown(sock);
++}
++
++void
+ isc__nmsocket_readtimeout_cb(uv_timer_t *timer) {
+ 	isc_nmsocket_t *sock = uv_handle_get_data((uv_handle_t *)timer);
+ 
+@@ -2333,6 +2347,8 @@ isc_nmhandle_keepalive(isc_nmhandle_t *handle, bool value) {
+ 		atomic_store(&sock->keepalive, value);
+ 		sock->read_timeout = value ? atomic_load(&sock->mgr->keepalive)
+ 					   : atomic_load(&sock->mgr->idle);
++		sock->write_timeout = value ? atomic_load(&sock->mgr->keepalive)
++					    : atomic_load(&sock->mgr->idle);
+ 		break;
+ 	default:
+ 		/*
+diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
+index 7339f77..e7605de 100644
+--- a/lib/isc/netmgr/tcp.c
++++ b/lib/isc/netmgr/tcp.c
+@@ -142,6 +142,10 @@ tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
++	r = uv_timer_init(&worker->loop, &sock->write_timer);
++	UV_RUNTIME_CHECK(uv_timer_init, r);
++	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
++
+ 	r = uv_tcp_open(&sock->uv_handle.tcp, sock->fd);
+ 	if (r != 0) {
+ 		isc__nm_closesocket(sock->fd);
+@@ -531,6 +535,10 @@ isc__nm_async_tcplisten(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
++	r = uv_timer_init(&worker->loop, &sock->write_timer);
++	UV_RUNTIME_CHECK(uv_timer_init, r);
++	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
++
+ 	LOCK(&sock->parent->lock);
+ 
+ 	r = uv_tcp_open(&sock->uv_handle.tcp, sock->fd);
+@@ -971,6 +979,10 @@ accept_connection(isc_nmsocket_t *ssock, isc_quota_t *quota) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&csock->read_timer, csock);
+ 
++	r = uv_timer_init(&worker->loop, &csock->write_timer);
++	UV_RUNTIME_CHECK(uv_timer_init, r);
++	uv_handle_set_data((uv_handle_t *)&csock->write_timer, csock);
++
+ 	r = uv_accept(&ssock->uv_handle.stream, &csock->uv_handle.stream);
+ 	if (r != 0) {
+ 		result = isc__nm_uverr2result(r);
+@@ -1064,6 +1076,13 @@ isc__nm_tcp_send(isc_nmhandle_t *handle, const isc_region_t *region,
+ 	uvreq->cb.send = cb;
+ 	uvreq->cbarg = cbarg;
+ 
++	if (sock->write_timeout == 0) {
++		sock->write_timeout =
++			(atomic_load(&sock->keepalive)
++				 ? atomic_load(&sock->mgr->keepalive)
++				 : atomic_load(&sock->mgr->idle));
++	}
++
+ 	ievent = isc__nm_get_netievent_tcpsend(sock->mgr, sock, uvreq);
+ 	isc__nm_maybe_enqueue_ievent(&sock->mgr->workers[sock->tid],
+ 				     (isc__netievent_t *)ievent);
+@@ -1074,11 +1093,17 @@ isc__nm_tcp_send(isc_nmhandle_t *handle, const isc_region_t *region,
+ static void
+ tcp_send_cb(uv_write_t *req, int status) {
+ 	isc__nm_uvreq_t *uvreq = (isc__nm_uvreq_t *)req->data;
++
+ 	REQUIRE(VALID_UVREQ(uvreq));
+ 	REQUIRE(VALID_NMHANDLE(uvreq->handle));
+ 
+ 	isc_nmsocket_t *sock = uvreq->sock;
+ 
++	if (--sock->writes == 0) {
++		int r = uv_timer_stop(&sock->write_timer);
++		UV_RUNTIME_CHECK(uv_timer_stop, r);
++	}
++
+ 	if (status < 0) {
+ 		isc__nm_incstats(sock->mgr, sock->statsindex[STATID_SENDFAIL]);
+ 		failed_send_cb(sock, uvreq, isc__nm_uverr2result(status));
+@@ -1122,6 +1147,11 @@ tcp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
+ 		return (ISC_R_CANCELED);
+ 	}
+ 
++	r = uv_timer_start(&sock->write_timer, isc__nmsocket_writetimeout_cb,
++			   sock->write_timeout, 0);
++	UV_RUNTIME_CHECK(uv_timer_start, r);
++	RUNTIME_CHECK(sock->writes++ >= 0);
++
+ 	r = uv_write(&req->uv_req.write, &sock->uv_handle.stream, &req->uvbuf,
+ 		     1, tcp_send_cb);
+ 	if (r < 0) {
+@@ -1185,7 +1215,7 @@ tcp_close_cb(uv_handle_t *handle) {
+ }
+ 
+ static void
+-timer_close_cb(uv_handle_t *handle) {
++read_timer_close_cb(uv_handle_t *handle) {
+ 	isc_nmsocket_t *sock = uv_handle_get_data(handle);
+ 	uv_handle_set_data(handle, NULL);
+ 
+@@ -1198,6 +1228,17 @@ timer_close_cb(uv_handle_t *handle) {
+ 	}
+ }
+ 
++static void
++write_timer_close_cb(uv_handle_t *timer) {
++	isc_nmsocket_t *sock = uv_handle_get_data(timer);
++	uv_handle_set_data(timer, NULL);
++
++	REQUIRE(VALID_NMSOCK(sock));
++
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
++	uv_close((uv_handle_t *)&sock->read_timer, read_timer_close_cb);
++}
++
+ static void
+ stop_tcp_child(isc_nmsocket_t *sock) {
+ 	REQUIRE(sock->type == isc_nm_tcpsocket);
+@@ -1250,6 +1291,8 @@ stop_tcp_parent(isc_nmsocket_t *sock) {
+ 
+ static void
+ tcp_close_direct(isc_nmsocket_t *sock) {
++	int r;
++
+ 	REQUIRE(VALID_NMSOCK(sock));
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 	REQUIRE(atomic_load(&sock->closing));
+@@ -1271,8 +1314,10 @@ tcp_close_direct(isc_nmsocket_t *sock) {
+ 	isc__nmsocket_timer_stop(sock);
+ 	isc__nm_stop_reading(sock);
+ 
+-	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+-	uv_close((uv_handle_t *)&sock->read_timer, timer_close_cb);
++	r = uv_timer_stop(&sock->write_timer);
++	UV_RUNTIME_CHECK(uv_timer_stop, r);
++	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
++	uv_close((uv_handle_t *)&sock->write_timer, write_timer_close_cb);
+ }
+ 
+ void
+diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
+index 7aaaee9..a822aa2 100644
+--- a/lib/isc/netmgr/tcpdns.c
++++ b/lib/isc/netmgr/tcpdns.c
+@@ -35,13 +35,6 @@
+ #include "netmgr-int.h"
+ #include "uv-compat.h"
+ 
+-/*%<
+- *
+- * Maximum number of simultaneous handles in flight supported for a single
+- * connected TCPDNS socket. This value was chosen arbitrarily, and may be
+- * changed in the future.
+- */
+-
+ static atomic_uint_fast32_t last_tcpdnsquota_log = ATOMIC_VAR_INIT(0);
+ 
+ static bool
+@@ -107,6 +100,10 @@ tcpdns_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
++	r = uv_timer_init(&worker->loop, &sock->write_timer);
++	UV_RUNTIME_CHECK(uv_timer_init, r);
++	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
++
+ 	if (isc__nm_closing(sock)) {
+ 		result = ISC_R_CANCELED;
+ 		goto error;
+@@ -500,6 +497,10 @@ isc__nm_async_tcpdnslisten(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
++	r = uv_timer_init(&worker->loop, &sock->write_timer);
++	UV_RUNTIME_CHECK(uv_timer_init, r);
++	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
++
+ 	LOCK(&sock->parent->lock);
+ 
+ 	r = uv_tcp_open(&sock->uv_handle.tcp, sock->fd);
+@@ -945,6 +946,10 @@ accept_connection(isc_nmsocket_t *ssock, isc_quota_t *quota) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&csock->read_timer, csock);
+ 
++	r = uv_timer_init(&worker->loop, &csock->write_timer);
++	UV_RUNTIME_CHECK(uv_timer_init, r);
++	uv_handle_set_data((uv_handle_t *)&csock->write_timer, csock);
++
+ 	r = uv_accept(&ssock->uv_handle.stream, &csock->uv_handle.stream);
+ 	if (r != 0) {
+ 		result = isc__nm_uverr2result(r);
+@@ -1059,6 +1064,13 @@ isc__nm_tcpdns_send(isc_nmhandle_t *handle, isc_region_t *region,
+ 	uvreq->cb.send = cb;
+ 	uvreq->cbarg = cbarg;
+ 
++	if (sock->write_timeout == 0) {
++		sock->write_timeout =
++			(atomic_load(&sock->keepalive)
++				 ? atomic_load(&sock->mgr->keepalive)
++				 : atomic_load(&sock->mgr->idle));
++	}
++
+ 	ievent = isc__nm_get_netievent_tcpdnssend(sock->mgr, sock, uvreq);
+ 	isc__nm_maybe_enqueue_ievent(&sock->mgr->workers[sock->tid],
+ 				     (isc__netievent_t *)ievent);
+@@ -1076,6 +1088,11 @@ tcpdns_send_cb(uv_write_t *req, int status) {
+ 
+ 	sock = uvreq->sock;
+ 
++	if (--sock->writes == 0) {
++		int r = uv_timer_stop(&sock->write_timer);
++		UV_RUNTIME_CHECK(uv_timer_stop, r);
++	}
++
+ 	if (status < 0) {
+ 		isc__nm_incstats(sock->mgr, sock->statsindex[STATID_SENDFAIL]);
+ 		isc__nm_failed_send_cb(sock, uvreq,
+@@ -1140,6 +1157,11 @@ isc__nm_async_tcpdnssend(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 		goto fail;
+ 	}
+ 
++	r = uv_timer_start(&sock->write_timer, isc__nmsocket_writetimeout_cb,
++			   sock->write_timeout, 0);
++	UV_RUNTIME_CHECK(uv_timer_start, r);
++	RUNTIME_CHECK(sock->writes++ >= 0);
++
+ 	r = uv_write(&uvreq->uv_req.write, &sock->uv_handle.stream, bufs, nbufs,
+ 		     tcpdns_send_cb);
+ 	if (r < 0) {
+@@ -1212,7 +1234,7 @@ tcpdns_close_cb(uv_handle_t *handle) {
+ }
+ 
+ static void
+-timer_close_cb(uv_handle_t *timer) {
++read_timer_close_cb(uv_handle_t *timer) {
+ 	isc_nmsocket_t *sock = uv_handle_get_data(timer);
+ 	uv_handle_set_data(timer, NULL);
+ 
+@@ -1227,6 +1249,17 @@ timer_close_cb(uv_handle_t *timer) {
+ 	}
+ }
+ 
++static void
++write_timer_close_cb(uv_handle_t *timer) {
++	isc_nmsocket_t *sock = uv_handle_get_data(timer);
++	uv_handle_set_data(timer, NULL);
++
++	REQUIRE(VALID_NMSOCK(sock));
++
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
++	uv_close((uv_handle_t *)&sock->read_timer, read_timer_close_cb);
++}
++
+ static void
+ stop_tcpdns_child(isc_nmsocket_t *sock) {
+ 	REQUIRE(sock->type == isc_nm_tcpdnssocket);
+@@ -1279,6 +1312,7 @@ stop_tcpdns_parent(isc_nmsocket_t *sock) {
+ 
+ static void
+ tcpdns_close_direct(isc_nmsocket_t *sock) {
++	int r;
+ 	REQUIRE(VALID_NMSOCK(sock));
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 	REQUIRE(atomic_load(&sock->closing));
+@@ -1294,8 +1328,10 @@ tcpdns_close_direct(isc_nmsocket_t *sock) {
+ 	isc__nmsocket_timer_stop(sock);
+ 	isc__nm_stop_reading(sock);
+ 
+-	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+-	uv_close((uv_handle_t *)&sock->read_timer, timer_close_cb);
++	r = uv_timer_stop(&sock->write_timer);
++	UV_RUNTIME_CHECK(uv_timer_stop, r);
++	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
++	uv_close((uv_handle_t *)&sock->write_timer, write_timer_close_cb);
+ }
+ 
+ void
+diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c
+index d33dc4c..d3fffe0 100644
+--- a/lib/isc/netmgr/udp.c
++++ b/lib/isc/netmgr/udp.c
+@@ -46,7 +46,10 @@ static void
+ udp_close_cb(uv_handle_t *handle);
+ 
+ static void
+-timer_close_cb(uv_handle_t *handle);
++read_timer_close_cb(uv_handle_t *handle);
++
++static void
++write_timer_close_cb(uv_handle_t *handle);
+ 
+ static void
+ udp_close_direct(isc_nmsocket_t *sock);
+@@ -230,6 +233,10 @@ isc__nm_async_udplisten(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
++	r = uv_timer_init(&worker->loop, &sock->write_timer);
++	UV_RUNTIME_CHECK(uv_timer_init, r);
++	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
++
+ 	LOCK(&sock->parent->lock);
+ 
+ 	r = uv_udp_open(&sock->uv_handle.udp, sock->fd);
+@@ -628,6 +635,10 @@ udp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
++	r = uv_timer_init(&worker->loop, &sock->write_timer);
++	UV_RUNTIME_CHECK(uv_timer_init, r);
++	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
++
+ 	r = uv_udp_open(&sock->uv_handle.udp, sock->fd);
+ 	if (r != 0) {
+ 		isc__nm_incstats(sock->mgr, sock->statsindex[STATID_OPENFAIL]);
+@@ -972,7 +983,7 @@ udp_close_cb(uv_handle_t *handle) {
+ }
+ 
+ static void
+-timer_close_cb(uv_handle_t *handle) {
++read_timer_close_cb(uv_handle_t *handle) {
+ 	isc_nmsocket_t *sock = uv_handle_get_data(handle);
+ 	uv_handle_set_data(handle, NULL);
+ 
+@@ -983,6 +994,17 @@ timer_close_cb(uv_handle_t *handle) {
+ 	}
+ }
+ 
++static void
++write_timer_close_cb(uv_handle_t *timer) {
++	isc_nmsocket_t *sock = uv_handle_get_data(timer);
++	uv_handle_set_data(timer, NULL);
++
++	REQUIRE(VALID_NMSOCK(sock));
++
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
++	uv_close((uv_handle_t *)&sock->read_timer, read_timer_close_cb);
++}
++
+ static void
+ stop_udp_child(isc_nmsocket_t *sock) {
+ 	REQUIRE(sock->type == isc_nm_udpsocket);
+@@ -1035,10 +1057,14 @@ stop_udp_parent(isc_nmsocket_t *sock) {
+ 
+ static void
+ udp_close_direct(isc_nmsocket_t *sock) {
++	int r;
+ 	REQUIRE(VALID_NMSOCK(sock));
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 
+-	uv_close((uv_handle_t *)&sock->read_timer, timer_close_cb);
++	r = uv_timer_stop(&sock->write_timer);
++	UV_RUNTIME_CHECK(uv_timer_stop, r);
++	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
++	uv_close((uv_handle_t *)&sock->write_timer, write_timer_close_cb);
+ }
+ 
+ void
+-- 
+2.27.0
+
diff --git a/backport-0014-Add-TCP-write-timeout-system-test.patch b/backport-0014-Add-TCP-write-timeout-system-test.patch
new file mode 100644
index 0000000000000000000000000000000000000000..824523e94297a157b27adb9afe2da22913a4fb6b
--- /dev/null
+++ b/backport-0014-Add-TCP-write-timeout-system-test.patch
@@ -0,0 +1,102 @@
+From 260b4c02cf3540e4a71b22f573958da24d89c7a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Wed, 9 Feb 2022 12:46:29 +0100
+Subject: [PATCH] Add TCP write timeout system test
+
+Extend the timeouts system test that bursts the queries for large TXT
+record and never read any responses back filling up the server TCP write
+buffer.  The test should work with the default wmem_max value on
+Linux (208k).
+
+(cherry picked from commit b735182ae0912759f5576557ade7660f4ea9c949)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/260b4c02cf3540e4a71b22f573958da24d89c7a2
+---
+ bin/tests/system/timeouts/setup.sh     |  5 ++++
+ bin/tests/system/timeouts/tests-tcp.py | 36 +++++++++++++++++++++++---
+ 2 files changed, 38 insertions(+), 3 deletions(-)
+
+diff --git a/bin/tests/system/timeouts/setup.sh b/bin/tests/system/timeouts/setup.sh
+index 2e8fd6a6ba..c4019d2a27 100644
+--- a/bin/tests/system/timeouts/setup.sh
++++ b/bin/tests/system/timeouts/setup.sh
+@@ -20,6 +20,11 @@ copy_setports ns1/named.conf.in ns1/named.conf
+ # tcp-initial-timeout interval
+ #
+ $PYTHON -c "
++print('large IN TXT', end=' ')
++for a in range(128):
++    print('\"%s\"' % ('A' * 240), end=' ')
++print('')
++
+ for a in range(150000):
+     print('%s IN NS a' % (a))
+     print('%s IN NS b' % (a))" > ns1/large.db
+diff --git a/bin/tests/system/timeouts/tests-tcp.py b/bin/tests/system/timeouts/tests-tcp.py
+index 2c5e99cc1c..e1f19608c8 100644
+--- a/bin/tests/system/timeouts/tests-tcp.py
++++ b/bin/tests/system/timeouts/tests-tcp.py
+@@ -51,7 +51,7 @@ def test_initial_timeout(port):
+             try:
+                 (sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
+                 (response, rtime) = dns.query.receive_tcp(sock, timeout())
+-            except ConnectionResetError as e:
++            except ConnectionError as e:
+                 raise EOFError from e
+ 
+ 
+@@ -83,7 +83,7 @@ def test_idle_timeout(port):
+             try:
+                 (sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
+                 (response, rtime) = dns.query.receive_tcp(sock, timeout())
+-            except ConnectionResetError as e:
++            except ConnectionError as e:
+                 raise EOFError from e
+ 
+ 
+@@ -152,7 +152,7 @@ def test_pipelining_timeout(port):
+             try:
+                 (sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
+                 (response, rtime) = dns.query.receive_tcp(sock, timeout())
+-            except ConnectionResetError as e:
++            except ConnectionError as e:
+                 raise EOFError from e
+ 
+ 
+@@ -190,3 +190,33 @@ def test_long_axfr(port):
+             if soa is not None:
+                 break
+         assert soa is not None
++
++
++@pytest.mark.dnspython
++@pytest.mark.dnspython2
++def test_send_timeout(port):
++    import dns.query
++
++    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
++        sock.connect(("10.53.0.1", port))
++
++        # Send and receive single large RDATA over TCP
++        msg = create_msg("large.example.", "TXT")
++        (sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
++        (response, rtime) = dns.query.receive_tcp(sock, timeout())
++
++        # Send and receive 28 large (~32k) DNS queries that should
++        # fill the default maximum 208k TCP send buffer
++        for n in range(28):
++            (sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
++
++        # configure idle interval is 5 seconds, sleep 6 to make sure we are
++        # above the interval
++        time.sleep(6)
++
++        with pytest.raises(EOFError):
++            try:
++                (sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
++                (response, rtime) = dns.query.receive_tcp(sock, timeout())
++            except ConnectionError as e:
++                raise EOFError from e
+-- 
+2.23.0
+
diff --git a/backport-0014-Add-isc_nmhandle_setwritetimeout-function.patch b/backport-0014-Add-isc_nmhandle_setwritetimeout-function.patch
new file mode 100644
index 0000000000000000000000000000000000000000..eee32b9a8ebd9dd097956b4cd54c52c740150b41
--- /dev/null
+++ b/backport-0014-Add-isc_nmhandle_setwritetimeout-function.patch
@@ -0,0 +1,64 @@
+From 1d0f2eb2c495a079101b6f6fd66ff22d95a4ab04 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Wed, 9 Feb 2022 19:48:13 +0100
+Subject: [PATCH] Add isc_nmhandle_setwritetimeout() function
+
+In some situations (unit test and forthcoming XFR timeouts MR), we need
+to modify the write timeout independently of the read timeout.  Add a
+isc_nmhandle_setwritetimeout() function that could be called before
+isc_nm_send() to specify a custom write timeout interval.
+
+(cherry picked from commit a89d9e0fa68b8d915c6a1c416543dd157d8b0b5a)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/1d0f2eb2c495a079101b6f6fd66ff22d95a4ab04
+---
+ lib/isc/include/isc/netmgr.h | 3 +++
+ lib/isc/netmgr/netmgr.c      | 8 ++++++++
+ lib/isc/win32/libisc.def.in  | 1 +
+ 3 files changed, 12 insertions(+)
+
+diff --git a/lib/isc/include/isc/netmgr.h b/lib/isc/include/isc/netmgr.h
+index f8477b0018..39dba1d376 100644
+--- a/lib/isc/include/isc/netmgr.h
++++ b/lib/isc/include/isc/netmgr.h
+@@ -489,3 +489,6 @@ isc__nm_force_tid(int tid);
+  * Force the thread ID to 'tid'. This is STRICTLY for use in unit
+  * tests and should not be used in any production code.
+  */
++
++void
++isc_nmhandle_setwritetimeout(isc_nmhandle_t *handle, uint64_t write_timeout);
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index 6bc8c64337..31917be101 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -639,6 +639,14 @@ isc_nm_maxudp(isc_nm_t *mgr, uint32_t maxudp) {
+ 	atomic_store(&mgr->maxudp, maxudp);
+ }
+ 
++void
++isc_nmhandle_setwritetimeout(isc_nmhandle_t *handle, uint64_t write_timeout) {
++	REQUIRE(VALID_NMHANDLE(handle));
++	REQUIRE(VALID_NMSOCK(handle->sock));
++
++	handle->sock->write_timeout = write_timeout;
++}
++
+ void
+ isc_nm_settimeouts(isc_nm_t *mgr, uint32_t init, uint32_t idle,
+ 		   uint32_t keepalive, uint32_t advertised) {
+diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in
+index de65c63b7d..79e7b64a58 100644
+--- a/lib/isc/win32/libisc.def.in
++++ b/lib/isc/win32/libisc.def.in
+@@ -457,6 +457,7 @@ isc_nmhandle_localaddr
+ isc_nmhandle_peeraddr
+ isc_nmhandle_setdata
+ isc_nmhandle_settimeout
++isc_nmhandle_setwritetimeout
+ isc_nm_attach
+ isc_nm_cancelread
+ isc_nm_detach
+-- 
+2.23.0
+
diff --git a/backport-0014-Rename-sock-timer-to-sock-read_timer.patch b/backport-0014-Rename-sock-timer-to-sock-read_timer.patch
new file mode 100644
index 0000000000000000000000000000000000000000..eecdc8d1c580547fa873c4d3e56b272f5cb38393
--- /dev/null
+++ b/backport-0014-Rename-sock-timer-to-sock-read_timer.patch
@@ -0,0 +1,279 @@
+From eb2463115fcf033b7756c1eeb036696e0595acbd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Wed, 9 Feb 2022 10:59:08 +0100
+Subject: [PATCH] Rename sock->timer to sock->read_timer
+
+Before adding the write timer, we have to remove the generic sock->timer
+to sock->read_timer.  We don't touch the function names to limit the
+impact of the refactoring.
+
+(cherry picked from commit 45a73c113f2982b7171632d75d4bbb51d4e6bb53)
+Conflict: UV_RUNTIME_CHECK to RUNTIME_CHECK
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/eb2463115fcf033b7756c1eeb036696e0595acbd
+---
+ lib/isc/netmgr/netmgr-int.h |  2 +-
+ lib/isc/netmgr/netmgr.c     | 13 +++++++------
+ lib/isc/netmgr/tcp.c        | 23 ++++++++++++-----------
+ lib/isc/netmgr/tcpdns.c     | 20 +++++++++++---------
+ lib/isc/netmgr/udp.c        | 10 +++++-----
+ 5 files changed, 36 insertions(+), 32 deletions(-)
+diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
+index b4299d5..6c6cf13 100644
+--- a/lib/isc/netmgr/netmgr-int.h
++++ b/lib/isc/netmgr/netmgr-int.h
+@@ -749,7 +749,7 @@ struct isc_nmsocket {
+ 	/*%
+ 	 * TCP read/connect timeout timers.
+ 	 */
+-	uv_timer_t timer;
++	uv_timer_t read_timer;
+ 	uint64_t read_timeout;
+ 	uint64_t connect_timeout;
+ 
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index 2867d25..f7acd0c 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -1913,7 +1913,7 @@ isc__nm_failed_connect_cb(isc_nmsocket_t *sock, isc__nm_uvreq_t *req,
+ 	REQUIRE(req->cb.connect != NULL);
+ 
+ 	isc__nmsocket_timer_stop(sock);
+-	uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+ 	INSIST(atomic_compare_exchange_strong(&sock->connecting,
+ 					      &(bool){ true }, false));
+@@ -2036,7 +2036,7 @@ isc__nmsocket_timer_restart(isc_nmsocket_t *sock) {
+ 			return;
+ 		}
+ 
+-		r = uv_timer_start(&sock->timer,
++		r = uv_timer_start(&sock->read_timer,
+ 				   isc__nmsocket_connecttimeout_cb,
+ 				   sock->connect_timeout + 10, 0);
+ 
+@@ -2045,7 +2045,8 @@ isc__nmsocket_timer_restart(isc_nmsocket_t *sock) {
+ 			return;
+ 		}
+ 
+-		r = uv_timer_start(&sock->timer, isc__nmsocket_readtimeout_cb,
++		r = uv_timer_start(&sock->read_timer,
++				   isc__nmsocket_readtimeout_cb,
+ 				   sock->read_timeout, 0);
+ 	}
+ 
+@@ -2056,7 +2057,7 @@ bool
+ isc__nmsocket_timer_running(isc_nmsocket_t *sock) {
+ 	REQUIRE(VALID_NMSOCK(sock));
+ 
+-	return (uv_is_active((uv_handle_t *)&sock->timer));
++	return (uv_is_active((uv_handle_t *)&sock->read_timer));
+ }
+ 
+ void
+@@ -2076,7 +2077,7 @@ isc__nmsocket_timer_stop(isc_nmsocket_t *sock) {
+ 
+ 	/* uv_timer_stop() is idempotent, no need to check if running */
+ 
+-	int r = uv_timer_stop(&sock->timer);
++	int r = uv_timer_stop(&sock->read_timer);
+ 	RUNTIME_CHECK(r == 0);
+ }
+ 
+@@ -2299,7 +2300,7 @@ isc_nmhandle_cleartimeout(isc_nmhandle_t *handle) {
+ 	default:
+ 		handle->sock->read_timeout = 0;
+ 
+-		if (uv_is_active((uv_handle_t *)&handle->sock->timer)) {
++		if (uv_is_active((uv_handle_t *)&handle->sock->read_timer)) {
+ 			isc__nmsocket_timer_stop(handle->sock);
+ 		}
+ 	}
+diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
+index 1ac7808..7339f77 100644
+--- a/lib/isc/netmgr/tcp.c
++++ b/lib/isc/netmgr/tcp.c
+@@ -138,8 +138,9 @@ tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data(&sock->uv_handle.handle, sock);
+ 
+-	r = uv_timer_init(&worker->loop, &sock->timer);
++	r = uv_timer_init(&worker->loop, &sock->read_timer);
+ 	RUNTIME_CHECK(r == 0);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+ 	r = uv_tcp_open(&sock->uv_handle.tcp, sock->fd);
+ 	if (r != 0) {
+@@ -168,7 +169,8 @@ tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
+ 	}
+ 	isc__nm_incstats(sock->mgr, sock->statsindex[STATID_CONNECT]);
+ 
+-	uv_handle_set_data((uv_handle_t *)&sock->timer, &req->uv_req.connect);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer,
++			   &req->uv_req.connect);
+ 	isc__nmsocket_timer_start(sock);
+ 
+ 	atomic_store(&sock->connected, true);
+@@ -229,7 +231,7 @@ tcp_connect_cb(uv_connect_t *uvreq, int status) {
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 
+ 	isc__nmsocket_timer_stop(sock);
+-	uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+ 	if (!atomic_load(&sock->connecting)) {
+ 		return;
+@@ -524,10 +526,10 @@ isc__nm_async_tcplisten(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	/* This keeps the socket alive after everything else is gone */
+ 	isc__nmsocket_attach(sock, &(isc_nmsocket_t *){ NULL });
+ 
+-	r = uv_timer_init(&worker->loop, &sock->timer);
++	r = uv_timer_init(&worker->loop, &sock->read_timer);
+ 	RUNTIME_CHECK(r == 0);
+ 
+-	uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+ 	LOCK(&sock->parent->lock);
+ 
+@@ -965,9 +967,9 @@ accept_connection(isc_nmsocket_t *ssock, isc_quota_t *quota) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data(&csock->uv_handle.handle, csock);
+ 
+-	r = uv_timer_init(&worker->loop, &csock->timer);
++	r = uv_timer_init(&worker->loop, &csock->read_timer);
+ 	RUNTIME_CHECK(r == 0);
+-	uv_handle_set_data((uv_handle_t *)&csock->timer, csock);
++	uv_handle_set_data((uv_handle_t *)&csock->read_timer, csock);
+ 
+ 	r = uv_accept(&ssock->uv_handle.stream, &csock->uv_handle.stream);
+ 	if (r != 0) {
+@@ -1269,8 +1271,8 @@ tcp_close_direct(isc_nmsocket_t *sock) {
+ 	isc__nmsocket_timer_stop(sock);
+ 	isc__nm_stop_reading(sock);
+ 
+-	uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
+-	uv_close((uv_handle_t *)&sock->timer, timer_close_cb);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
++	uv_close((uv_handle_t *)&sock->read_timer, timer_close_cb);
+ }
+ 
+ void
+@@ -1388,7 +1390,7 @@ isc__nm_async_tcpcancel(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 	UNUSED(worker);
+ 
+-	uv_timer_stop(&sock->timer);
++	uv_timer_stop(&sock->read_timer);
+ 
+ 	isc__nm_tcp_failed_read_cb(sock, ISC_R_EOF);
+ }
+diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
+index 7f66da0..7aaaee9 100644
+--- a/lib/isc/netmgr/tcpdns.c
++++ b/lib/isc/netmgr/tcpdns.c
+@@ -103,8 +103,9 @@ tcpdns_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data(&sock->uv_handle.handle, sock);
+ 
+-	r = uv_timer_init(&worker->loop, &sock->timer);
++	r = uv_timer_init(&worker->loop, &sock->read_timer);
+ 	RUNTIME_CHECK(r == 0);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+ 	if (isc__nm_closing(sock)) {
+ 		result = ISC_R_CANCELED;
+@@ -142,7 +143,8 @@ tcpdns_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
+ 	}
+ 	isc__nm_incstats(sock->mgr, sock->statsindex[STATID_CONNECT]);
+ 
+-	uv_handle_set_data((uv_handle_t *)&sock->timer, &req->uv_req.connect);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer,
++			   &req->uv_req.connect);
+ 	isc__nmsocket_timer_start(sock);
+ 
+ 	atomic_store(&sock->connected, true);
+@@ -203,7 +205,7 @@ tcpdns_connect_cb(uv_connect_t *uvreq, int status) {
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 
+ 	isc__nmsocket_timer_stop(sock);
+-	uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+ 	if (!atomic_load(&sock->connecting)) {
+ 		return;
+@@ -494,9 +496,9 @@ isc__nm_async_tcpdnslisten(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	/* This keeps the socket alive after everything else is gone */
+ 	isc__nmsocket_attach(sock, &(isc_nmsocket_t *){ NULL });
+ 
+-	r = uv_timer_init(&worker->loop, &sock->timer);
++	r = uv_timer_init(&worker->loop, &sock->read_timer);
+ 	RUNTIME_CHECK(r == 0);
+-	uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+ 	LOCK(&sock->parent->lock);
+ 
+@@ -939,9 +941,9 @@ accept_connection(isc_nmsocket_t *ssock, isc_quota_t *quota) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data(&csock->uv_handle.handle, csock);
+ 
+-	r = uv_timer_init(&worker->loop, &csock->timer);
++	r = uv_timer_init(&worker->loop, &csock->read_timer);
+ 	RUNTIME_CHECK(r == 0);
+-	uv_handle_set_data((uv_handle_t *)&csock->timer, csock);
++	uv_handle_set_data((uv_handle_t *)&csock->read_timer, csock);
+ 
+ 	r = uv_accept(&ssock->uv_handle.stream, &csock->uv_handle.stream);
+ 	if (r != 0) {
+@@ -1292,8 +1294,8 @@ tcpdns_close_direct(isc_nmsocket_t *sock) {
+ 	isc__nmsocket_timer_stop(sock);
+ 	isc__nm_stop_reading(sock);
+ 
+-	uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
+-	uv_close((uv_handle_t *)&sock->timer, timer_close_cb);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
++	uv_close((uv_handle_t *)&sock->read_timer, timer_close_cb);
+ }
+ 
+ void
+diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c
+index a91c425..d33dc4c 100644
+--- a/lib/isc/netmgr/udp.c
++++ b/lib/isc/netmgr/udp.c
+@@ -226,9 +226,9 @@ isc__nm_async_udplisten(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	/* This keeps the socket alive after everything else is gone */
+ 	isc__nmsocket_attach(sock, &(isc_nmsocket_t *){ NULL });
+ 
+-	r = uv_timer_init(&worker->loop, &sock->timer);
++	r = uv_timer_init(&worker->loop, &sock->read_timer);
+ 	RUNTIME_CHECK(r == 0);
+-	uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+ 	LOCK(&sock->parent->lock);
+ 
+@@ -624,9 +624,9 @@ udp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data(&sock->uv_handle.handle, sock);
+ 
+-	r = uv_timer_init(&worker->loop, &sock->timer);
++	r = uv_timer_init(&worker->loop, &sock->read_timer);
+ 	RUNTIME_CHECK(r == 0);
+-	uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+ 	r = uv_udp_open(&sock->uv_handle.udp, sock->fd);
+ 	if (r != 0) {
+@@ -1038,7 +1038,7 @@ udp_close_direct(isc_nmsocket_t *sock) {
+ 	REQUIRE(VALID_NMSOCK(sock));
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 
+-	uv_close((uv_handle_t *)&sock->timer, timer_close_cb);
++	uv_close((uv_handle_t *)&sock->read_timer, timer_close_cb);
+ }
+ 
+ void
+-- 
+2.27.0
+
diff --git a/backport-0014-Update-writetimeout-to-be-T_IDLE-in-netmgr_test.c.patch b/backport-0014-Update-writetimeout-to-be-T_IDLE-in-netmgr_test.c.patch
new file mode 100644
index 0000000000000000000000000000000000000000..72e73c4a07693914efc6a108380c1adde57f34f7
--- /dev/null
+++ b/backport-0014-Update-writetimeout-to-be-T_IDLE-in-netmgr_test.c.patch
@@ -0,0 +1,40 @@
+From 3f24bd2bce5134a5eaac4136e1d363c567c46a94 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Thu, 10 Feb 2022 08:42:22 +0100
+Subject: [PATCH] Update writetimeout to be T_IDLE in netmgr_test.c
+
+Use the isc_nmhandle_setwritetimeout() function in the netmgr unit test
+to allow more time for writing and reading the responses because some of
+the intervals that are used in the unit tests are really small leaving a
+little room for any delays.
+
+(cherry picked from commit ee359d6ffa701e5f9781ec75622af22736506bdd)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/3f24bd2bce5134a5eaac4136e1d363c567c46a94
+---
+ lib/isc/tests/netmgr_test.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/isc/tests/netmgr_test.c b/lib/isc/tests/netmgr_test.c
+index 41113ab7c8..50890e0ab5 100644
+--- a/lib/isc/tests/netmgr_test.c
++++ b/lib/isc/tests/netmgr_test.c
+@@ -418,6 +418,7 @@ connect_send(isc_nmhandle_t *handle) {
+ 	isc_nmhandle_t *sendhandle = NULL;
+ 	isc_refcount_increment0(&active_csends);
+ 	isc_nmhandle_attach(handle, &sendhandle);
++	isc_nmhandle_setwritetimeout(handle, T_IDLE);
+ 	if (atomic_fetch_sub(&nsends, 1) > 1) {
+ 		isc_nm_send(sendhandle, (isc_region_t *)&send_msg,
+ 			    connect_send_cb, NULL);
+@@ -529,6 +530,7 @@ listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
+ 			isc_nmhandle_t *sendhandle = NULL;
+ 			isc_nmhandle_attach(handle, &sendhandle);
+ 			isc_refcount_increment0(&active_ssends);
++			isc_nmhandle_setwritetimeout(sendhandle, T_IDLE);
+ 			isc_nm_send(sendhandle, (isc_region_t *)&send_msg,
+ 				    listen_send_cb, cbarg);
+ 		}
+-- 
+2.23.0
+
diff --git a/backport-0015-Fix-more-ns_statscounter_recursclients-underflows.patch b/backport-0015-Fix-more-ns_statscounter_recursclients-underflows.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b1bca109a8b759527bc0b7bfc374a9a20b8f0f8f
--- /dev/null
+++ b/backport-0015-Fix-more-ns_statscounter_recursclients-underflows.patch
@@ -0,0 +1,185 @@
+From 60e82835ecc0791b2de5131eeb7c636b000577f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
+Date: Wed, 23 Feb 2022 14:39:11 +0100
+Subject: [PATCH] Fix more ns_statscounter_recursclients underflows
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit aab691d51266f552a7923db32686fb9398b1d255 did not fix all possible
+scenarios in which the ns_statscounter_recursclients counter underflows.
+The solution implemented therein can be ineffective e.g. when CNAME
+chaining happens with prefetching enabled.
+
+Here is an example recursive resolution scenario in which the
+ns_statscounter_recursclients counter can underflow with the current
+logic in effect:
+
+ 1. Query processing starts, the answer is not found in the cache, so
+    recursion is started.  The NS_CLIENTATTR_RECURSING attribute is set.
+    ns_statscounter_recursclients is incremented (Δ = +1).
+
+ 2. Recursion completes, returning a CNAME.  client->recursionquota is
+    non-NULL, so the NS_CLIENTATTR_RECURSING attribute remains set.
+    ns_statscounter_recursclients is decremented (Δ = 0).
+
+ 3. Query processing restarts.
+
+ 4. The current QNAME (the target of the CNAME from step 2) is found in
+    the cache, with a TTL low enough to trigger a prefetch.
+
+ 5. query_prefetch() attaches to client->recursionquota.
+    ns_statscounter_recursclients is not incremented because
+    query_prefetch() does not do that (Δ = 0).
+
+ 6. Query processing restarts.
+
+ 7. The current QNAME (the target of the CNAME from step 4) is not found
+    in the cache, so recursion is started.  client->recursionquota is
+    already attached to (since step 5) and the NS_CLIENTATTR_RECURSING
+    attribute is set (since step 1), so ns_statscounter_recursclients is
+    not incremented (Δ = 0).
+
+ 8. The prefetch from step 5 completes.  client->recursionquota is
+    detached from in prefetch_done().  ns_statscounter_recursclients is
+    not decremented because prefetch_done() does not do that (Δ = 0).
+
+ 9. Recursion for the current QNAME completes.  client->recursionquota
+    is already detached from, i.e. set to NULL (since step 8), and the
+    NS_CLIENTATTR_RECURSING attribute is set (since step 1), so
+    ns_statscounter_recursclients is decremented (Δ = -1).
+
+Another possible scenario is that after step 7, recursion for the target
+of the CNAME from step 4 completes before the prefetch for the CNAME
+itself.  fetch_callback() then notices that client->recursionquota is
+non-NULL and decrements ns_statscounter_recursclients, even though
+client->recursionquota was attached to by query_prefetch() and therefore
+not accompanied by an incrementation of ns_statscounter_recursclients.
+The net result is also an underflow.
+
+Instead of trying to properly handle all possible orderings of events
+set into motion by normal recursion and prefetch-triggered recursion,
+adjust ns_statscounter_recursclients whenever the recursive clients
+quota is successfully attached to or detached from.  Remove the
+NS_CLIENTATTR_RECURSING attribute altogether as its only purpose is made
+obsolete by this change.
+
+(cherry picked from commit f7482b68b9623cad01f21fc8816d84a29183f2d1)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/60e82835ecc0791b2de5131eeb7c636b000577f2
+---
+ lib/ns/include/ns/client.h |  3 +--
+ lib/ns/query.c             | 46 +++++++++++++++-----------------------
+ 2 files changed, 19 insertions(+), 30 deletions(-)
+
+diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h
+index 1fd08633d3..91e8ccf8dc 100644
+--- a/lib/ns/include/ns/client.h
++++ b/lib/ns/include/ns/client.h
+@@ -270,8 +270,7 @@ struct ns_client {
+ #define NS_CLIENTATTR_WANTPAD	   0x08000 /*%< pad reply */
+ #define NS_CLIENTATTR_USEKEEPALIVE 0x10000 /*%< use TCP keepalive */
+ 
+-#define NS_CLIENTATTR_NOSETFC	0x20000 /*%< don't set servfail cache */
+-#define NS_CLIENTATTR_RECURSING 0x40000 /*%< client is recursing */
++#define NS_CLIENTATTR_NOSETFC 0x20000 /*%< don't set servfail cache */
+ 
+ /*
+  * Flag to use with the SERVFAIL cache to indicate
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index 335d877d48..176c552b41 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -2486,6 +2486,8 @@ prefetch_done(isc_task_t *task, isc_event_t *event) {
+ 	 */
+ 	if (client->recursionquota != NULL) {
+ 		isc_quota_detach(&client->recursionquota);
++		ns_stats_decrement(client->sctx->nsstats,
++				   ns_statscounter_recursclients);
+ 	}
+ 
+ 	free_devent(client, &event, &devent);
+@@ -2513,10 +2515,15 @@ query_prefetch(ns_client_t *client, dns_name_t *qname,
+ 	if (client->recursionquota == NULL) {
+ 		result = isc_quota_attach(&client->sctx->recursionquota,
+ 					  &client->recursionquota);
+-		if (result == ISC_R_SOFTQUOTA) {
++		switch (result) {
++		case ISC_R_SUCCESS:
++			ns_stats_increment(client->sctx->nsstats,
++					   ns_statscounter_recursclients);
++			break;
++		case ISC_R_SOFTQUOTA:
+ 			isc_quota_detach(&client->recursionquota);
+-		}
+-		if (result != ISC_R_SUCCESS) {
++			/* FALLTHROUGH */
++		default:
+ 			return;
+ 		}
+ 	}
+@@ -2726,10 +2733,15 @@ query_rpzfetch(ns_client_t *client, dns_name_t *qname, dns_rdatatype_t type) {
+ 	if (client->recursionquota == NULL) {
+ 		result = isc_quota_attach(&client->sctx->recursionquota,
+ 					  &client->recursionquota);
+-		if (result == ISC_R_SOFTQUOTA) {
++		switch (result) {
++		case ISC_R_SUCCESS:
++			ns_stats_increment(client->sctx->nsstats,
++					   ns_statscounter_recursclients);
++			break;
++		case ISC_R_SOFTQUOTA:
+ 			isc_quota_detach(&client->recursionquota);
+-		}
+-		if (result != ISC_R_SUCCESS) {
++			/* FALLTHROUGH */
++		default:
+ 			return;
+ 		}
+ 	}
+@@ -6094,15 +6106,6 @@ fetch_callback(isc_task_t *task, isc_event_t *event) {
+ 		isc_quota_detach(&client->recursionquota);
+ 		ns_stats_decrement(client->sctx->nsstats,
+ 				   ns_statscounter_recursclients);
+-	} else if (client->attributes & NS_CLIENTATTR_RECURSING) {
+-		client->attributes &= ~NS_CLIENTATTR_RECURSING;
+-		/*
+-		 * Detached from recursionquota via prefetch_done(),
+-		 * but need to decrement recursive client stats here anyway,
+-		 * since it was incremented in ns_query_recurse().
+-		 */
+-		ns_stats_decrement(client->sctx->nsstats,
+-				   ns_statscounter_recursclients);
+ 	}
+ 
+ 	LOCK(&client->manager->reclock);
+@@ -6268,7 +6271,6 @@ ns_query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname,
+ 		if (result == ISC_R_SUCCESS || result == ISC_R_SOFTQUOTA) {
+ 			ns_stats_increment(client->sctx->nsstats,
+ 					   ns_statscounter_recursclients);
+-			client->attributes |= NS_CLIENTATTR_RECURSING;
+ 		}
+ 
+ 		if (result == ISC_R_SOFTQUOTA) {
+@@ -6323,18 +6325,6 @@ ns_query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname,
+ 
+ 		dns_message_clonebuffer(client->message);
+ 		ns_client_recursing(client);
+-	} else if ((client->attributes & NS_CLIENTATTR_RECURSING) == 0) {
+-		client->attributes |= NS_CLIENTATTR_RECURSING;
+-		/*
+-		 * query_prefetch() attached first to client->recursionquota,
+-		 * but we must check if NS_CLIENTATTR_RECURSING attribute is
+-		 * on, if not then turn it on and increment recursing clients
+-		 * stats counter only once. The attribute is also checked in
+-		 * fetch_callback() to know if a matching decrement to this
+-		 * counter should be applied.
+-		 */
+-		ns_stats_increment(client->sctx->nsstats,
+-				   ns_statscounter_recursclients);
+ 	}
+ 
+ 	/*
+-- 
+2.23.0
+
diff --git a/backport-0016-Properly-free-up-enqueued-netievents-in-nm_destroy.patch b/backport-0016-Properly-free-up-enqueued-netievents-in-nm_destroy.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ad4b4b8b5e43c3a0cf66bba889822ecc5147f331
--- /dev/null
+++ b/backport-0016-Properly-free-up-enqueued-netievents-in-nm_destroy.patch
@@ -0,0 +1,40 @@
+From af2bddc242ae963c89e2f06e5a2587479ceced99 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Wed, 23 Feb 2022 22:04:05 +0100
+Subject: [PATCH] Properly free up enqueued netievents in nm_destroy()
+
+When the isc_netmgr is being destroyed, the normal and priority queues
+should be dequeued and netievents properly freed.  This wasn't the case.
+
+(cherry picked from commit 88418c33729804cc86a9492e3e30f1123f56ddcd)
+Conflict: isc_mem_put to isc_mempool_put
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/af2bddc242ae963c89e2f06e5a2587479ceced99
+---
+ lib/isc/netmgr/netmgr.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index ff5fd0f..6c24d41 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -418,14 +418,14 @@ nm_destroy(isc_nm_t **mgr0) {
+ 
+ 		/* Empty the async event queues */
+ 		while ((ievent = DEQUEUE_PRIORITY_NETIEVENT(worker)) != NULL) {
+-			isc_mempool_put(mgr->evpool, ievent);
++			isc__nm_put_netievent(mgr, ievent);
+ 		}
+ 
+ 		INSIST(DEQUEUE_PRIVILEGED_NETIEVENT(worker) == NULL);
+ 		INSIST(DEQUEUE_TASK_NETIEVENT(worker) == NULL);
+ 
+-		while ((ievent = DEQUEUE_PRIORITY_NETIEVENT(worker)) != NULL) {
+-			isc_mempool_put(mgr->evpool, ievent);
++		while ((ievent = DEQUEUE_NORMAL_NETIEVENT(worker)) != NULL) {
++			isc__nm_put_netievent(mgr, ievent);
+ 		}
+ 		isc_condition_destroy(&worker->cond_prio);
+ 		isc_mutex_destroy(&worker->lock);
+-- 
+2.27.0
+
diff --git a/backport-0017-Delay-isc__nm_uvreq_t-deallocation-to-connection-cal.patch b/backport-0017-Delay-isc__nm_uvreq_t-deallocation-to-connection-cal.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5cfbfa9a5598bb1dbb1522477960c5dc71323d30
--- /dev/null
+++ b/backport-0017-Delay-isc__nm_uvreq_t-deallocation-to-connection-cal.patch
@@ -0,0 +1,139 @@
+From 7b8e265a407db4adc14939acc6a3bbacda86bed1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Tue, 22 Feb 2022 18:12:18 +0100
+Subject: [PATCH] Delay isc__nm_uvreq_t deallocation to connection callback
+
+When the TCP, TCPDNS or TLSDNS connection times out, the isc__nm_uvreq_t
+would be pushed into sock->inactivereqs before the uv_tcp_connect()
+callback finishes.  Because the isc__nmsocket_t keeps the list of
+inactive isc__nm_uvreq_t, this would cause use-after-free only when the
+sock->inactivereqs is full (which could never happen because the failure
+happens in connection timeout callback) or when the sock->inactivereqs
+mechanism is completely removed (f.e. when running under Address or
+Thread Sanitizer).
+
+Delay isc__nm_uvreq_t deallocation to the connection callback and only
+signal the connection callback should be called by shutting down the
+libuv socket from the connection timeout callback.
+
+(cherry picked from commit 326862791689ea7029f381b4afd05c37abbd1fe7)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/7b8e265a407db4adc14939acc6a3bbacda86bed1
+---
+ lib/isc/netmgr/netmgr-int.h |  1 +
+ lib/isc/netmgr/netmgr.c     | 19 ++++++++-----------
+ lib/isc/netmgr/tcp.c        |  9 +++++----
+ lib/isc/netmgr/tcpdns.c     | 11 ++++++-----
+ 4 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
+index 23b197179a..30f4734171 100644
+--- a/lib/isc/netmgr/netmgr-int.h
++++ b/lib/isc/netmgr/netmgr-int.h
+@@ -833,6 +833,7 @@ struct isc_nmsocket {
+ 	atomic_bool connected;
+ 	bool accepting;
+ 	bool reading;
++	atomic_bool timedout;
+ 	isc_refcount_t references;
+ 
+ 	/*%
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index 4bd45e7235..a8e3290f52 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -1509,6 +1509,7 @@ isc___nmsocket_init(isc_nmsocket_t *sock, isc_nm_t *mgr, isc_nmsocket_type type,
+ 	atomic_init(&sock->connecting, false);
+ 	atomic_init(&sock->keepalive, false);
+ 	atomic_init(&sock->connected, false);
++	atomic_init(&sock->timedout, false);
+ 
+ 	atomic_init(&sock->active_child_connections, 0);
+ 
+@@ -1936,18 +1937,14 @@ isc__nmsocket_connecttimeout_cb(uv_timer_t *timer) {
+ 
+ 	isc__nmsocket_timer_stop(sock);
+ 
+-	/* Call the connect callback directly */
+-
+-	req->cb.connect(req->handle, ISC_R_TIMEDOUT, req->cbarg);
++	/*
++	 * Mark the connection as timed out and shutdown the socket.
++	 */
+ 
+-	/* Timer is not running, cleanup and shutdown everything */
+-	if (!isc__nmsocket_timer_running(sock)) {
+-		INSIST(atomic_compare_exchange_strong(&sock->connecting,
+-						      &(bool){ true }, false));
+-		isc__nm_uvreq_put(&req, sock);
+-		isc__nmsocket_clearcb(sock);
+-		isc__nmsocket_shutdown(sock);
+-	}
++	INSIST(atomic_compare_exchange_strong(&sock->timedout, &(bool){ false },
++					      true));
++	isc__nmsocket_clearcb(sock);
++	isc__nmsocket_shutdown(sock);
+ }
+ 
+ void
+diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
+index e562ef2d69..64914c29e3 100644
+--- a/lib/isc/netmgr/tcp.c
++++ b/lib/isc/netmgr/tcp.c
+@@ -239,15 +239,16 @@ tcp_connect_cb(uv_connect_t *uvreq, int status) {
+ 	isc__nmsocket_timer_stop(sock);
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+-	if (!atomic_load(&sock->connecting)) {
+-		return;
+-	}
+-
+ 	req = uv_handle_get_data((uv_handle_t *)uvreq);
+ 
+ 	REQUIRE(VALID_UVREQ(req));
+ 	REQUIRE(VALID_NMHANDLE(req->handle));
+ 
++	if (atomic_load(&sock->timedout)) {
++		result = ISC_R_TIMEDOUT;
++		goto error;
++	}
++
+ 	if (!atomic_load(&sock->connecting)) {
+ 		/*
+ 		 * The connect was cancelled from timeout; just clean up
+diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
+index 61a8e6b710..8fa2a43c5f 100644
+--- a/lib/isc/netmgr/tcpdns.c
++++ b/lib/isc/netmgr/tcpdns.c
+@@ -206,22 +206,23 @@ tcpdns_connect_cb(uv_connect_t *uvreq, int status) {
+ 	isc__nmsocket_timer_stop(sock);
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+-	if (!atomic_load(&sock->connecting)) {
+-		return;
+-	}
+-
+ 	req = uv_handle_get_data((uv_handle_t *)uvreq);
+ 
+ 	REQUIRE(VALID_UVREQ(req));
+ 	REQUIRE(VALID_NMHANDLE(req->handle));
+ 
++	if (atomic_load(&sock->timedout)) {
++		result = ISC_R_TIMEDOUT;
++		goto error;
++	}
++
+ 	if (isc__nmsocket_closing(sock)) {
+ 		/* Socket was closed midflight by isc__nm_tcpdns_shutdown() */
+ 		result = ISC_R_CANCELED;
+ 		goto error;
+ 	} else if (status == UV_ETIMEDOUT) {
+ 		/* Timeout status code here indicates hard error */
+-		result = ISC_R_CANCELED;
++		result = ISC_R_TIMEDOUT;
+ 		goto error;
+ 	} else if (status != 0) {
+ 		result = isc__nm_uverr2result(status);
+-- 
+2.23.0
+
diff --git a/backport-0018-Handle-TCP-sockets-in-isc__nmsocket_reset.patch b/backport-0018-Handle-TCP-sockets-in-isc__nmsocket_reset.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a342e6ea56ed0153ec287b9fce7cbdd893b35d05
--- /dev/null
+++ b/backport-0018-Handle-TCP-sockets-in-isc__nmsocket_reset.patch
@@ -0,0 +1,84 @@
+From ac5952aee8a6dbe38717b637d8476a625d25d91a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Mon, 28 Feb 2022 10:25:06 +0100
+Subject: [PATCH] Handle TCP sockets in isc__nmsocket_reset()
+
+The isc__nmsocket_reset() was missing a case for raw TCP sockets (used
+by RNDC and DoH) which would case a assertion failure when write timeout
+would be triggered.
+
+TCP sockets are now also properly handled in isc__nmsocket_reset().
+
+(cherry picked from commit b220fb32bdb3c70f80b95d3611807deceab2bd55)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/ac5952aee8a6dbe38717b637d8476a625d25d91a
+---
+ lib/isc/netmgr/netmgr.c | 38 +++++++++++++++++++++++++++++++++-----
+ 1 file changed, 33 insertions(+), 5 deletions(-)
+
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index 4829af52f9..b82ae64382 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -218,6 +218,9 @@ isc__nm_work_cb(uv_work_t *req);
+ static void
+ isc__nm_after_work_cb(uv_work_t *req, int status);
+ 
++void
++isc__nmsocket_reset(isc_nmsocket_t *sock);
++
+ /*%<
+  * Issue a 'handle closed' callback on the socket.
+  */
+@@ -1942,11 +1945,7 @@ isc__nmsocket_writetimeout_cb(uv_timer_t *timer) {
+ 	int r = uv_timer_stop(&sock->write_timer);
+ 	UV_RUNTIME_CHECK(uv_timer_stop, r);
+ 
+-	/* The shutdown will be handled in the respective close functions */
+-	r = uv_tcp_close_reset(&sock->uv_handle.tcp, NULL);
+-	UV_RUNTIME_CHECK(uv_tcp_close_reset, r);
+-
+-	isc__nmsocket_shutdown(sock);
++	isc__nmsocket_reset(sock);
+ }
+ 
+ void
+@@ -2674,6 +2673,35 @@ isc__nm_async_detach(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	nmhandle_detach_cb(&ievent->handle FLARG_PASS);
+ }
+ 
++void
++isc__nmsocket_reset(isc_nmsocket_t *sock) {
++	REQUIRE(VALID_NMSOCK(sock));
++
++	switch (sock->type) {
++	case isc_nm_tcpsocket:
++	case isc_nm_tcpdnssocket:
++		/*
++		 * This can be called from the TCP write timeout.
++		 */
++		REQUIRE(sock->parent == NULL);
++		break;
++	default:
++		INSIST(0);
++		ISC_UNREACHABLE();
++		break;
++	}
++
++	if (!uv_is_closing(&sock->uv_handle.handle)) {
++		/*
++		 * The real shutdown will be handled in the respective
++		 * close functions.
++		 */
++		int r = uv_tcp_close_reset(&sock->uv_handle.tcp, NULL);
++		UV_RUNTIME_CHECK(uv_tcp_close_reset, r);
++	}
++	isc__nmsocket_shutdown(sock);
++}
++
+ void
+ isc__nmsocket_shutdown(isc_nmsocket_t *sock) {
+ 	REQUIRE(VALID_NMSOCK(sock));
+-- 
+2.23.0
+
diff --git a/backport-0019-Use-unsigned-arithmetic-when-shifting-by-24.patch b/backport-0019-Use-unsigned-arithmetic-when-shifting-by-24.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c452a6af76e75419fb502c89ebfe5108dcaeb84e
--- /dev/null
+++ b/backport-0019-Use-unsigned-arithmetic-when-shifting-by-24.patch
@@ -0,0 +1,66 @@
+From a247d282bf138eb2fd6474053ea4a648371eb9b0 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Mon, 28 Feb 2022 13:43:20 +1100
+Subject: [PATCH] Use unsigned arithmetic when shifting by 24
+
+By default C promotes short unsigned values to signed int which
+leads to undefined behaviour when the value is shifted by too much.
+Force unsigned arithmetic to be perform by explicitly casting to a
+unsigned type.
+
+(cherry picked from commit b8b99603f117825f409cb2d49bc90ef188749227)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/a247d282bf138eb2fd6474053ea4a648371eb9b0
+---
+ lib/dns/journal.c | 3 ++-
+ lib/dns/rbtdb.c   | 5 +++--
+ lib/dns/soa.c     | 3 ++-
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/lib/dns/journal.c b/lib/dns/journal.c
+index 8e353f1c59..69beef7fbb 100644
+--- a/lib/dns/journal.c
++++ b/lib/dns/journal.c
+@@ -111,7 +111,8 @@ index_to_disk(dns_journal_t *);
+ 
+ static inline uint32_t
+ decode_uint32(unsigned char *p) {
+-	return ((p[0] << 24) + (p[1] << 16) + (p[2] << 8) + (p[3] << 0));
++	return (((uint32_t)p[0] << 24) + ((uint32_t)p[1] << 16) +
++		((uint32_t)p[2] << 8) + ((uint32_t)p[3] << 0));
+ }
+ 
+ static inline void
+diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
+index acb35d22e6..f99d8a6c12 100644
+--- a/lib/dns/rbtdb.c
++++ b/lib/dns/rbtdb.c
+@@ -8974,8 +8974,9 @@ rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
+ #if DNS_RDATASET_FIXED
+ 	if ((rdataset->attributes & DNS_RDATASETATTR_LOADORDER) != 0) {
+ 		unsigned int offset;
+-		offset = (raw[0] << 24) + (raw[1] << 16) + (raw[2] << 8) +
+-			 raw[3];
++		offset = ((unsigned int)raw[0] << 24) +
++			 ((unsigned int)raw[1] << 16) +
++			 ((unsigned int)raw[2] << 8) + (unsigned int)raw[3];
+ 		raw = rdataset->private3;
+ 		raw += offset;
+ 	}
+diff --git a/lib/dns/soa.c b/lib/dns/soa.c
+index d02be34e86..82edfd437e 100644
+--- a/lib/dns/soa.c
++++ b/lib/dns/soa.c
+@@ -25,7 +25,8 @@
+ 
+ static inline uint32_t
+ decode_uint32(unsigned char *p) {
+-	return ((p[0] << 24) + (p[1] << 16) + (p[2] << 8) + (p[3] << 0));
++	return (((uint32_t)p[0] << 24) + ((uint32_t)p[1] << 16) +
++		((uint32_t)p[2] << 8) + ((uint32_t)p[3] << 0));
+ }
+ 
+ static inline void
+-- 
+2.23.0
+
diff --git a/backport-0020-Grow-the-lex-token-buffer-in-one-more-place.patch b/backport-0020-Grow-the-lex-token-buffer-in-one-more-place.patch
new file mode 100644
index 0000000000000000000000000000000000000000..34ebaf64b93b3465c2f8d706aba056d260b3d378
--- /dev/null
+++ b/backport-0020-Grow-the-lex-token-buffer-in-one-more-place.patch
@@ -0,0 +1,48 @@
+From 0b6af23d619e6969c481f51f7360e5a7299be8f5 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Mon, 28 Feb 2022 11:47:56 +1100
+Subject: [PATCH] Grow the lex token buffer in one more place
+
+when parsing key pairs, if the '=' character fell at max_token
+a protective INSIST preventing buffer overrun could be triggered.
+Attempt to grow the buffer immediately before the INSIST.
+
+Also removed an unnecessary INSIST on the opening double quote
+of key buffer pair.
+
+(cherry picked from commit 4c356d277002d3e2f60fe43aaa85a4d524d933f8)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/0b6af23d619e6969c481f51f7360e5a7299be8f5
+---
+ lib/isc/lex.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/lib/isc/lex.c b/lib/isc/lex.c
+index 9546553800..aa9b549f79 100644
+--- a/lib/isc/lex.c
++++ b/lib/isc/lex.c
+@@ -670,6 +670,13 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
+ 		case lexstate_string:
+ 			if (!escaped && c == '=' &&
+ 			    (options & ISC_LEXOPT_VPAIR) != 0) {
++				if (remaining == 0U) {
++					result = grow_data(lex, &remaining,
++							   &curr, &prev);
++					if (result != ISC_R_SUCCESS) {
++						goto done;
++					}
++				}
+ 				INSIST(remaining > 0U);
+ 				*curr++ = c;
+ 				*curr = '\0';
+@@ -682,7 +689,6 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
+ 			if (state == lexstate_vpairstart) {
+ 				if (c == '"' &&
+ 				    (options & ISC_LEXOPT_QVPAIR) != 0) {
+-					INSIST(remaining > 0U);
+ 					no_comments = true;
+ 					state = lexstate_qvpair;
+ 					break;
+-- 
+2.23.0
+
diff --git a/backport-0021-Add-test-configurations-with-invalid-dnssec-policy-c.patch b/backport-0021-Add-test-configurations-with-invalid-dnssec-policy-c.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1048ae5ec2e241ed7057b358e4b0e32be81068d6
--- /dev/null
+++ b/backport-0021-Add-test-configurations-with-invalid-dnssec-policy-c.patch
@@ -0,0 +1,122 @@
+From 38d930e5cb11d398a01f68f3c1658b4c22759583 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 15 Feb 2022 16:24:52 +1100
+Subject: [PATCH] Add test configurations with invalid dnssec-policy clauses
+
+bad-ksk-without-zsk.conf only has a ksk defined without a
+matching zsk for the same algorithm.
+
+bad-zsk-without-ksk.conf only has a zsk defined without a
+matching ksk for the same algorithm.
+
+bad-unpaired-keys.conf has two keys of different algorithms
+one ksk only and the other zsk only
+
+(cherry picked from commit f23e86b96b77bb9fd485a2c8f6d3cd8a02afd7bd)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/38d930e5cb11d398a01f68f3c1658b4c22759583
+---
+ .../system/checkconf/bad-ksk-without-zsk.conf | 24 +++++++++++++++++
+ .../system/checkconf/bad-unpaired-keys.conf   | 27 +++++++++++++++++++
+ .../system/checkconf/bad-zsk-without-ksk.conf | 24 +++++++++++++++++
+ 3 files changed, 75 insertions(+)
+ create mode 100644 bin/tests/system/checkconf/bad-ksk-without-zsk.conf
+ create mode 100644 bin/tests/system/checkconf/bad-unpaired-keys.conf
+ create mode 100644 bin/tests/system/checkconf/bad-zsk-without-ksk.conf
+
+diff --git a/bin/tests/system/checkconf/bad-ksk-without-zsk.conf b/bin/tests/system/checkconf/bad-ksk-without-zsk.conf
+new file mode 100644
+index 0000000000..66e1b7f0c8
+--- /dev/null
++++ b/bin/tests/system/checkconf/bad-ksk-without-zsk.conf
+@@ -0,0 +1,24 @@
++/*
++ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++ *
++ * SPDX-License-Identifier: MPL-2.0
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0.  If a copy of the MPL was not distributed with this
++ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
++ *
++ * See the COPYRIGHT file distributed with this work for additional
++ * information regarding copyright ownership.
++ */
++
++dnssec-policy ksk-without-zsk {
++	keys {
++		ksk lifetime 30d algorithm 13;
++	};
++};
++
++zone "example" {
++	type primary;
++	file "example.db";
++	dnssec-policy ksk-without-zsk;
++};
+diff --git a/bin/tests/system/checkconf/bad-unpaired-keys.conf b/bin/tests/system/checkconf/bad-unpaired-keys.conf
+new file mode 100644
+index 0000000000..63b6dc2c65
+--- /dev/null
++++ b/bin/tests/system/checkconf/bad-unpaired-keys.conf
+@@ -0,0 +1,27 @@
++/*
++ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++ *
++ * SPDX-License-Identifier: MPL-2.0
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0.  If a copy of the MPL was not distributed with this
++ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
++ *
++ * See the COPYRIGHT file distributed with this work for additional
++ * information regarding copyright ownership.
++ */
++
++dnssec-policy unpaired-keys {
++	keys {
++		/* zsk without ksk */
++		zsk lifetime 30d algorithm 13;
++		/* ksk without zsk */
++		ksk lifetime 30d algorithm 7;
++	};
++};
++
++zone "example" {
++	type primary;
++	file "example.db";
++	dnssec-policy unpaired-keys;
++};
+diff --git a/bin/tests/system/checkconf/bad-zsk-without-ksk.conf b/bin/tests/system/checkconf/bad-zsk-without-ksk.conf
+new file mode 100644
+index 0000000000..31b031cdc8
+--- /dev/null
++++ b/bin/tests/system/checkconf/bad-zsk-without-ksk.conf
+@@ -0,0 +1,24 @@
++/*
++ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++ *
++ * SPDX-License-Identifier: MPL-2.0
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0.  If a copy of the MPL was not distributed with this
++ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
++ *
++ * See the COPYRIGHT file distributed with this work for additional
++ * information regarding copyright ownership.
++ */
++
++dnssec-policy zsk-without-ksk {
++	keys {
++		zsk lifetime 30d algorithm 13;
++	};
++};
++
++zone "example" {
++	type primary;
++	file "example.db";
++	dnssec-policy zsk-without-ksk;
++};
+-- 
+2.23.0
+
diff --git a/backport-0021-Check-dnssec-policy-key-roles-for-validity.patch b/backport-0021-Check-dnssec-policy-key-roles-for-validity.patch
new file mode 100644
index 0000000000000000000000000000000000000000..05b20f8690eb1e88772e3ca486d0e80a13ad4cad
--- /dev/null
+++ b/backport-0021-Check-dnssec-policy-key-roles-for-validity.patch
@@ -0,0 +1,80 @@
+From 2c7f02ca458dbf9ab9476b7290861a803a322ef3 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 15 Feb 2022 17:12:27 +1100
+Subject: [PATCH] Check dnssec-policy key roles for validity
+
+For each algorithm there must be a key performing the KSK and
+ZSK rolls.  After reading the keys from named.conf check that
+each algorithm present has both rolls.  CSK implicitly has both
+rolls.
+
+(cherry picked from commit 9bcf45f4cecdb2fe577c426aae23e5d105531472)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/2c7f02ca458dbf9ab9476b7290861a803a322ef3
+---
+ lib/isccfg/kaspconf.c | 35 ++++++++++++++++++++++++++++++++++-
+ 1 file changed, 34 insertions(+), 1 deletion(-)
+
+diff --git a/lib/isccfg/kaspconf.c b/lib/isccfg/kaspconf.c
+index 6e831e1465..32f76849cd 100644
+--- a/lib/isccfg/kaspconf.c
++++ b/lib/isccfg/kaspconf.c
+@@ -262,7 +262,7 @@ cfg_kasp_fromconfig(const cfg_obj_t *config, const char *name, isc_mem_t *mctx,
+ 	const cfg_listelt_t *element = NULL;
+ 	const char *kaspname = NULL;
+ 	dns_kasp_t *kasp = NULL;
+-	int i = 0;
++	size_t i = 0;
+ 
+ 	REQUIRE(kaspp != NULL && *kaspp == NULL);
+ 
+@@ -323,6 +323,9 @@ cfg_kasp_fromconfig(const cfg_obj_t *config, const char *name, isc_mem_t *mctx,
+ 
+ 	(void)confget(maps, "keys", &keys);
+ 	if (keys != NULL) {
++		char role[256] = { 0 };
++		dns_kasp_key_t *kkey = NULL;
++
+ 		for (element = cfg_list_first(keys); element != NULL;
+ 		     element = cfg_list_next(element))
+ 		{
+@@ -333,6 +336,36 @@ cfg_kasp_fromconfig(const cfg_obj_t *config, const char *name, isc_mem_t *mctx,
+ 			}
+ 		}
+ 		INSIST(!(dns_kasp_keylist_empty(kasp)));
++		dns_kasp_freeze(kasp);
++		for (kkey = ISC_LIST_HEAD(dns_kasp_keys(kasp)); kkey != NULL;
++		     kkey = ISC_LIST_NEXT(kkey, link))
++		{
++			uint32_t keyalg = dns_kasp_key_algorithm(kkey);
++			INSIST(keyalg < ARRAY_SIZE(role));
++
++			if (dns_kasp_key_zsk(kkey)) {
++				role[keyalg] |= DNS_KASP_KEY_ROLE_ZSK;
++			}
++
++			if (dns_kasp_key_ksk(kkey)) {
++				role[keyalg] |= DNS_KASP_KEY_ROLE_KSK;
++			}
++		}
++		dns_kasp_thaw(kasp);
++		for (i = 0; i < ARRAY_SIZE(role); i++) {
++			if (role[i] != 0 && role[i] != (DNS_KASP_KEY_ROLE_ZSK |
++							DNS_KASP_KEY_ROLE_KSK))
++			{
++				cfg_obj_log(keys, logctx, ISC_LOG_ERROR,
++					    "dnssec-policy: algorithm %zu "
++					    "requires both KSK and ZSK roles",
++					    i);
++				result = ISC_R_FAILURE;
++			}
++		}
++		if (result != ISC_R_SUCCESS) {
++			goto cleanup;
++		}
+ 	} else if (strcmp(kaspname, "insecure") == 0) {
+ 		/* "dnssec-policy insecure": key list must be empty */
+ 		INSIST(strcmp(kaspname, "insecure") == 0);
+-- 
+2.23.0
+
diff --git a/backport-0022-Add-network-manager-based-timer-API.patch b/backport-0022-Add-network-manager-based-timer-API.patch
new file mode 100644
index 0000000000000000000000000000000000000000..41dd4e658b60b9aec38f5d1c961833ca41c06578
--- /dev/null
+++ b/backport-0022-Add-network-manager-based-timer-API.patch
@@ -0,0 +1,189 @@
+From 914a7e14e2af8260a1b0d797cc95e0552ccae53f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Wed, 2 Feb 2022 10:50:27 +0100
+Subject: [PATCH] Add network manager based timer API
+
+This commits adds API that allows to create arbitrary timers associated
+with the network manager handles.
+
+(cherry picked from commit 3c7b04d0150ae6d6192747d90d52247bd598bd9a)
+Conflict: UV_RUNTIME_CHECK to RUNTIME_CHECK
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/914a7e14e2af8260a1b0d797cc95e0552ccae53f
+---
+ lib/isc/include/isc/netmgr.h | 24 ++++++++++
+ lib/isc/netmgr/netmgr-int.h  |  8 ++++
+ lib/isc/netmgr/netmgr.c      | 91 ++++++++++++++++++++++++++++++++++++
+ lib/isc/win32/libisc.def.in  |  5 ++
+ 4 files changed, 128 insertions(+)
+
+diff --git a/lib/isc/include/isc/netmgr.h b/lib/isc/include/isc/netmgr.h
+index 39dba1d376..7ec40e81b6 100644
+--- a/lib/isc/include/isc/netmgr.h
++++ b/lib/isc/include/isc/netmgr.h
+@@ -492,3 +492,27 @@ isc__nm_force_tid(int tid);
+ 
+ void
+ isc_nmhandle_setwritetimeout(isc_nmhandle_t *handle, uint64_t write_timeout);
++
++/*
++ * Timer related functions
++ */
++
++typedef struct isc_nm_timer isc_nm_timer_t;
++
++typedef void (*isc_nm_timer_cb)(void *, isc_result_t);
++
++void
++isc_nm_timer_create(isc_nmhandle_t *, isc_nm_timer_cb, void *,
++		    isc_nm_timer_t **);
++
++void
++isc_nm_timer_attach(isc_nm_timer_t *, isc_nm_timer_t **);
++
++void
++isc_nm_timer_detach(isc_nm_timer_t **);
++
++void
++isc_nm_timer_start(isc_nm_timer_t *, uint64_t);
++
++void
++isc_nm_timer_stop(isc_nm_timer_t *);
+diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
+index 3871d70939..23b197179a 100644
+--- a/lib/isc/netmgr/netmgr-int.h
++++ b/lib/isc/netmgr/netmgr-int.h
+@@ -350,6 +350,14 @@ struct isc__nm_uvreq {
+ 	ISC_LINK(isc__nm_uvreq_t) link;
+ };
+ 
++struct isc_nm_timer {
++	isc_refcount_t references;
++	uv_timer_t timer;
++	isc_nmhandle_t *handle;
++	isc_nm_timer_cb cb;
++	void *cbarg;
++};
++
+ void *
+ isc__nm_get_netievent(isc_nm_t *mgr, isc__netievent_type type);
+ /*%<
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index 31917be101..fb9d77d3b4 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -3179,6 +3179,97 @@ isc_nm_work_offload(isc_nm_t *netmgr, isc_nm_workcb_t work_cb,
+ 	RUNTIME_CHECK(r == 0);
+ }
+ 
++void
++isc_nm_timer_create(isc_nmhandle_t *handle, isc_nm_timer_cb cb, void *cbarg,
++		    isc_nm_timer_t **timerp) {
++	isc__networker_t *worker = NULL;
++	isc_nmsocket_t *sock = NULL;
++	isc_nm_timer_t *timer = NULL;
++	int r;
++
++	REQUIRE(isc__nm_in_netthread());
++	REQUIRE(VALID_NMHANDLE(handle));
++	REQUIRE(VALID_NMSOCK(handle->sock));
++
++	sock = handle->sock;
++	worker = &sock->mgr->workers[isc_nm_tid()];
++
++	timer = isc_mem_get(sock->mgr->mctx, sizeof(*timer));
++	*timer = (isc_nm_timer_t){ .cb = cb, .cbarg = cbarg };
++	isc_refcount_init(&timer->references, 1);
++	isc_nmhandle_attach(handle, &timer->handle);
++
++	r = uv_timer_init(&worker->loop, &timer->timer);
++	UV_RUNTIME_CHECK(uv_timer_init, r);
++
++	uv_handle_set_data((uv_handle_t *)&timer->timer, timer);
++
++	*timerp = timer;
++}
++
++void
++isc_nm_timer_attach(isc_nm_timer_t *timer, isc_nm_timer_t **timerp) {
++	REQUIRE(timer != NULL);
++	REQUIRE(timerp != NULL && *timerp == NULL);
++
++	isc_refcount_increment(&timer->references);
++	*timerp = timer;
++}
++
++static void
++timer_destroy(uv_handle_t *uvhandle) {
++	isc_nm_timer_t *timer = uv_handle_get_data(uvhandle);
++	isc_nmhandle_t *handle = timer->handle;
++	isc_mem_t *mctx = timer->handle->sock->mgr->mctx;
++
++	isc_mem_put(mctx, timer, sizeof(*timer));
++
++	isc_nmhandle_detach(&handle);
++}
++
++void
++isc_nm_timer_detach(isc_nm_timer_t **timerp) {
++	isc_nm_timer_t *timer = NULL;
++	isc_nmhandle_t *handle = NULL;
++
++	REQUIRE(timerp != NULL && *timerp != NULL);
++
++	timer = *timerp;
++	*timerp = NULL;
++
++	handle = timer->handle;
++
++	REQUIRE(isc__nm_in_netthread());
++	REQUIRE(VALID_NMHANDLE(handle));
++	REQUIRE(VALID_NMSOCK(handle->sock));
++
++	if (isc_refcount_decrement(&timer->references) == 1) {
++		uv_timer_stop(&timer->timer);
++		uv_close((uv_handle_t *)&timer->timer, timer_destroy);
++	}
++}
++
++static void
++timer_cb(uv_timer_t *uvtimer) {
++	isc_nm_timer_t *timer = uv_handle_get_data((uv_handle_t *)uvtimer);
++
++	REQUIRE(timer->cb != NULL);
++
++	timer->cb(timer->cbarg, ISC_R_TIMEDOUT);
++}
++
++void
++isc_nm_timer_start(isc_nm_timer_t *timer, uint64_t timeout) {
++	int r = uv_timer_start(&timer->timer, timer_cb, timeout, 0);
++	UV_RUNTIME_CHECK(uv_timer_start, r);
++}
++
++void
++isc_nm_timer_stop(isc_nm_timer_t *timer) {
++	int r = uv_timer_stop(&timer->timer);
++	UV_RUNTIME_CHECK(uv_timer_stop, r);
++}
++
+ #ifdef NETMGR_TRACE
+ /*
+  * Dump all active sockets in netmgr. We output to stderr
+diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in
+index 79e7b64a58..ab7ad73d20 100644
+--- a/lib/isc/win32/libisc.def.in
++++ b/lib/isc/win32/libisc.def.in
+@@ -480,6 +480,11 @@ isc_nm_tcpconnect
+ isc_nm_tcpdnsconnect
+ isc_nm_tcpdns_sequential
+ isc_nm_tid
++isc_nm_timer_create
++isc_nm_timer_attach
++isc_nm_timer_detach
++isc_nm_timer_start
++isc_nm_timer_stop
+ isc_nm_udpconnect
+ isc_nm_work_offload
+ isc_nmsocket_close
+-- 
+2.27.0
\ No newline at end of file
diff --git a/backport-0022-Change-single-write-timer-to-per-send-timers.patch b/backport-0022-Change-single-write-timer-to-per-send-timers.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b382139dd3578fe6a524b7537f130c28f28991ff
--- /dev/null
+++ b/backport-0022-Change-single-write-timer-to-per-send-timers.patch
@@ -0,0 +1,494 @@
+From d17d043499b0a6927738fa0a09daa71a53e90e11 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Thu, 10 Mar 2022 13:51:08 +0100
+Subject: [PATCH] Change single write timer to per-send timers
+
+Previously, there was a single per-socket write timer that would get
+restarted for every new write.  This turned out to be insufficient
+because the other side could keep reseting the timer, and never reading
+back the responses.
+
+Change the single write timer to per-send timer which would in turn
+reset the TCP connection on the first send timeout.
+
+(cherry picked from commit a761aa59e3d988b53e2f42f45bce53f2bea863ec)
+Conflict: UV_RUNTIME_CHECK to RUNTIME_CHECK
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/d17d043499b0a6927738fa0a09daa71a53e90e11
+---
+ lib/isc/netmgr/netmgr-int.h | 22 +++++------
+ lib/isc/netmgr/netmgr.c     | 26 +++++++++----
+ lib/isc/netmgr/tcp.c        | 74 ++++++++-----------------------------
+ lib/isc/netmgr/tcpdns.c     | 49 ++++++------------------
+ lib/isc/netmgr/udp.c        | 29 +--------------
+ 5 files changed, 58 insertions(+), 142 deletions(-)
+
+diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
+index e8b043f..e43bc9f 100644
+--- a/lib/isc/netmgr/netmgr-int.h
++++ b/lib/isc/netmgr/netmgr-int.h
+@@ -306,15 +306,15 @@ struct isc__nm_uvreq {
+ 	int magic;
+ 	isc_nmsocket_t *sock;
+ 	isc_nmhandle_t *handle;
+-	char tcplen[2];	      /* The TCP DNS message length */
+-	uv_buf_t uvbuf;	      /* translated isc_region_t, to be
+-			       * sent or received */
+-	isc_sockaddr_t local; /* local address */
+-	isc_sockaddr_t peer;  /* peer address */
+-	isc__nm_cb_t cb;      /* callback */
+-	void *cbarg;	      /* callback argument */
+-	uv_pipe_t ipc;	      /* used for sending socket
+-			       * uv_handles to other threads */
++	char tcplen[2];	       /* The TCP DNS message length */
++	uv_buf_t uvbuf;	       /* translated isc_region_t, to be
++				* sent or received */
++	isc_sockaddr_t local;  /* local address */
++	isc_sockaddr_t peer;   /* peer address */
++	isc__nm_cb_t cb;       /* callback */
++	void *cbarg;	       /* callback argument */
++	isc_nm_timer_t *timer; /* TCP write timer */
++
+ 	union {
+ 		uv_handle_t handle;
+ 		uv_req_t req;
+@@ -764,9 +764,7 @@ struct isc_nmsocket {
+ 	/*%
+ 	 * TCP write timeout timer.
+ 	 */
+-	uv_timer_t write_timer;
+ 	uint64_t write_timeout;
+-	int64_t writes;
+ 
+ 	/*% outer socket is for 'wrapped' sockets - e.g. tcpdns in tcp */
+ 	isc_nmsocket_t *outer;
+@@ -1600,7 +1598,7 @@ isc__nmsocket_connecttimeout_cb(uv_timer_t *timer);
+ void
+ isc__nmsocket_readtimeout_cb(uv_timer_t *timer);
+ void
+-isc__nmsocket_writetimeout_cb(uv_timer_t *timer);
++isc__nmsocket_writetimeout_cb(void *data, isc_result_t eresult);
+ 
+ /*%<
+  *
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index 9e44b76..0fe12f9 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -2009,11 +2009,15 @@ isc__nm_accept_connection_log(isc_result_t result, bool can_log_quota) {
+ }
+ 
+ void
+-isc__nmsocket_writetimeout_cb(uv_timer_t *timer) {
+-	isc_nmsocket_t *sock = uv_handle_get_data((uv_handle_t *)timer);
++isc__nmsocket_writetimeout_cb(void *data, isc_result_t eresult) {
++	isc__nm_uvreq_t *req = data;
++	isc_nmsocket_t *sock = NULL;
+ 
+-	int r = uv_timer_stop(&sock->write_timer);
+-	UV_RUNTIME_CHECK(uv_timer_stop, r);
++	REQUIRE(eresult == ISC_R_TIMEDOUT);
++	REQUIRE(VALID_UVREQ(req));
++	REQUIRE(VALID_NMSOCK(req->sock));
++
++	sock = req->sock;
+ 
+ 	isc__nmsocket_reset(sock);
+ }
+@@ -2724,6 +2728,13 @@ isc__nm_async_detach(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	nmhandle_detach_cb(&ievent->handle FLARG_PASS);
+ }
+ 
++static void
++reset_shutdown(uv_handle_t *handle) {
++	isc_nmsocket_t *sock = uv_handle_get_data(handle);
++
++	isc__nmsocket_shutdown(sock);
++}
++
+ void
+ isc__nmsocket_reset(isc_nmsocket_t *sock) {
+ 	REQUIRE(VALID_NMSOCK(sock));
+@@ -2747,10 +2758,10 @@ isc__nmsocket_reset(isc_nmsocket_t *sock) {
+ 		 * The real shutdown will be handled in the respective
+ 		 * close functions.
+ 		 */
+-		int r = uv_tcp_close_reset(&sock->uv_handle.tcp, NULL);
++		int r = uv_tcp_close_reset(&sock->uv_handle.tcp,
++					   reset_shutdown);
+ 		UV_RUNTIME_CHECK(uv_tcp_close_reset, r);
+ 	}
+-	isc__nmsocket_shutdown(sock);
+ }
+ 
+ void
+@@ -3285,7 +3296,8 @@ isc_nm_timer_detach(isc_nm_timer_t **timerp) {
+ 	REQUIRE(VALID_NMSOCK(handle->sock));
+ 
+ 	if (isc_refcount_decrement(&timer->references) == 1) {
+-		uv_timer_stop(&timer->timer);
++		int r = uv_timer_stop(&timer->timer);
++		UV_RUNTIME_CHECK(uv_timer_stop, r);
+ 		uv_close((uv_handle_t *)&timer->timer, timer_destroy);
+ 	}
+ }
+diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
+index 21327af..009e431 100644
+--- a/lib/isc/netmgr/tcp.c
++++ b/lib/isc/netmgr/tcp.c
+@@ -76,9 +76,6 @@ quota_accept_cb(isc_quota_t *quota, void *sock0);
+ static void
+ failed_accept_cb(isc_nmsocket_t *sock, isc_result_t eresult);
+ 
+-static void
+-failed_send_cb(isc_nmsocket_t *sock, isc__nm_uvreq_t *req,
+-	       isc_result_t eresult);
+ static void
+ stop_tcp_parent(isc_nmsocket_t *sock);
+ static void
+@@ -142,10 +139,6 @@ tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+-	r = uv_timer_init(&worker->loop, &sock->write_timer);
+-	UV_RUNTIME_CHECK(uv_timer_init, r);
+-	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
+-
+ 	r = uv_tcp_open(&sock->uv_handle.tcp, sock->fd);
+ 	if (r != 0) {
+ 		isc__nm_closesocket(sock->fd);
+@@ -536,10 +529,6 @@ isc__nm_async_tcplisten(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+-	r = uv_timer_init(&worker->loop, &sock->write_timer);
+-	UV_RUNTIME_CHECK(uv_timer_init, r);
+-	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
+-
+ 	LOCK(&sock->parent->lock);
+ 
+ 	r = uv_tcp_open(&sock->uv_handle.tcp, sock->fd);
+@@ -712,19 +701,6 @@ destroy:
+ 	}
+ }
+ 
+-static void
+-failed_send_cb(isc_nmsocket_t *sock, isc__nm_uvreq_t *req,
+-	       isc_result_t eresult) {
+-	REQUIRE(VALID_NMSOCK(sock));
+-	REQUIRE(VALID_UVREQ(req));
+-
+-	if (req->cb.send != NULL) {
+-		isc__nm_sendcb(sock, req, eresult, true);
+-	} else {
+-		isc__nm_uvreq_put(&req, sock);
+-	}
+-}
+-
+ void
+ isc__nm_tcp_read(isc_nmhandle_t *handle, isc_nm_recv_cb_t cb, void *cbarg) {
+ 	REQUIRE(VALID_NMHANDLE(handle));
+@@ -980,10 +956,6 @@ accept_connection(isc_nmsocket_t *ssock, isc_quota_t *quota) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&csock->read_timer, csock);
+ 
+-	r = uv_timer_init(&worker->loop, &csock->write_timer);
+-	UV_RUNTIME_CHECK(uv_timer_init, r);
+-	uv_handle_set_data((uv_handle_t *)&csock->write_timer, csock);
+-
+ 	r = uv_accept(&ssock->uv_handle.stream, &csock->uv_handle.stream);
+ 	if (r != 0) {
+ 		result = isc__nm_uverr2result(r);
+@@ -1094,20 +1066,20 @@ isc__nm_tcp_send(isc_nmhandle_t *handle, const isc_region_t *region,
+ static void
+ tcp_send_cb(uv_write_t *req, int status) {
+ 	isc__nm_uvreq_t *uvreq = (isc__nm_uvreq_t *)req->data;
++	isc_nmsocket_t *sock = NULL;
+ 
+ 	REQUIRE(VALID_UVREQ(uvreq));
+-	REQUIRE(VALID_NMHANDLE(uvreq->handle));
++	REQUIRE(VALID_NMSOCK(uvreq->sock));
+ 
+-	isc_nmsocket_t *sock = uvreq->sock;
++	sock = uvreq->sock;
+ 
+-	if (--sock->writes == 0) {
+-		int r = uv_timer_stop(&sock->write_timer);
+-		UV_RUNTIME_CHECK(uv_timer_stop, r);
+-	}
++	isc_nm_timer_stop(uvreq->timer);
++	isc_nm_timer_detach(&uvreq->timer);
+ 
+ 	if (status < 0) {
+ 		isc__nm_incstats(sock->mgr, sock->statsindex[STATID_SENDFAIL]);
+-		failed_send_cb(sock, uvreq, isc__nm_uverr2result(status));
++		isc__nm_failed_send_cb(sock, uvreq,
++				       isc__nm_uverr2result(status));
+ 		return;
+ 	}
+ 
+@@ -1131,7 +1103,7 @@ isc__nm_async_tcpsend(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	result = tcp_send_direct(sock, uvreq);
+ 	if (result != ISC_R_SUCCESS) {
+ 		isc__nm_incstats(sock->mgr, sock->statsindex[STATID_SENDFAIL]);
+-		failed_send_cb(sock, uvreq, result);
++		isc__nm_failed_send_cb(sock, uvreq, result);
+ 	}
+ }
+ 
+@@ -1148,17 +1120,18 @@ tcp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
+ 		return (ISC_R_CANCELED);
+ 	}
+ 
+-	r = uv_timer_start(&sock->write_timer, isc__nmsocket_writetimeout_cb,
+-			   sock->write_timeout, 0);
+-	UV_RUNTIME_CHECK(uv_timer_start, r);
+-	RUNTIME_CHECK(sock->writes++ >= 0);
+-
+ 	r = uv_write(&req->uv_req.write, &sock->uv_handle.stream, &req->uvbuf,
+ 		     1, tcp_send_cb);
+ 	if (r < 0) {
+ 		return (isc__nm_uverr2result(r));
+ 	}
+ 
++	isc_nm_timer_create(req->handle, isc__nmsocket_writetimeout_cb, req,
++			    &req->timer);
++	if (sock->write_timeout > 0) {
++		isc_nm_timer_start(req->timer, sock->write_timeout);
++	}
++
+ 	return (ISC_R_SUCCESS);
+ }
+ 
+@@ -1229,17 +1202,6 @@ read_timer_close_cb(uv_handle_t *handle) {
+ 	}
+ }
+ 
+-static void
+-write_timer_close_cb(uv_handle_t *timer) {
+-	isc_nmsocket_t *sock = uv_handle_get_data(timer);
+-	uv_handle_set_data(timer, NULL);
+-
+-	REQUIRE(VALID_NMSOCK(sock));
+-
+-	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+-	uv_close((uv_handle_t *)&sock->read_timer, read_timer_close_cb);
+-}
+-
+ static void
+ stop_tcp_child(isc_nmsocket_t *sock) {
+ 	REQUIRE(sock->type == isc_nm_tcpsocket);
+@@ -1292,8 +1254,6 @@ stop_tcp_parent(isc_nmsocket_t *sock) {
+ 
+ static void
+ tcp_close_direct(isc_nmsocket_t *sock) {
+-	int r;
+-
+ 	REQUIRE(VALID_NMSOCK(sock));
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 	REQUIRE(atomic_load(&sock->closing));
+@@ -1315,10 +1275,8 @@ tcp_close_direct(isc_nmsocket_t *sock) {
+ 	isc__nmsocket_timer_stop(sock);
+ 	isc__nm_stop_reading(sock);
+ 
+-	r = uv_timer_stop(&sock->write_timer);
+-	UV_RUNTIME_CHECK(uv_timer_stop, r);
+-	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
+-	uv_close((uv_handle_t *)&sock->write_timer, write_timer_close_cb);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
++	uv_close((uv_handle_t *)&sock->read_timer, read_timer_close_cb);
+ }
+ 
+ void
+diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
+index 89d1554..4689f56 100644
+--- a/lib/isc/netmgr/tcpdns.c
++++ b/lib/isc/netmgr/tcpdns.c
+@@ -100,10 +100,6 @@ tcpdns_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+-	r = uv_timer_init(&worker->loop, &sock->write_timer);
+-	UV_RUNTIME_CHECK(uv_timer_init, r);
+-	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
+-
+ 	if (isc__nm_closing(sock)) {
+ 		result = ISC_R_CANCELED;
+ 		goto error;
+@@ -498,10 +494,6 @@ isc__nm_async_tcpdnslisten(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+-	r = uv_timer_init(&worker->loop, &sock->write_timer);
+-	UV_RUNTIME_CHECK(uv_timer_init, r);
+-	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
+-
+ 	LOCK(&sock->parent->lock);
+ 
+ 	r = uv_tcp_open(&sock->uv_handle.tcp, sock->fd);
+@@ -947,10 +939,6 @@ accept_connection(isc_nmsocket_t *ssock, isc_quota_t *quota) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&csock->read_timer, csock);
+ 
+-	r = uv_timer_init(&worker->loop, &csock->write_timer);
+-	UV_RUNTIME_CHECK(uv_timer_init, r);
+-	uv_handle_set_data((uv_handle_t *)&csock->write_timer, csock);
+-
+ 	r = uv_accept(&ssock->uv_handle.stream, &csock->uv_handle.stream);
+ 	if (r != 0) {
+ 		result = isc__nm_uverr2result(r);
+@@ -1085,14 +1073,12 @@ tcpdns_send_cb(uv_write_t *req, int status) {
+ 	isc_nmsocket_t *sock = NULL;
+ 
+ 	REQUIRE(VALID_UVREQ(uvreq));
+-	REQUIRE(VALID_NMHANDLE(uvreq->handle));
++	REQUIRE(VALID_NMSOCK(uvreq->sock));
+ 
+ 	sock = uvreq->sock;
+ 
+-	if (--sock->writes == 0) {
+-		int r = uv_timer_stop(&sock->write_timer);
+-		UV_RUNTIME_CHECK(uv_timer_stop, r);
+-	}
++	isc_nm_timer_stop(uvreq->timer);
++	isc_nm_timer_detach(&uvreq->timer);
+ 
+ 	if (status < 0) {
+ 		isc__nm_incstats(sock->mgr, sock->statsindex[STATID_SENDFAIL]);
+@@ -1158,11 +1144,6 @@ isc__nm_async_tcpdnssend(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 		goto fail;
+ 	}
+ 
+-	r = uv_timer_start(&sock->write_timer, isc__nmsocket_writetimeout_cb,
+-			   sock->write_timeout, 0);
+-	UV_RUNTIME_CHECK(uv_timer_start, r);
+-	RUNTIME_CHECK(sock->writes++ >= 0);
+-
+ 	r = uv_write(&uvreq->uv_req.write, &sock->uv_handle.stream, bufs, nbufs,
+ 		     tcpdns_send_cb);
+ 	if (r < 0) {
+@@ -1170,6 +1151,12 @@ isc__nm_async_tcpdnssend(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 		goto fail;
+ 	}
+ 
++	isc_nm_timer_create(uvreq->handle, isc__nmsocket_writetimeout_cb, uvreq,
++			    &uvreq->timer);
++	if (sock->write_timeout > 0) {
++		isc_nm_timer_start(uvreq->timer, sock->write_timeout);
++	}
++
+ 	return;
+ 
+ fail:
+@@ -1250,17 +1237,6 @@ read_timer_close_cb(uv_handle_t *timer) {
+ 	}
+ }
+ 
+-static void
+-write_timer_close_cb(uv_handle_t *timer) {
+-	isc_nmsocket_t *sock = uv_handle_get_data(timer);
+-	uv_handle_set_data(timer, NULL);
+-
+-	REQUIRE(VALID_NMSOCK(sock));
+-
+-	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+-	uv_close((uv_handle_t *)&sock->read_timer, read_timer_close_cb);
+-}
+-
+ static void
+ stop_tcpdns_child(isc_nmsocket_t *sock) {
+ 	REQUIRE(sock->type == isc_nm_tcpdnssocket);
+@@ -1313,7 +1289,6 @@ stop_tcpdns_parent(isc_nmsocket_t *sock) {
+ 
+ static void
+ tcpdns_close_direct(isc_nmsocket_t *sock) {
+-	int r;
+ 	REQUIRE(VALID_NMSOCK(sock));
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 	REQUIRE(atomic_load(&sock->closing));
+@@ -1329,10 +1304,8 @@ tcpdns_close_direct(isc_nmsocket_t *sock) {
+ 	isc__nmsocket_timer_stop(sock);
+ 	isc__nm_stop_reading(sock);
+ 
+-	r = uv_timer_stop(&sock->write_timer);
+-	UV_RUNTIME_CHECK(uv_timer_stop, r);
+-	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
+-	uv_close((uv_handle_t *)&sock->write_timer, write_timer_close_cb);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
++	uv_close((uv_handle_t *)&sock->read_timer, read_timer_close_cb);
+ }
+ 
+ void
+diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c
+index d3fffe0..305ac29 100644
+--- a/lib/isc/netmgr/udp.c
++++ b/lib/isc/netmgr/udp.c
+@@ -48,9 +48,6 @@ udp_close_cb(uv_handle_t *handle);
+ static void
+ read_timer_close_cb(uv_handle_t *handle);
+ 
+-static void
+-write_timer_close_cb(uv_handle_t *handle);
+-
+ static void
+ udp_close_direct(isc_nmsocket_t *sock);
+ 
+@@ -233,10 +230,6 @@ isc__nm_async_udplisten(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+-	r = uv_timer_init(&worker->loop, &sock->write_timer);
+-	UV_RUNTIME_CHECK(uv_timer_init, r);
+-	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
+-
+ 	LOCK(&sock->parent->lock);
+ 
+ 	r = uv_udp_open(&sock->uv_handle.udp, sock->fd);
+@@ -635,10 +628,6 @@ udp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
+ 	RUNTIME_CHECK(r == 0);
+ 	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+ 
+-	r = uv_timer_init(&worker->loop, &sock->write_timer);
+-	UV_RUNTIME_CHECK(uv_timer_init, r);
+-	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
+-
+ 	r = uv_udp_open(&sock->uv_handle.udp, sock->fd);
+ 	if (r != 0) {
+ 		isc__nm_incstats(sock->mgr, sock->statsindex[STATID_OPENFAIL]);
+@@ -994,17 +983,6 @@ read_timer_close_cb(uv_handle_t *handle) {
+ 	}
+ }
+ 
+-static void
+-write_timer_close_cb(uv_handle_t *timer) {
+-	isc_nmsocket_t *sock = uv_handle_get_data(timer);
+-	uv_handle_set_data(timer, NULL);
+-
+-	REQUIRE(VALID_NMSOCK(sock));
+-
+-	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+-	uv_close((uv_handle_t *)&sock->read_timer, read_timer_close_cb);
+-}
+-
+ static void
+ stop_udp_child(isc_nmsocket_t *sock) {
+ 	REQUIRE(sock->type == isc_nm_udpsocket);
+@@ -1057,14 +1035,11 @@ stop_udp_parent(isc_nmsocket_t *sock) {
+ 
+ static void
+ udp_close_direct(isc_nmsocket_t *sock) {
+-	int r;
+ 	REQUIRE(VALID_NMSOCK(sock));
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 
+-	r = uv_timer_stop(&sock->write_timer);
+-	UV_RUNTIME_CHECK(uv_timer_stop, r);
+-	uv_handle_set_data((uv_handle_t *)&sock->write_timer, sock);
+-	uv_close((uv_handle_t *)&sock->write_timer, write_timer_close_cb);
++	uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
++	uv_close((uv_handle_t *)&sock->read_timer, read_timer_close_cb);
+ }
+ 
+ void
+-- 
+2.27.0
+
diff --git a/backport-0022-On-shutdown-reset-the-established-TCP-connections.patch b/backport-0022-On-shutdown-reset-the-established-TCP-connections.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a9020f68624107860201ff9dce900495243a34b2
--- /dev/null
+++ b/backport-0022-On-shutdown-reset-the-established-TCP-connections.patch
@@ -0,0 +1,84 @@
+From 7a386256b6e80520637583268b9e9fef5fe0f743 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Thu, 10 Mar 2022 13:58:58 +0100
+Subject: [PATCH] On shutdown, reset the established TCP connections
+
+Previously, the established TCP connections (both client and server)
+would be gracefully closed waiting for the write timeout.
+
+Don't wait for TCP connections to gracefully shutdown, but directly
+reset them for faster shutdown.
+
+(cherry picked from commit 6ddac2d56de980717aaba7fc0ad73af0f3890399)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/7a386256b6e80520637583268b9e9fef5fe0f743
+---
+ lib/isc/netmgr/netmgr.c | 27 +++++++++++++++++++++++----
+ 1 file changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index 41e4bce616..24947a562a 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -2686,6 +2686,7 @@ reset_shutdown(uv_handle_t *handle) {
+ 	isc_nmsocket_t *sock = uv_handle_get_data(handle);
+ 
+ 	isc__nmsocket_shutdown(sock);
++	isc__nmsocket_detach(&sock);
+ }
+ 
+ void
+@@ -2706,14 +2707,19 @@ isc__nmsocket_reset(isc_nmsocket_t *sock) {
+ 		break;
+ 	}
+ 
+-	if (!uv_is_closing(&sock->uv_handle.handle)) {
++	if (!uv_is_closing(&sock->uv_handle.handle) &&
++	    uv_is_active(&sock->uv_handle.handle))
++	{
+ 		/*
+ 		 * The real shutdown will be handled in the respective
+ 		 * close functions.
+ 		 */
++		isc__nmsocket_attach(sock, &(isc_nmsocket_t *){ NULL });
+ 		int r = uv_tcp_close_reset(&sock->uv_handle.tcp,
+ 					   reset_shutdown);
+ 		UV_RUNTIME_CHECK(uv_tcp_close_reset, r);
++	} else {
++		isc__nmsocket_shutdown(sock);
+ 	}
+ }
+ 
+@@ -2751,13 +2757,26 @@ shutdown_walk_cb(uv_handle_t *handle, void *arg) {
+ 
+ 	switch (handle->type) {
+ 	case UV_UDP:
++		isc__nmsocket_shutdown(sock);
++		return;
+ 	case UV_TCP:
+-		break;
++		switch (sock->type) {
++		case isc_nm_tcpsocket:
++		case isc_nm_tcpdnssocket:
++			if (sock->parent == NULL) {
++				/* Reset the TCP connections on shutdown */
++				isc__nmsocket_reset(sock);
++				return;
++			}
++			/* FALLTHROUGH */
++		default:
++			isc__nmsocket_shutdown(sock);
++		}
++
++		return;
+ 	default:
+ 		return;
+ 	}
+-
+-	isc__nmsocket_shutdown(sock);
+ }
+ 
+ void
+-- 
+2.23.0
+
diff --git a/backport-0023-Log-not-authoritative-for-update-zone-more-clearly.patch b/backport-0023-Log-not-authoritative-for-update-zone-more-clearly.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4d445bc5f8f4e391b92f684c7fc70a64d46a876b
--- /dev/null
+++ b/backport-0023-Log-not-authoritative-for-update-zone-more-clearly.patch
@@ -0,0 +1,84 @@
+From a5d65815bc9812f7b55664d564f9592765c88e6d Mon Sep 17 00:00:00 2001
+From: Tony Finch <fanf@isc.org>
+Date: Tue, 15 Mar 2022 17:57:43 +0000
+Subject: [PATCH] Log "not authoritative for update zone" more clearly
+
+Ensure the update zone name is mentioned in the NOTAUTH error message
+in the server log, so that it is easier to track down problematic
+update clients. There are two cases: either the update zone is
+unrelated to any of the server's zones (previously no zone was
+mentioned); or the update zone is a subdomain of one or more of the
+server's zones (previously the name of the irrelevant parent zone was
+misleadingly logged).
+
+Closes #3209
+
+(cherry picked from commit 84c4eb02e7a4599acfb5d2abc0e62e7d64fd1bd6)
+Conflict: delete CHANGES
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/a5d65815bc9812f7b55664d564f9592765c88e6d
+---
+ bin/tests/system/nsupdate/tests.sh | 26 ++++++++++++++++++++++++++
+ lib/ns/update.c                    | 10 +++++++++-
+ 3 files changed, 40 insertions(+), 1 deletion(-)
+
+diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
+index b3cb85aada..e4f96eb126 100755
+--- a/bin/tests/system/nsupdate/tests.sh
++++ b/bin/tests/system/nsupdate/tests.sh
+@@ -83,6 +83,32 @@ digcomp knowngood.ns1.before dig.out.ns1 || ret=1
+ digcomp knowngood.ns1.before dig.out.ns2 || ret=1
+ [ $ret = 0 ] || { echo_i "failed"; status=1; }
+ 
++ret=0
++echo_i "ensure an unrelated zone is mentioned in its NOTAUTH log"
++$NSUPDATE -k ns1/ddns.key > nsupdate.out 2>&1 << END && ret=1
++server 10.53.0.1 ${PORT}
++zone unconfigured.test
++update add unconfigured.test 600 IN A 10.53.0.1
++send
++END
++grep NOTAUTH nsupdate.out > /dev/null 2>&1 || ret=1
++grep ' unconfigured.test: not authoritative' ns1/named.run \
++     > /dev/null 2>&1 || ret=1
++[ $ret = 0 ] || { echo_i "failed"; status=1; }
++
++ret=0
++echo_i "ensure a subdomain is mentioned in its NOTAUTH log"
++$NSUPDATE -k ns1/ddns.key > nsupdate.out 2>&1 << END && ret=1
++server 10.53.0.1 ${PORT}
++zone sub.sub.example.nil
++update add sub.sub.sub.example.nil 600 IN A 10.53.0.1
++send
++END
++grep NOTAUTH nsupdate.out > /dev/null 2>&1 || ret=1
++grep ' sub.sub.example.nil: not authoritative' ns1/named.run \
++     > /dev/null 2>&1 || ret=1
++[ $ret = 0 ] || { echo_i "failed"; status=1; }
++
+ ret=0
+ echo_i "updating zone"
+ # nsupdate will print a ">" prompt to stdout as it gets each input line.
+diff --git a/lib/ns/update.c b/lib/ns/update.c
+index 9ab13e3301..067ff990bd 100644
+--- a/lib/ns/update.c
++++ b/lib/ns/update.c
+@@ -1631,7 +1631,15 @@ ns_update_start(ns_client_t *client, isc_nmhandle_t *handle,
+ 
+ 	result = dns_zt_find(client->view->zonetable, zonename, 0, NULL, &zone);
+ 	if (result != ISC_R_SUCCESS) {
+-		FAILC(DNS_R_NOTAUTH, "not authoritative for update zone");
++		/*
++		 * If we found a zone that is a parent of the update zonename,
++		 * detach it so it isn't mentioned in log - it is irrelevant.
++		 */
++		if (zone != NULL) {
++			dns_zone_detach(&zone);
++		}
++		FAILN(DNS_R_NOTAUTH, zonename,
++		      "not authoritative for update zone");
+ 	}
+ 
+ 	/*
+-- 
+2.27.0
+
diff --git a/backport-0024-Prevent-arithmetic-overflow-of-i-in-master.c-generat.patch b/backport-0024-Prevent-arithmetic-overflow-of-i-in-master.c-generat.patch
new file mode 100644
index 0000000000000000000000000000000000000000..631a66fb11becc015a055fd8fff5971f53160d4d
--- /dev/null
+++ b/backport-0024-Prevent-arithmetic-overflow-of-i-in-master.c-generat.patch
@@ -0,0 +1,43 @@
+From c284112becef6b6605ae4f18363afac3b0e173fd Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Fri, 4 Mar 2022 09:37:39 +1100
+Subject: [PATCH] Prevent arithmetic overflow of 'i' in master.c:generate
+
+the value of 'i' in generate could overflow when adding 'step' to
+it in the 'for' loop.  Use an unsigned int for 'i' which will give
+an additional bit and prevent the overflow.  The inputs are both
+less than 2^31 and and the result will be less than 2^32-1.
+
+(cherry picked from commit 5abdee9004f118b2c1301229418f93de7626e66f)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/c284112becef6b6605ae4f18363afac3b0e173fd
+---
+ lib/dns/master.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/lib/dns/master.c b/lib/dns/master.c
+index 75f59396a7..e1ba723104 100644
+--- a/lib/dns/master.c
++++ b/lib/dns/master.c
+@@ -800,7 +800,8 @@ generate(dns_loadctx_t *lctx, char *range, char *lhs, char *gtype, char *rhs,
+ 	isc_buffer_t target;
+ 	isc_result_t result;
+ 	isc_textregion_t r;
+-	int i, n, start, stop, step = 0;
++	int n, start, stop, step = 0;
++	unsigned int i;
+ 	dns_incctx_t *ictx;
+ 	char dummy[2];
+ 
+@@ -855,7 +856,7 @@ generate(dns_loadctx_t *lctx, char *range, char *lhs, char *gtype, char *rhs,
+ 		goto insist_cleanup;
+ 	}
+ 
+-	for (i = start; i <= stop; i += step) {
++	for (i = start; i <= (unsigned int)stop; i += step) {
+ 		result = genname(lhs, i, lhsbuf, DNS_MASTER_LHS);
+ 		if (result != ISC_R_SUCCESS) {
+ 			goto error_cleanup;
+-- 
+2.23.0
+
diff --git a/backport-0024-add-a-system-test-for-GENERATE-with-an-integer-overf.patch b/backport-0024-add-a-system-test-for-GENERATE-with-an-integer-overf.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6a47a599be3ac18fc95879a165718008f9de12dc
--- /dev/null
+++ b/backport-0024-add-a-system-test-for-GENERATE-with-an-integer-overf.patch
@@ -0,0 +1,68 @@
+From 975a3da84e3eb1f3825e486ebda384b73163ee65 Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Fri, 4 Mar 2022 15:19:52 -0800
+Subject: [PATCH] add a system test for $GENERATE with an integer overflow
+
+the line "$GENERATE 19-28/2147483645 $ CNAME x" should generate
+a single CNAME with the owner "19.example.com", but prior to the
+overflow bug it generated several CNAMEs, half of them with large
+negative values.
+
+we now test for the bugfix by using "named-checkzone -D" and
+grepping for a single CNAME in the output.
+
+(cherry picked from commit bd814b79d4a87faf80e306d705a6a9cc0ae08c11)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/975a3da84e3eb1f3825e486ebda384b73163ee65
+---
+ bin/tests/system/checkzone/tests.sh             | 10 ++++++++++
+ .../system/checkzone/zones/generate-overflow.db | 17 +++++++++++++++++
+ 2 files changed, 27 insertions(+)
+ create mode 100644 bin/tests/system/checkzone/zones/generate-overflow.db
+
+diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh
+index 1e772f9d72..ab2a54db84 100644
+--- a/bin/tests/system/checkzone/tests.sh
++++ b/bin/tests/system/checkzone/tests.sh
+@@ -184,5 +184,15 @@ n=$((n+1))
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+ status=$((status+ret))
+ 
++n=$((n+1))
++ret=0
++echo_i "checking integer overflow is prevented in \$GENERATE ($n)"
++$CHECKZONE -D example.com zones/generate-overflow.db > test.out.$n 2>&1 || ret=1
++lines=$(grep -c CNAME test.out.$n)
++echo $lines
++[ "$lines" -eq 1 ] || ret=1
++if [ $ret != 0 ]; then echo_i "failed"; fi
++status=$((status+ret))
++
+ echo_i "exit status: $status"
+ [ $status -eq 0 ] || exit 1
+diff --git a/bin/tests/system/checkzone/zones/generate-overflow.db b/bin/tests/system/checkzone/zones/generate-overflow.db
+new file mode 100644
+index 0000000000..c16b517481
+--- /dev/null
++++ b/bin/tests/system/checkzone/zones/generate-overflow.db
+@@ -0,0 +1,17 @@
++; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++;
++; SPDX-License-Identifier: MPL-2.0
++;
++; This Source Code Form is subject to the terms of the Mozilla Public
++; License, v. 2.0.  If a copy of the MPL was not distributed with this
++; file, you can obtain one at https://mozilla.org/MPL/2.0/.
++;
++; See the COPYRIGHT file distributed with this work for additional
++; information regarding copyright ownership.
++
++$TTL 600
++@		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
++		NS	ns
++ns		A	192.0.2.1
++
++$GENERATE 19-28/2147483645	$ CNAME x
+-- 
+2.27.0
+
diff --git a/backport-0024-update-shell-syntax.patch b/backport-0024-update-shell-syntax.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bb0c6f404842e9740cd85228a0a5e037ec1d7472
--- /dev/null
+++ b/backport-0024-update-shell-syntax.patch
@@ -0,0 +1,172 @@
+From fc7ed00d70e616d3cce026dc35fc9b19a7598b9f Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Fri, 4 Mar 2022 15:13:25 -0800
+Subject: [PATCH] update shell syntax
+
+clean up the shell syntax in the checkzone test prior to adding
+a new test.
+
+(cherry picked from commit 2261c853b521e60500ed355961646bc2d3b0ed06)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/fc7ed00d70e616d3cce026dc35fc9b19a7598b9f
+---
+ bin/tests/system/checkzone/tests.sh | 54 ++++++++++++++---------------
+ 1 file changed, 27 insertions(+), 27 deletions(-)
+
+diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh
+index 10c218925c..1e772f9d72 100644
+--- a/bin/tests/system/checkzone/tests.sh
++++ b/bin/tests/system/checkzone/tests.sh
+@@ -30,9 +30,9 @@ do
+ 		$CHECKZONE -i local example $db > test.out.$n 2>&1 || ret=1
+ 		;;
+ 	esac
+-	n=`expr $n + 1`
++	n=$((n+1))
+ 	if [ $ret != 0 ]; then echo_i "failed"; fi
+-	status=`expr $status + $ret`
++	status=$((status+ret))
+ done
+ 
+ for db in zones/bad*.db
+@@ -48,9 +48,9 @@ do
+ 		;;
+ 	esac
+ 	test $v = 1 || ret=1
+-	n=`expr $n + 1`
++	n=$((n+1))
+ 	if [ $ret != 0 ]; then echo_i "failed"; fi
+-	status=`expr $status + $ret`
++	status=$((status+ret))
+ done
+ 
+ echo_i "checking with journal file ($n)"
+@@ -58,16 +58,16 @@ ret=0
+ $CHECKZONE -D -o test.orig.db test zones/test1.db > /dev/null 2>&1 || ret=1
+ $CHECKZONE -D -o test.changed.db test zones/test2.db > /dev/null 2>&1 || ret=1
+ $MAKEJOURNAL test test.orig.db test.changed.db test.orig.db.jnl 2>&1 || ret=1
+-jlines=`$JOURNALPRINT test.orig.db.jnl | wc -l`
++jlines=$($JOURNALPRINT test.orig.db.jnl | wc -l)
+ [ $jlines = 3 ] || ret=1
+ $CHECKZONE -D -j -o test.out1.db test test.orig.db > /dev/null 2>&1 || ret=1
+ cmp -s test.changed.db test.out1.db || ret=1
+ mv -f test.orig.db.jnl test.journal
+ $CHECKZONE -D -J test.journal -o test.out2.db test test.orig.db > /dev/null 2>&1 || ret=1
+ cmp -s test.changed.db test.out2.db || ret=1
+-n=`expr $n + 1`
++n=$((n+1))
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "checking with spf warnings ($n)"
+ ret=0
+@@ -79,25 +79,25 @@ grep "'example' found type SPF" test.out1.$n > /dev/null && ret=1
+ grep "'x.example' found type SPF" test.out2.$n > /dev/null && ret=1
+ grep "'y.example' found type SPF" test.out2.$n > /dev/null && ret=1
+ grep "'example' found type SPF" test.out2.$n > /dev/null && ret=1
+-n=`expr $n + 1`
++n=$((n+1))
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "checking with max ttl (text) ($n)"
+ ret=0
+ $CHECKZONE -l 300 example zones/good1.db > test.out1.$n 2>&1 && ret=1
+ $CHECKZONE -l 600 example zones/good1.db > test.out2.$n 2>&1 || ret=1
+-n=`expr $n + 1`
++n=$((n+1))
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "checking with max ttl (raw) ($n)"
+ ret=0
+ $CHECKZONE -f raw -l 300 example good1.db.raw > test.out1.$n 2>&1 && ret=1
+ $CHECKZONE -f raw -l 600 example good1.db.raw > test.out2.$n 2>&1 || ret=1
+-n=`expr $n + 1`
++n=$((n+1))
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "checking with max ttl (map) ($n)"
+ ret=0
+@@ -111,33 +111,33 @@ echo_i "checking for no 'inherited owner' warning on '\$INCLUDE file' with no ne
+ ret=0
+ $CHECKZONE example zones/nowarn.inherited.owner.db > test.out1.$n 2>&1 || ret=1
+ grep "inherited.owner" test.out1.$n > /dev/null && ret=1
+-n=`expr $n + 1`
++n=$((n+1))
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "checking for 'inherited owner' warning on '\$ORIGIN + \$INCLUDE file' ($n)"
+ ret=0
+ $CHECKZONE example zones/warn.inherit.origin.db > test.out1.$n 2>&1 || ret=1
+ grep "inherited.owner" test.out1.$n > /dev/null || ret=1
+-n=`expr $n + 1`
++n=$((n+1))
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "checking for 'inherited owner' warning on '\$INCLUDE file origin' ($n)"
+ ret=0
+ $CHECKZONE example zones/warn.inherited.owner.db > test.out1.$n 2>&1 || ret=1
+ grep "inherited.owner" test.out1.$n > /dev/null || ret=1
+-n=`expr $n + 1`
++n=$((n+1))
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "checking that raw zone with bad class is handled ($n)"
+ ret=0
+ $CHECKZONE -f raw example zones/bad-badclass.raw > test.out.$n 2>&1 && ret=1
+ grep "failed: bad class" test.out.$n >/dev/null || ret=1
+-n=`expr $n + 1`
++n=$((n+1))
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "checking that expirations that loop using serial arithmetic are handled ($n)"
+ ret=0
+@@ -164,25 +164,25 @@ test $ret -eq 1 || $CHECKZONE $q dyn.example.net zones/crashzone.db || ret=1
+ test $ret -eq 1 || $CHECKZONE $q dyn.example.net zones/crashzone.db || ret=1
+ test $ret -eq 1 || $CHECKZONE $q dyn.example.net zones/crashzone.db || ret=1
+ test $ret -eq 1 || $CHECKZONE $q dyn.example.net zones/crashzone.db || ret=1
+-n=`expr $n + 1`
++n=$((n+1))
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "checking that nameserver below DNAME is reported even with occulted address record present ($n)"
+ ret=0
+ $CHECKZONE example.com zones/ns-address-below-dname.db > test.out.$n 2>&1 && ret=1
+ grep "is below a DNAME" test.out.$n >/dev/null || ret=1
+-n=`expr $n + 1`
++n=$((n+1))
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "checking that delegating nameserver below DNAME is reported even with occulted address record present ($n)"
+ ret=0
+ $CHECKZONE example.com zones/delegating-ns-address-below-dname.db > test.out.$n 2>&1 || ret=1
+ grep "is below a DNAME" test.out.$n >/dev/null || ret=1
+-n=`expr $n + 1`
++n=$((n+1))
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "exit status: $status"
+ [ $status -eq 0 ] || exit 1
+-- 
+2.23.0
+
diff --git a/backport-0025-Test-CDS-DELETE-persists-after-zone-sign.patch b/backport-0025-Test-CDS-DELETE-persists-after-zone-sign.patch
new file mode 100644
index 0000000000000000000000000000000000000000..59c4558f824f169c6f17005ab45ef1af18e410dd
--- /dev/null
+++ b/backport-0025-Test-CDS-DELETE-persists-after-zone-sign.patch
@@ -0,0 +1,297 @@
+From e5a5b23f410f60899453a713b98530f083647863 Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Mon, 10 Jan 2022 15:46:25 +0100
+Subject: [PATCH] Test CDS DELETE persists after zone sign
+
+Add a test case for a dynamically added CDS DELETE record and make
+sure it is not removed when signing the zone. This happens because
+BIND maintains CDS and CDNSKEY publishing and it will only allow
+CDS DELETE records if the zone is transitioning to insecure. This is
+a state that can be identified when using KASP through 'dnssec-policy',
+but not when using 'auto-dnssec'.
+
+(cherry picked from commit f08277f9fbbf3e38b855d6849c6d430d64bd3713)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/e5a5b23f410f60899453a713b98530f083647863
+---
+ bin/tests/system/autosign/clean.sh            |  2 +
+ bin/tests/system/autosign/ns2/keygen.sh       |  5 +-
+ .../autosign/ns3/cdnskey-delete.example.db.in | 28 +++++++
+ .../autosign/ns3/cds-delete.example.db.in     | 28 +++++++
+ bin/tests/system/autosign/ns3/keygen.sh       | 25 +++++-
+ bin/tests/system/autosign/ns3/named.conf.in   | 14 ++++
+ bin/tests/system/autosign/tests.sh            | 83 +++++++++++++++++++
+ 7 files changed, 180 insertions(+), 5 deletions(-)
+ create mode 100644 bin/tests/system/autosign/ns3/cdnskey-delete.example.db.in
+ create mode 100644 bin/tests/system/autosign/ns3/cds-delete.example.db.in
+
+diff --git a/bin/tests/system/autosign/clean.sh b/bin/tests/system/autosign/clean.sh
+index bb738af862..f4ab636e8e 100644
+--- a/bin/tests/system/autosign/clean.sh
++++ b/bin/tests/system/autosign/clean.sh
+@@ -35,6 +35,8 @@ rm -f ns2/private.secure.example.db ns2/bar.db
+ rm -f ns3/*.nzd ns3/*.nzd-lock ns3/*.nzf
+ rm -f ns3/*.nzf
+ rm -f ns3/autonsec3.example.db
++rm -f ns3/cdnskey-delete.example.db
++rm -f ns3/cds-delete.example.db
+ rm -f ns3/delzsk.example.db
+ rm -f ns3/dname-at-apex-nsec3.example.db
+ rm -f ns3/inacksk2.example.db
+diff --git a/bin/tests/system/autosign/ns2/keygen.sh b/bin/tests/system/autosign/ns2/keygen.sh
+index 8c9c80071c..383be7d3be 100644
+--- a/bin/tests/system/autosign/ns2/keygen.sh
++++ b/bin/tests/system/autosign/ns2/keygen.sh
+@@ -17,8 +17,9 @@ SYSTEMTESTTOP=../..
+ # Have the child generate subdomain keys and pass DS sets to us.
+ ( cd ../ns3 && $SHELL keygen.sh )
+ 
+-for subdomain in secure nsec3 autonsec3 optout rsasha256 rsasha512 nsec3-to-nsec oldsigs sync \
+-    dname-at-apex-nsec3
++for subdomain in secure nsec3 autonsec3 optout rsasha256 rsasha512 \
++		 nsec3-to-nsec oldsigs sync dname-at-apex-nsec3 cds-delete \
++		 cdnskey-delete
+ do
+ 	cp ../ns3/dsset-$subdomain.example$TP .
+ done
+diff --git a/bin/tests/system/autosign/ns3/cdnskey-delete.example.db.in b/bin/tests/system/autosign/ns3/cdnskey-delete.example.db.in
+new file mode 100644
+index 0000000000..3083a79f7d
+--- /dev/null
++++ b/bin/tests/system/autosign/ns3/cdnskey-delete.example.db.in
+@@ -0,0 +1,28 @@
++; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++;
++; SPDX-License-Identifier: MPL-2.0
++;
++; This Source Code Form is subject to the terms of the Mozilla Public
++; License, v. 2.0. If a copy of the MPL was not distributed with this
++; file, You can obtain one at http://mozilla.org/MPL/2.0/.
++;
++; See the COPYRIGHT file distributed with this work for additional
++; information regarding copyright ownership.
++
++$TTL 300	; 5 minutes
++@			IN SOA	mname1. . (
++				2009102722 ; serial
++				20         ; refresh (20 seconds)
++				20         ; retry (20 seconds)
++				1814400    ; expire (3 weeks)
++				3600       ; minimum (1 hour)
++				)
++			NS	ns
++ns			A	10.53.0.3
++
++a			A	10.0.0.1
++b			A	10.0.0.2
++d			A	10.0.0.4
++z			A	10.0.0.26
++a.a.a.a.a.a.a.a.a.a.e	A	10.0.0.27
++x			CNAME	a
+diff --git a/bin/tests/system/autosign/ns3/cds-delete.example.db.in b/bin/tests/system/autosign/ns3/cds-delete.example.db.in
+new file mode 100644
+index 0000000000..3083a79f7d
+--- /dev/null
++++ b/bin/tests/system/autosign/ns3/cds-delete.example.db.in
+@@ -0,0 +1,28 @@
++; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++;
++; SPDX-License-Identifier: MPL-2.0
++;
++; This Source Code Form is subject to the terms of the Mozilla Public
++; License, v. 2.0. If a copy of the MPL was not distributed with this
++; file, You can obtain one at http://mozilla.org/MPL/2.0/.
++;
++; See the COPYRIGHT file distributed with this work for additional
++; information regarding copyright ownership.
++
++$TTL 300	; 5 minutes
++@			IN SOA	mname1. . (
++				2009102722 ; serial
++				20         ; refresh (20 seconds)
++				20         ; retry (20 seconds)
++				1814400    ; expire (3 weeks)
++				3600       ; minimum (1 hour)
++				)
++			NS	ns
++ns			A	10.53.0.3
++
++a			A	10.0.0.1
++b			A	10.0.0.2
++d			A	10.0.0.4
++z			A	10.0.0.26
++a.a.a.a.a.a.a.a.a.a.e	A	10.0.0.27
++x			CNAME	a
+diff --git a/bin/tests/system/autosign/ns3/keygen.sh b/bin/tests/system/autosign/ns3/keygen.sh
+index 52b439f2bf..23d69f2fd5 100644
+--- a/bin/tests/system/autosign/ns3/keygen.sh
++++ b/bin/tests/system/autosign/ns3/keygen.sh
+@@ -333,7 +333,7 @@ $KEYGEN -a $DEFAULT_ALGORITHM -3 -q -P now -A now+3600 $zone > kg.out 2>&1 || du
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+-#  A zone that starts with a active KSK + ZSK and a inactive ZSK.
++# A zone that starts with a active KSK + ZSK and a inactive ZSK.
+ #
+ setup inacksk3.example
+ cp $infile $zonefile
+@@ -343,7 +343,7 @@ $KEYGEN -a $DEFAULT_ALGORITHM -3 -q $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
+ 
+ #
+-#  A zone that starts with a active KSK + ZSK and a inactive ZSK.
++# A zone that starts with a active KSK + ZSK and a inactive ZSK.
+ #
+ setup inaczsk3.example
+ cp $infile $zonefile
+@@ -364,10 +364,29 @@ zsk=`$KEYGEN -a $DEFAULT_ALGORITHM -3 -q -I now-1w $zone 2>kg.out` || dumpit kg.
+ echo $zsk > ../delzsk.key
+ 
+ #
+-#  Check that NSEC3 are correctly signed and returned from below a DNAME
++# Check that NSEC3 are correctly signed and returned from below a DNAME
+ #
+ setup dname-at-apex-nsec3.example
+ cp $infile $zonefile
+ ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
+ $KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone > kg.out 2>&1 || dumpit kg.out
+ $DSFROMKEY $ksk.key > dsset-${zone}$TP
++
++#
++# Check that dynamically added CDS (DELETE) is kept in the zone after signing.
++#
++setup cds-delete.example
++cp $infile $zonefile
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone > kg.out 2>&1 || dumpit kg.out
++$DSFROMKEY $ksk.key > dsset-${zone}$TP
++
++#
++# Check that dynamically added CDNSKEY (DELETE) is kept in the zone after
++# signing.
++#
++setup cdnskey-delete.example
++cp $infile $zonefile
++ksk=`$KEYGEN -q -a $DEFAULT_ALGORITHM -3 -fk $zone 2> kg.out` || dumpit kg.out
++$KEYGEN -q -a $DEFAULT_ALGORITHM -3 $zone > kg.out 2>&1 || dumpit kg.out
++$DSFROMKEY $ksk.key > dsset-${zone}$TP
+diff --git a/bin/tests/system/autosign/ns3/named.conf.in b/bin/tests/system/autosign/ns3/named.conf.in
+index 66d0e027a5..8f2eb5675a 100644
+--- a/bin/tests/system/autosign/ns3/named.conf.in
++++ b/bin/tests/system/autosign/ns3/named.conf.in
+@@ -317,4 +317,18 @@ zone "dname-at-apex-nsec3.example" {
+ 	auto-dnssec maintain;
+ };
+ 
++zone "cds-delete.example" {
++	type primary;
++	file "cds-delete.example.db";
++	allow-update { any; };
++	auto-dnssec maintain;
++};
++
++zone "cdnskey-delete.example" {
++	type primary;
++	file "cdnskey-delete.example.db";
++	allow-update { any; };
++	auto-dnssec maintain;
++};
++
+ include "trusted.conf";
+diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
+index 448de3c55c..962ca4e546 100755
+--- a/bin/tests/system/autosign/tests.sh
++++ b/bin/tests/system/autosign/tests.sh
+@@ -1638,6 +1638,89 @@ inac=`grep "DNSKEY .* is now inactive" ns1/named.run | wc -l`
+ [ "$inac" -eq 1 ] || ret=1
+ del=`grep "DNSKEY .* is now deleted" ns1/named.run | wc -l`
+ [ "$del" -eq 1 ] || ret=1
++n=`expr $n + 1`
++if [ $ret != 0 ]; then echo_i "failed"; fi
++status=`expr $status + $ret`
++
++echo_i "checking that CDS (DELETE) persists after zone sign ($n)"
++echo_i "update add cds-delete.example. CDS 0 0 00"
++ret=0
++$NSUPDATE > nsupdate.out 2>&1 <<END
++server 10.53.0.3 ${PORT}
++zone cds-delete.example.
++update add cds-delete.example. 3600 CDS 0 0 0 00
++send
++END
++
++_cds_delete() (
++	$DIG $DIGOPTS +noall +answer $1 cds @10.53.0.3 > dig.out.ns3.test$n || return 1
++	grep "CDS.*0.*0.*0.*00" dig.out.ns3.test$n > /dev/null 2>&1 || return 1
++	return 0
++)
++_cdnskey_delete_nx() {
++	$DIG $DIGOPTS +noall +answer $1 cdnskey @10.53.0.3 > dig.out.ns3.test$n || return 1
++	grep "CDNSKEY.*0.*3.*0.*AA==" dig.out.ns3.test$n > /dev/null 2>&1 && return 1
++	return 0
++}
++
++echo_i "query cds-delete.example. CDS"
++retry_quiet 10 _cds_delete cds-delete.example. || ret=1
++echo_i "query cds-delete.example. CDNSKEY"
++retry_quiet 1 _cdnskey_delete_nx cds-delete.example. || ret=1
++
++echo_i "sign cds-delete.example."
++nextpart ns3/named.run >/dev/null
++$RNDCCMD 10.53.0.3 sign cds-delete.example > /dev/null 2>&1 || ret=1
++wait_for_log 10 "zone cds-delete.example/IN: next key event" ns3/named.run
++# The CDS (DELETE) record should still be here.
++echo_i "query cds-delete.example. CDS"
++retry_quiet 1 _cds_delete cds-delete.example. || ret=1
++# The CDNSKEY (DELETE) record should still not be added.
++echo_i "query cds-delete.example. CDNSKEY"
++retry_quiet 1 _cdnskey_delete_nx cds-delete.example. || ret=1
++
++n=`expr $n + 1`
++if [ $ret != 0 ]; then echo_i "failed"; fi
++status=`expr $status + $ret`
++
++echo_i "checking that CDNSKEY (DELETE) persists after zone sign ($n)"
++echo_i "update add cdnskey-delete.example. CDNSKEY 0 3 0 AA=="
++ret=0
++$NSUPDATE > nsupdate.out 2>&1 <<END
++server 10.53.0.3 ${PORT}
++zone cdnskey-delete.example.
++update add cdnskey-delete.example. 3600 CDNSKEY 0 3 0 AA==
++send
++END
++
++_cds_delete_nx() (
++	$DIG $DIGOPTS +noall +answer $1 cds @10.53.0.3 > dig.out.ns3.test$n || return 1
++	grep "CDS.*0.*0.*0.*00" dig.out.ns3.test$n > /dev/null 2>&1 && return 1
++	return 0
++)
++_cdnskey_delete() {
++	$DIG $DIGOPTS +noall +answer $1 cdnskey @10.53.0.3 > dig.out.ns3.test$n || return 1
++	grep "CDNSKEY.*0.*3.*0.*AA==" dig.out.ns3.test$n > /dev/null 2>&1 || return 1
++	return 0
++}
++
++echo_i "query cdnskey-delete.example. CDNSKEY"
++retry_quiet 10 _cdnskey_delete cdnskey-delete.example. || ret=1
++echo_i "query cdnskey-delete.example. CDS"
++retry_quiet 1 _cds_delete_nx cdnskey-delete.example. || ret=1
++
++echo_i "sign cdsnskey-delete.example."
++nextpart ns3/named.run >/dev/null
++$RNDCCMD 10.53.0.3 sign cdnskey-delete.example > /dev/null 2>&1 || ret=1
++wait_for_log 10 "zone cdnskey-delete.example/IN: next key event" ns3/named.run
++# The CDNSKEY (DELETE) record should still be here.
++echo_i "query cdnskey-delete.example. CDNSKEY"
++retry_quiet 1 _cdnskey_delete cdnskey-delete.example. || ret=1
++# The CDS (DELETE) record should still not be added.
++echo_i "query cdnskey-delete.example. CDS"
++retry_quiet 1 _cds_delete_nx cdnskey-delete.example. || ret=1
++
++n=`expr $n + 1`
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+ status=`expr $status + $ret`
+ 
+-- 
+2.23.0
+
diff --git a/backport-0025-Update-dns_dnssec_syncdelete-function.patch b/backport-0025-Update-dns_dnssec_syncdelete-function.patch
new file mode 100644
index 0000000000000000000000000000000000000000..97773ca616f9164af3746436995f38ad14cfa309
--- /dev/null
+++ b/backport-0025-Update-dns_dnssec_syncdelete-function.patch
@@ -0,0 +1,264 @@
+From 42f43cebdd6887d42e9b440c2f2e15dd0812f252 Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Mon, 10 Jan 2022 17:18:47 +0100
+Subject: [PATCH] Update dns_dnssec_syncdelete() function
+
+Update the function that synchronizes the CDS and CDNSKEY DELETE
+records. It now allows for the possibility that the CDS DELETE record
+is published and the CDNSKEY DELETE record is not, and vice versa.
+
+Also update the code in zone.c how 'dns_dnssec_syncdelete()' is called.
+
+With KASP, we still maintain the DELETE records our self. Otherwise,
+we publish the CDS and CDNSKEY DELETE record only if they are added
+to the zone. We do still check if these records can be signed by a KSK.
+
+This change will allow users to add a CDS and/or CDNSKEY DELETE record
+manually, without BIND removing them on the next zone sign.
+
+Note that this commit removes the check whether the key is a KSK, this
+check is redundant because this check is also made in
+'dst_key_is_signing()' when the role is set to DST_BOOL_KSK.
+
+(cherry picked from commit 3d05c99abbfc34644ffeffe2884b6335fc12e055)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/42f43cebdd6887d42e9b440c2f2e15dd0812f252
+---
+ lib/dns/dnssec.c             | 44 +++++++++---------
+ lib/dns/include/dns/dnssec.h |  9 ++--
+ lib/dns/zone.c               | 87 +++++++++++++++++++++++++++++-------
+ 3 files changed, 99 insertions(+), 41 deletions(-)
+
+diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
+index f9ae6acbb4..64c72b5d7a 100644
+--- a/lib/dns/dnssec.c
++++ b/lib/dns/dnssec.c
+@@ -2147,7 +2147,7 @@ isc_result_t
+ dns_dnssec_syncdelete(dns_rdataset_t *cds, dns_rdataset_t *cdnskey,
+ 		      dns_name_t *origin, dns_rdataclass_t zclass,
+ 		      dns_ttl_t ttl, dns_diff_t *diff, isc_mem_t *mctx,
+-		      bool dnssec_insecure) {
++		      bool expect_cds_delete, bool expect_cdnskey_delete) {
+ 	unsigned char dsbuf[5] = { 0, 0, 0, 0, 0 };  /* CDS DELETE rdata */
+ 	unsigned char keybuf[5] = { 0, 0, 3, 0, 0 }; /* CDNSKEY DELETE rdata */
+ 	char namebuf[DNS_NAME_FORMATSIZE];
+@@ -2167,26 +2167,39 @@ dns_dnssec_syncdelete(dns_rdataset_t *cds, dns_rdataset_t *cdnskey,
+ 
+ 	dns_name_format(origin, namebuf, sizeof(namebuf));
+ 
+-	if (dnssec_insecure) {
+-		if (!dns_rdataset_isassociated(cdnskey) ||
+-		    !exists(cdnskey, &cdnskey_delete)) {
++	if (expect_cds_delete) {
++		if (!dns_rdataset_isassociated(cds) ||
++		    !exists(cds, &cds_delete)) {
+ 			isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
+ 				      DNS_LOGMODULE_DNSSEC, ISC_LOG_INFO,
+-				      "CDNSKEY (DELETE) for zone %s is now "
++				      "CDS (DELETE) for zone %s is now "
+ 				      "published",
+ 				      namebuf);
+-			RETERR(addrdata(&cdnskey_delete, diff, origin, ttl,
++			RETERR(addrdata(&cds_delete, diff, origin, ttl, mctx));
++		}
++	} else {
++		if (dns_rdataset_isassociated(cds) && exists(cds, &cds_delete))
++		{
++			isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
++				      DNS_LOGMODULE_DNSSEC, ISC_LOG_INFO,
++				      "CDS (DELETE) for zone %s is now "
++				      "deleted",
++				      namebuf);
++			RETERR(delrdata(&cds_delete, diff, origin, cds->ttl,
+ 					mctx));
+ 		}
++	}
+ 
+-		if (!dns_rdataset_isassociated(cds) ||
+-		    !exists(cds, &cds_delete)) {
++	if (expect_cdnskey_delete) {
++		if (!dns_rdataset_isassociated(cdnskey) ||
++		    !exists(cdnskey, &cdnskey_delete)) {
+ 			isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
+ 				      DNS_LOGMODULE_DNSSEC, ISC_LOG_INFO,
+-				      "CDS (DELETE) for zone %s is now "
++				      "CDNSKEY (DELETE) for zone %s is now "
+ 				      "published",
+ 				      namebuf);
+-			RETERR(addrdata(&cds_delete, diff, origin, ttl, mctx));
++			RETERR(addrdata(&cdnskey_delete, diff, origin, ttl,
++					mctx));
+ 		}
+ 	} else {
+ 		if (dns_rdataset_isassociated(cdnskey) &&
+@@ -2199,17 +2212,6 @@ dns_dnssec_syncdelete(dns_rdataset_t *cds, dns_rdataset_t *cdnskey,
+ 			RETERR(delrdata(&cdnskey_delete, diff, origin,
+ 					cdnskey->ttl, mctx));
+ 		}
+-
+-		if (dns_rdataset_isassociated(cds) && exists(cds, &cds_delete))
+-		{
+-			isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
+-				      DNS_LOGMODULE_DNSSEC, ISC_LOG_INFO,
+-				      "CDS (DELETE) for zone %s is now "
+-				      "deleted",
+-				      namebuf);
+-			RETERR(delrdata(&cds_delete, diff, origin, cds->ttl,
+-					mctx));
+-		}
+ 	}
+ 
+ 	result = ISC_R_SUCCESS;
+diff --git a/lib/dns/include/dns/dnssec.h b/lib/dns/include/dns/dnssec.h
+index 0ac96fceb5..9791ef128d 100644
+--- a/lib/dns/include/dns/dnssec.h
++++ b/lib/dns/include/dns/dnssec.h
+@@ -370,11 +370,14 @@ isc_result_t
+ dns_dnssec_syncdelete(dns_rdataset_t *cds, dns_rdataset_t *cdnskey,
+ 		      dns_name_t *origin, dns_rdataclass_t zclass,
+ 		      dns_ttl_t ttl, dns_diff_t *diff, isc_mem_t *mctx,
+-		      bool dnssec_insecure);
++		      bool expect_cds_delete, bool expect_cdnskey_delete);
+ /*%<
+  * Add or remove the CDS DELETE record and the CDNSKEY DELETE record.
+- * If 'dnssec_insecure' is true, the DELETE records should be present.
+- * Otherwise, the DELETE records must be removed from the RRsets (if present).
++ * If 'expect_cds_delete' is true, the CDS DELETE record should be present.
++ * Otherwise, the CDS DELETE record must be removed from the RRsets (if
++ * present). If 'expect_cdnskey_delete' is true, the CDNSKEY DELETE record
++ * should be present. Otherwise, the CDNSKEY DELETE record must be removed
++ * from the RRsets (if present).
+  *
+  * Returns:
+  *\li   ISC_R_SUCCESS
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 131e3200d2..76f03683de 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -21483,16 +21483,69 @@ zone_rekey(dns_zone_t *zone) {
+ 	KASP_UNLOCK(kasp);
+ 
+ 	if (result == ISC_R_SUCCESS) {
+-		bool cds_delete = false;
++		bool cdsdel = false;
++		bool cdnskeydel = false;
+ 		isc_stdtime_t when;
+ 
+ 		/*
+ 		 * Publish CDS/CDNSKEY DELETE records if the zone is
+ 		 * transitioning from secure to insecure.
+ 		 */
+-		if (kasp != NULL &&
+-		    strcmp(dns_kasp_getname(kasp), "insecure") == 0) {
+-			cds_delete = true;
++		if (kasp != NULL) {
++			if (strcmp(dns_kasp_getname(kasp), "insecure") == 0) {
++				cdsdel = true;
++				cdnskeydel = true;
++			}
++		} else {
++			/* Check if there is a CDS DELETE record. */
++			if (dns_rdataset_isassociated(&cdsset)) {
++				for (result = dns_rdataset_first(&cdsset);
++				     result == ISC_R_SUCCESS;
++				     result = dns_rdataset_next(&cdsset))
++				{
++					dns_rdata_t crdata = DNS_RDATA_INIT;
++					dns_rdataset_current(&cdsset, &crdata);
++					/*
++					 * CDS deletion record has this form
++					 * "0 0 0 00" which is 5 zero octets.
++					 */
++					if (crdata.length == 5U &&
++					    memcmp(crdata.data,
++						   (unsigned char[5]){ 0, 0, 0,
++								       0, 0 },
++						   5) == 0)
++					{
++						cdsdel = true;
++						break;
++					}
++				}
++			}
++
++			/* Check if there is a CDNSKEY DELETE record. */
++			if (dns_rdataset_isassociated(&cdnskeyset)) {
++				for (result = dns_rdataset_first(&cdnskeyset);
++				     result == ISC_R_SUCCESS;
++				     result = dns_rdataset_next(&cdnskeyset))
++				{
++					dns_rdata_t crdata = DNS_RDATA_INIT;
++					dns_rdataset_current(&cdnskeyset,
++							     &crdata);
++					/*
++					 * CDNSKEY deletion record has this form
++					 * "0 3 0 AA==" which is 2 zero octets,
++					 * a 3, and 2 zero octets.
++					 */
++					if (crdata.length == 5U &&
++					    memcmp(crdata.data,
++						   (unsigned char[5]){ 0, 0, 3,
++								       0, 0 },
++						   5) == 0)
++					{
++						cdnskeydel = true;
++						break;
++					}
++				}
++			}
+ 		}
+ 
+ 		/*
+@@ -21529,36 +21582,36 @@ zone_rekey(dns_zone_t *zone) {
+ 			goto failure;
+ 		}
+ 
+-		if (cds_delete) {
++		if (cdsdel || cdnskeydel) {
+ 			/*
+ 			 * Only publish CDS/CDNSKEY DELETE records if there is
+ 			 * a KSK that can be used to verify the RRset. This
+ 			 * means there must be a key with the KSK role that is
+ 			 * published and is used for signing.
+ 			 */
+-			cds_delete = false;
++			bool allow = false;
+ 			for (key = ISC_LIST_HEAD(dnskeys); key != NULL;
+ 			     key = ISC_LIST_NEXT(key, link)) {
+ 				dst_key_t *dstk = key->key;
+-				bool ksk = false;
+-				(void)dst_key_getbool(dstk, DST_BOOL_KSK, &ksk);
+-				if (!ksk) {
+-					continue;
+-				}
+ 
+-				if (dst_key_haskasp(dstk) &&
+-				    dst_key_is_published(dstk, now, &when) &&
++				if (dst_key_is_published(dstk, now, &when) &&
+ 				    dst_key_is_signing(dstk, DST_BOOL_KSK, now,
+ 						       &when))
+ 				{
+-					cds_delete = true;
++					allow = true;
+ 					break;
+ 				}
+ 			}
++			if (cdsdel) {
++				cdsdel = allow;
++			}
++			if (cdnskeydel) {
++				cdnskeydel = allow;
++			}
+ 		}
+-		result = dns_dnssec_syncdelete(&cdsset, &cdnskeyset,
+-					       &zone->origin, zone->rdclass,
+-					       ttl, &diff, mctx, cds_delete);
++		result = dns_dnssec_syncdelete(
++			&cdsset, &cdnskeyset, &zone->origin, zone->rdclass, ttl,
++			&diff, mctx, cdsdel, cdnskeydel);
+ 		if (result != ISC_R_SUCCESS) {
+ 			dnssec_log(zone, ISC_LOG_ERROR,
+ 				   "zone_rekey:couldn't update CDS/CDNSKEY "
+-- 
+2.23.0
+
diff --git a/backport-0026-Check-that-pending-negative-cache-entries-for-DS-can.patch b/backport-0026-Check-that-pending-negative-cache-entries-for-DS-can.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ca1459b787b2bbff590429f75fbe890d31afeca7
--- /dev/null
+++ b/backport-0026-Check-that-pending-negative-cache-entries-for-DS-can.patch
@@ -0,0 +1,118 @@
+From b5f2ab9cd4e7d0fbcdce35e39e8b81f37699b5ad Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Thu, 14 Apr 2022 10:57:11 +1000
+Subject: [PATCH] Check that pending negative cache entries for DS can be used
+ successfully
+
+Prime the cache with a negative cache DS entry then make a query for
+name beneath that entry. This will cause the DS entry to be retieved
+as part of the validation process.  Each RRset in the ncache entry
+will be validated and the trust level for each will be updated.
+
+(cherry picked from commit d2d9910da23951bf310c7be8ba68e1030eb13caa)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/b5f2ab9cd4e7d0fbcdce35e39e8b81f37699b5ad
+---
+ bin/tests/system/dnssec/ns2/example.db.in     |  4 +++
+ .../system/dnssec/ns3/insecure2.example.db    | 27 +++++++++++++++++++
+ bin/tests/system/dnssec/ns3/named.conf.in     |  6 +++++
+ bin/tests/system/dnssec/tests.sh              | 18 +++++++++++++
+ 4 files changed, 55 insertions(+)
+ create mode 100644 bin/tests/system/dnssec/ns3/insecure2.example.db
+
+diff --git a/bin/tests/system/dnssec/ns2/example.db.in b/bin/tests/system/dnssec/ns2/example.db.in
+index 5ec88013c9..f711f5823f 100644
+--- a/bin/tests/system/dnssec/ns2/example.db.in
++++ b/bin/tests/system/dnssec/ns2/example.db.in
+@@ -55,6 +55,10 @@ ns3.secure		A	10.53.0.3
+ insecure		NS	ns.insecure
+ ns.insecure		A	10.53.0.3
+ 
++; A second insecure subdomain
++insecure2		NS	ns.insecure2
++ns.insecure2		A	10.53.0.3
++
+ ; A secure subdomain we're going to inject bogus data into
+ bogus			NS	ns.bogus
+ ns.bogus		A	10.53.0.3
+diff --git a/bin/tests/system/dnssec/ns3/insecure2.example.db b/bin/tests/system/dnssec/ns3/insecure2.example.db
+new file mode 100644
+index 0000000000..76e3f47f21
+--- /dev/null
++++ b/bin/tests/system/dnssec/ns3/insecure2.example.db
+@@ -0,0 +1,27 @@
++; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++;
++; SPDX-License-Identifier: MPL-2.0
++;
++; This Source Code Form is subject to the terms of the Mozilla Public
++; License, v. 2.0.  If a copy of the MPL was not distributed with this
++; file, you can obtain one at https://mozilla.org/MPL/2.0/.
++;
++; See the COPYRIGHT file distributed with this work for additional
++; information regarding copyright ownership.
++
++$TTL 300	; 5 minutes
++@			IN SOA	mname1. . (
++				2000042407 ; serial
++				20         ; refresh (20 seconds)
++				20         ; retry (20 seconds)
++				1814400    ; expire (3 weeks)
++				3600       ; minimum (1 hour)
++				)
++			NS	ns
++ns			A	10.53.0.3
++
++a			A	10.0.0.1
++b			A	10.0.0.2
++d			A	10.0.0.4
++x			DNSKEY	258 3 5 Cg==
++z			A	10.0.0.26
+diff --git a/bin/tests/system/dnssec/ns3/named.conf.in b/bin/tests/system/dnssec/ns3/named.conf.in
+index 202f6a931d..bd0771dd49 100644
+--- a/bin/tests/system/dnssec/ns3/named.conf.in
++++ b/bin/tests/system/dnssec/ns3/named.conf.in
+@@ -78,6 +78,12 @@ zone "insecure.example" {
+ 	allow-update { any; };
+ };
+ 
++zone "insecure2.example" {
++	type primary;
++	file "insecure2.example.db";
++	allow-update { any; };
++};
++
+ zone "insecure.nsec3.example" {
+ 	type primary;
+ 	file "insecure.nsec3.example.db";
+diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
+index c6410ae79e..db3e19533e 100644
+--- a/bin/tests/system/dnssec/tests.sh
++++ b/bin/tests/system/dnssec/tests.sh
+@@ -4412,5 +4412,23 @@ n=$((n+1))
+ test "$ret" -eq 0 || echo_i "failed"
+ status=$((status+ret))
+ 
++# Check that a query against a validating resolver succeeds when there is
++# a negative cache entry with trust level "pending" for the DS.  Prime
++# with a +cd DS query to produce the negative cache entry, then send a
++# query that uses that entry as part of the validation process. [GL #3279]
++echo_i "check that pending negative DS cache entry validates ($n)"
++ret=0
++dig_with_opts @10.53.0.4 +cd insecure2.example. ds > dig.out.prime.ns4.test$n || ret=1
++grep "flags: qr rd ra cd;" dig.out.prime.ns4.test$n >/dev/null || ret=1
++grep "status: NOERROR" dig.out.prime.ns4.test$n >/dev/null || ret=1
++grep "ANSWER: 0, AUTHORITY: 4, " dig.out.prime.ns4.test$n > /dev/null || ret=1
++dig_with_opts @10.53.0.4 a.insecure2.example. a > dig.out.ns4.test$n || ret=1
++grep "ANSWER: 1, AUTHORITY: 1, " dig.out.ns4.test$n > /dev/null || ret=1
++grep "flags: qr rd ra;" dig.out.ns4.test$n >/dev/null || ret=1
++grep "status: NOERROR" dig.out.ns4.test$n >/dev/null || ret=1
++n=$((n+1))
++if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
++status=$((status+ret))
++
+ echo_i "exit status: $status"
+ [ $status -eq 0 ] || exit 1
+-- 
+2.23.0
+
diff --git a/backport-0026-Update-the-rdataset-trust-field-in-ncache.c-rdataset.patch b/backport-0026-Update-the-rdataset-trust-field-in-ncache.c-rdataset.patch
new file mode 100644
index 0000000000000000000000000000000000000000..417c4a08a262389c968e5cef2bb2dca3cae330f7
--- /dev/null
+++ b/backport-0026-Update-the-rdataset-trust-field-in-ncache.c-rdataset.patch
@@ -0,0 +1,31 @@
+From cb3c29cf8e77223d34f52e9fdf2ffb05337afe33 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Thu, 14 Apr 2022 11:16:32 +1000
+Subject: [PATCH] Update the rdataset->trust field in
+ ncache.c:rdataset_settrust
+
+Both the trust recorded in the slab stucture and the trust on
+rdataset need to be updated.
+
+(cherry picked from commit d043a41499f5cc52920841ca7332b7cce7460aad)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/cb3c29cf8e77223d34f52e9fdf2ffb05337afe33
+---
+ lib/dns/ncache.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
+index 2316eb04a7..7bea3d376c 100644
+--- a/lib/dns/ncache.c
++++ b/lib/dns/ncache.c
+@@ -504,6 +504,7 @@ rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) {
+ 	unsigned char *raw = rdataset->private3;
+ 
+ 	raw[-1] = (unsigned char)trust;
++	rdataset->trust = trust;
+ }
+ 
+ static dns_rdatasetmethods_t rdataset_methods = {
+-- 
+2.23.0
+
diff --git a/backport-0027-Prevent-memory-bloat-caused-by-a-jemalloc-quirk.patch b/backport-0027-Prevent-memory-bloat-caused-by-a-jemalloc-quirk.patch
new file mode 100644
index 0000000000000000000000000000000000000000..418214fc87f1ba20b323fb60991800cc364a9188
--- /dev/null
+++ b/backport-0027-Prevent-memory-bloat-caused-by-a-jemalloc-quirk.patch
@@ -0,0 +1,91 @@
+From e850946557469f2cbe4fab76d1c52227ddf81a93 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
+Date: Thu, 21 Apr 2022 14:19:39 +0200
+Subject: [PATCH] Prevent memory bloat caused by a jemalloc quirk
+
+Since version 5.0.0, decay-based purging is the only available dirty
+page cleanup mechanism in jemalloc.  It relies on so-called tickers,
+which are simple data structures used for ensuring that certain actions
+are taken "once every N times".  Ticker data (state) is stored in a
+thread-specific data structure called tsd in jemalloc parlance.  Ticks
+are triggered when extents are allocated and deallocated.  Once every
+1000 ticks, jemalloc attempts to release some of the dirty pages hanging
+around (if any).  This allows memory use to be kept in check over time.
+
+This dirty page cleanup mechanism has a quirk.  If the first
+allocator-related action for a given thread is a free(), a
+minimally-initialized tsd is set up which does not include ticker data.
+When that thread subsequently calls *alloc(), the tsd transitions to its
+nominal state, but due to a certain flag being set during minimal tsd
+initialization, ticker data remains unallocated.  This prevents
+decay-based dirty page purging from working, effectively enabling memory
+exhaustion over time. [1]
+
+The quirk described above has been addressed (by moving ticker state to
+a different structure) in jemalloc's development branch [2], but not in
+any numbered jemalloc version released to date (the latest one being
+5.2.1 as of this writing).
+
+Work around the problem by ensuring that every thread spawned by
+isc_thread_create() starts with a malloc() call.  Avoid immediately
+calling free() for the dummy allocation to prevent an optimizing
+compiler from stripping away the malloc() + free() pair altogether.
+
+An alternative implementation of this workaround was considered that
+used a pair of isc_mem_create() + isc_mem_destroy() calls instead of
+malloc() + free(), enabling the change to be fully contained within
+isc__trampoline_run() (i.e. to not touch struct isc__trampoline), as the
+compiler is not allowed to strip away arbitrary function calls.
+However, that solution was eventually dismissed as it triggered
+ThreadSanitizer reports when tools like dig, nsupdate, or rndc exited
+abruptly without waiting for all worker threads to finish their work.
+
+[1] https://github.com/jemalloc/jemalloc/issues/2251
+[2] https://github.com/jemalloc/jemalloc/commit/c259323ab3082324100c708109dbfff660d0f4b8
+
+(cherry picked from commit 7aa7b6474bc5ea2b4ec4806c7509dc5ea73396e1)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/e850946557469f2cbe4fab76d1c52227ddf81a93
+---
+ lib/isc/trampoline.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/lib/isc/trampoline.c b/lib/isc/trampoline.c
+index 4caa2e7574..e133c40084 100644
+--- a/lib/isc/trampoline.c
++++ b/lib/isc/trampoline.c
+@@ -31,6 +31,7 @@ struct isc__trampoline {
+ 	uintptr_t self;
+ 	isc_threadfunc_t start;
+ 	isc_threadarg_t arg;
++	void *jemalloc_enforce_init;
+ };
+ 
+ static isc_once_t isc__trampoline_initialize_once = ISC_ONCE_INIT;
+@@ -170,6 +171,7 @@ isc__trampoline_detach(isc__trampoline_t *trampoline) {
+ 		isc__trampoline_min = trampoline->tid;
+ 	}
+ 
++	free(trampoline->jemalloc_enforce_init);
+ 	free(trampoline);
+ 
+ 	UNLOCK(&isc__trampoline_lock);
+@@ -185,6 +187,15 @@ isc__trampoline_attach(isc__trampoline_t *trampoline) {
+ 	/* Initialize the trampoline */
+ 	isc_tid_v = trampoline->tid;
+ 	trampoline->self = isc_thread_self();
++
++	/*
++	 * Ensure every thread starts with a malloc() call to prevent memory
++	 * bloat caused by a jemalloc quirk.  While this dummy allocation is
++	 * not used for anything, free() must not be immediately called for it
++	 * so that an optimizing compiler does not strip away such a pair of
++	 * malloc() + free() calls altogether, as it would foil the fix.
++	 */
++	trampoline->jemalloc_enforce_init = malloc(8);
+ }
+ 
+ isc_threadresult_t
+-- 
+2.23.0
+
diff --git a/backport-0028-Ensure-diff-variable-is-not-read-uninitialized.patch b/backport-0028-Ensure-diff-variable-is-not-read-uninitialized.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b0707a670b3e16b42bb72769d36d038ef59dd30a
--- /dev/null
+++ b/backport-0028-Ensure-diff-variable-is-not-read-uninitialized.patch
@@ -0,0 +1,42 @@
+From 1bc75522035142a986466b321eefa42bb7bdb47a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Wed, 19 Jan 2022 13:35:32 +0100
+Subject: [PATCH] Ensure diff variable is not read uninitialized
+
+Coverity detected issues:
+- var_decl: Declaring variable "diff" without initializer.
+- uninit_use_in_call: Using uninitialized value "diff.tuples.head" when
+  calling "dns_diff_clear".
+
+(cherry picked from commit 67e773c93c2fe164e3791e0b843f724a6d9358d4)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/1bc75522035142a986466b321eefa42bb7bdb47a
+---
+ lib/dns/zone.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 76f03683de..b7b02ae5f9 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -23328,7 +23328,7 @@ setserial(isc_task_t *task, isc_event_t *event) {
+ 	ENTER;
+ 
+ 	if (zone->update_disabled) {
+-		goto failure;
++		goto disabled;
+ 	}
+ 
+ 	desired = sse->serial;
+@@ -23407,6 +23407,8 @@ failure:
+ 		dns_db_detach(&db);
+ 	}
+ 	dns_diff_clear(&diff);
++
++disabled:
+ 	isc_event_free(&event);
+ 	dns_zone_idetach(&zone);
+ 
+-- 
+2.23.0
+
diff --git a/backport-0029-Initialize-printed-buffer.patch b/backport-0029-Initialize-printed-buffer.patch
new file mode 100644
index 0000000000000000000000000000000000000000..37bedce9d92da150fc6ed96c796b209cb72d90df
--- /dev/null
+++ b/backport-0029-Initialize-printed-buffer.patch
@@ -0,0 +1,46 @@
+From 1e88c0196c427de538f8ddfd6c1c3c7dd72f11d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Wed, 19 Jan 2022 14:47:13 +0100
+Subject: [PATCH] Initialize printed buffer
+
+- var_decl: Declaring variable "tbuf" without initializer
+- assign: Assigning: "target.base" = "tbuf", which points to
+  uninitialized data
+- assign: Assigning: "r.base" = "target.base", which points to
+  uninitialized data
+
+I expect it would correctly initialize length always. Add simple
+initialization to silent coverity.
+
+(cherry picked from commit 59132bd3ec8a9f648a1e1cf59f5f3b2d59f17927)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/1e88c0196c427de538f8ddfd6c1c3c7dd72f11d5
+---
+ bin/dig/host.c | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/bin/dig/host.c b/bin/dig/host.c
+index 646c89783e..971cd974b7 100644
+--- a/bin/dig/host.c
++++ b/bin/dig/host.c
+@@ -208,15 +208,9 @@ printsection(dns_message_t *msg, dns_section_t sectionid,
+ 	isc_result_t result, loopresult;
+ 	isc_region_t r;
+ 	dns_name_t empty_name;
+-	char tbuf[4096];
++	char tbuf[4096] = { 0 };
+ 	bool first;
+-	bool no_rdata;
+-
+-	if (sectionid == DNS_SECTION_QUESTION) {
+-		no_rdata = true;
+-	} else {
+-		no_rdata = false;
+-	}
++	bool no_rdata = (sectionid == DNS_SECTION_QUESTION);
+ 
+ 	if (headers) {
+ 		printf(";; %s SECTION:\n", section_name);
+-- 
+2.23.0
+
diff --git a/backport-0030-Additional-safety-check-for-negative-array-index.patch b/backport-0030-Additional-safety-check-for-negative-array-index.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bc8d28c0a509026781f676bd6fd7a753888d4e16
--- /dev/null
+++ b/backport-0030-Additional-safety-check-for-negative-array-index.patch
@@ -0,0 +1,35 @@
+From c1b3862c4aef91b7b6a30c7cabb1f578839db83a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Wed, 19 Jan 2022 17:05:00 +0100
+Subject: [PATCH] Additional safety check for negative array index
+
+inet_ntop result should always protect against empty string accepted
+without an error. Make additional check to satisfy coverity scans.
+
+(cherry picked from commit 656a0f076f7f49d166b414d7cf5972d2919877d5)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/c1b3862c4aef91b7b6a30c7cabb1f578839db83a
+---
+ lib/dns/rdata.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
+index 2c94d11765..b44894adbe 100644
+--- a/lib/dns/rdata.c
++++ b/lib/dns/rdata.c
+@@ -1890,9 +1890,9 @@ inet_totext(int af, uint32_t flags, isc_region_t *src, isc_buffer_t *target) {
+ 	 * parsing, so append 0 in that case.
+ 	 */
+ 	if (af == AF_INET6 && (flags & DNS_STYLEFLAG_YAML) != 0) {
+-		isc_textregion_t tr;
+-		isc_buffer_usedregion(target, (isc_region_t *)&tr);
+-		if (tr.base[tr.length - 1] == ':') {
++		isc_region_t r;
++		isc_buffer_usedregion(target, &r);
++		if (r.length > 0 && r.base[r.length - 1] == ':') {
+ 			if (isc_buffer_availablelength(target) == 0) {
+ 				return (ISC_R_NOSPACE);
+ 			}
+-- 
+2.23.0
+
diff --git a/backport-0031-Fix-dig-nssearch-race-between-recv_done-and-send_don.patch b/backport-0031-Fix-dig-nssearch-race-between-recv_done-and-send_don.patch
new file mode 100644
index 0000000000000000000000000000000000000000..04df5063c65519b4935b4b76ed8f572dec25b521
--- /dev/null
+++ b/backport-0031-Fix-dig-nssearch-race-between-recv_done-and-send_don.patch
@@ -0,0 +1,77 @@
+From 1f2d2611ee23f0b9200dbea8a7b65fa9f3b86e3f Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Tue, 12 Apr 2022 13:00:45 +0000
+Subject: [PATCH] Fix dig +nssearch race between recv_done() and send_done()
+
+The `send_done()` callback needs to access query's `link.next` pointer
+when running in `+nssearch` mode, even if the query is already canceled
+or serviced, which can happen when `recv_done()` happens to be called
+earlier than `send_done()`.
+
+Keep the next query's pointer before unlinking the query from the
+lookup's queries list in `clear_query()` so that `send_done()` can
+use it even if the query is cleared.
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/1f2d2611ee23f0b9200dbea8a7b65fa9f3b86e3f
+---
+ bin/dig/dighost.c         | 8 ++++++--
+ bin/dig/include/dig/dig.h | 1 +
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
+index 27af3c80f1..e0ba9c2aae 100644
+--- a/bin/dig/dighost.c
++++ b/bin/dig/dighost.c
+@@ -1591,6 +1591,7 @@ clear_query(dig_query_t *query) {
+ 	}
+ 
+ 	if (ISC_LINK_LINKED(query, link)) {
++		query->saved_next = ISC_LIST_NEXT(query, link);
+ 		ISC_LIST_UNLINK(lookup->q, query, link);
+ 	}
+ 	if (ISC_LINK_LINKED(query, clink)) {
+@@ -1609,6 +1610,7 @@ clear_query(dig_query_t *query) {
+ 	isc_buffer_invalidate(&query->lengthbuf);
+ 
+ 	if (query->waiting_senddone) {
++		debug("waiting senddone, delay freeing query");
+ 		query->pending_free = true;
+ 	} else {
+ 		query->magic = 0;
+@@ -2583,6 +2585,7 @@ setup_lookup(dig_lookup_t *lookup) {
+ 
+ 		ISC_LINK_INIT(query, clink);
+ 		ISC_LINK_INIT(query, link);
++		query->saved_next = NULL;
+ 
+ 		query->magic = DIG_QUERY_MAGIC;
+ 
+@@ -2617,10 +2620,11 @@ send_done(isc_task_t *_task, isc_event_t *event) {
+ 	query->waiting_senddone = false;
+ 	l = query->lookup;
+ 
+-	if (!query->pending_free && l->ns_search_only && !l->trace_root &&
++	if (l == current_lookup && l->ns_search_only && !l->trace_root &&
+ 	    !l->tcp_mode) {
+ 		debug("sending next, since searching");
+-		next = ISC_LIST_NEXT(query, link);
++		next = query->pending_free ? query->saved_next
++					   : ISC_LIST_NEXT(query, link);
+ 		if (next != NULL) {
+ 			send_udp(next);
+ 		}
+diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
+index 79a868d1ef..9683e39892 100644
+--- a/bin/dig/include/dig/dig.h
++++ b/bin/dig/include/dig/dig.h
+@@ -183,6 +183,7 @@ struct dig_query {
+ 	isc_socket_t *sock;
+ 	ISC_LINK(dig_query_t) link;
+ 	ISC_LINK(dig_query_t) clink;
++	dig_query_t   *saved_next;
+ 	isc_sockaddr_t sockaddr;
+ 	isc_time_t     time_sent;
+ 	isc_time_t     time_recv;
+-- 
+2.23.0
+
diff --git a/backport-0032-Add-test-cases-using-static-and-static-stub-zones.patch b/backport-0032-Add-test-cases-using-static-and-static-stub-zones.patch
new file mode 100644
index 0000000000000000000000000000000000000000..22d130cac6beeabe81104bae9d00b151a3a34940
--- /dev/null
+++ b/backport-0032-Add-test-cases-using-static-and-static-stub-zones.patch
@@ -0,0 +1,308 @@
+From 967e5e09cd80bd74f96ad49d65b564ac58023f0c Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Mon, 28 Mar 2022 16:36:03 +1100
+Subject: [PATCH] Add test cases using static and static-stub zones
+
+RPZ NSIP and NSDNAME checks were failing with "unrecognized NS
+rpz_rrset_find() failed: glue" when static or static-stub zones
+where used to resolve the query name.
+
+Add tests using stub and static-stub zones that are expected to
+be filtered and not-filtered against NSIP and NSDNAME rules.
+
+stub and static-stub queries are expected to be filtered
+
+stub-nomatch and static-stub-nomatch queries are expected to be passed
+
+(cherry picked from commit 30cb70c82671e345810be546ffa902631b43d306)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/967e5e09cd80bd74f96ad49d65b564ac58023f0c
+---
+ bin/tests/system/rpz/ns10/hints         | 13 ++++++++
+ bin/tests/system/rpz/ns10/named.conf.in | 42 +++++++++++++++++++++++++
+ bin/tests/system/rpz/ns10/stub.db       | 21 +++++++++++++
+ bin/tests/system/rpz/ns2/named.conf.in  |  4 +++
+ bin/tests/system/rpz/ns2/stub.db        | 20 ++++++++++++
+ bin/tests/system/rpz/ns3/named.conf.in  | 20 ++++++++++++
+ bin/tests/system/rpz/setup.sh           |  1 +
+ bin/tests/system/rpz/tests.sh           | 37 ++++++++++++++++++----
+ 8 files changed, 152 insertions(+), 6 deletions(-)
+ create mode 100644 bin/tests/system/rpz/ns10/hints
+ create mode 100644 bin/tests/system/rpz/ns10/named.conf.in
+ create mode 100644 bin/tests/system/rpz/ns10/stub.db
+ create mode 100644 bin/tests/system/rpz/ns2/stub.db
+
+diff --git a/bin/tests/system/rpz/ns10/hints b/bin/tests/system/rpz/ns10/hints
+new file mode 100644
+index 0000000000..b657c3980e
+--- /dev/null
++++ b/bin/tests/system/rpz/ns10/hints
+@@ -0,0 +1,13 @@
++; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++;
++; SPDX-License-Identifier: MPL-2.0
++;
++; This Source Code Form is subject to the terms of the Mozilla Public
++; License, v. 2.0.  If a copy of the MPL was not distributed with this
++; file, you can obtain one at https://mozilla.org/MPL/2.0/.
++;
++; See the COPYRIGHT file distributed with this work for additional
++; information regarding copyright ownership.
++
++.	120	NS	ns.
++ns.	120	A	10.53.0.1
+diff --git a/bin/tests/system/rpz/ns10/named.conf.in b/bin/tests/system/rpz/ns10/named.conf.in
+new file mode 100644
+index 0000000000..b34ce79bb4
+--- /dev/null
++++ b/bin/tests/system/rpz/ns10/named.conf.in
+@@ -0,0 +1,42 @@
++/*
++ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++ *
++ * SPDX-License-Identifier: MPL-2.0
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0.  If a copy of the MPL was not distributed with this
++ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
++ *
++ * See the COPYRIGHT file distributed with this work for additional
++ * information regarding copyright ownership.
++ */
++
++options {
++	query-source address 10.53.0.10;
++	notify-source 10.53.0.10;
++	transfer-source 10.53.0.10;
++	port @PORT@;
++	pid-file "named.pid";
++	session-keyfile "session.key";
++	listen-on { 10.53.0.10; };
++	listen-on-v6 { none; };
++	notify no;
++	minimal-responses no;
++	recursion yes;
++	dnssec-validation yes;
++};
++
++key rndc_key {
++	secret "1234abcd8765";
++	algorithm hmac-sha256;
++};
++controls {
++	inet 10.53.0.10 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
++};
++
++include "../trusted.conf";
++zone "." { type hint; file "hints"; };
++
++# grafted on zones using stub and static-stub
++zone "stub-nomatch."		    {type primary; file "stub.db"; };
++zone "static-stub-nomatch."	    {type primary; file "stub.db"; };
+diff --git a/bin/tests/system/rpz/ns10/stub.db b/bin/tests/system/rpz/ns10/stub.db
+new file mode 100644
+index 0000000000..8ecac8c2b2
+--- /dev/null
++++ b/bin/tests/system/rpz/ns10/stub.db
+@@ -0,0 +1,21 @@
++; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++;
++; SPDX-License-Identifier: MPL-2.0
++;
++; This Source Code Form is subject to the terms of the Mozilla Public
++; License, v. 2.0.  If a copy of the MPL was not distributed with this
++; file, you can obtain one at https://mozilla.org/MPL/2.0/.
++;
++; See the COPYRIGHT file distributed with this work for additional
++; information regarding copyright ownership.
++
++; RPZ rewrite responses from this zone
++
++$TTL	120
++@		SOA	ns  hostmaster.ns ( 1 3600 1200 604800 60 )
++		NS	ns
++ns		A	10.53.0.10
++
++a3-1		A	10.53.99.99
++
++a4-1		A	10.53.99.99
+diff --git a/bin/tests/system/rpz/ns2/named.conf.in b/bin/tests/system/rpz/ns2/named.conf.in
+index 48ab311a97..1dde354562 100644
+--- a/bin/tests/system/rpz/ns2/named.conf.in
++++ b/bin/tests/system/rpz/ns2/named.conf.in
+@@ -49,3 +49,7 @@ zone "tld2s."		    {type primary; file "tld2s.db";};
+ 
+ zone "bl.tld2."		    {type primary; file "bl.tld2.db";
+ 				notify yes; notify-delay 0;};
++
++# grafted on zones using stub and static-stub
++zone "stub."		    {type primary; file "stub.db"; };
++zone "static-stub."	    {type primary; file "stub.db"; };
+diff --git a/bin/tests/system/rpz/ns2/stub.db b/bin/tests/system/rpz/ns2/stub.db
+new file mode 100644
+index 0000000000..e4b87817e7
+--- /dev/null
++++ b/bin/tests/system/rpz/ns2/stub.db
+@@ -0,0 +1,20 @@
++; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++;
++; SPDX-License-Identifier: MPL-2.0
++;
++; This Source Code Form is subject to the terms of the Mozilla Public
++; License, v. 2.0.  If a copy of the MPL was not distributed with this
++; file, you can obtain one at https://mozilla.org/MPL/2.0/.
++;
++; See the COPYRIGHT file distributed with this work for additional
++; information regarding copyright ownership.
++
++; RPZ rewrite responses from this zone
++
++$TTL	120
++@		SOA	tld2.  hostmaster.ns.tld2. ( 1 3600 1200 604800 60 )
++		NS	ns.sub1.tld2.
++
++a3-1		A	10.53.99.99
++
++a4-1		A	10.53.99.99
+diff --git a/bin/tests/system/rpz/ns3/named.conf.in b/bin/tests/system/rpz/ns3/named.conf.in
+index e5545a8720..30f08c804c 100644
+--- a/bin/tests/system/rpz/ns3/named.conf.in
++++ b/bin/tests/system/rpz/ns3/named.conf.in
+@@ -128,3 +128,23 @@ zone "fast-expire." {
+ 	primaries { 10.53.0.5; };
+ 	notify no;
+ };
++
++zone "stub." {
++	type stub;
++	primaries { 10.53.0.2; };
++};
++
++zone "static-stub." {
++	type static-stub;
++	server-addresses { 10.53.0.2; };
++};
++
++zone "stub-nomatch." {
++	type stub;
++	primaries { 10.53.0.10; };
++};
++
++zone "static-stub-nomatch." {
++	type static-stub;
++	server-addresses { 10.53.0.10; };
++};
+diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh
+index f9897b34de..fea43bdc36 100644
+--- a/bin/tests/system/rpz/setup.sh
++++ b/bin/tests/system/rpz/setup.sh
+@@ -54,6 +54,7 @@ copy_setports ns6/named.conf.in ns6/named.conf
+ copy_setports ns7/named.conf.in ns7/named.conf
+ copy_setports ns8/named.conf.in ns8/named.conf
+ copy_setports ns9/named.conf.in ns9/named.conf
++copy_setports ns10/named.conf.in ns10/named.conf
+ 
+ copy_setports dnsrpzd.conf.in dnsrpzd.conf
+ 
+diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
+index 56a7f2e683..9fc5d08cf2 100644
+--- a/bin/tests/system/rpz/tests.sh
++++ b/bin/tests/system/rpz/tests.sh
+@@ -28,6 +28,8 @@ ns5=$ns.5		# another rewriting resolver
+ ns6=$ns.6		# a forwarding server
+ ns7=$ns.7		# another rewriting resolver
+ ns8=$ns.8		# another rewriting resolver
++ns9=$ns.9		# another rewriting resolver
++ns10=$ns.10		# authoritative server
+ 
+ HAVE_CORE=
+ 
+@@ -406,6 +408,13 @@ nochange () {
+     ckresult "$*" ${DIGNM}_OK && clean_result ${DIGNM}_OK
+ }
+ 
++nochange_ns10 () {
++    make_dignm
++    digcmd $* >$DIGNM
++    digcmd $* @$ns10 >${DIGNM}_OK
++    ckresult "$*" ${DIGNM}_OK && clean_result ${DIGNM}_OK
++}
++
+ # check against a 'here document'
+ here () {
+     make_dignm
+@@ -618,6 +627,7 @@ EOF
+ 
+   # these tests assume "min-ns-dots 0"
+   start_group "NSDNAME rewrites" test3
++  nextpart ns3/named.run > /dev/null
+   nochange a3-1.tld2				# 1
+   nochange a3-1.tld2 +dnssec			# 2 this once caused problems
+   nxdomain a3-1.sub1.tld2			# 3 NXDOMAIN *.sub1.tld2 by NSDNAME
+@@ -630,25 +640,39 @@ EOF
+   addr 127.0.0.1 a3-1.sub3.tld2			# 10 prefer policy for largest NSDNAME
+   addr 127.0.0.2 a3-1.subsub.sub3.tld2		# 11
+   nxdomain xxx.crash1.tld2			# 12 dns_db_detachnode() crash
++
++  nxdomain a3-1.stub				# 13
++  nxdomain a3-1.static-stub			# 14
++  nochange_ns10 a3-1.stub-nomatch		# 15
++  nochange_ns10 a3-1.static-stub-nomatch	# 16
+   if [ "$mode" = dnsrps ]; then
+-    addr 12.12.12.12 as-ns.tld5.		# 13 qname-as-ns
++    addr 12.12.12.12 as-ns.tld5.		# 17 qname-as-ns
+   fi
++  nextpart ns3/named.run | grep -q "unrecognized NS rpz_rrset_find() failed: glue" &&
++  setret "seen: unrecognized NS rpz_rrset_find() failed: glue"
+   end_group
+   if [ "$mode" = dnsrps ]; then
+-    ckstats $ns3 test3 ns3 8
++    ckstats $ns3 test3 ns3 10
+   else
+-    ckstats $ns3 test3 ns3 7
++    ckstats $ns3 test3 ns3 9
+   fi
+ 
+   # these tests assume "min-ns-dots 0"
+   start_group "NSIP rewrites" test4
++  nextpart ns3/named.run > /dev/null
+   nxdomain a3-1.tld2				# 1 NXDOMAIN for all of tld2
+   nochange a3-2.tld2.				# 2 exempt rewrite by name
+   nochange a0-1.tld2.				# 3 exempt rewrite by address block
+   nochange a3-1.tld4				# 4 different NS IP address
++  nxdomain a4-1.stub				# 5
++  nxdomain a4-1.static-stub			# 6
++  nochange_ns10 a4-1.stub-nomatch		# 7
++  nochange_ns10 a4-1.static-stub-nomatch	# 8
+   if [ "$mode" = dnsrps ]; then
+-      addr 12.12.12.12 as-ns.tld5.		# 5 ip-as-ns
++      addr 12.12.12.12 as-ns.tld5.		# 9 ip-as-ns
+   fi
++  nextpart ns3/named.run | grep -q "unrecognized NS rpz_rrset_find() failed: glue" &&
++  setret "seen: unrecognized NS rpz_rrset_find() failed: glue"
+   end_group
+ 
+   start_group "walled garden NSIP rewrites" test4a
+@@ -660,9 +684,9 @@ EOF
+ EOF
+   end_group
+   if [ "$mode" = dnsrps ]; then
+-    ckstats $ns3 test4 ns3 5
++    ckstats $ns3 test4 ns3 7
+   else
+-    ckstats $ns3 test4 ns3 4
++    ckstats $ns3 test4 ns3 6
+   fi
+ 
+   # policies in ./test5 overridden by response-policy{} in ns3/named.conf
+@@ -785,6 +809,7 @@ EOF
+   fi
+ 
+   # Ensure ns3 manages to transfer the fast-expire zone before shutdown.
++  nextpartreset ns3/named.run
+   wait_for_log 20 "zone fast-expire/IN: transferred serial 1" ns3/named.run
+ 
+   # reconfigure the ns5 primary server without the fast-expire zone, so
+-- 
+2.23.0
+
diff --git a/backport-0032-Allow-DNS_RPZ_POLICY_ERROR-to-be-converted-to-a-stri.patch b/backport-0032-Allow-DNS_RPZ_POLICY_ERROR-to-be-converted-to-a-stri.patch
new file mode 100644
index 0000000000000000000000000000000000000000..aaa4ad2608da8b08fb430339aaf5415dc1a4bd12
--- /dev/null
+++ b/backport-0032-Allow-DNS_RPZ_POLICY_ERROR-to-be-converted-to-a-stri.patch
@@ -0,0 +1,29 @@
+From 36612dadff74e57139fe176729fa284b149b420f Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Wed, 4 May 2022 17:03:15 +1000
+Subject: [PATCH] Allow DNS_RPZ_POLICY_ERROR to be converted to a string
+
+(cherry picked from commit f498d2db0d9f3344d314956253beda73ac29ea4f)
+Conflict: adapt INSIST(0), ISC_UNREACHABLE
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/36612dadff74e57139fe176729fa284b149b420f
+---
+ lib/dns/rpz.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
+index d3baa71..1bdaac9 100644
+--- a/lib/dns/rpz.c
++++ b/lib/dns/rpz.c
+@@ -277,6 +277,9 @@ dns_rpz_policy2str(dns_rpz_policy_t policy) {
+ 	case DNS_RPZ_POLICY_DNS64:
+ 		str = "DNS64";
+ 		break;
++	case DNS_RPZ_POLICY_ERROR:
++		str = "ERROR";
++		break;
+ 	default:
+ 		INSIST(0);
+ 		ISC_UNREACHABLE();
+-- 
+2.27.0
+
diff --git a/backport-0032-Check-the-cache-as-well-when-glue-NS-are-returned-pr.patch b/backport-0032-Check-the-cache-as-well-when-glue-NS-are-returned-pr.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a31d6fc528045b95735856ded1cd4ea689950982
--- /dev/null
+++ b/backport-0032-Check-the-cache-as-well-when-glue-NS-are-returned-pr.patch
@@ -0,0 +1,86 @@
+From 8f23d56fba79ca063e3deacca973d89b327ccaed Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Wed, 4 May 2022 17:08:27 +1000
+Subject: [PATCH] Check the cache as well when glue NS are returned processing
+ RPZ
+
+(cherry picked from commit 8fb72012e36961ff62a29d5f4599b3c41e48e7c9)
+Conflict: adapt seg3 and FALLTHROUGH
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/8f23d56fba79ca063e3deacca973d89b327ccaed
+---
+ lib/ns/query.c | 28 ++++++++++++++++++++++------
+ 1 file changed, 22 insertions(+), 6 deletions(-)
+
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index f4547a5..5ba732f 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -3937,6 +3937,7 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult,
+ 	dns_rpz_have_t have;
+ 	dns_rpz_popt_t popt;
+ 	int rpz_ver;
++	unsigned int options;
+ #ifdef USE_DNSRPS
+ 	librpz_emsg_t emsg;
+ #endif /* ifdef USE_DNSRPS */
+@@ -4187,7 +4188,9 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult,
+ 
+ 	dns_fixedname_init(&nsnamef);
+ 	dns_name_clone(client->query.qname, dns_fixedname_name(&nsnamef));
++	options = DNS_DBFIND_GLUEOK;
+ 	while (st->r.label > st->popt.min_ns_labels) {
++		bool was_glue = false;
+ 		/*
+ 		 * Get NS rrset for each domain in the current qname.
+ 		 */
+@@ -4202,7 +4205,7 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult,
+ 		    !dns_rdataset_isassociated(st->r.ns_rdataset)) {
+ 			dns_db_t *db = NULL;
+ 			result = rpz_rrset_find(client, nsname,
+-						dns_rdatatype_ns,
++						dns_rdatatype_ns, options,
+ 						DNS_RPZ_TYPE_NSDNAME, &db, NULL,
+ 						&st->r.ns_rdataset, resuming);
+ 			if (db != NULL) {
+@@ -4212,8 +4215,10 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult,
+ 				goto cleanup;
+ 			}
+ 			switch (result) {
+-			case ISC_R_SUCCESS:
+ 			case DNS_R_GLUE:
++				was_glue = true;
++				/* FALLTHROUGH */
++			case ISC_R_SUCCESS:
+ 				result = dns_rdataset_first(st->r.ns_rdataset);
+ 				if (result != ISC_R_SUCCESS) {
+ 					goto cleanup;
+@@ -4252,6 +4257,7 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult,
+ 				continue;
+ 			}
+ 		}
++
+ 		/*
+ 		 * Check all NS names.
+ 		 */
+@@ -4302,7 +4308,17 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult,
+ 			result = dns_rdataset_next(st->r.ns_rdataset);
+ 		} while (result == ISC_R_SUCCESS);
+ 		dns_rdataset_disassociate(st->r.ns_rdataset);
+-		st->r.label--;
++
++		/*
++		 * If we just checked a glue NS RRset retry without allowing
++		 * glue responses, otherwise setup for the next name.
++		 */
++		if (was_glue) {
++			options = 0;
++		} else {
++			options = DNS_DBFIND_GLUEOK;
++			st->r.label--;
++		}
+ 
+ 		if (rpz_get_zbits(client, dns_rdatatype_any,
+ 				  DNS_RPZ_TYPE_NSDNAME) == 0 &&
+-- 
+2.27.0
+
diff --git a/backport-0032-Process-learned-records-as-well-as-glue.patch b/backport-0032-Process-learned-records-as-well-as-glue.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d5763f2263eba75e8d68bfb7d94673c61caa6cb1
--- /dev/null
+++ b/backport-0032-Process-learned-records-as-well-as-glue.patch
@@ -0,0 +1,207 @@
+From 8c2ede6edcc917496eb7d6603c05427cbb9793cc Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Wed, 4 May 2022 15:40:53 +1000
+Subject: [PATCH] Process learned records as well as glue
+
+(cherry picked from commit 07c828531cb49deeba3e14d7a5ffef7934973562)
+Conflict: adapt seg2 and delete rpz_rewrite modify
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/8c2ede6edcc917496eb7d6603c05427cbb9793cc
+---
+ lib/ns/query.c | 167 ++++++++++++++++++++++++++++---------------------
+ 1 file changed, 94 insertions(+), 73 deletions(-)
+
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index 5ba732f..e6b25bc 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -2774,7 +2774,7 @@ query_rpzfetch(ns_client_t *client, dns_name_t *qname, dns_rdatatype_t type) {
+  */
+ static isc_result_t
+ rpz_rrset_find(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type,
+-	       dns_rpz_type_t rpz_type, dns_db_t **dbp,
++	       unsigned int options, dns_rpz_type_t rpz_type, dns_db_t **dbp,
+ 	       dns_dbversion_t *version, dns_rdataset_t **rdatasetp,
+ 	       bool resuming) {
+ 	dns_rpz_st_t *st;
+@@ -2843,7 +2843,7 @@ rpz_rrset_find(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type,
+ 	found = dns_fixedname_initname(&fixed);
+ 	dns_clientinfomethods_init(&cm, ns_client_sourceip);
+ 	dns_clientinfo_init(&ci, client, NULL);
+-	result = dns_db_findext(*dbp, name, version, type, DNS_DBFIND_GLUEOK,
++	result = dns_db_findext(*dbp, name, version, type, options,
+ 				client->now, &node, found, &cm, &ci, *rdatasetp,
+ 				NULL);
+ 	if (result == DNS_R_DELEGATION && is_zone && USECACHE(client)) {
+@@ -3588,82 +3588,104 @@ rpz_rewrite_ip_rrset(ns_client_t *client, dns_name_t *name,
+ 	struct in_addr ina;
+ 	struct in6_addr in6a;
+ 	isc_result_t result;
++	unsigned int options = DNS_DBFIND_GLUEOK;
++	bool done = false;
+ 
+ 	CTRACE(ISC_LOG_DEBUG(3), "rpz_rewrite_ip_rrset");
+ 
+-	zbits = rpz_get_zbits(client, ip_type, rpz_type);
+-	if (zbits == 0) {
+-		return (ISC_R_SUCCESS);
+-	}
++	do {
++		zbits = rpz_get_zbits(client, ip_type, rpz_type);
++		if (zbits == 0) {
++			return (ISC_R_SUCCESS);
++		}
+ 
+-	/*
+-	 * Get the A or AAAA rdataset.
+-	 */
+-	result = rpz_rrset_find(client, name, ip_type, rpz_type, ip_dbp,
+-				ip_version, ip_rdatasetp, resuming);
+-	switch (result) {
+-	case ISC_R_SUCCESS:
+-	case DNS_R_GLUE:
+-	case DNS_R_ZONECUT:
+-		break;
+-	case DNS_R_EMPTYNAME:
+-	case DNS_R_EMPTYWILD:
+-	case DNS_R_NXDOMAIN:
+-	case DNS_R_NCACHENXDOMAIN:
+-	case DNS_R_NXRRSET:
+-	case DNS_R_NCACHENXRRSET:
+-	case ISC_R_NOTFOUND:
+-		return (ISC_R_SUCCESS);
+-	case DNS_R_DELEGATION:
+-	case DNS_R_DUPLICATE:
+-	case DNS_R_DROP:
+-		return (result);
+-	case DNS_R_CNAME:
+-	case DNS_R_DNAME:
+-		rpz_log_fail(client, DNS_RPZ_DEBUG_LEVEL1, name, rpz_type,
+-			     "NS address rewrite rrset", result);
+-		return (ISC_R_SUCCESS);
+-	default:
+-		if (client->query.rpz_st->m.policy != DNS_RPZ_POLICY_ERROR) {
+-			client->query.rpz_st->m.policy = DNS_RPZ_POLICY_ERROR;
+-			rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, name,
++		/*
++		 * Get the A or AAAA rdataset.
++		 */
++		result = rpz_rrset_find(client, name, ip_type, options,
++					rpz_type, ip_dbp, ip_version,
++					ip_rdatasetp, resuming);
++		switch (result) {
++		case ISC_R_SUCCESS:
++		case DNS_R_GLUE:
++		case DNS_R_ZONECUT:
++			break;
++		case DNS_R_EMPTYNAME:
++		case DNS_R_EMPTYWILD:
++		case DNS_R_NXDOMAIN:
++		case DNS_R_NCACHENXDOMAIN:
++		case DNS_R_NXRRSET:
++		case DNS_R_NCACHENXRRSET:
++		case ISC_R_NOTFOUND:
++			return (ISC_R_SUCCESS);
++		case DNS_R_DELEGATION:
++		case DNS_R_DUPLICATE:
++		case DNS_R_DROP:
++			return (result);
++		case DNS_R_CNAME:
++		case DNS_R_DNAME:
++			rpz_log_fail(client, DNS_RPZ_DEBUG_LEVEL1, name,
+ 				     rpz_type, "NS address rewrite rrset",
+ 				     result);
++			return (ISC_R_SUCCESS);
++		default:
++			if (client->query.rpz_st->m.policy !=
++			    DNS_RPZ_POLICY_ERROR) {
++				client->query.rpz_st->m.policy =
++					DNS_RPZ_POLICY_ERROR;
++				rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, name,
++					     rpz_type,
++					     "NS address rewrite rrset",
++					     result);
++			}
++			CTRACE(ISC_LOG_ERROR,
++			       "rpz_rewrite_ip_rrset: unexpected "
++			       "result");
++			return (DNS_R_SERVFAIL);
+ 		}
+-		CTRACE(ISC_LOG_ERROR, "rpz_rewrite_ip_rrset: unexpected "
+-				      "result");
+-		return (DNS_R_SERVFAIL);
+-	}
+ 
+-	/*
+-	 * Check all of the IP addresses in the rdataset.
+-	 */
+-	for (result = dns_rdataset_first(*ip_rdatasetp);
+-	     result == ISC_R_SUCCESS; result = dns_rdataset_next(*ip_rdatasetp))
+-	{
+-		dns_rdata_t rdata = DNS_RDATA_INIT;
+-		dns_rdataset_current(*ip_rdatasetp, &rdata);
+-		switch (rdata.type) {
+-		case dns_rdatatype_a:
+-			INSIST(rdata.length == 4);
+-			memmove(&ina.s_addr, rdata.data, 4);
+-			isc_netaddr_fromin(&netaddr, &ina);
+-			break;
+-		case dns_rdatatype_aaaa:
+-			INSIST(rdata.length == 16);
+-			memmove(in6a.s6_addr, rdata.data, 16);
+-			isc_netaddr_fromin6(&netaddr, &in6a);
+-			break;
+-		default:
+-			continue;
++		/*
++		 * If we are processing glue setup for the next loop
++		 * otherwise we are done.
++		 */
++		if (result == DNS_R_GLUE) {
++			options = 0;
++		} else {
++			done = true;
+ 		}
+ 
+-		result = rpz_rewrite_ip(client, &netaddr, qtype, rpz_type,
+-					zbits, p_rdatasetp);
+-		if (result != ISC_R_SUCCESS) {
+-			return (result);
++		/*
++		 * Check all of the IP addresses in the rdataset.
++		 */
++		for (result = dns_rdataset_first(*ip_rdatasetp);
++		     result == ISC_R_SUCCESS;
++		     result = dns_rdataset_next(*ip_rdatasetp))
++		{
++			dns_rdata_t rdata = DNS_RDATA_INIT;
++			dns_rdataset_current(*ip_rdatasetp, &rdata);
++			switch (rdata.type) {
++			case dns_rdatatype_a:
++				INSIST(rdata.length == 4);
++				memmove(&ina.s_addr, rdata.data, 4);
++				isc_netaddr_fromin(&netaddr, &ina);
++				break;
++			case dns_rdatatype_aaaa:
++				INSIST(rdata.length == 16);
++				memmove(in6a.s6_addr, rdata.data, 16);
++				isc_netaddr_fromin6(&netaddr, &in6a);
++				break;
++			default:
++				continue;
++			}
++
++			result = rpz_rewrite_ip(client, &netaddr, qtype,
++						rpz_type, zbits, p_rdatasetp);
++			if (result != ISC_R_SUCCESS) {
++				return (result);
++			}
+ 		}
+-	}
++	} while (!done &&
++		 client->query.rpz_st->m.policy == DNS_RPZ_POLICY_MISS);
+ 
+ 	return (ISC_R_SUCCESS);
+ }
+-- 
+2.27.0
+
diff --git a/backport-0032-Process-the-delegating-NS-RRset-when-checking-rpz-ru.patch b/backport-0032-Process-the-delegating-NS-RRset-when-checking-rpz-ru.patch
new file mode 100644
index 0000000000000000000000000000000000000000..214c7d57f5d1407f6f20d5b89a94d83d58d12a58
--- /dev/null
+++ b/backport-0032-Process-the-delegating-NS-RRset-when-checking-rpz-ru.patch
@@ -0,0 +1,27 @@
+From 13129872eb0b3c9d63782f42d7f1752e5dabefcf Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Wed, 4 May 2022 14:45:19 +1000
+Subject: [PATCH] Process the delegating NS RRset when checking rpz rules
+
+(cherry picked from commit cf97c61f48f6cea6d9e67158485106f659433309)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/13129872eb0b3c9d63782f42d7f1752e5dabefcf
+---
+ lib/ns/query.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index 771aa7b970..4eb95b808d 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -4211,6 +4211,7 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult,
+ 			}
+ 			switch (result) {
+ 			case ISC_R_SUCCESS:
++			case DNS_R_GLUE:
+ 				result = dns_rdataset_first(st->r.ns_rdataset);
+ 				if (result != ISC_R_SUCCESS) {
+ 					goto cleanup;
+-- 
+2.23.0
+
diff --git a/backport-0033-Lock-the-trampoline-when-attaching.patch b/backport-0033-Lock-the-trampoline-when-attaching.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1204f85c639c5205ea61337e084b56db741711d3
--- /dev/null
+++ b/backport-0033-Lock-the-trampoline-when-attaching.patch
@@ -0,0 +1,207 @@
+From be7f672fcc20a03d08c1f50b5b7a9f353ccd5dac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Wed, 4 May 2022 09:26:34 +0200
+Subject: [PATCH] Lock the trampoline when attaching
+
+When attaching to the trampoline, the isc__trampoline_max was access
+unlocked.  This would not manifest under normal circumstances because we
+initialize 65 trampolines by default and that's enough for most
+commodity hardware, but there are ARM machines with 128+ cores where
+this would be reported by ThreadSanitizer.
+
+Add locking around the code in isc__trampoline_attach().  This also
+requires the lock to leak on exit (along with memory that we already)
+because a new thread might be attaching to the trampoline while we are
+running the library destructor at the same time.
+
+(cherry picked from commit 933162ae1400ed4d854c32613a7e0a6bbe0b31f7)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/be7f672fcc20a03d08c1f50b5b7a9f353ccd5dac
+---
+ lib/isc/trampoline.c | 87 ++++++++++++++++++++------------------------
+ 1 file changed, 39 insertions(+), 48 deletions(-)
+
+diff --git a/lib/isc/trampoline.c b/lib/isc/trampoline.c
+index e133c40084..965fd0552e 100644
+--- a/lib/isc/trampoline.c
++++ b/lib/isc/trampoline.c
+@@ -15,9 +15,9 @@
+ 
+ #include <inttypes.h>
+ #include <stdlib.h>
++#include <uv.h>
+ 
+ #include <isc/mem.h>
+-#include <isc/mutex.h>
+ #include <isc/once.h>
+ #include <isc/thread.h>
+ #include <isc/util.h>
+@@ -34,9 +34,26 @@ struct isc__trampoline {
+ 	void *jemalloc_enforce_init;
+ };
+ 
+-static isc_once_t isc__trampoline_initialize_once = ISC_ONCE_INIT;
+-static isc_once_t isc__trampoline_shutdown_once = ISC_ONCE_INIT;
+-static isc_mutex_t isc__trampoline_lock;
++/*
++ * We can't use isc_mem API here, because it's called too
++ * early and when the isc_mem_debugging flags are changed
++ * later and ISC_MEM_DEBUGSIZE or ISC_MEM_DEBUGCTX flags are
++ * added, neither isc_mem_put() nor isc_mem_free() can be used
++ * to free up the memory allocated here because the flags were
++ * not set when calling isc_mem_get() or isc_mem_allocate()
++ * here.
++ *
++ * Since this is a single allocation at library load and deallocation at library
++ * unload, using the standard allocator without the tracking is fine for this
++ * single purpose.
++ *
++ * We can't use isc_mutex API either, because we track whether the mutexes get
++ * properly destroyed, and we intentionally leak the static mutex here without
++ * destroying it to prevent data race between library destructor running while
++ * thread is being still created.
++ */
++
++static uv_mutex_t isc__trampoline_lock;
+ static isc__trampoline_t **trampolines;
+ #if defined(HAVE_THREAD_LOCAL)
+ #include <threads.h>
+@@ -49,19 +66,6 @@ __declspec(thread) size_t isc_tid_v = SIZE_MAX;
+ static size_t isc__trampoline_min = 1;
+ static size_t isc__trampoline_max = 65;
+ 
+-/*
+- * We can't use isc_mem API here, because it's called too
+- * early and when the isc_mem_debugging flags are changed
+- * later and ISC_MEM_DEBUGSIZE or ISC_MEM_DEBUGCTX flags are
+- * added, neither isc_mem_put() nor isc_mem_free() can be used
+- * to free up the memory allocated here because the flags were
+- * not set when calling isc_mem_get() or isc_mem_allocate()
+- * here.
+- *
+- * Actually, since this is a single allocation at library load
+- * and deallocation at library unload, using the standard
+- * allocator without the tracking is fine for this purpose.
+- */
+ static isc__trampoline_t *
+ isc__trampoline_new(int tid, isc_threadfunc_t start, isc_threadarg_t arg) {
+ 	isc__trampoline_t *trampoline = calloc(1, sizeof(*trampoline));
+@@ -77,17 +81,17 @@ isc__trampoline_new(int tid, isc_threadfunc_t start, isc_threadarg_t arg) {
+ 	return (trampoline);
+ }
+ 
+-static void
+-trampoline_initialize(void) {
+-	isc_mutex_init(&isc__trampoline_lock);
++void
++isc__trampoline_initialize(void) {
++	uv_mutex_init(&isc__trampoline_lock);
+ 
+ 	trampolines = calloc(isc__trampoline_max, sizeof(trampolines[0]));
+ 	RUNTIME_CHECK(trampolines != NULL);
+ 
+ 	/* Get the trampoline slot 0 for the main thread */
+ 	trampolines[0] = isc__trampoline_new(0, NULL, NULL);
+-	trampolines[0]->self = isc_thread_self();
+ 	isc_tid_v = trampolines[0]->tid;
++	trampolines[0]->self = isc_thread_self();
+ 
+ 	/* Initialize the other trampolines */
+ 	for (size_t i = 1; i < isc__trampoline_max; i++) {
+@@ -97,38 +101,22 @@ trampoline_initialize(void) {
+ }
+ 
+ void
+-isc__trampoline_initialize(void) {
+-	isc_result_t result = isc_once_do(&isc__trampoline_initialize_once,
+-					  trampoline_initialize);
+-	RUNTIME_CHECK(result == ISC_R_SUCCESS);
+-}
+-
+-static void
+-trampoline_shutdown(void) {
++isc__trampoline_shutdown(void) {
+ 	/*
+ 	 * When the program using the library exits abruptly and the library
+ 	 * gets unloaded, there might be some existing trampolines from unjoined
+ 	 * threads.  We intentionally ignore those and don't check whether all
+-	 * trampolines have been cleared before exiting.
++	 * trampolines have been cleared before exiting, so we leak a little bit
++	 * of resources here, including the lock.
+ 	 */
+ 	free(trampolines[0]);
+-	free(trampolines);
+-	trampolines = NULL;
+-	isc_mutex_destroy(&isc__trampoline_lock);
+-}
+-
+-void
+-isc__trampoline_shutdown(void) {
+-	isc_result_t result = isc_once_do(&isc__trampoline_shutdown_once,
+-					  trampoline_shutdown);
+-	RUNTIME_CHECK(result == ISC_R_SUCCESS);
+ }
+ 
+ isc__trampoline_t *
+ isc__trampoline_get(isc_threadfunc_t start, isc_threadarg_t arg) {
+ 	isc__trampoline_t **tmp = NULL;
+ 	isc__trampoline_t *trampoline = NULL;
+-	LOCK(&isc__trampoline_lock);
++	uv_mutex_lock(&isc__trampoline_lock);
+ again:
+ 	for (size_t i = isc__trampoline_min; i < isc__trampoline_max; i++) {
+ 		if (trampolines[i] == NULL) {
+@@ -152,17 +140,17 @@ again:
+ 	goto again;
+ done:
+ 	INSIST(trampoline != NULL);
+-	UNLOCK(&isc__trampoline_lock);
++	uv_mutex_unlock(&isc__trampoline_lock);
+ 
+ 	return (trampoline);
+ }
+ 
+ void
+ isc__trampoline_detach(isc__trampoline_t *trampoline) {
+-	LOCK(&isc__trampoline_lock);
+-	REQUIRE(trampoline->tid > 0 &&
+-		(size_t)trampoline->tid < isc__trampoline_max);
++	uv_mutex_lock(&isc__trampoline_lock);
+ 	REQUIRE(trampoline->self == isc_thread_self());
++	REQUIRE(trampoline->tid > 0);
++	REQUIRE((size_t)trampoline->tid < isc__trampoline_max);
+ 	REQUIRE(trampolines[trampoline->tid] == trampoline);
+ 
+ 	trampolines[trampoline->tid] = NULL;
+@@ -174,15 +162,17 @@ isc__trampoline_detach(isc__trampoline_t *trampoline) {
+ 	free(trampoline->jemalloc_enforce_init);
+ 	free(trampoline);
+ 
+-	UNLOCK(&isc__trampoline_lock);
++	uv_mutex_unlock(&isc__trampoline_lock);
+ 	return;
+ }
+ 
+ void
+ isc__trampoline_attach(isc__trampoline_t *trampoline) {
+-	REQUIRE(trampoline->tid > 0 &&
+-		(size_t)trampoline->tid < isc__trampoline_max);
++	uv_mutex_lock(&isc__trampoline_lock);
+ 	REQUIRE(trampoline->self == ISC__TRAMPOLINE_UNUSED);
++	REQUIRE(trampoline->tid > 0);
++	REQUIRE((size_t)trampoline->tid < isc__trampoline_max);
++	REQUIRE(trampolines[trampoline->tid] == trampoline);
+ 
+ 	/* Initialize the trampoline */
+ 	isc_tid_v = trampoline->tid;
+@@ -196,6 +186,7 @@ isc__trampoline_attach(isc__trampoline_t *trampoline) {
+ 	 * malloc() + free() calls altogether, as it would foil the fix.
+ 	 */
+ 	trampoline->jemalloc_enforce_init = malloc(8);
++	uv_mutex_unlock(&isc__trampoline_lock);
+ }
+ 
+ isc_threadresult_t
+-- 
+2.23.0
+
diff --git a/backport-0034-prevent-a-possible-buffer-overflow-in-configuration-.patch b/backport-0034-prevent-a-possible-buffer-overflow-in-configuration-.patch
new file mode 100644
index 0000000000000000000000000000000000000000..28f9e9b104073a12a1042d35002280163dd8d497
--- /dev/null
+++ b/backport-0034-prevent-a-possible-buffer-overflow-in-configuration-.patch
@@ -0,0 +1,42 @@
+From b6670787d25743ddf39dfe8e615828efc928f50d Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Fri, 13 May 2022 19:59:58 -0700
+Subject: [PATCH] prevent a possible buffer overflow in configuration check
+
+corrected code that could have allowed a buffer overfow while
+parsing named.conf.
+
+(cherry picked from commit 921043b54161c7a3e6dc4036b038ca4dbc5fe472)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/b6670787d25743ddf39dfe8e615828efc928f50d
+---
+ lib/bind9/check.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/bind9/check.c b/lib/bind9/check.c
+index d446df3cd3..0be4871020 100644
+--- a/lib/bind9/check.c
++++ b/lib/bind9/check.c
+@@ -2500,8 +2500,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
+ 		} else if (dns_name_isula(zname)) {
+ 			ula = true;
+ 		}
+-		tmp += strlen(tmp);
+ 		len -= strlen(tmp);
++		tmp += strlen(tmp);
+ 		(void)snprintf(tmp, len, "%u/%s", zclass,
+ 			       (ztype == CFG_ZONE_INVIEW) ? target
+ 			       : (viewname != NULL)	  ? viewname
+@@ -3247,8 +3247,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
+ 		char *tmp = keydirbuf;
+ 		size_t len = sizeof(keydirbuf);
+ 		dns_name_format(zname, keydirbuf, sizeof(keydirbuf));
+-		tmp += strlen(tmp);
+ 		len -= strlen(tmp);
++		tmp += strlen(tmp);
+ 		(void)snprintf(tmp, len, "/%s", (dir == NULL) ? "(null)" : dir);
+ 		tresult = keydirexist(zconfig, (const char *)keydirbuf,
+ 				      kaspname, keydirs, logctx, mctx);
+-- 
+2.23.0
+
diff --git a/backport-0035-Add-lower-bound-checks-to-fetchlimit-test.patch b/backport-0035-Add-lower-bound-checks-to-fetchlimit-test.patch
new file mode 100644
index 0000000000000000000000000000000000000000..345a28355a190a4b9ef8da2253ad3b8d9ed61eb6
--- /dev/null
+++ b/backport-0035-Add-lower-bound-checks-to-fetchlimit-test.patch
@@ -0,0 +1,160 @@
+From 6edbe8452cc4a5eb0e5cd6aa92039bb17d8fc9ef Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Sun, 8 May 2022 17:17:29 -0700
+Subject: [PATCH] Add lower bound checks to fetchlimit test
+
+Check that the recursing client count is above a reasonable
+minimum, as well as below a maximum, so that we can detect
+bugs that cause recursion to fail too early or too often.
+
+(cherry picked from commit 8834c44683f76b3e9fff795eb3d9ec52bc063b6a)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/6edbe8452cc4a5eb0e5cd6aa92039bb17d8fc9ef
+---
+ bin/tests/system/fetchlimit/tests.sh | 41 +++++++++++++++-------------
+ 1 file changed, 22 insertions(+), 19 deletions(-)
+
+diff --git a/bin/tests/system/fetchlimit/tests.sh b/bin/tests/system/fetchlimit/tests.sh
+index e7df552af0..55f4bf6a48 100644
+--- a/bin/tests/system/fetchlimit/tests.sh
++++ b/bin/tests/system/fetchlimit/tests.sh
+@@ -21,7 +21,7 @@ burst() {
+     num=${3:-20}
+     rm -f burst.input.$$
+     while [ $num -gt 0 ]; do
+-        num=`expr $num - 1`
++        num=$((num-1))
+         echo "${num}${1}${2}.lamesub.example A" >> burst.input.$$
+     done
+     $PERL ../ditch.pl -p ${PORT} -s 10.53.0.3 burst.input.$$
+@@ -33,7 +33,9 @@ stat() {
+             sed 's;.*: \([^/][^/]*\)/.*;\1;'`
+     echo_i "clients: $clients"
+     [ "$clients" = "" ] && return 1
+-    [ "$clients" -le $1 ]
++    [ "$clients" -ge $1 ] || return 1
++    [ "$clients" -le $2 ] || return 1
++    return 0
+ }
+ 
+ status=0
+@@ -47,13 +49,14 @@ for try in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
+     burst a $try
+     # fetches-per-server is at 400, but at 20qps against a lame server,
+     # we'll reach 200 at the tenth second, and the quota should have been
+-    # tuned to less than that by then
+-    stat 200 || ret=1
++    # tuned to less than that by then.
++    [ $try -le 5 ] && low=$((try*10))
++    stat 20 200 || ret=1
+     [ $ret -eq 1 ] && break
+     sleep 1
+ done
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "dumping ADB data"
+ $RNDCCMD dumpdb -adb
+@@ -77,14 +80,14 @@ fails=`grep 'queries resulted in SERVFAIL' ns3/named.stats | sed 's/\([0-9][0-9]
+ [ -z "$fails" ] && fails=0
+ [ "$fails" -ge "$sspill" ] || ret=1
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "checking lame server recovery"
+ ret=0
+ rm -f ans4/norespond
+ for try in 1 2 3 4 5; do
+     burst b $try
+-    stat 200 || ret=1
++    stat 0 200 || ret=1
+     [ $ret -eq 1 ] && break
+     sleep 1
+ done
+@@ -99,7 +102,7 @@ quota=$5
+ 
+ for try in 1 2 3 4 5 6 7 8 9 10; do
+     burst c $try
+-    stat 20 || ret=1
++    stat 0 20 || ret=1
+     [ $ret -eq 1 ] && break
+     sleep 1
+ done
+@@ -112,7 +115,7 @@ set -- $info
+ [ ${5:-${quota}} -gt $quota ] || ret=1
+ quota=$5
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ copy_setports ns3/named2.conf.in ns3/named.conf
+ rndc_reconfig ns3 10.53.0.3
+@@ -126,17 +129,17 @@ for try in 1 2 3 4 5; do
+     burst b $try 300
+     $DIGCMD a ${try}.example > dig.out.ns3.$try
+     grep "status: NOERROR" dig.out.ns3.$try > /dev/null 2>&1 && \
+-            success=`expr $success + 1`
++            success=$((success+1))
+     grep "status: SERVFAIL" dig.out.ns3.$try > /dev/null 2>&1 && \
+-            fail=`expr $fail + 1`
+-    stat 50 || ret=1
++            fail=$(($fail+1))
++    stat 30 50 || ret=1
+     [ $ret -eq 1 ] && break
+     $RNDCCMD recursing 2>&1 | sed 's/^/ns3 /' | cat_i
+     sleep 1
+ done
+ echo_i "$success successful valid queries, $fail SERVFAIL"
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "checking drop statistics"
+ rm -f ns3/named.stats
+@@ -151,7 +154,7 @@ drops=`grep 'queries dropped' ns3/named.stats | sed 's/\([0-9][0-9]*\) queries.*
+ [ -z "$drops" ] && drops=0
+ [ "$drops" -ge "$zspill" ] || ret=1
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ copy_setports ns3/named3.conf.in ns3/named.conf
+ rndc_reconfig ns3 10.53.0.3
+@@ -165,11 +168,11 @@ touch ans4/norespond
+ for try in 1 2 3 4 5; do
+     burst b $try 400
+     $DIGCMD +time=2 a ${try}.example > dig.out.ns3.$try
+-    stat 400 || exceeded=`expr $exceeded + 1`
++    stat 100 400 || exceeded=$((exceeded + 1))
+     grep "status: NOERROR" dig.out.ns3.$try > /dev/null 2>&1 && \
+-            success=`expr $success + 1`
++            success=$((success+1))
+     grep "status: SERVFAIL" dig.out.ns3.$try > /dev/null 2>&1 && \
+-            fail=`expr $fail + 1`
++            fail=$(($fail+1))
+     sleep 1
+ done
+ echo_i "$success successful valid queries (expected 5)"
+@@ -179,7 +182,7 @@ echo_i "$fail SERVFAIL responses (expected 0)"
+ echo_i "clients count exceeded 400 on $exceeded trials (expected 0)"
+ [ "$exceeded" -eq 0 ] || { echo_i "failed"; ret=1; }
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "checking drop statistics"
+ rm -f ns3/named.stats
+@@ -191,7 +194,7 @@ done
+ drops=`grep 'queries dropped due to recursive client limit' ns3/named.stats | sed 's/\([0-9][0-9]*\) queries.*/\1/'`
+ [ "${drops:-0}" -ne 0 ] || ret=1
+ if [ $ret != 0 ]; then echo_i "failed"; fi
+-status=`expr $status + $ret`
++status=$((status+ret))
+ 
+ echo_i "exit status: $status"
+ [ $status -eq 0 ] || exit 1
+-- 
+2.23.0
+
diff --git a/backport-0035-Disable-EDNS-for-the-fetchlimit-test-server.patch b/backport-0035-Disable-EDNS-for-the-fetchlimit-test-server.patch
new file mode 100644
index 0000000000000000000000000000000000000000..896f001272e19f2a63d5fed15a286c7b9cdd74be
--- /dev/null
+++ b/backport-0035-Disable-EDNS-for-the-fetchlimit-test-server.patch
@@ -0,0 +1,71 @@
+From 9582d05683742c4920c7125e8364a3345e6035b8 Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Thu, 5 May 2022 14:52:15 -0700
+Subject: [PATCH] Disable EDNS for the fetchlimit test server
+
+The fetchlimit test depends on a resolver continuing to try UDP
+and timing out while the client waits for resolution to succeed.
+but since commit bb990030 (flag day 2020), a fetch will always
+switch to TCP after two timeouts, unless EDNS was disabled for
+the query.
+
+This commit adds "edns no;" to server statements in the fetchlimit
+resolver, to restore the behavior expected by the test.
+
+(cherry picked from commit 81deb24deb26095cbf3eaec8e7763973ec4177c3)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/9582d05683742c4920c7125e8364a3345e6035b8
+---
+ bin/tests/system/fetchlimit/ns3/named1.conf.in | 4 ++++
+ bin/tests/system/fetchlimit/ns3/named2.conf.in | 4 ++++
+ bin/tests/system/fetchlimit/ns3/named3.conf.in | 4 ++++
+ 3 files changed, 12 insertions(+)
+
+diff --git a/bin/tests/system/fetchlimit/ns3/named1.conf.in b/bin/tests/system/fetchlimit/ns3/named1.conf.in
+index ab7c25a0af..3adfe473eb 100644
+--- a/bin/tests/system/fetchlimit/ns3/named1.conf.in
++++ b/bin/tests/system/fetchlimit/ns3/named1.conf.in
+@@ -28,6 +28,10 @@ options {
+ 	fetches-per-server 400;
+ };
+ 
++server 10.53.0.4 {
++	edns no;
++};
++
+ key rndc_key {
+ 	secret "1234abcd8765";
+ 	algorithm hmac-sha256;
+diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.in b/bin/tests/system/fetchlimit/ns3/named2.conf.in
+index 27c5f33e3b..74374b106f 100644
+--- a/bin/tests/system/fetchlimit/ns3/named2.conf.in
++++ b/bin/tests/system/fetchlimit/ns3/named2.conf.in
+@@ -26,6 +26,10 @@ options {
+ 	fetches-per-zone 40;
+ };
+ 
++server 10.53.0.4 {
++	edns no;
++};
++
+ key rndc_key {
+ 	secret "1234abcd8765";
+ 	algorithm hmac-sha256;
+diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.in b/bin/tests/system/fetchlimit/ns3/named3.conf.in
+index a5d1c165fb..3df353b07d 100644
+--- a/bin/tests/system/fetchlimit/ns3/named3.conf.in
++++ b/bin/tests/system/fetchlimit/ns3/named3.conf.in
+@@ -26,6 +26,10 @@ options {
+ 	recursive-clients 400;
+ };
+ 
++server 10.53.0.4 {
++	edns no;
++};
++
+ key rndc_key {
+ 	secret "1234abcd8765";
+ 	algorithm hmac-sha256;
+-- 
+2.23.0
+
diff --git a/backport-0035-Fix-the-fetches-per-server-quota-calculation.patch b/backport-0035-Fix-the-fetches-per-server-quota-calculation.patch
new file mode 100644
index 0000000000000000000000000000000000000000..191b084522269ddde2b848e541450dcbd32f96d5
--- /dev/null
+++ b/backport-0035-Fix-the-fetches-per-server-quota-calculation.patch
@@ -0,0 +1,44 @@
+From 8516efa4fda80d99b0376db6681fb6f31326061e Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Wed, 4 May 2022 17:27:56 -0700
+Subject: [PATCH] Fix the fetches-per-server quota calculation
+
+Since commit bad5a523c2e, when the fetches-per-server quota
+was increased or decreased, instead of the value being set to
+the newly calculated quota, it was set to the *minimum* of
+the new quota or 1 - which effectively meant it was always set to 1.
+it should instead have been the maximum, to prevent the value from
+ever dropping to zero.
+
+(cherry picked from commit 694bc50273ddc01c571dd917415d24b42ca39de8)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/8516efa4fda80d99b0376db6681fb6f31326061e
+---
+ lib/dns/adb.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/dns/adb.c b/lib/dns/adb.c
+index d5ef99bb61..f86e5125e5 100644
+--- a/lib/dns/adb.c
++++ b/lib/dns/adb.c
+@@ -4324,7 +4324,7 @@ maybe_adjust_quota(dns_adb_t *adb, dns_adbaddrinfo_t *addr, bool timeout) {
+ 		uint_fast32_t new_quota =
+ 			adb->quota * quota_adj[--addr->entry->mode] / 10000;
+ 		atomic_store_release(&addr->entry->quota,
+-				     ISC_MIN(1, new_quota));
++				     ISC_MAX(1, new_quota));
+ 		log_quota(addr->entry,
+ 			  "atr %0.2f, quota increased to %" PRIuFAST32,
+ 			  addr->entry->atr, new_quota);
+@@ -4334,7 +4334,7 @@ maybe_adjust_quota(dns_adb_t *adb, dns_adbaddrinfo_t *addr, bool timeout) {
+ 		uint_fast32_t new_quota =
+ 			adb->quota * quota_adj[++addr->entry->mode] / 10000;
+ 		atomic_store_release(&addr->entry->quota,
+-				     ISC_MIN(1, new_quota));
++				     ISC_MAX(1, new_quota));
+ 		log_quota(addr->entry,
+ 			  "atr %0.2f, quota decreased to %" PRIuFAST32,
+ 			  addr->entry->atr, new_quota);
+-- 
+2.23.0
+
diff --git a/backport-0036-Add-kasp-test-for-3302.patch b/backport-0036-Add-kasp-test-for-3302.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ea5903bc668aa7fa7f4bcdd9d830aac7589709ab
--- /dev/null
+++ b/backport-0036-Add-kasp-test-for-3302.patch
@@ -0,0 +1,113 @@
+From 6226ab2fa910f01d75fd5b5c91c6452e38d1e7d0 Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Tue, 3 May 2022 12:24:58 +0200
+Subject: [PATCH] Add kasp test for #3302
+
+Add a test case that triggers a keymgr run that will not trigger any
+metadata changes. Ensure that the last status change of the key files
+is unmodified.
+
+(cherry picked from commit 7249bad706ab7e15660f4317dbfb76c65bd059cd)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/6226ab2fa910f01d75fd5b5c91c6452e38d1e7d0
+---
+ bin/tests/system/kasp.sh       | 12 ++++++++++-
+ bin/tests/system/kasp/tests.sh | 38 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 49 insertions(+), 1 deletion(-)
+
+diff --git a/bin/tests/system/kasp.sh b/bin/tests/system/kasp.sh
+index 01bcce3fd0..f41911a68e 100644
+--- a/bin/tests/system/kasp.sh
++++ b/bin/tests/system/kasp.sh
+@@ -64,6 +64,9 @@ VIEW3="C1Azf+gGPMmxrUg/WQINP6eV9Y0="
+ # EXPECT_KRRSIG
+ # LEGACY
+ # PRIVATE
++# PRIVKEY_STAT
++# PUBKEY_STAT
++# STATE_STAT
+ 
+ key_key() {
+ 	echo "${1}__${2}"
+@@ -86,6 +89,10 @@ key_save()
+ 	key_set "$1" BASEFILE "$BASE_FILE"
+ 	# Save creation date.
+ 	key_set "$1" CREATED "${KEY_CREATED}"
++	# Save key change time.
++	key_set "$1" PRIVKEY_STAT $(stat -c '%Z' "${BASE_FILE}.private")
++	key_set "$1" PUBKEY_STAT $(stat -c '%Z' "${BASE_FILE}.key")
++	key_set "$1" STATE_STAT $(stat -c '%Z' "${BASE_FILE}.state")
+ }
+ 
+ # Clear key state.
+@@ -98,6 +105,7 @@ key_clear() {
+ 	key_set "$1" "ROLE" 'none'
+ 	key_set "$1" "KSK" 'no'
+ 	key_set "$1" "ZSK" 'no'
++	key_set "$1" "FLAGS" '0'
+ 	key_set "$1" "LIFETIME" 'none'
+ 	key_set "$1" "ALG_NUM" '0'
+ 	key_set "$1" "ALG_STR" 'none'
+@@ -118,7 +126,9 @@ key_clear() {
+ 	key_set "$1" "EXPECT_KRRSIG" 'no'
+ 	key_set "$1" "LEGACY" 'no'
+ 	key_set "$1" "PRIVATE" 'yes'
+-	key_set "$1" "FLAGS" '0'
++	key_set "$1" "PRIVKEY_STAT" '0'
++	key_set "$1" "PUBKEY_STAT" '0'
++	key_set "$1" "STATE_STAT" '0'
+ }
+ 
+ # Start clear.
+diff --git a/bin/tests/system/kasp/tests.sh b/bin/tests/system/kasp/tests.sh
+index f4b3714a54..eccf33a2d3 100644
+--- a/bin/tests/system/kasp/tests.sh
++++ b/bin/tests/system/kasp/tests.sh
+@@ -294,6 +294,44 @@ check_apex
+ check_subdomain
+ dnssec_verify
+ 
++# Trigger a keymgr run. Make sure the key files are not touched if there are
++# no modifications to the key metadata.
++n=$((n+1))
++echo_i "make sure key files are untouched if metadata does not change ($n)"
++ret=0
++basefile=$(key_get KEY1 BASEFILE)
++privkey_stat=$(key_get KEY1 PRIVKEY_STAT)
++pubkey_stat=$(key_get KEY1 PUBKEY_STAT)
++state_stat=$(key_get KEY1 STATE_STAT)
++
++nextpart $DIR/named.run > /dev/null
++rndccmd 10.53.0.3 loadkeys "$ZONE" > /dev/null || log_error "rndc loadkeys zone ${ZONE} failed"
++wait_for_log 3 "keymgr: $ZONE done" $DIR/named.run
++privkey_stat2=$(stat -c '%Z' "${basefile}.private")
++pubkey_stat2=$(stat -c '%Z' "${basefile}.key")
++state_stat2=$(stat -c '%Z' "${basefile}.state")
++test "$privkey_stat" = "$privkey_stat2" || log_error "wrong private key file stat (expected $privkey_stat got $privkey_stat2)"
++test "$pubkey_stat" = "$pubkey_stat2" || log_error "wrong public key file stat (expected $pubkey_stat got $pubkey_stat2)"
++test "$state_stat" = "$state_stat2" || log_error "wrong state file stat (expected $state_stat got $state_stat2)"
++test "$ret" -eq 0 || echo_i "failed"
++status=$((status+ret))
++
++n=$((n+1))
++echo_i "again ($n)"
++ret=0
++
++nextpart $DIR/named.run > /dev/null
++rndccmd 10.53.0.3 loadkeys "$ZONE" > /dev/null || log_error "rndc loadkeys zone ${ZONE} failed"
++wait_for_log 3 "keymgr: done" $DIR/named.run
++privkey_stat2=$(stat -c '%Z' "${basefile}.private")
++pubkey_stat2=$(stat -c '%Z' "${basefile}.key")
++state_stat2=$(stat -c '%Z' "${basefile}.state")
++test "$privkey_stat" = "$privkey_stat2" || log_error "wrong private key file stat (expected $privkey_stat got $privkey_stat2)"
++test "$pubkey_stat" = "$pubkey_stat2" || log_error "wrong public key file stat (expected $pubkey_stat got $pubkey_stat2)"
++test "$state_stat" = "$state_stat2" || log_error "wrong state file stat (expected $state_stat got $state_stat2)"
++test "$ret" -eq 0 || echo_i "failed"
++status=$((status+ret))
++
+ # Update zone.
+ n=$((n+1))
+ echo_i "modify unsigned zone file and check that new record is signed for zone ${ZONE} ($n)"
+-- 
+2.23.0
+
diff --git a/backport-0036-Check-if-key-metadata-is-modified-before-writing.patch b/backport-0036-Check-if-key-metadata-is-modified-before-writing.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f11e7ee965889b3e1b7adce2aef5e5ed7973bb05
--- /dev/null
+++ b/backport-0036-Check-if-key-metadata-is-modified-before-writing.patch
@@ -0,0 +1,235 @@
+From c2e8c722980cd40e163f748e8502c9637ea55cf3 Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Tue, 3 May 2022 12:28:31 +0200
+Subject: [PATCH] Check if key metadata is modified before writing
+
+Add a new parameter to the dst_key structure, mark a key modified if
+dst_key_(un)set[bool,num,state,time] is called. Only write out key
+files during a keymgr run if the metadata has changed.
+
+(cherry picked from commit 1da91b3ab46b3d875213a473595e671d9ff9c76f)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/c2e8c722980cd40e163f748e8502c9637ea55cf3
+---
+ lib/dns/dst_api.c         | 26 ++++++++++++++++++++++++++
+ lib/dns/dst_internal.h    |  1 +
+ lib/dns/include/dst/dst.h | 20 ++++++++++++++++++++
+ lib/dns/keymgr.c          | 17 ++++++++++++++++-
+ 4 files changed, 63 insertions(+), 1 deletion(-)
+
+diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
+index ab371330f0..8873a041b8 100644
+--- a/lib/dns/dst_api.c
++++ b/lib/dns/dst_api.c
+@@ -490,6 +490,16 @@ dst_key_isexternal(dst_key_t *key) {
+ 	return (key->external);
+ }
+ 
++void
++dst_key_setmodified(dst_key_t *key, bool value) {
++	key->modified = value;
++}
++
++bool
++dst_key_ismodified(dst_key_t *key) {
++	return (key->modified);
++}
++
+ isc_result_t
+ dst_key_getfilename(dns_name_t *name, dns_keytag_t id, unsigned int alg,
+ 		    int type, const char *directory, isc_mem_t *mctx,
+@@ -637,6 +647,7 @@ dst_key_fromnamedfile(const char *filename, const char *dirname, int type,
+ 	    (pubkey->key_flags & DNS_KEYFLAG_TYPEMASK) == DNS_KEYTYPE_NOKEY)
+ 	{
+ 		RETERR(computeid(pubkey));
++		pubkey->modified = false;
+ 		*keyp = pubkey;
+ 		pubkey = NULL;
+ 		goto out;
+@@ -690,6 +701,7 @@ dst_key_fromnamedfile(const char *filename, const char *dirname, int type,
+ 		RETERR(DST_R_INVALIDPRIVATEKEY);
+ 	}
+ 
++	key->modified = false;
+ 	*keyp = key;
+ 	key = NULL;
+ 
+@@ -1047,6 +1059,8 @@ dst_key_setbool(dst_key_t *key, int type, bool value) {
+ 	REQUIRE(type <= DST_MAX_BOOLEAN);
+ 
+ 	isc_mutex_lock(&key->mdlock);
++	key->modified = key->modified || !key->boolset[type] ||
++			key->bools[type] != value;
+ 	key->bools[type] = value;
+ 	key->boolset[type] = true;
+ 	isc_mutex_unlock(&key->mdlock);
+@@ -1058,6 +1072,7 @@ dst_key_unsetbool(dst_key_t *key, int type) {
+ 	REQUIRE(type <= DST_MAX_BOOLEAN);
+ 
+ 	isc_mutex_lock(&key->mdlock);
++	key->modified = key->modified || key->boolset[type];
+ 	key->boolset[type] = false;
+ 	isc_mutex_unlock(&key->mdlock);
+ }
+@@ -1089,6 +1104,8 @@ dst_key_setnum(dst_key_t *key, int type, uint32_t value) {
+ 	REQUIRE(type <= DST_MAX_NUMERIC);
+ 
+ 	isc_mutex_lock(&key->mdlock);
++	key->modified = key->modified || !key->numset[type] ||
++			key->nums[type] != value;
+ 	key->nums[type] = value;
+ 	key->numset[type] = true;
+ 	isc_mutex_unlock(&key->mdlock);
+@@ -1100,6 +1117,7 @@ dst_key_unsetnum(dst_key_t *key, int type) {
+ 	REQUIRE(type <= DST_MAX_NUMERIC);
+ 
+ 	isc_mutex_lock(&key->mdlock);
++	key->modified = key->modified || key->numset[type];
+ 	key->numset[type] = false;
+ 	isc_mutex_unlock(&key->mdlock);
+ }
+@@ -1130,6 +1148,8 @@ dst_key_settime(dst_key_t *key, int type, isc_stdtime_t when) {
+ 	REQUIRE(type <= DST_MAX_TIMES);
+ 
+ 	isc_mutex_lock(&key->mdlock);
++	key->modified = key->modified || !key->timeset[type] ||
++			key->times[type] != when;
+ 	key->times[type] = when;
+ 	key->timeset[type] = true;
+ 	isc_mutex_unlock(&key->mdlock);
+@@ -1141,6 +1161,7 @@ dst_key_unsettime(dst_key_t *key, int type) {
+ 	REQUIRE(type <= DST_MAX_TIMES);
+ 
+ 	isc_mutex_lock(&key->mdlock);
++	key->modified = key->modified || key->timeset[type];
+ 	key->timeset[type] = false;
+ 	isc_mutex_unlock(&key->mdlock);
+ }
+@@ -1172,6 +1193,8 @@ dst_key_setstate(dst_key_t *key, int type, dst_key_state_t state) {
+ 	REQUIRE(type <= DST_MAX_KEYSTATES);
+ 
+ 	isc_mutex_lock(&key->mdlock);
++	key->modified = key->modified || !key->keystateset[type] ||
++			key->keystates[type] != state;
+ 	key->keystates[type] = state;
+ 	key->keystateset[type] = true;
+ 	isc_mutex_unlock(&key->mdlock);
+@@ -1183,6 +1206,7 @@ dst_key_unsetstate(dst_key_t *key, int type) {
+ 	REQUIRE(type <= DST_MAX_KEYSTATES);
+ 
+ 	isc_mutex_lock(&key->mdlock);
++	key->modified = key->modified || key->keystateset[type];
+ 	key->keystateset[type] = false;
+ 	isc_mutex_unlock(&key->mdlock);
+ }
+@@ -2747,4 +2771,6 @@ dst_key_copy_metadata(dst_key_t *to, dst_key_t *from) {
+ 			dst_key_unsetstate(to, i);
+ 		}
+ 	}
++
++	dst_key_setmodified(to, dst_key_ismodified(from));
+ }
+diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
+index e26837bfe4..4933cfd5aa 100644
+--- a/lib/dns/dst_internal.h
++++ b/lib/dns/dst_internal.h
+@@ -147,6 +147,7 @@ struct dst_key {
+ 	bool inactive; /*%< private key not present as it is
+ 			* inactive */
+ 	bool external; /*%< external key */
++	bool modified; /*%< set to true if key file metadata has changed */
+ 
+ 	int fmt_major; /*%< private key format, major version
+ 			* */
+diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h
+index d50761a63c..eab5501029 100644
+--- a/lib/dns/include/dst/dst.h
++++ b/lib/dns/include/dst/dst.h
+@@ -1107,6 +1107,26 @@ dst_key_isexternal(dst_key_t *key);
+  *	'key' to be valid.
+  */
+ 
++void
++dst_key_setmodified(dst_key_t *key, bool value);
++/*%<
++ * If 'value' is true, this marks the key to indicate that key file metadata
++ * has been modified. If 'value' is false, this resets the value, for example
++ * after you have written the key to file.
++ *
++ * Requires:
++ *	'key' to be valid.
++ */
++
++bool
++dst_key_ismodified(dst_key_t *key);
++/*%<
++ * Check if the key file has been modified.
++ *
++ * Requires:
++ *	'key' to be valid.
++ */
++
+ bool
+ dst_key_haskasp(dst_key_t *key);
+ /*%<
+diff --git a/lib/dns/keymgr.c b/lib/dns/keymgr.c
+index 965782b1f3..b01286575f 100644
+--- a/lib/dns/keymgr.c
++++ b/lib/dns/keymgr.c
+@@ -1512,6 +1512,7 @@ transition:
+ 			/* It is safe to make the transition. */
+ 			dst_key_setstate(dkey->key, i, next_state);
+ 			dst_key_settime(dkey->key, keystatetimes[i], now);
++			INSIST(dst_key_ismodified(dkey->key));
+ 			changed = true;
+ 		}
+ 	}
+@@ -2183,9 +2184,10 @@ dns_keymgr_run(const dns_name_t *origin, dns_rdataclass_t rdclass,
+ 	for (dns_dnsseckey_t *dkey = ISC_LIST_HEAD(*keyring); dkey != NULL;
+ 	     dkey = ISC_LIST_NEXT(dkey, link))
+ 	{
+-		if (!dkey->purge) {
++		if (dst_key_ismodified(dkey->key) && !dkey->purge) {
+ 			dns_dnssec_get_hints(dkey, now);
+ 			RETERR(dst_key_tofile(dkey->key, options, directory));
++			dst_key_setmodified(dkey->key, false);
+ 		}
+ 	}
+ 
+@@ -2205,6 +2207,13 @@ failure:
+ 		}
+ 	}
+ 
++	if (isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(3))) {
++		char namebuf[DNS_NAME_FORMATSIZE];
++		dns_name_format(origin, namebuf, sizeof(namebuf));
++		isc_log_write(dns_lctx, DNS_LOGCATEGORY_DNSSEC,
++			      DNS_LOGMODULE_DNSSEC, ISC_LOG_DEBUG(3),
++			      "keymgr: %s done", namebuf);
++	}
+ 	return (result);
+ }
+ 
+@@ -2282,6 +2291,9 @@ keymgr_checkds(dns_kasp_t *kasp, dns_dnsseckeylist_t *keyring,
+ 
+ 	dns_dnssec_get_hints(ksk_key, now);
+ 	result = dst_key_tofile(ksk_key->key, options, directory);
++	if (result == ISC_R_SUCCESS) {
++		dst_key_setmodified(ksk_key->key, false);
++	}
+ 	isc_dir_close(&dir);
+ 
+ 	return (result);
+@@ -2582,6 +2594,9 @@ dns_keymgr_rollover(dns_kasp_t *kasp, dns_dnsseckeylist_t *keyring,
+ 
+ 	dns_dnssec_get_hints(key, now);
+ 	result = dst_key_tofile(key->key, options, directory);
++	if (result == ISC_R_SUCCESS) {
++		dst_key_setmodified(key->key, false);
++	}
+ 	isc_dir_close(&dir);
+ 
+ 	return (result);
+-- 
+2.27.0
+
diff --git a/backport-0037-Don-t-process-DNSSEC-related-and-ZONEMD-records-in-c.patch b/backport-0037-Don-t-process-DNSSEC-related-and-ZONEMD-records-in-c.patch
new file mode 100644
index 0000000000000000000000000000000000000000..27cb106a15358afacd43530d61b3cf500e84c83b
--- /dev/null
+++ b/backport-0037-Don-t-process-DNSSEC-related-and-ZONEMD-records-in-c.patch
@@ -0,0 +1,63 @@
+From 1dc7288708a2c1027405d5c2b376809a335cf252 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Wed, 1 Jun 2022 08:51:55 +0000
+Subject: [PATCH] Don't process DNSSEC-related and ZONEMD records in catz
+
+When processing a catalog zone update, skip processing records with
+DNSSEC-related and ZONEMD types, because we are not interested in them
+in the context of a catalog zone, and processing them will fail and
+produce an unnecessary warning message.
+
+(cherry picked from commit 73d664313703d2874c3b1a4380afdcd8ba26dc62)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/1dc7288708a2c1027405d5c2b376809a335cf252
+---
+ lib/dns/catz.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/lib/dns/catz.c b/lib/dns/catz.c
+index 53fbb1c2a7..a749ffa9d4 100644
+--- a/lib/dns/catz.c
++++ b/lib/dns/catz.c
+@@ -1799,6 +1799,12 @@ cleanup:
+ 	return (result);
+ }
+ 
++static bool
++catz_rdatatype_is_processable(const dns_rdatatype_t type) {
++	return (!dns_rdatatype_isdnssec(type) && type != dns_rdatatype_cds &&
++		type != dns_rdatatype_cdnskey && type != dns_rdatatype_zonemd);
++}
++
+ void
+ dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) {
+ 	dns_catz_zone_t *oldzone = NULL, *newzone = NULL;
+@@ -1908,6 +1914,17 @@ dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) {
+ 		result = dns_rdatasetiter_first(rdsiter);
+ 		while (result == ISC_R_SUCCESS) {
+ 			dns_rdatasetiter_current(rdsiter, &rdataset);
++
++			/*
++			 * Skip processing DNSSEC-related and ZONEMD types,
++			 * because we are not interested in them in the context
++			 * of a catalog zone, and processing them will fail
++			 * and produce an unnecessary warning message.
++			 */
++			if (!catz_rdatatype_is_processable(rdataset.type)) {
++				goto next;
++			}
++
+ 			result = dns_catz_update_process(catzs, newzone, name,
+ 							 &rdataset);
+ 			if (result != ISC_R_SUCCESS) {
+@@ -1930,6 +1947,7 @@ dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) {
+ 					      cname, classbuf, typebuf,
+ 					      isc_result_totext(result));
+ 			}
++		next:
+ 			dns_rdataset_disassociate(&rdataset);
+ 			if (result != ISC_R_SUCCESS) {
+ 				break;
+-- 
+2.23.0
+
diff --git a/backport-0037-Fix-CID-352776-Concurrent-data-access-violations.patch b/backport-0037-Fix-CID-352776-Concurrent-data-access-violations.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bc17cb69e4a0d021e80e4048f24678811a5e2602
--- /dev/null
+++ b/backport-0037-Fix-CID-352776-Concurrent-data-access-violations.patch
@@ -0,0 +1,76 @@
+From 7c42c04f3fa1c6b936debe48b435b9ef9da464bd Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Mon, 16 May 2022 19:00:47 +0200
+Subject: [PATCH] Fix CID 352776: Concurrent data access violations
+
+*** CID 352776:  Concurrent data access violations  (MISSING_LOCK)
+/lib/dns/dst_api.c: 474 in dst_key_setmodified()
+468     dst_key_isexternal(dst_key_t *key) {
+469		return (key->external);
+470     }
+471
+472     void
+473     dst_key_setmodified(dst_key_t *key, bool value) {
+>>>     CID 352776:  Concurrent data access violations  (MISSING_LOCK)
+>>>     Accessing "key->modified" without holding lock
+>>>	"dst_key.mdlock". Elsewhere, "dst_key.modified" is accessed with
+>>>	"dst_key.mdlock" held 8 out of 11 times (8 of these accesses
+>>>	strongly imply that it is necessary).
+474		key->modified = value;
+475     }
+476
+477     bool
+478     dst_key_ismodified(dst_key_t *key) {
+479		return (key->modified);
+
+(cherry picked from commit 1fa24d0afbc01d25d71446156758b3a945db5b5f)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/7c42c04f3fa1c6b936debe48b435b9ef9da464bd
+---
+ lib/dns/dst_api.c         | 12 ++++++++++--
+ lib/dns/include/dst/dst.h |  2 +-
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
+index 8873a041b8..e5a52aea37 100644
+--- a/lib/dns/dst_api.c
++++ b/lib/dns/dst_api.c
+@@ -492,12 +492,20 @@ dst_key_isexternal(dst_key_t *key) {
+ 
+ void
+ dst_key_setmodified(dst_key_t *key, bool value) {
++	isc_mutex_lock(&key->mdlock);
+ 	key->modified = value;
++	isc_mutex_unlock(&key->mdlock);
+ }
+ 
+ bool
+-dst_key_ismodified(dst_key_t *key) {
+-	return (key->modified);
++dst_key_ismodified(const dst_key_t *key) {
++	bool modified;
++
++	isc_mutex_lock(&(((dst_key_t *)key)->mdlock));
++	modified = key->modified;
++	isc_mutex_unlock(&(((dst_key_t *)key)->mdlock));
++
++	return (modified);
+ }
+ 
+ isc_result_t
+diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h
+index eab5501029..3185e9f91b 100644
+--- a/lib/dns/include/dst/dst.h
++++ b/lib/dns/include/dst/dst.h
+@@ -1119,7 +1119,7 @@ dst_key_setmodified(dst_key_t *key, bool value);
+  */
+ 
+ bool
+-dst_key_ismodified(dst_key_t *key);
++dst_key_ismodified(const dst_key_t *key);
+ /*%<
+  * Check if the key file has been modified.
+  *
+-- 
+2.27.0
+
diff --git a/backport-0037-Require-valid-key-for-dst_key-functions.patch b/backport-0037-Require-valid-key-for-dst_key-functions.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ab19afbe86b1b9a25d16d5b490cd5b984c419f72
--- /dev/null
+++ b/backport-0037-Require-valid-key-for-dst_key-functions.patch
@@ -0,0 +1,70 @@
+From d3147417c55cb1277cac42034198a3011c8f5cfb Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Tue, 17 May 2022 12:02:43 +0200
+Subject: [PATCH] Require valid key for dst_key functions
+
+Make sure that the key structure is valid when calling the following
+functions:
+- dst_key_setexternal
+- dst_key_isexternal
+- dst_key_setmodified
+- dst_key_ismodified
+
+This commit is adapted because 9.16 has a different approach
+of deconsting the variable.
+
+(cherry picked from commit 888ec4e0d407a9333017d6997a2be81a69658e1f)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/d3147417c55cb1277cac42034198a3011c8f5cfb
+---
+ lib/dns/dst_api.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
+index e5a52aea37..f5741a1af4 100644
+--- a/lib/dns/dst_api.c
++++ b/lib/dns/dst_api.c
+@@ -482,16 +482,22 @@ dst_key_tofile(const dst_key_t *key, int type, const char *directory) {
+ 
+ void
+ dst_key_setexternal(dst_key_t *key, bool value) {
++	REQUIRE(VALID_KEY(key));
++
+ 	key->external = value;
+ }
+ 
+ bool
+ dst_key_isexternal(dst_key_t *key) {
++	REQUIRE(VALID_KEY(key));
++
+ 	return (key->external);
+ }
+ 
+ void
+ dst_key_setmodified(dst_key_t *key, bool value) {
++	REQUIRE(VALID_KEY(key));
++
+ 	isc_mutex_lock(&key->mdlock);
+ 	key->modified = value;
+ 	isc_mutex_unlock(&key->mdlock);
+@@ -500,10 +506,15 @@ dst_key_setmodified(dst_key_t *key, bool value) {
+ bool
+ dst_key_ismodified(const dst_key_t *key) {
+ 	bool modified;
++	dst_key_t *k;
+ 
+-	isc_mutex_lock(&(((dst_key_t *)key)->mdlock));
++	REQUIRE(VALID_KEY(key));
++
++	DE_CONST(key, k);
++
++	isc_mutex_lock(&k->mdlock);
+ 	modified = key->modified;
+-	isc_mutex_unlock(&(((dst_key_t *)key)->mdlock));
++	isc_mutex_unlock(&k->mdlock);
+ 
+ 	return (modified);
+ }
+-- 
+2.27.0
+
diff --git a/backport-0038-Do-not-cancel-processing-record-datasets-in-catalog-.patch b/backport-0038-Do-not-cancel-processing-record-datasets-in-catalog-.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8c797862ab4c42aa7c5fabfc0dcff3b3f8af102e
--- /dev/null
+++ b/backport-0038-Do-not-cancel-processing-record-datasets-in-catalog-.patch
@@ -0,0 +1,45 @@
+From 87b3ced5fefffae9627ec23f7f509be6d79c39e7 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Thu, 24 Mar 2022 21:38:08 +0000
+Subject: [PATCH] Do not cancel processing record datasets in catalog zone
+ after an error
+
+When there are multiple record datasets in a database node of a catalog
+zone, and BIND encounters a soft error during processing of a dataset,
+it breaks from the loop and doesn't process the other datasets in the
+node.
+
+There are cases when this is not desired. For example, the catalog zones
+draft version 5 states that there must be a TXT RRset named
+`version.$CATZ` with exactly one RR, but it doesn't set a limitation
+on possible non-TXT RRsets named `version.$CATZ` existing alongside
+with the TXT one. In case when one exists, we will get a processing
+error and will not continue the loop to process the TXT RRset coming
+next.
+
+Remove the "break" statement to continue processing all record datasets.
+
+(cherry picked from commit 0b2d5490cd8b17a01852fcd9e0a0e0c4b9c93ab6)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/87b3ced5fefffae9627ec23f7f509be6d79c39e7
+---
+ lib/dns/catz.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/lib/dns/catz.c b/lib/dns/catz.c
+index a749ffa9d4..e46549be5e 100644
+--- a/lib/dns/catz.c
++++ b/lib/dns/catz.c
+@@ -1949,9 +1949,6 @@ dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) {
+ 			}
+ 		next:
+ 			dns_rdataset_disassociate(&rdataset);
+-			if (result != ISC_R_SUCCESS) {
+-				break;
+-			}
+ 			result = dns_rdatasetiter_next(rdsiter);
+ 		}
+ 
+-- 
+2.23.0
+
diff --git a/backport-0039-corrected-the-opcode-param-to-opcode_totext.patch b/backport-0039-corrected-the-opcode-param-to-opcode_totext.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c1d8f84c93a61f3834fca48a7d0328ee2378573d
--- /dev/null
+++ b/backport-0039-corrected-the-opcode-param-to-opcode_totext.patch
@@ -0,0 +1,28 @@
+From 66cfaf0fb057eebb51a37d55c2e85679725bc740 Mon Sep 17 00:00:00 2001
+From: JINMEI Tatuya <jtatuya@infoblox.com>
+Date: Mon, 13 Jun 2022 16:25:40 -0700
+Subject: [PATCH] corrected the opcode param to opcode_totext
+
+(cherry picked from commit 2b81a696593bdc406f0cadf2ec930118a86bf92c)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/66cfaf0fb057eebb51a37d55c2e85679725bc740
+---
+ lib/dns/zone.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index b7b02ae5f9..ded4bb5f23 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -13144,7 +13144,7 @@ stub_glue_response_cb(isc_task_t *task, isc_event_t *event) {
+ 		isc_buffer_t rb;
+ 
+ 		isc_buffer_init(&rb, opcode, sizeof(opcode));
+-		(void)dns_opcode_totext(msg->rcode, &rb);
++		(void)dns_opcode_totext(msg->opcode, &rb);
+ 
+ 		dns_zone_log(zone, ISC_LOG_INFO,
+ 			     "refreshing stub: "
+-- 
+2.23.0
+
diff --git a/backport-0040-make-the-fix-more-complete.patch b/backport-0040-make-the-fix-more-complete.patch
new file mode 100644
index 0000000000000000000000000000000000000000..85e88ff1a01c5d702e238d014c1dd7402f740786
--- /dev/null
+++ b/backport-0040-make-the-fix-more-complete.patch
@@ -0,0 +1,46 @@
+From 673211492ceff3b80c0307726f2956c7fbd4c9dd Mon Sep 17 00:00:00 2001
+From: JINMEI Tatuya <jtatuya@infoblox.com>
+Date: Mon, 13 Jun 2022 16:30:00 -0700
+Subject: [PATCH] make the fix more complete
+
+(cherry picked from commit a58647df6a0afa188ed90c410d79ccfaeacfbf8b)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/673211492ceff3b80c0307726f2956c7fbd4c9dd
+---
+ lib/dns/zone.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index ded4bb5f23..cd4db58eaf 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -13573,7 +13573,7 @@ stub_callback(isc_task_t *task, isc_event_t *event) {
+ 		isc_buffer_t rb;
+ 
+ 		isc_buffer_init(&rb, opcode, sizeof(opcode));
+-		(void)dns_opcode_totext(msg->rcode, &rb);
++		(void)dns_opcode_totext(msg->opcode, &rb);
+ 
+ 		dns_zone_log(zone, ISC_LOG_INFO,
+ 			     "refreshing stub: "
+@@ -13979,7 +13979,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) {
+ 		isc_buffer_t rb;
+ 
+ 		isc_buffer_init(&rb, opcode, sizeof(opcode));
+-		(void)dns_opcode_totext(msg->rcode, &rb);
++		(void)dns_opcode_totext(msg->opcode, &rb);
+ 
+ 		dns_zone_log(zone, ISC_LOG_INFO,
+ 			     "refresh: "
+@@ -18171,7 +18171,7 @@ forward_callback(isc_task_t *task, isc_event_t *event) {
+ 		isc_buffer_t rb;
+ 
+ 		isc_buffer_init(&rb, opcode, sizeof(opcode));
+-		(void)dns_opcode_totext(msg->rcode, &rb);
++		(void)dns_opcode_totext(msg->opcode, &rb);
+ 
+ 		dns_zone_log(zone, ISC_LOG_INFO,
+ 			     "forwarding dynamic update: "
+-- 
+2.23.0
+
diff --git a/backport-0041-Gracefully-handle-uv_read_start-failures.patch b/backport-0041-Gracefully-handle-uv_read_start-failures.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c2e3ab7d72ad5ce7d8049d79bafe046ebcc5442e
--- /dev/null
+++ b/backport-0041-Gracefully-handle-uv_read_start-failures.patch
@@ -0,0 +1,261 @@
+From 6cfab7e4f737803e0fc686ea7b7be0d9215489c2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Tue, 14 Jun 2022 09:17:08 +0200
+Subject: [PATCH] Gracefully handle uv_read_start() failures
+
+Under specific rare timing circumstances the uv_read_start() could
+fail with UV_EINVAL when the connection is reset between the connect (or
+accept) and the uv_read_start() call on the nmworker loop.  Handle such
+situation gracefully by propagating the errors from uv_read_start() into
+upper layers, so the socket can be internally closed().
+
+(cherry picked from commit b432d5d3bcccf199141564b6a87d2cdac296ed7e)
+Conflict: adapt isc__nm_start_reading modify
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/6cfab7e4f737803e0fc686ea7b7be0d9215489c2
+---
+ lib/isc/netmgr/netmgr-int.h |  4 ++--
+ lib/isc/netmgr/netmgr.c     | 32 +++++++++++++++++++++-----------
+ lib/isc/netmgr/tcp.c        | 10 ++++++++--
+ lib/isc/netmgr/tcpdns.c     | 25 +++++++++++++++++++------
+ lib/isc/netmgr/udp.c        | 10 ++++++++--
+ 5 files changed, 58 insertions(+), 23 deletions(-)
+
+diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
+index e43bc9f..326535c 100644
+--- a/lib/isc/netmgr/netmgr-int.h
++++ b/lib/isc/netmgr/netmgr-int.h
+@@ -1560,11 +1560,11 @@ isc__nm_tcp_read_cb(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf);
+ void
+ isc__nm_tcpdns_read_cb(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf);
+ 
+-void
++isc_result_t
+ isc__nm_start_reading(isc_nmsocket_t *sock);
+ void
+ isc__nm_stop_reading(isc_nmsocket_t *sock);
+-void
++isc_result_t
+ isc__nm_process_sock_buffer(isc_nmsocket_t *sock);
+ void
+ isc__nm_resume_processing(void *arg);
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index 701f9a9..71c6d62 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -2162,12 +2162,13 @@ isc__nm_alloc_cb(uv_handle_t *handle, size_t size, uv_buf_t *buf) {
+ 	worker->recvbuf_inuse = true;
+ }
+ 
+-void
++isc_result_t
+ isc__nm_start_reading(isc_nmsocket_t *sock) {
++	isc_result_t result = ISC_R_SUCCESS;
+ 	int r;
+ 
+ 	if (sock->reading) {
+-		return;
++		return (ISC_R_SUCCESS);
+ 	}
+ 
+ 	switch (sock->type) {
+@@ -2187,8 +2188,14 @@ isc__nm_start_reading(isc_nmsocket_t *sock) {
+ 		INSIST(0);
+ 		ISC_UNREACHABLE();
+ 	}
+-	RUNTIME_CHECK(r == 0);
+-	sock->reading = true;
++
++	if (r != 0) {
++		result = isc__nm_uverr2result(r);
++	} else {
++		sock->reading = true;
++	}
++
++	return (result);
+ }
+ 
+ void
+@@ -2250,7 +2257,7 @@ processbuffer(isc_nmsocket_t *sock) {
+  * limit. In this case we'll be called again by resume_processing()
+  * later.
+  */
+-void
++isc_result_t
+ isc__nm_process_sock_buffer(isc_nmsocket_t *sock) {
+ 	for (;;) {
+ 		int_fast32_t ah = atomic_load(&sock->ah);
+@@ -2261,7 +2268,10 @@ isc__nm_process_sock_buffer(isc_nmsocket_t *sock) {
+ 			 * Don't reset the timer until we have a
+ 			 * full DNS message.
+ 			 */
+-			isc__nm_start_reading(sock);
++			result = isc__nm_start_reading(sock);
++			if (result != ISC_R_SUCCESS) {
++				return (result);
++			}
+ 			/*
+ 			 * Start the timer only if there are no externally used
+ 			 * active handles, there's always one active handle
+@@ -2271,11 +2281,11 @@ isc__nm_process_sock_buffer(isc_nmsocket_t *sock) {
+ 			if (ah == 1) {
+ 				isc__nmsocket_timer_start(sock);
+ 			}
+-			return;
++			goto done;
+ 		case ISC_R_CANCELED:
+ 			isc__nmsocket_timer_stop(sock);
+ 			isc__nm_stop_reading(sock);
+-			return;
++			goto done;
+ 		case ISC_R_SUCCESS:
+ 			/*
+ 			 * Stop the timer on the successful message read, this
+@@ -2289,13 +2299,15 @@ isc__nm_process_sock_buffer(isc_nmsocket_t *sock) {
+ 			    ah >= STREAM_CLIENTS_PER_CONN)
+ 			{
+ 				isc__nm_stop_reading(sock);
+-				return;
++				goto done;
+ 			}
+ 			break;
+ 		default:
+ 			INSIST(0);
+ 		}
+ 	}
++done:
++	return (ISC_R_SUCCESS);
+ }
+ 
+ void
+diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
+index 009e431..735b29d 100644
+--- a/lib/isc/netmgr/tcp.c
++++ b/lib/isc/netmgr/tcp.c
+@@ -743,18 +743,24 @@ isc__nm_async_tcpstartread(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	isc__netievent_tcpstartread_t *ievent =
+ 		(isc__netievent_tcpstartread_t *)ev0;
+ 	isc_nmsocket_t *sock = ievent->sock;
++	isc_result_t result;
+ 
+ 	REQUIRE(VALID_NMSOCK(sock));
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 	UNUSED(worker);
+ 
+ 	if (isc__nmsocket_closing(sock)) {
++		result = ISC_R_CANCELED;
++	} else {
++		result = isc__nm_start_reading(sock);
++	}
++
++	if (result != ISC_R_SUCCESS) {
+ 		sock->reading = true;
+-		isc__nm_tcp_failed_read_cb(sock, ISC_R_CANCELED);
++		isc__nm_tcp_failed_read_cb(sock, result);
+ 		return;
+ 	}
+ 
+-	isc__nm_start_reading(sock);
+ 	isc__nmsocket_timer_start(sock);
+ }
+ 
+diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
+index 4689f56..3bc8e05 100644
+--- a/lib/isc/netmgr/tcpdns.c
++++ b/lib/isc/netmgr/tcpdns.c
+@@ -709,6 +709,7 @@ isc__nm_async_tcpdnsread(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	isc__netievent_tcpdnsread_t *ievent =
+ 		(isc__netievent_tcpdnsread_t *)ev0;
+ 	isc_nmsocket_t *sock = ievent->sock;
++	isc_result_t result;
+ 
+ 	UNUSED(worker);
+ 
+@@ -716,12 +717,15 @@ isc__nm_async_tcpdnsread(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 
+ 	if (isc__nmsocket_closing(sock)) {
+-		sock->reading = true;
+-		isc__nm_failed_read_cb(sock, ISC_R_CANCELED, false);
+-		return;
++		result = ISC_R_CANCELED;
++	} else {
++		result = isc__nm_process_sock_buffer(sock);
+ 	}
+ 
+-	isc__nm_process_sock_buffer(sock);
++	if (result != ISC_R_SUCCESS) {
++		sock->reading = true;
++		isc__nm_failed_read_cb(sock, result, false);
++	}
+ }
+ 
+ /*
+@@ -813,6 +817,7 @@ isc__nm_tcpdns_read_cb(uv_stream_t *stream, ssize_t nread,
+ 	isc_nmsocket_t *sock = uv_handle_get_data((uv_handle_t *)stream);
+ 	uint8_t *base = NULL;
+ 	size_t len;
++	isc_result_t result;
+ 
+ 	REQUIRE(VALID_NMSOCK(sock));
+ 	REQUIRE(sock->tid == isc_nm_tid());
+@@ -856,7 +861,10 @@ isc__nm_tcpdns_read_cb(uv_stream_t *stream, ssize_t nread,
+ 		sock->read_timeout = atomic_load(&sock->mgr->idle);
+ 	}
+ 
+-	isc__nm_process_sock_buffer(sock);
++	result = isc__nm_process_sock_buffer(sock);
++	if (result != ISC_R_SUCCESS) {
++		isc__nm_failed_read_cb(sock, result, true);
++	}
+ free:
+ 	isc__nm_free_uvbuf(sock, buf);
+ }
+@@ -999,7 +1007,12 @@ accept_connection(isc_nmsocket_t *ssock, isc_quota_t *quota) {
+ 	 * prep_destroy()->tcpdns_close_direct().
+ 	 */
+ 	isc_nmhandle_attach(handle, &csock->recv_handle);
+-	isc__nm_process_sock_buffer(csock);
++	result = isc__nm_process_sock_buffer(csock);
++	if (result != ISC_R_SUCCESS) {
++		isc_nmhandle_detach(&csock->recv_handle);
++		isc_nmhandle_detach(&handle);
++		goto failure;
++	}
+ 
+ 	/*
+ 	 * The initial timer has been set, update the read timeout for the next
+diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c
+index 305ac29..1af63af 100644
+--- a/lib/isc/netmgr/udp.c
++++ b/lib/isc/netmgr/udp.c
+@@ -879,6 +879,7 @@ void
+ isc__nm_async_udpread(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	isc__netievent_udpread_t *ievent = (isc__netievent_udpread_t *)ev0;
+ 	isc_nmsocket_t *sock = ievent->sock;
++	isc_result_t result;
+ 
+ 	UNUSED(worker);
+ 
+@@ -886,12 +887,17 @@ isc__nm_async_udpread(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 
+ 	if (isc__nmsocket_closing(sock)) {
++		result = ISC_R_CANCELED;
++	} else {
++		result = isc__nm_start_reading(sock);
++	}
++
++	if (result != ISC_R_SUCCESS) {
+ 		sock->reading = true;
+-		isc__nm_failed_read_cb(sock, ISC_R_CANCELED, false);
++		isc__nm_failed_read_cb(sock, result, false);
+ 		return;
+ 	}
+ 
+-	isc__nm_start_reading(sock);
+ 	isc__nmsocket_timer_start(sock);
+ }
+ 
+-- 
+2.27.0
+
diff --git a/backport-0042-Fix-a-race-between-resolver-query-timeout-and-valida.patch b/backport-0042-Fix-a-race-between-resolver-query-timeout-and-valida.patch
new file mode 100644
index 0000000000000000000000000000000000000000..53390c39542a0a749001fd07d5e4d4944dc4bd45
--- /dev/null
+++ b/backport-0042-Fix-a-race-between-resolver-query-timeout-and-valida.patch
@@ -0,0 +1,174 @@
+From 058a2e7d4437f383c5cda3a44921e49ad272f9fb Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Fri, 10 Jun 2022 14:44:52 +0000
+Subject: [PATCH] Fix a race between resolver query timeout and validation
+
+The `resolver.c:validated()` function unlinks the current validator from
+the fetch's validators list, which can leave it empty, then unlocks
+the bucket lock. If, by a chance, the fetch was timed out just before
+the `validated()` call, the final timeout callback running in parallel
+with `validated()` can find the fetch context with no active fetches
+and with an empty validators list and destroy it, which is unexpected
+for the `validated()` function and can lead to a crash.
+
+Increase the fetch context's reference count in the beginning of
+`validated()` and decrease it when it finishes its work to avoid the
+unexpected destruction of the fetch context.
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/058a2e7d4437f383c5cda3a44921e49ad272f9fb
+---
+ lib/dns/resolver.c | 63 +++++++++++++++++++++-------------------------
+ 1 file changed, 28 insertions(+), 35 deletions(-)
+
+diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
+index f34b9e318e..e8899d2457 100644
+--- a/lib/dns/resolver.c
++++ b/lib/dns/resolver.c
+@@ -5746,12 +5746,13 @@ validated(isc_task_t *task, isc_event_t *event) {
+ 	dns_rdataset_t *rdataset;
+ 	dns_rdataset_t *sigrdataset;
+ 	dns_resolver_t *res;
+-	dns_valarg_t *valarg;
++	dns_valarg_t *valarg = event->ev_arg;
+ 	dns_validatorevent_t *vevent;
+ 	fetchctx_t *fctx;
+ 	bool chaining;
+ 	bool negative;
+ 	bool sentresponse;
++	bool bucket_empty;
+ 	isc_result_t eresult = ISC_R_SUCCESS;
+ 	isc_result_t result = ISC_R_SUCCESS;
+ 	isc_stdtime_t now;
+@@ -5765,14 +5766,15 @@ validated(isc_task_t *task, isc_event_t *event) {
+ 	UNUSED(task); /* for now */
+ 
+ 	REQUIRE(event->ev_type == DNS_EVENT_VALIDATORDONE);
+-	valarg = event->ev_arg;
++	REQUIRE(VALID_FCTX(valarg->fctx));
++	REQUIRE(!ISC_LIST_EMPTY(valarg->fctx->validators));
++
+ 	fctx = valarg->fctx;
++	fctx_increference(fctx);
+ 	dns_message_attach(valarg->message, &message);
+ 
+-	REQUIRE(VALID_FCTX(fctx));
+ 	res = fctx->res;
+ 	addrinfo = valarg->addrinfo;
+-	REQUIRE(!ISC_LIST_EMPTY(fctx->validators));
+ 
+ 	vevent = (dns_validatorevent_t *)event;
+ 	fctx->vresult = vevent->result;
+@@ -5810,12 +5812,8 @@ validated(isc_task_t *task, isc_event_t *event) {
+ 	 * so, destroy the fctx.
+ 	 */
+ 	if (SHUTTINGDOWN(fctx) && !sentresponse) {
+-		bool bucket_empty;
+-		bucket_empty = maybe_destroy(fctx, true);
++		maybe_destroy(fctx, true);
+ 		UNLOCK(&res->buckets[bucketnum].lock);
+-		if (bucket_empty) {
+-			empty_bucket(res);
+-		}
+ 		goto cleanup_event;
+ 	}
+ 
+@@ -5877,18 +5875,15 @@ validated(isc_task_t *task, isc_event_t *event) {
+ 				(void)dns_db_deleterdataset(fctx->cache, node,
+ 							    NULL, vevent->type,
+ 							    0);
+-			}
+-			if (result == ISC_R_SUCCESS &&
+-			    vevent->sigrdataset != NULL) {
+-				(void)dns_db_deleterdataset(
+-					fctx->cache, node, NULL,
+-					dns_rdatatype_rrsig, vevent->type);
+-			}
+-			if (result == ISC_R_SUCCESS) {
++				if (vevent->sigrdataset != NULL) {
++					(void)dns_db_deleterdataset(
++						fctx->cache, node, NULL,
++						dns_rdatatype_rrsig,
++						vevent->type);
++				}
+ 				dns_db_detachnode(fctx->cache, &node);
+ 			}
+-		}
+-		if (fctx->vresult == DNS_R_BROKENCHAIN && !negative) {
++		} else if (!negative) {
+ 			/*
+ 			 * Cache the data as pending for later validation.
+ 			 */
+@@ -5901,20 +5896,16 @@ validated(isc_task_t *task, isc_event_t *event) {
+ 				(void)dns_db_addrdataset(
+ 					fctx->cache, node, NULL, now,
+ 					vevent->rdataset, 0, NULL);
+-			}
+-			if (result == ISC_R_SUCCESS &&
+-			    vevent->sigrdataset != NULL) {
+-				(void)dns_db_addrdataset(
+-					fctx->cache, node, NULL, now,
+-					vevent->sigrdataset, 0, NULL);
+-			}
+-			if (result == ISC_R_SUCCESS) {
++				if (vevent->sigrdataset != NULL) {
++					(void)dns_db_addrdataset(
++						fctx->cache, node, NULL, now,
++						vevent->sigrdataset, 0, NULL);
++				}
+ 				dns_db_detachnode(fctx->cache, &node);
+ 			}
+ 		}
+ 		result = fctx->vresult;
+ 		add_bad(fctx, message, addrinfo, result, badns_validation);
+-		isc_event_free(&event);
+ 		UNLOCK(&res->buckets[bucketnum].lock);
+ 		INSIST(fctx->validator == NULL);
+ 		fctx->validator = ISC_LIST_HEAD(fctx->validators);
+@@ -5942,8 +5933,7 @@ validated(isc_task_t *task, isc_event_t *event) {
+ 			fctx_try(fctx, true, true); /* Locks bucket. */
+ 		}
+ 
+-		dns_message_detach(&message);
+-		return;
++		goto cleanup_event;
+ 	}
+ 
+ 	if (negative) {
+@@ -6057,19 +6047,15 @@ validated(isc_task_t *task, isc_event_t *event) {
+ 	}
+ 
+ 	if (sentresponse) {
+-		bool bucket_empty = false;
+ 		/*
+ 		 * If we only deferred the destroy because we wanted to cache
+ 		 * the data, destroy now.
+ 		 */
+ 		dns_db_detachnode(fctx->cache, &node);
+ 		if (SHUTTINGDOWN(fctx)) {
+-			bucket_empty = maybe_destroy(fctx, true);
++			maybe_destroy(fctx, true);
+ 		}
+ 		UNLOCK(&res->buckets[bucketnum].lock);
+-		if (bucket_empty) {
+-			empty_bucket(res);
+-		}
+ 		goto cleanup_event;
+ 	}
+ 
+@@ -6210,6 +6196,13 @@ cleanup_event:
+ 	INSIST(node == NULL);
+ 	dns_message_detach(&message);
+ 	isc_event_free(&event);
++
++	LOCK(&res->buckets[fctx->bucketnum].lock);
++	bucket_empty = fctx_decreference(fctx);
++	UNLOCK(&res->buckets[fctx->bucketnum].lock);
++	if (bucket_empty) {
++		empty_bucket(res);
++	}
+ }
+ 
+ static void
+-- 
+2.23.0
+
diff --git a/backport-0042-Remove-resolver.c-maybe_destroy.patch b/backport-0042-Remove-resolver.c-maybe_destroy.patch
new file mode 100644
index 0000000000000000000000000000000000000000..51269c96b79717afe2fb1296057151fe52925bf6
--- /dev/null
+++ b/backport-0042-Remove-resolver.c-maybe_destroy.patch
@@ -0,0 +1,150 @@
+From 61d77affdd39a352de5f386dc08818174fbaa781 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Wed, 15 Jun 2022 10:27:41 +0000
+Subject: [PATCH] Remove resolver.c:maybe_destroy()
+
+After refactoring of `validated()`, the `maybe_destroy()` function is
+no longer expected to actually destroy the fetch context when it is
+being called, so effectively it only ensures that the validators are
+canceled when the context has no more queries and pending events, but
+that is redundant, because `maybe_destroy()` `REQUIRE`s that the context
+should be in the shutting down state, and the function which sets that
+state is already canceling the validators in its own turn.
+
+As a failsafe, to make sure that no validators will be created after
+`fctx_doshutdown()` is called, add an early return from `valcreate()` if
+the context is in the shutting down state.
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/61d77affdd39a352de5f386dc08818174fbaa781
+---
+ lib/dns/resolver.c | 73 +++++-----------------------------------------
+ 1 file changed, 7 insertions(+), 66 deletions(-)
+
+diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
+index e8899d2457..15297024c0 100644
+--- a/lib/dns/resolver.c
++++ b/lib/dns/resolver.c
+@@ -641,8 +641,6 @@ ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
+ 		  dns_rdataset_t *ardataset, isc_result_t *eresultp);
+ static void
+ validated(isc_task_t *task, isc_event_t *event);
+-static bool
+-maybe_destroy(fetchctx_t *fctx, bool locked);
+ static void
+ add_bad(fetchctx_t *fctx, dns_message_t *rmessage, dns_adbaddrinfo_t *addrinfo,
+ 	isc_result_t reason, badnstype_t badtype);
+@@ -902,14 +900,16 @@ valcreate(fetchctx_t *fctx, dns_message_t *message, dns_adbaddrinfo_t *addrinfo,
+ 	  dns_rdataset_t *sigrdataset, unsigned int valoptions,
+ 	  isc_task_t *task) {
+ 	dns_validator_t *validator = NULL;
+-	dns_valarg_t *valarg;
++	dns_valarg_t *valarg = NULL;
+ 	isc_result_t result;
+ 
++	if (SHUTTINGDOWN(fctx)) {
++		return (ISC_R_SHUTTINGDOWN);
++	}
++
+ 	valarg = isc_mem_get(fctx->mctx, sizeof(*valarg));
++	*valarg = (dns_valarg_t){ .fctx = fctx, .addrinfo = addrinfo };
+ 
+-	valarg->fctx = fctx;
+-	valarg->addrinfo = addrinfo;
+-	valarg->message = NULL;
+ 	dns_message_attach(message, &valarg->message);
+ 
+ 	if (!ISC_LIST_EMPTY(fctx->validators)) {
+@@ -4434,7 +4434,6 @@ resume_qmin(isc_task_t *task, isc_event_t *event) {
+ 
+ 	LOCK(&res->buckets[bucketnum].lock);
+ 	if (SHUTTINGDOWN(fctx)) {
+-		maybe_destroy(fctx, true);
+ 		UNLOCK(&res->buckets[bucketnum].lock);
+ 		goto cleanup;
+ 	}
+@@ -5679,58 +5678,6 @@ clone_results(fetchctx_t *fctx) {
+ #define CHASE(r)      (((r)->attributes & DNS_RDATASETATTR_CHASE) != 0)
+ #define CHECKNAMES(r) (((r)->attributes & DNS_RDATASETATTR_CHECKNAMES) != 0)
+ 
+-/*
+- * Destroy '*fctx' if it is ready to be destroyed (i.e., if it has
+- * no references and is no longer waiting for any events).
+- *
+- * Requires:
+- *      '*fctx' is shutting down.
+- *
+- * Returns:
+- *	true if the resolver is exiting and this is the last fctx in the bucket.
+- */
+-static bool
+-maybe_destroy(fetchctx_t *fctx, bool locked) {
+-	unsigned int bucketnum;
+-	bool bucket_empty = false;
+-	dns_resolver_t *res = fctx->res;
+-	dns_validator_t *validator, *next_validator;
+-	bool dodestroy = false;
+-
+-	bucketnum = fctx->bucketnum;
+-	if (!locked) {
+-		LOCK(&res->buckets[bucketnum].lock);
+-	}
+-
+-	REQUIRE(SHUTTINGDOWN(fctx));
+-
+-	if (fctx->pending != 0 || fctx->nqueries != 0) {
+-		goto unlock;
+-	}
+-
+-	for (validator = ISC_LIST_HEAD(fctx->validators); validator != NULL;
+-	     validator = next_validator)
+-	{
+-		next_validator = ISC_LIST_NEXT(validator, link);
+-		dns_validator_cancel(validator);
+-	}
+-
+-	if (isc_refcount_current(&fctx->references) == 0 &&
+-	    ISC_LIST_EMPTY(fctx->validators))
+-	{
+-		bucket_empty = fctx_unlink(fctx);
+-		dodestroy = true;
+-	}
+-unlock:
+-	if (!locked) {
+-		UNLOCK(&res->buckets[bucketnum].lock);
+-	}
+-	if (dodestroy) {
+-		fctx_destroy(fctx);
+-	}
+-	return (bucket_empty);
+-}
+-
+ /*
+  * The validator has finished.
+  */
+@@ -5807,12 +5754,9 @@ validated(isc_task_t *task, isc_event_t *event) {
+ 	sentresponse = ((fctx->options & DNS_FETCHOPT_NOVALIDATE) != 0);
+ 
+ 	/*
+-	 * If shutting down, ignore the results.  Check to see if we're
+-	 * done waiting for validator completions and ADB pending events; if
+-	 * so, destroy the fctx.
++	 * If shutting down, ignore the results.
+ 	 */
+ 	if (SHUTTINGDOWN(fctx) && !sentresponse) {
+-		maybe_destroy(fctx, true);
+ 		UNLOCK(&res->buckets[bucketnum].lock);
+ 		goto cleanup_event;
+ 	}
+@@ -6052,9 +5996,6 @@ validated(isc_task_t *task, isc_event_t *event) {
+ 		 * the data, destroy now.
+ 		 */
+ 		dns_db_detachnode(fctx->cache, &node);
+-		if (SHUTTINGDOWN(fctx)) {
+-			maybe_destroy(fctx, true);
+-		}
+ 		UNLOCK(&res->buckets[bucketnum].lock);
+ 		goto cleanup_event;
+ 	}
+-- 
+2.23.0
+
diff --git a/backport-0043-Check-for-overflow-in-GENERATE-computations.patch b/backport-0043-Check-for-overflow-in-GENERATE-computations.patch
new file mode 100644
index 0000000000000000000000000000000000000000..95b4592b10b9f9f760a912548a1e09d18fd95c22
--- /dev/null
+++ b/backport-0043-Check-for-overflow-in-GENERATE-computations.patch
@@ -0,0 +1,64 @@
+From 16ac79a8f720a917b0f787178905a8df56d4d557 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Fri, 1 Jul 2022 11:40:37 +1000
+Subject: [PATCH] Check for overflow in $GENERATE computations
+
+$GENERATE uses 'int' for its computations and some constructions
+can overflow values that can be represented by an 'int' resulting
+in undefined behaviour.  Detect these conditions and return a
+range error.
+
+(cherry picked from commit 5327b9708fd0e5d0d6c95183cca9eafb4a1cfe05)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/16ac79a8f720a917b0f787178905a8df56d4d557
+---
+ .../checkzone/zones/bad-generate-range.db      | 18 ++++++++++++++++++
+ lib/dns/master.c                               |  7 +++++++
+ 2 files changed, 25 insertions(+)
+ create mode 100644 bin/tests/system/checkzone/zones/bad-generate-range.db
+
+diff --git a/bin/tests/system/checkzone/zones/bad-generate-range.db b/bin/tests/system/checkzone/zones/bad-generate-range.db
+new file mode 100644
+index 0000000000..62a9e15684
+--- /dev/null
++++ b/bin/tests/system/checkzone/zones/bad-generate-range.db
+@@ -0,0 +1,18 @@
++; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++;
++; SPDX-License-Identifier: MPL-2.0
++;
++; This Source Code Form is subject to the terms of the Mozilla Public
++; License, v. 2.0.  If a copy of the MPL was not distributed with this
++; file, you can obtain one at https://mozilla.org/MPL/2.0/.
++;
++; See the COPYRIGHT file distributed with this work for additional
++; information regarding copyright ownership.
++
++$TTL 600
++@		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
++		NS	ns
++ns		A	192.0.2.1
++
++; 2147483647 + 1 overflows what can be represented in an 'int'
++$GENERATE 1-1   host$	TXT foo${2147483647}
+diff --git a/lib/dns/master.c b/lib/dns/master.c
+index e1ba723104..e938b15a0e 100644
+--- a/lib/dns/master.c
++++ b/lib/dns/master.c
+@@ -735,6 +735,13 @@ genname(char *name, int it, char *buffer, size_t length) {
+ 					continue;
+ 				}
+ 			}
++			/*
++			 * 'it' is >= 0 so we don't need to check for
++			 * underflow.
++			 */
++			if ((it > 0 && delta > INT_MAX - it)) {
++				return (ISC_R_RANGE);
++			}
+ 			if (nibblemode) {
+ 				n = nibbles(numbuf, sizeof(numbuf), width,
+ 					    mode[0], it + delta);
+-- 
+2.23.0
+
diff --git a/backport-0043-Tighten-GENERATE-directive-parsing.patch b/backport-0043-Tighten-GENERATE-directive-parsing.patch
new file mode 100644
index 0000000000000000000000000000000000000000..335ff2aa84bf4e33c8e41e9af70d2edddb7b2585
--- /dev/null
+++ b/backport-0043-Tighten-GENERATE-directive-parsing.patch
@@ -0,0 +1,161 @@
+From d10e20da0dbd6d6438d55a5e9c6e22cee70aec20 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Fri, 1 Jul 2022 11:13:51 +1000
+Subject: [PATCH] Tighten $GENERATE directive parsing
+
+The original sscanf processing allowed for a number of syntax errors
+to be accepted.  This included missing the closing brace in
+${modifiers}
+
+Look for both comma and right brace as intermediate seperators as
+well as consuming the final right brace in the sscanf processing
+for ${modifiers}.  Check when we got right brace to determine if
+the sscanf consumed more input than expected and if so behave as
+if it had stopped at the first right brace.
+
+(cherry picked from commit 7be64c0e94c967c0014a0b960a495c4fb05f1fc2)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/d10e20da0dbd6d6438d55a5e9c6e22cee70aec20
+---
+ .../checkzone/zones/bad-generate-garbage.db   | 17 ++++++++++
+ .../zones/bad-generate-missing-brace.db       | 17 ++++++++++
+ .../checkzone/zones/good-generate-modifier.db | 20 +++++++++++
+ lib/dns/master.c                              | 33 ++++++++++++-------
+ 4 files changed, 76 insertions(+), 11 deletions(-)
+ create mode 100644 bin/tests/system/checkzone/zones/bad-generate-garbage.db
+ create mode 100644 bin/tests/system/checkzone/zones/bad-generate-missing-brace.db
+ create mode 100644 bin/tests/system/checkzone/zones/good-generate-modifier.db
+
+diff --git a/bin/tests/system/checkzone/zones/bad-generate-garbage.db b/bin/tests/system/checkzone/zones/bad-generate-garbage.db
+new file mode 100644
+index 0000000000..0d66e753b6
+--- /dev/null
++++ b/bin/tests/system/checkzone/zones/bad-generate-garbage.db
+@@ -0,0 +1,17 @@
++; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++;
++; SPDX-License-Identifier: MPL-2.0
++;
++; This Source Code Form is subject to the terms of the Mozilla Public
++; License, v. 2.0.  If a copy of the MPL was not distributed with this
++; file, you can obtain one at https://mozilla.org/MPL/2.0/.
++;
++; See the COPYRIGHT file distributed with this work for additional
++; information regarding copyright ownership.
++
++$TTL 600
++@		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
++		NS	ns
++ns		A	192.0.2.1
++
++$GENERATE 0-7   host$	A 1.2.3.${1,0,dgarbagegarbage}
+diff --git a/bin/tests/system/checkzone/zones/bad-generate-missing-brace.db b/bin/tests/system/checkzone/zones/bad-generate-missing-brace.db
+new file mode 100644
+index 0000000000..314583e71a
+--- /dev/null
++++ b/bin/tests/system/checkzone/zones/bad-generate-missing-brace.db
+@@ -0,0 +1,17 @@
++; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++;
++; SPDX-License-Identifier: MPL-2.0
++;
++; This Source Code Form is subject to the terms of the Mozilla Public
++; License, v. 2.0.  If a copy of the MPL was not distributed with this
++; file, you can obtain one at https://mozilla.org/MPL/2.0/.
++;
++; See the COPYRIGHT file distributed with this work for additional
++; information regarding copyright ownership.
++
++$TTL 600
++@		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
++		NS	ns
++ns		A	192.0.2.1
++
++$GENERATE 0-7   host$	A 1.2.3.${1000
+diff --git a/bin/tests/system/checkzone/zones/good-generate-modifier.db b/bin/tests/system/checkzone/zones/good-generate-modifier.db
+new file mode 100644
+index 0000000000..3c811d60e0
+--- /dev/null
++++ b/bin/tests/system/checkzone/zones/good-generate-modifier.db
+@@ -0,0 +1,20 @@
++; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++;
++; SPDX-License-Identifier: MPL-2.0
++;
++; This Source Code Form is subject to the terms of the Mozilla Public
++; License, v. 2.0.  If a copy of the MPL was not distributed with this
++; file, you can obtain one at https://mozilla.org/MPL/2.0/.
++;
++; See the COPYRIGHT file distributed with this work for additional
++; information regarding copyright ownership.
++
++$TTL 600
++@		SOA	ns hostmaster 2011012708 3600 1200 604800 1200
++		NS	ns
++ns		A	192.0.2.1
++
++$GENERATE 0-7   host$	A 1.2.3.${1,0,d}
++$GENERATE 8-9   host$	A 1.2.3.${1,0}
++$GENERATE 10-11 host$	A 1.2.3.${1}
++$GENERATE 1024-1026 ${0,3,n}	AAAA 2001:db8::${0,4,x}
+diff --git a/lib/dns/master.c b/lib/dns/master.c
+index e938b15a0e..1ad658b7f4 100644
+--- a/lib/dns/master.c
++++ b/lib/dns/master.c
+@@ -683,7 +683,10 @@ genname(char *name, int it, char *buffer, size_t length) {
+ 	char fmt[sizeof("%04000000000d")];
+ 	char numbuf[128];
+ 	char *cp;
+-	char mode[2];
++	char mode[2] = { 0 };
++	char brace[2] = { 0 };
++	char comma1[2] = { 0 };
++	char comma2[2] = { 0 };
+ 	int delta = 0;
+ 	isc_textregion_t r;
+ 	unsigned int n;
+@@ -708,23 +711,31 @@ genname(char *name, int it, char *buffer, size_t length) {
+ 			strlcpy(fmt, "%d", sizeof(fmt));
+ 			/* Get format specifier. */
+ 			if (*name == '{') {
+-				n = sscanf(name, "{%d,%u,%1[doxXnN]}", &delta,
+-					   &width, mode);
+-				switch (n) {
+-				case 1:
+-					break;
+-				case 2:
++				n = sscanf(name,
++					   "{%d%1[,}]%u%1[,}]%1[doxXnN]%1[}]",
++					   &delta, comma1, &width, comma2, mode,
++					   brace);
++				if (n < 2 || n > 6) {
++					return (DNS_R_SYNTAX);
++				}
++				if (comma1[0] == '}') {
++					/* %{delta} */
++				} else if (comma1[0] == ',' && comma2[0] == '}')
++				{
++					/* %{delta,width} */
+ 					n = snprintf(fmt, sizeof(fmt), "%%0%ud",
+ 						     width);
+-					break;
+-				case 3:
++				} else if (comma1[0] == ',' &&
++					   comma2[0] == ',' && mode[0] != 0 &&
++					   brace[0] == '}')
++				{
++					/* %{delta,width,format} */
+ 					if (mode[0] == 'n' || mode[0] == 'N') {
+ 						nibblemode = true;
+ 					}
+ 					n = snprintf(fmt, sizeof(fmt),
+ 						     "%%0%u%c", width, mode[0]);
+-					break;
+-				default:
++				} else {
+ 					return (DNS_R_SYNTAX);
+ 				}
+ 				if (n >= sizeof(fmt)) {
+-- 
+2.23.0
+
diff --git a/backport-0044-Add-UV_RUNTIME_CHECK-macro-to-print-uv_strerror.patch b/backport-0044-Add-UV_RUNTIME_CHECK-macro-to-print-uv_strerror.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5f101b8e6ad850a8585c01dca51f7f441ee4cfb2
--- /dev/null
+++ b/backport-0044-Add-UV_RUNTIME_CHECK-macro-to-print-uv_strerror.patch
@@ -0,0 +1,39 @@
+From 88751da1145e1bbc4ed32fd100184f3f0d7e2ad1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Tue, 15 Feb 2022 14:44:29 +0100
+Subject: [PATCH] Add UV_RUNTIME_CHECK() macro to print uv_strerror()
+
+When libuv functions fail, they return correct return value that could
+be useful for more detailed debugging.  Currently, we usually just check
+whether the return value is 0 and invoke assertion error if it doesn't
+throwing away the details why the call has failed.  Unfortunately, this
+often happen on more exotic platforms.
+
+Add a UV_RUNTIME_CHECK() macro that can be used to print more detailed
+error message (via uv_strerror() before ending the execution of the
+program abruptly with the assertion.
+
+(cherry picked from commit 62e15bb06db5e7d209e8c20d7bdb1501df7dfba8)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/88751da1145e1bbc4ed32fd100184f3f0d7e2ad1
+---
+ lib/isc/netmgr/netmgr-int.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
+index 326535c..23bc2a2 100644
+--- a/lib/isc/netmgr/netmgr-int.h
++++ b/lib/isc/netmgr/netmgr-int.h
+@@ -1607,3 +1607,9 @@ isc__nmsocket_writetimeout_cb(void *data, isc_result_t eresult);
+  * changed in the future.
+  */
+ #define STREAM_CLIENTS_PER_CONN 23
++
++#define UV_RUNTIME_CHECK(func, ret)                                           \
++       if (ret != 0) {                                                       \
++               isc_error_fatal(__FILE__, __LINE__, "%s failed: %s\n", #func, \
++                               uv_strerror(ret));                            \
++       }
+-- 
+2.27.0
+
diff --git a/backport-0045-Move-setting-the-sock-write_timeout-to-the-async_-se.patch b/backport-0045-Move-setting-the-sock-write_timeout-to-the-async_-se.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9e528c6c018382489a36d604c7e8a93ebe695fa8
--- /dev/null
+++ b/backport-0045-Move-setting-the-sock-write_timeout-to-the-async_-se.patch
@@ -0,0 +1,88 @@
+From ed4eda5ebc77c08b7ef1e6c94bea373c00c903c8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Tue, 17 May 2022 21:31:37 +0200
+Subject: [PATCH] Move setting the sock->write_timeout to the async_*send
+
+Setting the sock->write_timeout from the TCP, TCPDNS, and TLSDNS send
+functions could lead to (harmless) data race when setting the value for
+the first time when the isc_nm_send() function would be called from
+thread not-matching the socket we are sending to.  Move the setting the
+sock->write_timeout to the matching async function which is always
+called from the matching thread.
+
+(cherry picked from commit 61117840c18778e69e3073cc01dbea579271a014)
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/ed4eda5ebc77c08b7ef1e6c94bea373c00c903c8
+---
+ lib/isc/netmgr/tcp.c    | 14 +++++++-------
+ lib/isc/netmgr/tcpdns.c | 15 ++++++++-------
+ 2 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
+index a8d1dba6d4..eaad8da7c6 100644
+--- a/lib/isc/netmgr/tcp.c
++++ b/lib/isc/netmgr/tcp.c
+@@ -1083,13 +1083,6 @@ isc__nm_tcp_send(isc_nmhandle_t *handle, const isc_region_t *region,
+ 	uvreq->cb.send = cb;
+ 	uvreq->cbarg = cbarg;
+ 
+-	if (sock->write_timeout == 0) {
+-		sock->write_timeout =
+-			(atomic_load(&sock->keepalive)
+-				 ? atomic_load(&sock->mgr->keepalive)
+-				 : atomic_load(&sock->mgr->idle));
+-	}
+-
+ 	ievent = isc__nm_get_netievent_tcpsend(sock->mgr, sock, uvreq);
+ 	isc__nm_maybe_enqueue_ievent(&sock->mgr->workers[sock->tid],
+ 				     (isc__netievent_t *)ievent);
+@@ -1134,6 +1127,13 @@ isc__nm_async_tcpsend(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	REQUIRE(sock->tid == isc_nm_tid());
+ 	UNUSED(worker);
+ 
++	if (sock->write_timeout == 0) {
++		sock->write_timeout =
++			(atomic_load(&sock->keepalive)
++				 ? atomic_load(&sock->mgr->keepalive)
++				 : atomic_load(&sock->mgr->idle));
++	}
++
+ 	result = tcp_send_direct(sock, uvreq);
+ 	if (result != ISC_R_SUCCESS) {
+ 		isc__nm_incstats(sock->mgr, sock->statsindex[STATID_SENDFAIL]);
+diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
+index e287f0a282..6f513b49ce 100644
+--- a/lib/isc/netmgr/tcpdns.c
++++ b/lib/isc/netmgr/tcpdns.c
+@@ -1088,13 +1088,6 @@ isc__nm_tcpdns_send(isc_nmhandle_t *handle, isc_region_t *region,
+ 	uvreq->cb.send = cb;
+ 	uvreq->cbarg = cbarg;
+ 
+-	if (sock->write_timeout == 0) {
+-		sock->write_timeout =
+-			(atomic_load(&sock->keepalive)
+-				 ? atomic_load(&sock->mgr->keepalive)
+-				 : atomic_load(&sock->mgr->idle));
+-	}
+-
+ 	ievent = isc__nm_get_netievent_tcpdnssend(sock->mgr, sock, uvreq);
+ 	isc__nm_maybe_enqueue_ievent(&sock->mgr->workers[sock->tid],
+ 				     (isc__netievent_t *)ievent);
+@@ -1141,6 +1134,14 @@ isc__nm_async_tcpdnssend(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	isc_result_t result;
+ 	isc_nmsocket_t *sock = ievent->sock;
+ 	isc__nm_uvreq_t *uvreq = ievent->req;
++
++	if (sock->write_timeout == 0) {
++		sock->write_timeout =
++			(atomic_load(&sock->keepalive)
++				 ? atomic_load(&sock->mgr->keepalive)
++				 : atomic_load(&sock->mgr->idle));
++	}
++
+ 	uv_buf_t bufs[2] = { { .base = uvreq->tcplen, .len = 2 },
+ 			     { .base = uvreq->uvbuf.base,
+ 			       .len = uvreq->uvbuf.len } };
+-- 
+2.23.0
+
diff --git a/backport-Accept-in-NULL-with-inlen-0-in-isc_-half-siphash24.patch b/backport-Accept-in-NULL-with-inlen-0-in-isc_-half-siphash24.patch
new file mode 100644
index 0000000000000000000000000000000000000000..575ce6d668e7b81f3d6b8fafbe37ed8eb1ea6fdb
--- /dev/null
+++ b/backport-Accept-in-NULL-with-inlen-0-in-isc_-half-siphash24.patch
@@ -0,0 +1,60 @@
+From f1c08fe93ba35343534d893f3efcfa6f5d97fdf0 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 10 Jan 2023 13:51:49 +1100
+Subject: [PATCH] Accept 'in=NULL' with 'inlen=0' in isc_{half}siphash24
+
+Arthimetic on NULL pointers is undefined.  Avoid arithmetic operations
+when 'in' is NULL and require 'in' to be non-NULL if 'inlen' is not zero.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/f1c08fe93ba35343534d893f3efcfa6f5d97fdf0
+
+(cherry picked from commit 349c23dbb7a4f3ffe29f3c9deff418aab6266fd0)
+---
+ lib/isc/siphash.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/lib/isc/siphash.c b/lib/isc/siphash.c
+index 1a863ff8e1..a6e60cf02f 100644
+--- a/lib/isc/siphash.c
++++ b/lib/isc/siphash.c
+@@ -91,6 +91,7 @@ isc_siphash24(const uint8_t *k, const uint8_t *in, const size_t inlen,
+ 	      uint8_t *out) {
+ 	REQUIRE(k != NULL);
+ 	REQUIRE(out != NULL);
++	REQUIRE(inlen == 0 || in != NULL);
+ 
+ 	uint64_t k0 = U8TO64_LE(k);
+ 	uint64_t k1 = U8TO64_LE(k + 8);
+@@ -102,7 +103,9 @@ isc_siphash24(const uint8_t *k, const uint8_t *in, const size_t inlen,
+ 
+ 	uint64_t b = ((uint64_t)inlen) << 56;
+ 
+-	const uint8_t *end = in + inlen - (inlen % sizeof(uint64_t));
++	const uint8_t *end = (in == NULL)
++				     ? NULL
++				     : in + inlen - (inlen % sizeof(uint64_t));
+ 	const size_t left = inlen & 7;
+ 
+ 	for (; in != end; in += 8) {
+@@ -169,6 +172,7 @@ isc_halfsiphash24(const uint8_t *k, const uint8_t *in, const size_t inlen,
+ 		  uint8_t *out) {
+ 	REQUIRE(k != NULL);
+ 	REQUIRE(out != NULL);
++	REQUIRE(inlen == 0 || in != NULL);
+ 
+ 	uint32_t k0 = U8TO32_LE(k);
+ 	uint32_t k1 = U8TO32_LE(k + 4);
+@@ -180,7 +184,9 @@ isc_halfsiphash24(const uint8_t *k, const uint8_t *in, const size_t inlen,
+ 
+ 	uint32_t b = ((uint32_t)inlen) << 24;
+ 
+-	const uint8_t *end = in + inlen - (inlen % sizeof(uint32_t));
++	const uint8_t *end = (in == NULL)
++				     ? NULL
++				     : in + inlen - (inlen % sizeof(uint32_t));
+ 	const int left = inlen & 3;
+ 
+ 	for (; in != end; in += 4) {
+-- 
+2.23.0
diff --git a/backport-Add-mctx-attach-detach-when-creating-destroying-a-memory-pool.patch b/backport-Add-mctx-attach-detach-when-creating-destroying-a-memory-pool.patch
new file mode 100644
index 0000000000000000000000000000000000000000..03dbc11fc92f3e383c6821cedefae3a89f831577
--- /dev/null
+++ b/backport-Add-mctx-attach-detach-when-creating-destroying-a-memory-pool.patch
@@ -0,0 +1,41 @@
+yum 32779aba8a0a5f852c611f44ecbeab5aab633e34 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Wed, 31 Aug 2022 12:30:38 +0000
+Subject: [PATCH] Add mctx attach/detach when creating/destroying a memory pool
+
+This should make sure that the memory context is not destroyed
+before the memory pool, which is using the context.
+Conflict: Context adaptation in the original patch：+ mpctx->lock = NULL;
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/32779aba8a0a5f852c611f44ecbeab5aab633e34
+(cherry picked from commit e97c3eea954e055634b72c21325d2611e960ee94)
+---
+ lib/isc/mem.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/lib/isc/mem.c b/lib/isc/mem.c
+index f84d300..33ece7a 100644
+--- a/lib/isc/mem.c
++++ b/lib/isc/mem.c
+@@ -1656,7 +1656,8 @@ isc_mempool_create(isc_mem_t *mctx0, size_t size, isc_mempool_t **mpctxp) {
+ 	mpctx->common.impmagic = MEMPOOL_MAGIC;
+ 	mpctx->common.magic = ISCAPI_MPOOL_MAGIC;
+ 	mpctx->lock = NULL;
+-	mpctx->mctx = mctx;
++	mpctx->mctx = NULL;
++	isc_mem_attach((isc_mem_t *)mctx, (isc_mem_t **)&mpctx->mctx);
+ 	/*
+ 	 * Mempools are stored as a linked list of element.
+ 	 */
+@@ -1765,7 +1766,8 @@ isc_mempool_destroy(isc_mempool_t **mpctxp) {
+ 	mpctx->common.impmagic = 0;
+ 	mpctx->common.magic = 0;
+ 
+-	isc_mem_put((isc_mem_t *)mpctx->mctx, mpctx, sizeof(isc__mempool_t));
++	isc_mem_putanddetach((isc_mem_t **)&mpctx->mctx, mpctx,
++			     sizeof(isc__mempool_t));
+ 
+ 	if (lock != NULL) {
+ 		UNLOCK(lock);
+-- 
+2.33.0
+
diff --git a/backport-Add-missing-DbC-magic-checks.patch b/backport-Add-missing-DbC-magic-checks.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5a3c341d3fcc638bc0d9d98fd2d2c23fe5f7cbbb
--- /dev/null
+++ b/backport-Add-missing-DbC-magic-checks.patch
@@ -0,0 +1,64 @@
+From f9845df6d61e7491508a7f54b1d3caab7641652e Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Thu, 1 Dec 2022 12:51:30 +1100
+Subject: [PATCH] Add missing DbC magic checks
+
+Checking for value != NULL is not sufficient to detect use after
+free errors.
+
+(cherry picked from commit b1086a5561c8024fc39b5250063fc901c27eef06)
+---
+ lib/dns/catz.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lib/dns/catz.c b/lib/dns/catz.c
+index 332f9877360..68927e84bbf 100644
+--- a/lib/dns/catz.c
++++ b/lib/dns/catz.c
+@@ -638,7 +638,7 @@ cleanup_ht:
+ void
+ dns_catz_catzs_set_view(dns_catz_zones_t *catzs, dns_view_t *view) {
+ 	REQUIRE(DNS_CATZ_ZONES_VALID(catzs));
+-	REQUIRE(view != NULL);
++	REQUIRE(DNS_VIEW_VALID(view));
+ 	/* Either it's a new one or it's being reconfigured. */
+ 	REQUIRE(catzs->view == NULL || !strcmp(catzs->view->name, view->name));
+ 
+@@ -834,7 +834,7 @@ void
+ dns_catz_catzs_detach(dns_catz_zones_t **catzsp) {
+ 	dns_catz_zones_t *catzs;
+ 
+-	REQUIRE(catzsp != NULL && *catzsp != NULL);
++	REQUIRE(catzsp != NULL && DNS_CATZ_ZONES_VALID(*catzsp));
+ 
+ 	catzs = *catzsp;
+ 	*catzsp = NULL;
+@@ -1515,7 +1515,7 @@ dns_catz_generate_masterfilename(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
+ 	bool special = false;
+ 
+ 	REQUIRE(DNS_CATZ_ZONE_VALID(zone));
+-	REQUIRE(entry != NULL);
++	REQUIRE(DNS_CATZ_ENTRY_VALID(entry));
+ 	REQUIRE(buffer != NULL && *buffer != NULL);
+ 
+ 	isc_buffer_allocate(zone->catzs->mctx, &tbuf,
+@@ -1613,7 +1613,7 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
+ 	char zname[DNS_NAME_FORMATSIZE];
+ 
+ 	REQUIRE(DNS_CATZ_ZONE_VALID(zone));
+-	REQUIRE(entry != NULL);
++	REQUIRE(DNS_CATZ_ENTRY_VALID(entry));
+ 	REQUIRE(buf != NULL && *buf == NULL);
+ 
+ 	/*
+@@ -1745,7 +1745,7 @@ dns_catz_dbupdate_callback(dns_db_t *db, void *fn_arg) {
+ 	isc_region_t r;
+ 
+ 	REQUIRE(DNS_DB_VALID(db));
+-	REQUIRE(fn_arg != NULL);
++	REQUIRE(DNS_CATZ_ZONES_VALID(fn_arg));
+ 	catzs = (dns_catz_zones_t *)fn_arg;
+ 
+ 	dns_name_toregion(&db->origin, &r);
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-CVE-2021-25214.patch b/backport-CVE-2021-25214.patch
deleted file mode 100644
index 00eccf8d03fdf0f9de3b8bb330f61962897cae67..0000000000000000000000000000000000000000
--- a/backport-CVE-2021-25214.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 813a1d0f943f7b4ecf43c449a08762a8d8557a45 Mon Sep 17 00:00:00 2001
-From: UNKNOWN <>
-Date: Tue, 27 Apr 2021 12:02:53 +0800
-Subject: [PATCH v2 1/2] Fix CVE-2021-25214
-
-Conflict:NA
-Reference:https://downloads.isc.org/isc/bind9/private/40732ca6e4fcc9d0/patches/CVE-2021-25214.patch
-
-
-diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
-index 558f40c..bae6d41 100644
---- a/lib/dns/xfrin.c
-+++ b/lib/dns/xfrin.c
-@@ -474,6 +474,20 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl,
- 	    dns_rdatatype_ismeta(rdata->type))
- 		FAIL(DNS_R_FORMERR);
- 
-+	/*
-+	 * Immediately reject the entire transfer if the RR that is currently
-+	 * being processed is an SOA record that is not placed at the zone
-+	 * apex.
-+	 */
-+	if (rdata->type == dns_rdatatype_soa &&
-+	    !dns_name_equal(&xfr->name, name)) {
-+		char namebuf[DNS_NAME_FORMATSIZE];
-+		dns_name_format(name, namebuf, sizeof(namebuf));
-+		xfrin_log(xfr, ISC_LOG_DEBUG(3), "SOA name mismatch: '%s'",
-+			  namebuf);
-+		FAIL(DNS_R_NOTZONETOP);
-+	}
-+
-  redo:
- 	switch (xfr->state) {
- 	case XFRST_SOAQUERY:
--- 
-1.8.3.1
diff --git a/backport-CVE-2021-25215.patch b/backport-CVE-2021-25215.patch
deleted file mode 100644
index bbd3c4acb2714fb508af8c0f7b154096a245e7e1..0000000000000000000000000000000000000000
--- a/backport-CVE-2021-25215.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c42cc79ef9a23d8273b273bb86a1c8c9995b28a0 Mon Sep 17 00:00:00 2001
-From: UNKNOWN <>
-Date: Tue, 27 Apr 2021 12:12:24 +0800
-Subject: [PATCH v2 2/2] Fix CVE-2021-25215
-
-Conflict:NA
-Reference:https://downloads.isc.org/isc/bind9/private/40732ca6e4fcc9d0/patches/CVE-2021-25215.patch
-
-
-diff --git a/bin/named/query.c b/bin/named/query.c
-index 6e988f5..2e7700a 100644
---- a/bin/named/query.c
-+++ b/bin/named/query.c
-@@ -9092,10 +9092,17 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 		if (noqname != NULL)
- 			query_addnoqnameproof(client, noqname);
- 		/*
--		 * We shouldn't ever fail to add 'rdataset'
--		 * because it's already in the answer.
-+		 * 'rdataset' will only be non-NULL here if the ANSWER section
-+		 * of the message to be sent to the client already contains an
-+		 * RRset with the same owner name and the same type as
-+		 * 'rdataset'.  This should never happen, with one exception:
-+		 * when chasing DNAME records, one of the DNAME records placed
-+		 * in the ANSWER section may turn out to be the final answer to
-+		 * the client's query, but we have no way of knowing that until
-+		 * now.  In such a case, 'rdataset' will be freed later, so we
-+		 * do not need to free it here.
- 		 */
--		INSIST(rdataset == NULL);
-+		INSIST(rdataset == NULL || qtype == dns_rdatatype_dname);
- 	}
- 
-  addauth:
--- 
-1.8.3.1
diff --git a/backport-CVE-2021-25220.patch b/backport-CVE-2021-25220.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bb4dd26e1052c2dea48f8f1084db1a0e0a6b3c27
--- /dev/null
+++ b/backport-CVE-2021-25220.patch
@@ -0,0 +1,208 @@
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/f1bc36f19362f9f2173bf9511e85781058f19c64
+diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
+index dd82f273a4d5a2d34edd1cbcba8c9daf78a71b34..677384b1081d060ccc0acc92e476eb7664577806 100644
+--- a/lib/dns/resolver.c
++++ b/lib/dns/resolver.c
+@@ -65,6 +65,8 @@
+ #include <dns/stats.h>
+ #include <dns/tsig.h>
+ #include <dns/validator.h>
++#include <dns/zone.h>
++
+ #ifdef WANT_QUERYTRACE
+ #define RTRACE(m)                                                             \
+ 	isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,                     \
+@@ -339,6 +341,8 @@ struct fetchctx {
+ 	dns_fetch_t *qminfetch;
+ 	dns_rdataset_t qminrrset;
+ 	dns_name_t qmindcname;
++	dns_fixedname_t fwdfname;
++	dns_name_t *fwdname;
+ 
+ 	/*%
+ 	 * The number of events we're waiting for.
+@@ -3766,6 +3770,7 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) {
+ 		if (result == ISC_R_SUCCESS) {
+ 			fwd = ISC_LIST_HEAD(forwarders->fwdrs);
+ 			fctx->fwdpolicy = forwarders->fwdpolicy;
++			dns_name_copynf(domain, fctx->fwdname);
+ 			if (fctx->fwdpolicy == dns_fwdpolicy_only &&
+ 			    isstrictsubdomain(domain, &fctx->domain))
+ 			{
+@@ -5155,6 +5160,9 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type,
+ 	fctx->restarts = 0;
+ 	fctx->querysent = 0;
+ 	fctx->referrals = 0;
++
++	fctx->fwdname = dns_fixedname_initname(&fctx->fwdfname);
++
+ 	TIME_NOW(&fctx->start);
+ 	fctx->timeouts = 0;
+ 	fctx->lamecount = 0;
+@@ -5217,6 +5225,7 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type,
+ 					   fname, &forwarders);
+ 		if (result == ISC_R_SUCCESS) {
+ 			fctx->fwdpolicy = forwarders->fwdpolicy;
++			dns_name_copynf(fname, fctx->fwdname);
+ 		}
+ 
+ 		if (fctx->fwdpolicy != dns_fwdpolicy_only) {
+@@ -7120,6 +7129,107 @@ mark_related(dns_name_t *name, dns_rdataset_t *rdataset, bool external,
+ 	}
+ }
+ 
++/*
++ * Returns true if 'name' is external to the namespace for which
++ * the server being queried can answer, either because it's not a
++ * subdomain or because it's below a forward declaration or a
++ * locally served zone.
++ */
++static inline bool
++name_external(const dns_name_t *name, dns_rdatatype_t type, fetchctx_t *fctx) {
++	isc_result_t result;
++	dns_forwarders_t *forwarders = NULL;
++	dns_fixedname_t fixed, zfixed;
++	dns_name_t *fname = dns_fixedname_initname(&fixed);
++	dns_name_t *zfname = dns_fixedname_initname(&zfixed);
++	dns_name_t *apex = NULL;
++	dns_name_t suffix;
++	dns_zone_t *zone = NULL;
++	unsigned int labels;
++	dns_namereln_t rel;
++
++	apex = ISFORWARDER(fctx->addrinfo) ? fctx->fwdname : &fctx->domain;
++
++	/*
++	 * The name is outside the queried namespace.
++	 */
++	rel = dns_name_fullcompare(name, apex, &(int){ 0 },
++				   &(unsigned int){ 0U });
++	if (rel != dns_namereln_subdomain && rel != dns_namereln_equal) {
++		return (true);
++	}
++
++	/*
++	 * If the record lives in the parent zone, adjust the name so we
++	 * look for the correct zone or forward clause.
++	 */
++	labels = dns_name_countlabels(name);
++	if (dns_rdatatype_atparent(type) && labels > 1U) {
++		dns_name_init(&suffix, NULL);
++		dns_name_getlabelsequence(name, 1, labels - 1, &suffix);
++		name = &suffix;
++	} else if (rel == dns_namereln_equal) {
++		/* If 'name' is 'apex', no further checking is needed. */
++		return (false);
++	}
++
++	/*
++	 * If there is a locally served zone between 'apex' and 'name'
++	 * then don't cache.
++	 */
++	LOCK(&fctx->res->view->lock);
++	if (fctx->res->view->zonetable != NULL) {
++		unsigned int options = DNS_ZTFIND_NOEXACT | DNS_ZTFIND_MIRROR;
++		result = dns_zt_find(fctx->res->view->zonetable, name, options,
++				     zfname, &zone);
++		if (zone != NULL) {
++			dns_zone_detach(&zone);
++		}
++		if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
++			if (dns_name_fullcompare(zfname, apex, &(int){ 0 },
++						 &(unsigned int){ 0U }) ==
++			    dns_namereln_subdomain)
++			{
++				UNLOCK(&fctx->res->view->lock);
++				return (true);
++			}
++		}
++	}
++	UNLOCK(&fctx->res->view->lock);
++
++	/*
++	 * Look for a forward declaration below 'name'.
++	 */
++	result = dns_fwdtable_find(fctx->res->view->fwdtable, name, fname,
++				   &forwarders);
++
++	if (ISFORWARDER(fctx->addrinfo)) {
++		/*
++		 * See if the forwarder declaration is better.
++		 */
++		if (result == ISC_R_SUCCESS) {
++			return (!dns_name_equal(fname, fctx->fwdname));
++		}
++
++		/*
++		 * If the lookup failed, the configuration must have
++		 * changed: play it safe and don't cache.
++		 */
++		return (true);
++	} else if (result == ISC_R_SUCCESS &&
++		   forwarders->fwdpolicy == dns_fwdpolicy_only &&
++		   !ISC_LIST_EMPTY(forwarders->fwdrs))
++	{
++		/*
++		 * If 'name' is covered by a 'forward only' clause then we
++		 * can't cache this repsonse.
++		 */
++		return (true);
++	}
++
++	return (false);
++}
++
+ static isc_result_t
+ check_section(void *arg, const dns_name_t *addname, dns_rdatatype_t type,
+ 	      dns_section_t section) {
+@@ -7146,7 +7256,7 @@ check_section(void *arg, const dns_name_t *addname, dns_rdatatype_t type,
+ 	result = dns_message_findname(rctx->query->rmessage, section, addname,
+ 				      dns_rdatatype_any, 0, &name, NULL);
+ 	if (result == ISC_R_SUCCESS) {
+-		external = !dns_name_issubdomain(name, &fctx->domain);
++		external = name_external(name, type, fctx);
+ 		if (type == dns_rdatatype_a) {
+ 			for (rdataset = ISC_LIST_HEAD(name->list);
+ 			     rdataset != NULL;
+@@ -8770,6 +8880,13 @@ rctx_answer_scan(respctx_t *rctx) {
+ 			break;
+ 
+ 		case dns_namereln_subdomain:
++			/*
++			 * Don't accept DNAME from parent namespace.
++			 */
++			if (name_external(name, dns_rdatatype_dname, fctx)) {
++				continue;
++			}
++
+ 			/*
+ 			 * In-scope DNAME records must have at least
+ 			 * as many labels as the domain being queried.
+@@ -9083,13 +9200,11 @@ rctx_authority_positive(respctx_t *rctx) {
+ 				       DNS_SECTION_AUTHORITY);
+ 	while (!done && result == ISC_R_SUCCESS) {
+ 		dns_name_t *name = NULL;
+-		bool external;
+ 
+ 		dns_message_currentname(rctx->query->rmessage,
+ 					DNS_SECTION_AUTHORITY, &name);
+-		external = !dns_name_issubdomain(name, &fctx->domain);
+ 
+-		if (!external) {
++		if (!name_external(name, dns_rdatatype_ns, fctx)) {
+ 			dns_rdataset_t *rdataset = NULL;
+ 
+ 			/*
+@@ -9476,7 +9591,10 @@ rctx_authority_dnssec(respctx_t *rctx) {
+ 		}
+ 
+ 		if (!dns_name_issubdomain(name, &fctx->domain)) {
+-			/* Invalid name found; preserve it for logging later */
++			/*
++			 * Invalid name found; preserve it for logging
++			 * later.
++			 */
+ 			rctx->found_name = name;
+ 			rctx->found_type = ISC_LIST_HEAD(name->list)->type;
+ 			continue;
diff --git a/backport-CVE-2022-0396.patch b/backport-CVE-2022-0396.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e66735d55b9a51844ab15b939b90cbe4de40fcc7
--- /dev/null
+++ b/backport-CVE-2022-0396.patch
@@ -0,0 +1,79 @@
+From bfa4b9c1418ca1ae504f3474e8ffe6fddb6d3e98 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Tue, 8 Feb 2022 12:42:34 +0100
+Subject: [PATCH] Run .closehandle_cb asynchrounosly in nmhandle_detach_cb()
+
+When sock->closehandle_cb is set, we need to run nmhandle_detach_cb()
+asynchronously to ensure correct order of multiple packets processing in
+the isc__nm_process_sock_buffer().  When not run asynchronously, it
+would cause:
+
+  a) out-of-order processing of the return codes from processbuffer();
+
+  b) stack growth because the next TCP DNS message read callback will
+     be called from within the current TCP DNS message read callback.
+
+The sock->closehandle_cb is set to isc__nm_resume_processing() for TCP
+sockets which calls isc__nm_process_sock_buffer().  If the read callback
+(called from isc__nm_process_sock_buffer()->processbuffer()) doesn't
+attach to the nmhandle (f.e. because it wants to drop the processing or
+we send the response directly via uv_try_write()), the
+isc__nm_resume_processing() (via .closehandle_cb) would call
+isc__nm_process_sock_buffer() recursively.
+
+The below shortened code path shows how the stack can grow:
+
+ 1: ns__client_request(handle, ...);
+ 2: isc_nm_tcpdns_sequential(handle);
+ 3: ns_query_start(client, handle);
+ 4:   query_lookup(qctx);
+ 5:     query_send(qctcx->client);
+ 6:       isc__nmhandle_detach(&client->reqhandle);
+ 7:         nmhandle_detach_cb(&handle);
+ 8:           sock->closehandle_cb(sock); // isc__nm_resume_processing
+ 9:             isc__nm_process_sock_buffer(sock);
+10:               processbuffer(sock); // isc__nm_tcpdns_processbuffer
+11:                 isc_nmhandle_attach(req->handle, &handle);
+12:                 isc__nm_readcb(sock, req, ISC_R_SUCCESS);
+13:                   isc__nm_async_readcb(NULL, ...);
+14:                     uvreq->cb.recv(...); // ns__client_request
+
+Instead, if 'sock->closehandle_cb' is set, we need to run detach the
+handle asynchroniously in 'isc__nmhandle_detach', so that on line 8 in
+the code flow above does not start this recursion. This ensures the
+correct order when processing multiple packets in the function
+'isc__nm_process_sock_buffer()' and prevents the stack growth.
+
+When not run asynchronously, the out-of-order processing leaves the
+first TCP socket open until all requests on the stream have been
+processed.
+
+If the pipelining is disabled on the TCP via `keep-response-order`
+configuration option, named would keep the first socket in lingering
+CLOSE_WAIT state when the client sends an incomplete packet and then
+closes the connection from the client side.
+---
+ lib/isc/netmgr/netmgr.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index cabe9d5..c405a9b 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -1731,8 +1731,12 @@ isc__nmhandle_detach(isc_nmhandle_t **handlep FLARG) {
+ 	handle = *handlep;
+ 	*handlep = NULL;
+ 
++	/*
++	 * If the closehandle_cb is set, it needs to run asynchronously to
++	 * ensure correct ordering of the isc__nm_process_sock_buffer().
++	 */
+ 	sock = handle->sock;
+-	if (sock->tid == isc_nm_tid()) {
++	if (sock->tid == isc_nm_tid() && sock->closehandle_cb == NULL) {
+ 		nmhandle_detach_cb(&handle FLARG_PASS);
+ 	} else {
+ 		isc__netievent_detach_t *event =
+-- 
+1.8.3.1
+
diff --git a/backport-CVE-2022-2795.patch b/backport-CVE-2022-2795.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c978c7390ea8165399373eb95a71f1c51aab057c
--- /dev/null
+++ b/backport-CVE-2022-2795.patch
@@ -0,0 +1,60 @@
+From bf2ea6d8525bfd96a84dad221ba9e004adb710a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
+Date: Thu, 8 Sep 2022 11:11:30 +0200
+Subject: [PATCH] Bound the amount of work performed for delegations
+
+Limit the amount of database lookups that can be triggered in
+fctx_getaddresses() (i.e. when determining the name server addresses to
+query next) by setting a hard limit on the number of NS RRs processed
+for any delegation encountered.  Without any limit in place, named can
+be forced to perform large amounts of database lookups per each query
+received, which severely impacts resolver performance.
+
+The limit used (20) is an arbitrary value that is considered to be big
+enough for any sane DNS delegation.
+
+(cherry picked from commit 3a44097fd6c6c260765b628cd1d2c9cb7efb0b2a)
+---
+ lib/dns/resolver.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
+index d2cf14bbc8b..73a0ee9f779 100644
+--- a/lib/dns/resolver.c
++++ b/lib/dns/resolver.c
+@@ -195,6 +195,12 @@
+  */
+ #define NS_FAIL_LIMIT 4
+ #define NS_RR_LIMIT   5
++/*
++ * IP address lookups are performed for at most NS_PROCESSING_LIMIT NS RRs in
++ * any NS RRset encountered, to avoid excessive resource use while processing
++ * large delegations.
++ */
++#define NS_PROCESSING_LIMIT 20
+ 
+ /* Number of hash buckets for zone counters */
+ #ifndef RES_DOMAIN_BUCKETS
+@@ -3711,6 +3717,7 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) {
+ 	bool need_alternate = false;
+ 	bool all_spilled = true;
+ 	unsigned int no_addresses = 0;
++	unsigned int ns_processed = 0;
+ 
+ 	FCTXTRACE5("getaddresses", "fctx->depth=", fctx->depth);
+ 
+@@ -3902,6 +3909,11 @@ normal_nses:
+ 
+ 		dns_rdata_reset(&rdata);
+ 		dns_rdata_freestruct(&ns);
++
++		if (++ns_processed >= NS_PROCESSING_LIMIT) {
++			result = ISC_R_NOMORE;
++			break;
++		}
+ 	}
+ 	if (result != ISC_R_NOMORE) {
+ 		return (result);
+-- 
+GitLab
+
diff --git a/backport-CVE-2022-2881.patch b/backport-CVE-2022-2881.patch
new file mode 100644
index 0000000000000000000000000000000000000000..45bb83f5ff0abdeb14485d210cdc2f8ae507729a
--- /dev/null
+++ b/backport-CVE-2022-2881.patch
@@ -0,0 +1,42 @@
+From 13333db69f9b9710a98c86f44276e01e95420fa0 Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Tue, 16 Aug 2022 16:26:02 -0700
+Subject: [PATCH] compression buffer was not reused correctly
+
+when the compression buffer was reused for multiple statistics
+requests, responses could grow beyond the correct size. this was
+because the buffer was not cleared before reuse; compressed data
+was still written to the beginning of the buffer, but then the size
+of used region was increased by the amount written, rather than set
+to the amount written. this caused responses to grow larger and
+larger, potentially reading past the end of the allocated buffer.
+
+(cherry picked from commit 47e9fa981e56a7a232f3219fe8a40525c79d748b)
+---
+ lib/isc/httpd.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c
+index 776455a..e55330b 100644
+--- a/lib/isc/httpd.c
++++ b/lib/isc/httpd.c
+@@ -246,6 +246,8 @@ free_buffer(isc_mem_t *mctx, isc_buffer_t *buffer) {
+ 	if (r.length > 0) {
+ 		isc_mem_put(mctx, r.base, r.length);
+ 	}
++
++       isc_buffer_initnull(buffer);
+ }
+ 
+ static void
+@@ -910,6 +912,7 @@ isc_httpd_compress(isc_httpd_t *httpd) {
+ 	if (result != ISC_R_SUCCESS) {
+ 		return (result);
+ 	}
++       isc_buffer_clear(&httpd->compbuffer);
+ 	isc_buffer_region(&httpd->compbuffer, &r);
+ 
+ 	/*
+-- 
+2.23.0
+
diff --git a/backport-CVE-2022-2906.patch b/backport-CVE-2022-2906.patch
new file mode 100644
index 0000000000000000000000000000000000000000..704cc528a9711e9151a32f2d67a477536e42af93
--- /dev/null
+++ b/backport-CVE-2022-2906.patch
@@ -0,0 +1,135 @@
+From 73df5c80538970ee1fbc4fe3348109bdc281e197 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Thu, 18 Aug 2022 08:59:09 +0000
+Subject: [PATCH] Fix memory leaks in DH code
+
+When used with OpenSSL v3.0.0+, the `openssldh_compare()`,
+`openssldh_paramcompare()`, and `openssldh_todns()` functions
+fail to cleanup the used memory on some error paths.
+
+Use `DST_RET` instead of `return`, when there is memory to be
+released before returning from the functions.
+
+(cherry picked from commit 73d6bbff4e1df583810126fe58eac39bb52bc0d9)
+---
+ lib/dns/openssldh_link.c | 45 +++++++++++++++++++++++-----------------
+ 1 file changed, 26 insertions(+), 19 deletions(-)
+
+diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
+index 72b8209..ece97ea 100644
+--- a/lib/dns/openssldh_link.c
++++ b/lib/dns/openssldh_link.c
+@@ -68,6 +68,12 @@
+ 	"83655D23DCA3AD961C62F356208552BB9ED529077096966D" \
+ 	"670C354E4ABC9804F1746C08CA237327FFFFFFFFFFFFFFFF"
+ 
++#define DST_RET(a)        \
++        {                 \
++                    ret = a;  \
++                    goto err; \
++                }
++
+ static BIGNUM *bn2 = NULL, *bn768 = NULL, *bn1024 = NULL, *bn1536 = NULL;
+ 
+ #if !HAVE_DH_GET0_KEY
+@@ -180,7 +186,8 @@ openssldh_computesecret(const dst_key_t *pub, const dst_key_t *priv,
+ 
+ static bool
+ openssldh_compare(const dst_key_t *key1, const dst_key_t *key2) {
+-	DH *dh1, *dh2;
++    bool ret = true;
++    DH *dh1, *dh2;
+ 	const BIGNUM *pub_key1 = NULL, *pub_key2 = NULL;
+ 	const BIGNUM *priv_key1 = NULL, *priv_key2 = NULL;
+ 	const BIGNUM *p1 = NULL, *g1 = NULL, *p2 = NULL, *g2 = NULL;
+@@ -202,23 +209,24 @@ openssldh_compare(const dst_key_t *key1, const dst_key_t *key2) {
+ 	if (BN_cmp(p1, p2) != 0 || BN_cmp(g1, g2) != 0 ||
+ 	    BN_cmp(pub_key1, pub_key2) != 0)
+ 	{
+-		return (false);
++		DST_RET(false);
+ 	}
+ 
+ 	if (priv_key1 != NULL || priv_key2 != NULL) {
+-		if (priv_key1 == NULL || priv_key2 == NULL) {
+-			return (false);
+-		}
+-		if (BN_cmp(priv_key1, priv_key2) != 0) {
+-			return (false);
++		if (priv_key1 == NULL || priv_key2 == NULL ||
++			BN_cmp(priv_key1, priv_key2) != 0) {
++			DST_RET(false);
+ 		}
+ 	}
+-	return (true);
++
++err:
++	return (ret);
+ }
+ 
+ static bool
+ openssldh_paramcompare(const dst_key_t *key1, const dst_key_t *key2) {
+-	DH *dh1, *dh2;
++    bool ret = true;
++    DH *dh1, *dh2;
+ 	const BIGNUM *p1 = NULL, *g1 = NULL, *p2 = NULL, *g2 = NULL;
+ 
+ 	dh1 = key1->keydata.dh;
+@@ -234,9 +242,11 @@ openssldh_paramcompare(const dst_key_t *key1, const dst_key_t *key2) {
+ 	DH_get0_pqg(dh2, &p2, NULL, &g2);
+ 
+ 	if (BN_cmp(p1, p2) != 0 || BN_cmp(g1, g2) != 0) {
+-		return (false);
++		DST_RET(false);
+ 	}
+-	return (true);
++
++err:
++	return (ret);
+ }
+ 
+ static int
+@@ -386,7 +396,8 @@ uint16_fromregion(isc_region_t *region) {
+ 
+ static isc_result_t
+ openssldh_todns(const dst_key_t *key, isc_buffer_t *data) {
+-	DH *dh;
++	isc_result_t ret = ISC_R_SUCCESS;
++    DH *dh;
+ 	const BIGNUM *pub_key = NULL, *p = NULL, *g = NULL;
+ 	isc_region_t r;
+ 	uint16_t dnslen, plen, glen, publen;
+@@ -412,7 +423,7 @@ openssldh_todns(const dst_key_t *key, isc_buffer_t *data) {
+ 	publen = BN_num_bytes(pub_key);
+ 	dnslen = plen + glen + publen + 6;
+ 	if (r.length < (unsigned int)dnslen) {
+-		return (ISC_R_NOSPACE);
++		DST_RET(ISC_R_NOSPACE);
+ 	}
+ 
+ 	uint16_toregion(plen, &r);
+@@ -441,7 +452,8 @@ openssldh_todns(const dst_key_t *key, isc_buffer_t *data) {
+ 
+ 	isc_buffer_add(data, dnslen);
+ 
+-	return (ISC_R_SUCCESS);
++err:
++	return (ret);
+ }
+ 
+ static isc_result_t
+@@ -659,11 +671,6 @@ openssldh_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
+ 	DH *dh = NULL;
+ 	BIGNUM *pub_key = NULL, *priv_key = NULL, *p = NULL, *g = NULL;
+ 	isc_mem_t *mctx;
+-#define DST_RET(a)        \
+-	{                 \
+-		ret = a;  \
+-		goto err; \
+-	}
+ 
+ 	UNUSED(pub);
+ 	mctx = key->mctx;
+-- 
+2.23.0
+
diff --git a/backport-CVE-2022-3080.patch b/backport-CVE-2022-3080.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b5bfb5669d1f4212411eeabb54ac655bf62cdf9d
--- /dev/null
+++ b/backport-CVE-2022-3080.patch
@@ -0,0 +1,146 @@
+From 3f68e2ad838b3c12a725ccb1082a54b0e8b69562 Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Fri, 2 Sep 2022 16:50:39 +0200
+Subject: [PATCH] Only refresh RRset once
+
+Don't attempt to resolve DNS responses for intermediate results. This
+may create multiple refreshes and can cause a crash.
+
+One scenario is where for the query there is a CNAME and canonical
+answer in cache that are both stale. This will trigger a refresh of
+the RRsets because we encountered stale data and we prioritized it over
+the lookup. It will trigger a refresh of both RRsets. When we start
+recursing, it will detect a recursion loop because the recursion
+parameters will eventually be the same. In 'dns_resolver_destroyfetch'
+the sanity check fails, one of the callers did not get its event back
+before trying to destroy the fetch.
+
+Move the call to 'query_refresh_rrset' to 'ns_query_done', so that it
+is only called once per client request.
+
+Another scenario is where for the query there is a stale CNAME in the
+cache that points to a record that is also in cache but not stale. This
+will trigger a refresh of the RRset (because we encountered stale data
+and we prioritized it over the lookup).
+
+We mark RRsets that we add to the message with
+DNS_RDATASETATTR_STALE_ADDED to prevent adding a duplicate RRset when
+a stale lookup and a normal lookup conflict with each other. However,
+the other non-stale RRset when following a CNAME chain will be added to
+the message without setting that attribute, because it is not stale.
+
+This is a variant of the bug in #2594. The fix covered the same crash
+but for stale-answer-client-timeout > 0.
+
+Fix this by clearing all RRsets from the message before refreshing.
+This requires the refresh to happen after the query is send back to
+the client.
+
+(cherry picked from commit d939d2ecde5639d11acd6eac33a997b3e3c78b02)
+---
+ lib/ns/include/ns/query.h |  1 +
+ lib/ns/query.c            | 42 ++++++++++++++++++++++++---------------
+ 2 files changed, 27 insertions(+), 16 deletions(-)
+
+diff --git a/lib/ns/include/ns/query.h b/lib/ns/include/ns/query.h
+index 142ef8c6c1d..be0dadd5099 100644
+--- a/lib/ns/include/ns/query.h
++++ b/lib/ns/include/ns/query.h
+@@ -147,6 +147,7 @@ struct query_ctx {
+ 	bool authoritative;		    /* authoritative query? */
+ 	bool want_restart;		    /* CNAME chain or other
+ 					     * restart needed */
++	bool		refresh_rrset;	    /* stale RRset refresh needed */
+ 	bool		need_wildcardproof; /* wildcard proof needed */
+ 	bool		nxrewrite;	    /* negative answer from RPZ */
+ 	bool		findcoveringnsec;   /* lookup covering NSEC */
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index 5c2701eb718..98cfffe8c36 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -5737,7 +5737,6 @@ query_lookup(query_ctx_t *qctx) {
+ 	bool dbfind_stale = false;
+ 	bool stale_timeout = false;
+ 	bool stale_found = false;
+-	bool refresh_rrset = false;
+ 	bool stale_refresh_window = false;
+ 
+ 	CCTRACE(ISC_LOG_DEBUG(3), "query_lookup");
+@@ -5921,8 +5920,7 @@ query_lookup(query_ctx_t *qctx) {
+ 					"%s stale answer used, an attempt to "
+ 					"refresh the RRset will still be made",
+ 					namebuf);
+-				refresh_rrset = STALE(qctx->rdataset);
+-				qctx->client->nodetach = refresh_rrset;
++				qctx->refresh_rrset = STALE(qctx->rdataset);
+ 			}
+ 		} else {
+ 			/*
+@@ -5960,17 +5958,6 @@ query_lookup(query_ctx_t *qctx) {
+ 
+ 	result = query_gotanswer(qctx, result);
+ 
+-	if (refresh_rrset) {
+-		/*
+-		 * If we reached this point then it means that we have found a
+-		 * stale RRset entry in cache and BIND is configured to allow
+-		 * queries to be answered with stale data if no active RRset
+-		 * is available, i.e. "stale-anwer-client-timeout 0". But, we
+-		 * still need to refresh the RRset.
+-		 */
+-		query_refresh_rrset(qctx);
+-	}
+-
+ cleanup:
+ 	return (result);
+ }
+@@ -7760,11 +7747,14 @@ query_addanswer(query_ctx_t *qctx) {
+ 
+ 	/*
+ 	 * On normal lookups, clear any rdatasets that were added on a
+-	 * lookup due to stale-answer-client-timeout.
++	 * lookup due to stale-answer-client-timeout. Do not clear if we
++	 * are going to refresh the RRset, because the stale contents are
++	 * prioritized.
+ 	 */
+ 	if (QUERY_STALEOK(&qctx->client->query) &&
+-	    !QUERY_STALETIMEOUT(&qctx->client->query))
++	    !QUERY_STALETIMEOUT(&qctx->client->query) && !qctx->refresh_rrset)
+ 	{
++		CCTRACE(ISC_LOG_DEBUG(3), "query_clear_stale");
+ 		query_clear_stale(qctx->client);
+ 		/*
+ 		 * We can clear the attribute to prevent redundant clearing
+@@ -11478,9 +11468,29 @@ ns_query_done(query_ctx_t *qctx) {
+ 	/*
+ 	 * Client may have been detached after query_send(), so
+ 	 * we test and store the flag state here, for safety.
++	 * If we are refreshing the RRSet, we must not detach from the client
++	 * in the query_send(), so we need to override the flag.
+ 	 */
++	if (qctx->refresh_rrset) {
++		qctx->client->nodetach = true;
++	}
+ 	nodetach = qctx->client->nodetach;
+ 	query_send(qctx->client);
++
++	if (qctx->refresh_rrset) {
++		/*
++		 * If we reached this point then it means that we have found a
++		 * stale RRset entry in cache and BIND is configured to allow
++		 * queries to be answered with stale data if no active RRset
++		 * is available, i.e. "stale-anwer-client-timeout 0". But, we
++		 * still need to refresh the RRset. To prevent adding duplicate
++		 * RRsets, clear the RRsets from the message before doing the
++		 * refresh.
++		 */
++		message_clearrdataset(qctx->client->message, 0);
++		query_refresh_rrset(qctx);
++	}
++
+ 	if (!nodetach) {
+ 		qctx->detach_client = true;
+ 	}
+-- 
+GitLab
+
diff --git a/backport-CVE-2022-3094-add-a-configuration-option-for-the-update-quota.patch b/backport-CVE-2022-3094-add-a-configuration-option-for-the-update-quota.patch
new file mode 100644
index 0000000000000000000000000000000000000000..af9fa3521e5784ad2edc645303f4edf8ce1d9486
--- /dev/null
+++ b/backport-CVE-2022-3094-add-a-configuration-option-for-the-update-quota.patch
@@ -0,0 +1,267 @@
+From 7fe2204a2e8952bf892e4a70fea2ef5167e1f509 Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Thu, 1 Sep 2022 16:22:46 -0700
+Subject: [PATCH] add a configuration option for the update quota
+
+add an "update-quota" option to configure the update quota.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/82185f4f80d2fa39a4569f6740cb360ffff8f5c4
+(cherry picked from commit f57758a7303ad0034ff2ff08eaaf2ef899630f19)
+---
+ bin/named/config.c                   | 1 +
+ bin/named/named.conf.rst             | 9 +++++----
+ bin/named/server.c                   | 1 +
+ bin/tests/system/checkconf/good.conf | 1 +
+ doc/arm/reference.rst                | 7 ++++++-
+ doc/man/named.conf.5in               | 9 +++++----
+ doc/misc/master.zoneopt.rst          | 2 +-
+ doc/misc/options                     | 1 +
+ doc/misc/options.active              | 1 +
+ doc/misc/options.grammar.rst         | 3 ++-
+ doc/misc/slave.zoneopt.rst           | 2 +-
+ lib/isccfg/namedconf.c               | 1 +
+ 12 files changed, 26 insertions(+), 12 deletions(-)
+
+diff --git a/bin/named/config.c b/bin/named/config.c
+index 5fedee84d99..494147015ff 100644
+--- a/bin/named/config.c
++++ b/bin/named/config.c
+@@ -130,6 +130,7 @@ options {\n\
+ 	transfers-out 10;\n\
+ 	transfers-per-ns 2;\n\
+ 	trust-anchor-telemetry yes;\n\
++	update-quota 100;\n\
+ \n\
+ 	/* view */\n\
+ 	allow-new-zones no;\n\
+diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst
+index 27eed5ca3e4..4c9f9a73704 100644
+--- a/bin/named/named.conf.rst
++++ b/bin/named/named.conf.rst
+@@ -179,7 +179,7 @@ OPTIONS
+   	answer-cookie boolean;
+   	attach-cache string;
+   	auth-nxdomain boolean; // default changed
+-  	auto-dnssec ( allow | maintain | off );
++  	auto-dnssec ( allow | maintain | off );// deprecated
+   	automatic-interface-scan boolean;
+   	avoid-v4-udp-ports { portrange; ... };
+   	avoid-v6-udp-ports { portrange; ... };
+@@ -446,6 +446,7 @@ OPTIONS
+   	trust-anchor-telemetry boolean; // experimental
+   	try-tcp-refresh boolean;
+   	update-check-ksk boolean;
++  	update-quota integer;
+   	use-alt-transfer-source boolean;
+   	use-v4-udp-ports { portrange; ... };
+   	use-v6-udp-ports { portrange; ... };
+@@ -584,7 +585,7 @@ VIEW
+   	    * ) ] [ dscp integer ];
+   	attach-cache string;
+   	auth-nxdomain boolean; // default changed
+-  	auto-dnssec ( allow | maintain | off );
++  	auto-dnssec ( allow | maintain | off );// deprecated
+   	cache-file quoted_string;// deprecated
+   	catalog-zones { zone string [ default-masters [ port integer ]
+   	    [ dscp integer ] { ( remote-servers | ipv4_address [ port
+@@ -859,7 +860,7 @@ VIEW
+   		    integer | * ) ] [ dscp integer ];
+   		alt-transfer-source-v6 ( ipv6_address | * ) [ port (
+   		    integer | * ) ] [ dscp integer ];
+-  		auto-dnssec ( allow | maintain | off );
++  		auto-dnssec ( allow | maintain | off );// deprecated
+   		check-dup-records ( fail | warn | ignore );
+   		check-integrity boolean;
+   		check-mx ( fail | warn | ignore );
+@@ -977,7 +978,7 @@ ZONE
+   	    ] [ dscp integer ];
+   	alt-transfer-source-v6 ( ipv6_address | * ) [ port ( integer |
+   	    * ) ] [ dscp integer ];
+-  	auto-dnssec ( allow | maintain | off );
++  	auto-dnssec ( allow | maintain | off );// deprecated
+   	check-dup-records ( fail | warn | ignore );
+   	check-integrity boolean;
+   	check-mx ( fail | warn | ignore );
+diff --git a/bin/named/server.c b/bin/named/server.c
+index 20443ff8a94..78a21d62a20 100644
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -8542,6 +8542,7 @@ load_configuration(const char *filename, named_server_t *server,
+ 	configure_server_quota(maps, "tcp-clients", &server->sctx->tcpquota);
+ 	configure_server_quota(maps, "recursive-clients",
+ 			       &server->sctx->recursionquota);
++	configure_server_quota(maps, "update-quota", &server->sctx->updquota);
+ 
+ 	max = isc_quota_getmax(&server->sctx->recursionquota);
+ 	if (max > 1000) {
+diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf
+index b1f7059acf8..0ecdb68e95a 100644
+--- a/bin/tests/system/checkconf/good.conf
++++ b/bin/tests/system/checkconf/good.conf
+@@ -75,6 +75,7 @@ options {
+ 	recursive-clients 3000;
+ 	serial-query-rate 100;
+ 	server-id none;
++	update-quota 200;
+ 	check-names primary warn;
+ 	check-names secondary ignore;
+ 	max-cache-size 20000000000000;
+diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
+index 2603d602518..703663d0ba6 100644
+--- a/doc/arm/reference.rst
++++ b/doc/arm/reference.rst
+@@ -3151,6 +3151,11 @@ system.
+    value as ``tcp-keepalive-timeout``. This value can be updated at
+    runtime by using ``rndc tcp-timeouts``.
+ 
++``update-quota``
++   This is the maximum number of simultaneous DNS UPDATE messages that
++   the server will accept for updating local authoritiative zones or
++   forwarding to a primary server. The default is ``100``.
++
+ .. _intervals:
+ 
+ Periodic Task Intervals
+@@ -6840,7 +6845,7 @@ Name Server Statistics Counters
+ ``UpdateQuota``
+     This indicates the number of times a dynamic update or update
+     forwarding request was rejected because the number of pending
+-    requests exceeded the update quota.
++    requests exceeded ``update-quota``.
+ 
+ ``RateDropped``
+     This indicates the number of responses dropped due to rate limits.
+diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in
+index 4c46f475929..c87afa28813 100644
+--- a/doc/man/named.conf.5in
++++ b/doc/man/named.conf.5in
+@@ -231,7 +231,7 @@ options {
+       answer\-cookie boolean;
+       attach\-cache string;
+       auth\-nxdomain boolean; // default changed
+-      auto\-dnssec ( allow | maintain | off );
++      auto\-dnssec ( allow | maintain | off );// deprecated
+       automatic\-interface\-scan boolean;
+       avoid\-v4\-udp\-ports { portrange; ... };
+       avoid\-v6\-udp\-ports { portrange; ... };
+@@ -498,6 +498,7 @@ options {
+       trust\-anchor\-telemetry boolean; // experimental
+       try\-tcp\-refresh boolean;
+       update\-check\-ksk boolean;
++      update\-quota integer;
+       use\-alt\-transfer\-source boolean;
+       use\-v4\-udp\-ports { portrange; ... };
+       use\-v6\-udp\-ports { portrange; ... };
+@@ -668,7 +669,7 @@ view string [ class ] {
+           * ) ] [ dscp integer ];
+       attach\-cache string;
+       auth\-nxdomain boolean; // default changed
+-      auto\-dnssec ( allow | maintain | off );
++      auto\-dnssec ( allow | maintain | off );// deprecated
+       cache\-file quoted_string;// deprecated
+       catalog\-zones { zone string [ default\-masters [ port integer ]
+           [ dscp integer ] { ( remote\-servers | ipv4_address [ port
+@@ -943,7 +944,7 @@ view string [ class ] {
+                   integer | * ) ] [ dscp integer ];
+               alt\-transfer\-source\-v6 ( ipv6_address | * ) [ port (
+                   integer | * ) ] [ dscp integer ];
+-              auto\-dnssec ( allow | maintain | off );
++              auto\-dnssec ( allow | maintain | off );// deprecated
+               check\-dup\-records ( fail | warn | ignore );
+               check\-integrity boolean;
+               check\-mx ( fail | warn | ignore );
+@@ -1065,7 +1066,7 @@ zone string [ class ] {
+           ] [ dscp integer ];
+       alt\-transfer\-source\-v6 ( ipv6_address | * ) [ port ( integer |
+           * ) ] [ dscp integer ];
+-      auto\-dnssec ( allow | maintain | off );
++      auto\-dnssec ( allow | maintain | off );// deprecated
+       check\-dup\-records ( fail | warn | ignore );
+       check\-integrity boolean;
+       check\-mx ( fail | warn | ignore );
+diff --git a/doc/misc/master.zoneopt.rst b/doc/misc/master.zoneopt.rst
+index 8fc7e1b4f0d..346d59813ee 100644
+--- a/doc/misc/master.zoneopt.rst
++++ b/doc/misc/master.zoneopt.rst
+@@ -20,7 +20,7 @@
+   	also-notify [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ]; ... };
+   	alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+   	alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+-  	auto-dnssec ( allow | maintain | off );
++  	auto-dnssec ( allow | maintain | off ); // deprecated
+   	check-dup-records ( fail | warn | ignore );
+   	check-integrity <boolean>;
+   	check-mx ( fail | warn | ignore );
+diff --git a/doc/misc/options b/doc/misc/options
+index f57399499a5..0dbcf101e1c 100644
+--- a/doc/misc/options
++++ b/doc/misc/options
+@@ -404,6 +404,7 @@ options {
+         trust-anchor-telemetry <boolean>; // experimental
+         try-tcp-refresh <boolean>;
+         update-check-ksk <boolean>;
++        update-quota <integer>;
+         use-alt-transfer-source <boolean>;
+         use-id-pool <boolean>; // ancient
+         use-ixfr <boolean>; // obsolete
+diff --git a/doc/misc/options.active b/doc/misc/options.active
+index 5fc1ab29f42..eb75a86eae9 100644
+--- a/doc/misc/options.active
++++ b/doc/misc/options.active
+@@ -363,6 +363,7 @@ options {
+         trust-anchor-telemetry <boolean>; // experimental
+         try-tcp-refresh <boolean>;
+         update-check-ksk <boolean>;
++        update-quota <integer>;
+         use-alt-transfer-source <boolean>;
+         use-v4-udp-ports { <portrange>; ... };
+         use-v6-udp-ports { <portrange>; ... };
+diff --git a/doc/misc/options.grammar.rst b/doc/misc/options.grammar.rst
+index 438072c95c4..beef35341a1 100644
+--- a/doc/misc/options.grammar.rst
++++ b/doc/misc/options.grammar.rst
+@@ -33,7 +33,7 @@
+   	answer-cookie <boolean>;
+   	attach-cache <string>;
+   	auth-nxdomain <boolean>; // default changed
+-  	auto-dnssec ( allow | maintain | off );
++  	auto-dnssec ( allow | maintain | off ); // deprecated
+   	automatic-interface-scan <boolean>;
+   	avoid-v4-udp-ports { <portrange>; ... };
+   	avoid-v6-udp-ports { <portrange>; ... };
+@@ -300,6 +300,7 @@
+   	trust-anchor-telemetry <boolean>; // experimental
+   	try-tcp-refresh <boolean>;
+   	update-check-ksk <boolean>;
++  	update-quota <integer>;
+   	use-alt-transfer-source <boolean>;
+   	use-v4-udp-ports { <portrange>; ... };
+   	use-v6-udp-ports { <portrange>; ... };
+diff --git a/doc/misc/slave.zoneopt.rst b/doc/misc/slave.zoneopt.rst
+index cc72dcbf677..468a7f4d9a3 100644
+--- a/doc/misc/slave.zoneopt.rst
++++ b/doc/misc/slave.zoneopt.rst
+@@ -21,7 +21,7 @@
+   	also-notify [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ]; ... };
+   	alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+   	alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+-  	auto-dnssec ( allow | maintain | off );
++  	auto-dnssec ( allow | maintain | off ); // deprecated
+   	check-names ( fail | warn | ignore );
+   	database <string>;
+   	dialup ( notify | notify-passive | passive | refresh | <boolean> );
+diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
+index 45de0196bf4..6e63d86816e 100644
+--- a/lib/isccfg/namedconf.c
++++ b/lib/isccfg/namedconf.c
+@@ -1267,6 +1267,7 @@ static cfg_clausedef_t options_clauses[] = {
+ 	{ "transfers-out", &cfg_type_uint32, 0 },
+ 	{ "transfers-per-ns", &cfg_type_uint32, 0 },
+ 	{ "treat-cr-as-space", &cfg_type_boolean, CFG_CLAUSEFLAG_ANCIENT },
++	{ "update-quota", &cfg_type_uint32, 0 },
+ 	{ "use-id-pool", &cfg_type_boolean, CFG_CLAUSEFLAG_ANCIENT },
+ 	{ "use-ixfr", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
+ 	{ "use-v4-udp-ports", &cfg_type_bracketed_portlist, 0 },
+-- 
+GitLab
diff --git a/backport-CVE-2022-3094-add-an-update-quota.patch b/backport-CVE-2022-3094-add-an-update-quota.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f004366a010fac7e983b845d38263c3e3618da4e
--- /dev/null
+++ b/backport-CVE-2022-3094-add-an-update-quota.patch
@@ -0,0 +1,243 @@
+From 35711a29e5002fce5fb56af163c5a3db81b33bed Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Thu, 1 Sep 2022 16:05:04 -0700
+Subject: [PATCH] add an update quota
+
+limit the number of simultaneous DNS UPDATE events that can be
+processed by adding a quota for update and update forwarding.
+this quota currently, arbitrarily, defaults to 100.
+
+also add a statistics counter to record when the update quota
+has been exceeded.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/82185f4f80d2fa39a4569f6740cb360ffff8f5c4
+(cherry picked from commit 7c47254a140c3e9cf383cda73c7b6a55c4782826)
+---
+ bin/named/bind9.xsl        |  4 +++-
+ bin/named/bind9.xsl.h      |  6 +++++-
+ bin/named/statschannel.c   |  5 +++--
+ doc/arm/reference.rst      |  5 +++++
+ lib/ns/include/ns/server.h |  1 +
+ lib/ns/include/ns/stats.h  |  4 +++-
+ lib/ns/server.c            |  2 ++
+ lib/ns/update.c            | 38 +++++++++++++++++++++++++++++++++++++-
+ 8 files changed, 59 insertions(+), 6 deletions(-)
+
+diff --git a/bin/named/bind9.xsl b/bin/named/bind9.xsl
+index 5078115..194625b 100644
+--- a/bin/named/bind9.xsl
++++ b/bin/named/bind9.xsl
+@@ -12,7 +12,9 @@
+ 
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+   <xsl:output method="html" indent="yes" version="4.0"/>
+-  <xsl:template match="statistics[@version=&quot;3.11&quot;]">
++  <!-- the version number **below** must match version in bin/named/statschannel.c -->
++  <!-- don't forget to update "/xml/v<STATS_XML_VERSION_MAJOR>" in the HTTP endpoints listed below -->
++  <xsl:template match="statistics[@version=&quot;3.11.1&quot;]">
+     <html>
+       <head>
+         <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+diff --git a/bin/named/bind9.xsl.h b/bin/named/bind9.xsl.h
+index e30f7f5..b182742 100644
+--- a/bin/named/bind9.xsl.h
++++ b/bin/named/bind9.xsl.h
+@@ -20,7 +20,11 @@ static char xslmsg[] =
+ 	"<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" "
+ 	"xmlns=\"http://www.w3.org/1999/xhtml\" version=\"1.0\">\n"
+ 	" <xsl:output method=\"html\" indent=\"yes\" version=\"4.0\"/>\n"
+-	" <xsl:template match=\"statistics[@version=&quot;3.11&quot;]\">\n"
++	" <!-- the version number **below** must match version in "
++	"bin/named/statschannel.c -->\n"
++	" <!-- don't forget to update \"/xml/v<STATS_XML_VERSION_MAJOR>\" in "
++	"the HTTP endpoints listed below -->\n"
++	" <xsl:template match=\"statistics[@version=&quot;3.11.1&quot;]\">\n"
+ 	" <html>\n"
+ 	" <head>\n"
+ 	" <script type=\"text/javascript\" "
+diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
+index 8ff2567..0927eb1 100644
+--- a/bin/named/statschannel.c
++++ b/bin/named/statschannel.c
+@@ -335,6 +335,7 @@ init_desc(void) {
+ 	SET_NSSTATDESC(reclimitdropped,
+ 		       "queries dropped due to recursive client limit",
+ 		       "RecLimitDropped");
++	SET_NSSTATDESC(updatequota, "Update quota exceeded", "UpdateQuota");
+ 
+ 	INSIST(i == ns_statscounter_max);
+ 
+@@ -2007,7 +2008,7 @@ generatexml(named_server_t *server, uint32_t flags, int *buflen,
+ 					      "href=\"/bind9.xsl\""));
+ 	TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "statistics"));
+ 	TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "version",
+-					 ISC_XMLCHAR "3.11"));
++					 ISC_XMLCHAR "3.11.1"));
+ 
+ 	/* Set common fields for statistics dump */
+ 	dumparg.type = isc_statsformat_xml;
+@@ -2875,7 +2876,7 @@ generatejson(named_server_t *server, size_t *msglen, const char **msg,
+ 	/*
+ 	 * These statistics are included no matter which URL we use.
+ 	 */
+-	obj = json_object_new_string("1.5");
++	obj = json_object_new_string("1.5.1");
+ 	CHECKMEM(obj);
+ 	json_object_object_add(bindstats, "json-stats-version", obj);
+ 
+diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
+index 2d05aec..25c20d7 100644
+--- a/doc/arm/reference.rst
++++ b/doc/arm/reference.rst
+@@ -6705,6 +6705,11 @@ Name Server Statistics Counters
+ ``UpdateBadPrereq``
+     This indicates the number of dynamic updates rejected due to a prerequisite failure.
+ 
++``UpdateQuota``
++    This indicates the number of times a dynamic update or update
++    forwarding request was rejected because the number of pending
++    requests exceeded the update quota.
++
+ ``RateDropped``
+     This indicates the number of responses dropped due to rate limits.
+ 
+diff --git a/lib/ns/include/ns/server.h b/lib/ns/include/ns/server.h
+index 6a1f345..0abb579 100644
+--- a/lib/ns/include/ns/server.h
++++ b/lib/ns/include/ns/server.h
+@@ -84,6 +84,7 @@ struct ns_server {
+ 	isc_quota_t recursionquota;
+ 	isc_quota_t tcpquota;
+ 	isc_quota_t xfroutquota;
++	isc_quota_t updquota;
+ 
+ 	/*% Test options and other configurables */
+ 	uint32_t options;
+diff --git a/lib/ns/include/ns/stats.h b/lib/ns/include/ns/stats.h
+index 3c08799..95b15d0 100644
+--- a/lib/ns/include/ns/stats.h
++++ b/lib/ns/include/ns/stats.h
+@@ -106,7 +106,9 @@ enum {
+ 
+ 	ns_statscounter_reclimitdropped = 66,
+ 
+-	ns_statscounter_max = 67,
++	ns_statscounter_updatequota = 67,
++
++	ns_statscounter_max = 68,
+ };
+ 
+ void
+diff --git a/lib/ns/server.c b/lib/ns/server.c
+index a970a28..540bc2e 100644
+--- a/lib/ns/server.c
++++ b/lib/ns/server.c
+@@ -52,6 +52,7 @@ ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview,
+ 	isc_quota_init(&sctx->xfroutquota, 10);
+ 	isc_quota_init(&sctx->tcpquota, 10);
+ 	isc_quota_init(&sctx->recursionquota, 100);
++	isc_quota_init(&sctx->updquota, 100);
+ 
+ 	CHECKFATAL(dns_tkeyctx_create(mctx, &sctx->tkeyctx));
+ 
+@@ -131,6 +132,7 @@ ns_server_detach(ns_server_t **sctxp) {
+ 			isc_mem_put(sctx->mctx, altsecret, sizeof(*altsecret));
+ 		}
+ 
++		isc_quota_destroy(&sctx->updquota);
+ 		isc_quota_destroy(&sctx->recursionquota);
+ 		isc_quota_destroy(&sctx->tcpquota);
+ 		isc_quota_destroy(&sctx->xfroutquota);
+diff --git a/lib/ns/update.c b/lib/ns/update.c
+index ddda25a..a69b6e5 100644
+--- a/lib/ns/update.c
++++ b/lib/ns/update.c
+@@ -1544,6 +1544,19 @@ send_update_event(ns_client_t *client, dns_zone_t *zone) {
+ 	update_event_t *event = NULL;
+ 	isc_task_t *zonetask = NULL;
+ 
++	result = isc_quota_attach(&client->manager->sctx->updquota,
++				  &(isc_quota_t *){ NULL });
++	if (result != ISC_R_SUCCESS) {
++		update_log(client, zone, LOGLEVEL_PROTOCOL,
++			   "update failed: too many DNS UPDATEs queued (%s)",
++			   isc_result_totext(result));
++		ns_stats_increment(client->manager->sctx->nsstats,
++				   ns_statscounter_updatequota);
++		ns_client_drop(client, result);
++		isc_nmhandle_detach(&client->reqhandle);
++		return (DNS_R_DROP);
++	}
++
+ 	event = (update_event_t *)isc_event_allocate(
+ 		client->mctx, client, DNS_EVENT_UPDATE, update_action, NULL,
+ 		sizeof(*event));
+@@ -1682,12 +1695,19 @@ failure:
+ 		       dns_zone_gettype(zone) == dns_zone_mirror);
+ 		inc_stats(client, zone, ns_statscounter_updaterej);
+ 	}
++
+ 	/*
+ 	 * We failed without having sent an update event to the zone.
+ 	 * We are still in the client task context, so we can
+ 	 * simply give an error response without switching tasks.
+ 	 */
+-	respond(client, result);
++	if (result == DNS_R_DROP) {
++		ns_client_drop(client, result);
++		isc_nmhandle_detach(&client->reqhandle);
++	} else {
++		respond(client, result);
++	}
++
+ 	if (zone != NULL) {
+ 		dns_zone_detach(&zone);
+ 	}
+@@ -3494,6 +3514,7 @@ updatedone_action(isc_task_t *task, isc_event_t *event) {
+ 
+ 	respond(client, uev->result);
+ 
++	isc_quota_detach(&(isc_quota_t *){ &client->manager->sctx->updquota });
+ 	isc_event_free(&event);
+ 	isc_nmhandle_detach(&client->updatehandle);
+ }
+@@ -3510,6 +3531,8 @@ forward_fail(isc_task_t *task, isc_event_t *event) {
+ 	INSIST(client->nupdates > 0);
+ 	client->nupdates--;
+ 	respond(client, DNS_R_SERVFAIL);
++
++	isc_quota_detach(&(isc_quota_t *){ &client->manager->sctx->updquota });
+ 	isc_event_free(&event);
+ 	isc_nmhandle_detach(&client->updatehandle);
+ }
+@@ -3547,6 +3570,8 @@ forward_done(isc_task_t *task, isc_event_t *event) {
+ 	client->nupdates--;
+ 	ns_client_sendraw(client, uev->answer);
+ 	dns_message_detach(&uev->answer);
++
++	isc_quota_detach(&(isc_quota_t *){ &client->manager->sctx->updquota });
+ 	isc_event_free(&event);
+ 	isc_nmhandle_detach(&client->reqhandle);
+ 	isc_nmhandle_detach(&client->updatehandle);
+@@ -3582,6 +3607,17 @@ send_forward_event(ns_client_t *client, dns_zone_t *zone) {
+ 	update_event_t *event = NULL;
+ 	isc_task_t *zonetask = NULL;
+ 
++	result = isc_quota_attach(&client->manager->sctx->updquota,
++				  &(isc_quota_t *){ NULL });
++	if (result != ISC_R_SUCCESS) {
++		update_log(client, zone, LOGLEVEL_PROTOCOL,
++			   "update failed: too many DNS UPDATEs queued (%s)",
++			   isc_result_totext(result));
++		ns_stats_increment(client->manager->sctx->nsstats,
++				   ns_statscounter_updatequota);
++		return (DNS_R_DROP);
++	}
++
+ 	event = (update_event_t *)isc_event_allocate(
+ 		client->mctx, client, DNS_EVENT_UPDATE, forward_action, NULL,
+ 		sizeof(*event));
+-- 
+2.33.0
+
diff --git a/backport-CVE-2022-3094-move-update-ACL-and-update-policy-checks-before-quota.patch b/backport-CVE-2022-3094-move-update-ACL-and-update-policy-checks-before-quota.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0437303d30c4cb8e65bff9277de017a4e1ea0157
--- /dev/null
+++ b/backport-CVE-2022-3094-move-update-ACL-and-update-policy-checks-before-quota.patch
@@ -0,0 +1,473 @@
+From eb98d96481a37414369005857387be0d34544de0 Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Tue, 8 Nov 2022 17:32:41 -0800
+Subject: [PATCH] move update ACL and update-policy checks before quota
+
+check allow-update, update-policy, and allow-update-forwarding before
+consuming quota slots, so that unauthorized clients can't fill the
+quota.
+
+(this moves the access check before the prerequisite check, which
+violates the precise wording of RFC 2136. however, RFC co-author Paul
+Vixie has stated that the RFC is mistaken on this point; it should have
+said that access checking must happen *no later than* the completion of
+prerequisite checks, not that it must happen exactly then.)
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/82185f4f80d2fa39a4569f6740cb360ffff8f5c4
+(cherry picked from commit 964f559edb5036880b8e463b8f190b9007ee055d)
+---
+ lib/ns/update.c | 336 ++++++++++++++++++++++++++----------------------
+ 1 file changed, 182 insertions(+), 154 deletions(-)
+
+diff --git a/lib/ns/update.c b/lib/ns/update.c
+index a69b6e5..071de25 100644
+--- a/lib/ns/update.c
++++ b/lib/ns/update.c
+@@ -261,6 +261,9 @@ static void
+ forward_done(isc_task_t *task, isc_event_t *event);
+ static isc_result_t
+ add_rr_prepare_action(void *data, rr_t *rr);
++static isc_result_t
++rr_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
++	  const dns_rdata_t *rdata, bool *flag);
+ 
+ /**************************************************************************/
+ 
+@@ -333,25 +336,26 @@ inc_stats(ns_client_t *client, dns_zone_t *zone, isc_statscounter_t counter) {
+ static isc_result_t
+ checkqueryacl(ns_client_t *client, dns_acl_t *queryacl, dns_name_t *zonename,
+ 	      dns_acl_t *updateacl, dns_ssutable_t *ssutable) {
++	isc_result_t result;
+ 	char namebuf[DNS_NAME_FORMATSIZE];
+ 	char classbuf[DNS_RDATACLASS_FORMATSIZE];
+-	int level;
+-	isc_result_t result;
++	bool update_possible =
++		((updateacl != NULL && !dns_acl_isnone(updateacl)) ||
++		 ssutable != NULL);
+ 
+ 	result = ns_client_checkaclsilent(client, NULL, queryacl, true);
+ 	if (result != ISC_R_SUCCESS) {
++		int level = update_possible ? ISC_LOG_ERROR : ISC_LOG_INFO;
++		
+ 		dns_name_format(zonename, namebuf, sizeof(namebuf));
+ 		dns_rdataclass_format(client->view->rdclass, classbuf,
+ 				      sizeof(classbuf));
+ 
+-		level = (updateacl == NULL && ssutable == NULL) ? ISC_LOG_INFO
+-								: ISC_LOG_ERROR;
+-
+ 		ns_client_log(client, NS_LOGCATEGORY_UPDATE_SECURITY,
+ 			      NS_LOGMODULE_UPDATE, level,
+ 			      "update '%s/%s' denied due to allow-query",
+ 			      namebuf, classbuf);
+-	} else if (updateacl == NULL && ssutable == NULL) {
++	} else if (!update_possible) {
+ 		dns_name_format(zonename, namebuf, sizeof(namebuf));
+ 		dns_rdataclass_format(client->view->rdclass, classbuf,
+ 				      sizeof(classbuf));
+@@ -1543,6 +1547,156 @@ send_update_event(ns_client_t *client, dns_zone_t *zone) {
+ 	isc_result_t result = ISC_R_SUCCESS;
+ 	update_event_t *event = NULL;
+ 	isc_task_t *zonetask = NULL;
++	dns_ssutable_t *ssutable = NULL;
++	dns_message_t *request = client->message;
++	dns_aclenv_t *env =
++		ns_interfacemgr_getaclenv(client->manager->interface->mgr);
++	dns_rdataclass_t zoneclass;
++	dns_rdatatype_t covers;
++	dns_name_t *zonename = NULL;
++	dns_db_t *db = NULL;
++	dns_dbversion_t *ver = NULL;
++
++	CHECK(dns_zone_getdb(zone, &db));
++	zonename = dns_db_origin(db);
++	zoneclass = dns_db_class(db);
++	dns_zone_getssutable(zone, &ssutable);
++	dns_db_currentversion(db, &ver);
++
++	/*
++	 * Update message processing can leak record existence information
++	 * so check that we are allowed to query this zone.  Additionally,
++	 * if we would refuse all updates for this zone, we bail out here.
++	 */
++	CHECK(checkqueryacl(client, dns_zone_getqueryacl(zone),
++			    dns_zone_getorigin(zone),
++			    dns_zone_getupdateacl(zone), ssutable));
++
++	/*
++	 * Check requestor's permissions.
++	 */
++	if (ssutable == NULL) {
++		CHECK(checkupdateacl(client, dns_zone_getupdateacl(zone),
++				     "update", dns_zone_getorigin(zone), false,
++				     false));
++	} else if (client->signer == NULL && !TCPCLIENT(client)) {
++		CHECK(checkupdateacl(client, NULL, "update",
++				     dns_zone_getorigin(zone), false, true));
++	}
++
++	if (dns_zone_getupdatedisabled(zone)) {
++		FAILC(DNS_R_REFUSED, "dynamic update temporarily disabled "
++				     "because the zone is frozen.  Use "
++				     "'rndc thaw' to re-enable updates.");
++	}
++
++	/*
++	 * Prescan the update section, checking for updates that
++	 * are illegal or violate policy.
++	 */
++	for (result = dns_message_firstname(request, DNS_SECTION_UPDATE);
++	     result == ISC_R_SUCCESS;
++	     result = dns_message_nextname(request, DNS_SECTION_UPDATE))
++	{
++		dns_name_t *name = NULL;
++		dns_rdata_t rdata = DNS_RDATA_INIT;
++		dns_ttl_t ttl;
++		dns_rdataclass_t update_class;
++
++		get_current_rr(request, DNS_SECTION_UPDATE, zoneclass, &name,
++			       &rdata, &covers, &ttl, &update_class);
++
++		if (!dns_name_issubdomain(name, zonename)) {
++			FAILC(DNS_R_NOTZONE, "update RR is outside zone");
++		}
++		if (update_class == zoneclass) {
++			/*
++			 * Check for meta-RRs.  The RFC2136 pseudocode says
++			 * check for ANY|AXFR|MAILA|MAILB, but the text adds
++			 * "or any other QUERY metatype"
++			 */
++			if (dns_rdatatype_ismeta(rdata.type)) {
++				FAILC(DNS_R_FORMERR, "meta-RR in update");
++			}
++			result = dns_zone_checknames(zone, name, &rdata);
++			if (result != ISC_R_SUCCESS) {
++				FAIL(DNS_R_REFUSED);
++			}
++		} else if (update_class == dns_rdataclass_any) {
++			if (ttl != 0 || rdata.length != 0 ||
++			    (dns_rdatatype_ismeta(rdata.type) &&
++			     rdata.type != dns_rdatatype_any))
++			{
++				FAILC(DNS_R_FORMERR, "meta-RR in update");
++			}
++		} else if (update_class == dns_rdataclass_none) {
++			if (ttl != 0 || dns_rdatatype_ismeta(rdata.type)) {
++				FAILC(DNS_R_FORMERR, "meta-RR in update");
++			}
++		} else {
++			update_log(client, zone, ISC_LOG_WARNING,
++				   "update RR has incorrect class %d",
++				   update_class);
++			FAIL(DNS_R_FORMERR);
++		}
++
++		/*
++		 * draft-ietf-dnsind-simple-secure-update-01 says
++		 * "Unlike traditional dynamic update, the client
++		 * is forbidden from updating NSEC records."
++		 */
++		if (rdata.type == dns_rdatatype_nsec3) {
++			FAILC(DNS_R_REFUSED, "explicit NSEC3 updates are not "
++					     "allowed "
++					     "in secure zones");
++		} else if (rdata.type == dns_rdatatype_nsec) {
++			FAILC(DNS_R_REFUSED, "explicit NSEC updates are not "
++					     "allowed "
++					     "in secure zones");
++		} else if (rdata.type == dns_rdatatype_rrsig &&
++			   !dns_name_equal(name, zonename))
++		{
++			FAILC(DNS_R_REFUSED, "explicit RRSIG updates are "
++					     "currently "
++					     "not supported in secure zones "
++					     "except "
++					     "at the apex");
++		}
++
++		if (ssutable != NULL) {
++			isc_netaddr_t netaddr;
++			dst_key_t *tsigkey = NULL;
++			isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr);
++
++			if (client->message->tsigkey != NULL) {
++				tsigkey = client->message->tsigkey->key;
++			}
++
++			if (rdata.type != dns_rdatatype_any) {
++				if (!dns_ssutable_checkrules(
++					    ssutable, client->signer, name,
++					    &netaddr, TCPCLIENT(client), env,
++					    rdata.type, tsigkey))
++				{
++					FAILC(DNS_R_REFUSED, "rejected by "
++							     "secure update");
++				}
++			} else {
++				if (!ssu_checkall(db, ver, name, ssutable,
++						  client->signer, &netaddr, env,
++						  TCPCLIENT(client), tsigkey))
++				{
++					FAILC(DNS_R_REFUSED, "rejected by "
++							     "secure update");
++				}
++			}
++		}
++	}
++	if (result != ISC_R_NOMORE) {
++		FAIL(result);
++	}
++
++	update_log(client, zone, LOGLEVEL_DEBUG, "update section prescan OK");
+ 
+ 	result = isc_quota_attach(&client->manager->sctx->updquota,
+ 				  &(isc_quota_t *){ NULL });
+@@ -1552,9 +1706,7 @@ send_update_event(ns_client_t *client, dns_zone_t *zone) {
+ 			   isc_result_totext(result));
+ 		ns_stats_increment(client->manager->sctx->nsstats,
+ 				   ns_statscounter_updatequota);
+-		ns_client_drop(client, result);
+-		isc_nmhandle_detach(&client->reqhandle);
+-		return (DNS_R_DROP);
++		CHECK(DNS_R_DROP);
+ 	}
+ 
+ 	event = (update_event_t *)isc_event_allocate(
+@@ -1571,6 +1723,17 @@ send_update_event(ns_client_t *client, dns_zone_t *zone) {
+ 	dns_zone_gettask(zone, &zonetask);
+ 	isc_task_send(zonetask, ISC_EVENT_PTR(&event));
+ 
++failure:
++	if (db != NULL) {
++		dns_db_closeversion(db, &ver, false);
++		dns_db_detach(&db);
++	}
++
++	if (ssutable != NULL) {
++		dns_ssutable_detach(&ssutable);
++	}
++
++
+ 	return (result);
+ }
+ 
+@@ -1678,9 +1841,6 @@ ns_update_start(ns_client_t *client, isc_nmhandle_t *handle,
+ 		break;
+ 	case dns_zone_secondary:
+ 	case dns_zone_mirror:
+-		CHECK(checkupdateacl(client, dns_zone_getforwardacl(zone),
+-				     "update forwarding", zonename, true,
+-				     false));
+ 		dns_message_clonebuffer(client->message);
+ 		CHECK(send_forward_event(client, zone));
+ 		break;
+@@ -1691,8 +1851,6 @@ ns_update_start(ns_client_t *client, isc_nmhandle_t *handle,
+ 
+ failure:
+ 	if (result == DNS_R_REFUSED) {
+-		INSIST(dns_zone_gettype(zone) == dns_zone_secondary ||
+-		       dns_zone_gettype(zone) == dns_zone_mirror);
+ 		inc_stats(client, zone, ns_statscounter_updaterej);
+ 	}
+ 
+@@ -2583,7 +2741,7 @@ update_action(isc_task_t *task, isc_event_t *event) {
+ 	dns_rdatatype_t covers;
+ 	dns_message_t *request = client->message;
+ 	dns_rdataclass_t zoneclass;
+-	dns_name_t *zonename;
++	dns_name_t *zonename = NULL;
+ 	dns_ssutable_t *ssutable = NULL;
+ 	dns_fixedname_t tmpnamefixed;
+ 	dns_name_t *tmpname = NULL;
+@@ -2595,8 +2753,6 @@ update_action(isc_task_t *task, isc_event_t *event) {
+ 	dns_ttl_t maxttl = 0;
+ 	uint32_t maxrecords;
+ 	uint64_t records;
+-	dns_aclenv_t *env =
+-		ns_interfacemgr_getaclenv(client->manager->interface->mgr);
+ 
+ 	INSIST(event->ev_type == DNS_EVENT_UPDATE);
+ 
+@@ -2607,14 +2763,7 @@ update_action(isc_task_t *task, isc_event_t *event) {
+ 	zonename = dns_db_origin(db);
+ 	zoneclass = dns_db_class(db);
+ 	dns_zone_getssutable(zone, &ssutable);
+-
+-	/*
+-	 * Update message processing can leak record existence information
+-	 * so check that we are allowed to query this zone.  Additionally
+-	 * if we would refuse all updates for this zone we bail out here.
+-	 */
+-	CHECK(checkqueryacl(client, dns_zone_getqueryacl(zone), zonename,
+-			    dns_zone_getupdateacl(zone), ssutable));
++	options = dns_zone_getoptions(zone);
+ 
+ 	/*
+ 	 * Get old and new versions now that queryacl has been checked.
+@@ -2750,135 +2899,10 @@ update_action(isc_task_t *task, isc_event_t *event) {
+ 
+ 	update_log(client, zone, LOGLEVEL_DEBUG, "prerequisites are OK");
+ 
+-	/*
+-	 * Check Requestor's Permissions.  It seems a bit silly to do this
+-	 * only after prerequisite testing, but that is what RFC2136 says.
+-	 */
+-	if (ssutable == NULL) {
+-		CHECK(checkupdateacl(client, dns_zone_getupdateacl(zone),
+-				     "update", zonename, false, false));
+-	} else if (client->signer == NULL && !TCPCLIENT(client)) {
+-		CHECK(checkupdateacl(client, NULL, "update", zonename, false,
+-				     true));
+-	}
+-
+-	if (dns_zone_getupdatedisabled(zone)) {
+-		FAILC(DNS_R_REFUSED, "dynamic update temporarily disabled "
+-				     "because the zone is frozen.  Use "
+-				     "'rndc thaw' to re-enable updates.");
+-	}
+-
+-	/*
+-	 * Perform the Update Section Prescan.
+-	 */
+-
+-	for (result = dns_message_firstname(request, DNS_SECTION_UPDATE);
+-	     result == ISC_R_SUCCESS;
+-	     result = dns_message_nextname(request, DNS_SECTION_UPDATE))
+-	{
+-		dns_name_t *name = NULL;
+-		dns_rdata_t rdata = DNS_RDATA_INIT;
+-		dns_ttl_t ttl;
+-		dns_rdataclass_t update_class;
+-		get_current_rr(request, DNS_SECTION_UPDATE, zoneclass, &name,
+-			       &rdata, &covers, &ttl, &update_class);
+-
+-		if (!dns_name_issubdomain(name, zonename)) {
+-			FAILC(DNS_R_NOTZONE, "update RR is outside zone");
+-		}
+-		if (update_class == zoneclass) {
+-			/*
+-			 * Check for meta-RRs.  The RFC2136 pseudocode says
+-			 * check for ANY|AXFR|MAILA|MAILB, but the text adds
+-			 * "or any other QUERY metatype"
+-			 */
+-			if (dns_rdatatype_ismeta(rdata.type)) {
+-				FAILC(DNS_R_FORMERR, "meta-RR in update");
+-			}
+-			result = dns_zone_checknames(zone, name, &rdata);
+-			if (result != ISC_R_SUCCESS) {
+-				FAIL(DNS_R_REFUSED);
+-			}
+-		} else if (update_class == dns_rdataclass_any) {
+-			if (ttl != 0 || rdata.length != 0 ||
+-			    (dns_rdatatype_ismeta(rdata.type) &&
+-			     rdata.type != dns_rdatatype_any))
+-			{
+-				FAILC(DNS_R_FORMERR, "meta-RR in update");
+-			}
+-		} else if (update_class == dns_rdataclass_none) {
+-			if (ttl != 0 || dns_rdatatype_ismeta(rdata.type)) {
+-				FAILC(DNS_R_FORMERR, "meta-RR in update");
+-			}
+-		} else {
+-			update_log(client, zone, ISC_LOG_WARNING,
+-				   "update RR has incorrect class %d",
+-				   update_class);
+-			FAIL(DNS_R_FORMERR);
+-		}
+-
+-		/*
+-		 * draft-ietf-dnsind-simple-secure-update-01 says
+-		 * "Unlike traditional dynamic update, the client
+-		 * is forbidden from updating NSEC records."
+-		 */
+-		if (rdata.type == dns_rdatatype_nsec3) {
+-			FAILC(DNS_R_REFUSED, "explicit NSEC3 updates are not "
+-					     "allowed "
+-					     "in secure zones");
+-		} else if (rdata.type == dns_rdatatype_nsec) {
+-			FAILC(DNS_R_REFUSED, "explicit NSEC updates are not "
+-					     "allowed "
+-					     "in secure zones");
+-		} else if (rdata.type == dns_rdatatype_rrsig &&
+-			   !dns_name_equal(name, zonename)) {
+-			FAILC(DNS_R_REFUSED, "explicit RRSIG updates are "
+-					     "currently "
+-					     "not supported in secure zones "
+-					     "except "
+-					     "at the apex");
+-		}
+-
+-		if (ssutable != NULL) {
+-			isc_netaddr_t netaddr;
+-			dst_key_t *tsigkey = NULL;
+-			isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr);
+-
+-			if (client->message->tsigkey != NULL) {
+-				tsigkey = client->message->tsigkey->key;
+-			}
+-
+-			if (rdata.type != dns_rdatatype_any) {
+-				if (!dns_ssutable_checkrules(
+-					    ssutable, client->signer, name,
+-					    &netaddr, TCPCLIENT(client), env,
+-					    rdata.type, tsigkey))
+-				{
+-					FAILC(DNS_R_REFUSED, "rejected by "
+-							     "secure update");
+-				}
+-			} else {
+-				if (!ssu_checkall(db, ver, name, ssutable,
+-						  client->signer, &netaddr, env,
+-						  TCPCLIENT(client), tsigkey))
+-				{
+-					FAILC(DNS_R_REFUSED, "rejected by "
+-							     "secure update");
+-				}
+-			}
+-		}
+-	}
+-	if (result != ISC_R_NOMORE) {
+-		FAIL(result);
+-	}
+-
+-	update_log(client, zone, LOGLEVEL_DEBUG, "update section prescan OK");
+ 
+ 	/*
+ 	 * Process the Update Section.
+ 	 */
+-
+-	options = dns_zone_getoptions(zone);
+ 	for (result = dns_message_firstname(request, DNS_SECTION_UPDATE);
+ 	     result == ISC_R_SUCCESS;
+ 	     result = dns_message_nextname(request, DNS_SECTION_UPDATE))
+@@ -3312,10 +3336,7 @@ update_action(isc_task_t *task, isc_event_t *event) {
+ 			if (result == ISC_R_SUCCESS && records > maxrecords) {
+ 				update_log(client, zone, ISC_LOG_ERROR,
+ 					   "records in zone (%" PRIu64 ") "
+-					   "exceeds"
+-					   " max-"
+-					   "records"
+-					   " (%u)",
++					   "exceeds max-records (%u)",					   
+ 					   records, maxrecords);
+ 				result = DNS_R_TOOMANYRECORDS;
+ 				goto failure;
+@@ -3607,6 +3628,13 @@ send_forward_event(ns_client_t *client, dns_zone_t *zone) {
+ 	update_event_t *event = NULL;
+ 	isc_task_t *zonetask = NULL;
+ 
++	result = checkupdateacl(client, dns_zone_getforwardacl(zone),
++				"update forwarding", dns_zone_getorigin(zone),
++				true, false);
++	if (result != ISC_R_SUCCESS) {
++		return (result);
++	}
++
+ 	result = isc_quota_attach(&client->manager->sctx->updquota,
+ 				  &(isc_quota_t *){ NULL });
+ 	if (result != ISC_R_SUCCESS) {
+-- 
+2.33.0
+
diff --git a/backport-CVE-2022-3736.patch b/backport-CVE-2022-3736.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5d376ddebff466d4f639ccb263c3eb65c8d0d935
--- /dev/null
+++ b/backport-CVE-2022-3736.patch
@@ -0,0 +1,55 @@
+From 3cd0c32b0a4dc93a1e3955e17ea8efa0804964ae Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Thu, 27 Oct 2022 13:22:11 +1100
+Subject: [PATCH] Move the mapping of SIG and RRSIG to ANY
+
+dns_db_findext() asserts if RRSIG is passed to it and
+query_lookup_stale() failed to map RRSIG to ANY to prevent this.  To
+avoid cases like this in the future, move the mapping of SIG and RRSIG
+to ANY for qctx->type to qctx_init().
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/ea79385990c564eb478c286c089ea7ed15520690
+(cherry picked from commit 56eae064183488bcf7ff08c3edf59f2e1742c1b6)
+---
+ lib/ns/query.c | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index b822a29..1944a0b 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -5155,6 +5155,15 @@ qctx_init(ns_client_t *client, dns_fetchevent_t **eventp, dns_rdatatype_t qtype,
+ 	qctx->result = ISC_R_SUCCESS;
+ 	qctx->findcoveringnsec = qctx->view->synthfromdnssec;
+ 
++	/*
++	 * If it's an RRSIG or SIG query, we'll iterate the node.
++	 */
++	if (qctx->qtype == dns_rdatatype_rrsig ||
++	    qctx->qtype == dns_rdatatype_sig)
++	{
++		qctx->type = dns_rdatatype_any;
++	}
++
+ 	CALL_HOOK_NORETURN(NS_QUERY_QCTX_INITIALIZED, qctx);
+ }
+ 
+@@ -5295,14 +5304,6 @@ query_setup(ns_client_t *client, dns_rdatatype_t qtype) {
+ 
+ 	CALL_HOOK(NS_QUERY_SETUP, &qctx);
+ 
+-	/*
+-	 * If it's a SIG query, we'll iterate the node.
+-	 */
+-	if (qctx.qtype == dns_rdatatype_rrsig ||
+-	    qctx.qtype == dns_rdatatype_sig) {
+-		qctx.type = dns_rdatatype_any;
+-	}
+-
+ 	/*
+ 	 * Check SERVFAIL cache
+ 	 */
+-- 
+2.33.0
+
diff --git a/backport-CVE-2022-38177.patch b/backport-CVE-2022-38177.patch
new file mode 100644
index 0000000000000000000000000000000000000000..dc8cb41cf134e2ff6c8421c3916ebc1605d7f59e
--- /dev/null
+++ b/backport-CVE-2022-38177.patch
@@ -0,0 +1,25 @@
+From 5b2282afff760b1ed3471f6666bdfe8e1d34e590 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Thu, 11 Aug 2022 15:15:34 +1000
+Subject: [PATCH] Free eckey on siglen mismatch
+
+---
+ lib/dns/opensslecdsa_link.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/dns/opensslecdsa_link.c b/lib/dns/opensslecdsa_link.c
+index 1f16ca70738..5ee4342b387 100644
+--- a/lib/dns/opensslecdsa_link.c
++++ b/lib/dns/opensslecdsa_link.c
+@@ -230,7 +230,7 @@ opensslecdsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
+ 	}
+ 
+ 	if (sig->length != siglen) {
+-		return (DST_R_VERIFYFAILURE);
++		DST_RET(DST_R_VERIFYFAILURE);
+ 	}
+ 
+ 	if (!EVP_DigestFinal_ex(evp_md_ctx, digest, &dgstlen)) {
+-- 
+GitLab
+
diff --git a/backport-CVE-2022-38178.patch b/backport-CVE-2022-38178.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a0ab793ff05d55bed3601b0814fb87e56cba3009
--- /dev/null
+++ b/backport-CVE-2022-38178.patch
@@ -0,0 +1,31 @@
+From 1af23378ebb11da2eb0f412e4563d6c4165fbd3d Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Thu, 11 Aug 2022 15:28:13 +1000
+Subject: [PATCH] Free ctx on invalid siglen
+
+(cherry picked from commit 6ddb480a84836641a0711768a94122972c166825)
+---
+ lib/dns/openssleddsa_link.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/dns/openssleddsa_link.c b/lib/dns/openssleddsa_link.c
+index b5ab3b3d8a2..12fdf650eb6 100644
+--- a/lib/dns/openssleddsa_link.c
++++ b/lib/dns/openssleddsa_link.c
+@@ -236,11 +236,11 @@ openssleddsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
+ 	}
+ #endif /* if HAVE_OPENSSL_ED448 */
+ 	if (siglen == 0) {
+-		return (ISC_R_NOTIMPLEMENTED);
++		DST_RET(ISC_R_NOTIMPLEMENTED);
+ 	}
+ 
+ 	if (sig->length != siglen) {
+-		return (DST_R_VERIFYFAILURE);
++		DST_RET(DST_R_VERIFYFAILURE);
+ 	}
+ 
+ 	isc_buffer_usedregion(buf, &tbsreg);
+-- 
+GitLab
+
diff --git a/backport-CVE-2022-3924.patch b/backport-CVE-2022-3924.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4c1bf64e010ad80957bc6c6e3d2396665d5606bb
--- /dev/null
+++ b/backport-CVE-2022-3924.patch
@@ -0,0 +1,129 @@
+From 6bebcedb80470698987eb1f8b5ac1a39371a887f Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Mon, 14 Nov 2022 12:18:06 +0000
+Subject: [PATCH] Cancel all fetch events in dns_resolver_cancelfetch()
+
+Although 'dns_fetch_t' fetch can have two associated events, one for
+each of 'DNS_EVENT_FETCHDONE' and 'DNS_EVENT_TRYSTALE' types, the
+dns_resolver_cancelfetch() function is designed in a way that it
+expects only one existing event, which it must cancel, and when it
+happens so that 'stale-answer-client-timeout' is enabled and there
+are two events, only one of them is canceled, and it results in an
+assertion in dns_resolver_destroyfetch(), when it finds a dangling
+event.
+
+Change the logic of dns_resolver_cancelfetch() function so that it
+cancels both the events (if they exist), and in the right order.
+
+Conflict: change UNREACHABLE() to INSIST(0)
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/b4a65aaea19762a3712932aa2270e8a833fbde22
+(cherry picked from commit ec2098ca35039e4f81fd0aa7c525eb960b8f47bf)
+---
+ lib/dns/resolver.c | 52 +++++++++++++++++++++++++++++++++++-----------
+ lib/ns/query.c     |  4 +++-
+ 2 files changed, 43 insertions(+), 13 deletions(-)
+
+diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
+index bfd5967..b1a842c 100644
+--- a/lib/dns/resolver.c
++++ b/lib/dns/resolver.c
+@@ -11200,8 +11200,9 @@ void
+ dns_resolver_cancelfetch(dns_fetch_t *fetch) {
+ 	fetchctx_t *fctx;
+ 	dns_resolver_t *res;
+-	dns_fetchevent_t *event, *next_event;
+-	isc_task_t *etask;
++	dns_fetchevent_t *event = NULL;
++	dns_fetchevent_t *event_trystale = NULL;
++	dns_fetchevent_t *event_fetchdone = NULL;
+ 
+ 	REQUIRE(DNS_FETCH_VALID(fetch));
+ 	fctx = fetch->private;
+@@ -11213,32 +11214,59 @@ dns_resolver_cancelfetch(dns_fetch_t *fetch) {
+ 	LOCK(&res->buckets[fctx->bucketnum].lock);
+ 
+ 	/*
+-	 * Find the completion event for this fetch (as opposed
++	 * Find the events for this fetch (as opposed
+ 	 * to those for other fetches that have joined the same
+-	 * fctx) and send it with result = ISC_R_CANCELED.
++ 	 * fctx) and send them with result = ISC_R_CANCELED.
+ 	 */
+-	event = NULL;
+ 	if (fctx->state != fetchstate_done) {
++		dns_fetchevent_t *next_event = NULL;	
+ 		for (event = ISC_LIST_HEAD(fctx->events); event != NULL;
+ 		     event = next_event) {
+ 			next_event = ISC_LIST_NEXT(event, ev_link);
+ 			if (event->fetch == fetch) {
+ 				ISC_LIST_UNLINK(fctx->events, event, ev_link);
+-				break;
++				switch (event->ev_type) {
++				case DNS_EVENT_TRYSTALE:
++					INSIST(event_trystale == NULL);
++					event_trystale = event;
++					break;
++				case DNS_EVENT_FETCHDONE:
++					INSIST(event_fetchdone == NULL);
++					event_fetchdone = event;
++					break;
++				default:
++					INSIST(0);
++				}
++				if (event_trystale != NULL &&
++				    event_fetchdone != NULL)
++				{
++					break;
++				}			
+ 			}
+ 		}
+ 	}
+-	if (event != NULL) {
+-		etask = event->ev_sender;
+-		event->ev_sender = fctx;
+-		event->result = ISC_R_CANCELED;
+-		isc_task_sendanddetach(&etask, ISC_EVENT_PTR(&event));
++	/*
++	 * The "trystale" event must be sent before the "fetchdone" event,
++	 * because the latter clears the "recursing" query attribute, which is
++	 * required by both events (handled by the same callback function).
++	 */
++	if (event_trystale != NULL) {
++		isc_task_t *etask = event_trystale->ev_sender;
++		event_trystale->ev_sender = fctx;
++		event_trystale->result = ISC_R_CANCELED;
++		isc_task_sendanddetach(&etask, ISC_EVENT_PTR(&event_trystale));
+ 	}
++	if (event_fetchdone != NULL) {
++		isc_task_t *etask = event_fetchdone->ev_sender;
++		event_fetchdone->ev_sender = fctx;
++		event_fetchdone->result = ISC_R_CANCELED;
++		isc_task_sendanddetach(&etask, ISC_EVENT_PTR(&event_fetchdone));
++        }
++
+ 	/*
+ 	 * The fctx continues running even if no fetches remain;
+ 	 * the answer is still cached.
+ 	 */
+-
+ 	UNLOCK(&res->buckets[fctx->bucketnum].lock);
+ }
+ 
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index 1944a0b..1444de5 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -6073,7 +6073,9 @@ fetch_callback(isc_task_t *task, isc_event_t *event) {
+ 	CTRACE(ISC_LOG_DEBUG(3), "fetch_callback");
+ 
+ 	if (event->ev_type == DNS_EVENT_TRYSTALE) {
+-		query_lookup_stale(client);
++		if (devent->result != ISC_R_CANCELED) {
++			query_lookup_stale(client);
++		}		
+ 		isc_event_free(ISC_EVENT_PTR(&event));
+ 		return;
+ 	}
+-- 
+2.33.0
+
diff --git a/backport-CVE-2023-2828.patch b/backport-CVE-2023-2828.patch
new file mode 100644
index 0000000000000000000000000000000000000000..11ccf3c59f567bfc458cb48a8fcc17e3873df839
--- /dev/null
+++ b/backport-CVE-2023-2828.patch
@@ -0,0 +1,170 @@
+From 321a498e73e9fa00d69ee9cfa4756505e5e5c8e8 Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Thu, 25 May 2023 23:53:50 -0700
+Subject: [PATCH] CVE-2023-2828
+
+Every `named` instance configured to run as a recursive resolver maintains a cache database holding the responses to the queries it has recently sent to authoritative servers. The size limit for that cache database can be configured using the `max-cache-size` statement in the configuration file; it defaults to 90% of the total amount of memory available on the host. When the size of the cache reaches 7/8 of the configured limit, a cache-cleaning algorithm starts to remove expired and/or least-recently used RRsets from the cache, to keep memory use below the configured limit. It has been discovered that the effectiveness of the cache-cleaning algorithm used in `named` can be severely diminished by querying the resolver for specific RRsets in a certain order, effectively allowing the configured `max-cache-size` limit to be significantly exceeded.
+
+---
+ lib/dns/rbtdb.c | 105 ++++++++++++++++++++++++++++++------------------
+ 1 file changed, 65 insertions(+), 40 deletions(-)
+
+diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
+index 1795f9d..c25023c 100644
+--- a/lib/dns/rbtdb.c
++++ b/lib/dns/rbtdb.c
+@@ -599,7 +599,7 @@ static void
+ expire_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, bool tree_locked,
+ 	      expire_t reason);
+ static void
+-overmem_purge(dns_rbtdb_t *rbtdb, unsigned int locknum_start, isc_stdtime_t now,
++overmem_purge(dns_rbtdb_t *rbtdb, unsigned int locknum_start, size_t purgesize,
+ 	      bool tree_locked);
+ static isc_result_t
+ resign_insert(dns_rbtdb_t *rbtdb, int idx, rdatasetheader_t *newheader);
+@@ -6794,6 +6794,16 @@ cleanup:
+ 
+ static dns_dbmethods_t zone_methods;
+ 
++static size_t
++rdataset_size(rdatasetheader_t *header) {
++	if (!NONEXISTENT(header)) {
++		return (dns_rdataslab_size((unsigned char *)header,
++					   sizeof(*header)));
++	}
++
++	return (sizeof(*header));
++}
++
+ static isc_result_t
+ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
+ 	    isc_stdtime_t now, dns_rdataset_t *rdataset, unsigned int options,
+@@ -6957,7 +6967,8 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
+ 	}
+ 
+ 	if (cache_is_overmem) {
+-		overmem_purge(rbtdb, rbtnode->locknum, now, tree_locked);
++		overmem_purge(rbtdb, rbtnode->locknum, rdataset_size(newheader),
++			      tree_locked);
+ 	}
+ 
+ 	NODE_LOCK(&rbtdb->node_locks[rbtnode->locknum].lock,
+@@ -6976,10 +6987,18 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
+ 		}
+ 
+ 		header = isc_heap_element(rbtdb->heaps[rbtnode->locknum], 1);
+-		if (header != NULL && header->rdh_ttl + rbtdb->serve_stale_ttl <
+-					      now - RBTDB_VIRTUAL)
+-		{
+-			expire_header(rbtdb, header, tree_locked, expire_ttl);
++		if (header != NULL) {
++			dns_ttl_t rdh_ttl = header->rdh_ttl;
++
++			/* Only account for stale TTL if cache is not overmem */
++			if (!cache_is_overmem) {
++				rdh_ttl += rbtdb->serve_stale_ttl;
++			}
++
++			if (rdh_ttl < now - RBTDB_VIRTUAL) {
++				expire_header(rbtdb, header, tree_locked,
++					      expire_ttl);
++			}
+ 		}
+ 
+ 		/*
+@@ -10495,52 +10514,58 @@ update_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, isc_stdtime_t now) {
+ 	ISC_LIST_PREPEND(rbtdb->rdatasets[header->node->locknum], header, link);
+ }
+ 
++static size_t
++expire_lru_headers(dns_rbtdb_t *rbtdb, unsigned int locknum, size_t purgesize,
++		   bool tree_locked) {
++	rdatasetheader_t *header, *header_prev;
++	size_t purged = 0;
++
++	for (header = ISC_LIST_TAIL(rbtdb->rdatasets[locknum]);
++	     header != NULL && purged <= purgesize; header = header_prev)
++	{
++		header_prev = ISC_LIST_PREV(header, link);
++		/*
++		 * Unlink the entry at this point to avoid checking it
++		 * again even if it's currently used someone else and
++		 * cannot be purged at this moment.  This entry won't be
++		 * referenced any more (so unlinking is safe) since the
++		 * TTL was reset to 0.
++		 */
++		ISC_LIST_UNLINK(rbtdb->rdatasets[locknum], header, link);
++		size_t header_size = rdataset_size(header);
++		expire_header(rbtdb, header, tree_locked, expire_lru);
++		purged += header_size;
++	}
++
++	return (purged);
++}
++
+ /*%
+- * Purge some expired and/or stale (i.e. unused for some period) cache entries
+- * under an overmem condition.  To recover from this condition quickly, up to
+- * 2 entries will be purged.  This process is triggered while adding a new
+- * entry, and we specifically avoid purging entries in the same LRU bucket as
+- * the one to which the new entry will belong.  Otherwise, we might purge
+- * entries of the same name of different RR types while adding RRsets from a
+- * single response (consider the case where we're adding A and AAAA glue records
+- * of the same NS name).
++ * Purge some stale (i.e. unused for some period - LRU based cleaning) cache
++ * entries under the overmem condition.  To recover from this condition quickly,
++ * we cleanup entries up to the size of newly added rdata (passed as purgesize).
++ *
++ * This process is triggered while adding a new entry, and we specifically avoid
++ * purging entries in the same LRU bucket as the one to which the new entry will
++ * belong.  Otherwise, we might purge entries of the same name of different RR
++ * types while adding RRsets from a single response (consider the case where
++ * we're adding A and AAAA glue records of the same NS name).
+  */
+ static void
+-overmem_purge(dns_rbtdb_t *rbtdb, unsigned int locknum_start, isc_stdtime_t now,
++overmem_purge(dns_rbtdb_t *rbtdb, unsigned int locknum_start, size_t purgesize,
+ 	      bool tree_locked) {
+-	rdatasetheader_t *header, *header_prev;
+ 	unsigned int locknum;
+-	int purgecount = 2;
++	size_t purged = 0;
+ 
+ 	for (locknum = (locknum_start + 1) % rbtdb->node_lock_count;
+-	     locknum != locknum_start && purgecount > 0;
++	     locknum != locknum_start && purged <= purgesize;
+ 	     locknum = (locknum + 1) % rbtdb->node_lock_count)
+ 	{
+ 		NODE_LOCK(&rbtdb->node_locks[locknum].lock,
+ 			  isc_rwlocktype_write);
+ 
+-		header = isc_heap_element(rbtdb->heaps[locknum], 1);
+-		if (header && header->rdh_ttl < now - RBTDB_VIRTUAL) {
+-			expire_header(rbtdb, header, tree_locked, expire_ttl);
+-			purgecount--;
+-		}
+-
+-		for (header = ISC_LIST_TAIL(rbtdb->rdatasets[locknum]);
+-		     header != NULL && purgecount > 0; header = header_prev)
+-		{
+-			header_prev = ISC_LIST_PREV(header, link);
+-			/*
+-			 * Unlink the entry at this point to avoid checking it
+-			 * again even if it's currently used someone else and
+-			 * cannot be purged at this moment.  This entry won't be
+-			 * referenced any more (so unlinking is safe) since the
+-			 * TTL was reset to 0.
+-			 */
+-			ISC_LIST_UNLINK(rbtdb->rdatasets[locknum], header,
+-					link);
+-			expire_header(rbtdb, header, tree_locked, expire_lru);
+-			purgecount--;
+-		}
++		purged += expire_lru_headers(rbtdb, locknum, purgesize - purged,
++					     tree_locked);
+ 
+ 		NODE_UNLOCK(&rbtdb->node_locks[locknum].lock,
+ 			    isc_rwlocktype_write);
+-- 
+2.33.0
+
diff --git a/backport-CVE-2023-2911.patch b/backport-CVE-2023-2911.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a5f2b2c3da6ac5d1fbfbc4f4cbfffcaee0dec2da
--- /dev/null
+++ b/backport-CVE-2023-2911.patch
@@ -0,0 +1,107 @@
+From 240caa32b9cab90a38ab863fd64e6becf5d1393c Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Thu, 25 May 2023 23:53:50 -0700
+Subject: [PATCH] Stale answer lookups could loop when over recursion quota
+
+When a query was aborted because of the recursion quota being exceeded,
+but triggered a stale answer response and a stale data refresh query,
+it could cause named to loop back where we are iterating and following
+a delegation. Having no good answer in cache, we would fall back to
+using serve-stale again, use the stale data, try to refresh the RRset,
+and loop back again, without ever terminating until crashing due to
+stack overflow.
+
+This happens because in the functions 'query_notfound()' and
+'query_delegation_recurse()', we check whether we can fall back to
+serving stale data. We shouldn't do so if we are already refreshing
+an RRset due to having prioritized stale data in cache.
+
+In other words, we need to add an extra check to 'query_usestale()' to
+disallow serving stale data if we are currently refreshing a stale
+RRset.
+
+As an additional mitigation to prevent looping, we now use the result
+code ISC_R_ALREADYRUNNING rather than ISC_R_FAILURE when a recursion
+loop is encountered, and we check for that condition in
+'query_usestale()' as well.
+
+---
+ lib/ns/query.c | 30 ++++++++++++++++++++++--------
+ 1 file changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index 1444de5..3ce6742 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -5696,6 +5696,7 @@ query_refresh_rrset(query_ctx_t *orig_qctx) {
+ 	qctx.client->query.dboptions &= ~(DNS_DBFIND_STALETIMEOUT |
+ 					  DNS_DBFIND_STALEOK |
+ 					  DNS_DBFIND_STALEENABLED);
++	qctx.client->nodetach = false;
+ 
+ 	/*
+ 	 * We'll need some resources...
+@@ -5920,7 +5921,14 @@ query_lookup(query_ctx_t *qctx) {
+ 					"%s stale answer used, an attempt to "
+ 					"refresh the RRset will still be made",
+ 					namebuf);
++
+ 				qctx->refresh_rrset = STALE(qctx->rdataset);
++
++				/*
++				 * If we are refreshing the RRSet, we must not
++				 * detach from the client in query_send().
++				 */
++				qctx->client->nodetach = qctx->refresh_rrset;
+ 			}
+ 		} else {
+ 			/*
+@@ -6272,7 +6280,7 @@ ns_query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname,
+ 	if (recparam_match(&client->query.recparam, qtype, qname, qdomain)) {
+ 		ns_client_log(client, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_QUERY,
+ 			      ISC_LOG_INFO, "recursion loop detected");
+-		return (ISC_R_FAILURE);
++		return (ISC_R_ALREADYRUNNING);
+ 	}
+ 
+ 	recparam_update(&client->query.recparam, qtype, qname, qdomain);
+@@ -7235,10 +7243,21 @@ query_usestale(query_ctx_t *qctx, isc_result_t result) {
+ 		return (false);
+ 	}
+ 
+-	if (result == DNS_R_DUPLICATE || result == DNS_R_DROP) {
++	if (qctx->refresh_rrset) {
++		/*
++		 * This is a refreshing query, we have already prioritized
++		 * stale data, so don't enable serve-stale again.
++		 */
++		return (false);
++	}
++
++	if (result == DNS_R_DUPLICATE || result == DNS_R_DROP ||
++	    result == ISC_R_ALREADYRUNNING)
++	{
+ 		/*
+ 		 * Don't enable serve-stale if the result signals a duplicate
+-		 * query or query that is being dropped.
++		 * query or a query that is being dropped or can't proceed
++		 * because of a recursion loop.
+ 		 */
+ 		return (false);
+ 	}
+@@ -11490,12 +11509,7 @@ ns_query_done(query_ctx_t *qctx) {
+ 	/*
+ 	 * Client may have been detached after query_send(), so
+ 	 * we test and store the flag state here, for safety.
+-	 * If we are refreshing the RRSet, we must not detach from the client
+-	 * in the query_send(), so we need to override the flag.
+ 	 */
+-	if (qctx->refresh_rrset) {
+-		qctx->client->nodetach = true;
+-	}
+ 	nodetach = qctx->client->nodetach;
+ 	query_send(qctx->client);
+ 
+-- 
+2.33.0
+
diff --git a/backport-CVE-2023-3341.patch b/backport-CVE-2023-3341.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8fa9f4e144a3ce0785a8672dc4635a7bf0ed1679
--- /dev/null
+++ b/backport-CVE-2023-3341.patch
@@ -0,0 +1,169 @@
+From 820b0cceef0b67b041973da4041ea53d5e276363 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 20 Jun 2023 15:21:36 +1000
+Subject: [PATCH] Limit isccc_cc_fromwire recursion depth
+
+Named and rndc do not need a lot of recursion so the depth is
+set to 10.
+
+---
+ lib/isccc/cc.c                   | 39 ++++++++++++++++++++++++--------
+ lib/isccc/include/isccc/result.h |  4 +++-
+ lib/isccc/result.c               |  4 +++-
+ 3 files changed, 35 insertions(+), 12 deletions(-)
+
+diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c
+index 0be28b9..3744d0f 100644
+--- a/lib/isccc/cc.c
++++ b/lib/isccc/cc.c
+@@ -50,6 +50,10 @@
+ 
+ #define MAX_TAGS     256
+ #define DUP_LIFETIME 900
++#ifndef ISCCC_MAXDEPTH
++#define ISCCC_MAXDEPTH \
++	10 /* Big enough for rndc which just sends a string each way. */
++#endif
+ 
+ typedef isccc_sexpr_t *sexpr_ptr;
+ 
+@@ -480,19 +484,25 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length,
+ 
+ static isc_result_t
+ table_fromwire(isccc_region_t *source, isccc_region_t *secret,
+-	       uint32_t algorithm, isccc_sexpr_t **alistp);
++	       uint32_t algorithm, unsigned int depth, isccc_sexpr_t **alistp);
+ 
+ static isc_result_t
+-list_fromwire(isccc_region_t *source, isccc_sexpr_t **listp);
++list_fromwire(isccc_region_t *source, unsigned int depth,
++	      isccc_sexpr_t **listp);
+ 
+ static isc_result_t
+-value_fromwire(isccc_region_t *source, isccc_sexpr_t **valuep) {
++value_fromwire(isccc_region_t *source, unsigned int depth,
++	       isccc_sexpr_t **valuep) {
+ 	unsigned int msgtype;
+ 	uint32_t len;
+ 	isccc_sexpr_t *value;
+ 	isccc_region_t active;
+ 	isc_result_t result;
+ 
++	if (depth > ISCCC_MAXDEPTH) {
++		return (ISCCC_R_MAXDEPTH);
++	}
++
+ 	if (REGION_SIZE(*source) < 1 + 4) {
+ 		return (ISC_R_UNEXPECTEDEND);
+ 	}
+@@ -513,9 +523,9 @@ value_fromwire(isccc_region_t *source, isccc_sexpr_t **valuep) {
+ 			result = ISC_R_NOMEMORY;
+ 		}
+ 	} else if (msgtype == ISCCC_CCMSGTYPE_TABLE) {
+-		result = table_fromwire(&active, NULL, 0, valuep);
++		result = table_fromwire(&active, NULL, 0, depth + 1, valuep);
+ 	} else if (msgtype == ISCCC_CCMSGTYPE_LIST) {
+-		result = list_fromwire(&active, valuep);
++		result = list_fromwire(&active, depth + 1, valuep);
+ 	} else {
+ 		result = ISCCC_R_SYNTAX;
+ 	}
+@@ -525,7 +535,7 @@ value_fromwire(isccc_region_t *source, isccc_sexpr_t **valuep) {
+ 
+ static isc_result_t
+ table_fromwire(isccc_region_t *source, isccc_region_t *secret,
+-	       uint32_t algorithm, isccc_sexpr_t **alistp) {
++	       uint32_t algorithm, unsigned int depth, isccc_sexpr_t **alistp) {
+ 	char key[256];
+ 	uint32_t len;
+ 	isc_result_t result;
+@@ -535,6 +545,10 @@ table_fromwire(isccc_region_t *source, isccc_region_t *secret,
+ 
+ 	REQUIRE(alistp != NULL && *alistp == NULL);
+ 
++	if (depth > ISCCC_MAXDEPTH) {
++		return (ISCCC_R_MAXDEPTH);
++	}
++
+ 	checksum_rstart = NULL;
+ 	first_tag = true;
+ 	alist = isccc_alist_create();
+@@ -551,7 +565,7 @@ table_fromwire(isccc_region_t *source, isccc_region_t *secret,
+ 		GET_MEM(key, len, source->rstart);
+ 		key[len] = '\0'; /* Ensure NUL termination. */
+ 		value = NULL;
+-		result = value_fromwire(source, &value);
++		result = value_fromwire(source, depth + 1, &value);
+ 		if (result != ISC_R_SUCCESS) {
+ 			goto bad;
+ 		}
+@@ -589,14 +603,19 @@ bad:
+ }
+ 
+ static isc_result_t
+-list_fromwire(isccc_region_t *source, isccc_sexpr_t **listp) {
++list_fromwire(isccc_region_t *source, unsigned int depth,
++	      isccc_sexpr_t **listp) {
+ 	isccc_sexpr_t *list, *value;
+ 	isc_result_t result;
+ 
++	if (depth > ISCCC_MAXDEPTH) {
++		return (ISCCC_R_MAXDEPTH);
++	}
++
+ 	list = NULL;
+ 	while (!REGION_EMPTY(*source)) {
+ 		value = NULL;
+-		result = value_fromwire(source, &value);
++		result = value_fromwire(source, depth + 1, &value);
+ 		if (result != ISC_R_SUCCESS) {
+ 			isccc_sexpr_free(&list);
+ 			return (result);
+@@ -628,7 +647,7 @@ isccc_cc_fromwire(isccc_region_t *source, isccc_sexpr_t **alistp,
+ 		return (ISCCC_R_UNKNOWNVERSION);
+ 	}
+ 
+-	return (table_fromwire(source, secret, algorithm, alistp));
++	return (table_fromwire(source, secret, algorithm, 0, alistp));
+ }
+ 
+ static isc_result_t
+diff --git a/lib/isccc/include/isccc/result.h b/lib/isccc/include/isccc/result.h
+index 5346bab..5b6a876 100644
+--- a/lib/isccc/include/isccc/result.h
++++ b/lib/isccc/include/isccc/result.h
+@@ -46,8 +46,10 @@
+ #define ISCCC_R_CLOCKSKEW (ISC_RESULTCLASS_ISCCC + 4)
+ /*% Duplicate */
+ #define ISCCC_R_DUPLICATE (ISC_RESULTCLASS_ISCCC + 5)
++/*% Maximum recursion depth */
++#define ISCCC_R_MAXDEPTH (ISC_RESULTCLASS_ISCCC + 6)
+ 
+-#define ISCCC_R_NRESULTS 6 /*%< Number of results */
++#define ISCCC_R_NRESULTS 7 /*%< Number of results */
+ 
+ ISC_LANG_BEGINDECLS
+ 
+diff --git a/lib/isccc/result.c b/lib/isccc/result.c
+index 9285435..1956cb1 100644
+--- a/lib/isccc/result.c
++++ b/lib/isccc/result.c
+@@ -36,12 +36,14 @@ static const char *text[ISCCC_R_NRESULTS] = {
+ 	"bad auth",	   /* 3 */
+ 	"expired",	   /* 4 */
+ 	"clock skew",	   /* 5 */
+-	"duplicate"	   /* 6 */
++	"duplicate",	   /* 6 */
++	"max depth"	   /* 7 */
+ };
+ 
+ static const char *ids[ISCCC_R_NRESULTS] = {
+ 	"ISCCC_R_UNKNOWNVERSION", "ISCCC_R_SYNTAX",    "ISCCC_R_BADAUTH",
+ 	"ISCCC_R_EXPIRED",	  "ISCCC_R_CLOCKSKEW", "ISCCC_R_DUPLICATE",
++	"ISCCC_R_MAXDEPTH"
+ };
+ 
+ #define ISCCC_RESULT_RESULTSET 2
+-- 
+2.33.0
+
diff --git a/backport-CVE-2023-4408.patch b/backport-CVE-2023-4408.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5cd03d4d3fff5db0b882ed4ff0c539c0d0cb89d9
--- /dev/null
+++ b/backport-CVE-2023-4408.patch
@@ -0,0 +1,1645 @@
+From 608707b4f5b473e416563bfe0d43e26d6dc4a5c6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Mon, 11 Sep 2023 10:35:28 +0200
+Subject: [PATCH] Use hashtable when parsing a message
+
+When parsing messages use a hashtable instead of a linear search to
+reduce the amount of work done in findname when there's more than one
+name in the section.
+
+There are two hashtables:
+
+1) hashtable for owner names - that's constructed for each section when
+we hit the second name in the section and destroyed right after parsing
+that section;
+
+2) per-name hashtable - for each name in the section, we construct a new
+hashtable for that name if there are more than one rdataset for that
+particular name.
+
+Conflict:Due to the optimization patch 75f9dd8e82 not being merged, the optimization patch uses unreachable to encapsulate INSIST(0);ISC_UNREACHABLE(); In addition, the dns_message_find and dns_message_movename functions are not deleted.
+Reference:https://downloads.isc.org/isc/bind/9.16.48/patches/0001-CVE-2023-4408.patch
+
+(cherry picked from commit b8a96317544c7b310b4f74360825a87b6402ddc2)
+---
+ bin/plugins/filter-aaaa.c  |   2 +-
+ lib/dns/catz.c             |   8 +-
+ lib/dns/include/dns/name.h |  37 ++-
+ lib/dns/message.c          | 359 +++++++++++++++++-------
+ lib/dns/name.c             |   1 +
+ lib/dns/rpz.c              |   5 +-
+ lib/isc/ht.c               | 557 ++++++++++++++++++++++++++++---------
+ lib/isc/include/isc/ht.h   |  28 +-
+ lib/isc/tests/ht_test.c    |   4 +-
+ 9 files changed, 723 insertions(+), 278 deletions(-)
+
+diff --git a/bin/plugins/filter-aaaa.c b/bin/plugins/filter-aaaa.c
+index c390b45..b51f143 100644
+--- a/bin/plugins/filter-aaaa.c
++++ b/bin/plugins/filter-aaaa.c
+@@ -355,7 +355,7 @@ plugin_register(const char *parameters, const void *cfg, const char *cfg_file,
+ 	}
+ 
+ 	isc_mempool_create(mctx, sizeof(filter_data_t), &inst->datapool);
+-	isc_ht_init(&inst->ht, mctx, 16);
++	isc_ht_init(&inst->ht, mctx, 16, ISC_HT_CASE_SENSITIVE);
+ 	isc_mutex_init(&inst->hlock);
+ 
+ 	/*
+diff --git a/lib/dns/catz.c b/lib/dns/catz.c
+index fbe13f4..e27a6ff 100644
+--- a/lib/dns/catz.c
++++ b/lib/dns/catz.c
+@@ -418,9 +418,9 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) {
+ 
+ 	dns_name_format(&target->name, czname, DNS_NAME_FORMATSIZE);
+ 
+-	isc_ht_init(&toadd, target->catzs->mctx, 16);
++	isc_ht_init(&toadd, target->catzs->mctx, 16, ISC_HT_CASE_SENSITIVE);
+ 
+-	isc_ht_init(&tomod, target->catzs->mctx, 16);
++	isc_ht_init(&tomod, target->catzs->mctx, 16, ISC_HT_CASE_SENSITIVE);
+ 
+ 	isc_ht_iter_create(newzone->entries, &iter1);
+ 
+@@ -605,7 +605,7 @@ dns_catz_new_zones(dns_catz_zones_t **catzsp, dns_catz_zonemodmethods_t *zmm,
+ 
+ 	isc_refcount_init(&new_zones->refs, 1);
+ 
+-	isc_ht_init(&new_zones->zones, mctx, 4);
++	isc_ht_init(&new_zones->zones, mctx, 4, ISC_HT_CASE_SENSITIVE);
+ 
+ 	isc_mem_attach(mctx, &new_zones->mctx);
+ 	new_zones->zmm = zmm;
+@@ -657,7 +657,7 @@ dns_catz_new_zone(dns_catz_zones_t *catzs, dns_catz_zone_t **zonep,
+ 	dns_name_init(&new_zone->name, NULL);
+ 	dns_name_dup(name, catzs->mctx, &new_zone->name);
+ 
+-	isc_ht_init(&new_zone->entries, catzs->mctx, 4);
++	isc_ht_init(&new_zone->entries, catzs->mctx, 16, ISC_HT_CASE_SENSITIVE);
+ 
+ 	new_zone->updatetimer = NULL;
+ 	result = isc_timer_create(catzs->timermgr, isc_timertype_inactive, NULL,
+diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
+index 75bc020..4058b56 100644
+--- a/lib/dns/include/dns/name.h
++++ b/lib/dns/include/dns/name.h
+@@ -67,6 +67,7 @@
+ #include <stdbool.h>
+ #include <stdio.h>
+ 
++#include <isc/ht.h>
+ #include <isc/lang.h>
+ #include <isc/magic.h>
+ #include <isc/region.h> /* Required for storage size of dns_label_t. */
+@@ -110,6 +111,7 @@ struct dns_name {
+ 	isc_buffer_t  *buffer;
+ 	ISC_LINK(dns_name_t) link;
+ 	ISC_LIST(dns_rdataset_t) list;
++	isc_ht_t *ht;
+ };
+ 
+ #define DNS_NAME_MAGIC ISC_MAGIC('D', 'N', 'S', 'n')
+@@ -165,30 +167,24 @@ LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_wildcardname;
+  *	unsigned char offsets[] = { 0, 6 };
+  *	dns_name_t value = DNS_NAME_INITABSOLUTE(data, offsets);
+  */
+-#define DNS_NAME_INITNONABSOLUTE(A, B)                         \
+-	{                                                      \
+-		DNS_NAME_MAGIC, A, (sizeof(A) - 1), sizeof(B), \
+-			DNS_NAMEATTR_READONLY, B, NULL,        \
+-			{ (void *)-1, (void *)-1 }, {          \
+-			NULL, NULL                             \
+-		}                                              \
++#define DNS_NAME_INITNONABSOLUTE(A, B)                                   \
++	{                                                                \
++		DNS_NAME_MAGIC, A, (sizeof(A) - 1), sizeof(B),           \
++			DNS_NAMEATTR_READONLY, B, NULL,                  \
++			{ (void *)-1, (void *)-1 }, { NULL, NULL }, NULL \
+ 	}
+ 
+-#define DNS_NAME_INITABSOLUTE(A, B)                                       \
+-	{                                                                 \
+-		DNS_NAME_MAGIC, A, sizeof(A), sizeof(B),                  \
+-			DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, B, \
+-			NULL, { (void *)-1, (void *)-1 }, {               \
+-			NULL, NULL                                        \
+-		}                                                         \
++#define DNS_NAME_INITABSOLUTE(A, B)                                            \
++	{                                                                      \
++		DNS_NAME_MAGIC, A, sizeof(A), sizeof(B),                       \
++			DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, B,      \
++			NULL, { (void *)-1, (void *)-1 }, { NULL, NULL }, NULL \
+ 	}
+ 
+-#define DNS_NAME_INITEMPTY                                 \
+-	{                                                  \
+-		DNS_NAME_MAGIC, NULL, 0, 0, 0, NULL, NULL, \
+-			{ (void *)-1, (void *)-1 }, {      \
+-			NULL, NULL                         \
+-		}                                          \
++#define DNS_NAME_INITEMPTY                                               \
++	{                                                                \
++		DNS_NAME_MAGIC, NULL, 0, 0, 0, NULL, NULL,               \
++			{ (void *)-1, (void *)-1 }, { NULL, NULL }, NULL \
+ 	}
+ 
+ /*%
+@@ -1355,6 +1351,7 @@ ISC_LANG_ENDDECLS
+ 		_n->buffer = NULL;                \
+ 		ISC_LINK_INIT(_n, link);          \
+ 		ISC_LIST_INIT(_n->list);          \
++		_n->ht = NULL;                    \
+ 	} while (0)
+ 
+ #define DNS_NAME_RESET(n)                                  \
+diff --git a/lib/dns/message.c b/lib/dns/message.c
+index 5598d32..500705e 100644
+--- a/lib/dns/message.c
++++ b/lib/dns/message.c
+@@ -20,6 +20,8 @@
+ #include <stdbool.h>
+ 
+ #include <isc/buffer.h>
++#include <isc/hash.h>
++#include <isc/ht.h>
+ #include <isc/mem.h>
+ #include <isc/print.h>
+ #include <isc/string.h> /* Required for HP/UX (and others?) */
+@@ -503,9 +505,11 @@ msgresetsigs(dns_message_t *msg, bool replying) {
+ 		} else {
+ 			dns_rdataset_disassociate(msg->tsig);
+ 			isc_mempool_put(msg->rdspool, msg->tsig);
++			msg->tsig = NULL;
+ 			if (msg->querytsig != NULL) {
+ 				dns_rdataset_disassociate(msg->querytsig);
+ 				isc_mempool_put(msg->rdspool, msg->querytsig);
++				msg->querytsig = NULL;
+ 			}
+ 		}
+ 		dns_message_puttempname(msg, &msg->tsigname);
+@@ -794,6 +798,18 @@ dns_message_detach(dns_message_t **messagep) {
+ 	}
+ }
+ 
++static isc_result_t
++name_hash_add(isc_ht_t *ht, dns_name_t *name, dns_name_t **foundp) {
++	isc_result_t result = isc_ht_find(ht, name->ndata, name->length,
++					  (void **)foundp);
++	if (result == ISC_R_SUCCESS) {
++		return (ISC_R_EXISTS);
++	}
++	result = isc_ht_add(ht, name->ndata, name->length, (void *)name);
++	INSIST(result == ISC_R_SUCCESS);
++	return (ISC_R_SUCCESS);
++}
++
+ static isc_result_t
+ findname(dns_name_t **foundname, const dns_name_t *target,
+ 	 dns_namelist_t *section) {
+@@ -837,6 +853,28 @@ dns_message_find(const dns_name_t *name, dns_rdataclass_t rdclass,
+ 	return (ISC_R_NOTFOUND);
+ }
+ 
++typedef struct __attribute__((__packed__)) rds_key {
++       dns_rdataclass_t rdclass;
++       dns_rdatatype_t type;
++       dns_rdatatype_t covers;
++} rds_key_t;
++
++static isc_result_t
++rds_hash_add(isc_ht_t *ht, dns_rdataset_t *rds, dns_rdataset_t **foundp) {
++       rds_key_t key = { .rdclass = rds->rdclass,
++                         .type = rds->type,
++                         .covers = rds->covers };
++       isc_result_t result = isc_ht_find(ht, (const unsigned char *)&key,
++                                         sizeof(key), (void **)foundp);
++       if (result == ISC_R_SUCCESS) {
++               return (ISC_R_EXISTS);
++       }
++       result = isc_ht_add(ht, (const unsigned char *)&key, sizeof(key),
++                           (void *)rds);
++       INSIST(result == ISC_R_SUCCESS);
++       return (ISC_R_SUCCESS);
++}
++
+ isc_result_t
+ dns_message_findtype(const dns_name_t *name, dns_rdatatype_t type,
+ 		     dns_rdatatype_t covers, dns_rdataset_t **rdataset) {
+@@ -962,6 +1000,18 @@ getrdata(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 		}                            \
+ 	} while (0)
+ 
++static void
++cleanup_name_hashmaps(dns_namelist_t *section) {
++	dns_name_t *name = NULL;
++	for (name = ISC_LIST_HEAD(*section); name != NULL;
++	     name = ISC_LIST_NEXT(name, link))
++	{
++		if (name->ht != NULL) {
++			isc_ht_destroy(&name->ht);
++		}
++	}
++}
++
+ static isc_result_t
+ getquestions(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 	     unsigned int options) {
+@@ -971,13 +1021,19 @@ getquestions(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 	dns_name_t *name2 = NULL;
+ 	dns_rdataset_t *rdataset = NULL;
+ 	dns_rdatalist_t *rdatalist = NULL;
+-	isc_result_t result;
++	isc_result_t result = ISC_R_SUCCESS;
+ 	dns_rdatatype_t rdtype;
+ 	dns_rdataclass_t rdclass;
+ 	dns_namelist_t *section = &msg->sections[DNS_SECTION_QUESTION];
+ 	bool best_effort = ((options & DNS_MESSAGEPARSE_BESTEFFORT) != 0);
+ 	bool seen_problem = false;
+ 	bool free_name = false;
++	bool free_ht = false;
++	isc_ht_t *name_map = NULL;
++
++	if (msg->counts[DNS_SECTION_QUESTION] > 1) {
++		isc_ht_init(&name_map, msg->mctx, 1, ISC_HT_CASE_INSENSITIVE);
++	}
+ 
+ 	for (count = 0; count < msg->counts[DNS_SECTION_QUESTION]; count++) {
+ 		name = NULL;
+@@ -998,13 +1054,19 @@ getquestions(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 			goto cleanup;
+ 		}
+ 
++		/* If there is only one QNAME, skip the duplicity checks */
++		if (name_map == NULL) {
++			result = ISC_R_SUCCESS;
++			goto skip_name_check;
++		}
++
+ 		/*
+ 		 * Run through the section, looking to see if this name
+ 		 * is already there.  If it is found, put back the allocated
+ 		 * name since we no longer need it, and set our name pointer
+ 		 * to point to the name we found.
+ 		 */
+-		result = findname(&name2, name, section);
++		result = name_hash_add(name_map, name, &name2);
+ 
+ 		/*
+ 		 * If it is the first name in the section, accept it.
+@@ -1016,19 +1078,26 @@ getquestions(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 		 * this should be legal or not.  In either case we no longer
+ 		 * need this name pointer.
+ 		 */
+-		if (result != ISC_R_SUCCESS) {
++	skip_name_check:
++		switch (result) {
++		case ISC_R_SUCCESS:
+ 			if (!ISC_LIST_EMPTY(*section)) {
+ 				DO_ERROR(DNS_R_FORMERR);
+ 			}
+ 			ISC_LIST_APPEND(*section, name, link);
+-			free_name = false;
+-		} else {
++			break;
++		case ISC_R_EXISTS:
+ 			dns_message_puttempname(msg, &name);
+ 			name = name2;
+ 			name2 = NULL;
+-			free_name = false;
++			break;
++		default:
++			INSIST(0);
++			ISC_UNREACHABLE();
+ 		}
+ 
++		free_name = false;
++
+ 		/*
+ 		 * Get type and class.
+ 		 */
+@@ -1058,14 +1127,6 @@ getquestions(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 			msg->tkey = 1;
+ 		}
+ 
+-		/*
+-		 * Can't ask the same question twice.
+-		 */
+-		result = dns_message_find(name, rdclass, rdtype, 0, NULL);
+-		if (result == ISC_R_SUCCESS) {
+-			DO_ERROR(DNS_R_FORMERR);
+-		}
+-
+ 		/*
+ 		 * Allocate a new rdatalist.
+ 		 */
+@@ -1079,6 +1140,7 @@ getquestions(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 			result = ISC_R_NOMEMORY;
+ 			goto cleanup;
+ 		}
++		dns_rdataset_init(rdataset);
+ 
+ 		/*
+ 		 * Convert rdatalist to rdataset, and attach the latter to
+@@ -1087,32 +1149,71 @@ getquestions(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 		rdatalist->type = rdtype;
+ 		rdatalist->rdclass = rdclass;
+ 
+-		dns_rdataset_init(rdataset);
+ 		result = dns_rdatalist_tordataset(rdatalist, rdataset);
+-		if (result != ISC_R_SUCCESS) {
+-			goto cleanup;
+-		}
++		RUNTIME_CHECK(result == ISC_R_SUCCESS);
+ 
+ 		rdataset->attributes |= DNS_RDATASETATTR_QUESTION;
+ 
++		/*
++		 * Skip the duplicity check for first rdataset
++		 */
++		if (ISC_LIST_EMPTY(name->list)) {
++			result = ISC_R_SUCCESS;
++			goto skip_rds_check;
++		}
++
++		/*
++		 * Can't ask the same question twice.
++		 */
++		if (name->ht == NULL) {
++			isc_ht_init(&name->ht, msg->mctx, 1,
++				    ISC_HT_CASE_SENSITIVE);
++			free_ht = true;
++
++			INSIST(ISC_LIST_HEAD(name->list) ==
++			       ISC_LIST_TAIL(name->list));
++
++			dns_rdataset_t *old_rdataset =
++				ISC_LIST_HEAD(name->list);
++
++			result = rds_hash_add(name->ht, old_rdataset, NULL);
++
++			INSIST(result == ISC_R_SUCCESS);
++		}
++		result = rds_hash_add(name->ht, rdataset, NULL);
++		if (result == ISC_R_EXISTS) {
++			DO_ERROR(DNS_R_FORMERR);
++		}
++
++	skip_rds_check:
+ 		ISC_LIST_APPEND(name->list, rdataset, link);
++
+ 		rdataset = NULL;
+ 	}
+ 
+ 	if (seen_problem) {
+-		return (DNS_R_RECOVERABLE);
++		result = DNS_R_RECOVERABLE;
+ 	}
+-	return (ISC_R_SUCCESS);
+ 
+ cleanup:
+ 	if (rdataset != NULL) {
+-		INSIST(!dns_rdataset_isassociated(rdataset));
++		if (dns_rdataset_isassociated(rdataset)) {
++			dns_rdataset_disassociate(rdataset);
++		}
+ 		isc_mempool_put(msg->rdspool, rdataset);
+ 	}
+ 	if (free_name) {
+ 		dns_message_puttempname(msg, &name);
+ 	}
+ 
++	if (free_ht) {
++		cleanup_name_hashmaps(section);
++	}
++
++	if (name_map != NULL) {
++		isc_ht_destroy(&name_map);
++	}
++
+ 	return (result);
+ }
+ 
+@@ -1192,17 +1293,24 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 	dns_name_t *name = NULL;
+ 	dns_name_t *name2 = NULL;
+ 	dns_rdataset_t *rdataset = NULL;
++	dns_rdataset_t *found_rdataset = NULL;
+ 	dns_rdatalist_t *rdatalist = NULL;
+-	isc_result_t result;
++	isc_result_t result = ISC_R_SUCCESS;
+ 	dns_rdatatype_t rdtype, covers;
+ 	dns_rdataclass_t rdclass;
+ 	dns_rdata_t *rdata = NULL;
+ 	dns_ttl_t ttl;
+ 	dns_namelist_t *section = &msg->sections[sectionid];
+-	bool free_name = false, free_rdataset = false, seen_problem = false;
++	bool free_name = false, seen_problem = false;
++	bool free_ht = false;
+ 	bool preserve_order = ((options & DNS_MESSAGEPARSE_PRESERVEORDER) != 0);
+ 	bool best_effort = ((options & DNS_MESSAGEPARSE_BESTEFFORT) != 0);
+ 	bool isedns, issigzero, istsig;
++	isc_ht_t *name_map = NULL;
++
++	if (msg->counts[sectionid] > 1) {
++		isc_ht_init(&name_map, msg->mctx, 1, ISC_HT_CASE_INSENSITIVE);
++	}
+ 
+ 	for (count = 0; count < msg->counts[sectionid]; count++) {
+ 		int recstart = source->current;
+@@ -1210,10 +1318,10 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 
+ 		skip_name_search = false;
+ 		skip_type_search = false;
+-		free_rdataset = false;
+ 		isedns = false;
+ 		issigzero = false;
+ 		istsig = false;
++		found_rdataset = NULL;
+ 
+ 		name = NULL;
+ 		result = dns_message_gettempname(msg, &name);
+@@ -1253,8 +1361,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 		if (msg->rdclass_set == 0 &&
+ 		    rdtype != dns_rdatatype_opt &&  /* class is UDP SIZE */
+ 		    rdtype != dns_rdatatype_tsig && /* class is ANY */
+-		    rdtype != dns_rdatatype_tkey)
+-		{ /* class is undefined */
++		    rdtype != dns_rdatatype_tkey)   /* class is undefined */
++		{
+ 			msg->rdclass = rdclass;
+ 			msg->rdclass_set = 1;
+ 		}
+@@ -1360,10 +1468,6 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 		 * Then put the meta-class back into the finished rdata.
+ 		 */
+ 		rdata = newrdata(msg);
+-		if (rdata == NULL) {
+-			result = ISC_R_NOMEMORY;
+-			goto cleanup;
+-		}
+ 		if (msg->opcode == dns_opcode_update &&
+ 		    update(sectionid, rdclass)) {
+ 			if (rdatalen != 0) {
+@@ -1446,33 +1550,72 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 				free_name = false;
+ 			}
+ 		} else {
++                        if (name_map == NULL) {
++                                result = ISC_R_SUCCESS;
++                                goto skip_name_check;
++                        }
++			
+ 			/*
+ 			 * Run through the section, looking to see if this name
+ 			 * is already there.  If it is found, put back the
+ 			 * allocated name since we no longer need it, and set
+ 			 * our name pointer to point to the name we found.
+ 			 */
+-			result = findname(&name2, name, section);
++			result = name_hash_add(name_map, name, &name2);
+ 
+ 			/*
+ 			 * If it is a new name, append to the section.
+ 			 */
+-			if (result == ISC_R_SUCCESS) {
++                skip_name_check:
++                        switch (result) {
++                        case ISC_R_SUCCESS:
++                                ISC_LIST_APPEND(*section, name, link);
++                                break;
++                        case ISC_R_EXISTS:	
+ 				dns_message_puttempname(msg, &name);
+ 				name = name2;
+-			} else {
+-				ISC_LIST_APPEND(*section, name, link);
++                                name2 = NULL;
++                                break;
++                        default:
++				INSIST(0);
++				ISC_UNREACHABLE();
+ 			}
+ 			free_name = false;
+ 		}
+ 
++                rdatalist = newrdatalist(msg);
++                if (rdatalist == NULL) {
++                        result = ISC_R_NOMEMORY;
++                        goto cleanup;
++                }
++                dns_message_gettemprdataset(msg, &rdataset);
++                if (rdataset == NULL) {
++                        result = ISC_R_NOMEMORY;
++                        goto cleanup;
++                }
++
++                rdatalist->type = rdtype;
++                rdatalist->covers = covers;
++                rdatalist->rdclass = rdclass;
++                rdatalist->ttl = ttl;
++
++                RUNTIME_CHECK(dns_rdatalist_tordataset(rdatalist, rdataset) ==
++                              ISC_R_SUCCESS);
++                dns_rdataset_setownercase(rdataset, name);
++                rdatalist = NULL;
++
+ 		/*
+ 		 * Search name for the particular type and class.
+ 		 * Skip this stage if in update mode or this is a meta-type.
+ 		 */
+-		if (preserve_order || msg->opcode == dns_opcode_update ||
+-		    skip_type_search) {
+-			result = ISC_R_NOTFOUND;
++                if (isedns || istsig || issigzero) {
++                        /* Skip adding the rdataset to the tables */
++                } else if (preserve_order || msg->opcode == dns_opcode_update ||
++                           skip_type_search)
++                {
++		        result = ISC_R_SUCCESS;
++			
++			ISC_LIST_APPEND(name->list, rdataset, link);
+ 		} else {
+ 			/*
+ 			 * If this is a type that can only occur in
+@@ -1482,63 +1625,72 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 				DO_ERROR(DNS_R_FORMERR);
+ 			}
+ 
+-			rdataset = NULL;
+-			result = dns_message_find(name, rdclass, rdtype, covers,
+-						  &rdataset);
+-		}
+-
+-		/*
+-		 * If we found an rdataset that matches, we need to
+-		 * append this rdata to that set.  If we did not, we need
+-		 * to create a new rdatalist, store the important bits there,
+-		 * convert it to an rdataset, and link the latter to the name.
+-		 * Yuck.  When appending, make certain that the type isn't
+-		 * a singleton type, such as SOA or CNAME.
+-		 *
+-		 * Note that this check will be bypassed when preserving order,
+-		 * the opcode is an update, or the type search is skipped.
+-		 */
+-		if (result == ISC_R_SUCCESS) {
+-			if (dns_rdatatype_issingleton(rdtype)) {
+-				dns_rdata_t *first;
+-				dns_rdatalist_fromrdataset(rdataset,
+-							   &rdatalist);
+-				first = ISC_LIST_HEAD(rdatalist->rdata);
+-				INSIST(first != NULL);
+-				if (dns_rdata_compare(rdata, first) != 0) {
+-					DO_ERROR(DNS_R_FORMERR);
+-				}
++			if (ISC_LIST_EMPTY(name->list)) {
++				result = ISC_R_SUCCESS;
++				goto skip_rds_check;
+ 			}
+-		}
+ 
+-		if (result == ISC_R_NOTFOUND) {
+-			rdataset = isc_mempool_get(msg->rdspool);
+-			if (rdataset == NULL) {
+-				result = ISC_R_NOMEMORY;
+-				goto cleanup;
+-			}
+-			free_rdataset = true;
++			if (name->ht == NULL) {
++				isc_ht_init(&name->ht, msg->mctx, 1,
++					    ISC_HT_CASE_SENSITIVE);
++				free_ht = true;
+ 
+-			rdatalist = newrdatalist(msg);
+-			if (rdatalist == NULL) {
+-				result = ISC_R_NOMEMORY;
+-				goto cleanup;
++				INSIST(ISC_LIST_HEAD(name->list) ==
++				       ISC_LIST_TAIL(name->list));
++
++				dns_rdataset_t *old_rdataset =
++					ISC_LIST_HEAD(name->list);
++
++				result = rds_hash_add(name->ht, old_rdataset,
++						      NULL);
++
++				INSIST(result == ISC_R_SUCCESS);
+ 			}
++			found_rdataset = NULL;
++			result = rds_hash_add(name->ht, rdataset,
++					      &found_rdataset);
+ 
+-			rdatalist->type = rdtype;
+-			rdatalist->covers = covers;
+-			rdatalist->rdclass = rdclass;
+-			rdatalist->ttl = ttl;
++			/*
++			 * If we found an rdataset that matches, we need to
++			 * append this rdata to that set.  If we did not, we
++			 * need to create a new rdatalist, store the important
++			 * bits there, convert it to an rdataset, and link the
++			 * latter to the name. Yuck.  When appending, make
++			 * certain that the type isn't a singleton type, such as
++			 * SOA or CNAME.
++			 *
++			 * Note that this check will be bypassed when preserving
++			 * order, the opcode is an update, or the type search is
++			 * skipped.
++			 */
++		skip_rds_check:
++			switch (result) {
++			case ISC_R_EXISTS:
++				/* Free the rdataset we used as the key */
++				dns_rdataset_disassociate(rdataset);
++				isc_mempool_put(msg->rdspool, rdataset);
++				result = ISC_R_SUCCESS;
++				rdataset = found_rdataset;
+ 
+-			dns_rdataset_init(rdataset);
+-			RUNTIME_CHECK(
+-				dns_rdatalist_tordataset(rdatalist, rdataset) ==
+-				ISC_R_SUCCESS);
+-			dns_rdataset_setownercase(rdataset, name);
++				if (!dns_rdatatype_issingleton(rdtype)) {
++					break;
++				}
+ 
+-			if (!isedns && !istsig && !issigzero) {
++				dns_rdatalist_fromrdataset(rdataset,
++							   &rdatalist);
++				dns_rdata_t *first =
++					ISC_LIST_HEAD(rdatalist->rdata);
++				INSIST(first != NULL);
++				if (dns_rdata_compare(rdata, first) != 0) {
++					DO_ERROR(DNS_R_FORMERR);
++				}
++				break;
++			case ISC_R_SUCCESS:
+ 				ISC_LIST_APPEND(name->list, rdataset, link);
+-				free_rdataset = false;
++				break;
++			default:
++				INSIST(0);
++				ISC_UNREACHABLE();
+ 			}
+ 		}
+ 
+@@ -1573,8 +1725,6 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 			dns_rcode_t ercode;
+ 
+ 			msg->opt = rdataset;
+-			rdataset = NULL;
+-			free_rdataset = false;
+ 			ercode = (dns_rcode_t)((msg->opt->ttl &
+ 						DNS_MESSAGE_EDNSRCODE_MASK) >>
+ 					       20);
+@@ -1585,8 +1735,6 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 			msg->sig0 = rdataset;
+ 			msg->sig0name = name;
+ 			msg->sigstart = recstart;
+-			rdataset = NULL;
+-			free_rdataset = false;
+ 			free_name = false;
+ 		} else if (istsig) {
+ 			msg->tsig = rdataset;
+@@ -1596,22 +1744,17 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 			 * Windows doesn't like TSIG names to be compressed.
+ 			 */
+ 			msg->tsigname->attributes |= DNS_NAMEATTR_NOCOMPRESS;
+-			rdataset = NULL;
+-			free_rdataset = false;
+ 			free_name = false;
+ 		}
++		rdataset = NULL;
+ 
+ 		if (seen_problem) {
+ 			if (free_name) {
+ 				dns_message_puttempname(msg, &name);
+ 			}
+-			if (free_rdataset) {
+-				isc_mempool_put(msg->rdspool, rdataset);
+-			}
+-			free_name = free_rdataset = false;
++			free_name = false;
+ 		}
+ 		INSIST(!free_name);
+-		INSIST(!free_rdataset);
+ 	}
+ 
+ 	/*
+@@ -1629,16 +1772,24 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
+ 	}
+ 
+ 	if (seen_problem) {
+-		return (DNS_R_RECOVERABLE);
++		result = DNS_R_RECOVERABLE;
+ 	}
+-	return (ISC_R_SUCCESS);
+ 
+ cleanup:
++	if (rdataset != NULL && rdataset != found_rdataset) {
++		dns_rdataset_disassociate(rdataset);
++		isc_mempool_put(msg->rdspool, rdataset);
++	}
+ 	if (free_name) {
+ 		dns_message_puttempname(msg, &name);
+ 	}
+-	if (free_rdataset) {
+-		isc_mempool_put(msg->rdspool, rdataset);
++
++	if (free_ht) {
++		cleanup_name_hashmaps(section);
++	}
++
++	if (name_map != NULL) {
++		isc_ht_destroy(&name_map);
+ 	}
+ 
+ 	return (result);
+@@ -2432,7 +2583,7 @@ dns_message_findname(dns_message_t *msg, dns_section_t section,
+ 		     const dns_name_t *target, dns_rdatatype_t type,
+ 		     dns_rdatatype_t covers, dns_name_t **name,
+ 		     dns_rdataset_t **rdataset) {
+-	dns_name_t *foundname;
++	dns_name_t *foundname = NULL;
+ 	isc_result_t result;
+ 
+ 	/*
+@@ -2586,6 +2737,10 @@ dns_message_puttempname(dns_message_t *msg, dns_name_t **itemp) {
+ 	REQUIRE(!ISC_LINK_LINKED(item, link));
+ 	REQUIRE(ISC_LIST_HEAD(item->list) == NULL);
+ 
++	if (item->ht != NULL) {
++		isc_ht_destroy(&item->ht);
++	}
++
+ 	/*
+ 	 * we need to check this in case dns_name_dup() was used.
+ 	 */
+diff --git a/lib/dns/name.c b/lib/dns/name.c
+index 6ca311d..cc1b872 100644
+--- a/lib/dns/name.c
++++ b/lib/dns/name.c
+@@ -186,6 +186,7 @@ dns_name_invalidate(dns_name_t *name) {
+ 	name->offsets = NULL;
+ 	name->buffer = NULL;
+ 	ISC_LINK_INIT(name, link);
++	INSIST(name->ht == NULL);
+ }
+ 
+ bool
+diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
+index 13cfc85..58f98a5 100644
+--- a/lib/dns/rpz.c
++++ b/lib/dns/rpz.c
+@@ -1541,7 +1541,7 @@ dns_rpz_new_zone(dns_rpz_zones_t *rpzs, dns_rpz_zone_t **rpzp) {
+ 	 * simplifies update_from_db
+ 	 */
+ 
+-	isc_ht_init(&zone->nodes, rpzs->mctx, 1);
++	isc_ht_init(&zone->nodes, rpzs->mctx, 1, ISC_HT_CASE_SENSITIVE);
+ 
+ 	dns_name_init(&zone->origin, NULL);
+ 	dns_name_init(&zone->client_ip, NULL);
+@@ -1718,7 +1718,8 @@ setup_update(dns_rpz_zone_t *rpz) {
+ 		      ISC_LOG_DEBUG(1), "rpz: %s: using hashtable size %d",
+ 		      domain, hashsize);
+ 
+-	isc_ht_init(&rpz->newnodes, rpz->rpzs->mctx, hashsize);
++	isc_ht_init(&rpz->newnodes, rpz->rpzs->mctx, hashsize,
++		    ISC_HT_CASE_SENSITIVE);
+ 
+ 	result = dns_db_createiterator(rpz->updb, DNS_DB_NONSEC3, &rpz->updbit);
+ 	if (result != ISC_R_SUCCESS) {
+diff --git a/lib/isc/ht.c b/lib/isc/ht.c
+index 88e8578..c810ff1 100644
+--- a/lib/isc/ht.c
++++ b/lib/isc/ht.c
+@@ -25,51 +25,274 @@ typedef struct isc_ht_node isc_ht_node_t;
+ #define ISC_HT_MAGIC	 ISC_MAGIC('H', 'T', 'a', 'b')
+ #define ISC_HT_VALID(ht) ISC_MAGIC_VALID(ht, ISC_HT_MAGIC)
+ 
++#define HT_NO_BITS    0
++#define HT_MIN_BITS   1
++#define HT_MAX_BITS   32
++#define HT_OVERCOMMIT 3
++
++#define HT_NEXTTABLE(idx)      ((idx == 0) ? 1 : 0)
++#define TRY_NEXTTABLE(idx, ht) (idx == ht->hindex && rehashing_in_progress(ht))
++
++#define GOLDEN_RATIO_32 0x61C88647
++
++#define HASHSIZE(bits) (UINT64_C(1) << (bits))
++
+ struct isc_ht_node {
+ 	void *value;
+ 	isc_ht_node_t *next;
++	uint32_t hashval;
+ 	size_t keysize;
+-	unsigned char key[FLEXIBLE_ARRAY_MEMBER];
++	unsigned char key[];
+ };
+ 
+ struct isc_ht {
+ 	unsigned int magic;
+ 	isc_mem_t *mctx;
+-	size_t size;
+-	size_t mask;
+-	unsigned int count;
+-	isc_ht_node_t **table;
++	size_t count;
++	bool case_sensitive;
++	size_t size[2];
++	uint8_t hashbits[2];
++	isc_ht_node_t **table[2];
++	uint8_t hindex;
++	uint32_t hiter; /* rehashing iterator */
+ };
+ 
+ struct isc_ht_iter {
+ 	isc_ht_t *ht;
+ 	size_t i;
++	uint8_t hindex;
+ 	isc_ht_node_t *cur;
+ };
+ 
++static isc_ht_node_t *
++isc__ht_find(const isc_ht_t *ht, const unsigned char *key,
++	     const uint32_t keysize, const uint32_t hashval, const uint8_t idx);
++static void
++isc__ht_add(isc_ht_t *ht, const unsigned char *key, const uint32_t keysize,
++	    const uint32_t hashval, const uint8_t idx, void *value);
++static isc_result_t
++isc__ht_delete(isc_ht_t *ht, const unsigned char *key, const uint32_t keysize,
++	       const uint32_t hashval, const uint8_t idx);
++
++static uint32_t
++rehash_bits(isc_ht_t *ht, size_t newcount);
++
++static void
++hashtable_new(isc_ht_t *ht, const uint8_t idx, const uint8_t bits);
++static void
++hashtable_free(isc_ht_t *ht, const uint8_t idx);
++static void
++hashtable_rehash(isc_ht_t *ht, uint32_t newbits);
++static void
++hashtable_rehash_one(isc_ht_t *ht);
++static void
++maybe_rehash(isc_ht_t *ht, size_t newcount);
++
++static isc_result_t
++isc__ht_iter_next(isc_ht_iter_t *it);
++
++static uint8_t maptolower[] = {
++	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
++	0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
++	0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23,
++	0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
++	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
++	0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
++	0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73,
++	0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
++	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b,
++	0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
++	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
++	0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
++	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b,
++	0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
++	0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3,
++	0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
++	0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb,
++	0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
++	0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3,
++	0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
++	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb,
++	0xfc, 0xfd, 0xfe, 0xff
++};
++
++static int
++memcasecmp(const void *vs1, const void *vs2, size_t len) {
++	uint8_t const *s1 = vs1;
++	uint8_t const *s2 = vs2;
++	for (size_t i = 0; i < len; i++) {
++		uint8_t u1 = s1[i];
++		uint8_t u2 = s2[i];
++		int U1 = maptolower[u1];
++		int U2 = maptolower[u2];
++		int diff = U1 - U2;
++		if (diff) {
++			return diff;
++		}
++	}
++	return 0;
++}
++
++static bool
++isc__ht_node_match(isc_ht_node_t *node, const uint32_t hashval,
++		   const uint8_t *key, uint32_t keysize, bool case_sensitive) {
++	return (node->hashval == hashval && node->keysize == keysize &&
++		(case_sensitive ? (memcmp(node->key, key, keysize) == 0)
++				: (memcasecmp(node->key, key, keysize) == 0)));
++}
++
++static uint32_t
++hash_32(uint32_t val, unsigned int bits) {
++	REQUIRE(bits <= HT_MAX_BITS);
++	/* High bits are more random. */
++	return (val * GOLDEN_RATIO_32 >> (32 - bits));
++}
++
++static bool
++rehashing_in_progress(const isc_ht_t *ht) {
++	return (ht->table[HT_NEXTTABLE(ht->hindex)] != NULL);
++}
++
++static bool
++hashtable_is_overcommited(isc_ht_t *ht) {
++	return (ht->count >= (ht->size[ht->hindex] * HT_OVERCOMMIT));
++}
++
++static uint32_t
++rehash_bits(isc_ht_t *ht, size_t newcount) {
++	uint32_t newbits = ht->hashbits[ht->hindex];
++
++	while (newcount >= HASHSIZE(newbits) && newbits <= HT_MAX_BITS) {
++		newbits += 1;
++	}
++
++	return (newbits);
++}
++
++/*
++ * Rebuild the hashtable to reduce the load factor
++ */
++static void
++hashtable_rehash(isc_ht_t *ht, uint32_t newbits) {
++	uint8_t oldindex = ht->hindex;
++	uint32_t oldbits = ht->hashbits[oldindex];
++	uint8_t newindex = HT_NEXTTABLE(oldindex);
++
++	REQUIRE(ht->hashbits[oldindex] >= HT_MIN_BITS);
++	REQUIRE(ht->hashbits[oldindex] <= HT_MAX_BITS);
++	REQUIRE(ht->table[oldindex] != NULL);
++
++	REQUIRE(newbits <= HT_MAX_BITS);
++	REQUIRE(ht->hashbits[newindex] == HT_NO_BITS);
++	REQUIRE(ht->table[newindex] == NULL);
++
++	REQUIRE(newbits > oldbits);
++
++	hashtable_new(ht, newindex, newbits);
++
++	ht->hindex = newindex;
++
++	hashtable_rehash_one(ht);
++}
++
++static void
++hashtable_rehash_one(isc_ht_t *ht) {
++	isc_ht_node_t **newtable = ht->table[ht->hindex];
++	uint32_t oldsize = ht->size[HT_NEXTTABLE(ht->hindex)];
++	isc_ht_node_t **oldtable = ht->table[HT_NEXTTABLE(ht->hindex)];
++	isc_ht_node_t *node = NULL;
++	isc_ht_node_t *nextnode;
++
++	/* Find first non-empty node */
++	while (ht->hiter < oldsize && oldtable[ht->hiter] == NULL) {
++		ht->hiter++;
++	}
++
++	/* Rehashing complete */
++	if (ht->hiter == oldsize) {
++		hashtable_free(ht, HT_NEXTTABLE(ht->hindex));
++		ht->hiter = 0;
++		return;
++	}
++
++	/* Move the first non-empty node from old hashtable to new hashtable */
++	for (node = oldtable[ht->hiter]; node != NULL; node = nextnode) {
++		uint32_t hash = hash_32(node->hashval,
++					ht->hashbits[ht->hindex]);
++		nextnode = node->next;
++		node->next = newtable[hash];
++		newtable[hash] = node;
++	}
++
++	oldtable[ht->hiter] = NULL;
++
++	ht->hiter++;
++}
++
++static void
++maybe_rehash(isc_ht_t *ht, size_t newcount) {
++	uint32_t newbits = rehash_bits(ht, newcount);
++
++	if (ht->hashbits[ht->hindex] < newbits && newbits <= HT_MAX_BITS) {
++		hashtable_rehash(ht, newbits);
++	}
++}
++
++static void
++hashtable_new(isc_ht_t *ht, const uint8_t idx, const uint8_t bits) {
++	size_t size;
++	REQUIRE(ht->hashbits[idx] == HT_NO_BITS);
++	REQUIRE(ht->table[idx] == NULL);
++	REQUIRE(bits >= HT_MIN_BITS);
++	REQUIRE(bits <= HT_MAX_BITS);
++
++	ht->hashbits[idx] = bits;
++	ht->size[idx] = HASHSIZE(ht->hashbits[idx]);
++
++	size = ht->size[idx] * sizeof(isc_ht_node_t *);
++
++	ht->table[idx] = isc_mem_get(ht->mctx, size);
++	memset(ht->table[idx], 0, size);
++}
++
++static void
++hashtable_free(isc_ht_t *ht, const uint8_t idx) {
++	size_t size = ht->size[idx] * sizeof(isc_ht_node_t *);
++
++	for (size_t i = 0; i < ht->size[idx]; i++) {
++		isc_ht_node_t *node = ht->table[idx][i];
++		while (node != NULL) {
++			isc_ht_node_t *next = node->next;
++			ht->count--;
++			isc_mem_put(ht->mctx, node,
++				    sizeof(*node) + node->keysize);
++			node = next;
++		}
++	}
++
++	isc_mem_put(ht->mctx, ht->table[idx], size);
++	ht->hashbits[idx] = HT_NO_BITS;
++	ht->table[idx] = NULL;
++}
++
+ void
+-isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits) {
++isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits,
++	    unsigned int options) {
+ 	isc_ht_t *ht = NULL;
+-	size_t i;
++	bool case_sensitive = ((options & ISC_HT_CASE_INSENSITIVE) == 0);
+ 
+ 	REQUIRE(htp != NULL && *htp == NULL);
+ 	REQUIRE(mctx != NULL);
+-	REQUIRE(bits >= 1 && bits <= (sizeof(size_t) * 8 - 1));
++	REQUIRE(bits >= 1 && bits <= HT_MAX_BITS);
+ 
+-	ht = isc_mem_get(mctx, sizeof(struct isc_ht));
++	ht = isc_mem_get(mctx, sizeof(*ht));
++	*ht = (isc_ht_t){
++		.case_sensitive = case_sensitive,
++	};
+ 
+-	ht->mctx = NULL;
+ 	isc_mem_attach(mctx, &ht->mctx);
+ 
+-	ht->size = ((size_t)1 << bits);
+-	ht->mask = ((size_t)1 << bits) - 1;
+-	ht->count = 0;
+-
+-	ht->table = isc_mem_get(ht->mctx, ht->size * sizeof(isc_ht_node_t *));
+-
+-	for (i = 0; i < ht->size; i++) {
+-		ht->table[i] = NULL;
+-	}
++	hashtable_new(ht, 0, bits);
+ 
+ 	ht->magic = ISC_HT_MAGIC;
+ 
+@@ -79,125 +302,188 @@ isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits) {
+ void
+ isc_ht_destroy(isc_ht_t **htp) {
+ 	isc_ht_t *ht;
+-	size_t i;
+ 
+ 	REQUIRE(htp != NULL);
++	REQUIRE(ISC_HT_VALID(*htp));
+ 
+ 	ht = *htp;
+ 	*htp = NULL;
+-
+-	REQUIRE(ISC_HT_VALID(ht));
+-
+ 	ht->magic = 0;
+ 
+-	for (i = 0; i < ht->size; i++) {
+-		isc_ht_node_t *node = ht->table[i];
+-		while (node != NULL) {
+-			isc_ht_node_t *next = node->next;
+-			ht->count--;
+-			isc_mem_put(ht->mctx, node,
+-				    offsetof(isc_ht_node_t, key) +
+-					    node->keysize);
+-			node = next;
++        for (size_t i = 0; i <= 1; i++) {
++                if (ht->table[i] != NULL) {
++                        hashtable_free(ht, i);
+ 		}
+ 	}
+ 
+ 	INSIST(ht->count == 0);
+ 
+-	isc_mem_put(ht->mctx, ht->table, ht->size * sizeof(isc_ht_node_t *));
+-	isc_mem_putanddetach(&ht->mctx, ht, sizeof(struct isc_ht));
++	isc_mem_putanddetach(&ht->mctx, ht, sizeof(*ht));
+ }
+ 
+-isc_result_t
+-isc_ht_add(isc_ht_t *ht, const unsigned char *key, uint32_t keysize,
+-	   void *value) {
++static void
++isc__ht_add(isc_ht_t *ht, const unsigned char *key, const uint32_t keysize,
++           const uint32_t hashval, const uint8_t idx, void *value) {
++	
+ 	isc_ht_node_t *node;
+ 	uint32_t hash;
++        hash = hash_32(hashval, ht->hashbits[idx]);
++
++        node = isc_mem_get(ht->mctx, sizeof(*node) + keysize);
++        *node = (isc_ht_node_t){
++                .keysize = keysize,
++                .hashval = hashval,
++                .next = ht->table[idx][hash],
++                .value = value,
++        };
++ 
++        memmove(node->key, key, keysize);
++ 
++        ht->count++;
++        ht->table[idx][hash] = node;
++}
++
++isc_result_t
++isc_ht_add(isc_ht_t *ht, const unsigned char *key, const uint32_t keysize,
++           void *value) {
++        uint32_t hashval;
+ 
+ 	REQUIRE(ISC_HT_VALID(ht));
+ 	REQUIRE(key != NULL && keysize > 0);
+-
+-	hash = isc_hash_function(key, keysize, true);
+-	node = ht->table[hash & ht->mask];
+-	while (node != NULL) {
+-		if (keysize == node->keysize &&
+-		    memcmp(key, node->key, keysize) == 0) {
+-			return (ISC_R_EXISTS);
+-		}
+-		node = node->next;
++        if (rehashing_in_progress(ht)) {
++                /* Rehash in progress */
++                hashtable_rehash_one(ht);
++        } else if (hashtable_is_overcommited(ht)) {
++                /* Rehash requested */
++                maybe_rehash(ht, ht->count);	
+ 	}
+ 
+-	node = isc_mem_get(ht->mctx, offsetof(isc_ht_node_t, key) + keysize);
++	hashval = isc_hash32(key, keysize, ht->case_sensitive);
+ 
+-	memmove(node->key, key, keysize);
+-	node->keysize = keysize;
+-	node->next = ht->table[hash & ht->mask];
+-	node->value = value;
++        if (isc__ht_find(ht, key, keysize, hashval, ht->hindex) != NULL) {
++                return (ISC_R_EXISTS);
++        }
++ 
++        isc__ht_add(ht, key, keysize, hashval, ht->hindex, value);
+ 
+-	ht->count++;
+-	ht->table[hash & ht->mask] = node;
+ 	return (ISC_R_SUCCESS);
+ }
+ 
++static isc_ht_node_t *
++isc__ht_find(const isc_ht_t *ht, const unsigned char *key,
++             const uint32_t keysize, const uint32_t hashval,
++             const uint8_t idx) {
++        uint32_t hash;
++        uint8_t findex = idx;
++ 
++nexttable:
++        hash = hash_32(hashval, ht->hashbits[findex]);
++        for (isc_ht_node_t *node = ht->table[findex][hash]; node != NULL;
++             node = node->next)
++        {
++                if (isc__ht_node_match(node, hashval, key, keysize,
++                                       ht->case_sensitive))
++                {
++                        return (node);
++                }
++        }
++        if (TRY_NEXTTABLE(findex, ht)) {
++                /*
++                 * Rehashing in progress, check the other table
++                 */
++                findex = HT_NEXTTABLE(findex);
++                goto nexttable;
++        }
++
++        return (NULL);
++}
++
++
+ isc_result_t
+-isc_ht_find(const isc_ht_t *ht, const unsigned char *key, uint32_t keysize,
+-	    void **valuep) {
++isc_ht_find(const isc_ht_t *ht, const unsigned char *key,
++            const uint32_t keysize, void **valuep) {
++        uint32_t hashval;
++
+ 	isc_ht_node_t *node;
+-	uint32_t hash;
+ 
+ 	REQUIRE(ISC_HT_VALID(ht));
+ 	REQUIRE(key != NULL && keysize > 0);
+ 	REQUIRE(valuep == NULL || *valuep == NULL);
+ 
+-	hash = isc_hash_function(key, keysize, true);
+-	node = ht->table[hash & ht->mask];
+-	while (node != NULL) {
+-		if (keysize == node->keysize &&
+-		    memcmp(key, node->key, keysize) == 0) {
+-			if (valuep != NULL) {
+-				*valuep = node->value;
+-			}
+-			return (ISC_R_SUCCESS);
+-		}
+-		node = node->next;
++        hashval = isc_hash32(key, keysize, ht->case_sensitive);
++ 
++        node = isc__ht_find(ht, key, keysize, hashval, ht->hindex);
++        if (node == NULL) {
++                return (ISC_R_NOTFOUND);
+ 	}
+ 
+-	return (ISC_R_NOTFOUND);
++        if (valuep != NULL) {
++                *valuep = node->value;
++        }
++        return (ISC_R_SUCCESS);
+ }
+ 
+-isc_result_t
+-isc_ht_delete(isc_ht_t *ht, const unsigned char *key, uint32_t keysize) {
+-	isc_ht_node_t *node, *prev;
++static isc_result_t
++isc__ht_delete(isc_ht_t *ht, const unsigned char *key, const uint32_t keysize,
++               const uint32_t hashval, const uint8_t idx) {
++        isc_ht_node_t *prev = NULL;
+ 	uint32_t hash;
+ 
+-	REQUIRE(ISC_HT_VALID(ht));
+-	REQUIRE(key != NULL && keysize > 0);
++	hash = hash_32(hashval, ht->hashbits[idx]);
+ 
+-	prev = NULL;
+-	hash = isc_hash_function(key, keysize, true);
+-	node = ht->table[hash & ht->mask];
+-	while (node != NULL) {
+-		if (keysize == node->keysize &&
+-		    memcmp(key, node->key, keysize) == 0) {
++        for (isc_ht_node_t *node = ht->table[idx][hash]; node != NULL;
++             prev = node, node = node->next)
++        {
++                if (isc__ht_node_match(node, hashval, key, keysize,
++                                       ht->case_sensitive))
++		{
+ 			if (prev == NULL) {
+-				ht->table[hash & ht->mask] = node->next;
++				ht->table[idx][hash] = node->next;
+ 			} else {
+ 				prev->next = node->next;
+ 			}
+ 			isc_mem_put(ht->mctx, node,
+-				    offsetof(isc_ht_node_t, key) +
+-					    node->keysize);
++					sizeof(*node) + node->keysize);
+ 			ht->count--;
+ 
+ 			return (ISC_R_SUCCESS);
+ 		}
+ 
+-		prev = node;
+-		node = node->next;
+ 	}
++
+ 	return (ISC_R_NOTFOUND);
+ }
+ 
++isc_result_t
++isc_ht_delete(isc_ht_t *ht, const unsigned char *key, const uint32_t keysize) {
++        uint32_t hashval;
++        uint8_t hindex;
++        isc_result_t result;
++
++        REQUIRE(ISC_HT_VALID(ht));
++        REQUIRE(key != NULL && keysize > 0);
++
++        if (rehashing_in_progress(ht)) {
++                /* Rehash in progress */
++                hashtable_rehash_one(ht);
++        }
++
++        hindex = ht->hindex;
++        hashval = isc_hash32(key, keysize, ht->case_sensitive);
++nexttable:
++        result = isc__ht_delete(ht, key, keysize, hashval, hindex);
++ 
++        if (result == ISC_R_NOTFOUND && TRY_NEXTTABLE(hindex, ht)) {
++                /*
++                 * Rehashing in progress, check the other table
++                 */
++                hindex = HT_NEXTTABLE(hindex);
++                goto nexttable;
++        }
++
++        return (result);
++}
++
+ void
+ isc_ht_iter_create(isc_ht_t *ht, isc_ht_iter_t **itp) {
+ 	isc_ht_iter_t *it;
+@@ -206,10 +492,10 @@ isc_ht_iter_create(isc_ht_t *ht, isc_ht_iter_t **itp) {
+ 	REQUIRE(itp != NULL && *itp == NULL);
+ 
+ 	it = isc_mem_get(ht->mctx, sizeof(isc_ht_iter_t));
+-
+-	it->ht = ht;
+-	it->i = 0;
+-	it->cur = NULL;
++	*it = (isc_ht_iter_t){
++		.ht = ht,
++		.hindex = ht->hindex,
++	};
+ 
+ 	*itp = it;
+ }
+@@ -224,25 +510,46 @@ isc_ht_iter_destroy(isc_ht_iter_t **itp) {
+ 	it = *itp;
+ 	*itp = NULL;
+ 	ht = it->ht;
+-	isc_mem_put(ht->mctx, it, sizeof(isc_ht_iter_t));
++	isc_mem_put(ht->mctx, it, sizeof(*it));
+ }
+ 
+ isc_result_t
+ isc_ht_iter_first(isc_ht_iter_t *it) {
++	isc_ht_t *ht;
++
+ 	REQUIRE(it != NULL);
+ 
++	ht = it->ht;
++
++	it->hindex = ht->hindex;
+ 	it->i = 0;
+-	while (it->i < it->ht->size && it->ht->table[it->i] == NULL) {
++
++	return (isc__ht_iter_next(it));
++}
++
++static isc_result_t
++isc__ht_iter_next(isc_ht_iter_t *it) {
++	isc_ht_t *ht = it->ht;
++
++	while (it->i < ht->size[it->hindex] &&
++	       ht->table[it->hindex][it->i] == NULL)
++	{
+ 		it->i++;
+ 	}
+ 
+-	if (it->i == it->ht->size) {
+-		return (ISC_R_NOMORE);
++	if (it->i < ht->size[it->hindex]) {
++		it->cur = ht->table[it->hindex][it->i];
++
++		return (ISC_R_SUCCESS);
+ 	}
+ 
+-	it->cur = it->ht->table[it->i];
++	if (TRY_NEXTTABLE(it->hindex, ht)) {
++		it->hindex = HT_NEXTTABLE(it->hindex);
++		it->i = 0;
++		return (isc__ht_iter_next(it));
++	}
+ 
+-	return (ISC_R_SUCCESS);
++	return (ISC_R_NOMORE);
+ }
+ 
+ isc_result_t
+@@ -251,60 +558,36 @@ isc_ht_iter_next(isc_ht_iter_t *it) {
+ 	REQUIRE(it->cur != NULL);
+ 
+ 	it->cur = it->cur->next;
+-	if (it->cur == NULL) {
+-		do {
+-			it->i++;
+-		} while (it->i < it->ht->size && it->ht->table[it->i] == NULL);
+-		if (it->i >= it->ht->size) {
+-			return (ISC_R_NOMORE);
+-		}
+-		it->cur = it->ht->table[it->i];
++
++	if (it->cur != NULL) {
++		return (ISC_R_SUCCESS);
+ 	}
+ 
+-	return (ISC_R_SUCCESS);
++	it->i++;
++
++	return (isc__ht_iter_next(it));
+ }
+ 
+ isc_result_t
+ isc_ht_iter_delcurrent_next(isc_ht_iter_t *it) {
+ 	isc_result_t result = ISC_R_SUCCESS;
+-	isc_ht_node_t *to_delete = NULL;
+-	isc_ht_node_t *prev = NULL;
+-	isc_ht_node_t *node = NULL;
+-	uint32_t hash;
++	isc_ht_node_t *dnode = NULL;
++	uint8_t dindex;
+ 	isc_ht_t *ht;
++	isc_result_t dresult;
++
+ 	REQUIRE(it != NULL);
+ 	REQUIRE(it->cur != NULL);
+-	to_delete = it->cur;
+-	ht = it->ht;
+ 
+-	it->cur = it->cur->next;
+-	if (it->cur == NULL) {
+-		do {
+-			it->i++;
+-		} while (it->i < ht->size && ht->table[it->i] == NULL);
+-		if (it->i >= ht->size) {
+-			result = ISC_R_NOMORE;
+-		} else {
+-			it->cur = ht->table[it->i];
+-		}
+-	}
++	ht = it->ht;
++	dnode = it->cur;
++	dindex = it->hindex;
+ 
+-	hash = isc_hash_function(to_delete->key, to_delete->keysize, true);
+-	node = ht->table[hash & ht->mask];
+-	while (node != to_delete) {
+-		prev = node;
+-		node = node->next;
+-		INSIST(node != NULL);
+-	}
++	result = isc_ht_iter_next(it);
+ 
+-	if (prev == NULL) {
+-		ht->table[hash & ht->mask] = node->next;
+-	} else {
+-		prev->next = node->next;
+-	}
+-	isc_mem_put(ht->mctx, node,
+-		    offsetof(isc_ht_node_t, key) + node->keysize);
+-	ht->count--;
++	dresult = isc__ht_delete(ht, dnode->key, dnode->keysize, dnode->hashval,
++				 dindex);
++	INSIST(dresult == ISC_R_SUCCESS);
+ 
+ 	return (result);
+ }
+@@ -329,8 +612,8 @@ isc_ht_iter_currentkey(isc_ht_iter_t *it, unsigned char **key,
+ 	*keysize = it->cur->keysize;
+ }
+ 
+-unsigned int
+-isc_ht_count(isc_ht_t *ht) {
++size_t
++isc_ht_count(const isc_ht_t *ht) {
+ 	REQUIRE(ISC_HT_VALID(ht));
+ 
+ 	return (ht->count);
+diff --git a/lib/isc/include/isc/ht.h b/lib/isc/include/isc/ht.h
+index 280ee7e..0714875 100644
+--- a/lib/isc/include/isc/ht.h
++++ b/lib/isc/include/isc/ht.h
+@@ -11,8 +11,7 @@
+ 
+ /* ! \file */
+ 
+-#ifndef ISC_HT_H
+-#define ISC_HT_H 1
++#pragma once
+ 
+ #include <inttypes.h>
+ #include <string.h>
+@@ -23,9 +22,15 @@
+ typedef struct isc_ht	   isc_ht_t;
+ typedef struct isc_ht_iter isc_ht_iter_t;
+ 
++enum { ISC_HT_CASE_SENSITIVE = 0x00, ISC_HT_CASE_INSENSITIVE = 0x01 };
++
+ /*%
+  * Initialize hashtable at *htp, using memory context and size of (1<<bits)
+  *
++ * If 'options' contains ISC_HT_CASE_INSENSITIVE, then upper- and lower-case
++ * letters in key values will generate the same hash values; this can be used
++ * when the key for a hash table is a DNS name.
++ *
+  * Requires:
+  *\li	'htp' is not NULL and '*htp' is NULL.
+  *\li	'mctx' is a valid memory context.
+@@ -33,7 +38,8 @@ typedef struct isc_ht_iter isc_ht_iter_t;
+  *
+  */
+ void
+-isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits);
++isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits,
++	    unsigned int options);
+ 
+ /*%
+  * Destroy hashtable, freeing everything
+@@ -50,6 +56,7 @@ isc_ht_destroy(isc_ht_t **htp);
+  *
+  * Requires:
+  *\li	'ht' is a valid hashtable
++ *\li   write-lock
+  *
+  * Returns:
+  *\li	#ISC_R_NOMEMORY		-- not enough memory to create pool
+@@ -57,7 +64,7 @@ isc_ht_destroy(isc_ht_t **htp);
+  *\li	#ISC_R_SUCCESS		-- all is well.
+  */
+ isc_result_t
+-isc_ht_add(isc_ht_t *ht, const unsigned char *key, uint32_t keysize,
++isc_ht_add(isc_ht_t *ht, const unsigned char *key, const uint32_t keysize,
+ 	   void *value);
+ 
+ /*%
+@@ -68,27 +75,29 @@ isc_ht_add(isc_ht_t *ht, const unsigned char *key, uint32_t keysize,
+  *
+  * Requires:
+  * \li	'ht' is a valid hashtable
++ * \li  read-lock
+  *
+  * Returns:
+  * \li	#ISC_R_SUCCESS		-- success
+  * \li	#ISC_R_NOTFOUND		-- key not found
+  */
+ isc_result_t
+-isc_ht_find(const isc_ht_t *ht, const unsigned char *key, uint32_t keysize,
+-	    void **valuep);
++isc_ht_find(const isc_ht_t *ht, const unsigned char *key,
++	    const uint32_t keysize, void **valuep);
+ 
+ /*%
+  * Delete node from hashtable
+  *
+  * Requires:
+  *\li	ht is a valid hashtable
++ *\li   write-lock
+  *
+  * Returns:
+  *\li	#ISC_R_NOTFOUND		-- key not found
+  *\li	#ISC_R_SUCCESS		-- all is well
+  */
+ isc_result_t
+-isc_ht_delete(isc_ht_t *ht, const unsigned char *key, uint32_t keysize);
++isc_ht_delete(isc_ht_t *ht, const unsigned char *key, const uint32_t keysize);
+ 
+ /*%
+  * Create an iterator for the hashtable; point '*itp' to it.
+@@ -176,6 +185,5 @@ isc_ht_iter_currentkey(isc_ht_iter_t *it, unsigned char **key, size_t *keysize);
+  * Requires:
+  *\li	'ht' is a valid hashtable
+  */
+-unsigned int
+-isc_ht_count(isc_ht_t *ht);
+-#endif /* ifndef ISC_HT_H */
++size_t
++isc_ht_count(const isc_ht_t *ht);
+diff --git a/lib/isc/tests/ht_test.c b/lib/isc/tests/ht_test.c
+index 61b8c3d..4695012 100644
+--- a/lib/isc/tests/ht_test.c
++++ b/lib/isc/tests/ht_test.c
+@@ -59,7 +59,7 @@ test_ht_full(int bits, uintptr_t count) {
+ 	isc_result_t result;
+ 	uintptr_t i;
+ 
+-	isc_ht_init(&ht, test_mctx, bits);
++	isc_ht_init(&ht, test_mctx, bits, ISC_HT_CASE_SENSITIVE);
+ 	assert_non_null(ht);
+ 
+ 	for (i = 1; i < count; i++) {
+@@ -204,7 +204,7 @@ test_ht_iterator() {
+ 	unsigned char key[16];
+ 	size_t tksize;
+ 
+-	isc_ht_init(&ht, test_mctx, 16);
++	isc_ht_init(&ht, test_mctx, 16, ISC_HT_CASE_SENSITIVE);
+ 	assert_non_null(ht);
+ 	for (i = 1; i <= count; i++) {
+ 		/*
+-- 
+2.33.0
+
diff --git a/backport-CVE-2023-50387-CVE-2023-50868.patch b/backport-CVE-2023-50387-CVE-2023-50868.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4236c5c1a819891eaaaf61d842cf183a6eed566e
--- /dev/null
+++ b/backport-CVE-2023-50387-CVE-2023-50868.patch
@@ -0,0 +1,498 @@
+From c12608ca934c0433d280e65fe6c631013e200cfe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Thu, 11 Jan 2024 12:03:24 +0100
+Subject: [PATCH] Split fast and slow task queues
+
+Change the taskmgr (and thus netmgr) in a way that it supports fast and
+slow task queues.  The fast queue is used for incoming DNS traffic and
+it will pass the processing to the slow queue for sending outgoing DNS
+messages and processing resolver messages.
+
+In the future, more tasks might get moved to the slow queues, so the
+cached and authoritative DNS traffic can be handled without being slowed
+down by operations that take longer time to process.
+
+Conflict:Since the optimization patch 32a3970b has not been incorporated, the patch test modification part needs to be incorporated.
+Reference:https://downloads.isc.org/isc/bind/9.16.48/patches/0005-CVE-2023-50387-CVE-2023-50868.patch
+
+(cherry picked from commit 1b3b0cef224e7a9e8279c5cfe2f7e188e3777cc7)
+
+---
+ lib/dns/dst_api.c               | 27 +++++++++----
+ lib/dns/include/dns/validator.h |  1 +
+ lib/dns/include/dst/dst.h       |  4 ++
+ lib/dns/resolver.c              |  4 +-
+ lib/dns/validator.c             | 67 +++++++++++++++------------------
+ lib/isc/include/isc/netmgr.h    |  3 ++
+ lib/isc/netmgr/netmgr-int.h     |  1 +
+ lib/isc/netmgr/netmgr.c         | 36 +++++++++++-------
+ lib/isc/netmgr/tcp.c            |  6 +--
+ lib/isc/netmgr/tcpdns.c         |  4 +-
+ lib/isc/netmgr/udp.c            |  6 +--
+ lib/isc/tests/netmgr_test.c     |  2 -
+ 12 files changed, 91 insertions(+), 70 deletions(-)
+
+diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
+index c2977e0..0bf84b9 100644
+--- a/lib/dns/dst_api.c
++++ b/lib/dns/dst_api.c
+@@ -160,7 +160,8 @@ computeid(dst_key_t *key);
+ static isc_result_t
+ frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags,
+ 	   unsigned int protocol, dns_rdataclass_t rdclass,
+-	   isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp);
++	   isc_buffer_t *source, isc_mem_t *mctx, bool no_rdata,
++	   dst_key_t **keyp);
+ 
+ static isc_result_t
+ algorithm_status(unsigned int alg);
+@@ -776,6 +777,13 @@ dst_key_todns(const dst_key_t *key, isc_buffer_t *target) {
+ isc_result_t
+ dst_key_fromdns(const dns_name_t *name, dns_rdataclass_t rdclass,
+ 		isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) {
++	return (dst_key_fromdns_ex(name, rdclass, source, mctx, false, keyp));
++}
++
++isc_result_t
++dst_key_fromdns_ex(const dns_name_t *name, dns_rdataclass_t rdclass,
++		   isc_buffer_t *source, isc_mem_t *mctx, bool no_rdata,
++		   dst_key_t **keyp) {
+ 	uint8_t alg, proto;
+ 	uint32_t flags, extflags;
+ 	dst_key_t *key = NULL;
+@@ -806,7 +814,7 @@ dst_key_fromdns(const dns_name_t *name, dns_rdataclass_t rdclass,
+ 	}
+ 
+ 	result = frombuffer(name, alg, flags, proto, rdclass, source, mctx,
+-			    &key);
++			    no_rdata, &key);
+ 	if (result != ISC_R_SUCCESS) {
+ 		return (result);
+ 	}
+@@ -827,7 +835,7 @@ dst_key_frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags,
+ 	REQUIRE(dst_initialized);
+ 
+ 	result = frombuffer(name, alg, flags, protocol, rdclass, source, mctx,
+-			    &key);
++			    false, &key);
+ 	if (result != ISC_R_SUCCESS) {
+ 		return (result);
+ 	}
+@@ -2331,7 +2339,8 @@ computeid(dst_key_t *key) {
+ static isc_result_t
+ frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags,
+ 	   unsigned int protocol, dns_rdataclass_t rdclass,
+-	   isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) {
++	   isc_buffer_t *source, isc_mem_t *mctx, bool no_rdata,
++	   dst_key_t **keyp) {
+ 	dst_key_t *key;
+ 	isc_result_t ret;
+ 
+@@ -2356,10 +2365,12 @@ frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags,
+ 			return (DST_R_UNSUPPORTEDALG);
+ 		}
+ 
+-		ret = key->func->fromdns(key, source);
+-		if (ret != ISC_R_SUCCESS) {
+-			dst_key_free(&key);
+-			return (ret);
++		if (!no_rdata) {
++			ret = key->func->fromdns(key, source);
++			if (ret != ISC_R_SUCCESS) {
++				dst_key_free(&key);
++				return (ret);
++			}
+ 		}
+ 	}
+ 
+diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h
+index 4744014..73ac1cd 100644
+--- a/lib/dns/include/dns/validator.h
++++ b/lib/dns/include/dns/validator.h
+@@ -147,6 +147,7 @@ struct dns_validator {
+ 	unsigned int  depth;
+ 	unsigned int  authcount;
+ 	unsigned int  authfail;
++	bool	      failed;
+ 	isc_stdtime_t start;
+ };
+ 
+diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h
+index df48d8e..46fb193 100644
+--- a/lib/dns/include/dst/dst.h
++++ b/lib/dns/include/dst/dst.h
+@@ -469,6 +469,10 @@ dst_key_tofile(const dst_key_t *key, int type, const char *directory);
+  */
+ 
+ isc_result_t
++dst_key_fromdns_ex(const dns_name_t *name, dns_rdataclass_t rdclass,
++		   isc_buffer_t *source, isc_mem_t *mctx, bool no_rdata,
++		   dst_key_t **keyp);
++isc_result_t
+ dst_key_fromdns(const dns_name_t *name, dns_rdataclass_t rdclass,
+ 		isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp);
+ /*%<
+diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
+index 5f31d5b..cc8c9ab 100644
+--- a/lib/dns/resolver.c
++++ b/lib/dns/resolver.c
+@@ -10559,8 +10559,8 @@ dns_resolver_create(dns_view_t *view, isc_taskmgr_t *taskmgr,
+ 		 * Since we have a pool of tasks we bind them to task queues
+ 		 * to spread the load evenly
+ 		 */
+-		result = isc_task_create_bound(taskmgr, 0,
+-					       &res->buckets[i].task, i);
++		result = isc_task_create_bound(
++			taskmgr, 0, &res->buckets[i].task, ISC_NM_TASK_SLOW(i));
+ 		if (result != ISC_R_SUCCESS) {
+ 			isc_mutex_destroy(&res->buckets[i].lock);
+ 			goto cleanup_buckets;
+diff --git a/lib/dns/validator.c b/lib/dns/validator.c
+index e54fc70..e416cc9 100644
+--- a/lib/dns/validator.c
++++ b/lib/dns/validator.c
+@@ -1098,8 +1098,8 @@ create_validator(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type,
+  * 'rdataset'.  If found, build a dst_key_t for it and point val->key at
+  * it.
+  *
+- * If val->key is already non-NULL, locate it in the rdataset and then
+- * search past it for the *next* key that could have signed 'siginfo', then
++ * If val->key is already non-NULL, start searching from the next position in
++ * 'rdataset' to find the *next* key that could have signed 'siginfo', then
+  * set val->key to that.
+  *
+  * Returns ISC_R_SUCCESS if a possible matching key has been found,
+@@ -1112,59 +1112,59 @@ select_signing_key(dns_validator_t *val, dns_rdataset_t *rdataset) {
+ 	isc_buffer_t b;
+ 	dns_rdata_t rdata = DNS_RDATA_INIT;
+ 	dst_key_t *oldkey = val->key;
+-	bool foundold;
++	bool no_rdata = false;
+ 
+ 	if (oldkey == NULL) {
+-		foundold = true;
++		result = dns_rdataset_first(rdataset);
+ 	} else {
+-		foundold = false;
++		dst_key_free(&oldkey);
+ 		val->key = NULL;
++		result = dns_rdataset_next(rdataset);
+ 	}
+-
+-	result = dns_rdataset_first(rdataset);
+ 	if (result != ISC_R_SUCCESS) {
+-		goto failure;
++		goto done;
+ 	}
++
+ 	do {
+ 		dns_rdataset_current(rdataset, &rdata);
+ 
+ 		isc_buffer_init(&b, rdata.data, rdata.length);
+ 		isc_buffer_add(&b, rdata.length);
+ 		INSIST(val->key == NULL);
+-		result = dst_key_fromdns(&siginfo->signer, rdata.rdclass, &b,
+-					 val->view->mctx, &val->key);
++		result = dst_key_fromdns_ex(&siginfo->signer, rdata.rdclass, &b,
++					    val->view->mctx, no_rdata,
++					    &val->key);
+ 		if (result == ISC_R_SUCCESS) {
+ 			if (siginfo->algorithm ==
+ 				    (dns_secalg_t)dst_key_alg(val->key) &&
+ 			    siginfo->keyid ==
+ 				    (dns_keytag_t)dst_key_id(val->key) &&
++			    (dst_key_flags(val->key) & DNS_KEYFLAG_REVOKE) ==
++				    0 &&
+ 			    dst_key_iszonekey(val->key))
+ 			{
+-				if (foundold) {
+-					/*
+-					 * This is the key we're looking for.
+-					 */
+-					return (ISC_R_SUCCESS);
+-				} else if (dst_key_compare(oldkey, val->key)) {
+-					foundold = true;
+-					dst_key_free(&oldkey);
++				if (no_rdata) {
++					/* Retry with full key */
++					dns_rdata_reset(&rdata);
++					dst_key_free(&val->key);
++					no_rdata = false;
++					continue;
+ 				}
++				/* This is the key we're looking for. */
++				goto done;
+ 			}
+ 			dst_key_free(&val->key);
+ 		}
+ 		dns_rdata_reset(&rdata);
+ 		result = dns_rdataset_next(rdataset);
++		no_rdata = true;
+ 	} while (result == ISC_R_SUCCESS);
+ 
++done:
+ 	if (result == ISC_R_NOMORE) {
+ 		result = ISC_R_NOTFOUND;
+ 	}
+ 
+-failure:
+-	if (oldkey != NULL) {
+-		dst_key_free(&oldkey);
+-	}
+-
+ 	return (result);
+ }
+ 
+@@ -1557,20 +1557,9 @@ validate_answer(dns_validator_t *val, bool resume) {
+ 			continue;
+ 		}
+ 
+-		do {
+-			isc_result_t tresult;
+-			vresult = verify(val, val->key, &rdata,
+-					 val->siginfo->keyid);
+-			if (vresult == ISC_R_SUCCESS) {
+-				break;
+-			}
+-
+-			tresult = select_signing_key(val, val->keyset);
+-			if (tresult != ISC_R_SUCCESS) {
+-				break;
+-			}
+-		} while (1);
++		vresult = verify(val, val->key, &rdata, val->siginfo->keyid);
+ 		if (vresult != ISC_R_SUCCESS) {
++			val->failed = true;
+ 			validator_log(val, ISC_LOG_DEBUG(3),
+ 				      "failed to verify rdataset");
+ 		} else {
+@@ -1607,9 +1596,13 @@ validate_answer(dns_validator_t *val, bool resume) {
+ 		} else {
+ 			validator_log(val, ISC_LOG_DEBUG(3),
+ 				      "verify failure: %s",
+-				      isc_result_totext(result));
++				      isc_result_totext(vresult));
+ 			resume = false;
+ 		}
++		if (val->failed) {
++			result = ISC_R_NOMORE;
++			break;
++		}
+ 	}
+ 	if (result != ISC_R_NOMORE) {
+ 		validator_log(val, ISC_LOG_DEBUG(3),
+diff --git a/lib/isc/include/isc/netmgr.h b/lib/isc/include/isc/netmgr.h
+index dc44ef2..1b88832 100644
+--- a/lib/isc/include/isc/netmgr.h
++++ b/lib/isc/include/isc/netmgr.h
+@@ -455,6 +455,9 @@ isc_nm_tcpdnsconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
+  * 'cb'.
+  */
+ 
++#define ISC_NM_TASK_SLOW_OFFSET -2
++#define ISC_NM_TASK_SLOW(i)	(ISC_NM_TASK_SLOW_OFFSET - 1 - i)
++
+ void
+ isc_nm_task_enqueue(isc_nm_t *mgr, isc_task_t *task, int threadid);
+ /*%<
+diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
+index 23bc2a2..80de758 100644
+--- a/lib/isc/netmgr/netmgr-int.h
++++ b/lib/isc/netmgr/netmgr-int.h
+@@ -630,6 +630,7 @@ struct isc_nm {
+ 	isc_refcount_t references;
+ 	isc_mem_t *mctx;
+ 	int nworkers;
++	int nlisteners;
+ 	isc_mutex_t lock;
+ 	isc_condition_t wkstatecond;
+ 	isc_condition_t wkpausecond;
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index 71c6d62..1aa249e 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -272,31 +272,34 @@ isc__nm_winsock_destroy(void) {
+ #endif /* WIN32 */
+ 
+ static void
+-isc__nm_threadpool_initialize(uint32_t workers) {
++isc__nm_threadpool_initialize(uint32_t nworkers) {
+ 	char buf[11];
+ 	int r = uv_os_getenv("UV_THREADPOOL_SIZE", buf,
+ 			     &(size_t){ sizeof(buf) });
+ 	if (r == UV_ENOENT) {
+-		snprintf(buf, sizeof(buf), "%" PRIu32, workers);
++		snprintf(buf, sizeof(buf), "%" PRIu32, nworkers);
+ 		uv_os_setenv("UV_THREADPOOL_SIZE", buf);
+ 	}
+ }
+ 
+ void
+-isc__netmgr_create(isc_mem_t *mctx, uint32_t workers, isc_nm_t **netmgrp) {
++isc__netmgr_create(isc_mem_t *mctx, uint32_t nworkers, isc_nm_t **netmgrp) {
+ 	isc_nm_t *mgr = NULL;
+ 	char name[32];
+ 
+-	REQUIRE(workers > 0);
++	REQUIRE(nworkers > 0);
+ 
+ #ifdef WIN32
+ 	isc__nm_winsock_initialize();
+ #endif /* WIN32 */
+ 
+-	isc__nm_threadpool_initialize(workers);
++	isc__nm_threadpool_initialize(nworkers);
+ 
+ 	mgr = isc_mem_get(mctx, sizeof(*mgr));
+-	*mgr = (isc_nm_t){ .nworkers = workers };
++	*mgr = (isc_nm_t){
++		.nworkers = nworkers * 2,
++		.nlisteners = nworkers,
++	};
+ 
+ 	isc_mem_attach(mctx, &mgr->mctx);
+ 	isc_mutex_init(&mgr->lock);
+@@ -337,11 +340,12 @@ isc__netmgr_create(isc_mem_t *mctx, uint32_t workers, isc_nm_t **netmgrp) {
+ 	isc_mempool_associatelock(mgr->evpool, &mgr->evlock);
+ 	isc_mempool_setfillcount(mgr->evpool, 32);
+ 
+-	isc_barrier_init(&mgr->pausing, workers);
+-	isc_barrier_init(&mgr->resuming, workers);
++	isc_barrier_init(&mgr->pausing, mgr->nworkers);
++	isc_barrier_init(&mgr->resuming, mgr->nworkers);
+ 
+-	mgr->workers = isc_mem_get(mctx, workers * sizeof(isc__networker_t));
+-	for (size_t i = 0; i < workers; i++) {
++        mgr->workers = isc_mem_get(mctx,
++                                   mgr->nworkers * sizeof(isc__networker_t));
++        for (int i = 0; i < mgr->nworkers; i++) {
+ 		int r;
+ 		isc__networker_t *worker = &mgr->workers[i];
+ 		*worker = (isc__networker_t){
+@@ -376,7 +380,7 @@ isc__netmgr_create(isc_mem_t *mctx, uint32_t workers, isc_nm_t **netmgrp) {
+ 		mgr->workers_running++;
+ 		isc_thread_create(nm_thread, &mgr->workers[i], &worker->thread);
+ 
+-		snprintf(name, sizeof(name), "isc-net-%04zu", i);
++		snprintf(name, sizeof(name), "isc-net-%04d", i);
+ 		isc_thread_setname(worker->thread, name);
+ 	}
+ 
+@@ -860,9 +864,15 @@ isc_nm_task_enqueue(isc_nm_t *nm, isc_task_t *task, int threadid) {
+ 	isc__networker_t *worker = NULL;
+ 
+ 	if (threadid == -1) {
+-		tid = (int)isc_random_uniform(nm->nworkers);
++		tid = (int)isc_random_uniform(nm->nlisteners);
++	} else if (threadid == ISC_NM_TASK_SLOW_OFFSET) {
++		tid = nm->nlisteners +
++		      (int)isc_random_uniform(nm->nworkers - nm->nlisteners);
++	} else if (threadid < ISC_NM_TASK_SLOW_OFFSET) {
++		tid = nm->nlisteners + (ISC_NM_TASK_SLOW(threadid) %
++					(nm->nworkers - nm->nlisteners));
+ 	} else {
+-		tid = threadid % nm->nworkers;
++		tid = threadid % nm->nlisteners;
+ 	}
+ 
+ 	worker = &nm->workers[tid];
+diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
+index dde592d..c2e059a 100644
+--- a/lib/isc/netmgr/tcp.c
++++ b/lib/isc/netmgr/tcp.c
+@@ -321,7 +321,7 @@ isc_nm_tcpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
+ 			isc__nm_connectcb(sock, req, result, false);
+ 		} else {
+ 			isc__nmsocket_clearcb(sock);
+-			sock->tid = isc_random_uniform(mgr->nworkers);
++			sock->tid = isc_random_uniform(mgr->nlisteners);
+ 			isc__nm_connectcb(sock, req, result, true);
+ 		}
+ 		atomic_store(&sock->closed, true);
+@@ -339,7 +339,7 @@ isc_nm_tcpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
+ 		isc__nm_put_netievent_tcpconnect(mgr, ievent);
+ 	} else {
+ 		atomic_init(&sock->active, false);
+-		sock->tid = isc_random_uniform(mgr->nworkers);
++		sock->tid = isc_random_uniform(mgr->nlisteners);
+ 		isc__nm_enqueue_ievent(&mgr->workers[sock->tid],
+ 				       (isc__netievent_t *)ievent);
+ 	}
+@@ -435,7 +435,7 @@ isc_nm_listentcp(isc_nm_t *mgr, isc_sockaddr_t *iface,
+ #if defined(WIN32)
+ 	sock->nchildren = 1;
+ #else
+-	sock->nchildren = mgr->nworkers;
++	sock->nchildren = mgr->nlisteners;
+ #endif
+ 	children_size = sock->nchildren * sizeof(sock->children[0]);
+ 	sock->children = isc_mem_get(mgr->mctx, children_size);
+diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
+index f66944e..8f79a7f 100644
+--- a/lib/isc/netmgr/tcpdns.c
++++ b/lib/isc/netmgr/tcpdns.c
+@@ -301,7 +301,7 @@ isc_nm_tcpdnsconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
+ 		isc__nm_put_netievent_tcpdnsconnect(mgr, ievent);
+ 	} else {
+ 		atomic_init(&sock->active, false);
+-		sock->tid = isc_random_uniform(mgr->nworkers);
++		sock->tid = isc_random_uniform(mgr->nlisteners);
+ 		isc__nm_enqueue_ievent(&mgr->workers[sock->tid],
+ 				       (isc__netievent_t *)ievent);
+ 	}
+@@ -400,7 +400,7 @@ isc_nm_listentcpdns(isc_nm_t *mgr, isc_sockaddr_t *iface,
+ #if defined(WIN32)
+ 	sock->nchildren = 1;
+ #else
+-	sock->nchildren = mgr->nworkers;
++	sock->nchildren = mgr->nlisteners;
+ #endif
+ 	children_size = sock->nchildren * sizeof(sock->children[0]);
+ 	sock->children = isc_mem_get(mgr->mctx, children_size);
+diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c
+index 1af63af..668edca 100644
+--- a/lib/isc/netmgr/udp.c
++++ b/lib/isc/netmgr/udp.c
+@@ -126,7 +126,7 @@ isc_nm_listenudp(isc_nm_t *mgr, isc_sockaddr_t *iface, isc_nm_recv_cb_t cb,
+ 	uv_os_sock_t fd = -1;
+ 
+ 	/*
+-	 * We are creating mgr->nworkers duplicated sockets, one
++	 * We are creating mgr->nlisteners duplicated sockets, one
+ 	 * socket for each worker thread.
+ 	 */
+ 	sock = isc_mem_get(mgr->mctx, sizeof(isc_nmsocket_t));
+@@ -136,7 +136,7 @@ isc_nm_listenudp(isc_nm_t *mgr, isc_sockaddr_t *iface, isc_nm_recv_cb_t cb,
+ #if defined(WIN32)
+ 	sock->nchildren = 1;
+ #else
+-	sock->nchildren = mgr->nworkers;
++	sock->nchildren = mgr->nlisteners;
+ #endif
+ 
+ 	children_size = sock->nchildren * sizeof(sock->children[0]);
+@@ -795,7 +795,7 @@ isc_nm_udpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
+ 		isc__nm_put_netievent_udpconnect(mgr, event);
+ 	} else {
+ 		atomic_init(&sock->active, false);
+-		sock->tid = isc_random_uniform(mgr->nworkers);
++		sock->tid = isc_random_uniform(mgr->nlisteners);
+ 		isc__nm_enqueue_ievent(&mgr->workers[sock->tid],
+ 				       (isc__netievent_t *)event);
+ 	}
+diff --git a/lib/isc/tests/netmgr_test.c b/lib/isc/tests/netmgr_test.c
+index e44909e..d2c19e8 100644
+--- a/lib/isc/tests/netmgr_test.c
++++ b/lib/isc/tests/netmgr_test.c
+@@ -204,8 +204,6 @@ _setup(void **state __attribute__((unused))) {
+ 		return (-1);
+ 	}
+ 
+-	isc_hp_init(4 * workers);
+-
+ 	signal(SIGPIPE, SIG_IGN);
+ 
+ 	if (getenv("CI") == NULL || getenv("CI_ENABLE_ALL_TESTS") != NULL) {
+-- 
+2.33.0
+
diff --git a/backport-CVE-2023-5517.patch b/backport-CVE-2023-5517.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7cb2a708492bc0d7061ef33f96c0d61875f29887
--- /dev/null
+++ b/backport-CVE-2023-5517.patch
@@ -0,0 +1,117 @@
+From c73262493658cb8623927ef6cc2f023501f7e809 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 10 Oct 2023 10:58:18 +1100
+Subject: [PATCH] Save the correct result value to resume with
+ nxdomain-redirect
+
+The wrong result value was being saved for resumption with
+nxdomain-redirect when performing the fetch.  This lead to an assert
+when checking that RFC 1918 reverse queries where not leaking to
+the global internet.
+
+Conflict:NA
+Reference:https://downloads.isc.org/isc/bind/9.16.48/patches/0002-CVE-2023-5517.patch
+
+(cherry picked from commit 9d0fa07c5e7a39db89862a4f843d2190059afb4b)
+---
+ lib/ns/query.c | 25 ++++++++++++-------------
+ 1 file changed, 12 insertions(+), 13 deletions(-)
+
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index 62b5ea8463..55d815e6c0 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -455,10 +455,10 @@ static void
+ query_addnxrrsetnsec(query_ctx_t *qctx);
+ 
+ static isc_result_t
+-query_nxdomain(query_ctx_t *qctx, bool empty_wild);
++query_nxdomain(query_ctx_t *qctx, isc_result_t result);
+ 
+ static isc_result_t
+-query_redirect(query_ctx_t *qctx);
++query_redirect(query_ctx_t *qctx, isc_result_t result);
+ 
+ static isc_result_t
+ query_ncache(query_ctx_t *qctx, isc_result_t result);
+@@ -7345,8 +7345,7 @@ query_usestale(query_ctx_t *qctx, isc_result_t result) {
+  * result from the search.
+  */
+ static isc_result_t
+-query_gotanswer(query_ctx_t *qctx, isc_result_t res) {
+-	isc_result_t result = res;
++query_gotanswer(query_ctx_t *qctx, isc_result_t result) {
+ 	char errmsg[256];
+ 
+ 	CCTRACE(ISC_LOG_DEBUG(3), "query_gotanswer");
+@@ -7416,16 +7415,16 @@ query_gotanswer(query_ctx_t *qctx, isc_result_t res) {
+ 		return (query_nodata(qctx, DNS_R_NXRRSET));
+ 
+ 	case DNS_R_EMPTYWILD:
+-		return (query_nxdomain(qctx, true));
++		return (query_nxdomain(qctx, DNS_R_EMPTYWILD));
+ 
+ 	case DNS_R_NXDOMAIN:
+-		return (query_nxdomain(qctx, false));
++		return (query_nxdomain(qctx, DNS_R_NXDOMAIN));
+ 
+ 	case DNS_R_COVERINGNSEC:
+ 		return (query_coveringnsec(qctx));
+ 
+ 	case DNS_R_NCACHENXDOMAIN:
+-		result = query_redirect(qctx);
++		result = query_redirect(qctx, result);
+ 		if (result != ISC_R_COMPLETE) {
+ 			return (result);
+ 		}
+@@ -9243,10 +9242,10 @@ query_addnxrrsetnsec(query_ctx_t *qctx) {
+  * Handle NXDOMAIN and empty wildcard responses.
+  */
+ static isc_result_t
+-query_nxdomain(query_ctx_t *qctx, bool empty_wild) {
++query_nxdomain(query_ctx_t *qctx, isc_result_t result) {
+ 	dns_section_t section;
+ 	uint32_t ttl;
+-	isc_result_t result;
++	bool empty_wild = (result == DNS_R_EMPTYWILD);
+ 
+ 	CCTRACE(ISC_LOG_DEBUG(3), "query_nxdomain");
+ 
+@@ -9255,7 +9254,7 @@ query_nxdomain(query_ctx_t *qctx, bool empty_wild) {
+ 	INSIST(qctx->is_zone || REDIRECT(qctx->client));
+ 
+ 	if (!empty_wild) {
+-		result = query_redirect(qctx);
++		result = query_redirect(qctx, result);
+ 		if (result != ISC_R_COMPLETE) {
+ 			return (result);
+ 		}
+@@ -9343,7 +9342,7 @@ query_nxdomain(query_ctx_t *qctx, bool empty_wild) {
+  * redirecting, so query processing should continue past it.
+  */
+ static isc_result_t
+-query_redirect(query_ctx_t *qctx) {
++query_redirect(query_ctx_t *qctx, isc_result_t saved_result) {
+ 	isc_result_t result;
+ 
+ 	CCTRACE(ISC_LOG_DEBUG(3), "query_redirect");
+@@ -9384,7 +9383,7 @@ query_redirect(query_ctx_t *qctx) {
+ 		SAVE(qctx->client->query.redirect.rdataset, qctx->rdataset);
+ 		SAVE(qctx->client->query.redirect.sigrdataset,
+ 		     qctx->sigrdataset);
+-		qctx->client->query.redirect.result = DNS_R_NCACHENXDOMAIN;
++		qctx->client->query.redirect.result = saved_result;
+ 		dns_name_copynf(qctx->fname,
+ 				qctx->client->query.redirect.fname);
+ 		qctx->client->query.redirect.authoritative =
+@@ -10005,7 +10004,7 @@ query_coveringnsec(query_ctx_t *qctx) {
+ 	 * We now have the proof that we have an NXDOMAIN.  Apply
+ 	 * NXDOMAIN redirection if configured.
+ 	 */
+-	result = query_redirect(qctx);
++	result = query_redirect(qctx, DNS_R_COVERINGNSEC);
+ 	if (result != ISC_R_COMPLETE) {
+ 		redirected = true;
+ 		goto cleanup;
+-- 
+GitLab
diff --git a/backport-CVE-2023-5679.patch b/backport-CVE-2023-5679.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e3c67e0c7fc10240e08286e8afb17747cd0aa527
--- /dev/null
+++ b/backport-CVE-2023-5679.patch
@@ -0,0 +1,38 @@
+From 7db2796507127b40e2f091dafb842c6a7e86b9a8 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Thu, 12 Oct 2023 12:01:46 +1100
+Subject: [PATCH] Restore dns64 state during serve-stale processing
+
+If we are in the process of looking for the A records as part of
+dns64 processing and the server-stale timeout triggers, redo the
+dns64 changes that had been made to the orignal qctx.
+
+Conflict:NA
+Reference:https://downloads.isc.org/isc/bind/9.16.48/patches/0003-CVE-2023-5679.patch
+
+(cherry picked from commit 1fcc483df13e049b96f620e515f0d4d45f3680b7)
+---
+ lib/ns/query.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index 55d815e6c0..1290c308af 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -6095,6 +6095,13 @@ query_lookup_stale(ns_client_t *client) {
+ 	query_ctx_t qctx;
+ 
+ 	qctx_init(client, NULL, client->query.qtype, &qctx);
++	if (DNS64(client)) {
++		qctx.qtype = qctx.type = dns_rdatatype_a;
++		qctx.dns64 = true;
++	}
++	if (DNS64EXCLUDE(client)) {
++		qctx.dns64_exclude = true;
++	}
+ 	dns_db_attach(client->view->cachedb, &qctx.db);
+ 	client->query.attributes &= ~NS_QUERYATTR_RECURSIONOK;
+ 	client->query.dboptions |= DNS_DBFIND_STALETIMEOUT;
+-- 
+GitLab
+
diff --git a/backport-CVE-2023-6516.patch b/backport-CVE-2023-6516.patch
new file mode 100644
index 0000000000000000000000000000000000000000..748dfb4b966c8a97cdc1e684c5c4b93fa5190a9b
--- /dev/null
+++ b/backport-CVE-2023-6516.patch
@@ -0,0 +1,294 @@
+From c3377cbfaa44dcb033f5abfb2db031612c8f47d1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
+Date: Thu, 4 Jan 2024 13:39:27 +0100
+Subject: [PATCH] Limit isc_task_send() overhead for tree pruning
+
+Instead of issuing a separate isc_task_send() call for every RBTDB node
+that triggers tree pruning, maintain a list of nodes from which tree
+pruning can be started from and only issue an isc_task_send() call if
+pruning has not yet been triggered by another RBTDB node.
+
+The extra queuing overhead eliminated by this change could be remotely
+exploited to cause excessive memory use.
+
+As this change modifies struct dns_rbtnode by adding a new 'prunelink'
+member to it, bump MAPAPI to prevent any attempts of loading map-format
+zone files created using older BIND 9 versions.
+
+Conflict:NA
+Reference:https://downloads.isc.org/isc/bind/9.16.48/patches/0004-CVE-2023-6516.patch
+
+(cherry picked from commit 24381cc36d8528f5a4046fb2614451aeac4cdfc1)
+---
+ lib/dns/include/dns/rbt.h |   6 ++
+ lib/dns/mapapi            |   2 +-
+ lib/dns/rbt.c             |   1 +
+ lib/dns/rbtdb.c           | 150 +++++++++++++++++++++++++-------------
+ 4 files changed, 108 insertions(+), 51 deletions(-)
+
+diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
+index b67e602..0e48e1d 100644
+--- a/lib/dns/include/dns/rbt.h
++++ b/lib/dns/include/dns/rbt.h
+@@ -138,6 +138,12 @@ struct dns_rbtnode {
+ 	 */
+ 	ISC_LINK(dns_rbtnode_t) deadlink;
+ 
++	/*%
++	 * This linked list is used to store nodes from which tree pruning can
++	 * be started.
++	 */
++	ISC_LINK(dns_rbtnode_t) prunelink;
++
+ 	/*@{*/
+ 	/*!
+ 	 * These values are used in the RBT DB implementation.  The appropriate
+diff --git a/lib/dns/mapapi b/lib/dns/mapapi
+index 1b502d3..a46e190 100644
+--- a/lib/dns/mapapi
++++ b/lib/dns/mapapi
+@@ -13,4 +13,4 @@
+ # Whenever releasing a new major release of BIND9, set this value
+ # back to 1.0 when releasing the first alpha.  Map files are *never*
+ # compatible across major releases.
+-MAPAPI=3.0
++MAPAPI=4.0
+diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
+index 3fa2999..d453622 100644
+--- a/lib/dns/rbt.c
++++ b/lib/dns/rbt.c
+@@ -2292,6 +2292,7 @@ create_node(isc_mem_t *mctx, const dns_name_t *name, dns_rbtnode_t **nodep) {
+ 	HASHVAL(node) = 0;
+ 
+ 	ISC_LINK_INIT(node, deadlink);
++	ISC_LINK_INIT(node, prunelink);
+ 
+ 	LOCKNUM(node) = 0;
+ 	WILD(node) = 0;
+diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
+index c25023c..ab4caae 100644
+--- a/lib/dns/rbtdb.c
++++ b/lib/dns/rbtdb.c
+@@ -515,6 +515,10 @@ struct dns_rbtdb {
+ 	 */
+ 	rbtnodelist_t *deadnodes;
+ 
++	/* List of nodes from which recursive tree pruning can be started from.
++	 * Locked by tree_lock. */
++	rbtnodelist_t prunenodes;
++
+ 	/*
+ 	 * Heaps.  These are used for TTL based expiry in a cache,
+ 	 * or for zone resigning in a zone DB.  hmctx is the memory
+@@ -1060,6 +1064,7 @@ free_rbtdb(dns_rbtdb_t *rbtdb, bool log, isc_event_t *event) {
+ 	unsigned int i;
+ 	isc_result_t result;
+ 	char buf[DNS_NAME_FORMATSIZE];
++	dns_rbtnode_t *node = NULL;
+ 	dns_rbt_t **treep;
+ 	isc_time_t start;
+ 
+@@ -1085,8 +1090,6 @@ free_rbtdb(dns_rbtdb_t *rbtdb, bool log, isc_event_t *event) {
+ 	 * the overhead of unlinking all nodes here should be negligible.
+ 	 */
+ 	for (i = 0; i < rbtdb->node_lock_count; i++) {
+-		dns_rbtnode_t *node;
+-
+ 		node = ISC_LIST_HEAD(rbtdb->deadnodes[i]);
+ 		while (node != NULL) {
+ 			ISC_LIST_UNLINK(rbtdb->deadnodes[i], node, deadlink);
+@@ -1094,6 +1097,12 @@ free_rbtdb(dns_rbtdb_t *rbtdb, bool log, isc_event_t *event) {
+ 		}
+ 	}
+ 
++	node = ISC_LIST_HEAD(rbtdb->prunenodes);
++	while (node != NULL) {
++		ISC_LIST_UNLINK(rbtdb->prunenodes, node, prunelink);
++		node = ISC_LIST_HEAD(rbtdb->prunenodes);
++	}
++
+ 	if (event == NULL) {
+ 		rbtdb->quantum = (rbtdb->task != NULL) ? 100 : 0;
+ 	}
+@@ -1926,19 +1935,33 @@ is_leaf(dns_rbtnode_t *node) {
+ 		node->left == NULL && node->right == NULL);
+ }
+ 
++/*%
++  * The tree lock must be held when this function is called as it reads and
++  * updates rbtdb->prunenodes.
++  */
+ static inline void
+ send_to_prune_tree(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,
+ 		   isc_rwlocktype_t locktype) {
+-	isc_event_t *ev;
+-	dns_db_t *db;
++	bool pruning_queued = (ISC_LIST_HEAD(rbtdb->prunenodes) != NULL);
++
++	INSIST(locktype == isc_rwlocktype_write);
+ 
+-	ev = isc_event_allocate(rbtdb->common.mctx, NULL, DNS_EVENT_RBTPRUNE,
+-				prune_tree, node, sizeof(isc_event_t));
+ 	new_reference(rbtdb, node, locktype);
+-	db = NULL;
+-	attach((dns_db_t *)rbtdb, &db);
+-	ev->ev_sender = db;
+-	isc_task_send(rbtdb->task, &ev);
++        INSIST(!ISC_LINK_LINKED(node, prunelink));
++        ISC_LIST_APPEND(rbtdb->prunenodes, node, prunelink);
++
++        if (!pruning_queued) {
++                isc_event_t *ev = NULL;
++                dns_db_t *db = NULL;
++
++                attach((dns_db_t *)rbtdb, &db);
++
++                ev = isc_event_allocate(rbtdb->common.mctx, NULL,
++                                        DNS_EVENT_RBTPRUNE, prune_tree, db,
++                                        sizeof(isc_event_t));
++                isc_task_send(rbtdb->task, &ev);
++        }
++	
+ }
+ 
+ /*%
+@@ -2212,17 +2235,26 @@ restore_locks:
+ }
+ 
+ /*
+- * Prune the tree by recursively cleaning-up single leaves.  In the worst
+- * case, the number of iteration is the number of tree levels, which is at
+- * most the maximum number of domain name labels, i.e, 127.  In practice, this
+- * should be much smaller (only a few times), and even the worst case would be
+- * acceptable for a single event.
++ * Prune the tree by recursively cleaning up single leaves.  Go through all
++ * nodes stored in the rbtdb->prunenodes list; for each of them, in the worst
++ * case, it will be necessary to traverse a number of tree levels equal to the
++ * maximum legal number of domain name labels (127); in practice, the number of
++ * tree levels to traverse will virtually always be much smaller (a few levels
++ * at most).  While holding the tree lock throughout this entire operation is
++ * less than ideal, so is splitting the latter up by queueing a separate
++ * prune_tree() run for each node to start pruning from (as queueing requires
++ * allocating memory and can therefore potentially be exploited to exhaust
++ * available memory).  Also note that actually freeing up the memory used by
++ * RBTDB nodes (which is what this function does) is essential to keeping cache
++ * memory use in check, so since the tree lock needs to be acquired anyway,
++ * freeing as many nodes as possible before the tree lock gets released is
++ * prudent.
+  */
+ static void
+ prune_tree(isc_task_t *task, isc_event_t *event) {
+-	dns_rbtdb_t *rbtdb = event->ev_sender;
+-	dns_rbtnode_t *node = event->ev_arg;
+-	dns_rbtnode_t *parent;
++	dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)event->ev_arg;
++	dns_rbtnode_t *node = NULL;
++	dns_rbtnode_t *parent = NULL;
+ 	unsigned int locknum;
+ 
+ 	UNUSED(task);
+@@ -2230,44 +2262,60 @@ prune_tree(isc_task_t *task, isc_event_t *event) {
+ 	isc_event_free(&event);
+ 
+ 	RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_write);
+-	locknum = node->locknum;
+-	NODE_LOCK(&rbtdb->node_locks[locknum].lock, isc_rwlocktype_write);
+-	do {
+-		parent = node->parent;
+-		decrement_reference(rbtdb, node, 0, isc_rwlocktype_write,
+-				    isc_rwlocktype_write, true);
+ 
+-		if (parent != NULL && parent->down == NULL) {
+-			/*
+-			 * node was the only down child of the parent and has
+-			 * just been removed.  We'll then need to examine the
+-			 * parent.  Keep the lock if possible; otherwise,
+-			 * release the old lock and acquire one for the parent.
+-			 */
+-			if (parent->locknum != locknum) {
+-				NODE_UNLOCK(&rbtdb->node_locks[locknum].lock,
+-					    isc_rwlocktype_write);
+-				locknum = parent->locknum;
+-				NODE_LOCK(&rbtdb->node_locks[locknum].lock,
+-					  isc_rwlocktype_write);
++	while ((node = ISC_LIST_HEAD(rbtdb->prunenodes)) != NULL) {
++		locknum = node->locknum;
++		NODE_LOCK(&rbtdb->node_locks[locknum].lock,
++			  isc_rwlocktype_write);
++		do {
++			if (ISC_LINK_LINKED(node, prunelink)) {
++				ISC_LIST_UNLINK(rbtdb->prunenodes, node,
++						prunelink);
+ 			}
+ 
+-			/*
+-			 * We need to gain a reference to the node before
+-			 * decrementing it in the next iteration.
+-			 */
+-			if (ISC_LINK_LINKED(parent, deadlink)) {
+-				ISC_LIST_UNLINK(rbtdb->deadnodes[locknum],
++			parent = node->parent;
++			decrement_reference(rbtdb, node, 0,
++					    isc_rwlocktype_write,
++					    isc_rwlocktype_write, true);
++
++			if (parent != NULL && parent->down == NULL) {
++				/*
++				 * node was the only down child of the parent
++				 * and has just been removed.  We'll then need
++				 * to examine the parent.  Keep the lock if
++				 * possible; otherwise, release the old lock and
++				 * acquire one for the parent.
++				 */
++				if (parent->locknum != locknum) {
++					NODE_UNLOCK(
++						&rbtdb->node_locks[locknum].lock,
++						isc_rwlocktype_write);
++					locknum = parent->locknum;
++					NODE_LOCK(
++						&rbtdb->node_locks[locknum].lock,
++						isc_rwlocktype_write);
++				}
++
++				/*
++				 * We need to gain a reference to the node
++				 * before decrementing it in the next iteration.
++				 */
++				if (ISC_LINK_LINKED(parent, deadlink)) {
++					ISC_LIST_UNLINK(
++						rbtdb->deadnodes[locknum],
+ 						parent, deadlink);
++				}
++				new_reference(rbtdb, parent,
++					      isc_rwlocktype_write);
++			} else {
++				parent = NULL;
+ 			}
+-			new_reference(rbtdb, parent, isc_rwlocktype_write);
+-		} else {
+-			parent = NULL;
+-		}
+ 
+-		node = parent;
+-	} while (node != NULL);
+-	NODE_UNLOCK(&rbtdb->node_locks[locknum].lock, isc_rwlocktype_write);
++			node = parent;
++		} while (node != NULL);
++		NODE_UNLOCK(&rbtdb->node_locks[locknum].lock,
++			    isc_rwlocktype_write);
++	}
+ 	RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_write);
+ 
+ 	detach((dns_db_t **)&rbtdb);
+@@ -8718,6 +8766,8 @@ dns_rbtdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
+ 		ISC_LIST_INIT(rbtdb->deadnodes[i]);
+ 	}
+ 
++	ISC_LIST_INIT(rbtdb->prunenodes);
++
+ 	rbtdb->active = rbtdb->node_lock_count;
+ 
+ 	for (i = 0; i < (int)(rbtdb->node_lock_count); i++) {
+-- 
+2.33.0
+
diff --git a/backport-Call-dns_db_updatenotify_unregister-earlier.patch b/backport-Call-dns_db_updatenotify_unregister-earlier.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b35e4ad3be0ef759c6ad14fce8953e0ff24d8447
--- /dev/null
+++ b/backport-Call-dns_db_updatenotify_unregister-earlier.patch
@@ -0,0 +1,159 @@
+From dd73306509b4703011cbc6a8cc3d3667a58110d3 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Wed, 30 Nov 2022 18:44:37 +1100
+Subject: [PATCH] Call dns_db_updatenotify_unregister earlier
+
+dns_db_updatenotify_unregister needed to be called earlier to ensure
+that listener->onupdate_arg always points to a valid object.  The
+existing lazy cleanup in rbtdb_free did not ensure that.
+
+(cherry picked from commit 35839e91d84f4c22f3554ff4b6dc53d20359621e)
+---
+ lib/dns/include/dns/zone.h |  3 +-
+ lib/dns/rbtdb.c            | 10 +------
+ lib/dns/zone.c             | 60 ++++++++++++++++++++++----------------
+ 3 files changed, 38 insertions(+), 35 deletions(-)
+
+diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
+index cb5da5d046e..4bdc936949a 100644
+--- a/lib/dns/include/dns/zone.h
++++ b/lib/dns/include/dns/zone.h
+@@ -2610,7 +2610,8 @@ dns_zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs);
+ void
+ dns_zone_catz_disable(dns_zone_t *zone);
+ /*%<
+- * Disable zone as catalog zone, if it is one.
++ * Disable zone as catalog zone, if it is one.  Also disables any
++ * registered callbacks for the catalog zone.
+  *
+  * Requires:
+  *
+diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
+index 36fce510244..b36cdf22059 100644
+--- a/lib/dns/rbtdb.c
++++ b/lib/dns/rbtdb.c
+@@ -1063,7 +1063,6 @@ free_rbtdb(dns_rbtdb_t *rbtdb, bool log, isc_event_t *event) {
+ 	char buf[DNS_NAME_FORMATSIZE];
+ 	dns_rbt_t **treep;
+ 	isc_time_t start;
+-	dns_dbonupdatelistener_t *listener, *listener_next;
+ 
+ 	if (IS_CACHE(rbtdb) && rbtdb->common.rdclass == dns_rdataclass_in) {
+ 		overmem((dns_db_t *)rbtdb, (bool)-1);
+@@ -1220,14 +1219,7 @@ free_rbtdb(dns_rbtdb_t *rbtdb, bool log, isc_event_t *event) {
+ 		isc_file_munmap(rbtdb->mmap_location, (size_t)rbtdb->mmap_size);
+ 	}
+ 
+-	for (listener = ISC_LIST_HEAD(rbtdb->common.update_listeners);
+-	     listener != NULL; listener = listener_next)
+-	{
+-		listener_next = ISC_LIST_NEXT(listener, link);
+-		ISC_LIST_UNLINK(rbtdb->common.update_listeners, listener, link);
+-		isc_mem_put(rbtdb->common.mctx, listener,
+-			    sizeof(dns_dbonupdatelistener_t));
+-	}
++	INSIST(ISC_LIST_EMPTY(rbtdb->common.update_listeners));
+ 
+ 	isc_mem_putanddetach(&rbtdb->common.mctx, rbtdb, sizeof(*rbtdb));
+ }
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 62c102b374f..21e71767e93 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -1938,6 +1938,31 @@ dns_zone_rpz_disable_db(dns_zone_t *zone, dns_db_t *db) {
+ 					     zone->rpzs->zones[zone->rpz_num]);
+ }
+ 
++/*
++ * If a zone is a catalog zone, attach it to update notification in database.
++ */
++void
++dns_zone_catz_enable_db(dns_zone_t *zone, dns_db_t *db) {
++	REQUIRE(DNS_ZONE_VALID(zone));
++	REQUIRE(db != NULL);
++
++	if (zone->catzs != NULL) {
++		dns_db_updatenotify_register(db, dns_catz_dbupdate_callback,
++					     zone->catzs);
++	}
++}
++
++static void
++dns_zone_catz_disable_db(dns_zone_t *zone, dns_db_t *db) {
++	REQUIRE(DNS_ZONE_VALID(zone));
++	REQUIRE(db != NULL);
++
++	if (zone->catzs != NULL) {
++		dns_db_updatenotify_unregister(db, dns_catz_dbupdate_callback,
++					       zone->catzs);
++	}
++}
++
+ static void
+ zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs) {
+ 	REQUIRE(DNS_ZONE_VALID(zone));
+@@ -1964,6 +1989,9 @@ zone_catz_disable(dns_zone_t *zone) {
+ 	REQUIRE(DNS_ZONE_VALID(zone));
+ 
+ 	if (zone->catzs != NULL) {
++		if (zone->db != NULL) {
++			dns_zone_catz_disable_db(zone, zone->db);
++		}
+ 		dns_catz_catzs_detach(&zone->catzs);
+ 	}
+ }
+@@ -1984,31 +2012,6 @@ dns_zone_catz_is_enabled(dns_zone_t *zone) {
+ 	return (zone->catzs != NULL);
+ }
+ 
+-/*
+- * If a zone is a catalog zone, attach it to update notification in database.
+- */
+-void
+-dns_zone_catz_enable_db(dns_zone_t *zone, dns_db_t *db) {
+-	REQUIRE(DNS_ZONE_VALID(zone));
+-	REQUIRE(db != NULL);
+-
+-	if (zone->catzs != NULL) {
+-		dns_db_updatenotify_register(db, dns_catz_dbupdate_callback,
+-					     zone->catzs);
+-	}
+-}
+-
+-static void
+-dns_zone_catz_disable_db(dns_zone_t *zone, dns_db_t *db) {
+-	REQUIRE(DNS_ZONE_VALID(zone));
+-	REQUIRE(db != NULL);
+-
+-	if (zone->catzs != NULL) {
+-		dns_db_updatenotify_unregister(db, dns_catz_dbupdate_callback,
+-					       zone->catzs);
+-	}
+-}
+-
+ /*
+  * Set catalog zone ownership of the zone
+  */
+@@ -5375,6 +5378,11 @@ cleanup:
+ 			   isc_result_totext(result));
+ 	}
+ 
++	if (result != ISC_R_SUCCESS) {
++		dns_zone_rpz_disable_db(zone, db);
++		dns_zone_catz_disable_db(zone, db);
++	}
++
+ 	for (inc = ISC_LIST_HEAD(zone->newincludes); inc != NULL;
+ 	     inc = ISC_LIST_HEAD(zone->newincludes))
+ 	{
+@@ -17472,6 +17480,8 @@ static void
+ zone_detachdb(dns_zone_t *zone) {
+ 	REQUIRE(zone->db != NULL);
+ 
++	dns_zone_rpz_disable_db(zone, zone->db);
++	dns_zone_catz_disable_db(zone, zone->db);
+ 	dns_db_detach(&zone->db);
+ }
+ 
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Check-BN_dup-results-in-rsa_check.patch b/backport-Check-BN_dup-results-in-rsa_check.patch
new file mode 100644
index 0000000000000000000000000000000000000000..fcab1310257ff4826eb366b170842507a3b71c48
--- /dev/null
+++ b/backport-Check-BN_dup-results-in-rsa_check.patch
@@ -0,0 +1,41 @@
+From 12f902796d4adde1dfdbda9b23578049a2e530ee Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Mon, 26 Sep 2022 12:06:44 +1000
+Subject: [PATCH] Check BN_dup results in rsa_check
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/12f902796d4adde1dfdbda9b23578049a2e530ee
+(cherry picked from commit a47235f4f5af0286aadd43eeccf946a8f35a5dc8)
+---
+ lib/dns/opensslrsa_link.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
+index 9bee2f0449..45570dac98 100644
+--- a/lib/dns/opensslrsa_link.c
++++ b/lib/dns/opensslrsa_link.c
+@@ -849,6 +849,9 @@ rsa_check(RSA *rsa, RSA *pub) {
+ 			}
+ 		} else {
+ 			n = BN_dup(n2);
++			if (n == NULL) {
++				return (ISC_R_NOMEMORY);
++			}
+ 		}
+ 		if (e1 != NULL) {
+ 			if (BN_cmp(e1, e2) != 0) {
+@@ -859,6 +862,12 @@ rsa_check(RSA *rsa, RSA *pub) {
+ 			}
+ 		} else {
+ 			e = BN_dup(e2);
++			if (e == NULL) {
++				if (n != NULL) {
++					BN_free(n);
++				}
++				return (ISC_R_NOMEMORY);
++			}
+ 		}
+ 		if (RSA_set0_key(rsa, n, e, NULL) == 0) {
+ 			if (n != NULL) {
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Check-for-NULL-before-dereferencing-qctx-rpz_st.patch b/backport-Check-for-NULL-before-dereferencing-qctx-rpz_st.patch
new file mode 100644
index 0000000000000000000000000000000000000000..99e5182a1e5d62ee6d77bc2f58e2b8e1cd49956d
--- /dev/null
+++ b/backport-Check-for-NULL-before-dereferencing-qctx-rpz_st.patch
@@ -0,0 +1,43 @@
+From 148608c7b2a6fb55dafd35632b4a661f90ed36fb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
+Date: Mon, 13 Jun 2022 14:03:16 +0200
+Subject: [PATCH] Check for NULL before dereferencing qctx->rpz_st
+
+Commit 9ffb4a7ba11fae64a6ce2dd6390cd334372b7ab7 causes Clang Static
+Analyzer to flag a potential NULL dereference in query_nxdomain():
+
+    query.c:9394:26: warning: Dereference of null pointer [core.NullDereference]
+            if (!qctx->nxrewrite || qctx->rpz_st->m.rpz->addsoa) {
+                                    ^~~~~~~~~~~~~~~~~~~
+    1 warning generated.
+
+The warning above is for qctx->rpz_st potentially being a NULL pointer
+when query_nxdomain() is called from query_resume().  This is a false
+positive because none of the database lookup result codes currently
+causing query_nxdomain() to be called (DNS_R_EMPTYWILD, DNS_R_NXDOMAIN)
+can be returned by a database lookup following a recursive resolution
+attempt.  Add a NULL check nevertheless in order to future-proof the
+code and silence Clang Static Analyzer.
+
+(cherry picked from commit 07592d1315412c38c978e8d009aace5d0f5bef93)
+---
+ lib/ns/query.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index 43638a35eb8..067c6a23729 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -9248,7 +9248,9 @@ query_nxdomain(query_ctx_t *qctx, bool empty_wild) {
+ 	{
+ 		ttl = 0;
+ 	}
+-	if (!qctx->nxrewrite || qctx->rpz_st->m.rpz->addsoa) {
++	if (!qctx->nxrewrite ||
++	    (qctx->rpz_st != NULL && qctx->rpz_st->m.rpz->addsoa))
++	{
+ 		result = query_addsoa(qctx, ttl, section);
+ 		if (result != ISC_R_SUCCESS) {
+ 			QUERY_ERROR(qctx, result);
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Check-that-e-and-n-are-allocated-in-opensslrsa_fromdns.patch b/backport-Check-that-e-and-n-are-allocated-in-opensslrsa_fromdns.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b2bfd5316237e4466bbdb17a81199cec135a899e
--- /dev/null
+++ b/backport-Check-that-e-and-n-are-allocated-in-opensslrsa_fromdns.patch
@@ -0,0 +1,30 @@
+From 03c5db001e79e40011c3478e14593cdad72c5c1d Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Mon, 26 Sep 2022 11:57:17 +1000
+Subject: [PATCH] Check that 'e' and 'n' are allocated in opensslrsa_fromdns
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/03c5db001e79e40011c3478e14593cdad72c5c1d
+(cherry picked from commit db70c302138f02b6e1fca6e89cf2da35b2ca0ae4)
+---
+ lib/dns/opensslrsa_link.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
+index b23b6323fa..b744a62df9 100644
+--- a/lib/dns/opensslrsa_link.c
++++ b/lib/dns/opensslrsa_link.c
+@@ -671,6 +671,11 @@ opensslrsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
+ 	e = BN_bin2bn(r.base, e_bytes, NULL);
+ 	isc_region_consume(&r, e_bytes);
+ 	n = BN_bin2bn(r.base, r.length, NULL);
++	if (e == NULL || n == NULL) {
++		RSA_free(rsa);
++		return (ISC_R_NOMEMORY);
++	}
++
+ 	if (RSA_set0_key(rsa, n, e, NULL) == 0) {
+ 		if (n != NULL) {
+ 			BN_free(n);
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Check-that-e-and-n-are-non-NULL-in-opensslrsa_todns.patch b/backport-Check-that-e-and-n-are-non-NULL-in-opensslrsa_todns.patch
new file mode 100644
index 0000000000000000000000000000000000000000..dd266e558c8517cf338a011602e4f43174ee72ff
--- /dev/null
+++ b/backport-Check-that-e-and-n-are-non-NULL-in-opensslrsa_todns.patch
@@ -0,0 +1,37 @@
+From 0b0718fba3fb81507b7e82e6bca38007a94c475a Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Mon, 26 Sep 2022 11:52:55 +1000
+Subject: [PATCH] Check that 'e' and 'n' are non-NULL in opensslrsa_todns
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/0b0718fba3fb81507b7e82e6bca38007a94c475a
+(cherry picked from commit 5603cd69d170f49916bec3ca78ab3e4830170950)
+---
+ lib/dns/opensslrsa_link.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
+index 7aa743394b..b23b6323fa 100644
+--- a/lib/dns/opensslrsa_link.c
++++ b/lib/dns/opensslrsa_link.c
+@@ -585,13 +585,15 @@ opensslrsa_todns(const dst_key_t *key, isc_buffer_t *data) {
+ 	if (rsa == NULL) {
+ 		return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
+ 	}
+-
+-	isc_buffer_availableregion(data, &r);
+-
+ 	RSA_get0_key(rsa, &n, &e, NULL);
++	if (e == NULL || n == NULL) {
++		DST_RET(dst__openssl_toresult(DST_R_OPENSSLFAILURE));
++	}
+ 	mod_bytes = BN_num_bytes(n);
+ 	e_bytes = BN_num_bytes(e);
+ 
++	isc_buffer_availableregion(data, &r);
++
+ 	if (e_bytes < 256) { /*%< key exponent is <= 2040 bits */
+ 		if (r.length < 1) {
+ 			DST_RET(ISC_R_NOSPACE);
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Check-that-primary-key-names-have-not-changed.patch b/backport-Check-that-primary-key-names-have-not-changed.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ca9ad0db5772cc4528c0ad48407abbd9c51af903
--- /dev/null
+++ b/backport-Check-that-primary-key-names-have-not-changed.patch
@@ -0,0 +1,52 @@
+From 9524c493c9534654adb5c363972adcc521c1907b Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Fri, 23 Sep 2022 16:52:44 +1000
+Subject: [PATCH] Check that primary key names have not changed
+
+When looking for changes in a catalog zone member zone we need to
+also check if the TSIG key name associated with a primary server
+has be added, removed or changed.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/9524c493c9534654adb5c363972adcc521c1907b
+(cherry picked from commit 9172bd9b5a0b039cea187b6c7cc2c1314210c5d6)
+---
+ lib/dns/catz.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/lib/dns/catz.c b/lib/dns/catz.c
+index e46549be5e..702b081940 100644
+--- a/lib/dns/catz.c
++++ b/lib/dns/catz.c
+@@ -322,6 +322,20 @@ dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) {
+ 		return (false);
+ 	}
+ 
++	for (size_t i = 0; i < eb->opts.masters.count; i++) {
++		if ((ea->opts.masters.keys[i] == NULL) !=
++		    (eb->opts.masters.keys[i] == NULL)) {
++			return (false);
++		}
++		if (ea->opts.masters.keys[i] == NULL) {
++			continue;
++		}
++		if (!dns_name_equal(ea->opts.masters.keys[i],
++				    eb->opts.masters.keys[i])) {
++			return (false);
++		}
++	}
++
+ 	/* If one is NULL and the other isn't, the entries don't match */
+ 	if ((ea->opts.allow_query == NULL) != (eb->opts.allow_query == NULL)) {
+ 		return (false);
+@@ -350,7 +364,7 @@ dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) {
+ 		}
+ 	}
+ 
+-	/* xxxwpk TODO compare dscps/keys! */
++	/* xxxwpk TODO compare dscps! */
+ 	return (true);
+ }
+ 
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Clone-the-message-buffer-before-forwarding-UPDATE-me.patch b/backport-Clone-the-message-buffer-before-forwarding-UPDATE-me.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1c70ec1a28c67ca0fb2b78abbf5b41aca4b2349a
--- /dev/null
+++ b/backport-Clone-the-message-buffer-before-forwarding-UPDATE-me.patch
@@ -0,0 +1,28 @@
+From b485d95c661606e07dd99dbfbd366538694114b0 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Fri, 3 Jun 2022 16:55:56 +1000
+Subject: [PATCH] Clone the message buffer before forwarding UPDATE messages
+
+this prevents named forwarding a buffer that may have been over
+written.
+
+(cherry picked from commit 7a42417d61b4273a5819899232e4342b2ae79f03)
+---
+ lib/ns/update.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/ns/update.c b/lib/ns/update.c
+index 067ff990bdc..c4bde3d4eb2 100644
+--- a/lib/ns/update.c
++++ b/lib/ns/update.c
+@@ -1671,6 +1671,7 @@ ns_update_start(ns_client_t *client, isc_nmhandle_t *handle,
+ 		CHECK(checkupdateacl(client, dns_zone_getforwardacl(zone),
+ 				     "update forwarding", zonename, true,
+ 				     false));
++		dns_message_clonebuffer(client->message);
+ 		CHECK(send_forward_event(client, zone));
+ 		break;
+ 	default:
+-- 
+GitLab
+
diff --git a/backport-Detach-the-views-in-zone_shutdown-not-in-zone_free.patch b/backport-Detach-the-views-in-zone_shutdown-not-in-zone_free.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d24cdf218831d40e84f6f3543c770e0cb2dba3b3
--- /dev/null
+++ b/backport-Detach-the-views-in-zone_shutdown-not-in-zone_free.patch
@@ -0,0 +1,67 @@
+From cb083876c192fa32d2984508491bac96a4236137 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Tue, 17 Jan 2023 07:18:16 +0100
+Subject: [PATCH] Detach the views in zone_shutdown(), not in zone_free()
+
+The .view (and possibly .prev_view) would be kept attached to the
+removed zone until the zone is fully removed from the memory in
+zone_free().  If this process is delayed because server is busy
+something else like doing constant `rndc reconfig`, it could take
+seconds to detach the view, possibly keeping multiple dead views in the
+memory.  This could quickly lead to a massive memory bloat.
+
+Release the views early in the zone_shutdown() call, and don't wait
+until the zone is freed.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/cb083876c192fa32d2984508491bac96a4236137
+
+(cherry picked from commit 13bb8212804ce385010387d681a6623481921023)
+---
+ lib/dns/zone.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 51e2fc6cf2..9b025cdcaf 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -1246,6 +1246,8 @@ zone_free(dns_zone_t *zone) {
+ 	INSIST(zone->readio == NULL);
+ 	INSIST(zone->statelist == NULL);
+ 	INSIST(zone->writeio == NULL);
++	INSIST(zone->view == NULL);
++	INSIST(zone->prev_view == NULL);
+ 
+ 	if (zone->task != NULL) {
+ 		isc_task_detach(&zone->task);
+@@ -1253,12 +1255,6 @@ zone_free(dns_zone_t *zone) {
+ 	if (zone->loadtask != NULL) {
+ 		isc_task_detach(&zone->loadtask);
+ 	}
+-	if (zone->view != NULL) {
+-		dns_view_weakdetach(&zone->view);
+-	}
+-	if (zone->prev_view != NULL) {
+-		dns_view_weakdetach(&zone->prev_view);
+-	}
+ 
+ 	/* Unmanaged objects */
+ 	while (!ISC_LIST_EMPTY(zone->setnsec3param_queue)) {
+@@ -14971,6 +14967,15 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
+ 
+ 	LOCK_ZONE(zone);
+ 	INSIST(zone != zone->raw);
++
++	/* Detach the views early, we don't need them anymore */
++	if (zone->view != NULL) {
++		dns_view_weakdetach(&zone->view);
++	}
++	if (zone->prev_view != NULL) {
++		dns_view_weakdetach(&zone->prev_view);
++	}
++
+ 	if (linked) {
+ 		isc_refcount_decrement(&zone->irefs);
+ 	}
+-- 
+2.23.0
diff --git a/backport-Detach-the-zone-views-outside-of-the-zone-lock.patch b/backport-Detach-the-zone-views-outside-of-the-zone-lock.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4c3a35653219b1f0ae7f2ef6f0ce3376e79e1857
--- /dev/null
+++ b/backport-Detach-the-zone-views-outside-of-the-zone-lock.patch
@@ -0,0 +1,70 @@
+From 4b222f154bc3d5d6755cf7089948bd4522ddb7af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Thu, 19 Jan 2023 09:14:53 +0100
+Subject: [PATCH] Detach the zone views outside of the zone lock
+
+Detaching the views in the zone_shutdown() could lead to
+lock-order-inversion between adb->namelocks[bucket], adb->lock,
+view->lock and zone->lock.  Detach the views outside of the section that
+zone-locked.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/4b222f154bc3d5d6755cf7089948bd4522ddb7af
+
+(cherry picked from commit 978a0ef84cfb08435c1b7664c6328521b743fb02)
+---
+ lib/dns/zone.c | 25 ++++++++++++++++++-------
+ 1 file changed, 18 insertions(+), 7 deletions(-)
+
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 9b025cdcaf..1763dbc306 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -14922,6 +14922,7 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
+ 	dns_zone_t *zone = (dns_zone_t *)event->ev_arg;
+ 	bool free_needed, linked = false;
+ 	dns_zone_t *raw = NULL, *secure = NULL;
++	dns_view_t *view = NULL, *prev_view = NULL;
+ 
+ 	UNUSED(task);
+ 	REQUIRE(DNS_ZONE_VALID(zone));
+@@ -14968,13 +14969,15 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
+ 	LOCK_ZONE(zone);
+ 	INSIST(zone != zone->raw);
+ 
+-	/* Detach the views early, we don't need them anymore */
+-	if (zone->view != NULL) {
+-		dns_view_weakdetach(&zone->view);
+-	}
+-	if (zone->prev_view != NULL) {
+-		dns_view_weakdetach(&zone->prev_view);
+-	}
++	/*
++	 * Detach the views early, we don't need them anymore.  However, we need
++	 * to detach them outside of the zone lock to break the lock loop
++	 * between view, adb and zone locks.
++	 */
++	view = zone->view;
++	zone->view = NULL;
++	prev_view = zone->prev_view;
++	zone->prev_view = NULL;
+ 
+ 	if (linked) {
+ 		isc_refcount_decrement(&zone->irefs);
+@@ -15036,6 +15039,14 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
+ 		zone->secure = NULL;
+ 	}
+ 	UNLOCK_ZONE(zone);
++
++	if (view != NULL) {
++		dns_view_weakdetach(&view);
++	}
++	if (prev_view != NULL) {
++		dns_view_weakdetach(&prev_view);
++	}
++
+ 	if (raw != NULL) {
+ 		dns_zone_detach(&raw);
+ 	}
+-- 
+2.23.0
diff --git a/backport-Disable-the-internal-memory-allocator-by-default.patch b/backport-Disable-the-internal-memory-allocator-by-default.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7f979cbe083ac8d78eb359fa00b2ca9f6f51c6bb
--- /dev/null
+++ b/backport-Disable-the-internal-memory-allocator-by-default.patch
@@ -0,0 +1,41 @@
+From 1f7d2d53f0e5b86e22e1dd116868bb69eeacb1a0 Mon Sep 17 00:00:00 2001
+From: Ondřej Sur <oerdnj@isc-projects>
+Date: Wed, 15 Dec 2021 08:25:42 PM GMT+0800
+Subject: [PATCH] Disable the internal memory allocator by default
+
+Conflict:NA
+Reference:https://github.com/isc-projects/bind9/commit/1f7d2d53f0e5b86e22e1dd116868bb69eeacb1a0
+
+---
+ bin/named/main.c          | 1 +
+ lib/isc/include/isc/mem.h | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/bin/named/main.c b/bin/named/main.c
+index f62f82c..c7c35ce 100644
+--- a/bin/named/main.c
++++ b/bin/named/main.c
+@@ -456,6 +456,7 @@ static struct flag_def {
+ 			{ "mctx", ISC_MEM_DEBUGCTX, false },
+ 			{ NULL, 0, false } },
+   mem_context_flags[] = { { "external", ISC_MEMFLAG_INTERNAL, true },
++			  { "internal", ISC_MEMFLAG_INTERNAL, false },	  	          
+ 			  { "fill", ISC_MEMFLAG_FILL, false },
+ 			  { "nofill", ISC_MEMFLAG_FILL, true },
+ 			  { NULL, 0, false } };
+diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
+index 58e1d0e..b9f58fa 100644
+--- a/lib/isc/include/isc/mem.h
++++ b/lib/isc/include/isc/mem.h
+@@ -117,7 +117,7 @@ LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags;
+  */
+ 
+ #if !defined(ISC_MEM_USE_INTERNAL_MALLOC) && !__SANITIZE_ADDRESS__
+-#define ISC_MEM_USE_INTERNAL_MALLOC 1
++#define ISC_MEM_USE_INTERNAL_MALLOC 0
+ #endif /* ifndef ISC_MEM_USE_INTERNAL_MALLOC */
+ 
+ /*
+-- 
+2.33.0
+
diff --git a/backport-Disable-the-internale-memory-allocator-by-default.patch b/backport-Disable-the-internale-memory-allocator-by-default.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e45b21a17713c8bbcd99ef9fb7915736cc56c24c
--- /dev/null
+++ b/backport-Disable-the-internale-memory-allocator-by-default.patch
@@ -0,0 +1,41 @@
+From 1f7d2d53f0e5b86e22e1dd116868bb69eeacb1a0 Mon Sep 17 00:00:00 2001
+From: Ondrej Sur <oerdnj@isc-projects>
+Date: Wed, 15 Dec 2021 08:25:29 PM GMT+0800
+Subject: [PATCH] Disable the internale memory allocator by default
+
+Conflict:NA
+Reference:https://githun.com/isc-projects/bind9/commit/1f7d2d53f0e5b86e22e1dd116868bb69eeacb1a0
+
+---
+ bin/named/main.c          | 1 +
+ lib/isc/include/isc/mem.h | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/bin/named/main.c b/bin/named/main.c
+index f62f82c..b3d2498 100644
+--- a/bin/named/main.c
++++ b/bin/named/main.c
+@@ -456,6 +456,7 @@ static struct flag_def {
+ 			{ "mctx", ISC_MEM_DEBUGCTX, false },
+ 			{ NULL, 0, false } },
+   mem_context_flags[] = { { "external", ISC_MEMFLAG_INTERNAL, true },
++              { "internal", ISC_MEMFLAG_INTERNAL, false },
+ 			  { "fill", ISC_MEMFLAG_FILL, false },
+ 			  { "nofill", ISC_MEMFLAG_FILL, true },
+ 			  { NULL, 0, false } };
+diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
+index 58e1d0e..b9f58fa 100644
+--- a/lib/isc/include/isc/mem.h
++++ b/lib/isc/include/isc/mem.h
+@@ -117,7 +117,7 @@ LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags;
+  */
+ 
+ #if !defined(ISC_MEM_USE_INTERNAL_MALLOC) && !__SANITIZE_ADDRESS__
+-#define ISC_MEM_USE_INTERNAL_MALLOC 1
++#define ISC_MEM_USE_INTERNAL_MALLOC 0
+ #endif /* ifndef ISC_MEM_USE_INTERNAL_MALLOC */
+ 
+ /*
+-- 
+2.23.0
+
diff --git a/backport-Don-t-allow-DNSSEC-records-in-the-raw-zone.patch b/backport-Don-t-allow-DNSSEC-records-in-the-raw-zone.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2bafe8fda0cc43426e7f1bb2c20d1df8a870733c
--- /dev/null
+++ b/backport-Don-t-allow-DNSSEC-records-in-the-raw-zone.patch
@@ -0,0 +1,67 @@
+From 949768b252f3cb8a64425f15c9819b24202bb553 Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Mon, 10 Oct 2022 14:14:43 +0200
+Subject: [PATCH] Don't allow DNSSEC records in the raw zone
+
+There was an exception for dnssec-policy that allowed DNSSEC in the
+unsigned version of the zone. This however causes a crash if the
+zone switches from dynamic to inline-signing in the case of NSEC3,
+because we are now trying to add an NSEC3 record to a non-NSEC3 node.
+This is because BIND expects none of the records in the unsigned
+version of the zone to be NSEC3.
+
+Remove the exception for dnssec-policy when copying non DNSSEC
+records, but do allow for DNSKEY as this may be a published DNSKEY
+from a different provider.
+
+(cherry picked from commit 332b98ae49948e26a90f1d6e0a625f6eec568777)
+---
+ lib/dns/zone.c | 19 ++++++-------------
+ 1 file changed, 6 insertions(+), 13 deletions(-)
+
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 9a248ff318..e6c6bd01ca 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -16969,9 +16969,8 @@ restore_nsec3param(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version,
+ }
+ 
+ static isc_result_t
+-copy_non_dnssec_records(dns_zone_t *zone, dns_db_t *db, dns_db_t *version,
+-			dns_db_t *rawdb, dns_dbiterator_t *dbiterator,
+-			unsigned int *oldserial) {
++copy_non_dnssec_records(dns_db_t *db, dns_db_t *version, dns_db_t *rawdb,
++			dns_dbiterator_t *dbiterator, unsigned int *oldserial) {
+ 	dns_dbnode_t *rawnode = NULL, *node = NULL;
+ 	dns_fixedname_t fixed;
+ 	dns_name_t *name = dns_fixedname_initname(&fixed);
+@@ -17008,14 +17007,8 @@ copy_non_dnssec_records(dns_zone_t *zone, dns_db_t *db, dns_db_t *version,
+ 		    rdataset.type == dns_rdatatype_dnskey ||
+ 		    rdataset.type == dns_rdatatype_nsec3param)
+ 		{
+-			/*
+-			 * Allow DNSSEC records with dnssec-policy.
+-			 * WMM: Perhaps add config option for it.
+-			 */
+-			if (dns_zone_getkasp(zone) == NULL) {
+-				dns_rdataset_disassociate(&rdataset);
+-				continue;
+-			}
++			dns_rdataset_disassociate(&rdataset);
++			continue;
+ 		}
+ 		if (rdataset.type == dns_rdatatype_soa && oldserial != NULL) {
+ 			result = checkandaddsoa(db, node, version, &rdataset,
+@@ -17118,8 +17111,8 @@ receive_secure_db(isc_task_t *task, isc_event_t *event) {
+ 	for (result = dns_dbiterator_first(dbiterator); result == ISC_R_SUCCESS;
+ 	     result = dns_dbiterator_next(dbiterator))
+ 	{
+-		result = copy_non_dnssec_records(zone, db, version, rawdb,
+-						 dbiterator, oldserialp);
++		result = copy_non_dnssec_records(db, version, rawdb, dbiterator,
++						 oldserialp);
+ 		if (result != ISC_R_SUCCESS) {
+ 			goto failure;
+ 		}
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Don-t-perform-arithmetic-on-NULL-pointers.patch b/backport-Don-t-perform-arithmetic-on-NULL-pointers.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9883c3553aa87f9ed4c51f2171e5a1e8284636d4
--- /dev/null
+++ b/backport-Don-t-perform-arithmetic-on-NULL-pointers.patch
@@ -0,0 +1,84 @@
+From 2a9300a3bcd2c2cb5027e3435c53d2b8d94d72fd Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 10 Jan 2023 17:15:09 +1100
+Subject: [PATCH] Don't perform arithmetic on NULL pointers
+
+When node is NULL when calling getparent() et al. they return NULL
+but performing arithmetic on the NULL pointer is undefined.  Check
+if 'node' or 'header' is NULL and skip the adjustment.
+
+Conflict: The content of the patch has not been changed, the patch context does not match, it is suitable for the patch
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/2a9300a3bcd2c2cb5027e3435c53d2b8d94d72fd
+
+---
+ lib/dns/rbt.c | 19 ++++++++++++++-----
+ 1 file changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
+index 7f2c2d2..3fa2999 100644
+--- a/lib/dns/rbt.c
++++ b/lib/dns/rbt.c
+@@ -166,6 +166,10 @@ serialize_nodes(FILE *file, dns_rbtnode_t *node, uintptr_t parent,
+ 		dns_rbtdatawriter_t datawriter, void *writer_arg,
+ 		uintptr_t *where, uint64_t *crc);
+ 
++#define ADJUST_ADDRESS(address, relative, header)        \
++	if (address != NULL && header != NULL) {         \
++		address += relative * (uintptr_t)header; \
++	}
+ /*
+  * The following functions allow you to get the actual address of a pointer
+  * without having to use an if statement to check to see if that address is
+@@ -174,7 +178,8 @@ serialize_nodes(FILE *file, dns_rbtnode_t *node, uintptr_t parent,
+ static inline dns_rbtnode_t *
+ getparent(dns_rbtnode_t *node, file_header_t *header) {
+ 	char *adjusted_address = (char *)(node->parent);
+-	adjusted_address += node->parent_is_relative * (uintptr_t)header;
++
++	ADJUST_ADDRESS(adjusted_address, node->parent_is_relative, header);
+ 
+ 	return ((dns_rbtnode_t *)adjusted_address);
+ }
+@@ -182,7 +187,8 @@ getparent(dns_rbtnode_t *node, file_header_t *header) {
+ static inline dns_rbtnode_t *
+ getleft(dns_rbtnode_t *node, file_header_t *header) {
+ 	char *adjusted_address = (char *)(node->left);
+-	adjusted_address += node->left_is_relative * (uintptr_t)header;
++
++	ADJUST_ADDRESS(adjusted_address, node->left_is_relative, header);
+ 
+ 	return ((dns_rbtnode_t *)adjusted_address);
+ }
+@@ -190,7 +196,8 @@ getleft(dns_rbtnode_t *node, file_header_t *header) {
+ static inline dns_rbtnode_t *
+ getright(dns_rbtnode_t *node, file_header_t *header) {
+ 	char *adjusted_address = (char *)(node->right);
+-	adjusted_address += node->right_is_relative * (uintptr_t)header;
++
++	ADJUST_ADDRESS(adjusted_address, node->right_is_relative, header);
+ 
+ 	return ((dns_rbtnode_t *)adjusted_address);
+ }
+@@ -198,7 +205,8 @@ getright(dns_rbtnode_t *node, file_header_t *header) {
+ static inline dns_rbtnode_t *
+ getdown(dns_rbtnode_t *node, file_header_t *header) {
+ 	char *adjusted_address = (char *)(node->down);
+-	adjusted_address += node->down_is_relative * (uintptr_t)header;
++
++	ADJUST_ADDRESS(adjusted_address, node->down_is_relative, header);
+ 
+ 	return ((dns_rbtnode_t *)adjusted_address);
+ }
+@@ -206,7 +214,8 @@ getdown(dns_rbtnode_t *node, file_header_t *header) {
+ static inline dns_rbtnode_t *
+ getdata(dns_rbtnode_t *node, file_header_t *header) {
+ 	char *adjusted_address = (char *)(node->data);
+-	adjusted_address += node->data_is_relative * (uintptr_t)header;
++
++	ADJUST_ADDRESS(adjusted_address, node->data_is_relative, header);
+ 
+ 	return ((dns_rbtnode_t *)adjusted_address);
+ }
+-- 
+2.33.0
+
diff --git a/backport-Ensure-that-named_server_t-is-properly-initialized.patch b/backport-Ensure-that-named_server_t-is-properly-initialized.patch
new file mode 100644
index 0000000000000000000000000000000000000000..852c97f3ddb1589049c0b1aa2cd3e7ce8dcd7bca
--- /dev/null
+++ b/backport-Ensure-that-named_server_t-is-properly-initialized.patch
@@ -0,0 +1,146 @@
+From dff843199f3ed60090eb6e9ae60e9278c82bec5f Mon Sep 17 00:00:00 2001
+From: Tony Finch <fanf@isc.org>
+Date: Fri, 9 Sep 2022 08:21:10 +0100
+Subject: [PATCH] Ensure that named_server_t is properly initialized
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/dff843199f3ed60090eb6e9ae60e9278c82bec5f
+There was a ubsan error reporting an invalid value for interface_auto
+(a boolean value cannot be 190) because it was not initialized. To
+avoid this problem happening again, ensure the whole of the server
+structure is initialized to zero before setting the (relatively few)
+non-zero elements.
+---
+ bin/named/server.c | 72 ++++++----------------------------------------
+ 1 files changed, 9 insertions(+), 63 deletions(-)
+
+diff --git a/bin/named/server.c b/bin/named/server.c
+index 54b13f8f54..b4cbd953a9 100644
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -9971,13 +9971,14 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) {
+ 	isc_result_t result;
+ 	named_server_t *server = isc_mem_get(mctx, sizeof(*server));
+ 
+-	if (server == NULL) {
+-		fatal(server, "allocating server object", ISC_R_NOMEMORY);
+-	}
+-
+-	server->mctx = mctx;
+-	server->task = NULL;
+-	server->zonemgr = NULL;
++	*server = (named_server_t){
++		.mctx = mctx,
++		.statsfile = isc_mem_strdup(mctx, "named.stats"),
++		.bindkeysfile = isc_mem_strdup(mctx, named_g_defaultbindkeys),
++		.dumpfile = isc_mem_strdup(mctx, "named_dump.db"),
++		.secrootsfile = isc_mem_strdup(mctx, "named.secroots"),
++		.recfile = isc_mem_strdup(mctx, "named.recursing"),
++	};
+ 
+ #ifdef USE_DNSRPS
+ 	CHECKFATAL(dns_dnsrps_server_create(), "initializing RPZ service "
+@@ -9985,10 +9986,8 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) {
+ #endif /* ifdef USE_DNSRPS */
+ 
+ 	/* Initialize server data structures. */
+-	server->interfacemgr = NULL;
+ 	ISC_LIST_INIT(server->kasplist);
+ 	ISC_LIST_INIT(server->viewlist);
+-	server->in_roothints = NULL;
+ 
+ 	/* Must be first. */
+ 	CHECKFATAL(dst_lib_init(named_g_mctx, named_g_engine), "initializing "
+@@ -10018,7 +10017,6 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) {
+ 	isc_task_setname(server->task, "server", server);
+ 	isc_taskmgr_setexcltask(named_g_taskmgr, server->task);
+ 
+-	server->sctx = NULL;
+ 	CHECKFATAL(ns_server_create(mctx, get_matching_view, &server->sctx),
+ 		   "creating server context");
+ 
+@@ -10042,14 +10040,6 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) {
+ 		isc_app_onrun(named_g_mctx, server->task, run_server, server),
+ 		"isc_app_onrun");
+ 
+-	server->interface_timer = NULL;
+-	server->heartbeat_timer = NULL;
+-	server->pps_timer = NULL;
+-	server->tat_timer = NULL;
+-
+-	server->interface_interval = 0;
+-	server->heartbeat_interval = 0;
+-
+ 	CHECKFATAL(dns_zonemgr_create(named_g_mctx, named_g_taskmgr,
+ 				      named_g_timermgr, named_g_socketmgr,
+ 				      &server->zonemgr),
+@@ -10057,37 +10047,6 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) {
+ 	CHECKFATAL(dns_zonemgr_setsize(server->zonemgr, 1000), "dns_zonemgr_"
+ 							       "setsize");
+ 
+-	server->statsfile = isc_mem_strdup(server->mctx, "named.stats");
+-	CHECKFATAL(server->statsfile == NULL ? ISC_R_NOMEMORY : ISC_R_SUCCESS,
+-		   "isc_mem_strdup");
+-
+-	server->bindkeysfile = isc_mem_strdup(server->mctx,
+-					      named_g_defaultbindkeys);
+-	CHECKFATAL(server->bindkeysfile == NULL ? ISC_R_NOMEMORY
+-						: ISC_R_SUCCESS,
+-		   "isc_mem_strdup");
+-
+-	server->dumpfile = isc_mem_strdup(server->mctx, "named_dump.db");
+-	CHECKFATAL(server->dumpfile == NULL ? ISC_R_NOMEMORY : ISC_R_SUCCESS,
+-		   "isc_mem_strdup");
+-
+-	server->secrootsfile = isc_mem_strdup(server->mctx, "named.secroots");
+-	CHECKFATAL(server->secrootsfile == NULL ? ISC_R_NOMEMORY
+-						: ISC_R_SUCCESS,
+-		   "isc_mem_strdup");
+-
+-	server->recfile = isc_mem_strdup(server->mctx, "named.recursing");
+-	CHECKFATAL(server->recfile == NULL ? ISC_R_NOMEMORY : ISC_R_SUCCESS,
+-		   "isc_mem_strdup");
+-
+-	server->hostname_set = false;
+-	server->hostname = NULL;
+-	server->version_set = false;
+-	server->version = NULL;
+-
+-	server->zonestats = NULL;
+-	server->resolverstats = NULL;
+-	server->sockstats = NULL;
+ 	CHECKFATAL(isc_stats_create(server->mctx, &server->sockstats,
+ 				    isc_sockstatscounter_max),
+ 		   "isc_stats_create");
+@@ -10102,28 +10061,15 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) {
+ 				    dns_resstatscounter_max),
+ 		   "dns_stats_create (resolver)");
+ 
+-	server->flushonshutdown = false;
+-
+-	server->controls = NULL;
+ 	CHECKFATAL(named_controls_create(server, &server->controls),
+ 		   "named_controls_create");
+-	server->dispatchgen = 0;
++
+ 	ISC_LIST_INIT(server->dispatches);
+ 
+ 	ISC_LIST_INIT(server->statschannels);
+ 
+ 	ISC_LIST_INIT(server->cachelist);
+ 
+-	server->sessionkey = NULL;
+-	server->session_keyfile = NULL;
+-	server->session_keyname = NULL;
+-	server->session_keyalg = DST_ALG_UNKNOWN;
+-	server->session_keybits = 0;
+-
+-	server->lockfile = NULL;
+-
+-	server->dtenv = NULL;
+-
+ 	server->magic = NAMED_SERVER_MAGIC;
+ 	*serverp = server;
+ }
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Fix-a-cleanup-bug-when-isc_task_create-fails-in-dns_catz_new_zones.patch b/backport-Fix-a-cleanup-bug-when-isc_task_create-fails-in-dns_catz_new_zones.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2063c9281ad2f156e194a55810139a1a4aa67890
--- /dev/null
+++ b/backport-Fix-a-cleanup-bug-when-isc_task_create-fails-in-dns_catz_new_zones.patch
@@ -0,0 +1,33 @@
+From 466a05eaf0070f6984d50428454ab399258da5e1 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Mon, 27 Feb 2023 12:06:37 +0000
+Subject: [PATCH] Fix a cleanup bug when isc_task_create() fails in
+ dns_catz_new_zones()
+
+Use isc_mem_putanddetach() instead of isc_mem_put() to detach from the
+memory context.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/466a05eaf0070f6984d50428454ab399258da5e1
+
+(cherry picked from commit 9050481d1f3db1a007fb02ab1b186af94d2de1bc)
+---
+ lib/dns/catz.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/dns/catz.c b/lib/dns/catz.c
+index 92823a3..eb28838 100644
+--- a/lib/dns/catz.c
++++ b/lib/dns/catz.c
+@@ -661,7 +661,7 @@ cleanup_ht:
+ cleanup_refcount:
+ 	isc_refcount_destroy(&new_zones->refs);
+ 	isc_mutex_destroy(&new_zones->lock);
+-	isc_mem_put(mctx, new_zones, sizeof(*new_zones));
++	isc_mem_putanddetach(&new_zones->mctx, new_zones, sizeof(*new_zones));
+ 
+ 	return (result);
+ }
+-- 
+2.33.0
+
diff --git a/backport-Fix-a-logical-bug-in-cfg_print_duration.patch b/backport-Fix-a-logical-bug-in-cfg_print_duration.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6b0f7d6c22f8bc49a5da1dd3d37c16b168d6b42c
--- /dev/null
+++ b/backport-Fix-a-logical-bug-in-cfg_print_duration.patch
@@ -0,0 +1,70 @@
+From f458f6496de4dce06b1f9682537855800eda9675 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Mon, 17 Oct 2022 08:45:09 +0000
+Subject: [PATCH] Fix a logical bug in cfg_print_duration()
+
+The cfg_print_duration() function prints a ISO 8601 duration value
+converted from an array of integers, where the parts of the date and
+time are stored.
+
+durationlen[6], which holds the "seconds" part of the duration, has
+a special case in cfg_print_duration() to ensure that when there are
+no values in the duration, the result still can be printed as "PT0S",
+instead of just "P", so it can be a valid ISO 8601 duration value.
+
+There is a logical error in one of the two special case code paths,
+when it checks that no value from the "date" part is defined, and no
+"hour" or "minute" from the "time" part are defined.
+
+Because of the error, durationlen[6] can be used uninitialized, in
+which case the second parameter passed to snprintf() (which is the
+maximum allowed length) can contain a garbage value.
+
+This can not be exploited because the buffer is still big enough to
+hold the maximum possible amount of characters generated by the "%u%c"
+format string.
+
+Fix the logical bug, and initialize the 'durationlen' array to zeros
+to be a little safer from other similar errors.
+
+(cherry picked from commit 94409101870b689f77452b6324968687d9f3c72f)
+---
+ lib/isccfg/parser.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
+index b2a4a0ee979..42056c974e8 100644
+--- a/lib/isccfg/parser.c
++++ b/lib/isccfg/parser.c
+@@ -1041,7 +1041,7 @@ cfg_print_duration(cfg_printer_t *pctx, const cfg_obj_t *obj) {
+ 	char *str;
+ 	const char *indicators = "YMWDHMS";
+ 	int count, i;
+-	int durationlen[7];
++	int durationlen[7] = { 0 };
+ 	cfg_duration_t duration;
+ 	/*
+ 	 * D ? The duration has a date part.
+@@ -1073,10 +1073,8 @@ cfg_print_duration(cfg_printer_t *pctx, const cfg_obj_t *obj) {
+ 			} else {
+ 				T = true;
+ 			}
+-		} else {
+-			durationlen[i] = 0;
++			count += durationlen[i];
+ 		}
+-		count += durationlen[i];
+ 	}
+ 	/*
+ 	 * Special case for seconds which is not taken into account in the
+@@ -1114,7 +1112,7 @@ cfg_print_duration(cfg_printer_t *pctx, const cfg_obj_t *obj) {
+ 	}
+ 	/* Special case for seconds. */
+ 	if (duration.parts[6] > 0 ||
+-	    (!D && !duration.parts[4] && !duration.parts[3])) {
++	    (!D && !duration.parts[4] && !duration.parts[5])) {
+ 		snprintf(str, durationlen[6] + 2, "%u%c",
+ 			 (uint32_t)duration.parts[6], indicators[6]);
+ 	}
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Fix-a-use-after-free-bug-in-dns_zonemgr_releasezone.patch b/backport-Fix-a-use-after-free-bug-in-dns_zonemgr_releasezone.patch
new file mode 100644
index 0000000000000000000000000000000000000000..313b6fb410b375fcfe3553e9508fd737f1eeb5a6
--- /dev/null
+++ b/backport-Fix-a-use-after-free-bug-in-dns_zonemgr_releasezone.patch
@@ -0,0 +1,62 @@
+From 272afcd999cb07593f5dd943e22dc1a03d42b090 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Thu, 5 Jan 2023 15:01:35 +0000
+Subject: [PATCH] Fix a use-after-free bug in dns_zonemgr_releasezone()
+
+The dns_zonemgr_releasezone() function makes a decision to destroy
+'zmgr' (based on its references count, after decreasing it) inside
+a lock, and then destroys the object outside of the lock.
+
+This causes a race with dns_zonemgr_detach(), which could destroy
+the object in the meantime.
+
+Change dns_zonemgr_releasezone() to detach from 'zmgr' and destroy
+the object (if needed) using dns_zonemgr_detach(), outside of the
+lock.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/272afcd999cb07593f5dd943e22dc1a03d42b090
+
+(cherry picked from commit c1fc2122531bdd27ca38434a2632e8dac532bc13)
+---
+ lib/dns/zone.c | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 4b864da..bf47aa0 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -18815,8 +18815,6 @@ unlock:
+ 
+ void
+ dns_zonemgr_releasezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
+-	bool free_now = false;
+-
+ 	REQUIRE(DNS_ZONE_VALID(zone));
+ 	REQUIRE(DNS_ZONEMGR_VALID(zmgr));
+ 	REQUIRE(zone->zmgr == zmgr);
+@@ -18828,19 +18826,13 @@ dns_zonemgr_releasezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
+ 
+ 	zonemgr_keymgmt_delete(zmgr, zone);
+ 
++	/* Detach below, outside of the write lock. */
+ 	zone->zmgr = NULL;
+ 
+-	if (isc_refcount_decrement(&zmgr->refs) == 1) {
+-		free_now = true;
+-	}
+-
+ 	UNLOCK_ZONE(zone);
+ 	RWUNLOCK(&zmgr->rwlock, isc_rwlocktype_write);
+ 
+-	if (free_now) {
+-		zonemgr_free(zmgr);
+-	}
+-	ENSURE(zone->zmgr == NULL);
++	dns_zonemgr_detach(&zmgr);
+ }
+ 
+ void
+-- 
+2.33.0
+
diff --git a/backport-Fix-backport-error-in-84929d1cd7e1042452094ceeae969324b9df504f.patch b/backport-Fix-backport-error-in-84929d1cd7e1042452094ceeae969324b9df504f.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d0c0b8b56b2b6c9f93eac8f3b5bdbb7b996b7666
--- /dev/null
+++ b/backport-Fix-backport-error-in-84929d1cd7e1042452094ceeae969324b9df504f.patch
@@ -0,0 +1,62 @@
+From e4b5ca92ea33c3a08403b84f6b5260ba89206d8c Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Thu, 23 Feb 2023 15:43:51 +1100
+Subject: [PATCH] Fix backport error in
+ 84929d1cd7e1042452094ceeae969324b9df504f
+
+Not all the RETERR's in named_zone_configure where converted to
+CHECK's, as was the case in main, leading to a memory leak with
+the early returns.
+
+Conflict: The content of the patch has not been changed, the patch context does not match, it is suitable for the patch 
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/e4b5ca92ea33c3a08403b84f6b5260ba89206d8c
+
+---
+ bin/named/zoneconf.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
+index 8656602..8de3a88 100644
+--- a/bin/named/zoneconf.c
++++ b/bin/named/zoneconf.c
+@@ -1272,9 +1272,9 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 				zone, ipkl.addrs, ipkl.dscps, ipkl.keys,
+ 				ipkl.count);
+ 			dns_ipkeylist_clear(mctx, &ipkl);
+-			RETERR(result);
++			CHECK(result);
+ 		} else {
+-			RETERR(dns_zone_setalsonotify(zone, NULL, 0));
++			CHECK(dns_zone_setalsonotify(zone, NULL, 0));
+ 		}
+ 
+ 		obj = NULL;
+@@ -1721,9 +1721,9 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 			result = dns_zone_setparentals(zone, ipkl.addrs,
+ 						       ipkl.keys, ipkl.count);
+ 			dns_ipkeylist_clear(mctx, &ipkl);
+-			RETERR(result);
++			CHECK(result);
+ 		} else {
+-			RETERR(dns_zone_setparentals(zone, NULL, NULL, 0));
++			CHECK(dns_zone_setparentals(zone, NULL, NULL, 0));
+ 		}
+ 	}
+ 
+@@ -1936,11 +1936,11 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 				mayberaw, ipkl.addrs, ipkl.keys, ipkl.count);
+ 			count = ipkl.count;
+ 			dns_ipkeylist_clear(mctx, &ipkl);
+-			RETERR(result);
++			CHECK(result);
+ 		} else {
+ 			result = dns_zone_setprimaries(mayberaw, NULL, 0);
+ 		}
+-		RETERR(result);
++		CHECK(result);
+ 
+ 		multi = false;
+ 		if (count > 1) {
+-- 
+2.33.0
+
diff --git a/backport-Fix-dns_fwdtable_addfwd-error-path-cleanup-bug.patch b/backport-Fix-dns_fwdtable_addfwd-error-path-cleanup-bug.patch
new file mode 100644
index 0000000000000000000000000000000000000000..033426552edb1bf647075278f17c215efd1da149
--- /dev/null
+++ b/backport-Fix-dns_fwdtable_addfwd-error-path-cleanup-bug.patch
@@ -0,0 +1,32 @@
+From 1950629ffade5531d102639261a31321f8cdbb39 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Fri, 9 Dec 2022 12:41:38 +0000
+Subject: [PATCH] Fix dns_fwdtable_addfwd() error path cleanup bug
+
+Free 'sizeof(dns_forwarder_t)' bytes of memory instead of
+'sizeof(dns_sockaddr_t)' bytes, because `fwd` is a pointer
+to a 'dns_forwarder_t' type structure.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/1950629ffade5531d102639261a31321f8cdbb39
+
+(cherry picked from commit 0cc1b06d98676ab66200d388c48c3cd615aa0109)
+---
+ lib/dns/forward.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/dns/forward.c b/lib/dns/forward.c
+index 53d0c5ee4e..c7c54cddce 100644
+--- a/lib/dns/forward.c
++++ b/lib/dns/forward.c
+@@ -103,7 +103,7 @@ cleanup:
+ 	while (!ISC_LIST_EMPTY(forwarders->fwdrs)) {
+ 		fwd = ISC_LIST_HEAD(forwarders->fwdrs);
+ 		ISC_LIST_UNLINK(forwarders->fwdrs, fwd, link);
+-		isc_mem_put(fwdtable->mctx, fwd, sizeof(isc_sockaddr_t));
++		isc_mem_put(fwdtable->mctx, fwd, sizeof(dns_forwarder_t));
+ 	}
+ 	isc_mem_put(fwdtable->mctx, forwarders, sizeof(dns_forwarders_t));
+ 	return (result);
+-- 
+2.23.0
diff --git a/backport-Fix-dns_kasp_attach-dns_kasp_detach-usage.patch b/backport-Fix-dns_kasp_attach-dns_kasp_detach-usage.patch
new file mode 100644
index 0000000000000000000000000000000000000000..10fb847b23659a6e0936a536934b86c45c97ebf6
--- /dev/null
+++ b/backport-Fix-dns_kasp_attach-dns_kasp_detach-usage.patch
@@ -0,0 +1,474 @@
+From b49a3a56c92c65c53561bbd5f01738689aea335f Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 21 Feb 2023 12:15:01 +1100
+Subject: [PATCH] Fix dns_kasp_attach / dns_kasp_detach usage
+
+The kasp pointers in dns_zone_t should consistently be changed by
+dns_kasp_attach and dns_kasp_detach so the usage is balanced.
+
+Conflict:The content of the patch has not been changed, the patch context does not match, it is suitable for the patch  
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/b49a3a56c92c65c53561bbd5f01738689aea335f
+
+(cherry picked from commit b41882cc75c9d820c5642c88a6cd90fec32b8397)
+---
+ bin/named/zoneconf.c | 154 ++++++++++++++++++++++---------------------
+ lib/dns/zone.c       |   8 +--
+ 2 files changed, 83 insertions(+), 79 deletions(-)
+
+diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
+index 4691fdc..8656602 100644
+--- a/bin/named/zoneconf.c
++++ b/bin/named/zoneconf.c
+@@ -924,8 +924,8 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 	maps[i] = NULL;
+ 
+ 	if (vconfig != NULL) {
+-		RETERR(named_config_getclass(cfg_tuple_get(vconfig, "class"),
+-					     dns_rdataclass_in, &vclass));
++		CHECK(named_config_getclass(cfg_tuple_get(vconfig, "class"),
++					    dns_rdataclass_in, &vclass));
+ 	} else {
+ 		vclass = dns_rdataclass_in;
+ 	}
+@@ -936,8 +936,8 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 
+ 	zname = cfg_obj_asstring(cfg_tuple_get(zconfig, "name"));
+ 
+-	RETERR(named_config_getclass(cfg_tuple_get(zconfig, "class"), vclass,
+-				     &zclass));
++	CHECK(named_config_getclass(cfg_tuple_get(zconfig, "class"), vclass,
++				    &zclass));
+ 	dns_zone_setclass(zone, zclass);
+ 	if (raw != NULL) {
+ 		dns_zone_setclass(raw, zclass);
+@@ -957,7 +957,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 		cpval = isc_mem_strdup(mctx, cfg_obj_asstring(obj));
+ 	}
+ 	if (cpval == NULL) {
+-		return (ISC_R_NOMEMORY);
++		CHECK(ISC_R_NOMEMORY);
+ 	}
+ 
+ 	obj = NULL;
+@@ -972,7 +972,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 				      "zone '%s': both 'database' and 'dlz' "
+ 				      "specified",
+ 				      zname);
+-			return (ISC_R_FAILURE);
++			CHECK(ISC_R_FAILURE);
+ 		}
+ 
+ 		len = strlen(dlzname) + 5;
+@@ -983,7 +983,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 	result = strtoargv(mctx, cpval, &dbargc, &dbargv);
+ 	if (result != ISC_R_SUCCESS && cpval != default_dbtype) {
+ 		isc_mem_free(mctx, cpval);
+-		return (result);
++		CHECK(result);
+ 	}
+ 
+ 	/*
+@@ -1012,7 +1012,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 		isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
+ 			      NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR,
+ 			      "zone '%s': 'file' not specified", zname);
+-		return (ISC_R_FAILURE);
++		CHECK(ISC_R_FAILURE);
+ 	}
+ 
+ 	if (ztype == dns_zone_secondary || ztype == dns_zone_mirror) {
+@@ -1051,7 +1051,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 				    "can only be used with "
+ 				    "'masterfile-format text'",
+ 				    zname);
+-			return (ISC_R_FAILURE);
++			CHECK(ISC_R_FAILURE);
+ 		}
+ 
+ 		if (strcasecmp(masterstylestr, "full") == 0) {
+@@ -1077,47 +1077,45 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 		size_t signedlen = strlen(filename) + sizeof(SIGNED);
+ 		char *signedname;
+ 
+-		RETERR(dns_zone_setfile(raw, filename, masterformat,
+-					masterstyle));
++		CHECK(dns_zone_setfile(raw, filename, masterformat,
++				       masterstyle));
+ 		signedname = isc_mem_get(mctx, signedlen);
+ 
+ 		(void)snprintf(signedname, signedlen, "%s" SIGNED, filename);
+ 		result = dns_zone_setfile(zone, signedname,
+ 					  dns_masterformat_raw, NULL);
+ 		isc_mem_put(mctx, signedname, signedlen);
+-		if (result != ISC_R_SUCCESS) {
+-			return (result);
+-		}
++		CHECK(result);
+ 	} else {
+-		RETERR(dns_zone_setfile(zone, filename, masterformat,
+-					masterstyle));
++		CHECK(dns_zone_setfile(zone, filename, masterformat,
++				       masterstyle));
+ 	}
+ 
+ 	obj = NULL;
+ 	result = cfg_map_get(zoptions, "journal", &obj);
+ 	if (result == ISC_R_SUCCESS) {
+-		RETERR(dns_zone_setjournal(mayberaw, cfg_obj_asstring(obj)));
++		CHECK(dns_zone_setjournal(mayberaw, cfg_obj_asstring(obj)));
+ 	}
+ 
+ 	/*
+ 	 * Notify messages are processed by the raw zone if it exists.
+ 	 */
+ 	if (ztype == dns_zone_secondary || ztype == dns_zone_mirror) {
+-		RETERR(configure_zone_acl(
+-			zconfig, vconfig, config, allow_notify, ac, mayberaw,
+-			dns_zone_setnotifyacl, dns_zone_clearnotifyacl));
++		CHECK(configure_zone_acl(zconfig, vconfig, config, allow_notify,
++					 ac, mayberaw, dns_zone_setnotifyacl,
++					 dns_zone_clearnotifyacl));
+ 	}
+ 
+ 	/*
+ 	 * XXXAG This probably does not make sense for stubs.
+ 	 */
+-	RETERR(configure_zone_acl(zconfig, vconfig, config, allow_query, ac,
+-				  zone, dns_zone_setqueryacl,
+-				  dns_zone_clearqueryacl));
++	CHECK(configure_zone_acl(zconfig, vconfig, config, allow_query, ac,
++				 zone, dns_zone_setqueryacl,
++				 dns_zone_clearqueryacl));
+ 
+-	RETERR(configure_zone_acl(zconfig, vconfig, config, allow_query_on, ac,
+-				  zone, dns_zone_setqueryonacl,
+-				  dns_zone_clearqueryonacl));
++	CHECK(configure_zone_acl(zconfig, vconfig, config, allow_query_on, ac,
++				 zone, dns_zone_setqueryonacl,
++				 dns_zone_clearqueryonacl));
+ 
+ 	obj = NULL;
+ 	result = named_config_get(maps, "dialup", &obj);
+@@ -1176,10 +1174,10 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 	rcvquerystats = NULL;
+ 	dnssecsignstats = NULL;
+ 	if (statlevel == dns_zonestat_full) {
+-		RETERR(isc_stats_create(mctx, &zoneqrystats,
+-					ns_statscounter_max));
+-		RETERR(dns_rdatatypestats_create(mctx, &rcvquerystats));
+-		RETERR(dns_dnssecsignstats_create(mctx, &dnssecsignstats));
++		CHECK(isc_stats_create(mctx, &zoneqrystats,
++				       ns_statscounter_max));
++		CHECK(dns_rdatatypestats_create(mctx, &rcvquerystats));
++		CHECK(dns_dnssecsignstats_create(mctx, &dnssecsignstats));
+ 	}
+ 	dns_zone_setrequeststats(zone, zoneqrystats);
+ 	dns_zone_setrcvquerystats(zone, rcvquerystats);
+@@ -1218,7 +1216,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 						ISC_LOG_ERROR,
+ 						"dnssec-policy '%s' not found ",
+ 						kaspname);
+-					RETERR(result);
++					CHECK(result);
+ 				}
+ 				dns_zone_setkasp(zone, kasp);
+ 				use_kasp = true;
+@@ -1268,8 +1266,8 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 			dns_ipkeylist_t ipkl;
+ 			dns_ipkeylist_init(&ipkl);
+ 
+-			RETERR(named_config_getipandkeylist(config, "primaries",
+-							    obj, mctx, &ipkl));
++			CHECK(named_config_getipandkeylist(config, "primaries",
++							   obj, mctx, &ipkl));
+ 			result = dns_zone_setalsonotifydscpkeys(
+ 				zone, ipkl.addrs, ipkl.dscps, ipkl.keys,
+ 				ipkl.count);
+@@ -1282,48 +1280,48 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 		obj = NULL;
+ 		result = named_config_get(maps, "parental-source", &obj);
+ 		INSIST(result == ISC_R_SUCCESS && obj != NULL);
+-		RETERR(dns_zone_setparentalsrc4(zone, cfg_obj_assockaddr(obj)));
++		CHECK(dns_zone_setparentalsrc4(zone, cfg_obj_assockaddr(obj)));
+ 		dscp = cfg_obj_getdscp(obj);
+ 		if (dscp == -1) {
+ 			dscp = named_g_dscp;
+ 		}
+-		RETERR(dns_zone_setparentalsrc4dscp(zone, dscp));
++		CHECK(dns_zone_setparentalsrc4dscp(zone, dscp));
+ 		named_add_reserved_dispatch(named_g_server,
+ 					    cfg_obj_assockaddr(obj));
+ 
+ 		obj = NULL;
+ 		result = named_config_get(maps, "parental-source-v6", &obj);
+ 		INSIST(result == ISC_R_SUCCESS && obj != NULL);
+-		RETERR(dns_zone_setparentalsrc6(zone, cfg_obj_assockaddr(obj)));
++		CHECK(dns_zone_setparentalsrc6(zone, cfg_obj_assockaddr(obj)));
+ 		dscp = cfg_obj_getdscp(obj);
+ 		if (dscp == -1) {
+ 			dscp = named_g_dscp;
+ 		}
+-		RETERR(dns_zone_setparentalsrc6dscp(zone, dscp));
++		CHECK(dns_zone_setparentalsrc6dscp(zone, dscp));
+ 		named_add_reserved_dispatch(named_g_server,
+ 					    cfg_obj_assockaddr(obj));
+ 
+ 		obj = NULL;
+ 		result = named_config_get(maps, "notify-source", &obj);
+ 		INSIST(result == ISC_R_SUCCESS && obj != NULL);
+-		RETERR(dns_zone_setnotifysrc4(zone, cfg_obj_assockaddr(obj)));
++		CHECK(dns_zone_setnotifysrc4(zone, cfg_obj_assockaddr(obj)));
+ 		dscp = cfg_obj_getdscp(obj);
+ 		if (dscp == -1) {
+ 			dscp = named_g_dscp;
+ 		}
+-		RETERR(dns_zone_setnotifysrc4dscp(zone, dscp));
++		CHECK(dns_zone_setnotifysrc4dscp(zone, dscp));
+ 		named_add_reserved_dispatch(named_g_server,
+ 					    cfg_obj_assockaddr(obj));
+ 
+ 		obj = NULL;
+ 		result = named_config_get(maps, "notify-source-v6", &obj);
+ 		INSIST(result == ISC_R_SUCCESS && obj != NULL);
+-		RETERR(dns_zone_setnotifysrc6(zone, cfg_obj_assockaddr(obj)));
++		CHECK(dns_zone_setnotifysrc6(zone, cfg_obj_assockaddr(obj)));
+ 		dscp = cfg_obj_getdscp(obj);
+ 		if (dscp == -1) {
+ 			dscp = named_g_dscp;
+ 		}
+-		RETERR(dns_zone_setnotifysrc6dscp(zone, dscp));
++		CHECK(dns_zone_setnotifysrc6dscp(zone, dscp));
+ 		named_add_reserved_dispatch(named_g_server,
+ 					    cfg_obj_assockaddr(obj));
+ 
+@@ -1335,7 +1333,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 
+ 		dns_zone_setisself(zone, isself, named_g_server->interfacemgr);
+ 
+-		RETERR(configure_zone_acl(
++		CHECK(configure_zone_acl(
+ 			zconfig, vconfig, config, allow_transfer, ac, zone,
+ 			dns_zone_setxfracl, dns_zone_clearxfracl));
+ 
+@@ -1373,7 +1371,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 					    "%" PRId64 "' "
+ 					    "is too large",
+ 					    value);
+-				RETERR(ISC_R_RANGE);
++				CHECK(ISC_R_RANGE);
+ 			}
+ 			journal_size = (uint32_t)value;
+ 		}
+@@ -1515,7 +1513,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 					    "%" PRId64 "' "
+ 					    "is too large",
+ 					    value);
+-				RETERR(ISC_R_RANGE);
++				CHECK(ISC_R_RANGE);
+ 			}
+ 			journal_size = (uint32_t)value;
+ 		}
+@@ -1545,9 +1543,9 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 	if (ztype == dns_zone_primary) {
+ 		dns_acl_t *updateacl;
+ 
+-		RETERR(configure_zone_acl(
+-			zconfig, vconfig, config, allow_update, ac, mayberaw,
+-			dns_zone_setupdateacl, dns_zone_clearupdateacl));
++		CHECK(configure_zone_acl(zconfig, vconfig, config, allow_update,
++					 ac, mayberaw, dns_zone_setupdateacl,
++					 dns_zone_clearupdateacl));
+ 
+ 		updateacl = dns_zone_getupdateacl(mayberaw);
+ 		if (updateacl != NULL && dns_acl_isinsecure(updateacl)) {
+@@ -1558,7 +1556,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 				      zname);
+ 		}
+ 
+-		RETERR(configure_zone_ssutable(zoptions, mayberaw, zname));
++		CHECK(configure_zone_ssutable(zoptions, mayberaw, zname));
+ 	}
+ 
+ 	if (ztype == dns_zone_primary || raw != NULL) {
+@@ -1631,7 +1629,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 		result = named_config_get(maps, "key-directory", &obj);
+ 		if (result == ISC_R_SUCCESS) {
+ 			filename = cfg_obj_asstring(obj);
+-			RETERR(dns_zone_setkeydirectory(zone, filename));
++			CHECK(dns_zone_setkeydirectory(zone, filename));
+ 		}
+ 
+ 		obj = NULL;
+@@ -1673,8 +1671,8 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 		result = named_config_get(maps, "dnssec-loadkeys-interval",
+ 					  &obj);
+ 		INSIST(result == ISC_R_SUCCESS && obj != NULL);
+-		RETERR(dns_zone_setrefreshkeyinterval(zone,
+-						      cfg_obj_asuint32(obj)));
++		CHECK(dns_zone_setrefreshkeyinterval(zone,
++						     cfg_obj_asuint32(obj)));
+ 
+ 		obj = NULL;
+ 		result = cfg_map_get(zoptions, "auto-dnssec", &obj);
+@@ -1703,10 +1701,10 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 	}
+ 
+ 	if (ztype == dns_zone_secondary || ztype == dns_zone_mirror) {
+-		RETERR(configure_zone_acl(zconfig, vconfig, config,
+-					  allow_update_forwarding, ac, mayberaw,
+-					  dns_zone_setforwardacl,
+-					  dns_zone_clearforwardacl));
++		CHECK(configure_zone_acl(zconfig, vconfig, config,
++					 allow_update_forwarding, ac, mayberaw,
++					 dns_zone_setforwardacl,
++					 dns_zone_clearforwardacl));
+ 	}
+ 
+ 	/*%
+@@ -1718,7 +1716,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 		if (obj != NULL) {
+ 			dns_ipkeylist_t ipkl;
+ 			dns_ipkeylist_init(&ipkl);
+-			RETERR(named_config_getipandkeylist(
++			CHECK(named_config_getipandkeylist(
+ 				config, "parental-agents", obj, mctx, &ipkl));
+ 			result = dns_zone_setparentals(zone, ipkl.addrs,
+ 						       ipkl.keys, ipkl.count);
+@@ -1901,7 +1899,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 		(void)cfg_map_get(zoptions, "allow-transfer", &obj);
+ 		if (obj == NULL) {
+ 			dns_acl_t *none;
+-			RETERR(dns_acl_none(mctx, &none));
++			CHECK(dns_acl_none(mctx, &none));
+ 			dns_zone_setxfracl(zone, none);
+ 			dns_acl_detach(&none);
+ 		}
+@@ -1926,14 +1924,14 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 			result = named_config_getremotesdef(
+ 				named_g_config, "primaries",
+ 				DEFAULT_IANA_ROOT_ZONE_PRIMARIES, &obj);
+-			RETERR(result);
++			CHECK(result);
+ 		}
+ 		if (obj != NULL) {
+ 			dns_ipkeylist_t ipkl;
+ 			dns_ipkeylist_init(&ipkl);
+ 
+-			RETERR(named_config_getipandkeylist(config, "primaries",
+-							    obj, mctx, &ipkl));
++			CHECK(named_config_getipandkeylist(config, "primaries",
++							   obj, mctx, &ipkl));
+ 			result = dns_zone_setprimarieswithkeys(
+ 				mayberaw, ipkl.addrs, ipkl.keys, ipkl.count);
+ 			count = ipkl.count;
+@@ -1986,50 +1984,50 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 		obj = NULL;
+ 		result = named_config_get(maps, "transfer-source", &obj);
+ 		INSIST(result == ISC_R_SUCCESS && obj != NULL);
+-		RETERR(dns_zone_setxfrsource4(mayberaw,
+-					      cfg_obj_assockaddr(obj)));
++		CHECK(dns_zone_setxfrsource4(mayberaw,
++					     cfg_obj_assockaddr(obj)));
+ 		dscp = cfg_obj_getdscp(obj);
+ 		if (dscp == -1) {
+ 			dscp = named_g_dscp;
+ 		}
+-		RETERR(dns_zone_setxfrsource4dscp(mayberaw, dscp));
++		CHECK(dns_zone_setxfrsource4dscp(mayberaw, dscp));
+ 		named_add_reserved_dispatch(named_g_server,
+ 					    cfg_obj_assockaddr(obj));
+ 
+ 		obj = NULL;
+ 		result = named_config_get(maps, "transfer-source-v6", &obj);
+ 		INSIST(result == ISC_R_SUCCESS && obj != NULL);
+-		RETERR(dns_zone_setxfrsource6(mayberaw,
+-					      cfg_obj_assockaddr(obj)));
++		CHECK(dns_zone_setxfrsource6(mayberaw,
++					     cfg_obj_assockaddr(obj)));
+ 		dscp = cfg_obj_getdscp(obj);
+ 		if (dscp == -1) {
+ 			dscp = named_g_dscp;
+ 		}
+-		RETERR(dns_zone_setxfrsource6dscp(mayberaw, dscp));
++		CHECK(dns_zone_setxfrsource6dscp(mayberaw, dscp));
+ 		named_add_reserved_dispatch(named_g_server,
+ 					    cfg_obj_assockaddr(obj));
+ 
+ 		obj = NULL;
+ 		result = named_config_get(maps, "alt-transfer-source", &obj);
+ 		INSIST(result == ISC_R_SUCCESS && obj != NULL);
+-		RETERR(dns_zone_setaltxfrsource4(mayberaw,
+-						 cfg_obj_assockaddr(obj)));
++		CHECK(dns_zone_setaltxfrsource4(mayberaw,
++						cfg_obj_assockaddr(obj)));
+ 		dscp = cfg_obj_getdscp(obj);
+ 		if (dscp == -1) {
+ 			dscp = named_g_dscp;
+ 		}
+-		RETERR(dns_zone_setaltxfrsource4dscp(mayberaw, dscp));
++		CHECK(dns_zone_setaltxfrsource4dscp(mayberaw, dscp));
+ 
+ 		obj = NULL;
+ 		result = named_config_get(maps, "alt-transfer-source-v6", &obj);
+ 		INSIST(result == ISC_R_SUCCESS && obj != NULL);
+-		RETERR(dns_zone_setaltxfrsource6(mayberaw,
+-						 cfg_obj_assockaddr(obj)));
++		CHECK(dns_zone_setaltxfrsource6(mayberaw,
++						cfg_obj_assockaddr(obj)));
+ 		dscp = cfg_obj_getdscp(obj);
+ 		if (dscp == -1) {
+ 			dscp = named_g_dscp;
+ 		}
+-		RETERR(dns_zone_setaltxfrsource6dscp(mayberaw, dscp));
++		CHECK(dns_zone_setaltxfrsource6dscp(mayberaw, dscp));
+ 
+ 		obj = NULL;
+ 		(void)named_config_get(maps, "use-alt-transfer-source", &obj);
+@@ -2057,15 +2055,21 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 		break;
+ 
+ 	case dns_zone_staticstub:
+-		RETERR(configure_staticstub(zoptions, zone, zname,
+-					    default_dbtype));
++		CHECK(configure_staticstub(zoptions, zone, zname,
++					   default_dbtype));
+ 		break;
+ 
+ 	default:
+ 		break;
+ 	}
+ 
+-	return (ISC_R_SUCCESS);
++	result = ISC_R_SUCCESS;
++
++cleanup:
++	if (kasp != NULL) {
++		dns_kasp_detach(&kasp);
++	}
++	return (result);
+ }
+ 
+ /*
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 787a52c..6a62de0 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -5818,11 +5818,11 @@ dns_zone_setkasp(dns_zone_t *zone, dns_kasp_t *kasp) {
+ 
+ 	LOCK_ZONE(zone);
+ 	if (zone->kasp != NULL) {
+-		dns_kasp_t *oldkasp = zone->kasp;
+-		zone->kasp = NULL;
+-		dns_kasp_detach(&oldkasp);
++		dns_kasp_detach(&zone->kasp);
++	}
++	if (kasp != NULL) {
++		dns_kasp_attach(kasp, &zone->kasp);
+ 	}
+-	zone->kasp = kasp;
+ 	UNLOCK_ZONE(zone);
+ }
+ 
+-- 
+2.33.0
+
diff --git a/backport-Fix-fetch-context-use-after-free-bugs.patch b/backport-Fix-fetch-context-use-after-free-bugs.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1f3049236657fd3535b2d2172e52511c23ae59a6
--- /dev/null
+++ b/backport-Fix-fetch-context-use-after-free-bugs.patch
@@ -0,0 +1,95 @@
+From 6505056267dffada1d0fa326f318b241f4b64747 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
+Date: Fri, 8 Jul 2022 11:26:34 +0200
+Subject: [PATCH] Fix fetch context use-after-free bugs
+
+fctx_decreference() may call fctx_destroy(), which in turn may free the
+fetch context by calling isc_mem_putanddetach().  This means that
+whenever fctx_decreference() is called, the fetch context pointer should
+be assumed to point to garbage after that call.  Meanwhile, the
+following pattern is used in several places in lib/dns/resolver.c:
+
+    LOCK(&res->buckets[fctx->bucketnum].lock);
+    bucket_empty = fctx_decreference(fctx);
+    UNLOCK(&res->buckets[fctx->bucketnum].lock);
+
+Given that 'fctx' may be freed by the fctx_decreference() call, there is
+no guarantee that the value of fctx->bucketnum will be the same before
+and after the fctx_decreference() call.  This can cause all kinds of
+locking issues as LOCK() calls no longer match up with their UNLOCK()
+counterparts.
+
+Fix by always using a helper variable to hold the bucket number when the
+pattern above is used.
+
+Note that fctx_try() still uses 'fctx' after calling fctx_decreference()
+(it calls fctx_done()).  This is safe to do because the reference count
+for 'fctx' is increased a few lines earlier and it also cannot be zero
+right before that increase happens, so the fctx_decreference() call in
+that particular location never invokes fctx_destroy().  Nevertheless,
+use a helper variable for that call site as well, to retain consistency
+and to prevent copy-pasted code from causing similar problems in the
+future.
+---
+ lib/dns/resolver.c | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
+index 15297024c0e..154248ec891 100644
+--- a/lib/dns/resolver.c
++++ b/lib/dns/resolver.c
+@@ -4357,9 +4357,9 @@ fctx_try(fetchctx_t *fctx, bool retrying, bool badcache) {
+ 			options, 0, fctx->qc, task, resume_qmin, fctx,
+ 			&fctx->qminrrset, NULL, &fctx->qminfetch);
+ 		if (result != ISC_R_SUCCESS) {
+-			LOCK(&fctx->res->buckets[fctx->bucketnum].lock);
++			LOCK(&res->buckets[bucketnum].lock);
+ 			RUNTIME_CHECK(!fctx_decreference(fctx));
+-			UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
++			UNLOCK(&res->buckets[bucketnum].lock);
+ 			fctx_done(fctx, DNS_R_SERVFAIL, __LINE__);
+ 		}
+ 		return;
+@@ -6138,9 +6138,9 @@ cleanup_event:
+ 	dns_message_detach(&message);
+ 	isc_event_free(&event);
+ 
+-	LOCK(&res->buckets[fctx->bucketnum].lock);
++	LOCK(&res->buckets[bucketnum].lock);
+ 	bucket_empty = fctx_decreference(fctx);
+-	UNLOCK(&res->buckets[fctx->bucketnum].lock);
++	UNLOCK(&res->buckets[bucketnum].lock);
+ 	if (bucket_empty) {
+ 		empty_bucket(res);
+ 	}
+@@ -7528,6 +7528,7 @@ resume_dslookup(isc_task_t *task, isc_event_t *event) {
+ 	dns_resolver_t *res;
+ 	fetchctx_t *fctx;
+ 	isc_result_t result;
++	uint32_t bucketnum;
+ 	bool bucket_empty;
+ 	dns_rdataset_t nameservers;
+ 	dns_fixedname_t fixed;
+@@ -7538,6 +7539,7 @@ resume_dslookup(isc_task_t *task, isc_event_t *event) {
+ 	fctx = event->ev_arg;
+ 	REQUIRE(VALID_FCTX(fctx));
+ 	res = fctx->res;
++	bucketnum = fctx->bucketnum;
+ 
+ 	UNUSED(task);
+ 	FCTXTRACE("resume_dslookup");
+@@ -7665,9 +7667,9 @@ cleanup:
+ 	if (dns_rdataset_isassociated(&nameservers)) {
+ 		dns_rdataset_disassociate(&nameservers);
+ 	}
+-	LOCK(&res->buckets[fctx->bucketnum].lock);
++	LOCK(&res->buckets[bucketnum].lock);
+ 	bucket_empty = fctx_decreference(fctx);
+-	UNLOCK(&res->buckets[fctx->bucketnum].lock);
++	UNLOCK(&res->buckets[bucketnum].lock);
+ 	if (bucket_empty) {
+ 		empty_bucket(res);
+ 	}
+-- 
+GitLab
+
diff --git a/backport-Fix-logging-a-uint32_t-SOA-serial-value-in-dns_catz_update_from_db.patch b/backport-Fix-logging-a-uint32_t-SOA-serial-value-in-dns_catz_update_from_db.patch
new file mode 100644
index 0000000000000000000000000000000000000000..16ba0eb53b7d1c24aadafc8518f3d6175bece17a
--- /dev/null
+++ b/backport-Fix-logging-a-uint32_t-SOA-serial-value-in-dns_catz_update_from_db.patch
@@ -0,0 +1,34 @@
+From a634488a24f9be05d50a4a67f0d2bf4182161697 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Wed, 14 Dec 2022 14:40:31 +0000
+Subject: [PATCH] Fix logging a uint32_t SOA serial value in
+ dns_catz_update_from_db()
+
+The dns_catz_update_from_db() function prints serial number as a signed
+number (with "%d" in the format string), but the `vers` variable's type
+is 'uint32_t'. This breaks serials bigger than 2^31.
+
+Use PRIu32 instead of "d" in the format string.
+
+(cherry picked from commit 72b1760ea6cd415efe9868aad97c982fea8b0a42)
+---
+ lib/dns/catz.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/dns/catz.c b/lib/dns/catz.c
+index 49ad9bf37b..8a552d1259 100644
+--- a/lib/dns/catz.c
++++ b/lib/dns/catz.c
+@@ -1874,8 +1874,8 @@ dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) {
+ 
+ 	isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_MASTER,
+ 		      ISC_LOG_INFO,
+-		      "catz: updating catalog zone '%s' with serial %d", bname,
+-		      vers);
++		      "catz: updating catalog zone '%s' with serial %" PRIu32,
++		      bname, vers);
+ 
+ 	result = dns_catz_new_zone(catzs, &newzone, &db->origin);
+ 	if (result != ISC_R_SUCCESS) {
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Fix-memory-leak-in-dns_message_checksig-SIG-0-sigs.patch b/backport-Fix-memory-leak-in-dns_message_checksig-SIG-0-sigs.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2cc2d249895bd9b0f6af97de151646bef8e56d69
--- /dev/null
+++ b/backport-Fix-memory-leak-in-dns_message_checksig-SIG-0-sigs.patch
@@ -0,0 +1,30 @@
+From 3e77d6bf87f4a8c8793c9dd2a506432a24a4366c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= <pspacek@isc.org>
+Date: Mon, 19 Sep 2022 09:07:51 +0200
+Subject: [PATCH] Fix memory leak in dns_message_checksig() - SIG(0) sigs
+
+Impact should be visible only in tests or tools because named never
+uses view == NULL, which is a necessary condition to trigger this leak.
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/3e77d6bf87f4a8c8793c9dd2a506432a24a4366c
+(cherry picked from commit 69256b3553d3b8b73b6fa4de9b030b39f1b96d34)
+---
+ lib/dns/message.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/dns/message.c b/lib/dns/message.c
+index 0b5d9355e5..7b3d72abd9 100644
+--- a/lib/dns/message.c
++++ b/lib/dns/message.c
+@@ -3227,7 +3227,8 @@ dns_message_checksig(dns_message_t *msg, dns_view_t *view) {
+ 
+ 		dns_rdataset_init(&keyset);
+ 		if (view == NULL) {
+-			return (DNS_R_KEYUNAUTHORIZED);
++			result = DNS_R_KEYUNAUTHORIZED;
++			goto freesig;
+ 		}
+ 		result = dns_view_simplefind(view, &sig.signer,
+ 					     dns_rdatatype_key /* SIG(0) */, 0,
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Fix-ns_statscounter_recursclients-counting-bug.patch b/backport-Fix-ns_statscounter_recursclients-counting-bug.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8499382ccc25352b1c4e24134fe6f38ff29c2a4e
--- /dev/null
+++ b/backport-Fix-ns_statscounter_recursclients-counting-bug.patch
@@ -0,0 +1,39 @@
+From b6aeccf697729c4c721fc71da7063bb18a89c751 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Tue, 18 Oct 2022 08:54:04 +0000
+Subject: [PATCH] Fix ns_statscounter_recursclients counting bug
+
+The incrementing and decrementing of 'ns_statscounter_recursclients'
+were not properly balanced: for example, it would be incremented for
+a prefetch query but not decremented if the query failed.
+
+This commit ensures that the recursion quota and the recursive clients
+counter are always in sync with each other.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/b6aeccf697729c4c721fc71da7063bb18a89c751
+(cherry picked from commit 82991451b41793af201d070aba654c4ea89819cb)
+---
+ lib/ns/client.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/lib/ns/client.c b/lib/ns/client.c
+index 41d3fa0..dc8a10a 100644
+--- a/lib/ns/client.c
++++ b/lib/ns/client.c
+@@ -242,10 +242,8 @@ ns_client_endrequest(ns_client_t *client) {
+ 	 */
+ 	if (client->recursionquota != NULL) {
+ 		isc_quota_detach(&client->recursionquota);
+-		if (client->query.prefetch == NULL) {
+-			ns_stats_decrement(client->sctx->nsstats,
+-					   ns_statscounter_recursclients);
+-		}
++	        ns_stats_decrement(client->sctx->nsstats,
++		                   ns_statscounter_recursclients);
+ 	}
+ 
+ 	/*
+-- 
+2.33.0
+
diff --git a/backport-Fix-rndc-dumpdb-expired-for-stuck-cache-contents.patch b/backport-Fix-rndc-dumpdb-expired-for-stuck-cache-contents.patch
new file mode 100644
index 0000000000000000000000000000000000000000..eb1ab532d44d2ba7ec6629d63b09be1971e9c01f
--- /dev/null
+++ b/backport-Fix-rndc-dumpdb-expired-for-stuck-cache-contents.patch
@@ -0,0 +1,107 @@
+From f8ad7501dcc3a4008764c5bdd78ae65622c8b905 Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Wed, 20 Jul 2022 11:22:01 +0200
+Subject: [PATCH] Fix rndc dumpdb -expired for stuck cache contents
+
+The command 'rndc dumpdb -expired' will include expired RRsets in the
+output, but only for the RBTDB_VIRTUAL time (of 5 minutes). This means
+that if there is a cache cleaning problem and contents are not cleaned
+up, the rndc command has little diagnostic value. Fix this by including
+all RRsets in the dumpdb output if the '-expired' flag is set.
+
+(cherry picked from commit 930ba2c914a0abc07fd087d663a7bfb57850d4ca)
+---
+ lib/dns/rbtdb.c | 43 +++++++------------------------------------
+ 1 file changed, 7 insertions(+), 36 deletions(-)
+
+diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
+index 87944980ec0..75832e32085 100644
+--- a/lib/dns/rbtdb.c
++++ b/lib/dns/rbtdb.c
+@@ -9102,15 +9102,10 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) {
+ 	dns_rbtnode_t *rbtnode = rbtiterator->common.node;
+ 	rbtdb_version_t *rbtversion = rbtiterator->common.version;
+ 	rdatasetheader_t *header, *top_next;
+-	rbtdb_serial_t serial;
+-	isc_stdtime_t now;
++	rbtdb_serial_t serial = 1;
+ 
+-	if (IS_CACHE(rbtdb)) {
+-		serial = 1;
+-		now = rbtiterator->common.now;
+-	} else {
++	if (!IS_CACHE(rbtdb)) {
+ 		serial = rbtversion->serial;
+-		now = 0;
+ 	}
+ 
+ 	NODE_LOCK(&rbtdb->node_locks[rbtnode->locknum].lock,
+@@ -9122,19 +9117,9 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) {
+ 			if (header->serial <= serial && !IGNORE(header)) {
+ 				/*
+ 				 * Is this a "this rdataset doesn't exist"
+-				 * record?  Or is it too old in the cache?
+-				 *
+-				 * Note: unlike everywhere else, we
+-				 * check for now > header->rdh_ttl instead
+-				 * of ">=".  This allows ANY and RRSIG
+-				 *  queries for 0 TTL rdatasets to work.
++				 * record?
+ 				 */
+-				if (NONEXISTENT(header) ||
+-				    (now != 0 &&
+-				     (now - RBTDB_VIRTUAL) >
+-					     header->rdh_ttl +
+-						     rbtdb->serve_stale_ttl))
+-				{
++				if (NONEXISTENT(header)) {
+ 					header = NULL;
+ 				}
+ 				break;
+@@ -9166,22 +9151,17 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator) {
+ 	dns_rbtnode_t *rbtnode = rbtiterator->common.node;
+ 	rbtdb_version_t *rbtversion = rbtiterator->common.version;
+ 	rdatasetheader_t *header, *top_next;
+-	rbtdb_serial_t serial;
+-	isc_stdtime_t now;
+ 	rbtdb_rdatatype_t type, negtype;
+ 	dns_rdatatype_t rdtype, covers;
++	rbtdb_serial_t serial = 1;
+ 
+ 	header = rbtiterator->current;
+ 	if (header == NULL) {
+ 		return (ISC_R_NOMORE);
+ 	}
+ 
+-	if (IS_CACHE(rbtdb)) {
+-		serial = 1;
+-		now = rbtiterator->common.now;
+-	} else {
++	if (!IS_CACHE(rbtdb)) {
+ 		serial = rbtversion->serial;
+-		now = 0;
+ 	}
+ 
+ 	NODE_LOCK(&rbtdb->node_locks[rbtnode->locknum].lock,
+@@ -9207,17 +9187,8 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator) {
+ 					/*
+ 					 * Is this a "this rdataset doesn't
+ 					 * exist" record?
+-					 *
+-					 * Note: unlike everywhere else, we
+-					 * check for now > header->ttl instead
+-					 * of ">=".  This allows ANY and RRSIG
+-					 * queries for 0 TTL rdatasets to work.
+ 					 */
+-					if (NONEXISTENT(header) ||
+-					    (now != 0 &&
+-					     (now - RBTDB_VIRTUAL) >
+-						     header->rdh_ttl))
+-					{
++					if (NONEXISTENT(header)) {
+ 						header = NULL;
+ 					}
+ 					break;
+-- 
+GitLab
+
diff --git a/backport-Fix-tkey-buildquery-function-s-error-handling.patch b/backport-Fix-tkey-buildquery-function-s-error-handling.patch
new file mode 100644
index 0000000000000000000000000000000000000000..666c931a8723f3ecd0a188435b6451a834ae50f0
--- /dev/null
+++ b/backport-Fix-tkey-buildquery-function-s-error-handling.patch
@@ -0,0 +1,38 @@
+From eb72c81e6ac422f2332c6e8410461b3c0c9067b2 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Mon, 15 Aug 2022 11:40:21 +0000
+Subject: [PATCH] Fix tkey.c:buildquery() function's error handling
+
+Add the missing cleanup code.
+
+(cherry picked from commit 4237ab9550eeaea7121e3e3392fd14c26b5150f0)
+---
+ lib/dns/tkey.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
+index 9259a513188..2ca78b8bd9b 100644
+--- a/lib/dns/tkey.c
++++ b/lib/dns/tkey.c
+@@ -1019,6 +1019,18 @@ failure:
+ 	if (dynbuf != NULL) {
+ 		isc_buffer_free(&dynbuf);
+ 	}
++	if (rdata != NULL) {
++		dns_message_puttemprdata(msg, &rdata);
++	}
++	if (tkeylist != NULL) {
++		dns_message_puttemprdatalist(msg, &tkeylist);
++	}
++	if (tkeyset != NULL) {
++		if (dns_rdataset_isassociated(tkeyset)) {
++			dns_rdataset_disassociate(tkeyset);
++		}
++		dns_message_puttemprdataset(msg, &tkeyset);
++	}
+ 	return (result);
+ }
+ 
+-- 
+GitLab
+
diff --git a/backport-Fix-view-s-zones-reverting-bug-during-reconfiguration.patch b/backport-Fix-view-s-zones-reverting-bug-during-reconfiguration.patch
new file mode 100644
index 0000000000000000000000000000000000000000..49ab6d49528a1e38790abc97dc5b610d255a0a5f
--- /dev/null
+++ b/backport-Fix-view-s-zones-reverting-bug-during-reconfiguration.patch
@@ -0,0 +1,90 @@
+From 2fba2822067cd54ce8f30bf5b7c07076fc99368c Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Wed, 1 Mar 2023 12:30:46 +0000
+Subject: [PATCH] Fix view's zones reverting bug during reconfiguration
+
+During reconfiguration, the configure_view() function reverts the
+configured zones to the previous view in case if there is an error.
+
+It uses the 'zones_configured' boolean variable to decide whether
+it is required to revert the zones, i.e. the error happened after
+all the zones were successfully configured.
+
+The problem is that it does not account for the case when an error
+happens during the configuration of one of the zones (not the first),
+in which case there are zones that are already configured for the
+new view (and they need to be reverted), and there are zones that
+are not (starting from the failed one).
+
+Since 'zones_configured' remains 'false', the configured zones are
+not reverted.
+
+Replace the 'zones_configured' variable with a pointer to the latest
+successfully configured zone configuration element, and when reverting,
+revert up to and including that zone.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/2fba2822067cd54ce8f30bf5b7c07076fc99368c
+
+(cherry picked from commit 84c235a4b0477a34c0ac2054af98b39efc5b0df5)
+---
+ bin/named/server.c | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/bin/named/server.c b/bin/named/server.c
+index 4ab75044f6..6695fb6286 100644
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -3979,7 +3979,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
+ 	const cfg_obj_t *dyndb_list, *plugin_list;
+ 	const cfg_obj_t *disabled;
+ 	const cfg_obj_t *obj, *obj2;
+-	const cfg_listelt_t *element;
++	const cfg_listelt_t *element = NULL;
++	const cfg_listelt_t *zone_element_latest = NULL;
+ 	in_port_t port;
+ 	dns_cache_t *cache = NULL;
+ 	isc_result_t result;
+@@ -3996,7 +3997,6 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
+ 	dns_dispatch_t *dispatch6 = NULL;
+ 	bool rpz_configured = false;
+ 	bool catz_configured = false;
+-	bool zones_configured = false;
+ 	bool reused_cache = false;
+ 	bool shared_cache = false;
+ 	int i = 0, j = 0, k = 0;
+@@ -4100,8 +4100,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
+ 		CHECK(configure_zone(config, zconfig, vconfig, mctx, view,
+ 				     viewlist, kasplist, actx, false,
+ 				     old_rpz_ok, false));
++		zone_element_latest = element;
+ 	}
+-	zones_configured = true;
+ 
+ 	/*
+ 	 * Check that a master or slave zone was found for each
+@@ -5907,7 +5907,7 @@ cleanup:
+ 			dns_view_detach(&pview);
+ 		}
+ 
+-		if (zones_configured) {
++		if (zone_element_latest != NULL) {
+ 			for (element = cfg_list_first(zonelist);
+ 			     element != NULL; element = cfg_list_next(element))
+ 			{
+@@ -5915,6 +5915,13 @@ cleanup:
+ 					cfg_listelt_value(element);
+ 				configure_zone_setviewcommit(result, zconfig,
+ 							     view);
++				if (element == zone_element_latest) {
++					/*
++					 * This was the latest element that was
++					 * successfully configured earlier.
++					 */
++					break;
++				}
+ 			}
+ 		}
+ 	}
+-- 
+2.23.0
diff --git a/backport-Free-n-on-error-path-in-rsa_check.patch b/backport-Free-n-on-error-path-in-rsa_check.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e29cbccdfd6475e8ff5c645f0c4c7f4f0d236cd5
--- /dev/null
+++ b/backport-Free-n-on-error-path-in-rsa_check.patch
@@ -0,0 +1,28 @@
+From 2c8e38f359bb90bcec67419ce95d2eee81bfd7a2 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Mon, 26 Sep 2022 12:05:33 +1000
+Subject: [PATCH] Free 'n' on error path in rsa_check
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/2c8e38f359bb90bcec67419ce95d2eee81bfd7a2
+(cherry picked from commit 483c5a19781b0930c6e72bb2b498130c3f83d13f)
+---
+ lib/dns/opensslrsa_link.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
+index b744a62df9..9bee2f0449 100644
+--- a/lib/dns/opensslrsa_link.c
++++ b/lib/dns/opensslrsa_link.c
+@@ -852,6 +852,9 @@ rsa_check(RSA *rsa, RSA *pub) {
+ 		}
+ 		if (e1 != NULL) {
+ 			if (BN_cmp(e1, e2) != 0) {
++				if (n != NULL) {
++					BN_free(n);
++				}
+ 				return (DST_R_INVALIDPRIVATEKEY);
+ 			}
+ 		} else {
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Free-rsa-if-e-is-NULL-in-opensslrsa_verify2.patch b/backport-Free-rsa-if-e-is-NULL-in-opensslrsa_verify2.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d5b552488d51cd78bafed7436259de8375266c56
--- /dev/null
+++ b/backport-Free-rsa-if-e-is-NULL-in-opensslrsa_verify2.patch
@@ -0,0 +1,29 @@
+From 6f1e04409a24b275d756fdddc1ed8fffc2d48254 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Mon, 26 Sep 2022 11:51:05 +1000
+Subject: [PATCH] Free 'rsa' if 'e' is NULL in opensslrsa_verify2
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/6f1e04409a24b275d756fdddc1ed8fffc2d48254
+(cherry picked from commit a2b51ca6acae9e1c819e0d2e4aa1584b675c4cb7)
+---
+ lib/dns/opensslrsa_link.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
+index b0d8dd85b9..7aa743394b 100644
+--- a/lib/dns/opensslrsa_link.c
++++ b/lib/dns/opensslrsa_link.c
+@@ -333,6 +333,10 @@ opensslrsa_verify2(dst_context_t *dctx, int maxbits, const isc_region_t *sig) {
+ 		return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
+ 	}
+ 	RSA_get0_key(rsa, NULL, &e, NULL);
++	if (e == NULL) {
++		RSA_free(rsa);
++		return (dst__openssl_toresult(DST_R_VERIFYFAILURE));
++	}
+ 	bits = BN_num_bits(e);
+ 	RSA_free(rsa);
+ 	if (bits > maxbits && maxbits != 0) {
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-In-hmac_createctx-free-ctx-on-isc_hmac_init-failure.patch b/backport-In-hmac_createctx-free-ctx-on-isc_hmac_init-failure.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b70a8194d5d392175e34623ca1b9645bb60ac100
--- /dev/null
+++ b/backport-In-hmac_createctx-free-ctx-on-isc_hmac_init-failure.patch
@@ -0,0 +1,27 @@
+From d0c92a31a997d8c2fa48dd3a2ed90b11e54cfabf Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Fri, 17 Feb 2023 11:44:45 +1100
+Subject: [PATCH] In hmac_createctx free ctx on isc_hmac_init failure
+
+Conflict: NA 
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/d0c92a31a997d8c2fa48dd3a2ed90b11e54cfabf
+
+(cherry picked from commit d22257a370c69060e17a466db7698c96e23526b5)
+---
+ lib/dns/hmac_link.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c
+index d839f1123b..2872ff2c89 100644
+--- a/lib/dns/hmac_link.c
++++ b/lib/dns/hmac_link.c
+@@ -170,6 +170,7 @@ hmac_createctx(const isc_md_type_t *type, const dst_key_t *key,
+ 	result = isc_hmac_init(ctx, hkey->key, isc_md_type_get_block_size(type),
+ 			       type);
+ 	if (result != ISC_R_SUCCESS) {
++		isc_hmac_free(ctx);
+ 		return (DST_R_UNSUPPORTEDALG);
+ 	}
+ 
+-- 
+2.23.0
diff --git a/backport-Increase-the-BUFSIZ-long-buffers.patch b/backport-Increase-the-BUFSIZ-long-buffers.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0024ff66c061b5cd9361620267ca5ea852d21ed9
--- /dev/null
+++ b/backport-Increase-the-BUFSIZ-long-buffers.patch
@@ -0,0 +1,123 @@
+From c1b8f5f30c602fd39f0f92523485587c3c32708d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Thu, 14 Jul 2022 13:48:45 +0200
+Subject: [PATCH] Increase the BUFSIZ-long buffers
+
+The BUFSIZ value varies between platforms, it could be 8K on Linux and
+512 bytes on mingw.  Make sure the buffers are always big enough for the
+output data to prevent truncation of the output by appropriately
+enlarging or sizing the buffers.
+
+(cherry picked from commit b19d932262e84608174cb89eeed32ae0212f8a87)
+---
+ bin/named/server.c              |  7 ++++++-
+ bin/tests/system/feature-test.c | 13 +++++--------
+ lib/dns/private.c               |  3 ++-
+ lib/ns/client.c                 |  7 ++++++-
+ 4 files changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/bin/named/server.c b/bin/named/server.c
+index d3595c37a19..c339cfbc54b 100644
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -14582,7 +14582,12 @@ named_server_signing(named_server_t *server, isc_lex_t *lex,
+ 		     result = dns_rdataset_next(&privset))
+ 		{
+ 			dns_rdata_t priv = DNS_RDATA_INIT;
+-			char output[BUFSIZ];
++			/*
++			 * In theory, the output buffer could hold a full RDATA
++			 * record which is 16-bit and then some text around
++			 * it
++			 */
++			char output[UINT16_MAX + BUFSIZ];
+ 			isc_buffer_t buf;
+ 
+ 			dns_rdataset_current(&privset, &priv);
+diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c
+index 4f422323434..99e1b80bb1d 100644
+--- a/bin/tests/system/feature-test.c
++++ b/bin/tests/system/feature-test.c
+@@ -11,6 +11,7 @@
+  * information regarding copyright ownership.
+  */
+ 
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -26,13 +27,9 @@
+ #include <Winsock2.h>
+ #endif /* ifdef WIN32 */
+ 
+-#ifndef MAXHOSTNAMELEN
+-#ifdef HOST_NAME_MAX
+-#define MAXHOSTNAMELEN HOST_NAME_MAX
+-#else /* ifdef HOST_NAME_MAX */
+-#define MAXHOSTNAMELEN 256
+-#endif /* ifdef HOST_NAME_MAX */
+-#endif /* ifndef MAXHOSTNAMELEN */
++#ifndef _POSIX_HOST_NAME_MAX
++#define _POSIX_HOST_NAME_MAX 255
++#endif
+ 
+ static void
+ usage() {
+@@ -86,7 +83,7 @@ main(int argc, char **argv) {
+ 	}
+ 
+ 	if (strcmp(argv[1], "--gethostname") == 0) {
+-		char hostname[MAXHOSTNAMELEN];
++		char hostname[_POSIX_HOST_NAME_MAX + 1];
+ 		int n;
+ #ifdef WIN32
+ 		/* From InitSocket() */
+diff --git a/lib/dns/private.c b/lib/dns/private.c
+index 58deda095a9..cbf947f8ccc 100644
+--- a/lib/dns/private.c
++++ b/lib/dns/private.c
+@@ -383,7 +383,8 @@ dns_private_totext(dns_rdata_t *private, isc_buffer_t *buf) {
+ 	} else if (private->length == 5) {
+ 		unsigned char alg = private->data[0];
+ 		dns_keytag_t keyid = (private->data[2] | private->data[1] << 8);
+-		char keybuf[BUFSIZ], algbuf[DNS_SECALG_FORMATSIZE];
++		char keybuf[DNS_SECALG_FORMATSIZE + BUFSIZ],
++			algbuf[DNS_SECALG_FORMATSIZE];
+ 		bool del = private->data[3];
+ 		bool complete = private->data[4];
+ 
+diff --git a/lib/ns/client.c b/lib/ns/client.c
+index bf60746642d..54c35986b85 100644
+--- a/lib/ns/client.c
++++ b/lib/ns/client.c
+@@ -12,6 +12,7 @@
+  */
+ 
+ #include <inttypes.h>
++#include <limits.h>
+ #include <stdbool.h>
+ 
+ #include <isc/aes.h>
+@@ -64,6 +65,10 @@
+ #include <ns/stats.h>
+ #include <ns/update.h>
+ 
++#ifndef _POSIX_HOST_NAME_MAX
++#define _POSIX_HOST_NAME_MAX 255
++#endif
++
+ /***
+  *** Client
+  ***/
+@@ -918,7 +923,7 @@ isc_result_t
+ ns_client_addopt(ns_client_t *client, dns_message_t *message,
+ 		 dns_rdataset_t **opt) {
+ 	unsigned char ecs[ECS_SIZE];
+-	char nsid[BUFSIZ], *nsidp;
++	char nsid[_POSIX_HOST_NAME_MAX + 1], *nsidp = NULL;
+ 	unsigned char cookie[COOKIE_SIZE];
+ 	isc_result_t result;
+ 	dns_view_t *view;
+-- 
+GitLab
+
diff --git a/backport-Inherit-dnssec-policy-in-check-for-inline-signing.patch b/backport-Inherit-dnssec-policy-in-check-for-inline-signing.patch
new file mode 100644
index 0000000000000000000000000000000000000000..59ccdc7b3858034fede0f14764c54733bf753e0e
--- /dev/null
+++ b/backport-Inherit-dnssec-policy-in-check-for-inline-signing.patch
@@ -0,0 +1,67 @@
+From 0d5e0867df94c05b7523b89e0a4135c0cec728e1 Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Mon, 11 Jul 2022 10:30:44 +0200
+Subject: [PATCH] Inherit dnssec-policy in check for inline-signing
+
+When dnssec-policy is used, and the zone is not dynamic, BIND will
+assume that the zone is inline-signed. But the function responsible
+for this did not inherit the dnssec-policy option from the view or
+options level, and thus never enabled inline-signing, while the zone
+should have been.
+
+This is fixed by this commit.
+
+(cherry picked from commit 576b21b1682605a7d04e51c8a7721180f828b2d7)
+---
+ bin/named/zoneconf.c | 28 ++++++++++++++++++----------
+ 1 file changed, 18 insertions(+), 10 deletions(-)
+
+diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
+index 7a414201709..d1d45d818bc 100644
+--- a/bin/named/zoneconf.c
++++ b/bin/named/zoneconf.c
+@@ -2171,6 +2171,7 @@ named_zone_inlinesigning(dns_zone_t *zone, const cfg_obj_t *zconfig,
+ 	const cfg_obj_t *updatepolicy = NULL;
+ 	bool zone_is_dynamic = false;
+ 	bool inline_signing = false;
++	bool dnssec_policy = false;
+ 
+ 	(void)cfg_map_get(config, "options", &options);
+ 
+@@ -2222,16 +2223,23 @@ named_zone_inlinesigning(dns_zone_t *zone, const cfg_obj_t *zconfig,
+ 	 * inline-signing.
+ 	 */
+ 	signing = NULL;
+-	if (!inline_signing && !zone_is_dynamic &&
+-	    cfg_map_get(zoptions, "dnssec-policy", &signing) == ISC_R_SUCCESS &&
+-	    signing != NULL)
+-	{
+-		if (strcmp(cfg_obj_asstring(signing), "none") != 0) {
+-			inline_signing = true;
+-			dns_zone_log(zone, ISC_LOG_DEBUG(1),
+-				     "inline-signing: "
+-				     "implicitly through dnssec-policy");
+-		}
++	res = cfg_map_get(zoptions, "dnssec-policy", &signing);
++	if (res != ISC_R_SUCCESS && voptions != NULL) {
++		res = cfg_map_get(voptions, "dnssec-policy", &signing);
++	}
++	if (res != ISC_R_SUCCESS && options != NULL) {
++		res = cfg_map_get(options, "dnssec-policy", &signing);
++	}
++	if (res == ISC_R_SUCCESS) {
++		dnssec_policy = (strcmp(cfg_obj_asstring(signing), "none") !=
++				 0);
++	}
++
++	if (!inline_signing && !zone_is_dynamic && dnssec_policy) {
++		inline_signing = true;
++		dns_zone_log(zone, ISC_LOG_DEBUG(1),
++			     "inline-signing: "
++			     "implicitly through dnssec-policy");
+ 	}
+ 
+ 	return (inline_signing);
+-- 
+GitLab
+
diff --git a/backport-Make-isc_ht_init-and-isc_ht_iter_create-return-void.patch b/backport-Make-isc_ht_init-and-isc_ht_iter_create-return-void.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d340c05d6bbfe04d53ef113023e661ff0cbd52c5
--- /dev/null
+++ b/backport-Make-isc_ht_init-and-isc_ht_iter_create-return-void.patch
@@ -0,0 +1,408 @@
+From ba89da052a025928823055614e3f43fe8f8e3ef8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Tue, 8 Mar 2022 11:22:55 +0100
+Subject: [PATCH] Make isc_ht_init() and isc_ht_iter_create() return void
+
+Previously, the function(s) in the commit subject could fail for various
+reasons - mostly allocation failures, or other functions returning
+different return code than ISC_R_SUCCESS.  Now, the aforementioned
+function(s) cannot ever fail and they would always return ISC_R_SUCCESS.
+
+Change the function(s) to return void and remove the extra checks in
+the code that uses them.
+
+Conflict:NA
+Reference:https://gitlab.isc.org/isc-projects/bind9/-/commit/ba89da052a025928823055614e3f43fe8f8e3ef8.patch
+
+(cherry picked from commit 8fa27365ec8ea47b498ea64a9b72553c0b662b6b)
+---
+ bin/plugins/filter-aaaa.c |  4 +-
+ lib/dns/catz.c            | 82 ++++++++++-----------------------------
+ lib/dns/rpz.c             | 29 ++------------
+ lib/isc/ht.c              |  7 +---
+ lib/isc/include/isc/ht.h  | 13 +++----
+ lib/isc/tests/ht_test.c   |  9 ++---
+ 6 files changed, 35 insertions(+), 109 deletions(-)
+
+diff --git a/bin/plugins/filter-aaaa.c b/bin/plugins/filter-aaaa.c
+index 1db3ca2..c390b45 100644
+--- a/bin/plugins/filter-aaaa.c
++++ b/bin/plugins/filter-aaaa.c
+@@ -337,7 +337,7 @@ plugin_register(const char *parameters, const void *cfg, const char *cfg_file,
+ 		unsigned long cfg_line, isc_mem_t *mctx, isc_log_t *lctx,
+ 		void *actx, ns_hooktable_t *hooktable, void **instp) {
+ 	filter_instance_t *inst = NULL;
+-	isc_result_t result;
++	isc_result_t result = ISC_R_SUCCESS;
+ 
+ 	isc_log_write(lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_HOOKS,
+ 		      ISC_LOG_INFO,
+@@ -355,7 +355,7 @@ plugin_register(const char *parameters, const void *cfg, const char *cfg_file,
+ 	}
+ 
+ 	isc_mempool_create(mctx, sizeof(filter_data_t), &inst->datapool);
+-	CHECK(isc_ht_init(&inst->ht, mctx, 16));
++	isc_ht_init(&inst->ht, mctx, 16);
+ 	isc_mutex_init(&inst->hlock);
+ 
+ 	/*
+diff --git a/lib/dns/catz.c b/lib/dns/catz.c
+index 77b7a24..fbe13f4 100644
+--- a/lib/dns/catz.c
++++ b/lib/dns/catz.c
+@@ -418,39 +418,21 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) {
+ 
+ 	dns_name_format(&target->name, czname, DNS_NAME_FORMATSIZE);
+ 
+-	result = isc_ht_init(&toadd, target->catzs->mctx, 16);
+-	if (result != ISC_R_SUCCESS) {
+-		goto cleanup;
+-	}
++	isc_ht_init(&toadd, target->catzs->mctx, 16);
+ 
+-	result = isc_ht_init(&tomod, target->catzs->mctx, 16);
+-	if (result != ISC_R_SUCCESS) {
+-		goto cleanup;
+-	}
++	isc_ht_init(&tomod, target->catzs->mctx, 16);
+ 
+-	result = isc_ht_iter_create(newzone->entries, &iter1);
+-	if (result != ISC_R_SUCCESS) {
+-		goto cleanup;
+-	}
++	isc_ht_iter_create(newzone->entries, &iter1);
+ 
+-	result = isc_ht_iter_create(target->entries, &iter2);
+-	if (result != ISC_R_SUCCESS) {
+-		goto cleanup;
+-	}
++	isc_ht_iter_create(target->entries, &iter2);
+ 
+ 	/*
+ 	 * We can create those iterators now, even though toadd and tomod are
+ 	 * empty
+ 	 */
+-	result = isc_ht_iter_create(toadd, &iteradd);
+-	if (result != ISC_R_SUCCESS) {
+-		goto cleanup;
+-	}
++	isc_ht_iter_create(toadd, &iteradd);
+ 
+-	result = isc_ht_iter_create(tomod, &itermod);
+-	if (result != ISC_R_SUCCESS) {
+-		goto cleanup;
+-	}
++	isc_ht_iter_create(tomod, &itermod);
+ 
+ 	/*
+ 	 * First - walk the new zone and find all nodes that are not in the
+@@ -598,25 +580,11 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) {
+ 
+ 	result = ISC_R_SUCCESS;
+ 
+-cleanup:
+-	if (iter1 != NULL) {
+-		isc_ht_iter_destroy(&iter1);
+-	}
+-	if (iter2 != NULL) {
+-		isc_ht_iter_destroy(&iter2);
+-	}
+-	if (iteradd != NULL) {
+-		isc_ht_iter_destroy(&iteradd);
+-	}
+-	if (itermod != NULL) {
+-		isc_ht_iter_destroy(&itermod);
+-	}
+-	if (toadd != NULL) {
+-		isc_ht_destroy(&toadd);
+-	}
+-	if (tomod != NULL) {
+-		isc_ht_destroy(&tomod);
+-	}
++	isc_ht_iter_destroy(&iteradd);
++	isc_ht_iter_destroy(&itermod);
++	isc_ht_destroy(&toadd);
++	isc_ht_destroy(&tomod);
++
+ 	return (result);
+ }
+ 
+@@ -637,10 +605,7 @@ dns_catz_new_zones(dns_catz_zones_t **catzsp, dns_catz_zonemodmethods_t *zmm,
+ 
+ 	isc_refcount_init(&new_zones->refs, 1);
+ 
+-	result = isc_ht_init(&new_zones->zones, mctx, 4);
+-	if (result != ISC_R_SUCCESS) {
+-		goto cleanup_refcount;
+-	}
++	isc_ht_init(&new_zones->zones, mctx, 4);
+ 
+ 	isc_mem_attach(mctx, &new_zones->mctx);
+ 	new_zones->zmm = zmm;
+@@ -658,7 +623,6 @@ dns_catz_new_zones(dns_catz_zones_t **catzsp, dns_catz_zonemodmethods_t *zmm,
+ 
+ cleanup_ht:
+ 	isc_ht_destroy(&new_zones->zones);
+-cleanup_refcount:
+ 	isc_refcount_destroy(&new_zones->refs);
+ 	isc_mutex_destroy(&new_zones->lock);
+ 	isc_mem_putanddetach(&new_zones->mctx, new_zones, sizeof(*new_zones));
+@@ -693,10 +657,7 @@ dns_catz_new_zone(dns_catz_zones_t *catzs, dns_catz_zone_t **zonep,
+ 	dns_name_init(&new_zone->name, NULL);
+ 	dns_name_dup(name, catzs->mctx, &new_zone->name);
+ 
+-	result = isc_ht_init(&new_zone->entries, catzs->mctx, 4);
+-	if (result != ISC_R_SUCCESS) {
+-		goto cleanup_name;
+-	}
++	isc_ht_init(&new_zone->entries, catzs->mctx, 4);
+ 
+ 	new_zone->updatetimer = NULL;
+ 	result = isc_timer_create(catzs->timermgr, isc_timertype_inactive, NULL,
+@@ -726,7 +687,6 @@ dns_catz_new_zone(dns_catz_zones_t *catzs, dns_catz_zone_t **zonep,
+ 
+ cleanup_ht:
+ 	isc_ht_destroy(&new_zone->entries);
+-cleanup_name:
+ 	dns_name_free(&new_zone->name, catzs->mctx);
+ 	isc_mem_put(catzs->mctx, new_zone, sizeof(*new_zone));
+ 
+@@ -827,8 +787,7 @@ dns_catz_zone_detach(dns_catz_zone_t **zonep) {
+ 		if (zone->entries != NULL) {
+ 			isc_ht_iter_t *iter = NULL;
+ 			isc_result_t result;
+-			result = isc_ht_iter_create(zone->entries, &iter);
+-			INSIST(result == ISC_R_SUCCESS);
++			isc_ht_iter_create(zone->entries, &iter);
+ 			for (result = isc_ht_iter_first(iter);
+ 			     result == ISC_R_SUCCESS;
+ 			     result = isc_ht_iter_delcurrent_next(iter))
+@@ -884,8 +843,7 @@ dns_catz_catzs_detach(dns_catz_zones_t **catzsp) {
+ 		if (catzs->zones != NULL) {
+ 			isc_ht_iter_t *iter = NULL;
+ 			isc_result_t result;
+-			result = isc_ht_iter_create(catzs->zones, &iter);
+-			INSIST(result == ISC_R_SUCCESS);
++			isc_ht_iter_create(catzs->zones, &iter);
+ 			for (result = isc_ht_iter_first(iter);
+ 			     result == ISC_R_SUCCESS;) {
+ 				dns_catz_zone_t *zone = NULL;
+@@ -2060,8 +2018,7 @@ dns_catz_prereconfig(dns_catz_zones_t *catzs) {
+ 
+ 	REQUIRE(DNS_CATZ_ZONES_VALID(catzs));
+ 
+-	result = isc_ht_iter_create(catzs->zones, &iter);
+-	INSIST(result == ISC_R_SUCCESS);
++	isc_ht_iter_create(catzs->zones, &iter);
+ 	for (result = isc_ht_iter_first(iter); result == ISC_R_SUCCESS;
+ 	     result = isc_ht_iter_next(iter))
+ 	{
+@@ -2082,8 +2039,7 @@ dns_catz_postreconfig(dns_catz_zones_t *catzs) {
+ 	REQUIRE(DNS_CATZ_ZONES_VALID(catzs));
+ 
+ 	LOCK(&catzs->lock);
+-	result = isc_ht_iter_create(catzs->zones, &iter);
+-	INSIST(result == ISC_R_SUCCESS);
++	isc_ht_iter_create(catzs->zones, &iter);
+ 	for (result = isc_ht_iter_first(iter); result == ISC_R_SUCCESS;) {
+ 		dns_catz_zone_t *zone = NULL;
+ 
+@@ -2122,5 +2078,7 @@ dns_catz_postreconfig(dns_catz_zones_t *catzs) {
+ isc_result_t
+ dns_catz_get_iterator(dns_catz_zone_t *catz, isc_ht_iter_t **itp) {
+ 	REQUIRE(DNS_CATZ_ZONE_VALID(catz));
+-	return (isc_ht_iter_create(catz->entries, itp));
++	isc_ht_iter_create(catz->entries, itp);
++
++	return (ISC_R_SUCCESS);
+ }
+diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
+index 1bdaac9..13cfc85 100644
+--- a/lib/dns/rpz.c
++++ b/lib/dns/rpz.c
+@@ -1541,10 +1541,7 @@ dns_rpz_new_zone(dns_rpz_zones_t *rpzs, dns_rpz_zone_t **rpzp) {
+ 	 * simplifies update_from_db
+ 	 */
+ 
+-	result = isc_ht_init(&zone->nodes, rpzs->mctx, 1);
+-	if (result != ISC_R_SUCCESS) {
+-		goto cleanup_ht;
+-	}
++	isc_ht_init(&zone->nodes, rpzs->mctx, 1);
+ 
+ 	dns_name_init(&zone->origin, NULL);
+ 	dns_name_init(&zone->client_ip, NULL);
+@@ -1578,9 +1575,6 @@ dns_rpz_new_zone(dns_rpz_zones_t *rpzs, dns_rpz_zone_t **rpzp) {
+ 
+ 	return (ISC_R_SUCCESS);
+ 
+-cleanup_ht:
+-	isc_timer_detach(&zone->updatetimer);
+-
+ cleanup_timer:
+ 	isc_refcount_decrementz(&zone->refs);
+ 	isc_refcount_destroy(&zone->refs);
+@@ -1724,14 +1718,7 @@ setup_update(dns_rpz_zone_t *rpz) {
+ 		      ISC_LOG_DEBUG(1), "rpz: %s: using hashtable size %d",
+ 		      domain, hashsize);
+ 
+-	result = isc_ht_init(&rpz->newnodes, rpz->rpzs->mctx, hashsize);
+-	if (result != ISC_R_SUCCESS) {
+-		isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
+-			      DNS_LOGMODULE_MASTER, ISC_LOG_ERROR,
+-			      "rpz: %s: failed to initialize hashtable - %s",
+-			      domain, isc_result_totext(result));
+-		goto cleanup;
+-	}
++	isc_ht_init(&rpz->newnodes, rpz->rpzs->mctx, hashsize);
+ 
+ 	result = dns_db_createiterator(rpz->updb, DNS_DB_NONSEC3, &rpz->updbit);
+ 	if (result != ISC_R_SUCCESS) {
+@@ -1838,17 +1825,7 @@ cleanup_quantum(isc_task_t *task, isc_event_t *event) {
+ 		 * Iterate over old ht with existing nodes deleted to
+ 		 * delete deleted nodes from RPZ
+ 		 */
+-		result = isc_ht_iter_create(rpz->nodes, &iter);
+-		if (result != ISC_R_SUCCESS) {
+-			dns_name_format(&rpz->origin, domain,
+-					DNS_NAME_FORMATSIZE);
+-			isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
+-				      DNS_LOGMODULE_MASTER, ISC_LOG_ERROR,
+-				      "rpz: %s: failed to create HT "
+-				      "iterator - %s",
+-				      domain, isc_result_totext(result));
+-			goto cleanup;
+-		}
++		isc_ht_iter_create(rpz->nodes, &iter);
+ 	}
+ 
+ 	name = dns_fixedname_initname(&fname);
+diff --git a/lib/isc/ht.c b/lib/isc/ht.c
+index 82f8ac8..88e8578 100644
+--- a/lib/isc/ht.c
++++ b/lib/isc/ht.c
+@@ -47,7 +47,7 @@ struct isc_ht_iter {
+ 	isc_ht_node_t *cur;
+ };
+ 
+-isc_result_t
++void
+ isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits) {
+ 	isc_ht_t *ht = NULL;
+ 	size_t i;
+@@ -74,7 +74,6 @@ isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits) {
+ 	ht->magic = ISC_HT_MAGIC;
+ 
+ 	*htp = ht;
+-	return (ISC_R_SUCCESS);
+ }
+ 
+ void
+@@ -199,7 +198,7 @@ isc_ht_delete(isc_ht_t *ht, const unsigned char *key, uint32_t keysize) {
+ 	return (ISC_R_NOTFOUND);
+ }
+ 
+-isc_result_t
++void
+ isc_ht_iter_create(isc_ht_t *ht, isc_ht_iter_t **itp) {
+ 	isc_ht_iter_t *it;
+ 
+@@ -213,8 +212,6 @@ isc_ht_iter_create(isc_ht_t *ht, isc_ht_iter_t **itp) {
+ 	it->cur = NULL;
+ 
+ 	*itp = it;
+-
+-	return (ISC_R_SUCCESS);
+ }
+ 
+ void
+diff --git a/lib/isc/include/isc/ht.h b/lib/isc/include/isc/ht.h
+index 9d5ab82..280ee7e 100644
+--- a/lib/isc/include/isc/ht.h
++++ b/lib/isc/include/isc/ht.h
+@@ -31,11 +31,8 @@ typedef struct isc_ht_iter isc_ht_iter_t;
+  *\li	'mctx' is a valid memory context.
+  *\li	'bits' >=1 and 'bits' <=32
+  *
+- * Returns:
+- *\li	#ISC_R_NOMEMORY		-- not enough memory to create pool
+- *\li	#ISC_R_SUCCESS		-- all is well.
+  */
+-isc_result_t
++void
+ isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits);
+ 
+ /*%
+@@ -100,7 +97,7 @@ isc_ht_delete(isc_ht_t *ht, const unsigned char *key, uint32_t keysize);
+  *\li	'ht' is a valid hashtable
+  *\li	'itp' is non NULL and '*itp' is NULL.
+  */
+-isc_result_t
++void
+ isc_ht_iter_create(isc_ht_t *ht, isc_ht_iter_t **itp);
+ 
+ /*%
+@@ -119,7 +116,7 @@ isc_ht_iter_destroy(isc_ht_iter_t **itp);
+  *\li	'it' is non NULL.
+  *
+  * Returns:
+- * \li 	#ISC_R_SUCCESS	-- success
++ * \li	#ISC_R_SUCCESS	-- success
+  * \li	#ISC_R_NOMORE	-- no data in the hashtable
+  */
+ isc_result_t
+@@ -132,7 +129,7 @@ isc_ht_iter_first(isc_ht_iter_t *it);
+  *\li	'it' is non NULL.
+  *
+  * Returns:
+- * \li 	#ISC_R_SUCCESS	-- success
++ * \li	#ISC_R_SUCCESS	-- success
+  * \li	#ISC_R_NOMORE	-- end of hashtable reached
+  */
+ isc_result_t
+@@ -145,7 +142,7 @@ isc_ht_iter_next(isc_ht_iter_t *it);
+  *\li	'it' is non NULL.
+  *
+  * Returns:
+- * \li 	#ISC_R_SUCCESS	-- success
++ * \li	#ISC_R_SUCCESS	-- success
+  * \li	#ISC_R_NOMORE	-- end of hashtable reached
+  */
+ isc_result_t
+diff --git a/lib/isc/tests/ht_test.c b/lib/isc/tests/ht_test.c
+index 6a8e319..61b8c3d 100644
+--- a/lib/isc/tests/ht_test.c
++++ b/lib/isc/tests/ht_test.c
+@@ -59,8 +59,7 @@ test_ht_full(int bits, uintptr_t count) {
+ 	isc_result_t result;
+ 	uintptr_t i;
+ 
+-	result = isc_ht_init(&ht, test_mctx, bits);
+-	assert_int_equal(result, ISC_R_SUCCESS);
++	isc_ht_init(&ht, test_mctx, bits);
+ 	assert_non_null(ht);
+ 
+ 	for (i = 1; i < count; i++) {
+@@ -205,8 +204,7 @@ test_ht_iterator() {
+ 	unsigned char key[16];
+ 	size_t tksize;
+ 
+-	result = isc_ht_init(&ht, test_mctx, 16);
+-	assert_int_equal(result, ISC_R_SUCCESS);
++	isc_ht_init(&ht, test_mctx, 16);
+ 	assert_non_null(ht);
+ 	for (i = 1; i <= count; i++) {
+ 		/*
+@@ -220,8 +218,7 @@ test_ht_iterator() {
+ 	}
+ 
+ 	walked = 0;
+-	result = isc_ht_iter_create(ht, &iter);
+-	assert_int_equal(result, ISC_R_SUCCESS);
++	isc_ht_iter_create(ht, &iter);
+ 
+ 	for (result = isc_ht_iter_first(iter); result == ISC_R_SUCCESS;
+ 	     result = isc_ht_iter_next(iter))
+-- 
+2.33.0
+
diff --git a/backport-Propagate-the-shutdown-event-to-the-recursing-ns_client-s.patch b/backport-Propagate-the-shutdown-event-to-the-recursing-ns_client-s.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6202e1afdee0c2db2fc4af841529e2708e4c9e0f
--- /dev/null
+++ b/backport-Propagate-the-shutdown-event-to-the-recursing-ns_client-s.patch
@@ -0,0 +1,99 @@
+From 72724b258c1c86c638630559d7142723d595d69d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Thu, 3 Nov 2022 17:42:12 +0100
+Subject: [PATCH] Propagate the shutdown event to the recursing ns_client(s)
+
+Send the ns_query_cancel() on the recursing clients when we initiate the
+named shutdown for faster shutdown.
+
+When we are shutting down the resolver, we cancel all the outstanding
+fetches, and the ISC_R_CANCEL events doesn't propagate to the ns_client
+callback.
+
+In the future, the better solution how to fix this would be to look at
+the shutdown paths and let them all propagate from bottom (loopmgr) to
+top (f.e. ns_client).
+
+(cherry picked from commit d861d403bb9a7912e29a06aba6caf6d502839f1b)
+---
+ lib/ns/client.c            | 13 +++++++++++++
+ lib/ns/include/ns/client.h | 10 ++++++++--
+ lib/ns/interfacemgr.c      |  1 +
+ lib/ns/win32/libns.def     |  1 +
+ 4 files changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/lib/ns/client.c b/lib/ns/client.c
+index 6bd5ddfdefb..d4ce000be87 100644
+--- a/lib/ns/client.c
++++ b/lib/ns/client.c
+@@ -2518,6 +2518,19 @@ cleanup_reclock:
+ 	return (result);
+ }
+ 
++void
++ns_clientmgr_shutdown(ns_clientmgr_t *manager) {
++	REQUIRE(VALID_MANAGER(manager));
++
++	LOCK(&manager->reclock);
++	for (ns_client_t *client = ISC_LIST_HEAD(manager->recursing);
++	     client != NULL; client = ISC_LIST_NEXT(client, rlink))
++	{
++		ns_query_cancel(client);
++	}
++	UNLOCK(&manager->reclock);
++}
++
+ void
+ ns_clientmgr_destroy(ns_clientmgr_t **managerp) {
+ 	isc_result_t result;
+diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h
+index 9d152c6bbe8..d1e2fde4073 100644
+--- a/lib/ns/include/ns/client.h
++++ b/lib/ns/include/ns/client.h
+@@ -354,12 +354,18 @@ ns_clientmgr_create(isc_mem_t *mctx, ns_server_t *sctx, isc_taskmgr_t *taskmgr,
+  */
+ 
+ void
+-ns_clientmgr_destroy(ns_clientmgr_t **managerp);
++ns_clientmgr_shutdown(ns_clientmgr_t *manager);
+ /*%<
+- * Destroy a client manager and all ns_client_t objects
++ * Shutdown a client manager and all ns_client_t objects
+  * managed by it.
+  */
+ 
++void
++ns_clientmgr_destroy(ns_clientmgr_t **managerp);
++/*%<
++ * Destroy a client manager.
++ */
++
+ isc_sockaddr_t *
+ ns_client_getsockaddr(ns_client_t *client);
+ /*%<
+diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c
+index 687359058b0..216e274a54e 100644
+--- a/lib/ns/interfacemgr.c
++++ b/lib/ns/interfacemgr.c
+@@ -574,6 +574,7 @@ ns_interface_shutdown(ns_interface_t *ifp) {
+ 		isc_nmsocket_close(&ifp->tcplistensocket);
+ 	}
+ 	if (ifp->clientmgr != NULL) {
++		ns_clientmgr_shutdown(ifp->clientmgr);
+ 		ns_clientmgr_destroy(&ifp->clientmgr);
+ 	}
+ }
+diff --git a/lib/ns/win32/libns.def b/lib/ns/win32/libns.def
+index eadd940a9ce..50edf86730b 100644
+--- a/lib/ns/win32/libns.def
++++ b/lib/ns/win32/libns.def
+@@ -42,6 +42,7 @@ ns_client_shuttingdown
+ ns_client_sourceip
+ ns_clientmgr_create
+ ns_clientmgr_destroy
++ns_clientmgr_shutdown
+ ns_hook_add
+ ns_hooktable_create
+ ns_hooktable_free
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Reject-zones-with-TTL-higher-than-dnssec-policy-max.patch b/backport-Reject-zones-with-TTL-higher-than-dnssec-policy-max.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3fb43686d42999520bce1395c8a71ed7a46daf53
--- /dev/null
+++ b/backport-Reject-zones-with-TTL-higher-than-dnssec-policy-max.patch
@@ -0,0 +1,80 @@
+From 111b215987a1cccc2e55a0fea4d8621103d9de9f Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Wed, 13 Jul 2022 10:28:59 +0200
+Subject: [PATCH] Reject zones with TTL higher than dnssec-policy max-zone-ttl
+
+Reject loading of zones with TTL higher than the max-zone-ttl
+from the dnssec-policy.
+
+With this change, any zone with a dnssec-policy in use will ignore
+the max-zone-ttl option in zone/view/options.
+---
+ bin/named/zoneconf.c | 38 +++++++++++++++++---------------------
+ 1 file changed, 17 insertions(+), 21 deletions(-)
+
+diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
+index d1d45d818bc..c918d0ac248 100644
+--- a/bin/named/zoneconf.c
++++ b/bin/named/zoneconf.c
+@@ -897,6 +897,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 	dns_stats_t *dnssecsignstats;
+ 	dns_zonestat_level_t statlevel = dns_zonestat_none;
+ 	int seconds;
++	dns_ttl_t maxttl = 0; /* unlimited */
+ 	dns_zone_t *mayberaw = (raw != NULL) ? raw : zone;
+ 	isc_dscp_t dscp;
+ 
+@@ -1060,27 +1061,6 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 		}
+ 	}
+ 
+-	obj = NULL;
+-	result = named_config_get(maps, "max-zone-ttl", &obj);
+-	if (result == ISC_R_SUCCESS && masterformat == dns_masterformat_map) {
+-		isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
+-			      NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR,
+-			      "zone '%s': 'max-zone-ttl' is not compatible "
+-			      "with 'masterfile-format map'",
+-			      zname);
+-		return (ISC_R_FAILURE);
+-	} else if (result == ISC_R_SUCCESS) {
+-		dns_ttl_t maxttl = 0; /* unlimited */
+-
+-		if (cfg_obj_isduration(obj)) {
+-			maxttl = cfg_obj_asduration(obj);
+-		}
+-		dns_zone_setmaxttl(zone, maxttl);
+-		if (raw != NULL) {
+-			dns_zone_setmaxttl(raw, maxttl);
+-		}
+-	}
+-
+ 	obj = NULL;
+ 	result = named_config_get(maps, "max-records", &obj);
+ 	INSIST(result == ISC_R_SUCCESS && obj != NULL);
+@@ -1534,6 +1514,22 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ 		dns_zone_setjournalsize(zone, journal_size);
+ 	}
+ 
++	if (use_kasp) {
++		maxttl = dns_kasp_zonemaxttl(dns_zone_getkasp(zone));
++	} else {
++		obj = NULL;
++		result = named_config_get(maps, "max-zone-ttl", &obj);
++		if (result == ISC_R_SUCCESS) {
++			if (cfg_obj_isduration(obj)) {
++				maxttl = cfg_obj_asduration(obj);
++			}
++		}
++	}
++	dns_zone_setmaxttl(zone, maxttl);
++	if (raw != NULL) {
++		dns_zone_setmaxttl(raw, maxttl);
++	}
++
+ 	/*
+ 	 * Configure update-related options.  These apply to
+ 	 * primary servers only.
+-- 
+GitLab
+
diff --git a/backport-Release-unused-key-file-IO-lock-objects.patch b/backport-Release-unused-key-file-IO-lock-objects.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1b0a076ba7efb413fe47357208bcdb87e3152677
--- /dev/null
+++ b/backport-Release-unused-key-file-IO-lock-objects.patch
@@ -0,0 +1,31 @@
+From 98fca774b62f35b0618c01430e424ca43c492e34 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Wed, 7 Dec 2022 16:45:33 +0100
+Subject: [PATCH] Release unused key file IO lock objects
+
+Due to off-by-one error in zonemgr_keymgmt_delete, unused key file IO
+lock objects were never freed and they were kept until the server
+shutdown.  Adjust the returned value by -1 to accomodate the fact that
+the atomic_fetch_*() functions return the value before the operation and
+not current value after the operation.
+
+(cherry picked from commit fb1acd6736609360f79a498d44dffcceb8ca0f54)
+---
+ lib/dns/zone.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index 2456cd23be..22ffc73b63 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -18656,7 +18656,7 @@ zonemgr_keymgmt_delete(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
+ 		if (dns_name_equal(kfio->name, &zone->origin)) {
+ 			unsigned int count;
+ 
+-			count = atomic_fetch_sub_relaxed(&kfio->count, 1);
++			count = atomic_fetch_sub_relaxed(&kfio->count, 1) - 1;
+ 			if (count > 0) {
+ 				/* Keep the entry. */
+ 				break;
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Replace-netievent-lock-free-queue-with-simple-locked.patch b/backport-Replace-netievent-lock-free-queue-with-simple-locked.patch
new file mode 100644
index 0000000000000000000000000000000000000000..66b0abbf90fafc4d8ca5a9ead8dfc9568661b8d1
--- /dev/null
+++ b/backport-Replace-netievent-lock-free-queue-with-simple-locked.patch
@@ -0,0 +1,1353 @@
+From 32a3970b13643df0102e2e5312f345a1b3833a67 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Tue, 22 Feb 2022 23:40:39 +0100
+Subject: [PATCH] Replace netievent lock-free queue with simple locked queue
+
+The current implementation of isc_queue uses Michael-Scott lock-free
+queue that in turn uses hazard pointers.  It was discovered that the way
+we use the isc_queue, such complicated mechanism isn't really needed,
+because most of the time, we either execute the work directly when on
+nmthread (in case of UDP) or schedule the work from the matching
+nmthreads.
+
+Replace the current implementation of the isc_queue with a simple locked
+ISC_LIST.  There's a slight improvement - since copying the whole list
+is very lightweight - we move the queue into a new list before we start
+the processing and locking just for moving the queue and not for every
+single item on the list.
+
+NOTE: There's a room for future improvements - since we don't guarantee
+the order in which the netievents are processed, we could have two lists
+- one unlocked that would be used when scheduling the work from the
+matching thread and one locked that would be used from non-matching
+thread.
+
+(cherry picked from commit 6bd025942c4aeef42ef06f380a70c70acf490b1d)
+
+Conflict:The pre-reconstruction patch 75f9dd8e is not integrated. Therefore, netmgr.c needs to be adapted
+Reference:https://gitlab.isc.org/isc-projects/bind9/-/commit/32a3970b13643df0102e2e5312f345a1b3833a67
+
+---
+ bin/named/main.c                        |   1 -
+ lib/isc/Makefile.in                     |   8 +-
+ lib/isc/hp.c                            | 205 ---------------------
+ lib/isc/include/isc/Makefile.in         |   4 +-
+ lib/isc/include/isc/hp.h                | 138 --------------
+ lib/isc/include/isc/list.h              |  17 +-
+ lib/isc/include/isc/queue.h             |  54 ------
+ lib/isc/include/isc/types.h             |   8 +-
+ lib/isc/managers.c                      |   7 -
+ lib/isc/netmgr/netmgr-int.h             |  33 ++--
+ lib/isc/netmgr/netmgr.c                 | 227 ++++++++++-------------
+ lib/isc/queue.c                         | 232 ------------------------
+ lib/isc/task.c                          |   2 +-
+ lib/isc/tests/netmgr_test.c             |   1 -
+ lib/isc/win32/libisc.def.in             |  20 --
+ 15 files changed, 137 insertions(+), 821 deletions(-)
+ delete mode 100644 lib/isc/hp.c
+ delete mode 100644 lib/isc/include/isc/hp.h
+ delete mode 100644 lib/isc/include/isc/queue.h
+ delete mode 100644 lib/isc/queue.c
+
+diff --git a/bin/named/main.c b/bin/named/main.c
+index c7c35ce..0bd3397 100644
+--- a/bin/named/main.c
++++ b/bin/named/main.c
+@@ -32,7 +32,6 @@
+ #include <isc/dir.h>
+ #include <isc/file.h>
+ #include <isc/hash.h>
+-#include <isc/hp.h>
+ #include <isc/httpd.h>
+ #include <isc/managers.h>
+ #include <isc/netmgr.h>
+diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
+index 2cf73e0..1c711bd 100644
+--- a/lib/isc/Makefile.in
++++ b/lib/isc/Makefile.in
+@@ -51,14 +51,14 @@ OBJS =		pk11.@O@ pk11_result.@O@ \
+ 		bind9.@O@ buffer.@O@ bufferlist.@O@ \
+ 		commandline.@O@ counter.@O@ crc64.@O@ error.@O@ entropy.@O@ \
+ 		event.@O@ hash.@O@ ht.@O@ heap.@O@ hex.@O@ \
+-		hmac.@O@ hp.@O@ httpd.@O@ iterated_hash.@O@ \
++		hmac.@O@ httpd.@O@ iterated_hash.@O@ \
+ 		lex.@O@ lfsr.@O@ lib.@O@ log.@O@ \
+ 		managers.@O@ md.@O@ mem.@O@ mutexblock.@O@ \
+ 		netmgr/netmgr.@O@ netmgr/tcp.@O@ netmgr/udp.@O@ \
+ 		netmgr/tcpdns.@O@ \
+ 		netmgr/uverr2result.@O@ netmgr/uv-compat.@O@ \
+ 		netaddr.@O@ netscope.@O@ nonce.@O@ openssl_shim.@O@ pool.@O@ \
+-		parseint.@O@ portset.@O@ queue.@O@ quota.@O@ \
++		parseint.@O@ portset.@O@ quota.@O@ \
+ 		radix.@O@ random.@O@ ratelimiter.@O@ \
+ 		region.@O@ regex.@O@ result.@O@ rwlock.@O@ \
+ 		safe.@O@ serial.@O@ siphash.@O@ sockaddr.@O@ stats.@O@ \
+@@ -74,11 +74,11 @@ SRCS =		pk11.c pk11_result.c \
+ 		backtrace.c base32.c base64.c bind9.c \
+ 		buffer.c bufferlist.c commandline.c counter.c crc64.c \
+ 		entropy.c error.c event.c hash.c ht.c heap.c \
+-		hex.c hmac.c hp.c httpd.c iterated_hash.c \
++		hex.c hmac.c httpd.c iterated_hash.c \
+ 		lex.c lfsr.c lib.c log.c \
+ 		managers.c md.c mem.c mutexblock.c \
+ 		netaddr.c netscope.c nonce.c openssl_shim.c pool.c \
+-		parseint.c portset.c queue.c quota.c radix.c random.c \
++		parseint.c portset.c quota.c radix.c random.c \
+ 		ratelimiter.c region.c regex.c result.c rwlock.c \
+ 		safe.c serial.c siphash.c sockaddr.c stats.c string.c \
+ 		symtab.c task.c taskpool.c timer.c tls.c \
+diff --git a/lib/isc/hp.c b/lib/isc/hp.c
+deleted file mode 100644
+index 92d160b..0000000
+--- a/lib/isc/hp.c
++++ /dev/null
+@@ -1,205 +0,0 @@
+-/*
+- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+- *
+- * This Source Code Form is subject to the terms of the Mozilla Public
+- * License, v. 2.0. If a copy of the MPL was not distributed with this
+- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
+- *
+- * See the COPYRIGHT file distributed with this work for additional
+- * information regarding copyright ownership.
+- */
+-
+-/*
+- * Hazard Pointer implementation.
+- *
+- * This work is based on C++ code available from:
+- * https://github.com/pramalhe/ConcurrencyFreaks/
+- *
+- * Copyright (c) 2014-2016, Pedro Ramalhete, Andreia Correia
+- * All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions are met:
+- *
+- *     * Redistributions of source code must retain the above copyright
+- *       notice, this list of conditions and the following disclaimer.
+- *     * Redistributions in binary form must reproduce the above copyright
+- *       notice, this list of conditions and the following disclaimer in the
+- *       documentation and/or other materials provided with the distribution.
+- *     * Neither the name of Concurrency Freaks nor the
+- *       names of its contributors may be used to endorse or promote products
+- *       derived from this software without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER>
+- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+- * THE POSSIBILITY OF SUCH DAMAGE.
+- */
+-
+-#include <inttypes.h>
+-
+-#include <isc/atomic.h>
+-#include <isc/hp.h>
+-#include <isc/mem.h>
+-#include <isc/once.h>
+-#include <isc/string.h>
+-#include <isc/thread.h>
+-#include <isc/util.h>
+-
+-#define HP_MAX_THREADS 128
+-static int isc__hp_max_threads = HP_MAX_THREADS;
+-#define HP_MAX_HPS     4 /* This is named 'K' in the HP paper */
+-#define CLPAD	       (128 / sizeof(uintptr_t))
+-#define HP_THRESHOLD_R 0 /* This is named 'R' in the HP paper */
+-
+-/* Maximum number of retired objects per thread */
+-static int isc__hp_max_retired = HP_MAX_THREADS * HP_MAX_HPS;
+-
+-typedef struct retirelist {
+-	int size;
+-	uintptr_t *list;
+-} retirelist_t;
+-
+-struct isc_hp {
+-	int max_hps;
+-	isc_mem_t *mctx;
+-	atomic_uintptr_t **hp;
+-	retirelist_t **rl;
+-	isc_hp_deletefunc_t *deletefunc;
+-};
+-
+-static inline int
+-tid(void) {
+-	return (isc_tid_v);
+-}
+-
+-void
+-isc_hp_init(int max_threads) {
+-	isc__hp_max_threads = max_threads;
+-	isc__hp_max_retired = max_threads * HP_MAX_HPS;
+-}
+-
+-isc_hp_t *
+-isc_hp_new(isc_mem_t *mctx, size_t max_hps, isc_hp_deletefunc_t *deletefunc) {
+-	isc_hp_t *hp = isc_mem_get(mctx, sizeof(*hp));
+-
+-	if (max_hps == 0) {
+-		max_hps = HP_MAX_HPS;
+-	}
+-
+-	*hp = (isc_hp_t){ .max_hps = max_hps, .deletefunc = deletefunc };
+-
+-	isc_mem_attach(mctx, &hp->mctx);
+-
+-	hp->hp = isc_mem_get(mctx, isc__hp_max_threads * sizeof(hp->hp[0]));
+-	hp->rl = isc_mem_get(mctx, isc__hp_max_threads * sizeof(hp->rl[0]));
+-
+-	for (int i = 0; i < isc__hp_max_threads; i++) {
+-		hp->hp[i] = isc_mem_get(mctx, CLPAD * 2 * sizeof(hp->hp[i][0]));
+-		hp->rl[i] = isc_mem_get(mctx, sizeof(*hp->rl[0]));
+-		*hp->rl[i] = (retirelist_t){ .size = 0 };
+-
+-		for (int j = 0; j < hp->max_hps; j++) {
+-			atomic_init(&hp->hp[i][j], 0);
+-		}
+-		hp->rl[i]->list = isc_mem_get(
+-			hp->mctx, isc__hp_max_retired * sizeof(uintptr_t));
+-	}
+-
+-	return (hp);
+-}
+-
+-void
+-isc_hp_destroy(isc_hp_t *hp) {
+-	for (int i = 0; i < isc__hp_max_threads; i++) {
+-		isc_mem_put(hp->mctx, hp->hp[i],
+-			    CLPAD * 2 * sizeof(hp->hp[i][0]));
+-
+-		for (int j = 0; j < hp->rl[i]->size; j++) {
+-			void *data = (void *)hp->rl[i]->list[j];
+-			hp->deletefunc(data);
+-		}
+-		isc_mem_put(hp->mctx, hp->rl[i]->list,
+-			    isc__hp_max_retired * sizeof(uintptr_t));
+-		isc_mem_put(hp->mctx, hp->rl[i], sizeof(*hp->rl[0]));
+-	}
+-	isc_mem_put(hp->mctx, hp->hp, isc__hp_max_threads * sizeof(hp->hp[0]));
+-	isc_mem_put(hp->mctx, hp->rl, isc__hp_max_threads * sizeof(hp->rl[0]));
+-
+-	isc_mem_putanddetach(&hp->mctx, hp, sizeof(*hp));
+-}
+-
+-void
+-isc_hp_clear(isc_hp_t *hp) {
+-	for (int i = 0; i < hp->max_hps; i++) {
+-		atomic_store_release(&hp->hp[tid()][i], 0);
+-	}
+-}
+-
+-void
+-isc_hp_clear_one(isc_hp_t *hp, int ihp) {
+-	atomic_store_release(&hp->hp[tid()][ihp], 0);
+-}
+-
+-uintptr_t
+-isc_hp_protect(isc_hp_t *hp, int ihp, atomic_uintptr_t *atom) {
+-	uintptr_t n = 0;
+-	uintptr_t ret;
+-	while ((ret = atomic_load(atom)) != n) {
+-		atomic_store(&hp->hp[tid()][ihp], ret);
+-		n = ret;
+-	}
+-	return (ret);
+-}
+-
+-uintptr_t
+-isc_hp_protect_ptr(isc_hp_t *hp, int ihp, atomic_uintptr_t ptr) {
+-	atomic_store(&hp->hp[tid()][ihp], atomic_load(&ptr));
+-	return (atomic_load(&ptr));
+-}
+-
+-uintptr_t
+-isc_hp_protect_release(isc_hp_t *hp, int ihp, atomic_uintptr_t ptr) {
+-	atomic_store_release(&hp->hp[tid()][ihp], atomic_load(&ptr));
+-	return (atomic_load(&ptr));
+-}
+-
+-void
+-isc_hp_retire(isc_hp_t *hp, uintptr_t ptr) {
+-	hp->rl[tid()]->list[hp->rl[tid()]->size++] = ptr;
+-	INSIST(hp->rl[tid()]->size < isc__hp_max_retired);
+-
+-	if (hp->rl[tid()]->size < HP_THRESHOLD_R) {
+-		return;
+-	}
+-
+-	for (int iret = 0; iret < hp->rl[tid()]->size; iret++) {
+-		uintptr_t obj = hp->rl[tid()]->list[iret];
+-		bool can_delete = true;
+-		for (int itid = 0; itid < isc__hp_max_threads && can_delete;
+-		     itid++) {
+-			for (int ihp = hp->max_hps - 1; ihp >= 0; ihp--) {
+-				if (atomic_load(&hp->hp[itid][ihp]) == obj) {
+-					can_delete = false;
+-					break;
+-				}
+-			}
+-		}
+-
+-		if (can_delete) {
+-			size_t bytes = (hp->rl[tid()]->size - iret) *
+-				       sizeof(hp->rl[tid()]->list[0]);
+-			memmove(&hp->rl[tid()]->list[iret],
+-				&hp->rl[tid()]->list[iret + 1], bytes);
+-			hp->rl[tid()]->size--;
+-			hp->deletefunc((void *)obj);
+-		}
+-	}
+-}
+diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in
+index 25b216a..1377172 100644
+--- a/lib/isc/include/isc/Makefile.in
++++ b/lib/isc/include/isc/Makefile.in
+@@ -23,13 +23,13 @@ HEADERS =	aes.h app.h assertions.h astack.h atomic.h backtrace.h \
+ 		cmocka.h commandline.h counter.h crc64.h deprecated.h \
+ 		endian.h errno.h error.h event.h eventclass.h \
+ 		file.h formatcheck.h fsaccess.h fuzz.h \
+-		hash.h heap.h hex.h hmac.h hp.h ht.h httpd.h \
++		hash.h heap.h hex.h hmac.h ht.h httpd.h \
+ 		interfaceiter.h iterated_hash.h \
+ 		lang.h lex.h lfsr.h lib.h likely.h list.h log.h \
+ 		magic.h managers.h md.h mem.h meminfo.h \
+ 		mutexatomic.h mutexblock.h \
+ 		netaddr.h netmgr.h netscope.h nonce.h os.h parseint.h \
+-		pool.h portset.h print.h queue.h quota.h \
++		pool.h portset.h print.h quota.h \
+ 		radix.h random.h ratelimiter.h refcount.h regex.h \
+ 		region.h resource.h result.h resultclass.h rwlock.h \
+ 		safe.h serial.h siphash.h sockaddr.h socket.h \
+diff --git a/lib/isc/include/isc/hp.h b/lib/isc/include/isc/hp.h
+deleted file mode 100644
+index 44155e6..0000000
+--- a/lib/isc/include/isc/hp.h
++++ /dev/null
+@@ -1,138 +0,0 @@
+-/*
+- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+- *
+- * This Source Code Form is subject to the terms of the Mozilla Public
+- * License, v. 2.0. If a copy of the MPL was not distributed with this
+- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
+- *
+- * See the COPYRIGHT file distributed with this work for additional
+- * information regarding copyright ownership.
+- */
+-
+-/*
+- * Hazard Pointer implementation.
+- *
+- * This work is based on C++ code available from:
+- * https://github.com/pramalhe/ConcurrencyFreaks/
+- *
+- * Copyright (c) 2014-2016, Pedro Ramalhete, Andreia Correia
+- * All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions are met:
+- *
+- *     * Redistributions of source code must retain the above copyright
+- *       notice, this list of conditions and the following disclaimer.
+- *     * Redistributions in binary form must reproduce the above copyright
+- *       notice, this list of conditions and the following disclaimer in the
+- *       documentation and/or other materials provided with the distribution.
+- *     * Neither the name of Concurrency Freaks nor the
+- *       names of its contributors may be used to endorse or promote products
+- *       derived from this software without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER>
+- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+- * THE POSSIBILITY OF SUCH DAMAGE.
+- */
+-
+-#pragma once
+-
+-#include <isc/atomic.h>
+-#include <isc/mem.h>
+-#include <isc/string.h>
+-#include <isc/types.h>
+-#include <isc/util.h>
+-
+-/*%
+- * Hazard pointers are a mechanism for protecting objects in memory
+- * from being deleted by other threads while in use. This allows
+- * safe lock-free data structures.
+- *
+- * This is an adaptation of the ConcurrencyFreaks implementation in C.
+- * More details available at https://github.com/pramalhe/ConcurrencyFreaks,
+- * in the file HazardPointers.hpp.
+- */
+-
+-typedef void(isc_hp_deletefunc_t)(void *);
+-
+-void
+-isc_hp_init(int max_threads);
+-/*%<
+- * Initialize hazard pointer constants - isc__hp_max_threads. If more threads
+- * will try to access hp it will assert.
+- */
+-
+-isc_hp_t *
+-isc_hp_new(isc_mem_t *mctx, size_t max_hps, isc_hp_deletefunc_t *deletefunc);
+-/*%<
+- * Create a new hazard pointer array of size 'max_hps' (or a reasonable
+- * default value if 'max_hps' is 0). The function 'deletefunc' will be
+- * used to delete objects protected by hazard pointers when it becomes
+- * safe to retire them.
+- */
+-
+-void
+-isc_hp_destroy(isc_hp_t *hp);
+-/*%<
+- * Destroy a hazard pointer array and clean up all objects protected
+- * by hazard pointers.
+- */
+-
+-void
+-isc_hp_clear(isc_hp_t *hp);
+-/*%<
+- * Clear all hazard pointers in the array for the current thread.
+- *
+- * Progress condition: wait-free bounded (by max_hps)
+- */
+-
+-void
+-isc_hp_clear_one(isc_hp_t *hp, int ihp);
+-/*%<
+- * Clear a specified hazard pointer in the array for the current thread.
+- *
+- * Progress condition: wait-free population oblivious.
+- */
+-
+-uintptr_t
+-isc_hp_protect(isc_hp_t *hp, int ihp, atomic_uintptr_t *atom);
+-/*%<
+- * Protect an object referenced by 'atom' with a hazard pointer for the
+- * current thread.
+- *
+- * Progress condition: lock-free.
+- */
+-
+-uintptr_t
+-isc_hp_protect_ptr(isc_hp_t *hp, int ihp, atomic_uintptr_t ptr);
+-/*%<
+- * This returns the same value that is passed as ptr, which is sometimes
+- * useful.
+- *
+- * Progress condition: wait-free population oblivious.
+- */
+-
+-uintptr_t
+-isc_hp_protect_release(isc_hp_t *hp, int ihp, atomic_uintptr_t ptr);
+-/*%<
+- * Same as isc_hp_protect_ptr(), but explicitly uses memory_order_release.
+- *
+- * Progress condition: wait-free population oblivious.
+- */
+-
+-void
+-isc_hp_retire(isc_hp_t *hp, uintptr_t ptr);
+-/*%<
+- * Retire an object that is no longer in use by any thread, calling
+- * the delete function that was specified in isc_hp_new().
+- *
+- * Progress condition: wait-free bounded (by the number of threads squared)
+- */
+diff --git a/lib/isc/include/isc/list.h b/lib/isc/include/isc/list.h
+index 4ed1f3c..3e00eda 100644
+--- a/lib/isc/include/isc/list.h
++++ b/lib/isc/include/isc/list.h
+@@ -9,8 +9,7 @@
+  * information regarding copyright ownership.
+  */
+ 
+-#ifndef ISC_LIST_H
+-#define ISC_LIST_H 1
++#pragma once
+ 
+ #include <isc/assertions.h>
+ 
+@@ -198,4 +197,16 @@
+ #define __ISC_LIST_DEQUEUEUNSAFE_TYPE(list, elt, link, type) \
+ 	__ISC_LIST_UNLINKUNSAFE_TYPE(list, elt, link, type)
+ 
+-#endif /* ISC_LIST_H */
++#define ISC_LIST_MOVEUNSAFE(dest, src)    \
++	{                                 \
++		(dest).head = (src).head; \
++		(dest).tail = (src).tail; \
++		(src).head = NULL;        \
++		(src).tail = NULL;        \
++	}
++
++#define ISC_LIST_MOVE(dest, src)                \
++	{                                       \
++		INSIST(ISC_LIST_EMPTY(dest));   \
++		ISC_LIST_MOVEUNSAFE(dest, src); \
++	}
+diff --git a/lib/isc/include/isc/queue.h b/lib/isc/include/isc/queue.h
+deleted file mode 100644
+index a48af88..0000000
+--- a/lib/isc/include/isc/queue.h
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/*
+- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+- *
+- * This Source Code Form is subject to the terms of the Mozilla Public
+- * License, v. 2.0. If a copy of the MPL was not distributed with this
+- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
+- *
+- * See the COPYRIGHT file distributed with this work for additional
+- * information regarding copyright ownership.
+- */
+-
+-#pragma once
+-#include <isc/mem.h>
+-
+-typedef struct isc_queue isc_queue_t;
+-
+-isc_queue_t *
+-isc_queue_new(isc_mem_t *mctx, int max_threads);
+-/*%<
+- * Create a new fetch-and-add array queue.
+- *
+- * 'max_threads' is currently unused. In the future it can be used
+- * to pass a maximum threads parameter when creating hazard pointers,
+- * but currently `isc_hp_t` uses a hard-coded value.
+- */
+-
+-void
+-isc_queue_enqueue(isc_queue_t *queue, uintptr_t item);
+-/*%<
+- * Enqueue an object pointer 'item' at the tail of the queue.
+- *
+- * Requires:
+- * \li	'item' is not null.
+- */
+-
+-uintptr_t
+-isc_queue_dequeue(isc_queue_t *queue);
+-/*%<
+- * Remove an object pointer from the head of the queue and return the
+- * pointer. If the queue is empty, return `nulluintptr` (the uintptr_t
+- * representation of NULL).
+- *
+- * Requires:
+- * \li	'queue' is not null.
+- */
+-
+-void
+-isc_queue_destroy(isc_queue_t *queue);
+-/*%<
+- * Destroy a queue.
+- *
+- * Requires:
+- * \li	'queue' is not null.
+- */
+diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
+index 485a80c..baaef93 100644
+--- a/lib/isc/include/isc/types.h
++++ b/lib/isc/include/isc/types.h
+@@ -44,11 +44,9 @@ typedef struct isc_counter isc_counter_t;		  /*%< Counter */
+ typedef int16_t		   isc_dscp_t;	       /*%< Diffserv code point */
+ typedef struct isc_event   isc_event_t;	       /*%< Event */
+ typedef ISC_LIST(isc_event_t) isc_eventlist_t; /*%< Event List */
+-typedef unsigned int	isc_eventtype_t;       /*%< Event Type */
+-typedef uint32_t	isc_fsaccess_t;	       /*%< FS Access */
+-typedef struct isc_hash isc_hash_t;	       /*%< Hash */
+-typedef struct isc_hp	isc_hp_t;	       /*%< Hazard
+-						*   pointer */
++typedef unsigned int	 isc_eventtype_t;      /*%< Event Type */
++typedef uint32_t	 isc_fsaccess_t;       /*%< FS Access */
++typedef struct isc_hash	 isc_hash_t;	       /*%< Hash */
+ typedef struct isc_httpd isc_httpd_t;	       /*%< HTTP client */
+ typedef void(isc_httpdfree_t)(isc_buffer_t *, void *); /*%< HTTP free function
+ 							*/
+diff --git a/lib/isc/managers.c b/lib/isc/managers.c
+index c39a650..e210ad6 100644
+--- a/lib/isc/managers.c
++++ b/lib/isc/managers.c
+@@ -9,7 +9,6 @@
+  * information regarding copyright ownership.
+  */
+ 
+-#include <isc/hp.h>
+ #include <isc/managers.h>
+ #include <isc/util.h>
+ 
+@@ -23,12 +22,6 @@ isc_managers_create(isc_mem_t *mctx, size_t workers, size_t quantum,
+ 	isc_taskmgr_t *taskmgr = NULL;
+ 	isc_nm_t *netmgr = NULL;
+ 
+-	/*
+-	 * We have ncpus network threads, ncpus old network threads - make
+-	 * it 4x just to be on the safe side.
+-	 */
+-	isc_hp_init(4 * workers);
+-
+ 	REQUIRE(netmgrp != NULL && *netmgrp == NULL);
+ 	isc__netmgr_create(mctx, workers, &netmgr);
+ 	*netmgrp = netmgr;
+diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
+index 80de758..097725c 100644
+--- a/lib/isc/netmgr/netmgr-int.h
++++ b/lib/isc/netmgr/netmgr-int.h
+@@ -25,7 +25,6 @@
+ #include <isc/magic.h>
+ #include <isc/mem.h>
+ #include <isc/netmgr.h>
+-#include <isc/queue.h>
+ #include <isc/quota.h>
+ #include <isc/random.h>
+ #include <isc/refcount.h>
+@@ -171,6 +170,17 @@ typedef enum {
+ 	NETIEVENT_MAX = 4,
+ } netievent_type_t;
+ 
++typedef struct isc__nm_uvreq isc__nm_uvreq_t;
++typedef struct isc__netievent isc__netievent_t;
++
++typedef ISC_LIST(isc__netievent_t) isc__netievent_list_t;
++
++typedef struct ievent {
++	isc_mutex_t lock;
++	isc_condition_t cond;
++	isc__netievent_list_t list;
++} ievent_t;
++
+ /*
+  * Single network event loop worker.
+  */
+@@ -180,13 +190,10 @@ typedef struct isc__networker {
+ 	uv_loop_t loop;	  /* libuv loop structure */
+ 	uv_async_t async; /* async channel to send
+ 			   * data to this networker */
+-	isc_mutex_t lock;
+ 	bool paused;
+ 	bool finished;
+ 	isc_thread_t thread;
+-	isc_queue_t *ievents[NETIEVENT_MAX];
+-	atomic_uint_fast32_t nievents[NETIEVENT_MAX];
+-	isc_condition_t cond_prio;
++	ievent_t ievents[NETIEVENT_MAX];
+ 
+ 	isc_refcount_t references;
+ 	atomic_int_fast64_t pktcount;
+@@ -373,11 +380,12 @@ isc__nm_put_netievent(isc_nm_t *mgr, void *ievent);
+  *   either in netmgr.c or matching protocol file (e.g. udp.c, tcp.c, etc.)
+  */
+ 
+-#define NETIEVENT__SOCKET         \
+-	isc__netievent_type type; \
+-	isc_nmsocket_t *sock;     \
+-	const char *file;         \
+-	unsigned int line;        \
++#define NETIEVENT__SOCKET                \
++	isc__netievent_type type;        \
++	ISC_LINK(isc__netievent_t) link; \
++	isc_nmsocket_t *sock;            \
++	const char *file;                \
++	unsigned int line;               \
+ 	const char *func
+ 
+ typedef struct isc__netievent__socket {
+@@ -441,8 +449,7 @@ typedef struct isc__netievent__socket_req {
+ 	}
+ 
+ typedef struct isc__netievent__socket_req_result {
+-	isc__netievent_type type;
+-	isc_nmsocket_t *sock;
++	NETIEVENT__SOCKET;
+ 	isc__nm_uvreq_t *req;
+ 	isc_result_t result;
+ } isc__netievent__socket_req_result_t;
+@@ -541,6 +548,7 @@ typedef struct isc__netievent__socket_quota {
+ 
+ typedef struct isc__netievent__task {
+ 	isc__netievent_type type;
++	ISC_LINK(isc__netievent_t) link;
+ 	isc_task_t *task;
+ } isc__netievent__task_t;
+ 
+@@ -577,6 +585,7 @@ typedef struct isc__netievent_udpsend {
+ 
+ typedef struct isc__netievent {
+ 	isc__netievent_type type;
++	ISC_LINK(isc__netievent_t) link;
+ } isc__netievent_t;
+ 
+ #define NETIEVENT_TYPE(type) typedef isc__netievent_t isc__netievent_##type##_t;
+diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
+index 1aa249e..7261f20 100644
+--- a/lib/isc/netmgr/netmgr.c
++++ b/lib/isc/netmgr/netmgr.c
+@@ -21,6 +21,7 @@
+ #include <isc/buffer.h>
+ #include <isc/condition.h>
+ #include <isc/errno.h>
++#include <isc/list.h>
+ #include <isc/log.h>
+ #include <isc/magic.h>
+ #include <isc/mem.h>
+@@ -144,6 +145,7 @@ static isc_threadresult_t
+ nm_thread(isc_threadarg_t worker0);
+ static void
+ async_cb(uv_async_t *handle);
++
+ static bool
+ process_netievent(isc__networker_t *worker, isc__netievent_t *ievent);
+ static isc_result_t
+@@ -153,51 +155,6 @@ wait_for_priority_queue(isc__networker_t *worker);
+ static void
+ drain_queue(isc__networker_t *worker, netievent_type_t type);
+ 
+-#define ENQUEUE_NETIEVENT(worker, queue, event) \
+-	isc_queue_enqueue(worker->ievents[queue], (uintptr_t)event)
+-#define DEQUEUE_NETIEVENT(worker, queue) \
+-	(isc__netievent_t *)isc_queue_dequeue(worker->ievents[queue])
+-
+-#define ENQUEUE_PRIORITY_NETIEVENT(worker, event) \
+-	ENQUEUE_NETIEVENT(worker, NETIEVENT_PRIORITY, event)
+-#define ENQUEUE_PRIVILEGED_NETIEVENT(worker, event) \
+-	ENQUEUE_NETIEVENT(worker, NETIEVENT_PRIVILEGED, event)
+-#define ENQUEUE_TASK_NETIEVENT(worker, event) \
+-	ENQUEUE_NETIEVENT(worker, NETIEVENT_TASK, event)
+-#define ENQUEUE_NORMAL_NETIEVENT(worker, event) \
+-	ENQUEUE_NETIEVENT(worker, NETIEVENT_NORMAL, event)
+-
+-#define DEQUEUE_PRIORITY_NETIEVENT(worker) \
+-	DEQUEUE_NETIEVENT(worker, NETIEVENT_PRIORITY)
+-#define DEQUEUE_PRIVILEGED_NETIEVENT(worker) \
+-	DEQUEUE_NETIEVENT(worker, NETIEVENT_PRIVILEGED)
+-#define DEQUEUE_TASK_NETIEVENT(worker) DEQUEUE_NETIEVENT(worker, NETIEVENT_TASK)
+-#define DEQUEUE_NORMAL_NETIEVENT(worker) \
+-	DEQUEUE_NETIEVENT(worker, NETIEVENT_NORMAL)
+-
+-#define INCREMENT_NETIEVENT(worker, queue) \
+-	atomic_fetch_add_release(&worker->nievents[queue], 1)
+-#define DECREMENT_NETIEVENT(worker, queue) \
+-	atomic_fetch_sub_release(&worker->nievents[queue], 1)
+-
+-#define INCREMENT_PRIORITY_NETIEVENT(worker) \
+-	INCREMENT_NETIEVENT(worker, NETIEVENT_PRIORITY)
+-#define INCREMENT_PRIVILEGED_NETIEVENT(worker) \
+-	INCREMENT_NETIEVENT(worker, NETIEVENT_PRIVILEGED)
+-#define INCREMENT_TASK_NETIEVENT(worker) \
+-	INCREMENT_NETIEVENT(worker, NETIEVENT_TASK)
+-#define INCREMENT_NORMAL_NETIEVENT(worker) \
+-	INCREMENT_NETIEVENT(worker, NETIEVENT_NORMAL)
+-
+-#define DECREMENT_PRIORITY_NETIEVENT(worker) \
+-	DECREMENT_NETIEVENT(worker, NETIEVENT_PRIORITY)
+-#define DECREMENT_PRIVILEGED_NETIEVENT(worker) \
+-	DECREMENT_NETIEVENT(worker, NETIEVENT_PRIVILEGED)
+-#define DECREMENT_TASK_NETIEVENT(worker) \
+-	DECREMENT_NETIEVENT(worker, NETIEVENT_TASK)
+-#define DECREMENT_NORMAL_NETIEVENT(worker) \
+-	DECREMENT_NETIEVENT(worker, NETIEVENT_NORMAL)
+-
+ static void
+ isc__nm_async_stop(isc__networker_t *worker, isc__netievent_t *ev0);
+ static void
+@@ -361,12 +318,10 @@ isc__netmgr_create(isc_mem_t *mctx, uint32_t nworkers, isc_nm_t **netmgrp) {
+ 		r = uv_async_init(&worker->loop, &worker->async, async_cb);
+ 		RUNTIME_CHECK(r == 0);
+ 
+-		isc_mutex_init(&worker->lock);
+-		isc_condition_init(&worker->cond_prio);
+-
+ 		for (size_t type = 0; type < NETIEVENT_MAX; type++) {
+-			worker->ievents[type] = isc_queue_new(mgr->mctx, 128);
+-			atomic_init(&worker->nievents[type], 0);
++			isc_mutex_init(&worker->ievents[type].lock);
++			isc_condition_init(&worker->ievents[type].cond);
++			ISC_LIST_INIT(worker->ievents[type].list);
+ 		}
+ 
+ 		worker->recvbuf = isc_mem_get(mctx, ISC_NETMGR_RECVBUF_SIZE);
+@@ -417,28 +372,15 @@ nm_destroy(isc_nm_t **mgr0) {
+ 
+ 	for (int i = 0; i < mgr->nworkers; i++) {
+ 		isc__networker_t *worker = &mgr->workers[i];
+-		isc__netievent_t *ievent = NULL;
+ 		int r;
+ 
+-		/* Empty the async event queues */
+-		while ((ievent = DEQUEUE_PRIORITY_NETIEVENT(worker)) != NULL) {
+-			isc__nm_put_netievent(mgr, ievent);
+-		}
+-
+-		INSIST(DEQUEUE_PRIVILEGED_NETIEVENT(worker) == NULL);
+-		INSIST(DEQUEUE_TASK_NETIEVENT(worker) == NULL);
+-
+-		while ((ievent = DEQUEUE_NORMAL_NETIEVENT(worker)) != NULL) {
+-			isc__nm_put_netievent(mgr, ievent);
+-		}
+-		isc_condition_destroy(&worker->cond_prio);
+-		isc_mutex_destroy(&worker->lock);
+-
+ 		r = uv_loop_close(&worker->loop);
+ 		INSIST(r == 0);
+ 
+ 		for (size_t type = 0; type < NETIEVENT_MAX; type++) {
+-			isc_queue_destroy(worker->ievents[type]);
++			INSIST(ISC_LIST_EMPTY(worker->ievents[type].list));
++			isc_condition_destroy(&worker->ievents[type].cond);
++			isc_mutex_destroy(&worker->ievents[type].lock);
+ 		}
+ 
+ 		isc_mem_put(mgr->mctx, worker->sendbuf,
+@@ -786,13 +728,17 @@ nm_thread(isc_threadarg_t worker0) {
+ 	}
+ 
+ 	/*
+-	 * We are shutting down. Process the task queues
+-	 * (they may include shutdown events) but do not process
+-	 * the netmgr event queue.
++	 * We are shutting down.  Drain the queues.
+ 	 */
+ 	drain_queue(worker, NETIEVENT_PRIVILEGED);
+ 	drain_queue(worker, NETIEVENT_TASK);
+ 
++	for (size_t type = 0; type < NETIEVENT_MAX; type++) {
++		LOCK(&worker->ievents[type].lock);
++		INSIST(ISC_LIST_EMPTY(worker->ievents[type].list));
++		UNLOCK(&worker->ievents[type].lock);
++	}
++
+ 	LOCK(&mgr->lock);
+ 	mgr->workers_running--;
+ 	SIGNAL(&mgr->wkstatecond);
+@@ -814,7 +760,8 @@ process_all_queues(isc__networker_t *worker) {
+ 		isc_result_t result = process_queue(worker, type);
+ 		switch (result) {
+ 		case ISC_R_SUSPEND:
+-			return (true);
++			reschedule = true;
++			break;
+ 		case ISC_R_EMPTY:
+ 			/* empty queue */
+ 			break;
+@@ -914,35 +861,29 @@ isc__nm_async_task(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 
+ static void
+ wait_for_priority_queue(isc__networker_t *worker) {
+-	isc_condition_t *cond = &worker->cond_prio;
+-	bool wait_for_work = true;
++	isc_condition_t *cond = &worker->ievents[NETIEVENT_PRIORITY].cond;
++	isc_mutex_t *lock = &worker->ievents[NETIEVENT_PRIORITY].lock;
++	isc__netievent_list_t *list =
++		&(worker->ievents[NETIEVENT_PRIORITY].list);
+ 
+-	while (true) {
+-		isc__netievent_t *ievent;
+-		LOCK(&worker->lock);
+-		ievent = DEQUEUE_PRIORITY_NETIEVENT(worker);
+-		if (wait_for_work) {
+-			while (ievent == NULL) {
+-				WAIT(cond, &worker->lock);
+-				ievent = DEQUEUE_PRIORITY_NETIEVENT(worker);
+-			}
+-		}
+-		UNLOCK(&worker->lock);
+-		wait_for_work = false;
+-
+-		if (ievent == NULL) {
+-			return;
+-		}
+-		DECREMENT_PRIORITY_NETIEVENT(worker);
+-
+-		(void)process_netievent(worker, ievent);
++	LOCK(lock);
++	while (ISC_LIST_EMPTY(*list)) {
++		WAIT(cond, lock);
+ 	}
++	UNLOCK(lock);
++
++	drain_queue(worker, NETIEVENT_PRIORITY);
+ }
+ 
+ static void
+ drain_queue(isc__networker_t *worker, netievent_type_t type) {
+-	while (process_queue(worker, type) != ISC_R_EMPTY) {
+-		;
++	bool empty = false;
++	while (!empty) {
++		if (process_queue(worker, type) == ISC_R_EMPTY) {
++			LOCK(&worker->ievents[type].lock);
++			empty = ISC_LIST_EMPTY(worker->ievents[type].list);
++			UNLOCK(&worker->ievents[type].lock);
++		}
+ 	}
+ }
+ 
+@@ -1025,40 +966,41 @@ process_netievent(isc__networker_t *worker, isc__netievent_t *ievent) {
+ 
+ static isc_result_t
+ process_queue(isc__networker_t *worker, netievent_type_t type) {
+-	/*
+-	 * The number of items on the queue is only loosely synchronized with
+-	 * the items on the queue.  But there's a guarantee that if there's an
+-	 * item on the queue, it will be accounted for.  However there's a
+-	 * possibility that the counter might be higher than the items on the
+-	 * queue stored.
+-	 */
+-	uint_fast32_t waiting = atomic_load_acquire(&worker->nievents[type]);
+-	isc__netievent_t *ievent = DEQUEUE_NETIEVENT(worker, type);
++	isc__netievent_t *ievent = NULL;
++	isc__netievent_list_t list;
++
++	ISC_LIST_INIT(list);
+ 
+-	if (ievent == NULL && waiting == 0) {
++	LOCK(&worker->ievents[type].lock);
++	ISC_LIST_MOVE(list, worker->ievents[type].list);
++	UNLOCK(&worker->ievents[type].lock);
++
++	ievent = ISC_LIST_HEAD(list);
++	if (ievent == NULL) {
+ 		/* There's nothing scheduled */
+ 		return (ISC_R_EMPTY);
+-	} else if (ievent == NULL) {
+-		/* There's at least one item scheduled, but not on the queue yet
+-		 */
+-		return (ISC_R_SUCCESS);
+ 	}
+ 
+ 	while (ievent != NULL) {
+-		DECREMENT_NETIEVENT(worker, type);
+-		bool stop = !process_netievent(worker, ievent);
+-
+-		if (stop) {
+-			/* Netievent told us to stop */
++		isc__netievent_t *next = ISC_LIST_NEXT(ievent, link);
++		ISC_LIST_DEQUEUE(list, ievent, link);
++
++		if (!process_netievent(worker, ievent)) {
++			/* The netievent told us to stop */
++			if (!ISC_LIST_EMPTY(list)) {
++				/*
++				 * Reschedule the rest of the unprocessed
++				 * events.
++				 */
++				LOCK(&worker->ievents[type].lock);
++				ISC_LIST_PREPENDLIST(worker->ievents[type].list,
++						     list, link);
++				UNLOCK(&worker->ievents[type].lock);
++			}
+ 			return (ISC_R_SUSPEND);
+ 		}
+ 
+-		if (waiting-- == 0) {
+-			/* We reached this round "quota" */
+-			break;
+-		}
+-
+-		ievent = DEQUEUE_NETIEVENT(worker, type);
++		ievent = next;
+ 	}
+ 
+ 	/* We processed at least one */
+@@ -1070,6 +1012,7 @@ isc__nm_get_netievent(isc_nm_t *mgr, isc__netievent_type type) {
+ 	isc__netievent_storage_t *event = isc_mempool_get(mgr->evpool);
+ 
+ 	*event = (isc__netievent_storage_t){ .ni.type = type };
++	ISC_LINK_INIT(&(event->ni), link);
+ 	return (event);
+ }
+ 
+@@ -1137,26 +1080,39 @@ isc__nm_maybe_enqueue_ievent(isc__networker_t *worker,
+ 
+ void
+ isc__nm_enqueue_ievent(isc__networker_t *worker, isc__netievent_t *event) {
++	netievent_type_t type;
++
+ 	if (event->type > netievent_prio) {
+-		/*
+-		 * We need to make sure this signal will be delivered and
+-		 * the queue will be processed.
+-		 */
+-		LOCK(&worker->lock);
+-		INCREMENT_PRIORITY_NETIEVENT(worker);
+-		ENQUEUE_PRIORITY_NETIEVENT(worker, event);
+-		SIGNAL(&worker->cond_prio);
+-		UNLOCK(&worker->lock);
+-	} else if (event->type == netievent_privilegedtask) {
+-		INCREMENT_PRIVILEGED_NETIEVENT(worker);
+-		ENQUEUE_PRIVILEGED_NETIEVENT(worker, event);
+-	} else if (event->type == netievent_task) {
+-		INCREMENT_TASK_NETIEVENT(worker);
+-		ENQUEUE_TASK_NETIEVENT(worker, event);
++		type = NETIEVENT_PRIORITY;
+ 	} else {
+-		INCREMENT_NORMAL_NETIEVENT(worker);
+-		ENQUEUE_NORMAL_NETIEVENT(worker, event);
++		switch (event->type) {
++		case netievent_prio:
++			INSIST(0);
++			ISC_UNREACHABLE();
++			break;
++		case netievent_privilegedtask:
++			type = NETIEVENT_PRIVILEGED;
++			break;
++		case netievent_task:
++			type = NETIEVENT_TASK;
++			break;
++		default:
++			type = NETIEVENT_NORMAL;
++			break;
++		}
+ 	}
++
++	/*
++	 * We need to make sure this signal will be delivered and
++	 * the queue will be processed.
++	 */
++	LOCK(&worker->ievents[type].lock);
++	ISC_LIST_ENQUEUE(worker->ievents[type].list, event, link);
++	if (type == NETIEVENT_PRIORITY) {
++		SIGNAL(&worker->ievents[type].cond);
++	}
++	UNLOCK(&worker->ievents[type].lock);
++
+ 	uv_async_send(&worker->async);
+ }
+ 
+@@ -2851,6 +2807,7 @@ shutdown_walk_cb(uv_handle_t *handle, void *arg) {
+ void
+ isc__nm_async_shutdown(isc__networker_t *worker, isc__netievent_t *ev0) {
+ 	UNUSED(ev0);
++
+ 	uv_walk(&worker->loop, shutdown_walk_cb, NULL);
+ }
+ 
+diff --git a/lib/isc/queue.c b/lib/isc/queue.c
+deleted file mode 100644
+index d16c8e6..0000000
+--- a/lib/isc/queue.c
++++ /dev/null
+@@ -1,232 +0,0 @@
+-/*
+- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+- *
+- * This Source Code Form is subject to the terms of the Mozilla Public
+- * License, v. 2.0. If a copy of the MPL was not distributed with this
+- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
+- *
+- * See the COPYRIGHT file distributed with this work for additional
+- * information regarding copyright ownership.
+- */
+-
+-#include <inttypes.h>
+-
+-#include <isc/align.h>
+-#include <isc/atomic.h>
+-#include <isc/hp.h>
+-#include <isc/mem.h>
+-#include <isc/queue.h>
+-#include <isc/string.h>
+-
+-#define BUFFER_SIZE 1024
+-
+-#define MAX_THREADS 128
+-
+-#define ALIGNMENT 128
+-
+-static uintptr_t nulluintptr = (uintptr_t)NULL;
+-
+-typedef struct node {
+-	atomic_uint_fast32_t deqidx;
+-	atomic_uintptr_t items[BUFFER_SIZE];
+-	atomic_uint_fast32_t enqidx;
+-	atomic_uintptr_t next;
+-	isc_mem_t *mctx;
+-} node_t;
+-
+-/* we just need one Hazard Pointer */
+-#define HP_TAIL 0
+-#define HP_HEAD 0
+-
+-struct isc_queue {
+-	alignas(ALIGNMENT) atomic_uintptr_t head;
+-	alignas(ALIGNMENT) atomic_uintptr_t tail;
+-	isc_mem_t *mctx;
+-	int max_threads;
+-	int taken;
+-	isc_hp_t *hp;
+-	void *alloced_ptr;
+-};
+-
+-static node_t *
+-node_new(isc_mem_t *mctx, uintptr_t item) {
+-	node_t *node = isc_mem_get(mctx, sizeof(*node));
+-	*node = (node_t){ .mctx = NULL };
+-
+-	atomic_init(&node->deqidx, 0);
+-	atomic_init(&node->enqidx, 1);
+-	atomic_init(&node->next, 0);
+-	atomic_init(&node->items[0], item);
+-
+-	for (int i = 1; i < BUFFER_SIZE; i++) {
+-		atomic_init(&node->items[i], 0);
+-	}
+-
+-	isc_mem_attach(mctx, &node->mctx);
+-
+-	return (node);
+-}
+-
+-static void
+-node_destroy(void *node0) {
+-	node_t *node = (node_t *)node0;
+-
+-	isc_mem_putanddetach(&node->mctx, node, sizeof(*node));
+-}
+-
+-static bool
+-node_cas_next(node_t *node, node_t *cmp, const node_t *val) {
+-	return (atomic_compare_exchange_strong(&node->next, (uintptr_t *)&cmp,
+-					       (uintptr_t)val));
+-}
+-
+-static bool
+-queue_cas_tail(isc_queue_t *queue, node_t *cmp, const node_t *val) {
+-	return (atomic_compare_exchange_strong(&queue->tail, (uintptr_t *)&cmp,
+-					       (uintptr_t)val));
+-}
+-
+-static bool
+-queue_cas_head(isc_queue_t *queue, node_t *cmp, const node_t *val) {
+-	return (atomic_compare_exchange_strong(&queue->head, (uintptr_t *)&cmp,
+-					       (uintptr_t)val));
+-}
+-
+-isc_queue_t *
+-isc_queue_new(isc_mem_t *mctx, int max_threads) {
+-	isc_queue_t *queue = NULL;
+-	node_t *sentinel = NULL;
+-	void *qbuf = NULL;
+-	uintptr_t qptr;
+-
+-	/*
+-	 * A trick to allocate an aligned isc_queue_t structure
+-	 */
+-	qbuf = isc_mem_get(mctx, sizeof(*queue) + ALIGNMENT);
+-	qptr = (uintptr_t)qbuf;
+-	queue = (isc_queue_t *)(qptr + (ALIGNMENT - (qptr % ALIGNMENT)));
+-
+-	if (max_threads == 0) {
+-		max_threads = MAX_THREADS;
+-	}
+-
+-	*queue = (isc_queue_t){
+-		.max_threads = max_threads,
+-		.alloced_ptr = qbuf,
+-	};
+-
+-	isc_mem_attach(mctx, &queue->mctx);
+-
+-	queue->hp = isc_hp_new(mctx, 1, node_destroy);
+-
+-	sentinel = node_new(mctx, nulluintptr);
+-	atomic_init(&sentinel->enqidx, 0);
+-
+-	atomic_init(&queue->head, (uintptr_t)sentinel);
+-	atomic_init(&queue->tail, (uintptr_t)sentinel);
+-
+-	return (queue);
+-}
+-
+-void
+-isc_queue_enqueue(isc_queue_t *queue, uintptr_t item) {
+-	REQUIRE(item != nulluintptr);
+-
+-	while (true) {
+-		node_t *lt = NULL;
+-		uint_fast32_t idx;
+-		uintptr_t n = nulluintptr;
+-
+-		lt = (node_t *)isc_hp_protect(queue->hp, 0, &queue->tail);
+-		idx = atomic_fetch_add(&lt->enqidx, 1);
+-		if (idx > BUFFER_SIZE - 1) {
+-			node_t *lnext = NULL;
+-
+-			if (lt != (node_t *)atomic_load(&queue->tail)) {
+-				continue;
+-			}
+-
+-			lnext = (node_t *)atomic_load(&lt->next);
+-			if (lnext == NULL) {
+-				node_t *newnode = node_new(queue->mctx, item);
+-				if (node_cas_next(lt, NULL, newnode)) {
+-					queue_cas_tail(queue, lt, newnode);
+-					isc_hp_clear(queue->hp);
+-					return;
+-				}
+-				node_destroy(newnode);
+-			} else {
+-				queue_cas_tail(queue, lt, lnext);
+-			}
+-
+-			continue;
+-		}
+-
+-		if (atomic_compare_exchange_strong(&lt->items[idx], &n, item)) {
+-			isc_hp_clear(queue->hp);
+-			return;
+-		}
+-	}
+-}
+-
+-uintptr_t
+-isc_queue_dequeue(isc_queue_t *queue) {
+-	REQUIRE(queue != NULL);
+-
+-	while (true) {
+-		node_t *lh = NULL;
+-		uint_fast32_t idx;
+-		uintptr_t item;
+-
+-		lh = (node_t *)isc_hp_protect(queue->hp, 0, &queue->head);
+-		if (atomic_load(&lh->deqidx) >= atomic_load(&lh->enqidx) &&
+-		    atomic_load(&lh->next) == nulluintptr)
+-		{
+-			break;
+-		}
+-
+-		idx = atomic_fetch_add(&lh->deqidx, 1);
+-		if (idx > BUFFER_SIZE - 1) {
+-			node_t *lnext = (node_t *)atomic_load(&lh->next);
+-			if (lnext == NULL) {
+-				break;
+-			}
+-			if (queue_cas_head(queue, lh, lnext)) {
+-				isc_hp_retire(queue->hp, (uintptr_t)lh);
+-			}
+-
+-			continue;
+-		}
+-
+-		item = atomic_exchange(&(lh->items[idx]),
+-				       (uintptr_t)&queue->taken);
+-		if (item == nulluintptr) {
+-			continue;
+-		}
+-
+-		isc_hp_clear(queue->hp);
+-		return (item);
+-	}
+-
+-	isc_hp_clear(queue->hp);
+-	return (nulluintptr);
+-}
+-
+-void
+-isc_queue_destroy(isc_queue_t *queue) {
+-	node_t *last = NULL;
+-	void *alloced = NULL;
+-
+-	REQUIRE(queue != NULL);
+-
+-	while (isc_queue_dequeue(queue) != nulluintptr) {
+-		/* do nothing */
+-	}
+-
+-	last = (node_t *)atomic_load_relaxed(&queue->head);
+-	node_destroy(last);
+-	isc_hp_destroy(queue->hp);
+-
+-	alloced = queue->alloced_ptr;
+-	isc_mem_putanddetach(&queue->mctx, alloced, sizeof(*queue) + ALIGNMENT);
+-}
+diff --git a/lib/isc/task.c b/lib/isc/task.c
+index caf2c06..19a657a 100644
+--- a/lib/isc/task.c
++++ b/lib/isc/task.c
+@@ -198,7 +198,7 @@ isc_task_create(isc_taskmgr_t *manager, unsigned int quantum,
+ isc_result_t
+ isc_task_create_bound(isc_taskmgr_t *manager, unsigned int quantum,
+ 		      isc_task_t **taskp, int threadid) {
+-	isc_task_t *task;
++	isc_task_t *task = NULL;
+ 	bool exiting;
+ 
+ 	REQUIRE(VALID_MANAGER(manager));
+diff --git a/lib/isc/tests/netmgr_test.c b/lib/isc/tests/netmgr_test.c
+index d2c19e8..a3c635e 100644
+--- a/lib/isc/tests/netmgr_test.c
++++ b/lib/isc/tests/netmgr_test.c
+@@ -21,7 +21,6 @@
+ #define UNIT_TESTING
+ #include <cmocka.h>
+ 
+-#include <isc/hp.h>
+ #include <isc/nonce.h>
+ #include <isc/os.h>
+ #include <isc/quota.h>
+diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in
+index 54c6b0b..4f7f374 100644
+--- a/lib/isc/win32/libisc.def.in
++++ b/lib/isc/win32/libisc.def.in
+@@ -249,15 +249,6 @@ isc_heap_insert
+ isc_hex_decodestring
+ isc_hex_tobuffer
+ isc_hex_totext
+-isc_hp_clear
+-isc_hp_clear_one
+-isc_hp_destroy
+-isc_hp_init
+-isc_hp_protect
+-isc_hp_protect_ptr
+-isc_hp_protect_release
+-isc_hp_new
+-isc_hp_retire
+ isc_hmac
+ isc_hmac_new
+ isc_hmac_free
+@@ -268,13 +259,6 @@ isc_hmac_final
+ isc_hmac_get_md_type
+ isc_hmac_get_size
+ isc_hmac_get_block_size
+-isc_hp_new
+-isc_hp_destroy
+-isc_hp_clear
+-isc_hp_protect
+-isc_hp_protect_ptr
+-isc_hp_protect_release
+-isc_hp_retire
+ isc_ht_add
+ isc_ht_count
+ isc_ht_delete
+@@ -513,10 +497,6 @@ isc_portset_isset
+ isc_portset_nports
+ isc_portset_remove
+ isc_portset_removerange
+-isc_queue_enqueue
+-isc_queue_dequeue
+-isc_queue_destroy
+-isc_queue_new
+ isc_quota_attach
+ isc_quota_attach_cb
+ isc_quota_cb_init
+-- 
+2.33.0
+
diff --git a/backport-Reset-parser-before-parsing-of-internal-trust-anchor.patch b/backport-Reset-parser-before-parsing-of-internal-trust-anchor.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0fc4589e2d32af2176c389515f54460e62fc0cc7
--- /dev/null
+++ b/backport-Reset-parser-before-parsing-of-internal-trust-anchor.patch
@@ -0,0 +1,29 @@
+From ba9a140e1f3165145164a5923c65461824d80ab3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Thu, 11 Aug 2022 11:41:30 +0200
+Subject: [PATCH] Reset parser before parsing of internal trust anchor
+
+It might be reused if /etc/bind.keys exists, but failed correct parsing.
+Release traces of previous parsing attempt of different data.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/ba9a140e1f3165145164a5923c65461824d80ab3
+(cherry picked from commit dc07394c4724c1e1235af85dd8c044af70da93ae)
+---
+ bin/delv/delv.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/bin/delv/delv.c b/bin/delv/delv.c
+index f4c7c015dd..0702eec862 100644
+--- a/bin/delv/delv.c
++++ b/bin/delv/delv.c
+@@ -852,6 +852,7 @@ setup_dnsseckeys(dns_client_t *client) {
+ 
+ 		isc_buffer_init(&b, anchortext, sizeof(anchortext) - 1);
+ 		isc_buffer_add(&b, sizeof(anchortext) - 1);
++		cfg_parser_reset(parser);
+ 		result = cfg_parse_buffer(parser, &b, NULL, 0,
+ 					  &cfg_type_bindkeys, 0, &bindkeys);
+ 		if (result != ISC_R_SUCCESS) {
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Searching-catzs-zones-requires-a-read-lock.patch b/backport-Searching-catzs-zones-requires-a-read-lock.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7f1b2e247932a5d86c6175caf80fa3113e426b62
--- /dev/null
+++ b/backport-Searching-catzs-zones-requires-a-read-lock.patch
@@ -0,0 +1,33 @@
+From 79ee7353ad5eda781c4f9d2297ddff32682731d6 Mon Sep 17 00:00:00 2001
+From: Aram Sargsyan <aram@isc.org>
+Date: Fri, 27 Jan 2023 18:04:41 +0000
+Subject: [PATCH] Searching catzs->zones requires a read lock
+
+Lock the catzs->lock mutex before searching in the catzs->zones
+hash table.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/79ee7353ad5eda781c4f9d2297ddff32682731d6
+
+(cherry picked from commit 0ef0c86632c838c3f342fe1c6d8cdef1b327cde6)
+---
+ lib/dns/catz.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/dns/catz.c b/lib/dns/catz.c
+index 9a9ecd0dc9..eef688a1d0 100644
+--- a/lib/dns/catz.c
++++ b/lib/dns/catz.c
+@@ -752,8 +752,10 @@ dns_catz_get_zone(dns_catz_zones_t *catzs, const dns_name_t *name) {
+ 	REQUIRE(DNS_CATZ_ZONES_VALID(catzs));
+ 	REQUIRE(ISC_MAGIC_VALID(name, DNS_NAME_MAGIC));
+ 
++	LOCK(&catzs->lock);
+ 	result = isc_ht_find(catzs->zones, name->ndata, name->length,
+ 			     (void **)&found);
++	UNLOCK(&catzs->lock);
+ 	if (result != ISC_R_SUCCESS) {
+ 		return (NULL);
+ 	}
+-- 
+2.23.0
diff --git a/backport-Select-the-appropriate-namespace-when-using-a-dual-stack-server.patch b/backport-Select-the-appropriate-namespace-when-using-a-dual-stack-server.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6e50fc3ff6f97eda7860230b458f94d4e2f94b68
--- /dev/null
+++ b/backport-Select-the-appropriate-namespace-when-using-a-dual-stack-server.patch
@@ -0,0 +1,87 @@
+From 3952f01cad20c5468a9f0aef818ee79b57aeb260 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 18 Oct 2022 10:02:08 +1100
+Subject: [PATCH] Select the appropriate namespace when using a dual stack
+ server
+
+When using dual-stack-servers the covering namespace to check whether
+answers are in scope or not should be fctx->domain.  To do this we need
+to be able to distingish forwarding due to forwarders clauses and
+dual-stack-servers.  A new flag FCTX_ADDRINFO_DUALSTACK has been added
+to signal this.
+
+(cherry picked from commit dfbffd77f9fac6397f5223e0fc3b3de28de68b5f)
+---
+ lib/dns/resolver.c | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
+index 9a25a4cda7..41d79e9d46 100644
+--- a/lib/dns/resolver.c
++++ b/lib/dns/resolver.c
+@@ -320,6 +320,11 @@ struct fetchctx {
+ 	ISC_LIST(resquery_t) queries;
+ 	dns_adbfindlist_t finds;
+ 	dns_adbfind_t *find;
++	/*
++	 * altfinds are names and/or addresses of dual stack servers that
++	 * should be used when iterative resolution to a server is not
++	 * possible because the address family of that server is not usable.
++	 */
+ 	dns_adbfindlist_t altfinds;
+ 	dns_adbfind_t *altfind;
+ 	dns_adbaddrinfolist_t forwaddrs;
+@@ -588,12 +593,14 @@ struct dns_resolver {
+ #define FCTX_ADDRINFO_EDNSOK	0x04000
+ #define FCTX_ADDRINFO_NOCOOKIE	0x08000
+ #define FCTX_ADDRINFO_BADCOOKIE 0x10000
++#define FCTX_ADDRINFO_DUALSTACK 0x20000
+ 
+ #define UNMARKED(a)    (((a)->flags & FCTX_ADDRINFO_MARK) == 0)
+ #define ISFORWARDER(a) (((a)->flags & FCTX_ADDRINFO_FORWARDER) != 0)
+ #define NOCOOKIE(a)    (((a)->flags & FCTX_ADDRINFO_NOCOOKIE) != 0)
+ #define EDNSOK(a)      (((a)->flags & FCTX_ADDRINFO_EDNSOK) != 0)
+ #define BADCOOKIE(a)   (((a)->flags & FCTX_ADDRINFO_BADCOOKIE) != 0)
++#define ISDUALSTACK(a) (((a)->flags & FCTX_ADDRINFO_DUALSTACK) != 0)
+ 
+ #define NXDOMAIN(r) (((r)->attributes & DNS_RDATASETATTR_NXDOMAIN) != 0)
+ #define NEGATIVE(r) (((r)->attributes & DNS_RDATASETATTR_NEGATIVE) != 0)
+@@ -3639,7 +3646,7 @@ findname(fetchctx_t *fctx, const dns_name_t *name, in_port_t port,
+ 				}
+ 			}
+ 		}
+-		if ((flags & FCTX_ADDRINFO_FORWARDER) != 0) {
++		if ((flags & FCTX_ADDRINFO_DUALSTACK) != 0) {
+ 			ISC_LIST_APPEND(fctx->altfinds, find, publink);
+ 		} else {
+ 			ISC_LIST_APPEND(fctx->finds, find, publink);
+@@ -3938,7 +3945,7 @@ normal_nses:
+ 		     a = ISC_LIST_NEXT(a, link)) {
+ 			if (!a->isaddress) {
+ 				findname(fctx, &a->_u._n.name, a->_u._n.port,
+-					 stdoptions, FCTX_ADDRINFO_FORWARDER,
++					 stdoptions, FCTX_ADDRINFO_DUALSTACK,
+ 					 now, NULL, NULL, NULL);
+ 				continue;
+ 			}
+@@ -3951,6 +3958,7 @@ normal_nses:
+ 			if (result == ISC_R_SUCCESS) {
+ 				dns_adbaddrinfo_t *cur;
+ 				ai->flags |= FCTX_ADDRINFO_FORWARDER;
++				ai->flags |= FCTX_ADDRINFO_DUALSTACK;
+ 				cur = ISC_LIST_HEAD(fctx->altaddrs);
+ 				while (cur != NULL && cur->srtt < ai->srtt) {
+ 					cur = ISC_LIST_NEXT(cur, publink);
+@@ -7117,7 +7125,9 @@ name_external(const dns_name_t *name, dns_rdatatype_t type, fetchctx_t *fctx) {
+ 	unsigned int labels;
+ 	dns_namereln_t rel;
+ 
+-	apex = ISFORWARDER(fctx->addrinfo) ? fctx->fwdname : &fctx->domain;
++	apex = (ISDUALSTACK(fctx->addrinfo) || !ISFORWARDER(fctx->addrinfo))
++		       ? &fctx->domain
++		       : fctx->fwdname;
+ 
+ 	/*
+ 	 * The name is outside the queried namespace.
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Suppress-duplicate-dns_db_updatenotify_register-registrations.patch b/backport-Suppress-duplicate-dns_db_updatenotify_register-registrations.patch
new file mode 100644
index 0000000000000000000000000000000000000000..61bf78b5032fc74aff7dc441ccce7d0ce79168cf
--- /dev/null
+++ b/backport-Suppress-duplicate-dns_db_updatenotify_register-registrations.patch
@@ -0,0 +1,81 @@
+From ffeda92cd85461dad3bea74dd4892ef990fec4c9 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Wed, 30 Nov 2022 18:40:27 +1100
+Subject: [PATCH] Suppress duplicate dns_db_updatenotify_register registrations
+
+Duplicate dns_db_updatenotify_register registrations need to be
+suppressed to ensure that dns_db_updatenotify_unregister is successful.
+
+(cherry picked from commit f13e71e55167bf9c94f4faf1dab110467158e7b4)
+---
+ lib/dns/catz.c           |  6 +++---
+ lib/dns/db.c             | 12 +++++++++++-
+ lib/dns/include/dns/db.h |  2 +-
+ 3 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/lib/dns/catz.c b/lib/dns/catz.c
+index 487d20833e1..332f9877360 100644
+--- a/lib/dns/catz.c
++++ b/lib/dns/catz.c
+@@ -810,9 +810,9 @@ dns_catz_zone_detach(dns_catz_zone_t **zonep) {
+ 		zone->magic = 0;
+ 		isc_timer_detach(&zone->updatetimer);
+ 		if (zone->db_registered) {
+-			INSIST(dns_db_updatenotify_unregister(
+-				       zone->db, dns_catz_dbupdate_callback,
+-				       zone->catzs) == ISC_R_SUCCESS);
++			dns_db_updatenotify_unregister(
++				zone->db, dns_catz_dbupdate_callback,
++				zone->catzs);
+ 		}
+ 		if (zone->dbversion) {
+ 			dns_db_closeversion(zone->db, &zone->dbversion, false);
+diff --git a/lib/dns/db.c b/lib/dns/db.c
+index c5de3d9e0b0..04cf6560fea 100644
+--- a/lib/dns/db.c
++++ b/lib/dns/db.c
+@@ -1013,7 +1013,7 @@ dns_db_rpz_ready(dns_db_t *db) {
+ 	return ((db->methods->rpz_ready)(db));
+ }
+ 
+-/**
++/*
+  * Attach a notify-on-update function the database
+  */
+ isc_result_t
+@@ -1024,6 +1024,16 @@ dns_db_updatenotify_register(dns_db_t *db, dns_dbupdate_callback_t fn,
+ 	REQUIRE(db != NULL);
+ 	REQUIRE(fn != NULL);
+ 
++	for (listener = ISC_LIST_HEAD(db->update_listeners); listener != NULL;
++	     listener = ISC_LIST_NEXT(listener, link))
++	{
++		if ((listener->onupdate == fn) &&
++		    (listener->onupdate_arg == fn_arg))
++		{
++			return (ISC_R_SUCCESS);
++		}
++	}
++
+ 	listener = isc_mem_get(db->mctx, sizeof(dns_dbonupdatelistener_t));
+ 
+ 	listener->onupdate = fn;
+diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
+index f14d9f6c529..08bdc80e4ee 100644
+--- a/lib/dns/include/dns/db.h
++++ b/lib/dns/include/dns/db.h
+@@ -1673,11 +1673,11 @@ dns_db_updatenotify_register(dns_db_t *db, dns_dbupdate_callback_t fn,
+ 			     void *fn_arg);
+ /*%<
+  * Register a notify-on-update callback function to a database.
++ * Duplicate callbacks are suppressed.
+  *
+  * Requires:
+  *
+  * \li	'db' is a valid database
+- * \li	'db' does not have an update callback registered
+  * \li	'fn' is not NULL
+  *
+  */
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-Test-dnssec-policy-max-zone-ttl-rejects-zone-with-to.patch b/backport-Test-dnssec-policy-max-zone-ttl-rejects-zone-with-to.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2b3aee8c709327605248b4c2e690a361ce077f7a
--- /dev/null
+++ b/backport-Test-dnssec-policy-max-zone-ttl-rejects-zone-with-to.patch
@@ -0,0 +1,107 @@
+From 2022384b8dc7249671d521dc9ef5a292a960521d Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Wed, 13 Jul 2022 10:27:18 +0200
+Subject: [PATCH] Test dnssec-policy max-zone-ttl rejects zone with too high
+ TTL
+
+Similar to the 'max-zone-ttl' zone option, the 'dnssec-policy' option
+should reject zones with TTLs that are out of range.
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/2022384b8dc7249671d521dc9ef5a292a960521d
+---
+ bin/tests/system/kasp/ns3/named.conf.in       |  9 +++++++
+ .../system/kasp/ns3/policies/kasp.conf.in     |  4 ++++
+ bin/tests/system/kasp/ns3/setup.sh            | 24 ++++++++-----------
+ bin/tests/system/kasp/tests.sh                |  9 +++++++
+ 4 files changed, 32 insertions(+), 14 deletions(-)
+
+diff --git a/bin/tests/system/kasp/ns3/named.conf.in b/bin/tests/system/kasp/ns3/named.conf.in
+index e229fd9158..64ae2aa402 100644
+--- a/bin/tests/system/kasp/ns3/named.conf.in
++++ b/bin/tests/system/kasp/ns3/named.conf.in
+@@ -223,6 +223,15 @@ zone "ecdsa384.kasp" {
+ 	dnssec-policy "ecdsa384";
+ };
+ 
++/*
++ * Zone with too high TTL.
++ */
++zone "max-zone-ttl.kasp" {
++	type primary;
++	file "max-zone-ttl.kasp.db";
++	dnssec-policy "ttl";
++};
++
+ /*
+  * Zones in different signing states.
+  */
+diff --git a/bin/tests/system/kasp/ns3/policies/kasp.conf.in b/bin/tests/system/kasp/ns3/policies/kasp.conf.in
+index d0ae96ce08..17b900c7b3 100644
+--- a/bin/tests/system/kasp/ns3/policies/kasp.conf.in
++++ b/bin/tests/system/kasp/ns3/policies/kasp.conf.in
+@@ -132,3 +132,7 @@ dnssec-policy "checkds-csk" {
+ 		csk key-directory lifetime unlimited algorithm @DEFAULT_ALGORITHM@;
+ 	};
+ };
++
++dnssec-policy "ttl" {
++	max-zone-ttl 299;
++};
+diff --git a/bin/tests/system/kasp/ns3/setup.sh b/bin/tests/system/kasp/ns3/setup.sh
+index 21c4c9126d..bc4a0fc11d 100644
+--- a/bin/tests/system/kasp/ns3/setup.sh
++++ b/bin/tests/system/kasp/ns3/setup.sh
+@@ -64,20 +64,16 @@ if [ -f ../ed448-supported.file ]; then
+ 	cat ed448.conf >> named.conf
+ fi
+ 
+-# Set up zone that stays unsigned.
+-zone="unsigned.kasp"
+-echo_i "setting up zone: $zone"
+-zonefile="${zone}.db"
+-infile="${zone}.db.infile"
+-cp template.db.in $infile
+-cp template.db.in $zonefile
+-
+-# Set up zone that stays unsigned.
+-zone="insecure.kasp"
+-echo_i "setting up zone: $zone"
+-zonefile="${zone}.db"
+-infile="${zone}.db.infile"
+-cp template.db.in $zonefile
++# Set up zones that stay unsigned.
++for zn in unsigned insecure max-zone-ttl
++do
++	zone="${zn}.kasp"
++	echo_i "setting up zone: $zone"
++	zonefile="${zone}.db"
++	infile="${zone}.db.infile"
++	cp template.db.in $infile
++	cp template.db.in $zonefile
++done
+ 
+ # Some of these zones already have keys.
+ zone="dnssec-keygen.kasp"
+diff --git a/bin/tests/system/kasp/tests.sh b/bin/tests/system/kasp/tests.sh
+index 4a458945a0..ff4d32cc7b 100644
+--- a/bin/tests/system/kasp/tests.sh
++++ b/bin/tests/system/kasp/tests.sh
+@@ -253,6 +253,15 @@ status=$((status+ret))
+ 
+ next_key_event_threshold=$((next_key_event_threshold+i))
+ 
++# Test max-zone-ttl rejects zones with too high TTL.
++n=$((n+1))
++echo_i "check that max-zone-ttl rejects zones with too high TTL ($n)"
++ret=0
++set_zone "max-zone-ttl.kasp"
++grep "loading from master file ${ZONE}.db failed: out of range" "ns3/named.run" > /dev/null || ret=1
++test "$ret" -eq 0 || echo_i "failed"
++status=$((status+ret))
++
+ #
+ # Zone: default.kasp.
+ #
+-- 
+2.27.0
+
diff --git a/backport-clean-up-properly-when-interface-creation-fails.patch b/backport-clean-up-properly-when-interface-creation-fails.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2c851eaab3ffff96c19438d6fd27fc7027e50fa8
--- /dev/null
+++ b/backport-clean-up-properly-when-interface-creation-fails.patch
@@ -0,0 +1,67 @@
+From 80a8322d6594cfaa9ffe90d3de0c315a0d34efc3 Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Fri, 2 Sep 2022 15:41:26 -0700
+Subject: [PATCH] clean up properly when interface creation fails
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/80a8322d6594cfaa9ffe90d3de0c315a0d34efc3
+
+previously, if ns_clientmgr_create() failed, the interface was not
+cleaned up correctly and an assertion or segmentation fault could
+follow. this has been fixed.
+---
+ lib/ns/interfacemgr.c | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c
+index facb0d141b..51429de716 100644
+--- a/lib/ns/interfacemgr.c
++++ b/lib/ns/interfacemgr.c
+@@ -391,7 +391,7 @@ ns_interfacemgr_shutdown(ns_interfacemgr_t *mgr) {
+ static isc_result_t
+ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
+ 		    const char *name, ns_interface_t **ifpret) {
+-	ns_interface_t *ifp;
++	ns_interface_t *ifp = NULL;
+ 	isc_result_t result;
+ 	int disp;
+ 
+@@ -422,13 +422,13 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
+ 	ISC_LINK_INIT(ifp, link);
+ 
+ 	ns_interfacemgr_attach(mgr, &ifp->mgr);
++	isc_refcount_init(&ifp->references, 1);
++	ifp->magic = IFACE_MAGIC;
++
+ 	LOCK(&mgr->lock);
+ 	ISC_LIST_APPEND(mgr->interfaces, ifp, link);
+ 	UNLOCK(&mgr->lock);
+ 
+-	isc_refcount_init(&ifp->references, 1);
+-	ifp->magic = IFACE_MAGIC;
+-
+ 	result = ns_clientmgr_create(mgr->mctx, mgr->sctx, mgr->taskmgr,
+ 				     mgr->timermgr, ifp, mgr->ncpus,
+ 				     &ifp->clientmgr);
+@@ -444,11 +444,17 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
+ 	return (ISC_R_SUCCESS);
+ 
+ failure:
+-	isc_mutex_destroy(&ifp->lock);
++	LOCK(&ifp->mgr->lock);
++	ISC_LIST_UNLINK(ifp->mgr->interfaces, ifp, link);
++	UNLOCK(&ifp->mgr->lock);
+ 
+ 	ifp->magic = 0;
+-	isc_mem_put(mgr->mctx, ifp, sizeof(*ifp));
++	ns_interfacemgr_detach(&ifp->mgr);
++	isc_refcount_decrement(&ifp->references);
++	isc_refcount_destroy(&ifp->references);
++	isc_mutex_destroy(&ifp->lock);
+ 
++	isc_mem_put(mgr->mctx, ifp, sizeof(*ifp));
+ 	return (ISC_R_UNEXPECTED);
+ }
+ 
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-delay-trust-anchor-management-until-zones-are-loaded.patch b/backport-delay-trust-anchor-management-until-zones-are-loaded.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d8297f29fc09a35e090ead16776c4e754dfdd0ba
--- /dev/null
+++ b/backport-delay-trust-anchor-management-until-zones-are-loaded.patch
@@ -0,0 +1,103 @@
+From aca10608b64b161bc9e4b03f0f70b9a5f07ed08f Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Fri, 27 Jan 2023 14:43:11 -0800
+Subject: [PATCH] delay trust anchor management until zones are loaded
+
+it was possible for a managed trust anchor needing to send a key
+refresh query to be unable to do so because an authoritative zone
+was not yet loaded. this has been corrected by delaying the
+synchronization of managed-keys zones until after all zones are
+loaded.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/aca10608b64b161bc9e4b03f0f70b9a5f07ed08f
+
+(cherry picked from commit bafbbd24653dc80a29ebd4e0569f77166123c3d1)
+---
+ bin/named/server.c | 23 +++++++++++++++++++++++
+ lib/dns/zone.c     | 15 ++-------------
+ 2 files changed, 25 insertions(+), 13 deletions(-)
+
+diff --git a/bin/named/server.c b/bin/named/server.c
+index ed0ee59552..a23c4ed107 100644
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -9658,6 +9658,7 @@ view_loaded(void *arg) {
+ 	if (isc_refcount_decrement(&zl->refs) == 1) {
+ 		named_server_t *server = zl->server;
+ 		bool reconfig = zl->reconfig;
++		dns_view_t *view = NULL;
+ 
+ 		isc_refcount_destroy(&zl->refs);
+ 		isc_mem_put(server->mctx, zl, sizeof(*zl));
+@@ -9678,6 +9679,28 @@ view_loaded(void *arg) {
+ 				      "all zones loaded");
+ 		}
+ 
++		for (view = ISC_LIST_HEAD(server->viewlist); view != NULL;
++		     view = ISC_LIST_NEXT(view, link))
++		{
++			if (view->managed_keys != NULL) {
++				result = dns_zone_synckeyzone(
++					view->managed_keys);
++				if (result != ISC_R_SUCCESS) {
++					isc_log_write(
++						named_g_lctx,
++						DNS_LOGCATEGORY_DNSSEC,
++						DNS_LOGMODULE_DNSSEC,
++						ISC_LOG_ERROR,
++						"failed to initialize "
++						"managed-keys for view %s "
++						"(%s): DNSSEC validation is "
++						"at risk",
++						view->name,
++						isc_result_totext(result));
++				}
++			}
++		}
++
+ 		CHECKFATAL(dns_zonemgr_forcemaint(server->zonemgr),
+ 			   "forcing zone maintenance");
+ 
+diff --git a/lib/dns/zone.c b/lib/dns/zone.c
+index c418be5da4..a2fe9f6d24 100644
+--- a/lib/dns/zone.c
++++ b/lib/dns/zone.c
+@@ -4730,8 +4730,7 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) {
+ 	}
+ 
+ failure:
+-	if (result != ISC_R_SUCCESS && !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED))
+-	{
++	if (result != ISC_R_SUCCESS) {
+ 		dnssec_log(zone, ISC_LOG_ERROR,
+ 			   "unable to synchronize managed keys: %s",
+ 			   dns_result_totext(result));
+@@ -5196,10 +5195,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
+ 		break;
+ 
+ 	case dns_zone_key:
+-		result = sync_keyzone(zone, db);
+-		if (result != ISC_R_SUCCESS) {
+-			goto cleanup;
+-		}
++		/* Nothing needs to be done now */
+ 		break;
+ 
+ 	default:
+@@ -5357,13 +5353,6 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
+ 	goto done;
+ 
+ cleanup:
+-	if (zone->type == dns_zone_key && result != ISC_R_SUCCESS) {
+-		dnssec_log(zone, ISC_LOG_ERROR,
+-			   "failed to initialize managed-keys (%s): "
+-			   "DNSSEC validation is at risk",
+-			   isc_result_totext(result));
+-	}
+-
+ 	if (result != ISC_R_SUCCESS) {
+ 		dns_zone_rpz_disable_db(zone, db);
+ 		dns_zone_catz_disable_db(zone, db);
+-- 
+2.23.0
diff --git a/backport-disassociate-rdatasets-when-cleaning-up.patch b/backport-disassociate-rdatasets-when-cleaning-up.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3baa3f5546c6771f38b351c222de44beae74fec8
--- /dev/null
+++ b/backport-disassociate-rdatasets-when-cleaning-up.patch
@@ -0,0 +1,31 @@
+From f2855facbeb19c51befed1c858f4d28b8306f886 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 21 Dec 2021 12:44:17 +1100
+Subject: [PATCH] disassociate rdatasets when cleaning up
+
+free_namelist could be passed names with associated rdatasets
+when handling errors.  These need to be disassociated before
+calling dns_message_puttemprdataset.
+
+(cherry picked from commit 745d5edc3a8ca6f232b2d700ae076c2caee2bfc5)
+---
+ lib/dns/tkey.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
+index e6e44526a9c..9259a513188 100644
+--- a/lib/dns/tkey.c
++++ b/lib/dns/tkey.c
+@@ -226,6 +226,9 @@ free_namelist(dns_message_t *msg, dns_namelist_t *namelist) {
+ 		while (!ISC_LIST_EMPTY(name->list)) {
+ 			set = ISC_LIST_HEAD(name->list);
+ 			ISC_LIST_UNLINK(name->list, set, link);
++			if (dns_rdataset_isassociated(set)) {
++				dns_rdataset_disassociate(set);
++			}
+ 			dns_message_puttemprdataset(msg, &set);
+ 		}
+ 		dns_message_puttempname(msg, &name);
+-- 
+GitLab
+
diff --git a/backport-dnstap-query_message-field-was-erroneously-set-with-responses.patch b/backport-dnstap-query_message-field-was-erroneously-set-with-responses.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5e3e30de6ef003d4b1e09e0c566fe285974f4ee8
--- /dev/null
+++ b/backport-dnstap-query_message-field-was-erroneously-set-with-responses.patch
@@ -0,0 +1,61 @@
+From e1fa6cbab82fe424a94269e3ae9e106c10bf59be Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Fri, 26 Aug 2022 15:38:34 -0700
+Subject: [PATCH] dnstap query_message field was erroneously set with responses
+
+The dnstap query_message field was in some cases being filled in
+with response messages, along with the response_message field.
+The query_message field should only be used when logging requests,
+and the response_message field only when logging responses.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/e1fa6cbab82fe424a94269e3ae9e106c10bf59be
+---
+ lib/dns/dnstap.c | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c
+index 30ca97e636..97f070937d 100644
+--- a/lib/dns/dnstap.c
++++ b/lib/dns/dnstap.c
+@@ -808,10 +808,11 @@ dns_dt_send(dns_view_t *view, dns_dtmsgtype_t msgtype, isc_sockaddr_t *qaddr,
+ 		dm.m.response_time_nsec = isc_time_nanoseconds(t);
+ 		dm.m.has_response_time_nsec = 1;
+ 
+-		cpbuf(buf, &dm.m.response_message, &dm.m.has_response_message);
+-
+-		/* Types RR and FR get both query and response times */
+-		if (msgtype == DNS_DTTYPE_CR || msgtype == DNS_DTTYPE_AR) {
++		/*
++		 * Types RR and FR can fall through and get the query
++		 * time set as well. Any other response type, break.
++		 */
++		if (msgtype != DNS_DTTYPE_RR && msgtype != DNS_DTTYPE_FR) {
+ 			break;
+ 		}
+ 
+@@ -831,8 +832,6 @@ dns_dt_send(dns_view_t *view, dns_dtmsgtype_t msgtype, isc_sockaddr_t *qaddr,
+ 		dm.m.has_query_time_sec = 1;
+ 		dm.m.query_time_nsec = isc_time_nanoseconds(t);
+ 		dm.m.has_query_time_nsec = 1;
+-
+-		cpbuf(buf, &dm.m.query_message, &dm.m.has_query_message);
+ 		break;
+ 	default:
+ 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_DNSTAP,
+@@ -841,6 +840,13 @@ dns_dt_send(dns_view_t *view, dns_dtmsgtype_t msgtype, isc_sockaddr_t *qaddr,
+ 		return;
+ 	}
+ 
++	/* Query and response messages */
++	if ((msgtype & DNS_DTTYPE_QUERY) != 0) {
++		cpbuf(buf, &dm.m.query_message, &dm.m.has_query_message);
++	} else if ((msgtype & DNS_DTTYPE_RESPONSE) != 0) {
++		cpbuf(buf, &dm.m.response_message, &dm.m.has_response_message);
++	}
++
+ 	/* Zone/bailiwick */
+ 	switch (msgtype) {
+ 	case DNS_DTTYPE_AR:
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-dont-enabled-serve-stale-on-duplicate-queries.patch b/backport-dont-enabled-serve-stale-on-duplicate-queries.patch
new file mode 100644
index 0000000000000000000000000000000000000000..58917c624e9a2e3adf58e12547c9e2d1f675f8ca
--- /dev/null
+++ b/backport-dont-enabled-serve-stale-on-duplicate-queries.patch
@@ -0,0 +1,36 @@
+From dd7dde5743715dc0dec2defbb92b1a8637977bf9 Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Tue, 2 Aug 2022 14:21:40 +0200
+Subject: [PATCH] Don't enable serve-stale on duplicate queries
+
+When checking if we should enable serve-stale, add an early out case
+when the result is an error signalling a duplicate query or a query
+that would be dropped.
+
+(cherry picked from commit 059a4c2f4d9d3cff371842f43208d021509314fa)
+---
+ lib/ns/query.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index d0f025dbb9a..1bf36fea283 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -7230,6 +7230,14 @@ query_usestale(query_ctx_t *qctx, isc_result_t result) {
+ 		return (false);
+ 	}
+ 
++	if (result == DNS_R_DUPLICATE || result == DNS_R_DROP) {
++		/*
++		 * Don't enable serve-stale if the result signals a duplicate
++		 * query or query that is being dropped.
++		 */
++		return (false);
++	}
++
+ 	qctx_clean(qctx);
+ 	qctx_freedata(qctx);
+ 
+-- 
+GitLab
+
diff --git a/backport-ensure-RPZ-lookups-handle-CD-1-correctly.patch b/backport-ensure-RPZ-lookups-handle-CD-1-correctly.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b6270056175648398a8425d7c1458b220ac3580d
--- /dev/null
+++ b/backport-ensure-RPZ-lookups-handle-CD-1-correctly.patch
@@ -0,0 +1,62 @@
+From 8e4a1f3483bedf262504583605ec07205bd17c2a Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Tue, 18 Oct 2022 13:48:52 -0700
+Subject: [PATCH] ensure RPZ lookups handle CD=1 correctly
+
+RPZ rewrites called dns_db_findext() without passing through the
+client database options; as as result, if the client set CD=1,
+DNS_DBFIND_PENDINGOK was not used as it should have been, and
+cache lookups failed, resulting in failure of the rewrite.
+
+(cherry picked from commit 305a50dbe12a43b0ee429c2e9bee04f35a8047c4)
+---
+ lib/ns/query.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/lib/ns/query.c b/lib/ns/query.c
+index 43a0293d5d..baa28b5233 100644
+--- a/lib/ns/query.c
++++ b/lib/ns/query.c
+@@ -3585,7 +3585,7 @@ rpz_rewrite_ip_rrset(ns_client_t *client, dns_name_t *name,
+ 	struct in_addr ina;
+ 	struct in6_addr in6a;
+ 	isc_result_t result;
+-	unsigned int options = DNS_DBFIND_GLUEOK;
++	unsigned int options = client->query.dboptions | DNS_DBFIND_GLUEOK;
+ 	bool done = false;
+ 
+ 	CTRACE(ISC_LOG_DEBUG(3), "rpz_rewrite_ip_rrset");
+@@ -3646,8 +3646,9 @@ rpz_rewrite_ip_rrset(ns_client_t *client, dns_name_t *name,
+ 		 * otherwise we are done.
+ 		 */
+ 		if (result == DNS_R_GLUE) {
+-			options = 0;
++			options = client->query.dboptions;
+ 		} else {
++			options = client->query.dboptions | DNS_DBFIND_GLUEOK;
+ 			done = true;
+ 		}
+ 
+@@ -4207,7 +4208,7 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult,
+ 
+ 	dns_fixedname_init(&nsnamef);
+ 	dns_name_clone(client->query.qname, dns_fixedname_name(&nsnamef));
+-	options = DNS_DBFIND_GLUEOK;
++	options = client->query.dboptions | DNS_DBFIND_GLUEOK;
+ 	while (st->r.label > st->popt.min_ns_labels) {
+ 		bool was_glue = false;
+ 		/*
+@@ -4333,9 +4334,9 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult,
+ 		 * glue responses, otherwise setup for the next name.
+ 		 */
+ 		if (was_glue) {
+-			options = 0;
++			options = client->query.dboptions;
+ 		} else {
+-			options = DNS_DBFIND_GLUEOK;
++			options = client->query.dboptions | DNS_DBFIND_GLUEOK;
+ 			st->r.label--;
+ 		}
+ 
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-fix-an-incorrect-detach-in-update-processing.patch b/backport-fix-an-incorrect-detach-in-update-processing.patch
new file mode 100644
index 0000000000000000000000000000000000000000..acc0c7e727c6f79e152eb721ccab18ad249c1a78
--- /dev/null
+++ b/backport-fix-an-incorrect-detach-in-update-processing.patch
@@ -0,0 +1,84 @@
+From 17924f4bdfbd99e06057c090d6ac3e8074deb642 Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Fri, 2 Sep 2022 14:44:58 -0700
+Subject: [PATCH] fix an incorrect detach in update processing
+
+when processing UDPATE requests, hold the request handle until
+we either drop the request or respond to it.
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/17924f4bdfbd99e06057c090d6ac3e8074deb642
+(cherry picked from commit 00e0758e1218f82fd1fe995c161ce4243bbbbb89)
+---
+ lib/ns/update.c | 25 +++++++++++--------------
+ 1 file changed, 11 insertions(+), 14 deletions(-)
+
+diff --git a/lib/ns/update.c b/lib/ns/update.c
+index c4bde3d4eb..a21b725f39 100644
+--- a/lib/ns/update.c
++++ b/lib/ns/update.c
+@@ -1569,19 +1569,17 @@ respond(ns_client_t *client, isc_result_t result) {
+ 
+ 	msg_result = dns_message_reply(client->message, true);
+ 	if (msg_result != ISC_R_SUCCESS) {
+-		goto msg_failure;
++		isc_log_write(ns_lctx, NS_LOGCATEGORY_UPDATE,
++			      NS_LOGMODULE_UPDATE, ISC_LOG_ERROR,
++			      "could not create update response message: %s",
++			      isc_result_totext(msg_result));
++		ns_client_drop(client, msg_result);
++		isc_nmhandle_detach(&client->reqhandle);
++		return;
+ 	}
+-	client->message->rcode = dns_result_torcode(result);
+ 
++	client->message->rcode = dns_result_torcode(result);
+ 	ns_client_send(client);
+-	return;
+-
+-msg_failure:
+-	isc_log_write(ns_lctx, NS_LOGCATEGORY_UPDATE, NS_LOGMODULE_UPDATE,
+-		      ISC_LOG_ERROR,
+-		      "could not create update response message: %s",
+-		      isc_result_totext(msg_result));
+-	ns_client_drop(client, msg_result);
+ 	isc_nmhandle_detach(&client->reqhandle);
+ }
+ 
+@@ -1595,7 +1593,8 @@ ns_update_start(ns_client_t *client, isc_nmhandle_t *handle,
+ 	dns_zone_t *zone = NULL, *raw = NULL;
+ 
+ 	/*
+-	 * Attach to the request handle
++	 * Attach to the request handle. This will be held until
++	 * we respond, or drop the request.
+ 	 */
+ 	isc_nmhandle_attach(handle, &client->reqhandle);
+ 
+@@ -1677,8 +1676,6 @@ ns_update_start(ns_client_t *client, isc_nmhandle_t *handle,
+ 	default:
+ 		FAILC(DNS_R_NOTAUTH, "not authoritative for update zone");
+ 	}
+-
+-	isc_nmhandle_detach(&client->reqhandle);
+ 	return;
+ 
+ failure:
+@@ -1696,7 +1693,6 @@ failure:
+ 	if (zone != NULL) {
+ 		dns_zone_detach(&zone);
+ 	}
+-	isc_nmhandle_detach(&client->reqhandle);
+ }
+ 
+ /*%
+@@ -3554,6 +3550,7 @@ forward_done(isc_task_t *task, isc_event_t *event) {
+ 	ns_client_sendraw(client, uev->answer);
+ 	dns_message_detach(&uev->answer);
+ 	isc_event_free(&event);
++	isc_nmhandle_detach(&client->reqhandle);
+ 	isc_nmhandle_detach(&client->updatehandle);
+ }
+ 
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-nsec3.c-Add-a-missing-dns_db_detachnode-call.patch b/backport-nsec3.c-Add-a-missing-dns_db_detachnode-call.patch
new file mode 100644
index 0000000000000000000000000000000000000000..54522fc6e56f3a48aed9ee7eecf9ba7c1caaa281
--- /dev/null
+++ b/backport-nsec3.c-Add-a-missing-dns_db_detachnode-call.patch
@@ -0,0 +1,33 @@
+From 58d01b821af93448714ccb22cea15c35088bd33a Mon Sep 17 00:00:00 2001
+From: Matthijs Mekking <matthijs@isc.org>
+Date: Tue, 23 Aug 2022 10:54:42 +0200
+Subject: [PATCH] nsec3.c: Add a missing dns_db_detachnode() call
+
+There is one case in 'dns_nsec3_activex()' where it returns but forgets
+to detach the db node. Add the missing 'dns_db_detachnode()' call.
+
+This case only triggers if 'sig-signing-type' (privatetype) is set to 0
+(which by default is not), or if the function is called with 'complete'
+is set to 'true' (which at this moment do not exist).
+
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/58d01b821af93448714ccb22cea15c35088bd33a
+(cherry picked from commit 0cf6c18ccb2205a1fc81431f908c8310f6136bbb)
+---
+ lib/dns/nsec3.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c
+index f4f7cdeb53..45240b2499 100644
+--- a/lib/dns/nsec3.c
++++ b/lib/dns/nsec3.c
+@@ -1833,6 +1833,7 @@ dns_nsec3_activex(dns_db_t *db, dns_dbversion_t *version, bool complete,
+ 
+ try_private:
+ 	if (privatetype == 0 || complete) {
++		dns_db_detachnode(db, &node);
+ 		*answer = false;
+ 		return (ISC_R_SUCCESS);
+ 	}
+-- 
+2.23.0
\ No newline at end of file
diff --git a/backport-warn-about-zones-with-both-dnssec-policy-and-max-zon.patch b/backport-warn-about-zones-with-both-dnssec-policy-and-max-zon.patch
new file mode 100644
index 0000000000000000000000000000000000000000..eb051d626a3af4d0db177136f589f6d686340ac3
--- /dev/null
+++ b/backport-warn-about-zones-with-both-dnssec-policy-and-max-zon.patch
@@ -0,0 +1,102 @@
+From fb8f102ffcd0e0bb3b9691ceec5ee8a24025af28 Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Thu, 21 Jul 2022 11:07:31 -0700
+Subject: [PATCH] warn about zones with both dnssec-policy and max-zone-ttl
+
+max-zone-ttl in zone/view/options is a no-op if dnssec-policy
+is in use, so generate a warning.
+Conflict: NA
+Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/fb8f102ffcd0e0bb3b9691ceec5ee8a24025af28
+---
+ bin/tests/system/checkconf/tests.sh           |  8 ++++++
+ .../checkconf/warn-kasp-max-zone-ttl.conf     | 26 +++++++++++++++++++
+ lib/bind9/check.c                             | 21 +++++++++++++++
+ 3 files changed, 55 insertions(+)
+ create mode 100644 bin/tests/system/checkconf/warn-kasp-max-zone-ttl.conf
+
+diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
+index cec8f8407e..9143e9e08c 100644
+--- a/bin/tests/system/checkconf/tests.sh
++++ b/bin/tests/system/checkconf/tests.sh
+@@ -585,6 +585,14 @@ grep "not recommended" < checkconf.out$n > /dev/null || ret=1
+ if [ $ret != 0 ]; then echo_i "failed"; ret=1; fi
+ status=`expr $status + $ret`
+ 
++n=`expr $n + 1`
++echo_i "check that using both max-zone-ttl and dnssec-policy generates a warning ($n)"
++ret=0
++$CHECKCONF warn-kasp-max-zone-ttl.conf > checkconf.out$n 2>/dev/null || ret=1
++grep "option 'max-zone-ttl' is ignored when used together with 'dnssec-policy'" < checkconf.out$n > /dev/null || ret=1
++if [ $ret != 0 ]; then echo_i "failed"; ret=1; fi
++status=`expr $status + $ret`
++
+ n=$((n+1))
+ echo_i "check that masterfile-format map generates deprecation warning ($n)"
+ ret=0
+diff --git a/bin/tests/system/checkconf/warn-kasp-max-zone-ttl.conf b/bin/tests/system/checkconf/warn-kasp-max-zone-ttl.conf
+new file mode 100644
+index 0000000000..0b5939478e
+--- /dev/null
++++ b/bin/tests/system/checkconf/warn-kasp-max-zone-ttl.conf
+@@ -0,0 +1,26 @@
++/*
++ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
++ *
++ * SPDX-License-Identifier: MPL-2.0
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0.  If a copy of the MPL was not distributed with this
++ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
++ *
++ * See the COPYRIGHT file distributed with this work for additional
++ * information regarding copyright ownership.
++ */
++
++/*
++ * The dnssec-policy is not defined. Should also be caught if it is inherited.
++ */
++
++options {
++	dnssec-policy default;
++};
++
++zone "example.net" {
++	type primary;
++	file "example.db";
++        max-zone-ttl 600;
++};
+diff --git a/lib/bind9/check.c b/lib/bind9/check.c
+index 0be4871020..0707ea44b9 100644
+--- a/lib/bind9/check.c
++++ b/lib/bind9/check.c
+@@ -2633,6 +2633,27 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
+ 		}
+ 	}
+ 
++	/*
++	 * Warn about zones with both dnssec-policy and max-zone-ttl
++	 */
++	if (has_dnssecpolicy) {
++		obj = NULL;
++		(void)cfg_map_get(zoptions, "max-zone-ttl", &obj);
++		if (obj == NULL && voptions != NULL) {
++			(void)cfg_map_get(voptions, "max-zone-ttl", &obj);
++		}
++		if (obj == NULL && goptions != NULL) {
++			(void)cfg_map_get(goptions, "max-zone-ttl", &obj);
++		}
++		if (obj != NULL) {
++			cfg_obj_log(obj, logctx, ISC_LOG_WARNING,
++				    "zone '%s': option 'max-zone-ttl' "
++				    "is ignored when used together with "
++				    "'dnssec-policy'",
++				    znamestr);
++		}
++	}
++
+ 	/*
+ 	 * Check validity of the zone options.
+ 	 */
+-- 
+2.27.0
+
diff --git a/bind-9.10-dist-native-pkcs11.patch b/bind-9.10-dist-native-pkcs11.patch
index df0d8963884e883b8cb6275244072b4ecf05a87a..e4f1ebd6566484101fb4bbba6bc81dca826db9e4 100644
--- a/bind-9.10-dist-native-pkcs11.patch
+++ b/bind-9.10-dist-native-pkcs11.patch
@@ -1,68 +1,107 @@
+From 1cbffe7e8b5bced9134abbae23a2a20c83d39a6a Mon Sep 17 00:00:00 2001
+From: Petr Mensik <pemensik@redhat.com>
+Date: Thu, 21 Jan 2021 10:46:20 +0100
+Subject: [PATCH] Enable custom pkcs11 native build
+
+Share common parts like libisc, libcc and others. But provide native
+pkcs11 libraries as a new copy of libdns and libns.
+---
+ bin/Makefile.in                  |  2 +-
+ bin/confgen/Makefile.in          |  2 +-
+ bin/dnssec-pkcs11/Makefile.in    | 39 +++++++++++++++++---------------
+ bin/named-pkcs11/Makefile.in     | 31 +++++++++++++------------
+ configure.ac                     | 19 ++++++++++++++++
+ lib/Makefile.in                  |  2 +-
+ lib/dns-pkcs11/Makefile.in       | 22 +++++++++---------
+ lib/dns-pkcs11/tests/Makefile.in |  8 +++----
+ lib/ns-pkcs11/Makefile.in        | 26 ++++++++++-----------
+ lib/ns-pkcs11/tests/Makefile.in  | 12 +++++-----
+ make/includes.in                 |  7 ++++++
+ 11 files changed, 100 insertions(+), 70 deletions(-)
+
 diff --git a/bin/Makefile.in b/bin/Makefile.in
-index f0c504a..ce7a2da 100644
+index 9ad7f62..094775a 100644
 --- a/bin/Makefile.in
 +++ b/bin/Makefile.in
-@@ -11,8 +11,8 @@ srcdir =	@srcdir@
+@@ -11,7 +11,7 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
  
 -SUBDIRS =	named rndc dig delv dnssec tools nsupdate check confgen \
--		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
-+SUBDIRS =	named named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools nsupdate \
-+		check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
++SUBDIRS =	named named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools nsupdate check confgen \
+ 		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests
  TARGETS =
  
- @BIND9_MAKE_RULES@
+diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
+index c126bf3..1b7512d 100644
+--- a/bin/confgen/Makefile.in
++++ b/bin/confgen/Makefile.in
+@@ -22,7 +22,7 @@ VERSION=@BIND9_VERSION@
+ CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
+ 	${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
+ 
+-CDEFINES = @USE_PKCS11@
++CDEFINES =
+ CWARNINGS =
+ 
+ ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
 diff --git a/bin/dnssec-pkcs11/Makefile.in b/bin/dnssec-pkcs11/Makefile.in
-index 4b8ca13..32f4470 100644
+index ace0e5a..e0f6a00 100644
 --- a/bin/dnssec-pkcs11/Makefile.in
 +++ b/bin/dnssec-pkcs11/Makefile.in
 @@ -15,18 +15,18 @@ VERSION=@BIND9_VERSION@
  
  @BIND9_MAKE_INCLUDES@
  
--CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
-+CINCLUDES =	${DNS_PKCS11_INCLUDES} ${ISC_PKCS11_INCLUDES}
+-CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
++CINCLUDES =	${DNS_PKCS11_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
+ 		${OPENSSL_CFLAGS}
  
--CDEFINES =	-DVERSION=\"${VERSION}\" @USE_PKCS11@ @PKCS11_ENGINE@ \
--		@CRYPTO@ -DPK11_LIB_LOCATION=\"@PKCS11_PROVIDER@\"
-+CDEFINES =	-DVERSION=\"${VERSION}\" @PKCS11_ENGINE@ \
-+		@CRYPTO_PK11@ -DPK11_LIB_LOCATION=\"@PKCS11_PROVIDER@\"
+-CDEFINES =	-DVERSION=\"${VERSION}\" -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
++CDEFINES =	-DVERSION=\"${VERSION}\" -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\" -DUSE_PKCS11=1
  CWARNINGS =
  
--DNSLIBS =	../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
--ISCLIBS =	../../lib/isc/libisc.@A@
--ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
-+DNSLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
-+ISCLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@
-+ISCNOSYMLIBS =	../../lib/isc-pkcs11/libisc-pkcs11-nosymtbl.@A@
+-DNSLIBS =	../../lib/dns/libdns.@A@ @NO_LIBTOOL_DNSLIBS@
++DNSLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@ @NO_LIBTOOL_DNSLIBS@
+ ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
+ ISCLIBS =	../../lib/isc/libisc.@A@ @NO_LIBTOOL_ISCLIBS@
+ ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@ @NO_LIBTOOL_ISCLIBS@
  
 -DNSDEPLIBS =	../../lib/dns/libdns.@A@
--ISCDEPLIBS =	../../lib/isc/libisc.@A@
 +DNSDEPLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@
-+ISCDEPLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@
+ ISCDEPLIBS =	../../lib/isc/libisc.@A@
+ ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
  
- DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
+@@ -36,12 +36,15 @@ LIBS =		${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
  
-@@ -35,10 +35,10 @@ LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
- NOSYMLIBS =	${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@
+ NOSYMLIBS =	${DNSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
  
++# Add suffix to all targets
++EXEEXT =	-pkcs11@EXEEXT@
++
  # Alphabetically
--TARGETS =	dnssec-keygen@EXEEXT@ dnssec-signzone@EXEEXT@ \
--		dnssec-keyfromlabel@EXEEXT@ dnssec-dsfromkey@EXEEXT@ \
--		dnssec-revoke@EXEEXT@ dnssec-settime@EXEEXT@ \
--		dnssec-verify@EXEEXT@ dnssec-importkey@EXEEXT@
-+TARGETS =	dnssec-keygen-pkcs11@EXEEXT@ dnssec-signzone-pkcs11@EXEEXT@ \
-+		dnssec-keyfromlabel-pkcs11@EXEEXT@ dnssec-dsfromkey-pkcs11@EXEEXT@ \
-+		dnssec-revoke-pkcs11@EXEEXT@ dnssec-settime-pkcs11@EXEEXT@ \
-+		dnssec-verify-pkcs11@EXEEXT@ dnssec-importkey-pkcs11@EXEEXT@
+-TARGETS =	dnssec-cds@EXEEXT@ dnssec-dsfromkey@EXEEXT@ \
+-		dnssec-importkey@EXEEXT@ dnssec-keyfromlabel@EXEEXT@ \
+-		dnssec-keygen@EXEEXT@ dnssec-revoke@EXEEXT@ \
+-		dnssec-settime@EXEEXT@ dnssec-signzone@EXEEXT@ \
+-		dnssec-verify@EXEEXT@
++TARGETS =	dnssec-cds${EXEEXT} dnssec-dsfromkey${EXEEXT} \
++		dnssec-importkey${EXEEXT} dnssec-keyfromlabel${EXEEXT} \
++		dnssec-keygen${EXEEXT} dnssec-revoke${EXEEXT} \
++		dnssec-settime${EXEEXT} dnssec-signzone${EXEEXT} \
++		dnssec-verify${EXEEXT}
  
  OBJS =		dnssectool.@O@
  
-@@ -59,15 +59,15 @@ MANOBJS =	${MANPAGES} ${HTMLPAGES}
+@@ -52,19 +55,19 @@ SRCS =		dnssec-cds.c dnssec-dsfromkey.c dnssec-importkey.c \
  
  @BIND9_MAKE_RULES@
  
+-dnssec-cds@EXEEXT@: dnssec-cds.@O@ ${OBJS} ${DEPLIBS}
++dnssec-cds-pkcs11@EXEEXT@: dnssec-cds.@O@ ${OBJS} ${DEPLIBS}
+ 	export BASEOBJS="dnssec-cds.@O@ ${OBJS}"; \
+ 	${FINALBUILDCMD}
+ 
 -dnssec-dsfromkey@EXEEXT@: dnssec-dsfromkey.@O@ ${OBJS} ${DEPLIBS}
 +dnssec-dsfromkey-pkcs11@EXEEXT@: dnssec-dsfromkey.@O@ ${OBJS} ${DEPLIBS}
  	export BASEOBJS="dnssec-dsfromkey.@O@ ${OBJS}"; \
@@ -78,7 +117,7 @@ index 4b8ca13..32f4470 100644
  	export BASEOBJS="dnssec-keygen.@O@ ${OBJS}"; \
  	${FINALBUILDCMD}
  
-@@ -75,7 +75,7 @@ dnssec-signzone.@O@: dnssec-signzone.c
+@@ -72,7 +75,7 @@ dnssec-signzone.@O@: dnssec-signzone.c
  	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
  		-c ${srcdir}/dnssec-signzone.c
  
@@ -87,7 +126,7 @@ index 4b8ca13..32f4470 100644
  	export BASEOBJS="dnssec-signzone.@O@ ${OBJS}"; \
  	${FINALBUILDCMD}
  
-@@ -83,19 +83,19 @@ dnssec-verify.@O@: dnssec-verify.c
+@@ -80,19 +83,19 @@ dnssec-verify.@O@: dnssec-verify.c
  	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
  		-c ${srcdir}/dnssec-verify.c
  
@@ -111,117 +150,70 @@ index 4b8ca13..32f4470 100644
  	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
  	dnssec-importkey.@O@ ${OBJS} ${LIBS}
  
-@@ -106,16 +106,14 @@ docclean manclean maintainer-clean::
- 
- installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
--	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
- 
- install-man8: ${MANPAGES}
- 	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
- 
--install:: ${TARGETS} installdirs install-man8
-+install:: ${TARGETS} installdirs
- 	for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir} || exit 1; done
- 
- uninstall::
--	for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m || exit 1; done
- 	for t in ${TARGETS}; do ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/$$t || exit 1; done
- 
- clean distclean::
-diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
-index 4b8ca13..4175996 100644
---- a/bin/dnssec/Makefile.in
-+++ b/bin/dnssec/Makefile.in
-@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
- 
- CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
- 
--CDEFINES =	-DVERSION=\"${VERSION}\" @USE_PKCS11@ @PKCS11_ENGINE@ \
-+CDEFINES =	-DVERSION=\"${VERSION}\" \
- 		@CRYPTO@ -DPK11_LIB_LOCATION=\"@PKCS11_PROVIDER@\"
- CWARNINGS =
- 
 diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in
-index 70e5571..b5a4a6b 100644
+index debb906..ecfdb6c 100644
 --- a/bin/named-pkcs11/Makefile.in
 +++ b/bin/named-pkcs11/Makefile.in
-@@ -43,27 +43,27 @@ DLZDRIVER_INCLUDES =	@DLZ_DRIVER_INCLUDES@
- DLZDRIVER_LIBS =	@DLZ_DRIVER_LIBS@
+@@ -37,13 +37,14 @@ DBDRIVER_LIBS =
  
- CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
--		${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
--		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
-+		${LWRES_INCLUDES} ${DNS_PKCS11_INCLUDES} ${BIND9_INCLUDES} \
-+		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_PKCS11_INCLUDES} \
- 		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \
- 		@DST_OPENSSL_INC@
+ DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
  
--CDEFINES =      @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @USE_GSSAPI@ @CRYPTO@
-+CDEFINES =      @USE_PKCS11@ @PKCS11_ENGINE@ @CRYPTO_PK11@ @USE_GSSAPI@
+-DLZDRIVER_OBJS =	@DLZ_DRIVER_OBJS@
+-DLZDRIVER_SRCS =	@DLZ_DRIVER_SRCS@
+-DLZDRIVER_INCLUDES =	@DLZ_DRIVER_INCLUDES@
+-DLZDRIVER_LIBS =	@DLZ_DRIVER_LIBS@
++# Skip building on PKCS11 variant
++DLZDRIVER_OBJS =
++DLZDRIVER_SRCS =
++DLZDRIVER_INCLUDES =
++DLZDRIVER_LIBS =
+ 
+ CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
+-		${NS_INCLUDES} ${DNS_INCLUDES} \
++		${NS_PKCS11_INCLUDES} ${DNS_PKCS11_INCLUDES} \
+ 		${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \
+ 		${ISC_INCLUDES} ${DLZDRIVER_INCLUDES} \
+ 		${DBDRIVER_INCLUDES} \
+@@ -56,24 +57,24 @@ CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
+ 		${LIBXML2_CFLAGS} \
+ 		${MAXMINDDB_CFLAGS}
+ 
+-CDEFINES =      @CONTRIB_DLZ@
++CDEFINES =
  
  CWARNINGS =
  
--DNSLIBS =	../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
-+DNSLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
+-DNSLIBS =	../../lib/dns/libdns.@A@ @NO_LIBTOOL_DNSLIBS@
++DNSLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@ @NO_LIBTOOL_DNSLIBS@
  ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
  ISCCCLIBS =	../../lib/isccc/libisccc.@A@
--ISCLIBS =	../../lib/isc/libisc.@A@
--ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
-+ISCLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@
-+ISCNOSYMLIBS =	../../lib/isc-pkcs11/libisc-pkcs11-nosymtbl.@A@
- LWRESLIBS =	../../lib/lwres/liblwres.@A@
+ ISCLIBS =	../../lib/isc/libisc.@A@ @NO_LIBTOOL_ISCLIBS@
+ ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@ @NO_LIBTOOL_ISCLIBS@
  BIND9LIBS =	../../lib/bind9/libbind9.@A@
+-NSLIBS =	../../lib/ns/libns.@A@
++NSLIBS =	../../lib/ns-pkcs11/libns-pkcs11.@A@
  
 -DNSDEPLIBS =	../../lib/dns/libdns.@A@
 +DNSDEPLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@
  ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
  ISCCCDEPLIBS =	../../lib/isccc/libisccc.@A@
--ISCDEPLIBS =	../../lib/isc/libisc.@A@
-+ISCDEPLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@
- LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@
+ ISCDEPLIBS =	../../lib/isc/libisc.@A@
  BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
+-NSDEPLIBS =	../../lib/ns/libns.@A@
++NSDEPLIBS =	../../lib/ns-pkcs11/libns-pkcs11.@A@
  
-@@ -72,15 +72,15 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
- 
- LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
--		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
-+		@LIBS@
- 
- NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
--		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
-+		@LIBS@
+ DEPLIBS =	${NSDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
+ 		${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${ISCDEPLIBS}
+@@ -93,7 +94,7 @@ NOSYMLIBS =	${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
  
  SUBDIRS =	unix
  
--TARGETS =	named@EXEEXT@ lwresd@EXEEXT@ feature-test@EXEEXT@
-+TARGETS =	named-pkcs11@EXEEXT@ feature-test-pkcs11@EXEEXT@
+-TARGETS =	named@EXEEXT@
++TARGETS =	named-pkcs11@EXEEXT@
  
- GEOIPLINKOBJS = geoip.@O@
  GEOIP2LINKOBJS = geoip.@O@
-@@ -94,8 +94,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
- 		tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
- 		zoneconf.@O@ \
- 		lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
--		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ \
--		${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
-+        lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@
- 
- UOBJS =		unix/os.@O@ unix/dlz_dlopen_driver.@O@
- 
-@@ -113,8 +112,7 @@ SRCS =		builtin.c client.c config.c control.c \
- 		tkeyconf.c tsigconf.c update.c xfrout.c \
- 		zoneconf.c \
- 		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
--		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
--		${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
-+        lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
- 
- MANPAGES =	named.8 lwresd.8 named.conf.5
- 
-@@ -154,21 +152,21 @@ server.@O@: server.c
+ 
+@@ -151,7 +152,7 @@ server.@O@: server.c
  		-DPRODUCT=\"${PRODUCT}\" \
  		-DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
  
@@ -230,85 +222,29 @@ index 70e5571..b5a4a6b 100644
  	export MAKE_SYMTABLE="yes"; \
  	export BASEOBJS="${OBJS} ${UOBJS}"; \
  	${FINALBUILDCMD}
+@@ -170,11 +171,11 @@ statschannel.@O@: bind9.xsl.h
+ installdirs:
+ 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
  
--lwresd@EXEEXT@: named@EXEEXT@
-+lwresd@EXEEXT@: named-pkcs11@EXEEXT@
- 	rm -f lwresd@EXEEXT@
--	@LN@ named@EXEEXT@ lwresd@EXEEXT@
-+	@LN@ named-pkcs11@EXEEXT@ lwresd@EXEEXT@
- 
- # Bit of hack, do not produce intermediate .o object for featuretest
- feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c
- 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
- 		-c ${top_srcdir}/bin/tests/system/feature-test.c
- 
--feature-test@EXEEXT@: feature-test.@O@
-+feature-test-pkcs11@EXEEXT@: feature-test.@O@
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
- 		-o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
- 
-@@ -201,16 +199,11 @@ install-man8: named.8 lwresd.8
- 
- install-man: install-man5 install-man8
- 
--install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs install-man
+-install:: named@EXEEXT@ installdirs
 -	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
--	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
 +install:: named-pkcs11@EXEEXT@ installdirs
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-pkcs11@EXEEXT@ ${DESTDIR}${sbindir}
  
  uninstall::
--	rm -f ${DESTDIR}${mandir}/man5/named.conf.5
--	rm -f ${DESTDIR}${mandir}/man8/lwresd.8
--	rm -f ${DESTDIR}${mandir}/man8/named.8
--	rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
 -	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
 +	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-pkcs11@EXEEXT@
  
  @DLZ_DRIVER_RULES@
  
-diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
-index 70e5571..4cfed4d 100644
---- a/bin/named/Makefile.in
-+++ b/bin/named/Makefile.in
-@@ -48,7 +48,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
- 		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \
- 		@DST_OPENSSL_INC@
- 
--CDEFINES =      @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @USE_GSSAPI@ @CRYPTO@
-+CDEFINES =      @CONTRIB_DLZ@ @USE_GSSAPI@ @CRYPTO@
- 
- CWARNINGS =
- 
-diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
-index a058c91..d4b689a 100644
---- a/bin/pkcs11/Makefile.in
-+++ b/bin/pkcs11/Makefile.in
-@@ -15,13 +15,13 @@ top_srcdir =	@top_srcdir@
- 
- @BIND9_MAKE_INCLUDES@
- 
--CINCLUDES =	${ISC_INCLUDES}
-+CINCLUDES =	${ISC_PKCS11_INCLUDES}
- 
- CDEFINES =
- 
--ISCLIBS =	../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
-+ISCLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@ @ISC_OPENSSL_LIBS@
- 
--ISCDEPLIBS =	../../lib/isc/libisc.@A@
-+ISCDEPLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@
- 
- DEPLIBS =	${ISCDEPLIBS}
- 
 diff --git a/configure.ac b/configure.ac
-index 9b7d778..59ba20b 100644
+index e405eaf..efaa5a7 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1139,12 +1139,14 @@ AC_SUBST(USE_GSSAPI)
+@@ -1269,12 +1269,14 @@ AC_SUBST(USE_GSSAPI)
  AC_SUBST(DST_GSSAPI_INC)
  AC_SUBST(DNS_GSSAPI_LIBS)
- DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_LIBS"
+ DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS"
 +DNS_CRYPTO_PK11_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_PK11_LIBS"
  
  #
@@ -319,96 +255,47 @@ index 9b7d778..59ba20b 100644
 +AC_SUBST(DNS_CRYPTO_PK11_LIBS)
  
  #
- # was --with-randomdev specified?
-@@ -1494,11 +1496,11 @@ AC_ARG_ENABLE(openssl-hash,
- AC_MSG_CHECKING(for OpenSSL library)
- OPENSSL_WARNING=
- openssldirs="/usr /usr/local /usr/local/ssl /opt/local /usr/pkg /usr/sfw"
--if test "yes" = "$want_native_pkcs11"
--then
--	use_openssl="native_pkcs11"
--	AC_MSG_RESULT(use of native PKCS11 instead)
--fi
-+# if test "yes" = "$want_native_pkcs11"
-+# then
-+# 	use_openssl="native_pkcs11"
-+# 	AC_MSG_RESULT(use of native PKCS11 instead)
-+# fi
- 
- if test "auto" = "$use_openssl"
- then
-@@ -1511,6 +1513,7 @@ then
- 		fi
- 	done
+ # was --with-lmdb specified?
+@@ -2345,6 +2347,8 @@ AC_SUBST(BIND9_DNS_BUILDINCLUDE)
+ AC_SUBST(BIND9_NS_BUILDINCLUDE)
+ AC_SUBST(BIND9_BIND9_BUILDINCLUDE)
+ AC_SUBST(BIND9_IRS_BUILDINCLUDE)
++AC_SUBST(BIND9_DNS_PKCS11_BUILDINCLUDE)
++AC_SUBST(BIND9_NS_PKCS11_BUILDINCLUDE)
+ if test "X$srcdir" != "X"; then
+ 	BIND9_ISC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc/include"
+ 	BIND9_ISCCC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccc/include"
+@@ -2353,6 +2357,8 @@ if test "X$srcdir" != "X"; then
+ 	BIND9_NS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/ns/include"
+ 	BIND9_BIND9_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/bind9/include"
+ 	BIND9_IRS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/irs/include"
++	BIND9_DNS_PKCS11_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/dns-pkcs11/include"
++	BIND9_NS_PKCS11_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/ns-pkcs11/include"
+ else
+ 	BIND9_ISC_BUILDINCLUDE=""
+ 	BIND9_ISCCC_BUILDINCLUDE=""
+@@ -2361,6 +2367,8 @@ else
+ 	BIND9_NS_BUILDINCLUDE=""
+ 	BIND9_BIND9_BUILDINCLUDE=""
+ 	BIND9_IRS_BUILDINCLUDE=""
++	BIND9_DNS_PKCS11_BUILDINCLUDE=""
++	BIND9_NS_PKCS11_BUILDINCLUDE=""
  fi
-+CRYPTO_PK11=""
- OPENSSL_ECDSA=""
- OPENSSL_GOST=""
- OPENSSL_ED25519=""
-@@ -1532,11 +1535,10 @@ case "$with_gost" in
- 		;;
- esac
- 
--case "$use_openssl" in
--	native_pkcs11)
--		AC_MSG_RESULT(disabled because of native PKCS11)
-+if test "$want_native_pkcs11" = "yes"
-+then
- 		DST_OPENSSL_INC=""
--		CRYPTO="-DPKCS11CRYPTO"
-+		CRYPTO_PK11="-DPKCS11CRYPTO"
- 		CRYPTOLIB="pkcs11"
- 		OPENSSLECDSALINKOBJS=""
- 		OPENSSLECDSALINKSRCS=""
-@@ -1546,7 +1548,9 @@ case "$use_openssl" in
- 		OPENSSLGOSTLINKSRCS=""
- 		OPENSSLLINKOBJS=""
- 		OPENSSLLINKSRCS=""
--		;;
-+fi
-+
-+case "$use_openssl" in
- 	no)
- 		AC_MSG_RESULT(no)
- 		DST_OPENSSL_INC=""
-@@ -1578,7 +1582,7 @@ case "$use_openssl" in
- If you do not want OpenSSL, use --without-openssl])
- 		;;
- 	*)
--		if test "yes" = "$want_native_pkcs11"
-+		if false # test "yes" = "$want_native_pkcs11"
- 		then
- 			AC_MSG_RESULT()
- 			AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.])
-@@ -2006,6 +2010,7 @@ AC_SUBST(OPENSSL_ED25519)
- AC_SUBST(OPENSSL_GOST)
- 
- DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS"
-+DNS_CRYPTO_PK11_LIBS="$DNS_CRYPTO_LIBS"
- 
- ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES"
- if test "yes" = "$with_aes"
-@@ -2291,6 +2296,7 @@ esac
- AC_SUBST(PKCS11LINKOBJS)
- AC_SUBST(PKCS11LINKSRCS)
- AC_SUBST(CRYPTO)
-+AC_SUBST(CRYPTO_PK11)
- AC_SUBST(PKCS11_ECDSA)
- AC_SUBST(PKCS11_GOST)
- AC_SUBST(PKCS11_ED25519)
-@@ -5405,8 +5411,11 @@ AC_CONFIG_FILES([
+ 
+ AC_SUBST_FILE(BIND9_MAKE_INCLUDES)
+@@ -2816,8 +2824,11 @@ AC_CONFIG_FILES([
  	bin/delv/Makefile
  	bin/dig/Makefile
  	bin/dnssec/Makefile
-+	bin/dnssec-pkcs11/Makefile	
++	bin/dnssec-pkcs11/Makefile
  	bin/named/Makefile
  	bin/named/unix/Makefile
 +	bin/named-pkcs11/Makefile
 +	bin/named-pkcs11/unix/Makefile
  	bin/nsupdate/Makefile
  	bin/pkcs11/Makefile
- 	bin/python/Makefile
-@@ -5479,6 +5488,10 @@ AC_CONFIG_FILES([
+ 	bin/plugins/Makefile
+@@ -2879,6 +2890,10 @@ AC_CONFIG_FILES([
  	lib/dns/include/dns/Makefile
  	lib/dns/include/dst/Makefile
  	lib/dns/tests/Makefile
@@ -419,73 +306,54 @@ index 9b7d778..59ba20b 100644
  	lib/irs/Makefile
  	lib/irs/include/Makefile
  	lib/irs/include/irs/Makefile
-@@ -5503,6 +5516,24 @@ AC_CONFIG_FILES([
- 	lib/isc/unix/include/Makefile
- 	lib/isc/unix/include/isc/Makefile
- 	lib/isc/unix/include/pkcs11/Makefile
-+	lib/isc-pkcs11/$arch/Makefile
-+	lib/isc-pkcs11/$arch/include/Makefile
-+	lib/isc-pkcs11/$arch/include/isc/Makefile
-+	lib/isc-pkcs11/$thread_dir/Makefile
-+	lib/isc-pkcs11/$thread_dir/include/Makefile
-+	lib/isc-pkcs11/$thread_dir/include/isc/Makefile
-+	lib/isc-pkcs11/Makefile
-+	lib/isc-pkcs11/include/Makefile
-+	lib/isc-pkcs11/include/isc/Makefile
-+	lib/isc-pkcs11/include/isc/platform.h
-+	lib/isc-pkcs11/include/pk11/Makefile
-+	lib/isc-pkcs11/include/pkcs11/Makefile
-+	lib/isc-pkcs11/tests/Makefile
-+	lib/isc-pkcs11/nls/Makefile
-+	lib/isc-pkcs11/unix/Makefile
-+	lib/isc-pkcs11/unix/include/Makefile
-+	lib/isc-pkcs11/unix/include/isc/Makefile
-+	lib/isc-pkcs11/unix/include/pkcs11/Makefile
- 	lib/isccc/Makefile
- 	lib/isccc/include/Makefile
- 	lib/isccc/include/isccc/Makefile
+@@ -2911,6 +2926,10 @@ AC_CONFIG_FILES([
+ 	lib/ns/include/Makefile
+ 	lib/ns/include/ns/Makefile
+ 	lib/ns/tests/Makefile
++	lib/ns-pkcs11/Makefile
++	lib/ns-pkcs11/include/Makefile
++	lib/ns-pkcs11/include/ns/Makefile
++	lib/ns-pkcs11/tests/Makefile
+ 	make/Makefile
+ 	make/mkdep
+ 	unit/unittest.sh
 diff --git a/lib/Makefile.in b/lib/Makefile.in
-index 81270a0..bcb5312 100644
+index 833964e..058ba2f 100644
 --- a/lib/Makefile.in
 +++ b/lib/Makefile.in
 @@ -15,7 +15,7 @@ top_srcdir =	@top_srcdir@
  # Attempt to disable parallel processing.
  .NOTPARALLEL:
  .NO_PARALLEL:
--SUBDIRS =	isc isccc dns isccfg bind9 lwres irs samples
-+SUBDIRS =	isc isc-pkcs11 isccc dns dns-pkcs11 isccfg bind9 lwres irs samples
+-SUBDIRS =	isc isccc dns ns isccfg bind9 irs
++SUBDIRS =	isc isccc dns dns-pkcs11 ns ns-pkcs11 isccfg bind9 irs
  TARGETS =
  
  @BIND9_MAKE_RULES@
 diff --git a/lib/dns-pkcs11/Makefile.in b/lib/dns-pkcs11/Makefile.in
-index 7f09bd6..c388d9e 100644
+index 58bda3c..d6a45df 100644
 --- a/lib/dns-pkcs11/Makefile.in
 +++ b/lib/dns-pkcs11/Makefile.in
-@@ -26,17 +26,16 @@ VERSION=@BIND9_VERSION@
+@@ -22,7 +22,7 @@ VERSION=@BIND9_VERSION@
  
- USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
+ @BIND9_MAKE_INCLUDES@
  
 -CINCLUDES =	-I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} \
--		${ISC_INCLUDES} ${MAXMINDDB_CFLAGS} \
--		@DST_OPENSSL_INC@ @DST_GSSAPI_INC@
 +CINCLUDES =	-I. -I${top_srcdir}/lib/dns-pkcs11 -Iinclude ${DNS_PKCS11_INCLUDES} \
-+		${ISC_PKCS11_INCLUDES} ${MAXMINDDB_CFLAGS} @DST_OPENSSL_INC@ @DST_GSSAPI_INC@
+ 		${ISC_INCLUDES} \
+ 		${FSTRM_CFLAGS} \
+ 		${OPENSSL_CFLAGS} @DST_GSSAPI_INC@ \
+@@ -32,7 +32,7 @@ CINCLUDES =	-I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} \
+ 		${LMDB_CFLAGS} \
+ 		${MAXMINDDB_CFLAGS}
  
--CDEFINES =	-DUSE_MD5 @CRYPTO@ @USE_GSSAPI@ ${USE_ISC_SPNEGO}
-+CDEFINES =	-DUSE_MD5 @CRYPTO_PK11@ @USE_GSSAPI@ ${USE_ISC_SPNEGO}
+-CDEFINES =	@USE_GSSAPI@
++CDEFINES =	@USE_GSSAPI@ @USE_PKCS11@
  
  CWARNINGS =
  
--ISCLIBS =	../../lib/isc/libisc.@A@
-+ISCLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@
- 
--ISCDEPLIBS =	../../lib/isc/libisc.@A@
-+ISCDEPLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@
- 
- LIBS =		${MAXMINDDB_LIBS} @LIBS@
- 
-@@ -150,15 +149,15 @@ version.@O@: version.c
- 		-DLIBAGE=${LIBAGE} \
+@@ -135,15 +135,15 @@ version.@O@: version.c
+ 		-DMAPAPI=\"${MAPAPI}\" \
  		-c ${srcdir}/version.c
  
 -libdns.@SA@: ${OBJS}
@@ -498,13 +366,13 @@ index 7f09bd6..c388d9e 100644
  	${LIBTOOL_MODE_LINK} \
 -		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \
 +		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns-pkcs11.la -rpath ${libdir} \
- 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+ 		-release "${VERSION}" \
 -		${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
 +		${OBJS} ${ISCLIBS} @DNS_CRYPTO_PK11_LIBS@ ${LIBS}
  
  include: gen
  	${MAKE} include/dns/enumtype.h
-@@ -189,22 +188,22 @@ gen: gen.c
+@@ -174,22 +174,22 @@ gen: gen.c
  	${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c \
  	${BUILD_LIBS} ${LFS_LIBS}
  
@@ -532,89 +400,142 @@ index 7f09bd6..c388d9e 100644
  	rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
  	rm -f include/dns/rdatastruct.h
  	rm -f dnstap.pb-c.c dnstap.pb-c.h
-diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in
-index 8ad54bb..a3ecdfb 100644
---- a/lib/isc-pkcs11/Makefile.in
-+++ b/lib/isc-pkcs11/Makefile.in
-@@ -23,8 +23,8 @@ CINCLUDES =	-I${srcdir}/unix/include \
- 		-I${srcdir}/@ISC_THREAD_DIR@/include \
- 		-I${srcdir}/@ISC_ARCH_DIR@/include \
- 		-I./include \
--		-I${srcdir}/include ${DNS_INCLUDES} @ISC_OPENSSL_INC@
--CDEFINES =	@CRYPTO@ -DPK11_LIB_LOCATION=\"${PROVIDER}\"
-+		-I${srcdir}/include ${DNS_PKCS11_INCLUDES}
-+CDEFINES =	@CRYPTO_PK11@ -DPK11_LIB_LOCATION=\"${PROVIDER}\"
+diff --git a/lib/dns-pkcs11/tests/Makefile.in b/lib/dns-pkcs11/tests/Makefile.in
+index da91394..aadb73f 100644
+--- a/lib/dns-pkcs11/tests/Makefile.in
++++ b/lib/dns-pkcs11/tests/Makefile.in
+@@ -15,15 +15,15 @@ VERSION=@BIND9_VERSION@
+ 
+ @BIND9_MAKE_INCLUDES@
+ 
+-CINCLUDES =	-I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
++CINCLUDES =	-I. -Iinclude ${DNS_PKCS11_INCLUDES} ${ISC_INCLUDES} \
+ 		${FSTRM_CFLAGS} ${OPENSSL_CFLAGS} \
+ 		${PROTOBUF_C_CFLAGS} ${MAXMINDDB_CFLAGS} @CMOCKA_CFLAGS@
+-CDEFINES =	-DTESTS="\"${top_builddir}/lib/dns/tests/\""
++CDEFINES =	@USE_PKCS11@ -DTESTS="\"${top_builddir}/lib/dns-pkcs11/tests/\""
+ 
+ ISCLIBS =	../../isc/libisc.@A@ @NO_LIBTOOL_ISCLIBS@
+ ISCDEPLIBS =	../../isc/libisc.@A@
+-DNSLIBS =	../libdns.@A@ @NO_LIBTOOL_DNSLIBS@
+-DNSDEPLIBS =	../libdns.@A@
++DNSLIBS =	../libdns-pkcs11.@A@ @NO_LIBTOOL_DNSLIBS@
++DNSDEPLIBS =	../libdns-pkcs11.@A@
+ 
+ LIBS =		@LIBS@ @CMOCKA_LIBS@
+ 
+diff --git a/lib/ns-pkcs11/Makefile.in b/lib/ns-pkcs11/Makefile.in
+index bc683ce..7a9d2f2 100644
+--- a/lib/ns-pkcs11/Makefile.in
++++ b/lib/ns-pkcs11/Makefile.in
+@@ -16,12 +16,12 @@ VERSION=@BIND9_VERSION@
+ 
+ @BIND9_MAKE_INCLUDES@
+ 
+-CINCLUDES =	-I. -I${top_srcdir}/lib/ns -Iinclude \
+-		${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
++CINCLUDES =	-I. -I${top_srcdir}/lib/ns-pkcs11 -Iinclude \
++		${NS_PKCS11_INCLUDES} ${DNS_PKCS11_INCLUDES} ${ISC_INCLUDES} \
+ 		${OPENSSL_CFLAGS} @DST_GSSAPI_INC@ \
+ 		${FSTRM_CFLAGS}
+ 
+-CDEFINES =	-DNAMED_PLUGINDIR=\"${plugindir}\"
++CDEFINES =	@USE_PKCS11@ -DNAMED_PLUGINDIR=\"${plugindir}\"
+ 
  CWARNINGS =
  
- # Alphabetically
-@@ -103,40 +103,40 @@ version.@O@: version.c
- 		-DLIBAGE=${LIBAGE} \
- 		-c ${srcdir}/version.c
+@@ -29,9 +29,9 @@ ISCLIBS =	../../lib/isc/libisc.@A@
  
--libisc.@SA@: ${OBJS} ${SYMTBLOBJS}
-+libisc-pkcs11.@SA@: ${OBJS} ${SYMTBLOBJS}
- 	${AR} ${ARFLAGS} $@ ${OBJS} ${SYMTBLOBJS}
- 	${RANLIB} $@
+ ISCDEPLIBS =	../../lib/isc/libisc.@A@
+ 
+-DNSLIBS =	../../lib/dns/libdns.@A@ @NO_LIBTOOL_DNSLIBS@
++DNSLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@ @NO_LIBTOOL_DNSLIBS@
+ 
+-DNSDEPLIBS =	../../lib/dns/libdns.@A@
++DNSDEPLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@
+ 
+ LIBS =		@LIBS@
  
--libisc-nosymtbl.@SA@: ${OBJS}
-+libisc-pkcs11-nosymtbl.@SA@: ${OBJS}
+@@ -60,28 +60,28 @@ version.@O@: version.c
+ 		-DMAJOR=\"${MAJOR}\" \
+ 		-c ${srcdir}/version.c
+ 
+-libns.@SA@: ${OBJS}
++libns-pkcs11.@SA@: ${OBJS}
  	${AR} ${ARFLAGS} $@ ${OBJS}
  	${RANLIB} $@
  
--libisc.la: ${OBJS} ${SYMTBLOBJS}
-+libisc-pkcs11.la: ${OBJS} ${SYMTBLOBJS}
+-libns.la: ${OBJS}
++libns-pkcs11.la: ${OBJS}
  	${LIBTOOL_MODE_LINK} \
--		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \
-+		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-pkcs11.la -rpath ${libdir} \
- 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
- 		${OBJS} ${SYMTBLOBJS} ${LIBS}
- 
--libisc-nosymtbl.la: ${OBJS}
-+libisc-pkcs11-nosymtbl.la: ${OBJS}
- 	${LIBTOOL_MODE_LINK} \
--		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-nosymtbl.la -rpath ${libdir} \
-+		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-pkcs11-nosymtbl.la -rpath ${libdir} \
- 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
- 		${OBJS} ${LIBS}
- 
--timestamp: libisc.@A@ libisc-nosymtbl.@A@
-+timestamp: libisc-pkcs11.@A@ libisc-pkcs11-nosymtbl.@A@
+-		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libns.la -rpath ${libdir} \
++		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libns-pkcs11.la -rpath ${libdir} \
+ 		-release "${VERSION}" \
+-		${OBJS} ${ISCLIBS} ${DNSLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
++		${OBJS} ${ISCLIBS} ${DNSLIBS} @DNS_CRYPTO_PK11_LIBS@ ${LIBS}
+ 
+-timestamp: libns.@A@
++timestamp: libns-pkcs11.@A@
  	touch timestamp
  
--testdirs: libisc.@A@ libisc-nosymtbl.@A@
-+testdirs: libisc-pkcs11.@A@ libisc-pkcs11-nosymtbl.@A@
- 
  installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
  
  install:: timestamp installdirs
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisc.@A@ ${DESTDIR}${libdir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisc-pkcs11.@A@ ${DESTDIR}${libdir}
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libns.@A@ \
++	${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libns-pkcs11.@A@ \
+ 		${DESTDIR}${libdir}
  
  uninstall::
--	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libisc.@A@
-+	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libisc-pkcs11.@A@
+-	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libns.@A@
++	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libns-pkcs11.@A@
  
  clean distclean::
--	rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \
--	libisc-nosymtbl.la timestamp
-+	rm -f libisc-pkcs11.@A@ libisc-pkcs11-nosymtbl.@A@ libisc-pkcs11.la \
-+	libisc-pkcs11-nosymtbl.la timestamp
+-	rm -f libns.@A@ timestamp
++	rm -f libns-pkcs11.@A@ timestamp
+diff --git a/lib/ns-pkcs11/tests/Makefile.in b/lib/ns-pkcs11/tests/Makefile.in
+index 4c3e694..c1b6d99 100644
+--- a/lib/ns-pkcs11/tests/Makefile.in
++++ b/lib/ns-pkcs11/tests/Makefile.in
+@@ -17,17 +17,17 @@ VERSION=@BIND9_VERSION@
+ 
+ WRAP_OPTIONS =	-Wl,--wrap=isc__nmhandle_detach -Wl,--wrap=isc__nmhandle_attach
+ 
+-CINCLUDES =	-I. -Iinclude ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
++CINCLUDES =	-I. -Iinclude ${NS_PKCS11_INCLUDES} ${DNS_PKCS11_INCLUDES} ${ISC_INCLUDES} \
+ 		${OPENSSL_CFLAGS} \
+ 		@CMOCKA_CFLAGS@
+-CDEFINES =	-DTESTS="\"${top_builddir}/lib/ns/tests/\"" -DNAMED_PLUGINDIR=\"${plugindir}\"
++CDEFINES =	-DTESTS="\"${top_builddir}/lib/ns-pkcs11/tests/\"" -DNAMED_PLUGINDIR=\"${plugindir}\" @USE_PKCS11@
+ 
+ ISCLIBS =	../../isc/libisc.@A@ @NO_LIBTOOL_ISCLIBS@
+ ISCDEPLIBS =	../../isc/libisc.@A@
+-DNSLIBS =	../../dns/libdns.@A@ @NO_LIBTOOL_DNSLIBS@
+-DNSDEPLIBS =	../../dns/libdns.@A@
+-NSLIBS =	../libns.@A@
+-NSDEPLIBS =	../libns.@A@
++DNSLIBS =	../../dns-pkcs11/libdns-pkcs11.@A@ @NO_LIBTOOL_DNSLIBS@
++DNSDEPLIBS =	../../dns-pkcs11/libdns-pkcs11.@A@
++NSLIBS =	../libns-pkcs11.@A@
++NSDEPLIBS =	../libns-pkcs11.@A@
+ 
+ LIBS =		@LIBS@ @CMOCKA_LIBS@
+ 
 diff --git a/make/includes.in b/make/includes.in
-index fa86ad1..3cfbe9f 100644
+index b8317d3..b73b0c4 100644
 --- a/make/includes.in
 +++ b/make/includes.in
-@@ -43,3 +43,13 @@ BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \
+@@ -39,3 +39,10 @@ BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \
  
  TEST_INCLUDES = \
  	-I${top_srcdir}/lib/tests/include
 +
-+ISC_PKCS11_INCLUDES = @BIND9_ISC_BUILDINCLUDE@ \
-+	-I${top_srcdir}/lib/isc-pkcs11 \
-+	-I${top_srcdir}/lib/isc-pkcs11/include \
-+	-I${top_srcdir}/lib/isc-pkcs11/unix/include \
-+	-I${top_srcdir}/lib/isc-pkcs11/@ISC_THREAD_DIR@/include \
-+	-I${top_srcdir}/lib/isc-pkcs11/@ISC_ARCH_DIR@/include
-+
-+DNS_PKCS11_INCLUDES = @BIND9_DNS_BUILDINCLUDE@ \
++DNS_PKCS11_INCLUDES = @BIND9_DNS_PKCS11_BUILDINCLUDE@ \
 +	-I${top_srcdir}/lib/dns-pkcs11/include
++
++NS_PKCS11_INCLUDES = @BIND9_NS_PKCS11_BUILDINCLUDE@ \
++	-I${top_srcdir}/lib/ns-pkcs11/include
++
+-- 
+2.31.1
+
diff --git a/bind-9.10-sdb.patch b/bind-9.10-sdb.patch
deleted file mode 100644
index 5c4987f3adef67084affaf071da69a3363b57268..0000000000000000000000000000000000000000
--- a/bind-9.10-sdb.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-diff --git a/bin/Makefile.in b/bin/Makefile.in
-index ce7a2da..4e6a824 100644
---- a/bin/Makefile.in
-+++ b/bin/Makefile.in
-@@ -11,8 +11,8 @@ srcdir =	@srcdir@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools nsupdate \
--		check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
-+SUBDIRS =	named named-sdb named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools nsupdate \
-+		check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools tests
- TARGETS =
- 
- @BIND9_MAKE_RULES@
-diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in
-index 4cfed4d..c6b42b2 100644
---- a/bin/named-sdb/Makefile.in
-+++ b/bin/named-sdb/Makefile.in
-@@ -30,10 +30,10 @@ VERSION=@BIND9_VERSION@
- #
- # Add database drivers here.
- #
--DBDRIVER_OBJS =
--DBDRIVER_SRCS =
-+DBDRIVER_OBJS =	ldapdb.@O@ pgsqldb.@O@ sqlitedb.@O@ dirdb.@O@
-+DBDRIVER_SRCS =	ldapdb.c pgsqldb.c sqlitedb.c dirdb.c
- DBDRIVER_INCLUDES =
--DBDRIVER_LIBS =
-+DBDRIVER_LIBS =	-lldap -llber -lsqlite3 -lpq
- 
- DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
- 
-@@ -80,7 +80,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 
- SUBDIRS =	unix
- 
--TARGETS =	named@EXEEXT@ lwresd@EXEEXT@ feature-test@EXEEXT@
-+TARGETS =	named-sdb@EXEEXT@ feature-test-sdb@EXEEXT@
- 
- GEOIPLINKOBJS = geoip.@O@
- GEOIP2LINKOBJS = geoip.@O@
-@@ -154,7 +154,7 @@ server.@O@: server.c
- 		-DPRODUCT=\"${PRODUCT}\" \
- 		-DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
- 
--named@EXEEXT@: ${OBJS} ${DEPLIBS}
-+named-sdb@EXEEXT@: ${OBJS} ${DEPLIBS}
- 	export MAKE_SYMTABLE="yes"; \
- 	export BASEOBJS="${OBJS} ${UOBJS}"; \
- 	${FINALBUILDCMD}
-@@ -168,7 +168,7 @@ feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c
- 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
- 		-c ${top_srcdir}/bin/tests/system/feature-test.c
- 
--feature-test@EXEEXT@: feature-test.@O@
-+feature-test-sdb@EXEEXT@: feature-test.@O@
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
- 		-o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
- 
-@@ -190,8 +190,6 @@ statschannel.@O@: bind9.xsl.h
- 
- installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
--	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
--	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
- 
- install-man5: named.conf.5
- 	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man5
-@@ -201,16 +199,11 @@ install-man8: named.8 lwresd.8
- 
- install-man: install-man5 install-man8
- 
--install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs install-man
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
--	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
-+install:: ${TARGETS} installdirs
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
- 
- uninstall::
--	rm -f ${DESTDIR}${mandir}/man5/named.conf.5
--	rm -f ${DESTDIR}${mandir}/man8/lwresd.8
--	rm -f ${DESTDIR}${mandir}/man8/named.8
--	rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
--	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
-+	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-sdb@EXEEXT@
- 
- @DLZ_DRIVER_RULES@
- 
-diff --git a/bin/named-sdb/main.c b/bin/named-sdb/main.c
-index c9fc3cc..148ebb3 100644
---- a/bin/named-sdb/main.c
-+++ b/bin/named-sdb/main.c
-@@ -97,6 +97,10 @@
-  * Include header files for database drivers here.
-  */
- /* #include "xxdb.h" */
-+#include "ldapdb.h"
-+#include "pgsqldb.h"
-+#include "sqlitedb.h"
-+#include "dirdb.h"
- 
- #ifdef CONTRIB_DLZ
- /*
-@@ -1134,6 +1138,11 @@ setup(void) {
- 		ns_main_earlyfatal("isc_app_start() failed: %s",
- 				   isc_result_totext(result));
- 
-+	ldapdb_clear();
-+	pgsqldb_clear();
-+	dirdb_clear();
-+	sqlitedb_clear();
-+
- 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
- 		      ISC_LOG_NOTICE, "starting %s %s%s%s <id:%s>",
- 		      ns_g_product, ns_g_version,
-@@ -1334,6 +1343,75 @@ setup(void) {
- 				   isc_result_totext(result));
- #endif
- 
-+        result = ldapdb_init();
-+        if (result != ISC_R_SUCCESS)
-+        {
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB ldap module initialisation failed: %s.",
-+                          isc_result_totext(result)
-+                );
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB ldap zone database will be unavailable."
-+                );
-+        }else
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_NOTICE, "SDB ldap zone database module loaded."
-+                         );
-+
-+        result = pgsqldb_init();
-+        if (result != ISC_R_SUCCESS)
-+        {
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB pgsql module initialisation failed: %s.",
-+                          isc_result_totext(result)
-+                );
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB pgsql zone database will be unavailable."
-+                );
-+        }else
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
-+                         );
-+
-+        result = sqlitedb_init();
-+        if (result != ISC_R_SUCCESS)
-+        {
-+             isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB sqlite3 module initialisation failed: %s.",
-+                          isc_result_totext(result)
-+                );
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB sqlite3 zone database will be unavailable."
-+                );
-+        }else
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_NOTICE, "SDB sqlite3 DB zone database module loaded."
-+                         );
-+
-+        result = dirdb_init();
-+        if (result != ISC_R_SUCCESS)
-+        {
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB directory DB module initialisation failed: %s.",
-+                          isc_result_totext(result)
-+                );
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB directory DB zone database will be unavailable."
-+                );
-+        }else
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_NOTICE, "SDB directory DB zone database module loaded."
-+                         );
-+
-+
- 	ns_server_create(ns_g_mctx, &ns_g_server);
- 
- #ifdef HAVE_LIBSECCOMP
-@@ -1376,6 +1454,11 @@ cleanup(void) {
- 
- 	dns_name_destroy();
- 
-+	ldapdb_clear();
-+	pgsqldb_clear();
-+	sqlitedb_clear();
-+	dirdb_clear();
-+
- 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
- 		      ISC_LOG_NOTICE, "exiting");
- 	ns_log_shutdown();
-diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
-index 4cfed4d..f4bce7b 100644
---- a/bin/named/Makefile.in
-+++ b/bin/named/Makefile.in
-@@ -45,10 +45,10 @@ DLZDRIVER_LIBS =	@DLZ_DRIVER_LIBS@
- CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
- 		${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
- 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
--		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \
-+		${MAXMINDDB_CFLAGS} \
- 		@DST_OPENSSL_INC@
- 
--CDEFINES =      @CONTRIB_DLZ@ @USE_GSSAPI@ @CRYPTO@
-+CDEFINES =      @USE_GSSAPI@ @CRYPTO@
- 
- CWARNINGS =
- 
-@@ -72,11 +72,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
- 
- LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
--		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
-+		@LIBS@
- 
- NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
--		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
-+		@LIBS@
- 
- SUBDIRS =	unix
- 
-@@ -94,8 +94,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
- 		tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
- 		zoneconf.@O@ \
- 		lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
--		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ \
--		${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
-+		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@
- 
- UOBJS =		unix/os.@O@ unix/dlz_dlopen_driver.@O@
- 
-@@ -113,8 +112,7 @@ SRCS =		builtin.c client.c config.c control.c \
- 		tkeyconf.c tsigconf.c update.c xfrout.c \
- 		zoneconf.c \
- 		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
--		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
--		${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
-+		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
- 
- MANPAGES =	named.8 lwresd.8 named.conf.5
- 
-@@ -212,7 +210,5 @@ uninstall::
- 	rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
- 	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
- 
--@DLZ_DRIVER_RULES@
--
- named-symtbl.@O@: named-symtbl.c
- 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
-diff --git a/bin/sdb_tools/Makefile.in b/bin/sdb_tools/Makefile.in
-index c7e0868..95ab742 100644
---- a/bin/sdb_tools/Makefile.in
-+++ b/bin/sdb_tools/Makefile.in
-@@ -32,11 +32,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
- LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
- 
--TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@
-+TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
- 
--OBJS	=	zone2ldap.@O@ zonetodb.@O@
-+OBJS	=	zone2ldap.@O@ zonetodb.@O@ zone2sqlite.@O@
- 
--SRCS    =       zone2ldap.c zonetodb.c
-+SRCS    =       zone2ldap.c zonetodb.c zone2sqlite.c
- 
- MANPAGES =      zone2ldap.1
- 
-@@ -50,6 +50,9 @@ zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLIBS}
- zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
- 
-+zone2sqlite@EXEEXT@: zone2sqlite.@O@  ${DEPLIBS}
-+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.@O@ -lsqlite3 -lssl ${LIBS}
-+
- clean distclean manclean maintainer-clean::
- 	rm -f ${TARGETS} ${OBJS}
- 
-@@ -60,4 +63,5 @@ installdirs:
- install:: ${TARGETS} installdirs
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@  ${DESTDIR}${sbindir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
- 	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
-diff --git a/configure.ac b/configure.ac
-index f85f45f..7d28c52 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5400,6 +5400,8 @@ AC_CONFIG_FILES([
- 	bin/named/unix/Makefile
- 	bin/named-pkcs11/Makefile
- 	bin/named-pkcs11/unix/Makefile
-+	bin/named-sdb/Makefile
-+	bin/named-sdb/unix/Makefile
- 	bin/nsupdate/Makefile
- 	bin/pkcs11/Makefile
- 	bin/python/Makefile
-@@ -5424,6 +5426,7 @@ AC_CONFIG_FILES([
- 	bin/python/isc/tests/policy_test.py
- 	bin/python/isc/utils.py
- 	bin/rndc/Makefile
-+	bin/sdb_tools/Makefile
- 	bin/tests/Makefile
- 	bin/tests/headerdep_test.sh
- 	bin/tests/optional/Makefile
diff --git a/bind-9.10-use-of-strlcat.patch b/bind-9.10-use-of-strlcat.patch
deleted file mode 100644
index 2a399165f996d3b45cd978e47a686b82c763af65..0000000000000000000000000000000000000000
--- a/bind-9.10-use-of-strlcat.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/bin/sdb_tools/zone2ldap.c b/bin/sdb_tools/zone2ldap.c
-index d56bc56..99c3314 100644
---- a/bin/sdb_tools/zone2ldap.c
-+++ b/bin/sdb_tools/zone2ldap.c
-@@ -817,11 +817,11 @@ build_dn_from_dc_list (char **dc_list, unsigned int ttl, int flag, char *zone)
-     }
- 
- 
--      strlcat (dn, tmp, sizeof (dn));
-+      strncat (dn, tmp, sizeof (dn) - strlen (dn));
-     }
- 
-   sprintf (tmp, "dc=%s", dc_list[0]);
--  strlcat (dn, tmp, sizeof (dn));
-+  strncat (dn, tmp, sizeof (dn) - strlen (dn));
- 
- 	    fflush(NULL);
-   return dn;
diff --git a/bind-9.11-engine-pkcs11.patch b/bind-9.11-engine-pkcs11.patch
deleted file mode 100644
index 4a6290d084c2978f7998707d57ae04e04648bed8..0000000000000000000000000000000000000000
--- a/bind-9.11-engine-pkcs11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 37f89ccfc439f8d86c401d9ae10e94e53b924961 Mon Sep 17 00:00:00 2001
-From: Petr Mensik <pemensik@redhat.com>
-Date: Tue, 27 Aug 2019 20:39:59 +0200
-Subject: [PATCH] Do not set engine for native PKCS11
-
-It resets already set lib_path to pkcs11, which is invalid in native
-pkcs11 crypto. Engine has to be path to PKCS#11 module.
----
- bin/named/include/named/globals.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
-index eda2214..2a611d5 100644
---- a/bin/named/include/named/globals.h
-+++ b/bin/named/include/named/globals.h
-@@ -160,7 +160,7 @@ EXTERN const char *		ns_g_defaultdnstap	INIT(NULL);
- 
- EXTERN const char *		ns_g_username		INIT(NULL);
- 
--#if defined(USE_PKCS11)
-+#if defined(USE_PKCS11) && !defined(PKCS11CRYPTO)
- EXTERN const char *		ns_g_engine		INIT(PKCS11_ENGINE);
- #else
- EXTERN const char *		ns_g_engine		INIT(NULL);
--- 
-2.20.1
-
diff --git a/bind-9.11-export-suffix.patch b/bind-9.11-export-suffix.patch
deleted file mode 100644
index 8703747475a71ed0f46220857f8da1c21ea6dfe1..0000000000000000000000000000000000000000
--- a/bind-9.11-export-suffix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index c1bfd62..7c5ad51 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5333,6 +5333,8 @@ AC_SUBST(BUILD_CPPFLAGS)
- AC_SUBST(BUILD_LDFLAGS)
- AC_SUBST(BUILD_LIBS)
- 
-+AC_SUBST(LIBDIR_SUFFIX)
-+
- #
- # Commands to run at the end of config.status.
- # Don't just put these into configure, it won't work right if somebody
-diff --git a/isc-config.sh.in b/isc-config.sh.in
-index b5e94ed..d2857e0 100644
---- a/isc-config.sh.in
-+++ b/isc-config.sh.in
-@@ -13,16 +13,17 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- exec_prefix_set=
- includedir=@includedir@
-+libdir_suffix=@LIBDIR_SUFFIX@
- arch=$(uname -m)
- 
- case $arch in
- 	x86_64 | amd64 | sparc64 | s390x | ppc64)
--		libdir=/usr/lib64
--		sec_libdir=/usr/lib
-+		libdir=/usr/lib64${libdir_suffix}
-+		sec_libdir=/usr/lib${libdir_suffix}
- 		;;
- 	* )
--		libdir=/usr/lib
--		sec_libdir=/usr/lib64
-+		libdir=/usr/lib${libdir_suffix}
-+		sec_libdir=/usr/lib64${libdir_suffix}
- 		;;
- esac
- 
diff --git a/bind-9.11-feature-test-named.patch b/bind-9.11-feature-test-named.patch
deleted file mode 100644
index c8e6d57f81fc27088ba9d85dd533f69af9d25630..0000000000000000000000000000000000000000
--- a/bind-9.11-feature-test-named.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 3f2fafe5368655225eddf0537e58e425bbc297be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Wed, 30 Jan 2019 14:37:17 +0100
-Subject: [PATCH] Create feature-test in source directory
-
-Feature-test tool is used in system tests to test compiled in changes.
-Because we build more variants of named with different configuration,
-compile feature-test for each of them this way.
-
-Named variant specific feature-test does not have defined gss support,
-even when it was enabled by configure. bin/tests/system Makefile defines
-it, so define it also in named variants.
----
- bin/named/Makefile.in       | 13 +++++++++++--
- bin/tests/system/conf.sh.in |  2 +-
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
-index 3166368..70e5571 100644
---- a/bin/named/Makefile.in
-+++ b/bin/named/Makefile.in
-@@ -48,7 +48,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
- 		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \
- 		@DST_OPENSSL_INC@
- 
--CDEFINES =      @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @CRYPTO@
-+CDEFINES =      @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @USE_GSSAPI@ @CRYPTO@
- 
- CWARNINGS =
- 
-@@ -80,7 +80,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 
- SUBDIRS =	unix
- 
--TARGETS =	named@EXEEXT@ lwresd@EXEEXT@
-+TARGETS =	named@EXEEXT@ lwresd@EXEEXT@ feature-test@EXEEXT@
- 
- GEOIPLINKOBJS = geoip.@O@
- GEOIP2LINKOBJS = geoip.@O@
-@@ -163,6 +163,15 @@ lwresd@EXEEXT@: named@EXEEXT@
- 	rm -f lwresd@EXEEXT@
- 	@LN@ named@EXEEXT@ lwresd@EXEEXT@
- 
-+# Bit of hack, do not produce intermediate .o object for featuretest
-+feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c
-+	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
-+		-c ${top_srcdir}/bin/tests/system/feature-test.c
-+
-+feature-test@EXEEXT@: feature-test.@O@
-+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
-+		-o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
-+
- doc man:: ${MANOBJS}
- 
- docclean manclean maintainer-clean::
-diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
-index cedabbe..e1bf5da 100644
---- a/bin/tests/system/conf.sh.in
-+++ b/bin/tests/system/conf.sh.in
-@@ -71,7 +71,7 @@ DNSTAPREAD=$TOP/bin/tools/dnstap-read
- MDIG=$TOP/bin/tools/mdig
- NZD2NZF=$TOP/bin/tools/named-nzd2nzf
- FSTRM_CAPTURE=@FSTRM_CAPTURE@
--FEATURETEST=$TOP/bin/tests/system/feature-test
-+FEATURETEST=$TOP/bin/named/feature-test
- 
- RANDFILE=$TOP/bin/tests/system/random.data
- 
--- 
-2.20.1
-
diff --git a/bind-9.11-fips-code.patch b/bind-9.11-fips-code.patch
deleted file mode 100644
index cf001041f3dcb203cc373a0412edc15bb95b2e2d..0000000000000000000000000000000000000000
--- a/bind-9.11-fips-code.patch
+++ /dev/null
@@ -1,1459 +0,0 @@
-From eff6dcb62f3cea6df0a848c2220a49bc02cb4a0e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Thu, 2 Aug 2018 23:34:45 +0200
-Subject: [PATCH] FIPS code changes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Squashed commit of the following:
-
-commit b49f70ce0575b6b52a71b90fe0376dbf16f92c6b
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Mon Jan 22 14:12:37 2018 +0100
-
-    Update system tests to detect MD5 disabled at runtime
-
-commit 80ceffee4860c24baf70bc9a8653d92731eda2e4
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Thu Aug 2 14:53:54 2018 +0200
-
-    Avoid warning about undefined parameters
-
-commit e4ad4363e3d1acaac58456117579f02761f38fdc
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Wed Jun 20 19:31:19 2018 +0200
-
-    Fix rndc-confgen default algorithm, report true algorithm in usage.
-
-commit 7e629a351010cb75e0589ec361f720085675998c
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Fri Feb 23 21:21:30 2018 +0100
-
-    Cleanup only if initialization was successful
-
-commit 2101b948c77cbcbe07eb4a1e60f3e693b2245ec6
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Mon Feb 5 12:19:28 2018 +0100
-
-    Ensure dst backend is initialized first even before hmac algorithms.
-
-commit 7567c7edde7519115a9ae7e20818c835d3eb1ffe
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Mon Feb 5 12:17:54 2018 +0100
-
-    Skip initialization of MD5 based algorithms if not available.
-
-commit 5782137df6b45a6d900d5a1c250c1257227e917a
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Mon Feb 5 10:21:27 2018 +0100
-
-    Change secalgs skipping to be more safe
-
-commit f2d78729898182d2d19d5064de1bec9b66817159
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Wed Jan 31 18:26:11 2018 +0100
-
-    Skip MD5 algorithm also in case of NULL name
-
-commit 32a2ad4abc7aaca1c257730319ad3c27405d3407
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Wed Jan 31 11:38:12 2018 +0100
-
-    Make MD5 behave like unknown algorithm in TSIG.
-
-commit 13cd3f704dce568fdf24a567be5802b58ac6007b
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Tue Nov 28 20:14:37 2017 +0100
-
-    Select token with most supported functions, instead of demanding it must support all functions
-
-    Initialize PKCS#11 always until successfully initialized
-
-commit a71df74abdca4fe63bcdf542b81a109cf1f495b4
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Mon Jan 22 16:17:44 2018 +0100
-
-    Handle MD5 unavailability from DST
-
-commit dd82cb263efa2753d3ee772972726ea08bcc639b
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Mon Jan 22 14:11:16 2018 +0100
-
-    Check runtime flag from library and applications, fail gracefully.
-
-commit c7b2f87f07ecae75b821a908e29f08a42371e32e
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Mon Jan 22 08:39:08 2018 +0100
-
-    Modify libraries to use isc_md5_available() if PK11_MD5_DISABLE is not
-    defined.
-    TODO: pk11.c should accept slot without MD5 support.
-
-commit 0b8e470ec636b9e350b5ec3203eb2b4091415fde
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Mon Jan 22 07:21:04 2018 +0100
-
-    Add runtime detection whether MD5 is useable.
----
- bin/confgen/keygen.c              | 10 +++-
- bin/confgen/rndc-confgen.c        | 32 ++++---------
- bin/dig/dig.c                     |  7 +--
- bin/dig/dighost.c                 | 14 ++++--
- bin/dnssec/dnssec-keygen.c        | 14 ++++++
- bin/named/config.c                | 25 +++++++++-
- bin/nsupdate/nsupdate.c           | 24 ++++++----
- bin/rndc/rndc.c                   |  3 +-
- bin/tests/optional/hash_test.c    | 78 ++++++++++++++++---------------
- bin/tests/system/tkey/keycreate.c |  3 ++
- bin/tests/system/tkey/keydelete.c | 17 ++++---
- lib/bind9/check.c                 | 10 ++++
- lib/dns/dst_api.c                 | 23 ++++++---
- lib/dns/dst_internal.h            |  3 +-
- lib/dns/dst_parse.c               | 18 +++++--
- lib/dns/hmac_link.c               | 18 ++-----
- lib/dns/opensslrsa_link.c         |  6 +++
- lib/dns/pkcs11rsa_link.c          | 33 +++++++++++--
- lib/dns/rcode.c                   | 21 ++++++++-
- lib/dns/tests/rsa_test.c          |  4 ++
- lib/dns/tests/tsig_test.c         |  1 +
- lib/dns/tkey.c                    |  9 ++++
- lib/dns/tsec.c                    |  8 +++-
- lib/dns/tsig.c                    | 17 ++++---
- lib/isc/include/isc/md5.h         |  3 ++
- lib/isc/md5.c                     | 59 +++++++++++++++++++++++
- lib/isc/pk11.c                    | 44 +++++++++++------
- lib/isc/tests/hash_test.c         |  9 ++++
- lib/isccc/cc.c                    | 42 +++++++++++------
- 29 files changed, 400 insertions(+), 155 deletions(-)
-
-diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c
-index 8931ad5..5015abb 100644
---- a/bin/confgen/keygen.c
-+++ b/bin/confgen/keygen.c
-@@ -22,6 +22,7 @@
- #include <isc/entropy.h>
- #include <isc/file.h>
- #include <isc/keyboard.h>
-+#include <isc/md5.h>
- #include <isc/mem.h>
- #include <isc/print.h>
- #include <isc/result.h>
-@@ -73,7 +74,7 @@ alg_fromtext(const char *name) {
- 		p = &name[5];
- 
- #ifndef PK11_MD5_DISABLE
--	if (strcasecmp(p, "md5") == 0)
-+	if (strcasecmp(p, "md5") == 0 && isc_md5_available())
- 		return DST_ALG_HMACMD5;
- #endif
- 	if (strcasecmp(p, "sha1") == 0)
-@@ -132,6 +133,13 @@ generate_key(isc_mem_t *mctx, const char *randomfile, dns_secalg_t alg,
- 	switch (alg) {
- #ifndef PK11_MD5_DISABLE
- 	    case DST_ALG_HMACMD5:
-+		if (!isc_md5_available()) {
-+			fatal("unsupported algorithm %d\n", alg);
-+		} else if (keysize < 1 || keysize > 512) {
-+			fatal("keysize %d out of range (must be 1-512)\n",
-+			      keysize);
-+		}
-+		break;
- #endif
- 	    case DST_ALG_HMACSHA1:
- 	    case DST_ALG_HMACSHA224:
-diff --git a/bin/confgen/rndc-confgen.c b/bin/confgen/rndc-confgen.c
-index 5ca3d76..6b7790a 100644
---- a/bin/confgen/rndc-confgen.c
-+++ b/bin/confgen/rndc-confgen.c
-@@ -36,6 +36,7 @@
- #include <isc/file.h>
- #include <isc/keyboard.h>
- #include <isc/mem.h>
-+#include <isc/md5.h>
- #include <isc/net.h>
- #include <isc/print.h>
- #include <isc/result.h>
-@@ -63,7 +64,7 @@ const char *progname;
- 
- bool verbose = false;
- 
--const char *keyfile, *keydef;
-+const char *keyfile, *keydef, *algdef;
- 
- ISC_PLATFORM_NORETURN_PRE static void
- usage(int status) ISC_PLATFORM_NORETURN_POST;
-@@ -71,13 +72,12 @@ usage(int status) ISC_PLATFORM_NORETURN_POST;
- static void
- usage(int status) {
- 
--#ifndef PK11_MD5_DISABLE
- 	fprintf(stderr, "\
- Usage:\n\
-  %s [-a] [-b bits] [-c keyfile] [-k keyname] [-p port] [-r randomfile] \
- [-s addr] [-t chrootdir] [-u user]\n\
-   -a:		 generate just the key clause and write it to keyfile (%s)\n\
--  -A alg:	 algorithm (default hmac-md5)\n\
-+  -A alg:	 algorithm (default %s)\n\
-   -b bits:	 from 1 through 512, default 256; total length of the secret\n\
-   -c keyfile:	 specify an alternate key file (requires -a)\n\
-   -k keyname:	 the name as it will be used  in named.conf and rndc.conf\n\
-@@ -86,24 +86,7 @@ Usage:\n\
-   -s addr:	 the address to which rndc should connect\n\
-   -t chrootdir:	 write a keyfile in chrootdir as well (requires -a)\n\
-   -u user:	 set the keyfile owner to \"user\" (requires -a)\n",
--		 progname, keydef);
--#else
--	fprintf(stderr, "\
--Usage:\n\
-- %s [-a] [-b bits] [-c keyfile] [-k keyname] [-p port] [-r randomfile] \
--[-s addr] [-t chrootdir] [-u user]\n\
--  -a:		 generate just the key clause and write it to keyfile (%s)\n\
--  -A alg:	 algorithm (default hmac-sha256)\n\
--  -b bits:	 from 1 through 512, default 256; total length of the secret\n\
--  -c keyfile:	 specify an alternate key file (requires -a)\n\
--  -k keyname:	 the name as it will be used  in named.conf and rndc.conf\n\
--  -p port:	 the port named will listen on and rndc will connect to\n\
--  -r randomfile: source of random data (use \"keyboard\" for key timing)\n\
--  -s addr:	 the address to which rndc should connect\n\
--  -t chrootdir:	 write a keyfile in chrootdir as well (requires -a)\n\
--  -u user:	 set the keyfile owner to \"user\" (requires -a)\n",
--		 progname, keydef);
--#endif
-+		 progname, keydef, algdef);
- 
- 	exit (status);
- }
-@@ -139,11 +122,12 @@ main(int argc, char **argv) {
- 	progname = program;
- 
- 	keyname = DEFAULT_KEYNAME;
--#ifndef PK11_MD5_DISABLE
--	alg = DST_ALG_HMACMD5;
--#else
- 	alg = DST_ALG_HMACSHA256;
-+#ifndef PK11_MD5_DISABLE
-+	if (isc_md5_available())
-+		alg = DST_ALG_HMACMD5;
- #endif
-+	algdef = alg_totext(alg);
- 	serveraddr = DEFAULT_SERVER;
- 	port = DEFAULT_PORT;
- 
-diff --git a/bin/dig/dig.c b/bin/dig/dig.c
-index 706299e..aaf22e7 100644
---- a/bin/dig/dig.c
-+++ b/bin/dig/dig.c
-@@ -20,6 +20,7 @@
- #include <ctype.h>
- 
- #include <isc/app.h>
-+#include <isc/md5.h>
- #include <isc/netaddr.h>
- #include <isc/parseint.h>
- #include <isc/platform.h>
-@@ -1774,10 +1775,10 @@ dash_option(char *option, char *next, dig_lookup_t **lookup,
- 			ptr = ptr2;
- 			ptr2 = ptr3;
- 		} else  {
--#ifndef PK11_MD5_DISABLE
--			hmacname = DNS_TSIG_HMACMD5_NAME;
--#else
- 			hmacname = DNS_TSIG_HMACSHA256_NAME;
-+#ifndef PK11_MD5_DISABLE
-+			if (isc_md5_available())
-+				hmacname = DNS_TSIG_HMACMD5_NAME;
- #endif
- 			digestbits = 0;
- 		}
-diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
-index 93e5b40..afd2700 100644
---- a/bin/dig/dighost.c
-+++ b/bin/dig/dighost.c
-@@ -80,6 +80,7 @@
- #include <isc/hex.h>
- #include <isc/lang.h>
- #include <isc/log.h>
-+#include <isc/md5.h>
- #include <isc/netaddr.h>
- #include <isc/netdb.h>
- #include <isc/parseint.h>
-@@ -1246,9 +1247,10 @@ parse_hmac(const char *hmac) {
- 	digestbits = 0;
- 
- #ifndef PK11_MD5_DISABLE
--	if (strcasecmp(buf, "hmac-md5") == 0) {
-+	if (strcasecmp(buf, "hmac-md5") == 0 && isc_md5_available()) {
- 		hmacname = DNS_TSIG_HMACMD5_NAME;
--	} else if (strncasecmp(buf, "hmac-md5-", 9) == 0) {
-+	} else if (strncasecmp(buf, "hmac-md5-", 9) == 0 &&
-+		   isc_md5_available()) {
- 		hmacname = DNS_TSIG_HMACMD5_NAME;
- 		digestbits = parse_bits(&buf[9], "digest-bits [0..128]", 128);
- 	} else
-@@ -1368,7 +1370,13 @@ setup_file_key(void) {
- 	switch (dst_key_alg(dstkey)) {
- #ifndef PK11_MD5_DISABLE
- 	case DST_ALG_HMACMD5:
--		hmacname = DNS_TSIG_HMACMD5_NAME;
-+		if (isc_md5_available()) {
-+			hmacname = DNS_TSIG_HMACMD5_NAME;
-+		} else {
-+			printf(";; Couldn't create key %s: bad algorithm\n",
-+			       keynametext);
-+			goto failure;
-+		}
- 		break;
- #endif
- 	case DST_ALG_HMACSHA1:
-diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
-index 1476d0d..f5c9316 100644
---- a/bin/dnssec/dnssec-keygen.c
-+++ b/bin/dnssec/dnssec-keygen.c
-@@ -36,6 +36,7 @@
- #include <isc/buffer.h>
- #include <isc/commandline.h>
- #include <isc/entropy.h>
-+#include <isc/md5.h>
- #include <isc/mem.h>
- #include <isc/print.h>
- #include <isc/region.h>
-@@ -562,6 +563,19 @@ main(int argc, char **argv) {
- 					"\"-a RSAMD5\"\n");
- 			INSIST(freeit == NULL);
- 			return (1);
-+		} else if (strcasecmp(algname, "HMAC-MD5") == 0) {
-+			if (isc_md5_available()) {
-+				alg = DST_ALG_HMACMD5;
-+			} else {
-+				fprintf(stderr,
-+					"The use of HMAC-MD5 was disabled\n");
-+				return (1);
-+			}
-+		} else if (strcasecmp(algname, "RSAMD5") == 0 &&
-+			   !isc_md5_available()) {
-+			fprintf(stderr, "The use of RSAMD5 was disabled\n");
-+			INSIST(freeit == NULL);
-+			return (1);
- 		} else if (strcasecmp(algname, "HMAC-MD5") == 0) {
- 			alg = DST_ALG_HMACMD5;
- #else
-diff --git a/bin/named/config.c b/bin/named/config.c
-index 32c454a..dff826b 100644
---- a/bin/named/config.c
-+++ b/bin/named/config.c
-@@ -18,6 +18,7 @@
- 
- #include <isc/buffer.h>
- #include <isc/log.h>
-+#include <isc/md5.h>
- #include <isc/mem.h>
- #include <isc/parseint.h>
- #include <isc/region.h>
-@@ -974,6 +975,21 @@ ns_config_getkeyalgorithm(const char *str, dns_name_t **name,
- 	return (ns_config_getkeyalgorithm2(str, name, NULL, digestbits));
- }
- 
-+static inline int
-+algorithms_start() {
-+#ifndef PK11_MD5_DISABLE
-+	if (!isc_md5_available()) {
-+		int i = 0;
-+		while (algorithms[i].str != NULL &&
-+			algorithms[i].hmac == hmacmd5) {
-+			i++;
-+		}
-+		return i;
-+	}
-+#endif
-+	return 0;
-+}
-+
- isc_result_t
- ns_config_getkeyalgorithm2(const char *str, dns_name_t **name,
- 			   unsigned int *typep, uint16_t *digestbits)
-@@ -983,7 +999,7 @@ ns_config_getkeyalgorithm2(const char *str, dns_name_t **name,
- 	uint16_t bits;
- 	isc_result_t result;
- 
--	for (i = 0; algorithms[i].str != NULL; i++) {
-+	for (i = algorithms_start(); algorithms[i].str != NULL; i++) {
- 		len = strlen(algorithms[i].str);
- 		if (strncasecmp(algorithms[i].str, str, len) == 0 &&
- 		    (str[len] == '\0' ||
-@@ -1006,7 +1022,12 @@ ns_config_getkeyalgorithm2(const char *str, dns_name_t **name,
- 	if (name != NULL) {
- 		switch (algorithms[i].hmac) {
- #ifndef PK11_MD5_DISABLE
--		case hmacmd5: *name = dns_tsig_hmacmd5_name; break;
-+		case hmacmd5:
-+			if (isc_md5_available()) {
-+				*name = dns_tsig_hmacmd5_name; break;
-+			} else {
-+				return (ISC_R_NOTFOUND);
-+			}
- #endif
- 		case hmacsha1: *name = dns_tsig_hmacsha1_name; break;
- 		case hmacsha224: *name = dns_tsig_hmacsha224_name; break;
-diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
-index de60313..bbb3936 100644
---- a/bin/nsupdate/nsupdate.c
-+++ b/bin/nsupdate/nsupdate.c
-@@ -31,6 +31,7 @@
- #include <isc/hash.h>
- #include <isc/lex.h>
- #include <isc/log.h>
-+#include <isc/md5.h>
- #include <isc/mem.h>
- #include <isc/parseint.h>
- #include <isc/portset.h>
-@@ -477,9 +478,10 @@ parse_hmac(dns_name_t **hmac, const char *hmacstr, size_t len,
- 	strlcpy(buf, hmacstr, ISC_MIN(len + 1, sizeof(buf)));
- 
- #ifndef PK11_MD5_DISABLE
--	if (strcasecmp(buf, "hmac-md5") == 0) {
-+	if (strcasecmp(buf, "hmac-md5") == 0 && isc_md5_available()) {
- 		*hmac = DNS_TSIG_HMACMD5_NAME;
--	} else if (strncasecmp(buf, "hmac-md5-", 9) == 0) {
-+	} else if (strncasecmp(buf, "hmac-md5-", 9) == 0 &&
-+		   isc_md5_available()) {
- 		*hmac = DNS_TSIG_HMACMD5_NAME;
- 		result = isc_parse_uint16(&digestbits, &buf[9], 10);
- 		if (result != ISC_R_SUCCESS || digestbits > 128) {
-@@ -592,10 +594,10 @@ setup_keystr(void) {
- 			exit(1);
- 		}
- 	} else {
--#ifndef PK11_MD5_DISABLE
--		hmacname = DNS_TSIG_HMACMD5_NAME;
--#else
- 		hmacname = DNS_TSIG_HMACSHA256_NAME;
-+#ifndef PK11_MD5_DISABLE
-+		if (isc_md5_available())
-+			hmacname = DNS_TSIG_HMACMD5_NAME;
- #endif
- 		name = keystr;
- 		n = s;
-@@ -732,7 +734,8 @@ setup_keyfile(isc_mem_t *mctx, isc_log_t *lctx) {
- 	switch (dst_key_alg(dstkey)) {
- #ifndef PK11_MD5_DISABLE
- 	case DST_ALG_HMACMD5:
--		hmacname = DNS_TSIG_HMACMD5_NAME;
-+		if (isc_md5_available())
-+			hmacname = DNS_TSIG_HMACMD5_NAME;
- 		break;
- #endif
- 	case DST_ALG_HMACSHA1:
-@@ -1637,12 +1640,13 @@ evaluate_key(char *cmdline) {
- 			return (STATUS_SYNTAX);
- 		}
- 		namestr = n + 1;
--	} else
--#ifndef PK11_MD5_DISABLE
--		hmacname = DNS_TSIG_HMACMD5_NAME;
--#else
-+	} else {
- 		hmacname = DNS_TSIG_HMACSHA256_NAME;
-+#ifndef PK11_MD5_DISABLE
-+		if (isc_md5_available())
-+			hmacname = DNS_TSIG_HMACMD5_NAME;
- #endif
-+	}
- 
- 	isc_buffer_init(&b, namestr, strlen(namestr));
- 	isc_buffer_add(&b, strlen(namestr));
-diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
-index 9eb0ce0..8083654 100644
---- a/bin/rndc/rndc.c
-+++ b/bin/rndc/rndc.c
-@@ -23,6 +23,7 @@
- #include <isc/file.h>
- #include <isc/log.h>
- #include <isc/net.h>
-+#include <isc/md5.h>
- #include <isc/mem.h>
- #include <isc/print.h>
- #include <isc/random.h>
-@@ -636,7 +637,7 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname,
- 	algorithmstr = cfg_obj_asstring(algorithmobj);
- 
- #ifndef PK11_MD5_DISABLE
--	if (strcasecmp(algorithmstr, "hmac-md5") == 0)
-+	if (strcasecmp(algorithmstr, "hmac-md5") == 0 && isc_md5_available())
- 		algorithm = ISCCC_ALG_HMACMD5;
- 	else
- #endif
-diff --git a/bin/tests/optional/hash_test.c b/bin/tests/optional/hash_test.c
-index bf2891a..b5f0a1c 100644
---- a/bin/tests/optional/hash_test.c
-+++ b/bin/tests/optional/hash_test.c
-@@ -90,43 +90,47 @@ main(int argc, char **argv) {
- 	print_digest(s, "sha224", digest, ISC_SHA224_DIGESTLENGTH/4);
- 
- #ifndef PK11_MD5_DISABLE
--	s = "abc";
--	isc_md5_init(&md5);
--	memmove(buffer, s, strlen(s));
--	isc_md5_update(&md5, buffer, strlen(s));
--	isc_md5_final(&md5, digest);
--	print_digest(s, "md5", digest, 4);
--
--	/*
--	 * The 3 HMAC-MD5 examples from RFC2104
--	 */
--	s = "Hi There";
--	memset(key, 0x0b, 16);
--	isc_hmacmd5_init(&hmacmd5, key, 16);
--	memmove(buffer, s, strlen(s));
--	isc_hmacmd5_update(&hmacmd5, buffer, strlen(s));
--	isc_hmacmd5_sign(&hmacmd5, digest);
--	print_digest(s, "hmacmd5", digest, 4);
--
--	s = "what do ya want for nothing?";
--	strlcpy((char *)key, "Jefe", sizeof(key));
--	isc_hmacmd5_init(&hmacmd5, key, 4);
--	memmove(buffer, s, strlen(s));
--	isc_hmacmd5_update(&hmacmd5, buffer, strlen(s));
--	isc_hmacmd5_sign(&hmacmd5, digest);
--	print_digest(s, "hmacmd5", digest, 4);
--
--	s = "\335\335\335\335\335\335\335\335\335\335"
--	    "\335\335\335\335\335\335\335\335\335\335"
--	    "\335\335\335\335\335\335\335\335\335\335"
--	    "\335\335\335\335\335\335\335\335\335\335"
--	    "\335\335\335\335\335\335\335\335\335\335";
--	memset(key, 0xaa, 16);
--	isc_hmacmd5_init(&hmacmd5, key, 16);
--	memmove(buffer, s, strlen(s));
--	isc_hmacmd5_update(&hmacmd5, buffer, strlen(s));
--	isc_hmacmd5_sign(&hmacmd5, digest);
--	print_digest(s, "hmacmd5", digest, 4);
-+	if (isc_md5_available()) {
-+		s = "abc";
-+		isc_md5_init(&md5);
-+		memmove(buffer, s, strlen(s));
-+		isc_md5_update(&md5, buffer, strlen(s));
-+		isc_md5_final(&md5, digest);
-+		print_digest(s, "md5", digest, 4);
-+
-+		/*
-+		 * The 3 HMAC-MD5 examples from RFC2104
-+		 */
-+		s = "Hi There";
-+		memset(key, 0x0b, 16);
-+		isc_hmacmd5_init(&hmacmd5, key, 16);
-+		memmove(buffer, s, strlen(s));
-+		isc_hmacmd5_update(&hmacmd5, buffer, strlen(s));
-+		isc_hmacmd5_sign(&hmacmd5, digest);
-+		print_digest(s, "hmacmd5", digest, 4);
-+
-+		s = "what do ya want for nothing?";
-+		strlcpy((char *)key, "Jefe", sizeof(key));
-+		isc_hmacmd5_init(&hmacmd5, key, 4);
-+		memmove(buffer, s, strlen(s));
-+		isc_hmacmd5_update(&hmacmd5, buffer, strlen(s));
-+		isc_hmacmd5_sign(&hmacmd5, digest);
-+		print_digest(s, "hmacmd5", digest, 4);
-+
-+		s = "\335\335\335\335\335\335\335\335\335\335"
-+		    "\335\335\335\335\335\335\335\335\335\335"
-+		    "\335\335\335\335\335\335\335\335\335\335"
-+		    "\335\335\335\335\335\335\335\335\335\335"
-+		    "\335\335\335\335\335\335\335\335\335\335";
-+		memset(key, 0xaa, 16);
-+		isc_hmacmd5_init(&hmacmd5, key, 16);
-+		memmove(buffer, s, strlen(s));
-+		isc_hmacmd5_update(&hmacmd5, buffer, strlen(s));
-+		isc_hmacmd5_sign(&hmacmd5, digest);
-+		print_digest(s, "hmacmd5", digest, 4);
-+	} else {
-+		fprintf(stderr, "Skipping disabled MD5 algorithm\n");
-+	}
- #endif
- 
- 	/*
-diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
-index 5a00f86..653c951 100644
---- a/bin/tests/system/tkey/keycreate.c
-+++ b/bin/tests/system/tkey/keycreate.c
-@@ -20,6 +20,7 @@
- #include <isc/entropy.h>
- #include <isc/hash.h>
- #include <isc/log.h>
-+#include <isc/md5.h>
- #include <isc/mem.h>
- #include <isc/print.h>
- #include <isc/sockaddr.h>
-@@ -142,6 +143,8 @@ sendquery(isc_task_t *task, isc_event_t *event) {
- 	static char keystr[] = "0123456789ab";
- 
- 	isc_event_free(&event);
-+	if (!isc_md5_available())
-+		CHECK("MD5 was disabled", ISC_R_NOTIMPLEMENTED);
- 
- 	result = ISC_R_FAILURE;
- 	if (inet_pton(AF_INET, "10.53.0.1", &inaddr) != 1)
-diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
-index bde66a4..70a40c3 100644
---- a/bin/tests/system/tkey/keydelete.c
-+++ b/bin/tests/system/tkey/keydelete.c
-@@ -225,12 +225,17 @@ main(int argc, char **argv) {
- 	result = dst_key_fromnamedfile(keyname, NULL, type, mctx, &dstkey);
- 	CHECK("dst_key_fromnamedfile", result);
- #ifndef PK11_MD5_DISABLE
--	result = dns_tsigkey_createfromkey(dst_key_name(dstkey),
--					   DNS_TSIG_HMACMD5_NAME,
--					   dstkey, true, NULL, 0, 0,
--					   mctx, ring, &tsigkey);
--	dst_key_free(&dstkey);
--	CHECK("dns_tsigkey_createfromkey", result);
-+	if (isc_md5_available()) {
-+		result = dns_tsigkey_createfromkey(dst_key_name(dstkey),
-+						   DNS_TSIG_HMACMD5_NAME,
-+						   dstkey, true, NULL, 0, 0,
-+						   mctx, ring, &tsigkey);
-+		dst_key_free(&dstkey);
-+		CHECK("dns_tsigkey_createfromkey", result);
-+	} else {
-+		dst_key_free(&dstkey);
-+		CHECK("MD5 was disabled", ISC_R_NOTIMPLEMENTED);
-+	}
- #else
- 	dst_key_free(&dstkey);
- 	CHECK("MD5 was disabled", ISC_R_NOTIMPLEMENTED);
-diff --git a/lib/bind9/check.c b/lib/bind9/check.c
-index ec0ab6d..e0803d4 100644
---- a/lib/bind9/check.c
-+++ b/lib/bind9/check.c
-@@ -23,6 +23,7 @@
- #include <isc/file.h>
- #include <isc/hex.h>
- #include <isc/log.h>
-+#include <isc/md5.h>
- #include <isc/mem.h>
- #include <isc/netaddr.h>
- #include <isc/parseint.h>
-@@ -2618,6 +2619,15 @@ bind9_check_key(const cfg_obj_t *key, isc_log_t *logctx) {
- 	}
- 
- 	algorithm = cfg_obj_asstring(algobj);
-+#ifndef PK11_MD5_DISABLE
-+	/* Skip hmac-md5* algorithms */
-+	if (!isc_md5_available() &&
-+	    strncasecmp(algorithm, "hmac-md5", 8) == 0) {
-+		cfg_obj_log(algobj, logctx, ISC_LOG_ERROR,
-+			    "disabled algorithm '%s'", algorithm);
-+		return (ISC_R_DISABLED);
-+	}
-+#endif
- 	for (i = 0; algorithms[i].name != NULL; i++) {
- 		len = strlen(algorithms[i].name);
- 		if (strncasecmp(algorithms[i].name, algorithm, len) == 0 &&
-diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
-index e3c47a9..320c0f8 100644
---- a/lib/dns/dst_api.c
-+++ b/lib/dns/dst_api.c
-@@ -192,6 +192,12 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx,
- 	dst_result_register();
- 
- 	memset(dst_t_func, 0, sizeof(dst_t_func));
-+
-+#ifdef OPENSSL
-+	RETERR(dst__openssl_init(engine));
-+#elif PKCS11CRYPTO
-+	RETERR(dst__pkcs11_init(mctx, engine));
-+#endif
- #ifndef PK11_MD5_DISABLE
- 	RETERR(dst__hmacmd5_init(&dst_t_func[DST_ALG_HMACMD5]));
- #endif
-@@ -201,7 +207,6 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx,
- 	RETERR(dst__hmacsha384_init(&dst_t_func[DST_ALG_HMACSHA384]));
- 	RETERR(dst__hmacsha512_init(&dst_t_func[DST_ALG_HMACSHA512]));
- #ifdef OPENSSL
--	RETERR(dst__openssl_init(engine));
- #ifndef PK11_MD5_DISABLE
- 	RETERR(dst__opensslrsa_init(&dst_t_func[DST_ALG_RSAMD5],
- 				    DST_ALG_RSAMD5));
-@@ -235,14 +240,18 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx,
- 	RETERR(dst__openssleddsa_init(&dst_t_func[DST_ALG_ED448]));
- #endif
- #elif PKCS11CRYPTO
--	RETERR(dst__pkcs11_init(mctx, engine));
- #ifndef PK11_MD5_DISABLE
--	RETERR(dst__pkcs11rsa_init(&dst_t_func[DST_ALG_RSAMD5]));
-+	RETERR(dst__pkcs11rsa_init(&dst_t_func[DST_ALG_RSAMD5],
-+				   DST_ALG_RSAMD5));
- #endif
--	RETERR(dst__pkcs11rsa_init(&dst_t_func[DST_ALG_RSASHA1]));
--	RETERR(dst__pkcs11rsa_init(&dst_t_func[DST_ALG_NSEC3RSASHA1]));
--	RETERR(dst__pkcs11rsa_init(&dst_t_func[DST_ALG_RSASHA256]));
--	RETERR(dst__pkcs11rsa_init(&dst_t_func[DST_ALG_RSASHA512]));
-+	RETERR(dst__pkcs11rsa_init(&dst_t_func[DST_ALG_RSASHA1],
-+				   DST_ALG_RSASHA1));
-+	RETERR(dst__pkcs11rsa_init(&dst_t_func[DST_ALG_NSEC3RSASHA1],
-+				   DST_ALG_NSEC3RSASHA1));
-+	RETERR(dst__pkcs11rsa_init(&dst_t_func[DST_ALG_RSASHA256],
-+				   DST_ALG_RSASHA256));
-+	RETERR(dst__pkcs11rsa_init(&dst_t_func[DST_ALG_RSASHA512],
-+				   DST_ALG_RSASHA512));
- #ifndef PK11_DSA_DISABLE
- 	RETERR(dst__pkcs11dsa_init(&dst_t_func[DST_ALG_DSA]));
- 	RETERR(dst__pkcs11dsa_init(&dst_t_func[DST_ALG_NSEC3DSA]));
-diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
-index 6ee796c..3e55d44 100644
---- a/lib/dns/dst_internal.h
-+++ b/lib/dns/dst_internal.h
-@@ -250,7 +250,8 @@ isc_result_t dst__hmacsha384_init(struct dst_func **funcp);
- isc_result_t dst__hmacsha512_init(struct dst_func **funcp);
- isc_result_t dst__opensslrsa_init(struct dst_func **funcp,
- 				  unsigned char algorithm);
--isc_result_t dst__pkcs11rsa_init(struct dst_func **funcp);
-+isc_result_t dst__pkcs11rsa_init(struct dst_func **funcp,
-+				 unsigned char algorithm);
- #ifndef PK11_DSA_DISABLE
- isc_result_t dst__openssldsa_init(struct dst_func **funcp);
- isc_result_t dst__pkcs11dsa_init(struct dst_func **funcp);
-diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c
-index f31c33d..87023a6 100644
---- a/lib/dns/dst_parse.c
-+++ b/lib/dns/dst_parse.c
-@@ -33,6 +33,7 @@
- #include <isc/file.h>
- #include <isc/fsaccess.h>
- #include <isc/lex.h>
-+#include <isc/md5.h>
- #include <isc/mem.h>
- #include <isc/print.h>
- #include <isc/stdtime.h>
-@@ -396,6 +397,10 @@ check_data(const dst_private_t *priv, const unsigned int alg,
- 	switch (alg) {
- #ifndef PK11_MD5_DISABLE
- 	case DST_ALG_RSAMD5:
-+		if (isc_md5_available())
-+			return (check_rsa(priv, external));
-+		else
-+			return (DST_R_UNSUPPORTEDALG);
- #endif
- 	case DST_ALG_RSASHA1:
- 	case DST_ALG_NSEC3RSASHA1:
-@@ -421,7 +426,10 @@ check_data(const dst_private_t *priv, const unsigned int alg,
- 		return (check_eddsa(priv, external));
- #ifndef PK11_MD5_DISABLE
- 	case DST_ALG_HMACMD5:
--		return (check_hmac_md5(priv, old));
-+		if (isc_md5_available())
-+			return (check_hmac_md5(priv, old));
-+		else
-+			return (DST_R_UNSUPPORTEDALG);
- #endif
- 	case DST_ALG_HMACSHA1:
- 		return (check_hmac_sha(priv, HMACSHA1_NTAGS, alg));
-@@ -640,11 +648,13 @@ dst__privstruct_parse(dst_key_t *key, unsigned int alg, isc_lex_t *lex,
- 	}
- 
- #ifdef PK11_MD5_DISABLE
--	check = check_data(priv, alg == DST_ALG_RSA ? DST_ALG_RSASHA1 : alg,
--			   true, external);
-+	if (alg == DST_ALG_RSA)
-+		alg = DST_ALG_RSASHA1;
- #else
--	check = check_data(priv, alg, true, external);
-+	if (!isc_md5_available() && alg == DST_ALG_RSA)
-+		alg = DST_ALG_RSASHA1;
- #endif
-+	check = check_data(priv, alg, true, external);
- 	if (check < 0) {
- 		ret = DST_R_INVALIDPRIVATEKEY;
- 		goto fail;
-diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c
-index 3b6579b..4bdce2f 100644
---- a/lib/dns/hmac_link.c
-+++ b/lib/dns/hmac_link.c
-@@ -340,20 +340,10 @@ static dst_func_t hmacmd5_functions = {
- 
- isc_result_t
- dst__hmacmd5_init(dst_func_t **funcp) {
--#ifdef HAVE_FIPS_MODE
--	/*
--	 * Problems from OpenSSL are likely from FIPS mode
--	 */
--	int fips_mode = FIPS_mode();
--
--	if (fips_mode != 0) {
--		UNEXPECTED_ERROR(__FILE__, __LINE__,
--				 "FIPS mode is %d: MD5 is only supported "
--				 "if the value is 0.\n"
--				 "Please disable either FIPS mode or MD5.",
--				 fips_mode);
--	}
--#endif
-+
-+	/* Intentionally skip initialization */
-+	if (!isc_md5_available())
-+		return (ISC_R_SUCCESS);
- 
- #if PK11_FLAVOR != PK11_UTIMACO_FLAVOR
- 	/*
-diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
-index ec35f50..c80fabe 100644
---- a/lib/dns/opensslrsa_link.c
-+++ b/lib/dns/opensslrsa_link.c
-@@ -1812,6 +1812,12 @@ dst__opensslrsa_init(dst_func_t **funcp, unsigned char algorithm) {
- 
- 	if (*funcp == NULL) {
- 		switch (algorithm) {
-+#ifndef PK11_MD5_DISABLE
-+		case DST_ALG_RSAMD5:
-+			if (isc_md5_available())
-+				*funcp = &opensslrsa_functions;
-+			break;
-+#endif
- 		case DST_ALG_RSASHA256:
- #if defined(HAVE_EVP_SHA256) || !USE_EVP
- 			*funcp = &opensslrsa_functions;
-diff --git a/lib/dns/pkcs11rsa_link.c b/lib/dns/pkcs11rsa_link.c
-index 096c1a8..6c280bf 100644
---- a/lib/dns/pkcs11rsa_link.c
-+++ b/lib/dns/pkcs11rsa_link.c
-@@ -96,10 +96,15 @@ pkcs11rsa_createctx_sign(dst_key_t *key, dst_context_t *dctx) {
- #endif
- 
- 	/*
--	 * Reject incorrect RSA key lengths.
-+	 * Reject incorrect RSA key lengths or disabled algorithms.
- 	 */
- 	switch (dctx->key->key_alg) {
- 	case DST_ALG_RSAMD5:
-+#ifndef PK11_MD5_DISABLE
-+		if (!isc_md5_available())
-+			return (ISC_R_FAILURE);
-+#endif
-+		/* FALLTHROUGH */
- 	case DST_ALG_RSASHA1:
- 	case DST_ALG_NSEC3RSASHA1:
- 		/* From RFC 3110 */
-@@ -641,6 +646,9 @@ pkcs11rsa_createctx(dst_key_t *key, dst_context_t *dctx) {
- 	switch (key->key_alg) {
- #ifndef PK11_MD5_DISABLE
- 	case DST_ALG_RSAMD5:
-+		if (!isc_md5_available())
-+			return (ISC_R_FAILURE);
-+	
- 		mech.mechanism = CKM_MD5;
- 		break;
- #endif
-@@ -799,6 +807,9 @@ pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
- 	switch (key->key_alg) {
- #ifndef PK11_MD5_DISABLE
- 	case DST_ALG_RSAMD5:
-+		if (!isc_md5_available())
-+			return (ISC_R_FAILURE);
-+
- 		der = md5_der;
- 		derlen = sizeof(md5_der);
- 		hashlen = ISC_MD5_DIGESTLENGTH;
-@@ -1024,6 +1035,9 @@ pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
- 	switch (key->key_alg) {
- #ifndef PK11_MD5_DISABLE
- 	case DST_ALG_RSAMD5:
-+		if (!isc_md5_available())
-+			return (ISC_R_FAILURE);
-+
- 		der = md5_der;
- 		derlen = sizeof(md5_der);
- 		hashlen = ISC_MD5_DIGESTLENGTH;
-@@ -2231,11 +2245,22 @@ static dst_func_t pkcs11rsa_functions = {
- };
- 
- isc_result_t
--dst__pkcs11rsa_init(dst_func_t **funcp) {
-+dst__pkcs11rsa_init(dst_func_t **funcp, unsigned char algorithm) {
- 	REQUIRE(funcp != NULL);
- 
--	if (*funcp == NULL)
--		*funcp = &pkcs11rsa_functions;
-+	if (*funcp == NULL) {
-+		switch (algorithm) {
-+#ifndef PK11_MD5_DISABLE
-+			case DST_ALG_RSAMD5:
-+				if (isc_md5_available())
-+					*funcp = &pkcs11rsa_functions;
-+				break;
-+#endif
-+			default:
-+				*funcp = &pkcs11rsa_functions;
-+				break;
-+		}
-+	}
- 	return (ISC_R_SUCCESS);
- }
- 
-diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c
-index 9c42c50..f51d548 100644
---- a/lib/dns/rcode.c
-+++ b/lib/dns/rcode.c
-@@ -16,6 +16,7 @@
- #include <stdbool.h>
- 
- #include <isc/buffer.h>
-+#include <isc/md5.h>
- #include <isc/parseint.h>
- #include <isc/print.h>
- #include <isc/region.h>
-@@ -357,17 +358,33 @@ dns_cert_totext(dns_cert_t cert, isc_buffer_t *target) {
- 	return (dns_mnemonic_totext(cert, target, certs));
- }
- 
-+static inline struct tbl *
-+secalgs_tbl_start() {
-+	struct tbl *algs = secalgs;
-+
-+#ifndef PK11_MD5_DISABLE
-+	if (!isc_md5_available()) {
-+		while (algs->name != NULL &&
-+		       algs->value == DNS_KEYALG_RSAMD5)
-+			++algs;
-+	}
-+#endif
-+	return algs;
-+}
-+
- isc_result_t
- dns_secalg_fromtext(dns_secalg_t *secalgp, isc_textregion_t *source) {
- 	unsigned int value;
--	RETERR(dns_mnemonic_fromtext(&value, source, secalgs, 0xff));
-+
-+	RETERR(dns_mnemonic_fromtext(&value, source,
-+	                             secalgs_tbl_start(), 0xff));
- 	*secalgp = value;
- 	return (ISC_R_SUCCESS);
- }
- 
- isc_result_t
- dns_secalg_totext(dns_secalg_t secalg, isc_buffer_t *target) {
--	return (dns_mnemonic_totext(secalg, target, secalgs));
-+	return (dns_mnemonic_totext(secalg, target, secalgs_tbl_start()));
- }
- 
- void
-diff --git a/lib/dns/tests/rsa_test.c b/lib/dns/tests/rsa_test.c
-index f9ac6d0..241e17e 100644
---- a/lib/dns/tests/rsa_test.c
-+++ b/lib/dns/tests/rsa_test.c
-@@ -27,6 +27,7 @@
- #define UNIT_TESTING
- #include <cmocka.h>
- 
-+#include <isc/md5.h>
- #include <isc/util.h>
- #include <isc/print.h>
- 
-@@ -248,6 +249,8 @@ isc_rsa_verify_test(void **state) {
- 	/* RSAMD5 */
- 
- #ifndef PK11_MD5_DISABLE
-+	if (isc_md5_available()) {
-+		/* wrong indentation is kept for diff minimization */
- 	key->key_alg = DST_ALG_RSAMD5;
- 
- 	ret = dst_context_create3(key, mctx, DNS_LOGCATEGORY_DNSSEC,
-@@ -265,6 +268,7 @@ isc_rsa_verify_test(void **state) {
- 	assert_int_equal(ret, ISC_R_SUCCESS);
- 
- 	dst_context_destroy(&ctx);
-+	}
- #endif
- 
- 	/* RSASHA256 */
-diff --git a/lib/dns/tests/tsig_test.c b/lib/dns/tests/tsig_test.c
-index 11d011a..feb2068 100644
---- a/lib/dns/tests/tsig_test.c
-+++ b/lib/dns/tests/tsig_test.c
-@@ -25,6 +25,7 @@
- #define UNIT_TESTING
- #include <cmocka.h>
- 
-+#include <isc/md5.h>
- #include <isc/mem.h>
- #include <isc/print.h>
- #include <isc/util.h>
-diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
-index 89cfc79..d07364a 100644
---- a/lib/dns/tkey.c
-+++ b/lib/dns/tkey.c
-@@ -245,6 +245,9 @@ compute_secret(isc_buffer_t *shared, isc_region_t *queryrandomness,
- 	unsigned char digests[32];
- 	unsigned int i;
- 
-+	if (!isc_md5_available())
-+		return (ISC_R_NOTIMPLEMENTED);
-+
- 	isc_buffer_usedregion(shared, &r);
- 
- 	/*
-@@ -321,6 +324,12 @@ process_dhtkey(dns_message_t *msg, dns_name_t *signer, dns_name_t *name,
- 	}
- 
- #ifndef PK11_MD5_DISABLE
-+	if (!isc_md5_available()) {
-+		tkey_log("process_dhtkey: MD5 was disabled");
-+		tkeyout->error = dns_tsigerror_badalg;
-+		return (ISC_R_SUCCESS);
-+	}
-+
- 	if (!dns_name_equal(&tkeyin->algorithm, DNS_TSIG_HMACMD5_NAME)) {
- 		tkey_log("process_dhtkey: algorithms other than "
- 			 "hmac-md5 are not supported");
-diff --git a/lib/dns/tsec.c b/lib/dns/tsec.c
-index 9d8ead4..0c82f65 100644
---- a/lib/dns/tsec.c
-+++ b/lib/dns/tsec.c
-@@ -11,6 +11,7 @@
- 
- #include <config.h>
- 
-+#include <isc/md5.h>
- #include <isc/mem.h>
- #include <isc/util.h>
- 
-@@ -63,7 +64,12 @@ dns_tsec_create(isc_mem_t *mctx, dns_tsectype_t type, dst_key_t *key,
- 		switch (dst_key_alg(key)) {
- #ifndef PK11_MD5_DISABLE
- 		case DST_ALG_HMACMD5:
--			algname = dns_tsig_hmacmd5_name;
-+			if (isc_md5_available()) {
-+				algname = dns_tsig_hmacmd5_name;
-+			} else {
-+				isc_mem_put(mctx, tsec, sizeof(*tsec));
-+				return (DNS_R_BADALG);
-+			}
- 			break;
- #endif
- 		case DST_ALG_HMACSHA1:
-diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
-index 58c1104..00ee1e1 100644
---- a/lib/dns/tsig.c
-+++ b/lib/dns/tsig.c
-@@ -273,7 +273,8 @@ dns_tsigkey_createfromkey(dns_name_t *name, dns_name_t *algorithm,
- 	(void)dns_name_downcase(&tkey->name, &tkey->name, NULL);
- 
- #ifndef PK11_MD5_DISABLE
--	if (dns_name_equal(algorithm, DNS_TSIG_HMACMD5_NAME)) {
-+	if (dns_name_equal(algorithm, DNS_TSIG_HMACMD5_NAME) &&
-+	    isc_md5_available()) {
- 		tkey->algorithm = DNS_TSIG_HMACMD5_NAME;
- 		if (dstkey != NULL && dst_key_alg(dstkey) != DST_ALG_HMACMD5) {
- 			ret = DNS_R_BADALG;
-@@ -499,7 +500,8 @@ destroyring(dns_tsig_keyring_t *ring) {
- static unsigned int
- dst_alg_fromname(dns_name_t *algorithm) {
- #ifndef PK11_MD5_DISABLE
--	if (dns_name_equal(algorithm, DNS_TSIG_HMACMD5_NAME)) {
-+	if (dns_name_equal(algorithm, DNS_TSIG_HMACMD5_NAME) &&
-+	    isc_md5_available()) {
- 		return (DST_ALG_HMACMD5);
- 	} else
- #endif
-@@ -683,7 +685,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
- 		REQUIRE(secret != NULL);
- 
- #ifndef PK11_MD5_DISABLE
--	if (dns_name_equal(algorithm, DNS_TSIG_HMACMD5_NAME)) {
-+	if (dns_name_equal(algorithm, DNS_TSIG_HMACMD5_NAME) &&
-+	    isc_md5_available()) {
- 		if (secret != NULL) {
- 			isc_buffer_t b;
- 
-@@ -1291,7 +1294,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
- 		return (ret);
- 	if (
- #ifndef PK11_MD5_DISABLE
--	    alg == DST_ALG_HMACMD5 ||
-+	    (alg == DST_ALG_HMACMD5 && isc_md5_available()) ||
- #endif
- 	    alg == DST_ALG_HMACSHA1 ||
- 	    alg == DST_ALG_HMACSHA224 || alg == DST_ALG_HMACSHA256 ||
-@@ -1460,7 +1463,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
- 
- 	if (
- #ifndef PK11_MD5_DISABLE
--	    alg == DST_ALG_HMACMD5 ||
-+	    (alg == DST_ALG_HMACMD5 && isc_md5_available()) ||
- #endif
- 	    alg == DST_ALG_HMACSHA1 ||
- 	    alg == DST_ALG_HMACSHA224 || alg == DST_ALG_HMACSHA256 ||
-@@ -1601,7 +1604,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) {
- 			goto cleanup_querystruct;
- 		if (
- #ifndef PK11_MD5_DISABLE
--			alg == DST_ALG_HMACMD5 ||
-+			(alg == DST_ALG_HMACMD5 && isc_md5_available()) ||
- #endif
- 			alg == DST_ALG_HMACSHA1 ||
- 			alg == DST_ALG_HMACSHA224 ||
-@@ -1780,7 +1783,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) {
- 			goto cleanup_context;
- 		if (
- #ifndef PK11_MD5_DISABLE
--			alg == DST_ALG_HMACMD5 ||
-+			(alg == DST_ALG_HMACMD5 && isc_md5_available()) ||
- #endif
- 			alg == DST_ALG_HMACSHA1 ||
- 			alg == DST_ALG_HMACSHA224 ||
-diff --git a/lib/isc/include/isc/md5.h b/lib/isc/include/isc/md5.h
-index 4d29398..e3f5cec 100644
---- a/lib/isc/include/isc/md5.h
-+++ b/lib/isc/include/isc/md5.h
-@@ -91,6 +91,9 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest);
- bool
- isc_md5_check(bool testing);
- 
-+bool
-+isc_md5_available(void);
-+
- ISC_LANG_ENDDECLS
- 
- #endif /* !PK11_MD5_DISABLE */
-diff --git a/lib/isc/md5.c b/lib/isc/md5.c
-index 249f3da..628a414 100644
---- a/lib/isc/md5.c
-+++ b/lib/isc/md5.c
-@@ -37,6 +37,7 @@
- 
- #include <isc/assertions.h>
- #include <isc/md5.h>
-+#include <isc/once.h>
- #include <isc/platform.h>
- #include <isc/safe.h>
- #include <isc/string.h>
-@@ -54,6 +55,9 @@
- #define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr)
- #endif
- 
-+static isc_once_t available_once = ISC_ONCE_INIT;
-+static bool available = false;
-+
- void
- isc_md5_init(isc_md5_t *ctx) {
- 	ctx->ctx = EVP_MD_CTX_new();
-@@ -85,8 +89,33 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest) {
- 	ctx->ctx = NULL;
- }
- 
-+static void
-+do_detect_available() {
-+	isc_md5_t local;
-+	isc_md5_t *ctx = &local;
-+	unsigned char digest[ISC_MD5_DIGESTLENGTH];
-+
-+	ctx->ctx = EVP_MD_CTX_new();
-+	RUNTIME_CHECK(ctx->ctx != NULL);
-+	available = (EVP_DigestInit(ctx->ctx, EVP_md5()) == 1);
-+	if (available)
-+		(void)EVP_DigestFinal(ctx->ctx, digest, NULL);
-+	EVP_MD_CTX_free(ctx->ctx);
-+	ctx->ctx = NULL;
-+}
-+
-+bool
-+isc_md5_available() {
-+	RUNTIME_CHECK(isc_once_do(&available_once, do_detect_available)
-+		      == ISC_R_SUCCESS);
-+	return available;
-+}
-+
- #elif PKCS11CRYPTO
- 
-+static isc_once_t available_once = ISC_ONCE_INIT;
-+static bool available = false;
-+
- void
- isc_md5_init(isc_md5_t *ctx) {
- 	CK_RV rv;
-@@ -129,6 +158,31 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest) {
- 	pk11_return_session(ctx);
- }
- 
-+static void
-+do_detect_available() {
-+	isc_md5_t local;
-+	isc_md5_t *ctx = &local;
-+	CK_RV rv;
-+	CK_MECHANISM mech = { CKM_MD5, NULL, 0 };
-+
-+	if (pk11_get_session(ctx, OP_DIGEST, true, false,
-+				       false, NULL, 0) == ISC_R_SUCCESS)
-+	{
-+		rv = pkcs_C_DigestInit(ctx->session, &mech);
-+		isc_md5_invalidate(ctx);
-+		available = (rv == CKR_OK);
-+	} else {
-+		available = false;
-+	}
-+}
-+
-+bool
-+isc_md5_available() {
-+	RUNTIME_CHECK(isc_once_do(&available_once, do_detect_available)
-+		      == ISC_R_SUCCESS);
-+	return available;
-+}
-+
- #else
- 
- static void
-@@ -338,6 +392,11 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest) {
- 	memmove(digest, ctx->buf, 16);
- 	isc_safe_memwipe(ctx, sizeof(*ctx));	/* In case it's sensitive */
- }
-+
-+bool
-+isc_md5_available() {
-+	return true;
-+}
- #endif
- 
- /*
-diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c
-index 0d5b009..7809e7b 100644
---- a/lib/isc/pk11.c
-+++ b/lib/isc/pk11.c
-@@ -197,8 +197,6 @@ pk11_initialize(isc_mem_t *mctx, const char *engine) {
- 	UNLOCK(&alloclock);
- 	if (initialized) {
- 		goto unlock;
--	} else {
--		initialized = true;
- 	}
- 
- 	ISC_LIST_INIT(tokens);
-@@ -238,6 +236,7 @@ pk11_initialize(isc_mem_t *mctx, const char *engine) {
- 	}
- #endif
- #endif /* PKCS11CRYPTO */
-+	initialized = true;
-  unlock:
- 	UNLOCK(&sessionlock);
- 	return (result);
-@@ -589,6 +588,8 @@ scan_slots(void) {
- 	pk11_token_t *token;
- 	unsigned int i;
- 	bool bad;
-+	unsigned int best_rsa_algorithms = 0;
-+	unsigned int best_digest_algorithms = 0;
- 
- 	slotCount = 0;
- 	PK11_FATALCHECK(pkcs_C_GetSlotList, (CK_FALSE, NULL_PTR, &slotCount));
-@@ -601,6 +602,8 @@ scan_slots(void) {
- 	PK11_FATALCHECK(pkcs_C_GetSlotList, (CK_FALSE, slotList, &slotCount));
- 
- 	for (i = 0; i < slotCount; i++) {
-+		unsigned int rsa_algorithms = 0;
-+		unsigned int digest_algorithms = 0;
- 		slot = slotList[i];
- 		PK11_TRACE2("slot#%u=0x%lx\n", i, slot);
- 
-@@ -640,11 +643,12 @@ scan_slots(void) {
- 		if ((rv != CKR_OK) ||
- 		    ((mechInfo.flags & CKF_SIGN) == 0) ||
- 		    ((mechInfo.flags & CKF_VERIFY) == 0)) {
--#if !defined(PK11_MD5_DISABLE) && !defined(PK11_RSA_PKCS_REPLACE)
--			bad = true;
--#endif
- 			PK11_TRACEM(CKM_MD5_RSA_PKCS);
- 		}
-+#if !defined(PK11_MD5_DISABLE) && !defined(PK11_RSA_PKCS_REPLACE)
-+		else
-+			++rsa_algorithms;
-+#endif
- 		rv = pkcs_C_GetMechanismInfo(slot, CKM_SHA1_RSA_PKCS,
- 					     &mechInfo);
- 		if ((rv != CKR_OK) ||
-@@ -687,8 +691,14 @@ scan_slots(void) {
- 		if (bad)
- 			goto try_dsa;
- 		token->operations |= 1 << OP_RSA;
--		if (best_rsa_token == NULL)
-+		if (best_rsa_token == NULL) {
- 			best_rsa_token = token;
-+			best_rsa_algorithms = rsa_algorithms;
-+		} else if (rsa_algorithms > best_rsa_algorithms) {
-+			pk11_mem_put(best_rsa_token, sizeof(*best_rsa_token));
-+			best_rsa_token = token;
-+			best_rsa_algorithms = rsa_algorithms;
-+		}
- 
- 	try_dsa:
- 		bad = false;
-@@ -756,11 +766,12 @@ scan_slots(void) {
- 		bad = false;
- 		rv = pkcs_C_GetMechanismInfo(slot, CKM_MD5, &mechInfo);
- 		if ((rv != CKR_OK) || ((mechInfo.flags & CKF_DIGEST) == 0)) {
--#ifndef PK11_MD5_DISABLE
--			bad = true;
--#endif
- 			PK11_TRACEM(CKM_MD5);
- 		}
-+#ifndef PK11_MD5_DISABLE
-+		else
-+			++digest_algorithms;
-+#endif
- 		rv = pkcs_C_GetMechanismInfo(slot, CKM_SHA_1, &mechInfo);
- 		if ((rv != CKR_OK) || ((mechInfo.flags & CKF_DIGEST) == 0)) {
- 			bad = true;
-@@ -788,11 +799,12 @@ scan_slots(void) {
- 		}
- 		rv = pkcs_C_GetMechanismInfo(slot, CKM_MD5_HMAC, &mechInfo);
- 		if ((rv != CKR_OK) || ((mechInfo.flags & CKF_SIGN) == 0)) {
--#if !defined(PK11_MD5_DISABLE) && !defined(PK11_MD5_HMAC_REPLACE)
--			bad = true;
--#endif
- 			PK11_TRACEM(CKM_MD5_HMAC);
- 		}
-+#if !defined(PK11_MD5_DISABLE) && !defined(PK11_MD5_HMAC_REPLACE)
-+		else
-+			++digest_algorithms;
-+#endif
- 		rv = pkcs_C_GetMechanismInfo(slot, CKM_SHA_1_HMAC, &mechInfo);
- 		if ((rv != CKR_OK) || ((mechInfo.flags & CKF_SIGN) == 0)) {
- #ifndef PK11_SHA_1_HMAC_REPLACE
-@@ -830,8 +842,14 @@ scan_slots(void) {
- 		}
- 		if (!bad) {
- 			token->operations |= 1 << OP_DIGEST;
--			if (digest_token == NULL)
-+			if (digest_token == NULL) {
- 				digest_token = token;
-+				best_digest_algorithms = digest_algorithms;
-+			} else if (digest_algorithms > best_digest_algorithms) {
-+				pk11_mem_put(digest_token, sizeof(*digest_token));
-+				digest_token = token;
-+				best_digest_algorithms = digest_algorithms;
-+			}
- 		}
- 
- 		/* ECDSA requires digest */
-diff --git a/lib/isc/tests/hash_test.c b/lib/isc/tests/hash_test.c
-index 31ced94..421131e 100644
---- a/lib/isc/tests/hash_test.c
-+++ b/lib/isc/tests/hash_test.c
-@@ -775,6 +775,9 @@ isc_md5_test(void **state) {
- 
- 	UNUSED(state);
- 
-+	if (!isc_md5_available())
-+		return;
-+
- 	/*
- 	 * These are the various test vectors.  All of these are passed
- 	 * through the hash function and the results are compared to the
-@@ -1630,6 +1633,9 @@ isc_hmacmd5_test(void **state) {
- 
- 	UNUSED(state);
- 
-+	if (!isc_md5_available())
-+		return;
-+
- 	/*
- 	 * These are the various test vectors.  All of these are passed
- 	 * through the hash function and the results are compared to the
-@@ -1940,6 +1946,9 @@ static void
- md5_check_test(void **state) {
- 	UNUSED(state);
- 
-+	if (!isc_md5_available())
-+		return;
-+
- 	assert_true(isc_md5_check(false));
- 	assert_false(isc_md5_check(true));
- 
-diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c
-index c2740cb..c314d76 100644
---- a/lib/isccc/cc.c
-+++ b/lib/isccc/cc.c
-@@ -272,11 +272,15 @@ sign(unsigned char *data, unsigned int length, unsigned char *hmac,
- 	switch (algorithm) {
- #ifndef PK11_MD5_DISABLE
- 	case ISCCC_ALG_HMACMD5:
--		isc_hmacmd5_init(&ctx.hmd5, secret->rstart,
--				 REGION_SIZE(*secret));
--		isc_hmacmd5_update(&ctx.hmd5, data, length);
--		isc_hmacmd5_sign(&ctx.hmd5, digest);
--		source.rend = digest + ISC_MD5_DIGESTLENGTH;
-+		if (isc_md5_available()) {
-+			isc_hmacmd5_init(&ctx.hmd5, secret->rstart,
-+					 REGION_SIZE(*secret));
-+			isc_hmacmd5_update(&ctx.hmd5, data, length);
-+			isc_hmacmd5_sign(&ctx.hmd5, digest);
-+			source.rend = digest + ISC_MD5_DIGESTLENGTH;
-+		} else {
-+			return (ISC_R_FAILURE);
-+		}
- 		break;
- #endif
- 
-@@ -350,14 +354,18 @@ isccc_cc_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer,
- {
- 	unsigned int hmac_base, signed_base;
- 	isc_result_t result;
-+	const bool md5 = (algorithm == ISCCC_ALG_HMACMD5);
- 
- #ifndef PK11_MD5_DISABLE
-+	if (md5 && !isc_md5_available())
-+		return (ISC_R_NOTIMPLEMENTED);
-+
- 	result = isc_buffer_reserve(buffer,
--				    4 + ((algorithm == ISCCC_ALG_HMACMD5) ?
-+				    4 + ((md5) ?
- 					 sizeof(auth_hmd5) :
- 					 sizeof(auth_hsha)));
- #else
--	if (algorithm == ISCCC_ALG_HMACMD5)
-+	if (md5)
- 		return (ISC_R_NOTIMPLEMENTED);
- 	result = isc_buffer_reserve(buffer, 4 + sizeof(auth_hsha));
- #endif
-@@ -376,7 +384,7 @@ isccc_cc_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer,
- 		 * we know what it is.
- 		 */
- #ifndef PK11_MD5_DISABLE
--		if (algorithm == ISCCC_ALG_HMACMD5) {
-+		if (md5) {
- 			hmac_base = (*buffer)->used + HMD5_OFFSET;
- 			isc_buffer_putmem(*buffer,
- 					  auth_hmd5, sizeof(auth_hmd5));
-@@ -442,7 +450,7 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length,
- 	if (!isccc_alist_alistp(_auth))
- 		return (ISC_R_FAILURE);
- #ifndef PK11_MD5_DISABLE
--	if (algorithm == ISCCC_ALG_HMACMD5)
-+	if (algorithm == ISCCC_ALG_HMACMD5 && isc_md5_available())
- 		hmac = isccc_alist_lookup(_auth, "hmd5");
- 	else
- #endif
-@@ -457,12 +465,16 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length,
- 	switch (algorithm) {
- #ifndef PK11_MD5_DISABLE
- 	case ISCCC_ALG_HMACMD5:
--		isc_hmacmd5_init(&ctx.hmd5, secret->rstart,
--				 REGION_SIZE(*secret));
--		isc_hmacmd5_update(&ctx.hmd5, data, length);
--		isc_hmacmd5_sign(&ctx.hmd5, digest);
--		source.rend = digest + ISC_MD5_DIGESTLENGTH;
--		break;
-+		if (isc_md5_available()) {
-+			isc_hmacmd5_init(&ctx.hmd5, secret->rstart,
-+					 REGION_SIZE(*secret));
-+			isc_hmacmd5_update(&ctx.hmd5, data, length);
-+			isc_hmacmd5_sign(&ctx.hmd5, digest);
-+			source.rend = digest + ISC_MD5_DIGESTLENGTH;
-+			break;
-+		} else {
-+			return (ISC_R_FAILURE);
-+		}
- #endif
- 
- 	case ISCCC_ALG_HMACSHA1:
--- 
-2.20.1
-
diff --git a/bind-9.11-fips-disable.patch b/bind-9.11-fips-disable.patch
deleted file mode 100644
index afe95649fac7a30ff9b47ca919e1be65fbfb8ecb..0000000000000000000000000000000000000000
--- a/bind-9.11-fips-disable.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 83b889c238282b210f874a3ad81bb56299767495 Mon Sep 17 00:00:00 2001
-From: Petr Mensik <pemensik@redhat.com>
-Date: Mon, 5 Aug 2019 11:54:03 +0200
-Subject: [PATCH] Allow explicit disabling of autodisabled MD5
-
-Default security policy might include explicitly disabled RSAMD5
-algorithm. Current FIPS code automatically disables in FIPS mode. But if
-RSAMD5 is included in security policy, it fails to start, because that
-algorithm is not recognized. Allow it disabled, but fail on any
-other usage.
----
- bin/named/server.c |  4 ++--
- lib/bind9/check.c  |  4 ++++
- lib/dns/rcode.c    | 33 +++++++++++++++------------------
- 3 files changed, 21 insertions(+), 20 deletions(-)
-
-diff --git a/bin/named/server.c b/bin/named/server.c
-index 5b57371..51702ab 100644
---- a/bin/named/server.c
-+++ b/bin/named/server.c
-@@ -1547,12 +1547,12 @@ disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
- 		r.length = strlen(r.base);
- 
- 		result = dns_secalg_fromtext(&alg, &r);
--		if (result != ISC_R_SUCCESS) {
-+		if (result != ISC_R_SUCCESS && result != ISC_R_DISABLED) {
- 			uint8_t ui;
- 			result = isc_parse_uint8(&ui, r.base, 10);
- 			alg = ui;
- 		}
--		if (result != ISC_R_SUCCESS) {
-+		if (result != ISC_R_SUCCESS && result != ISC_R_DISABLED) {
- 			cfg_obj_log(cfg_listelt_value(element),
- 				    ns_g_lctx, ISC_LOG_ERROR,
- 				    "invalid algorithm");
-diff --git a/lib/bind9/check.c b/lib/bind9/check.c
-index e0803d4..8023784 100644
---- a/lib/bind9/check.c
-+++ b/lib/bind9/check.c
-@@ -302,6 +302,10 @@ disabled_algorithms(const cfg_obj_t *disabled, isc_log_t *logctx) {
- 		r.length = strlen(r.base);
- 
- 		tresult = dns_secalg_fromtext(&alg, &r);
-+		if (tresult == ISC_R_DISABLED) {
-+			// Recognize disabled algorithms, disable it explicitly
-+			tresult = ISC_R_SUCCESS;
-+		}
- 		if (tresult != ISC_R_SUCCESS) {
- 			cfg_obj_log(cfg_listelt_value(element), logctx,
- 				    ISC_LOG_ERROR, "invalid algorithm '%s'",
-diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c
-index f51d548..c49b8d1 100644
---- a/lib/dns/rcode.c
-+++ b/lib/dns/rcode.c
-@@ -126,7 +126,6 @@
- #endif
- 
- #define SECALGNAMES \
--	MD5_SECALGNAMES \
- 	DH_SECALGNAMES \
- 	DSA_SECALGNAMES \
- 	{ DNS_KEYALG_ECC, "ECC", 0 }, \
-@@ -178,6 +177,7 @@ static struct tbl rcodes[] = { RCODENAMES ERCODENAMES };
- static struct tbl tsigrcodes[] = { RCODENAMES TSIGRCODENAMES };
- static struct tbl certs[] = { CERTNAMES };
- static struct tbl secalgs[] = { SECALGNAMES };
-+static struct tbl md5_secalgs[] = { MD5_SECALGNAMES };
- static struct tbl secprotos[] = { SECPROTONAMES };
- static struct tbl hashalgs[] = { HASHALGNAMES };
- static struct tbl dsdigests[] = { DSDIGESTNAMES };
-@@ -358,33 +358,30 @@ dns_cert_totext(dns_cert_t cert, isc_buffer_t *target) {
- 	return (dns_mnemonic_totext(cert, target, certs));
- }
- 
--static inline struct tbl *
--secalgs_tbl_start() {
--	struct tbl *algs = secalgs;
--
--#ifndef PK11_MD5_DISABLE
--	if (!isc_md5_available()) {
--		while (algs->name != NULL &&
--		       algs->value == DNS_KEYALG_RSAMD5)
--			++algs;
--	}
--#endif
--	return algs;
--}
--
- isc_result_t
- dns_secalg_fromtext(dns_secalg_t *secalgp, isc_textregion_t *source) {
- 	unsigned int value;
-+	isc_result_t result;
- 
--	RETERR(dns_mnemonic_fromtext(&value, source,
--	                             secalgs_tbl_start(), 0xff));
-+	result = dns_mnemonic_fromtext(&value, source,
-+	                               secalgs, 0xff);
-+	if (result != ISC_R_SUCCESS) {
-+		result = dns_mnemonic_fromtext(&value, source,
-+	                                       md5_secalgs, 0xff);
-+		if (result != ISC_R_SUCCESS) {
-+			return (result);
-+		} else if (!isc_md5_available()) {
-+			*secalgp = value;
-+			return (ISC_R_DISABLED);
-+		}
-+	}
- 	*secalgp = value;
- 	return (ISC_R_SUCCESS);
- }
- 
- isc_result_t
- dns_secalg_totext(dns_secalg_t secalg, isc_buffer_t *target) {
--	return (dns_mnemonic_totext(secalg, target, secalgs_tbl_start()));
-+	return (dns_mnemonic_totext(secalg, target, secalgs));
- }
- 
- void
--- 
-2.20.1
-
diff --git a/bind-9.11-fips-tests.patch b/bind-9.11-fips-tests.patch
index 29dda07dfa04bd5c7b968ba760d8dcbc8be62fa6..51927a4e9e02a5599448b790512814b2acef32a0 100644
--- a/bind-9.11-fips-tests.patch
+++ b/bind-9.11-fips-tests.patch
@@ -1,4 +1,4 @@
-From c23daf334d5487fa53fef88c82312e439a2d8523 Mon Sep 17 00:00:00 2001
+From 3f04cf343dbeb8819197702ce1be737e26e0638a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
 Date: Thu, 2 Aug 2018 23:46:45 +0200
 Subject: [PATCH] FIPS tests changes
@@ -76,38 +76,26 @@ Date:   Wed Mar 7 10:44:23 2018 +0100
  bin/tests/system/catz/ns2/named.conf.in       |  2 +-
  bin/tests/system/checkconf/bad-tsig.conf      |  2 +-
  bin/tests/system/checkconf/good.conf          |  2 +-
- bin/tests/system/digdelv/ns2/example.db       | 15 +++--
- bin/tests/system/digdelv/tests.sh             | 20 +++---
- bin/tests/system/dlv/ns1/sign.sh              |  4 +-
- bin/tests/system/dlv/ns2/sign.sh              |  4 +-
- bin/tests/system/dlv/ns6/sign.sh              | 66 +++++++++---------
- bin/tests/system/dnssec/ns2/sign.sh           |  8 +--
- bin/tests/system/dnssec/ns5/trusted.conf.bad  |  2 +-
- bin/tests/system/dnssec/tests.sh              |  4 +-
  bin/tests/system/feature-test.c               | 14 ++++
- bin/tests/system/filter-aaaa/ns1/sign.sh      |  4 +-
- bin/tests/system/filter-aaaa/ns4/sign.sh      |  4 +-
  bin/tests/system/notify/ns5/named.conf.in     |  6 +-
  bin/tests/system/notify/tests.sh              |  6 +-
  bin/tests/system/nsupdate/ns1/named.conf.in   |  2 +-
  bin/tests/system/nsupdate/ns2/named.conf.in   |  2 +-
- bin/tests/system/nsupdate/setup.sh            |  7 +-
- bin/tests/system/nsupdate/tests.sh            | 11 ++-
+ bin/tests/system/nsupdate/setup.sh            |  6 +-
+ bin/tests/system/nsupdate/tests.sh            | 15 +++--
  bin/tests/system/rndc/setup.sh                |  2 +-
  bin/tests/system/rndc/tests.sh                | 23 ++++---
- bin/tests/system/tsig/clean.sh                |  1 +
  bin/tests/system/tsig/ns1/named.conf.in       | 10 +--
+ bin/tests/system/tsig/ns1/rndc5.conf.in       | 10 +++
  bin/tests/system/tsig/setup.sh                |  5 ++
- bin/tests/system/tsig/tests.sh                | 67 ++++++++++++-------
- bin/tests/system/tsiggss/setup.sh             |  2 +-
+ bin/tests/system/tsig/tests.sh                | 65 ++++++++++++-------
  bin/tests/system/upforwd/ns1/named.conf.in    |  2 +-
  bin/tests/system/upforwd/tests.sh             |  2 +-
- bin/tests/system/tsig/ns1/rndc5.conf.in | 10 +++
- 45 files changed, 232 insertions(+), 171 deletions(-)
+ 33 files changed, 162 insertions(+), 108 deletions(-)
  create mode 100644 bin/tests/system/tsig/ns1/rndc5.conf.in
 
 diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named1.conf.in
-index 0ea6502..026db3f 100644
+index 60f22e1..249f672 100644
 --- a/bin/tests/system/acl/ns2/named1.conf.in
 +++ b/bin/tests/system/acl/ns2/named1.conf.in
 @@ -33,12 +33,12 @@ options {
@@ -126,7 +114,7 @@ index 0ea6502..026db3f 100644
  };
  
 diff --git a/bin/tests/system/acl/ns2/named2.conf.in b/bin/tests/system/acl/ns2/named2.conf.in
-index b877880..d8f50be 100644
+index ada97bc..f82d858 100644
 --- a/bin/tests/system/acl/ns2/named2.conf.in
 +++ b/bin/tests/system/acl/ns2/named2.conf.in
 @@ -33,12 +33,12 @@ options {
@@ -145,7 +133,7 @@ index b877880..d8f50be 100644
  };
  
 diff --git a/bin/tests/system/acl/ns2/named3.conf.in b/bin/tests/system/acl/ns2/named3.conf.in
-index 0a95062..aa54088 100644
+index 97684e4..de6a2e9 100644
 --- a/bin/tests/system/acl/ns2/named3.conf.in
 +++ b/bin/tests/system/acl/ns2/named3.conf.in
 @@ -33,17 +33,17 @@ options {
@@ -170,7 +158,7 @@ index 0a95062..aa54088 100644
  };
  
 diff --git a/bin/tests/system/acl/ns2/named4.conf.in b/bin/tests/system/acl/ns2/named4.conf.in
-index 7cdcb6e..606a345 100644
+index 462b3fa..994b35c 100644
 --- a/bin/tests/system/acl/ns2/named4.conf.in
 +++ b/bin/tests/system/acl/ns2/named4.conf.in
 @@ -33,12 +33,12 @@ options {
@@ -189,10 +177,10 @@ index 7cdcb6e..606a345 100644
  };
  
 diff --git a/bin/tests/system/acl/ns2/named5.conf.in b/bin/tests/system/acl/ns2/named5.conf.in
-index 4b4e050..0e679a8 100644
+index 728da58..8f00d09 100644
 --- a/bin/tests/system/acl/ns2/named5.conf.in
 +++ b/bin/tests/system/acl/ns2/named5.conf.in
-@@ -34,12 +34,12 @@ options {
+@@ -35,12 +35,12 @@ options {
  };
  
  key one {
@@ -208,7 +196,7 @@ index 4b4e050..0e679a8 100644
  };
  
 diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh
-index 09f31f2..f88f0d4 100644
+index be59d64..13d5bdc 100644
 --- a/bin/tests/system/acl/tests.sh
 +++ b/bin/tests/system/acl/tests.sh
 @@ -22,14 +22,14 @@ echo_i "testing basic ACL processing"
@@ -334,11 +322,11 @@ index 09f31f2..f88f0d4 100644
  
  echo_i "testing allow-query-on ACL processing"
 diff --git a/bin/tests/system/allow-query/ns2/named10.conf.in b/bin/tests/system/allow-query/ns2/named10.conf.in
-index 1569913..e9c5c2d 100644
+index 7d43e36..f7b25f9 100644
 --- a/bin/tests/system/allow-query/ns2/named10.conf.in
 +++ b/bin/tests/system/allow-query/ns2/named10.conf.in
-@@ -12,7 +12,7 @@
- controls { /* empty */ };
+@@ -10,7 +10,7 @@
+  */
  
  key one {
 -	algorithm hmac-md5;
@@ -347,11 +335,11 @@ index 1569913..e9c5c2d 100644
  };
  
 diff --git a/bin/tests/system/allow-query/ns2/named11.conf.in b/bin/tests/system/allow-query/ns2/named11.conf.in
-index 18ac91c..2b1c873 100644
+index 2952518..121557e 100644
 --- a/bin/tests/system/allow-query/ns2/named11.conf.in
 +++ b/bin/tests/system/allow-query/ns2/named11.conf.in
-@@ -12,12 +12,12 @@
- controls { /* empty */ };
+@@ -10,12 +10,12 @@
+  */
  
  key one {
 -	algorithm hmac-md5;
@@ -366,11 +354,11 @@ index 18ac91c..2b1c873 100644
  };
  
 diff --git a/bin/tests/system/allow-query/ns2/named12.conf.in b/bin/tests/system/allow-query/ns2/named12.conf.in
-index b824844..dd48945 100644
+index 0c01071..ceabbb5 100644
 --- a/bin/tests/system/allow-query/ns2/named12.conf.in
 +++ b/bin/tests/system/allow-query/ns2/named12.conf.in
-@@ -12,7 +12,7 @@
- controls { /* empty */ };
+@@ -10,7 +10,7 @@
+  */
  
  key one {
 -	algorithm hmac-md5;
@@ -379,11 +367,11 @@ index b824844..dd48945 100644
  };
  
 diff --git a/bin/tests/system/allow-query/ns2/named30.conf.in b/bin/tests/system/allow-query/ns2/named30.conf.in
-index aeb1540..bfce58b 100644
+index 4c17292..9cd9d1f 100644
 --- a/bin/tests/system/allow-query/ns2/named30.conf.in
 +++ b/bin/tests/system/allow-query/ns2/named30.conf.in
-@@ -12,7 +12,7 @@
- controls { /* empty */ };
+@@ -10,7 +10,7 @@
+  */
  
  key one {
 -	algorithm hmac-md5;
@@ -392,11 +380,11 @@ index aeb1540..bfce58b 100644
  };
  
 diff --git a/bin/tests/system/allow-query/ns2/named31.conf.in b/bin/tests/system/allow-query/ns2/named31.conf.in
-index d4b7432..e0f5252 100644
+index a2690a4..f488730 100644
 --- a/bin/tests/system/allow-query/ns2/named31.conf.in
 +++ b/bin/tests/system/allow-query/ns2/named31.conf.in
-@@ -12,12 +12,12 @@
- controls { /* empty */ };
+@@ -10,12 +10,12 @@
+  */
  
  key one {
 -	algorithm hmac-md5;
@@ -411,11 +399,11 @@ index d4b7432..e0f5252 100644
  };
  
 diff --git a/bin/tests/system/allow-query/ns2/named32.conf.in b/bin/tests/system/allow-query/ns2/named32.conf.in
-index c025938..87afb3f 100644
+index a0708c8..51fa457 100644
 --- a/bin/tests/system/allow-query/ns2/named32.conf.in
 +++ b/bin/tests/system/allow-query/ns2/named32.conf.in
-@@ -12,7 +12,7 @@
- controls { /* empty */ };
+@@ -10,7 +10,7 @@
+  */
  
  key one {
 -	algorithm hmac-md5;
@@ -424,10 +412,10 @@ index c025938..87afb3f 100644
  };
  
 diff --git a/bin/tests/system/allow-query/ns2/named40.conf.in b/bin/tests/system/allow-query/ns2/named40.conf.in
-index d83b376..d726b94 100644
+index 687768e..d24d6d2 100644
 --- a/bin/tests/system/allow-query/ns2/named40.conf.in
 +++ b/bin/tests/system/allow-query/ns2/named40.conf.in
-@@ -16,12 +16,12 @@ acl accept { 10.53.0.2; };
+@@ -14,12 +14,12 @@ acl accept { 10.53.0.2; };
  acl badaccept { 10.53.0.1; };
  
  key one {
@@ -443,10 +431,10 @@ index d83b376..d726b94 100644
  };
  
 diff --git a/bin/tests/system/allow-query/tests.sh b/bin/tests/system/allow-query/tests.sh
-index fb6059d..f960156 100644
+index fe40635..543c663 100644
 --- a/bin/tests/system/allow-query/tests.sh
 +++ b/bin/tests/system/allow-query/tests.sh
-@@ -190,7 +190,7 @@ rndc_reload
+@@ -182,7 +182,7 @@ rndc_reload ns2 10.53.0.2
  
  echo_i "test $n: key allowed - query allowed"
  ret=0
@@ -455,7 +443,7 @@ index fb6059d..f960156 100644
  grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1
  grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1
  if [ $ret != 0 ]; then echo_i "failed"; fi
-@@ -203,7 +203,7 @@ rndc_reload
+@@ -195,7 +195,7 @@ rndc_reload ns2 10.53.0.2
  
  echo_i "test $n: key not allowed - query refused"
  ret=0
@@ -464,7 +452,7 @@ index fb6059d..f960156 100644
  grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1
  grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1
  if [ $ret != 0 ]; then echo_i "failed"; fi
-@@ -216,7 +216,7 @@ rndc_reload
+@@ -208,7 +208,7 @@ rndc_reload ns2 10.53.0.2
  
  echo_i "test $n: key disallowed - query refused"
  ret=0
@@ -473,7 +461,7 @@ index fb6059d..f960156 100644
  grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1
  grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1
  if [ $ret != 0 ]; then echo_i "failed"; fi
-@@ -349,7 +349,7 @@ rndc_reload
+@@ -341,7 +341,7 @@ rndc_reload ns2 10.53.0.2
  
  echo_i "test $n: views key allowed - query allowed"
  ret=0
@@ -482,7 +470,7 @@ index fb6059d..f960156 100644
  grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1
  grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1
  if [ $ret != 0 ]; then echo_i "failed"; fi
-@@ -362,7 +362,7 @@ rndc_reload
+@@ -354,7 +354,7 @@ rndc_reload ns2 10.53.0.2
  
  echo_i "test $n: views key not allowed - query refused"
  ret=0
@@ -491,7 +479,7 @@ index fb6059d..f960156 100644
  grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1
  grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1
  if [ $ret != 0 ]; then echo_i "failed"; fi
-@@ -375,7 +375,7 @@ rndc_reload
+@@ -367,7 +367,7 @@ rndc_reload ns2 10.53.0.2
  
  echo_i "test $n: views key disallowed - query refused"
  ret=0
@@ -500,7 +488,7 @@ index fb6059d..f960156 100644
  grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1
  grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1
  if [ $ret != 0 ]; then echo_i "failed"; fi
-@@ -508,7 +508,7 @@ status=`expr $status + $ret`
+@@ -500,7 +500,7 @@ status=`expr $status + $ret`
  n=`expr $n + 1`
  echo_i "test $n: zone key allowed - query allowed"
  ret=0
@@ -509,7 +497,7 @@ index fb6059d..f960156 100644
  grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1
  grep '^a.keyallow.example' dig.out.ns2.$n > /dev/null || ret=1
  if [ $ret != 0 ]; then echo_i "failed"; fi
-@@ -518,7 +518,7 @@ status=`expr $status + $ret`
+@@ -510,7 +510,7 @@ status=`expr $status + $ret`
  n=`expr $n + 1`
  echo_i "test $n: zone key not allowed - query refused"
  ret=0
@@ -518,7 +506,7 @@ index fb6059d..f960156 100644
  grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1
  grep '^a.keyallow.example' dig.out.ns2.$n > /dev/null && ret=1
  if [ $ret != 0 ]; then echo_i "failed"; fi
-@@ -528,7 +528,7 @@ status=`expr $status + $ret`
+@@ -520,7 +520,7 @@ status=`expr $status + $ret`
  n=`expr $n + 1`
  echo_i "test $n: zone key disallowed - query refused"
  ret=0
@@ -528,7 +516,7 @@ index fb6059d..f960156 100644
  grep '^a.keydisallow.example' dig.out.ns2.$n > /dev/null && ret=1
  if [ $ret != 0 ]; then echo_i "failed"; fi
 diff --git a/bin/tests/system/catz/ns1/named.conf.in b/bin/tests/system/catz/ns1/named.conf.in
-index 74b7d37..c353766 100644
+index 1218669..e62715e 100644
 --- a/bin/tests/system/catz/ns1/named.conf.in
 +++ b/bin/tests/system/catz/ns1/named.conf.in
 @@ -61,5 +61,5 @@ zone "catalog4.example" {
@@ -539,7 +527,7 @@ index 74b7d37..c353766 100644
 +	algorithm hmac-sha256;
  };
 diff --git a/bin/tests/system/catz/ns2/named.conf.in b/bin/tests/system/catz/ns2/named.conf.in
-index ee83efb..35ced08 100644
+index 30333e6..4005152 100644
 --- a/bin/tests/system/catz/ns2/named.conf.in
 +++ b/bin/tests/system/catz/ns2/named.conf.in
 @@ -70,5 +70,5 @@ zone "catalog4.example" {
@@ -563,10 +551,10 @@ index 21be03e..e57c308 100644
  };
  
 diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf
-index 9ab35b3..486551a 100644
+index e09b9e8..2e824b3 100644
 --- a/bin/tests/system/checkconf/good.conf
 +++ b/bin/tests/system/checkconf/good.conf
-@@ -153,6 +153,6 @@ dyndb "name" "library.so" {
+@@ -210,6 +210,6 @@ dyndb "name" "library.so" {
  	system;
  };
  key "mykey" {
@@ -574,473 +562,40 @@ index 9ab35b3..486551a 100644
 +	algorithm "hmac-sha256";
  	secret "qwertyuiopasdfgh";
  };
-diff --git a/bin/tests/system/digdelv/ns2/example.db b/bin/tests/system/digdelv/ns2/example.db
-index f4e30f5..9f53e31 100644
---- a/bin/tests/system/digdelv/ns2/example.db
-+++ b/bin/tests/system/digdelv/ns2/example.db
-@@ -38,12 +38,15 @@ foo			SSHFP	2 1 123456789abcdef67890123456789abcdef67890
- ;;
- ;; we are not testing DNSSEC behavior, so we don't care about the semantics
- ;; of the following records.
--dnskey                  300     DNSKEY  256 3 1 (
--                                        AQPTpWyReB/e9Ii6mVGnakS8hX2zkh/iUYAg
--                                        +Ge4noWROpTWOIBvm76zeJPWs4Zfqa1IsswD
--                                        Ix5Mqeg0zwclz59uecKsKyx5w9IhtZ8plc4R
--                                        b9VIE5x7KNHAYTvTO5d4S8M=
--                                        )
-+dnskey                  300     DNSKEY 256 3 8 (
-+                    AwEAAaWmCoDpj2K59zcpqnmnQM7IC/XbjS6jIP7uTBR4X7p1bdQJzAeo
-+                    EnMhnpnxPp0j+20eZm4847DB2U+HuHy79Mvqd3aozTmfBJvzjKs9qyba
-+                    zY/ZHn6BDYxNJiFfjSS/VJ1KuQPDbpCzhm2hbvT5s9nSOaG0WyRk+d+R
-+                    qEca11E7ZKkmmNiGlyzMAgfmTTBwgxWBAAhvd9nU1GqD6eQ6Z63hpTc/
-+                    KDIHnFTo7pOcZ4z5urIKUMCMcFytedETlEoR5CIWGPdQq2eIEEMfn5ld
-+                    QqdEZRHVErD9og8aluJ2s767HZb8LzjCfYgBFoT9/n48T75oZLEKtSkG
-+                    /idCeeQlaLU=
-+                    )
- 
- ; TTL of 3 weeks
- weeks		1814400	A	10.53.0.2
-diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
-index ade45ce..d3aff24 100644
---- a/bin/tests/system/digdelv/tests.sh
-+++ b/bin/tests/system/digdelv/tests.sh
-@@ -106,7 +106,7 @@ if [ -x "$DIG" ] ; then
-   echo_i "checking dig +rrcomments works for DNSKEY($n)"
-   ret=0
-   $DIG $DIGOPTS +tcp @10.53.0.3 +rrcomments DNSKEY dnskey.example > dig.out.test$n || ret=1
--  grep "; ZSK; alg = RSAMD5 ; key id = 30795" < dig.out.test$n > /dev/null || ret=1
-+  grep "; ZSK; alg = RSASHA256 ; key id = 36895$" < dig.out.test$n > /dev/null || ret=1
-   check_ttl_range dig.out.test$n "DNSKEY" 300 || ret=1
-   if [ $ret != 0 ]; then echo_i "failed"; fi
-   status=`expr $status + $ret`
-@@ -115,7 +115,7 @@ if [ -x "$DIG" ] ; then
-   echo_i "checking dig +short +rrcomments works for DNSKEY ($n)"
-   ret=0
-   $DIG $DIGOPTS +tcp @10.53.0.3 +short +rrcomments DNSKEY dnskey.example > dig.out.test$n || ret=1
--  grep "; ZSK; alg = RSAMD5 ; key id = 30795" < dig.out.test$n > /dev/null || ret=1
-+  grep "; ZSK; alg = RSASHA256 ; key id = 36895$" < dig.out.test$n > /dev/null || ret=1
-   if [ $ret != 0 ]; then echo_i "failed"; fi
-   status=`expr $status + $ret`
- 
-@@ -123,7 +123,7 @@ if [ -x "$DIG" ] ; then
-   echo_i "checking dig +short +nosplit works($n)"
-   ret=0
-   $DIG $DIGOPTS +tcp @10.53.0.3 +short +nosplit DNSKEY dnskey.example > dig.out.test$n || ret=1
--  grep "Z8plc4Rb9VIE5x7KNHAYTvTO5d4S8M=$" < dig.out.test$n > /dev/null || ret=1
-+  grep "T9/n48T75oZLEKtSkG/idCeeQlaLU=$" < dig.out.test$n > /dev/null || ret=1
-   if [ $ret != 0 ]; then echo_i "failed"; fi
-   status=`expr $status + $ret`
- 
-@@ -131,7 +131,7 @@ if [ -x "$DIG" ] ; then
-   echo_i "checking dig +short +rrcomments works($n)"
-   ret=0
-   $DIG $DIGOPTS +tcp @10.53.0.3 +short +rrcomments DNSKEY dnskey.example > dig.out.test$n || ret=1
--  grep "S8M=  ; ZSK; alg = RSAMD5 ; key id = 30795$" < dig.out.test$n > /dev/null || ret=1
-+  grep "aLU=  ; ZSK; alg = RSASHA256 ; key id = 36895$" < dig.out.test$n > /dev/null || ret=1
-   if [ $ret != 0 ]; then echo_i "failed"; fi
-   status=`expr $status + $ret`
- 
-@@ -148,7 +148,7 @@ if [ -x "$DIG" ] ; then
-   echo_i "checking dig +short +rrcomments works($n)"
-   ret=0
-   $DIG $DIGOPTS +tcp @10.53.0.3 +short +rrcomments DNSKEY dnskey.example > dig.out.test$n || ret=1
--  grep "S8M=  ; ZSK; alg = RSAMD5 ; key id = 30795$" < dig.out.test$n > /dev/null || ret=1
-+  grep "aLU=  ; ZSK; alg = RSASHA256 ; key id = 36895$" < dig.out.test$n > /dev/null || ret=1
-   if [ $ret != 0 ]; then echo_i "failed"; fi
-   status=`expr $status + $ret`
- 
-@@ -695,7 +695,7 @@ if [ -x ${DELV} ] ; then
-   echo_i "checking delv +rrcomments works for DNSKEY($n)"
-   ret=0
-   $DELV $DELVOPTS +tcp @10.53.0.3 +rrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1
--  grep "; ZSK; alg = RSAMD5 ; key id = 30795" < delv.out.test$n > /dev/null || ret=1
-+  grep "; ZSK; alg = RSASHA256 ; key id = 36895" < delv.out.test$n > /dev/null || ret=1
-   check_ttl_range delv.out.test$n "DNSKEY" 300 || ret=1
-   if [ $ret != 0 ]; then echo_i "failed"; fi
-   status=`expr $status + $ret`
-@@ -704,7 +704,7 @@ if [ -x ${DELV} ] ; then
-   echo_i "checking delv +short +rrcomments works for DNSKEY ($n)"
-   ret=0
-   $DELV $DELVOPTS +tcp @10.53.0.3 +short +rrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1
--  grep "; ZSK; alg = RSAMD5 ; key id = 30795" < delv.out.test$n > /dev/null || ret=1
-+  grep "; ZSK; alg = RSASHA256 ; key id = 36895" < delv.out.test$n > /dev/null || ret=1
-   if [ $ret != 0 ]; then echo_i "failed"; fi
-   status=`expr $status + $ret`
- 
-@@ -712,7 +712,7 @@ if [ -x ${DELV} ] ; then
-   echo_i "checking delv +short +rrcomments works ($n)"
-   ret=0
-   $DELV $DELVOPTS +tcp @10.53.0.3 +short +rrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1
--  grep "S8M=  ; ZSK; alg = RSAMD5 ; key id = 30795$" < delv.out.test$n > /dev/null || ret=1
-+  grep "aLU=  ; ZSK; alg = RSASHA256 ; key id = 36895$" < delv.out.test$n > /dev/null || ret=1
-   if [ $ret != 0 ]; then echo_i "failed"; fi
-   status=`expr $status + $ret`
- 
-@@ -720,7 +720,7 @@ if [ -x ${DELV} ] ; then
-   echo_i "checking delv +short +nosplit works ($n)"
-   ret=0
-   $DELV $DELVOPTS +tcp @10.53.0.3 +short +nosplit DNSKEY dnskey.example > delv.out.test$n || ret=1
--  grep "Z8plc4Rb9VIE5x7KNHAYTvTO5d4S8M=" < delv.out.test$n > /dev/null || ret=1
-+  grep "T9/n48T75oZLEKtSkG/idCeeQlaLU=" < delv.out.test$n > /dev/null || ret=1
-   if test `wc -l < delv.out.test$n` != 1 ; then ret=1 ; fi
-   f=`awk '{print NF}' < delv.out.test$n`
-   test "${f:-0}" -eq 14 || ret=1
-@@ -731,7 +731,7 @@ if [ -x ${DELV} ] ; then
-   echo_i "checking delv +short +nosplit +norrcomments works ($n)"
-   ret=0
-   $DELV $DELVOPTS +tcp @10.53.0.3 +short +nosplit +norrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1
--  grep "Z8plc4Rb9VIE5x7KNHAYTvTO5d4S8M=$" < delv.out.test$n > /dev/null || ret=1
-+  grep "T9/n48T75oZLEKtSkG/idCeeQlaLU=$" < delv.out.test$n > /dev/null || ret=1
-   if test `wc -l < delv.out.test$n` != 1 ; then ret=1 ; fi
-   f=`awk '{print NF}' < delv.out.test$n`
-   test "${f:-0}" -eq 4 || ret=1
-diff --git a/bin/tests/system/dlv/ns1/sign.sh b/bin/tests/system/dlv/ns1/sign.sh
-index 606e7cc..a3a0d60 100755
---- a/bin/tests/system/dlv/ns1/sign.sh
-+++ b/bin/tests/system/dlv/ns1/sign.sh
-@@ -23,8 +23,8 @@ infile=root.db.in
- zonefile=root.db
- outfile=root.signed
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 1024 -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 1024 -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-diff --git a/bin/tests/system/dlv/ns2/sign.sh b/bin/tests/system/dlv/ns2/sign.sh
-index 9825c57..202c978 100755
---- a/bin/tests/system/dlv/ns2/sign.sh
-+++ b/bin/tests/system/dlv/ns2/sign.sh
-@@ -24,8 +24,8 @@ zonefile=druz.db
- outfile=druz.pre
- dlvzone=utld.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null` 
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 1024 -n zone $zone 2> /dev/null` 
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 1024 -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-diff --git a/bin/tests/system/dlv/ns6/sign.sh b/bin/tests/system/dlv/ns6/sign.sh
-index 1e39862..4ed19ac 100755
---- a/bin/tests/system/dlv/ns6/sign.sh
-+++ b/bin/tests/system/dlv/ns6/sign.sh
-@@ -16,13 +16,15 @@ SYSTESTDIR=dlv
- 
- echo_i "dlv/ns6/sign.sh"
- 
-+bits=1024
-+
- zone=grand.child1.utld.
- infile=child.db.in
- zonefile=grand.child1.utld.db
- outfile=grand.child1.signed
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -36,8 +38,8 @@ zonefile=grand.child3.utld.db
- outfile=grand.child3.signed
- dlvzone=dlv.utld.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -51,8 +53,8 @@ zonefile=grand.child4.utld.db
- outfile=grand.child4.signed
- dlvzone=dlv.utld.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -66,8 +68,8 @@ zonefile=grand.child5.utld.db
- outfile=grand.child5.signed
- dlvzone=dlv.utld.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -81,8 +83,8 @@ zonefile=grand.child7.utld.db
- outfile=grand.child7.signed
- dlvzone=dlv.utld.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -96,8 +98,8 @@ zonefile=grand.child8.utld.db
- outfile=grand.child8.signed
- dlvzone=dlv.utld.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -111,8 +113,8 @@ zonefile=grand.child9.utld.db
- outfile=grand.child9.signed
- dlvzone=dlv.utld.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -125,8 +127,8 @@ zonefile=grand.child10.utld.db
- outfile=grand.child10.signed
- dlvzone=dlv.utld.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -138,8 +140,8 @@ infile=child.db.in
- zonefile=grand.child1.druz.db
- outfile=grand.child1.druz.signed
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -153,8 +155,8 @@ zonefile=grand.child3.druz.db
- outfile=grand.child3.druz.signed
- dlvzone=dlv.druz.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -168,8 +170,8 @@ zonefile=grand.child4.druz.db
- outfile=grand.child4.druz.signed
- dlvzone=dlv.druz.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -183,8 +185,8 @@ zonefile=grand.child5.druz.db
- outfile=grand.child5.druz.signed
- dlvzone=dlv.druz.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -198,8 +200,8 @@ zonefile=grand.child7.druz.db
- outfile=grand.child7.druz.signed
- dlvzone=dlv.druz.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -213,8 +215,8 @@ zonefile=grand.child8.druz.db
- outfile=grand.child8.druz.signed
- dlvzone=dlv.druz.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -228,8 +230,8 @@ zonefile=grand.child9.druz.db
- outfile=grand.child9.druz.signed
- dlvzone=dlv.druz.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-@@ -242,8 +244,8 @@ zonefile=grand.child10.druz.db
- outfile=grand.child10.druz.signed
- dlvzone=dlv.druz.
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b $bits -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh
-index 13fb924..1ffa279 100644
---- a/bin/tests/system/dnssec/ns2/sign.sh
-+++ b/bin/tests/system/dnssec/ns2/sign.sh
-@@ -126,8 +126,8 @@ zone=in-addr.arpa.
- infile=in-addr.arpa.db.in
- zonefile=in-addr.arpa.db
- 
--keyname1=`$KEYGEN -q -r $RANDFILE -a DSA -b 768 -n zone $zone`
--keyname2=`$KEYGEN -q -r $RANDFILE -a DSA -b 768 -n zone $zone`
-+keyname1=`$KEYGEN -q -r $RANDFILE -a DSA -b 1024 -n zone $zone`
-+keyname2=`$KEYGEN -q -r $RANDFILE -a DSA -b 1024 -n zone $zone`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- $SIGNER -P -g -r $RANDFILE -o $zone -k $keyname1 $zonefile $keyname2 > /dev/null
-@@ -138,7 +138,7 @@ privzone=private.secure.example
- privinfile=private.secure.example.db.in
- privzonefile=private.secure.example.db
- 
--privkeyname=`$KEYGEN -q -r $RANDFILE -a RSAMD5 -b 768 -n zone $privzone`
-+privkeyname=`$KEYGEN -q -r $RANDFILE -a RSASHA256 -b 1024 -n zone $privzone`
- 
- cat $privinfile $privkeyname.key >$privzonefile
- 
-@@ -152,7 +152,7 @@ dlvinfile=dlv.db.in
- dlvzonefile=dlv.db
- dlvsetfile=dlvset-${privzone}${TP}
- 
--dlvkeyname=`$KEYGEN -q -r $RANDFILE -a RSAMD5 -b 768 -n zone $dlvzone`
-+dlvkeyname=`$KEYGEN -q -r $RANDFILE -a RSASHA256 -b 1024 -n zone $dlvzone`
- 
- cat $dlvinfile $dlvkeyname.key $dlvsetfile > $dlvzonefile
- 
-diff --git a/bin/tests/system/dnssec/ns5/trusted.conf.bad b/bin/tests/system/dnssec/ns5/trusted.conf.bad
-index ed30460..e6b1126 100644
---- a/bin/tests/system/dnssec/ns5/trusted.conf.bad
-+++ b/bin/tests/system/dnssec/ns5/trusted.conf.bad
-@@ -10,5 +10,5 @@
-  */
- 
- trusted-keys {
--    "." 256 3 1 "AQO6Cl+slAf+iuieDim9L3kujFHQD7s/IOj03ClMOpKYcTXtK4mRpuULVfvWxDi9Ew/gj0xLnnX7z9OJHIxLI+DSrAHd8Dm0XfBEAtVtJSn70GaPZgnLMw1rk5ap2DsEoWk=";
-+    "." 256 3 8 "AwEAAarwAdjV4gIhpBCjXVAScRFEx3co7k8smJdxrnqoGsl5NB7EZ9jRdgvCXbJn6v8y9jlNWVHvaC8ilhfhLh0A1vLWiWv4ijd/12xcnrY7xpG7Cu3YkxUxaXJ7Jdg/Iw1+9mGgXF1v4UbCIcw/3U3cxyk7OxYg+VSb5KBAQSR0upxV";
- };
-diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
-index b31c1b4..a5e237b 100644
---- a/bin/tests/system/dnssec/tests.sh
-+++ b/bin/tests/system/dnssec/tests.sh
-@@ -3235,8 +3235,8 @@ do
- 	   alg=`expr $alg + 1`
- 	   continue;;
- 	3) size="-b 512";;
--	5) size="-b 512";;
--	6) size="-b 512";;
-+	5) size="-b 1024";;
-+	6) size="-b 1024";;
- 	7) size="-b 512";;
- 	8) size="-b 512";;
- 	10) size="-b 1024";;
 diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c
-index c1249ed..20a3139 100644
+index 877504f..577660a 100644
 --- a/bin/tests/system/feature-test.c
 +++ b/bin/tests/system/feature-test.c
-@@ -19,6 +19,7 @@
+@@ -14,6 +14,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
++#include <isc/md.h>
+ #include <isc/net.h>
  #include <isc/print.h>
  #include <isc/util.h>
- #include <isc/net.h>
-+#include <isc/md5.h>
- #include <dns/edns.h>
- 
- #ifdef WIN32
-@@ -47,6 +48,7 @@ usage() {
- 	fprintf(stderr, "	--have-geoip2\n");
- 	fprintf(stderr, "	--have-libxml2\n");
- 	fprintf(stderr, "	--ipv6only=no\n");
-+	fprintf(stderr, "       --md5\n");
- 	fprintf(stderr, "	--rpz-nsdname\n");
- 	fprintf(stderr, "	--rpz-nsip\n");
- 	fprintf(stderr, "	--with-idn\n");
-@@ -155,6 +157,18 @@ main(int argc, char **argv) {
- #endif
+@@ -186,6 +187,19 @@ main(int argc, char **argv) {
+ #endif /* ifdef DLZ_FILESYSTEM */
  	}
  
 +	if (strcmp(argv[1], "--md5") == 0) {
-+#ifdef PK11_MD5_DISABLE
-+		return (1);
-+#else
-+		if (isc_md5_available()) {
++		unsigned char digest[ISC_MAX_MD_SIZE];
++		const unsigned char test[] = "test";
++		unsigned int size = sizeof(digest);
++
++		if (isc_md(ISC_MD_MD5, test, sizeof(test),
++		           digest, &size) == ISC_R_SUCCESS) {
 +			return (0);
 +		} else {
 +			return (1);
 +		}
-+#endif
 +	}
 +
- 	if (strcmp(argv[1], "--rpz-nsip") == 0) {
- #ifdef ENABLE_RPZ_NSIP
+ 	if (strcmp(argv[1], "--with-idn") == 0) {
+ #ifdef HAVE_LIBIDN2
  		return (0);
-diff --git a/bin/tests/system/filter-aaaa/ns1/sign.sh b/bin/tests/system/filter-aaaa/ns1/sign.sh
-index f755581..4a7d890 100755
---- a/bin/tests/system/filter-aaaa/ns1/sign.sh
-+++ b/bin/tests/system/filter-aaaa/ns1/sign.sh
-@@ -21,8 +21,8 @@ infile=signed.db.in
- zonefile=signed.db.signed
- outfile=signed.db.signed
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 1024 -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 1024 -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
-diff --git a/bin/tests/system/filter-aaaa/ns4/sign.sh b/bin/tests/system/filter-aaaa/ns4/sign.sh
-index f755581..4a7d890 100755
---- a/bin/tests/system/filter-aaaa/ns4/sign.sh
-+++ b/bin/tests/system/filter-aaaa/ns4/sign.sh
-@@ -21,8 +21,8 @@ infile=signed.db.in
- zonefile=signed.db.signed
- outfile=signed.db.signed
- 
--keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
--keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
-+keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 1024 -n zone $zone 2> /dev/null`
-+keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 1024 -n zone $zone 2> /dev/null`
- 
- cat $infile $keyname1.key $keyname2.key >$zonefile
- 
 diff --git a/bin/tests/system/notify/ns5/named.conf.in b/bin/tests/system/notify/ns5/named.conf.in
-index cfcfe8f..0a1614d 100644
+index 1ee8df4..2b75d9a 100644
 --- a/bin/tests/system/notify/ns5/named.conf.in
 +++ b/bin/tests/system/notify/ns5/named.conf.in
 @@ -10,17 +10,17 @@
@@ -1065,7 +620,7 @@ index cfcfe8f..0a1614d 100644
  };
  
 diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
-index 1f6e6d0..c08bd25 100644
+index 3d7e0b7..ec4d9a7 100644
 --- a/bin/tests/system/notify/tests.sh
 +++ b/bin/tests/system/notify/tests.sh
 @@ -212,16 +212,16 @@ ret=0
@@ -1089,10 +644,10 @@ index 1f6e6d0..c08bd25 100644
  	grep "test string" dig.out.b.ns5.test$n > /dev/null &&
  	grep "test string" dig.out.c.ns5.test$n > /dev/null &&
 diff --git a/bin/tests/system/nsupdate/ns1/named.conf.in b/bin/tests/system/nsupdate/ns1/named.conf.in
-index 1d999ad..26b6b7c 100644
+index b51e700..436c97d 100644
 --- a/bin/tests/system/nsupdate/ns1/named.conf.in
 +++ b/bin/tests/system/nsupdate/ns1/named.conf.in
-@@ -32,7 +32,7 @@ controls {
+@@ -37,7 +37,7 @@ controls {
  };
  
  key altkey {
@@ -1102,10 +657,10 @@ index 1d999ad..26b6b7c 100644
  };
  
 diff --git a/bin/tests/system/nsupdate/ns2/named.conf.in b/bin/tests/system/nsupdate/ns2/named.conf.in
-index 4549184..cb7dccd 100644
+index da6b3b4..c547e47 100644
 --- a/bin/tests/system/nsupdate/ns2/named.conf.in
 +++ b/bin/tests/system/nsupdate/ns2/named.conf.in
-@@ -33,7 +33,7 @@ controls {
+@@ -32,7 +32,7 @@ controls {
  };
  
  key altkey {
@@ -1115,31 +670,30 @@ index 4549184..cb7dccd 100644
  };
  
 diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh
-index 21805c5..0d3d85c 100644
+index c055da3..4e1242b 100644
 --- a/bin/tests/system/nsupdate/setup.sh
 +++ b/bin/tests/system/nsupdate/setup.sh
-@@ -58,7 +58,12 @@ EOF
+@@ -56,7 +56,11 @@ EOF
  
- $DDNSCONFGEN -q -r $RANDFILE -z example.nil > ns1/ddns.key
+ $DDNSCONFGEN -q -z example.nil > ns1/ddns.key
  
--$DDNSCONFGEN -q -r $RANDFILE -a hmac-md5 -k md5-key -z keytests.nil > ns1/md5.key
+-$DDNSCONFGEN -q -a hmac-md5 -k md5-key -z keytests.nil > ns1/md5.key
 +if $FEATURETEST --md5; then
-+	$DDNSCONFGEN -q -r $RANDFILE -a hmac-md5 -k md5-key -z keytests.nil > ns1/md5.key
++	$DDNSCONFGEN -q -a hmac-md5 -k md5-key -z keytests.nil > ns1/md5.key
 +else
 +	echo -n > ns1/md5.key
 +fi
-+
- $DDNSCONFGEN -q -r $RANDFILE -a hmac-sha1 -k sha1-key -z keytests.nil > ns1/sha1.key
- $DDNSCONFGEN -q -r $RANDFILE -a hmac-sha224 -k sha224-key -z keytests.nil > ns1/sha224.key
- $DDNSCONFGEN -q -r $RANDFILE -a hmac-sha256 -k sha256-key -z keytests.nil > ns1/sha256.key
+ $DDNSCONFGEN -q -a hmac-sha1 -k sha1-key -z keytests.nil > ns1/sha1.key
+ $DDNSCONFGEN -q -a hmac-sha224 -k sha224-key -z keytests.nil > ns1/sha224.key
+ $DDNSCONFGEN -q -a hmac-sha256 -k sha256-key -z keytests.nil > ns1/sha256.key
 diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
-index 4da4849..b3bc807 100755
+index b35d797..41c128e 100755
 --- a/bin/tests/system/nsupdate/tests.sh
 +++ b/bin/tests/system/nsupdate/tests.sh
-@@ -708,7 +708,14 @@ fi
+@@ -797,7 +797,14 @@ fi
  n=`expr $n + 1`
  ret=0
- echo_i "check TSIG key algorithms ($n)"
+ echo_i "check TSIG key algorithms (nsupdate -k) ($n)"
 -for alg in md5 sha1 sha224 sha256 sha384 sha512; do
 +if $FEATURETEST --md5
 +then
@@ -1152,7 +706,7 @@ index 4da4849..b3bc807 100755
      $NSUPDATE -k ns1/${alg}.key <<END > /dev/null || ret=1
  server 10.53.0.1 ${PORT}
  update add ${alg}.keytests.nil. 600 A 10.10.10.3
-@@ -716,7 +723,7 @@ send
+@@ -805,7 +812,7 @@ send
  END
  done
  sleep 2
@@ -1161,11 +715,29 @@ index 4da4849..b3bc807 100755
      $DIG $DIGOPTS +short @10.53.0.1 ${alg}.keytests.nil | grep 10.10.10.3 > /dev/null 2>&1 || ret=1
  done
  if [ $ret -ne 0 ]; then
+@@ -816,7 +823,7 @@ fi
+ n=`expr $n + 1`
+ ret=0
+ echo_i "check TSIG key algorithms (nsupdate -y) ($n)"
+-for alg in md5 sha1 sha224 sha256 sha384 sha512; do
++for alg in $ALGS; do
+     secret=$(sed -n 's/.*secret "\(.*\)";.*/\1/p' ns1/${alg}.key)
+     $NSUPDATE -y "hmac-${alg}:${alg}-key:$secret" <<END > /dev/null || ret=1
+ server 10.53.0.1 ${PORT}
+@@ -825,7 +832,7 @@ send
+ END
+ done
+ sleep 2
+-for alg in md5 sha1 sha224 sha256 sha384 sha512; do
++for alg in $ALGS; do
+     $DIG $DIGOPTS +short @10.53.0.1 ${alg}.keytests.nil | grep 10.10.10.50 > /dev/null 2>&1 || ret=1
+ done
+ if [ $ret -ne 0 ]; then
 diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh
-index 343869e..c30efb0 100644
+index b59e7a7..04d5f5a 100644
 --- a/bin/tests/system/rndc/setup.sh
 +++ b/bin/tests/system/rndc/setup.sh
-@@ -37,7 +37,7 @@ make_key () {
+@@ -33,7 +33,7 @@ make_key () {
              sed 's/allow { 10.53.0.4/allow { any/' >> ns4/named.conf
  }
  
@@ -1175,7 +747,7 @@ index 343869e..c30efb0 100644
  make_key 3 ${EXTRAPORT3} hmac-sha224
  make_key 4 ${EXTRAPORT4} hmac-sha256
 diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh
-index 57e066d..186a723 100644
+index 9fd84ed..d0b188f 100644
 --- a/bin/tests/system/rndc/tests.sh
 +++ b/bin/tests/system/rndc/tests.sh
 @@ -348,15 +348,20 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -1208,17 +780,8 @@ index 57e066d..186a723 100644
  
  n=`expr $n + 1`
  echo_i "testing rndc with hmac-sha1 ($n)"
-diff --git a/bin/tests/system/tsig/clean.sh b/bin/tests/system/tsig/clean.sh
-index 576ec70..cb7a852 100644
---- a/bin/tests/system/tsig/clean.sh
-+++ b/bin/tests/system/tsig/clean.sh
-@@ -20,3 +20,4 @@ rm -f */named.run
- rm -f ns*/named.lock
- rm -f Kexample.net.+163+*
- rm -f keygen.out?
-+rm -f ns1/named.conf
 diff --git a/bin/tests/system/tsig/ns1/named.conf.in b/bin/tests/system/tsig/ns1/named.conf.in
-index fbf30c6..f61657d 100644
+index 3470c4f..cf539cd 100644
 --- a/bin/tests/system/tsig/ns1/named.conf.in
 +++ b/bin/tests/system/tsig/ns1/named.conf.in
 @@ -21,10 +21,7 @@ options {
@@ -1245,21 +808,37 @@ index fbf30c6..f61657d 100644
  
  key "sha1-trunc" {
  	secret "FrSt77yPTFx6hTs4i2tKLB9LmE0=";
+diff --git a/bin/tests/system/tsig/ns1/rndc5.conf.in b/bin/tests/system/tsig/ns1/rndc5.conf.in
+new file mode 100644
+index 0000000..0682194
+--- /dev/null
++++ b/bin/tests/system/tsig/ns1/rndc5.conf.in
+@@ -0,0 +1,10 @@
++# Conditionally included when support for MD5 is available
++key "md5" {
++	secret "97rnFx24Tfna4mHPfgnerA==";
++	algorithm hmac-md5;
++};
++
++key "md5-trunc" {
++	secret "97rnFx24Tfna4mHPfgnerA==";
++	algorithm hmac-md5-80;
++};
 diff --git a/bin/tests/system/tsig/setup.sh b/bin/tests/system/tsig/setup.sh
-index 4dd4a25..aa0f966 100644
+index e3b4a45..ae21d04 100644
 --- a/bin/tests/system/tsig/setup.sh
 +++ b/bin/tests/system/tsig/setup.sh
-@@ -17,3 +17,8 @@ $SHELL clean.sh
- copy_setports ns1/named.conf.in ns1/named.conf
+@@ -15,3 +15,8 @@ SYSTEMTESTTOP=..
+ $SHELL clean.sh
  
- test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
+ copy_setports ns1/named.conf.in ns1/named.conf
 +
 +if $FEATURETEST --md5
 +then
 +	cat ns1/rndc5.conf.in >> ns1/named.conf
 +fi
 diff --git a/bin/tests/system/tsig/tests.sh b/bin/tests/system/tsig/tests.sh
-index f731fa6..cade35b 100644
+index 38d842a..668aa6f 100644
 --- a/bin/tests/system/tsig/tests.sh
 +++ b/bin/tests/system/tsig/tests.sh
 @@ -26,20 +26,25 @@ sha512="jI/Pa4qRu96t76Pns5Z/Ndxbn3QCkwcxLOgt9vgvnJw5wqTRvNyk3FtD6yIMd1dWVlqZ+Y4f
@@ -1273,13 +852,6 @@ index f731fa6..cade35b 100644
 -if [ $ret -eq 1 ] ; then
 -	echo_i "failed"; status=1
 -fi
--
--echo_i "fetching using hmac-md5 (new form)"
--ret=0
--$DIG $DIGOPTS example.nil. -y "hmac-md5:md5:$md5" @10.53.0.1 soa > dig.out.md5.new || ret=1
--grep -i "md5.*TSIG.*NOERROR" dig.out.md5.new > /dev/null || ret=1
--if [ $ret -eq 1 ] ; then
--	echo_i "failed"; status=1
 +if $FEATURETEST --md5
 +then
 +	echo_i "fetching using hmac-md5 (old form)"
@@ -1289,7 +861,13 @@ index f731fa6..cade35b 100644
 +	if [ $ret -eq 1 ] ; then
 +		echo_i "failed"; status=1
 +	fi
-+
+ 
+-echo_i "fetching using hmac-md5 (new form)"
+-ret=0
+-$DIG $DIGOPTS example.nil. -y "hmac-md5:md5:$md5" @10.53.0.1 soa > dig.out.md5.new || ret=1
+-grep -i "md5.*TSIG.*NOERROR" dig.out.md5.new > /dev/null || ret=1
+-if [ $ret -eq 1 ] ; then
+-	echo_i "failed"; status=1
 +	echo_i "fetching using hmac-md5 (new form)"
 +	ret=0
 +	$DIG $DIGOPTS example.nil. -y "hmac-md5:md5:$md5" @10.53.0.1 soa > dig.out.md5.new || ret=1
@@ -1350,19 +928,8 @@ index f731fa6..cade35b 100644
  fi
  
  echo_i "fetching using hmac-sha1-80 (BADTRUNC)"
-diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh
-index 0d21c7b..dbcb7b4 100644
---- a/bin/tests/system/tsiggss/setup.sh
-+++ b/bin/tests/system/tsiggss/setup.sh
-@@ -18,5 +18,5 @@ test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
- 
- copy_setports ns1/named.conf.in ns1/named.conf
- 
--key=`$KEYGEN -Cq -K ns1 -a DSA -b 512 -r $RANDFILE -n HOST -T KEY key.example.nil.`
-+key=`$KEYGEN -Cq -K ns1 -a DSA -b 1024 -r $RANDFILE -n HOST -T KEY key.example.nil.`
- cat ns1/example.nil.db.in ns1/${key}.key > ns1/example.nil.db
 diff --git a/bin/tests/system/upforwd/ns1/named.conf.in b/bin/tests/system/upforwd/ns1/named.conf.in
-index e0a30cd..6a77b1c 100644
+index 3873c7c..b359a5a 100644
 --- a/bin/tests/system/upforwd/ns1/named.conf.in
 +++ b/bin/tests/system/upforwd/ns1/named.conf.in
 @@ -10,7 +10,7 @@
@@ -1375,10 +942,10 @@ index e0a30cd..6a77b1c 100644
  };
  
 diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh
-index b0694bb..9adae82 100644
+index a50c896..8062d68 100644
 --- a/bin/tests/system/upforwd/tests.sh
 +++ b/bin/tests/system/upforwd/tests.sh
-@@ -68,7 +68,7 @@ if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
+@@ -79,7 +79,7 @@ if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
  
  echo_i "updating zone (signed) ($n)"
  ret=0
@@ -1387,22 +954,6 @@ index b0694bb..9adae82 100644
  server 10.53.0.3 ${PORT}
  update add updated.example. 600 A 10.10.10.1
  update add updated.example. 600 TXT Foo
-diff --git a/bin/tests/system/tsig/ns1/rndc5.conf.in b/bin/tests/system/tsig/ns1/rndc5.conf.in
-new file mode 100644
-index 0000000..0682194
---- /dev/null
-+++ b/bin/tests/system/tsig/ns1/rndc5.conf.in
-@@ -0,0 +1,10 @@
-+# Conditionally included when support for MD5 is available
-+key "md5" {
-+	secret "97rnFx24Tfna4mHPfgnerA==";
-+	algorithm hmac-md5;
-+};
-+
-+key "md5-trunc" {
-+	secret "97rnFx24Tfna4mHPfgnerA==";
-+	algorithm hmac-md5-80;
-+};
 -- 
-2.20.1
+2.26.2
 
diff --git a/bind-9.11-host-idn-disable.patch b/bind-9.11-host-idn-disable.patch
deleted file mode 100644
index 7f02b4c90e28a73394040fa44629787096132f69..0000000000000000000000000000000000000000
--- a/bind-9.11-host-idn-disable.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From ec50eff97c259b5bfbfa4e050d69fe7b39b0f15a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Tue, 25 Sep 2018 18:08:46 +0200
-Subject: [PATCH] Disable IDN from environment as documented
-
-Manual page of host contained instructions to disable IDN processing
-when it was built with libidn2. When refactoring IDN support however,
-support for disabling IDN in host and nslookup was lost. Use also
-environment variable and document it for nslookup, host and dig.
-
-Support variable CHARSET=ASCII to disable IDN, supported in downstream
-RH patch since RHEL 5.
----
- bin/dig/dig.docbook      |  4 +++-
- bin/dig/dighost.c        |  5 +++++
- bin/dig/host.docbook     |  2 +-
- bin/dig/nslookup.docbook | 15 +++++++++++++++
- 4 files changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
-index 5d19301..933af79 100644
---- a/bin/dig/dig.docbook
-+++ b/bin/dig/dig.docbook
-@@ -1312,7 +1312,9 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
-       reply from the server.
-       If you'd like to turn off the IDN support for some reason, use
-       parameters <parameter>+noidnin</parameter> and
--      <parameter>+noidnout</parameter>.
-+      <parameter>+noidnout</parameter> or define
-+      the <envar>IDN_DISABLE</envar> environment variable.
-+
-     </para>
-   </refsection>
- 
-diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
-index 5eabc1f..73aaab8 100644
---- a/bin/dig/dighost.c
-+++ b/bin/dig/dighost.c
-@@ -826,6 +826,11 @@ make_empty_lookup(void) {
- 	looknew->badcookie = true;
- #ifdef WITH_IDN_SUPPORT
- 	looknew->idnin = isatty(1)?(getenv("IDN_DISABLE") == NULL):false;
-+	if (looknew->idnin) {
-+		const char *charset = getenv("CHARSET");
-+		if (charset && !strcmp(charset, "ASCII"))
-+			looknew->idnin = false;
-+	}
- #else
- 	looknew->idnin = false;
- #endif
-diff --git a/bin/dig/host.docbook b/bin/dig/host.docbook
-index da0f8fb..9689b5a 100644
---- a/bin/dig/host.docbook
-+++ b/bin/dig/host.docbook
-@@ -379,7 +379,7 @@
-       <command>host</command> appropriately converts character encoding of
-       domain name before sending a request to DNS server or displaying a
-       reply from the server.
--      If you'd like to turn off the IDN support for some reason, defines
-+      If you'd like to turn off the IDN support for some reason, define
-       the <envar>IDN_DISABLE</envar> environment variable.
-       The IDN support is disabled if the variable is set when
-       <command>host</command> runs.
-diff --git a/bin/dig/nslookup.docbook b/bin/dig/nslookup.docbook
-index d46fc2d..6d7d181 100644
---- a/bin/dig/nslookup.docbook
-+++ b/bin/dig/nslookup.docbook
-@@ -495,6 +495,21 @@ nslookup -query=hinfo  -timeout=10
-     </para>
-   </refsection>
- 
-+  <refsection><info><title>IDN SUPPORT</title></info>
-+
-+    <para>
-+      If <command>nslookup</command> has been built with IDN (internationalized
-+      domain name) support, it can accept and display non-ASCII domain names.
-+      <command>nslookup</command> appropriately converts character encoding of
-+      domain name before sending a request to DNS server or displaying a
-+      reply from the server.
-+      If you'd like to turn off the IDN support for some reason, define
-+      the <envar>IDN_DISABLE</envar> environment variable.
-+      The IDN support is disabled if the variable is set when
-+      <command>nslookup</command> runs.
-+    </para>
-+  </refsection>
-+
-   <refsection><info><title>FILES</title></info>
- 
-     <para><filename>/etc/resolv.conf</filename>
--- 
-2.20.1
-
diff --git a/bind-9.11-json-c.patch b/bind-9.11-json-c.patch
deleted file mode 100644
index 95e559724367655d21d5ad3ccffeb4bcf47c0337..0000000000000000000000000000000000000000
--- a/bind-9.11-json-c.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cb6d2019766a6c8c5516fd8859cedf0052f03293 Mon Sep 17 00:00:00 2001
-From: Petr Mensik <pemensik@redhat.com>
-Date: Thu, 25 Jul 2019 11:37:57 +0200
-Subject: [PATCH] Skip support of jsoncpp
-
-Bind cannot be compiled when jsoncpp-devel is installed. Remove support
-for jsoncpp, use only json-c-devel. Bind 9.15 has already support for
---with-json-c, do not yet introduce it.
----
- configure.ac | 17 ++---------------
- 1 file changed, 2 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6d05337..5ce83b5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2594,15 +2594,7 @@ case "$use_libjson" in
- 	auto|yes)
- 		for d in /usr /usr/local /opt/local
- 		do
--			if test -f "${d}/include/json/json.h"
--			then
--				if test ${d} != /usr
--				then
--					libjson_cflags="-I ${d}/include"
--					LIBS="$LIBS -L${d}/lib"
--				fi
--				have_libjson="yes"
--			elif test -f "${d}/include/json-c/json.h"
-+			if test -f "${d}/include/json-c/json.h"
- 			then
- 				if test ${d} != /usr
- 				then
-@@ -2615,12 +2607,7 @@ case "$use_libjson" in
- 		done
- 		;;
- 	*)
--		if test -f "${use_libjson}/include/json/json.h"
--		then
--			libjson_cflags="-I${use_libjson}/include"
--			LIBS="$LIBS -L${use_libjson}/lib"
--			have_libjson="yes"
--		elif test -f "${use_libjson}/include/json-c/json.h"
-+		if test -f "${use_libjson}/include/json-c/json.h"
- 		then
- 			libjson_cflags="-I${use_libjson}/include"
- 			LIBS="$LIBS -L${use_libjson}/lib"
--- 
-2.20.1
-
diff --git a/bind-9.11-kyua-pkcs11.patch b/bind-9.11-kyua-pkcs11.patch
index 9cfa61815b4e9d4fb7a96d08e3149cc4908f5068..ea9a51a26576ad2f47fa86d0a7b7dd7180c74d53 100644
--- a/bind-9.11-kyua-pkcs11.patch
+++ b/bind-9.11-kyua-pkcs11.patch
@@ -1,4 +1,4 @@
-From a9b5785f174cf7fd74891fa64f6b69b9a9b55466 Mon Sep 17 00:00:00 2001
+From 1241f2005d08673c28a595c5a6cd61350b95a929 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
 Date: Tue, 2 Jan 2018 18:13:07 +0100
 Subject: [PATCH] Fix pkcs11 variants atf tests
@@ -7,19 +7,16 @@ Add dns-pkcs11 tests Makefile to configure
 
 Add pkcs11 Kyuafile, fix dh_test to pass in pkcs11 mode
 ---
- configure.ac                     |  1 +
- lib/Kyuafile                     |  2 ++
- lib/dns-pkcs11/tests/Makefile.in | 10 +++++-----
- lib/dns-pkcs11/tests/dh_test.c   |  3 ++-
- lib/isc-pkcs11/tests/Makefile.in |  6 +++---
- lib/isc-pkcs11/tests/hash_test.c | 32 +++++++++++++++++++++++++-------
- 6 files changed, 38 insertions(+), 16 deletions(-)
+ configure.ac                   | 1 +
+ lib/Kyuafile                   | 2 ++
+ lib/dns-pkcs11/tests/dh_test.c | 3 ++-
+ 3 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 62ecf56..0940a7d 100644
+index d80ae31..0fb9328 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5476,6 +5476,7 @@ AC_CONFIG_FILES([
+@@ -3090,6 +3090,7 @@ AC_CONFIG_FILES([
  	lib/dns-pkcs11/include/Makefile
  	lib/dns-pkcs11/include/dns/Makefile
  	lib/dns-pkcs11/include/dst/Makefile
@@ -28,7 +25,7 @@ index 62ecf56..0940a7d 100644
  	lib/irs/include/Makefile
  	lib/irs/include/irs/Makefile
 diff --git a/lib/Kyuafile b/lib/Kyuafile
-index 7c8bab0..eec9564 100644
+index 39ce986..037e5ef 100644
 --- a/lib/Kyuafile
 +++ b/lib/Kyuafile
 @@ -2,8 +2,10 @@ syntax(2)
@@ -38,37 +35,15 @@ index 7c8bab0..eec9564 100644
 +include('dns-pkcs11/Kyuafile')
  include('irs/Kyuafile')
  include('isc/Kyuafile')
-+include('isc-pkcs11/Kyuafile')
  include('isccc/Kyuafile')
  include('isccfg/Kyuafile')
- include('lwres/Kyuafile')
-diff --git a/lib/dns-pkcs11/tests/Makefile.in b/lib/dns-pkcs11/tests/Makefile.in
-index 22a06a8..5df5b15 100644
---- a/lib/dns-pkcs11/tests/Makefile.in
-+++ b/lib/dns-pkcs11/tests/Makefile.in
-@@ -17,12 +17,12 @@ VERSION=@BIND9_VERSION@
- 
- CINCLUDES =	-I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
- 		@DST_OPENSSL_INC@ ${MAXMINDDB_CFLAGS}
--CDEFINES =	@CRYPTO@ -DTESTS="\"${top_builddir}/lib/dns/tests/\""
-+CDEFINES =	@CRYPTO_PK11@ -DTESTS="\"${top_builddir}/lib/dns-pkcs11/tests/\""
- 
--ISCLIBS =	../../isc/libisc.@A@
--ISCDEPLIBS =	../../isc/libisc.@A@
--DNSLIBS =	../libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
--DNSDEPLIBS =	../libdns.@A@
-+ISCLIBS =	../../isc-pkcs11/libisc-pkcs11.@A@
-+ISCDEPLIBS =	../../isc-pkcs11/libisc-pkcs11.@A@
-+DNSLIBS =	../libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
-+DNSDEPLIBS =	../libdns-pkcs11.@A@
- 
- LIBS =		@LIBS@ @CMOCKA_LIBS@
- CFLAGS =	@CFLAGS@ @CMOCKA_CFLAGS@
+ include('ns/Kyuafile')
++include('ns-pkcs11/Kyuafile')
 diff --git a/lib/dns-pkcs11/tests/dh_test.c b/lib/dns-pkcs11/tests/dh_test.c
-index a5bf46c..9ff2b76 100644
+index 934e8fd..658d1af 100644
 --- a/lib/dns-pkcs11/tests/dh_test.c
 +++ b/lib/dns-pkcs11/tests/dh_test.c
-@@ -88,7 +88,8 @@ dh_computesecret(void **state) {
+@@ -87,7 +87,8 @@ dh_computesecret(void **state) {
  	result = dst_key_computesecret(key, key, &buf);
  	assert_int_equal(result, DST_R_NOTPRIVATEKEY);
  	result = key->func->computesecret(key, key, &buf);
@@ -78,115 +53,6 @@ index a5bf46c..9ff2b76 100644
  
  	dst_key_free(&key);
  }
-diff --git a/lib/isc-pkcs11/tests/Makefile.in b/lib/isc-pkcs11/tests/Makefile.in
-index 36d2207..00dfbc9 100644
---- a/lib/isc-pkcs11/tests/Makefile.in
-+++ b/lib/isc-pkcs11/tests/Makefile.in
-@@ -16,10 +16,10 @@ VERSION=@BIND9_VERSION@
- @BIND9_MAKE_INCLUDES@
- 
- CINCLUDES =	-I. -Iinclude ${ISC_INCLUDES} @ISC_OPENSSL_INC@
--CDEFINES =	@CRYPTO@ -DTESTS="\"${top_builddir}/lib/isc/tests/\""
-+CDEFINES =	@CRYPTO_PK11@ -DTESTS="\"${top_builddir}/lib/isc-pkcs11/tests/\""
- 
--ISCLIBS =	../libisc.@A@ @ISC_OPENSSL_LIBS@
--ISCDEPLIBS =	../libisc.@A@
-+ISCLIBS =	../libisc-pkcs11.@A@ @ISC_OPENSSL_LIBS@
-+ISCDEPLIBS =	../libisc-pkcs11.@A@
- 
- LIBS =		@LIBS@ @CMOCKA_LIBS@
- CFLAGS =	@CFLAGS@ @CMOCKA_CFLAGS@
-diff --git a/lib/isc-pkcs11/tests/hash_test.c b/lib/isc-pkcs11/tests/hash_test.c
-index 4fafc38..5eb2be2 100644
---- a/lib/isc-pkcs11/tests/hash_test.c
-+++ b/lib/isc-pkcs11/tests/hash_test.c
-@@ -84,7 +84,7 @@ typedef struct hash_testcase {
- 
- typedef struct hash_test_key {
- 	const char *key;
--	const int len;
-+	const unsigned len;
- } hash_test_key_t;
- 
- /* non-hmac tests */
-@@ -955,8 +955,11 @@ isc_hmacsha1_test(void **state) {
- 	hash_test_key_t *test_key = test_keys;
- 
- 	while (testcase->input != NULL && testcase->result != NULL) {
-+		int len = ISC_MAX(test_key->len, ISC_SHA1_DIGESTLENGTH);
-+
-+		memset(buffer, 0, ISC_SHA1_DIGESTLENGTH);
- 		memmove(buffer, test_key->key, test_key->len);
--		isc_hmacsha1_init(&hmacsha1, buffer, test_key->len);
-+		isc_hmacsha1_init(&hmacsha1, buffer, len);
- 		isc_hmacsha1_update(&hmacsha1,
- 				    (const uint8_t *) testcase->input,
- 				    testcase->input_len);
-@@ -1115,8 +1118,11 @@ isc_hmacsha224_test(void **state) {
- 	hash_test_key_t *test_key = test_keys;
- 
- 	while (testcase->input != NULL && testcase->result != NULL) {
-+		int len = ISC_MAX(test_key->len, ISC_SHA224_DIGESTLENGTH);
-+
-+		memset(buffer, 0, ISC_SHA224_DIGESTLENGTH);
- 		memmove(buffer, test_key->key, test_key->len);
--		isc_hmacsha224_init(&hmacsha224, buffer, test_key->len);
-+		isc_hmacsha224_init(&hmacsha224, buffer, len);
- 		isc_hmacsha224_update(&hmacsha224,
- 				      (const uint8_t *) testcase->input,
- 				      testcase->input_len);
-@@ -1276,8 +1282,11 @@ isc_hmacsha256_test(void **state) {
- 	hash_test_key_t *test_key = test_keys;
- 
- 	while (testcase->input != NULL && testcase->result != NULL) {
-+		int len = ISC_MAX(test_key->len, ISC_SHA256_DIGESTLENGTH);
-+
-+		memset(buffer, 0, ISC_SHA256_DIGESTLENGTH);
- 		memmove(buffer, test_key->key, test_key->len);
--		isc_hmacsha256_init(&hmacsha256, buffer, test_key->len);
-+		isc_hmacsha256_init(&hmacsha256, buffer, len);
- 		isc_hmacsha256_update(&hmacsha256,
- 				      (const uint8_t *) testcase->input,
- 				      testcase->input_len);
-@@ -1443,8 +1452,11 @@ isc_hmacsha384_test(void **state) {
- 	hash_test_key_t *test_key = test_keys;
- 
- 	while (testcase->input != NULL && testcase->result != NULL) {
-+		int len = ISC_MAX(test_key->len, ISC_SHA384_DIGESTLENGTH);
-+
-+		memset(buffer, 0, ISC_SHA384_DIGESTLENGTH);
- 		memmove(buffer, test_key->key, test_key->len);
--		isc_hmacsha384_init(&hmacsha384, buffer, test_key->len);
-+		isc_hmacsha384_init(&hmacsha384, buffer, len);
- 		isc_hmacsha384_update(&hmacsha384,
- 				      (const uint8_t *) testcase->input,
- 				      testcase->input_len);
-@@ -1610,8 +1622,11 @@ isc_hmacsha512_test(void **state) {
- 	hash_test_key_t *test_key = test_keys;
- 
- 	while (testcase->input != NULL && testcase->result != NULL) {
-+		int len = ISC_MAX(test_key->len, ISC_SHA512_DIGESTLENGTH);
-+
-+		memset(buffer, 0, ISC_SHA512_DIGESTLENGTH);
- 		memmove(buffer, test_key->key, test_key->len);
--		isc_hmacsha512_init(&hmacsha512, buffer, test_key->len);
-+		isc_hmacsha512_init(&hmacsha512, buffer, len);
- 		isc_hmacsha512_update(&hmacsha512,
- 				      (const uint8_t *) testcase->input,
- 				      testcase->input_len);
-@@ -1754,8 +1769,11 @@ isc_hmacmd5_test(void **state) {
- 	hash_test_key_t *test_key = test_keys;
- 
- 	while (testcase->input != NULL && testcase->result != NULL) {
-+		int len = ISC_MAX(test_key->len, ISC_MD5_DIGESTLENGTH);
-+
-+		memset(buffer, 0, ISC_MD5_DIGESTLENGTH);
- 		memmove(buffer, test_key->key, test_key->len);
--		isc_hmacmd5_init(&hmacmd5, buffer, test_key->len);
-+		isc_hmacmd5_init(&hmacmd5, buffer, len);
- 		isc_hmacmd5_update(&hmacmd5,
- 				   (const uint8_t *) testcase->input,
- 				   testcase->input_len);
 -- 
-2.21.1
+2.20.1
 
diff --git a/bind-9.11-oot-manual.patch b/bind-9.11-oot-manual.patch
deleted file mode 100644
index 84e9d25e5eca8dbb7f8a31260fc10deb5635f501..0000000000000000000000000000000000000000
--- a/bind-9.11-oot-manual.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From 8ca95f47231822df2b9c171a4da1e93ca5b748eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Wed, 25 Jul 2018 12:24:16 +0200
-Subject: [PATCH] Use make automatic variables to install updated manuals
-
-Make will choose modified manual from build directory or original from source
-directory automagically. Take advantage of install tool feature.
-Install all files in single command instead of iterating on each of them.
----
- bin/check/Makefile.in   |  8 +++++---
- bin/confgen/Makefile.in |  9 +++++----
- bin/delv/Makefile.in    |  6 ++++--
- bin/dig/Makefile.in     |  8 ++++----
- bin/dnssec/Makefile.in  |  6 ++++--
- bin/named/Makefile.in   | 13 +++++++++----
- bin/pkcs11/Makefile.in  |  9 ++++-----
- bin/python/Makefile.in  |  8 ++++----
- bin/tools/Makefile.in   | 25 +++++++++++++++----------
- 9 files changed, 54 insertions(+), 38 deletions(-)
-
-diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
-index c124e80..1174f8d 100644
---- a/bin/check/Makefile.in
-+++ b/bin/check/Makefile.in
-@@ -83,12 +83,14 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
- 
--install:: named-checkconf@EXEEXT@ named-checkzone@EXEEXT@ installdirs
-+install-man8: ${MANPAGES}
-+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-+	(cd ${DESTDIR}${mandir}/man8; rm -f named-compilezone.8; ${LINK_PROGRAM} named-checkzone.8 named-compilezone.8)
-+
-+install:: named-checkconf@EXEEXT@ named-checkzone@EXEEXT@ installdirs install-man8
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkconf@EXEEXT@ ${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkzone@EXEEXT@ ${DESTDIR}${sbindir}
- 	(cd ${DESTDIR}${sbindir}; rm -f named-compilezone@EXEEXT@; ${LINK_PROGRAM} named-checkzone@EXEEXT@ named-compilezone@EXEEXT@)
--	for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8 || exit 1; done
--	(cd ${DESTDIR}${mandir}/man8; rm -f named-compilezone.8; ${LINK_PROGRAM} named-checkzone.8 named-compilezone.8)
- 
- uninstall::
- 	rm -f ${DESTDIR}${mandir}/man8/named-compilezone.8
-diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
-index 87f13dd..7865c0c 100644
---- a/bin/confgen/Makefile.in
-+++ b/bin/confgen/Makefile.in
-@@ -95,13 +95,14 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
- 
--install:: rndc-confgen@EXEEXT@ ddns-confgen@EXEEXT@ installdirs
-+install-man8: rndc-confgen.8 ddns-confgen.8
-+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-+	(cd ${DESTDIR}${mandir}/man8; rm -f tsig-keygen.8; ${LINK_PROGRAM} ddns-confgen.8 tsig-keygen.8)
-+
-+install:: rndc-confgen@EXEEXT@ ddns-confgen@EXEEXT@ installdirs install-man8
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} rndc-confgen@EXEEXT@ ${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ddns-confgen@EXEEXT@ ${DESTDIR}${sbindir}
--	${INSTALL_DATA} ${srcdir}/rndc-confgen.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/ddns-confgen.8 ${DESTDIR}${mandir}/man8
- 	(cd ${DESTDIR}${sbindir}; rm -f tsig-keygen@EXEEXT@; ${LINK_PROGRAM} ddns-confgen@EXEEXT@ tsig-keygen@EXEEXT@)
--	(cd ${DESTDIR}${mandir}/man8; rm -f tsig-keygen.8; ${LINK_PROGRAM} ddns-confgen.8 tsig-keygen.8)
- 
- uninstall::
- 	rm -f ${DESTDIR}${mandir}/man8/tsig-keygen.8
-diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in
-index e2d2802..19361a8 100644
---- a/bin/delv/Makefile.in
-+++ b/bin/delv/Makefile.in
-@@ -63,10 +63,12 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
- 
--install:: delv@EXEEXT@ installdirs
-+install-man1: delv.1
-+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man1
-+
-+install:: delv@EXEEXT@ installdirs install-man1
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
- 		delv@EXEEXT@ ${DESTDIR}${bindir}
--	${INSTALL_DATA} ${srcdir}/delv.1 ${DESTDIR}${mandir}/man1
- 
- uninstall::
- 	rm -f ${DESTDIR}${mandir}/man1/delv.1
-diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
-index a9830a9..d7ac0b6 100644
---- a/bin/dig/Makefile.in
-+++ b/bin/dig/Makefile.in
-@@ -91,16 +91,16 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
- 
--install:: dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@ installdirs
-+install-man1: ${MANPAGES}
-+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man1
-+
-+install:: dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@ installdirs install-man1
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
- 		dig@EXEEXT@ ${DESTDIR}${bindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
- 		host@EXEEXT@ ${DESTDIR}${bindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
- 		nslookup@EXEEXT@ ${DESTDIR}${bindir}
--	for m in ${MANPAGES}; do \
--		${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man1 || exit 1; \
--	done
- 
- uninstall::
- 	for m in ${MANPAGES}; do \
-diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
-index 2239ad1..ce0a177 100644
---- a/bin/dnssec/Makefile.in
-+++ b/bin/dnssec/Makefile.in
-@@ -110,9 +110,11 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
- 
--install:: ${TARGETS} installdirs
-+install-man8: ${MANPAGES}
-+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-+
-+install:: ${TARGETS} installdirs install-man8
- 	for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir} || exit 1; done
--	for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8 || exit 1; done
- 
- uninstall::
- 	for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m || exit 1; done
-diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
-index e1f85a9..d92bc9a 100644
---- a/bin/named/Makefile.in
-+++ b/bin/named/Makefile.in
-@@ -176,12 +176,17 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
- 
--install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
-+install-man5: named.conf.5
-+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man5
-+
-+install-man8: named.8 lwresd.8
-+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-+
-+install-man: install-man5 install-man8
-+
-+install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs install-man
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
- 	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
--	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
- 
- uninstall::
- 	rm -f ${DESTDIR}${mandir}/man5/named.conf.5
-diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
-index ae90616..a058c91 100644
---- a/bin/pkcs11/Makefile.in
-+++ b/bin/pkcs11/Makefile.in
-@@ -71,7 +71,10 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
- 
--install:: ${TARGETS} installdirs
-+install-man8: ${MANPAGES}
-+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-+
-+install:: ${TARGETS} installdirs install-man8
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-list@EXEEXT@ \
- 		${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-destroy@EXEEXT@ \
-@@ -80,10 +83,6 @@ install:: ${TARGETS} installdirs
- 		${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-tokens@EXEEXT@ \
- 		${DESTDIR}${sbindir}
--	${INSTALL_DATA} ${srcdir}/pkcs11-list.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/pkcs11-destroy.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/pkcs11-keygen.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/pkcs11-tokens.8 ${DESTDIR}${mandir}/man8
- 
- uninstall::
- 	rm -f ${DESTDIR}${mandir}/man8/pkcs11-tokens.8
-diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in
-index aa678d4..064c404 100644
---- a/bin/python/Makefile.in
-+++ b/bin/python/Makefile.in
-@@ -47,13 +47,13 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
- 
--install:: ${TARGETS} installdirs
-+install-man8: ${MANPAGES}
-+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-+
-+install:: ${TARGETS} installdirs install-man8
- 	${INSTALL_SCRIPT} dnssec-checkds ${DESTDIR}${sbindir}
- 	${INSTALL_SCRIPT} dnssec-coverage ${DESTDIR}${sbindir}
- 	${INSTALL_SCRIPT} dnssec-keymgr ${DESTDIR}${sbindir}
--	${INSTALL_DATA} ${srcdir}/dnssec-checkds.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/dnssec-keymgr.8 ${DESTDIR}${mandir}/man8
- 	if test -n "${PYTHON}" ; then \
- 		if test -n "${DESTDIR}" ; then \
- 			${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} @PYTHON_INSTALL_LIB@ ; \
-diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
-index 7bf2af4..c395bc7 100644
---- a/bin/tools/Makefile.in
-+++ b/bin/tools/Makefile.in
-@@ -119,17 +119,27 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
- 
--nzd:
-+nzd-man: named-nzd2nzf.8
-+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-+
-+nzd: nzd-man
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-nzd2nzf@EXEEXT@ \
- 		${DESTDIR}${sbindir}
--	${INSTALL_DATA} ${srcdir}/named-nzd2nzf.8 ${DESTDIR}${mandir}/man8
- 
--dnstap:
-+dnstap-man: dnstap-read.1
-+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man1
-+
-+dnstap: dnstap-man
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} dnstap-read@EXEEXT@ \
- 		${DESTDIR}${bindir}
--	${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1
- 
--install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
-+install-man1: arpaname.1 named-rrchecker.1 mdig.1
-+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man1
-+
-+install-man8: named-journalprint.8 nsec3hash.8
-+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
-+
-+install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@ install-man1 install-man8
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} arpaname@EXEEXT@ \
- 		${DESTDIR}${bindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-journalprint@EXEEXT@ \
-@@ -144,13 +154,8 @@ install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
- 		${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} mdig@EXEEXT@ \
- 		${DESTDIR}${bindir}
--	${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1
- 	${INSTALL_DATA} ${srcdir}/isc-hmac-fixup.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/named-journalprint.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/named-rrchecker.1 ${DESTDIR}${mandir}/man1
--	${INSTALL_DATA} ${srcdir}/nsec3hash.8 ${DESTDIR}${mandir}/man8
- 	${INSTALL_DATA} ${srcdir}/genrandom.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1
- 
- uninstall::
- 	rm -f ${DESTDIR}${mandir}/man1/mdig.1
--- 
-2.14.4
-
diff --git a/bind-9.11-pk11.patch b/bind-9.11-pk11.patch
deleted file mode 100644
index d80231495888fd7f92cbc0bd316238572cc15132..0000000000000000000000000000000000000000
--- a/bind-9.11-pk11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
-index 640519a..fc40472 100644
---- a/lib/dns/dst_internal.h
-+++ b/lib/dns/dst_internal.h
-@@ -59,6 +59,9 @@
- #include <openssl/objects.h>
- #include <openssl/rsa.h>
- #endif
-+#if PKCS11CRYPTO
-+#include <pk11/pk11.h>
-+#endif
- 
- ISC_LANG_BEGINDECLS
- 
-diff --git a/lib/isc/include/pk11/internal.h b/lib/isc/include/pk11/internal.h
-index aa8907a..603712a 100644
---- a/lib/isc/include/pk11/internal.h
-+++ b/lib/isc/include/pk11/internal.h
-@@ -13,6 +13,8 @@
- #ifndef PK11_INTERNAL_H
- #define PK11_INTERNAL_H 1
- 
-+#include <pk11/pk11.h>
-+
- /*! \file pk11/internal.h */
- 
- ISC_LANG_BEGINDECLS
diff --git a/bind-9.11-rh1205168.patch b/bind-9.11-rh1205168.patch
deleted file mode 100644
index 181cec9f32d103b38303b8dc99c8825eb7181b43..0000000000000000000000000000000000000000
--- a/bind-9.11-rh1205168.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 90416594843a56550e40b11561807786219ce1c4 Mon Sep 17 00:00:00 2001
-From: Evan Hunt <each@isc.org>
-Date: Mon, 11 Sep 2017 15:01:36 -0700
-Subject: [PATCH] remap getaddrinfo() to irs_getgetaddrinfo()
-
-The libirs version of getaddrinfo() cannot be called from within BIND9.
-
-fix prototypes
----
- lib/irs/include/irs/netdb.h.in | 94 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 94 insertions(+)
-
-diff --git a/lib/irs/include/irs/netdb.h.in b/lib/irs/include/irs/netdb.h.in
-index 23dcd37..f36113d 100644
---- a/lib/irs/include/irs/netdb.h.in
-+++ b/lib/irs/include/irs/netdb.h.in
-@@ -150,6 +150,100 @@ struct addrinfo {
- #define	NI_DGRAM	0x00000010
- 
- /*
-+ * Define to map into irs_ namespace.
-+ */
-+
-+#define IRS_NAMESPACE
-+
-+#ifdef IRS_NAMESPACE
-+
-+/*
-+ * Use our versions not the ones from the C library.
-+ */
-+
-+#ifdef getnameinfo
-+#undef getnameinfo
-+#endif
-+#define getnameinfo irs_getnameinfo
-+
-+#ifdef getaddrinfo
-+#undef getaddrinfo
-+#endif
-+#define getaddrinfo irs_getaddrinfo
-+
-+#ifdef freeaddrinfo
-+#undef freeaddrinfo
-+#endif
-+#define freeaddrinfo irs_freeaddrinfo
-+
-+#ifdef gai_strerror
-+#undef gai_strerror
-+#endif
-+#define gai_strerror irs_gai_strerror
-+
-+#endif
-+
-+extern int getaddrinfo (const char *name,
-+			const char *service,
-+			const struct addrinfo *req,
-+			struct addrinfo **pai);
-+extern int getnameinfo (const struct sockaddr *sa,
-+			socklen_t salen, char *host,
-+			socklen_t hostlen, char *serv,
-+			socklen_t servlen, int flags);
-+extern void freeaddrinfo (struct addrinfo *ai);
-+extern const char *gai_strerror (int ecode);
-+
-+/*
-+ * Define to map into irs_ namespace.
-+ */
-+
-+#define IRS_NAMESPACE
-+
-+#ifdef IRS_NAMESPACE
-+
-+/*
-+ * Use our versions not the ones from the C library.
-+ */
-+
-+#ifdef getnameinfo
-+#undef getnameinfo
-+#endif
-+#define getnameinfo irs_getnameinfo
-+
-+#ifdef getaddrinfo
-+#undef getaddrinfo
-+#endif
-+#define getaddrinfo irs_getaddrinfo
-+
-+#ifdef freeaddrinfo
-+#undef freeaddrinfo
-+#endif
-+#define freeaddrinfo irs_freeaddrinfo
-+
-+#ifdef gai_strerror
-+#undef gai_strerror
-+#endif
-+#define gai_strerror irs_gai_strerror
-+
-+int
-+getaddrinfo(const char *hostname, const char *servname,
-+	    const struct addrinfo *hints, struct addrinfo **res);
-+
-+int
-+getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen,
-+	    char *host, IRS_GETNAMEINFO_BUFLEN_T hostlen,
-+	    char *serv, IRS_GETNAMEINFO_BUFLEN_T servlen,
-+	    IRS_GETNAMEINFO_FLAGS_T flags);
-+
-+void freeaddrinfo (struct addrinfo *ai);
-+
-+IRS_GAISTRERROR_RETURN_T
-+gai_strerror(int ecode);
-+
-+#endif
-+
-+/*
-  * Tell Emacs to use C mode on this file.
-  * Local variables:
-  * mode: c
--- 
-2.9.5
-
diff --git a/bind-9.11-rh1410433.patch b/bind-9.11-rh1410433.patch
deleted file mode 100644
index d30762007a6dc83015b4c6618faaaaed6df31f94..0000000000000000000000000000000000000000
--- a/bind-9.11-rh1410433.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/lib/dns/dyndb.c b/lib/dns/dyndb.c
-index 15561ce..e4449b0 100644
---- a/lib/dns/dyndb.c
-+++ b/lib/dns/dyndb.c
-@@ -133,8 +133,11 @@ load_library(isc_mem_t *mctx, const char *filename, const char *instname,
- 		      instname, filename);
- 
- 	flags = RTLD_NOW|RTLD_LOCAL;
-+#if 0
-+	/* Shared global namespace is required for dns-pkcs11 library */
- #if defined(RTLD_DEEPBIND) && !__SANITIZE_ADDRESS__
- 	flags |= RTLD_DEEPBIND;
-+#endif
- #endif
- 
- 	handle = dlopen(filename, flags);
diff --git a/bind-9.11-rh1624100.patch b/bind-9.11-rh1624100.patch
deleted file mode 100644
index 077582089f2409ffb9e22308a3370c02eedc5bc4..0000000000000000000000000000000000000000
--- a/bind-9.11-rh1624100.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-From f27598743ab6e03271e26f23da4beba748d19c60 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
-Date: Wed, 25 Apr 2018 14:04:31 +0200
-Subject: [PATCH] Replace isc_safe routines with their OpenSSL counter parts
-
-(cherry picked from commit 66ba2fdad583d962a1f4971c85d58381f0849e4d)
-
-Remove isc_safe_memcompare, it's not needed anywhere and can't be replaced with CRYPTO_memcmp()
-
-(cherry picked from commit b105ccee68ccc3c18e6ea530063b3c8e5a42571c)
-
-Fix the isc_safe_memwipe() usage with (NULL, >0)
-
-(cherry picked from commit 083461d3329ff6f2410745848a926090586a9846)
----
- bin/dnssec/dnssec-signzone.c |  2 +-
- lib/dns/nsec3.c              |  4 +-
- lib/dns/spnego.c             |  4 +-
- lib/isc/Makefile.in          |  8 +---
- lib/isc/include/isc/safe.h   | 18 ++------
- lib/isc/safe.c               | 83 ------------------------------------
- lib/isc/tests/safe_test.c    | 18 --------
- 7 files changed, 11 insertions(+), 126 deletions(-)
- delete mode 100644 lib/isc/safe.c
-
-diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
-index 6dded0c..a9c5557 100644
---- a/bin/dnssec/dnssec-signzone.c
-+++ b/bin/dnssec/dnssec-signzone.c
-@@ -784,7 +784,7 @@ hashlist_add_dns_name(hashlist_t *l, /*const*/ dns_name_t *name,
- 
- static int
- hashlist_comp(const void *a, const void *b) {
--	return (isc_safe_memcompare(a, b, hash_length + 1));
-+	return (memcmp(a, b, hash_length + 1));
- }
- 
- static void
-diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c
-index 6ae7ca8..01426d6 100644
---- a/lib/dns/nsec3.c
-+++ b/lib/dns/nsec3.c
-@@ -1963,7 +1963,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, dns_name_t* name,
- 	 * Work out what this NSEC3 covers.
- 	 * Inside (<0) or outside (>=0).
- 	 */
--	scope = isc_safe_memcompare(owner, nsec3.next, nsec3.next_length);
-+	scope = memcmp(owner, nsec3.next, nsec3.next_length);
- 
- 	/*
- 	 * Prepare to compute all the hashes.
-@@ -1987,7 +1987,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, dns_name_t* name,
- 			return (ISC_R_IGNORE);
- 		}
- 
--		order = isc_safe_memcompare(hash, owner, length);
-+		order = memcmp(hash, owner, length);
- 		if (first && order == 0) {
- 			/*
- 			 * The hashes are the same.
-diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
-index ad77f24..670982a 100644
---- a/lib/dns/spnego.c
-+++ b/lib/dns/spnego.c
-@@ -371,7 +371,7 @@ gssapi_spnego_decapsulate(OM_uint32 *,
- 
- /* mod_auth_kerb.c */
- 
--static int
-+static isc_boolean_t
- cmp_gss_type(gss_buffer_t token, gss_OID gssoid)
- {
- 	unsigned char *p;
-@@ -395,7 +395,7 @@ cmp_gss_type(gss_buffer_t token, gss_OID gssoid)
- 	if (((OM_uint32) *p++) != gssoid->length)
- 		return (GSS_S_DEFECTIVE_TOKEN);
- 
--	return (isc_safe_memcompare(p, gssoid->elements, gssoid->length));
-+	return (!isc_safe_memequal(p, gssoid->elements, gssoid->length));
- }
- 
- /* accept_sec_context.c */
-diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
-index 149552a..8529a86 100644
---- a/lib/isc/Makefile.in
-+++ b/lib/isc/Makefile.in
-@@ -60,7 +60,7 @@ OBJS =		@ISC_EXTRA_OBJS@ @ISC_PK11_O@ @ISC_PK11_RESULT_O@ \
- 		parseint.@O@ portset.@O@ quota.@O@ radix.@O@ random.@O@ \
- 		ratelimiter.@O@ refcount.@O@ region.@O@ regex.@O@ result.@O@ \
- 		rwlock.@O@ \
--		safe.@O@ serial.@O@ siphash.@O@ sha1.@O@ sha2.@O@ sockaddr.@O@ stats.@O@ \
-+		serial.@O@ siphash.@O@ sha1.@O@ sha2.@O@ sockaddr.@O@ stats.@O@ \
- 		string.@O@ strtoul.@O@ symtab.@O@ task.@O@ taskpool.@O@ \
- 		tm.@O@ timer.@O@ utf8.@O@ version.@O@ \
- 		${UNIXOBJS} ${NLSOBJS} ${THREADOBJS}
-@@ -79,7 +79,7 @@ SRCS =		@ISC_EXTRA_SRCS@ @ISC_PK11_C@ @ISC_PK11_RESULT_C@ \
- 		netaddr.c netscope.c pool.c ondestroy.c \
- 		parseint.c portset.c quota.c radix.c random.c ${CHACHASRCS} \
- 		ratelimiter.c refcount.c region.c regex.c result.c rwlock.c \
--		safe.c serial.c siphash.c sha1.c sha2.c sockaddr.c stats.c string.c \
-+		serial.c siphash.c sha1.c sha2.c sockaddr.c stats.c string.c \
- 		strtoul.c symtab.c task.c taskpool.c timer.c \
- 		tm.c utf8.c version.c
- 
-@@ -95,10 +95,6 @@ TESTDIRS =	@UNITTESTS@
- 
- @BIND9_MAKE_RULES@
- 
--safe.@O@: safe.c
--	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} @CCNOOPT@ \
--		-c ${srcdir}/safe.c
--
- version.@O@: version.c
- 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
- 		-DVERSION=\"${VERSION}\" \
-diff --git a/lib/isc/include/isc/safe.h b/lib/isc/include/isc/safe.h
-index 66ed08b..88b8f47 100644
---- a/lib/isc/include/isc/safe.h
-+++ b/lib/isc/include/isc/safe.h
-@@ -15,29 +15,19 @@
- 
- /*! \file isc/safe.h */
- 
--#include <stdbool.h>
--
--#include <isc/types.h>
--#include <stdlib.h>
-+#include <isc/lang.h>
-+#include <openssl/crypto.h>
- 
- ISC_LANG_BEGINDECLS
- 
--bool
--isc_safe_memequal(const void *s1, const void *s2, size_t n);
-+#define isc_safe_memequal(s1, s2, n) !CRYPTO_memcmp(s1, s2, n)
- /*%<
-  * Returns true iff. two blocks of memory are equal, otherwise
-  * false.
-  *
-  */
- 
--int
--isc_safe_memcompare(const void *b1, const void *b2, size_t len);
--/*%<
-- * Clone of libc memcmp() which is safe to differential timing attacks.
-- */
--
--void
--isc_safe_memwipe(void *ptr, size_t len);
-+#define isc_safe_memwipe(ptr, len) OPENSSL_cleanse(ptr, len)
- /*%<
-  * Clear the memory of length `len` pointed to by `ptr`.
-  *
-diff --git a/lib/isc/safe.c b/lib/isc/safe.c
-deleted file mode 100644
-index 7a464b6..0000000
---- a/lib/isc/safe.c
-+++ /dev/null
-@@ -1,83 +0,0 @@
--/*
-- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-- *
-- * This Source Code Form is subject to the terms of the Mozilla Public
-- * License, v. 2.0. If a copy of the MPL was not distributed with this
-- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
-- *
-- * See the COPYRIGHT file distributed with this work for additional
-- * information regarding copyright ownership.
-- */
--
--/*! \file */
--
--#include <config.h>
--
--#include <stdbool.h>
--
--#include <isc/safe.h>
--#include <isc/string.h>
--#include <isc/util.h>
--
--#ifdef WIN32
--#include <windows.h>
--#endif
--
--#ifdef _MSC_VER
--#pragma optimize("", off)
--#endif
--
--bool
--isc_safe_memequal(const void *s1, const void *s2, size_t n) {
--	uint8_t acc = 0;
--
--	if (n != 0U) {
--		const uint8_t *p1 = s1, *p2 = s2;
--
--		do {
--			acc |= *p1++ ^ *p2++;
--		} while (--n != 0U);
--	}
--	return (acc == 0);
--}
--
--
--int
--isc_safe_memcompare(const void *b1, const void *b2, size_t len) {
--	const unsigned char *p1 = b1, *p2 = b2;
--	size_t i;
--	int res = 0, done = 0;
--
--	for (i = 0; i < len; i++) {
--		/* lt is -1 if p1[i] < p2[i]; else 0. */
--		int lt = (p1[i] - p2[i]) >> CHAR_BIT;
--
--		/* gt is -1 if p1[i] > p2[i]; else 0. */
--		int gt = (p2[i] - p1[i]) >> CHAR_BIT;
--
--		/* cmp is 1 if p1[i] > p2[i]; -1 if p1[i] < p2[i]; else 0. */
--		int cmp = lt - gt;
--
--		/* set res = cmp if !done. */
--		res |= cmp & ~done;
--
--		/* set done if p1[i] != p2[i]. */
--		done |= lt | gt;
--	}
--
--	return (res);
--}
--
--void
--isc_safe_memwipe(void *ptr, size_t len) {
--	if (ISC_UNLIKELY(ptr == NULL || len == 0))
--		return;
--
--#ifdef WIN32
--	SecureZeroMemory(ptr, len);
--#elif HAVE_EXPLICIT_BZERO
--	explicit_bzero(ptr, len);
--#else
--	memset(ptr, 0, len);
--#endif
--}
-diff --git a/lib/isc/tests/safe_test.c b/lib/isc/tests/safe_test.c
-index 266ac75..60e9181 100644
---- a/lib/isc/tests/safe_test.c
-+++ b/lib/isc/tests/safe_test.c
-@@ -45,22 +45,6 @@ isc_safe_memequal_test(void **state) {
- 				       "\x00\x00\x00\x00", 4));
- }
- 
--/* test isc_safe_memcompare() */
--static void
--isc_safe_memcompare_test(void **state) {
--	UNUSED(state);
--
--	assert_int_equal(isc_safe_memcompare("test", "test", 4), 0);
--	assert_true(isc_safe_memcompare("test", "tesc", 4) > 0);
--	assert_true(isc_safe_memcompare("test", "tesy", 4) < 0);
--	assert_int_equal(isc_safe_memcompare("\x00\x00\x00\x00",
--					     "\x00\x00\x00\x00", 4), 0);
--	assert_true(isc_safe_memcompare("\x00\x00\x00\x00",
--					"\x00\x00\x00\x01", 4) < 0);
--	assert_true(isc_safe_memcompare("\x00\x00\x00\x02",
--					"\x00\x00\x00\x00", 4) > 0);
--}
--
- /* test isc_safe_memwipe() */
- static void
- isc_safe_memwipe_test(void **state) {
-@@ -69,7 +53,6 @@ isc_safe_memwipe_test(void **state) {
- 	/* These should pass. */
- 	isc_safe_memwipe(NULL, 0);
- 	isc_safe_memwipe((void *) -1, 0);
--	isc_safe_memwipe(NULL, 42);
- 
- 	/*
- 	 * isc_safe_memwipe(ptr, size) should function same as
-@@ -108,7 +91,6 @@ main(void) {
- 	const struct CMUnitTest tests[] = {
- 		cmocka_unit_test(isc_safe_memequal_test),
- 		cmocka_unit_test(isc_safe_memwipe_test),
--		cmocka_unit_test(isc_safe_memcompare_test),
- 	};
- 
- 	return (cmocka_run_group_tests(tests, NULL, NULL));
--- 
-2.26.2
-
diff --git a/bind-9.11-rh1663318.patch b/bind-9.11-rh1663318.patch
deleted file mode 100644
index 1af7efbc5da4d172aa2668102f8be6b114b3d8b3..0000000000000000000000000000000000000000
--- a/bind-9.11-rh1663318.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b16a1ff25644bb075f454afe68ee63f6f385ca9c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Wed, 23 Jan 2019 21:11:07 +0100
-Subject: [PATCH] Made RAND_status check optional (broke --disable-crypto-rand)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Unlike upstream, skip it also for DHCP.
-
-Disable RAND_status also in non-threaded builds. DHCP is built without
-threads and should not check RAND_status on dns library initialization.
-Lack of entropy is possible state for dhclient, but it must not fail
-even in this case. Because DHCP itself does not require custom random
-generator, leave default RAND_OpenSSL configured. It should help TLS
-connection to LDAP in single DHCP binary, while keeping secure random
-data if needed.
-
-(modified upstream commit 8a98277811ea50035ff37b744fa3dc5b75bee099)
-
-Signed-off-by: Petr Menšík <pemensik@redhat.com>
----
- lib/dns/openssl_link.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
-index 7a233dd..941eb17 100644
---- a/lib/dns/openssl_link.c
-+++ b/lib/dns/openssl_link.c
-@@ -289,6 +289,7 @@ dst__openssl_init(const char *engine) {
- #endif
- #endif /* !defined(OPENSSL_NO_ENGINE) */
- 
-+#if defined(ISC_PLATFORM_CRYPTORANDOM) && defined(ISC_PLATFORM_USETHREADS)
- 	/* Protect ourselves against unseeded PRNG */
- 	if (RAND_status() != 1) {
- 		FATAL_ERROR(__FILE__, __LINE__,
-@@ -296,6 +297,7 @@ dst__openssl_init(const char *engine) {
- 			    "cannot be initialized (see the `PRNG not "
- 			    "seeded' message in the OpenSSL FAQ)");
- 	}
-+#endif
- 
- 	return (ISC_R_SUCCESS);
- 
--- 
-2.20.1
-
diff --git a/bind-9.11-rh1666814.patch b/bind-9.11-rh1666814.patch
index ea1df5dec6118dea393fad53d70e3e28f8dd4683..533781d7721081eb4bb1b642bca9f5112644d45e 100644
--- a/bind-9.11-rh1666814.patch
+++ b/bind-9.11-rh1666814.patch
@@ -1,37 +1,29 @@
-From 3bb29f45604ac6890f4ea5cdcbd1a62e6dad14a7 Mon Sep 17 00:00:00 2001
+From d05d116da39c0a5c580ceaac6ba069899b82c5a0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
 Date: Wed, 16 Jan 2019 16:27:33 +0100
-Subject: [PATCH 2/2] Fix possible crash when loading corrupted file
+Subject: [PATCH] Fix possible crash when loading corrupted file
 
 Some values passes internal triggers by coincidence. Fix the check and
 check also first_node_offset before even passing it further.
 ---
- lib/dns/rbt.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ lib/dns/rbt.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
-index 62d0826..b029b7d 100644
+index 5aee5f6..7f2c2d2 100644
 --- a/lib/dns/rbt.c
 +++ b/lib/dns/rbt.c
-@@ -787,7 +787,7 @@ treefix(dns_rbt_t *rbt, void *base, size_t filesize, dns_rbtnode_t *n,
- 		return (ISC_R_SUCCESS);
- 
- 	CONFIRM((void *) n >= base);
--	CONFIRM((char *) n - (char *) base <= (int) nodemax);
-+	CONFIRM((size_t)((char *) n - (char *) base) <= nodemax);
- 	CONFIRM(DNS_RBTNODE_VALID(n));
- 
- 	dns_name_init(&nodename, NULL);
-@@ -939,7 +939,8 @@ dns_rbt_deserialize_tree(void *base_address, size_t filesize,
- 	rbt->root = (dns_rbtnode_t *)((char *)base_address +
- 				header_offset + header->first_node_offset);
+@@ -945,7 +945,9 @@ dns_rbt_deserialize_tree(void *base_address, size_t filesize,
+ 	rbt->root = (dns_rbtnode_t *)((char *)base_address + header_offset +
+ 				      header->first_node_offset);
  
 -	if ((header->nodecount * sizeof(dns_rbtnode_t)) > filesize) {
 +	if ((header->nodecount * sizeof(dns_rbtnode_t)) > filesize
 +	    || header->first_node_offset > filesize) {
++
  		result = ISC_R_INVALIDFILE;
  		goto cleanup;
  	}
 -- 
-2.20.1
+2.31.1
 
diff --git a/bind-9.11-rh1732883.patch b/bind-9.11-rh1732883.patch
deleted file mode 100644
index 14bf2654a59e1a47136d13ef1713ff1ebf110ca5..0000000000000000000000000000000000000000
--- a/bind-9.11-rh1732883.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From 6010876e561b4345e569ffd11eaec9ea52725817 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Wed, 24 Jul 2019 17:15:55 +0200
-Subject: [PATCH] Detect system time jumps
-
-In case if system time was changed backward it's possible to have ip
-address dropped by the kernel due to lifetime expirity. Try to detect
-this situation using either monotonic time or saved timestamp and execute
-go_reboot() procedure to request lease extention
----
- lib/isc/include/isc/result.h    |  3 ++-
- lib/isc/include/isc/util.h      |  3 +++
- lib/isc/result.c                |  2 ++
- lib/isc/unix/app.c              | 39 +++++++++++++++++++++++++++++----
- lib/isc/unix/include/isc/time.h | 20 +++++++++++++++++
- lib/isc/unix/time.c             | 22 +++++++++++++++++++
- 6 files changed, 84 insertions(+), 5 deletions(-)
-
-diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
-index 0389efa..149cde5 100644
---- a/lib/isc/include/isc/result.h
-+++ b/lib/isc/include/isc/result.h
-@@ -89,7 +89,8 @@
- #define ISC_R_DISCFULL			67	/*%< disc full */
- #define ISC_R_DEFAULT			68	/*%< default */
- #define ISC_R_IPV4PREFIX		69	/*%< IPv4 prefix */
--#define ISC_R_NRESULTS 			70
-+#define ISC_R_TIMESHIFTED               70      /*%< system time changed */
-+#define ISC_R_NRESULTS 			71
- 
- ISC_LANG_BEGINDECLS
- 
-diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
-index 973c348..8160dd3 100644
---- a/lib/isc/include/isc/util.h
-+++ b/lib/isc/include/isc/util.h
-@@ -289,6 +289,9 @@ extern void mock_assert(const int result, const char* const expression,
-  * Time
-  */
- #define TIME_NOW(tp) 	RUNTIME_CHECK(isc_time_now((tp)) == ISC_R_SUCCESS)
-+#ifdef CLOCK_BOOTTIME
-+#define TIME_MONOTONIC(tp) 	RUNTIME_CHECK(isc_time_boottime((tp)) == ISC_R_SUCCESS)
-+#endif
- 
- /*%
-  * Alignment
-diff --git a/lib/isc/result.c b/lib/isc/result.c
-index a9db132..7c04831 100644
---- a/lib/isc/result.c
-+++ b/lib/isc/result.c
-@@ -105,6 +105,7 @@ static const char *description[ISC_R_NRESULTS] = {
- 	"disc full",				/*%< 67 */
- 	"default",				/*%< 68 */
- 	"IPv4 prefix",				/*%< 69 */
-+        "time changed",                         /*%< 70 */
- };
- 
- static const char *identifier[ISC_R_NRESULTS] = {
-@@ -178,6 +179,7 @@ static const char *identifier[ISC_R_NRESULTS] = {
- 	"ISC_R_DISCFULL",
- 	"ISC_R_DEFAULT",
- 	"ISC_R_IPV4PREFIX",
-+        "ISC_R_TIMESHIFTED",
- };
- 
- #define ISC_RESULT_RESULTSET			2
-diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c
-index a6e9882..52eb3e0 100644
---- a/lib/isc/unix/app.c
-+++ b/lib/isc/unix/app.c
-@@ -442,15 +442,48 @@ isc__app_ctxonrun(isc_appctx_t *ctx0, isc_mem_t *mctx, isc_task_t *task,
- static isc_result_t
- evloop(isc__appctx_t *ctx) {
- 	isc_result_t result;
-+        isc_time_t now;
-+#ifdef CLOCK_BOOTTIME
-+        isc_time_t monotonic;
-+        uint64_t diff  = 0;
-+#else
-+        isc_time_t prev;
-+        TIME_NOW(&prev);
-+#endif
-+
-+
- 
- 	while (!ctx->want_shutdown) {
- 		int n;
--		isc_time_t when, now;
-+		isc_time_t when;
- 		struct timeval tv, *tvp;
- 		isc_socketwait_t *swait;
- 		bool readytasks;
- 		bool call_timer_dispatch = false;
--
-+                uint64_t us;
-+
-+#ifdef CLOCK_BOOTTIME
-+                // TBD macros for following three lines
-+                TIME_NOW(&now);
-+                TIME_MONOTONIC(&monotonic);
-+                INSIST(now.seconds > monotonic.seconds)
-+                us = isc_time_microdiff (&now, &monotonic);
-+                if (us < diff){
-+                  us = diff - us;
-+                  if (us > 1000000){ // ignoring shifts less than one second
-+                    return ISC_R_TIMESHIFTED;
-+                  };
-+                  diff = isc_time_microdiff (&now, &monotonic);
-+                } else {
-+                  diff = isc_time_microdiff (&now, &monotonic);
-+                  // not implemented
-+                }
-+#else
-+                TIME_NOW(&now);
-+                if (isc_time_compare (&now, &prev) < 0)
-+                  return ISC_R_TIMESHIFTED;
-+                TIME_NOW(&prev);
-+#endif
- 		/*
- 		 * Check the reload (or suspend) case first for exiting the
- 		 * loop as fast as possible in case:
-@@ -475,8 +508,6 @@ evloop(isc__appctx_t *ctx) {
- 			if (result != ISC_R_SUCCESS)
- 				tvp = NULL;
- 			else {
--				uint64_t us;
--
- 				TIME_NOW(&now);
- 				us = isc_time_microdiff(&when, &now);
- 				if (us == 0)
-diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h
-index b864c29..5dd43c9 100644
---- a/lib/isc/unix/include/isc/time.h
-+++ b/lib/isc/unix/include/isc/time.h
-@@ -132,6 +132,26 @@ isc_time_isepoch(const isc_time_t *t);
-  *\li	't' is a valid pointer.
-  */
- 
-+#ifdef CLOCK_BOOTTIME
-+isc_result_t
-+isc_time_boottime(isc_time_t *t);
-+/*%<
-+ * Set 't' to monotonic time from previous boot
-+ * it's not affected by system time change. It also
-+ * includes the time system was suspended
-+ *
-+ * Requires:
-+ *\li	't' is a valid pointer.
-+ *
-+ * Returns:
-+ *
-+ *\li	Success
-+ *\li	Unexpected error
-+ *		Getting the time from the system failed.
-+ */
-+#endif /* CLOCK_BOOTTIME */
-+ 
-+
- isc_result_t
- isc_time_now(isc_time_t *t);
- /*%<
-diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c
-index 8edc9df..fe0bb91 100644
---- a/lib/isc/unix/time.c
-+++ b/lib/isc/unix/time.c
-@@ -498,3 +498,25 @@ isc_time_formatISO8601ms(const isc_time_t *t, char *buf, unsigned int len) {
- 			 t->nanoseconds / NS_PER_MS);
- 	}
- }
-+
-+
-+#ifdef CLOCK_BOOTTIME
-+isc_result_t
-+isc_time_boottime(isc_time_t *t) {
-+  struct timespec ts;
-+  
-+  char strbuf[ISC_STRERRORSIZE];
-+
-+  if (clock_gettime (CLOCK_BOOTTIME, &ts) != 0){
-+    isc__strerror(errno, strbuf, sizeof(strbuf));
-+    UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", strbuf);
-+    return (ISC_R_UNEXPECTED);    
-+  }
-+
-+  t->seconds = ts.tv_sec;
-+  t->nanoseconds = ts.tv_nsec;
-+
-+  return (ISC_R_SUCCESS);
-+  
-+};
-+#endif
--- 
-2.20.1
-
diff --git a/bind-9.11-rh1736762-5.patch b/bind-9.11-rh1736762-5.patch
deleted file mode 100644
index e14efcab19b1e99bc96dddbff2ca751145711e90..0000000000000000000000000000000000000000
--- a/bind-9.11-rh1736762-5.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 6257d829c9d7e71ac51bcdc6b5b981c7a19200e2 Mon Sep 17 00:00:00 2001
-From: Mark Andrews <marka@isc.org>
-Date: Mon, 25 Nov 2019 05:46:55 +0000
-Subject: [PATCH] Merge branch
- '1373-threadsanitizer-data-race-rbtdb-c-5193-in-detachnode' into 'master'
-
-Resolve "ThreadSanitizer: data race rbtdb.c:5193 in detachnode"
-
-Closes #1373
-
-See merge request isc-projects/bind9!2598
----
- lib/dns/include/dns/rbt.h | 22 +++++++++-------------
- 1 file changed, 9 insertions(+), 13 deletions(-)
-
-diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
-index 67ac3e4d8a..a084bd6193 100644
---- a/lib/dns/include/dns/rbt.h
-+++ b/lib/dns/include/dns/rbt.h
-@@ -49,10 +49,7 @@ ISC_LANG_BEGINDECLS
- 
- #define DNS_RBT_USEMAGIC 1
- 
--/*
-- * These should add up to 30.
-- */
--#define DNS_RBT_LOCKLENGTH                      10
-+#define DNS_RBT_LOCKLENGTH		(sizeof(((dns_rbtnode_t *)0)->locknum)*8)
- #define DNS_RBT_REFLENGTH                       20
- 
- #define DNS_RBTNODE_MAGIC               ISC_MAGIC('R','B','N','O')
-@@ -159,16 +156,15 @@ struct dns_rbtnode {
- 	 * separate region of memory.
- 	 */
- 	void *data;
--	unsigned int :0;                /* start of bitfields c/o node lock */
--	unsigned int dirty:1;
--	unsigned int wild:1;
--	unsigned int locknum:DNS_RBT_LOCKLENGTH;
--#ifndef DNS_RBT_USEISCREFCOUNT
--	unsigned int references:DNS_RBT_REFLENGTH;
--#endif
--	unsigned int :0;                /* end of bitfields c/o node lock */
-+	uint8_t :0;                /* start of bitfields c/o node lock */
-+	uint8_t dirty:1;
-+	uint8_t wild:1;
-+	uint8_t :0;                /* end of bitfields c/o node lock */
-+	uint16_t locknum;	   /* note that this is not in the bitfield */
- #ifdef DNS_RBT_USEISCREFCOUNT
--	isc_refcount_t references; /* note that this is not in the bitfield */
-+	isc_refcount_t references;
-+#else
-+	unsigned int references:DNS_RBT_REFLENGTH;
- #endif
- 	/*@}*/
- };
--- 
-2.21.0
-
diff --git a/bind-9.11-rt31459.patch b/bind-9.11-rt31459.patch
deleted file mode 100644
index 266f78c556d0e17c9bc35e2832b28f8f44c6827f..0000000000000000000000000000000000000000
--- a/bind-9.11-rt31459.patch
+++ /dev/null
@@ -1,2122 +0,0 @@
-From 5c29299e43db5a4e6f8b1b07af84dfe1687c4c2b Mon Sep 17 00:00:00 2001
-From: Evan Hunt <each@isc.org>
-Date: Tue, 12 Sep 2017 19:05:46 -0700
-Subject: [PATCH] rebased rt31459c
-
-[rt31459d] update the newer tools
-
-[rt31459d] setup entropy in dns_lib_init()
-
-[rt31459d] silence compiler warning
-
-DNS_OPENSSL_LIBS -> DST_OPENSSL_LIBS
-
-Include new unit test
----
- bin/confgen/keygen.c                     |   7 +
- bin/dnssec/dnssec-dsfromkey.c            |   8 +-
- bin/dnssec/dnssec-importkey.c            |   8 +-
- bin/dnssec/dnssec-revoke.c               |   8 +-
- bin/dnssec/dnssec-settime.c              |   8 +-
- bin/dnssec/dnssec-signzone.c             |  11 +-
- bin/dnssec/dnssec-verify.c               |   8 +-
- bin/dnssec/dnssectool.c                  |  11 +-
- bin/named/server.c                       |   6 +
- bin/nsupdate/nsupdate.c                  |  14 +-
- bin/tests/makejournal.c                  |   6 +-
- bin/tests/system/pipelined/pipequeries.c |  20 +-
- bin/tests/system/pipelined/tests.sh      |   4 +-
- bin/tests/system/rsabigexponent/bigkey.c |   4 +
- bin/tests/system/tkey/keycreate.c        |  26 ++-
- bin/tests/system/tkey/keydelete.c        |  26 ++-
- bin/tests/system/tkey/tests.sh           |   8 +-
- bin/tools/mdig.c                         |   3 +-
- configure                                | 250 +++++++++++++----------
- configure.ac                             |  77 ++++++-
- lib/dns/dst_api.c                        |  21 +-
- lib/dns/include/dst/dst.h                |   8 +
- lib/dns/lib.c                            |  15 +-
- lib/dns/openssl_link.c                   |  72 ++++++-
- lib/dns/pkcs11.c                         |  29 ++-
- lib/dns/tests/Kyuafile                   |   1 +
- lib/dns/tests/Makefile.in                |   7 +
- lib/dns/tests/dstrandom_test.c           | 115 +++++++++++
- lib/dns/win32/libdns.def.in              |   7 +
- lib/isc/entropy.c                        |  24 +++
- lib/isc/include/isc/entropy.h            |  12 ++
- lib/isc/include/isc/platform.h.in        |   5 +
- lib/isc/include/isc/types.h              |   2 +
- lib/isc/pk11.c                           |  12 +-
- lib/isc/win32/include/isc/platform.h.in  |   5 +
- win32utils/Configure                     |  28 ++-
- 36 files changed, 701 insertions(+), 175 deletions(-)
- create mode 100644 lib/dns/tests/dstrandom_test.c
-
-diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c
-index 5015abb..295e16f 100644
---- a/bin/confgen/keygen.c
-+++ b/bin/confgen/keygen.c
-@@ -165,6 +165,13 @@ generate_key(isc_mem_t *mctx, const char *randomfile, dns_secalg_t alg,
- 		randomfile = NULL;
- 		open_keyboard = ISC_ENTROPY_KEYBOARDYES;
- 	}
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+	if (randomfile != NULL &&
-+	    strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) {
-+		randomfile = NULL;
-+		isc_entropy_usehook(ectx, true);
-+	}
-+#endif
- 	DO("start entropy source", isc_entropy_usebestsource(ectx,
- 							     &entropy_source,
- 							     randomfile,
-diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c
-index d9d6bb9..de4b15f 100644
---- a/bin/dnssec/dnssec-dsfromkey.c
-+++ b/bin/dnssec/dnssec-dsfromkey.c
-@@ -498,14 +498,14 @@ main(int argc, char **argv) {
- 
- 	if (ectx == NULL)
- 		setup_entropy(mctx, NULL, &ectx);
--	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
--	if (result != ISC_R_SUCCESS)
--		fatal("could not initialize hash");
- 	result = dst_lib_init(mctx, ectx,
- 			      ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
- 	if (result != ISC_R_SUCCESS)
- 		fatal("could not initialize dst: %s",
- 		      isc_result_totext(result));
-+	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
-+	if (result != ISC_R_SUCCESS)
-+		fatal("could not initialize hash");
- 	isc_entropy_stopcallbacksources(ectx);
- 
- 	setup_logging(mctx, &log);
-@@ -574,8 +574,8 @@ main(int argc, char **argv) {
- 	if (dns_rdataset_isassociated(&rdataset))
- 		dns_rdataset_disassociate(&rdataset);
- 	cleanup_logging(&log);
--	dst_lib_destroy();
- 	isc_hash_destroy();
-+	dst_lib_destroy();
- 	cleanup_entropy(&ectx);
- 	dns_name_destroy();
- 	if (verbose > 10)
-diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c
-index d65a514..04b3094 100644
---- a/bin/dnssec/dnssec-importkey.c
-+++ b/bin/dnssec/dnssec-importkey.c
-@@ -404,14 +404,14 @@ main(int argc, char **argv) {
- 
- 	if (ectx == NULL)
- 		setup_entropy(mctx, NULL, &ectx);
--	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
--	if (result != ISC_R_SUCCESS)
--		fatal("could not initialize hash");
- 	result = dst_lib_init(mctx, ectx,
- 			      ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
- 	if (result != ISC_R_SUCCESS)
- 		fatal("could not initialize dst: %s",
- 		      isc_result_totext(result));
-+	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
-+	if (result != ISC_R_SUCCESS)
-+		fatal("could not initialize hash");
- 	isc_entropy_stopcallbacksources(ectx);
- 
- 	setup_logging(mctx, &log);
-@@ -455,8 +455,8 @@ main(int argc, char **argv) {
- 	if (dns_rdataset_isassociated(&rdataset))
- 		dns_rdataset_disassociate(&rdataset);
- 	cleanup_logging(&log);
--	dst_lib_destroy();
- 	isc_hash_destroy();
-+	dst_lib_destroy();
- 	cleanup_entropy(&ectx);
- 	dns_name_destroy();
- 	if (verbose > 10)
-diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c
-index 7d82dbf..10f9359 100644
---- a/bin/dnssec/dnssec-revoke.c
-+++ b/bin/dnssec/dnssec-revoke.c
-@@ -184,14 +184,14 @@ main(int argc, char **argv) {
- 
- 	if (ectx == NULL)
- 		setup_entropy(mctx, NULL, &ectx);
--	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
--	if (result != ISC_R_SUCCESS)
--		fatal("Could not initialize hash");
- 	result = dst_lib_init2(mctx, ectx, engine,
- 			       ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
- 	if (result != ISC_R_SUCCESS)
- 		fatal("Could not initialize dst: %s",
- 		      isc_result_totext(result));
-+	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
-+	if (result != ISC_R_SUCCESS)
-+		fatal("Could not initialize hash");
- 	isc_entropy_stopcallbacksources(ectx);
- 
- 	result = dst_key_fromnamedfile(filename, dir,
-@@ -273,8 +273,8 @@ main(int argc, char **argv) {
- 
- cleanup:
- 	dst_key_free(&key);
--	dst_lib_destroy();
- 	isc_hash_destroy();
-+	dst_lib_destroy();
- 	cleanup_entropy(&ectx);
- 	if (verbose > 10)
- 		isc_mem_stats(mctx, stdout);
-diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c
-index 7afcaee..1cfa511 100644
---- a/bin/dnssec/dnssec-settime.c
-+++ b/bin/dnssec/dnssec-settime.c
-@@ -380,14 +380,14 @@ main(int argc, char **argv) {
- 
- 	if (ectx == NULL)
- 		setup_entropy(mctx, NULL, &ectx);
--	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
--	if (result != ISC_R_SUCCESS)
--		fatal("Could not initialize hash");
- 	result = dst_lib_init2(mctx, ectx, engine,
- 			       ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
- 	if (result != ISC_R_SUCCESS)
- 		fatal("Could not initialize dst: %s",
- 		      isc_result_totext(result));
-+	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
-+	if (result != ISC_R_SUCCESS)
-+		fatal("Could not initialize hash");
- 	isc_entropy_stopcallbacksources(ectx);
- 
- 	if (predecessor != NULL) {
-@@ -672,8 +672,8 @@ main(int argc, char **argv) {
- 	if (prevkey != NULL)
- 		dst_key_free(&prevkey);
- 	dst_key_free(&key);
--	dst_lib_destroy();
- 	isc_hash_destroy();
-+	dst_lib_destroy();
- 	cleanup_entropy(&ectx);
- 	if (verbose > 10)
- 		isc_mem_stats(mctx, stdout);
-diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
-index 319a805..27ae4d4 100644
---- a/bin/dnssec/dnssec-signzone.c
-+++ b/bin/dnssec/dnssec-signzone.c
-@@ -3460,14 +3460,15 @@ main(int argc, char *argv[]) {
- 	if (!pseudorandom)
- 		eflags |= ISC_ENTROPY_GOODONLY;
- 
--	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
--	if (result != ISC_R_SUCCESS)
--		fatal("could not create hash context");
--
- 	result = dst_lib_init2(mctx, ectx, engine, eflags);
- 	if (result != ISC_R_SUCCESS)
- 		fatal("could not initialize dst: %s",
- 		      isc_result_totext(result));
-+
-+	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
-+	if (result != ISC_R_SUCCESS)
-+		fatal("could not create hash context");
-+
- 	isc_stdtime_get(&now);
- 
- 	if (startstr != NULL) {
-@@ -3879,8 +3880,8 @@ main(int argc, char *argv[]) {
- 	dns_master_styledestroy(&dsstyle, mctx);
- 
- 	cleanup_logging(&log);
--	dst_lib_destroy();
- 	isc_hash_destroy();
-+	dst_lib_destroy();
- 	cleanup_entropy(&ectx);
- 	dns_name_destroy();
- 	if (verbose > 10)
-diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c
-index 4c293bf..3263cbc 100644
---- a/bin/dnssec/dnssec-verify.c
-+++ b/bin/dnssec/dnssec-verify.c
-@@ -281,15 +281,15 @@ main(int argc, char *argv[]) {
- 	if (ectx == NULL)
- 		setup_entropy(mctx, NULL, &ectx);
- 
--	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
--	if (result != ISC_R_SUCCESS)
--		fatal("could not create hash context");
--
- 	result = dst_lib_init2(mctx, ectx, engine, ISC_ENTROPY_BLOCKING);
- 	if (result != ISC_R_SUCCESS)
- 		fatal("could not initialize dst: %s",
- 		      isc_result_totext(result));
- 
-+	result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
-+	if (result != ISC_R_SUCCESS)
-+		fatal("could not create hash context");
-+
- 	isc_stdtime_get(&now);
- 
- 	rdclass = strtoclass(classname);
-diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
-index 618ec5b..5654435 100644
---- a/bin/dnssec/dnssectool.c
-+++ b/bin/dnssec/dnssectool.c
-@@ -34,6 +34,7 @@
- #include <isc/heap.h>
- #include <isc/list.h>
- #include <isc/mem.h>
-+#include <isc/platform.h>
- #include <isc/print.h>
- #include <isc/string.h>
- #include <isc/time.h>
-@@ -235,7 +236,8 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) {
- 	if (*ectx == NULL) {
- 		result = isc_entropy_create(mctx, ectx);
- 		if (result != ISC_R_SUCCESS)
--			fatal("could not create entropy object");
-+			fatal("could not create entropy object: %s",
-+			      isc_result_totext(result));
- 		ISC_LIST_INIT(sources);
- 	}
- 
-@@ -244,6 +246,13 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) {
- 		randomfile = NULL;
- 	}
- 
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+	if (randomfile != NULL &&
-+	    strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) {
-+		randomfile = NULL;
-+		isc_entropy_usehook(*ectx, true);
-+	}
-+#endif
- 	result = isc_entropy_usebestsource(*ectx, &source, randomfile,
- 					   usekeyboard);
- 
-diff --git a/bin/named/server.c b/bin/named/server.c
-index 4e503e5..f27071f 100644
---- a/bin/named/server.c
-+++ b/bin/named/server.c
-@@ -36,6 +36,7 @@
- #include <isc/lex.h>
- #include <isc/meminfo.h>
- #include <isc/parseint.h>
-+#include <isc/platform.h>
- #include <isc/portset.h>
- #include <isc/print.h>
- #include <isc/random.h>
-@@ -8217,6 +8218,10 @@ load_configuration(const char *filename, ns_server_t *server,
- 				      "no source of entropy found");
- 		} else {
- 			const char *randomdev = cfg_obj_asstring(obj);
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+			if (strcmp(randomdev, ISC_PLATFORM_CRYPTORANDOM) == 0)
-+				isc_entropy_usehook(ns_g_entropy, true);
-+#else
- 			int level = ISC_LOG_ERROR;
- 			result = isc_entropy_createfilesource(ns_g_entropy,
- 							      randomdev);
-@@ -8251,6 +8256,7 @@ load_configuration(const char *filename, ns_server_t *server,
- 				}
- 				isc_entropy_detach(&ns_g_fallbackentropy);
- 			}
-+#endif
- #endif
- 		}
- 
-diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
-index bbb3936..0286987 100644
---- a/bin/nsupdate/nsupdate.c
-+++ b/bin/nsupdate/nsupdate.c
-@@ -272,7 +272,8 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) {
- 	if (*ectx == NULL) {
- 		result = isc_entropy_create(mctx, ectx);
- 		if (result != ISC_R_SUCCESS)
--			fatal("could not create entropy object");
-+			fatal("could not create entropy object: %s",
-+			      isc_result_totext(result));
- 		ISC_LIST_INIT(sources);
- 	}
- 
-@@ -281,6 +282,13 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) {
- 		randomfile = NULL;
- 	}
- 
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+	if (randomfile != NULL &&
-+	    strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) {
-+		randomfile = NULL;
-+		isc_entropy_usehook(*ectx, true);
-+	}
-+#endif
- 	result = isc_entropy_usebestsource(*ectx, &source, randomfile,
- 					   usekeyboard);
- 
-@@ -979,11 +987,11 @@ setup_system(void) {
- 		}
- 	}
- 
--	setup_entropy(gmctx, NULL, &entropy);
-+	if (entropy == NULL)
-+		setup_entropy(gmctx, NULL, &entropy);
- 
- 	result = isc_hash_create(gmctx, entropy, DNS_NAME_MAXWIRE);
- 	check_result(result, "isc_hash_create");
--	isc_hash_init();
- 
- 	result = dns_dispatchmgr_create(gmctx, entropy, &dispatchmgr);
- 	check_result(result, "dns_dispatchmgr_create");
-diff --git a/bin/tests/makejournal.c b/bin/tests/makejournal.c
-index 61a41b0..acc71a1 100644
---- a/bin/tests/makejournal.c
-+++ b/bin/tests/makejournal.c
-@@ -102,12 +102,12 @@ main(int argc, char **argv) {
- 	CHECK(isc_mem_create(0, 0, &mctx));
- 	CHECK(isc_entropy_create(mctx, &ectx));
- 
--	CHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
--	hash_active = true;
--
- 	CHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING));
- 	dst_active = true;
- 
-+	CHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
-+	hash_active = true;
-+
- 	CHECK(isc_log_create(mctx, &lctx, &logconfig));
- 	isc_log_registercategories(lctx, categories);
- 	isc_log_setcontext(lctx);
-diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c
-index c6ab7f8..f0a6ff2 100644
---- a/bin/tests/system/pipelined/pipequeries.c
-+++ b/bin/tests/system/pipelined/pipequeries.c
-@@ -204,6 +204,7 @@ sendqueries(isc_task_t *task, isc_event_t *event) {
- 
- int
- main(int argc, char *argv[]) {
-+	char *randomfile = NULL;
- 	isc_sockaddr_t bind_any;
- 	struct in_addr inaddr;
- 	isc_result_t result;
-@@ -222,7 +223,7 @@ main(int argc, char *argv[]) {
- 	int c;
- 
- 	isc_commandline_errprint = false;
--	while ((c = isc_commandline_parse(argc, argv, "p:")) != -1) {
-+	while ((c = isc_commandline_parse(argc, argv, "p:r:")) != -1) {
- 		switch (c) {
- 		case 'p':
- 			result = isc_parse_uint16(&port,
-@@ -233,6 +234,9 @@ main(int argc, char *argv[]) {
- 				exit(1);
- 			}
- 			break;
-+		case 'r':
-+			randomfile = isc_commandline_argument;
-+			break;
- 		case '?':
- 			fprintf(stderr, "%s: invalid argument '%c'",
- 				argv[0], c);
-@@ -275,10 +279,18 @@ main(int argc, char *argv[]) {
- 
- 	ectx = NULL;
- 	RUNCHECK(isc_entropy_create(mctx, &ectx));
--	RUNCHECK(isc_entropy_createfilesource(ectx, "../random.data"));
--	RUNCHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+	if (randomfile != NULL &&
-+	    strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) {
-+		randomfile = NULL;
-+		isc_entropy_usehook(ectx, true);
-+	}
-+#endif
-+	if (randomfile != NULL)
-+		RUNCHECK(isc_entropy_createfilesource(ectx, randomfile));
- 
- 	RUNCHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_GOODONLY));
-+	RUNCHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
- 
- 	taskmgr = NULL;
- 	RUNCHECK(isc_taskmgr_create(mctx, 1, 0, &taskmgr));
-@@ -331,8 +343,8 @@ main(int argc, char *argv[]) {
- 	isc_task_detach(&task);
- 	isc_taskmgr_destroy(&taskmgr);
- 
--	dst_lib_destroy();
- 	isc_hash_destroy();
-+	dst_lib_destroy();
- 	isc_entropy_detach(&ectx);
- 
- 	isc_log_destroy(&lctx);
-diff --git a/bin/tests/system/pipelined/tests.sh b/bin/tests/system/pipelined/tests.sh
-index 61f1ff7..ed1302a 100644
---- a/bin/tests/system/pipelined/tests.sh
-+++ b/bin/tests/system/pipelined/tests.sh
-@@ -19,7 +19,7 @@ status=0
- 
- echo_i "check pipelined TCP queries"
- ret=0
--$PIPEQUERIES -p ${PORT} < input > raw || ret=1
-+$PIPEQUERIES -p ${PORT} -r $RANDFILE < input > raw || ret=1
- awk '{ print $1 " " $5 }' < raw > output
- sort < output > output-sorted
- $DIFF ref output-sorted || { ret=1 ; echo_i "diff sorted failed"; }
-@@ -43,7 +43,7 @@ status=`expr $status + $ret`
- 
- echo_i "check keep-response-order"
- ret=0
--$PIPEQUERIES -p ${PORT} ++ < inputb > rawb || ret=1
-+$PIPEQUERIES -p ${PORT} -r $RANDFILE ++ < inputb > rawb || ret=1
- awk '{ print $1 " " $5 }' < rawb > outputb
- $DIFF refb outputb || ret=1
- if [ $ret != 0 ]; then echo_i "failed"; fi
-diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c
-index 4462f2e..f06268d 100644
---- a/bin/tests/system/rsabigexponent/bigkey.c
-+++ b/bin/tests/system/rsabigexponent/bigkey.c
-@@ -20,6 +20,7 @@
- #include <isc/buffer.h>
- #include <isc/entropy.h>
- #include <isc/mem.h>
-+#include <isc/platform.h>
- #include <isc/print.h>
- #include <isc/region.h>
- #include <isc/stdio.h>
-@@ -183,6 +184,9 @@ main(int argc, char **argv) {
- 
- 	CHECK(isc_mem_create(0, 0, &mctx), "isc_mem_create()");
- 	CHECK(isc_entropy_create(mctx, &ectx), "isc_entropy_create()");
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+	isc_entropy_usehook(ectx, true);
-+#endif
- 	CHECK(isc_entropy_usebestsource(ectx, &source,
- 					"../random.data",
- 					ISC_ENTROPY_KEYBOARDNO),
-diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
-index 653c951..fe8698e 100644
---- a/bin/tests/system/tkey/keycreate.c
-+++ b/bin/tests/system/tkey/keycreate.c
-@@ -206,6 +206,7 @@ sendquery(isc_task_t *task, isc_event_t *event) {
- int
- main(int argc, char *argv[]) {
- 	char *ourkeyname;
-+	char *randomfile;
- 	isc_taskmgr_t *taskmgr;
- 	isc_timermgr_t *timermgr;
- 	isc_socketmgr_t *socketmgr;
-@@ -225,10 +226,21 @@ main(int argc, char *argv[]) {
- 
- 	RUNCHECK(isc_app_start());
- 
-+	randomfile = NULL;
-+
- 	if (argc < 2) {
- 		fprintf(stderr, "I:no DH key provided\n");
- 		exit(-1);
- 	}
-+	if (strcmp(argv[1], "-r") == 0) {
-+		if (argc < 4) {
-+			fprintf(stderr, "I:no DH key provided\n");
-+			exit(-1);
-+		}
-+		randomfile = argv[2];
-+		argv += 2;
-+		argc -= 2;
-+	}
- 	ourkeyname = argv[1];
- 
- 	if (argc >= 3)
-@@ -242,14 +254,22 @@ main(int argc, char *argv[]) {
- 
- 	ectx = NULL;
- 	RUNCHECK(isc_entropy_create(mctx, &ectx));
--	RUNCHECK(isc_entropy_createfilesource(ectx, "../random.data"));
--	RUNCHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+	if (randomfile != NULL &&
-+	    strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) {
-+		randomfile = NULL;
-+		isc_entropy_usehook(ectx, true);
-+	}
-+#endif
-+	if (randomfile != NULL)
-+		RUNCHECK(isc_entropy_createfilesource(ectx, randomfile));
- 
- 	log = NULL;
- 	logconfig = NULL;
- 	RUNCHECK(isc_log_create(mctx, &log, &logconfig));
- 
- 	RUNCHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_GOODONLY));
-+	RUNCHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
- 
- 	taskmgr = NULL;
- 	RUNCHECK(isc_taskmgr_create(mctx, 1, 0, &taskmgr));
-@@ -328,8 +348,8 @@ main(int argc, char *argv[]) {
- 
- 	isc_log_destroy(&log);
- 
--	dst_lib_destroy();
- 	isc_hash_destroy();
-+	dst_lib_destroy();
- 	isc_entropy_detach(&ectx);
- 
- 	isc_mem_destroy(&mctx);
-diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
-index 70a40c3..2146f9b 100644
---- a/bin/tests/system/tkey/keydelete.c
-+++ b/bin/tests/system/tkey/keydelete.c
-@@ -136,6 +136,7 @@ sendquery(isc_task_t *task, isc_event_t *event) {
- int
- main(int argc, char **argv) {
- 	char *keyname;
-+	char *randomfile;
- 	isc_taskmgr_t *taskmgr;
- 	isc_timermgr_t *timermgr;
- 	isc_socketmgr_t *socketmgr;
-@@ -156,10 +157,21 @@ main(int argc, char **argv) {
- 
- 	RUNCHECK(isc_app_start());
- 
-+	randomfile = NULL;
-+
- 	if (argc < 2) {
- 		fprintf(stderr, "I:no key to delete\n");
- 		exit(-1);
- 	}
-+	if (strcmp(argv[1], "-r") == 0) {
-+		if (argc < 4) {
-+			fprintf(stderr, "I:no DH key provided\n");
-+			exit(-1);
-+		}
-+		randomfile = argv[2];
-+		argv += 2;
-+		argc -= 2;
-+	}
- 	keyname = argv[1];
- 
- 	dns_result_register();
-@@ -169,14 +181,22 @@ main(int argc, char **argv) {
- 
- 	ectx = NULL;
- 	RUNCHECK(isc_entropy_create(mctx, &ectx));
--	RUNCHECK(isc_entropy_createfilesource(ectx, "../random.data"));
--	RUNCHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+	if (randomfile != NULL &&
-+	    strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) {
-+		randomfile = NULL;
-+		isc_entropy_usehook(ectx, true);
-+	}
-+#endif
-+	if (randomfile != NULL)
-+		RUNCHECK(isc_entropy_createfilesource(ectx, randomfile));
- 
- 	log = NULL;
- 	logconfig = NULL;
- 	RUNCHECK(isc_log_create(mctx, &log, &logconfig));
- 
- 	RUNCHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_GOODONLY));
-+	RUNCHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
- 
- 	taskmgr = NULL;
- 	RUNCHECK(isc_taskmgr_create(mctx, 1, 0, &taskmgr));
-@@ -264,8 +284,8 @@ main(int argc, char **argv) {
- 
- 	isc_log_destroy(&log);
- 
--	dst_lib_destroy();
- 	isc_hash_destroy();
-+	dst_lib_destroy();
- 	isc_entropy_detach(&ectx);
- 
- 	isc_mem_destroy(&mctx);
-diff --git a/bin/tests/system/tkey/tests.sh b/bin/tests/system/tkey/tests.sh
-index 9f90dd7..fad6c83 100644
---- a/bin/tests/system/tkey/tests.sh
-+++ b/bin/tests/system/tkey/tests.sh
-@@ -33,7 +33,7 @@ for owner in . foo.example.
- do
- 	echo "I:creating new key using owner name \"$owner\""
- 	ret=0
--	keyname=`$KEYCREATE $dhkeyname $owner` || ret=1
-+	keyname=`$KEYCREATE -r $RANDFILE $dhkeyname $owner` || ret=1
- 	if [ $ret != 0 ]; then
- 		echo "I:failed"
- 		status=`expr $status + $ret`
-@@ -55,7 +55,7 @@ do
- 
- 	echo "I:deleting new key"
- 	ret=0
--	$KEYDELETE $keyname || ret=1
-+	$KEYDELETE -r $RANDFILE $keyname || ret=1
- 	if [ $ret != 0 ]; then
- 		echo "I:failed"
- 	fi
-@@ -75,7 +75,7 @@ done
- 
- echo "I:creating new key using owner name bar.example."
- ret=0
--keyname=`$KEYCREATE $dhkeyname bar.example.` || ret=1
-+keyname=`$KEYCREATE -r $RANDFILE $dhkeyname bar.example.` || ret=1
- if [ $ret != 0 ]; then
-         echo "I:failed"
- 	status=`expr $status + $ret`
-@@ -116,7 +116,7 @@ status=`expr $status + $ret`
- 
- echo "I:recreating the bar.example. key"
- ret=0
--keyname=`$KEYCREATE $dhkeyname bar.example.` || ret=1
-+keyname=`$KEYCREATE -r $RANDFILE $dhkeyname bar.example.` || ret=1
- if [ $ret != 0 ]; then
-         echo "I:failed"
- 	status=`expr $status + $ret`
-diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
-index bf6dbb6..0416b21 100644
---- a/bin/tools/mdig.c
-+++ b/bin/tools/mdig.c
-@@ -1972,12 +1972,11 @@ main(int argc, char *argv[]) {
- 
- 	ectx = NULL;
- 	RUNCHECK(isc_entropy_create(mctx, &ectx));
-+	RUNCHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_GOODONLY));
- 	RUNCHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
- 	RUNCHECK(isc_entropy_getdata(ectx, cookie_secret,
- 				     sizeof(cookie_secret), NULL, 0));
- 
--	RUNCHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_GOODONLY));
--
- 	ISC_LIST_INIT(queries);
- 	parse_args(false, argc, argv);
- 	if (server == NULL)
-diff --git a/configure b/configure
-index 6d05371..33689c9 100755
---- a/configure
-+++ b/configure
-@@ -640,6 +640,7 @@ ac_includes_default="\
- 
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
-+LIBDIR_SUFFIX
- BUILD_LIBS
- BUILD_LDFLAGS
- BUILD_CPPFLAGS
-@@ -823,6 +824,7 @@ LIBXML2_CFLAGS
- NZDTARGETS
- NZDSRCS
- NZD_TOOLS
-+ISC_PLATFORM_CRYPTORANDOM
- PKCS11_TEST
- PKCS11_ED25519
- PKCS11_GOST
-@@ -1047,6 +1049,7 @@ with_eddsa
- with_aes
- enable_openssl_hash
- with_cc_alg
-+enable_crypto_rand
- with_lmdb
- with_libxml2
- with_libjson
-@@ -1749,6 +1752,7 @@ Optional Features:
-   --enable-threads        enable multithreading
-   --enable-native-pkcs11  use native PKCS11 for all crypto [default=no]
-   --enable-openssl-hash   use OpenSSL for hash functions [default=no]
-+  --enable-crypto-rand    use the crypto provider for random [default=yes]
-   --enable-largefile      64-bit file support
-   --enable-backtrace      log stack backtrace on abort [default=yes]
-   --enable-symtable       use internal symbol table for backtrace
-@@ -17144,6 +17148,7 @@ case "$use_openssl" in
- $as_echo "disabled because of native PKCS11" >&6; }
- 		DST_OPENSSL_INC=""
- 		CRYPTO="-DPKCS11CRYPTO"
-+		CRYPTOLIB="pkcs11"
- 		OPENSSLECDSALINKOBJS=""
- 		OPENSSLECDSALINKSRCS=""
- 		OPENSSLEDDSALINKOBJS=""
-@@ -17158,6 +17163,7 @@ $as_echo "disabled because of native PKCS11" >&6; }
- $as_echo "no" >&6; }
- 		DST_OPENSSL_INC=""
- 		CRYPTO=""
-+		CRYPTOLIB=""
- 		OPENSSLECDSALINKOBJS=""
- 		OPENSSLECDSALINKSRCS=""
- 		OPENSSLEDDSALINKOBJS=""
-@@ -17170,6 +17176,7 @@ $as_echo "no" >&6; }
- 	auto)
- 		DST_OPENSSL_INC=""
- 		CRYPTO=""
-+		CRYPTOLIB=""
- 		OPENSSLECDSALINKOBJS=""
- 		OPENSSLECDSALINKSRCS=""
- 		OPENSSLEDDSALINKOBJS=""
-@@ -17179,7 +17186,7 @@ $as_echo "no" >&6; }
- 		OPENSSLLINKOBJS=""
- 		OPENSSLLINKSRCS=""
- 		as_fn_error $? "OpenSSL was not found in any of $openssldirs; use --with-openssl=/path
--If you don't want OpenSSL, use --without-openssl" "$LINENO" 5
-+If you do not want OpenSSL, use --without-openssl" "$LINENO" 5
- 		;;
- 	*)
- 		if test "yes" = "$want_native_pkcs11"
-@@ -17210,6 +17217,7 @@ $as_echo "not found" >&6; }
- 			as_fn_error $? "\"$use_openssl/include/openssl/opensslv.h\" not found" "$LINENO" 5
- 		fi
- 		CRYPTO='-DOPENSSL'
-+		CRYPTOLIB="openssl"
- 		if test "/usr" = "$use_openssl"
- 		then
- 			DST_OPENSSL_INC=""
-@@ -17835,8 +17843,6 @@ fi
- # Use OpenSSL for hash functions
- #
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for using OpenSSL for hash functions" >&5
--$as_echo_n "checking for using OpenSSL for hash functions... " >&6; }
- ISC_PLATFORM_OPENSSLHASH="#undef ISC_PLATFORM_OPENSSLHASH"
- case $want_openssl_hash in
- 	yes)
-@@ -18211,6 +18217,86 @@ if test "rt" = "$have_clock_gt"; then
- 	LIBS="-lrt $LIBS"
- fi
- 
-+#
-+# Use the crypto provider (OpenSSL/PKCS#11) for random functions
-+#
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for using the crypto library (vs. builtin) for random functions" >&5
-+$as_echo_n "checking for using the crypto library (vs. builtin) for random functions... " >&6; }
-+# Check whether --enable-crypto-rand was given.
-+if test "${enable_crypto_rand+set}" = set; then :
-+  enableval=$enable_crypto_rand; want_crypto_rand="$enableval"
-+else
-+  want_crypto_rand="auto"
-+fi
-+
-+if test "$want_crypto_rand" = "auto"
-+then
-+	case "$CRYPTOLIB" in
-+	"")
-+		want_crypto_rand="no"
-+		;;
-+	pkcs11)
-+		want_crypto_rand="yes"
-+		;;
-+	openssl)
-+		saved_cflags="$CFLAGS"
-+		saved_libs="$LIBS"
-+		CFLAGS="$CFLAGS $DST_OPENSSL_INC"
-+		LIBS="$LIBS $DST_OPENSSL_LIBS"
-+		if test "$cross_compiling" = yes; then :
-+  want_crypto_rand="yes"
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#include <openssl/rand.h>
-+
-+unsigned char buf[128];
-+
-+int main()
-+{
-+	if (RAND_bytes(buf, 128) != 1)
-+		return (1);
-+	return (0);
-+}
-+
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  want_crypto_rand="yes"
-+else
-+  want_crypto_rand="no"
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+		CFLAGS="$saved_cflags"
-+		LIBS="$saved_libs"
-+		;;
-+	*)
-+		as_fn_error $? "Unknown crypto library define $CRYPTOLIB" "$LINENO" 5
-+		;;
-+	esac
-+fi
-+case $want_crypto_rand in
-+	yes)
-+		if test "$CRYPTOLIB" = ""
-+		then
-+			as_fn_error $? "No crypto library for random functions" "$LINENO" 5
-+		fi
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$CRYPTOLIB\"" >&5
-+$as_echo "\"$CRYPTOLIB\"" >&6; }
-+		ISC_PLATFORM_CRYPTORANDOM="#define ISC_PLATFORM_CRYPTORANDOM \"$CRYPTOLIB\""
-+		;;
-+	no)
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+		ISC_PLATFORM_CRYPTORANDOM="#undef ISC_PLATFORM_CRYPTORANDOM"
-+		;;
-+esac
-+
-+
- #
- # was --with-lmdb specified?
- #
-@@ -20441,9 +20527,12 @@ _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: size_t for buflen; int for flags" >&5
- $as_echo "size_t for buflen; int for flags" >&6; }
--	 $as_echo "#define IRS_GETNAMEINFO_SOCKLEN_T size_t" >>confdefs.h
-+	# Changed to solve multilib conflict on Fedora
-+	# AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, size_t)
-+	# AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
-+	 $as_echo "#define IRS_GETNAMEINFO_SOCKLEN_T socklen_t" >>confdefs.h
- 
--	 $as_echo "#define IRS_GETNAMEINFO_BUFLEN_T size_t" >>confdefs.h
-+	 $as_echo "#define IRS_GETNAMEINFO_BUFLEN_T socklen_t" >>confdefs.h
- 
- 	 $as_echo "#define IRS_GETNAMEINFO_FLAGS_T int" >>confdefs.h
- 
-@@ -21758,12 +21847,7 @@ ISC_PLATFORM_USEGCCASM="#undef ISC_PLATFORM_USEGCCASM"
- ISC_PLATFORM_USESTDASM="#undef ISC_PLATFORM_USESTDASM"
- ISC_PLATFORM_USEMACASM="#undef ISC_PLATFORM_USEMACASM"
- if test "yes" = "$use_atomic"; then
--	have_atomic=yes		# set default
--	case "$host" in
--	i[3456]86-*)
--		# XXX: some old x86 architectures actually do not support
--		#      (some of) these operations.  Do we need stricter checks?
--		# The cast to long int works around a bug in the HP C Compiler
-+	# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-@@ -21796,6 +21880,11 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- 
- 
-+	have_atomic=yes		# set default
-+	case "$host" in
-+	i[3456]86-*)
-+		# XXX: some old x86 architectures actually do not support
-+		#      (some of) these operations.  Do we need stricter checks?
- 		if test $ac_cv_sizeof_void_p = 8; then
- 			arch=x86_64
- 			have_xaddq=yes
-@@ -21804,39 +21893,6 @@ _ACEOF
- 		fi
- 	;;
- 	x86_64-*|amd64-*)
--		# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
--$as_echo_n "checking size of void *... " >&6; }
--if ${ac_cv_sizeof_void_p+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
--
--else
--  if test "$ac_cv_type_void_p" = yes; then
--     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error 77 "cannot compute sizeof (void *)
--See \`config.log' for more details" "$LINENO" 5; }
--   else
--     ac_cv_sizeof_void_p=0
--   fi
--fi
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
--$as_echo "$ac_cv_sizeof_void_p" >&6; }
--
--
--
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
--_ACEOF
--
--
- 		if test $ac_cv_sizeof_void_p = 8; then
- 			arch=x86_64
- 			have_xaddq=yes
-@@ -21867,6 +21923,10 @@ $as_echo_n "checking architecture type for atomic operations... " >&6; }
- $as_echo "$arch" >&6; }
- fi
- 
-+if test ! "$arch" = "x86_64" -a "$have_xaddq" = "yes"; then
-+	as_fn_error $? "XADDQ present but disabled by Fedora patch!" "$LINENO" 5
-+fi
-+
- if test "yes" = "$have_atomic"; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for inline assembly code" >&5
- $as_echo_n "checking compiler support for inline assembly code... " >&6; }
-@@ -24421,6 +24481,30 @@ CFLAGS="$CFLAGS $SO_CFLAGS"
- #
- dlzdir='${DLZ_DRIVER_DIR}'
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for target libdir" >&5
-+$as_echo_n "checking for target libdir... " >&6; }
-+if test "$cross_compiling" = yes; then :
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "cannot run test program while cross compiling
-+See \`config.log' for more details" "$LINENO" 5; }
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int main(void) {exit((sizeof(void *) == 8) ? 0 : 1);}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  target_lib=lib64
-+else
-+  target_lib=lib
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$target_lib\"" >&5
-+$as_echo "\"$target_lib\"" >&6; }
-+
- #
- # Private autoconf macro to simplify configuring drivers:
- #
-@@ -24751,11 +24835,11 @@ $as_echo "no" >&6; }
- $as_echo "using mysql with libs ${mysql_lib} and includes ${mysql_include}" >&6; }
- 		;;
- 	*)
--		if test -d "$use_dlz_mysql/lib/mysql"
-+		if test -d $use_dlz_mysql/${target_lib}/mysql
- 		then
--			mysql_lib="$use_dlz_mysql/lib/mysql"
-+			mysql_lib=$use_dlz_mysql/${target_lib}/mysql
- 		else
--			mysql_lib="$use_dlz_mysql/lib"
-+			mysql_lib=$use_dlz_mysql/${target_lib}
- 		fi
- 
- 	CONTRIB_DLZ="$CONTRIB_DLZ -DDLZ_MYSQL"
-@@ -24840,7 +24924,7 @@ $as_echo "" >&6; }
- 			# Check other locations for includes.
- 			# Order is important (sigh).
- 
--			bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /db"
-+			bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /libdb /db"
- 			# include a blank element first
- 			for d in "" $bdb_incdirs
- 			do
-@@ -24865,57 +24949,9 @@ $as_echo "" >&6; }
- 			bdb_libnames="db53 db-5.3 db51 db-5.1 db48 db-4.8 db47 db-4.7 db46 db-4.6 db45 db-4.5 db44 db-4.4 db43 db-4.3 db42 db-4.2 db41 db-4.1 db"
- 			for d in $bdb_libnames
- 			do
--				if test "$dd" = "/usr"
--				then
--					as_ac_Lib=`$as_echo "ac_cv_lib_$d''_db_create" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -l$d" >&5
--$as_echo_n "checking for db_create in -l$d... " >&6; }
--if eval \${$as_ac_Lib+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-l$d  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char db_create ();
--int
--main ()
--{
--return db_create ();
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
--  eval "$as_ac_Lib=yes"
--else
--  eval "$as_ac_Lib=no"
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--eval ac_res=\$$as_ac_Lib
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
--  dlz_bdb_libs="-l${d}"
--fi
--
--					if test $dlz_bdb_libs != "yes"
--					then
--						break
--					fi
--				elif test -f "$dd/lib/lib${d}.so"
-+				if test -f "$dd/${target_lib}/lib${d}.so"
- 				then
--					dlz_bdb_libs="-L${dd}/lib -l${d}"
-+					dlz_bdb_libs="-L${dd}/${target_lib}/libdb -l${d}"
- 					break
- 				fi
- 			done
-@@ -25074,10 +25110,10 @@ $as_echo "no" >&6; }
- 		DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES -I$use_dlz_ldap/include"
- 		DLZ_DRIVER_LDAP_INCLUDES="-I$use_dlz_ldap/include"
- 	fi
--	if test -n "-L$use_dlz_ldap/lib -lldap -llber"
-+	if test -n "-L$use_dlz_ldap/${target_lib} -lldap -llber"
- 	then
--		DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_ldap/lib -lldap -llber"
--		DLZ_DRIVER_LDAP_LIBS="-L$use_dlz_ldap/lib -lldap -llber"
-+		DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_ldap/${target_lib} -lldap -llber"
-+		DLZ_DRIVER_LDAP_LIBS="-L$use_dlz_ldap/${target_lib} -lldap -llber"
- 	fi
- 
- 
-@@ -25163,11 +25199,11 @@ fi
- 		odbcdirs="/usr /usr/local /usr/pkg"
- 		for d in $odbcdirs
- 		do
--			if test -f $d/include/sql.h -a -f $d/lib/libodbc.a
-+			if test -f $d/include/sql.h -a -f $d/${target_lib}/libodbc.a
- 			then
- 				use_dlz_odbc=$d
- 				dlz_odbc_include="-I$use_dlz_odbc/include"
--				dlz_odbc_libs="-L$use_dlz_odbc/lib -lodbc"
-+				dlz_odbc_libs="-L$use_dlz_odbc/${target_lib} -lodbc"
- 				break
- 			fi
- 		done
-@@ -25442,6 +25478,8 @@ DNS_CRYPTO_LIBS="$NEWFLAGS"
- 
- 
- 
-+
-+
- #
- # Commands to run at the end of config.status.
- # Don't just put these into configure, it won't work right if somebody
-@@ -27819,6 +27857,8 @@ report() {
- 	    echo "    IPv6 support (--enable-ipv6)"
- 	test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11" || \
- 		echo "    OpenSSL cryptography/DNSSEC (--with-openssl)"
-+        test "no" = "$want_crypto_rand" || \
-+                echo "    Crypto provider entropy source (--enable-crypto-rand)"
- 	test "X$PYTHON" = "X" || echo "    Python tools (--with-python)"
- 	test "X$XMLSTATS" = "X" || echo "    XML statistics (--with-libxml2)"
- 	test "X$JSONSTATS" = "X" || echo "    JSON statistics (--with-libjson)"
-@@ -27859,6 +27899,8 @@ report() {
- 	echo "    Very verbose query trace logging (--enable-querytrace)"
-     test "no" = "$with_cmocka" || echo "    CMocka Unit Testing Framework (--with-cmocka)"
- 
-+    echo "    Cryptographic library for DNSSEC: $CRYPTOLIB"
-+
-     echo "    Dynamically loadable zone (DLZ) drivers:"
-     test "no" = "$use_dlz_bdb" || \
- 	echo "        Berkeley DB (--with-dlz-bdb)"
-@@ -27906,6 +27948,8 @@ report() {
- 	echo "    ECDSA algorithm support (--with-ecdsa)"
-     test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ED25519" -o "yes" = "$PKCS11_ED25519" || \
- 	echo "    EDDSA algorithm support (--with-eddsa)"
-+    test "yes" = "$want_crypto_rand" || \
-+        echo "    Crypto provider entropy source (--enable-crypto-rand)"
- 
-     test "yes" = "$enable_seccomp" || \
- 	echo "    Use libseccomp system call filtering (--enable-seccomp)"
-diff --git a/configure.ac b/configure.ac
-index d10cde5..68bead8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1550,6 +1550,7 @@ case "$use_openssl" in
- 		AC_MSG_RESULT(disabled because of native PKCS11)
- 		DST_OPENSSL_INC=""
- 		CRYPTO="-DPKCS11CRYPTO"
-+		CRYPTOLIB="pkcs11"
- 		OPENSSLECDSALINKOBJS=""
- 		OPENSSLECDSALINKSRCS=""
- 		OPENSSLEDDSALINKOBJS=""
-@@ -1563,6 +1564,7 @@ case "$use_openssl" in
- 		AC_MSG_RESULT(no)
- 		DST_OPENSSL_INC=""
- 		CRYPTO=""
-+		CRYPTOLIB=""
- 		OPENSSLECDSALINKOBJS=""
- 		OPENSSLECDSALINKSRCS=""
- 		OPENSSLEDDSALINKOBJS=""
-@@ -1575,6 +1577,7 @@ case "$use_openssl" in
- 	auto)
- 		DST_OPENSSL_INC=""
- 		CRYPTO=""
-+		CRYPTOLIB=""
- 		OPENSSLECDSALINKOBJS=""
- 		OPENSSLECDSALINKSRCS=""
- 		OPENSSLEDDSALINKOBJS=""
-@@ -1585,7 +1588,7 @@ case "$use_openssl" in
- 		OPENSSLLINKSRCS=""
- 		AC_MSG_ERROR(
- [OpenSSL was not found in any of $openssldirs; use --with-openssl=/path
--If you don't want OpenSSL, use --without-openssl])
-+If you do not want OpenSSL, use --without-openssl])
- 		;;
- 	*)
- 		if test "yes" = "$want_native_pkcs11"
-@@ -1615,6 +1618,7 @@ If you don't want OpenSSL, use --without-openssl])
- 			AC_MSG_ERROR(["$use_openssl/include/openssl/opensslv.h" not found])
- 		fi
- 		CRYPTO='-DOPENSSL'
-+		CRYPTOLIB="openssl"
- 		if test "/usr" = "$use_openssl"
- 		then
- 			DST_OPENSSL_INC=""
-@@ -2050,7 +2054,6 @@ fi
- # Use OpenSSL for hash functions
- #
- 
--AC_MSG_CHECKING(for using OpenSSL for hash functions)
- ISC_PLATFORM_OPENSSLHASH="#undef ISC_PLATFORM_OPENSSLHASH"
- case $want_openssl_hash in
- 	yes)
-@@ -2322,6 +2325,67 @@ if test "rt" = "$have_clock_gt"; then
- 	LIBS="-lrt $LIBS"
- fi
- 
-+#
-+# Use the crypto provider (OpenSSL/PKCS#11) for random functions
-+#
-+
-+AC_MSG_CHECKING(for using the crypto library (vs. builtin) for random functions)
-+AC_ARG_ENABLE(crypto-rand,
-+	[  --enable-crypto-rand    use the crypto provider for random [[default=yes]]],
-+	want_crypto_rand="$enableval", want_crypto_rand="auto")
-+if test "$want_crypto_rand" = "auto"
-+then
-+	case "$CRYPTOLIB" in
-+	"")
-+		want_crypto_rand="no"
-+		;;
-+	pkcs11)
-+		want_crypto_rand="yes"
-+		;;
-+	openssl)
-+		saved_cflags="$CFLAGS"
-+		saved_libs="$LIBS"
-+		CFLAGS="$CFLAGS $DST_OPENSSL_INC"
-+		LIBS="$LIBS $DST_OPENSSL_LIBS"
-+		AC_TRY_RUN([
-+#include <openssl/rand.h>
-+
-+unsigned char buf[128];
-+
-+int main()
-+{
-+	if (RAND_bytes(buf, 128) != 1)
-+		return (1);
-+	return (0);
-+}
-+],
-+		[want_crypto_rand="yes"],
-+		[want_crypto_rand="no"],
-+		[want_crypto_rand="yes"])
-+		CFLAGS="$saved_cflags"
-+		LIBS="$saved_libs"
-+		;;
-+	*)
-+		AC_MSG_ERROR([Unknown crypto library define $CRYPTOLIB])
-+		;;
-+	esac
-+fi
-+case $want_crypto_rand in
-+	yes)
-+		if test "$CRYPTOLIB" = ""
-+		then
-+			AC_MSG_ERROR([No crypto library for random functions])
-+		fi
-+		AC_MSG_RESULT(["$CRYPTOLIB"])
-+		ISC_PLATFORM_CRYPTORANDOM="#define ISC_PLATFORM_CRYPTORANDOM \"$CRYPTOLIB\""
-+		;;
-+	no)
-+		AC_MSG_RESULT(no)
-+		ISC_PLATFORM_CRYPTORANDOM="#undef ISC_PLATFORM_CRYPTORANDOM"
-+		;;
-+esac
-+AC_SUBST(ISC_PLATFORM_CRYPTORANDOM)
-+
- #
- # was --with-lmdb specified?
- #
-@@ -4098,12 +4162,12 @@ ISC_PLATFORM_USEGCCASM="#undef ISC_PLATFORM_USEGCCASM"
- ISC_PLATFORM_USESTDASM="#undef ISC_PLATFORM_USESTDASM"
- ISC_PLATFORM_USEMACASM="#undef ISC_PLATFORM_USEMACASM"
- if test "yes" = "$use_atomic"; then
-+	AC_CHECK_SIZEOF([void *])
- 	have_atomic=yes		# set default
- 	case "$host" in
- 	[i[3456]86-*])
- 		# XXX: some old x86 architectures actually do not support
- 		#      (some of) these operations.  Do we need stricter checks?
--		AC_CHECK_SIZEOF([void *])
- 		if test $ac_cv_sizeof_void_p = 8; then
- 			arch=x86_64
- 			have_xaddq=yes
-@@ -4112,7 +4176,6 @@ if test "yes" = "$use_atomic"; then
- 		fi
- 	;;
- 	x86_64-*|amd64-*)
--		AC_CHECK_SIZEOF([void *])
- 		if test $ac_cv_sizeof_void_p = 8; then
- 			arch=x86_64
- 			have_xaddq=yes
-@@ -5518,6 +5581,8 @@ report() {
- 	    echo "    IPv6 support (--enable-ipv6)"
- 	test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11" || \
- 		echo "    OpenSSL cryptography/DNSSEC (--with-openssl)"
-+        test "no" = "$want_crypto_rand" || \
-+                echo "    Crypto provider entropy source (--enable-crypto-rand)"
- 	test "X$PYTHON" = "X" || echo "    Python tools (--with-python)"
- 	test "X$XMLSTATS" = "X" || echo "    XML statistics (--with-libxml2)"
- 	test "X$JSONSTATS" = "X" || echo "    JSON statistics (--with-libjson)"
-@@ -5558,6 +5623,8 @@ report() {
- 	echo "    Very verbose query trace logging (--enable-querytrace)"
-     test "no" = "$with_cmocka" || echo "    CMocka Unit Testing Framework (--with-cmocka)"
- 
-+    echo "    Cryptographic library for DNSSEC: $CRYPTOLIB"
-+
-     echo "    Dynamically loadable zone (DLZ) drivers:"
-     test "no" = "$use_dlz_bdb" || \
- 	echo "        Berkeley DB (--with-dlz-bdb)"
-@@ -5605,6 +5672,8 @@ report() {
- 	echo "    ECDSA algorithm support (--with-ecdsa)"
-     test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ED25519" -o "yes" = "$PKCS11_ED25519" || \
- 	echo "    EDDSA algorithm support (--with-eddsa)"
-+    test "yes" = "$want_crypto_rand" || \
-+        echo "    Crypto provider entropy source (--enable-crypto-rand)"
- 
-     test "yes" = "$enable_seccomp" || \
- 	echo "    Use libseccomp system call filtering (--enable-seccomp)"
-diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
-index 65bf25d..1eccbe7 100644
---- a/lib/dns/dst_api.c
-+++ b/lib/dns/dst_api.c
-@@ -277,6 +277,12 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx,
- #ifdef GSSAPI
- 	RETERR(dst__gssapi_init(&dst_t_func[DST_ALG_GSSAPI]));
- #endif
-+#if defined(OPENSSL) || defined(PKCS11CRYPTO)
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+	if (dst_entropy_pool != NULL)
-+		isc_entropy_sethook(dst_random_getdata);
-+#endif
-+#endif /* defined(OPENSSL) || defined(PKCS11CRYPTO) */
- 	dst_initialized = true;
- 	return (ISC_R_SUCCESS);
- 
-@@ -296,11 +302,19 @@ dst_lib_destroy(void) {
- 	for (i = 0; i < DST_MAX_ALGS; i++)
- 		if (dst_t_func[i] != NULL && dst_t_func[i]->cleanup != NULL)
- 			dst_t_func[i]->cleanup();
-+#if defined(OPENSSL) || defined(PKCS11CRYPTO)
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+	if (dst_entropy_pool != NULL) {
-+		isc_entropy_usehook(dst_entropy_pool, false);
-+		isc_entropy_sethook(NULL);
-+	}
-+#endif
- #ifdef OPENSSL
- 	dst__openssl_destroy();
- #elif PKCS11CRYPTO
- 	(void) dst__pkcs11_destroy();
- #endif /* if OPENSSL, elif PKCS11CRYPTO */
-+#endif /* defined(OPENSSL) || defined(PKCS11CRYPTO) */
- 	if (dst__memory_pool != NULL)
- 		isc_mem_detach(&dst__memory_pool);
- 	if (dst_entropy_pool != NULL)
-@@ -2002,13 +2016,17 @@ dst__entropy_getdata(void *buf, unsigned int len, bool pseudo) {
- 		flags &= ~ISC_ENTROPY_GOODONLY;
- 	else
- 		flags |= ISC_ENTROPY_BLOCKING;
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+	return (dst_random_getdata(buf, len, NULL, flags));
-+#else
- 	return (isc_entropy_getdata(dst_entropy_pool, buf, len, NULL, flags));
-+#endif
- #endif /* PKCS11CRYPTO */
- }
- 
- unsigned int
- dst__entropy_status(void) {
--#ifndef PKCS11CRYPTO
-+#if !defined(PKCS11CRYPTO) && !defined(ISC_PLATFORM_CRYPTORANDOM)
- #ifdef GSSAPI
- 	unsigned int flags = dst_entropy_flags;
- 	isc_result_t ret;
-@@ -2031,6 +2049,7 @@ dst__entropy_status(void) {
- #endif
- 	return (isc_entropy_status(dst_entropy_pool));
- #else
-+	/* Doesn't matter as it is not used in this case. */
- 	return (0);
- #endif
- }
-diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h
-index 1924e74..6813c96 100644
---- a/lib/dns/include/dst/dst.h
-+++ b/lib/dns/include/dst/dst.h
-@@ -159,6 +159,14 @@ dst_lib_destroy(void);
-  * Releases all resources allocated by DST.
-  */
- 
-+isc_result_t
-+dst_random_getdata(void *data, unsigned int length,
-+		   unsigned int *returned, unsigned int flags);
-+/*%<
-+ * \brief Return data from the crypto random generator.
-+ * Specialization of isc_entropy_getdata().
-+ */
-+
- bool
- dst_algorithm_supported(unsigned int alg);
- /*%<
-diff --git a/lib/dns/lib.c b/lib/dns/lib.c
-index 304814b..60543c4 100644
---- a/lib/dns/lib.c
-+++ b/lib/dns/lib.c
-@@ -18,6 +18,7 @@
- #include <stdbool.h>
- #include <stddef.h>
- 
-+#include <isc/entropy.h>
- #include <isc/hash.h>
- #include <isc/mem.h>
- #include <isc/msgcat.h>
-@@ -78,6 +79,7 @@ static unsigned int references = 0;
- static void
- initialize(void) {
- 	isc_result_t result;
-+	isc_entropy_t *ectx = NULL;
- 
- 	REQUIRE(initialize_done == false);
- 
-@@ -88,11 +90,14 @@ initialize(void) {
- 	result = dns_ecdb_register(dns_g_mctx, &dbimp);
- 	if (result != ISC_R_SUCCESS)
- 		goto cleanup_mctx;
--	result = isc_hash_create(dns_g_mctx, NULL, DNS_NAME_MAXWIRE);
-+	result = isc_entropy_create(dns_g_mctx, &ectx);
- 	if (result != ISC_R_SUCCESS)
- 		goto cleanup_db;
-+	result = isc_hash_create(dns_g_mctx, NULL, DNS_NAME_MAXWIRE);
-+	if (result != ISC_R_SUCCESS)
-+		goto cleanup_ectx;
- 
--	result = dst_lib_init(dns_g_mctx, NULL, 0);
-+	result = dst_lib_init(dns_g_mctx, ectx, 0);
- 	if (result != ISC_R_SUCCESS)
- 		goto cleanup_hash;
- 
-@@ -100,11 +105,17 @@ initialize(void) {
- 	if (result != ISC_R_SUCCESS)
- 		goto cleanup_dst;
- 
-+	isc_hash_init();
-+	isc_entropy_detach(&ectx);
-+
- 	initialize_done = true;
- 	return;
- 
-   cleanup_dst:
- 	dst_lib_destroy();
-+  cleanup_ectx:
-+	if (ectx != NULL)
-+		isc_entropy_detach(&ectx);
-   cleanup_hash:
- 	isc_hash_destroy();
-   cleanup_db:
-diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
-index 13e838f..ffe0a69 100644
---- a/lib/dns/openssl_link.c
-+++ b/lib/dns/openssl_link.c
-@@ -31,6 +31,7 @@
- #include <isc/mem.h>
- #include <isc/mutex.h>
- #include <isc/mutexblock.h>
-+#include <isc/platform.h>
- #include <isc/string.h>
- #include <isc/thread.h>
- #include <isc/util.h>
-@@ -46,8 +47,6 @@
- #include <openssl/engine.h>
- #endif
- 
--static RAND_METHOD *rm = NULL;
--
- #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static isc_mutex_t *locks = NULL;
- static int nlocks;
-@@ -57,6 +56,9 @@ static int nlocks;
- static ENGINE *e = NULL;
- #endif
- 
-+#ifndef ISC_PLATFORM_CRYPTORANDOM
-+static RAND_METHOD *rm = NULL;
-+
- static int
- entropy_get(unsigned char *buf, int num) {
- 	isc_result_t result;
-@@ -102,6 +104,7 @@ entropy_add(const void *buf, int num, double entropy) {
- 	return (1);
- }
- #endif
-+#endif /* !ISC_PLATFORM_CRYPTORANDOM */
- 
- #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static void
-@@ -192,7 +195,7 @@ _set_thread_id(CRYPTO_THREADID *id)
- isc_result_t
- dst__openssl_init(const char *engine) {
- 	isc_result_t result;
--#if !defined(OPENSSL_NO_ENGINE)
-+#if !defined(OPENSSL_NO_ENGINE) && !defined(ISC_PLATFORM_CRYPTORANDOM)
- 	ENGINE *re;
- #else
- 	UNUSED(engine);
-@@ -222,6 +225,7 @@ dst__openssl_init(const char *engine) {
- 	ERR_load_crypto_strings();
- #endif
- 
-+#ifndef ISC_PLATFORM_CRYPTORANDOM
- 	rm = mem_alloc(sizeof(RAND_METHOD) FILELINE);
- 	if (rm == NULL) {
- 		result = ISC_R_NOMEMORY;
-@@ -233,6 +237,7 @@ dst__openssl_init(const char *engine) {
- 	rm->add = entropy_add;
- 	rm->pseudorand = entropy_getpseudo;
- 	rm->status = entropy_status;
-+#endif
- 
- #if !defined(OPENSSL_NO_ENGINE)
- #if !defined(CONF_MFLAGS_DEFAULT_SECTION)
-@@ -266,6 +271,7 @@ dst__openssl_init(const char *engine) {
- 		}
- 	}
- 
-+#ifndef ISC_PLATFORM_CRYPTORANDOM
- 	re = ENGINE_get_default_RAND();
- 	if (re == NULL) {
- 		re = ENGINE_new();
-@@ -278,9 +284,21 @@ dst__openssl_init(const char *engine) {
- 		ENGINE_free(re);
- 	} else
- 		ENGINE_finish(re);
-+#endif
- #else
-+#ifndef ISC_PLATFORM_CRYPTORANDOM
- 	RAND_set_rand_method(rm);
-+#endif
- #endif /* !defined(OPENSSL_NO_ENGINE) */
-+
-+	/* Protect ourselves against unseeded PRNG */
-+	if (RAND_status() != 1) {
-+		FATAL_ERROR(__FILE__, __LINE__,
-+			    "OpenSSL pseudorandom number generator "
-+			    "cannot be initialized (see the `PRNG not "
-+			    "seeded' message in the OpenSSL FAQ)");
-+	}
-+
- 	return (ISC_R_SUCCESS);
- 
- #if !defined(OPENSSL_NO_ENGINE)
-@@ -288,10 +306,14 @@ dst__openssl_init(const char *engine) {
- 	if (e != NULL)
- 		ENGINE_free(e);
- 	e = NULL;
-+#ifndef ISC_PLATFORM_CRYPTORANDOM
- 	mem_free(rm FILELINE);
- 	rm = NULL;
- #endif
-+#endif
-+#ifndef ISC_PLATFORM_CRYPTORANDOM
-  cleanup_mutexinit:
-+#endif
- #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	CRYPTO_set_locking_callback(NULL);
- 	DESTROYMUTEXBLOCK(locks, nlocks);
-@@ -306,14 +328,17 @@ void
- dst__openssl_destroy(void) {
- #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
- 	OPENSSL_cleanup();
-+#ifndef ISC_PLATFORM_CRYPTORANDOM
- 	if (rm != NULL) {
- 		mem_free(rm FILELINE);
- 		rm = NULL;
- 	}
-+#endif
- #else
- 	/*
- 	 * Sequence taken from apps_shutdown() in <apps/apps.h>.
- 	 */
-+#ifndef ISC_PLATFORM_CRYPTORANDOM
- 	if (rm != NULL) {
- #if OPENSSL_VERSION_NUMBER >= 0x00907000L
- 		RAND_cleanup();
-@@ -321,6 +346,7 @@ dst__openssl_destroy(void) {
- 		mem_free(rm FILELINE);
- 		rm = NULL;
- 	}
-+#endif
- #if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
- 	CONF_modules_free();
- #endif
-@@ -456,11 +482,45 @@ dst__openssl_getengine(const char *engine) {
- }
- #endif
- 
--#else /* OPENSSL */
-+isc_result_t
-+dst_random_getdata(void *data, unsigned int length,
-+		   unsigned int *returned, unsigned int flags) {
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+#ifndef DONT_REQUIRE_DST_LIB_INIT
-+	INSIST(dst__memory_pool != NULL);
-+#endif
-+	REQUIRE(data != NULL);
-+	REQUIRE(length > 0);
- 
--#include <isc/util.h>
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+	if ((flags & ISC_ENTROPY_GOODONLY) == 0) {
-+		if (RAND_pseudo_bytes((unsigned char *)data, (int)length) < 0)
-+			return (dst__openssl_toresult2("RAND_pseudo_bytes",
-+						       DST_R_OPENSSLFAILURE));
-+	} else {
-+		if (RAND_bytes((unsigned char *)data, (int)length) != 1)
-+			return (dst__openssl_toresult2("RAND_bytes",
-+						       DST_R_OPENSSLFAILURE));
-+	}
-+#else
-+	UNUSED(flags);
- 
--EMPTY_TRANSLATION_UNIT
-+	if (RAND_bytes((unsigned char *)data, (int)length) != 1)
-+		return (dst__openssl_toresult2("RAND_bytes",
-+					       DST_R_OPENSSLFAILURE));
-+#endif
-+	if (returned != NULL)
-+		*returned = length;
-+	return (ISC_R_SUCCESS);
-+#else
-+	UNUSED(data);
-+	UNUSED(length);
-+	UNUSED(returned);
-+	UNUSED(flags);
-+
-+	return (ISC_R_NOTIMPLEMENTED);
-+#endif
-+}
- 
- #endif /* OPENSSL */
- /*! \file */
-diff --git a/lib/dns/pkcs11.c b/lib/dns/pkcs11.c
-index 5a2c502..8eaef53 100644
---- a/lib/dns/pkcs11.c
-+++ b/lib/dns/pkcs11.c
-@@ -13,12 +13,15 @@
- 
- #include <config.h>
- 
-+#include <isc/util.h>
-+
- #include <dns/log.h>
- #include <dns/result.h>
- 
- #include <pk11/pk11.h>
- #include <pk11/internal.h>
- 
-+#include "dst_internal.h"
- #include "dst_pkcs11.h"
- 
- isc_result_t
-@@ -34,12 +37,32 @@ dst__pkcs11_toresult(const char *funcname, const char *file, int line,
- 	return (fallback);
- }
- 
-+isc_result_t
-+dst_random_getdata(void *data, unsigned int length,
-+		   unsigned int *returned, unsigned int flags) {
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+	isc_result_t ret;
- 
--#else /* PKCS11CRYPTO */
-+#ifndef DONT_REQUIRE_DST_LIB_INIT
-+	INSIST(dst__memory_pool != NULL);
-+#endif
-+	REQUIRE(data != NULL);
-+	REQUIRE(length > 0);
-+	UNUSED(flags);
- 
--#include <isc/util.h>
-+	ret = pk11_rand_bytes(data, (int) length);
-+	if ((ret == ISC_R_SUCCESS) && (returned != NULL))
-+		*returned = length;
-+	return (ret);
-+#else
-+	UNUSED(data);
-+	UNUSED(length);
-+	UNUSED(returned);
-+	UNUSED(flags);
- 
--EMPTY_TRANSLATION_UNIT
-+	return (ISC_R_NOTIMPLEMENTED);
-+#endif
-+}
- 
- #endif /* PKCS11CRYPTO */
- /*! \file */
-diff --git a/lib/dns/tests/Kyuafile b/lib/dns/tests/Kyuafile
-index 937b548..f3c0e38 100644
---- a/lib/dns/tests/Kyuafile
-+++ b/lib/dns/tests/Kyuafile
-@@ -10,6 +10,7 @@ tap_test_program{name='dh_test'}
- tap_test_program{name='dispatch_test'}
- tap_test_program{name='dnstap_test'}
- tap_test_program{name='dst_test'}
-+tap_test_program{name='dstrandom_test'}
- tap_test_program{name='geoip_test'}
- tap_test_program{name='gost_test'}
- tap_test_program{name='keytable_test'}
-diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
-index 90dc3a6..7671e1d 100644
---- a/lib/dns/tests/Makefile.in
-+++ b/lib/dns/tests/Makefile.in
-@@ -37,6 +37,7 @@ SRCS =		acl_test.c \
- 		dnstap_test.c \
- 		dst_test.c \
- 		dnstest.c \
-+		dstrandom_test.c \
- 		geoip_test.c \
- 		gost_test.c \
- 		keytable_test.c \
-@@ -69,6 +70,7 @@ TARGETS =	acl_test@EXEEXT@ \
- 		dh_test@EXEEXT@ \
- 		dispatch_test@EXEEXT@ \
- 		dnstap_test@EXEEXT@ \
-+		dstrandom_test@EXEEXT@ \
- 		dst_test@EXEEXT@ \
- 		geoip_test@EXEEXT@ \
- 		gost_test@EXEEXT@ \
-@@ -258,6 +260,11 @@ zt_test@EXEEXT@: zt_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
- 		${LDFLAGS} -o $@ zt_test.@O@ dnstest.@O@ \
- 		${DNSLIBS} ${ISCLIBS} ${LIBS}
- 
-+dstrandom_test@EXEEXT@: dstrandom_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-+			dstrandom_test.@O@ ${DNSLIBS} \
-+			${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
-+
- unit::
- 	sh ${top_builddir}/unit/unittest.sh
- 
-diff --git a/lib/dns/tests/dstrandom_test.c b/lib/dns/tests/dstrandom_test.c
-new file mode 100644
-index 0000000..bd3d164
---- /dev/null
-+++ b/lib/dns/tests/dstrandom_test.c
-@@ -0,0 +1,115 @@
-+/*
-+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-+ *
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+ *
-+ * See the COPYRIGHT file distributed with this work for additional
-+ * information regarding copyright ownership.
-+ */
-+
-+#include <config.h>
-+
-+#if HAVE_CMOCKA
-+
-+#include <stdarg.h>
-+#include <stddef.h>
-+#include <setjmp.h>
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#define UNIT_TESTING
-+#include <cmocka.h>
-+
-+#include <isc/entropy.h>
-+#include <isc/mem.h>
-+#include <isc/print.h>
-+#include <isc/platform.h>
-+#include <isc/util.h>
-+
-+#include <dst/dst.h>
-+
-+isc_mem_t *mctx = NULL;
-+isc_entropy_t *ectx = NULL;
-+unsigned char buffer[128];
-+
-+/* isc_entropy_getdata() examples */
-+static void
-+isc_entropy_getdata_test(void **state) {
-+	isc_result_t result;
-+	unsigned int returned, status;
-+	const char *randomfile = "testdata/dstrandom/random.data";
-+	int ret;
-+
-+	UNUSED(state);
-+
-+	isc_mem_debugging |= ISC_MEM_DEBUGRECORD;
-+	result = isc_mem_create(0, 0, &mctx);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+	result = isc_entropy_create(mctx, &ectx);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+	result = dst_lib_init(mctx, ectx, 0);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+	isc_entropy_usehook(ectx, true);
-+
-+	returned = 0;
-+	result = isc_entropy_getdata(ectx, buffer, sizeof(buffer),
-+				     &returned, 0);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+	assert_int_equal(returned, sizeof(buffer));
-+
-+	status = isc_entropy_status(ectx);
-+	assert_int_equal(status, 0);
-+
-+	isc_entropy_usehook(ectx, false);
-+#endif
-+
-+	ret = chdir(TESTS);
-+	assert_int_equal(ret, 0);
-+
-+	result = isc_entropy_createfilesource(ectx, randomfile);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+
-+	returned = 0;
-+	result = isc_entropy_getdata(ectx, buffer, sizeof(buffer),
-+				     &returned, 0);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+	assert_int_equal(returned, sizeof(buffer));
-+
-+	status = isc_entropy_status(ectx);
-+	assert_true(status > 0);
-+
-+	dst_lib_destroy();
-+	isc_entropy_detach(&ectx);
-+	assert_null(ectx);
-+
-+	isc_mem_destroy(&mctx);
-+	assert_null(mctx);
-+}
-+
-+int
-+main(void) {
-+	const struct CMUnitTest tests[] = {
-+		cmocka_unit_test(isc_entropy_getdata_test),
-+	};
-+
-+	return (cmocka_run_group_tests(tests, NULL, NULL));
-+}
-+
-+#else /* HAVE_CMOCKA */
-+
-+#include <stdio.h>
-+
-+int
-+main(void) {
-+	printf("1..0 # Skipped: cmocka not available\n");
-+	return (0);
-+}
-+
-+#endif
-diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in
-index 63be973..40b21fa 100644
---- a/lib/dns/win32/libdns.def.in
-+++ b/lib/dns/win32/libdns.def.in
-@@ -1485,6 +1485,13 @@ dst_lib_destroy
- dst_lib_init
- dst_lib_init2
- dst_lib_initmsgcat
-+@IF PKCS11
-+dst_random_getdata
-+@ELSE PKCS11
-+@IF OPENSSL
-+dst_random_getdata
-+@END OPENSSL
-+@END PKCS11
- dst_region_computeid
- dst_region_computerid
- dst_result_register
-diff --git a/lib/isc/entropy.c b/lib/isc/entropy.c
-index 907e470..451544d 100644
---- a/lib/isc/entropy.c
-+++ b/lib/isc/entropy.c
-@@ -104,11 +104,15 @@ struct isc_entropy {
- 	uint32_t			initialized;
- 	uint32_t			initcount;
- 	isc_entropypool_t		pool;
-+	bool				usehook;
- 	unsigned int			nsources;
- 	isc_entropysource_t	       *nextsource;
- 	ISC_LIST(isc_entropysource_t)	sources;
- };
- 
-+/*% Global Hook */
-+static isc_entropy_getdata_t hook;
-+
- /*% Sample Queue */
- typedef struct {
- 	uint32_t	last_time;	/*%< last time recorded */
-@@ -557,6 +561,11 @@ isc_entropy_getdata(isc_entropy_t *ent, void *data, unsigned int length,
- 
- 	LOCK(&ent->lock);
- 
-+	if (ent->usehook && (hook != NULL)) {
-+		UNLOCK(&ent->lock);
-+		return (hook(data, length, returned, flags));
-+	}
-+
- 	remain = length;
- 	buf = data;
- 	total = 0;
-@@ -708,6 +717,7 @@ isc_entropy_create(isc_mem_t *mctx, isc_entropy_t **entp) {
- 	ent->refcnt = 1;
- 	ent->initialized = 0;
- 	ent->initcount = 0;
-+	ent->usehook = false;
- 	ent->magic = ENTROPY_MAGIC;
- 
- 	isc_entropypool_init(&ent->pool);
-@@ -1286,3 +1296,17 @@ isc_entropy_usebestsource(isc_entropy_t *ectx, isc_entropysource_t **source,
- 	 */
- 	return (final_result);
- }
-+
-+void
-+isc_entropy_usehook(isc_entropy_t *ectx, bool onoff) {
-+	REQUIRE(VALID_ENTROPY(ectx));
-+
-+	LOCK(&ectx->lock);
-+	ectx->usehook = onoff;
-+	UNLOCK(&ectx->lock);
-+}
-+
-+void
-+isc_entropy_sethook(isc_entropy_getdata_t myhook) {
-+	hook = myhook;
-+}
-diff --git a/lib/isc/include/isc/entropy.h b/lib/isc/include/isc/entropy.h
-index e8733db..c40a18c 100644
---- a/lib/isc/include/isc/entropy.h
-+++ b/lib/isc/include/isc/entropy.h
-@@ -302,6 +302,18 @@ isc_entropy_usebestsource(isc_entropy_t *ectx, isc_entropysource_t **source,
-  *	isc_entropy_createcallbacksource().
-  */
- 
-+void
-+isc_entropy_usehook(isc_entropy_t *ectx, bool onoff);
-+/*!<
-+ * \brief Mark/unmark the given entropy structure as being hooked.
-+ */
-+
-+void
-+isc_entropy_sethook(isc_entropy_getdata_t myhook);
-+/*!<
-+ * \brief Set the getdata hook (e.g., for a crypto random generator).
-+ */
-+
- ISC_LANG_ENDDECLS
- 
- #endif /* ISC_ENTROPY_H */
-diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
-index 61960f1..d22993d 100644
---- a/lib/isc/include/isc/platform.h.in
-+++ b/lib/isc/include/isc/platform.h.in
-@@ -359,6 +359,11 @@
-  */
- @ISC_PLATFORM_HAVESTRINGSH@
- 
-+/*
-+ * Define if the random functions are provided by crypto.
-+ */
-+@ISC_PLATFORM_CRYPTORANDOM@
-+
- /*
-  * Define if the hash functions must be provided by OpenSSL.
-  */
-diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
-index da9d66f..4205400 100644
---- a/lib/isc/include/isc/types.h
-+++ b/lib/isc/include/isc/types.h
-@@ -97,6 +97,8 @@ typedef struct isc_time			isc_time_t;		/*%< Time */
- typedef struct isc_timer		isc_timer_t;		/*%< Timer */
- typedef struct isc_timermgr		isc_timermgr_t;		/*%< Timer Manager */
- 
-+typedef isc_result_t (*isc_entropy_getdata_t)(void *, unsigned int,
-+					      unsigned int *, unsigned int);
- typedef void (*isc_taskaction_t)(isc_task_t *, isc_event_t *);
- typedef int (*isc_sockfdwatch_t)(isc_task_t *, isc_socket_t *, void *, int);
- 
-diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c
-index 68aebdc..4b85527 100644
---- a/lib/isc/pk11.c
-+++ b/lib/isc/pk11.c
-@@ -321,14 +321,16 @@ pk11_rand_seed_fromfile(const char *randomfile) {
- 	ret = isc_stdio_open(randomfile, "r", &stream);
- 	if (ret != ISC_R_SUCCESS)
- 		goto cleanup;
--	ret = isc_stdio_read(seed, 1, SEEDSIZE, stream, &cc);
--	if (ret!= ISC_R_SUCCESS)
--		goto cleanup;
-+	while (ret == ISC_R_SUCCESS) {
-+		ret = isc_stdio_read(seed, 1, SEEDSIZE, stream, &cc);
-+		if ((ret != ISC_R_SUCCESS) && (ret != ISC_R_EOF))
-+			goto cleanup;
-+		(void) pkcs_C_SeedRandom(ctx.session, seed, (CK_ULONG) cc);
-+	} 
- 	ret = isc_stdio_close(stream);
- 	stream = NULL;
--	if (ret!= ISC_R_SUCCESS)
-+	if (ret != ISC_R_SUCCESS)
- 		goto cleanup;
--	(void) pkcs_C_SeedRandom(ctx.session, seed, (CK_ULONG) cc);
- 
-     cleanup:
- 	if (stream != NULL)
-diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in
-index 8ade705..fa72f9d 100644
---- a/lib/isc/win32/include/isc/platform.h.in
-+++ b/lib/isc/win32/include/isc/platform.h.in
-@@ -73,6 +73,11 @@
- #define ISC_PLATFORM_NORETURN_PRE __declspec(noreturn)
- #define ISC_PLATFORM_NORETURN_POST
- 
-+/*
-+ * Define if the random functions are provided by crypto.
-+ */
-+@ISC_PLATFORM_CRYPTORANDOM@
-+
- /*
-  * Define if the hash functions must be provided by OpenSSL.
-  */
-diff --git a/win32utils/Configure b/win32utils/Configure
-index 79d682e..6c78cb2 100644
---- a/win32utils/Configure
-+++ b/win32utils/Configure
-@@ -382,6 +382,7 @@ my @substdefh = ("ALLOW_FILTER_AAAA",
- my %configdefp;
- 
- my @substdefp = ("ISC_PLATFORM_BUSYWAITNOP",
-+                 "ISC_PLATFORM_CRYPTORANDOM",
-                  "ISC_PLATFORM_HAVEATOMICSTORE",
-                  "ISC_PLATFORM_HAVEATOMICSTOREQ",
-                  "ISC_PLATFORM_HAVECMPXCHG",
-@@ -517,7 +518,8 @@ my @allcond = (@substcond, "NOTYET", "NOLONGER");
- 
- # enable-xxx/disable-xxx
- 
--my @enablelist = ("developer",
-+my @enablelist = ("crypto-rand",
-+                  "developer",
-                   "fixed-rrset",
-                   "intrinsics",
-                   "isc-spnego",
-@@ -580,6 +582,7 @@ my @help = (
- "\nOptional Features:\n",
- "  enable-intrinsics     enable intrinsic/atomic functions [default=yes]\n",
- "  enable-native-pkcs11  use native PKCS#11 for all crypto [default=no]\n",
-+"  enable-crypto-rand    use crypto provider for random [default=yes]\n",
- "  enable-openssl-hash   use OpenSSL for hash functions [default=yes]\n",
- "  enable-isc-spnego     use SPNEGO from lib/dns [default=yes]\n",
- "  enable-filter-aaaa    enable filtering of AAAA records [default=yes]\n",
-@@ -628,7 +631,9 @@ my $want_clean = "no";
- my $want_unknown = "no";
- my $unknown_value;
- my $enable_intrinsics = "yes";
-+my $cryptolib = "";
- my $enable_native_pkcs11 = "no";
-+my $enable_crypto_rand = "yes";
- my $enable_openssl_hash = "auto";
- my $enable_filter_aaaa = "yes";
- my $enable_isc_spnego = "yes";
-@@ -847,6 +852,10 @@ sub myenable {
-         if ($val =~ /^yes$/i) {
-             $enable_native_pkcs11 = "yes";
-         }
-+    } elsif ($key =~ /^crypto-rand$/i) {
-+        if ($val =~ /^no$/i) {
-+            $enable_crypto_rand = "no";
-+        }
-     } elsif ($key =~ /^openssl-hash$/i) {
-         if ($val =~ /^yes$/i) {
-             $enable_openssl_hash = "yes";
-@@ -1153,6 +1162,11 @@ if ($verbose) {
-     } else {
-         print "native-pkcs11: disabled\n";
-     }
-+    if ($enable_crypto_rand eq "yes") {
-+        print "crypto-rand: enabled\n";
-+    } else {
-+        print "crypto-rand: disabled\n";
-+    }
-     if ($enable_openssl_hash eq "yes") {
-         print "openssl-hash: enabled\n";
-     } else {
-@@ -1510,6 +1524,7 @@ if ($enable_intrinsics eq "yes") {
- 
- # enable-native-pkcs11
- if ($enable_native_pkcs11 eq "yes") {
-+    $cryptolib = "pkcs11";
-     if ($use_openssl eq "auto") {
-         $use_openssl = "no";
-     }
-@@ -1719,6 +1734,7 @@ if ($use_openssl eq "yes") {
-         $openssl_dll = File::Spec->catdir($openssl_path, "@dirlist[0]");
-     }   
- 
-+    $cryptolib = "openssl";
-     $configcond{"OPENSSL"} = 1;
-     $configdefd{"CRYPTO"} = "OPENSSL";
-     $configvar{"OPENSSL_PATH"} = "$openssl_path";
-@@ -2290,6 +2306,15 @@ if ($use_aes eq "yes") {
- }
- 
- 
-+# enable-crypto-rand
-+if ($enable_crypto_rand eq "yes") {
-+    if (($use_openssl eq "no") && ($enable_native_pkcs11 eq "no")) {
-+        die "No crypto provider for random functions\n";
-+    }
-+    $configdefp{"ISC_PLATFORM_CRYPTORANDOM"} = "\"$cryptolib\"";
-+}
-+print "Cryptographic library for DNSSEC: $cryptolib";
-+
- # enable-openssl-hash
- if ($enable_openssl_hash eq "yes") {
-     if ($use_openssl eq "no") {
-@@ -3665,6 +3690,7 @@ exit 0;
- #  --enable-developer partially supported
- #  --enable-newstats (9.9/9.9sub only)
- #  --enable-native-pkcs11 supported
-+#  --enable-crypto-rand supported
- #  --enable-openssl-version-check included without a way to disable it
- #  --enable-openssl-hash supported
- #  --enable-threads included without a way to disable it
--- 
-2.21.1
-
diff --git a/bind-9.11-rt46047.patch b/bind-9.11-rt46047.patch
deleted file mode 100644
index ee9bae8cf67d04541d520e7ce8a595b46a282a6b..0000000000000000000000000000000000000000
--- a/bind-9.11-rt46047.patch
+++ /dev/null
@@ -1,789 +0,0 @@
-From 344c19ad4b3f058e65a4b41650bb0ee20692cc5c Mon Sep 17 00:00:00 2001
-From: Evan Hunt <each@isc.org>
-Date: Thu, 28 Sep 2017 10:09:22 -0700
-Subject: [PATCH] completed and corrected the crypto-random change
-
-4724.	[func]		By default, BIND now uses the random number
-			functions provided by the crypto library (i.e.,
-			OpenSSL or a PKCS#11 provider) as a source of
-			randomness rather than /dev/random.  This is
-			suitable for virtual machine environments
-			which have limited entropy pools and lack
-			hardware random number generators.
-
-			This can be overridden by specifying another
-			entropy source via the "random-device" option
-			in named.conf, or via the -r command line option;
-			however, for functions requiring full cryptographic
-			strength, such as DNSSEC key generation, this
-			cannot be overridden. In particular, the -r
-			command line option no longer has any effect on
-			dnssec-keygen.
-
-			This can be disabled by building with
-			"configure --disable-crypto-rand".
-			[RT #31459] [RT #46047]
----
- bin/confgen/keygen.c                     | 12 +++---
- bin/dnssec/dnssec-keygen.docbook         | 24 +++++++----
- bin/dnssec/dnssectool.c                  | 12 +++---
- bin/named/client.c                       |  3 +-
- bin/named/config.c                       |  4 +-
- bin/named/controlconf.c                  | 19 +++++---
- bin/named/include/named/server.h         |  2 +
- bin/named/interfacemgr.c                 |  1 +
- bin/named/query.c                        |  1 +
- bin/named/server.c                       | 52 ++++++++++++++--------
- bin/nsupdate/nsupdate.c                  |  4 +-
- bin/tests/system/pipelined/pipequeries.c |  4 +-
- bin/tests/system/tkey/keycreate.c        |  4 +-
- bin/tests/system/tkey/keydelete.c        |  5 +--
- doc/arm/Bv9ARM-book.xml                  | 55 +++++++++++++++++-------
- doc/arm/notes-rh-changes.xml             | 42 ++++++++++++++++++
- doc/arm/notes.xml                        |  1 +
- lib/dns/dst_api.c                        |  4 +-
- lib/dns/include/dst/dst.h                | 14 +++++-
- lib/dns/openssl_link.c                   |  3 +-
- lib/isc/include/isc/entropy.h            | 48 +++++++++++++++------
- lib/isc/include/isc/random.h             | 28 +++++++-----
- lib/isccfg/namedconf.c                   |  2 +-
- 23 files changed, 240 insertions(+), 104 deletions(-)
- create mode 100644 doc/arm/notes-rh-changes.xml
-
-diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c
-index 295e16f..0f79aa8 100644
---- a/bin/confgen/keygen.c
-+++ b/bin/confgen/keygen.c
-@@ -161,17 +161,15 @@ generate_key(isc_mem_t *mctx, const char *randomfile, dns_secalg_t alg,
- 
- 	DO("create entropy context", isc_entropy_create(mctx, &ectx));
- 
--	if (randomfile != NULL && strcmp(randomfile, "keyboard") == 0) {
--		randomfile = NULL;
--		open_keyboard = ISC_ENTROPY_KEYBOARDYES;
--	}
- #ifdef ISC_PLATFORM_CRYPTORANDOM
--	if (randomfile != NULL &&
--	    strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) {
--		randomfile = NULL;
-+	if (randomfile == NULL) {
- 		isc_entropy_usehook(ectx, true);
- 	}
- #endif
-+	if (randomfile != NULL && strcmp(randomfile, "keyboard") == 0) {
-+		randomfile = NULL;
-+		open_keyboard = ISC_ENTROPY_KEYBOARDYES;
-+	}
- 	DO("start entropy source", isc_entropy_usebestsource(ectx,
- 							     &entropy_source,
- 							     randomfile,
-diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook
-index 1826919..96543fc 100644
---- a/bin/dnssec/dnssec-keygen.docbook
-+++ b/bin/dnssec/dnssec-keygen.docbook
-@@ -349,15 +349,23 @@
- 	<term>-r <replaceable class="parameter">randomdev</replaceable></term>
- 	<listitem>
- 	  <para>
--	    Specifies the source of randomness.  If the operating
--	    system does not provide a <filename>/dev/random</filename>
--	    or equivalent device, the default source of randomness
--	    is keyboard input.  <filename>randomdev</filename>
--	    specifies
-+	    Specifies a source of randomness.  Normally, when generating
-+	    DNSSEC keys, this option has no effect; the random number
-+	    generation function provided by the cryptographic library will
-+	    be used.
-+	  </para>
-+	  <para>
-+	    If that behavior is disabled at compile time, however,
-+	    the specified file will be used as entropy source
-+	    for key generation.  <filename>randomdev</filename> is
- 	    the name of a character device or file containing random
--	    data to be used instead of the default.  The special value
--	    <filename>keyboard</filename> indicates that keyboard
--	    input should be used.
-+	    data to be used.  The special value <filename>keyboard</filename>
-+	    indicates that keyboard input should be used.
-+	  </para>
-+	  <para>
-+	    The default is <filename>/dev/random</filename> if the
-+	    operating system provides it or an equivalent device;
-+	    if not, the default source of randomness is keyboard input.
- 	  </para>
- 	</listitem>
-       </varlistentry>
-diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
-index 5654435..24c0d5a 100644
---- a/bin/dnssec/dnssectool.c
-+++ b/bin/dnssec/dnssectool.c
-@@ -241,18 +241,16 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) {
- 		ISC_LIST_INIT(sources);
- 	}
- 
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+	if (randomfile == NULL) {
-+		isc_entropy_usehook(*ectx, true);
-+	}
-+#endif
- 	if (randomfile != NULL && strcmp(randomfile, "keyboard") == 0) {
- 		usekeyboard = ISC_ENTROPY_KEYBOARDYES;
- 		randomfile = NULL;
- 	}
- 
--#ifdef ISC_PLATFORM_CRYPTORANDOM
--	if (randomfile != NULL &&
--	    strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) {
--		randomfile = NULL;
--		isc_entropy_usehook(*ectx, true);
--	}
--#endif
- 	result = isc_entropy_usebestsource(*ectx, &source, randomfile,
- 					   usekeyboard);
- 
-diff --git a/bin/named/client.c b/bin/named/client.c
-index 9a0d3c8..c573177 100644
---- a/bin/named/client.c
-+++ b/bin/named/client.c
-@@ -1765,7 +1765,8 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message,
- 
- 		isc_buffer_init(&buf, cookie, sizeof(cookie));
- 		isc_stdtime_get(&now);
--		isc_random_get(&nonce);
-+		nonce = ((isc_rng_random(ns_g_server->rngctx) << 16) |
-+			 isc_rng_random(ns_g_server->rngctx));
- 
- 		compute_cookie(client, now, nonce, ns_g_server->secret, &buf);
- 
-diff --git a/bin/named/config.c b/bin/named/config.c
-index dbdff64..63da4b0 100644
---- a/bin/named/config.c
-+++ b/bin/named/config.c
-@@ -98,7 +98,9 @@ options {\n\
- #	pid-file \"" NS_LOCALSTATEDIR "/run/named/named.pid\"; /* or /lwresd.pid */\n\
- 	port 53;\n\
- 	prefetch 2 9;\n"
--#ifdef PATH_RANDOMDEV
-+#if defined(ISC_PLATFORM_CRYPTORANDOM)
-+"	random-device none;\n"
-+#elif defined(PATH_RANDOMDEV)
- "	random-device \"" PATH_RANDOMDEV "\";\n"
- #endif
- "	recursing-file \"named.recursing\";\n\
-diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
-index d955c2f..40621f2 100644
---- a/bin/named/controlconf.c
-+++ b/bin/named/controlconf.c
-@@ -325,9 +325,10 @@ log_invalid(isccc_ccmsg_t *ccmsg, isc_result_t result) {
- 
- static void
- control_recvmessage(isc_task_t *task, isc_event_t *event) {
--	controlconnection_t *conn;
--	controllistener_t *listener;
--	controlkey_t *key;
-+	controlconnection_t *conn = NULL;
-+	controllistener_t *listener = NULL;
-+	ns_server_t *server = NULL;
-+	controlkey_t *key = NULL;
- 	isccc_sexpr_t *request = NULL;
- 	isccc_sexpr_t *response = NULL;
- 	uint32_t algorithm;
-@@ -338,16 +339,17 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) {
- 	isc_buffer_t *text;
- 	isc_result_t result;
- 	isc_result_t eresult;
--	isccc_sexpr_t *_ctrl;
-+	isccc_sexpr_t *_ctrl = NULL;
- 	isccc_time_t sent;
- 	isccc_time_t exp;
- 	uint32_t nonce;
--	isccc_sexpr_t *data;
-+	isccc_sexpr_t *data = NULL;
- 
- 	REQUIRE(event->ev_type == ISCCC_EVENT_CCMSG);
- 
- 	conn = event->ev_arg;
- 	listener = conn->listener;
-+	server = listener->controls->server;
- 	algorithm = DST_ALG_UNKNOWN;
- 	secret.rstart = NULL;
- 	text = NULL;
-@@ -458,8 +460,11 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) {
- 	 * Establish nonce.
- 	 */
- 	if (conn->nonce == 0) {
--		while (conn->nonce == 0)
--			isc_random_get(&conn->nonce);
-+		while (conn->nonce == 0) {
-+			uint16_t r1 = isc_rng_random(server->rngctx);
-+			uint16_t r2 = isc_rng_random(server->rngctx);
-+			conn->nonce = (r1 << 16) | r2;
-+		}
- 		eresult = ISC_R_SUCCESS;
- 	} else
- 		eresult = ns_control_docommand(request, listener->readonly, &text);
-diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h
-index 3f96b7b..c92922e 100644
---- a/bin/named/include/named/server.h
-+++ b/bin/named/include/named/server.h
-@@ -20,6 +20,7 @@
- #include <isc/log.h>
- #include <isc/magic.h>
- #include <isc/quota.h>
-+#include <isc/random.h>
- #include <isc/sockaddr.h>
- #include <isc/types.h>
- #include <isc/xml.h>
-@@ -134,6 +135,7 @@ struct ns_server {
- 	char *			lockfile;
- 
- 	uint16_t		transfer_tcp_message_size;
-+	isc_rng_t *		rngctx;
- };
- 
- struct ns_altsecret {
-diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
-index 9dea7c1..272d300 100644
---- a/bin/named/interfacemgr.c
-+++ b/bin/named/interfacemgr.c
-@@ -17,6 +17,7 @@
- 
- #include <isc/interfaceiter.h>
- #include <isc/os.h>
-+#include <isc/random.h>
- #include <isc/string.h>
- #include <isc/task.h>
- #include <isc/util.h>
-diff --git a/bin/named/query.c b/bin/named/query.c
-index 203f1e6..25eeced 100644
---- a/bin/named/query.c
-+++ b/bin/named/query.c
-@@ -19,6 +19,7 @@
- #include <isc/hex.h>
- #include <isc/mem.h>
- #include <isc/print.h>
-+#include <isc/random.h>
- #include <isc/rwlock.h>
- #include <isc/serial.h>
- #include <isc/stats.h>
-diff --git a/bin/named/server.c b/bin/named/server.c
-index f27071f..f132c19 100644
---- a/bin/named/server.c
-+++ b/bin/named/server.c
-@@ -8210,21 +8210,32 @@ load_configuration(const char *filename, ns_server_t *server,
- 	 * Open the source of entropy.
- 	 */
- 	if (first_time) {
-+		const char *randomdev = NULL;
-+		int level = ISC_LOG_ERROR;
- 		obj = NULL;
- 		result = ns_config_get(maps, "random-device", &obj);
--		if (result != ISC_R_SUCCESS) {
-+		if (result == ISC_R_SUCCESS) {
-+			if (!cfg_obj_isvoid(obj)) {
-+				level = ISC_LOG_INFO;
-+				randomdev = cfg_obj_asstring(obj);
-+			}
-+		}
-+		if (randomdev == NULL) {
-+#ifdef ISC_PLATFORM_CRYPTORANDOM
-+			isc_entropy_usehook(ns_g_entropy, true);
-+#else
-+			if ((obj != NULL) && !cfg_obj_isvoid(obj))
-+				level = ISC_LOG_INFO;
- 			isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
--				      NS_LOGMODULE_SERVER, ISC_LOG_INFO,
-+				      NS_LOGMODULE_SERVER, level,
- 				      "no source of entropy found");
-+			if ((obj == NULL) || cfg_obj_isvoid(obj)) {
-+				CHECK(ISC_R_FAILURE);
-+			}
-+#endif
- 		} else {
--			const char *randomdev = cfg_obj_asstring(obj);
--#ifdef ISC_PLATFORM_CRYPTORANDOM
--			if (strcmp(randomdev, ISC_PLATFORM_CRYPTORANDOM) == 0)
--				isc_entropy_usehook(ns_g_entropy, true);
--#else
--			int level = ISC_LOG_ERROR;
- 			result = isc_entropy_createfilesource(ns_g_entropy,
--							      randomdev);
-+			                                      randomdev);
- #ifdef PATH_RANDOMDEV
- 			if (ns_g_fallbackentropy != NULL) {
- 				level = ISC_LOG_INFO;
-@@ -8235,8 +8246,8 @@ load_configuration(const char *filename, ns_server_t *server,
- 					      NS_LOGCATEGORY_GENERAL,
- 					      NS_LOGMODULE_SERVER,
- 					      level,
--					      "could not open entropy source "
--					      "%s: %s",
-+					      "could not open "
-+					      "entropy source %s: %s",
- 					      randomdev,
- 					      isc_result_totext(result));
- 			}
-@@ -8256,7 +8267,6 @@ load_configuration(const char *filename, ns_server_t *server,
- 				}
- 				isc_entropy_detach(&ns_g_fallbackentropy);
- 			}
--#endif
- #endif
- 		}
- 
-@@ -9025,6 +9035,7 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) {
- 	server->in_roothints = NULL;
- 	server->blackholeacl = NULL;
- 	server->keepresporder = NULL;
-+	server->rngctx = NULL;
- 
- 	/* Must be first. */
- 	CHECKFATAL(dst_lib_init2(ns_g_mctx, ns_g_entropy,
-@@ -9051,6 +9062,9 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) {
- 	CHECKFATAL(dns_tkeyctx_create(ns_g_mctx, ns_g_entropy,
- 				      &server->tkeyctx),
- 		   "creating TKEY context");
-+	server->rngctx = NULL;
-+	CHECKFATAL(isc_rng_create(ns_g_mctx, ns_g_entropy, &server->rngctx),
-+	           "creating random numbers context");
- 
- 	/*
- 	 * Setup the server task, which is responsible for coordinating
-@@ -9257,7 +9271,8 @@ ns_server_destroy(ns_server_t **serverp) {
- 
- 	if (server->zonemgr != NULL)
- 		dns_zonemgr_detach(&server->zonemgr);
--
-+	if (server->rngctx != NULL)
-+		isc_rng_detach(&server->rngctx);
- 	if (server->tkeyctx != NULL)
- 		dns_tkeyctx_destroy(&server->tkeyctx);
- 
-@@ -13263,10 +13278,10 @@ newzone_cfgctx_destroy(void **cfgp) {
- 
- static isc_result_t
- generate_salt(unsigned char *salt, size_t saltlen) {
--	int i, n;
-+	size_t i, n;
- 	union {
- 		unsigned char rnd[256];
--		uint32_t rnd32[64];
-+		uint16_t rnd16[128];
- 	} rnd;
- 	unsigned char text[512 + 1];
- 	isc_region_t r;
-@@ -13276,9 +13291,10 @@ generate_salt(unsigned char *salt, size_t saltlen) {
- 	if (saltlen > 256U)
- 		return (ISC_R_RANGE);
- 
--	n = (int) (saltlen + sizeof(uint32_t) - 1) / sizeof(uint32_t);
--	for (i = 0; i < n; i++)
--		isc_random_get(&rnd.rnd32[i]);
-+	n = (saltlen + sizeof(uint16_t) - 1) / sizeof(uint16_t);
-+	for (i = 0; i < n; i++) {
-+		rnd.rnd16[i] = isc_rng_random(ns_g_server->rngctx);
-+	}
- 
- 	memmove(salt, rnd.rnd, saltlen);
- 
-diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
-index 0286987..0376377 100644
---- a/bin/nsupdate/nsupdate.c
-+++ b/bin/nsupdate/nsupdate.c
-@@ -283,9 +283,7 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) {
- 	}
- 
- #ifdef ISC_PLATFORM_CRYPTORANDOM
--	if (randomfile != NULL &&
--	    strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) {
--		randomfile = NULL;
-+	if (randomfile == NULL) {
- 		isc_entropy_usehook(*ectx, true);
- 	}
- #endif
-diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c
-index f0a6ff2..55064f6 100644
---- a/bin/tests/system/pipelined/pipequeries.c
-+++ b/bin/tests/system/pipelined/pipequeries.c
-@@ -280,9 +280,7 @@ main(int argc, char *argv[]) {
- 	ectx = NULL;
- 	RUNCHECK(isc_entropy_create(mctx, &ectx));
- #ifdef ISC_PLATFORM_CRYPTORANDOM
--	if (randomfile != NULL &&
--	    strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) {
--		randomfile = NULL;
-+	if (randomfile == NULL) {
- 		isc_entropy_usehook(ectx, true);
- 	}
- #endif
-diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
-index fe8698e..937fcc3 100644
---- a/bin/tests/system/tkey/keycreate.c
-+++ b/bin/tests/system/tkey/keycreate.c
-@@ -255,9 +255,7 @@ main(int argc, char *argv[]) {
- 	ectx = NULL;
- 	RUNCHECK(isc_entropy_create(mctx, &ectx));
- #ifdef ISC_PLATFORM_CRYPTORANDOM
--	if (randomfile != NULL &&
--	    strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) {
--		randomfile = NULL;
-+	if (randomfile == NULL) {
- 		isc_entropy_usehook(ectx, true);
- 	}
- #endif
-diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
-index 2146f9b..64b8e74 100644
---- a/bin/tests/system/tkey/keydelete.c
-+++ b/bin/tests/system/tkey/keydelete.c
-@@ -171,6 +171,7 @@ main(int argc, char **argv) {
- 		randomfile = argv[2];
- 		argv += 2;
- 		argc -= 2;
-+		POST(argc);
- 	}
- 	keyname = argv[1];
- 
-@@ -182,9 +183,7 @@ main(int argc, char **argv) {
- 	ectx = NULL;
- 	RUNCHECK(isc_entropy_create(mctx, &ectx));
- #ifdef ISC_PLATFORM_CRYPTORANDOM
--	if (randomfile != NULL &&
--	    strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) {
--		randomfile = NULL;
-+	if (randomfile == NULL) {
- 		isc_entropy_usehook(ectx, true);
- 	}
- #endif
-diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
-index 93c7a08..bb1e81d 100644
---- a/doc/arm/Bv9ARM-book.xml
-+++ b/doc/arm/Bv9ARM-book.xml
-@@ -5081,22 +5081,45 @@ badresp:1,adberr:0,findfail:0,valfail:0]
- 	    <term><command>random-device</command></term>
- 	    <listitem>
- 	      <para>
--		The source of entropy to be used by the server.  Entropy is
--		primarily needed
--		for DNSSEC operations, such as TKEY transactions and dynamic
--		update of signed
--		zones.  This options specifies the device (or file) from which
--		to read
--		entropy.  If this is a file, operations requiring entropy will
--		fail when the
--		file has been exhausted.  If not specified, the default value
--		is
--		<filename>/dev/random</filename>
--		(or equivalent) when present, and none otherwise.  The
--		<command>random-device</command> option takes
--		effect during
--		the initial configuration load at server startup time and
--		is ignored on subsequent reloads.
-+		Specifies a source of entropy to be used by the server.
-+		This is a device or file from which to read entropy.
-+		If it is a file, operations requiring entropy
-+		will fail when the file has been exhausted.
-+	      </para>
-+	      <para>
-+		Entropy is needed for cryptographic operations such as
-+		TKEY transactions, dynamic update of signed zones, and
-+		generation of TSIG session keys. It is also used for
-+		seeding and stirring the pseudo-random number generator,
-+		which is used for less critical functions requiring
-+		randomness such as generation of DNS message transaction
-+		ID's.
-+	      </para>
-+	      <para>
-+		If <command>random-device</command> is not specified, or
-+		if it is set to <literal>none</literal>, entropy will be
-+		read from the random number generation function supplied
-+		by the cryptographic library with which BIND was linked
-+		(i.e.  OpenSSL or a PKCS#11 provider).
-+	      </para>
-+	      <para>
-+		The <command>random-device</command> option takes
-+		effect during the initial configuration load at server
-+		startup time and is ignored on subsequent reloads.
-+	      </para>
-+	      <para>
-+		If BIND is built with
-+		<command>configure --disable-crypto-rand</command>, then
-+		entropy is <emphasis>not</emphasis> sourced from the
-+		cryptographic library. In this case, if
-+		<command>random-device</command> is not specified, the
-+		default value is the system random device,
-+		<filename>/dev/random</filename> or the equivalent.
-+		This default can be overridden with
-+		<command>configure --with-randomdev</command>.
-+		If no system random device exists, then no entropy source
-+		will be configured, and <command>named</command> will only
-+		be able to use pseudo-random numbers.
- 	      </para>
- 	    </listitem>
- 	  </varlistentry>
-diff --git a/doc/arm/notes-rh-changes.xml b/doc/arm/notes-rh-changes.xml
-new file mode 100644
-index 0000000..89a4961
---- /dev/null
-+++ b/doc/arm/notes-rh-changes.xml
-@@ -0,0 +1,42 @@
-+<!--
-+ - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-+ -
-+ - This Source Code Form is subject to the terms of the Mozilla Public
-+ - License, v. 2.0. If a copy of the MPL was not distributed with this
-+ - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+ -
-+ - See the COPYRIGHT file distributed with this work for additional
-+ - information regarding copyright ownership.
-+-->
-+
-+<section xml:id="relnotes_rh_changes"><info><title>Red Hat Specific Changes</title></info>
-+  <itemizedlist>
-+     <listitem>
-+      <para>
-+        By default, BIND now uses the random number generation functions
-+        in the cryptographic library (i.e., OpenSSL or a PKCS#11
-+        provider) as a source of high-quality randomness rather than
-+        <filename>/dev/random</filename>.  This is suitable for virtual
-+        machine environments, which may have limited entropy pools and
-+        lack hardware random number generators.
-+      </para>
-+      <para>
-+        This can be overridden by specifying another entropy source via
-+        the <command>random-device</command> option in
-+        <filename>named.conf</filename>, or via the <command>-r</command>
-+        command line option.  However, for functions requiring full
-+        cryptographic strength, such as DNSSEC key generation, this
-+        <emphasis>cannot</emphasis> be overridden. In particular, the
-+        <command>-r</command> command line option no longer has any
-+        effect on <command>dnssec-keygen</command>.
-+      </para>
-+      <para>
-+        This can be disabled by building with
-+        <command>configure --disable-crypto-rand</command>, in which
-+        case <filename>/dev/random</filename> will be the default
-+        entropy source.  [RT #31459] [RT #46047]
-+      </para>
-+    </listitem>
-+  </itemizedlist>
-+</section>
-+
-diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
-index 589a347..052a0bd 100644
---- a/doc/arm/notes.xml
-+++ b/doc/arm/notes.xml
-@@ -40,6 +40,7 @@
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-9.11.1.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-9.11.0.xml"/>
- 
-+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-rh-changes.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-eol.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-thankyou.xml"/>
- </section>
-diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
-index 1eccbe7..1933993 100644
---- a/lib/dns/dst_api.c
-+++ b/lib/dns/dst_api.c
-@@ -2017,10 +2017,12 @@ dst__entropy_getdata(void *buf, unsigned int len, bool pseudo) {
- 	else
- 		flags |= ISC_ENTROPY_BLOCKING;
- #ifdef ISC_PLATFORM_CRYPTORANDOM
-+	/* get entropy directly from crypto provider */
- 	return (dst_random_getdata(buf, len, NULL, flags));
- #else
-+	/* get entropy from entropy source or hook function */
- 	return (isc_entropy_getdata(dst_entropy_pool, buf, len, NULL, flags));
--#endif
-+#endif /* ISC_PLATFORM_CRYPTORANDOM */
- #endif /* PKCS11CRYPTO */
- }
- 
-diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h
-index 6813c96..665574d 100644
---- a/lib/dns/include/dst/dst.h
-+++ b/lib/dns/include/dst/dst.h
-@@ -163,8 +163,18 @@ isc_result_t
- dst_random_getdata(void *data, unsigned int length,
- 		   unsigned int *returned, unsigned int flags);
- /*%<
-- * \brief Return data from the crypto random generator.
-- * Specialization of isc_entropy_getdata().
-+ * Gets random data from the random generator provided by the
-+ * crypto library, if BIND was built with --enable-crypto-rand.
-+ *
-+ * See isc_entropy_getdata() for parameter usage. Normally when
-+ * this function is available, it will be set up as a hook in the
-+ * entropy context, so that isc_entropy_getdata() is a front-end to
-+ * this function.
-+ *
-+ * Returns:
-+ * \li	ISC_R_SUCCESS on success
-+ * \li	ISC_R_NOTIMPLEMENTED if BIND is built with --disable-crypto-rand
-+ * \li	DST_R_OPENSSLFAILURE, DST_R_CRYPTOFAILURE, or other codes on error
-  */
- 
- bool
-diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
-index ffe0a69..5e48686 100644
---- a/lib/dns/openssl_link.c
-+++ b/lib/dns/openssl_link.c
-@@ -484,7 +484,8 @@ dst__openssl_getengine(const char *engine) {
- 
- isc_result_t
- dst_random_getdata(void *data, unsigned int length,
--		   unsigned int *returned, unsigned int flags) {
-+		   unsigned int *returned, unsigned int flags)
-+{
- #ifdef ISC_PLATFORM_CRYPTORANDOM
- #ifndef DONT_REQUIRE_DST_LIB_INIT
- 	INSIST(dst__memory_pool != NULL);
-diff --git a/lib/isc/include/isc/entropy.h b/lib/isc/include/isc/entropy.h
-index c40a18c..c7cb17d 100644
---- a/lib/isc/include/isc/entropy.h
-+++ b/lib/isc/include/isc/entropy.h
-@@ -189,9 +189,8 @@ isc_entropy_createcallbacksource(isc_entropy_t *ent,
- /*!<
-  * \brief Create an entropy source that is polled via a callback.
-  *
-- * This would
-- * be used when keyboard input is used, or a GUI input method.  It can
-- * also be used to hook in any external entropy source.
-+ * This would be used when keyboard input is used, or a GUI input method.
-+ * It can also be used to hook in any external entropy source.
-  *
-  * Samples are added via isc_entropy_addcallbacksample(), below.
-  * _addcallbacksample() is the only function which may be called from
-@@ -232,15 +231,32 @@ isc_result_t
- isc_entropy_getdata(isc_entropy_t *ent, void *data, unsigned int length,
- 		    unsigned int *returned, unsigned int flags);
- /*!<
-- * \brief Extract data from the entropy pool.  This may load the pool from various
-- * sources.
-+ * \brief Get random data from entropy pool 'ent'.
-  *
-- * Do this by stirring the pool and returning a part of hash as randomness.
-- * Note that no secrets are given away here since parts of the hash are
-- * xored together before returned.
-+ * If a hook has been set up using isc_entropy_sethook() and
-+ * isc_entropy_usehook(), then the hook function will be called to get
-+ * random data.
-  *
-- * Honor the request from the caller to only return good data, any data,
-- * etc.
-+ * Otherwise, randomness is extracted from the entropy pool set up in BIND.
-+ * This may cause the pool to be loaded from various sources. Ths is done
-+ * by stirring the pool and returning a part of hash as randomness.
-+ * (Note that no secrets are given away here since parts of the hash are
-+ * XORed together before returning.)
-+ *
-+ * 'flags' may contain ISC_ENTROPY_GOODONLY, ISC_ENTROPY_PARTIAL, or
-+ * ISC_ENTROPY_BLOCKING. These will be honored if the hook function is
-+ * not in use. If it is, the flags will be passed to the hook function
-+ * but it may ignore them.
-+ *
-+ * Up to 'length' bytes of randomness are retrieved and copied into 'data'.
-+ * (If 'returned' is not NULL, and the number of bytes copied is less than
-+ * 'length' - which may happen if ISC_ENTROPY_PARTIAL was used - then the
-+ * number of bytes copied will be stored in *returned.)
-+ *
-+ * Returns:
-+ * \li	ISC_R_SUCCESS on success
-+ * \li	ISC_R_NOENTROPY if entropy pool is empty
-+ * \li	other error codes are possible when a hook is in use
-  */
- 
- void
-@@ -305,13 +321,21 @@ isc_entropy_usebestsource(isc_entropy_t *ectx, isc_entropysource_t **source,
- void
- isc_entropy_usehook(isc_entropy_t *ectx, bool onoff);
- /*!<
-- * \brief Mark/unmark the given entropy structure as being hooked.
-+ * \brief Configure entropy context 'ectx' to use the hook function
-+ *
-+ * Sets the entropy context to call the hook function for random number
-+ * generation, if such a function has been configured via
-+ * isc_entropy_sethook(), whenever isc_entropy_getdata() is called.
-  */
- 
- void
- isc_entropy_sethook(isc_entropy_getdata_t myhook);
- /*!<
-- * \brief Set the getdata hook (e.g., for a crypto random generator).
-+ * \brief Set the hook function.
-+ *
-+ * The hook function is a global value: only one hook function
-+ * can be set in the system. Individual entropy contexts may be
-+ * configured to use it, or not, by calling isc_entropy_usehook().
-  */
- 
- ISC_LANG_ENDDECLS
-diff --git a/lib/isc/include/isc/random.h b/lib/isc/include/isc/random.h
-index f8aed34..17c551b 100644
---- a/lib/isc/include/isc/random.h
-+++ b/lib/isc/include/isc/random.h
-@@ -9,8 +9,6 @@
-  * information regarding copyright ownership.
-  */
- 
--/* $Id: random.h,v 1.20 2009/01/17 23:47:43 tbox Exp $ */
--
- #ifndef ISC_RANDOM_H
- #define ISC_RANDOM_H 1
- 
-@@ -21,13 +19,23 @@
- #include <isc/mutex.h>
- 
- /*! \file isc/random.h
-- * \brief Implements a random state pool which will let the caller return a
-- * series of possibly non-reproducible random values.
-+ * \brief Implements pseudo random number generators.
-+ *
-+ * Two pseudo-random number generators are implemented, in isc_random_*
-+ * and isc_rng_*. Neither one is very strong; they should not be used
-+ * in cryptography functions.
-+ *
-+ * isc_random_* is based on arc4random if it is available on the system.
-+ * Otherwise it is based on the posix srand() and rand() functions.
-+ * It is useful for jittering values a bit here and there, such as
-+ * timeouts, etc, but should not be relied upon to generate
-+ * unpredictable sequences (for example, when choosing transaction IDs).
-  *
-- * Note that the
-- * strength of these numbers is not all that high, and should not be
-- * used in cryptography functions.  It is useful for jittering values
-- * a bit here and there, such as timeouts, etc.
-+ * isc_rng_* is based on ChaCha20, and is seeded and stirred from the
-+ * system entropy source. It is stronger than isc_random_* and can
-+ * be used for generating unpredictable sequences. It is still not as
-+ * good as using system entropy directly (see entropy.h) and should not
-+ * be used for cryptographic functions such as key generation.
-  */
- 
- ISC_LANG_BEGINDECLS
-@@ -115,8 +123,8 @@ isc_rng_random(isc_rng_t *rngctx);
- uint16_t
- isc_rng_uniformrandom(isc_rng_t *rngctx, uint16_t upper_bound);
- /*%<
-- * Returns a uniformly distributed pseudo random 16-bit unsigned
-- * integer.
-+ * Returns a uniformly distributed pseudo-random 16-bit unsigned integer
-+ * less than 'upper_bound'.
-  */
- 
- ISC_LANG_ENDDECLS
-diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
-index 1c45d5c..91693b5 100644
---- a/lib/isccfg/namedconf.c
-+++ b/lib/isccfg/namedconf.c
-@@ -1109,7 +1109,7 @@ options_clauses[] = {
- 	{ "pid-file", &cfg_type_qstringornone, 0 },
- 	{ "port", &cfg_type_uint32, 0 },
- 	{ "querylog", &cfg_type_boolean, 0 },
--	{ "random-device", &cfg_type_qstring, 0 },
-+	{ "random-device", &cfg_type_qstringornone, 0 },
- 	{ "recursing-file", &cfg_type_qstring, 0 },
- 	{ "recursive-clients", &cfg_type_uint32, 0 },
- 	{ "reserved-sockets", &cfg_type_uint32, 0 },
--- 
-2.21.1
-
diff --git a/bind-9.11-serve-stale-dbfix.patch b/bind-9.11-serve-stale-dbfix.patch
deleted file mode 100644
index 7091871060207a5a87cd76e005f2963a42cf5f52..0000000000000000000000000000000000000000
--- a/bind-9.11-serve-stale-dbfix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 20848d8284951481051f6ebdeb8128c05c7e82e2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Mon, 11 Nov 2019 16:56:52 +0100
-Subject: [PATCH] Move stale_ttl from middle to the end
-
-bind-dyndb-ldap is using rdataset structure. Do not modify its body,
-move stale_ttl to the end. Make it binary compatible.
----
- lib/dns/include/dns/rdataset.h | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
-index 97071ed496..a0c6afe624 100644
---- a/lib/dns/include/dns/rdataset.h
-+++ b/lib/dns/include/dns/rdataset.h
-@@ -137,11 +137,6 @@ struct dns_rdataset {
- 	dns_rdataclass_t		rdclass;
- 	dns_rdatatype_t			type;
- 	dns_ttl_t			ttl;
--	/*
--	 * Stale ttl is used to see how long this RRset can still be used
--	 * to serve to clients, after the TTL has expired.
--	 */
--	dns_ttl_t			stale_ttl;
- 	dns_trust_t			trust;
- 	dns_rdatatype_t			covers;
- 
-@@ -178,6 +173,11 @@ struct dns_rdataset {
- 	void *				private7;
- 	/*@}*/
- 
-+	/*
-+	 * Stale ttl is used to see how long this RRset can still be used
-+	 * to serve to clients, after the TTL has expired.
-+	 */
-+	dns_ttl_t			stale_ttl;
- };
- 
- /*!
--- 
-2.20.1
-
diff --git a/bind-9.11-serve-stale.patch b/bind-9.11-serve-stale.patch
deleted file mode 100644
index 724a57bd04ad6969eb4a97d1c035d75f45a4952c..0000000000000000000000000000000000000000
--- a/bind-9.11-serve-stale.patch
+++ /dev/null
@@ -1,3859 +0,0 @@
-From 521fc8dcc0ac064ae8bc521418f5b03f0ceec657 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Thu, 7 Nov 2019 14:31:03 +0100
-Subject: [PATCH] Implement serve-stale in 9.11
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Squashed commit of the following:
-
-commit 32f47f36e545223b2a4757588d7bd4af8c5f5760
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Tue Sep 3 18:45:54 2019 +0200
-
-    convert serve_stale to db_test
-
-    Manual checkout from commit e8f61dd315c5d1c88915bb79361182241e42e47a.
-    Use test modified for cmocka, including serve-stale tests.
-
-commit 071eb1fb0786f6d614955813d99c3caabff33383
-Author: Michał Kępień <michal@isc.org>
-Date:   Fri Apr 27 09:13:26 2018 +0200
-
-    Detect recursion loops during query processing
-
-    Interrupt query processing when query_recurse() attempts to ask the same
-    name servers for the same QNAME/QTYPE tuple for two times in a row as
-    this indicates that query processing may be stuck for an indeterminate
-    period of time, e.g. due to interactions between features able to
-    restart query_lookup().
-
-    (cherry picked from commit 46bb4dd124ed031d4c219d1e37a3c6322092e30c)
-
-commit c12090bc361c7fa4522ace73899e778e44e9b295
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Mon Sep 2 11:12:32 2019 +0200
-
-    Fix test name used in whole test-suite
-
-    Correct name is serve-stale
-
-commit ff4d826f295d268a248ca06941d65c903e1b405c
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Fri Aug 30 17:43:28 2019 +0200
-
-    Clean files in more generic rules
-
-commit 8d81ed15eda9a2a11e1433d1fdddacfc772708b6
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Thu Aug 29 21:27:57 2019 +0200
-
-    [rt46602] Pass port numbers to tests via environment variables
-
-    Manually applied commit f5d8f079008b648d2e343543e66dd728054c6101
-
-commit 94fafa477891576286def8c4041ad127734af2d1
-Author: Tony Finch <dot@dotat.at>
-Date:   Tue Apr 10 16:17:57 2018 +0100
-
-    Move serve-stale logging to its own category, so that its verbosity can be curtailed.
-
-    (cherry picked from commit 4b442c309dfb2c8880b19af4133047655bb734df)
-
-commit e0c884bee98c3d2533dfaa667f58c6a80d8a3a00
-Author: Michał Kępień <michal@isc.org>
-Date:   Fri Apr 27 09:13:26 2018 +0200
-
-    Prevent check_stale_header() from leaking rdataset headers
-
-    check_stale_header() fails to update the pointer to the previous header
-    while processing rdataset headers eligible for serve-stale, thus
-    enabling rdataset headers to be leaked (i.e. disassociated from a node
-    and left on the relevant TTL heap) while iterating through a node.  This
-    can lead to several different assertion failures.  Add the missing
-    pointer update.
-
-    (cherry picked from commit 391fac1fc8d2e470287b5cc4344b3adb90c6f54a)
-
-commit d724cc1d80ee8d46113eaf82549d49636739b67c
-Author: Matthijs Mekking <matthijs@isc.org>
-Date:   Thu Jan 24 10:24:44 2019 +0100
-
-    Print in dump-file stale ttl
-
-    This change makes rndc dumpdb correctly print the "; stale" line.
-    It also provides extra information on how long this data may still
-    be served to clients (in other words how long the stale RRset may
-    still be used).
-
-    (cherry picked from commit 924ebc605db798e2a383ee5eaaebad739e7c789c)
-
-commit 625da4bd4590ac6108bb30eddd23ceffb245ae49
-Author: Michał Kępień <michal@isc.org>
-Date:   Mon Oct 22 15:26:45 2018 +0200
-
-    Check serve-stale behavior with a cold cache
-
-    Ensure that serve-stale works as expected when returning stale answers
-    is enabled, the authoritative server does not respond, and there is no
-    cached answer available.
-
-    (cherry picked from commit 27cfe83a388147edfa0451b28c06c746912ea684)
-
-commit d67ae10461c409fdafdbbe64f857db2552b71059
-Author: Michał Kępień <michal@isc.org>
-Date:   Mon Oct 22 15:26:45 2018 +0200
-
-    Check TTL of stale answers
-
-    Make sure that stale answers returned when the serve-stale feature is
-    enabled have a TTL matching the value of the stale-answer-ttl setting.
-
-    (cherry picked from commit 893ab37ce78c658215bd3a019f25afe795b37d5a)
-
-commit 50459107805e68e4a63a8e497bf58ef3ce013ddb
-Author: Michał Kępień <michal@isc.org>
-Date:   Mon Jul 9 14:35:12 2018 +0200
-
-    Do not use Net::DNS::Nameserver in the "serve-stale" system test
-
-    Net::DNS versions older than 0.67 respond to queries sent to a
-    Net::DNS::Nameserver even if its ReplyHandler returns undef.  This makes
-    the "serve-stale" system test fail as it takes advantage of the newer
-    behavior.  Since the latest Net::DNS version available with stock
-    RHEL/CentOS 6 packages is 0.65 and we officially support that operating
-    system, bin/tests/system/serve-stale/ans2/ans.pl should behave
-    consistently for various Net::DNS versions.  Ensure that by reworking it
-    so that it does not use Net::DNS::Nameserver.
-
-    (cherry picked from commit c4209418a50c09142375f7edadca731c526f3d3a)
-
-commit 4b5befc714bb386bd245b1c14ce3bce5ae6fb5fa
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Tue Jun 5 21:38:29 2018 +0200
-
-    Fix server-stale requirement, skip without Time::HiRes
-
-    (cherry picked from commit 7a0c7bf9c8e6a724e52635eed213ad25b9504e66)
-
-commit 5ce51a3a7e5ef3087c4d022e3fca42fb2fd0c996
-Author: Ondřej Surý <ondrej@sury.org>
-Date:   Wed Oct 18 13:01:14 2017 +0200
-
-    [rt46602] Update server-stale test to run on port passed from run.sh script
-
-    (cherry picked from commit f83ebd34b9555a5a834c58146035173bcbd01dda)
-
-commit 3954a9bf3437f6fab050294a7f2f954a23d161ec
-Author: Ondřej Surý <ondrej@sury.org>
-Date:   Wed Oct 18 14:18:59 2017 +0200
-
-    [rt46602] Add serve-stale working files to .gitignore
-
-    (cherry picked from commit cba162e70e7fac43435a606106841a69ce468526)
-
-commit 112aa21f5fa875494820e4d1eb70e41e10e1aae7
-Author: Mark Andrews <marka@isc.org>
-Date:   Thu Oct 12 15:33:47 2017 +1100
-
-    test for Net::DNS::Nameserver
-
-    (cherry picked from commit 5b60d0608ac2852753180b762d1917163f9dc315)
-
-commit 9d610e46af8a636f44914cee4cf8b2016054db1e
-Author: Mark Andrews <marka@isc.org>
-Date:   Thu Oct 12 15:19:45 2017 +1100
-
-    add Net::DNS prerequiste test
-
-    (cherry picked from commit fa644181f51559da3e3913acd72dbc3f6d916e71)
-
-commit e4ea7ba88d9a9a0c79579400c68a5dabe03e8572
-Author: Mark Andrews <marka@isc.org>
-Date:   Wed Sep 6 19:26:10 2017 +1000
-
-    add quotes arount $send_response
-
-    (cherry picked from commit 023ab19634b287543169e9b7b5259f3126cd60ff)
-
-commit 0af0c5d33c2de34da164571288b650282c6be10a
-Author: Mark Andrews <marka@isc.org>
-Date:   Thu Nov 23 16:11:49 2017 +1100
-
-    initalise serve_stale_ttl
-
-    (cherry picked from commit 2f4e0e5a81278f59037bf06ae99ff52245cd57e9)
-
-commit fbadd90ee81863d617c4c319d5f0079b877fe102
-Author: Evan Hunt <each@isc.org>
-Date:   Thu Sep 14 11:48:21 2017 -0700
-
-    [master] add thanks to APNIC and add missing note for serve-stale
-
-commit deb8adaa59955970b9d2f2fe58060a3cbf08312b
-Author: Mark Andrews <marka@isc.org>
-Date:   Wed Sep 6 12:16:10 2017 +1000
-
-    silence 'staleanswersok' may be used uninitialized in this function warning. [RT #14147
-
-commit 0e2d03823768dc545015e6ce309777210f4a9f85
-Author: Petr Menšík <pemensik@redhat.com>
-Date:   Thu Aug 29 19:57:58 2019 +0200
-
-    More fixes to merge
-
-commit 360e25ffe7623ea0a2eec49395001f4940967776
-Author: Mark Andrews <marka@isc.org>
-Date:   Wed Sep 6 09:58:29 2017 +1000
-
-    4700.   [func]          Serving of stale answers is now supported. This
-                            allows named to provide stale cached answers when
-                            the authoritative server is under attack.
-                            See max-stale-ttl, stale-answer-enable,
-                            stale-answer-ttl. [RT #44790]
-
-Signed-off-by: Petr Menšík <pemensik@redhat.com>
----
- bin/named/config.c                            |   9 +-
- bin/named/control.c                           |   2 +
- bin/named/include/named/control.h             |   1 +
- bin/named/include/named/log.h                 |   1 +
- bin/named/include/named/query.h               |  15 +
- bin/named/include/named/server.h              |  13 +-
- bin/named/log.c                               |   1 +
- bin/named/query.c                             | 164 +++++-
- bin/named/server.c                            | 177 +++++-
- bin/named/statschannel.c                      |   6 +
- bin/rndc/rndc.c                               |   2 +
- bin/rndc/rndc.docbook                         |  19 +
- bin/tests/system/chain/prereq.sh              |   7 +
- bin/tests/system/conf.sh.in                   |   2 +-
- bin/tests/system/dyndb/driver/db.c            |   2 +
- bin/tests/system/serve-stale/.gitignore       |  11 +
- bin/tests/system/serve-stale/ans2/ans.pl.in   | 178 ++++++
- bin/tests/system/serve-stale/clean.sh         |  15 +
- .../system/serve-stale/ns1/named1.conf.in     |  35 ++
- .../system/serve-stale/ns1/named2.conf.in     |  35 ++
- bin/tests/system/serve-stale/ns1/root.db      |   5 +
- .../system/serve-stale/ns3/named.conf.in      |  35 ++
- bin/tests/system/serve-stale/prereq.sh        |  38 ++
- bin/tests/system/serve-stale/setup.sh         |  13 +
- bin/tests/system/serve-stale/tests.sh         | 536 ++++++++++++++++++
- doc/arm/Bv9ARM-book.xml                       |  69 ++-
- doc/arm/logging-categories.xml                |  11 +
- doc/arm/notes-rh-changes.xml                  |  14 +-
- doc/misc/options                              |  10 +
- lib/bind9/check.c                             |  78 ++-
- lib/dns/cache.c                               |  38 +-
- lib/dns/db.c                                  |  22 +
- lib/dns/ecdb.c                                |   4 +-
- lib/dns/include/dns/cache.h                   |  21 +
- lib/dns/include/dns/db.h                      |  35 ++
- lib/dns/include/dns/rdataset.h                |  11 +
- lib/dns/include/dns/resolver.h                |  43 +-
- lib/dns/include/dns/types.h                   |   6 +
- lib/dns/include/dns/view.h                    |   3 +
- lib/dns/master.c                              |  14 +-
- lib/dns/masterdump.c                          |  23 +
- lib/dns/rbtdb.c                               | 207 ++++++-
- lib/dns/resolver.c                            |  79 ++-
- lib/dns/sdb.c                                 |   4 +-
- lib/dns/sdlz.c                                |   4 +-
- lib/dns/tests/db_test.c                       | 198 ++++++-
- lib/dns/view.c                                |   3 +
- lib/isccfg/namedconf.c                        |   5 +
- 48 files changed, 2122 insertions(+), 102 deletions(-)
- create mode 100644 bin/tests/system/serve-stale/.gitignore
- create mode 100644 bin/tests/system/serve-stale/ans2/ans.pl.in
- create mode 100644 bin/tests/system/serve-stale/clean.sh
- create mode 100644 bin/tests/system/serve-stale/ns1/named1.conf.in
- create mode 100644 bin/tests/system/serve-stale/ns1/named2.conf.in
- create mode 100644 bin/tests/system/serve-stale/ns1/root.db
- create mode 100644 bin/tests/system/serve-stale/ns3/named.conf.in
- create mode 100644 bin/tests/system/serve-stale/prereq.sh
- create mode 100644 bin/tests/system/serve-stale/setup.sh
- create mode 100755 bin/tests/system/serve-stale/tests.sh
-
-diff --git a/bin/named/config.c b/bin/named/config.c
-index 63da4b0..b598f9b 100644
---- a/bin/named/config.c
-+++ b/bin/named/config.c
-@@ -182,13 +182,14 @@ options {\n\
- #ifdef HAVE_LMDB
- "	lmdb-mapsize 32M;\n"
- #endif
--"	max-acache-size 16M;\n\
--	max-cache-size 90%;\n\
-+"	max-cache-size 90%;\n\
-+	max-acache-size 16M;\n\
- 	max-cache-ttl 604800; /* 1 week */\n\
- 	max-clients-per-query 100;\n\
- 	max-ncache-ttl 10800; /* 3 hours */\n\
- 	max-recursion-depth 7;\n\
- 	max-recursion-queries 75;\n\
-+	max-stale-ttl 604800; /* 1 week */\n\
- 	message-compression yes;\n\
- #	min-roots <obsolete>;\n\
- 	minimal-any false;\n\
-@@ -203,10 +204,14 @@ options {\n\
- 	request-expire true;\n\
- 	request-ixfr true;\n\
- 	require-server-cookie no;\n\
-+	resolver-nonbackoff-tries 3;\n\
-+	resolver-retry-interval 800; /* in milliseconds */\n\
- #	rfc2308-type1 <obsolete>;\n\
- 	root-key-sentinel yes;\n\
- 	servfail-ttl 1;\n\
- #	sortlist <none>\n\
-+	stale-answer-enable false;\n\
-+	stale-answer-ttl 1; /* 1 second */\n\
- #	topology <none>\n\
- 	transfer-format many-answers;\n\
- 	v6-bias 50;\n\
-diff --git a/bin/named/control.c b/bin/named/control.c
-index df23c26..8b79850 100644
---- a/bin/named/control.c
-+++ b/bin/named/control.c
-@@ -282,6 +282,8 @@ ns_control_docommand(isccc_sexpr_t *message, bool readonly,
- 		result = ns_server_validation(ns_g_server, lex, text);
- 	} else if (command_compare(command, NS_COMMAND_ZONESTATUS)) {
- 		result = ns_server_zonestatus(ns_g_server, lex, text);
-+	} else if (command_compare(command, NS_COMMAND_SERVESTALE)) {
-+		result = ns_server_servestale(ns_g_server, lex, text);
- 	} else {
- 		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
- 			      NS_LOGMODULE_CONTROL, ISC_LOG_WARNING,
-diff --git a/bin/named/include/named/control.h b/bin/named/include/named/control.h
-index 8705fdd..1634154 100644
---- a/bin/named/include/named/control.h
-+++ b/bin/named/include/named/control.h
-@@ -69,6 +69,7 @@
- #define NS_COMMAND_MKEYS	"managed-keys"
- #define NS_COMMAND_DNSTAPREOPEN	"dnstap-reopen"
- #define NS_COMMAND_DNSTAP	"dnstap"
-+#define NS_COMMAND_SERVESTALE	"serve-stale"
- 
- isc_result_t
- ns_controls_create(ns_server_t *server, ns_controls_t **ctrlsp);
-diff --git a/bin/named/include/named/log.h b/bin/named/include/named/log.h
-index 56bfcd4..cd8db60 100644
---- a/bin/named/include/named/log.h
-+++ b/bin/named/include/named/log.h
-@@ -32,6 +32,7 @@
- #define NS_LOGCATEGORY_UPDATE_SECURITY	(&ns_g_categories[6])
- #define NS_LOGCATEGORY_QUERY_ERRORS	(&ns_g_categories[7])
- #define NS_LOGCATEGORY_TAT		(&ns_g_categories[8])
-+#define NS_LOGCATEGORY_SERVE_STALE	(&ns_g_categories[9])
- 
- /*
-  * Backwards compatibility.
-diff --git a/bin/named/include/named/query.h b/bin/named/include/named/query.h
-index 9661f56..445b578 100644
---- a/bin/named/include/named/query.h
-+++ b/bin/named/include/named/query.h
-@@ -35,6 +35,18 @@ typedef struct ns_dbversion {
- 	ISC_LINK(struct ns_dbversion)	link;
- } ns_dbversion_t;
- 
-+/*%
-+ * nameserver recursion parameters, to uniquely identify a recursion
-+ * query; this is used to detect a recursion loop
-+ */
-+typedef struct ns_query_recparam {
-+	dns_rdatatype_t			qtype;
-+	dns_name_t *			qname;
-+	dns_fixedname_t			fqname;
-+	dns_name_t *			qdomain;
-+	dns_fixedname_t			fqdomain;
-+} ns_query_recparam_t;
-+
- /*% nameserver query structure */
- struct ns_query {
- 	unsigned int			attributes;
-@@ -63,6 +75,7 @@ struct ns_query {
- 	unsigned int			dns64_aaaaoklen;
- 	unsigned int			dns64_options;
- 	unsigned int			dns64_ttl;
-+
- 	struct {
- 		dns_db_t *      	db;
- 		dns_zone_t *      	zone;
-@@ -76,6 +89,8 @@ struct ns_query {
- 		bool		authoritative;
- 		bool		is_zone;
- 	} redirect;
-+
-+	ns_query_recparam_t		recparam;
- 	dns_keytag_t root_key_sentinel_keyid;
- 	bool root_key_sentinel_is_ta;
- 	bool root_key_sentinel_not_ta;
-diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h
-index c92922e..588bf2d 100644
---- a/bin/named/include/named/server.h
-+++ b/bin/named/include/named/server.h
-@@ -226,7 +226,10 @@ enum {
- 
- 	dns_nsstatscounter_reclimitdropped = 58,
- 
--	dns_nsstatscounter_max = 59
-+	dns_nsstatscounter_trystale = 59,
-+	dns_nsstatscounter_usedstale = 60,
-+
-+	dns_nsstatscounter_max = 61
- };
- 
- /*%
-@@ -765,4 +768,12 @@ ns_server_mkeys(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text);
- isc_result_t
- ns_server_dnstap(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text);
- 
-+
-+/*%
-+ * Control whether stale answers are served or not when configured in
-+ * named.conf.
-+ */
-+isc_result_t
-+ns_server_servestale(ns_server_t *server, isc_lex_t *lex,
-+		     isc_buffer_t **text);
- #endif /* NAMED_SERVER_H */
-diff --git a/bin/named/log.c b/bin/named/log.c
-index 3aa25e9..12f178b 100644
---- a/bin/named/log.c
-+++ b/bin/named/log.c
-@@ -38,6 +38,7 @@ static isc_logcategory_t categories[] = {
- 	{ "update-security",		0 },
- 	{ "query-errors",		0 },
- 	{ "trust-anchor-telemetry",	0 },
-+	{ "serve-stale",                0 },
- 	{ NULL, 			0 }
- };
- 
-diff --git a/bin/named/query.c b/bin/named/query.c
-index 25eeced..162e4ea 100644
---- a/bin/named/query.c
-+++ b/bin/named/query.c
-@@ -125,10 +125,14 @@
- #define REDIRECT(c)		(((c)->query.attributes & \
- 				  NS_QUERYATTR_REDIRECT) != 0)
- 
--/*% No QNAME Proof? */
-+/*% Does the rdataset 'r' have an attached 'No QNAME Proof'? */
- #define NOQNAME(r)		(((r)->attributes & \
- 				  DNS_RDATASETATTR_NOQNAME) != 0)
- 
-+/*% Does the rdataset 'r' contain a stale answer? */
-+#define STALE(r)		(((r)->attributes & \
-+				  DNS_RDATASETATTR_STALE) != 0)
-+
- #ifdef WANT_QUERYTRACE
- static inline void
- client_trace(ns_client_t *client, int level, const char *message) {
-@@ -217,6 +221,10 @@ static bool
- rpz_ck_dnssec(ns_client_t *client, isc_result_t qresult,
- 	      dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset);
- 
-+static void
-+recparam_update(ns_query_recparam_t *param, dns_rdatatype_t qtype,
-+		const dns_name_t *qname, const dns_name_t *qdomain);
-+
- /*%
-  * Increment query statistics counters.
-  */
-@@ -470,6 +478,7 @@ query_reset(ns_client_t *client, bool everything) {
- 	client->query.isreferral = false;
- 	client->query.dns64_options = 0;
- 	client->query.dns64_ttl = UINT32_MAX;
-+	recparam_update(&client->query.recparam, 0, NULL, NULL);
- 	client->query.root_key_sentinel_keyid = 0;
- 	client->query.root_key_sentinel_is_ta = false;
- 	client->query.root_key_sentinel_not_ta = false;
-@@ -4254,6 +4263,54 @@ query_prefetch(ns_client_t *client, dns_name_t *qname,
- 	dns_rdataset_clearprefetch(rdataset);
- }
- 
-+/*%
-+ * Check whether the recursion parameters in 'param' match the current query's
-+ * recursion parameters provided in 'qtype', 'qname', and 'qdomain'.
-+ */
-+static bool
-+recparam_match(const ns_query_recparam_t *param, dns_rdatatype_t qtype,
-+	       const dns_name_t *qname, const dns_name_t *qdomain)
-+{
-+	REQUIRE(param != NULL);
-+
-+	return (param->qtype == qtype &&
-+	        param->qname != NULL && qname != NULL &&
-+	        param->qdomain != NULL && qdomain != NULL &&
-+	        dns_name_equal(param->qname, qname) &&
-+	        dns_name_equal(param->qdomain, qdomain));
-+}
-+
-+/*%
-+ * Update 'param' with current query's recursion parameters provided in
-+ * 'qtype', 'qname', and 'qdomain'.
-+ */
-+static void
-+recparam_update(ns_query_recparam_t *param, dns_rdatatype_t qtype,
-+		const dns_name_t *qname, const dns_name_t *qdomain)
-+{
-+	isc_result_t result;
-+
-+	REQUIRE(param != NULL);
-+
-+	param->qtype = qtype;
-+
-+	if (qname == NULL) {
-+		param->qname = NULL;
-+	} else {
-+		param->qname = dns_fixedname_initname(&param->fqname);
-+		result = dns_name_copy(qname, param->qname, NULL);
-+		RUNTIME_CHECK(result == ISC_R_SUCCESS);
-+	}
-+
-+	if (qdomain == NULL) {
-+		param->qdomain = NULL;
-+	} else {
-+		param->qdomain = dns_fixedname_initname(&param->fqdomain);
-+		result = dns_name_copy(qdomain, param->qdomain, NULL);
-+		RUNTIME_CHECK(result == ISC_R_SUCCESS);
-+	}
-+}
-+
- static isc_result_t
- query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname,
- 	      dns_name_t *qdomain, dns_rdataset_t *nameservers,
-@@ -4263,6 +4320,19 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname,
- 	dns_rdataset_t *rdataset, *sigrdataset;
- 	isc_sockaddr_t *peeraddr;
- 
-+	/*
-+	 * Check recursion parameters from the previous query to see if they
-+	 * match.  If not, update recursion parameters and proceed.
-+	 */
-+	if (recparam_match(&client->query.recparam, qtype, qname, qdomain)) {
-+		ns_client_log(client, NS_LOGCATEGORY_CLIENT,
-+			      NS_LOGMODULE_QUERY, ISC_LOG_INFO,
-+			      "recursion loop detected");
-+		return (ISC_R_FAILURE);
-+	}
-+
-+	recparam_update(&client->query.recparam, qtype, qname, qdomain);
-+
- 	if (!resuming)
- 		inc_stats(client, dns_nsstatscounter_recursion);
- 
-@@ -6780,6 +6850,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 	int line = -1;
- 	bool dns64_exclude, dns64, rpz;
- 	bool nxrewrite = false;
-+	bool want_stale = false;
- 	bool redirected = false;
- 	dns_clientinfomethods_t cm;
- 	dns_clientinfo_t ci;
-@@ -7089,6 +7160,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 		type = qtype;
- 
-  restart:
-+	// query_start
- 	CTRACE(ISC_LOG_DEBUG(3), "query_find: restart");
- 	want_restart = false;
- 	authoritative = false;
-@@ -7233,6 +7305,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 	}
- 
-  db_find:
-+	// query_lookup
- 	CTRACE(ISC_LOG_DEBUG(3), "query_find: db_find");
- 	/*
- 	 * We'll need some resources...
-@@ -7290,6 +7363,35 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 	if (!is_zone)
- 		dns_cache_updatestats(client->view->cache, result);
- 
-+	if (want_stale) {
-+		char namebuf[DNS_NAME_FORMATSIZE];
-+		bool success;
-+
-+		client->query.dboptions &= ~DNS_DBFIND_STALEOK;
-+		want_stale = false;
-+
-+		if (dns_rdataset_isassociated(rdataset) &&
-+		    dns_rdataset_count(rdataset) > 0 &&
-+		    STALE(rdataset)) {
-+			rdataset->ttl = client->view->staleanswerttl;
-+			success = true;
-+		} else {
-+			success = false;
-+		}
-+
-+		dns_name_format(client->query.qname,
-+				namebuf, sizeof(namebuf));
-+		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_SERVE_STALE,
-+			      NS_LOGMODULE_QUERY, ISC_LOG_INFO,
-+			      "%s resolver failure, stale answer %s",
-+			      namebuf, success ? "used" : "unavailable");
-+
-+		if (!success) {
-+			QUERY_ERROR(DNS_R_SERVFAIL);
-+			goto cleanup;
-+		}
-+	}
-+
-  resume:
- 	CTRACE(ISC_LOG_DEBUG(3), "query_find: resume");
- 
-@@ -7635,6 +7737,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 		 * The cache doesn't even have the root NS.  Get them from
- 		 * the hints DB.
- 		 */
-+		// query_notfound
- 		INSIST(!is_zone);
- 		if (db != NULL)
- 			dns_db_detach(&db);
-@@ -7697,12 +7800,14 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 		 */
- 		/* FALLTHROUGH */
- 	case DNS_R_DELEGATION:
-+		// query_delegation
- 		authoritative = false;
- 		if (is_zone) {
- 			/*
- 			 * Look to see if we are authoritative for the
- 			 * child zone if the query type is DS.
- 			 */
-+			// query_zone_delegation
- 			if (!RECURSIONOK(client) &&
- 			    (options & DNS_GETDB_NOEXACT) != 0 &&
- 			    qtype == dns_rdatatype_ds) {
-@@ -8089,6 +8194,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 						       false, true);
- 			}
- 		}
-+		// query_nxdomain
- 		if (dns_rdataset_isassociated(rdataset)) {
- 			/*
- 			 * If we've got a NSEC record, we need to save the
-@@ -8409,7 +8515,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 		/*
- 		 * If we have a zero ttl from the cache refetch it.
- 		 */
--		if (!is_zone && !resuming && rdataset->ttl == 0 &&
-+		// query_cname
-+		if (!is_zone && !resuming && !STALE(rdataset) && rdataset->ttl == 0 &&
- 		    RECURSIONOK(client))
- 		{
- 			if (dns_rdataset_isassociated(rdataset))
-@@ -8627,7 +8734,11 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 			 "query_find: unexpected error after resuming: %s",
- 			 isc_result_totext(result));
- 		CTRACE(ISC_LOG_ERROR, errmsg);
--		QUERY_ERROR(DNS_R_SERVFAIL);
-+		if (resuming) {
-+			want_stale = true;
-+		} else {
-+			QUERY_ERROR(DNS_R_SERVFAIL);
-+		}
- 		goto cleanup;
- 	}
- 
-@@ -8883,7 +8994,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 		/*
- 		 * If we have a zero ttl from the cache refetch it.
- 		 */
--		if (!is_zone && !resuming && rdataset->ttl == 0 &&
-+		if (!is_zone && !resuming && !STALE(rdataset) && rdataset->ttl == 0 &&
- 		    RECURSIONOK(client))
- 		{
- 			if (dns_rdataset_isassociated(rdataset))
-@@ -8894,6 +9005,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 			if (node != NULL)
- 				dns_db_detachnode(db, &node);
- 
-+			// query_respond
- 			INSIST(!REDIRECT(client));
- 			result = query_recurse(client, qtype,
- 					       client->query.qname,
-@@ -9174,6 +9286,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 				       dns_fixedname_name(&wildcardname),
- 				       true, false);
-  cleanup:
-+	// query_done
- 	CTRACE(ISC_LOG_DEBUG(3), "query_find: cleanup");
- 	/*
- 	 * General cleanup.
-@@ -9230,6 +9343,49 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
- 		goto restart;
- 	}
- 
-+	if (want_stale) {
-+		dns_ttl_t stale_ttl = 0;
-+		isc_result_t result;
-+		bool staleanswersok = false;
-+
-+		/*
-+		 * Stale answers only make sense if stale_ttl > 0 but
-+		 * we want rndc to be able to control returning stale
-+		 * answers if they are configured.
-+		 */
-+		dns_db_attach(client->view->cachedb, &db);
-+		result = dns_db_getservestalettl(db, &stale_ttl);
-+		if (result == ISC_R_SUCCESS && stale_ttl > 0)  {
-+			switch (client->view->staleanswersok) {
-+			case dns_stale_answer_yes:
-+				staleanswersok = true;
-+				break;
-+			case dns_stale_answer_conf:
-+				staleanswersok =
-+					client->view->staleanswersenable;
-+				break;
-+			case dns_stale_answer_no:
-+				staleanswersok = false;
-+				break;
-+			}
-+		} else {
-+			staleanswersok = false;
-+		}
-+
-+		if (staleanswersok) {
-+			client->query.dboptions |= DNS_DBFIND_STALEOK;
-+			inc_stats(client, dns_nsstatscounter_trystale);
-+			if (client->query.fetch != NULL)
-+				dns_resolver_destroyfetch(
-+						   &client->query.fetch);
-+			goto db_find;
-+		}
-+		dns_db_detach(&db);
-+		want_stale = false;
-+		QUERY_ERROR(DNS_R_SERVFAIL);
-+		goto cleanup;
-+	}
-+
- 	if (eresult != ISC_R_SUCCESS &&
- 	    (!PARTIALANSWER(client) || WANTRECURSION(client)
- 	     || eresult == DNS_R_DROP)) {
-diff --git a/bin/named/server.c b/bin/named/server.c
-index 1f23cf0..1fa836f 100644
---- a/bin/named/server.c
-+++ b/bin/named/server.c
-@@ -1720,7 +1720,8 @@ static bool
- cache_sharable(dns_view_t *originview, dns_view_t *view,
- 	       bool new_zero_no_soattl,
- 	       unsigned int new_cleaning_interval,
--	       uint64_t new_max_cache_size)
-+	       uint64_t new_max_cache_size,
-+	       uint32_t new_stale_ttl)
- {
- 	/*
- 	 * If the cache cannot even reused for the same view, it cannot be
-@@ -1735,6 +1736,7 @@ cache_sharable(dns_view_t *originview, dns_view_t *view,
- 	 */
- 	if (dns_cache_getcleaninginterval(originview->cache) !=
- 	    new_cleaning_interval ||
-+	    dns_cache_getservestalettl(originview->cache) != new_stale_ttl ||
- 	    dns_cache_getcachesize(originview->cache) != new_max_cache_size) {
- 		return (false);
- 	}
-@@ -3290,6 +3292,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
- 	size_t max_acache_size;
- 	size_t max_adb_size;
- 	uint32_t lame_ttl, fail_ttl;
-+	uint32_t max_stale_ttl;
- 	dns_tsig_keyring_t *ring = NULL;
- 	dns_view_t *pview = NULL;	/* Production view */
- 	isc_mem_t *cmctx = NULL, *hmctx = NULL;
-@@ -3318,6 +3321,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
- 	bool old_rpz_ok = false;
- 	isc_dscp_t dscp4 = -1, dscp6 = -1;
- 	dns_dyndbctx_t *dctx = NULL;
-+	unsigned int resolver_param;
- 
- 	REQUIRE(DNS_VIEW_VALID(view));
- 
-@@ -3732,6 +3736,24 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
- 	if (view->maxncachettl > 7 * 24 * 3600)
- 		view->maxncachettl = 7 * 24 * 3600;
- 
-+	obj = NULL;
-+	result = ns_config_get(maps, "max-stale-ttl", &obj);
-+	INSIST(result == ISC_R_SUCCESS);
-+	max_stale_ttl = cfg_obj_asuint32(obj);
-+
-+	obj = NULL;
-+	result = ns_config_get(maps, "stale-answer-enable", &obj);
-+	INSIST(result == ISC_R_SUCCESS);
-+	view->staleanswersenable = cfg_obj_asboolean(obj);
-+
-+	result = dns_viewlist_find(&ns_g_server->viewlist, view->name,
-+				   view->rdclass, &pview);
-+	if (result == ISC_R_SUCCESS) {
-+		view->staleanswersok = pview->staleanswersok;
-+		dns_view_detach(&pview);
-+	} else
-+		view->staleanswersok = dns_stale_answer_conf;
-+
- 	/*
- 	 * Configure the view's cache.
- 	 *
-@@ -3765,7 +3787,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
- 	nsc = cachelist_find(cachelist, cachename, view->rdclass);
- 	if (nsc != NULL) {
- 		if (!cache_sharable(nsc->primaryview, view, zero_no_soattl,
--				    cleaning_interval, max_cache_size)) {
-+				    cleaning_interval, max_cache_size,
-+				    max_stale_ttl)) {
- 			isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
- 				      NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
- 				      "views %s and %s can't share the cache "
-@@ -3864,9 +3887,15 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
- 
- 	dns_cache_setcleaninginterval(cache, cleaning_interval);
- 	dns_cache_setcachesize(cache, max_cache_size);
-+	dns_cache_setservestalettl(cache, max_stale_ttl);
- 
- 	dns_cache_detach(&cache);
- 
-+	obj = NULL;
-+	result = ns_config_get(maps, "stale-answer-ttl", &obj);
-+	INSIST(result == ISC_R_SUCCESS);
-+	view->staleanswerttl = ISC_MAX(cfg_obj_asuint32(obj), 1);
-+
- 	/*
- 	 * Resolver.
- 	 *
-@@ -4055,6 +4084,21 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
- 		maxbits = 4096;
- 	view->maxbits = maxbits;
- 
-+	/*
-+	 * Set resolver retry parameters.
-+	 */
-+	obj = NULL;
-+	CHECK(ns_config_get(maps, "resolver-retry-interval", &obj));
-+	resolver_param = cfg_obj_asuint32(obj);
-+	if (resolver_param > 0)
-+		dns_resolver_setretryinterval(view->resolver, resolver_param);
-+
-+	obj = NULL;
-+	CHECK(ns_config_get(maps, "resolver-nonbackoff-tries", &obj));
-+	resolver_param = cfg_obj_asuint32(obj);
-+	if (resolver_param > 0)
-+		dns_resolver_setnonbackofftries(view->resolver, resolver_param);
-+
- 	/*
- 	 * Set supported DNSSEC algorithms.
- 	 */
-@@ -14456,3 +14500,132 @@ ns_server_dnstap(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) {
- 	return (ISC_R_NOTIMPLEMENTED);
- #endif
- }
-+
-+isc_result_t
-+ns_server_servestale(ns_server_t *server, isc_lex_t *lex,
-+		     isc_buffer_t **text)
-+{
-+	char *ptr, *classtxt, *viewtxt = NULL;
-+	char msg[128];
-+	dns_rdataclass_t rdclass = dns_rdataclass_in;
-+	dns_view_t *view;
-+	bool found = false;
-+	dns_stale_answer_t staleanswersok = dns_stale_answer_conf;
-+	bool wantstatus = false;
-+	isc_result_t result = ISC_R_SUCCESS;
-+
-+	/* Skip the command name. */
-+	ptr = next_token(lex, text);
-+	if (ptr == NULL)
-+		return (ISC_R_UNEXPECTEDEND);
-+
-+	ptr = next_token(lex, NULL);
-+	if (ptr == NULL)
-+		return (ISC_R_UNEXPECTEDEND);
-+
-+	if (strcasecmp(ptr, "on") == 0 || strcasecmp(ptr, "yes") == 0) {
-+		staleanswersok = dns_stale_answer_yes;
-+	} else if (strcasecmp(ptr, "off") == 0 || strcasecmp(ptr, "no") == 0) {
-+		staleanswersok = dns_stale_answer_no;
-+	} else if (strcasecmp(ptr, "reset") == 0) {
-+		staleanswersok = dns_stale_answer_conf;
-+	} else if (strcasecmp(ptr, "status") == 0) {
-+		wantstatus = true;
-+	} else
-+		return (DNS_R_SYNTAX);
-+
-+	/* Look for the optional class name. */
-+	classtxt = next_token(lex, text);
-+	if (classtxt != NULL) {
-+		/* Look for the optional view name. */
-+		viewtxt = next_token(lex, text);
-+	}
-+
-+	if (classtxt != NULL) {
-+		isc_textregion_t r;
-+
-+		r.base = classtxt;
-+		r.length = strlen(classtxt);
-+		result = dns_rdataclass_fromtext(&rdclass, &r);
-+		if (result != ISC_R_SUCCESS) {
-+			if (viewtxt == NULL) {
-+				viewtxt = classtxt;
-+				classtxt = NULL;
-+				result = ISC_R_SUCCESS;
-+			} else {
-+				snprintf(msg, sizeof(msg),
-+					 "unknown class '%s'", classtxt);
-+				(void) putstr(text, msg);
-+				goto cleanup;
-+			}
-+		}
-+	}
-+
-+	result = isc_task_beginexclusive(server->task);
-+	RUNTIME_CHECK(result == ISC_R_SUCCESS);
-+
-+	for (view = ISC_LIST_HEAD(server->viewlist);
-+	     view != NULL;
-+	     view = ISC_LIST_NEXT(view, link))
-+	{
-+		dns_ttl_t stale_ttl = 0;
-+		dns_db_t *db = NULL;
-+
-+		if (classtxt != NULL && rdclass != view->rdclass)
-+			continue;
-+
-+		if (viewtxt != NULL && strcmp(view->name, viewtxt) != 0)
-+			continue;
-+
-+		if (!wantstatus) {
-+			view->staleanswersok = staleanswersok;
-+			found = true;
-+			continue;
-+		}
-+
-+		db = NULL;
-+		dns_db_attach(view->cachedb, &db);
-+		(void)dns_db_getservestalettl(db, &stale_ttl);
-+		dns_db_detach(&db);
-+		if (found)
-+			CHECK(putstr(text, "\n"));
-+		CHECK(putstr(text, view->name));
-+		CHECK(putstr(text, ": "));
-+		switch (view->staleanswersok) {
-+		case dns_stale_answer_yes:
-+			if (stale_ttl > 0)
-+				CHECK(putstr(text, "on (rndc)"));
-+			else
-+				CHECK(putstr(text, "off (not-cached)"));
-+			break;
-+		case dns_stale_answer_no:
-+			CHECK(putstr(text, "off (rndc)"));
-+			break;
-+		case dns_stale_answer_conf:
-+			if (view->staleanswersenable && stale_ttl > 0)
-+				CHECK(putstr(text, "on"));
-+			else if (view->staleanswersenable)
-+				CHECK(putstr(text, "off (not-cached)"));
-+			else
-+				CHECK(putstr(text, "off"));
-+			break;
-+		}
-+		if (stale_ttl > 0) {
-+			snprintf(msg, sizeof(msg),
-+				 " (stale-answer-ttl=%u max-stale-ttl=%u)",
-+				 view->staleanswerttl, stale_ttl);
-+			CHECK(putstr(text, msg));
-+		}
-+		found = true;
-+	}
-+	isc_task_endexclusive(ns_g_server->task);
-+
-+	if (!found)
-+		result = ISC_R_NOTFOUND;
-+
-+cleanup:
-+	if (isc_buffer_usedlength(*text) > 0)
-+		(void) putnull(text);
-+
-+	return (result);
-+}
-diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
-index 4b8d972..8c68737 100644
---- a/bin/named/statschannel.c
-+++ b/bin/named/statschannel.c
-@@ -300,6 +300,12 @@ init_desc(void) {
- 	SET_NSSTATDESC(reclimitdropped,
- 		       "queries dropped due to recursive client limit",
- 		       "RecLimitDropped");
-+	SET_NSSTATDESC(trystale,
-+		       "attempts to use stale cache data after lookup failure",
-+		       "QryTryStale");
-+	SET_NSSTATDESC(usedstale,
-+		       "successful uses of stale cache data after lookup failure",
-+		       "QryUsedStale");
- 	INSIST(i == dns_nsstatscounter_max);
- 
- 	/* Initialize resolver statistics */
-diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
-index 8083654..d519983 100644
---- a/bin/rndc/rndc.c
-+++ b/bin/rndc/rndc.c
-@@ -160,6 +160,8 @@ command is one of the following:\n\
-   scan		Scan available network interfaces for changes.\n\
-   secroots [view ...]\n\
- 		Write security roots to the secroots file.\n\
-+  serve-stale	( yes | no | reset ) [class [view]]\n\
-+		Control whether stale answers are returned\n\
-   showzone zone [class [view]]\n\
- 		Print a zone's configuration.\n\
-   sign zone [class [view]]\n\
-diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
-index e14a17e..eaf32d3 100644
---- a/bin/rndc/rndc.docbook
-+++ b/bin/rndc/rndc.docbook
-@@ -689,6 +689,25 @@
- 	</listitem>
-       </varlistentry>
- 
-+      <varlistentry>
-+	<term><userinput>serve-stale ( on | off | reset | status) <optional><replaceable>class</replaceable> <optional><replaceable>view</replaceable></optional></optional></userinput></term>
-+	<listitem>
-+	  <para>
-+	    Enable, disable, or reset the serving of stale answers
-+	    as configured in named.conf. Serving of stale answers
-+	    will remain disabled across <filename>named.conf</filename>
-+	    reloads if disabled via rndc until it is reset via rndc.
-+	  </para>
-+	  <para>
-+	    Status will report whether serving of stale answers is
-+	    currently enabled, disabled or not configured for a
-+	    view.  If serving of stale records is configured then
-+	    the values of stale-answer-ttl and max-stale-ttl are
-+	    reported.
-+	  </para>
-+	</listitem>
-+      </varlistentry>
-+
-       <varlistentry>
- 	<term><userinput>secroots <optional>-</optional> <optional><replaceable>view ...</replaceable></optional></userinput></term>
- 	<listitem>
-diff --git a/bin/tests/system/chain/prereq.sh b/bin/tests/system/chain/prereq.sh
-index f3f1939..9ff3f07 100644
---- a/bin/tests/system/chain/prereq.sh
-+++ b/bin/tests/system/chain/prereq.sh
-@@ -48,3 +48,10 @@ else
-     echo_i "This test requires the Net::DNS::Nameserver library." >&2
-     exit 1
- fi
-+if $PERL -e 'use Net::DNS::Nameserver;' 2>/dev/null
-+then
-+	:
-+else
-+    echo "I:This test requires the Net::DNS::Nameserver library." >&2
-+    exit 1
-+fi
-diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
-index 22749b9..a247fd5 100644
---- a/bin/tests/system/conf.sh.in
-+++ b/bin/tests/system/conf.sh.in
-@@ -128,7 +128,7 @@ PARALLELDIRS="dnssec rpzrecurse \
- 	reclimit redirect resolver rndc rootkeysentinel rpz \
- 	rrchecker rrl rrsetorder rsabigexponent runtime \
- 	sfcache smartsign sortlist \
--	spf staticstub statistics statschannel stub \
-+	spf serve-stale staticstub statistics statschannel stub \
- 	tcp tsig tsiggss \
- 	unknown upforwd verify views wildcard \
- 	xfer xferquota zero zonechecks"
-diff --git a/bin/tests/system/dyndb/driver/db.c b/bin/tests/system/dyndb/driver/db.c
-index 02aa6ab..a77c7de 100644
---- a/bin/tests/system/dyndb/driver/db.c
-+++ b/bin/tests/system/dyndb/driver/db.c
-@@ -629,6 +629,8 @@ static dns_dbmethods_t sampledb_methods = {
- 	hashsize,
- 	NULL,
- 	NULL,
-+	NULL,
-+	NULL,
- };
- 
- /* Auxiliary driver functions. */
-diff --git a/bin/tests/system/serve-stale/.gitignore b/bin/tests/system/serve-stale/.gitignore
-new file mode 100644
-index 0000000..2272eef
---- /dev/null
-+++ b/bin/tests/system/serve-stale/.gitignore
-@@ -0,0 +1,11 @@
-+/ans2/ans.pid
-+/ans2/ans.pl
-+/dig.out*
-+/ns1/named.conf
-+/ns3/named.conf
-+/ns3/root.bk
-+/rndc.out*
-+named.lock
-+named.pid
-+named.port
-+named.run
-diff --git a/bin/tests/system/serve-stale/ans2/ans.pl.in b/bin/tests/system/serve-stale/ans2/ans.pl.in
-new file mode 100644
-index 0000000..2b39eca
---- /dev/null
-+++ b/bin/tests/system/serve-stale/ans2/ans.pl.in
-@@ -0,0 +1,178 @@
-+#!/usr/bin/env perl
-+#
-+# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+use strict;
-+use warnings;
-+
-+use IO::File;
-+use IO::Socket;
-+use Getopt::Long;
-+use Net::DNS;
-+use Time::HiRes qw(usleep nanosleep);
-+
-+my $pidf = new IO::File "ans.pid", "w" or die "cannot open pid file: $!";
-+print $pidf "$$\n" or die "cannot write pid file: $!";
-+$pidf->close or die "cannot close pid file: $!";
-+sub rmpid { unlink "ans.pid"; exit 1; };
-+
-+$SIG{INT} = \&rmpid;
-+$SIG{TERM} = \&rmpid;
-+
-+my $send_response = 1;
-+
-+my $localaddr = "10.53.0.2";
-+my $localport = @PORT@;
-+my $udpsock = IO::Socket::INET->new(LocalAddr => "$localaddr",
-+   LocalPort => $localport, Proto => "udp", Reuse => 1) or die "$!";
-+
-+#
-+# Delegation
-+#
-+my $SOA = "example 300 IN SOA . . 0 0 0 0 300";
-+my $NS = "example 300 IN NS ns.example";
-+my $A = "ns.example 300 IN A $localaddr";
-+#
-+# Records to be TTL stretched
-+#
-+my $TXT = "data.example 1 IN TXT \"A text record with a 1 second ttl\"";
-+my $negSOA = "example 1 IN SOA . . 0 0 0 0 300";
-+
-+sub reply_handler {
-+    my ($qname, $qclass, $qtype) = @_;
-+    my ($rcode, @ans, @auth, @add);
-+
-+    print ("request: $qname/$qtype\n");
-+    STDOUT->flush();
-+
-+    # Control whether we send a response or not.
-+    # We always respond to control commands.
-+    if ($qname eq "enable" ) {
-+	if ($qtype eq "TXT") {
-+	    $send_response = 1;
-+            my $rr = new Net::DNS::RR("$qname 0 $qclass TXT \"$send_response\"");
-+            push @ans, $rr;
-+	}
-+	$rcode = "NOERROR";
-+        return ($rcode, \@ans, \@auth, \@add, { aa => 1 });
-+    } elsif ($qname eq "disable" ) {
-+	if ($qtype eq "TXT") {
-+	    $send_response = 0;
-+            my $rr = new Net::DNS::RR("$qname 0 $qclass TXT \"$send_response\"");
-+            push @ans, $rr;
-+	}
-+	$rcode = "NOERROR";
-+        return ($rcode, \@ans, \@auth, \@add, { aa => 1 });
-+    }
-+
-+    # If we are not responding to queries we are done.
-+    return if (!$send_response);
-+
-+    # Construct the response and send it.
-+    if ($qname eq "ns.example" ) {
-+	if ($qtype eq "A") {
-+	    my $rr = new Net::DNS::RR($A);
-+	    push @ans, $rr;
-+	} else {
-+	    my $rr = new Net::DNS::RR($SOA);
-+	    push @auth, $rr;
-+	}
-+	$rcode = "NOERROR";
-+    } elsif ($qname eq "example") {
-+	if ($qtype eq "NS") {
-+	    my $rr = new Net::DNS::RR($NS);
-+	    push @auth, $rr;
-+	    $rr = new Net::DNS::RR($A);
-+	    push @add, $rr;
-+	} elsif ($qtype eq "SOA") {
-+	    my $rr = new Net::DNS::RR($SOA);
-+	    push @ans, $rr;
-+	} else {
-+	    my $rr = new Net::DNS::RR($SOA);
-+	    push @auth, $rr;
-+	}
-+	$rcode = "NOERROR";
-+    } elsif ($qname eq "nodata.example") {
-+	my $rr = new Net::DNS::RR($negSOA);
-+	push @auth, $rr;
-+	$rcode = "NOERROR";
-+    } elsif ($qname eq "data.example") {
-+	if ($qtype eq "TXT") {
-+	    my $rr = new Net::DNS::RR($TXT);
-+	    push @ans, $rr;
-+	} else {
-+	    my $rr = new Net::DNS::RR($negSOA);
-+	    push @auth, $rr;
-+	}
-+	$rcode = "NOERROR";
-+    } elsif ($qname eq "nxdomain.example") {
-+	my $rr = new Net::DNS::RR($negSOA);
-+	push @auth, $rr;
-+	$rcode = "NXDOMAIN";
-+    } else {
-+        my $rr = new Net::DNS::RR($SOA);
-+	push @auth, $rr;
-+	$rcode = "NXDOMAIN";
-+    }
-+
-+    # mark the answer as authoritive (by setting the 'aa' flag
-+    return ($rcode, \@ans, \@auth, \@add, { aa => 1 });
-+}
-+
-+GetOptions(
-+    'port=i' => \$localport,
-+);
-+
-+my $rin;
-+my $rout;
-+
-+for (;;) {
-+	$rin = '';
-+	vec($rin, fileno($udpsock), 1) = 1;
-+
-+	select($rout = $rin, undef, undef, undef);
-+
-+	if (vec($rout, fileno($udpsock), 1)) {
-+		my ($buf, $request, $err);
-+		$udpsock->recv($buf, 512);
-+
-+		if ($Net::DNS::VERSION > 0.68) {
-+			$request = new Net::DNS::Packet(\$buf, 0);
-+			$@ and die $@;
-+		} else {
-+			my $err;
-+			($request, $err) = new Net::DNS::Packet(\$buf, 0);
-+			$err and die $err;
-+		}
-+
-+		my @questions = $request->question;
-+		my $qname = $questions[0]->qname;
-+		my $qclass = $questions[0]->qclass;
-+		my $qtype = $questions[0]->qtype;
-+		my $id = $request->header->id;
-+
-+		my ($rcode, $ans, $auth, $add, $headermask) = reply_handler($qname, $qclass, $qtype);
-+
-+		if (!defined($rcode)) {
-+			print "  Silently ignoring query\n";
-+			next;
-+		}
-+
-+		my $reply = Net::DNS::Packet->new();
-+		$reply->header->qr(1);
-+		$reply->header->aa(1) if $headermask->{'aa'};
-+		$reply->header->id($id);
-+		$reply->header->rcode($rcode);
-+		$reply->push("question",   @questions);
-+		$reply->push("answer",     @$ans)  if $ans;
-+		$reply->push("authority",  @$auth) if $auth;
-+		$reply->push("additional", @$add)  if $add;
-+
-+		my $num_chars = $udpsock->send($reply->data);
-+		print "  Sent $num_chars bytes via UDP\n";
-+	}
-+}
-diff --git a/bin/tests/system/serve-stale/clean.sh b/bin/tests/system/serve-stale/clean.sh
-new file mode 100644
-index 0000000..2397326
---- /dev/null
-+++ b/bin/tests/system/serve-stale/clean.sh
-@@ -0,0 +1,15 @@
-+# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+rm -f test.output
-+rm -f dig.out.test*
-+rm -f ans2/ans.pl
-+rm -f ns3/root.bk
-+rm -f rndc.out.test*
-+rm -f ns*/named.memstats
-+rm -f ns*/managed-keys.bind
-+rm -f ns*/named.conf
-+rm -f ns*/named.run
-diff --git a/bin/tests/system/serve-stale/ns1/named1.conf.in b/bin/tests/system/serve-stale/ns1/named1.conf.in
-new file mode 100644
-index 0000000..8a75a10
---- /dev/null
-+++ b/bin/tests/system/serve-stale/ns1/named1.conf.in
-@@ -0,0 +1,35 @@
-+/*
-+ * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
-+ *
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+ */
-+
-+key rndc_key {
-+        secret "1234abcd8765";
-+        algorithm hmac-sha256;
-+};
-+
-+controls {
-+	inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-+};
-+
-+options {
-+	query-source address 10.53.0.1;
-+	notify-source 10.53.0.1;
-+	transfer-source 10.53.0.1;
-+	port @PORT@;
-+	pid-file "named.pid";
-+	listen-on { 10.53.0.1; };
-+	listen-on-v6 { none; };
-+	recursion yes;
-+	max-stale-ttl 3600;
-+	stale-answer-ttl 1;
-+	stale-answer-enable yes;
-+};
-+
-+zone "." {
-+	type master;
-+	file "root.db";
-+};
-diff --git a/bin/tests/system/serve-stale/ns1/named2.conf.in b/bin/tests/system/serve-stale/ns1/named2.conf.in
-new file mode 100644
-index 0000000..072e6ec
---- /dev/null
-+++ b/bin/tests/system/serve-stale/ns1/named2.conf.in
-@@ -0,0 +1,35 @@
-+/*
-+ * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
-+ *
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+ */
-+
-+key rndc_key {
-+        secret "1234abcd8765";
-+        algorithm hmac-sha256;
-+};
-+
-+controls {
-+	inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-+};
-+
-+options {
-+	query-source address 10.53.0.1;
-+	notify-source 10.53.0.1;
-+	transfer-source 10.53.0.1;
-+	port @PORT@;
-+	pid-file "named.pid";
-+	listen-on { 10.53.0.1; };
-+	listen-on-v6 { none; };
-+	recursion yes;
-+	max-stale-ttl 7200;
-+	stale-answer-ttl 2;
-+	stale-answer-enable yes;
-+};
-+
-+zone "." {
-+	type master;
-+	file "root.db";
-+};
-diff --git a/bin/tests/system/serve-stale/ns1/root.db b/bin/tests/system/serve-stale/ns1/root.db
-new file mode 100644
-index 0000000..eb9ad3e
---- /dev/null
-+++ b/bin/tests/system/serve-stale/ns1/root.db
-@@ -0,0 +1,5 @@
-+.		300	SOA	. . 0 0 0 0 0
-+.		300	NS	ns.nil.
-+ns.nil.		300	A	10.53.0.1
-+example.	300	NS	ns.example.
-+ns.example.	300	A	10.53.0.2
-diff --git a/bin/tests/system/serve-stale/ns3/named.conf.in b/bin/tests/system/serve-stale/ns3/named.conf.in
-new file mode 100644
-index 0000000..24a3293
---- /dev/null
-+++ b/bin/tests/system/serve-stale/ns3/named.conf.in
-@@ -0,0 +1,35 @@
-+/*
-+ * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
-+ *
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+ */
-+
-+key rndc_key {
-+        secret "1234abcd8765";
-+        algorithm hmac-sha256;
-+};
-+
-+controls {
-+	inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-+};
-+
-+options {
-+	query-source address 10.53.0.3;
-+	notify-source 10.53.0.3;
-+	transfer-source 10.53.0.3;
-+	port @PORT@;
-+	pid-file "named.pid";
-+	listen-on { 10.53.0.3; };
-+	listen-on-v6 { none; };
-+	recursion yes;
-+	// max-stale-ttl 3600;
-+	// stale-answer-ttl 3;
-+};
-+
-+zone "." {
-+	type slave;
-+	masters { 10.53.0.1; };
-+	file "root.bk";
-+};
-diff --git a/bin/tests/system/serve-stale/prereq.sh b/bin/tests/system/serve-stale/prereq.sh
-new file mode 100644
-index 0000000..a3bbef8
---- /dev/null
-+++ b/bin/tests/system/serve-stale/prereq.sh
-@@ -0,0 +1,38 @@
-+#!/bin/sh
-+#
-+# Copyright (C) 2011, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+SYSTEMTESTTOP=..
-+. $SYSTEMTESTTOP/conf.sh
-+
-+if $PERL -e 'use Net::DNS;' 2>/dev/null
-+then
-+    if $PERL -e 'use Net::DNS; die if ($Net::DNS::VERSION >= 0.69 && $Net::DNS::VERSION <= 0.74);' 2>/dev/null
-+    then
-+        :
-+    else
-+        echo "I:Net::DNS versions 0.69 to 0.74 have bugs that cause this test to fail: please update." >&2
-+        exit 1
-+    fi
-+else
-+    echo "I:This test requires the Net::DNS library." >&2
-+    exit 1
-+fi
-+if $PERL -e 'use Net::DNS::Nameserver;' 2>/dev/null
-+then
-+	:
-+else
-+	echo "I:This test requires the Net::DNS::Nameserver library." >&2
-+	exit 1
-+fi
-+if $PERL -e 'use Time::HiRes;' 2>/dev/null
-+then
-+	:
-+else
-+	echo "I:This test requires the Time::HiRes library." >&2
-+	exit 1
-+fi
-diff --git a/bin/tests/system/serve-stale/setup.sh b/bin/tests/system/serve-stale/setup.sh
-new file mode 100644
-index 0000000..690f43c
---- /dev/null
-+++ b/bin/tests/system/serve-stale/setup.sh
-@@ -0,0 +1,13 @@
-+#!/bin/sh
-+# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+SYSTEMTESTTOP=..
-+. $SYSTEMTESTTOP/conf.sh
-+
-+copy_setports ns1/named1.conf.in ns1/named.conf
-+copy_setports ans2/ans.pl.in ans2/ans.pl
-+copy_setports ns3/named.conf.in ns3/named.conf
-diff --git a/bin/tests/system/serve-stale/tests.sh b/bin/tests/system/serve-stale/tests.sh
-new file mode 100755
-index 0000000..201c996
---- /dev/null
-+++ b/bin/tests/system/serve-stale/tests.sh
-@@ -0,0 +1,536 @@
-+#!/bin/sh
-+#
-+# Copyright (C) 2000, 2001, 2004, 2007, 2009-2016  Internet Systems Consortium, Inc. ("ISC")
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+SYSTEMTESTTOP=..
-+. $SYSTEMTESTTOP/conf.sh
-+
-+while getopts "p:c:" flag; do
-+    case "$flag" in
-+	p) port=$OPTARG ;;
-+	c) controlport=$OPTARG ;;
-+	*) exit 1 ;;
-+    esac
-+done
-+
-+RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
-+
-+echo "RNDCCMD: ${RNDCCMD}"
-+
-+status=0
-+n=0
-+
-+#echo "I:check ans.pl server ($n)"
-+#$DIG -p ${PORT} @10.53.0.2 example NS
-+#$DIG -p ${PORT} @10.53.0.2 example SOA
-+#$DIG -p ${PORT} @10.53.0.2 ns.example A
-+#$DIG -p ${PORT} @10.53.0.2 ns.example AAAA
-+#$DIG -p ${PORT} @10.53.0.2 txt enable
-+#$DIG -p ${PORT} @10.53.0.2 txt disable
-+#$DIG -p ${PORT} @10.53.0.2 ns.example AAAA
-+#$DIG -p ${PORT} @10.53.0.2 txt enable
-+#$DIG -p ${PORT} @10.53.0.2 ns.example AAAA
-+##$DIG -p ${PORT} @10.53.0.2 data.example TXT
-+#$DIG -p ${PORT} @10.53.0.2 nodata.example TXT
-+#$DIG -p ${PORT} @10.53.0.2 nxdomain.example TXT
-+
-+n=`expr $n + 1`
-+echo "I:prime cache data.example ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 data.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:prime cache nodata.example ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nodata.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:prime cache nxdomain.example ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nxdomain.example TXT > dig.out.test$n
-+grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:disable responses from authoritative server ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.2 txt disable  > dig.out.test$n
-+grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1
-+grep "TXT.\"0\"" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+sleep 1
-+
-+n=`expr $n + 1`
-+echo "I:check 'rndc serve-stale status' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1
-+grep '_default: on (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale data.example ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 data.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale nodata.example ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nodata.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale nxdomain.example ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nxdomain.example TXT > dig.out.test$n
-+grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:running 'rndc serve-stale off' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale off || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check 'rndc serve-stale status' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1
-+grep '_default: off (rndc) (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale data.example (serve-stale off) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 data.example TXT > dig.out.test$n
-+grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale nodata.example (serve-stale off) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nodata.example TXT > dig.out.test$n
-+grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale nxdomain.example (serve-stale off) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nxdomain.example TXT > dig.out.test$n
-+grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:running 'rndc serve-stale on' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale on || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check 'rndc serve-stale status' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1
-+grep '_default: on (rndc) (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale data.example (serve-stale on) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 data.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale nodata.example (serve-stale on) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nodata.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale nxdomain.example (serve-stale on) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nxdomain.example TXT > dig.out.test$n
-+grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:running 'rndc serve-stale no' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale no || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check 'rndc serve-stale status' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1
-+grep '_default: off (rndc) (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale data.example (serve-stale no) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 data.example TXT > dig.out.test$n
-+grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale nodata.example (serve-stale no) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nodata.example TXT > dig.out.test$n
-+grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale nxdomain.example (serve-stale no) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nxdomain.example TXT > dig.out.test$n
-+grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:running 'rndc serve-stale yes' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale yes || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check 'rndc serve-stale status' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1
-+grep '_default: on (rndc) (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale data.example (serve-stale yes) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 data.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale nodata.example (serve-stale yes) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nodata.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale nxdomain.example (serve-stale yes) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nxdomain.example TXT > dig.out.test$n
-+grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:running 'rndc serve-stale off' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale off || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:running 'rndc serve-stale reset' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale reset || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check 'rndc serve-stale status' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1
-+grep '_default: on (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale data.example (serve-stale reset) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 data.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale nodata.example (serve-stale reset) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nodata.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check stale nxdomain.example (serve-stale reset) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.1 nxdomain.example TXT > dig.out.test$n
-+grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:running 'rndc serve-stale off' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale off || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check 'rndc serve-stale status' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1
-+grep '_default: off (rndc) (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:updating ns1/named.conf ($n)"
-+ret=0
-+sed -e "s/@PORT@/${PORT}/g;s/@CONTROLPORT@/${CONTROLPORT}/g" < ns1/named2.conf.in > ns1/named.conf
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:running 'rndc reload' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 reload > rndc.out.test$n 2>&1 || ret=1
-+grep "server reload successful" rndc.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check 'rndc serve-stale status' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1
-+grep '_default: off (rndc) (stale-answer-ttl=2 max-stale-ttl=7200)' rndc.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check 'rndc serve-stale' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale > rndc.out.test$n 2>&1 && ret=1
-+grep "unexpected end of input" rndc.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check 'rndc serve-stale unknown' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 serve-stale unknown > rndc.out.test$n 2>&1 && ret=1
-+grep "syntax error" rndc.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo_i "flush cache, re-enable serve-stale and query again ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.1 flushtree example > rndc.out.test$n.1 2>&1 || ret=1
-+$RNDCCMD 10.53.0.1 serve-stale on > rndc.out.test$n.2 2>&1 || ret=1
-+$DIG -p ${PORT} @10.53.0.1 data.example TXT > dig.out.test$n
-+grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo_i "failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+ret=0
-+$DIG -p ${PORT} @10.53.0.2 txt enable  > dig.out.test$n
-+grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1
-+grep "TXT.\"1\"" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:prime cache data.example (max-stale-ttl default) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.3 data.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:prime cache nodata.example (max-stale-ttl default) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.3 nodata.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:prime cache nxdomain.example (max-stale-ttl default) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.3 nxdomain.example TXT > dig.out.test$n
-+grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:disable responses from authoritative server ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.2 txt disable  > dig.out.test$n
-+grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1
-+grep "TXT.\"0\"" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+sleep 1
-+
-+n=`expr $n + 1`
-+echo "I:check 'rndc serve-stale status' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.3 serve-stale status > rndc.out.test$n 2>&1 || ret=1
-+grep '_default: off (stale-answer-ttl=1 max-stale-ttl=604800)' rndc.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check fail of data.example (max-stale-ttl default) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.3 data.example TXT > dig.out.test$n
-+grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check fail of nodata.example (max-stale-ttl default) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.3 nodata.example TXT > dig.out.test$n
-+grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check fail of nxdomain.example (max-stale-ttl default) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.3 nxdomain.example TXT > dig.out.test$n
-+grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check 'rndc serve-stale on' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.3 serve-stale on > rndc.out.test$n 2>&1 || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check 'rndc serve-stale status' ($n)"
-+ret=0
-+$RNDCCMD 10.53.0.3 serve-stale status > rndc.out.test$n 2>&1 || ret=1
-+grep '_default: on (rndc) (stale-answer-ttl=1 max-stale-ttl=604800)' rndc.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check data.example (max-stale-ttl default) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.3 data.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check nodata.example (max-stale-ttl default) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.3 nodata.example TXT > dig.out.test$n
-+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+n=`expr $n + 1`
-+echo "I:check nxdomain.example (max-stale-ttl default) ($n)"
-+ret=0
-+$DIG -p ${PORT} @10.53.0.3 nxdomain.example TXT > dig.out.test$n
-+grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1
-+grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1
-+grep "example.*1.*IN" dig.out.test$n > /dev/null || ret=1
-+if [ $ret != 0 ]; then echo "I:failed"; fi
-+status=`expr $status + $ret`
-+
-+echo "I:exit status: $status"
-+[ $status -eq 0 ] || exit 1
-diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
-index bb1e81d..6dbbfad 100644
---- a/doc/arm/Bv9ARM-book.xml
-+++ b/doc/arm/Bv9ARM-book.xml
-@@ -4381,6 +4381,9 @@ badresp:1,adberr:0,findfail:0,valfail:0]
- 	  statement in the <filename>named.conf</filename> file:
- 	</para>
- 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="options.grammar.xml"/>
-+  [ <command>max-stale-ttl</command> <replaceable>number</replaceable> ; ]
-+  [ <command>stale-answer-enable</command> <replaceable>yes_or_no</replaceable> ; ]
-+  [ <command>stale-answer-ttl</command> <replaceable>number</replaceable> ; ]
-       </section>
- 
-       <section xml:id="options"><info><title><command>options</command> Statement Definition and
-@@ -4474,6 +4477,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
- 		  <command>dnssec-validation</command>,
- 		  <command>max-cache-ttl</command>,
- 		  <command>max-ncache-ttl</command>,
-+		  <command>max-stale-ttl</command>,
- 		  <command>max-cache-size</command>, and
- 		  <command>zero-no-soa-ttl</command>.
- 		</para>
-@@ -5485,7 +5489,6 @@ options {
- 	    </listitem>
- 	  </varlistentry>
- 
--
- 	  <varlistentry>
- 	    <term><command>max-zone-ttl</command></term>
- 	    <listitem>
-@@ -5521,6 +5524,21 @@ options {
- 	    </listitem>
- 	  </varlistentry>
- 
-+	  <varlistentry>
-+	    <term><command>stale-answer-ttl</command></term>
-+	    <listitem>
-+	      <para>
-+		Specifies the TTL to be returned on stale answers.
-+		The default is 1 second. The minimal allowed is
-+		also 1 second; a value of 0 will be updated silently
-+		to 1 second.  For stale answers to be returned
-+		<option>max-stale-ttl</option> must be set to a
-+		non zero value and they must not have been disabled
-+		by <command>rndc</command>.
-+	      </para>
-+	    </listitem>
-+	  </varlistentry>
-+
- 	  <varlistentry>
- 	    <term><command>serial-update-method</command></term>
- 	    <listitem>
-@@ -6280,6 +6298,22 @@ options {
- 	      </listitem>
- 	    </varlistentry>
- 
-+	    <varlistentry>
-+	      <term><command>serve-stale-enable</command></term>
-+	      <listitem>
-+		<para>
-+		  Enable the returning of stale answers when the
-+		  nameservers for the zone are not answering.  This
-+		  is off by default but can be enabled/disabled via
-+		  <command>rndc server-stale on</command> and
-+		  <command>rndc server-stale off</command> which
-+		  override the named.conf setting.  <command>rndc
-+		  server-stale reset</command> will restore control
-+		  via named.conf.
-+		</para>
-+	      </listitem>
-+	    </varlistentry>
-+
- 	    <varlistentry>
- 	      <term><command>nocookie-udp-size</command></term>
- 	      <listitem>
-@@ -7501,14 +7535,20 @@ options {
- 	      <term><command>resolver-query-timeout</command></term>
- 	      <listitem>
- 		<para>
--		  The amount of time in seconds that the resolver
-+		  The amount of time in milliseconds that the resolver
- 		  will spend attempting to resolve a recursive
- 		  query before failing.  The default and minimum
--		  is <literal>10</literal> and the maximum is
--		  <literal>30</literal>.  Setting it to
-+		  is <literal>10000</literal> and the maximum is
-+		  <literal>30000</literal>.  Setting it to
- 		  <literal>0</literal> will result in the default
- 		  being used.
- 		</para>
-+		<para>
-+		  This value was originally specified in seconds.
-+		  Values less than or equal to 300 will be be treated
-+		  as seconds and converted to milliseconds before
-+		  applying the above limits.
-+		</para>
- 	      </listitem>
- 	    </varlistentry>
- 	  </variablelist>
-@@ -8994,6 +9034,27 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
- 	      </listitem>
- 	    </varlistentry>
- 
-+	    <varlistentry>
-+	      <term><command>max-stale-ttl</command></term>
-+	      <listitem>
-+		<para>
-+		  Sets the maximum time for which the server will
-+		  retain records past their normal expiry to
-+		  return them as stale records when the servers
-+		  for those records are not reachable.  The default
-+		  is to not retain the record.
-+		</para>
-+		<para>
-+		  <command>rndc serve-stale</command> can be used
-+		  to disable and re-enable the serving of stale
-+		  records at runtime.  Reloading or reconfiguring
-+		  <command>named</command> will not re-enable serving
-+		  of stale records if they have been disabled via
-+		  <command>rndc</command>.
-+		</para>
-+	      </listitem>
-+	    </varlistentry>
-+
- 	    <varlistentry>
- 	      <term><command>min-roots</command></term>
- 	      <listitem>
-diff --git a/doc/arm/logging-categories.xml b/doc/arm/logging-categories.xml
-index 181def7..59f6afb 100644
---- a/doc/arm/logging-categories.xml
-+++ b/doc/arm/logging-categories.xml
-@@ -311,6 +311,17 @@
- 	  </para>
- 	</entry>
-       </row>
-+      <row rowsep="0">
-+	<entry colname="1">
-+	  <para><command>serve-stale</command></para>
-+	</entry>
-+	<entry colname="2">
-+	  <para>
-+	    Whether or not a stale answer is used
-+	    following a resolver failure.
-+	  </para>
-+	</entry>
-+      </row>
-       <row rowsep="0">
- 	<entry colname="1">
- 	  <para><command>spill</command></para>
-diff --git a/doc/arm/notes-rh-changes.xml b/doc/arm/notes-rh-changes.xml
-index 89a4961..80b7dee 100644
---- a/doc/arm/notes-rh-changes.xml
-+++ b/doc/arm/notes-rh-changes.xml
-@@ -12,6 +12,9 @@
- <section xml:id="relnotes_rh_changes"><info><title>Red Hat Specific Changes</title></info>
-   <itemizedlist>
-      <listitem>
-+      <para>
-+        This version includes some features not present in releases by ISC.
-+      </para>
-       <para>
-         By default, BIND now uses the random number generation functions
-         in the cryptographic library (i.e., OpenSSL or a PKCS#11
-@@ -36,7 +39,16 @@
-         case <filename>/dev/random</filename> will be the default
-         entropy source.  [RT #31459] [RT #46047]
-       </para>
--    </listitem>
-+      <para>
-+        When acting as a recursive resolver, <command>named</command>
-+        can now continue returning answers whose TTLs have expired
-+        when the authoritative server is under attack and unable to
-+        respond. This is controlled by the
-+        <command>stale-answer-enable</command>,
-+        <command>stale-answer-ttl</command> and
-+        <command>max-stale-ttl</command> options. [RT #44790]
-+      </para>
-+     </listitem>
-   </itemizedlist>
- </section>
- 
-diff --git a/doc/misc/options b/doc/misc/options
-index e11beed..fde93c7 100644
---- a/doc/misc/options
-+++ b/doc/misc/options
-@@ -225,6 +225,7 @@ options {
-         max-refresh-time <integer>;
-         max-retry-time <integer>;
-         max-rsa-exponent-size <integer>;
-+        max-stale-ttl <ttlval>;
-         max-transfer-idle-in <integer>;
-         max-transfer-idle-out <integer>;
-         max-transfer-time-in <integer>;
-@@ -298,7 +299,9 @@ options {
-         request-sit <boolean>; // obsolete
-         require-server-cookie <boolean>;
-         reserved-sockets <integer>;
-+        resolver-nonbackoff-tries <integer>;
-         resolver-query-timeout <integer>;
-+        resolver-retry-interval <integer>;
-         response-policy { zone <string> [ log <boolean> ] [ max-policy-ttl
-             <integer> ] [ policy ( cname | disabled | drop | given | no-op
-             | nodata | nxdomain | passthru | tcp-only <quoted_string> ) ] [
-@@ -328,6 +331,8 @@ options {
-         sit-secret <string>; // obsolete
-         sortlist { <address_match_element>; ... };
-         stacksize ( default | unlimited | <sizeval> );
-+        stale-answer-enable <boolean>;
-+        stale-answer-ttl <ttlval>;
-         startup-notify-rate <integer>;
-         statistics-file <quoted_string>;
-         statistics-interval <integer>; // not yet implemented
-@@ -539,6 +544,7 @@ view <string> [ <class> ] {
-         max-recursion-queries <integer>;
-         max-refresh-time <integer>;
-         max-retry-time <integer>;
-+        max-stale-ttl <ttlval>;
-         max-transfer-idle-in <integer>;
-         max-transfer-idle-out <integer>;
-         max-transfer-time-in <integer>;
-@@ -600,7 +606,9 @@ view <string> [ <class> ] {
-         request-nsid <boolean>;
-         request-sit <boolean>; // obsolete
-         require-server-cookie <boolean>;
-+        resolver-nonbackoff-tries <integer>;
-         resolver-query-timeout <integer>;
-+        resolver-retry-interval <integer>;
-         response-policy { zone <string> [ log <boolean> ] [ max-policy-ttl
-             <integer> ] [ policy ( cname | disabled | drop | given | no-op
-             | nodata | nxdomain | passthru | tcp-only <quoted_string> ) ] [
-@@ -655,6 +663,8 @@ view <string> [ <class> ] {
-         sig-signing-type <integer>;
-         sig-validity-interval <integer> [ <integer> ];
-         sortlist { <address_match_element>; ... };
-+        stale-answer-enable <boolean>;
-+        stale-answer-ttl <ttlval>;
-         suppress-initial-notify <boolean>; // not yet implemented
-         topology { <address_match_element>; ... }; // not implemented
-         transfer-format ( many-answers | one-answer );
-diff --git a/lib/bind9/check.c b/lib/bind9/check.c
-index eaac5ba..a89d78f 100644
---- a/lib/bind9/check.c
-+++ b/lib/bind9/check.c
-@@ -99,7 +99,8 @@ check_orderent(const cfg_obj_t *ent, isc_log_t *logctx) {
- 			cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 				    "rrset-order: invalid class '%s'",
- 				    r.base);
--			result = ISC_R_FAILURE;
-+			if (result == ISC_R_SUCCESS)
-+				result = ISC_R_FAILURE;
- 		}
- 	}
- 
-@@ -112,7 +113,8 @@ check_orderent(const cfg_obj_t *ent, isc_log_t *logctx) {
- 			cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 				    "rrset-order: invalid type '%s'",
- 				    r.base);
--			result = ISC_R_FAILURE;
-+			if (result == ISC_R_SUCCESS)
-+				result = ISC_R_FAILURE;
- 		}
- 	}
- 
-@@ -126,7 +128,8 @@ check_orderent(const cfg_obj_t *ent, isc_log_t *logctx) {
- 		if (tresult != ISC_R_SUCCESS) {
- 			cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 				    "rrset-order: invalid name '%s'", str);
--			result = ISC_R_FAILURE;
-+			if (result == ISC_R_SUCCESS)
-+				result = ISC_R_FAILURE;
- 		}
- 	}
- 
-@@ -135,14 +138,16 @@ check_orderent(const cfg_obj_t *ent, isc_log_t *logctx) {
- 	    strcasecmp("order", cfg_obj_asstring(obj)) != 0) {
- 		cfg_obj_log(ent, logctx, ISC_LOG_ERROR,
- 			    "rrset-order: keyword 'order' missing");
--		result = ISC_R_FAILURE;
-+		if (result == ISC_R_SUCCESS)
-+			result = ISC_R_FAILURE;
- 	}
- 
- 	obj = cfg_tuple_get(ent, "ordering");
- 	if (!cfg_obj_isstring(obj)) {
- 	    cfg_obj_log(ent, logctx, ISC_LOG_ERROR,
- 			"rrset-order: missing ordering");
--		result = ISC_R_FAILURE;
-+		if (result == ISC_R_SUCCESS)
-+			result = ISC_R_FAILURE;
- 	} else if (strcasecmp(cfg_obj_asstring(obj), "fixed") == 0) {
- #if !DNS_RDATASET_FIXED
- 		cfg_obj_log(obj, logctx, ISC_LOG_WARNING,
-@@ -154,7 +159,8 @@ check_orderent(const cfg_obj_t *ent, isc_log_t *logctx) {
- 		cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 			    "rrset-order: invalid order '%s'",
- 			    cfg_obj_asstring(obj));
--		result = ISC_R_FAILURE;
-+		if (result == ISC_R_SUCCESS)
-+			result = ISC_R_FAILURE;
- 	}
- 	return (result);
- }
-@@ -174,7 +180,7 @@ check_order(const cfg_obj_t *options, isc_log_t *logctx) {
- 	     element = cfg_list_next(element))
- 	{
- 		tresult = check_orderent(cfg_listelt_value(element), logctx);
--		if (tresult != ISC_R_SUCCESS)
-+		if (result == ISC_R_SUCCESS && tresult != ISC_R_SUCCESS)
- 			result = tresult;
- 	}
- 	return (result);
-@@ -204,7 +210,8 @@ check_dual_stack(const cfg_obj_t *options, isc_log_t *logctx) {
- 		if (val > UINT16_MAX) {
- 			cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 				    "port '%u' out of range", val);
--			result = ISC_R_FAILURE;
-+			if (result == ISC_R_SUCCESS)
-+				result = ISC_R_RANGE;
- 		}
- 	}
- 	obj = cfg_tuple_get(alternates, "addresses");
-@@ -224,7 +231,8 @@ check_dual_stack(const cfg_obj_t *options, isc_log_t *logctx) {
- 		if (tresult != ISC_R_SUCCESS) {
- 			cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 				    "bad name '%s'", str);
--			result = ISC_R_FAILURE;
-+			if (result == ISC_R_SUCCESS)
-+				result = tresult;
- 		}
- 		obj = cfg_tuple_get(value, "port");
- 		if (cfg_obj_isuint32(obj)) {
-@@ -232,7 +240,8 @@ check_dual_stack(const cfg_obj_t *options, isc_log_t *logctx) {
- 			if (val > UINT16_MAX) {
- 				cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 					    "port '%u' out of range", val);
--				result = ISC_R_FAILURE;
-+				if (result == ISC_R_SUCCESS)
-+					result = ISC_R_RANGE;
- 			}
- 		}
- 	}
-@@ -1271,7 +1280,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
- 			cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 				    "auto-dnssec may only be activated at the "
- 				    "zone level");
--			result = ISC_R_FAILURE;
-+			if (result == ISC_R_SUCCESS)
-+				result = ISC_R_FAILURE;
- 		}
- 	}
- 
-@@ -1291,7 +1301,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
- 		{
- 			obj = cfg_listelt_value(element);
- 			tresult = mustbesecure(obj, symtab, logctx, mctx);
--			if (tresult != ISC_R_SUCCESS)
-+			if (result == ISC_R_SUCCESS && tresult != ISC_R_SUCCESS)
- 				result = tresult;
- 		}
- 		if (symtab != NULL)
-@@ -1310,7 +1320,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
- 				cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 					    "%s: invalid name '%s'",
- 					    server_contact[i], str);
--				result = ISC_R_FAILURE;
-+				if (result == ISC_R_SUCCESS)
-+					result = ISC_R_FAILURE;
- 			}
- 		}
- 	}
-@@ -1330,7 +1341,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
- 			cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 				    "disable-empty-zone: invalid name '%s'",
- 				    str);
--			result = ISC_R_FAILURE;
-+			if (result == ISC_R_SUCCESS)
-+				result = ISC_R_FAILURE;
- 		}
- 	}
- 
-@@ -1344,11 +1356,12 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
- 	    strlen(cfg_obj_asstring(obj)) > 1024U) {
- 		cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 			    "'server-id' too big (>1024 bytes)");
--		result = ISC_R_FAILURE;
-+		if (result == ISC_R_SUCCESS)
-+			result = ISC_R_FAILURE;
- 	}
- 
- 	tresult = check_dscp(options, logctx);
--	if (tresult != ISC_R_SUCCESS)
-+	if (result == ISC_R_SUCCESS && tresult != ISC_R_SUCCESS)
- 		result = tresult;
- 
- 	obj = NULL;
-@@ -1358,11 +1371,13 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
- 		if (lifetime > 604800) {	/* 7 days */
- 			cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 				    "'nta-lifetime' cannot exceed one week");
--			result = ISC_R_RANGE;
-+			if (result == ISC_R_SUCCESS)
-+				result = ISC_R_RANGE;
- 		} else if (lifetime == 0) {
- 			cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 				    "'nta-lifetime' may not be zero");
--			result = ISC_R_RANGE;
-+			if (result == ISC_R_SUCCESS)
-+				result = ISC_R_RANGE;
- 		}
- 	}
- 
-@@ -1373,7 +1388,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
- 		if (recheck > 604800) {		/* 7 days */
- 			cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 				    "'nta-recheck' cannot exceed one week");
--			result = ISC_R_RANGE;
-+			if (result == ISC_R_SUCCESS)
-+				result = ISC_R_RANGE;
- 		}
- 
- 		if (recheck > lifetime)
-@@ -1391,7 +1407,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
- 	if (strcasecmp(ccalg, "aes") == 0) {
- 		cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 			    "cookie-algorithm: '%s' not supported", ccalg);
--		result = ISC_R_NOTIMPLEMENTED;
-+		if (result == ISC_R_SUCCESS)
-+			result = ISC_R_NOTIMPLEMENTED;
- 	}
- #endif
- 
-@@ -1480,7 +1497,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
- 				cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
- 					    "%s out of range (%u < %u)",
- 					    fstrm[i].name, value, fstrm[i].min);
--			result = ISC_R_RANGE;
-+			if (result == ISC_R_SUCCESS)
-+				result = ISC_R_RANGE;
- 		}
- 
- 		if (strcmp(fstrm[i].name, "fstrm-set-input-queue-size") == 0) {
-@@ -1494,7 +1512,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
- 					    "%s '%u' not a power-of-2",
- 					    fstrm[i].name,
- 					    cfg_obj_asuint32(obj));
--				result = ISC_R_RANGE;
-+				if (result == ISC_R_SUCCESS)
-+					result = ISC_R_RANGE;
- 			}
- 		}
- 	}
-@@ -1512,7 +1531,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
- 				    "%" PRId64 "' "
- 				    "is too small",
- 				    mapsize);
--			return (ISC_R_RANGE);
-+			if (result == ISC_R_SUCCESS)
-+				result = ISC_R_RANGE;
- 		} else if (mapsize > (1ULL << 40)) { /* 1 terabyte */
- 			cfg_obj_log(obj, logctx,
- 				    ISC_LOG_ERROR,
-@@ -1520,10 +1540,20 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
- 				    "%" PRId64 "' "
- 				    "is too large",
- 				    mapsize);
--			return (ISC_R_RANGE);
-+			if (result == ISC_R_SUCCESS)
-+				result = ISC_R_RANGE;
- 		}
- 	}
- 
-+	obj = NULL;
-+	(void)cfg_map_get(options, "resolver-nonbackoff-tries", &obj);
-+	if (obj != NULL && cfg_obj_asuint32(obj) == 0U) {
-+		cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
-+			    "'resolver-nonbackoff-tries' must be >= 1");
-+		if (result == ISC_R_SUCCESS)
-+			result = ISC_R_RANGE;
-+	}
-+
- 	return (result);
- }
- 
-diff --git a/lib/dns/cache.c b/lib/dns/cache.c
-index 4701ff8..97e427a 100644
---- a/lib/dns/cache.c
-+++ b/lib/dns/cache.c
-@@ -138,6 +138,7 @@ struct dns_cache {
- 	int			db_argc;
- 	char			**db_argv;
- 	size_t			size;
-+	dns_ttl_t		serve_stale_ttl;
- 	isc_stats_t		*stats;
- 
- 	/* Locked by 'filelock'. */
-@@ -167,9 +168,13 @@ overmem_cleaning_action(isc_task_t *task, isc_event_t *event);
- 
- static inline isc_result_t
- cache_create_db(dns_cache_t *cache, dns_db_t **db) {
--	return (dns_db_create(cache->mctx, cache->db_type, dns_rootname,
--			      dns_dbtype_cache, cache->rdclass,
--			      cache->db_argc, cache->db_argv, db));
-+	isc_result_t result;
-+	result = dns_db_create(cache->mctx, cache->db_type, dns_rootname,
-+			       dns_dbtype_cache, cache->rdclass,
-+			       cache->db_argc, cache->db_argv, db);
-+	if (result == ISC_R_SUCCESS)
-+		dns_db_setservestalettl(*db, cache->serve_stale_ttl);
-+	return (result);
- }
- 
- isc_result_t
-@@ -238,6 +243,7 @@ dns_cache_create3(isc_mem_t *cmctx, isc_mem_t *hmctx, isc_taskmgr_t *taskmgr,
- 	cache->references = 1;
- 	cache->live_tasks = 0;
- 	cache->rdclass = rdclass;
-+	cache->serve_stale_ttl = 0;
- 
- 	cache->stats = NULL;
- 	result = isc_stats_create(cmctx, &cache->stats,
-@@ -1092,6 +1098,32 @@ dns_cache_getcachesize(dns_cache_t *cache) {
- 	return (size);
- }
- 
-+void
-+dns_cache_setservestalettl(dns_cache_t *cache, dns_ttl_t ttl) {
-+	REQUIRE(VALID_CACHE(cache));
-+
-+	LOCK(&cache->lock);
-+	cache->serve_stale_ttl = ttl;
-+	UNLOCK(&cache->lock);
-+
-+	(void)dns_db_setservestalettl(cache->db, ttl);
-+}
-+
-+dns_ttl_t
-+dns_cache_getservestalettl(dns_cache_t *cache) {
-+	dns_ttl_t ttl;
-+	isc_result_t result;
-+
-+	REQUIRE(VALID_CACHE(cache));
-+
-+	/*
-+	 * Could get it straight from the dns_cache_t, but use db
-+	 * to confirm the value that the db is really using.
-+	 */
-+	result = dns_db_getservestalettl(cache->db, &ttl);
-+	return result == ISC_R_SUCCESS ? ttl : 0;
-+}
-+
- /*
-  * The cleaner task is shutting down; do the necessary cleanup.
-  */
-diff --git a/lib/dns/db.c b/lib/dns/db.c
-index ee3e00d..576aa65 100644
---- a/lib/dns/db.c
-+++ b/lib/dns/db.c
-@@ -1130,3 +1130,25 @@ dns_db_nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) {
- 		return (ISC_R_NOTIMPLEMENTED);
- 	return ((db->methods->nodefullname)(db, node, name));
- }
-+
-+isc_result_t
-+dns_db_setservestalettl(dns_db_t *db, dns_ttl_t ttl)
-+{
-+	REQUIRE(DNS_DB_VALID(db));
-+	REQUIRE((db->attributes & DNS_DBATTR_CACHE) != 0);
-+
-+	if (db->methods->setservestalettl != NULL)
-+		return ((db->methods->setservestalettl)(db, ttl));
-+	return (ISC_R_NOTIMPLEMENTED);
-+}
-+
-+isc_result_t
-+dns_db_getservestalettl(dns_db_t *db, dns_ttl_t *ttl)
-+{
-+	REQUIRE(DNS_DB_VALID(db));
-+	REQUIRE((db->attributes & DNS_DBATTR_CACHE) != 0);
-+
-+	if (db->methods->getservestalettl != NULL)
-+		return ((db->methods->getservestalettl)(db, ttl));
-+	return (ISC_R_NOTIMPLEMENTED);
-+}
-diff --git a/lib/dns/ecdb.c b/lib/dns/ecdb.c
-index 47994ea..23bfe7d 100644
---- a/lib/dns/ecdb.c
-+++ b/lib/dns/ecdb.c
-@@ -588,7 +588,9 @@ static dns_dbmethods_t ecdb_methods = {
- 	NULL,			/* setcachestats */
- 	NULL,			/* hashsize */
- 	NULL,			/* nodefullname */
--	NULL			/* getsize */
-+	NULL,			/* getsize */
-+	NULL,			/* setservestalettl */
-+	NULL			/* getservestalettl */
- };
- 
- static isc_result_t
-diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h
-index 62797db..714b78e 100644
---- a/lib/dns/include/dns/cache.h
-+++ b/lib/dns/include/dns/cache.h
-@@ -260,6 +260,27 @@ dns_cache_getcachesize(dns_cache_t *cache);
-  * Get the maximum cache size.
-  */
- 
-+void
-+dns_cache_setservestalettl(dns_cache_t *cache, dns_ttl_t ttl);
-+/*%<
-+ * Sets the maximum length of time that cached answers may be retained
-+ * past their normal TTL.  Default value for the library is 0, disabling
-+ * the use of stale data.
-+ *
-+ * Requires:
-+ *\li	'cache' to be valid.
-+ */
-+
-+dns_ttl_t
-+dns_cache_getservestalettl(dns_cache_t *cache);
-+/*%<
-+ * Gets the maximum length of time that cached answers may be kept past
-+ * normal expiry.
-+ *
-+ * Requires:
-+ *\li	'cache' to be valid.
-+ */
-+
- isc_result_t
- dns_cache_flush(dns_cache_t *cache);
- /*%<
-diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
-index 6f0eed0..e3917f2 100644
---- a/lib/dns/include/dns/db.h
-+++ b/lib/dns/include/dns/db.h
-@@ -195,6 +195,8 @@ typedef struct dns_dbmethods {
- 					dns_name_t *name);
- 	isc_result_t	(*getsize)(dns_db_t *db, dns_dbversion_t *version,
- 				   uint64_t *records, uint64_t *bytes);
-+	isc_result_t	(*setservestalettl)(dns_db_t *db, dns_ttl_t ttl);
-+	isc_result_t	(*getservestalettl)(dns_db_t *db, dns_ttl_t *ttl);
- } dns_dbmethods_t;
- 
- typedef isc_result_t
-@@ -253,6 +255,7 @@ struct dns_dbonupdatelistener {
- #define DNS_DBFIND_FORCENSEC3		0x0080
- #define DNS_DBFIND_ADDITIONALOK		0x0100
- #define DNS_DBFIND_NOZONECUT		0x0200
-+#define DNS_DBFIND_STALEOK		0x0400
- /*@}*/
- 
- /*@{*/
-@@ -1683,6 +1686,38 @@ dns_db_nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name);
-  * \li	'db' is a valid database
-  * \li	'node' and 'name' are not NULL
-  */
-+
-+isc_result_t
-+dns_db_setservestalettl(dns_db_t *db, dns_ttl_t ttl);
-+/*%<
-+ * Sets the maximum length of time that cached answers may be retained
-+ * past their normal TTL. Default value for the library is 0, disabling
-+ * the use of stale data.
-+ *
-+ * Requires:
-+ * \li	'db' is a valid cache database.
-+ * \li	'ttl' is the number of seconds to retain data past its normal expiry.
-+ *
-+ * Returns:
-+ * \li	#ISC_R_SUCCESS
-+ * \li	#ISC_R_NOTIMPLEMENTED - Not supported by this DB implementation.
-+ */
-+
-+isc_result_t
-+dns_db_getservestalettl(dns_db_t *db, dns_ttl_t *ttl);
-+/*%<
-+ * Gets maximum length of time that cached answers may be kept past
-+ * normal TTL expiration.
-+ *
-+ * Requires:
-+ * \li	'db' is a valid cache database.
-+ * \li	'ttl' is the number of seconds to retain data past its normal expiry.
-+ *
-+ * Returns:
-+ * \li	#ISC_R_SUCCESS
-+ * \li	#ISC_R_NOTIMPLEMENTED - Not supported by this DB implementation.
-+ */
-+
- ISC_LANG_ENDDECLS
- 
- #endif /* DNS_DB_H */
-diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
-index 5295d8e..97071ed 100644
---- a/lib/dns/include/dns/rdataset.h
-+++ b/lib/dns/include/dns/rdataset.h
-@@ -128,6 +128,7 @@ struct dns_rdataset {
- 	unsigned int			magic;		/* XXX ? */
- 	dns_rdatasetmethods_t *		methods;
- 	ISC_LINK(dns_rdataset_t)	link;
-+
- 	/*
- 	 * XXX do we need these, or should they be retrieved by methods?
- 	 * Leaning towards the latter, since they are not frequently required
-@@ -136,12 +137,19 @@ struct dns_rdataset {
- 	dns_rdataclass_t		rdclass;
- 	dns_rdatatype_t			type;
- 	dns_ttl_t			ttl;
-+	/*
-+	 * Stale ttl is used to see how long this RRset can still be used
-+	 * to serve to clients, after the TTL has expired.
-+	 */
-+	dns_ttl_t			stale_ttl;
- 	dns_trust_t			trust;
- 	dns_rdatatype_t			covers;
-+
- 	/*
- 	 * attributes
- 	 */
- 	unsigned int			attributes;
-+
- 	/*%
- 	 * the counter provides the starting point in the "cyclic" order.
- 	 * The value UINT32_MAX has a special meaning of "picking up a
-@@ -149,11 +157,13 @@ struct dns_rdataset {
- 	 * increment the counter.
- 	 */
- 	uint32_t			count;
-+
- 	/*
- 	 * This RRSIG RRset should be re-generated around this time.
- 	 * Only valid if DNS_RDATASETATTR_RESIGN is set in attributes.
- 	 */
- 	isc_stdtime_t			resign;
-+
- 	/*@{*/
- 	/*%
- 	 * These are for use by the rdataset implementation, and MUST NOT
-@@ -206,6 +216,7 @@ struct dns_rdataset {
- #define DNS_RDATASETATTR_OPTOUT		0x00100000	/*%< OPTOUT proof */
- #define DNS_RDATASETATTR_NEGATIVE	0x00200000
- #define DNS_RDATASETATTR_PREFETCH	0x00400000
-+#define DNS_RDATASETATTR_STALE		0x01000000
- 
- /*%
-  * _OMITDNSSEC:
-diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
-index 0b66c75..4b4b6bd 100644
---- a/lib/dns/include/dns/resolver.h
-+++ b/lib/dns/include/dns/resolver.h
-@@ -547,9 +547,12 @@ dns_resolver_getmustbesecure(dns_resolver_t *resolver, dns_name_t *name);
- 
- 
- void
--dns_resolver_settimeout(dns_resolver_t *resolver, unsigned int seconds);
-+dns_resolver_settimeout(dns_resolver_t *resolver, unsigned int timeout);
- /*%<
-- * Set the length of time the resolver will work on a query, in seconds.
-+ * Set the length of time the resolver will work on a query, in milliseconds.
-+ *
-+ * 'timeout' was originally defined in seconds, and later redefined to be in
-+ * milliseconds.  Values less than or equal to 300 are treated as seconds.
-  *
-  * If timeout is 0, the default timeout will be applied.
-  *
-@@ -560,7 +563,8 @@ dns_resolver_settimeout(dns_resolver_t *resolver, unsigned int seconds);
- unsigned int
- dns_resolver_gettimeout(dns_resolver_t *resolver);
- /*%<
-- * Get the current length of time the resolver will work on a query, in seconds.
-+ * Get the current length of time the resolver will work on a query,
-+ * in milliseconds.
-  *
-  * Requires:
-  * \li  resolver to be valid.
-@@ -582,6 +586,39 @@ dns_resolver_getzeronosoattl(dns_resolver_t *resolver);
- void
- dns_resolver_setzeronosoattl(dns_resolver_t *resolver, bool state);
- 
-+unsigned int
-+dns_resolver_getretryinterval(dns_resolver_t *resolver);
-+
-+void
-+dns_resolver_setretryinterval(dns_resolver_t *resolver, unsigned int interval);
-+/*%<
-+ * Sets the amount of time, in millseconds, that is waited for a reply
-+ * to a server before another server is tried.  Interacts with the
-+ * value of dns_resolver_getnonbackofftries() by trying that number of times
-+ * at this interval, before doing exponential backoff and doubling the interval
-+ * on each subsequent try, to a maximum of 10 seconds.  Defaults to 800 ms;
-+ * silently capped at 2000 ms.
-+ *
-+ * Requires:
-+ * \li	resolver to be valid.
-+ * \li  interval > 0.
-+ */
-+
-+unsigned int
-+dns_resolver_getnonbackofftries(dns_resolver_t *resolver);
-+
-+void
-+dns_resolver_setnonbackofftries(dns_resolver_t *resolver, unsigned int tries);
-+/*%<
-+ * Sets the number of failures of getting a reply from remote servers for
-+ * a query before backing off by doubling the retry interval for each
-+ * subsequent request sent.  Defaults to 3.
-+ *
-+ * Requires:
-+ * \li	resolver to be valid.
-+ * \li  tries > 0.
-+ */
-+
- unsigned int
- dns_resolver_getoptions(dns_resolver_t *resolver);
- 
-diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
-index 567e8a8..7bf2b60 100644
---- a/lib/dns/include/dns/types.h
-+++ b/lib/dns/include/dns/types.h
-@@ -385,6 +385,12 @@ typedef enum {
- 	dns_updatemethod_date
- } dns_updatemethod_t;
- 
-+typedef enum {
-+	dns_stale_answer_no,
-+	dns_stale_answer_yes,
-+	dns_stale_answer_conf
-+} dns_stale_answer_t;
-+
- /*
-  * Functions.
-  */
-diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
-index c849dec..647ca2a 100644
---- a/lib/dns/include/dns/view.h
-+++ b/lib/dns/include/dns/view.h
-@@ -229,6 +229,9 @@ struct dns_view {
- 	dns_dtenv_t			*dtenv;		/* Dnstap environment */
- 	dns_dtmsgtype_t			dttypes;	/* Dnstap message types
- 							   to log */
-+	dns_ttl_t			staleanswerttl;
-+	dns_stale_answer_t		staleanswersok;		/* rndc setting */
-+	bool				staleanswersenable;	/* named.conf setting */
- };
- 
- #define DNS_VIEW_MAGIC			ISC_MAGIC('V','i','e','w')
-diff --git a/lib/dns/master.c b/lib/dns/master.c
-index 8edd732..8c9f00e 100644
---- a/lib/dns/master.c
-+++ b/lib/dns/master.c
-@@ -1948,12 +1948,18 @@ load_text(dns_loadctx_t *lctx) {
- 
- 		if ((lctx->options & DNS_MASTER_AGETTL) != 0) {
- 			/*
--			 * Adjust the TTL for $DATE.  If the RR has already
--			 * expired, ignore it.
-+			 * Adjust the TTL for $DATE. If the RR has
-+			 * already expired, set its TTL to 0. This
-+			 * should be okay even if the TTL stretching
-+			 * feature is not in effect, because it will
-+			 * just be quickly expired by the cache, and the
-+			 * way this was written before the patch it
-+			 * could potentially add 0 TTLs anyway.
- 			 */
- 			if (lctx->ttl < ttl_offset)
--				continue;
--			lctx->ttl -= ttl_offset;
-+				lctx->ttl = 0;
-+			else
-+				lctx->ttl -= ttl_offset;
- 		}
- 
- 		/*
-diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
-index 13d1a3e..873b694 100644
---- a/lib/dns/masterdump.c
-+++ b/lib/dns/masterdump.c
-@@ -81,6 +81,9 @@ struct dns_master_style {
-  */
- #define DNS_TOTEXT_LINEBREAK_MAXLEN 100
- 
-+/*% Does the rdataset 'r' contain a stale answer? */
-+#define STALE(r) (((r)->attributes & DNS_RDATASETATTR_STALE) != 0)
-+
- /*%
-  * Context structure for a masterfile dump in progress.
-  */
-@@ -94,6 +97,7 @@ typedef struct dns_totext_ctx {
- 	dns_fixedname_t		origin_fixname;
- 	uint32_t 		current_ttl;
- 	bool 			current_ttl_valid;
-+	dns_ttl_t		serve_stale_ttl;
- } dns_totext_ctx_t;
- 
- LIBDNS_EXTERNAL_DATA const dns_master_style_t
-@@ -382,6 +386,7 @@ totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) {
- 	ctx->neworigin = NULL;
- 	ctx->current_ttl = 0;
- 	ctx->current_ttl_valid = false;
-+	ctx->serve_stale_ttl = 0;
- 
- 	return (ISC_R_SUCCESS);
- }
-@@ -1028,6 +1033,11 @@ dump_rdatasets_text(isc_mem_t *mctx, dns_name_t *name,
- 		    (ctx->style.flags & DNS_STYLEFLAG_NCACHE) == 0) {
- 			/* Omit negative cache entries */
- 		} else {
-+			if (STALE(rds)) {
-+				fprintf(f, "; stale (for %u more seconds)\n",
-+					(rds->stale_ttl -
-+					 ctx->serve_stale_ttl));
-+			}
- 			isc_result_t result =
- 				dump_rdataset(mctx, name, rds, ctx,
- 					       buffer, f);
-@@ -1496,6 +1506,16 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
- 	dns_db_attach(db, &dctx->db);
- 
- 	dctx->do_date = dns_db_iscache(dctx->db);
-+	if (dctx->do_date) {
-+		/*
-+		 * Adjust the date backwards by the serve-stale TTL, if any.
-+		 * This is so the TTL will be loaded correctly when next
-+		 * started.
-+		 */
-+		(void)dns_db_getservestalettl(dctx->db,
-+					      &dctx->tctx.serve_stale_ttl);
-+		dctx->now -= dctx->tctx.serve_stale_ttl;
-+	}
- 
- 	if (dctx->format == dns_masterformat_text &&
- 	    (dctx->tctx.style.flags & DNS_STYLEFLAG_REL_OWNER) != 0) {
-@@ -1555,6 +1575,9 @@ writeheader(dns_dumpctx_t *dctx) {
- 		 * it in the zone case.
- 		 */
- 		if (dctx->do_date) {
-+			fprintf(dctx->f,
-+				"; using a %d second stale ttl\n",
-+				dctx->tctx.serve_stale_ttl);
- 			result = dns_time32_totext(dctx->now, &buffer);
- 			RUNTIME_CHECK(result == ISC_R_SUCCESS);
- 			isc_buffer_usedregion(&buffer, &r);
-diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
-index 02f2c84..fda991d 100644
---- a/lib/dns/rbtdb.c
-+++ b/lib/dns/rbtdb.c
-@@ -490,6 +490,7 @@ typedef ISC_LIST(rdatasetheader_t)      rdatasetheaderlist_t;
- typedef ISC_LIST(dns_rbtnode_t)         rbtnodelist_t;
- 
- #define RDATASET_ATTR_NONEXISTENT       0x0001
-+/*%< May be potentially served as stale data. */
- #define RDATASET_ATTR_STALE             0x0002
- #define RDATASET_ATTR_IGNORE            0x0004
- #define RDATASET_ATTR_RETAIN            0x0008
-@@ -502,6 +503,8 @@ typedef ISC_LIST(dns_rbtnode_t)         rbtnodelist_t;
- #define RDATASET_ATTR_CASESET           0x0400
- #define RDATASET_ATTR_ZEROTTL           0x0800
- #define RDATASET_ATTR_CASEFULLYLOWER    0x1000
-+/*%< Ancient - awaiting cleanup. */
-+#define RDATASET_ATTR_ANCIENT           0x2000
- 
- typedef struct acache_cbarg {
- 	dns_rdatasetadditional_t        type;
-@@ -552,6 +555,8 @@ struct acachectl {
- 	(((header)->attributes & RDATASET_ATTR_ZEROTTL) != 0)
- #define CASEFULLYLOWER(header) \
- 	(((header)->attributes & RDATASET_ATTR_CASEFULLYLOWER) != 0)
-+#define ANCIENT(header) \
-+	(((header)->attributes & RDATASET_ATTR_ANCIENT) != 0)
- 
- 
- #define ACTIVE(header, now) \
-@@ -611,6 +616,12 @@ typedef enum {
- 	expire_flush
- } expire_t;
- 
-+typedef enum {
-+	rdataset_ttl_fresh,
-+	rdataset_ttl_stale,
-+	rdataset_ttl_ancient
-+} rdataset_ttl_t;
-+
- typedef struct rbtdb_version {
- 	/* Not locked */
- 	rbtdb_serial_t                  serial;
-@@ -678,6 +689,12 @@ struct dns_rbtdb {
- 	dns_dbnode_t                    *soanode;
- 	dns_dbnode_t                    *nsnode;
- 
-+	/*
-+	 * Maximum length of time to keep using a stale answer past its
-+	 * normal TTL expiry.
-+	*/
-+	dns_ttl_t			serve_stale_ttl;
-+
- 	/*
- 	 * This is a linked list used to implement the LRU cache.  There will
- 	 * be node_lock_count linked lists here.  Nodes in bucket 1 will be
-@@ -721,6 +738,8 @@ struct dns_rbtdb {
- #define RBTDB_ATTR_LOADED               0x01
- #define RBTDB_ATTR_LOADING              0x02
- 
-+#define KEEPSTALE(rbtdb) ((rbtdb)->serve_stale_ttl > 0)
-+
- /*%
-  * Search Context
-  */
-@@ -1791,15 +1810,15 @@ rollback_node(dns_rbtnode_t *node, rbtdb_serial_t serial) {
- }
- 
- static inline void
--mark_stale_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header) {
-+mark_header_ancient(dns_rbtdb_t *rbtdb, rdatasetheader_t *header) {
- 
- 	/*
--	 * If we are already stale there is nothing to do.
-+	 * If we are already ancient there is nothing to do.
- 	 */
--	if ((header->attributes & RDATASET_ATTR_STALE) != 0)
-+	if (ANCIENT(header))
- 		return;
- 
--	header->attributes |= RDATASET_ATTR_STALE;
-+	header->attributes |= RDATASET_ATTR_ANCIENT;
- 	header->node->dirty = 1;
- 
- 	/*
-@@ -1840,8 +1859,8 @@ clean_cache_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) {
- 		/*
- 		 * If current is nonexistent or stale, we can clean it up.
- 		 */
--		if ((current->attributes &
--		     (RDATASET_ATTR_NONEXISTENT|RDATASET_ATTR_STALE)) != 0) {
-+		if (NONEXISTENT(current) || ANCIENT(current) ||
-+		    (STALE(current) && ! KEEPSTALE(rbtdb))) {
- 			if (top_prev != NULL)
- 				top_prev->next = current->next;
- 			else
-@@ -2086,6 +2105,80 @@ delete_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) {
- 	}
- }
- 
-+#if 0
-+static void
-+clean_now_or_later(dns_rbtnode_t *node, dns_rbtdb_t *rbtdb,
-+		   rdatasetheader_t *header, rdatasetheader_t **header_prevp)
-+{
-+	if (dns_rbtnode_refcurrent(node) == 0) {
-+		isc_mem_t *mctx;
-+
-+		/*
-+		 * header->down can be non-NULL if the refcount has just
-+		 * decremented to 0 but decrement_reference() has not performed
-+		 * clean_cache_node(), in which case we need to purge the stale
-+		 * headers first.
-+		 */
-+		mctx = rbtdb->common.mctx;
-+		clean_stale_headers(rbtdb, mctx, header);
-+		if (*header_prevp != NULL)
-+			(*header_prevp)->next = header->next;
-+		else
-+			node->data = header->next;
-+		free_rdataset(rbtdb, mctx, header);
-+	} else {
-+		header->attributes |= RDATASET_ATTR_STALE |
-+		                      RDATASET_ATTR_ANCIENT;
-+		node->dirty = 1;
-+		*header_prevp = header;
-+	}
-+}
-+
-+static rdataset_ttl_t
-+check_ttl(dns_rbtnode_t *node, rbtdb_search_t *search,
-+	  rdatasetheader_t *header, rdatasetheader_t **header_prevp,
-+	  nodelock_t *lock, isc_rwlocktype_t *locktype)
-+{
-+	dns_rbtdb_t *rbtdb = search->rbtdb;
-+
-+	if (header->rdh_ttl > search->now)
-+		return rdataset_ttl_fresh;
-+
-+	/*
-+	 * This rdataset is stale, but perhaps still usable.
-+	 */
-+	if (KEEPSTALE(rbtdb) &&
-+	    header->rdh_ttl + rbtdb->serve_stale_ttl > search->now) {
-+		header->attributes |= RDATASET_ATTR_STALE;
-+		/* Doesn't set dirty because it doesn't need removal. */
-+		return rdataset_ttl_stale;
-+	}
-+
-+	/*
-+	 * This rdataset is so stale it is no longer usable, even with
-+	 * KEEPSTALE.  If no one else is using the node, we can clean it up
-+	 * right now, otherwise we mark it as ancient, and the node as dirty,
-+	 * so it will get cleaned up later.
-+	 */
-+	if ((header->rdh_ttl <= search->now - RBTDB_VIRTUAL) &&
-+	    (*locktype == isc_rwlocktype_write ||
-+	     NODE_TRYUPGRADE(lock) == ISC_R_SUCCESS)) {
-+		/*
-+		 * We update the node's status only when we can get write
-+		 * access; otherwise, we leave others to this work.  Periodical
-+		 * cleaning will eventually take the job as the last resort.
-+		 * We won't downgrade the lock, since other rdatasets are
-+		 * probably stale, too.
-+		 */
-+		*locktype = isc_rwlocktype_write;
-+		clean_now_or_later(node, rbtdb, header, header_prevp);
-+	} else
-+		*header_prevp = header;
-+
-+	return rdataset_ttl_ancient;
-+}
-+#endif
-+
- /*
-  * Caller must be holding the node lock.
-  */
-@@ -3313,6 +3406,12 @@ bind_rdataset(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,
- 		rdataset->attributes |= DNS_RDATASETATTR_OPTOUT;
- 	if (PREFETCH(header))
- 		rdataset->attributes |= DNS_RDATASETATTR_PREFETCH;
-+	if (STALE(header)) {
-+		rdataset->attributes |= DNS_RDATASETATTR_STALE;
-+		rdataset->stale_ttl =
-+			(rbtdb->serve_stale_ttl + header->rdh_ttl) - now;
-+		rdataset->ttl = 0;
-+	}
- 	rdataset->private1 = rbtdb;
- 	rdataset->private2 = node;
- 	raw = (unsigned char *)header + sizeof(*header);
-@@ -4653,6 +4752,19 @@ check_stale_header(dns_rbtnode_t *node, rdatasetheader_t *header,
- #endif
- 
- 	if (!ACTIVE(header, search->now)) {
-+		dns_ttl_t stale = header->rdh_ttl +
-+				  search->rbtdb->serve_stale_ttl;
-+		/*
-+		 * If this data is in the stale window keep it and if
-+		 * DNS_DBFIND_STALEOK is not set we tell the caller to
-+		 * skip this record.
-+		 */
-+		if (KEEPSTALE(search->rbtdb) && stale > search->now) {
-+			header->attributes |= RDATASET_ATTR_STALE;
-+			*header_prev = header;
-+			return ((search->options & DNS_DBFIND_STALEOK) == 0);
-+		}
-+
- 		/*
- 		 * This rdataset is stale.  If no one else is using the
- 		 * node, we can clean it up right now, otherwise we mark
-@@ -4692,7 +4804,7 @@ check_stale_header(dns_rbtnode_t *node, rdatasetheader_t *header,
- 					node->data = header->next;
- 				free_rdataset(search->rbtdb, mctx, header);
- 			} else {
--				mark_stale_header(search->rbtdb, header);
-+				mark_header_ancient(search->rbtdb, header);
- 				*header_prev = header;
- 			}
- 		} else
-@@ -5130,7 +5242,7 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
- 				       &locktype, lock, &search,
- 				       &header_prev)) {
- 			/* Do nothing. */
--		} else if (EXISTS(header) && (!STALE(header))) {
-+		} else if (EXISTS(header) && !ANCIENT(header)) {
- 			/*
- 			 * We now know that there is at least one active
- 			 * non-stale rdataset at this node.
-@@ -5608,7 +5720,7 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) {
- 			 * refcurrent(rbtnode) must be non-zero.  This is so
- 			 * because 'node' is an argument to the function.
- 			 */
--			mark_stale_header(rbtdb, header);
-+			mark_header_ancient(rbtdb, header);
- 			if (log)
- 				isc_log_write(dns_lctx, category, module,
- 					      level, "overmem cache: stale %s",
-@@ -5616,7 +5728,7 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) {
- 		} else if (force_expire) {
- 			if (! RETAIN(header)) {
- 				set_ttl(rbtdb, header, 0);
--				mark_stale_header(rbtdb, header);
-+				mark_header_ancient(rbtdb, header);
- 			} else if (log) {
- 				isc_log_write(dns_lctx, category, module,
- 					      level, "overmem cache: "
-@@ -5873,9 +5985,9 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
- 				 * non-zero.  This is so because 'node' is an
- 				 * argument to the function.
- 				 */
--				mark_stale_header(rbtdb, header);
-+				mark_header_ancient(rbtdb, header);
- 			}
--		} else if (EXISTS(header) && (!STALE(header))) {
-+		} else if (EXISTS(header) && !ANCIENT(header)) {
- 			if (header->type == matchtype)
- 				found = header;
- 			else if (header->type == RBTDB_RDATATYPE_NCACHEANY ||
-@@ -6167,7 +6279,7 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
- 				     topheader = topheader->next)
- 				{
- 					set_ttl(rbtdb, topheader, 0);
--					mark_stale_header(rbtdb, topheader);
-+					mark_header_ancient(rbtdb, topheader);
- 				}
- 				goto find_header;
- 			}
-@@ -6225,7 +6337,7 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
- 				 * ncache entry.
- 				 */
- 				set_ttl(rbtdb, topheader, 0);
--				mark_stale_header(rbtdb, topheader);
-+				mark_header_ancient(rbtdb, topheader);
- 				topheader = NULL;
- 				goto find_header;
- 			}
-@@ -6263,8 +6375,11 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
- 		}
- 
- 		/*
--		 * Trying to add an rdataset with lower trust to a cache DB
--		 * has no effect, provided that the cache data isn't stale.
-+		 * Trying to add an rdataset with lower trust to a cache
-+		 * DB has no effect, provided that the cache data isn't
-+		 * stale. If the cache data is stale, new lower trust
-+		 * data will supersede it below. Unclear what the best
-+		 * policy is here.
- 		 */
- 		if (rbtversion == NULL && trust < header->trust &&
- 		    (ACTIVE(header, now) || header_nx)) {
-@@ -6293,6 +6408,10 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
- 
- 			if ((options & DNS_DBADD_EXACT) != 0)
- 				flags |= DNS_RDATASLAB_EXACT;
-+			/*
-+			 * TTL use here is irrelevant to the cache;
-+			 * merge is only done with zonedbs.
-+			 */
- 			if ((options & DNS_DBADD_EXACTTTL) != 0 &&
- 			     newheader->rdh_ttl != header->rdh_ttl)
- 					result = DNS_R_NOTEXACT;
-@@ -6336,11 +6455,12 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
- 			}
- 		}
- 		/*
--		 * Don't replace existing NS, A and AAAA RRsets
--		 * in the cache if they are already exist.  This
--		 * prevents named being locked to old servers.
--		 * Don't lower trust of existing record if the
--		 * update is forced.
-+		 * Don't replace existing NS, A and AAAA RRsets in the
-+		 * cache if they are already exist. This prevents named
-+		 * being locked to old servers. Don't lower trust of
-+		 * existing record if the update is forced. Nothing
-+		 * special to be done w.r.t stale data; it gets replaced
-+		 * normally further down.
- 		 */
- 		if (IS_CACHE(rbtdb) && ACTIVE(header, now) &&
- 		    header->type == dns_rdatatype_ns &&
-@@ -6511,10 +6631,10 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
- 				changed->dirty = true;
- 			if (rbtversion == NULL) {
- 				set_ttl(rbtdb, header, 0);
--				mark_stale_header(rbtdb, header);
-+				mark_header_ancient(rbtdb, header);
- 				if (sigheader != NULL) {
- 					set_ttl(rbtdb, sigheader, 0);
--					mark_stale_header(rbtdb, sigheader);
-+					mark_header_ancient(rbtdb, sigheader);
- 				}
- 			}
- 			if (rbtversion != NULL && !header_nx) {
-@@ -8331,6 +8451,30 @@ nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) {
- 	return (result);
- }
- 
-+static isc_result_t
-+setservestalettl(dns_db_t *db, dns_ttl_t ttl) {
-+	dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db;
-+
-+	REQUIRE(VALID_RBTDB(rbtdb));
-+	REQUIRE(IS_CACHE(rbtdb));
-+
-+	/* currently no bounds checking.  0 means disable. */
-+	rbtdb->serve_stale_ttl = ttl;
-+	return ISC_R_SUCCESS;
-+}
-+
-+static isc_result_t
-+getservestalettl(dns_db_t *db, dns_ttl_t *ttl) {
-+	dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db;
-+
-+	REQUIRE(VALID_RBTDB(rbtdb));
-+	REQUIRE(IS_CACHE(rbtdb));
-+
-+	*ttl = rbtdb->serve_stale_ttl;
-+	return ISC_R_SUCCESS;
-+}
-+
-+
- static dns_dbmethods_t zone_methods = {
- 	attach,
- 	detach,
-@@ -8376,7 +8520,9 @@ static dns_dbmethods_t zone_methods = {
- 	NULL,
- 	hashsize,
- 	nodefullname,
--	getsize
-+	getsize,
-+	NULL,
-+	NULL
- };
- 
- static dns_dbmethods_t cache_methods = {
-@@ -8424,7 +8570,9 @@ static dns_dbmethods_t cache_methods = {
- 	setcachestats,
- 	hashsize,
- 	nodefullname,
--	NULL
-+	NULL,
-+	setservestalettl,
-+	getservestalettl
- };
- 
- isc_result_t
-@@ -8695,7 +8843,7 @@ dns_rbtdb_create
- 	rbtdb->rpzs = NULL;
- 	rbtdb->load_rpzs = NULL;
- 	rbtdb->rpz_num = DNS_RPZ_INVALID_NUM;
--
-+	rbtdb->serve_stale_ttl = 0;
- 	/*
- 	 * Version Initialization.
- 	 */
-@@ -9113,7 +9261,8 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) {
- 				 * rdatasets to work.
- 				 */
- 				if (NONEXISTENT(header) ||
--				    (now != 0 && now > header->rdh_ttl))
-+				    (now != 0 && now > header->rdh_ttl
-+						     + rbtdb->serve_stale_ttl))
- 					header = NULL;
- 				break;
- 			} else
-@@ -10322,7 +10471,7 @@ static inline bool
- need_headerupdate(rdatasetheader_t *header, isc_stdtime_t now) {
- 	if ((header->attributes &
- 	     (RDATASET_ATTR_NONEXISTENT |
--	      RDATASET_ATTR_STALE |
-+	      RDATASET_ATTR_ANCIENT |
- 	      RDATASET_ATTR_ZEROTTL)) != 0)
- 		return (false);
- 
-@@ -10428,7 +10577,7 @@ expire_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header,
- 	      bool tree_locked, expire_t reason)
- {
- 	set_ttl(rbtdb, header, 0);
--	mark_stale_header(rbtdb, header);
-+	mark_header_ancient(rbtdb, header);
- 
- 	/*
- 	 * Caller must hold the node (write) lock.
-diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
-index 337a2f3..24e14d2 100644
---- a/lib/dns/resolver.c
-+++ b/lib/dns/resolver.c
-@@ -141,16 +141,17 @@
- #endif /* WANT_QUERYTRACE */
- 
- #define US_PER_SEC 1000000U
-+#define US_PER_MSEC 1000U
- /*
-  * The maximum time we will wait for a single query.
-  */
--#define MAX_SINGLE_QUERY_TIMEOUT 9U
--#define MAX_SINGLE_QUERY_TIMEOUT_US (MAX_SINGLE_QUERY_TIMEOUT*US_PER_SEC)
-+#define MAX_SINGLE_QUERY_TIMEOUT 9000U
-+#define MAX_SINGLE_QUERY_TIMEOUT_US (MAX_SINGLE_QUERY_TIMEOUT*US_PER_MSEC)
- 
- /*
-  * We need to allow a individual query time to complete / timeout.
-  */
--#define MINIMUM_QUERY_TIMEOUT (MAX_SINGLE_QUERY_TIMEOUT + 1U)
-+#define MINIMUM_QUERY_TIMEOUT (MAX_SINGLE_QUERY_TIMEOUT + 1000U)
- 
- /* The default time in seconds for the whole query to live. */
- #ifndef DEFAULT_QUERY_TIMEOUT
-@@ -159,7 +160,7 @@
- 
- /* The maximum time in seconds for the whole query to live. */
- #ifndef MAXIMUM_QUERY_TIMEOUT
--#define MAXIMUM_QUERY_TIMEOUT 30
-+#define MAXIMUM_QUERY_TIMEOUT 30000
- #endif
- 
- /* The default maximum number of recursions to follow before giving up. */
-@@ -515,6 +516,11 @@ struct dns_resolver {
- 	dns_fetch_t *			primefetch;
- 	/* Locked by nlock. */
- 	unsigned int			nfctx;
-+
-+	/* Unlocked. Additions for serve-stale feature. */
-+	unsigned int			retryinterval; /* in milliseconds */
-+	unsigned int			nonbackofftries;
-+
- };
- 
- #define RES_MAGIC			ISC_MAGIC('R', 'e', 's', '!')
-@@ -1625,14 +1631,12 @@ fctx_setretryinterval(fetchctx_t *fctx, unsigned int rtt) {
- 	unsigned int seconds;
- 	unsigned int us;
- 
-+	us = fctx->res->retryinterval * 1000;
- 	/*
--	 * We retry every .8 seconds the first two times through the address
--	 * list, and then we do exponential back-off.
-+	 * Exponential backoff after the first few tries.
- 	 */
--	if (fctx->restarts < 3)
--		us = 800000;
--	else
--		us = (800000 << (fctx->restarts - 2));
-+	if (fctx->restarts >= fctx->res->nonbackofftries)
-+		us <<= (fctx->restarts - fctx->res->nonbackofftries - 1);
- 
- 	/*
- 	 * Add a fudge factor to the expected rtt based on the current
-@@ -4494,7 +4498,8 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
- 	/*
- 	 * Compute an expiration time for the entire fetch.
- 	 */
--	isc_interval_set(&interval, res->query_timeout, 0);
-+	isc_interval_set(&interval, res->query_timeout / 1000,
-+			 res->query_timeout % 1000 * 1000000);
- 	iresult = isc_time_nowplusinterval(&fctx->expires, &interval);
- 	if (iresult != ISC_R_SUCCESS) {
- 		UNEXPECTED_ERROR(__FILE__, __LINE__,
-@@ -8983,6 +8988,8 @@ dns_resolver_create(dns_view_t *view,
- 	res->spillattimer = NULL;
- 	res->zspill = 0;
- 	res->zero_no_soa_ttl = false;
-+	res->retryinterval = 30000;
-+	res->nonbackofftries = 3;
- 	res->query_timeout = DEFAULT_QUERY_TIMEOUT;
- 	res->maxdepth = DEFAULT_RECURSION_DEPTH;
- 	res->maxqueries = DEFAULT_MAX_QUERIES;
-@@ -10317,17 +10324,20 @@ dns_resolver_gettimeout(dns_resolver_t *resolver) {
- }
- 
- void
--dns_resolver_settimeout(dns_resolver_t *resolver, unsigned int seconds) {
-+dns_resolver_settimeout(dns_resolver_t *resolver, unsigned int timeout) {
- 	REQUIRE(VALID_RESOLVER(resolver));
- 
--	if (seconds == 0)
--		seconds = DEFAULT_QUERY_TIMEOUT;
--	if (seconds > MAXIMUM_QUERY_TIMEOUT)
--		seconds = MAXIMUM_QUERY_TIMEOUT;
--	if (seconds < MINIMUM_QUERY_TIMEOUT)
--		seconds =  MINIMUM_QUERY_TIMEOUT;
-+	if (timeout <= 300)
-+		timeout *= 1000;
-+
-+	if (timeout == 0)
-+		timeout = DEFAULT_QUERY_TIMEOUT;
-+	if (timeout > MAXIMUM_QUERY_TIMEOUT)
-+		timeout = MAXIMUM_QUERY_TIMEOUT;
-+	if (timeout < MINIMUM_QUERY_TIMEOUT)
-+		timeout =  MINIMUM_QUERY_TIMEOUT;
- 
--	resolver->query_timeout = seconds;
-+	resolver->query_timeout = timeout;
- }
- 
- void
-@@ -10424,3 +10434,34 @@ dns_resolver_getquotaresponse(dns_resolver_t *resolver, dns_quotatype_t which)
- 
- 	return (resolver->quotaresp[which]);
- }
-+
-+unsigned int
-+dns_resolver_getretryinterval(dns_resolver_t *resolver) {
-+	REQUIRE(VALID_RESOLVER(resolver));
-+
-+	return (resolver->retryinterval);
-+}
-+
-+void
-+dns_resolver_setretryinterval(dns_resolver_t *resolver, unsigned int interval)
-+{
-+	REQUIRE(VALID_RESOLVER(resolver));
-+	REQUIRE(interval > 0);
-+
-+	resolver->retryinterval = ISC_MIN(interval, 2000);
-+}
-+
-+unsigned int
-+dns_resolver_getnonbackofftries(dns_resolver_t *resolver) {
-+	REQUIRE(VALID_RESOLVER(resolver));
-+
-+	return (resolver->nonbackofftries);
-+}
-+
-+void
-+dns_resolver_setnonbackofftries(dns_resolver_t *resolver, unsigned int tries) {
-+	REQUIRE(VALID_RESOLVER(resolver));
-+	REQUIRE(tries > 0);
-+
-+	resolver->nonbackofftries = tries;
-+}
-diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
-index d4c8c67..ee9be79 100644
---- a/lib/dns/sdb.c
-+++ b/lib/dns/sdb.c
-@@ -1368,7 +1368,9 @@ static dns_dbmethods_t sdb_methods = {
- 	NULL,			/* setcachestats */
- 	NULL,			/* hashsize */
- 	NULL,			/* nodefullname */
--	NULL			/* getsize */
-+	NULL,			/* getsize */
-+	NULL,			/* setservestalettl */
-+	NULL			/* getservestalettl */
- };
- 
- static isc_result_t
-diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
-index 0b9620c..331992e 100644
---- a/lib/dns/sdlz.c
-+++ b/lib/dns/sdlz.c
-@@ -1336,7 +1336,9 @@ static dns_dbmethods_t sdlzdb_methods = {
- 	NULL,			/* setcachestats */
- 	NULL,			/* hashsize */
- 	NULL,			/* nodefullname */
--	NULL			/* getsize */
-+	NULL,			/* getsize */
-+	NULL,			/* setservestalettl */
-+	NULL			/* getservestalettl */
- };
- 
- /*
-diff --git a/lib/dns/tests/db_test.c b/lib/dns/tests/db_test.c
-index 2849775..812f750 100644
---- a/lib/dns/tests/db_test.c
-+++ b/lib/dns/tests/db_test.c
-@@ -28,8 +28,9 @@
- 
- #include <dns/db.h>
- #include <dns/dbiterator.h>
--#include <dns/name.h>
- #include <dns/journal.h>
-+#include <dns/name.h>
-+#include <dns/rdatalist.h>
- 
- #include "dnstest.h"
- 
-@@ -76,7 +77,7 @@ getoriginnode_test(void **state) {
- 	assert_int_equal(result, ISC_R_SUCCESS);
- 
- 	result = dns_db_create(mymctx, "rbt", dns_rootname, dns_dbtype_zone,
--			    dns_rdataclass_in, 0, NULL, &db);
-+			       dns_rdataclass_in, 0, NULL, &db);
- 	assert_int_equal(result, ISC_R_SUCCESS);
- 
- 	result = dns_db_getoriginnode(db, &node);
-@@ -91,6 +92,197 @@ getoriginnode_test(void **state) {
- 	isc_mem_detach(&mymctx);
- }
- 
-+/* test getservestalettl and setservestalettl */
-+static void
-+getsetservestalettl_test(void **state) {
-+	dns_db_t *db = NULL;
-+	isc_mem_t *mymctx = NULL;
-+	isc_result_t result;
-+	dns_ttl_t ttl;
-+
-+	UNUSED(state);
-+
-+	result = isc_mem_create(0, 0, &mymctx);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+
-+	result = dns_db_create(mymctx, "rbt", dns_rootname, dns_dbtype_cache,
-+			       dns_rdataclass_in, 0, NULL, &db);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+
-+	ttl = 5000;
-+	result = dns_db_getservestalettl(db, &ttl);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+	assert_int_equal(ttl, 0);
-+
-+	ttl = 6 * 3600;
-+	result = dns_db_setservestalettl(db, ttl);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+
-+	ttl = 5000;
-+	result = dns_db_getservestalettl(db, &ttl);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+	assert_int_equal(ttl, 6 * 3600);
-+
-+	dns_db_detach(&db);
-+	isc_mem_detach(&mymctx);
-+}
-+
-+/* check DNS_DBFIND_STALEOK works */
-+static void
-+dns_dbfind_staleok_test(void **state) {
-+	dns_db_t *db = NULL;
-+	dns_dbnode_t *node = NULL;
-+	dns_fixedname_t example_fixed;
-+	dns_fixedname_t found_fixed;
-+	dns_name_t *example;
-+	dns_name_t *found;
-+	dns_rdatalist_t rdatalist;
-+	dns_rdataset_t rdataset;
-+	int count;
-+	int pass;
-+	isc_mem_t *mymctx = NULL;
-+	isc_result_t result;
-+	unsigned char data[] = { 0x0a, 0x00, 0x00, 0x01 };
-+
-+	UNUSED(state);
-+
-+	result = isc_mem_create(0, 0, &mymctx);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+
-+	result = dns_db_create(mymctx, "rbt", dns_rootname, dns_dbtype_cache,
-+			       dns_rdataclass_in, 0, NULL, &db);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+
-+	example = dns_fixedname_initname(&example_fixed);
-+	found = dns_fixedname_initname(&found_fixed);
-+
-+	result = dns_name_fromstring(example, "example", 0, NULL);
-+	assert_int_equal(result, ISC_R_SUCCESS);
-+
-+	/*
-+	 * Pass 0: default; no stale processing permitted.
-+	 * Pass 1: stale processing for 1 second.
-+	 * Pass 2: stale turned off after being on.
-+	 */
-+	for (pass = 0; pass < 3; pass++) {
-+		dns_rdata_t rdata = DNS_RDATA_INIT;
-+
-+		/* 10.0.0.1 */
-+		rdata.data = data;
-+		rdata.length = 4;
-+		rdata.rdclass = dns_rdataclass_in;
-+		rdata.type = dns_rdatatype_a;
-+
-+		dns_rdatalist_init(&rdatalist);
-+		rdatalist.ttl = 2;
-+		rdatalist.type = dns_rdatatype_a;
-+		rdatalist.rdclass = dns_rdataclass_in;
-+		ISC_LIST_APPEND(rdatalist.rdata, &rdata, link);
-+
-+		switch (pass) {
-+		case 0:
-+			/* default: stale processing off */
-+			break;
-+		case 1:
-+			/* turn on stale processing */
-+			result = dns_db_setservestalettl(db, 1);
-+			assert_int_equal(result, ISC_R_SUCCESS);
-+			break;
-+		case 2:
-+			/* turn off stale processing */
-+			result = dns_db_setservestalettl(db, 0);
-+			assert_int_equal(result, ISC_R_SUCCESS);
-+			break;
-+		}
-+
-+		dns_rdataset_init(&rdataset);
-+		result = dns_rdatalist_tordataset(&rdatalist, &rdataset);
-+		assert_int_equal(result, ISC_R_SUCCESS);
-+
-+		result = dns_db_findnode(db, example, true, &node);
-+		assert_int_equal(result, ISC_R_SUCCESS);
-+
-+		result = dns_db_addrdataset(db, node, NULL, 0, &rdataset, 0,
-+					    NULL);
-+		assert_int_equal(result, ISC_R_SUCCESS);
-+
-+		dns_db_detachnode(db, &node);
-+		dns_rdataset_disassociate(&rdataset);
-+
-+		result = dns_db_find(db, example, NULL, dns_rdatatype_a,
-+				     0, 0, &node, found, &rdataset, NULL);
-+		assert_int_equal(result, ISC_R_SUCCESS);
-+
-+		/*
-+		 * May loop for up to 2 seconds performing non stale lookups.
-+		 */
-+		count = 0;
-+		do {
-+			count++;
-+			assert_in_range(count, 0, 20); /* loop sanity */
-+			assert_int_equal(rdataset.attributes &
-+				     DNS_RDATASETATTR_STALE, 0);
-+			assert_true(rdataset.ttl > 0);
-+			dns_db_detachnode(db, &node);
-+			dns_rdataset_disassociate(&rdataset);
-+
-+			usleep(100000);	/* 100 ms */
-+
-+			result = dns_db_find(db, example, NULL,
-+					     dns_rdatatype_a, 0, 0,
-+					     &node, found, &rdataset, NULL);
-+		} while (result == ISC_R_SUCCESS);
-+
-+		assert_int_equal(result, ISC_R_NOTFOUND);
-+
-+		/*
-+		 * Check whether we can get stale data.
-+		 */
-+		result = dns_db_find(db, example, NULL, dns_rdatatype_a,
-+				     DNS_DBFIND_STALEOK, 0,
-+				     &node, found, &rdataset, NULL);
-+		switch (pass) {
-+		case 0:
-+			assert_int_equal(result, ISC_R_NOTFOUND);
-+			break;
-+		case 1:
-+			/*
-+			 * Should loop for 1 second with stale lookups then
-+			 * stop.
-+			 */
-+			count = 0;
-+			do {
-+				count++;
-+				assert_in_range(count, 0, 49); /* loop sanity */
-+				assert_int_equal(result, ISC_R_SUCCESS);
-+				assert_int_equal(rdataset.ttl, 0);
-+				assert_int_equal(rdataset.attributes &
-+					     DNS_RDATASETATTR_STALE,
-+					     DNS_RDATASETATTR_STALE);
-+				dns_db_detachnode(db, &node);
-+				dns_rdataset_disassociate(&rdataset);
-+
-+				usleep(100000);	/* 100 ms */
-+
-+				result = dns_db_find(db, example, NULL,
-+						     dns_rdatatype_a,
-+						     DNS_DBFIND_STALEOK,
-+						     0, &node, found,
-+						     &rdataset, NULL);
-+			} while (result == ISC_R_SUCCESS);
-+			assert_in_range(count, 1, 10);
-+			assert_int_equal(result, ISC_R_NOTFOUND);
-+			break;
-+		case 2:
-+			assert_int_equal(result, ISC_R_NOTFOUND);
-+			break;
-+		}
-+	}
-+
-+	dns_db_detach(&db);
-+	isc_mem_detach(&mymctx);
-+}
-+
- /* database class */
- static void
- class_test(void **state) {
-@@ -213,6 +405,8 @@ int
- main(void) {
- 	const struct CMUnitTest tests[] = {
- 		cmocka_unit_test(getoriginnode_test),
-+		cmocka_unit_test(getsetservestalettl_test),
-+		cmocka_unit_test(dns_dbfind_staleok_test),
- 		cmocka_unit_test_setup_teardown(class_test,
- 						_setup, _teardown),
- 		cmocka_unit_test_setup_teardown(dbtype_test,
-diff --git a/lib/dns/view.c b/lib/dns/view.c
-index 0fca1d9..55ede81 100644
---- a/lib/dns/view.c
-+++ b/lib/dns/view.c
-@@ -229,6 +229,9 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
- 	view->flush = false;
- 	view->dlv = NULL;
- 	view->maxudp = 0;
-+	view->staleanswerttl = 1;
-+	view->staleanswersok = dns_stale_answer_conf;
-+	view->staleanswersenable = false;
- 	view->nocookieudp = 0;
- 	view->maxbits = 0;
- 	view->v4_aaaa = dns_aaaa_ok;
-diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
-index 91693b5..5771774 100644
---- a/lib/isccfg/namedconf.c
-+++ b/lib/isccfg/namedconf.c
-@@ -1778,6 +1778,7 @@ view_clauses[] = {
- 	{ "max-ncache-ttl", &cfg_type_uint32, 0 },
- 	{ "max-recursion-depth", &cfg_type_uint32, 0 },
- 	{ "max-recursion-queries", &cfg_type_uint32, 0 },
-+	{ "max-stale-ttl", &cfg_type_ttlval, 0 },
- 	{ "max-udp-size", &cfg_type_uint32, 0 },
- 	{ "message-compression", &cfg_type_boolean, 0 },
- 	{ "min-roots", &cfg_type_uint32, CFG_CLAUSEFLAG_NOTIMP },
-@@ -1806,7 +1807,9 @@ view_clauses[] = {
- 	{ "request-nsid", &cfg_type_boolean, 0 },
- 	{ "request-sit", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
- 	{ "require-server-cookie", &cfg_type_boolean, 0 },
-+	{ "resolver-nonbackoff-tries", &cfg_type_uint32, 0 },
- 	{ "resolver-query-timeout", &cfg_type_uint32, 0 },
-+	{ "resolver-retry-interval", &cfg_type_uint32, 0 },
- 	{ "response-policy", &cfg_type_rpz, 0 },
- 	{ "rfc2308-type1", &cfg_type_boolean, CFG_CLAUSEFLAG_NYI },
- 	{ "root-delegation-only",  &cfg_type_optional_exclude, 0 },
-@@ -1815,6 +1818,8 @@ view_clauses[] = {
- 	{ "send-cookie", &cfg_type_boolean, 0 },
- 	{ "servfail-ttl", &cfg_type_ttlval, 0 },
- 	{ "sortlist", &cfg_type_bracketed_aml, 0 },
-+	{ "stale-answer-enable", &cfg_type_boolean, 0 },
-+	{ "stale-answer-ttl", &cfg_type_ttlval, 0 },
- 	{ "suppress-initial-notify", &cfg_type_boolean, CFG_CLAUSEFLAG_NYI },
- 	{ "topology", &cfg_type_bracketed_aml, CFG_CLAUSEFLAG_NOTIMP },
- 	{ "transfer-format", &cfg_type_transferformat, 0 },
--- 
-2.21.1
-
diff --git a/bind-9.11-tests-pkcs11.patch b/bind-9.11-tests-pkcs11.patch
deleted file mode 100644
index 79c55b209b04342113cf963b55739b61b124a0a1..0000000000000000000000000000000000000000
--- a/bind-9.11-tests-pkcs11.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 66298a12b09784eab2c052ab22f87bb2b2f1267b Mon Sep 17 00:00:00 2001
-From: Petr Mensik <pemensik@redhat.com>
-Date: Fri, 1 Mar 2019 15:55:46 +0100
-Subject: [PATCH] Detect correctly pkcs11 support
-
-It fails now always, because oot builds are not supported by
-cleanpkcs11.sh.
----
- bin/tests/system/cleanpkcs11.sh | 2 +-
- bin/tests/system/conf.sh.in     | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bin/tests/system/cleanpkcs11.sh b/bin/tests/system/cleanpkcs11.sh
-index b974708..3bbef4c 100644
---- a/bin/tests/system/cleanpkcs11.sh
-+++ b/bin/tests/system/cleanpkcs11.sh
-@@ -12,6 +12,6 @@
- SYSTEMTESTTOP=.
- . $SYSTEMTESTTOP/conf.sh
- 
--if [ ! -x ../../pkcs11/pkcs11-destroy ]; then exit 1; fi
-+if [ ! -x "$PK11DESTROY" ]; then exit 1; fi
- 
- $PK11DEL -w0 > /dev/null 2>&1
-diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
-index a446c18..ede1203 100644
---- a/bin/tests/system/conf.sh.in
-+++ b/bin/tests/system/conf.sh.in
-@@ -46,6 +46,7 @@ CHECKZONE=$TOP/bin/check/named-checkzone
- CHECKCONF=$TOP/bin/check/named-checkconf
- PK11GEN="$TOP/bin/pkcs11/pkcs11-keygen -q -s ${SLOT:-0} -p ${HSMPIN:-1234}"
- PK11LIST="$TOP/bin/pkcs11/pkcs11-list -s ${SLOT:-0} -p ${HSMPIN:-1234}"
-+PK11DESTROY=$TOP/bin/pkcs11/pkcs11-destroy
- PK11DEL="$TOP/bin/pkcs11/pkcs11-destroy -s ${SLOT:-0} -p ${HSMPIN:-1234} -w 0"
- JOURNALPRINT=$TOP/bin/tools/named-journalprint
- VERIFY=$TOP/bin/dnssec/dnssec-verify
--- 
-2.20.1
-
diff --git a/bind-9.11-tests-variants.patch b/bind-9.11-tests-variants.patch
deleted file mode 100644
index 7f28397d4028ce4735636c33cfd8e9f7c0459c91..0000000000000000000000000000000000000000
--- a/bind-9.11-tests-variants.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 9576e960ad3719aa9c1707734ad7ba0eccf16e5f Mon Sep 17 00:00:00 2001
-From: Petr Mensik <pemensik@redhat.com>
-Date: Fri, 1 Mar 2019 15:48:20 +0100
-Subject: [PATCH] Make alternative named builds testable in system tests
-
-Red Hat has alternative variant builds of named, which are not ever
-tested by system tests. New variables make it relatively easy to test
-alternative variants.
-
-For sdb variant use:
-export NAMED_VARIANT=-sdb DNSSEC_VARIANT=
-
-For pkcs variant use:
-export NAMED_VARIANT=-pkcs11 DNSSEC_VARIANT=-pkcs11
----
- bin/tests/system/conf.sh.in | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
-index 6f2dbcd..05605ae 100644
---- a/bin/tests/system/conf.sh.in
-+++ b/bin/tests/system/conf.sh.in
-@@ -37,7 +37,7 @@ DISABLED_ALGORITHM=ECDSAP384SHA384
- DISABLED_ALGORITHM_NUMBER=14
- DISABLED_BITS=384
- 
--NAMED=$TOP/bin/named/named
-+NAMED=$TOP/bin/named${NAMED_VARIANT}/named${NAMED_VARIANT}
- # We must use "named -l" instead of "lwresd" because argv[0] is lost
- # if the program is libtoolized.
- LWRESD="$TOP/bin/named/named -l"
-@@ -48,14 +48,14 @@ NSUPDATE=$TOP/bin/nsupdate/nsupdate
- DDNSCONFGEN=$TOP/bin/confgen/ddns-confgen
- TSIGKEYGEN=$TOP/bin/confgen/tsig-keygen
- RNDCCONFGEN=$TOP/bin/confgen/rndc-confgen
--KEYGEN=$TOP/bin/dnssec/dnssec-keygen
--KEYFRLAB=$TOP/bin/dnssec/dnssec-keyfromlabel
--SIGNER=$TOP/bin/dnssec/dnssec-signzone
--REVOKE=$TOP/bin/dnssec/dnssec-revoke
--SETTIME=$TOP/bin/dnssec/dnssec-settime
--DSFROMKEY=$TOP/bin/dnssec/dnssec-dsfromkey
-+KEYGEN=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-keygen${DNSSEC_VARIANT}
-+KEYFRLAB=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-keyfromlabel${DNSSEC_VARIANT}
-+SIGNER=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-signzone${DNSSEC_VARIANT}
-+REVOKE=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-revoke${DNSSEC_VARIANT}
-+SETTIME=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-settime${DNSSEC_VARIANT}
-+DSFROMKEY=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-dsfromkey${DNSSEC_VARIANT}
- HOST=$TOP/bin/dig/host
--IMPORTKEY=$TOP/bin/dnssec/dnssec-importkey
-+IMPORTKEY=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-importkey${DNSSEC_VARIANT}
- CHECKDS=$TOP/bin/python/dnssec-checkds
- COVERAGE=$TOP/bin/python/dnssec-coverage
- KEYMGR=$TOP/bin/python/dnssec-keymgr
-@@ -75,7 +75,7 @@ DNSTAPREAD=$TOP/bin/tools/dnstap-read
- MDIG=$TOP/bin/tools/mdig
- NZD2NZF=$TOP/bin/tools/named-nzd2nzf
- FSTRM_CAPTURE=@FSTRM_CAPTURE@
--FEATURETEST=$TOP/bin/named/feature-test
-+FEATURETEST=$TOP/bin/named${NAMED_VARIANT}/feature-test${NAMED_VARIANT}
- 
- RANDFILE=$TOP/bin/tests/system/random.data
- 
--- 
-2.21.1
-
diff --git a/bind-9.11-unit-disable-random.patch b/bind-9.11-unit-disable-random.patch
deleted file mode 100644
index 553f7255e1e6770dbad855c79f810065a0a90a23..0000000000000000000000000000000000000000
--- a/bind-9.11-unit-disable-random.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 373f07148217a8e70e33446f5108fb42d1079ba6 Mon Sep 17 00:00:00 2001
-From: Petr Mensik <pemensik@redhat.com>
-Date: Thu, 21 Feb 2019 22:42:27 +0100
-Subject: [PATCH] Disable random_test
-
-It fails too often on some architecture, failing the whole build along.
-Because it runs two times for pkcs11 and normal build and any of
-subtests can occasionally fail, stop it.
-
-It can be used again by defining 'unstable' variable in Kyuafile.
----
- lib/isc/tests/Kyuafile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/isc/tests/Kyuafile b/lib/isc/tests/Kyuafile
-index 4cd2574..9df2340 100644
---- a/lib/isc/tests/Kyuafile
-+++ b/lib/isc/tests/Kyuafile
-@@ -19,7 +19,7 @@ tap_test_program{name='pool_test'}
- tap_test_program{name='print_test'}
- tap_test_program{name='queue_test'}
- tap_test_program{name='radix_test'}
--tap_test_program{name='random_test'}
-+tap_test_program{name='random_test', required_configs='unstable'}
- tap_test_program{name='regex_test'}
- tap_test_program{name='result_test'}
- tap_test_program{name='safe_test'}
--- 
-2.20.1
-
diff --git a/bind-9.11.12.tar.gz.asc b/bind-9.11.12.tar.gz.asc
new file mode 100644
index 0000000000000000000000000000000000000000..6d7992f056a0b4574f5488e3e0f5881a685ff975
--- /dev/null
+++ b/bind-9.11.12.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABAgAdFiEErj+seWcR7Fn8AHqkdLtrmky7PTgFAl2WMooACgkQdLtrmky7
+PThv2RAAnXNLYTzXtH6ls29tRm5Hc+D6UaeqcWDNQ4BpkRVhrFxtukalGCi9mmB6
+NPJzFyXmaOW654pypCIuEgqJNFUpDtLzLzT7SUF+mhm+5plsaRSBnh4mq87l5KSp
+twODAPnfCJV+HBk5RmToLEstAbGQ7xEBTyQtZoFkY+V7zEFwENKiCvWsoSWOkYR3
+zXo3sKjc83HV9ShbW/mCtbZf5L0qlbrKOAzqJfAFMhNNJi8kMbmr/Zi2sIfN+Rhv
+g8HQo89Epv6r51yAdeED8idIX4rKjjcEtHrZeDmLdCcdHgSEj2sIlH92Joce6vL0
+S59A0rItIXm6fW8sz6WNpcj4tVtWYbIYjXZ4SPFNkaUrHv8cUekq+5vbI+v07Gh3
+2bhtDsDyTY5I1/AsY/EFmwkCAjUS00jZryBnuJpLB3v5JtUog4ek32yLBzPrqRBo
+1876j4nlXAia8mG0OgJNWZ0gHyUPe/TgfR8fQDLmHxHHlKrJNTEwY6bLW8jzFTX1
+zk510fI1K7J9tiQgf5wcBQ2h3EBlqzDNIJDovoATzLYIf0HKyVegh/vnQdtdEhUR
+1DzJAt3bsBfAP1AFfWPD/ACu5Zdm7SxY1wE/pjkwttDU3sRZqOfuwNBGeolu3cVN
+O9/h1zsyVeVS0ui2vu4+V4EvNitmXsVbG2doDq9L5yBiIKGO2Ew=
+=GCy6
+-----END PGP SIGNATURE-----
diff --git a/bind-9.11.21.tar.gz.asc b/bind-9.11.21.tar.gz.asc
deleted file mode 100644
index c6a65c342eb2e4511b60fff141ef6b5628eca04d..0000000000000000000000000000000000000000
--- a/bind-9.11.21.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABAgAdFiEElc7aJWscoKFfMC+1lSGn7V2s6RgFAl8Fgc8ACgkQlSGn7V2s
-6Rj/ThAAlpExE5fpqdUFncwGzw1XTBHuHOlvQN4cJQseL/6c0O7lwjUxddAKYNyB
-+TnGEgbd+OG6ifvxIG7m/4JkTuuw7hdj88MNHhhD6r7BnnTnwWL50qlL1McbhOCG
-ThqbxCOL+ncg48f/LytXj02l38dt136lxJlpkwyHaykMJO4Im19Te69hWROftKpP
-X4c3/GtJL5ZMtFxUyHpvHv0MJbZrLgys9+R7FtOlSckSgCMIj/D2fiPBCpNkY2uN
-DdLkOe5oVqpypQfY2K1NbyJPaUUkDfnf2VHNF/c6DLLzCz/kYA14QxJjDKGtKV20
-5tDJF+7buDqi/egUCB3VNagPWgYyIbVFR/VGReepOR+gedEiqwyN0Q0B76VEtB7H
-lkeMRol07wm88tLHTIH+JpgGz7vYSyIPgZ3K/gJMmJUgk70zArlzb/WSMrfVtJqd
-irB/cPiKhlG3Ktau7/LgVeX7s5isoXImwQ3JgSTlw2ZlhkT7PzALkVbT7CRtjOT9
-+VqEA7iYClBuSgdFv9Dr41pho9bWBjGvATekSTHnQJfGvSvtGzD+XbxhyLhJQnZ+
-XgsZ0uQZxzxqHk23TirGIA3iWSwIFGxeLYsTzg9wY4Qx8pwjDZVD0hrkuKaRQZS3
-CrxBfqzT8zTD9okforH/E3tau38ENZO42XqQDXdAjw+ioMjqUOM=
-=I3HH
------END PGP SIGNATURE-----
diff --git a/bind-9.14-config-pkcs11.patch b/bind-9.14-config-pkcs11.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0d62df6977db38aeed0380e12209bd93da7a7328
--- /dev/null
+++ b/bind-9.14-config-pkcs11.patch
@@ -0,0 +1,83 @@
+From e6ab9c67f0a14adc23c1067e03a106da1b1651b7 Mon Sep 17 00:00:00 2001
+From: Petr Mensik <pemensik@redhat.com>
+Date: Fri, 18 Oct 2019 21:30:52 +0200
+Subject: [PATCH] Move USE_PKCS11 and USE_OPENSSL out of config.h
+
+Building two variants with the same common code requires to unset
+USE_PKCS11 on part of build. That is not possible with config.h value.
+Move it as normal define to CDEFINES.
+---
+ bin/confgen/Makefile.in |  2 +-
+ configure.ac            |  8 ++++++--
+ lib/dns/dst_internal.h  | 12 +++++++++---
+ 3 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
+index 1b7512d..c126bf3 100644
+--- a/bin/confgen/Makefile.in
++++ b/bin/confgen/Makefile.in
+@@ -22,7 +22,7 @@ VERSION=@BIND9_VERSION@
+ CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
+ 	${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
+ 
+-CDEFINES =
++CDEFINES = @USE_PKCS11@
+ CWARNINGS =
+ 
+ ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
+diff --git a/configure.ac b/configure.ac
+index f5483fe..08a7d8a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -935,10 +935,14 @@ AC_SUBST([PKCS11_TEST])
+ AC_SUBST([PKCS11_TOOLS])
+ AC_SUBST([PKCS11_MANS])
+ 
++USE_PKCS11='-DUSE_PKCS11=0'
++USE_OPENSSL='-DUSE_OPENSSL=0'
+ AC_SUBST([CRYPTO])
+ AS_CASE([$CRYPTO],
+-	[pkcs11],[AC_DEFINE([USE_PKCS11], [1], [define if PKCS11 is used for Public-Key Cryptography])],
+-	[AC_DEFINE([USE_OPENSSL], [1], [define if OpenSSL is used for Public-Key Cryptography])])
++	[pkcs11],[USE_PKCS11='-DUSE_PKCS11=1'],
++	[USE_OPENSSL='-DUSE_OPENSSL=1'])
++AC_SUBST(USE_PKCS11)
++AC_SUBST(USE_OPENSSL)
+ 
+ # preparation for automake
+ # AM_CONDITIONAL([PKCS11_TOOLS], [test "$with_native_pkcs11" = "yes"])
+diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
+index 2c3b4a3..55e9dc4 100644
+--- a/lib/dns/dst_internal.h
++++ b/lib/dns/dst_internal.h
+@@ -38,6 +38,13 @@
+ #include <isc/stdtime.h>
+ #include <isc/types.h>
+ 
++#ifndef USE_PKCS11
++#define USE_PKCS11 0
++#endif
++#ifndef USE_OPENSSL
++#define USE_OPENSSL (! USE_PKCS11)
++#endif
++
+ #if USE_PKCS11
+ #include <pk11/pk11.h>
+ #include <pk11/site.h>
+@@ -116,11 +123,10 @@ struct dst_key {
+ 		void *generic;
+ 		dns_gss_ctx_id_t gssctx;
+ 		DH *dh;
+-#if USE_OPENSSL
+-		EVP_PKEY *pkey;
+-#endif /* if USE_OPENSSL */
+ #if USE_PKCS11
+ 		pk11_object_t *pkey;
++#else
++		EVP_PKEY *pkey;
+ #endif /* if USE_PKCS11 */
+ 		dst_hmac_key_t *hmac_key;
+ 	} keydata; /*%< pointer to key in crypto pkg fmt */
+-- 
+2.26.2
+
diff --git a/bind-9.14.7.tar.gz.asc b/bind-9.14.7.tar.gz.asc
new file mode 100644
index 0000000000000000000000000000000000000000..1134ae1b301709f81bda531559d6a9a421923c8f
--- /dev/null
+++ b/bind-9.14.7.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABAgAdFiEErj+seWcR7Fn8AHqkdLtrmky7PTgFAl2WMpEACgkQdLtrmky7
+PTh/sg//QbNRAQvADQfwF1PPo+JxB+3WzQ9oJAWeHbOoiubwkUwO9xE+BEnTNd5o
+oM1lSLqFxNykOTaoeJlqPftPod1cxo7lSzkwflugGyB/59wliCpqCg053YV4x9mO
+QggvA/E50+0FI/Om/7v4GHGADu/JE83FovOueWAB0LgqfDSD6QFcNFF9sUJJ4P7r
+FcEXSWj8QbrHMWBKncZUOpD2ECotvtrYmi0DTHl1XfigESDQpWtsnTFuabCCsvkh
+ch9wQRplAes2Mf/aS5tl1y0QKKBFuEjtGiTdgrDl6o9GLnx6CueX5saZehu2EVkr
+fq2vEYUC2lRQSjuxSMMJ3L0TGUcl7+ixlAIISS2K9L5Xx7MhBXt/EH5KiKPfsEet
+3EH+DhxV5uXjDU7MgvREnxT+ssV23e0HWTz4tVVQ9LpvYmWPIgLcSOhHCc57yoQF
+c46V0f69dMWbMAlQ93EZSG274ZvpIszpK8+3hGI3/TuDFFgiQJeJJBFVtYJMle69
+3mEEclfzO7fBiXZFec6nVx2309bL64bafN7zszPKXl4XgoefOfD0v0eWqQT4fxfm
+dnGC0qMqSZs5F+d0fISV5JUUNYzt9PZjvnzqLLGOeTF6l3/n9G1mmNsXcxJ1OEIF
+6qh1oO7JTPjt0MFhKac4QjNQi/Bnp25O3I/PRyWZCbiwXkyvyQU=
+=ZT7s
+-----END PGP SIGNATURE-----
diff --git a/bind-9.16-redhat_doc.patch b/bind-9.16-redhat_doc.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ef76e16bff7687cf00510fbd485c39ac76babada
--- /dev/null
+++ b/bind-9.16-redhat_doc.patch
@@ -0,0 +1,60 @@
+From 3a161af91bffcd457586ab466e32ac8484028763 Mon Sep 17 00:00:00 2001
+From: Petr Mensik <pemensik@redhat.com>
+Date: Wed, 17 Jun 2020 23:17:13 +0200
+Subject: [PATCH] Update man named with Red Hat specifics
+
+This is almost unmodified text and requires revalidation. Some of those
+statements are no longer correct.
+---
+ bin/named/named.rst | 35 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 35 insertions(+)
+
+diff --git a/bin/named/named.rst b/bin/named/named.rst
+index 6fd8f87..3cd6350 100644
+--- a/bin/named/named.rst
++++ b/bin/named/named.rst
+@@ -228,6 +228,41 @@ Files
+ ``/var/run/named/named.pid``
+    The default process-id file.
+ 
++Notes
++~~~~~
++
++**Red Hat SELinux BIND Security Profile:**
++
++By default, Red Hat ships BIND with the most secure SELinux policy
++that will not prevent normal BIND operation and will prevent exploitation
++of all known BIND security vulnerabilities. See the selinux(8) man page
++for information about SElinux.
++
++It is not necessary to run named in a chroot environment if the Red Hat
++SELinux policy for named is enabled. When enabled, this policy is far
++more secure than a chroot environment. Users are recommended to enable
++SELinux and remove the bind-chroot package.
++
++*With this extra security comes some restrictions:*
++
++By default, the SELinux policy does not allow named to write outside directory
++/var/named. That directory used to be read-only for named, but write access is
++enabled by default now.
++
++The "named" group must be granted read privelege to
++these files in order for named to be enabled to read them.
++Any file updated by named must be writeable by named user or named group.
++
++Any file created in the zone database file directory is automatically assigned
++the SELinux file context *named_zone_t* .
++
++The Red Hat BIND distribution and SELinux policy creates three directories where
++named were allowed to create and modify files: */var/named/slaves*, */var/named/dynamic*
++*/var/named/data*. The service is able to write and file under */var/named* with appropriate
++permissions. They are used for better organisation of zones and backward compatibility.
++Files in these directories are automatically assigned the '*named_cache_t*'
++file context, which SELinux always allows named to write.
++
+ See Also
+ ~~~~~~~~
+ 
+-- 
+2.26.2
+
diff --git a/bind-9.11.21.tar.gz b/bind-9.16.23.tar.xz
similarity index 35%
rename from bind-9.11.21.tar.gz
rename to bind-9.16.23.tar.xz
index d562897a705414ec5df571a88b5f64652347f7bd..a31426bca30425bf9e2f058d2d1d0efe827e7001 100644
Binary files a/bind-9.11.21.tar.gz and b/bind-9.16.23.tar.xz differ
diff --git a/bind-9.16.23.tar.xz.asc b/bind-9.16.23.tar.xz.asc
new file mode 100644
index 0000000000000000000000000000000000000000..d48514df673bc1924dda9899b9257a7f075946a8
--- /dev/null
+++ b/bind-9.16.23.tar.xz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQIzBAABAgAdFiEEqtu6UHTxQC97adVrxbTukxqfnf0FAmGKhMcACgkQxbTukxqf
+nf1EbQ//YXsBbMtyI3c0MoleSi5zwzcpCTZTWTFHqH5WUiruLMDF453j/Fn2zaSC
+WuaUnhN61dR+BVtX+D2Y8GiVQFICo5X1nJj0jb/TcflXFq7YLWUAO0NPwPkBL1J4
+/PA0YCp1zYcvBXIxTKaU7AcBxlKmcGLdZcgCyGU6NSKaOJSxHOWXM460uD/crskB
+iSPEbMevN9TTJs9webztJNKH/3BuNkOD9SFb6JlUIQqwKx1v8rosgdI7BvgGMZqy
+s+10+GlIRFFvsX2XkX8BnjDlQ1QdzDOAoyCU+Se9rXDqu+zZf1VN4ReUCSDuPYf9
+z+GW1EbMxuZzEKrEIJvhnVNNiHqtKVaK6IIUX5bHqgPLEx87HxJMOPmbyBc1kDAe
+0WCmsITaq62WvKOG8Ho8wLrlG4AAO5+A7xit4bJ4XUtLiqyt+9FUIeEFY9nZb/6O
+OXK9eBMZHZ++r52RtA+GYZllkNRpzwnULOdR/9svVQuc10/MjnRoFqInzLlqwfwm
+2q6r372oWn8+MUvjQVBgzprn5BvY+HDo2gNEYEi5QyR3ql2dX/Qz7iUdUfhRvMNL
+FdPt3B3kktfOV98p/imrIwLwVVWwKBlphntkRxLtSZBs3nbo27F/ND54fixC2eCa
+epB6FF5IquzQ/MOiz4uql3YexNDQQ+7N2IGPJVMwO2ILAyZDNOQ=
+=pVtf
+-----END PGP SIGNATURE-----
diff --git a/bind-9.3.1rc1-sdb_tools-Makefile.in b/bind-9.3.1rc1-sdb_tools-Makefile.in
deleted file mode 100644
index c7e0868a03b41a2bda605b171ed0def6c9b94e91..0000000000000000000000000000000000000000
--- a/bind-9.3.1rc1-sdb_tools-Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
-srcdir     =	@srcdir@
-VPATH      =	@srcdir@
-top_srcdir =	@top_srcdir@
-
-VERSION=@BIND9_VERSION@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include \
-		${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
-		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES}
-
-CDEFINES =	-DBIND9
-
-DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
-ISCCCLIBS =	../../lib/isccc/libisccc.@A@
-ISCLIBS =	../../lib/isc/libisc.@A@
-LWRESLIBS =	../../lib/lwres/liblwres.@A@
-BIND9LIBS =	../../lib/bind9/libbind9.@A@
-
-DNSDEPLIBS =	../../lib/dns/libdns.@A@
-ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
-ISCCCDEPLIBS =	../../lib/isccc/libisccc.@A@
-ISCDEPLIBS =	../../lib/isc/libisc.@A@
-LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@
-BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
-
-DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
-		${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${ISCDEPLIBS}
-
-LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
-		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
-
-TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@
-
-OBJS	=	zone2ldap.@O@ zonetodb.@O@
-
-SRCS    =       zone2ldap.c zonetodb.c
-
-MANPAGES =      zone2ldap.1
-
-EXT_CFLAGS =
-
-@BIND9_MAKE_RULES@
-
-zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zone2ldap.@O@ -lldap -llber ${LIBS}
-
-zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
-
-clean distclean manclean maintainer-clean::
-	rm -f ${TARGETS} ${OBJS}
-
-installdirs:
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
-
-install:: ${TARGETS} installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@  ${DESTDIR}${sbindir}
-	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
diff --git a/bind-9.3.2-redhat_doc.patch b/bind-9.3.2-redhat_doc.patch
deleted file mode 100644
index d4531f4ff41225030cf1084993b6a326ff67695e..0000000000000000000000000000000000000000
--- a/bind-9.3.2-redhat_doc.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/bin/named/named.8 b/bin/named/named.8
-index ef10ef4..3150b22 100644
---- a/bin/named/named.8
-+++ b/bin/named/named.8
-@@ -349,6 +349,63 @@ The default configuration file\&.
- /var/run/named/named\&.pid
- .RS 4
- The default process\-id file\&.
-+.PP
-+.SH "NOTES"
-+.PP
-+.TP
-+\fBRed Hat SELinux BIND Security Profile:\fR
-+.PP
-+By default, Red Hat ships BIND with the most secure SELinux policy
-+that will not prevent normal BIND operation and will prevent exploitation
-+of all known BIND security vulnerabilities . See the selinux(8) man page
-+for information about SElinux.
-+.PP
-+It is not necessary to run named in a chroot environment if the Red Hat
-+SELinux policy for named is enabled. When enabled, this policy is far
-+more secure than a chroot environment. Users are recommended to enable
-+SELinux and remove the bind-chroot package.
-+.PP
-+With this extra security comes some restrictions:
-+.PP
-+By default, the SELinux policy does not allow named to write any master
-+zone database files. Only the root user may create files in the $ROOTDIR/var/named
-+zone database file directory (the options { "directory" } option), where
-+$ROOTDIR is set in /etc/sysconfig/named.
-+.PP
-+The "named" group must be granted read privelege to
-+these files in order for named to be enabled to read them.
-+.PP
-+Any file created in the zone database file directory is automatically assigned
-+the SELinux file context named_zone_t .
-+.PP
-+By default, SELinux prevents any role from modifying named_zone_t files; this
-+means that files in the zone database directory cannot be modified by dynamic
-+DNS (DDNS) updates or zone transfers.
-+.PP
-+The Red Hat BIND distribution and SELinux policy creates three directories where
-+named is allowed to create and modify files: /var/named/slaves, /var/named/dynamic
-+/var/named/data. By placing files you want named to modify, such as
-+slave or DDNS updateable zone files and database / statistics dump files in
-+these directories, named will work normally and no further operator action is
-+required. Files in these directories are automatically assigned the 'named_cache_t'
-+file context, which SELinux allows named to write.
-+.PP
-+\fBRed Hat BIND SDB support:\fR
-+.PP
-+Red Hat ships named with compiled in Simplified Database Backend modules that ISC
-+provides in the "contrib/sdb" directory. Install bind-sdb package if you want use them
-+.PP
-+The SDB modules for LDAP, PostGreSQL, DirDB and SQLite are compiled into named-sdb.
-+.PP
-+See the documentation for the various SDB modules in /usr/share/doc/bind-sdb-*/ .
-+.br
-+.PP
-+\fBRed Hat system-config-bind:\fR
-+.PP
-+Red Hat provides the system-config-bind GUI to configure named.conf and zone
-+database files. Run the "system-config-bind" command and access the manual
-+by selecting the Help menu.
-+.PP
- .RE
- .SH "SEE ALSO"
- .PP
diff --git a/bind-9.3.2b1-fix_sdb_ldap.patch b/bind-9.3.2b1-fix_sdb_ldap.patch
deleted file mode 100644
index e5a418ee2ed4d30a31c45242c52fdd5cffc71efa..0000000000000000000000000000000000000000
--- a/bind-9.3.2b1-fix_sdb_ldap.patch
+++ /dev/null
@@ -1,511 +0,0 @@
-diff --git a/bin/sdb_tools/Makefile.in b/bin/sdb_tools/Makefile.in
-index 95ab742..5059a17 100644
---- a/bin/sdb_tools/Makefile.in
-+++ b/bin/sdb_tools/Makefile.in
-@@ -32,11 +32,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
- LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
- 
--TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
-+TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@ ldap2zone@EXEEXT@
- 
--OBJS	=	zone2ldap.@O@ zonetodb.@O@ zone2sqlite.@O@
-+OBJS	=	zone2ldap.@O@ zonetodb.@O@ zone2sqlite.@O@ ldap2zone.@O@
- 
--SRCS    =       zone2ldap.c zonetodb.c zone2sqlite.c
-+SRCS    =       zone2ldap.c zonetodb.c zone2sqlite.c ldap2zone.c
- 
- MANPAGES =      zone2ldap.1
- 
-@@ -47,6 +47,9 @@ EXT_CFLAGS =
- zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zone2ldap.@O@ -lldap -llber ${LIBS}
- 
-+ldap2zone@EXEEXT@: ldap2zone.@O@ ${DEPLIBS}
-+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ldap2zone.@O@ -lldap -llber ${LIBS}
-+
- zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
- 
-@@ -64,4 +67,5 @@ install:: ${TARGETS} installdirs
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@  ${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone@EXEEXT@ ${DESTDIR}${sbindir}
- 	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
-diff --git a/bin/sdb_tools/zone2ldap.c b/bin/sdb_tools/zone2ldap.c
-index e0e9207..d59936c 100644
---- a/bin/sdb_tools/zone2ldap.c
-+++ b/bin/sdb_tools/zone2ldap.c
-@@ -73,7 +73,7 @@ void add_ldap_values (ldap_info * ldinfo);
- void init_ldap_conn (void);
- 
- /* Ldap error checking */
--void ldap_result_check (const char *msg, char *dn, int err);
-+void ldap_result_check (const char *msg, const char *dn, int err);
- 
- /* Put a hostname into a char ** array */
- char **hostname_to_dn_list (char *hostname, char *zone, unsigned int flags);
-@@ -82,7 +82,7 @@ char **hostname_to_dn_list (char *hostname, char *zone, unsigned int flags);
- int get_attr_list_size (char **tmp);
- 
- /* Get a DN */
--char *build_dn_from_dc_list (char **dc_list, unsigned int ttl, int flag);
-+char *build_dn_from_dc_list (char **dc_list, unsigned int ttl, int flag, char *zone);
- 
- /* Add to RR list */
- void add_to_rr_list (char *dn, char *name, char *type, char *data,
-@@ -104,11 +104,26 @@ void
- init_ldap_conn ();
- void usage();
- 
--char *argzone, *ldapbase, *binddn, *bindpw = NULL;
--const char *ldapsystem = "localhost";
--static const char *objectClasses[] =
--  { "top", "dNSZone", NULL };
--static const char *topObjectClasses[] = { "top", NULL };
-+static char *argzone, *ldapbase, *binddn, *bindpw = NULL;
-+
-+/* these are needed to placate gcc4's const-ness const-ernations : */
-+static char localhost[] = "localhost";
-+static char *ldapsystem=&(localhost[0]);
-+/* dnszone schema class names: */
-+static char topClass    [] ="top";
-+static char dNSZoneClass[] ="dNSZone";
-+static char objectClass [] ="objectClass";
-+static char dcObjectClass[]="dcObject";
-+/* dnszone schema attribute names: */
-+static char relativeDomainName[]="relativeDomainName";
-+static char dNSTTL            []="dNSTTL";
-+static char zoneName          []="zoneName";
-+static char dc                []="dc";
-+static char sameZone          []="@";
-+/* LDAPMod mod_values: */
-+static char *objectClasses    []= { &(topClass[0]), &(dNSZoneClass[0]), NULL };
-+static char *topObjectClasses []= { &(topClass[0]), &(dcObjectClass[0]), &(dNSZoneClass[0]), NULL };
-+static char *dn_buffer      [64]={NULL};
- LDAP *conn;
- unsigned int debug = 0;
- 
-@@ -120,7 +135,7 @@ static void
- fatal(const char *msg) {
-   perror(msg);
-   if (conn != NULL)
--    ldap_unbind_s(conn);
-+    ldap_unbind_ext_s(conn, NULL, NULL);
-   exit(1);
- }
- 
-@@ -132,12 +147,13 @@ main (int argc, char **argv)
-   isc_result_t result;
-   char *basedn;
-   ldap_info *tmp;
--  LDAPMod *base_attrs[2];
--  LDAPMod base;
-+  LDAPMod *base_attrs[5];
-+  LDAPMod base, dcBase, znBase, rdnBase;
-   isc_buffer_t buff;
-   char *zonefile=0L;
-   char fullbasedn[1024];
-   char *ctmp;
-+  char *zn, *dcp[2], *znp[2], *rdn[2];
-   dns_fixedname_t fixedzone, fixedname;
-   dns_rdataset_t rdataset;
-   char **dc_list;
-@@ -150,7 +166,7 @@ main (int argc, char **argv)
-   extern char *optarg;
-   extern int optind, opterr, optopt;
-   int create_base = 0;
--  int topt;
-+  int topt, dcn, zdn, znlen;
- 
-   if (argc < 2)
-     {
-@@ -158,7 +174,7 @@ main (int argc, char **argv)
-       exit (-1);
-     }
- 
--  while ((topt = getopt (argc, argv, "D:w:b:z:f:h:?dcv")) != -1)
-+  while ((topt = getopt (argc, argv, "D:Ww:b:z:f:h:?dcv")) != -1)
-     {
-       switch (topt)
- 	{
-@@ -181,6 +197,9 @@ main (int argc, char **argv)
- 	  if (bindpw == NULL)
- 	    fatal("strdup");
- 	  break;
-+	case 'W':
-+	  bindpw = getpass("Enter LDAP Password: ");
-+	  break;
- 	case 'b':
- 	  ldapbase = strdup (optarg);
- 	  if (ldapbase == NULL)
-@@ -302,17 +321,51 @@ main (int argc, char **argv)
- 	printf ("Creating base zone DN %s\n", argzone);
- 
-       dc_list = hostname_to_dn_list (argzone, argzone, DNS_TOP);
--      basedn = build_dn_from_dc_list (dc_list, 0, NO_SPEC);
-+      basedn = build_dn_from_dc_list (dc_list, 0, NO_SPEC, argzone);
-+      if (debug)
-+	printf ("base DN %s\n", basedn);
- 
--      for (ctmp = &basedn[strlen (basedn)]; ctmp >= &basedn[0]; ctmp--)
-+      for (ctmp = &basedn[strlen (basedn)], dcn=0; ctmp >= &basedn[0]; ctmp--)
- 	{
- 	  if ((*ctmp == ',') || (ctmp == &basedn[0]))
- 	    {
- 	      base.mod_op = LDAP_MOD_ADD;
--	      base.mod_type = (char*)"objectClass";
-+	      base.mod_type = objectClass;
- 	      base.mod_values = (char**)topObjectClasses;
- 	      base_attrs[0] = (void*)&base;
--	      base_attrs[1] = NULL;
-+
-+	      dcBase.mod_op = LDAP_MOD_ADD;
-+	      dcBase.mod_type = dc;
-+	      dcp[0]=dc_list[dcn];
-+	      dcp[1]=0L;
-+	      dcBase.mod_values=dcp;
-+	      base_attrs[1] = (void*)&dcBase;
-+
-+	      znBase.mod_op = LDAP_MOD_ADD;
-+	      znBase.mod_type = zoneName;
-+	      for( zdn = dcn, znlen = 0; zdn >= 0; zdn-- )
-+		  znlen += strlen(dc_list[zdn])+1;
-+	      znp[0] = (char*)malloc(znlen+1);
-+	      znp[1] = 0L;
-+	      for( zdn = dcn, zn=znp[0]; zdn >= 0; zdn-- )
-+		  zn+=sprintf(zn,"%s%s",dc_list[zdn],
-+			      ((zdn > 0) && (*(dc_list[zdn-1])!='.')) ? "." : ""
-+		             );
-+
-+	      znBase.mod_values = znp;
-+	      base_attrs[2] = (void*)&znBase;
-+
-+	      rdnBase.mod_op = LDAP_MOD_ADD;
-+	      rdnBase.mod_type = relativeDomainName;
-+	      rdn[0] = strdup(sameZone);
-+	      rdn[1] = 0L;
-+	      rdnBase.mod_values = rdn;
-+	      base_attrs[3] = (void*)&rdnBase;
-+
-+	      dcn++;
-+
-+	      base.mod_values = topObjectClasses;
-+	      base_attrs[4] = NULL;
- 
- 	      if (ldapbase)
- 		{
-@@ -329,6 +382,10 @@ main (int argc, char **argv)
- 		  else
- 		    sprintf (fullbasedn, "%s", ctmp);
- 		}
-+
-+	      if( debug )
-+		  printf("Full base dn: %s\n", fullbasedn);
-+
- 	      result = ldap_add_s (conn, fullbasedn, base_attrs);
- 	      ldap_result_check ("initial ldap_add_s", fullbasedn, result);
- 	    }
-@@ -408,14 +465,14 @@ generate_ldap (dns_name_t * dnsname, dns_rdata_t * rdata, unsigned int ttl)
-   isc_result_check (result, "dns_rdata_totext");
-   data[isc_buffer_usedlength (&buff)] = 0;
- 
--  dc_list = hostname_to_dn_list (name, argzone, DNS_OBJECT);
-+  dc_list = hostname_to_dn_list ((char*)name, argzone, DNS_OBJECT);
-   len = (get_attr_list_size (dc_list) - 2);
--  dn = build_dn_from_dc_list (dc_list, ttl, WI_SPEC);
-+  dn = build_dn_from_dc_list (dc_list, ttl, WI_SPEC, argzone);
- 
-   if (debug)
-     printf ("Adding %s (%s %s) to run queue list.\n", dn, type, data);
- 
--  add_to_rr_list (dn, dc_list[len], type, data, ttl, DNS_OBJECT);
-+  add_to_rr_list (dn, dc_list[len], (char*)type, (char*)data, ttl, DNS_OBJECT);
- }
- 
- 
-@@ -455,7 +512,8 @@ add_to_rr_list (char *dn, char *name, char *type,
-   int attrlist;
-   char ldap_type_buffer[128];
-   char charttl[64];
--
-+  char *zn;
-+  int znlen;
- 
-   if ((tmp = locate_by_dn (dn)) == NULL)
-     {
-@@ -482,10 +540,10 @@ add_to_rr_list (char *dn, char *name, char *type,
- 	    fatal("malloc");
- 	}
-       tmp->attrs[0]->mod_op = LDAP_MOD_ADD;
--      tmp->attrs[0]->mod_type = (char*)"objectClass";
-+      tmp->attrs[0]->mod_type = objectClass;
- 
-       if (flags == DNS_OBJECT)
--	tmp->attrs[0]->mod_values = (char**)objectClasses;
-+	tmp->attrs[0]->mod_values = objectClasses;
-       else
- 	{
- 	  tmp->attrs[0]->mod_values = (char**)topObjectClasses;
-@@ -497,7 +555,7 @@ add_to_rr_list (char *dn, char *name, char *type,
- 	}
- 
-       tmp->attrs[1]->mod_op = LDAP_MOD_ADD;
--      tmp->attrs[1]->mod_type = (char*)"relativeDomainName";
-+      tmp->attrs[1]->mod_type = relativeDomainName;
-       tmp->attrs[1]->mod_values = (char **) calloc (sizeof (char *), 2);
- 
-       if (tmp->attrs[1]->mod_values == (char **)NULL)
-@@ -526,7 +584,7 @@ add_to_rr_list (char *dn, char *name, char *type,
- 	 fatal("strdup");
- 
-       tmp->attrs[3]->mod_op = LDAP_MOD_ADD;
--      tmp->attrs[3]->mod_type = (char*)"dNSTTL";
-+      tmp->attrs[3]->mod_type = dNSTTL;
-       tmp->attrs[3]->mod_values = (char **) calloc (sizeof (char *), 2);
- 
-       if (tmp->attrs[3]->mod_values == (char **)NULL)
-@@ -539,14 +597,25 @@ add_to_rr_list (char *dn, char *name, char *type,
-       if (tmp->attrs[3]->mod_values[0] == NULL)
- 	 fatal("strdup");
- 
-+      znlen=strlen(gbl_zone);
-+      if ( gbl_zone[znlen-1] == '.' )
-+      { /* ldapdb MUST search by relative zone name */
-+	  zn = (char*)malloc(znlen);
-+	  memcpy(zn, gbl_zone, znlen-1);
-+	  zn[znlen-1]='\0';
-+      }else
-+      {
-+	  zn = gbl_zone;
-+      }
-+
-       tmp->attrs[4]->mod_op = LDAP_MOD_ADD;
--      tmp->attrs[4]->mod_type = (char*)"zoneName";
-+      tmp->attrs[4]->mod_type = zoneName;
-       tmp->attrs[4]->mod_values = (char **)calloc(sizeof(char *), 2);
- 
-       if (tmp->attrs[4]->mod_values == (char **)NULL)
- 	 fatal("calloc");
- 
--      tmp->attrs[4]->mod_values[0] = gbl_zone;
-+      tmp->attrs[4]->mod_values[0] = zn;
-       tmp->attrs[4]->mod_values[1] = NULL;
- 
-       tmp->attrs[5] = NULL;
-@@ -557,7 +626,7 @@ add_to_rr_list (char *dn, char *name, char *type,
-   else
-     {
- 
--      for (i = 0; tmp->attrs[i] != NULL; i++)
-+	for (i = 0; tmp->attrs[i] != NULL; i++)
- 	{
- 	  sprintf (ldap_type_buffer, "%sRecord", type);
- 	  if (!strncmp
-@@ -631,44 +700,70 @@ char **
- hostname_to_dn_list (char *hostname, char *zone, unsigned int flags)
- {
-   char *tmp;
--  static char *dn_buffer[64];
-   int i = 0;
--  char *zname;
--  char *hnamebuff;
--
--  zname = strdup (hostname);
--  if (zname == NULL)
--	fatal("strdup");
--
--  if (flags == DNS_OBJECT)
--    {
--
--      if (strlen (zname) != strlen (zone))
--	{
--	  tmp = &zname[strlen (zname) - strlen (zone)];
--	  *--tmp = '\0';
--	  hnamebuff = strdup (zname);
--	  if (hnamebuff == NULL)
--		fatal("strdup");
--	  zname = ++tmp;
--	}
--      else
--	hnamebuff = (char*)"@";
--    }
--  else
--    {
--      zname = zone;
--      hnamebuff = NULL;
--    }
--
--  for (tmp = strrchr (zname, '.'); tmp != (char *) 0;
--       tmp = strrchr (zname, '.'))
--    {
--      *tmp++ = '\0';
--      dn_buffer[i++] = tmp;
--    }
--  dn_buffer[i++] = zname;
--  dn_buffer[i++] = hnamebuff;
-+  char *hname=0L, *last=0L;
-+  int hlen=strlen(hostname), zlen=(strlen(zone));
-+
-+/*  printf("hostname: %s zone: %s\n",hostname, zone); */
-+  hname=0L;
-+  if(flags == DNS_OBJECT)
-+  {
-+      if( (zone[ zlen - 1 ] == '.') && (hostname[hlen - 1] != '.') )
-+      {
-+	  hname=(char*)malloc(hlen + 1);
-+	  hlen += 1;
-+	  sprintf(hname, "%s.", hostname);
-+	  hostname = hname;
-+      }
-+      if(strcmp(hostname, zone) == 0)
-+      {
-+	  if( hname == 0 )
-+	      hname=strdup(hostname);
-+	  last = strdup(sameZone);
-+      }else
-+      {
-+	  if(  (hlen < zlen)
-+	     ||( strcmp( hostname + (hlen - zlen), zone ) != 0)
-+	    )
-+	  {
-+	      if( hname != 0 )
-+		  free(hname);
-+	      hname=(char*)malloc( hlen + zlen + 1);
-+	      if( *zone == '.' )
-+		  sprintf(hname, "%s%s", hostname, zone);
-+	      else
-+		  sprintf(hname,"%s",zone);
-+	  }else
-+	  {
-+	      if( hname == 0 )
-+		  hname = strdup(hostname);
-+	  }
-+	  last = hname;
-+      }
-+  }else
-+  { /* flags == DNS_TOP */
-+      hname = strdup(zone);
-+      last = hname;
-+  }
-+
-+  for (tmp = strrchr (hname, '.'); tmp != (char *) 0;
-+       tmp = strrchr (hname, '.'))
-+  {
-+      if( *( tmp + 1 ) != '\0' )
-+      {
-+	  *tmp = '\0';
-+	  dn_buffer[i++] = ++tmp;
-+      }else
-+      { /* trailing '.' ! */
-+	  dn_buffer[i++] = strdup(".");
-+	  *tmp = '\0';
-+	  if( tmp == hname )
-+	      break;
-+      }
-+  }
-+  if( ( last != hname ) && (tmp != hname) )
-+      dn_buffer[i++] = hname;
-+  dn_buffer[i++] = last;
-   dn_buffer[i] = NULL;
- 
-   return dn_buffer;
-@@ -680,30 +775,38 @@ hostname_to_dn_list (char *hostname, char *zone, unsigned int flags)
-  * exception of "@"/SOA. */
- 
- char *
--build_dn_from_dc_list (char **dc_list, unsigned int ttl, int flag)
-+build_dn_from_dc_list (char **dc_list, unsigned int ttl, int flag, char *zone)
- {
-   int size;
--  int x;
--  static char dn[1024];
--  char tmp[128];
-+  int x, znlen;
-+  static char dn[DNS_NAME_MAXTEXT*3/2];
-+  char tmp[DNS_NAME_MAXTEXT*3/2];
-+  char zn[DNS_NAME_MAXTEXT+1];
- 
-   bzero (tmp, sizeof (tmp));
-   bzero (dn, sizeof (dn));
-   size = get_attr_list_size (dc_list);
-+  znlen = strlen(zone);
-+  if ( zone[znlen-1] == '.' )
-+  { /* ldapdb MUST search by relative zone name */
-+      memcpy(&(zn[0]),zone,znlen-1);
-+      zn[znlen-1]='\0';
-+      zone = zn;
-+  }
-   for (x = size - 2; x > 0; x--)
-     {
-     if (flag == WI_SPEC)
-     {
-       if (x == (size - 2) && (strncmp (dc_list[x], "@", 1) == 0) && (ttl))
--	sprintf (tmp, "relativeDomainName=%s + dNSTTL=%u,", dc_list[x], ttl);
-+	snprintf (tmp, sizeof(tmp), "zoneName=%s + relativeDomainName=%s,", zone, dc_list[x]);
-       else if (x == (size - 2))
--	      sprintf(tmp, "relativeDomainName=%s,",dc_list[x]);
-+	      snprintf(tmp, sizeof(tmp), "zoneName=%s + relativeDomainName=%s,", zone, dc_list[x]);
-       else
--	      sprintf(tmp,"dc=%s,", dc_list[x]);
-+	      snprintf(tmp, sizeof(tmp), "dc=%s,", dc_list[x]);
-     }
-     else
-     {
--	    sprintf(tmp, "dc=%s,", dc_list[x]);
-+	    snprintf(tmp, sizeof(tmp), "dc=%s,", dc_list[x]);
-     }
- 
- 
-@@ -732,19 +835,18 @@ init_ldap_conn ()
-     }
- 
-   result = ldap_simple_bind_s (conn, binddn, bindpw);
--  ldap_result_check ("ldap_simple_bind_s", (char*)"LDAP Bind", result);
-+  ldap_result_check ("ldap_simple_bind_s", "LDAP Bind", result);
- }
- 
- /* Like isc_result_check, only for LDAP */
- void
--ldap_result_check (const char *msg, char *dn, int err)
-+ldap_result_check (const char *msg, const char *dn, int err)
- {
-   if ((err != LDAP_SUCCESS) && (err != LDAP_ALREADY_EXISTS))
-     {
--      fprintf(stderr, "Error while adding %s (%s):\n",
--		      dn, msg);
--      ldap_perror (conn, dn);
--      ldap_unbind_s (conn);
-+      fprintf(stderr, "Error while adding %s (%s):\n%s",
-+		      dn, msg, ldap_err2string(err));
-+      ldap_unbind_ext_s (conn, NULL, NULL);
-       exit (-1);
-     }
- }
-@@ -758,16 +860,15 @@ add_ldap_values (ldap_info * ldinfo)
-   int result;
-   char dnbuffer[1024];
- 
--
-   if (ldapbase != NULL)
-     sprintf (dnbuffer, "%s,%s", ldinfo->dn, ldapbase);
-   else
-     sprintf (dnbuffer, "%s", ldinfo->dn);
- 
-   result = ldap_add_s (conn, dnbuffer, ldinfo->attrs);
--  ldap_result_check ("ldap_add_s", dnbuffer, result);
--}
-+    ldap_result_check ("ldap_add_s", dnbuffer, result);
- 
-+}
- 
- 
- 
-@@ -776,5 +877,5 @@ void
- usage ()
- {
-   fprintf (stderr,
--	   "zone2ldap -D [BIND DN] -w [BIND PASSWORD] -b [BASE DN] -z [ZONE] -f [ZONE FILE] -h [LDAP HOST] "
-+	   "zone2ldap -D [BIND DN] [-w BIND PASSWORD | -W:prompt] -b [BASE DN] -z [ZONE] -f [ZONE FILE] -h [LDAP HOST] "
- 	   "[-c Create LDAP Base structure][-d Debug Output (lots !)] \n ");}
diff --git a/bind-9.3.2b2-sdbsrc.patch b/bind-9.3.2b2-sdbsrc.patch
deleted file mode 100644
index 46e183c149f83ee2bc388f9087941f3d337f2fb4..0000000000000000000000000000000000000000
--- a/bind-9.3.2b2-sdbsrc.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-diff --git a/contrib/sdb/bdb/bdb.c b/contrib/sdb/bdb/bdb.c
-index 23594bb..b3c6619 100644
---- a/contrib/sdb/bdb/bdb.c
-+++ b/contrib/sdb/bdb/bdb.c
-@@ -43,7 +43,7 @@
- #include <dns/lib.h>
- #include <dns/ttl.h>
- 
--#include <named/bdb.h>
-+#include "bdb.h"
- #include <named/globals.h>
- #include <named/config.h>
- 
-diff --git a/contrib/sdb/ldap/zone2ldap.c b/contrib/sdb/ldap/zone2ldap.c
-index 07c89bc..23dd873 100644
---- a/contrib/sdb/ldap/zone2ldap.c
-+++ b/contrib/sdb/ldap/zone2ldap.c
-@@ -63,16 +63,16 @@ typedef struct LDAP_INFO
- ldap_info;
- 
- /* usage Info */
--void usage ();
-+void usage (void);
- 
- /* Add to the ldap dit */
- void add_ldap_values (ldap_info * ldinfo);
- 
- /* Init an ldap connection */
--void init_ldap_conn ();
-+void init_ldap_conn (void);
- 
- /* Ldap error checking */
--void ldap_result_check (char *msg, char *dn, int err);
-+void ldap_result_check (const char *msg, char *dn, int err);
- 
- /* Put a hostname into a char ** array */
- char **hostname_to_dn_list (char *hostname, char *zone, unsigned int flags);
-@@ -88,7 +88,7 @@ void add_to_rr_list (char *dn, char *name, char *type, char *data,
- 		     unsigned int ttl, unsigned int flags);
- 
- /* Error checking */
--void isc_result_check (isc_result_t res, char *errorstr);
-+void isc_result_check (isc_result_t res, const char *errorstr);
- 
- /* Generate LDIF Format files */
- void generate_ldap (dns_name_t * dnsname, dns_rdata_t * rdata,
-@@ -97,11 +97,17 @@ void generate_ldap (dns_name_t * dnsname, dns_rdata_t * rdata,
- /* head pointer to the list */
- ldap_info *ldap_info_base = NULL;
- 
-+ldap_info *
-+locate_by_dn (char *dn);
-+void
-+init_ldap_conn ();
-+void usage();
-+
- char *argzone, *ldapbase, *binddn, *bindpw = NULL;
--char *ldapsystem = "localhost";
--static char *objectClasses[] =
-+const char *ldapsystem = "localhost";
-+static const char *objectClasses[] =
-   { "top", "dNSZone", NULL };
--static char *topObjectClasses[] = { "top", NULL };
-+static const char *topObjectClasses[] = { "top", NULL };
- LDAP *conn;
- unsigned int debug = 0;
- 
-@@ -128,7 +134,7 @@ main (int argc, char **argv)
-   LDAPMod *base_attrs[2];
-   LDAPMod base;
-   isc_buffer_t buff;
--  char *zonefile;
-+  char *zonefile=0L;
-   char fullbasedn[1024];
-   char *ctmp;
-   dns_fixedname_t fixedzone, fixedname;
-@@ -304,9 +310,9 @@ main (int argc, char **argv)
- 	  if ((*ctmp == ',') || (ctmp == &basedn[0]))
- 	    {
- 	      base.mod_op = LDAP_MOD_ADD;
--	      base.mod_type = "objectClass";
--	      base.mod_values = topObjectClasses;
--	      base_attrs[0] = &base;
-+	      base.mod_type = (char*)"objectClass";
-+	      base.mod_values = (char**)topObjectClasses;
-+	      base_attrs[0] = (void*)&base;
- 	      base_attrs[1] = NULL;
- 
- 	      if (ldapbase)
-@@ -363,7 +369,7 @@ main (int argc, char **argv)
-  * I should probably rename this function, as not to cause any
-  * confusion with the isc* routines. Will exit on error. */
- void
--isc_result_check (isc_result_t res, char *errorstr)
-+isc_result_check (isc_result_t res, const char *errorstr)
- {
-   if (res != ISC_R_SUCCESS)
-     {
-@@ -470,20 +476,20 @@ add_to_rr_list (char *dn, char *name, char *type,
-       if (tmp->attrs == (LDAPMod **) NULL)
- 	fatal("calloc");
- 
--      for (i = 0; i < flags; i++)
-+      for (i = 0; i < (int)flags; i++)
- 	{
- 	  tmp->attrs[i] = (LDAPMod *) malloc (sizeof (LDAPMod));
- 	  if (tmp->attrs[i] == (LDAPMod *) NULL)
- 	    fatal("malloc");
- 	}
-       tmp->attrs[0]->mod_op = LDAP_MOD_ADD;
--      tmp->attrs[0]->mod_type = "objectClass";
-+      tmp->attrs[0]->mod_type = (char*)"objectClass";
- 
-       if (flags == DNS_OBJECT)
--	tmp->attrs[0]->mod_values = objectClasses;
-+	tmp->attrs[0]->mod_values = (char**)objectClasses;
-       else
- 	{
--	  tmp->attrs[0]->mod_values = topObjectClasses;
-+	  tmp->attrs[0]->mod_values = (char**)topObjectClasses;
- 	  tmp->attrs[1] = NULL;
- 	  tmp->attrcnt = 2;
- 	  tmp->next = ldap_info_base;
-@@ -492,7 +498,7 @@ add_to_rr_list (char *dn, char *name, char *type,
- 	}
- 
-       tmp->attrs[1]->mod_op = LDAP_MOD_ADD;
--      tmp->attrs[1]->mod_type = "relativeDomainName";
-+      tmp->attrs[1]->mod_type = (char*)"relativeDomainName";
-       tmp->attrs[1]->mod_values = (char **) calloc (sizeof (char *), 2);
- 
-       if (tmp->attrs[1]->mod_values == (char **)NULL)
-@@ -521,7 +527,7 @@ add_to_rr_list (char *dn, char *name, char *type,
- 	 fatal("strdup");
- 
-       tmp->attrs[3]->mod_op = LDAP_MOD_ADD;
--      tmp->attrs[3]->mod_type = "dNSTTL";
-+      tmp->attrs[3]->mod_type = (char*)"dNSTTL";
-       tmp->attrs[3]->mod_values = (char **) calloc (sizeof (char *), 2);
- 
-       if (tmp->attrs[3]->mod_values == (char **)NULL)
-@@ -535,7 +541,7 @@ add_to_rr_list (char *dn, char *name, char *type,
- 	 fatal("strdup");
- 
-       tmp->attrs[4]->mod_op = LDAP_MOD_ADD;
--      tmp->attrs[4]->mod_type = "zoneName";
-+      tmp->attrs[4]->mod_type = (char*)"zoneName";
-       tmp->attrs[4]->mod_values = (char **)calloc(sizeof(char *), 2);
- 
-       if (tmp->attrs[4]->mod_values == (char **)NULL)
-@@ -648,7 +654,7 @@ hostname_to_dn_list (char *hostname, char *zone, unsigned int flags)
- 	  zname = ++tmp;
- 	}
-       else
--	hnamebuff = "@";
-+	hnamebuff = (char*)"@";
-     }
-   else
-     {
-@@ -727,12 +733,12 @@ init_ldap_conn ()
-     }
- 
-   result = ldap_simple_bind_s (conn, binddn, bindpw);
--  ldap_result_check ("ldap_simple_bind_s", "LDAP Bind", result);
-+  ldap_result_check ("ldap_simple_bind_s", (char*)"LDAP Bind", result);
- }
- 
- /* Like isc_result_check, only for LDAP */
- void
--ldap_result_check (char *msg, char *dn, int err)
-+ldap_result_check (const char *msg, char *dn, int err)
- {
-   if ((err != LDAP_SUCCESS) && (err != LDAP_ALREADY_EXISTS))
-     {
-diff --git a/contrib/sdb/pgsql/pgsqldb.c b/contrib/sdb/pgsql/pgsqldb.c
-index 50d3cba..516eb9f 100644
---- a/contrib/sdb/pgsql/pgsqldb.c
-+++ b/contrib/sdb/pgsql/pgsqldb.c
-@@ -23,7 +23,7 @@
- #include <string.h>
- #include <stdlib.h>
- 
--#include <pgsql/libpq-fe.h>
-+#include <libpq-fe.h>
- 
- #include <isc/mem.h>
- #include <isc/print.h>
-diff --git a/contrib/sdb/pgsql/zonetodb.c b/contrib/sdb/pgsql/zonetodb.c
-index b8f5912..ff2d135 100644
---- a/contrib/sdb/pgsql/zonetodb.c
-+++ b/contrib/sdb/pgsql/zonetodb.c
-@@ -37,7 +37,7 @@
- #include <dns/rdatatype.h>
- #include <dns/result.h>
- 
--#include <pgsql/libpq-fe.h>
-+#include <libpq-fe.h>
- 
- /*
-  * Generate a PostgreSQL table from a zone.
-@@ -54,6 +54,9 @@ char *dbname, *dbtable;
- char str[10240];
- 
- void
-+closeandexit(int status);
-+
-+void
- closeandexit(int status) {
- 	if (conn != NULL)
- 		PQfinish(conn);
-@@ -61,6 +64,9 @@ closeandexit(int status) {
- }
- 
- void
-+check_result(isc_result_t result, const char *message);
-+
-+void
- check_result(isc_result_t result, const char *message) {
- 	if (result != ISC_R_SUCCESS) {
- 		fprintf(stderr, "%s: %s\n", message,
-@@ -84,7 +90,8 @@ quotestring(const unsigned char *source, unsigned char *dest) {
- 	}
- 	*dest++ = 0;
- }
--
-+void
-+addrdata(dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata);
- void
- addrdata(dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) {
- 	unsigned char namearray[DNS_NAME_MAXTEXT + 1];
diff --git a/bind-9.5-PIE.patch b/bind-9.5-PIE.patch
index a525b9b02d306688a85528e4436ded4f36455f19..d3c73ee9e4743fc6e55071842d078def786eed2f 100644
--- a/bind-9.5-PIE.patch
+++ b/bind-9.5-PIE.patch
@@ -1,8 +1,10 @@
---- bind-9.5.0b2/bin/named/Makefile.in.pie	2008-02-11 17:21:47.000000000 +0100
-+++ bind-9.5.0b2/bin/named/Makefile.in	2008-02-11 17:22:10.000000000 +0100
-@@ -100,8 +100,12 @@ HTMLPAGES =	named.html lwresd.html named
- 
- MANOBJS =	${MANPAGES} ${HTMLPAGES}
+diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
+index eb622d1..37053a7 100644
+--- a/bin/named/Makefile.in
++++ b/bin/named/Makefile.in
+@@ -117,8 +117,12 @@ SRCS =		builtin.c config.c control.c \
+ 		tkeyconf.c tsigconf.c zoneconf.c \
+ 		${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
  
 +EXT_CFLAGS = -fpie
 +
@@ -13,10 +15,11 @@
  main.@O@: main.c
  	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
  		-DVERSION=\"${VERSION}\" \
-diff -up bind-9.5.0b2/bin/named/unix/Makefile.in.pie bind-9.5.0b2/bin/named/unix/Makefile.in
---- bind-9.5.0b2/bin/named/unix/Makefile.in.pie	2008-02-11 17:22:21.000000000 +0100
-+++ bind-9.5.0b2/bin/named/unix/Makefile.in	2008-02-11 17:23:00.000000000 +0100
-@@ -19,6 +19,8 @@ srcdir =	@srcdir@
+diff --git a/bin/named/unix/Makefile.in b/bin/named/unix/Makefile.in
+index fd9ca8d..f1c102c 100644
+--- a/bin/named/unix/Makefile.in
++++ b/bin/named/unix/Makefile.in
+@@ -11,6 +11,8 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
  
diff --git a/bind-9.9.1-P2-multlib-conflict.patch b/bind-9.9.1-P2-multlib-conflict.patch
deleted file mode 100644
index 8768b86b7eb5066dc133219350223389ba876e89..0000000000000000000000000000000000000000
--- a/bind-9.9.1-P2-multlib-conflict.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/config.h.in b/config.h.in
-index 4ecaa8f..2f65ccc 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -600,7 +600,7 @@ int sigwait(const unsigned int *set, int *sig);
- #undef PREFER_GOSTASN1
- 
- /* The size of `void *', as computed by sizeof. */
--#undef SIZEOF_VOID_P
-+/* #undef SIZEOF_VOID_P */
- 
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
-diff --git a/isc-config.sh.in b/isc-config.sh.in
-index a8a0a89..b5e94ed 100644
---- a/isc-config.sh.in
-+++ b/isc-config.sh.in
-@@ -13,7 +13,18 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- exec_prefix_set=
- includedir=@includedir@
--libdir=@libdir@
-+arch=$(uname -m)
-+
-+case $arch in
-+	x86_64 | amd64 | sparc64 | s390x | ppc64)
-+		libdir=/usr/lib64
-+		sec_libdir=/usr/lib
-+		;;
-+	* )
-+		libdir=/usr/lib
-+		sec_libdir=/usr/lib64
-+		;;
-+esac
- 
- usage()
- {
-@@ -132,6 +143,16 @@ if test x"$echo_libs" = x"true"; then
- 	if test x"${exec_prefix_set}" = x"true"; then
- 		libs="-L${exec_prefix}/lib"
- 	else
-+		if [ ! -x $libdir/libisc.so ] ; then
-+			if [ ! -x $sec_libdir/libisc.so ] ; then
-+				echo "Error: ISC libs not found in $libdir"
-+				if [ -d $sec_libdir ] ; then
-+					echo "Error: ISC libs not found in $sec_libdir"
-+				fi
-+				exit 1
-+			fi
-+			libdir=$sec_libdir
-+		fi
- 		libs="-L${libdir}"
- 	fi
- 	if test x"$libirs" = x"true" ; then
diff --git a/bind-95-rh452060.patch b/bind-95-rh452060.patch
deleted file mode 100644
index c57ccabe9ee3de7ec6e32fe83a8c1a3733cbc68a..0000000000000000000000000000000000000000
--- a/bind-95-rh452060.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
-index aa5315d..1fa711a 100644
---- a/bin/dig/dighost.c
-+++ b/bin/dig/dighost.c
-@@ -1814,6 +1814,13 @@ clear_query(dig_query_t *query) {
- 
- 	if (query->timer != NULL)
- 		isc_timer_detach(&query->timer);
-+
-+	if (query->waiting_senddone) {
-+		debug("send_done not yet called");
-+		query->pending_free = true;
-+		return;
-+	}
-+
- 	lookup = query->lookup;
- 
- 	if (lookup->current_query == query)
-@@ -1839,10 +1846,7 @@ clear_query(dig_query_t *query) {
- 	isc_mempool_put(commctx, query->recvspace);
- 	isc_buffer_invalidate(&query->recvbuf);
- 	isc_buffer_invalidate(&query->lengthbuf);
--	if (query->waiting_senddone)
--		query->pending_free = true;
--	else
--		isc_mem_free(mctx, query);
-+	isc_mem_free(mctx, query);
- }
- 
- /*%
-@@ -2892,9 +2896,9 @@ send_done(isc_task_t *_task, isc_event_t *event) {
- 	isc_event_free(&event);
- 
- 	if (query->pending_free)
--		isc_mem_free(mctx, query);
-+		clear_query(query);
- 
--	check_if_done();
-+	check_next_lookup(l);
- 	UNLOCK_LOOKUP;
- }
- 
diff --git a/bind-96-old-api.patch b/bind-96-old-api.patch
deleted file mode 100644
index d181d3ef64187bbeb1d0b00571779fbcc0febb69..0000000000000000000000000000000000000000
--- a/bind-96-old-api.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up bind-9.6.0b1/contrib/sdb/ldap/ldapdb.c.old-api bind-9.6.0b1/contrib/sdb/ldap/ldapdb.c
---- bind-9.6.0b1/contrib/sdb/ldap/ldapdb.c.old-api	2008-11-24 13:28:13.000000000 +0100
-+++ bind-9.6.0b1/contrib/sdb/ldap/ldapdb.c	2008-11-24 13:28:23.000000000 +0100
-@@ -25,6 +25,7 @@
- /* Using LDAPv3 by default, change this if you want v2 */
- #ifndef LDAPDB_LDAP_VERSION
- #define LDAPDB_LDAP_VERSION 3
-+#define LDAP_DEPRECATED 1
- #endif
- 
- #include <config.h>
-diff -up bind-9.6.0b1/contrib/sdb/ldap/zone2ldap.c.old-api bind-9.6.0b1/contrib/sdb/ldap/zone2ldap.c
---- bind-9.6.0b1/contrib/sdb/ldap/zone2ldap.c.old-api	2008-11-24 13:29:05.000000000 +0100
-+++ bind-9.6.0b1/contrib/sdb/ldap/zone2ldap.c	2008-11-24 13:29:14.000000000 +0100
-@@ -13,6 +13,8 @@
-  * ditched dNSDomain2 schema support. Version 0.3-ALPHA
-  */
- 
-+#define LDAP_DEPRECATED 1
-+
- #include <errno.h>
- #include <string.h>
- #include <stdlib.h>
diff --git a/bind.spec b/bind.spec
index 7c3f2ed8fb6c4ce33c82e21a5e44135b5f5ca089..0c3e886623c1ce5187ddcce119c60b23febced73 100644
--- a/bind.spec
+++ b/bind.spec
@@ -1,244 +1,385 @@
-%bcond_without  LMDB
-%bcond_without  JSON
-%bcond_with     DNSTAP
-%bcond_with     DLZ
-%bcond_with     SYSTEMTEST
-%bcond_without  UNITTEST
-%bcond_with     SDB
-%bcond_without  GSSTSIG
-%bcond_without  PKCS11
-%bcond_without  EXPORT_LIBS
-%bcond_with     TSAN
-
-%{?!bind_uid:   %global bind_uid  25}
-%{?!bind_gid:   %global bind_gid  25}
+%bcond_with    SYSTEMTEST
+%bcond_without GSSTSIG
+%bcond_without PKCS11
+%bcond_without JSON
+%bcond_with    DLZ
+%bcond_with    GEOIP2
+%bcond_without UNITTEST
+%bcond_with    DNSTAP
+%bcond_without LMDB
+%bcond_with    DOC
+%bcond_with    TSAN
+
+%{?!bind_uid:  %global bind_uid  25}
+%{?!bind_gid:  %global bind_gid  25}
+%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
+%global        bind_dir          /var/named
+%global        _unitdir          /usr/lib/systemd/system
+%global        _tmpfilesdir      /usr/lib/tmpfiles.d
+%global        chroot_prefix     %{bind_dir}/chroot
+%global        chroot_create_directories /dev /run/named %{_localstatedir}/{log,named,tmp} \\\
+                                         %{_sysconfdir}/{crypto-policies/back-ends,pki/dnssec-keys,named} \\\
+                                         %{_libdir}/bind %{_libdir}/named %{_datadir}/GeoIP /proc/sys/net/ipv4
+
+%global        selinuxbooleans   named_write_master_zones=1
+%define bind_export_libs isc dns isccfg irs
 %{!?_export_dir:%global _export_dir /bind9-export/}
-%undefine       _strict_symbol_defs_build
-
-Name:           bind
-Summary:        Domain Name System (DNS) Server (named)
-License:        MPLv2.0
-Version:        9.11.21
-Release:        12
-Epoch:          32
-Url:            https://www.isc.org/downloads/bind/
-Source0:        https://ftp.isc.org/isc/bind9/9.11.21/bind-%{version}.tar.gz
-Source1:        named.sysconfig
-Source2:        named.logrotate
-Source3:        bind-9.3.1rc1-sdb_tools-Makefile.in
-Source4:        dnszone.schema
-Source5:        README.sdb_pgsql
-Source6:        named.conf.sample
-Source7:        named.conf
-#Source8:        config-18.tar.bz2
-Source9:        ldap2zone.c
-Source10:       ldap2zone.1
-Source11:       named-sdb.8
-Source12:       zonetodb.1
-Source13:       zone2sqlite.1
-Source14:       bind.tmpfiles.d
-Source15:       trusted-key.key
-Source16:       named.service
-Source17:       named-chroot.service
-Source18:       named-sdb.service
-Source19:       named-sdb-chroot.service
-Source20:       setup-named-chroot.sh
-Source21:       generate-rndc-key.sh
-Source22:       named.rwtab
-Source23:       named-chroot-setup.service
-Source24:       named-sdb-chroot-setup.service
-Source25:       named-setup-rndc.service
-Source26:       named-pkcs11.service
-Source27:       setup-named-softhsm.sh
-Source28:       named-chroot.files
-Source29:       random.data
-Source30:       https://www.internic.net/domain/named.root
-Source31:       named.rfc1912.zones
-Source32:       named.empty
-Source33:       named.localhost
-Source34:       named.loopback
-Source35:       named.root.key
-
-BuildRequires:  openssl-devel libtool autoconf pkgconfig libcap-devel python3-devel python3-ply docbook-style-xsl
-BuildRequires:  libidn2-devel libxml2-devel make systemd selinux-policy findutils sed libxslt
-BuildRequires:  chrpath
-
-%if %{with SDB}
-BuildRequires:  openldap-devel libpq-devel sqlite-devel mariadb-connector-c-devel
-%endif
+%undefine _strict_symbol_defs_build
+
+Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
+Name:     bind
+License:  MPLv2.0
+Version:  9.16.23
+Release:  21
+Epoch:    32
+Url:      https://www.isc.org/downloads/bind/
+#
+Source0:  https://downloads.isc.org/isc/bind9/%{version}/bind-%{version}.tar.xz
+Source1:  named.sysconfig
+Source2:  https://downloads.isc.org/isc/bind9/%{version}/bind-%{version}.tar.xz.asc
+Source3:  named.logrotate
+Source4:  https://downloads.isc.org/isc/pgpkeys/codesign2021.txt
+Source16: named.conf
+# Refresh by command: dig @a.root-servers.net. +tcp +norec
+# or from URL
+Source17: https://www.internic.net/domain/named.root
+Source18: named.localhost
+Source19: named.loopback
+Source20: named.empty
+Source23: named.rfc1912.zones
+Source25: named.conf.sample
+Source27: named.root.key
+Source35: bind.tmpfiles.d
+Source36: trusted-key.key
+Source37: named.service
+Source38: named-chroot.service
+Source41: setup-named-chroot.sh
+Source42: generate-rndc-key.sh
+Source43: named.rwtab
+Source44: named-chroot-setup.service
+Source46: named-setup-rndc.service
+Source47: named-pkcs11.service
+Source48: setup-named-softhsm.sh
+Source49: named-chroot.files
+
+Patch1:bind-9.14-config-pkcs11.patch
+Patch2:bind-9.10-dist-native-pkcs11.patch
+Patch3:bind-9.11-kyua-pkcs11.patch
+# Common patches
+Patch10: bind-9.5-PIE.patch
+Patch16: bind-9.16-redhat_doc.patch
+Patch72: bind-9.5-dlz-64bit.patch
+Patch106:bind93-rh490837.patch
+Patch112:bind97-rh645544.patch
+Patch130:bind-9.9.1-P2-dlz-libdb.patch
+Patch157:bind-9.11-fips-tests.patch
+# https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/2689
+Patch164:bind-9.11-rh1666814.patch
 
+Patch6000:backport-CVE-2022-0396.patch
+Patch6001:backport-CVE-2021-25220.patch
+
+Patch6008:backport-0001-Do-not-convert-ISC_R_NOSPACE-to-DNS_R_SERVFAIL-too-e.patch
+Patch6009:backport-0001-Exercise-ISC_R_NOSPACE-path-in-dns_sdlz_putrr.patch
+Patch6010:backport-0002-Fix-catalog-zone-reconfiguration-crash.patch
+Patch6011:backport-0002-Add-a-regression-test.patch
+Patch6012:backport-0003-Improve-the-logging-on-failed-TCP-accept.patch
+Patch6013:backport-0004-Stop-leaking-mutex-in-nmworker-and-cond-in-nm-socket.patch
+Patch6014:backport-0005-Address-memory-leak-when-processing-dnssec-policy-cl.patch
+Patch6015:backport-0005-Report-duplicate-dnssec-policy-names.patch
+Patch6016:backport-0006-Prevent-a-shutdown-race-in-catz_create_chg_task.patch
+Patch6017:backport-0007-Fix-bug-introduced-by-763-related-to-offline-keys.patch
+Patch6018:backport-0007-Only-warn-if-we-could-not-delete-signature.patch
+Patch6019:backport-0007-Update-autosign-test.patch
+Patch6020:backport-0007-Replace-RSASHA1-in-autosign-test-with-default-alg.patch
+Patch6021:backport-0008-On-shutdown-return-ISC_R_SHUTTINGDOWN-from-isc_taskm.patch
+Patch6022:backport-0009-Remove-taskmgr-excl_lock-fix-the-locking-for-taskmgr.patch
+Patch6023:backport-0010-add-UV_ENOTSUP-to-isc___nm_uverr2result.patch
+Patch6024:backport-0011-rndc-add-an-extra-task-reference.patch
+Patch6025:backport-0012-Separate-the-locked-parts-of-dns_zone_catz_enable-di.patch
+Patch6026:backport-0012-Add-a-system-test-for-view-reverting-after-a-failed-.patch
+Patch6027:backport-0012-Fix-a-memory-leak-in-dns_dlzcreate.patch
+Patch6028:backport-0012-Fix-invalid-control-port-number-in-the-catz-system-t.patch
+Patch6029:backport-0012-Improve-the-view-configuration-error-handling-and-re.patch
+Patch6030:backport-0012-Improve-the-zones-view-reverting-logic-when-a-zone-i.patch
+Patch6031:backport-0013-Add-log-message-when-hard-quota-is-reached-in-TCP-ac.patch
+Patch6032:backport-0014-Update-writetimeout-to-be-T_IDLE-in-netmgr_test.c.patch
+Patch6033:backport-0014-Rename-sock-timer-to-sock-read_timer.patch
+Patch6034:backport-0014-Add-TCP-TCPDNS-and-TLSDNS-write-timer.patch
+Patch6035:backport-0014-Add-TCP-write-timeout-system-test.patch
+Patch6036:backport-0014-Add-isc_nmhandle_setwritetimeout-function.patch
+Patch6037:backport-0015-Fix-more-ns_statscounter_recursclients-underflows.patch
+Patch6038:backport-0016-Properly-free-up-enqueued-netievents-in-nm_destroy.patch
+Patch6039:backport-0017-Delay-isc__nm_uvreq_t-deallocation-to-connection-cal.patch
+Patch6040:backport-0018-Handle-TCP-sockets-in-isc__nmsocket_reset.patch
+Patch6041:backport-0019-Use-unsigned-arithmetic-when-shifting-by-24.patch
+Patch6042:backport-0020-Grow-the-lex-token-buffer-in-one-more-place.patch
+Patch6043:backport-0021-Add-test-configurations-with-invalid-dnssec-policy-c.patch
+Patch6044:backport-0021-Check-dnssec-policy-key-roles-for-validity.patch
+Patch6045:backport-0022-Add-network-manager-based-timer-API.patch
+Patch6046:backport-0022-Change-single-write-timer-to-per-send-timers.patch
+Patch6048:backport-0022-On-shutdown-reset-the-established-TCP-connections.patch
+Patch6049:backport-0023-Log-not-authoritative-for-update-zone-more-clearly.patch
+Patch6050:backport-0024-Prevent-arithmetic-overflow-of-i-in-master.c-generat.patch
+Patch6051:backport-0024-update-shell-syntax.patch
+Patch6052:backport-0024-add-a-system-test-for-GENERATE-with-an-integer-overf.patch
+Patch6053:backport-0025-Test-CDS-DELETE-persists-after-zone-sign.patch
+Patch6054:backport-0025-Update-dns_dnssec_syncdelete-function.patch
+Patch6055:backport-0026-Check-that-pending-negative-cache-entries-for-DS-can.patch
+Patch6056:backport-0026-Update-the-rdataset-trust-field-in-ncache.c-rdataset.patch
+Patch6057:backport-0027-Prevent-memory-bloat-caused-by-a-jemalloc-quirk.patch
+Patch6058:backport-0028-Ensure-diff-variable-is-not-read-uninitialized.patch
+Patch6059:backport-0029-Initialize-printed-buffer.patch
+Patch6060:backport-0030-Additional-safety-check-for-negative-array-index.patch
+Patch6061:backport-0031-Fix-dig-nssearch-race-between-recv_done-and-send_don.patch
+Patch6062:backport-0032-Process-the-delegating-NS-RRset-when-checking-rpz-ru.patch
+Patch6063:backport-0032-Allow-DNS_RPZ_POLICY_ERROR-to-be-converted-to-a-stri.patch
+Patch6064:backport-0032-Add-test-cases-using-static-and-static-stub-zones.patch
+Patch6065:backport-0032-Check-the-cache-as-well-when-glue-NS-are-returned-pr.patch
+Patch6066:backport-0032-Process-learned-records-as-well-as-glue.patch
+Patch6067:backport-0033-Lock-the-trampoline-when-attaching.patch
+Patch6068:backport-0034-prevent-a-possible-buffer-overflow-in-configuration-.patch
+Patch6069:backport-0035-Add-lower-bound-checks-to-fetchlimit-test.patch
+Patch6070:backport-0035-Disable-EDNS-for-the-fetchlimit-test-server.patch
+Patch6071:backport-0035-Fix-the-fetches-per-server-quota-calculation.patch
+Patch6072:backport-0036-Check-if-key-metadata-is-modified-before-writing.patch
+Patch6073:backport-0036-Add-kasp-test-for-3302.patch
+Patch6074:backport-0037-Fix-CID-352776-Concurrent-data-access-violations.patch
+Patch6075:backport-0037-Don-t-process-DNSSEC-related-and-ZONEMD-records-in-c.patch
+Patch6076:backport-0037-Require-valid-key-for-dst_key-functions.patch
+Patch6077:backport-0038-Do-not-cancel-processing-record-datasets-in-catalog-.patch
+Patch6078:backport-0039-corrected-the-opcode-param-to-opcode_totext.patch
+Patch6079:backport-0040-make-the-fix-more-complete.patch
+Patch6080:backport-0041-Gracefully-handle-uv_read_start-failures.patch
+Patch6081:backport-0042-Fix-a-race-between-resolver-query-timeout-and-valida.patch
+Patch6082:backport-0042-Remove-resolver.c-maybe_destroy.patch
+Patch6083:backport-0043-Check-for-overflow-in-GENERATE-computations.patch
+Patch6084:backport-0043-Tighten-GENERATE-directive-parsing.patch
+Patch6085:backport-0044-Add-UV_RUNTIME_CHECK-macro-to-print-uv_strerror.patch
+Patch6086:backport-0045-Move-setting-the-sock-write_timeout-to-the-async_-se.patch
+Patch6087:backport-Clone-the-message-buffer-before-forwarding-UPDATE-me.patch
+Patch6088:backport-disassociate-rdatasets-when-cleaning-up.patch
+Patch6089:backport-dont-enabled-serve-stale-on-duplicate-queries.patch
+Patch6090:backport-Fix-fetch-context-use-after-free-bugs.patch
+Patch6091:backport-Fix-rndc-dumpdb-expired-for-stuck-cache-contents.patch
+Patch6092:backport-Fix-tkey-buildquery-function-s-error-handling.patch
+Patch6093:backport-Increase-the-BUFSIZ-long-buffers.patch
+Patch6094:backport-Inherit-dnssec-policy-in-check-for-inline-signing.patch
+Patch6095:backport-Reject-zones-with-TTL-higher-than-dnssec-policy-max.patch
+
+Patch6096:backport-Test-dnssec-policy-max-zone-ttl-rejects-zone-with-to.patch
+Patch6097:backport-warn-about-zones-with-both-dnssec-policy-and-max-zon.patch
+
+Patch6098:backport-CVE-2022-2795.patch
+Patch6099:backport-CVE-2022-3080.patch
+Patch6100:backport-CVE-2022-38177.patch
+Patch6101:backport-CVE-2022-38178.patch
+Patch6102:backport-CVE-2022-2906.patch
+Patch6103:backport-CVE-2022-2881.patch
+
+Patch6104:backport-Reset-parser-before-parsing-of-internal-trust-anchor.patch
+Patch6105:backport-nsec3.c-Add-a-missing-dns_db_detachnode-call.patch
+Patch6106:backport-dnstap-query_message-field-was-erroneously-set-with-responses.patch
+Patch6107:backport-fix-an-incorrect-detach-in-update-processing.patch
+Patch6108:backport-clean-up-properly-when-interface-creation-fails.patch
+Patch6109:backport-Add-mctx-attach-detach-when-creating-destroying-a-memory-pool.patch
+Patch6110:backport-Ensure-that-named_server_t-is-properly-initialized.patch
+Patch6111:backport-Free-rsa-if-e-is-NULL-in-opensslrsa_verify2.patch
+Patch6112:backport-Free-n-on-error-path-in-rsa_check.patch
+Patch6113:backport-Fix-memory-leak-in-dns_message_checksig-SIG-0-sigs.patch
+Patch6114:backport-Check-that-e-and-n-are-non-NULL-in-opensslrsa_todns.patch
+Patch6115:backport-Check-that-e-and-n-are-allocated-in-opensslrsa_fromdns.patch
+Patch6116:backport-Check-BN_dup-results-in-rsa_check.patch
+Patch6117:backport-Check-that-primary-key-names-have-not-changed.patch
+Patch6118:backport-Fix-ns_statscounter_recursclients-counting-bug.patch
+
+Patch6119:backport-Fix-a-logical-bug-in-cfg_print_duration.patch
+Patch6120:backport-ensure-RPZ-lookups-handle-CD-1-correctly.patch
+Patch6121:backport-Don-t-allow-DNSSEC-records-in-the-raw-zone.patch
+Patch6122:backport-Select-the-appropriate-namespace-when-using-a-dual-stack-server.patch
+Patch6123:backport-Check-for-NULL-before-dereferencing-qctx-rpz_st.patch
+Patch6124:backport-Suppress-duplicate-dns_db_updatenotify_register-registrations.patch
+Patch6125:backport-Call-dns_db_updatenotify_unregister-earlier.patch
+Patch6126:backport-Add-missing-DbC-magic-checks.patch
+Patch6127:backport-Propagate-the-shutdown-event-to-the-recursing-ns_client-s.patch
+Patch6128:backport-Release-unused-key-file-IO-lock-objects.patch
+Patch6129:backport-Fix-logging-a-uint32_t-SOA-serial-value-in-dns_catz_update_from_db.patch
+
+Patch6130:backport-CVE-2022-3736.patch
+Patch6131:backport-CVE-2022-3924.patch
+Patch6132:backport-CVE-2022-3094-add-an-update-quota.patch
+Patch6133:backport-CVE-2022-3094-add-a-configuration-option-for-the-update-quota.patch
+Patch6134:backport-CVE-2022-3094-move-update-ACL-and-update-policy-checks-before-quota.patch
+
+Patch6135:backport-Don-t-perform-arithmetic-on-NULL-pointers.patch
+Patch6136:backport-Accept-in-NULL-with-inlen-0-in-isc_-half-siphash24.patch
+Patch6137:backport-Fix-a-use-after-free-bug-in-dns_zonemgr_releasezone.patch
+Patch6138:backport-Fix-dns_fwdtable_addfwd-error-path-cleanup-bug.patch
+Patch6139:backport-Detach-the-views-in-zone_shutdown-not-in-zone_free.patch
+Patch6140:backport-Detach-the-zone-views-outside-of-the-zone-lock.patch
+Patch6141:backport-delay-trust-anchor-management-until-zones-are-loaded.patch
+Patch6142:backport-In-hmac_createctx-free-ctx-on-isc_hmac_init-failure.patch
+Patch6143:backport-Fix-dns_kasp_attach-dns_kasp_detach-usage.patch
+Patch6144:backport-Fix-backport-error-in-84929d1cd7e1042452094ceeae969324b9df504f.patch
+Patch6145:backport-Fix-a-cleanup-bug-when-isc_task_create-fails-in-dns_catz_new_zones.patch
+Patch6146:backport-Searching-catzs-zones-requires-a-read-lock.patch
+Patch6147:backport-Fix-view-s-zones-reverting-bug-during-reconfiguration.patch
+Patch6148:backport-Disable-the-internal-memory-allocator-by-default.patch
+Patch6149:backport-CVE-2023-2911.patch
+Patch6150:backport-CVE-2023-2828.patch
+
+Patch6151:backport-CVE-2023-3341.patch
+
+Patch6152:backport-CVE-2023-5679.patch
+Patch6153:backport-CVE-2023-5517.patch
+Patch6154:backport-CVE-2023-6516.patch
+
+Patch6155:backport-Make-isc_ht_init-and-isc_ht_iter_create-return-void.patch
+Patch6156:backport-CVE-2023-4408.patch
+
+Patch6157:backport-CVE-2023-50387-CVE-2023-50868.patch
+
+Patch9000:bugfix-limit-numbers-of-test-threads.patch
+
+%{?systemd_ordering}
+Requires:       coreutils
+Requires:       shadow-utils
+Requires:       glibc-common
+Requires:       grep
+Requires:       bind-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       systemd
+# This wild require should satisfy %%selinux_set_boolean macro only
+# in case it needs to be used
+Requires: policycoreutils-python-utils libselinux-utils
+Requires: selinux-policy selinux-policy-base libuv
+Recommends:     bind-utils bind-dnssec-utils
+BuildRequires:  gcc, make
+BuildRequires:  openssl-devel, libtool, autoconf, pkgconfig, libcap-devel
+BuildRequires:  libidn2-devel, libxml2-devel
+BuildRequires:  selinux-policy
+# needed for %%{__python3} macro
+BuildRequires:  python3-devel
+BuildRequires:  python3-ply
+BuildRequires:  findutils sed
+BuildRequires:  libuv-devel
+BuildRequires:  libnsl2
+BuildRequires:  systemd
+%if %{with DLZ}
+BuildRequires:  openldap-devel, libpq-devel, sqlite-devel, mariadb-connector-c-devel
+%endif
 %if %{with UNITTEST}
+# make unit dependencies
 BuildRequires:  libcmocka-devel kyua
 %endif
-
-%if %{with PKCS11}
+%if %{with PKCS11} && (%{with UNITTEST} || %{with SYSTEMTEST})
 BuildRequires:  softhsm
 %endif
-
 %if %{with SYSTEMTEST}
-BuildRequires:  net-tools perl(Net::DNS) perl(Net::DNS::Nameserver)
+# bin/tests/system dependencies
+BuildRequires:  perl(Net::DNS) perl(Net::DNS::Nameserver) perl(Time::HiRes) perl(Getopt::Long)
+# manual configuration requires this tool
+BuildRequires:  iproute
 %endif
-
 %if %{with GSSTSIG}
 BuildRequires:  krb5-devel
 %endif
-
 %if %{with LMDB}
 BuildRequires:  lmdb-devel
 %endif
-
 %if %{with JSON}
 BuildRequires:  json-c-devel
 %endif
-
+%if %{with GEOIP2}
+BuildRequires:  libmaxminddb-devel
+%endif
 %if %{with DNSTAP}
 BuildRequires:  fstrm-devel protobuf-c-devel
 %endif
-
+# Needed to regenerate dig.1 manpage
+%if %{with DOC}
+BuildRequires:  python3-sphinx python3-sphinx_rtd_theme
+BuildRequires:  doxygen
+%endif
+%if %{with DOCPDF}
+# Because remaining issues with COPR, allow turning off PDF (re)generation
+BuildRequires:  python3-sphinx-latex latexmk texlive-xetex texlive-xindy
+%endif
 %if %{with TSAN}
-BuildRequires:  libtsan
+BuildRequires: libtsan
 %endif
 
-Requires:       systemd coreutils shadow-utils glibc-common grep policycoreutils-python-utils
-Requires:       python3-bind = %{epoch}:%{version}-%{release} libselinux-utils selinux-policy bind-libs = %{epoch}:%{version}-%{release} bind-libs-lite = %{epoch}:%{version}-%{release}
-Provides:       bind-config = 30:9.3.2-34.fc6 caching-nameserver = 31:9.4.1-7.fc8 dnssec-conf = 1.27-2
-Provides:       bind-license
-Obsoletes:      bind-config < 30:9.3.2-34.fc6 caching-nameserver < 31:9.4.1-7.fc8 dnssec-conf < 1.27-2
-Obsoletes:      bind-license
-
-# Common patches
-Patch10: bind-9.5-PIE.patch
-Patch16: bind-9.3.2-redhat_doc.patch
-Patch72: bind-9.5-dlz-64bit.patch
-Patch101:bind-96-old-api.patch
-Patch102:bind-95-rh452060.patch
-Patch106:bind93-rh490837.patch
-Patch109:bind97-rh478718.patch
-Patch112:bind97-rh645544.patch
-Patch130:bind-9.9.1-P2-dlz-libdb.patch
-Patch131:bind-9.9.1-P2-multlib-conflict.patch
-Patch133:bind99-rh640538.patch
-Patch134:bind97-rh669163.patch
-Patch136:bind-9.10-dist-native-pkcs11.patch
-
-Patch137:bind-9.10-use-of-strlcat.patch
-Patch140:bind-9.11-rh1410433.patch
-Patch145:bind-9.11-rh1205168.patch
-Patch149:bind-9.11-kyua-pkcs11.patch
-Patch150:bind-9.11-engine-pkcs11.patch
-Patch153:bind-9.11-export-suffix.patch
-Patch154:bind-9.11-oot-manual.patch
-Patch155:bind-9.11-pk11.patch
-Patch156:bind-9.11-fips-code.patch
-Patch157:bind-9.11-fips-tests.patch
-Patch158:bind-9.11-rt31459.patch
-Patch159:bind-9.11-rt46047.patch
-Patch160:bind-9.11-rh1624100.patch
-Patch161:bind-9.11-host-idn-disable.patch
-Patch163:bind-9.11-rh1663318.patch
-Patch164:bind-9.11-rh1666814.patch
-Patch168:bind-9.11-unit-disable-random.patch
-Patch170:bind-9.11-feature-test-named.patch
-Patch171:bind-9.11-tests-variants.patch
-Patch172:bind-9.11-tests-pkcs11.patch
-Patch173:bind-9.11-rh1732883.patch
-Patch174:bind-9.11-json-c.patch
-Patch175:bind-9.11-fips-disable.patch
-Patch177: bind-9.11-serve-stale.patch
-Patch178: bind-9.11-serve-stale-dbfix.patch
-Patch183: bind-9.11-rh1736762-5.patch
-
-Patch184: feature-bind99-euler-range-port.patch
-Patch185: bugfix-nslookup-norec.patch
-Patch186: bugfix-named-log-time.patch
-Patch187: dnssec-checkds-s.patch
-Patch188: do-not-treat-a-referral-with-a-non-empty-ANSWER-sect.patch
-Patch189: Add-some-DBC-checks-in-dighost-fix-race-between-clea.patch
-Patch190: Use-clock_gettime-instead-of-gettimeofday.patch
-
-Patch191: CVE-2020-8622.patch
-Patch192: CVE-2020-8623.patch
-Patch193: CVE-2020-8624.patch
-Patch194: Fix_the_difference_at_the_macro_definition_using_clock_gettime_instead_of_gettimeofda.patch
-Patch195: CVE-2020-8625.patch
-Patch196: backport-CVE-2021-25214.patch
-Patch197: backport-CVE-2021-25215.patch
-# SDB patches
-Patch11: bind-9.3.2b2-sdbsrc.patch
-Patch12: bind-9.10-sdb.patch
-# needs inpection
-Patch13: bind-9.3.2b1-fix_sdb_ldap.patch
-
 %description
-Berkeley Internet Name Domain (BIND) is an implementation of the Domain Name
-System (DNS) protocols and provides an openly redistributable reference
-implementation of the major components of the Domain Name System.
-This package includes the components to operate a DNS server.
+BIND (Berkeley Internet Name Domain) is an implementation of the DNS
+(Domain Name System) protocols. BIND includes a DNS server (named),
+which resolves host names to IP addresses; a resolver library
+(routines for applications to use when interfacing with DNS); and
+tools for verifying that the DNS server is operating properly.
 
 %if %{with PKCS11}
 %package pkcs11
 Summary: Bind with native PKCS#11 functionality for crypto
-Requires: systemd bind-libs-lite = %{epoch}:%{version}-%{release}
-Requires: bind = %{epoch}:%{version}-%{release} bind-libs = %{epoch}:%{version}-%{release}
+Requires: bind%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: bind-pkcs11-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Recommends: softhsm
 
-Provides: bind-pkcs11-libs = %{epoch}:%{version}-%{release} bind-pkcs11-utils = %{epoch}:%{version}-%{release}
-Obsoletes:bind-pkcs11-libs < %{epoch}:%{version}-%{release} bind-pkcs11-utils < %{epoch}:%{version}-%{release}
-
 %description pkcs11
 This is a version of BIND server built with native PKCS#11 functionality.
 It is important to have SoftHSM v2+ installed and some token initialized.
 For other supported HSM modules please check the BIND documentation.
 
+%package pkcs11-utils
+Summary: Bind tools with native PKCS#11 for using DNSSEC
+Requires: bind-pkcs11-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Obsoletes: bind-pkcs11 < 32:9.9.4-16.P2
+Requires: bind-dnssec-doc = %{epoch}:%{version}-%{release}
+
+%description pkcs11-utils
+This is a set of PKCS#11 utilities that when used together create rsa
+keys in a PKCS11 keystore. Also utilities for working with DNSSEC
+compiled with native PKCS#11 functionality are included.
+
+%package pkcs11-libs
+Summary: Bind libraries compiled with native PKCS#11
+Requires: bind-license = %{epoch}:%{version}-%{release}
+Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description pkcs11-libs
+This is a set of BIND libraries (dns, isc) compiled with native PKCS#11
+functionality.
+
 %package pkcs11-devel
 Summary: Development files for Bind libraries compiled with native PKCS#11
-Requires: bind-pkcs11 = %{epoch}:%{version}-%{release}
-Requires: bind-devel = %{epoch}:%{version}-%{release}
+Requires: bind-pkcs11-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: bind-devel%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description pkcs11-devel
 This a set of development files for BIND libraries (dns, isc) compiled
 with native PKCS#11 functionality.
 %endif
 
-%if %{with SDB}
-%package sdb
-Summary: BIND server with database backends and DLZ support
-Requires: systemd bind-libs = %{epoch}:%{version}-%{release}
-Requires: bind = %{epoch}:%{version}-%{release} bind-libs-lite = %{epoch}:%{version}-%{release}
-
-%description sdb
-BIND (Berkeley Internet Name Domain) is an implementation of the DNS
-(Domain Name System) protocols. BIND includes a DNS server (named-sdb)
-which has compiled-in SDB (Simplified Database Backend) which includes
-support for using alternative Zone Databases stored in an LDAP server
-(ldapdb), a postgreSQL database (pgsqldb), an sqlite database (sqlitedb),
-or in the filesystem (dirdb), in addition to the standard in-memory RBT
-(Red Black Tree) zone database. It also includes support for DLZ
-(Dynamic Loadable Zones)
-%endif
-
-%package libs-lite
-Summary:  Libraries for working with the DNS protocol
-Obsoletes:bind-libbind-devel < 31:9.3.3-4.fc7
-Provides: bind-libbind-devel = 31:9.3.3-4.fc7
-Requires: bind-license = %{epoch}:%{version}-%{release}
-
-%description libs-lite
-Lite libs of BIND.
-
 %package libs
-Summary: Libraries for BIND
+Summary: Libraries used by the BIND DNS packages
 Requires: bind-license = %{epoch}:%{version}-%{release}
-Requires: bind-libs-lite = %{epoch}:%{version}-%{release}
+Provides: bind-libs-lite = %{epoch}:%{version}-%{release}
+Obsoletes: bind-libs-lite < 32:9.16.13
 
 %description libs
-BIND suite libraries.
+Contains heavyweight version of BIND suite libraries used by both named DNS
+server and utilities in bind-utils package.
+
+%package license
+Summary:  License of the BIND DNS suite
+BuildArch:noarch
+
+%description license
+Contains license of the BIND DNS suite.
 
 %package utils
-Summary: Utilities for bind
-Requires: bind-libs = %{epoch}:%{version}-%{release}
-Requires: bind-libs-lite = %{epoch}:%{version}-%{release}
-Requires: python3-bind = %{epoch}:%{version}-%{release}
+Summary: Utilities for querying DNS name servers
+Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release}
+# For compatibility with Debian package
+Provides: dnsutils = %{epoch}:%{version}-%{release}
 
 %description utils
 Bind-utils contains a collection of utilities for querying DNS (Domain
@@ -250,239 +391,240 @@ network addresses.
 You should install bind-utils if you need to get information from DNS name
 servers.
 
+%package dnssec-utils
+Summary: DNSSEC keys and zones management utilities
+Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Recommends: bind-utils
+Requires: python3-bind = %{epoch}:%{version}-%{release}
+Requires: bind-dnssec-doc = %{epoch}:%{version}-%{release}
 
+%description dnssec-utils
+Bind-dnssec-utils contains a collection of utilities for editing
+DNSSEC keys and BIND zone files. These tools provide generation,
+revocation and verification of keys and DNSSEC signatures in zone files.
 
-%package     devel
-Summary:     Header files and libraries needed for BIND DNS development
-Requires:    bind = %{epoch}:%{version}-%{release} bind-libs = %{epoch}:%{version}-%{release} bind-libs-lite = %{epoch}:%{version}-%{release}
-Provides:    bind-libbind-devel = 31:9.3.3-4.fc7 bind-lite-devel
-Obsoletes:   bind-libbind-devel < 31:9.3.3-4.fc7 bind-lite-devel
+You should install bind-dnssec-utils if you need to sign a DNS zone
+or maintain keys for it.
+
+%package dnssec-doc
+Summary: Manual pages of DNSSEC utilities
+Requires: bind-license = %{epoch}:%{version}-%{release}
+BuildArch:noarch
+Conflicts: %{name}-utils < %{epoch}:%{version}-%{release}
+
+%description dnssec-doc
+Bind-dnssec-doc contains manual pages for bind-dnssec-utils.
+
+%package devel
+Summary:  Header files and libraries needed for bind-dyndb-ldap
+Provides: bind-lite-devel = %{epoch}:%{version}-%{release}
+Obsoletes: bind-lite-devel < 32:9.16.6-3
+Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: openssl-devel%{?_isa} libxml2-devel%{?_isa}
+Requires: libcap-devel%{?_isa}
+%if %{with GSSTSIG}
+Requires: krb5-devel%{?_isa}
+%endif
+%if %{with LMDB}
+Requires: lmdb-devel%{?_isa}
+%endif
+%if %{with JSON}
+Requires:  json-c-devel%{?_isa}
+%endif
+%if %{with DNSTAP}
+Requires:  fstrm-devel%{?_isa} protobuf-c-devel%{?_isa}
+%endif
+%if %{with GEOIP2}
+Requires:  libmaxminddb-devel%{?_isa}
+%endif
 
 %description devel
 The bind-devel package contains full version of the header files and libraries
-required for development with ISC BIND 9.
+required for building bind-dyndb-ldap. Upstream no longer supports nor recommends
+bind libraries for third party applications.
 
-%package     chroot
-Summary:     A chroot runtime environment for the ISC BIND DNS server, named(8)
-Prefix:      /var/named/chroot
-Requires:    bind = %{epoch}:%{version}-%{release} grep
+%package chroot
+Summary:        A chroot runtime environment for the ISC BIND DNS server, named(8)
+Prefix:         %{chroot_prefix}
+# grep is required due to setup-named-chroot.sh script
+Requires:       grep
+Requires:       bind%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description chroot
 This package contains a tree of files which can be used as a
 chroot(2) jail for the named(8) program from the BIND package.
 Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 
-%if %{with SDB}
-%package     sdb-chroot
-Summary:     A chroot runtime environment for the ISC BIND DNS server, named-sdb(8)
-Prefix:      /var/named/chroot_sdb
-Requires:    bind-sdb = %{epoch}:%{version}-%{release} grep
 
-%description sdb-chroot
-This package contains a tree of files which can be used as a
-chroot(2) jail for the named-sdb(8) program from the BIND package.
-Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
+%if %{with DLZ}
+%package dlz-filesystem
+Summary: BIND server filesystem DLZ module
+Requires: bind%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description dlz-filesystem
+Dynamic Loadable Zones filesystem module for BIND server.
+
+%package dlz-ldap
+Summary: BIND server ldap DLZ module
+Requires: bind%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description dlz-ldap
+Dynamic Loadable Zones LDAP module for BIND server.
+
+%package dlz-mysql
+Summary: BIND server mysql and mysqldyn DLZ modules
+Requires: bind%{?_isa} = %{epoch}:%{version}-%{release}
+Provides: %{name}-dlz-mysqldyn = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-dlz-mysqldyn < 32:9.16.6-3
+
+%description dlz-mysql
+Dynamic Loadable Zones MySQL module for BIND server.
+Contains also mysqldyn module with dynamic DNS updates (DDNS) support.
+
+%package dlz-sqlite3
+Summary: BIND server sqlite3 DLZ module
+Requires: bind%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description dlz-sqlite3
+Dynamic Loadable Zones sqlite3 module for BIND server.
 %endif
 
-%package -n  python3-bind
-Summary:     A module allowing rndc commands to be sent from Python programs
-Requires:    bind = %{epoch}:%{version}-%{release}
-Requires:    python3 python3-ply %{?py3_dist:%py3_dist ply}
-BuildArch:   noarch
+
+%package -n python3-bind
+Summary:   A module allowing rndc commands to be sent from Python programs
+Requires:  bind-license = %{epoch}:%{version}-%{release}
+Requires:  python3 python3-ply %{?py3_dist:%py3_dist ply}
+BuildArch: noarch
 %{?python_provide:%python_provide python3-bind}
 %{?python_provide:%python_provide python3-isc}
 
 %description -n python3-bind
 This package provides a module which allows commands to be sent to rndc directly from Python programs.
 
-%if %{with EXPORT_LIBS}
-%package     export-libs
-Summary:     ISC libs for DHCP application
-Provides:    bind99-libs = 9.9.11-4
-Obsoletes:   bind99-libs < 9.9.11-4
+%if %{with DOC}
+%package doc
+Summary:   BIND 9 Administrator Reference Manual
+Requires:  bind-license = %{epoch}:%{version}-%{release}
+Requires:  python3-sphinx_rtd_theme
+BuildArch: noarch
 
-%description export-libs
+%description doc
 BIND (Berkeley Internet Name Domain) is an implementation of the DNS
-(Domain Name System) protocols. This package set contains only export
-version of BIND libraries, that are used for building ISC DHCP.
-
-%package     export-devel
-Summary:     Header files and libraries needed for BIND export libraries
-Requires:    bind-export-libs = %{epoch}:%{version}-%{release} openssl-devel libcap-devel
-Obsoletes:   bind99-devel < 9.9.11-4
-Conflicts:   bind99-devel
-
-%description export-devel
-This package contains export version of the header files and libraries
-required for development with ISC BIND. These headers and libraries
-are used for building ISC DHCP.
+(Domain Name System) protocols. BIND includes a DNS server (named),
+which resolves host names to IP addresses; a resolver library
+(routines for applications to use when interfacing with DNS); and
+tools for verifying that the DNS server is operating properly.
+
+This package contains BIND 9 Administrator Reference Manual
+in HTML and PDF format.
+%end
+
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
+%autosetup -n %{name}-%{version} -N
+
 # Common patches
-%patch10 -p1 -b .PIE
-%patch16 -p1 -b .redhat_doc
-%patch72 -p1 -b .64bit
-%patch102 -p1 -b .rh452060
-%patch106 -p1 -b .rh490837
-%patch109 -p1 -b .rh478718
-%patch112 -p1 -b .rh645544
-%patch130 -p1 -b .libdb
-%patch131 -p1 -b .multlib-conflict
-%patch140 -p1 -b .rh1410433
-%patch145 -p1 -b .rh1205168
-%patch153 -p1 -b .export_suffix
-%patch154 -p1 -b .oot-man
-%patch155 -p1 -b .pk11-internal
-%patch156 -p1 -b .fips-code
-%patch157 -p1 -b .fips-tests
-%patch158 -p1 -b .rt31459
-%patch159 -p1 -b .rt46047
-%patch160 -p1 -b .rh1624100
-%patch161 -p1 -b .host-idn-disable
-%patch163 -p1 -b .rh1663318
-%patch164 -p1 -b .rh1666814
-%patch168 -p1 -b .random_test-disable
-%patch170 -p1 -b .featuretest-named
-%patch171 -p1 -b .test-variant
-%patch172 -p1 -b .test-pkcs11
-%patch173 -p1 -b .rh1732883
-%patch174 -p1 -b .json-c
-%patch175 -p1 -b .rh1709553
-%patch177 -p1 -b .serve-stale
-%patch178 -p1 -b .rh1770492
-%patch183 -p1 -b .rh1736762-5
-
-%patch184 -p1
-%patch185 -p1
-%patch186 -p1
-%patch187 -p1
-%patch188 -p1
-%patch189 -p1
-%patch190 -p1
-
-%patch191 -p1
-%patch192 -p1
-%patch193 -p1
-%patch194 -p1
-%patch195 -p1
-%patch196 -p1
-%patch197 -p1
-
-mkdir lib/dns/tests/testdata/dstrandom
-cp -a %{SOURCE29} lib/dns/tests/testdata/dstrandom/random.data
+%autopatch -p1 -m 10
 
 %if %{with PKCS11}
+%autopatch -p1 -m 1 -M 1
 cp -r bin/named{,-pkcs11}
 cp -r bin/dnssec{,-pkcs11}
-cp -r lib/isc{,-pkcs11}
 cp -r lib/dns{,-pkcs11}
-%patch136 -p1 -b .dist_pkcs11
-%patch149 -p1 -b .kyua-pkcs11
-%patch150 -p1 -b .engine-pkcs11
+cp -r lib/ns{,-pkcs11}
+%autopatch -p1 -m 2 -M 9
 %endif
 
-%if %{with SDB}
-%patch101 -p1 -b .old-api
-mkdir bin/named-sdb
-cp -r bin/named/* bin/named-sdb
-%patch11 -p1 -b .sdbsrc
-# SDB ldap
-cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named-sdb
-# SDB postgreSQL
-cp -fp contrib/sdb/pgsql/pgsqldb.[ch] bin/named-sdb
-# SDB sqlite
-cp -fp contrib/sdb/sqlite/sqlitedb.[ch] bin/named-sdb
-# SDB Berkeley DB - needs to be ported to DB4!
-#cp -fp contrib/sdb/bdb/bdb.[ch] bin/named_sdb
-# SDB dir
-cp -fp contrib/sdb/dir/dirdb.[ch] bin/named-sdb
-# SDB tools
-mkdir -p bin/sdb_tools
-cp -fp %{SOURCE9} bin/sdb_tools/ldap2zone.c
-cp -fp %{SOURCE3} bin/sdb_tools/Makefile.in
-#cp -fp contrib/sdb/bdb/zone2bdb.c bin/sdb_tools
-cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/sdb_tools
-cp -fp contrib/sdb/pgsql/zonetodb.c bin/sdb_tools
-cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
-
-%patch12 -p1 -b .sdb
-%patch13 -p1 -b .fix_sdb_ldap
-%patch137 -p1 -b .strlcat_fix
-%endif
-
-%patch133 -p1 -b .rh640538
-%patch134 -p1 -b .rh669163
-
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
-for i in bin/named{,-sdb}/{,unix}/Makefile.in; do
+for i in bin/named/{,unix}/Makefile.in; do
   sed -i 's|fpie|fPIE|g' $i
 done
 %endif
+
+sed -e 's|"$TOP/config.guess"|"$TOP_SRCDIR/config.guess"|' -i bin/tests/system/ifconfig.sh
 :;
 
+
 %build
+## We use out of tree configure/build for export libs
 %define _configure "../configure"
+
+# normal and pkcs11 unit tests
 %define unit_prepare_build() \
-    cp -uv Kyuafile "%{1}/" \
-    find lib -name 'K*.key'           -exec cp -uv  '{}' "%{1}/{}" ';' \
-    find lib -name 'Kyuafile'         -exec cp -uv  '{}' "%{1}/{}" ';' \
-    find lib -name 'testdata' -type d -exec cp -Tav '{}' "%{1}/{}" ';' \
-    find lib -name 'testkeys' -type d -exec cp -Tav '{}' "%{1}/{}" ';' \
+  cp -uv Kyuafile "%{1}/" \
+  find lib -name 'K*.key' -exec cp -uv '{}' "%{1}/{}" ';' \
+  find lib -name 'Kyuafile' -exec cp -uv '{}' "%{1}/{}" ';' \
+  find lib -name 'testdata' -type d -exec cp -Tav '{}' "%{1}/{}" ';' \
+  find lib -name 'testkeys' -type d -exec cp -Tav '{}' "%{1}/{}" ';' \
 
 %define systemtest_prepare_build() \
-    cp -Tuav bin/tests "%{1}/bin/tests/" \
-    cp -uv   version   "%{1}"
+  cp -Tuav bin/tests "%{1}/bin/tests/" \
+  cp -uv version "%{1}" \
 
 CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 %if %{with TSAN}
   CFLAGS+=" -O1 -fsanitize=thread -fPIE -pie"
 %endif
 export CFLAGS
-export CPPFLAGS="$CPPFLAGS -DDIG_SIGCHASE"
 export STD_CDEFINES="$CPPFLAGS"
 
-sed -i -e 's/RELEASEVER=\(.*\)/RELEASEVER=\1-%{version}-%{release}/' version
+
+#sed -i -e \
+#'s/RELEASEVER=\(.*\)/RELEASEVER=\1-RH/' \
+#version
 
 libtoolize -c -f; aclocal -I libtool.m4 --force; autoconf -f
 
 mkdir build
-pushd build
-export LIBDIR_SUFFIXi=
 
+%if %{with DLZ}
+# DLZ modules do not support oot builds. Copy files into build
+mkdir -p build/contrib/dlz
+cp -frp contrib/dlz/modules build/contrib/dlz/modules
+%endif
+
+pushd build
+LIBDIR_SUFFIX=
+export LIBDIR_SUFFIX
 %configure \
-    --with-python=%{__python3} --with-libtool --localstatedir=/var \
-    --enable-threads --enable-ipv6 --enable-filter-aaaa --with-pic \
-    --disable-static --includedir=%{_includedir}/bind9 \
-    --with-tuning=large --with-libidn2 --enable-openssl-hash \
-    --enable-fixed-rrset --enable-full-report \
-    --with-docbook-xsl=%{_datadir}/sgml/docbook/xsl-stylesheets \
-%if %{with PKCS11}
-    --enable-native-pkcs11 --with-pkcs11=%{_libdir}/pkcs11/libsofthsm2.so \
+  --with-python=%{__python3} \
+  --with-libtool \
+  --localstatedir=%{_var} \
+  --with-pic \
+  --disable-static \
+  --includedir=%{_includedir}/bind9 \
+  --with-tuning=large \
+  --with-libidn2 \
+%if %{with GEOIP2}
+  --with-maxminddb \
 %endif
-%if %{with SDB}
-    --with-dlopen=yes --with-dlz-ldap=yes --with-dlz-postgres=yes \
-    --with-dlz-mysql=yes --with-dlz-filesystem=yes \
+%if %{with PKCS11}
+  --enable-native-pkcs11 \
+  --with-pkcs11=%{_libdir}/pkcs11/libsofthsm2.so \
 %endif
+  --with-dlopen=yes \
 %if %{with GSSTSIG}
-    --with-gssapi=yes --disable-isc-spnego \
+  --with-gssapi=yes \
 %endif
 %if %{with LMDB}
-    --with-lmdb=yes \
+  --with-lmdb=yes \
 %else
-    --with-lmdb=no \
+  --with-lmdb=no \
 %endif
 %if %{with JSON}
-    --with-libjson \
-%endif 
+  --without-libjson --with-json-c \
+%endif
 %if %{with DNSTAP}
-    --enable-dnstap \
+  --enable-dnstap \
 %endif
 %if %{with UNITTEST}
-    --with-cmocka \
+  --with-cmocka \
 %endif
+  --enable-fixed-rrset \
+  --enable-full-report \
+;
 %if %{with DNSTAP}
   pushd lib
   SRCLIB="../../../lib"
@@ -493,452 +635,452 @@ export LIBDIR_SUFFIXi=
   popd
 %endif
 
+%if %{with DOCPDF}
+# avoid using home for pdf latex files
+export TEXMFVAR="`pwd`"
+export TEXMFCONFIG="`pwd`"
+fmtutil-user --listcfg || :
+fmtutil-user --missing || :
+%endif
+
 %make_build
 
-cp -rv doc/* ../doc/
+# Regenerate dig.1 manpage
 pushd bin/dig
-make  man
+make man
 popd
 pushd bin/python
-make  man
+make man
 popd
 
-popd # build
-
-%unit_prepare_build       build
-%systemtest_prepare_build build
-
-%if %{with EXPORT_LIBS}
-cp isc-config.sh.1 isc-export-config.sh.1
-mkdir export-libs
-pushd export-libs
-export LIBDIR_SUFFIX=%{_export_dir}
-%{configure} \
-    --with-libtool --disable-static --disable-epoll --disable-kqueue \
-    --libdir=%{_libdir}%{_export_dir} --enable-openssl-hash \
-    --includedir=%{_includedir}%{_export_dir}/ --disable-threads \
-    --enable-fixed-rrset --disable-rpz-nsip --disable-rpz-nsdname \
-    --without-lmdb --without-libxml2 --without-libjson \
-    --without-zlib --without-dlopen --enable-full-report \
-%if %{with GSSTSIG}
-    --with-gssapi=yes --disable-isc-spnego \
-%endif
-%if %{with UNITTEST}
-    --with-cmocka \
+%if %{with DOC}
+  make doc
 %endif
 
-mv isc-config.sh isc-export-config.sh
-
-sed -i \
--e '/^SUBDIRS =/s/.*/SUBDIRS = make lib/i' \
--e 's/isc-config.sh/isc-export-config.sh/g' \
--e 's/bind9-config/bind9-export-config/g' \
-Makefile
-
-sed -i -e "/^SUBDIRS =/s/.*/SUBDIRS = isc dns isccfg irs/i" lib/Makefile
-
-for lib in isc dns isccfg irs; do
-    find .  -name Makefile -exec sed  "s/lib${lib}\./lib${lib}-export\./g" -i {} \;
-    sed -e "s/-l${lib}\([^[:alpha:]]\)/-l${lib}-export\1/g" \
-    -e "s/lib${lib}\./lib${lib}-export\./g" \
-    -i isc-export-config.sh
-done
-
-%make_build
-popd
+%if %{with DLZ}
+  pushd contrib/dlz/modules
+  for DIR in mysql mysqldyn; do
+    sed -e 's/@DLZ_DRIVER_MYSQL_INCLUDES@/$(shell mysql_config --cflags)/' \
+        -e 's/@DLZ_DRIVER_MYSQL_LIBS@/$(shell mysql_config --libs)/' \
+        $DIR/Makefile.in > $DIR/Makefile
+  done
+  for DIR in filesystem ldap mysql mysqldyn sqlite3; do
+    make -C $DIR CFLAGS="-fPIC -I../include $CFLAGS $LDFLAGS"
+  done
+  popd
+%endif
+popd # build
 
-%unit_prepare_build export-libs
-# Test just compiled libraries
-for lib in %{bind_export_libs}
-do
-  sed -e "s,^\s*include(.*${lib}/.*,-- use &," -i export-libs/lib/Kyuafile
-done
-sed -e "/^\s*include(/ d" -e 's/^-- use //' -i export-libs/lib/Kyuafile
-%endif #end EXPORT_LIBS
+%unit_prepare_build build
+%systemtest_prepare_build build
 
 %check
-%if %{with PKCS11}
+%if %{with PKCS11} && (%{with UNITTEST} || %{with SYSTEMTEST})
   # Tests require initialization of pkcs11 token
-  eval "$(bash %{SOURCE27} -A "`pwd`/softhsm-tokens")"
+  eval "$(bash %{SOURCE48} -A "`pwd`/softhsm-tokens")"
 %endif
 
 %if %{with TSAN}
-  export TSAN_OPTIONS="log_exe_name=true log_path=ThreadSanitizer exitcode=0"
+export TSAN_OPTIONS="log_exe_name=true log_path=ThreadSanitizer exitcode=0"
 %endif
 
 %if %{with UNITTEST}
   pushd build
+  CPUS=$(lscpu -p=cpu,core | grep -v '^#' | wc -l)
+  if [ "$CPUS" -gt 16 ]; then
+    ORIGFILES=$(ulimit -n)
+    ulimit -n 4096 || : # Requires on some machines with many cores
+  fi
+  export ISC_TASK_WORKERS=8
   make unit
   e=$?
   if [ "$e" -ne 0 ]; then
     echo "ERROR: this build of BIND failed 'make unit'. Aborting."
     exit $e;
   fi;
-  popd
-
-  %if %{with EXPORT_LIBS}
-    pushd export-libs
-    make unit
-    e=$?
-    if [ "$e" -ne 0 ]; then
-      echo "ERROR: this build of BIND export-libs failed 'make unit'. Aborting."
-      exit $e;
-    fi;
-    popd
-  %endif
 
+  [ "$CPUS" -gt 16 ] && ulimit -n $ORIGFILES || :
+  popd
+## End of UNITTEST
 %endif
 
 %if %{with SYSTEMTEST}
-if [ "`whoami`" = 'root' ]; then
-    set -e
-    chmod -R a+rwX .
-    pushd bin/tests
-    pushd system
-    ./ifconfig.sh up
-    popd
-    make test
-    e=$?
-    pushd system
-    ./ifconfig.sh down
-    popd
-    popd
-    if [ "$e" -ne 0 ]; then
-        echo "ERROR: 'make test' failed. Aborting."
-        exit $e;
-    fi
+# Runs system test if ip addresses are already configured
+# or it is able to configure them
+if perl bin/tests/system/testsock.pl
+then
+  CONFIGURED=already
+else
+  CONFIGURED=
+  sh bin/tests/system/ifconfig.sh up
+  perl bin/tests/system/testsock.pl && CONFIGURED=build
+fi
+if [ -n "$CONFIGURED" ]
+then
+  set -e
+  pushd build/bin/tests
+  chown -R ${USER} . # Can be unknown user
+  %make_build test 2>&1 | tee test.log
+  e=$?
+  popd
+  [ "$CONFIGURED" = build ] && sh bin/tests/system/ifconfig.sh down
+  if [ "$e" -ne 0 ]; then
+    echo "ERROR: this build of BIND failed 'make test'. Aborting."
+    exit $e;
+  fi;
+else
+  echo 'SKIPPED: tests require root, CAP_NET_ADMIN or already configured test addresses.'
 fi
 %endif
+:
 
 %install
-mkdir -p ${RPM_BUILD_ROOT}/var/log
-mkdir -p ${RPM_BUILD_ROOT}/run/named
-mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bind
+# Build directory hierarchy
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/{bind,named}
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/named/{slaves,data,dynamic}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
-mkdir -p ${RPM_BUILD_ROOT}/var/named/{slaves,data,dynamic}
-mkdir -p ${RPM_BUILD_ROOT}/var/named/chroot/{dev,etc,var,run/named}
-mkdir -p ${RPM_BUILD_ROOT}/var/named/chroot/var/{log,named,tmp}
-mkdir -p ${RPM_BUILD_ROOT}/var/named/chroot/etc/crypto-policies/back-ends
-mkdir -p ${RPM_BUILD_ROOT}/var/named/chroot/etc/{pki/dnssec-keys,named}
-mkdir -p ${RPM_BUILD_ROOT}/var/named/chroot/%{_libdir}/bind
-pushd ${RPM_BUILD_ROOT}/var/named/chroot/var
-ln -s ../run run
-popd
-touch    ${RPM_BUILD_ROOT}/var/named/chroot/etc/named.conf
-
-%if %{with SDB}
-mkdir -p ${RPM_BUILD_ROOT}/var/named/chroot_sdb/{dev,etc,var,run/named}
-mkdir -p ${RPM_BUILD_ROOT}/var/named/chroot_sdb/var/{log,named,tmp}
-mkdir -p ${RPM_BUILD_ROOT}/var/named/chroot_sdb/etc/crypto-policies/back-ends
-mkdir -p ${RPM_BUILD_ROOT}/var/named/chroot_sdb/etc/{pki/dnssec-keys,named}
-mkdir -p ${RPM_BUILD_ROOT}/var/named/chroot_sdb/%{_libdir}/bind
-pushd ${RPM_BUILD_ROOT}/var/named/chroot_sdb/var
+mkdir -p ${RPM_BUILD_ROOT}/run/named
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log
+
+#chroot
+for D in %{chroot_create_directories}
+do
+  mkdir -p ${RPM_BUILD_ROOT}/%{chroot_prefix}${D}
+done
+
+# create symlink as it is on real filesystem
+pushd ${RPM_BUILD_ROOT}/%{chroot_prefix}/var
 ln -s ../run run
 popd
-touch    ${RPM_BUILD_ROOT}/var/named/chroot_sdb/etc/named.conf
-%endif
+
+# these are required to prevent them being erased during upgrade of previous
+touch ${RPM_BUILD_ROOT}/%{chroot_prefix}%{_sysconfdir}/named.conf
+#end chroot
 
 pushd build
 %make_install
 popd
 
-%if %{with EXPORT_LIBS}
-pushd export-libs
-%make_install
+# Remove unwanted files
+rm -f ${RPM_BUILD_ROOT}/etc/bind.keys
 
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d
-echo "%{_libdir}%{_export_dir}" > ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf
-cp -fp config.h ${RPM_BUILD_ROOT}%{_includedir}%{_export_dir}
-rm -rf ${RPM_BUILD_ROOT}%{_includedir}%{_export_dir}/pkcs11/
-rm -f  ${RPM_BUILD_ROOT}%{_includedir}%{_export_dir}/pk11/{constants,internal,pk11,result}.h
-popd
+# Systemd unit files
+mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
+install -m 644 %{SOURCE37} ${RPM_BUILD_ROOT}%{_unitdir}
+install -m 644 %{SOURCE38} ${RPM_BUILD_ROOT}%{_unitdir}
+install -m 644 %{SOURCE44} ${RPM_BUILD_ROOT}%{_unitdir}
+install -m 644 %{SOURCE46} ${RPM_BUILD_ROOT}%{_unitdir}
+
+%if %{with PKCS11}
+install -m 644 %{SOURCE47} ${RPM_BUILD_ROOT}%{_unitdir}
+%else
+# Not packaged without PKCS11
+find ${RPM_BUILD_ROOT}%{_includedir}/bind9/pk11 ${RPM_BUILD_ROOT}%{_includedir}/bind9/pkcs11 \
+  -name '*.h' \! -name site.h -delete
+
+%endif
+
+mkdir -p ${RPM_BUILD_ROOT}%{_libexecdir}
+install -m 755 %{SOURCE41} ${RPM_BUILD_ROOT}%{_libexecdir}/setup-named-chroot.sh
+install -m 755 %{SOURCE42} ${RPM_BUILD_ROOT}%{_libexecdir}/generate-rndc-key.sh
+
+%if %{with PKCS11}
+install -m 755 %{SOURCE48} ${RPM_BUILD_ROOT}%{_libexecdir}/setup-named-softhsm.sh
 %endif
 
-rm -f                      ${RPM_BUILD_ROOT}/etc/bind.keys
-install -d                 ${RPM_BUILD_ROOT}%{_unitdir}
-install -d                 ${RPM_BUILD_ROOT}%{_libexecdir}
-install -d                 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 644 %{SOURCE16} ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 644 %{SOURCE17} ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 644 %{SOURCE23} ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 644 %{SOURCE25} ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 755 %{SOURCE20} ${RPM_BUILD_ROOT}%{_libexecdir}/setup-named-chroot.sh
-install -m 755 %{SOURCE21} ${RPM_BUILD_ROOT}%{_libexecdir}/generate-rndc-key.sh
-install -m 644 %{SOURCE1}  ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
-install -m 644 %{SOURCE28} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
-install -m 644 %{SOURCE2}  ${RPM_BUILD_ROOT}/etc/logrotate.d/named
-
-%if %{with SDB}
-install -m 644 %{SOURCE18} ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 644 %{SOURCE19} ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 644 %{SOURCE24} ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}%{_mandir}/man1/ldap2zone.1
-install -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_mandir}/man8/named-sdb.8
-install -m 644 %{SOURCE12} ${RPM_BUILD_ROOT}%{_mandir}/man1/zonetodb.1
-install -m 644 %{SOURCE13} ${RPM_BUILD_ROOT}%{_mandir}/man1/zone2sqlite.1
+install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
+install -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
+
+%if %{with DLZ}
+  pushd build
+  pushd contrib/dlz/modules
+  for DIR in filesystem ldap mysql mysqldyn sqlite3; do
+    %make_install -C $DIR libdir=%{_libdir}/named
+  done
+  pushd ${RPM_BUILD_ROOT}/%{_libdir}/bind
+    cp -s ../named/dlz_*.so .
+  popd
+  mkdir -p doc/{mysql,mysqldyn}
+  cp -p mysqldyn/testing/README doc/mysqldyn/README.testing
+  cp -p mysqldyn/testing/* doc/mysqldyn
+  cp -p mysql/testing/* doc/mysql
+  popd
+  popd
 %endif
 
+# Install isc/errno2result.h header
+install -m 644 lib/isc/unix/errno2result.h ${RPM_BUILD_ROOT}%{_includedir}/bind9/isc
+
+# Remove libtool .la files:
+find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';';
+
+# PKCS11 versions manpages
 %if %{with PKCS11}
-install -m 644 %{SOURCE26} ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 755 %{SOURCE27} ${RPM_BUILD_ROOT}%{_libexecdir}/setup-named-softhsm.sh
 pushd ${RPM_BUILD_ROOT}%{_mandir}/man8
-ln -s named.8.gz               named-pkcs11.8.gz
-ln -s dnssec-keygen.8.gz       dnssec-keygen-pkcs11.8.gz
-ln -s dnssec-revoke.8.gz       dnssec-revoke-pkcs11.8.gz
-ln -s dnssec-verify.8.gz       dnssec-verify-pkcs11.8.gz
-ln -s dnssec-settime.8.gz      dnssec-settime-pkcs11.8.gz
-ln -s dnssec-checkds.8.gz      dnssec-checkds-pkcs11.8.gz
-ln -s dnssec-coverage.8.gz     dnssec-coverage-pkcs11.8.gz
-ln -s dnssec-signzone.8.gz     dnssec-signzone-pkcs11.8.gz
-ln -s dnssec-dsfromkey.8.gz    dnssec-dsfromkey-pkcs11.8.gz
-ln -s dnssec-importkey.8.gz    dnssec-importkey-pkcs11.8.gz
+ln -s named.8.gz named-pkcs11.8.gz
+ln -s dnssec-checkds.8.gz dnssec-checkds-pkcs11.8.gz
+ln -s dnssec-dsfromkey.8.gz dnssec-dsfromkey-pkcs11.8.gz
+ln -s dnssec-importkey.8.gz dnssec-importkey-pkcs11.8.gz
 ln -s dnssec-keyfromlabel.8.gz dnssec-keyfromlabel-pkcs11.8.gz
+ln -s dnssec-keygen.8.gz dnssec-keygen-pkcs11.8.gz
+ln -s dnssec-revoke.8.gz dnssec-revoke-pkcs11.8.gz
+ln -s dnssec-settime.8.gz dnssec-settime-pkcs11.8.gz
+ln -s dnssec-signzone.8.gz dnssec-signzone-pkcs11.8.gz
+ln -s dnssec-verify.8.gz dnssec-verify-pkcs11.8.gz
 popd
 %endif
 
-%if %{with SDB}
-install -d                 ${RPM_BUILD_ROOT}/etc/openldap/schema
-install -m 644 %{SOURCE4}  ${RPM_BUILD_ROOT}/etc/openldap/schema/dnszone.schema
-install -m 644 %{SOURCE5}  contrib/sdb/pgsql/
+# 9.16.4 installs even manual pages for tools not generated
+%if %{without DNSTAP}
+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/dnstap-read.1* || true
+%endif
+%if %{without LMDB}
+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man8/named-nzd2nzf.8* || true
 %endif
 
-install -m 644 lib/isc/unix/errno2result.h ${RPM_BUILD_ROOT}%{_includedir}/bind9/isc
-cp -fp build/config.h ${RPM_BUILD_ROOT}/%{_includedir}/bind9
+pushd ${RPM_BUILD_ROOT}%{_mandir}/man8
+ln -s ddns-confgen.8.gz tsig-keygen.8.gz
+ln -s named-checkzone.8.gz named-compilezone.8.gz
+popd
 
-find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';';
+%if %{with DOC}
+mkdir -p ${RPM_BUILD_ROOT}%{_pkgdocdir}
+cp -a build/doc/arm/_build/html ${RPM_BUILD_ROOT}%{_pkgdocdir}
+rm -rf ${RPM_BUILD_ROOT}%{_pkgdocdir}/html/.{buildinfo,doctrees}
+# Backward compatible link to 9.11 documentation
+(cd ${RPM_BUILD_ROOT}%{_pkgdocdir} && ln -s html/index.html Bv9ARM.html)
+# Share static data from original sphinx package
+for DIR in %{python3_sitelib}/sphinx_rtd_theme/static/*
+do
+  BASE=$(basename -- "$DIR")
+  BINDTHEMEDIR="${RPM_BUILD_ROOT}%{_pkgdocdir}/html/_static/$BASE"
+  if [ -d "$BINDTHEMEDIR" ]; then
+    rm -rf "$BINDTHEMEDIR"
+    ln -s "$DIR" "$BINDTHEMEDIR"
+  fi
+done
+%endif
+%if %{with DOCPDF}
+cp -a build/doc/arm/Bv9ARM.pdf ${RPM_BUILD_ROOT}%{_pkgdocdir}
+%endif
 
-touch  ${RPM_BUILD_ROOT}%{_localstatedir}/log/named.log
+# Ghost config files:
+touch ${RPM_BUILD_ROOT}%{_localstatedir}/log/named.log
 
-# configuration files
-install -m 640 %{SOURCE7} ${RPM_BUILD_ROOT}%{_sysconfdir}/named.conf
+# configuration files:
+install -m 640 %{SOURCE16} ${RPM_BUILD_ROOT}%{_sysconfdir}/named.conf
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/rndc.{key,conf}
-install -m 644 %{SOURCE35} ${RPM_BUILD_ROOT}%{_sysconfdir}/named.root.key
-install -m 644 %{SOURCE15} ${RPM_BUILD_ROOT}%{_sysconfdir}/trusted-key.key
+install -m 644 %{SOURCE27} ${RPM_BUILD_ROOT}%{_sysconfdir}/named.root.key
+install -m 644 %{SOURCE36} ${RPM_BUILD_ROOT}%{_sysconfdir}/trusted-key.key
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/named
 
-# data files
+# data files:
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/named
-install -m 640 %{SOURCE30} ${RPM_BUILD_ROOT}%{_localstatedir}/named/named.ca
-install -m 640 %{SOURCE33} ${RPM_BUILD_ROOT}%{_localstatedir}/named/named.localhost
-install -m 640 %{SOURCE34} ${RPM_BUILD_ROOT}%{_localstatedir}/named/named.loopback
-install -m 640 %{SOURCE32} ${RPM_BUILD_ROOT}%{_localstatedir}/named/named.empty
-install -m 640 %{SOURCE31} ${RPM_BUILD_ROOT}%{_sysconfdir}/named.rfc1912.zones
+install -m 640 %{SOURCE17} ${RPM_BUILD_ROOT}%{_localstatedir}/named/named.ca
+install -m 640 %{SOURCE18} ${RPM_BUILD_ROOT}%{_localstatedir}/named/named.localhost
+install -m 640 %{SOURCE19} ${RPM_BUILD_ROOT}%{_localstatedir}/named/named.loopback
+install -m 640 %{SOURCE20} ${RPM_BUILD_ROOT}%{_localstatedir}/named/named.empty
+install -m 640 %{SOURCE23} ${RPM_BUILD_ROOT}%{_sysconfdir}/named.rfc1912.zones
 
+# sample bind configuration files for %%doc:
 mkdir -p sample/etc sample/var/named/{data,slaves}
-install -m 644 %{SOURCE6} sample/etc/named.conf
-
-install -m 644 %{SOURCE7} named.conf.default
-install -m 644 %{SOURCE31} sample/etc/named.rfc1912.zones
-install -m 644 %{SOURCE33} %{SOURCE34} %{SOURCE32}  sample/var/named
-install -m 644 %{SOURCE30} sample/var/named/named.ca
+install -m 644 %{SOURCE25} sample/etc/named.conf
+# Copy default configuration to %%doc to make it usable from system-config-bind
+install -m 644 %{SOURCE16} named.conf.default
+install -m 644 %{SOURCE23} sample/etc/named.rfc1912.zones
+install -m 644 %{SOURCE18} %{SOURCE19} %{SOURCE20}  sample/var/named
+install -m 644 %{SOURCE17} sample/var/named/named.ca
+for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.internal.zone.db my.external.zone.db; do 
+  echo '@ in soa localhost. root 1 3H 15M 1W 1D
+  ns localhost.' > sample/var/named/$f; 
+done
+:;
 
-mkdir -p                   ${RPM_BUILD_ROOT}%{_tmpfilesdir}
-mkdir -p                   ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d
-install -m 644 %{SOURCE14} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/named.conf
-install -m 644 %{SOURCE22} ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d/named
+mkdir -p ${RPM_BUILD_ROOT}%{_tmpfilesdir}
+install -m 644 %{SOURCE35} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/named.conf
 
-chrpath -d %{buildroot}/%{_libdir}/bind9-export/*.so*
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d
+install -m 644 %{SOURCE43} ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d/named
 
 %pre
 if [ "$1" -eq 1 ]; then
-    /usr/sbin/groupadd -g %{bind_gid} -f -r named >/dev/null 2>&1 || :;
-    /usr/sbin/useradd  -u %{bind_uid} -r -N -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :;
-fi
+  /usr/sbin/groupadd -g %{bind_gid} -f -r named >/dev/null 2>&1 || :;
+  /usr/sbin/useradd  -u %{bind_uid} -r -N -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :;
+fi;
+:;
 
 %post
-/sbin/ldconfig
-%selinux_set_booleans named_write_master_zones=1
+%?ldconfig
+if [ -e "%{_sysconfdir}/selinux/config" ]; then
+  %selinux_set_booleans -s targeted %{selinuxbooleans}
+  %selinux_set_booleans -s mls %{selinuxbooleans}
+fi
 if [ "$1" -eq 1 ]; then
-    [ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.* /etc/named.* >/dev/null 2>&1 ;
-    [ -e /etc/rndc.key ]    && chown root:named /etc/rndc.key
-    [ -e /etc/rndc.key ]    && chmod 0640 /etc/rndc.key
+  # Initial installation
+  [ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.* /etc/named.* >/dev/null 2>&1 ;
+  # rndc.key has to have correct perms and ownership, CVE-2007-6283
+  [ -e /etc/rndc.key ] && chown root:named /etc/rndc.key
+  [ -e /etc/rndc.key ] && chmod 0640 /etc/rndc.key
 else
-if getent passwd named | grep ':/bin/false$' >/dev/null; then
+  # Upgrade, use invalid shell
+  if getent passwd named | grep ':/bin/false$' >/dev/null; then
     /sbin/usermod -s /sbin/nologin named
+  fi
+  # Checkconf will parse out comments
+  if /usr/sbin/named-checkconf -p /etc/named.conf 2>/dev/null | grep -q named.iscdlv.key
+  then
+    echo "Replacing obsolete named.iscdlv.key with named.root.key..."
+    if cp -Rf --preserve=all --remove-destination /etc/named.conf /etc/named.conf.rpmbackup; then
+      sed -e 's/named\.iscdlv\.key/named.root.key/' \
+        /etc/named.conf.rpmbackup > /etc/named.conf || \
+      mv /etc/named.conf.rpmbackup /etc/named.conf
+    fi
+  fi
 fi
-fi
-
 %systemd_post named.service
+:;
 
 %preun
+# Package removal, not upgrade
 %systemd_preun named.service
 
 %postun
-/sbin/ldconfig
-%selinux_unset_booleans named_write_master_zones=1
+%?ldconfig
+# Package upgrade, not uninstall
 %systemd_postun_with_restart named.service
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-%post libs-lite -p /sbin/ldconfig
-
-%postun libs-lite -p /sbin/ldconfig
-
-
-%if %{with SDB}
-%post sdb
-%systemd_post named-sdb.service
-
-%preun sdb
-%systemd_preun named-sdb.service
-
-%postun sdb
-%systemd_postun_with_restart named-sdb.service
-
-%endif #end SDB
+if [ -e "%{_sysconfdir}/selinux/config" ]; then
+  %selinux_unset_booleans -s targeted %{selinuxbooleans}
+  %selinux_unset_booleans -s mls %{selinuxbooleans}
+fi
 
 %if %{with PKCS11}
 %post pkcs11
-/sbin/ldconfig
+# Initial installation
 %systemd_post named-pkcs11.service
 
 %preun pkcs11
+# Package removal, not upgrade
 %systemd_preun named-pkcs11.service
 
 %postun pkcs11
-/sbin/ldconfig
+# Package upgrade, not uninstall
 %systemd_postun_with_restart named-pkcs11.service
+%endif
 
-%endif #end PKCS11
-
-%triggerpostun -n bind -- bind <= 32:9.5.0-20.b1
-if [ "$1" -gt 0 ]; then
-    [ -e /etc/rndc.key ] && chown root:named /etc/rndc.key
-    [ -e /etc/rndc.key ] && chmod 0640 /etc/rndc.key
+# Fix permissions on existing device files on upgrade
+%define chroot_fix_devices() \
+if [ $1 -gt 1 ]; then \
+  for DEV in "%{1}/dev"/{null,random,zero}; do \
+    if [ -e "$DEV" ] && [ "$(/bin/stat --printf="%G %a" "$DEV")" = "root 644" ]; \
+    then \
+      /bin/chmod 0664 "$DEV" \
+      /bin/chgrp named "$DEV" \
+    fi \
+  done \
 fi
 
 %triggerun -- bind < 32:9.9.0-0.6.rc1
 /sbin/chkconfig --del named >/dev/null 2>&1 || :
 /bin/systemctl try-restart named.service >/dev/null 2>&1 || :
 
-%if %{with EXPORT_LIBS}
-%post export-libs
-/sbin/ldconfig
-%end
-
-%postun export-libs
-/sbin/ldconfig
-%end
+%ldconfig_scriptlets libs
 
+%if %{with PKCS11}
+%ldconfig_scriptlets pkcs11-libs
 %endif
 
-%define chroot_fix_devices() \
-if [ $1 -gt 1 ]; then \
-    for DEV in "%{1}/dev"/{null,random,zero}; do \
-        if [ -e "$DEV" -a "$(/bin/stat --printf="%G %a" "$DEV")" = "root 644" ]; then \
-            /bin/chmod 0664 "$DEV" \
-            /bin/chgrp named "$DEV" \
-        fi \
-    done \
-fi
-
 %post chroot
 %systemd_post named-chroot.service
-%chroot_fix_devices /var/named/chroot
+%chroot_fix_devices %{chroot_prefix}
+:;
 
 %posttrans chroot
 if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
-    [ -x /sbin/restorecon ] && /sbin/restorecon /var/named/chroot/dev/* > /dev/null 2>&1;
-fi
+  [ -x /sbin/restorecon ] && /sbin/restorecon %{chroot_prefix}/dev/* > /dev/null 2>&1;
+fi;
 
 %preun chroot
+# wait for stop of both named-chroot and named-chroot-setup services
+# on uninstall
 %systemd_preun named-chroot.service named-chroot-setup.service
+:;
 
 %postun chroot
+# Package upgrade, not uninstall
 %systemd_postun_with_restart named-chroot.service
 
-%if %{with SDB}
-
-%post sdb-chroot
-%systemd_post named-sdb-chroot.service
-%chroot_fix_devices /var/named/chroot_sdb
-
-%posttrans sdb-chroot
-if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
-    [ -x /sbin/restorecon ] && /sbin/restorecon /var/named/chroot_sdb/dev/* > /dev/null 2>&1;
-fi
-
-%preun sdb-chroot
-%systemd_preun named-sdb-chroot.service
-
-%postun sdb-chroot
-%systemd_postun_with_restart named-sdb-chroot.service
-
-%endif #end SDB
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
 
 %files
-%license COPYRIGHT
-%doc CHANGES README named.conf.default doc/arm/*html doc/arm/*pdf sample/
-%{_libdir}/bind
-%{_bindir}/named-rrchecker
-%{_bindir}/mdig
-%{_sbindir}/named-journalprint
-%{_sbindir}/named-checkconf
-%{_sbindir}/lwresd
-%{_sbindir}/named
-%{_sbindir}/rndc*
+%dir %{_libdir}/bind
+%dir %{_libdir}/named
+%{_libdir}/named/*.so
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/named
 %config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.root.key
+%config(noreplace) %{_sysconfdir}/logrotate.d/named
 %{_tmpfilesdir}/named.conf
 %{_sysconfdir}/rwtab.d/named
-%{_libexecdir}/generate-rndc-key.sh
 %{_unitdir}/named.service
 %{_unitdir}/named-setup-rndc.service
-
+%{_sbindir}/named-journalprint
+%{_sbindir}/named-checkconf
+%{_bindir}/named-rrchecker
+%{_bindir}/mdig
+%{_sbindir}/named
+%{_sbindir}/rndc*
+%{_libexecdir}/generate-rndc-key.sh
 %{_mandir}/man1/mdig.1*
 %{_mandir}/man1/named-rrchecker.1*
 %{_mandir}/man5/named.conf.5*
 %{_mandir}/man5/rndc.conf.5*
 %{_mandir}/man8/rndc.8*
 %{_mandir}/man8/named.8*
-%{_mandir}/man8/lwresd.8*
 %{_mandir}/man8/named-checkconf.8*
 %{_mandir}/man8/rndc-confgen.8*
 %{_mandir}/man8/named-journalprint.8*
+%{_mandir}/man8/filter-aaaa.8.gz
+%doc CHANGES README named.conf.default
+%doc sample/
 
+# Hide configuration
 %defattr(0640,root,named,0750)
 %dir %{_sysconfdir}/named
 %config(noreplace) %verify(not link) %{_sysconfdir}/named.conf
 %config(noreplace) %verify(not link) %{_sysconfdir}/named.rfc1912.zones
-
 %defattr(0660,root,named,01770)
 %dir %{_localstatedir}/named
-
 %defattr(0660,named,named,0770)
 %dir %{_localstatedir}/named/slaves
 %dir %{_localstatedir}/named/data
 %dir %{_localstatedir}/named/dynamic
 %ghost %{_localstatedir}/log/named.log
-
 %defattr(0640,root,named,0750)
 %config %verify(not link) %{_localstatedir}/named/named.ca
 %config %verify(not link) %{_localstatedir}/named/named.localhost
 %config %verify(not link) %{_localstatedir}/named/named.loopback
 %config %verify(not link) %{_localstatedir}/named/named.empty
 %ghost %config(noreplace) %{_sysconfdir}/rndc.key
+# ^- rndc.key now created on first install only if it does not exist
 %ghost %config(noreplace) %{_sysconfdir}/rndc.conf
-%config(noreplace) %{_sysconfdir}/logrotate.d/named
-
+# ^- The default rndc.conf which uses rndc.key is in named's default internal config -
+#    so rndc.conf is not necessary.
 %defattr(-,named,named,-)
 %dir /run/named
 
 %files libs
-%{_libdir}/libbind9.so.161*
-%{_libdir}/libisccc.so.161*
-%{_libdir}/liblwres.so.161*
-
-%files libs-lite
-%{_libdir}/libdns.so.1110*
-%{_libdir}/libirs.so.161*
-%{_libdir}/libisc.so.1105*
-%{_libdir}/libisccfg.so.163*
-
+%{_libdir}/libbind9-%{version}*.so
+%{_libdir}/libisccc-%{version}*.so
+%{_libdir}/libns-%{version}*.so
+%{_libdir}/libdns-%{version}*.so
+%{_libdir}/libirs-%{version}*.so
+%{_libdir}/libisc-%{version}*.so
+%{_libdir}/libisccfg-%{version}*.so
+
+%files license
+%{!?_licensedir:%global license %%doc}
+%license COPYRIGHT
 
 %files utils
 %{_bindir}/dig
@@ -949,18 +1091,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/arpaname
 %{_sbindir}/ddns-confgen
 %{_sbindir}/tsig-keygen
-%{_sbindir}/genrandom
 %{_sbindir}/nsec3hash
-%{_sbindir}/dnssec*
-%{_sbindir}/isc-hmac-fixup
 %{_sbindir}/named-checkzone
 %{_sbindir}/named-compilezone
+%if %{with DNSTAP}
+%{_bindir}/dnstap-read
+%{_mandir}/man1/dnstap-read.1*
+%endif
 %if %{with LMDB}
 %{_sbindir}/named-nzd2nzf
-%endif
-
-%if %{with PKCS11}
-%exclude %{_sbindir}/dnssec*pkcs11
+%{_mandir}/man8/named-nzd2nzf.8*
 %endif
 %{_mandir}/man1/host.1*
 %{_mandir}/man1/nsupdate.1*
@@ -970,264 +1110,498 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man1/arpaname.1*
 %{_mandir}/man8/ddns-confgen.8*
 %{_mandir}/man8/tsig-keygen.8*
-%{_mandir}/man8/genrandom.8*
 %{_mandir}/man8/nsec3hash.8*
-%{_mandir}/man8/dnssec*.8*
-%if %{with PKCS11}
-%exclude %{_mandir}/man8/dnssec*-pkcs11.8*
-%endif
-%{_mandir}/man8/isc-hmac-fixup.8*
 %{_mandir}/man8/named-checkzone.8*
 %{_mandir}/man8/named-compilezone.8*
-%if %{with LMDB}
-%{_mandir}/man8/named-nzd2nzf.8*
-%endif
-%if %{with DNSTAP}
-%{_bindir}/dnstap-read
-%{_mandir}/man1/dnstap-read.1*
-%endif
 %{_sysconfdir}/trusted-key.key
 
-%if %{with SDB}
-
-%files sdb
-%doc contrib/sdb/ldap/README.ldap contrib/sdb/ldap/INSTALL.ldap contrib/sdb/pgsql/README.sdb_pgsql
-%dir %{_sysconfdir}/openldap/schema
-%config(noreplace) %{_sysconfdir}/openldap/schema/dnszone.schema
-%{_sbindir}/named-sdb
-%{_sbindir}/zone2ldap
-%{_sbindir}/ldap2zone
-%{_sbindir}/zonetodb
-%{_sbindir}/zone2sqlite
-%{_unitdir}/named-sdb.service
-%{_mandir}/man1/zone2ldap.1*
-%{_mandir}/man1/ldap2zone.1*
-%{_mandir}/man1/zonetodb.1*
-%{_mandir}/man1/zone2sqlite.1*
-%{_mandir}/man8/named-sdb.8*
-
-%endif #end SDB
+%files dnssec-utils
+%{_sbindir}/dnssec*
+%if %{with PKCS11}
+%exclude %{_sbindir}/dnssec*pkcs11
+%endif
 
+%files dnssec-doc
+%{_mandir}/man8/dnssec*.8*
+%if %{with PKCS11}
+%exclude %{_mandir}/man8/dnssec*-pkcs11.8*
+%endif
 
 %files devel
-%dir %{_includedir}/bind9
-%dir %{_includedir}/bind9/pk11
 %{_libdir}/libbind9.so
 %{_libdir}/libisccc.so
-%{_libdir}/liblwres.so
+%{_libdir}/libns.so
 %{_libdir}/libdns.so
 %{_libdir}/libirs.so
 %{_libdir}/libisc.so
 %{_libdir}/libisccfg.so
-%{_includedir}/bind9/config.h
+%dir %{_includedir}/bind9
 %{_includedir}/bind9/bind9
 %{_includedir}/bind9/isccc
-%{_includedir}/bind9/lwres
+%{_includedir}/bind9/ns
 %{_includedir}/bind9/dns
 %{_includedir}/bind9/dst
 %{_includedir}/bind9/irs
 %{_includedir}/bind9/isc
+%dir %{_includedir}/bind9/pk11
 %{_includedir}/bind9/pk11/site.h
 %{_includedir}/bind9/isccfg
-%{_bindir}/isc-config.sh
-%{_bindir}/bind9-config
-%{_mandir}/man1/isc-config.sh.1*
-%{_mandir}/man1/bind9-config.1*
-%{_mandir}/man3/lwres*
 
 %files chroot
 %config(noreplace) %{_sysconfdir}/named-chroot.files
 %{_unitdir}/named-chroot.service
 %{_unitdir}/named-chroot-setup.service
 %{_libexecdir}/setup-named-chroot.sh
-
 %defattr(0664,root,named,-)
-%ghost %dev(c,1,3) %verify(not mtime) /var/named/chroot/dev/null
-%ghost %dev(c,1,8) %verify(not mtime) /var/named/chroot/dev/random
-%ghost %dev(c,1,9) %verify(not mtime) /var/named/chroot/dev/urandom
-%ghost %dev(c,1,5) %verify(not mtime) /var/named/chroot/dev/zero
-
+%ghost %dev(c,1,3) %verify(not mtime) %{chroot_prefix}/dev/null
+%ghost %dev(c,1,8) %verify(not mtime) %{chroot_prefix}/dev/random
+%ghost %dev(c,1,9) %verify(not mtime) %{chroot_prefix}/dev/urandom
+%ghost %dev(c,1,5) %verify(not mtime) %{chroot_prefix}/dev/zero
 %defattr(0640,root,named,0750)
-%dir /var/named/chroot
-%dir /var/named/chroot/{dev,etc,var,run}
-%dir /var/named/chroot/etc/{named,pki}
-%dir /var/named/chroot/etc/pki/dnssec-keys
-%dir /var/named/chroot/etc/crypto-policies
-%dir /var/named/chroot/etc/crypto-policies/back-ends
-%ghost %config(noreplace) /var/named/chroot/etc/named.conf
-
+%dir %{chroot_prefix}
+%dir %{chroot_prefix}/dev
+%dir %{chroot_prefix}%{_sysconfdir}
+%dir %{chroot_prefix}%{_sysconfdir}/named
+%dir %{chroot_prefix}%{_sysconfdir}/pki
+%dir %{chroot_prefix}%{_sysconfdir}/pki/dnssec-keys
+%dir %{chroot_prefix}%{_sysconfdir}/crypto-policies
+%dir %{chroot_prefix}%{_sysconfdir}/crypto-policies/back-ends
+%dir %{chroot_prefix}%{_localstatedir}
+%dir %{chroot_prefix}/run
+%ghost %config(noreplace) %{chroot_prefix}%{_sysconfdir}/named.conf
 %defattr(-,root,root,-)
-%dir /var/named/chroot/{usr,%{_libdir}}
-%dir /var/named/chroot/%{_libdir}/bind
-
+%dir %{chroot_prefix}/usr
+%dir %{chroot_prefix}/%{_libdir}
+%dir %{chroot_prefix}/%{_libdir}/bind
+%dir %{chroot_prefix}/%{_datadir}/GeoIP
+%{chroot_prefix}/proc
 %defattr(0660,root,named,01770)
-%dir /var/named/chroot/var/named
-
+%dir %{chroot_prefix}%{_localstatedir}/named
 %defattr(0660,named,named,0770)
-%dir /var/named/chroot/var/{tmp,log}
-
+%dir %{chroot_prefix}%{_localstatedir}/tmp
+%dir %{chroot_prefix}%{_localstatedir}/log
 %defattr(-,named,named,-)
-%dir /var/named/chroot/run/named
-/var/named/chroot/var/run
-
-%if %{with SDB}
-
-%files sdb-chroot
-%config(noreplace) %{_sysconfdir}/named-chroot.files
-%{_unitdir}/named-sdb-chroot.service
-%{_unitdir}/named-sdb-chroot-setup.service
-%{_libexecdir}/setup-named-chroot.sh
-
-%defattr(0664,root,named,-)
-%ghost %dev(c,1,3) %verify(not mtime) /var/named/chroot_sdb/dev/null
-%ghost %dev(c,1,8) %verify(not mtime) /var/named/chroot_sdb/dev/random
-%ghost %dev(c,1,9) %verify(not mtime) /var/named/chroot_sdb/dev/urandom
-%ghost %dev(c,1,5) %verify(not mtime) /var/named/chroot_sdb/dev/zero
-
-%defattr(0640,root,named,0750)
-%dir /var/named/chroot_sdb
-%dir /var/named/chroot_sdb/{dev,etc,var,run}
-%dir /var/named/chroot_sdb/etc/{named,pki}
-%dir /var/named/chroot_sdb/etc/pki/dnssec-keys
-%dir /var/named/chroot_sdb/etc/crypto-policies
-%dir /var/named/chroot_sdb/etc/crypto-policies/back-ends
-%ghost %config(noreplace) /var/named/chroot_sdb/etc/named.conf
-
-%defattr(0660,root,named,01770)
-%dir /var/named/chroot_sdb/var/named
-
-%defattr(-,root,root,-)
-%dir /var/named/chroot_sdb/{usr,%{_libdir}}
-%dir /var/named/chroot_sdb/%{_libdir}/bind
-
-%defattr(0660,named,named,0770)
-%dir /var/named/chroot_sdb/var/{tmp,log}
-
-%defattr(-,named,named,-)
-%dir /var/named/chroot_sdb/run/named
-/var/named/chroot_sdb/var/run
-
-%endif #end SDB
+%dir %{chroot_prefix}/run/named
+%{chroot_prefix}%{_localstatedir}/run
 
 %if %{with PKCS11}
-
 %files pkcs11
 %{_sbindir}/named-pkcs11
-%{_sbindir}/dnssec*pkcs11
-%{_sbindir}/pkcs11-*
-%{_libdir}/libdns-pkcs11.so.1110*
-%{_libdir}/libisc-pkcs11.so.1105*
 %{_unitdir}/named-pkcs11.service
+%{_mandir}/man8/named-pkcs11.8*
 %{_libexecdir}/setup-named-softhsm.sh
-%{_mandir}/man8/*pkcs11*.8*
+
+%files pkcs11-utils
+%{_sbindir}/dnssec*pkcs11
+%{_sbindir}/pkcs11-destroy
+%{_sbindir}/pkcs11-keygen
+%{_sbindir}/pkcs11-list
+%{_sbindir}/pkcs11-tokens
+%{_mandir}/man8/pkcs11*.8*
+%{_mandir}/man8/dnssec*-pkcs11.8*
+
+%files pkcs11-libs
+%{_libdir}/libdns-pkcs11-%{version}*.so
+%{_libdir}/libns-pkcs11-%{version}*.so
 
 %files pkcs11-devel
-%{_libdir}/lib*-pkcs11.so
 %{_includedir}/bind9/pk11/*.h
-%{_includedir}/bind9/pkcs11
 %exclude %{_includedir}/bind9/pk11/site.h
+%{_includedir}/bind9/pkcs11
+%{_libdir}/libdns-pkcs11.so
+%{_libdir}/libns-pkcs11.so
+%endif
 
-%endif #end PKCS11
-
-%if %{with EXPORT_LIBS}
+%if %{with DLZ}
+%files dlz-filesystem
+%{_libdir}/{named,bind}/dlz_filesystem_dynamic.so
 
-%files export-libs
-%dir %{_libdir}/%{_export_dir}
-%{_libdir}/%{_export_dir}/libdns-export.so.1110*
-%{_libdir}/%{_export_dir}/libirs-export.so.161*
-%{_libdir}/%{_export_dir}/libisc-export.so.1105*
-%{_libdir}/%{_export_dir}/libisccfg-export.so.163*
+%files dlz-mysql
+%{_libdir}/{named,bind}/dlz_mysql_dynamic.so
+%doc build/contrib/dlz/modules/doc/mysql
+%{_libdir}/{named,bind}/dlz_mysqldyn_mod.so
+%doc build/contrib/dlz/modules/doc/mysqldyn
 
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf
+%files dlz-ldap
+%{_libdir}/{named,bind}/dlz_ldap_dynamic.so
+%doc contrib/dlz/modules/ldap/testing/*
 
-%files export-devel
-%{_libdir}/%{_export_dir}/lib*-export.so
-%{_includedir}/%{_export_dir}/{dns,dst,irs,isc,isccfg}
-%{_includedir}/%{_export_dir}/pk11/site.h
-%{_includedir}/%{_export_dir}/config.h
-%attr(0755,root,root) %{_bindir}/isc-export-config.sh
-%{_bindir}/bind9-export-config
-%{_mandir}/man1/*-export-config*.1*
+%files dlz-sqlite3
+%{_libdir}/{named,bind}/dlz_sqlite3_dynamic.so
+%doc contrib/dlz/modules/sqlite3/testing/*
 
-%endif #end EXPORT_LIBS
+%endif
 
 %files -n python3-bind
 %{python3_sitelib}/*.egg-info
 %{python3_sitelib}/isc/
 
+%if %{with DOC}
+%files doc
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/Bv9ARM.html
+%doc %{_pkgdocdir}/html
+%endif
+%if %{with DOCPDF}
+%doc %{_pkgdocdir}/Bv9ARM.pdf
+%endif
 
 %changelog
-* Sat Jul 24 2021 jiangheng <jiangheng12@huawei.com> - 9.11.21-12
+* Fri Mar 15 2024 chengyechun <chengyechun1@huawei.com> - 32:9.16.23-21
+- Type:CVE
+- CVE:CVE-2023-6516 CVE-2023-4408 CVE-2023-5517 CVE-2023-5680 CVE-2023-5679 CVE-50387 CVE-2023-50868
+- SUG:NA
+- DESC:fix CVE-2023-6516 CVE-2023-4408 CVE-2023-5517 CVE-2023-5680 CVE-2023-5679 CVE-50387 CVE-2023-50868 and sync some patches from upstream
+
+* Sat Sep 23 2023 zhanghao <zhanghao383@huawei.com> - 32:9.16.23-20
+- Type:CVE
+- CVE:CVE-2023-3341
+- SUG:NA
+- DESC:fix CVE-2023-3341
+
+* Mon Sep 04 2023 chengyechun <chengyechun1@huawei.com> - 32:9.16.23-19
 - Type:bugfix
-- ID:NA
+- CVE:NA
 - SUG:NA
-- DESC:remove buildrequires gdb
+- DESC:Disable the internal memory allocator by default
 
-* Wed May 26 2021 jiangheng <jiangheng12@huawei.com> - 9.11.21-11
+* Mon Jun 26 2023 zhanghao <zhanghao383@huawei.com> - 32:9.16.23-18
 - Type:CVE
-- ID:NA
+- CVE:CVE-2023-2911 CVE-2023-2828
 - SUG:NA
-- DESC:fix CVE-2021-25214 CVE-2021-25215
+- DESC:fix CVE-2023-2911 CVE-2023-2828
 
-* Thu May 22 2021 jiangheng <jiangheng12@huawei.com> - 9.11.21-10
+* Tue Apr 11 2023 zhanghao <zhanghao383@huawei.com> - 32:9.16.23-17
 - Type:bugfix
-- ID:NA
+- CVE:NA
 - SUG:NA
-- DESC:remove unnecessary dependencies
+- DESC: Don't perform arithmetic on NULL pointers
+Accept 'in=NULL' with 'inlen=0' in isc_{half}siphash24
+Fix a use-after-free bug in dns_zonemgr_releasezone()
+Fix dns_fwdtable_addfwd() error path cleanup bug
+Detach the views in zone_shutdown(), not in zone_free()
+Detach the zone views outside of the zone lock
+delay trust anchor management until zones are loaded
+In hmac_createctx free ctx on isc_hmac_init failure
+Fix dns_kasp_attach / dns_kasp_detach usage
+Fix backport error in 84929d1c
+Fix a cleanup bug when isc_task_create() fails in dns_catz_new_zones()
+Searching catzs->zones requires a read lock
+Fix view's zones reverting bug during reconfiguration
+
+* Sat Feb 25 2023 zhanghao <zhanghao383@huawei.com> - 32:9.16.23-16
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC: backport some patches from community
 
-* Thu May 20 2021 jiangheng <jiangheng12@huawei.com> - 9.11.21-9
+* Thu Feb 09 2023 zhanghao<zhanghao383@huawei.com> - 32:9.16.23-15
 - Type:bugfix
-- ID:NA
+- CVE:NA
+- SUG:NA
+- DESC:fix output expected information when install bing-sdborbind-sdb-chroot
+
+* Fri Feb 03 2023 zhanghao<zhanghao383@huawei.com> - 32:9.16.23-14
+- Type:CVE
+- CVE:CVE-2022-3736 CVE-2022-3924 CVE-2022-3094
 - SUG:NA
-- DESC:remove useless bind-sdb package
+- DESC:fix CVE-2022-3736 CVE-2022-3924 CVE-2022-3094
 
-* Thu Mar 25 2021 liulong <liulong20@huawei.com> - 9.11.21-8
+* Wed Dec 28 2022 huangyu <huangyu106@huawei.com> - 32:9.16.23-13
 - Type:bugfix
-- ID:NA
+- CVE:NA
+- SUG:NA
+- DESC: backport some patches from community
+
+* Sat Nov 26 2022 jiangheng <jiangheng14@huawei.com> - 32:9.16.23-12
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC: backport some patches from community
+
+* Thu Sep 29 2022 huangyu <huangyu106@huawei.com> - 32:9.16.23-11
+- Type:bugfix
+- CVE:NA
 - SUG:NA
-- DESC:remove sensitive words.
+- DESC: Fix catalog zone reconfiguration crash
+Improve the logging on failed TCP accept
+Separate the locked parts of dns_zone_catz_enable-di
+Check if key-metadata is modified before writing
+Fix CID-352776 Concurrent data access violations
+Require valid key for dst_key functions
 
-* Thu Feb 18 2021 liulong <liulong20@huawei.com> - 9.11.21-7
+* Wed Sep 28 2022 huangyu<huangyu106@huawei.com> - 32:9.16.23-10
+- DESC:fix CVE-2022-2881 CVE-2022-2906 CVE-2022-2795 CVE-2022-38177 CVE-2022-38178
+CVE-2022-3080
+
+* Wed Aug 31 2022 yangchenguang <yangchenguang@uniontech.com> - 32:9.16.23-9
+- DESC: fix downgrade bind-utils conflict bind-dnssec-doc
+
+* Mon Apr 11 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-8
 - Type:CVE
-- ID:NA
+- CVE:CVE-2021-25220
+- SUG:NA
+- DESC:fix CVE-2021-25220
+
+* Wed Mar 30 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-7
+- Type:CVE
+- CVE:CVE-2022-0396
 - SUG:NA
-- DESC:Fix CVE-2020-8625
+- DESC:fix CVE-2022-0396
 
-* Thu Jan 7 2021 hanzhijun <hanzhijun1@huawei.com> - 9.11.21-6
+* Wed Feb 09 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-6
 - Type:bugfix
-- ID:NA
+- CVE:NA
 - SUG:NA
-- DESC:Fix the difference at the macro definition using clock gettime instead of gettimeofda
+- DESC:limit number of test threads to reduce test execution time
 
-* Tue Dec 15 2020 xihaochen <xihaochen@huawei.com> - 9.11.21-5
-- Type:requirement
-- ID:NA
+* Tue Jan 18 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-5
+- Type:bugfix
+- CVE:NA
 - SUG:NA
-- DESC: update url
+- DESC:add systemd buildrequire
 
-* Wed Dec 09 2020 gaihuiying <gaihuiying1@huawei.com> - 9.11.21-4
-- Type:requirement
-- ID:NA
+* Mon Jan 17 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-4
+- Type:bugfix
+- CVE:NA
 - SUG:NA
-- DESC:open UNITTEST 
+- DESC:remove not enabled option in named.conf
 
-* Wed Nov 18 2020 gaihuiying <gaihuiying1@huawei.com> - 9.11.21-3
-- Type:requirement
-- ID:NA
+* Fri Jan 14 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-3
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:remove set-timeout-inteval-of-some-cases-to-600s.patch
+       specify ISC_TASK_WORKERS value to fix some test cases execute time too long
+
+* Mon Jan 10 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-2
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:set timeout inteval of some cases to 600s
+
+* Thu Dec 02 2021 jiangheng<jiangheng12@huawei.com> - 9.16.23-1
+- DESC:update to 9.16.23
+
+* Wed Nov 17 2021 jiangheng<jiangheng12@huawei.com> - 9.11.21-4.h9
+- Type:CVE
+- CVE:CVE-2021-25219
+- SUG:NA
+- DESC:fix CVE-2021-25219
+
+* Wed Nov 03 2021 jiangheng<jiangheng12@huawei.com> - 9.11.21-4.h8
+- Type:CVE
+- CVE:CVE-2021-25219
+- SUG:NA
+- DESC:fix CVE-2021-25219
+
+* Tue Aug 03 2021 jiangheng<jiangheng12@huawei.com> - 9.11.21-4.h7
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:give zspill its own lock
+       fix tasan error
+       fix data race
+       Correctly encode LOC records with non integer negative
+       isc_ratelimiter needs to hold a reference to its task
+       dig +bufsize=0 failed to disable EDNS as a side effect
+       Lock access to ctx->blocked as it is updated by multiple threads
+       Only read dns_master_indent and dns_master_indentstr in named
+       Defer read of zl->server and zl->reconfig
+       Break lock order loop by sending TAT in an event
+       Handle DNS_R_NCACHENXRRSET in fetch_callback_{dnskey,validator}()
+       Unload a zone if a transfer breaks its SOA record
+       Address inconsistencies in checking added RRsets
+       dns_rdata_tostruct() should reject rdata with DNS_RDATA_UPDATE set
+
+* Fri Jun 04 2021 jiangheng<jiangheng12@huawei.com> - 9.11.21-4.h6
+- Type:bugfix
+- CVE:
 - SUG:NA
-- DESC:remove geoip dependency from bind
+- DESC:set print-time default to yes
 
-* Tue Sep 22 2020 lunankun <lunankun@huawei.com> - 9.11.21-2
+* Wed May 19 2021 jiangheng<jiangheng12@huawei.com> - 9.11.21-4.h5
+- Type:CVE
+- CVE:CVE-2021-25214 CVE-2021-25215
+- SUG:NA
+- DESC:fix CVE-2021-25214 CVE-2021-25215
+
+* Mon Apr 26 2021 jiangheng<jiangheng12@huawei.com> - 9.11.21-4.h4
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix no response when execute rndc addzone command
+
+* Mon Apr 12 2021 zhujunhao<zhujunhao8@huawei.com> - 9.11.21-4.h3
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:remove GeoIP and libdb
+
+* Mon Apr 12 2021 jiangheng<jiangheng12@huawei.com> - 9.11.21-4.h2
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix the upgrade installtion failure
+
+* Wed Apr 07 2021 jiangheng<jiangheng12@huawei.com> - 9.11.21-4.h1
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:update version to 9.11.21-4.h1
+
+* Wed Mar 10 2021 zhouyihang<zhouyihang3@huawei.com> - 9.11.4-17.h11
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:set geoip-use-ecs default to no
+
+* Tue Mar 09 2021 yuboyun<yuboyun@huawei.com> - 9.11.4-17.h10
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:free rbuf 
+       mempool didn t work for sizes less than sizeof void 
+       Reset dig exit code after a TCP connection is establ 
+       Prevent a race after zone load 
+       Fix isc_buffer_copyregion for auto reallocated buffe 
+       free tmpzonename and restart_master 
+       errors initalizing badcaches were not caught or clea 
+       set freed pointers to NULL 
+       cleanup allocated memory on error 
+       Fix a small memleak in delv 
+       pass the correct object to cfg_obj_log 
+       Try to fix crash at sigchase topdown 
+       Do not fail on NULL passed to OpenSSL_free 
+       error out if there are extra command line options 
+       correct errno to result translation 
+       properly detect period as last character in filename 
+       fail if ctime output is truncted 
+       Fix a race in fctx_cancelquery 
+       add missing MAYBE_UNLOCK 
+       Fix race in unix socket code when closing a socket t 
+       fix Ed448 length values for precomputed ASN.1 prefix 
+       don t overwrite the dns_master_loadfile result befor 
+       address NULL pointer dereferences 
+       address potential NULL pointer dereference 
+       Prevent query loops for misbehaving servers 
+       Lock di  manager buffer_lock before accessing b 
+       Request exclusive access when crashing via fatal 
+       Assign fctx client when fctx is created rather when  
+       lock access to fctx nqueries 
+       acquire task lock before calling push_readyq for tas 
+       Call dns_dbiterator_destroy earlier to prevent poten 
+       Handle catopen errors 
+       Fixed crash when querying for non existing domain in 
+       Fixed rebinding protection bug when using forwarder  
+       initialize sockaddrdscp to prevent spurious output f 
+       Lock access to answer to silence TSAN 
+       Fix a data access race in resolver 
+       Address race between zone_maintenance and dns_zone_s 
+       rbtdb cleanup_dead_nodes should ignore alive nodes o 
+       make sure new_zone_lock is locked before unlocking i 
+       Prevent crash on dst initialization failure 
+       IPSECKEY require non zero length public keys 
+       NSEC3PARAM check that saltlen is consistent with the 
+       A6 return FORMERR in fromwire if bits are non zero 
+       Cast the original rcode to dns_ttl_t when setting ex 
+       Lock on msg SELECT_POKE_CLOSE as it triggers a tsan  
+       Lock access when updating reading manager epoll_even 
+       Take complete ownership of aclp before calling destr 
+       Take complete ownership of validatorp before calling 
+       Address lock order inversion 
+       It appears that you can t change what you are pollin 
+       counter used was read without the lock being held 
+       Missing locks in ns_lwresd_shutdown 
+       Use atomics to update counters 
+       Obtain a lock on the quota structure 
+       The node lock was released too early 
+       Address lock order inversion between the keytable an 
+       Pause dbiterator to release rwlock to prevent lock o 
+       Address lock order reversals when shutting down a vi 
+       Hold qid lock when calling deref_portentry as 
+       Lock zone before calling zone_namerd_tostr 
+       Address TSAN error between dns_rbt_findnode and subt 
+       Address data race in dns_stats_detach over reference 
+       Lock check of DNS_ZONEFLG_EXITING flag 
+
+* Mon Feb 22 2021 zhouyihang<zhouyihang3@huawei.com> - 9.11.4-17.h9
 - Type:CVE
-- ID:CVE-2020-8622CVE-2020-8623 CVE-2020-8624
+- CVE:CVE-2020-8625
 - SUG:NA
-- DESC:fix CVE-2020-8622 CVE-2020-8623 CVE-2020-8624
+- DESC:fix CVE-2020-8625
 
-* Mon Jul 27 2020 gaihuiying <gaihuiying1@huawei.com> - 9.11.21-1
-- Type:requirement
+* Mon Jan 4 2021 zhouyihang<zhouyihang3@huawei.com> - 9.11.4-17.h8
+- Type:CVE
+- CVE:CVE-2020-8619
+- SUG:NA
+- DESC:fix CVE-2020-8619
+
+* Mon Dec 21 2020 xihaochen<xihaochen@huawei.com> - 9.11.4-17.h7
+- Type:CVE
+- CVE:CVE-2020-8624
+- SUG:NA
+- DESC:fix CVE-2020-8624
+
+* Wed Dec 02 2020 yuboyun<yuboyun@huawei.com> - 9.11.4-17.h6
+- Type:bugfix
+- CVE:NA
+- SUG:restart
+- DESC:fix the difference at the macro definition using clock gettime instead of gettimeofday
+
+* Wed Nov 18 2020 yuboyun<yuboyun@huawei.com> - 9.11.4-17.h5
+- Type:CVE
+- CVE:CVE-2020-8623
+- SUG:restart
+- DESC:fix CVE-2020-8623
+
+* Tue Sep 22 2020 yuboyun<yuboyun@huawei.com> - 9.11.4-17.h4
+- Type:CVE
+- CVE:CVE-2020-8622
+- SUG:NA
+- DESC:add %patch6032 -p1 to fix CVE-2020-8622
+
+* Wed Sep 16 2020 yuboyun<yuboyun@huawei.com> - 9.11.4-17.h3
+- Type:CVE
+- CVE:CVE-2020-8622
+- SUG:restart
+- DESC:fix CVE-2020-8622
+
+* Tue Jun 09 2020 gaihuiying<gaihuiying1@huawei.com> - 9.11.4-17.h2
+- Type:cves
+- ID:CVE-2018-5744 CVE-2019-6467 CVE-2019-6471 CVE-2019-6477
+- SUG:restart
+- DESC:backport patch to fix CVE-2018-5744 CVE-2019-6467 CVE-2019-6471 CVE-2019-6477
+
+* Thu May 28 2020 gaihuiying<gaihuiying1@huawei.com> - 9.11.4-17.h1
+- Type:cves
+- ID:CVE-2020-8616 CVE-2020-8617
+- SUG:restart
+- DESC:backport patch to fix CVE-2020-8616 CVE-2020-8617
+
+* Tue Mar 31 2020 liaichun<liaichun@huawei.com> - 9.11.4-17
+- Type:bugfix
+- ID:NA
+- SUG:restart
+- DESC: modify named.root.key permissions from 600 to 644
+
+* Thu Mar 26 2020 liaichun<liaichun@huawei.com> - 9.11.4-16
+- Type:bugfix
+- ID:NA
+- SUG:restart
+- DESC:fix  named service hangs and crashes
+
+* Sat Mar 21 2020 liaichun<liaichun@huawei.com> - 9.11.4-15
+- Type:bugfix
 - ID:NA
 - SUG:NA
-- DESC:update c-ares version to 9.11.21
+- DESC: modify key file permissions from 644 to 600
+
+* Fri Mar 20 2020 wangli<wangli221@huawei.com> - 9.11.4-14
+- Type:bugfix
+- ID:NA
+- SUG:restart
+- DESC:Reenable crypto rand for DHCP, disable just entropy check
 
 * Thu Mar 19 2020 songnannan <songnannan2@huawei.com> - 9.11.4-13
 - add gdb in buildrequires
diff --git a/bind.yaml b/bind.yaml
deleted file mode 100644
index a6bede2b221fa262cf59c963f19cc003542cd8cd..0000000000000000000000000000000000000000
--- a/bind.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-version_control: git
-src_repo: https://gitlab.isc.org/isc-projects/bind9.git
-tag_prefix: bind9-
-seperator: _
diff --git a/bind93-rh490837.patch b/bind93-rh490837.patch
index 6ea55ba70fd10a25773082277cded77751dcc34f..4b32b4db46334b37d78ee9bcd812b03163b8c5a9 100644
--- a/bind93-rh490837.patch
+++ b/bind93-rh490837.patch
@@ -1,81 +1,34 @@
-diff --git a/lib/isc/include/isc/stdio.h b/lib/isc/include/isc/stdio.h
-index 1f44b5a..a3625f9 100644
---- a/lib/isc/include/isc/stdio.h
-+++ b/lib/isc/include/isc/stdio.h
-@@ -69,6 +69,9 @@ isc_stdio_sync(FILE *f);
-  * direct counterpart in the stdio library.
-  */
- 
-+isc_result_t
-+isc_stdio_fgetc(FILE *f, int *ret);
-+
- ISC_LANG_ENDDECLS
- 
- #endif /* ISC_STDIO_H */
 diff --git a/lib/isc/lex.c b/lib/isc/lex.c
-index a8955bc..fc6103b 100644
+index cd44fe3..5b7c539 100644
 --- a/lib/isc/lex.c
 +++ b/lib/isc/lex.c
-@@ -434,17 +434,14 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
- 			if (source->is_file) {
- 				stream = source->input;
+@@ -27,6 +27,8 @@
+ #include <isc/string.h>
+ #include <isc/util.h>
  
--#if defined(HAVE_FLOCKFILE) && defined(HAVE_GETCUNLOCKED)
--				c = getc_unlocked(stream);
--#else
--				c = getc(stream);
--#endif
--				if (c == EOF) {
--					if (ferror(stream)) {
++#include "../errno2result.h"
++
+ typedef struct inputsource {
+ 	isc_result_t result;
+ 	bool is_file;
+@@ -422,7 +424,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
+ #endif /* if defined(HAVE_FLOCKFILE) && defined(HAVE_GETC_UNLOCKED) */
+ 				if (c == EOF) {
+ 					if (ferror(stream)) {
 -						source->result = ISC_R_IOERROR;
--						result = source->result;
-+				result = isc_stdio_fgetc(stream, &c);
-+
-+				if (result != ISC_R_SUCCESS) {
-+					if (result != ISC_R_EOF) {
-+						source->result = result;
++						source->result = isc__errno2result(errno);
+ 						result = source->result;
  						goto done;
  					}
-+
- 					source->at_eof = true;
- 				}
- 			} else {
 diff --git a/lib/isc/unix/errno2result.c b/lib/isc/unix/errno2result.c
-index 2f12bcc..5bfd648 100644
+index e3e2644..5e58600 100644
 --- a/lib/isc/unix/errno2result.c
 +++ b/lib/isc/unix/errno2result.c
-@@ -40,6 +40,7 @@ isc___errno2result(int posixerrno, bool dolog,
- 	case EINVAL:		/* XXX sometimes this is not for files */
+@@ -37,6 +37,7 @@ isc___errno2result(int posixerrno, bool dolog, const char *file,
+ 	case EINVAL: /* XXX sometimes this is not for files */
  	case ENAMETOOLONG:
  	case EBADF:
 +	case EISDIR:
  		return (ISC_R_INVALIDFILE);
  	case ENOENT:
  		return (ISC_R_FILENOTFOUND);
-diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c
-index e60fa65..77f0b13 100644
---- a/lib/isc/unix/stdio.c
-+++ b/lib/isc/unix/stdio.c
-@@ -149,3 +149,22 @@ isc_stdio_sync(FILE *f) {
- 		return (isc__errno2result(errno));
- }
- 
-+isc_result_t
-+isc_stdio_fgetc(FILE *f, int *ret) {
-+	int r;
-+	isc_result_t result = ISC_R_SUCCESS;
-+
-+#if defined(HAVE_FLOCKFILE) && defined(HAVE_GETCUNLOCKED)
-+	r = fgetc_unlocked(f);
-+#else
-+	r = fgets(f);
-+#endif
-+
-+	if (r == EOF)
-+		result = ferror(f) ? isc__errno2result(errno) : ISC_R_EOF;
-+
-+	*ret = r;
-+
-+	return result;
-+}
-+
diff --git a/bind97-rh478718.patch b/bind97-rh478718.patch
deleted file mode 100644
index dfc41653fe7219b8a4db2775d51cab9dc48aecc7..0000000000000000000000000000000000000000
--- a/bind97-rh478718.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 26c509e..c1bfd62 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4152,6 +4152,10 @@ if test "yes" = "$use_atomic"; then
- 	AC_MSG_RESULT($arch)
- fi
- 
-+if test ! "$arch" = "x86_64" -a "$have_xaddq" = "yes"; then
-+	AC_MSG_ERROR([XADDQ present but disabled by Fedora patch!])
-+fi
-+
- if test "yes" = "$have_atomic"; then
- 	AC_MSG_CHECKING([compiler support for inline assembly code])
- 
-diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
-index c902d46..9c7c342 100644
---- a/lib/isc/include/isc/platform.h.in
-+++ b/lib/isc/include/isc/platform.h.in
-@@ -284,19 +284,25 @@
-  * If the "xaddq" operation (64bit xadd) is available on this architecture,
-  * ISC_PLATFORM_HAVEXADDQ will be defined.
-  */
--@ISC_PLATFORM_HAVEXADDQ@
- 
- /*
-- * If the 32-bit "atomic swap" operation is available on this
-- * architecture, ISC_PLATFORM_HAVEATOMICSTORE" will be defined.
-+ * If the 64-bit "atomic swap" operation is available on this
-+ * architecture, ISC_PLATFORM_HAVEATOMICSTOREQ" will be defined.
-  */
--@ISC_PLATFORM_HAVEATOMICSTORE@
-+
-+#ifdef __x86_64__
-+#define ISC_PLATFORM_HAVEXADDQ 1
-+#define ISC_PLATFORM_HAVEATOMICSTOREQ 1
-+#else
-+#undef ISC_PLATFORM_HAVEXADDQ
-+#undef ISC_PLATFORM_HAVEATOMICSTOREQ
-+#endif
- 
- /*
-- * If the 64-bit "atomic swap" operation is available on this
-+ * If the 32-bit "atomic swap" operation is available on this
-  * architecture, ISC_PLATFORM_HAVEATOMICSTORE" will be defined.
-  */
--@ISC_PLATFORM_HAVEATOMICSTOREQ@
-+@ISC_PLATFORM_HAVEATOMICSTORE@
- 
- /*
-  * If the "compare-and-exchange" operation is available on this architecture,
diff --git a/bind97-rh645544.patch b/bind97-rh645544.patch
index c15eeb5308b0d9049a5928515dc782b4b1725237..e2ae978bceb2e6f598551728a64f92e0254677fe 100644
--- a/bind97-rh645544.patch
+++ b/bind97-rh645544.patch
@@ -1,31 +1,31 @@
 diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
-index ecb3ddb..f7f73cd 100644
+index 31549c6..65a14b6 100644
 --- a/lib/dns/resolver.c
 +++ b/lib/dns/resolver.c
-@@ -1456,7 +1456,7 @@ log_edns(fetchctx_t *fctx) {
+@@ -1762,7 +1762,7 @@ log_edns(fetchctx_t *fctx) {
  	 */
  	dns_name_format(&fctx->domain, domainbuf, sizeof(domainbuf));
  	isc_log_write(dns_lctx, DNS_LOGCATEGORY_EDNS_DISABLED,
 -		      DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
 +		      DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(1),
- 		      "success resolving '%s' (in '%s'?) after %s",
- 		      fctx->info, domainbuf, fctx->reason);
- 
-@@ -4667,7 +4667,7 @@ log_lame(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo) {
+ 		      "success resolving '%s' (in '%s'?) after %s", fctx->info,
+ 		      domainbuf, fctx->reason);
+ }
+@@ -5298,7 +5298,7 @@ log_lame(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo) {
  	dns_name_format(&fctx->domain, domainbuf, sizeof(domainbuf));
  	isc_sockaddr_format(&addrinfo->sockaddr, addrbuf, sizeof(addrbuf));
  	isc_log_write(dns_lctx, DNS_LOGCATEGORY_LAME_SERVERS,
 -		      DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
 +		      DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(1),
- 		      "lame server resolving '%s' (in '%s'?): %s",
- 		      namebuf, domainbuf, addrbuf);
+ 		      "lame server resolving '%s' (in '%s'?): %s", namebuf,
+ 		      domainbuf, addrbuf);
  }
-@@ -4685,7 +4685,7 @@ log_formerr(fetchctx_t *fctx, const char *format, ...) {
+@@ -5316,7 +5316,7 @@ log_formerr(fetchctx_t *fctx, const char *format, ...) {
  	isc_sockaddr_format(&fctx->addrinfo->sockaddr, nsbuf, sizeof(nsbuf));
  
  	isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
 -		      DNS_LOGMODULE_RESOLVER, ISC_LOG_NOTICE,
 +		      DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(1),
- 		      "DNS format error from %s resolving %s for %s: %s",
- 		      nsbuf, fctx->info, fctx->clientstr, msgbuf);
+ 		      "DNS format error from %s resolving %s for %s: %s", nsbuf,
+ 		      fctx->info, fctx->clientstr, msgbuf);
  }
diff --git a/bind97-rh669163.patch b/bind97-rh669163.patch
deleted file mode 100644
index 125049fb722495f3eddcff9beb8ea1310274613d..0000000000000000000000000000000000000000
--- a/bind97-rh669163.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up bind-9.7.2-P3/lib/lwres/lwconfig.c.rh669163 bind-9.7.2-P3/lib/lwres/lwconfig.c
---- bind-9.7.2-P3/lib/lwres/lwconfig.c.rh669163	2011-01-28 14:48:38.934472578 +0100
-+++ bind-9.7.2-P3/lib/lwres/lwconfig.c	2011-01-28 14:49:50.421326035 +0100
-@@ -612,6 +612,10 @@ lwres_conf_parse(lwres_context_t *ctx, c
- 			break;
- 		}
- 
-+		/* Ignore options with no parameters */
-+		if (stopchar == '\n')
-+			continue;
-+
- 		if (strlen(word) == 0U)
- 			rval = LWRES_R_SUCCESS;
- 		else if (strcmp(word, "nameserver") == 0)
diff --git a/bind99-rh640538.patch b/bind99-rh640538.patch
deleted file mode 100644
index 5066a1450a3fdb4f7130b483cf0e47fe29a00440..0000000000000000000000000000000000000000
--- a/bind99-rh640538.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
-index 1079421..f11abd1 100644
---- a/bin/dig/dig.docbook
-+++ b/bin/dig/dig.docbook
-@@ -1177,6 +1177,39 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
-     </para>
-   </refsection>
- 
-+  <refsection><info><title>RETURN CODES</title></info>
-+    <para>
-+      <command>Dig</command> return codes are:
-+      <variablelist>
-+        <varlistentry>
-+          <listitem>
-+            <para>0: Everything went well, including things like NXDOMAIN</para>
-+          </listitem>
-+        </varlistentry>
-+        <varlistentry>
-+          <listitem>
-+            <para>1: Usage error</para>
-+          </listitem>
-+        </varlistentry>
-+        <varlistentry>
-+          <listitem>
-+            <para>8: Couldn't open batch file</para>
-+          </listitem>
-+        </varlistentry>
-+        <varlistentry>
-+          <listitem>
-+            <para>9: No reply from server</para>
-+          </listitem>
-+        </varlistentry>
-+        <varlistentry>
-+          <listitem>
-+            <para>10: Internal error</para>
-+          </listitem>
-+        </varlistentry>
-+      </variablelist>
-+    </para>
-+  </refsection>
-+
-   <refsection><info><title>FILES</title></info>
- 
-     <para><filename>/etc/resolv.conf</filename>
diff --git a/bugfix-limit-numbers-of-test-threads.patch b/bugfix-limit-numbers-of-test-threads.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6115096cc13bdc365035da31befd4c4702bea710
--- /dev/null
+++ b/bugfix-limit-numbers-of-test-threads.patch
@@ -0,0 +1,39 @@
+From 1d9843b58800b51e1366fba5e0bdef5f0336efaf Mon Sep 17 00:00:00 2001
+From: jiangheng <jiangheng12@huawei.com>
+Date: Wed, 9 Feb 2022 16:21:10 +0800
+Subject: [PATCH] limit numbers of test threads to reduce execution time
+
+---
+ lib/dns/tests/dnstest.c | 2 +-
+ lib/ns/tests/nstest.c   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
+index 465ce9f..263b0d6 100644
+--- a/lib/dns/tests/dnstest.c
++++ b/lib/dns/tests/dnstest.c
+@@ -114,7 +114,7 @@ cleanup_managers(void) {
+ static isc_result_t
+ create_managers(void) {
+ 	isc_result_t result;
+-	ncpus = isc_os_ncpus();
++	ncpus = ISC_MIN(isc_os_ncpus(), 8);
+ 
+ 	CHECK(isc_managers_create(dt_mctx, ncpus, 0, &netmgr, &taskmgr));
+ 	CHECK(isc_timermgr_create(dt_mctx, &timermgr));
+diff --git a/lib/ns/tests/nstest.c b/lib/ns/tests/nstest.c
+index 238450d..b5fa00c 100644
+--- a/lib/ns/tests/nstest.c
++++ b/lib/ns/tests/nstest.c
+@@ -243,7 +243,7 @@ create_managers(void) {
+ 	in_port_t port = 5300 + isc_random8();
+ 	ns_listenlist_t *listenon = NULL;
+ 	isc_event_t *event = NULL;
+-	ncpus = isc_os_ncpus();
++	ncpus = ISC_MIN(isc_os_ncpus(), 8);
+ 
+ 	CHECK(isc_managers_create(mctx, ncpus, 0, &netmgr, &taskmgr));
+ 	CHECK(isc_task_create_bound(taskmgr, 0, &maintask, 0));
+-- 
+1.8.3.1
+
diff --git a/bugfix-named-log-time.patch b/bugfix-named-log-time.patch
deleted file mode 100644
index a5df24f2fb35d8b2882bb816a05b27431dce8ad1..0000000000000000000000000000000000000000
--- a/bugfix-named-log-time.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -upNr b/lib/isc/include/isc/util.h a/lib/isc/include/isc/util.h
---- b/lib/isc/include/isc/util.h	2019-07-30 19:52:09.600000000 +0800
-+++ a/lib/isc/include/isc/util.h	2019-07-30 21:39:03.400000000 +0800
-@@ -233,6 +233,7 @@
-  * Time
-  */
- #define TIME_NOW(tp) 	RUNTIME_CHECK(isc_time_now((tp)) == ISC_R_SUCCESS)
-+#define TIME_REAL_NOW(tp) 	RUNTIME_CHECK(isc_time_real_now((tp)) == ISC_R_SUCCESS)
- #ifdef CLOCK_BOOTTIME
- #define TIME_MONOTONIC(tp) 	RUNTIME_CHECK(isc_time_boottime((tp)) == ISC_R_SUCCESS)
- #endif
-diff -upNr b/lib/isc/log.c a/lib/isc/log.c
---- b/lib/isc/log.c	2019-07-30 19:52:09.610000000 +0800
-+++ a/lib/isc/log.c	2019-07-30 21:39:03.410000000 +0800
-@@ -1498,7 +1498,7 @@ isc_log_doit(isc_log_t *lctx, isc_logcat
- 		    time_string[0] == '\0') {
- 			isc_time_t isctime;
- 
--			TIME_NOW(&isctime);
-+			TIME_REAL_NOW(&isctime);
- 			isc_time_formattimestamp(&isctime, time_string,
- 						 sizeof(time_string));
- 		}
-@@ -1545,7 +1545,7 @@ isc_log_doit(isc_log_t *lctx, isc_logcat
- 				 * which fall within the duplicate_interval
- 				 * range.
- 				 */
--				TIME_NOW(&oldest);
-+				TIME_REAL_NOW(&oldest);
- 				if (isc_time_subtract(&oldest, &interval,
- 						      &oldest)
- 				    != ISC_R_SUCCESS)
-@@ -1622,7 +1622,7 @@ isc_log_doit(isc_log_t *lctx, isc_logcat
- 					strlcpy(message->text, lctx->buffer,
- 						size);
- 
--					TIME_NOW(&message->time);
-+					TIME_REAL_NOW(&message->time);
- 
- 					ISC_LINK_INIT(message, link);
- 					ISC_LIST_APPEND(lctx->messages,
-diff -upNr b/lib/isc/unix/include/isc/time.h a/lib/isc/unix/include/isc/time.h
---- b/lib/isc/unix/include/isc/time.h	2019-07-30 19:52:09.600000000 +0800
-+++ a/lib/isc/unix/include/isc/time.h	2019-07-30 21:39:03.400000000 +0800
-@@ -149,6 +149,8 @@ isc_time_now(isc_time_t *t);
-  */
- 
- isc_result_t
-+isc_time_real_now(isc_time_t *t);
-+isc_result_t
- isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i);
- /*%<
-  * Set *t to the current absolute time + i.
-diff -upNr b/lib/isc/unix/time.c a/lib/isc/unix/time.c
---- b/lib/isc/unix/time.c	2019-07-30 19:52:09.600000000 +0800
-+++ a/lib/isc/unix/time.c	2019-07-30 21:39:03.400000000 +0800
-@@ -105,6 +129,50 @@ isc_time_isepoch(const isc_time_t *t) {
- 
- 
- isc_result_t
-+isc_time_real_now(isc_time_t *t) {
-+	struct timeval tv;
-+	char strbuf[ISC_STRERRORSIZE];
-+
-+	REQUIRE(t != NULL);
-+
-+	if (gettimeofday(&tv, NULL) == -1) {
-+		isc__strerror(errno, strbuf, sizeof(strbuf));
-+		UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", strbuf);
-+		return (ISC_R_UNEXPECTED);
-+	}
-+
-+	/*
-+	 * Does POSIX guarantee the signedness of tv_sec and tv_usec?  If not,
-+	 * then this test will generate warnings for platforms on which it is
-+	 * unsigned.  In any event, the chances of any of these problems
-+	 * happening are pretty much zero, but since the libisc library ensures
-+	 * certain things to be true ...
-+	 */
-+#if ISC_FIX_TV_USEC
-+	fix_tv_usec(&tv);
-+	if (tv.tv_sec < 0)
-+		return (ISC_R_UNEXPECTED);
-+#else
-+	if (tv.tv_sec < 0 || tv.tv_usec < 0 || tv.tv_usec >= US_PER_S)
-+		return (ISC_R_UNEXPECTED);
-+#endif
-+
-+	/*
-+	 * Ensure the tv_sec value fits in t->seconds.
-+	 */
-+	if (sizeof(tv.tv_sec) > sizeof(t->seconds) &&
-+	    ((tv.tv_sec | (unsigned int)-1) ^ (unsigned int)-1) != 0U)
-+		return (ISC_R_RANGE);
-+
-+	t->seconds = tv.tv_sec;
-+	t->nanoseconds = tv.tv_usec * NS_PER_US;
-+
-+	return (ISC_R_SUCCESS);
-+}
-+
-+
-+
-+isc_result_t
- isc_time_now(isc_time_t *t) {
- 	struct timeval tv;
- 	char strbuf[ISC_STRERRORSIZE];
diff --git a/bugfix-nslookup-norec.patch b/bugfix-nslookup-norec.patch
deleted file mode 100644
index a67899ad2437e7a87b92e7af96ae3656c9b0a89a..0000000000000000000000000000000000000000
--- a/bugfix-nslookup-norec.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
---- a/bin/dig/dighost.c.orig	2011-03-11 07:46:58.000000000 +0100
-+++ b/bin/dig/dighost.c	2011-10-28 14:31:29.806591603 +0200
-@@ -3291,8 +3291,13 @@
- 	} else {
- 		if (!l->ns_search_only) {
- 			fputs(l->cmdline, stdout);
--			printf(";; connection timed out; no servers could be "
--			       "reached\n");
-+			if (!next_origin(ISC_LIST_HEAD(l->q))) {
-+				printf(";; connection timed out; no servers could be "
-+					"reached\n");
-+			} else {
-+				printf(";; connection timed out; trying next "
-+					"origin\n");
-+			}
- 		}
- 		cancel_lookup(l);
- 		check_next_lookup(l);
diff --git a/codesign2021.txt b/codesign2021.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d021b564512488bfecbd6a0083affd51d51f92d6
--- /dev/null
+++ b/codesign2021.txt
@@ -0,0 +1,534 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFwq9BQBEADHjPDCwsHVtxnMNilgu187W8a9rYTMLgLfQwioSbjsF7dUJu8m
+r1w2stcsatRs7HBk/j26RNJagY2Jt0QufOQLlTePpTl6UPU8EeiJ8c15DNf45TMk
+pa/3MdIVpDnBioyD1JNqsI4z+yCYZ7p/TRVCyh5vCcwmt5pdKjKMTcu7aD2PtTtI
+yhTIetJavy1HQmgOl4/t/nKL7Lll2xtZ56JFUt7epo0h69fiUvPewkhykzoEf4UG
+ZFHSLZKqdMNPs/Jr9n7zS+iOgEXJnKDkp8SoXpAcgJ5fncROMXpxgY2U+G5rB9n0
+/hvV1zG+EP6OLIGqekiDUga84LdmR/8Cyc7DimUmaoIZXrAo0Alpt0aZ8GimdKmh
+qirIguJOSrrsZTeZLilCWu37fRIjCQ3dSMNyhHJaOhRJQpQOEDG7jHxFak7627aF
+UnVwBAOK3NlFfbomapXQm64lYNoONGrpV0ctueD3VoPipxIyzNHHgcsXDZ6C00sv
+SbuuS9jlFEDonA6S8tApKgkEJuToBuopM4xqqwHNJ4e6QoXYjERIgIBTco3r/76D
+o22ZxSK1m2m2i+p0gnWTlFn6RH+r6gfLwZRj8iR4fa0yMn3DztyTO6H8AiaslONt
+LV2kvkhBar1/6dzlBvMdiRBejrVnw+Jg2bOmYTncFN00szPOXbEalps8wwARAQAB
+tE1JbnRlcm5ldCBTeXN0ZW1zIENvbnNvcnRpdW0sIEluYy4gKFNpZ25pbmcga2V5
+LCAyMDE5LTIwMjApIDxjb2Rlc2lnbkBpc2Mub3JnPokCVAQTAQgAPhYhBK4/rHln
+EexZ/AB6pHS7a5pMuz04BQJcKvQUAhsDBQkD7JcABQsJCAcCBhUKCQgLAgQWAgMB
+Ah4BAheAAAoJEHS7a5pMuz0476oP/1+UaSHfe4WVHV43QaQ/z1rw7vg2aHEwyWJA
+1D1tBr9+LvfohswwWBLIjcKRaoXZ4pLBFjuiYHBTsdaAQFeQQvQTXMmBx21ZyUZj
+tjim8f9T1JhmIrMx6tF14NbqFpjw82Mv0rc8y74pdRvkdnFigqLKUoN2tFQlKeG+
+5T24zNwrGrlR3S7gnM47nD1JqKwt4GnczLnMBW/0gbLscMUpAeNo/gY4g0GV/zkn
+Rt91bLpcEyDAv+ZhQZbkJ49dnNzl5cTK5+uQWnlAZAdPecdLkvBNRNgj/FKL41RF
+JGN6eqq3+jlPbyj9okeJoGQ64Ibv1ZHVTQIx5vT1+PuVX/Nm0GqSUZdLqR33daKI
+hjpgUdUK/D0AnN5ulVuE1NnZWjVDTXVEeU8DFvi4lxZVHnZixejxFIZ7vRMvyaHa
+xLwbevwEUuPLzWn3XhC5yQeqCe6zmzzaPhPlg6NTnM5wgzcKORqCXgxzmtnX+Pbd
+gXTwNKAJId/141vj1OtZQKJexG9QLufMjBg5rg/qdKooozremeM+FovIocbdFnmX
+pzP8it8r8FKi7FpXRE3fwxwba4Y9AS2/owtuixlJ2+7M2OXwZEtxyXTXw2v5GFOP
+vN64G/b71l9c3yKVlQ3BXD0jErv9XcieeFDR9PK0XGlsxykPcIXZYVy2KSWptkSf
+6f2op3tMuQINBFwq9BQBEAC59lflbMmvSVkCHFoakdjokwGviNU4I/hOsNmHALYr
+gJc0z88ss2KxbOq6JZoW9QOEHz2QLGsSGKnBUViEGvXoINDGuvzKFqHdEjGsExiF
+FPGAgCQA2CSEZZ8MlITNdq4DuSti1LetjCF9d7hw2xOQs9ucxSXIslyqPbCdlxki
+33tov40VE/J8jDUp9Rv27e0H2x4Nhu9MRQt4vTtpOcelYzl/dtPAmsnY4U/Nex4I
+LM+JU2HcG/5i0nWkxOtz9Qc7kOgm4cuwXTCJw9KukPS3CykV1H/StPp43JyxoK1X
+gZDMFww+9jupqLletmYKqCW6jVbqXr4Xlisq9Ey3LIWRQ0Zw/LB2NKU/jgnJGtLa
+7O8VRWJKwkCtyYUbZMksKiGex7zCqPDR0hRVuYNsTjONobnrOS+7ST7ThbCndc+A
+5mtuXpxuFffIuG78a3R3N30RF6g18peTfaEHMpqz+914HkNl6Ns445Zh+2rJkLUu
+8O++tgWEUrpUajN9nosWaXWHOf7E9qGnm1G/3f9P3Nd5U+b3OKUYyqb+CNGCHyiN
+bE1Cg3MnKpM9Yi9aZu4Qg/dPdxMWrqUmkmyDf6x/Oh8ZZkIacFlAaqbysQ6hRaJo
+p7UG9AJfXHynj/Hz+1dNpUOlAIairFe3T2mWQO4Yy6IMgLEGVodZRHaMugdzZwus
+HwARAQABiQI8BBgBCAAmFiEErj+seWcR7Fn8AHqkdLtrmky7PTgFAlwq9BQCGwwF
+CQPslwAACgkQdLtrmky7PTikHw/8CZ+DnggV4AuI86spuMLdtUBDOux/T0gvyxSW
+f8sJkjH0eAYAmP9/flJDfmwra5yNaINfqoLFWtaYLpxpBcWBc4VIoiWqVp2aaCPi
+wh0sznCPiduiYcKGkHmupX8aCQXBYFDeQ8Jq1e9zwGD7Mon7BeBO48Vd5/IT1H5I
+u5qzaCtD2ECO9MYdhuqJjFKU0MVzVocsBDdtLvrfnUwe4wc6kvOgHQ6RkMJU1bgY
+0Sqstsg12vnREAr4uihnZQEihsRmNdiiv0DYVaRK92PLPpfVAox1Axq2HpH3WT87
+RpsFruXLj/zTl4AZczfDVd/Z4yWmJSzr0F5igkGSUrxo0ye2kNES6cmOGI9TgmgP
+NLGXlC/su5fKXKjRgkD1ibJ0qFNNxF3Cwpz/+cav9ySDgFGX5Vu0kFi93fEYHshD
+6lP9M5qS/2oKiykCGvcRCNU/9emdYlF37H52rxRerBaZN6dYMTjZw2vsEMUl06pL
+llbLiwjPix2OlLFcwH3yKJG0pKkpEImBdJwHtJh5uHzfkSAbZjJAZ2Ekw7sLqiT0
+85hAGovywGpHMiYkqhNUO84fjZYCsrAlZMdriY92IMcQhmWQ416t5zcle2Xgx+/x
+zBnktvx9KIH/HwBa+qym5z/uFC2S6zhNyC61LV/CEDCmcUi2lUXr7vcIxCsmxuUF
+1ONbRP65Ag0EXFtUfAEQAN5tk4luE92Ed4E92VlgTetGMHyxwOlZ2OsK6l+Z5ML0
+wzomAITgMQwG0FeT6HX7vB+luVhg0XAZUW/K0bme8ZEO0dbHB3Vn07wXHhmq7QXH
+/ACftkvevIT610dHskrtIvE5rZfj1P/wtjRTxDrkjhlGj9vhUxxcCkKadzDdBJGo
+dP+Zh02d/4cc++LePNqZ3eJWm0JLghqKxzTv0MV1r6G1ZeykFzXeWY+La8ZCRaON
+LcHjI7wlpyTJA9WGmyAphtEHM4fQqKLxtebIDo7m4glgR12nlV6B53gUT96PcKuA
+Y/UPRiTV6nHyUtuL1EGTAVLsMDmtDbdSdtLLVbJXVmA+tapABa4amMxNVNY3QSUj
+cAbECcTyVmVJfIT5fJW4eOMhWtrIGMspWoO5It0pl4K8jhCzIcfoXQ0olCSeC9fE
+tljE7qzRzYQUUvN1VZPVX0Yw/xSwOutv4mxmNRWY9HW1M/jGoRAboqN8WhCbldak
+a0XCH3U4rWXB/8HHb8KP4+q4ssVyPuEQ/v1UNNRk9AB25NPEh5PMdcf7HU8IcUHX
+THEfd7zZVJ0l4FSsnGeuJfMrnRIpNOYX65ikeoTwmDU3ZjWfmSy7F5hTLw8WOEB4
+EKpnplyV1QN/j3317/M9PxvB8IOvyNF2okeurtHFMmI/lGwy51akp6iHMkbBDm5n
+ABEBAAGJBHIEGAEIACYWIQSuP6x5ZxHsWfwAeqR0u2uaTLs9OAUCXFtUfAIbAgUJ
+A70hAAJACRB0u2uaTLs9OMF0IAQZAQgAHRYhBJXO2iVrHKChXzAvtZUhp+1drOkY
+BQJcW1R8AAoJEJUhp+1drOkY94wQAKb2fED9Up/xHEOjZm5ODK5LCVHy0KMATiTf
+5SiJhRtqaRbimPH1WB3XMLls3FJZnm+UngIfwCsoWo0rksFUNmqFi6t4Cj/UB/Zv
+29EnDT9BAeG5fP+Op5PDCsu4qnLv3oam35oV9yZLRkLhBd/EkRGEA/q27WnpiYCx
+Jv5uPOJBWQqu32aE6st23PpY/QWDWOhGPfcWCecu1rIe+2BCs0UjfO0KOT8HYWNh
+nGpsEZ+TmDKjRxMTYWKguEb9evEihl6kUwmQZgROdhBes63Yq4ku9rBXvRhCYbwS
+odhjx2soDRcNmzxNV1Ply8a+2bwRHPnOeyyxEHFAwjkyXo7ZqGtenwSriG0LOW87
+y3Yw63O+oAlGLIB3psBSj4wZVGme9485HVICAFcJ3jXqsXSIJdzW61nGerB2r2Qk
+Bn7yYIvHg3iOToB0alfNw2QuDtCZTNefvlHFnoashRhkk0yWzBerleFJbijx4+Vr
+FaOH35BO1T3rgBmGkDW6gewoZMHEcmzTDoxxmbXiRvY+5o7b+ul/yzwhnJz3f5jk
+7+Adnr9qAGMD2o3rCRBHV3lSEkLhBL+bfmsEYEor1fd+pDFoEKKjpDP6bgDcZyGv
+O0mmr7Y/6ZrnKWxOrmNXieOTLbpY22tXv43QLgyiPcjhCfphT95IxqdNfMfOiI9k
+IQf8g7GBciIP/1mbdnMj6Hg0J9IbI/XX/DWATOVMdDhq38VcggOHRjZk2lY99+4V
+Au1wRHa/Io/CENikYzI00deSzhrN+tdUK/TCZI0Ft5Lykmti2ilmkIQGsBuD9gu/
+2bmWkNJEdpHeC/+oxntDFj43CpyKpPAarrw+4XiYNK+1+4WZsQRL0jJuKJ754v/o
+NTaSd8GOCyFR7q8SVH4tig9DjkZjYjFFMnWkxdpnDX56/AfdS+x5EaRHKCJoGChT
++pHimvKe+MxBxpwJr4JpGddklin+6xUF5jTG6322hz385wsagGvmH2XliOu47a+7
+xUei7w3S1qtVCfdhtBEWL5i021yVYlrw+rUCwpFMIXAPA/p44O/qY06sQXJ01Fym
+JCbOnjtVYX9gdF8fMKoDXAcvEtSulBNpXDongWp50BDfVoA7h9oDsxL5kw0GpkJn
+uVMYLpO+iOqoEA3bJfsCedilkcz6UamLb+6RXMupKQaZ006Bu75Rm+h6PdicdiKD
+jJY/7PbGuUmXxuSFT92v0hATlpEIQ8H8laEcnb8apiX2qOyGUHnb7pfYoNqvCm06
+3NP2igCtiGkzAohiHfhztfy2UApiTtXmPu3EhEUMooB+0Lt0zzY+e1cnFKRbJHvQ
+ZidiOJfKuqp6upPvEgKYMRCAU4+nLT3MVbralo726JnDqrDJvCqAamhfuQINBFxb
+VNsBEADcRGjaY+/ZVWBlQWvgy08ObhQbTRglb8thrcPeTR7211JJwAJemuTWwCjF
+SVDH8JJ0Ss8rBcbitrGI3i3mcgJRQ1hILR2HT0bbmMLufCxZzQBjJm76H8XN++k6
+bd8HCYGXMguUaHRRHAcV+P18e3qGizgL7c8Vln9fbhowkX9yi/WhiL2uoXC3+XSa
+C08TzwjKPb9Wnct6uCBAzMp8S7KW6P18vZyBTRBrugA9eZrGEe25rhy9szlJcajc
+VeMiDMf058z7ait5t43AfUzd5zrD6c+ZGYIku88oY55LsZVcvn9o7I+UNbNJdiek
+IpLae3Dgrie3QgDyfzPV1vXT2X8LaegOsNIkSo6jzjdKE0ZNg4xVSuPdr5jujYBN
+z2k1lqV/Q/Ccpqzs0NsgnXnY8RDDrrmJhdy/ZrCMsXpbTK5KryR+JoDEiuyJ7YO2
+jTOCo6zQ631jvi7XUeHAFIdQ7eYRklJwABwj/IMXY++O8JBLO7iZ1dvvu3pfY7pg
+dQvPgDttVAIxrNxMMj39LRbb6LE+eclWcTfGCMr3O6LOOLwkMnDWEkJAz7JMtWqr
+2l+9xF9Dq7CkxHPP87dLTMNGIDr38bJ83CSmDPlBoaljTYgrlatBTV2hGMjPgEcB
+jOgg6QyRGpO2N0SVBnD8PfBI7a7CwQw3BHOJtH8vPUkXZoafoQARAQABiQRyBBgB
+CAAmFiEErj+seWcR7Fn8AHqkdLtrmky7PTgFAlxbVNsCGwIFCQO9IQACQAkQdLtr
+mky7PTjBdCAEGQEIAB0WIQTXDITmS1WOW8zsByEy4hdfHXV6KgUCXFtU2wAKCRAy
+4hdfHXV6KoJ9D/9IUN+s4gSiyWnqfq+UK5q86DTbC+OyQpAY/U/VDi/jQXDUaXzu
+f25cCgyl4Xgf6nNTE6IEdgJCL4R6bChxJOHNpZ8/N3ckb/Q5xHKZ/5k5wFv7nxUk
+vunzxB0wUgCLkn4oy4B8QbTMuRz1qcSdehUyZAlfkr7o/J5UO8FtgaMuNACxZNlO
+JW5AjTDdbEW0MZapAgjx7+oTQMDtz9q4afuPaGJ3fTz4Vx1+mYt59b1h6xaMTXJi
+8egJF0U4n/tJ+3gxAIhF7tQRPdNEwG+2Kw/YNyrLMY+nbazhlgUIIkk2IH3Ztd0S
+XnNd7gV/slN80T9CtHtaDlH2FkeAd1unynxsDd/TLb1gLHem5iDsFuZBaIyHetdY
+TlvT3SlKnDQr0FBTe86Kuv7n/ZNoU4lceXhUXTcataxKdxKEJt2x1Ei/hMHSVjaY
+3ir57tuOUDMkl6hpL3sYiq7cMGUAnLH9nBZbbcNdfChDiM24mGmXaNoITutVAHS4
+uNunSL1l13hJ1hnGY79j4l+CgnPx7LHzBmLh4PPWKM3RYqwgaPEkflVQr1JOOKMM
+x4bpllEtzpvVAIaF73tlsOQRRN1Aah67gvkWKqiZrXc0Sx/yh8EO/6bImb87rtVr
+0kjeDGEiuGYXsszNBCmVjHal5kLUKaESefzd223zeaFe9foO2HrnsFb9B34ZD/9J
+W5M+42QFd+tOLh1ue/5xToiyggGh1MX9axDqHiRu2w+E7kNuuws2426aupUQ3yPD
+4dSwR428U14ytM90bZXztKFDgFAaQJ/4YVEGPSbLHFc4VlhDHpGljl8J7vI5xPOm
+Ruc9aabtXwd065nQ2csk1DliiA4jpS9dUq/flH2oGj4b2OSGFvR5oC7oERHMpUA0
+p+wY3vnjkSVnWqV98yEBCFcZvpOy8J5KDZxYZvZydUvZ3ny5W6QPg8OKriqrCAKW
+QXds47vRIiAasK14duLgex6il7HmboaqqOhRhevtBAHBJpB1z6Aq0SMwcKwdtTId
+GTSoQd0R77ZGYvR3StpAwl8rJhCNwJHu2euA3hYPWHg0pF0L8pFbfUwOYf1dU+uQ
+4xAJQKcCteQ7B0pawp+Hxp/0erB5c5PUUck38ze1ZoGm/oqh24XZ/amPVWE9nYSo
+VTJwnbqWsfI6mzKdBHr5MP5zW5ei0PAo3lFb5gvVzJ2TqaGJvrh907I9R5Nwd6GM
+wAWAzZ/nCLflSNyPyJ3ftxY6pGyCBJsycY7gBQD9i1xU0bxONltqSyifwQ0rt7yr
+iwSI0VRnv8K3M2iTAdDm44bX6oHzljgiYachlV6IGmO3vdVVrCDhm+b+ia1bnQ/1
+H7itWEwllkUCCtaDwEcf8o3OdbS9S5KEbwH7YUD967kCDQRcW1UMARAAvl+0jUaB
+UkQWBflWy4Wd8Gcf3lzOqbARdpM/iztebc7RbLnv0TNFQPV4TD9RoP+rY4dJzC8w
+/rlxlhD3DiGcI3of3o/3pN6jss4wKyy9Jcg7uCo/fcspOoPOwigAUfBYTd2rWNvI
+/pPUl7zmavQR2+TyQ4IHWG52zAABGej/tf3Ma6WGHC4QeTkh7LtHn3JFRCoFy101
+x60bJqIWONfR6+5UAOL/P+zTteEMsO3v7dWCWHX/tcYLrhCEH1CNnyPS7v7TF+Ys
+uOGL7sSmQOUAcgldfUfTACw84YqViu5BSYiww18Eg1l66UcQFnhwB3fTGwzb3oPM
+npAv2wAZ9gyFGzRgcH8QnXRm/SLDWlTaMIJS//0p/gXifCAdBZA/skBt+E4hQ5Sr
+9iXGNMueR3bn7u8Pcoc1DpSJENE5H0nB62l3/OiSl/k7mJMGlUv6wKr42xNnIM6M
+hO97axjRXy/XQz5n6ktyn9xRngkQNL9Ynj+i8E0k/xv5jA39EGAKOXxQFf8357sA
+DnZ5g/Yf0Yr1c+TNIIRXER/k/KMavB52mguTNqCsewO5aje4Gq4vKd5P+jOKGopA
+C4idTLkHutZTiakod7lW2jmjpm6P7oyAeAhDNEroNrbOIw0SaujHBmJtxgK1Q929
+y/EaH5vJyWfMFyUqM7CQBqUU/HRLERsebM8AEQEAAYkEcgQYAQgAJhYhBK4/rHln
+EexZ/AB6pHS7a5pMuz04BQJcW1UMAhsCBQkDvSEAAkAJEHS7a5pMuz04wXQgBBkB
+CAAdFiEErtYi/gIHfrS1wUbBQqJ50kjNwxAFAlxbVQwACgkQQqJ50kjNwxAf5xAA
+hBhcOeqLgeXbUu0CCTKlnG6D7H8sQJWXCSsh9pAXffv58b4f0ntJ1TztKfVd79hS
+BCcXRc/9+MhUUzR79NvFWWZMWqJ6MucjAkkOBRoc7c85PawYTI7e1zSapLPJEHG0
+xDzK8ClxwGEvlA4O/eGGVFaCTkxdTQg95fDXfghab6j89GI8Ghc9rC9V8RUgGVQV
+qJJkBJ/gECJJp3holB4/w/I/sU+9AHXGKJvSJJ62fpmY143Y5JQk+I8DxoT0kIq4
+W2iZVAQMzQGpAOXkDuHk7a7J/QuL78CuoG98GOsfTd7nNsgPTZ07cPYGOxXeNR5U
+9DlYOBWDwsf6d+D+tHLB8KzH3MWnWa3crjE3a/sgrDEad0CmAJzHXuCyPMy8vPQn
+uxIai/gw2POq8YQMoKW5S80perLuN73FxAumjK9a2hYVdZNtABwrlW/6ELruv1se
+mMjUq6oDyFio0rGy/uzCItl13hIr1Ii7B/SPz9dNnCagV8aiUmKXRk3HKoEXf34I
+xWlod0szWopnP31NXNKHihs46ORSMrjnzFKjRcJsnipdins+DHJYroYhtOjNtsb/
+WV3D4tSerG3xKF/v3ssn2VsjcgK5HY/k9iUol/dvoP0bJ+rKs/fzt8oAqEexiRnV
+cPnj/zAiBOt1940+0vTWaNYOPDkq872S48GNybOC342u2xAAnAp5myKostxjyQn3
+E/7/G1OWHaJW5kx/HCqHCWjgwwLOmhssNn8kpTf3ybvt5uhMolIF95RjFB3gBOfU
+vw0sqMvEoBoGSMSTSc3zD05RBsWWFD9qwvPMXtn0gYaH39ISAFnxXrtrQ7dDD1d2
+LcBErdttnxEhUnT4/0YIat+r2PhmYYDYviKsuOy8MC/sJIxvhYEpbyPQnPksUzA4
+wmAbVNPlzqU2oWPrLT2tlxUue3z6VS/YHDcsLSgjVOMWSusLMh1+D76Y+Lcr9kVz
+nRu+dYXh4I6OBnlT1VuzEVmrf69NFwh8j3PaVn0I0NEDU7mMa+5W0QYuJIsXZonq
+SI2uIu64ZOVd+D8WmCEZO/Kmk5PMXs+0fMcFD9mOeFaiOdz+PIlHAsrxwKXr4Q5z
+zzu/wEOaqAVa2bJywTbl8MntQUY/XeD94MvdlSAwO3Ll1BpQ5NfXjm3YpP6Uyqlj
+pkrYQL56iqucgYn61jLSXhFHGLXSZs2G48ggN2mHtf6ZQeAJ4D2DIXRj4uqIHoJf
+7MWDui8u+cJsw/F0ZerPsCN/CpkEoj4FW4F4O3JbiieYSUK7lxc0qyDdbQiVCVl/
+08wNToe3RctSzsQ99tCwfVWqLVcTVb+0aeSaNykb+qW30bHW7AUYs/qKiapQFzZz
+QZnpHXGmVe93fDfILx3yUCA8Yia5Ag0EXFtVOgEQAOS7GFDH2DGXPMJzSdS7a/zZ
+ewP4bM42n2Ku3XiCyXG173p4ppNdOLS3l7JrRflMhjfBtETCOV8B4z0B9wCZZywz
+iLOt8+0A0zpY7EHZNvMRjZyq/s0FCKLtnlqo/KNwiJPRvQazZ6+UOSffEQEGpNKs
+1ycZIDb1tk8iRpRvtCin8CeLRLf+2BxHbWBewnCSCl80rC89PTcvPf+jmtcDJqDQ
+z/blp2CT1JUo1xdzyHYdIa/kQ2PBQo02ejBVs0vDjbzuYVQzZV3q6cYnYwGPtpTB
+Ot8GXuA1X3qYx0MlZwGEYpiTFS+Ju4cJrYofuBOudXpfux2uAPkJskw+ro5k1I/q
+fptRWDbZ4fGgROmUXBPg29XdyVExYgAbVeBdHWX30sCHs8+c8wzWkdAY/BgdCySg
+EVLiDmSfMekH2H1N9ncwzhwNlHk2BaYTR9hWdZ7lrH7BbT8g6SVSge/eqgvjKI33
+AUmragvNQ1B3362yqLK/FJOHyJiYd6DKfkq4E+ysw+C+qIo51qVNkqRqT0M7HhwZ
+AvaoeykrGIE5vq6jHa9+MxDlsN5Sf7gNgx2dk0d7LAJR6AmYNqRS2V+837XfogMc
+bB90ZyK2rOzDN3f48jaqXA8TX2CSun01RoPdCPZm0M/uxTZxOFzoatrkpEVbx/3x
+sjvuPVa7qkKdgUuo/PhBABEBAAGJBHIEGAEIACYWIQSuP6x5ZxHsWfwAeqR0u2ua
+TLs9OAUCXFtVOgIbAgUJA70hAAJACRB0u2uaTLs9OMF0IAQZAQgAHRYhBHkdfriO
+vI0BOENKrDPfNZrnpgp5BQJcW1U6AAoJEDPfNZrnpgp5JY4QAMry7TcsRIZJCVlC
+qecIAjyJizWz5dEwScba0BDU4rv/h42CvXJlySZpbgUEyB4SBggEnu/dKVbsd/t0
+TXRNg80Zs/pTFVbwcg+sDgIg1wZldZbClLfvgk0xLoDl5vq+K4SAQwSLTSPHQyYu
+8IxkrKmbBdBSXlgnmcHK2lDXrzWYJDEYEyFPV4pC3cHicCygSc/4eepUz+crEF6Z
+IE1df4LRv9h5CgsLewMv5nQ1EjxTo9mX1GiSh3e7KcfS98FgIQl3oy+yO2cmVVVq
+x5ggDcRI2sUbXa3D3kjAo2tUIA1nUMFLIrii+aZawOsf64VMdIs2OXEi5XFR+Zdw
+t+Bx6lUKZ3/tntStZitJdK8/RUbhmYQ8Tu01vxt/IAN+07VxWyZwcFB5KuC+lKtO
+/0vwyhyiOlHm8lzV/5qwFPusB4bNk/2uLPUaavJdrBpmB0t9pol/NFCRzW5MKFvu
+Qw35QyFVR0IBeaGjRc5J9yxbzi78umN1iHZbDjXFA7oRa9tkM2AP8V2anxSHUyon
+UN6OuLqSM2frA8iZcl0S7qcepYNF1ix9PhdQHXy0H7hoikXMLIiCl/unW5pVTs6q
+KnmxmRz9ZcqvvuVXbeY9C+kZE0LOBTZMljuS1Hcs69RU3rA18swfN5CTXw12ZwQZ
+SsnRhi2X28Tn8SD0vrEsEf08q3XshDwP/0MvBBfymXd+5MzxlvMg8vGJeFuDMEFN
+cpETa7Xzzz5Eir3ETtxpUWPCriqmCpnlIWidNwbg+LlyTeYUDPIDnMtEX5ySmYGn
+BI8ykvAKm/XTfr0PWOEAXcmxTC3oMhvYEhIyGHZOFJQxIo7vmrwZKi2wqMnKMPq+
+XXHgvtZe5tNbESI27APeQCMVZLVnVVa0D1JRFYBuwNoJXhWbAIKlIjBGv05NvK71
+e4x0zEY2mXxLBbsxVBvHhpg29HseX/AhHvUAcBehJ+sqnenXZqdeNhgBIeZubXq6
+A/gfscswF/Ocp63Z/vqAjEmvUKwAxNKrKlwLVShVvobPx2N4hH4ZT7p58cjhMhQz
+Lm4whTHy1hvBIR6j/Lo2eOkkVhiMlrrvWJIAEic3Gzj5f7XOsVr7CXjkSdoXHOIR
+63ZDO/9Wy6ygu8vCdiIFlyRyUBLnGhUYVbRYnTU58tQMfEYy30ZKF4vxz4Ysxoy1
+oJa6emaa33Nn1Z2kE64AaW4wbUJ57nROuFdoYTwJ02vyc51J4s0C94EA+a5VrQkN
+J7bT8P9G5gksp4b1WyoFm+O4aU5Sx+XpSO2IZFuBL05anF57Pm6Bz3LJX6sEYima
+chv72q7PYeYbETrl4DZxE2xlEiMUvN4DH/RExpPWeUsVMFtS5n60n5+AW1EYyGJ9
+mfWlvZ0xCjQ3uQINBFxbVW4BEAC/gtho2rZl6/+/szkOfEumAdFwyQbtM5CnJyuU
+rnrneWWlnNPLeaHml5a9yrcgOZ15QgnFD5YOHZ/S9L40goML8cB118etk9uE7vMv
+EtwxbkqZXTlqdxpFI/SzT4jJCa9XFQ2uA+KdmKmGW9EagtdLql2B9ziMhH0Ha6Y9
+5x+9+7/oRYU+ddmAbwrJjdn6bCuYQ7QVpccFC67qdpy2I97v03hst7yGT1FbrIjE
+sF4nMig6Uhwma5Edqm2dLaVXeZ+Fl0WeQCnWjprZMvkHCAxjTBlQpmvvwcQwqHot
+s832s96l/Sd5R6r+TWU0lTtXpcxL6t7MXfW+BInkqg0ZiHG1Znni6SwfatzDv6W2
+lJW2pj3Ub++JulEIkbct1f+TEeeLU0RbJmWlL/qe24fodKg1ixH0gyxsRKzdBUIf
+vgCkrzwLFgJEHRISjQzIASVtDdt8QoIqX8XALgjMBgAnZqtYrAEdFImWys0K1zOu
+MbuPcTImufz5ObnKM7rRMdCO9z+cHGs0TT2vUvPPuOsNYL1GX4EfrCp2eLKahjJQ
+BCxfatn4mFqHVmR/4a7vqq1j4Qfj3h08z7QVrNwGWAF3r8nmaHdaT0m55xctMRQa
+3N3UaYj0IQ08CSUJq5e005Z5Oinbt2O4paxnG4/UbJXpRiLEVU5Ja17IBsDfZydx
+W//ZlQARAQABiQRyBBgBCAAmFiEErj+seWcR7Fn8AHqkdLtrmky7PTgFAlxbVW4C
+GwIFCQO9IQACQAkQdLtrmky7PTjBdCAEGQEIAB0WIQQVaJBoXqDfahNx7yAXzF2x
+8AiEBwUCXFtVbgAKCRAXzF2x8AiEB3iPEACI735VFBDd4E6wlGAA12Av+XnWSruo
+Te7zGdKo2SuZ1gN1PYdNgflbifYCYajnQENp92N3q263Sq3MDf+EZYKijJ3EoU6y
+chjOJR6ge+UgKPdGQc7Lu61wWECBFaL6TMXCedcZ/Xd0xT2IbvK8qsKsITDjiDOh
+DUqdjVeyPXyfkmSrF5P3hvNxJvPbQ6k5Igx9JA+unLXxatljAeh1whnchRQAIKkx
+l19Nr1z+odFD+tzCX4HQmUfHRXgBiJICyIxWB+U7USqLtqk+7DE893meceSt0Mz0
+JgLct0E5EFfCdwbehnl5NJeay8XEdcfjUkeyb/VAVxWYUBiG72okUIaIP7xR5MW1
+P6ecdTr0GzOC1SySpfyT0+ot0rtXGSnXrBzpY6nU14hDoV3g/FMas+qz1smTtOVi
+1MVakDRf4QyP9Jqf4q4/GosRrgBvXZHi+zWkKuf+DXPcL/q6MfgHvQc6tFMh5ONQ
+snrF3Bca3BQDT2GKjSukeG3JmECHmKtQk22jhk6T9DJ3518yw29El9tUgraaZ5Fo
+Gen3TYCxA2BhV2LYCSLSHiTPdtUsbDuIP/FXaFXr34nAtKKOSSY6nP8SMzCPSEMN
+iscfdjejR1Xd012T/mLqVCBzFJWyX2RaUdygSWUpt/QdvWa4pXCgYZjEVidraOws
+VWMbb0zuI9KCseOaD/4jd+awtnRUj2SbGeJSVnqDPk0Hk8ndFebAo70uQGATkLXC
+m5ls0RDU2xHZumuUk+b74Y1KjwdqF65NEmfjaSQ6B8gnCO69eKHcUT821ED9bwfa
+4XpgsOMEoZklvFByax0JMS4JEJU/xfsLmfeuXVirN9Z82vxAXG8fuK8bso6VLG/J
+Mpxhq1Zv24NQ+uevvh9loyWMcaw3IqPvQzNlyuuya3rXJYZHSH7TauYgqWySXiGS
+H6oXl6Ej4GR3t5uWwHKvEREQer+KPZV3uXRnrTpgITy+PxZ9ywmPwmPBHcD6c0P+
+g0lNNtDdvw69qy+oh7JaqqYaDvedseN39UgBSx++ewRhq0OTikAD/BCv1zhPizlD
+9BHAOsCxrgnz0WsONYKFAE8vtNo/wB//djf/zqMsI3iWdbWqM9e/muEEV4jQRWLW
+TWp1XTqqvkc6TsLBBNO5zisJ0VwSfDyRUplr/IWeUl9FrRngjBJqF2nl90US5p3o
+uk5wUWdjFa0haFyDgZNFwyFr85mex+o6qIC3oif7UjC4kHPe4wzvHDYAxrHMB6MY
+QvrcXzULmInot3qRAr5duUNbQbrjdtVvOQFvjowBP5Scu5ZBSzc0O2TUUSKgnJZS
+Bs7+yswfgyhYzusbxlOdA+iE2Y8GuovamGYTbsdCxDStOMfZnaiXuLL04Uy1PQ==
+=fX+D
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF/u5KMBEAC0hPiTonjYEe5FqNzFn73KmcN8KGD2wzujmWWLnFXGEVDEpFcS
+ULQDshhCclwNeXUArUey4nficwpqUe+Xl2h4dP4z7yh3WiL5nA5JRjJjw8KJQGVW
+AkgiZTnJHH8DrzNt9LnDL516qMDJarTHemDUUUZLNxnuv0RDEhDxsXWiVCQZZcw/
+41yIY97uCf30dsDwnckVl3iEmYaGTYavWbKP60S8WaxO0YG57RI1etmlIQ0nMmka
+4bvFnwwb9Jdnwle4LIiRMCGymsheaKCKrEZgIJY+idyBuExLLykiL8iNBj2Pzi7z
+XSCniH9qcEwfqgZlP/KZwujLhGOc4c4peNwpuDGcmYZoAsUD8CZ8H/LU1FIR2A1u
+/UrRREtC8nNTDGxCckSMEquHNURfMk1QmDbJ9gaa9aOk0AArxuTxyj6Cn+KQd5l5
+0mN0R1sDVQq9xWdvnB7N0d3MDhnV7f19iUhi3KYvjVTkCMXjhNXjDH/KXFKoFhKa
+9SkxYGfW25inwSQoqbP1TE5+rESf57bo+XFxfVQuYfVJ5BlZobz+sRl2iDQyBJDM
+uDFyXE/t+E76BmwyHeOI1weqUMYebqHgu0x76dTYj9yWgWdQAC1pXi15/MTIaOtQ
+hWezb5rkI2yZqaZLaRBOIRBIPM5C5AOjL2XbfwUuSr2W4+TvxLocxi48DwARAQAB
+tE1JbnRlcm5ldCBTeXN0ZW1zIENvbnNvcnRpdW0sIEluYy4gKFNpZ25pbmcga2V5
+LCAyMDIxLTIwMjIpIDxjb2Rlc2lnbkBpc2Mub3JnPokCVAQTAQgAPhYhBH4ckayA
+MKWlnR76uXUPPIdyPkASBQJf7uSjAhsPBQkD60WABQsJCAcCBhUKCQgLAgQWAgMB
+Ah4BAheAAAoJEHUPPIdyPkAS0lMP/2IgMErScBUaXrZXqYXoluR8xU0p9DyZEBx+
+ZGNAcJ2CTPAbn3FrkNGNpK4SOCLXEZPKOQ09umaIxl8H6uEGaTut1JLj1qGaZ8ID
+4gAeQcTIN9OQA5ElQo+ci20XE9JSvzqY1zb04EkMuVL678xPCYJhUSLS0MAQkcDJ
+JQLN17SwNi4vGqzVhnwKUviQU9/s+LRUkThsTg4qT0fNnmGoVJXqrshxJa2ZWM6J
+QtOWBgJiC6xZ+zRiZS898L0tekU4o9yxtnnDWry2bI+mJbxAp94ZAXgKahOU7LKV
+3SPxkx7TAng24nOWi1EaP51pe7usTFH1BR3CUHZdoIQ4xruZGkt/qPumskofzl+1
+8bw1bEFbq8S6jC+twT3JUcE02HbEIbrd6l2T8pYBXaojFggGjUTSv9d5YUN5N9U/
+/Qy0o3xZwHNdXLx6xSrUO+NT5JU1Nh/0sutEH7ru/YqFZof9vfCbV86y8fIOPgk8
+LkJNUSu4QCJ1PHKB+fJp7yAhlPkOXNG1b9+W/hVp96rdkovpCUkLD83s+suQyJGk
+QB7Qpem7nS4zp7/Naui+g3M3p/uRSzZgELTnXNyY//bw9fOqx5SDLjSUslUMz+TH
+sFTwfo/Mot70MPHMe6aE6tdTDoJTcv4Iim/8MDhJ6yqKt8sxprataZoWwFi6zAF9
+BzWkJcrbuQINBF/u5P4BEACso8iLzFJ+M1wqcsCDup+GtRMzte04CAlLmaLgyzfL
+3xxBo4AUgX6UbUCGycG878JVn52S6Nsl6FlasmyH00MGjZt1CuNz4htfSmLGcBMj
+IwQv1CYR8bm9EPwR15NaWdgzJHShCduMHv4HdfqSa6UQfzO/P8mwioER19fkDQSE
+U1KsY0yl//ipWiW3ZJGShGHLnn4YbxogQtsRPESKUsQ9MtzuMt3ehGtkN4RguOXC
+6pCWP8J4F9lgjSZ+uLOQKV4rmpbSMXntOJi2nu+14Zj36enW8xyAXO/w5z/wci2G
+LN/aa/v2a3GM3WJQsPNzpDwB+pr1n0Kp+wK6K7siVmDoV+WecD2KNNgOuSyUve7h
+BjWRM9W13LsgLGhKJA8yUpPvhXk91vLRUhwFJ2GUirxLPLs2TSTjHlHvhcPy6aX2
+HxbHkcOt53n2h0zx7ntl1N7XHozMWmHphPsSvOZ5StuQRAFvfE63EyfR84KUPIbZ
+kvftbAJPKCJC8W6GqhfORzYZqldDNNva5iYHF1OItF79ZLGI56diNsBV9SOVKk4d
+f9Qp6urYOd+9RGQGmCQte/WSFaU9z9QYPEGl1NlmGAWt7KKyB6QXZH1oEMwXtPd8
+4GQX3XGtyggEp6BGwkFFWRQzF1EZ0maRPrpN4bpQqLXSJiqQxsX+FAcOkhpo6X7b
+8QARAQABiQRyBBgBCAAmFiEEfhyRrIAwpaWdHvq5dQ88h3I+QBIFAl/u5P4CGwIF
+CQPrRYACQAkQdQ88h3I+QBLBdCAEGQEIAB0WIQTpq255IzwEFuiZP0UMA6+pClln
+xAUCX+7k/gAKCRAMA6+pCllnxDtmD/0YCUccmKudW9PiQw7mI1HSuwL6aS+MlG6/
+LJ79nmi6TTpe87NDcEv2bBpVWYcQK87smCxIYyuj4SCZuBQivjyuecipRoG14PUh
+KU8UiqdF+vKDvUAA7huOBlR4dgr7/KvjirnbwO3mGouwZszDOLvaHuO403+TPm1b
+mJtEA9y6Wbk/+PTtfPymQwnaiJkPhQ6Q7ZbyasRIisO3MRPacUjt2DXFi5VV/Mya
+8o5Pae3zY+5SjMyE2siPnVE4/nzp424jDzSq4DGEUip/x+QYHFwxhCJmdZlRIFmn
+vSCAGXBpyPVbckC0Gw8kZ8HsGzNbMbx/VjDG3LFT8TR2Djsh99/6icO1J+jDkPNn
+IFEsYjAw7Tos5IPhIT1XkSCW84KqBG5pGI5h7fJzf19sR7Ki6XyFe6VYvggeQIS7
+VN1ISl3tRN/dk0GbrKkUKr0OVfaRD0wXQHTzbec8Fs43G0z/DKoFutGB/J3yjAmw
+IOcP5R6rqjhVp4APQpsB51XCaaqEXaXZyMWrKILbPIjlE6FHeh1qd+zdIjullnF2
+YZv89HU9dIXxKr35CM8f3BWm4D4cRjsUOWoGhMNwdHzHYOdys6T72KBK9D2irz8C
+L0bycjN+SIpde/auo+dQKqKD3/ipr4dyKJyOUsls9cyhxkFp031cZ5rWbXcLJ8/s
+1BeVPjFCngqPD/9rMKA6kCSnTo+rSqZRxo9RlQwy4K6xfPPdHZvBi3A4UYCsurgl
+qLtFtGG8SMWigmUZWLT6uhsi0orR5wfG7vzajF0Hcd8yuWa4zGeu0rFJXgG64Pyj
+nJHtv2Tzi8DNY5Y+8mfXqUewyEUXQLxnLqpGlPjNUAJKvjm4SstNadewgWeb6F8x
+UQJc8owGmK5+yZQ5LZj6bjt9Dr3SCM3Og/iS5XK5POGUJgtgXLXp3uy7p9SzsJ73
+qhrDII/YqSwToMu8tUv4xEGxyceVPDm+ywde5SXYmtvMYrq5DBdlalZ9kBlC5fyc
+IIzKoIOOkKKpa/YAyKdLTk8ZByjDk1RrdcOyP4VNpCvyisf6JPwWfKdM5mxf47hb
+s7zioUH7miUGA6i5TNi1e+DU2mL92sJwQ0WkHw6KaUez2Y9CaD8hZnQw/h/JcNq6
+nb8y0GR8h7qWms3K0rtSs8SuDXUsdZrFAeURivccmohXddtt0FDzkheKGXs27SSl
+8oOCh+jl/hEUzz2mJGFwRBo0FI5ipN51IfjhMJ8zzSmvfrtdwT2Tu6wSY9DLsYR7
+0tWGOc2HA6o7kdcC1V0p2jvQct281FrC9dTXFgcDuGUBYhzEZeWwjuYQXBzMquF6
+ersVnPo/Z5l1SnkK+wVBQbf4igHOaobl0AQxnb86W4CXBTZ3CvRq6o8vWbkCDQRf
+7uUlARAA7oTlVZXhdVlPnSQlnI5JwovG2jEIrRifpbyavlhlosX+rgtQ5EILn0DS
+PJ35CNfOAeOcLQeRrJAZj6w/x9FHWfKRAHUeiTTsVDzTrDyJBCVuC40ck587KVUc
+GuB3vee03/y8qAczj5TZNaDdl+4qAzOFQuV4MjwJOx5fsXZw3dUAS7pw1mTkAYTh
+nz557buc8JJCxrebT6FvN8bugk7LJ8SYmI154Q5wCdXB6Q42sdSMFlKKPYRRmIvX
+vI4Ytl/J35v43gCLbXccTWQpBX+ra75sndS2hYGQhcC+WdNtt4THgU6Sb7ErpJK7
+7A1r1Wf0WSioQ2VWjT0QbUE+6IXD1J8duh6ZgzuqppMm13aDdMDZGwdcxlFw+vlo
+bM+IAX+QgzPjslM3FHVvvfCLka+ctMO+lL0bz1G4njNEXcIAILhmoqRI4ItVH7Nl
+ZI3pAfLLB4qbhTKTIiS+uIoA82RU86ozr5oJZCsJa5N5EpJnYxnjv2tYhU42eh+j
+hyM+5ra1dXtveKvL5SkVuRUlPZvgOuwQ14Qnj6sv8CmtBpyVpupHmY2RbNtLVLdH
+Ix3lyQbgVo9iMJIoXiPXmcRWCgLgOeuETjFXsEcFLxuN+D0My0dtwWcg+271vtPn
+0orTObxkctFK+V32ByJYxVvytNCW245bICpxCicxmh5kYEmQCnMAEQEAAYkEcgQY
+AQgAJhYhBH4ckayAMKWlnR76uXUPPIdyPkASBQJf7uUlAhsCBQkD60WAAkAJEHUP
+PIdyPkASwXQgBBkBCAAdFiEEqtu6UHTxQC97adVrxbTukxqfnf0FAl/u5SUACgkQ
+xbTukxqfnf2aeg//ZspIr4ETVf3ai0dXCm2Pf6gpM7QUfI9fPUHymvBhNrNhfZqN
+ADpzbJefzLif8as7kUr904zTc5Jse5a0MzCrMyEwTDIoCKDv2ktLq1L20bwflZs+
+oP27CYC5FkJYgLYPrQZ/7hRC8EWjgn6v3seJtEo8G73kiVEBOnxVEfGZ8zxmX1Cp
+aOWfhiFYCmkEe6Ck9hG+OaWt7+WW0wWT1UFiluzRRAEMROcCUtyB5IPCqCH/Rz/m
+/bE6G+lHZo6OY/wY2q/oW2f9JB/4QyJeSI+fkjY/wDjfNQjiPMLfZctv25IeZYVY
+ZvIKrdnjbzRe+GwYLg5G/SbpSOEb5O55Ps8mNUpYFaMCfefW+DG48a4WyUGzFr52
+BMKvHKtc6c7P3+muBAqcNZYxRqyLIQiYiV9CCjpIV1WgUeedroHUXvJF/SAvNVvB
+ZR00I/D2hsD9BFh3B1FEYbw7GuYuG27Z6fgRolOQUeTabjQLI386SV3IxZ1KFwm4
+GU8BTbUA2zwT3hu/BaaCI5jTSLyBpdo10b1wgMEnqmXG6AbNdxFVEWwE+CE++BHW
+0YBhKp8fghHwwN1fwTCV+QyA4Qn6EBVDkTrUPKqTeCmHzt3AQh8WVrsmrodyr5Yp
+69LoRnlkLcGJiOCKMOmkop9Z32ckGieYHrl24Dw6hmUSWDG+pBn0ezbSPit3FhAA
+qD2y1VzqxsaCOD634Ltq8AbvphP8XZPrrsC3DIA36ITaCQDa5Cn7madLCXy/uP6N
++tojtzXf4tUzumwGJGFLtdMXNmuEuXrj++NrU1xcscbvDn5O4NDMadwI1EDlQo7w
+uWK9jaQAVhF7iDEBEazZe26knQFxC0my4SyO1uQaEg3BKHj6z7dkAjzWJaQZhzql
+yrRzbCiVUUI8ZkrgM/+/6NJohUG/had6DoefgK6H8/yjgVx1Wtx+XAuBQ2cvclhc
+TAmHs128dWduNHxI2Yx+uM4kuHYpPKBwdEh91ZNeNqtBJURfSVjBCjKkTYiS7kiv
+XyvQOBdZVeSVpj/QoAfaUlQoBVm7aF6xf7GtYlVzjMsLYdpjXhy4ZbQQVUuPI+1f
+yFkw8PpASZ3gvO6KQ4V2w3hOYAxYQ1kSwTtaA7+18nyv65VolTmAotmLun94UKn7
+zjopByBnC/XEqsU3tibg9A7xQ2KUpWkpmG35f4ZR9aEIxSe2Jmm+Se0JfiAq6Szf
+dyWvr/TzaS/BZL4WEPk2Vw/mzWEPZOscpIkBFGK+Ul7yuXvbrbwr+zmAikHmTb1V
+XfPb9eBnwDDuRHhLBym4FMrPjzeziAxxkScTfDjWq6rvMmaEe1CX+dj6ldx9Jp9d
+iUngol89eSgAQOtptjcit5o0Y0Mu/RF6KIBG89ghFly5Ag0EX+7lVAEQAKFx5asK
+W7A9BNKPkaXgym0AlW2szQR1nwxi3APLVLS0Al9Y/3mnBbYyO84HDr82AtMSWSMY
+UZIKtkUj2sVqUb+xHOPkY/MenyoBrCl2qaTVJ89nnWMUjtrX2qk0O09+ByoYXTit
+BVPAIZ/qZfGNB+Dsp1haNKRdowkf6WXkw7A9dHB5isVmaM/Z0THNJRHwc6mcqbEV
+M4fDL+OCx6m2KQHTHirk+OE9Nwral82IIqj3d5UBHmjHAbQNXTDzZbWg6tYbLN3I
+EYxSRQpkJZIVheyBmWFZuivm4hCDZxJlZ1sgxQeIZk6wR2LBR6ccTW6PH11PhIpr
+6O8aQh8JUMg+/aJK2eQXINozYdjOTUjnWAUeUqML7Pg/vERRAgHXO9Z+NTIEWEOo
+Ee+8WOFmrmfjb9Uz27DtymhUjOl0ryiG6F1b90t1rZvVKWR2OaCUhICm88o3MCgb
+HFeOh7v3tnQb2Uot7kY1hgch6j1MNYWGb8LjwoTAmx9okEv9mh119k+SdVJP6wsX
+ZtL4860vTfTw6RQM7rkZBzTyf4qCvU5uRSd2u6JqtUhw4m/gkKQyW8jLEkqX7JaT
++iEBgPzjALvfSWDbDgst0szqU5jltYpgjG3On7/ZGFFJrkB06orUvovxLThWWvm1
+iugw4/av3n64hl/yfxvKQHLQA3Kfkjjzc3oPABEBAAGJBHIEGAEIACYWIQR+HJGs
+gDClpZ0e+rl1DzyHcj5AEgUCX+7lVAIbAgUJA+tFgAJACRB1DzyHcj5AEsF0IAQZ
+AQgAHRYhBGFPhWcuJXtdQn6ZBiGZBzrXgrS4BQJf7uVUAAoJECGZBzrXgrS4jfkP
+/ApYZIRnBL+LdTPYdbZDYXotkE6RO6ZsPdcV1G6na5jJ7igdVuvoz5nP3rX+oQoH
+6k9DysQzyh/SkXRPnbOOyvQsI7atmH7SkhNn7ke8zmEJLzApHA0ZMGXtBJHQkZwA
+5LDWIQb8HbtJTBr2DyJcQdpRmP3hHDgyYgwg0AUG/2JEwYqps+/pqJCrLSP+GLOA
+ia+wRH9xwv1Vl2gIxWXqEO6U3puqUg+0z1Av4Gj/xzuw1F3eLrOfgklhpASc8QtC
+89kx1nhFS+OybQfRAH7YN9DKE5L1kJxQ4t+uW8TiXf9r+MdcVMEI3LATZRtgowFc
+493g7EkTppmqabFns9OamyxXdIzLAKoKvykr7HPCBWUnZn2I2RrcGQltRBQlR0Mb
+jO+sFi89XnFPwXIw/t/9zoq1bXCGTt7H5RtrfxC1wTYXqLEdV9pptNj7j5mlff9g
+DMw1v3MfUxbz9gIDzs7ANnw3SkWi+d0v0bLadWdItkq2WKvvgB58NJtKPc8Jwilh
+nO7W31U/kv8FR9JcFXzS9+Y6ejIClF4FAwr5tK07N/xSFAKEs5kyAYEKxP6vI59m
+5h+tO8cws+pi4gqfWa3t3b+dVzKl9AIkWAYjq9FvbfiqZgKTlTviSUMpmK5qJVld
+72+NiolUVniJbw9Z10ps4G4zmXSl1ZxyKnehUzcKyPieEEsP/1/tctQx1LhVu0TJ
+RLtWrE523hqxpqDdF8/QrNp9dX3YVoEkMQW3YYir2oERtaosWXmRjldq5dNfgtwc
+lhG+/CP5rxNeCJlI+b64pC/yQMCrbz/V74aAipuv7ZZMflgr7ZD5i3jyM/7/AunS
+qOUPwkKrjetNF85eibeO7c0Y9/HhILkLQ8EoNfJshdc0/scwMZEpLHTMAHSrxCAV
+FuhLsF9epenA6IbtuMsp43aSxshX05RH7F94uj4VCMUSs/90viB5njItpPdZCqUH
+eXSvLSjxqsmS4Tz9Dn+uWvxleBLRRcpZykuNLGgwVXafWftWbA+U9KaJnDWFdzjJ
++gAsWfHfFBOa1RfXYP++e+VJflcHaEZ4byLG5Zf1HqAvvcaShAVuMXY1hoYJinvh
+uk1zJRW9dP7apZx7BXWxbWcn8LMR5GFfunl/M2iNASmkqxJ9gvy6TBRWJu2QeNbN
+5Ks0/GDUawQqvhmM3V6zFQWVsPwaHpufIaGqnKC2gXaIHXPP0ldyXdLXwgZ+6A7D
+IEqHQB2BDbiJtovk6GaK8PUCEHTiDmRF/mBzlpBJOn+Hc5ELufgr9E2lkrKJzFag
+CBCucNhVEaUedFrycxfSALing7DJPWb5cobu9K+3T9L3k57XgxSAj+g6vOxHuxHL
+ve1IPheCWfkKpJH5faFDWKpJYYPauQINBF/u5YABEADgWTS7wFA39XvpWNHSfAAR
+2/nlGWuTvD7zoirzUwOd2+I2XYwgl910KsznhlqDrHZlqKuGRjQlbpyTbsOH2N5k
+IE+0uEXidU3iwslSZ33RLL0h9+czDnlgijYXLCg5ScswBEC1E/kXX685AUCTPX2n
+D1+Ymxxgov3AvItVxKDd3N5ERsy6hYWPK4ACXt47hJFqPfPtnQe2IdFkRm3bOuX/
+X79Kb5N6cAoao65Tpsix1pm6tTNww0+THzIWzK/yhi1/tUOv/QJMEVAxeBAPr+Pm
+mvjHvsI9RNQt7VnoHVkqJhPDxyQZR2IOVQXvlYyCtkPA4WQlyxLzWM24TG8xhD1v
+zZzA8qs//o9QI8OLg2ZYxplC4lW6GEZk3GnrTXs7bW6HUq+RlayIbDw7oMs30jAv
+YyDdQpZrYuZvsWKbKu+65Yi3M5kW0v96LT3ueMJaL/RanL9JhAWuEqyezffsBZ5a
+88/i0n9FJ8cQ1fZq2/GLq/mN2JZ3e/HSWynTnlmk+qGk2bq0cRFJNHAs2HNAm0Id
+pjSFCPmek9j30wp2c2knML+SsSw5h6570mwILuKwFr6i2hyFlPk4H7nP04vPQ8P2
+Pu5O/Cfg9rPSBjIi9FsNS8/a29sSuOmsSGHZnMrVUpGw+iKmx/jVejOtqe6hYydu
+MSQtIU59E2fq5TM4tub6qwARAQABiQRyBBgBCAAmFiEEfhyRrIAwpaWdHvq5dQ88
+h3I+QBIFAl/u5YACGwIFCQPrRYACQAkQdQ88h3I+QBLBdCAEGQEIAB0WIQQjoUGa
+YHzyVyZWN3UsTffOV4ELlAUCX+7lgAAKCRAsTffOV4ELlDerEACBP9kAH17GHloL
+XJjd1IHttRWU2Qs/VV0H14g14hgRz2/Qa7KRR4mGrXPKS/ctMkDXwlvs4HPUTeO4
+MMT38hwxv54AjW7CtF8DR3EQFXKR51roICQognvqpPe1auNERdLzAdcn+NoHEQB7
+eyPqjQM3OGGq0SVRwNnv777o+Kd8Ncv/4fR1xvA20Ds94G5vCYpHB6J+lPPVXBmz
+rOYSf+QZWsXjAZdnAAYkpEjfJhNrqvqSoRxZ0dweCqieenm8Nzt/vdL9nT3+4AGy
+5hmaAG2ENj5AhI194gtgACvKwCl5hF0VKMhtm5d9SWS+1quHzgn3UFh3VZrfjPid
+CR64mIu3RpZe7EcR+lMl7gCJxdFlHVD3z1lbz2V6u+xH4ZsLrTY+v8kDxzY8ojM/
+zDbnlEK+xzA9akhlaD3D3wKXRVuSlrxfEVv14mwKN5AYHN7bLL3bjOo9WYtLznH6
+Av4GqXSQ+LOl0+6bLKmD68/N0q2IiZwUSOsxTE1fUdYPF8eiN8L+35Qt0jwybieU
+a3JYtmO8EW4ZEmjJGwKgyrf+eigJN2/0AeBwcJyUw1YfzaqqS35NNyn5eKANyFQ2
+ZhIjuXRyBOoUMBAx2TSm7FGeFOIw+aQgap6HuGbZ0EZBz6hr9ogNC9FVXCPENKo+
+GdTGoIEs0n6gGOPP5ssp7xUK3420AM3HEACSmYaNC1Gfq2d81fI0TBJ9ATCRPo14
+MjJGiWaFaXoVp/lQeOvlX2JyBG2I6fhMGPGKntCfX+/MERLNAiahQgOjvnOCQdlL
+hbq+6loQ1eSTX2AXpRlQpvyxLuebbM+HX3N/9mqAksgQdljmqoJQbiE/HqXqjmKe
+16ylU3Rjabyc2p/31p7hm0IJ/3yqDsM06FUBJ108SALQyVvKqRA6q1t/Odb3xgt2
+isbCEgvhJ8kYz3LQkvTW75rSa1cM53Udd1rbyo1t0PaOSGeUZw73/nY1+6LtUEg7
+Q0x4ohL1UE7z7+14mAtn4OvGDuZJil7Lf4cPszf0SFoHPs8iUFpSorBwn3u+5ZXW
+NYFblPU2WK3O52qZqsjuQI/gK7uQhXjJO5nA5M8Yv7bVrbLMOj64hdOpNbd56Ycc
+qwYbHZL3WyRAN7TNg5ZlHgIVac22StawjXiHWDGaAXpCaHJn8ryM3LY+LTz16R2M
+bi+HVaw+0fY9f/mIcOdT6AyDg+V200GkGXL6aw0LZkBZmDin+OMmL7AS8TZ4dvZt
+zj+sykcT8DsaFj5Au6zHJoCnsuShMquHOA/vcUkhoe8/E2Y2QdiX7zwDM8vFM8tX
+DujFLNPIZuItcVEpE3ysFV2ZfVgBXoxTlZUQxdgJBQ0zg6Ez7rDYEAhVqo2gY9sk
+XtN80X/unsjGSbkCDQRf7uWiARAA3i7pu8/QvukeIBoIk1V0GHGPjX+GeV3fR4fu
+ciYgx+NKTXT/oJ/89KVeetT4CSnGEZcEpAvsBL3hsiblJYyLVmeoCniFlU+rMem4
+zYP2PnEX70Q56d6SjBArs3K1FZK25S5qqv5ceM10NVRwPufV1RIuui6mQLm2ZwlY
+JyyANZZXMrHMJdaHpK9mMBSSF42MFQZhcauQCrhMhcpmZKn0D2+PpRveYwSr43Qi
+qBWR2INTDmj/V3ERMviE7vLajWQcmDdcrBp4u3miAJcJSn3XR5SiuL5W77jFEzgJ
+zR8yTC4hWE60nWJOk8UrEbpLyr7mBE0Tr7+1IBMgVXh8WHyzLE2ENREFvtp8KlSS
+y47Ky9n+5aqPI4M7epMNwU/ZGQnC8o3yX0zZL1tKq0fTAw1Ly4NGE1gRbmzrQcCh
+qUHg/J4KFYBMg8eCAzuPp4CRk8wUzu4fRWrOraoz/7bvhH8ilgPu1teLLKzDdOdx
+QAaiz/nGy00ICNbYqifR5m73K/rDdjtIqgsMp9Az0mEpgVNq8SPzM5grqAnP/iww
+QxwFftiXq/pEP2d8rn65e8NikN42Q28PH1D/uBYnOuVdZUvjU9wwywmfyr+NZMaH
+X9sN8R3Kk990W9VxwdOTITpAjz0qMtpE7i/GwPEtpZPTIfl54+cVKvyUjBuTXkWn
+vXN+6MkAEQEAAYkEcgQYAQgAJhYhBH4ckayAMKWlnR76uXUPPIdyPkASBQJf7uWi
+AhsCBQkD60WAAkAJEHUPPIdyPkASwXQgBBkBCAAdFiEEBjEqvVaiYb6sKxATk1aQ
+aqvQi4MFAl/u5aIACgkQk1aQaqvQi4P2Mg/9FXfsIZAgPN/Dq95y1fHG8jsPXEoY
+VNY1codxxAaNqvBXZkfJbFwSYpLY3xIbyxHuGuOtC9NpIy9M1+PR7MsxtZAvSjP+
+flP/12x+6nP2H3NWOICpsY1tNOnQe2SjKJxZXHFnDqDBgKpv3QfKUHmYEdExJe3p
+NQrjZAgmdbEHeoj+P2VV5vqRrJoqNV/pUbM9czfEHeMVMm/mwWNOi/paCh1y/PxZ
+Mkj2bqLMRFfML9O/7QOJRxu3wQwl6jJHj4o6CHks6t237FSB+qZhhQP+vR2CZl5w
+lQ4trw0wpNgbZRIMlU3tUfFQ+KdFsM7UqwzwrVgWFur5r7KrFzJN88EKSplrIY0q
+se6S5b58H7Tw1jtfjb/xF6jQz5aoZ9xemd8roLReRpKPq70o2eIP1HkjCtqmd5Xc
+RQaVEUvlv34WZQ5w2eA1bEBESjbrKhX+H0Un0msUS0JpnpegRNZqW3Bedeos0usy
+MsfqMYmZEcZb3hw51XnSb8B/WhkSmcoEuECRxeCu1tw0pn7o4GemAeqT5ng8LXeE
+RJhrUTlCIyRab8TIQZvmf6XjneT0stZLKCoZUXO+7FH7F7nPsew1dU+WFIauQX71
+PkZp2JMT7W57HKPuEillF8v5+H1k9Jq/2k+ZdgmT1Gd27nALBOc7q8rr00Lf6BU3
+K+XsfWo+p08CXKudfQ/+JFzzpyKeX5nVqiqbxqUakPy/Ot010/7457YVpvcLmcvT
+Yn4cR0dottl96lp5wT1jN7VXfZu/tsHEtTg1ofeExNuCL8DZVsSN836idRmObhLP
+dnYmThZcXBJ3RgSniQNwvuuGUtpH7OXb5vnAOe42+n3yucxhPI9Gzo5g6fTqWwb+
+qwh39ydxtiv3v3jgFixJLj/HH3MsxTm6cNUTWNLzvX+HugBeuOfyDG9++fe3UmZe
+MczAF9N9tDFP+0b1diXywJWfSdVLBmMARYeh0Swjud60SQLTqaqXVfPSECGo9LVc
+wot2u4q67QhUC2OTKiTkF6QVE05iKoPEPkCTmMvSpbHF3ERZE3J6YsVg17Uc7LrZ
+7DRRF+03mu4njS8LvIoeBuqsB96mNQNH/PwLSANWTtclCwj2C9W1HKy3zKjnu3kC
+PHLzwQFEO28TE5EsblnBdA8ozNIV887V7yw89MxPhpuXRn8BVAU1S9Dj7j3mNHLj
+rVAgZmr/nx3oDt8VfOZpK8u3u1voZdC+cnTBdcG2gzM8Ya+h8C60Y8dFzykr8hr4
+b5gDeDI1OkQ2vOQHtnQPdscYKl0v1ntHq2wrFuCIol4WneKh3Jrvdb37cL971u4g
+dpw0jTO/ykCvLlipxjJ/NrnXFb6TriZRgWZqiIwY2lKEfZDXqc/iOa2L0yBr21a5
+Ag0EX+7luwEQAM/CQdinTzIHaEJsCe42g6tt4dBC/UC4wD367rJcyJbEd+qaLJwS
+CQUbg/wrEdRT+aROHVKLwrvXxtgJs0x15vvFTurkn1BnNMh7p8woYwip7PKrNn2+
+96Yg7Aqc3a3gkDQeF8Q7uipOH/5feJh6l7Iu718pvnDUw4UFZt/RUrdqseFXVwr/
+ffSalLx7gJhL3mYuU1qpJZxsonNwAS43eViagI0FHSqixB5kPgFcbBf3BIiisOCy
+a1L9a+zSt1y1aEFC7m+9YlGJA3C0/X8s+dK0VWOrJlP/WmKUp3Epxpu6srsBItcT
+YMuGA82/03YAJ+jpGMRb+X1Dq9vuOUxvDjG+G10Cgew2EjiAkXpVg/1NsCrQWRbs
+KtFf5PXGfKCO0i8hEzwmJLd5OlNIIiup450iX4eS77Tey69hGyweLIC4YDPDwFpp
+bkDdRG6nDvePbEHi5z1L41NaWNa0wEyh28OqrmD0FCcGukk24pBVemVEx0En4siQ
+la6/1QXQlG/wTi7Yi71V/4oz7iZ4lSPWs0ACFGD9W5InlRykiRXC1cV27f+qMw9u
+Y6UbgvN70cWflK5C7e2h/eAQfxj+seYFUjMnJTkXiZE85m63p1Yu2A1c9+jqJ0L3
+Lfn5YIQdtWdY3Qc1RIQYPVRl5NcgXIPV7TwjvnjowuHjWX0IQbhv61lNABEBAAGJ
+BHIEGAEIACYWIQR+HJGsgDClpZ0e+rl1DzyHcj5AEgUCX+7luwIbAgUJA+tFgAJA
+CRB1DzyHcj5AEsF0IAQZAQgAHRYhBOJesM8c6ASdR/HZpjPhDkoYOo5GBQJf7uW7
+AAoJEDPhDkoYOo5GhpcQALowCpZ8UowMWlQFfZ2ySJalnZM6S2RxCFiss4W9pGuu
+9PKuN2wdXW3HGkBGDAuQgLwanSfhGSt/urT3+DT40OlDMzanRwEK0qiSaSs/xBtK
+dNL7JmGbcWTXpNP3aHhfYhVOg7NJnsfZ8Ti3dfuv3ZrjcLvgdnZ/s6O9S3gU8DtH
+fpnOfE3hxjUEHEw9hs9Otc6foCqMDZDvfU3emYduD5AvTiXYdeD/mZBD4OmF99II
+XWNuQexAJ+xgOPdvXaYt0lBuXmfMcn/1hrU3RJqguwnPZ2cU5zo41/uSbdsFrTHK
+yEOLTn0XYYk07mZGdscljzmXbpsbAC4Jp8CDBhUfdzfi1n3AOyblk1nywfionLlz
+HDtfWQYCxp16N8S2MU7tA1w8rFNwVDVwmxIfgjLrjPAgvqSpCmLHTXNBfdLUYRAv
+SpY9TR+U4YOOuEx2Niwnprdjm1qilN+fmPR3tWvVChlD3kHmSpi1+9ix+xizlBjN
+eZ08Eq5rDBPsTpqJmoNS8pHE0EL3IVpcB1pZ5rd6UBSa7LoMLeWwWm7Ap5VZALfp
+jMNws4SA2q5OTRY2or/+m1+cfDWIP+2XQV4YaNFMbO7XKr3vnUOxY9gyADqfRJiv
+DljHiw5iLzbkaHs7dYJOPNMGMlRzZfkkxg6Patx44TQ2rO7LnyCgVdFZWDHNevgR
+Z8AP/152xfh3qsOnT+R32Rt8CcwXmKFxLylgpjegcUmbutow9zdlX26qZ67cJ/3p
+hNLZgAYKPrGecGA0BJ2UzsPEKKz8I/dAp96LpHo/24WqUamh1z2PRAgyJGC43zm0
+rA/KAlcht8bbI/VuZ5eAYXjH01QfPS7i7fFOryYYFqfH+BTp3ZEr/A7FkcOZXmNV
+Gg4+oC2t6cJnzDsM0MUJ7dgNAHTLGx6RZZahdE3LJ8oVJ8Vek9KtjJbPr143EZLt
+ymkiy93pzLUaKWfCZJCCI9nfJnNZnvoQXv0l3wnrQIFE14Fv0jbTALHRgRJlB4cZ
+i3teEuf7shSDsd13JDdfmxMsxnfeVsIUPa+J0GBSbe14JHXlcd0t03cpbzO547Qb
+rFpD98XO6Y7OefWD3pwDF2Izjnn4Cny/hpUIEO1A2j4qHhUkqmnFmBO6yIFic637
+CJnYe3uU7ss/TNIUKLhujqlcNl8WeOMVPbhnCuOhyQh2aioAKn1yiQ1EgNSIGIVD
+LwqMt0kxI52/aDkZgCcEfBFC1c17IeUH+G0HMGm49/acFHkhX61S4efXhvzH5J0l
+Dr+0qk4aVKNwqkUNp56GSMLhiiSYivX9Xa4qQGNlmrki1pC2DamlTXDLB67XQcRp
+dAc+4nNTK4E/czrr0+wlkgz7pC1MAllCLilyTSPGnKIPlOd2uQINBF/u5d0BEADF
++6hDuKvzbmKWZNXjJK6Em/5nnzBOa155YQLN91zMs6COI4p+YuIVPPzVWZYR0yHs
+gTWw45cMV+RYwuL/P+1Z84bgOyPloIVF9VQjOC+wB3Gn4qmTzobr6q+UfQVvUiUQ
+8fGG11teWvYpWiG91uialjHZmrpAOQxjHRxHPpi0cZtTFEqinCIy6c942xbtZnzf
+nzPpxkKl0a8s1eKZ0KlDK6Ab59nxAinilohXRg/U6sqypsyLl41L0qMZek5dEt4C
+r3spdSkZgxqJpLTqQy/5VB4pcfEaIaank3sLxhpil/oQiq+38WA0VkICQyeiCsvf
+eEKyt1C6COBNH+olegUxudTKDHFthyGMPRz3McI5jHxCyru0mfLJag2hHXzgGoaD
+VkYIwkvyVsHWDqrZMMXcCIUVlpphxtHo1M32AATnWFe4K1nFdbejR9XC5xWOgwbT
+zCblqporHzU0c8WBbfJ0Y10IDrHsa/F08PkFvVN48Ydik6rcwowSPxP+59Q9AKLh
+Isd2hzfWU2zAbG5Ph1wecwlYR3tp/0i3uSTDXfuuaY+vrqpoECN6fnSg8NxiBbjU
+JR0Ju6KDM2SeBUz5hp9BzL8+OPTogRZoinxBogrRAvdGLOnLG5hMjBezzF8UEvp6
+IMisGHBZgXoX4Juvf78RE8JOwHa+HUejj5kYiQW6TwARAQABiQRyBBgBCAAmFiEE
+fhyRrIAwpaWdHvq5dQ88h3I+QBIFAl/u5d0CGwIFCQPrRYACQAkQdQ88h3I+QBLB
+dCAEGQEIAB0WIQT2AU9wN9W7TuO6I3E56nu98JFFWwUCX+7l3QAKCRA56nu98JFF
+W5whD/9Hu5cnJ0hnzqk3MQsdMXbTNLsv+KePV71kcMRat4hjw2Li/TUaC8xtA81d
+O/1obmsuoDAgv82KlQ7DLDXjFk2q45lJdgZxAkN3dEoYakdTIEi11FvwbhV+qxZK
+jTq3jFQho4i3GDLgrvBMG4B1TGMH0IPux9fmBGpxYKmp1GjhpgoMXp9bqzsV/mPZ
+TxPlmIpeJEO2jeCWKhHHw6rzwGjF68G3HiJ0TqvjdCtcNrwd3GTDsdEJtUl49aqF
+M7VfoqKjVdRO/YDL//+TJNOYz5EBGjIZxbhgZJ9Qz+geSBx9GJtDWdq193ofFi39
+oleTFnEMj+OeIr1Bc2pc8Z3HJttFknicJDkeze3mM0CZAkhVkLFy6DvAQkXrgvfp
+AUYFACQW8E2XmRBiKd4huojWYz5QGSEIk2fYRVhse2HAUZ9gTODSX2L13nls+BEi
+sArsmSFA/RQslDXW+Jl+P0e37BzN51uk2Dg4ylJUBgcpTRUn4Q8c1DgHDhkEVnBI
+ny2H/MFuhImw9g5xqlBfCEKh5D8D0e4fX28MhSsBlOCeIKJoY85U3GNY0tlIwAt8
+M7IIHe1n1qncPbAMmq0K48J1lfyTEbXpnSfArzEdbnosjBUaiQX5EwA656eZ6wb3
+Vq02UDei6KPuOosl4Voy+Ffq5MCkanVMA97/0wV3CeCvQYGbsvsUD/9fLYc3yH7A
+0xksK7PImztDR8MLsUPoiv/vnfZ+WJJ+YJ0TKAHm1ZO3NqeZmD7XoWHKwh83zsK8
+x/JUASCBN16isC+Ym6IwF83/HXJfKNvvotkr2WG6Dv8Vg1Hhk2Iv5y3EMbFa9rfv
+6vjxho+0sYrraJH8qQAM08IIOi7+afrkR/ikgA8V7ymqmdxtMMHZqG+h5R0VGTVw
+QBxZ5/ZiY56Qn5UH2m0Tc2AHOcAQTvCEwyb19IPyhif+rek3npSvKtDc6WBJioyi
+gvDhl+jgIfcIo77w6GthgbFc9k68Je56Peu2J30zWj76Z+Di1OJhAj1wFr4/XT5o
+c1MB/Vfyx3hEPRDNz7dRaDqoVnYVdoI0blyCiSkD9I4/axb4X3xN2SK4XA/zv+Lb
+1FbCM1XFL2aF+09tk+77EVdWsBmQpOArD0d54E1YulBGaxVm5QKfov23KiqHIFVF
+8WYqJqNJwbJRZii7klczkVm3wFte3NWK7HW8kfF147lv0z3AiZYnk0O6Mj1ip3R8
+Qm5yiv57DbbgIMkSPWCpEtFGHIoK2msJ2bQcizh2WGxLos00RTx3IVAeSAS54+kr
+rMBg50wNczcGHKPDUKLwkYczgHonUtljAkeXnTl69rifChI+KpjHNtF6dFgC1aSt
+MOud6HhAcd0f3lmuPzCGGp4YOQx9tV139bkCDQRf7uX4ARAAxaybudQK4fMIzLiV
+grIzthhb3/DK83PNohTNMemM2V2z1Ij5Dlu2XNDypMdR0rKM/QI3zWud1+vd2h/l
+QZlg58FspvrY6I7hI+cbdRldVaAKDGQHo5Bi0a7BkonZvS/0wnNUPIhy/znzXtXR
+f4L7ePZMofH/2shz4TZ1yNpU8zaomY6eNjSc51P4vVxtDQ4QofQeJEn8aO9a4whu
+O0TVEAPKRYBRgjM8faDuUJtLfiC3OrhLg+B7JVSF3di4JITAyafPbZACLjV7Umxb
+SUL3qTJZVpIuhF0xQOCE+WRx3Xs7lkPdHMqP2OaJ8Y4ymR08cSfIP2XFKsQFtoqT
+VyMQgGgI6VXF8OfnCnGgx0Do1vJNoL0neFzVXpCPPzh1RbcrtndZWum/1R4egkYg
+J8TPQH5X391J58Uwd5l9/ZDdoSeeQYdtTR4YQ8//ATFO3hoSRvES4U6ZwO8LM6di
+ra6pqb6j0liT+DdcBwE4C1bGJMJ6d93S5SfH3llDIMJo7uJDbKILFMES9rg7S6I8
++SW75TjKUk4Y7L8R8qwURqEyuOOGfaQXirqvji4PdcGDBiIk2Oq69Ky6lmlJgyIH
+SZ7SO1JXk0yAJTXb+a6FJTLFxidkIZzu+LhLBn/MhAPjVyv3qCTQ7O0lu8Mfcqg5
+8hhJ6IE79PBHS3z8ok+mFK0iGrcAEQEAAYkEcgQYAQgAJhYhBH4ckayAMKWlnR76
+uXUPPIdyPkASBQJf7uX4AhsCBQkD60WAAkAJEHUPPIdyPkASwXQgBBkBCAAdFiEE
+JFV3TUL9/mucOD64/hACvFlwgR8FAl/u5fgACgkQ/hACvFlwgR+LoRAAgtIgaKb4
+ZY8qoAFZeph+Syg+mMKfPJkBuGUedJl6IxbHBSg2mhnCjJ0bmdqxsAXgtcSUqmtZ
+Yw9NyoGgiVjs+gu5sQp1Oxc2/keQXaVksTkoXwdnf+2iXyp1WPeeLGySHmzuwy9c
+eExt+h0mVmBgFls2wNdFGPbVfiT3PvFkwqsnta6HebDTN4pMzvG1IIGV7L5KRo1E
+dmkrt3lXQWmdgHl3JoNQ9v/Jgf4jo6gDw53YvJFKJcaOOAS3d4CzPWmcLzcy4mf0
+9YI3DoQCbYL3cRNelUwzUF2L6QyPCwonXemLCmfkBgsSVqvW4fq8qbEHGF2fK7x3
+d7bZEsUiGCt/tXOkDkNJ31T/mC35nxZfcj8AMPixO+BnAeKeYC37LbQD76jrw526
+tUXsAF+QON5DPeot+e8bIx9qSbvdqpXDkK4lGcRTuS2OVC8J9XfDTch4wm3Kd4P4
+lDdRAJWnLfVay0m05LGlekWdEzcjP8KDaICH9rEs6f9e1gy6mTEBnBW//41BxELT
+KxoTGlcX3yEhCmK36g5C/+d6b7Ji5arGGTCa96v/xG32KYc1zfn3TYkCx06pPUbz
+iAl2l0MTpGeqz2hJMOGA3JuxwlksJKqnPYy0hHKdVW4Pnn25NeXcBp8wpkt8VZOR
+bzjw/TJB7qvJHoRo1tat85Uij9rAXqTyO8Ea0hAAi/EfuiDDy3GV7bvjFSA1XEjL
+d+F40g2X0QG/PHTScYB4rFJwV0GFUxLHr4g7iypAVI+BB4EYikx8gpee6B0g3J+r
+aCFDDrRPDKdqrpZK53oYcBPkdSBbCr5MAa/M3DerKBEgoBVUbaSHWN7OH2ae+5R6
+X2ERmYZdW4PCj6lw7a+RhkAsgKo8RjonjV61ehQPZh20noI19Q80BYYSCfHHvzy5
+vwvByhmTMJNrl3PDpBy9/TwBR5DpnHfOPJX6bnl3pdu65F2TRM6yoFbfoUiEqrXV
+4wC1I++N9VjrQvXSp0ik/XaMWq87wLIg+1owElJIzwyZWukQkZMAYtesVFz20YwC
+7Nu8SNr/NTSCH1EqLsS4YhBTsjpc2T8AqUlgxKrilmLbrj64PXgMsQ9WYm5zwlC5
+UA5eky5YhETFJ25dIaplMm47aIbPSH5f9y5eYPkfOCoMu5oDzDzoXdH9V1YfsHqa
+8bboSgTdariC23x38E9PaWQNyY2MFKL6cFt2ilIsMSSD6JAm1x8kBtn1bBopG588
+7mTDtlqHCw/QrTuLreJG9KJ1dQFJ/Q42+csH09l081wlv4BBuVlN1Xmj+c2sWn90
+l1BPZfYHd9jhggI96yTZhfTfFbSMSuGPQyqHnwDYdA3cNj5BYievBkO5FZaCe9SZ
+4xcYgqlVpv15O7VrD+I=
+=Uugw
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/dnssec-checkds-s.patch b/dnssec-checkds-s.patch
deleted file mode 100644
index 055ce2c2691c2a7f3881e7aef502eba53fa637fc..0000000000000000000000000000000000000000
--- a/dnssec-checkds-s.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From 3b4f23cdbfa3f285d06eea8c4101650d2ab4e945 Mon Sep 17 00:00:00 2001
-From: Evan Hunt <each@isc.org>
-Date: Thu, 26 Oct 2017 21:05:11 -0700
-Subject: [PATCH 1314/3677] [master] dnssec-checkds -s
-
-4794.	[func]		"dnssec-checkds -s" specifies a file from which
-			to read a DS set rather than querying the parent.
-			[RT #44667]
----
- CHANGES                                     |   8 +-
- bin/python/dnssec-checkds.docbook           |  24 +++---
- bin/tests/system/checkds/clean.sh           |   2 -
- bin/tests/system/checkds/dig.pl             |   2 -
- bin/tests/system/checkds/dig.sh             |   3 -
- bin/tests/system/checkds/prep.example.db    | 121 ++++++++++++++++++++++++++++
- bin/tests/system/checkds/prep.example.ds.db |   2 +
- bin/tests/system/checkds/tests.sh           |   9 +++
- doc/arm/notes.xml                           |   8 ++
- 10 files changed, 190 insertions(+), 38 deletions(-)
- create mode 100644 bin/tests/system/checkds/prep.example.db
- create mode 100644 bin/tests/system/checkds/prep.example.ds.db
-
-diff --git a/bin/python/dnssec-checkds.docbook b/bin/python/dnssec-checkds.docbook
-index 91716bc..069d6e9 100644
---- a/bin/python/dnssec-checkds.docbook
-+++ b/bin/python/dnssec-checkds.docbook
-@@ -42,20 +42,13 @@
-   <refsynopsisdiv>
-     <cmdsynopsis sepchar=" ">
-       <command>dnssec-checkds</command>
--      <arg choice="opt" rep="norepeat"><option>-l <replaceable class="parameter">domain</replaceable></option></arg>
--      <arg choice="opt" rep="norepeat"><option>-f <replaceable class="parameter">file</replaceable></option></arg>
-       <arg choice="opt" rep="norepeat"><option>-d <replaceable class="parameter">dig path</replaceable></option></arg>
-       <arg choice="opt" rep="norepeat"><option>-D <replaceable class="parameter">dsfromkey path</replaceable></option></arg>
--      <arg choice="req" rep="norepeat">zone</arg>
--    </cmdsynopsis>
--    <cmdsynopsis sepchar=" ">
--      <command>dnssec-dsfromkey</command>
--      <arg choice="opt" rep="norepeat"><option>-l <replaceable class="parameter">domain</replaceable></option></arg>
-       <arg choice="opt" rep="norepeat"><option>-f <replaceable class="parameter">file</replaceable></option></arg>
--      <arg choice="opt" rep="norepeat"><option>-d <replaceable class="parameter">dig path</replaceable></option></arg>
--      <arg choice="opt" rep="norepeat"><option>-D <replaceable class="parameter">dsfromkey path</replaceable></option></arg>
-+      <arg choice="opt" rep="norepeat"><option>-l <replaceable class="parameter">domain</replaceable></option></arg>
-+      <arg choice="opt" rep="norepeat"><option>-s <replaceable class="parameter">file</replaceable></option></arg>
-       <arg choice="req" rep="norepeat">zone</arg>
--   </cmdsynopsis>
-+    </cmdsynopsis>
-   </refsynopsisdiv>
- 
-   <refsection><info><title>DESCRIPTION</title></info>
-@@ -93,6 +86,17 @@
-       </varlistentry>
- 
-       <varlistentry>
-+        <term>-s <replaceable class="parameter">file</replaceable></term>
-+        <listitem>
-+          <para>
-+            Specifies a prepared dsset file, such as would be generated
-+            by <command>dnssec-signzone</command>, to use as a source for
-+            the DS RRset instead of querying the parent.
-+          </para>
-+        </listitem>
-+      </varlistentry>
-+
-+      <varlistentry>
-         <term>-d <replaceable class="parameter">dig path</replaceable></term>
-         <listitem>
-           <para>
-diff --git a/bin/python/isc/checkds.py.in b/bin/python/isc/checkds.py.in
-index ce50355..a161554 100644
---- a/bin/python/isc/checkds.py.in
-+++ b/bin/python/isc/checkds.py.in
-@@ -89,39 +93,43 @@ class SECRR:
- # Generate a set of expected DS/DLV records from the DNSKEY RRset,
- # and report on congruency.
- ############################################################################
--def check(zone, args, masterfile=None, lookaside=None):
-+def check(zone, args):
-     rrlist = []
--    cmd = [args.dig, "+noall", "+answer", "-t", "dlv" if lookaside else "ds",
--           "-q", zone + "." + lookaside if lookaside else zone]
--    fp, _ = Popen(cmd, stdout=PIPE).communicate()
-+    if args.dssetfile:
-+        fp = open(args.dssetfile).read()
-+    else:
-+        cmd = [args.dig, "+noall", "+answer", "-t",
-+                "dlv" if args.lookaside else "ds", "-q",
-+                zone + "." + args.lookaside if args.lookaside else zone]
-+        fp, _ = Popen(cmd, stdout=PIPE).communicate()
- 
-     for line in fp.splitlines():
-         if type(line) is not str:
-             line = line.decode('ascii')
--        rrlist.append(SECRR(line, lookaside))
-+        rrlist.append(SECRR(line, args.lookaside))
-     rrlist = sorted(rrlist, key=lambda rr: (rr.keyid, rr.keyalg, rr.hashalg))
- 
-     klist = []
- 
--    if masterfile:
--        cmd = [args.dsfromkey, "-f", masterfile]
--        if lookaside:
--            cmd += ["-l", lookaside]
-+    if args.masterfile:
-+        cmd = [args.dsfromkey, "-f", args.masterfile]
-+        if args.lookaside:
-+            cmd += ["-l", args.lookaside]
-         cmd.append(zone)
-         fp, _ = Popen(cmd, stdout=PIPE).communicate()
-     else:
-         intods, _ = Popen([args.dig, "+noall", "+answer", "-t", "dnskey",
-                            "-q", zone], stdout=PIPE).communicate()
-         cmd = [args.dsfromkey, "-f", "-"]
--        if lookaside:
--            cmd += ["-l", lookaside]
-+        if args.lookaside:
-+            cmd += ["-l", args.lookaside]
-         cmd.append(zone)
-         fp, _ = Popen(cmd, stdin=PIPE, stdout=PIPE).communicate(intods)
- 
-     for line in fp.splitlines():
-         if type(line) is not str:
-             line = line.decode('ascii')
--        klist.append(SECRR(line, lookaside))
-+        klist.append(SECRR(line, args.lookaside))
- 
-     if len(klist) < 1:
-         print("No DNSKEY records found in zone apex")
-@@ -136,7 +144,8 @@ def check(zone, args, masterfile=None, lookaside=None):
-                    rr.keyid, SECRR.hashalgs[rr.hashalg]))
- 
-     if not found:
--        print("No %s records were found for any DNSKEY" % ("DLV" if lookaside else "DS"))
-+        print("No %s records were found for any DNSKEY" %
-+                ("DLV" if args.lookaside else "DS"))
- 
-     return found
- 
-@@ -151,10 +160,6 @@ def parse_args():
-     sbindir = 'bin' if os.name == 'nt' else 'sbin'
- 
-     parser.add_argument('zone', type=str, help='zone to check')
--    parser.add_argument('-f', '--file', dest='masterfile', type=str,
--                        help='zone master file')
--    parser.add_argument('-l', '--lookaside', dest='lookaside', type=str,
--                        help='DLV lookaside zone')
-     parser.add_argument('-d', '--dig', dest='dig',
-                         default=os.path.join(prefix(bindir), 'dig'),
-                         type=str, help='path to \'dig\'')
-@@ -162,6 +167,12 @@ def parse_args():
-                         default=os.path.join(prefix(sbindir),
-                                              'dnssec-dsfromkey'),
-                         type=str, help='path to \'dnssec-dsfromkey\'')
-+    parser.add_argument('-f', '--file', dest='masterfile', type=str,
-+                        help='zone master file')
-+    parser.add_argument('-l', '--lookaside', dest='lookaside', type=str,
-+                        help='DLV lookaside zone')
-+    parser.add_argument('-s', '--dsset', dest='dssetfile', type=str,
-+                        help='prepared DSset file')
-     parser.add_argument('-v', '--version', action='version',
-                         version=version)
-     args = parser.parse_args()
-@@ -178,5 +189,5 @@ def parse_args():
- ############################################################################
- def main():
-     args = parse_args()
--    found = check(args.zone, args, args.masterfile, args.lookaside)
-+    found = check(args.zone, args)
-     exit(0 if found else 1)
- 
--- 
-1.8.3.1
-
diff --git a/dnszone.schema b/dnszone.schema
deleted file mode 100644
index cb72a3fd923962030c23bfd105e7f6a92fe1378f..0000000000000000000000000000000000000000
--- a/dnszone.schema
+++ /dev/null
@@ -1,148 +0,0 @@
-# A schema for storing DNS zones in LDAP
-#
-attributetype ( 1.3.6.1.4.1.2428.20.0.0  NAME 'dNSTTL'
-	DESC 'An integer denoting time to live'
-	EQUALITY integerMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.0.1 NAME 'dNSClass'
-	DESC 'The class of a resource record'
-	EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.0.2 NAME 'zoneName'
-	DESC 'The name of a zone, i.e. the name of the highest node in the zone'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.0.3 NAME 'relativeDomainName'
-	DESC 'The starting labels of a domain name'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.12 NAME 'pTRRecord'
-	DESC 'domain name pointer, RFC 1035'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.13 NAME 'hInfoRecord'
-	DESC 'host information, RFC 1035'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.14 NAME 'mInfoRecord'
-	DESC 'mailbox or mail list information, RFC 1035'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.16 NAME 'tXTRecord'
-	DESC 'text string, RFC 1035'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.18 NAME 'aFSDBRecord'
-	DESC 'for AFS Data Base location, RFC 1183'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.24 NAME 'SigRecord'
-	DESC 'Signature, RFC 2535'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.25 NAME 'KeyRecord'
-	DESC 'Key, RFC 2535'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.28 NAME 'aAAARecord'
-	DESC 'IPv6 address, RFC 1886'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.29 NAME 'LocRecord'
-	DESC 'Location, RFC 1876'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.30 NAME 'nXTRecord'
-	DESC 'non-existant, RFC 2535'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.33 NAME 'sRVRecord'
-	DESC 'service location, RFC 2782'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.35 NAME 'nAPTRRecord'
-	DESC 'Naming Authority Pointer, RFC 2915'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.36 NAME 'kXRecord'
-	DESC 'Key Exchange Delegation, RFC 2230'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.37 NAME 'certRecord'
-	DESC 'certificate, RFC 2538'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.38 NAME 'a6Record'
-	DESC 'A6 Record Type, RFC 2874'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.39 NAME 'dNameRecord'
-	DESC 'Non-Terminal DNS Name Redirection, RFC 2672'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.43 NAME 'dSRecord'
-	DESC 'Delegation Signer, RFC 3658'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.46 NAME 'rRSIGRecord'
-	DESC 'RRSIG, RFC 3755'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.47 NAME 'nSECRecord'
-	DESC 'NSEC, RFC 3755'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-objectclass ( 1.3.6.1.4.1.2428.20.3 NAME 'dNSZone'
-        SUP top STRUCTURAL
-	MUST ( zoneName $ relativeDomainName )
-        MAY ( DNSTTL $ DNSClass $
-              ARecord $ MDRecord $ MXRecord $ NSRecord $
-	      SOARecord $ CNAMERecord $ PTRRecord $ HINFORecord $
-              MINFORecord $ TXTRecord $ SIGRecord $ KEYRecord $
-              AAAARecord $ LOCRecord $ NXTRecord $ SRVRecord $
-              NAPTRRecord $ KXRecord $ CERTRecord $ A6Record $
-              DNAMERecord ) )
diff --git a/do-not-treat-a-referral-with-a-non-empty-ANSWER-sect.patch b/do-not-treat-a-referral-with-a-non-empty-ANSWER-sect.patch
deleted file mode 100644
index 02bba3757f8d4c6bd887ca6337a6377ea96029e5..0000000000000000000000000000000000000000
--- a/do-not-treat-a-referral-with-a-non-empty-ANSWER-sect.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/lib/dns/resolver.c	2019-04-17 06:06:06.700000000 -0400
-+++ b/lib/dns/resolver_1.c	2019-04-17 06:08:47.697000000 -0400
-@@ -8419,7 +8419,9 @@ resquery_response(isc_task_t *task, isc_
- 				if (result != ISC_R_SUCCESS)
- 					FCTXTRACE3("noanswer_response", result);
- 			}
--			if (result != DNS_R_DELEGATION) {
-+			if (result == DNS_R_DELEGATION) {
-+                            result = ISC_R_SUCCESS;
-+                        } else {
- 				/*
- 				 * At this point, AA is not set, the response
- 				 * is not a referral, and the server is not a
diff --git a/feature-bind99-euler-range-port.patch b/feature-bind99-euler-range-port.patch
deleted file mode 100644
index 19f8e87c5055d29752c23be2cbe280a5d454bf59..0000000000000000000000000000000000000000
--- a/feature-bind99-euler-range-port.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
-index c93651d..d03ef2d 100644
---- a/lib/dns/dispatch.c
-+++ b/lib/dns/dispatch.c
-@@ -49,6 +49,7 @@
- #include <dns/tcpmsg.h>
- #include <dns/types.h>
- 
-+const char *conffile = "/etc/dns_port.conf";
- typedef ISC_LIST(dns_dispentry_t)	dns_displist_t;
- 
- typedef struct dispsocket		dispsocket_t;
-@@ -1933,6 +1934,168 @@ open_socket(isc_socketmgr_t *mgr, isc_sockaddr_t *local,
- 	return (ISC_R_SUCCESS);
- }
- 
-+static int convert_num(char *str)
-+{
-+	int negative = 0;
-+	int tval;
-+	int val = 0;
-+	int base = 10;
-+	char *ptr = str;
-+	if (str == NULL)
-+		return -ISC_R_FAILURE;
-+
-+	if (*ptr == '-') {
-+		negative = 1;
-+		++ptr;
-+	}
-+
-+	do {
-+		tval = *ptr++;
-+		/* XXX assumes ASCII... */
-+		if (tval >= '0')
-+			tval -= '0';
-+		else {
-+			syslog (LOG_ERR, "Bogus number: %s.", str);
-+			return -ISC_R_BADNUMBER;
-+		}
-+		if (tval >= base) {
-+			syslog (LOG_ERR, "Bogus number: %s.", str);
-+			return -ISC_R_BADNUMBER;
-+		}
-+		val = val * base + tval;
-+	} while (*ptr);
-+
-+	if (negative)
-+		val = -val;
-+	return val;
-+}
-+
-+static int str_token(char *str, int *digit, unsigned int len, const char *semi)
-+{
-+	int num = 0;
-+	char *p;
-+	p = strtok(str, semi);
-+	while (p !=NULL) {
-+		if (num >= len-1) {
-+			digit[num] = '\0';
-+			break;
-+		}
-+		/* convert string to integer */
-+		digit[num] = convert_num(p);
-+		if (digit[num] < 0)
-+			return -ISC_R_BADNUMBER;
-+
-+		p = strtok(NULL, semi);
-+		num++;
-+	}
-+
-+	return num;
-+}
-+
-+static int parse_port_config(const char *buffer, const char *sub_buf, int *ports, unsigned int len, const char *semi)
-+{
-+	char *str;
-+	char string[256] = {0};
-+	int start, end;
-+	int ret = -ISC_R_DISABLED;
-+
-+	if (str = strstr(buffer, sub_buf)) {
-+		start = strlen(sub_buf);
-+		end = strlen(str);
-+		strncpy(string, str + start, end - start -1);
-+		/* string segmentation with semi character */
-+		ret = str_token(string, ports, len, semi);
-+		if (ret < 0)
-+			return -ISC_R_BADNUMBER;
-+	}
-+
-+	return ret;
-+}
-+
-+static isc_result_t
-+parse_config(const char *file, in_port_t *port_lo, in_port_t *port_hi, in_port_t *no_use_ports)
-+{
-+	FILE *fp;
-+	char *str = NULL;
-+	char buffer[256] = {0};
-+	int ports[8] = {0};
-+	int unports[17] = {0};
-+	int i = 0;
-+	int ret;
-+
-+	fp = fopen(file, "r");
-+	if (fp) {
-+		while (fgets(buffer, 256, fp)) {
-+                       const char *buffer_s = buffer;
-+			str = buffer;
-+			/* skip the comment line */
-+			while (isspace(*str))
-+				str++;
-+			if (strncmp(str, "#", 1) == 0)
-+				continue;
-+			/* get default set of dispatch ports */
-+			ret = parse_port_config(buffer_s, "dns-range-port", ports, 8, " ");
-+			if (ret == 2) {
-+				*port_lo = (in_port_t)ports[0];
-+				*port_hi = (in_port_t)ports[1];
-+				if (*port_lo < 1024 || *port_hi > 65535 || *port_lo > *port_hi) {
-+					syslog(LOG_ERR,
-+						"Unexpected ports contents in %s file.", file);
-+					fclose(fp);
-+					fp = NULL;
-+					return ISC_R_INVALIDFILE;
-+				}
-+			} else if (ret != -ISC_R_DISABLED){
-+				syslog(LOG_ERR,
-+					"Unexpected ports contents in %s file.", file);
-+				fclose(fp);
-+				fp = NULL;
-+				return ISC_R_INVALIDFILE;
-+			}
-+			/* get excluded ports */
-+			ret = parse_port_config(buffer_s, "dns-excluded-ports", unports, 17, " ");
-+			if (ret > 0) {
-+				while (unports[i] != '\0') {
-+					no_use_ports[i] = (in_port_t)unports[i];
-+					i++;
-+				}
-+			} else if (ret != -ISC_R_DISABLED) {
-+				syslog(LOG_ERR,
-+					"Unexpected ports contents in %s file.", file);
-+				fclose(fp);
-+				fp = NULL;
-+				return ISC_R_INVALIDFILE;
-+			}
-+		}
-+
-+		fclose(fp);
-+		fp = NULL;
-+		return ISC_R_SUCCESS;
-+	}
-+
-+	syslog(LOG_ERR,
-+		"Open %s fail, return.\n", file);
-+	return ISC_R_FILENOTFOUND;
-+}
-+
-+/*%
-+ * Create a temporary port list to set the initial default set of dispatch
-+ * ports and excluded ports.  This is almost meaningless as the application will
-+ * normally set the ports explicitly, but is provided to fill some minor corner
-+ * cases.
-+ */
-+static isc_result_t
-+create_portset_by_range(isc_mem_t *mctx, isc_portset_t **portsetp, in_port_t port_lo, in_port_t port_hi, in_port_t *no_use_ports) {
-+	isc_result_t result;
-+
-+	result = isc_portset_create(mctx, portsetp);
-+	if (result != ISC_R_SUCCESS)
-+		return (result);
-+	isc_portset_addrange_by_range(*portsetp, port_lo, port_hi, no_use_ports);
-+
-+	return (ISC_R_SUCCESS);
-+}
-+
- /*%
-  * Create a temporary port list to set the initial default set of dispatch
-  * ports: [1024, 65535].  This is almost meaningless as the application will
-@@ -1963,6 +2125,9 @@ dns_dispatchmgr_create(isc_mem_t *mctx, isc_entropy_t *entropy,
- 	isc_result_t result;
- 	isc_portset_t *v4portset = NULL;
- 	isc_portset_t *v6portset = NULL;
-+	in_port_t port_lo = 1024;
-+	in_port_t port_hi = 65535;
-+	in_port_t no_use_ports[17] = {0};
- 
- 	REQUIRE(mctx != NULL);
- 	REQUIRE(mgrp != NULL && *mgrp == NULL);
-@@ -2063,14 +2228,23 @@ dns_dispatchmgr_create(isc_mem_t *mctx, isc_entropy_t *entropy,
- 	mgr->nv6ports = 0;
- 	mgr->magic = DNS_DISPATCHMGR_MAGIC;
- 
--	result = create_default_portset(mctx, &v4portset);
-+	/* parse port list file, get default set of dispatch ports and excluded ports */
-+	result = parse_config(conffile, &port_lo, &port_hi, no_use_ports);
- 	if (result == ISC_R_SUCCESS) {
--		result = create_default_portset(mctx, &v6portset);
--		if (result == ISC_R_SUCCESS) {
--			result = dns_dispatchmgr_setavailports(mgr,
--							       v4portset,
--							       v6portset);
--		}
-+		create_portset_by_range(mctx, &v4portset, port_lo, port_hi, no_use_ports);
-+		if (result == ISC_R_SUCCESS)
-+			result = create_portset_by_range(mctx, &v6portset, port_lo, port_hi, no_use_ports);
-+	}
-+	else {
-+		result = create_default_portset(mctx, &v4portset);
-+		if (result == ISC_R_SUCCESS)
-+			result = create_default_portset(mctx, &v6portset);
-+	}
-+
-+	if (result == ISC_R_SUCCESS) {
-+		result = dns_dispatchmgr_setavailports(mgr,
-+							   v4portset,
-+							   v6portset);
- 	}
- 	if (v4portset != NULL)
- 		isc_portset_destroy(mctx, &v4portset);
-diff --git a/lib/isc/include/isc/portset.h b/lib/isc/include/isc/portset.h
-index 774d6bb..cfd0bcb 100644
---- a/lib/isc/include/isc/portset.h
-+++ b/lib/isc/include/isc/portset.h
-@@ -125,6 +125,19 @@ isc_portset_addrange(isc_portset_t *portset, in_port_t port_lo,
-  */
- 
- void
-+isc_portset_addrange_by_range(isc_portset_t *portset, in_port_t port_lo,
-+		     in_port_t port_hi, in_port_t *no_use_ports);
-+/*%<
-+ * Add a subset of [port_lo, port_hi] (inclusive) and no_use_ports(exclusive) to the portset.  Ports in the
-+ * subset may or may not be stored in portset.
-+ *
-+ * Requires:
-+ *\li	'portlist' to be valid.
-+ *\li	port_lo <= port_hi
-+ *\li   no_use_ports > 0
-+ */
-+
-+void
- isc_portset_removerange(isc_portset_t *portset, in_port_t port_lo,
- 			in_port_t port_hi);
- /*%<
-diff --git a/lib/isc/portset.c b/lib/isc/portset.c
-index 471ca8e..0ebd79f 100644
---- a/lib/isc/portset.c
-+++ b/lib/isc/portset.c
-@@ -128,6 +128,31 @@ isc_portset_addrange(isc_portset_t *portset, in_port_t port_lo,
- }
- 
- void
-+isc_portset_addrange_by_range(isc_portset_t *portset, in_port_t port_lo,
-+		     in_port_t port_hi, in_port_t *no_use_ports)
-+{
-+	in_port_t p;
-+	int i, flag;
-+	REQUIRE(portset != NULL);
-+	REQUIRE(port_lo <= port_hi);
-+
-+	p = port_lo;
-+	do {
-+		i = 0;
-+		flag = 0;
-+		while (no_use_ports[i] != '\0') {
-+			if (no_use_ports[i] == p) {
-+				flag = 1;
-+				break;
-+			}
-+			i++;
-+		}
-+		if (flag == 0)
-+			portset_add(portset, p);
-+	} while (p++ < port_hi);
-+}
-+
-+void
- isc_portset_removerange(isc_portset_t *portset, in_port_t port_lo,
- 			in_port_t port_hi)
- {
diff --git a/generate-rndc-key.sh b/generate-rndc-key.sh
old mode 100644
new mode 100755
index 375a48e831ff2ed34f4a4944473b42f3dfe7ecb8..956bb8e4eaaadabcf5db36eb5ecdf307944dd90d
--- a/generate-rndc-key.sh
+++ b/generate-rndc-key.sh
@@ -17,7 +17,7 @@ fi
 
 if [ ! -s /etc/rndc.key -a ! -s /etc/rndc.conf ]; then
   echo -n $"Generating /etc/rndc.key:"
-  if /usr/sbin/rndc-confgen -a -A hmac-sha256 -r /dev/urandom > /dev/null 2>&1
+  if /usr/sbin/rndc-confgen -a -A hmac-sha256 > /dev/null 2>&1
   then
     chmod 640 /etc/rndc.key
     chown root:named /etc/rndc.key
diff --git a/ldap2zone.1 b/ldap2zone.1
deleted file mode 100644
index a48c69f60a9f2762b09136628605d1385240febb..0000000000000000000000000000000000000000
--- a/ldap2zone.1
+++ /dev/null
@@ -1,41 +0,0 @@
-.\" Copyright (C) 2004, 2005 Stig Venaas <venaas@uninett.no>
-.\" 
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\" Manpage written by Jan Gorig
-.TH ldap2zone 1 "15 March 2010" "BIND9"
-.SH NAME
-ldap2zone - Creates zone file from LDAP dnszone information
-.SH SYNOPSIS
-.B ldap2zone zone-name LDAP-URL default-ttl [serial]
-.SH DESCRIPTION
-ldap2zone is a tool that reads info for a zone from LDAP and constructs a standard plain ascii zone file that is written to the standard output. The LDAP information has to be stored using the dnszone schema. The schema is used by BIND with LDAP back-end.
-
-\fBzone-name\fR
-.RS 4
-Name of the zone, eg "mydomain.net."
-.RE
-.PP
-\fBLDAP-URL\fR
-.RS 4
-LDAP URL to dnszone information
-.RE
-.PP
-\fBdefault-ttl\fR
-.RS 4
-Default TTL value to be used in zone
-.RE
-.PP
-\fBserial\fR
-.RS 4
-(optional) Program checks this number to be different than SOA serial number.
-.RE
-
-.SH "EXIT STATUS"
-Exits with 0 on success or 1 on failure.
-.SH "SEE ALSO"
-named(8) ldap(3) 
-http://www.venaas.no/dns/ldap2zone/
-.SH "COPYRIGHT"
-Copyright (C) 2004, 2005 Stig Venaas
diff --git a/makefile-replace-libs.py b/makefile-replace-libs.py
new file mode 100755
index 0000000000000000000000000000000000000000..86689a4009ed7b111f798035fe3f331afb8157fd
--- /dev/null
+++ b/makefile-replace-libs.py
@@ -0,0 +1,127 @@
+#!/usr/bin/python3
+
+import re
+import argparse
+
+"""
+Script for replacing Makefile ISC_INCLUDES with runtime flags.
+
+Should translate part of Makefile to use isc-config.sh instead static linked sources.
+ISC_INCLUDES = -I/home/pemensik/rhel/bind/bind-9.11.12/build/lib/isc/include \
+        -I${top_srcdir}/lib/isc \
+        -I${top_srcdir}/lib/isc/include \
+        -I${top_srcdir}/lib/isc/unix/include \
+        -I${top_srcdir}/lib/isc/pthreads/include \
+        -I${top_srcdir}/lib/isc/x86_32/include
+
+Should be translated to:
+ISC_INCLUDES = $(shell isc-config.sh --cflags isc)
+"""
+
+def isc_config(mode, lib):
+    if mode:
+        return '$(shell isc-config.sh {mode} {lib})'.format(mode=mode, lib=lib)
+    else:
+        return ''
+
+def check_match(match, debug=False):
+    """
+    Check this definition is handled by internal library
+    """
+    if not match:
+        return False
+    lib = match.group(2).lower()
+    ok = not lib_filter or lib in lib_filter
+    if debug:
+        print('{status} {lib}: {text}'.format(status=ok, lib=lib, text=match.group(1)))
+    return ok
+
+def fix_line(match, mode):
+    lib = match.group(2).lower()
+    return match.group(1)+isc_config(mode, lib)+"\n"
+
+def fix_file_lines(path, debug=False):
+    """
+    Opens file and scans fixes selected parameters
+
+    Returns list of lines if something should be changed,
+    None if no action is required
+    """
+    fixed = []
+    changed = False
+    with open(path, 'r') as fin:
+        fout = None
+
+        line = next(fin, None)
+        while line:
+            appended = False
+            while line.endswith("\\\n"):
+                line += next(fin, None)
+
+            inc = re_includes.match(line)
+            deplibs = re_deplibs.match(line)
+            libs = re_libs.match(line)
+            newline = None
+            if check_match(inc, debug=debug):
+                newline = fix_line(inc, '--cflags')
+            elif check_match(deplibs, debug=debug):
+                newline = fix_line(libs, None)
+            elif check_match(libs, debug=debug):
+                newline = fix_line(libs, '--libs')
+
+            if newline and line != newline:
+                changed = True
+                line = newline
+
+            fixed.append(line)
+            line = next(fin, None)
+
+    if not changed:
+        return None
+    else:
+        return fixed
+
+def write_lines(path, lines):
+    fout = open(path, 'w')
+    for line in lines:
+        fout.write(line)
+    fout.close()
+
+def print_lines(lines):
+    for line in lines:
+        print(line, end='')
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='Makefile multiline include replacer')
+    parser.add_argument('files', nargs='+')
+    parser.add_argument('--filter', type=str,
+            default='isc isccc isccfg dns lwres bind9 irs',
+            help='List of libraries supported by isc-config.sh')
+    parser.add_argument('--check', action='store_true',
+            help='Test file only')
+    parser.add_argument('--print', action='store_true',
+            help='Print changed file only')
+    parser.add_argument('--debug', action='store_true',
+            help='Enable debug outputs')
+
+    args = parser.parse_args()
+    lib_filter = None
+
+    re_includes = re.compile(r'^\s*((\w+)_INCLUDES\s+=\s*).*')
+    re_deplibs = re.compile(r'^\s*((\w+)DEPLIBS\s*=).*')
+    re_libs = re.compile(r'^\s*((\w+)LIBS\s*=).*')
+
+    if args.filter:
+        lib_filter = set(args.filter.split(' '))
+        pass
+
+    for path in args.files:
+        lines = fix_file_lines(path, debug=args.debug)
+        if lines:
+            if args.print:
+                print_lines(lines)
+            elif not args.check:
+                write_lines(path, lines)
+                print('File {path} was fixed'.format(path=path))
+        else:
+            print('File {path} does not need fixing'.format(path=path))
diff --git a/named-chroot.files b/named-chroot.files
index b38cbe68dd5cae77fb0326cc2c5226fb35b4c811..9a768e4b7705afb6a911fbe69160ad849090ec43 100644
--- a/named-chroot.files
+++ b/named-chroot.files
@@ -16,6 +16,9 @@
 /etc/named
 /usr/lib64/bind
 /usr/lib/bind
+/usr/lib64/named
+/usr/lib/named
+/usr/share/GeoIP
 /run/named
 # Warning: the order is important
 # If a directory containing $ROOTDIR is listed here,
diff --git a/named-sdb-chroot-setup.service b/named-sdb-chroot-setup.service
deleted file mode 100644
index 5a3e173c60476af8e495879c47eeec31aa0d3d92..0000000000000000000000000000000000000000
--- a/named-sdb-chroot-setup.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Set-up/destroy chroot environment for named-sdb
-BindsTo=named-sdb-chroot.service
-Wants=named-setup-rndc.service
-After=named-setup-rndc.service
-
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/libexec/setup-named-chroot.sh /var/named/chroot_sdb on /etc/named-chroot.files
-ExecStop=/usr/libexec/setup-named-chroot.sh /var/named/chroot_sdb off /etc/named-chroot.files
diff --git a/named-sdb-chroot.service b/named-sdb-chroot.service
deleted file mode 100644
index acf88ba744f8cbf543f9b56e491ad3e586d837a5..0000000000000000000000000000000000000000
--- a/named-sdb-chroot.service
+++ /dev/null
@@ -1,30 +0,0 @@
-# Don't forget to add "$AddUnixListenSocket /var/named/chroot_sdb/dev/log"
-# line to your /etc/rsyslog.conf file. Otherwise your logging becomes
-# broken when rsyslogd daemon is restarted (due update, for example).
-
-[Unit]
-Description=Berkeley Internet Name Domain (DNS)
-Wants=nss-lookup.target
-Requires=named-sdb-chroot-setup.service
-Before=nss-lookup.target
-After=named-sdb-chroot-setup.service
-After=network.target
-
-[Service]
-Type=forking
-Environment=NAMEDCONF=/etc/named.conf
-EnvironmentFile=-/etc/sysconfig/named
-Environment=KRB5_KTNAME=/etc/named.keytab
-PIDFile=/var/named/chroot_sdb/run/named/named.pid
-
-ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -t /var/named/chroot_sdb -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
-ExecStart=/usr/sbin/named-sdb -u named -c ${NAMEDCONF} -t /var/named/chroot_sdb $OPTIONS
-
-ExecReload=/bin/sh -c 'if /usr/sbin/rndc null > /dev/null 2>&1; then /usr/sbin/rndc reload; else /bin/kill -HUP $MAINPID; fi'
-
-ExecStop=/bin/sh -c '/usr/sbin/rndc stop > /dev/null 2>&1 || /bin/kill -TERM $MAINPID'
-
-PrivateTmp=false
-
-[Install]
-WantedBy=multi-user.target
diff --git a/named-sdb.8 b/named-sdb.8
deleted file mode 100644
index 1e456c31aeebfba999fd97b6586a24292c35dd45..0000000000000000000000000000000000000000
--- a/named-sdb.8
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/named.8.gz
\ No newline at end of file
diff --git a/named-sdb.service b/named-sdb.service
deleted file mode 100644
index cdf3a62530ce0d19e7181df01f6974c3cd1c48a9..0000000000000000000000000000000000000000
--- a/named-sdb.service
+++ /dev/null
@@ -1,26 +0,0 @@
-[Unit]
-Description=Berkeley Internet Name Domain (DNS)
-Wants=nss-lookup.target
-Wants=named-setup-rndc.service
-Before=nss-lookup.target
-After=named-setup-rndc.service
-After=network.target
-
-[Service]
-Type=forking
-Environment=NAMEDCONF=/etc/named.conf
-EnvironmentFile=-/etc/sysconfig/named
-Environment=KRB5_KTNAME=/etc/named.keytab
-PIDFile=/run/named/named.pid
-
-ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
-ExecStart=/usr/sbin/named-sdb -u named -c ${NAMEDCONF} $OPTIONS
-
-ExecReload=/bin/sh -c 'if /usr/sbin/rndc null > /dev/null 2>&1; then /usr/sbin/rndc reload; else /bin/kill -HUP $MAINPID; fi'
-
-ExecStop=/bin/sh -c '/usr/sbin/rndc stop > /dev/null 2>&1 || /bin/kill -TERM $MAINPID'
-
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/named.conf b/named.conf
index 1dc9d1590736f3c3415a802a7c4bf1b616801833..d62d3890cedc5b72cdcd0f6a9f981b8902a28ba8 100644
--- a/named.conf
+++ b/named.conf
@@ -30,7 +30,6 @@ options {
 	*/
 	recursion yes;
 
-	dnssec-enable yes;
 	dnssec-validation yes;
 
 	managed-keys-directory "/var/named/dynamic";
@@ -38,7 +37,6 @@ options {
 	pid-file "/run/named/named.pid";
 	session-keyfile "/run/named/session.key";
 
-	/* https://fedoraproject.org/wiki/Changes/CryptoPolicy */
 	include "/etc/crypto-policies/back-ends/bind.config";
 };
 
diff --git a/named.conf.sample b/named.conf.sample
index a6cdc5efe6297e12685a0d280fd22770792a8546..a49004ec850cae45c50f328a670d49d3d7cb401c 100644
--- a/named.conf.sample
+++ b/named.conf.sample
@@ -63,10 +63,6 @@ options
 
 	/* DNSSEC related options. See information about keys ("Trusted keys", bellow) */
 
-	/* Enable serving of DNSSEC related data - enable on both authoritative
- 	   and recursive servers DNSSEC aware servers */
-	dnssec-enable yes;
-
 	/* Enable DNSSEC validation on recursive servers */
 	dnssec-validation yes;
 
@@ -77,9 +73,7 @@ options
 
 	managed-keys-directory "/var/named/dynamic";
 
-    /* In Fedora we use system-wide Crypto Policy */
-    /* https://fedoraproject.org/wiki/Changes/CryptoPolicy */
-    include "/etc/crypto-policies/back-ends/bind.config";
+	include "/etc/crypto-policies/back-ends/bind.config";
 };
 
 logging 
@@ -182,8 +176,8 @@ view "internal"
 
 key ddns_key
 {
-	algorithm hmac-md5;
-	secret "use /usr/sbin/dnssec-keygen to generate TSIG keys";
+	algorithm hmac-sha256;
+	secret "use /usr/sbin/ddns-confgen to generate TSIG keys";
 };
 
 view "external"
@@ -214,39 +208,34 @@ view "external"
 /* Trusted keys
 
   This statement contains DNSSEC keys. If you want DNSSEC aware resolver you
-  have to configure at least one trusted key.
+  should configure at least one trusted key.
 
   Note that no key written below is valid. Especially root key because root zone
   is not signed yet.
 */
 /*
-trusted-keys {
+trust-anchors {
 // Root Key
-"." 257 3 3 "BNY4wrWM1nCfJ+CXd0rVXyYmobt7sEEfK3clRbGaTwSJxrGkxJWoZu6I7PzJu/
-             E9gx4UC1zGAHlXKdE4zYIpRhaBKnvcC2U9mZhkdUpd1Vso/HAdjNe8LmMlnzY3
-             zy2Xy4klWOADTPzSv9eamj8V18PHGjBLaVtYvk/ln5ZApjYghf+6fElrmLkdaz
-             MQ2OCnACR817DF4BBa7UR/beDHyp5iWTXWSi6XmoJLbG9Scqc7l70KDqlvXR3M
-             /lUUVRbkeg1IPJSidmK3ZyCllh4XSKbje/45SKucHgnwU5jefMtq66gKodQj+M
-             iA21AfUVe7u99WzTLzY3qlxDhxYQQ20FQ97S+LKUTpQcq27R7AT3/V5hRQxScI
-             Nqwcz4jYqZD2fQdgxbcDTClU0CRBdiieyLMNzXG3";
+. initial-key 257 3 8 "AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3
+		      +/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kv
+		      ArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF
+		      0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+e
+		      oZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfd
+		      RUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwN
+		      R1AkUTV74bU=";
 
 // Key for forward zone
-example.com. 257 3 5 "AwEAAaxPMcR2x0HbQV4WeZB6oEDX+r0QM65KbhTjrW1ZaARmPhEZZe
-                      3Y9ifgEuq7vZ/zGZUdEGNWy+JZzus0lUptwgjGwhUS1558Hb4JKUbb
-                      OTcM8pwXlj0EiX3oDFVmjHO444gLkBO UKUf/mC7HvfwYH/Be22GnC
-                      lrinKJp1Og4ywzO9WglMk7jbfW33gUKvirTHr25GL7STQUzBb5Usxt
-                      8lgnyTUHs1t3JwCY5hKZ6CqFxmAVZP20igTixin/1LcrgX/KMEGd/b
-                      iuvF4qJCyduieHukuY3H4XMAcR+xia2 nIUPvm/oyWR8BW/hWdzOvn
-                      SCThlHf3xiYleDbt/o1OTQ09A0=";
+example.com. static-key 257 3 8 "AwEAAZ0aqu1rJ6orJynrRfNpPmayJZoAx9Ic2/Rl9VQW
+				LMHyjxxem3VUSoNUIFXERQbj0A9Ogp0zDM9YIccKLRd6
+				LmWiDCt7UJQxVdD+heb5Ec4qlqGmyX9MDabkvX2NvMws
+				UecbYBq8oXeTT9LRmCUt9KUt/WOi6DKECxoG/bWTykrX
+				yBR8elD+SQY43OAVjlWrVltHxgp4/rhBCvRbmdflunaP
+				Igu27eE2U4myDSLT8a4A0rB5uHG4PkOa9dIRs9y00M2m
+				Wf4lyPee7vi5few2dbayHXmieGcaAHrx76NGAABeY393
+				xjlmDNcUkF1gpNWUla4fWZbbaYQzA93mLdrng+M=";
+
 
 // Key for reverse zone.
-2.0.192.IN-ADDRPA.NET. 257 3 5 "AQOnS4xn/IgOUpBPJ3bogzwcxOdNax071L18QqZnQQQA
-                                VVr+iLhGTnNGp3HoWQLUIzKrJVZ3zggy3WwNT6kZo6c0
-                                tszYqbtvchmgQC8CzKojM/W16i6MG/ea fGU3siaOdS0
-                                yOI6BgPsw+YZdzlYMaIJGf4M4dyoKIhzdZyQ2bYQrjyQ
-                                4LB0lC7aOnsMyYKHHYeRv PxjIQXmdqgOJGq+vsevG06
-                                zW+1xgYJh9rCIfnm1GX/KMgxLPG2vXTD/RnLX+D3T3UL
-                                7HJYHJhAZD5L59VvjSPsZJHeDCUyWYrvPZesZDIRvhDD
-                                52SKvbheeTJUm6EhkzytNN2SN96QRk8j/iI8ib";
+2.0.192.IN-ADDRPA.NET. initial-ds 31406 8 2 "F78CF3344F72137235098ECBBD08947C2C9001C7F6A085A17F518B5D8F6B916D";
 };
 */
diff --git a/named.root.key b/named.root.key
index 48449a82c72df2eb36d56b444b5d56cef9b2a048..fbcb5d330a5caf230dc17aaadd03e2c4a33127b0 100644
--- a/named.root.key
+++ b/named.root.key
@@ -1,4 +1,4 @@
-managed-keys {
+trust-anchors {
         # ROOT KEYS: See https://data.iana.org/root-anchors/root-anchors.xml
         # for current trust anchor information.
         #
@@ -9,11 +9,5 @@ managed-keys {
         # file as initializing keys; thereafter, the keys in the
         # managed key database will be trusted and maintained
         # automatically.
-        . initial-key 257 3 8 "AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3
-                +/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kv
-                ArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF
-                0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+e
-                oZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfd
-                RUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwN
-                R1AkUTV74bU=";
+        . initial-ds 20326 8 2 "E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D";
 };
diff --git a/random.data b/random.data
deleted file mode 100644
index 354add021c50385a89450e5babe1977007bb3352..0000000000000000000000000000000000000000
Binary files a/random.data and /dev/null differ
diff --git a/setup-named-chroot.sh b/setup-named-chroot.sh
old mode 100644
new mode 100755
diff --git a/setup-named-softhsm.sh b/setup-named-softhsm.sh
old mode 100644
new mode 100755
diff --git a/softhsm2.conf.in b/softhsm2.conf.in
new file mode 100644
index 0000000000000000000000000000000000000000..1f393201e6ed4b1d9ad001274bd4cc4e3579ff9e
--- /dev/null
+++ b/softhsm2.conf.in
@@ -0,0 +1,10 @@
+# SoftHSM v2 configuration file
+
+directories.tokendir = @TOKENPATH@
+objectstore.backend = file
+
+# ERROR, WARNING, INFO, DEBUG
+log.level = ERROR
+
+# If CKF_REMOVABLE_DEVICE flag should be set
+slots.removable = false
diff --git a/trusted-key.key b/trusted-key.key
index df2fd0ddbf2bde0973944ad732b4d5487a9746a0..7b845f3bd015275c66c23c8c09d4132c830fbb53 100644
--- a/trusted-key.key
+++ b/trusted-key.key
@@ -1,2 +1 @@
-. 3600 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0=
 . 3600 IN DNSKEY 257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU=
diff --git a/zone2sqlite.1 b/zone2sqlite.1
deleted file mode 100644
index 689782740f7538cf1b21dffca987de6d549189da..0000000000000000000000000000000000000000
--- a/zone2sqlite.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\" Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001 Internet Software Consortium.
-.\" 
-.\" Permission to use, copy, modify, and/or distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-.\" PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" Manpage written by Jan Gorig
-.TH zone2sqlite 1 "15 March 2010" "BIND9"
-.SH NAME
-zone2sqlite - Load BIND 9 zone file into SQLite database
-.SH SYNOPSIS
-.B zone2sqlite zone zonefile dbfile dbtable
-.SH DESCRIPTION
-zone2sqlite parses DNS zone file and creates database for use with SQLite BIND SDB driver.
-
-\fBzone\fR
-.RS 4
-Zone origin, eg "mydomain.net."
-.RE
-.PP
-\fBzonefile\fR
-.RS 4
-Master zone database file, eg. mydomain.net.zone
-.RE
-.PP
-\fBdbfile\fR
-.RS 4
-Name of SQLite database file
-.RE
-.PP
-\fBdbtable\fR
-.RS 4
-Name of table in database
-.RE
-
-.SH "EXIT STATUS"
-Exits with 0 on success or 1 on failure.
-.SH "SEE ALSO"
-named(8)
-.SH "COPYRIGHT"
-Copyright \(co 2004, 2005, 2007\-2009 Internet Systems Consortium, Inc. ("ISC")
-.br
-Copyright \(co 2000, 2001 Internet Software Consortium.
-.br
diff --git a/zonetodb.1 b/zonetodb.1
deleted file mode 100644
index 897e74fdfd1df26b6d54564df0345e291f0b4a82..0000000000000000000000000000000000000000
--- a/zonetodb.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\" Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001 Internet Software Consortium.
-.\" 
-.\" Permission to use, copy, modify, and/or distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-.\" PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" Manpage written by Jan Gorig
-.TH zonetodb 1 "15 March 2010" "BIND9"
-.SH NAME
-zonetodb - Generate a PostgreSQL table from a zone.
-.SH SYNOPSIS
-.B zonetodb origin file dbname dbtable
-.SH DESCRIPTION
-zonetodb parses DNS zone file and creates table in selected database for use with PostgreSQL BIND SDB driver.
-
-\fBzone\fR
-.RS 4
-Zone origin, eg "pgdb.net."
-.RE
-.PP
-\fBfile\fR
-.RS 4
-Master zone database file, eg. pgdb.net.db
-.RE
-.PP
-\fBdbname\fR
-.RS 4
-Name of PostgreSQL database (database must exist)
-.RE
-.PP
-\fBdbtable\fR
-.RS 4
-Name of table in database
-.RE
-
-.SH "EXIT STATUS"
-Exits with 0 on success or 1 on failure.
-.SH "SEE ALSO"
-named(8)
-.SH "COPYRIGHT"
-Copyright \(co 2004, 2005, 2007\-2009 Internet Systems Consortium, Inc. ("ISC")
-.br
-Copyright \(co 2000, 2001 Internet Software Consortium.
-.br