From 74b53c3a5832f0d70da2ce75b0d8f3cf8bac8bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Mon, 18 Nov 2019 20:01:52 +0100
Subject: [PATCH] Update to 9.11.13

---
 .gitignore                  |   2 +
 bind-9.11-rh1732883.patch   |  36 ++++----
 bind-9.11-rt46047.patch     |  44 +++++-----
 bind-9.11-serve-stale.patch | 170 ++++++++++++++++++------------------
 bind.spec                   |  11 +--
 sources                     |   3 +-
 6 files changed, 134 insertions(+), 132 deletions(-)

diff --git a/.gitignore b/.gitignore
index f7c73a1..39aba1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,3 +98,5 @@ bind-9.7.2b1.tar.gz
 /bind-9.11.10.tar.gz
 /bind-9.11.11.tar.gz
 /bind-9.11.12.tar.gz
+/bind-9.11.13.tar.gz
+/bind-9.11.13.tar.gz.asc
diff --git a/bind-9.11-rh1732883.patch b/bind-9.11-rh1732883.patch
index 80820b5..14bf265 100644
--- a/bind-9.11-rh1732883.patch
+++ b/bind-9.11-rh1732883.patch
@@ -1,4 +1,4 @@
-From 348947b3d573e2187db61fb43919d2260dcfc135 Mon Sep 17 00:00:00 2001
+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
@@ -17,18 +17,16 @@ go_reboot() procedure to request lease extention
  6 files changed, 84 insertions(+), 5 deletions(-)
 
 diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
-index 0fd4971..2add549 100644
+index 0389efa..149cde5 100644
 --- a/lib/isc/include/isc/result.h
 +++ b/lib/isc/include/isc/result.h
-@@ -87,9 +87,10 @@
- #define ISC_R_CRYPTOFAILURE		65	/*%< cryptography library failure */
- #define ISC_R_DISCQUOTA			66	/*%< disc quota */
+@@ -89,7 +89,8 @@
  #define ISC_R_DISCFULL			67	/*%< disc full */
-+#define ISC_R_TIMESHIFTED               68      /*%< system time changed */
- 
- /*% Not a result code: the number of results. */
--#define ISC_R_NRESULTS 			68
-+#define ISC_R_NRESULTS 			69
+ #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
  
@@ -47,27 +45,27 @@ index 973c348..8160dd3 100644
  /*%
   * Alignment
 diff --git a/lib/isc/result.c b/lib/isc/result.c
-index abb6ed2..8c95a93 100644
+index a9db132..7c04831 100644
 --- a/lib/isc/result.c
 +++ b/lib/isc/result.c
-@@ -103,6 +103,7 @@ static const char *description[ISC_R_NRESULTS] = {
- 	"crypto failure",			/*%< 65 */
- 	"disc quota",				/*%< 66 */
+@@ -105,6 +105,7 @@ static const char *description[ISC_R_NRESULTS] = {
  	"disc full",				/*%< 67 */
-+        "time changed",                         /*%< 68 */
+ 	"default",				/*%< 68 */
+ 	"IPv4 prefix",				/*%< 69 */
++        "time changed",                         /*%< 70 */
  };
  
  static const char *identifier[ISC_R_NRESULTS] = {
-@@ -174,6 +175,7 @@ static const char *identifier[ISC_R_NRESULTS] = {
- 	"ISC_R_CRYPTOFAILURE",
- 	"ISC_R_DISCQUOTA",
+@@ -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 7e5a0ee..ceab74e 100644
+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,
diff --git a/bind-9.11-rt46047.patch b/bind-9.11-rt46047.patch
index 4bb47e8..8f413f6 100644
--- a/bind-9.11-rt46047.patch
+++ b/bind-9.11-rt46047.patch
@@ -1,4 +1,4 @@
-From 4c7b644910e21e690e5f51d5596a9fe46d9c7b7a Mon Sep 17 00:00:00 2001
+From 5a465424f5249ceaf0547ab90361a16eb08f7a2b 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
@@ -142,10 +142,10 @@ index 31a99e7..38c83ed 100644
  					   usekeyboard);
  
 diff --git a/bin/named/client.c b/bin/named/client.c
-index 2169954..c6c59f7 100644
+index 50fa2cd..524d9a3 100644
 --- a/bin/named/client.c
 +++ b/bin/named/client.c
-@@ -1754,7 +1754,8 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message,
+@@ -1762,7 +1762,8 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message,
  
  		isc_buffer_init(&buf, cookie, sizeof(cookie));
  		isc_stdtime_get(&now);
@@ -156,7 +156,7 @@ index 2169954..c6c59f7 100644
  		compute_cookie(client, now, nonce, ns_g_server->secret, &buf);
  
 diff --git a/bin/named/config.c b/bin/named/config.c
-index de64ca5..833c1dc 100644
+index dbdff64..63da4b0 100644
 --- a/bin/named/config.c
 +++ b/bin/named/config.c
 @@ -98,7 +98,9 @@ options {\n\
@@ -223,7 +223,7 @@ index d955c2f..40621f2 100644
  	} 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 f5ed2b7..b2c1d05 100644
+index 7ee8f66..8982d26 100644
 --- a/bin/named/include/named/server.h
 +++ b/bin/named/include/named/server.h
 @@ -20,6 +20,7 @@
@@ -243,7 +243,7 @@ index f5ed2b7..b2c1d05 100644
  
  struct ns_altsecret {
 diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
-index 9bd1f93..851d3c9 100644
+index 9dea7c1..272d300 100644
 --- a/bin/named/interfacemgr.c
 +++ b/bin/named/interfacemgr.c
 @@ -17,6 +17,7 @@
@@ -255,7 +255,7 @@ index 9bd1f93..851d3c9 100644
  #include <isc/task.h>
  #include <isc/util.h>
 diff --git a/bin/named/query.c b/bin/named/query.c
-index 86417c7..55b7b7c 100644
+index c9e5469..0940714 100644
 --- a/bin/named/query.c
 +++ b/bin/named/query.c
 @@ -19,6 +19,7 @@
@@ -267,10 +267,10 @@ index 86417c7..55b7b7c 100644
  #include <isc/serial.h>
  #include <isc/stats.h>
 diff --git a/bin/named/server.c b/bin/named/server.c
-index c782073..bc59cbc 100644
+index 36fc047..3c1eec0 100644
 --- a/bin/named/server.c
 +++ b/bin/named/server.c
-@@ -8204,21 +8204,32 @@ load_configuration(const char *filename, ns_server_t *server,
+@@ -8208,21 +8208,32 @@ load_configuration(const char *filename, ns_server_t *server,
  	 * Open the source of entropy.
  	 */
  	if (first_time) {
@@ -312,7 +312,7 @@ index c782073..bc59cbc 100644
  #ifdef PATH_RANDOMDEV
  			if (ns_g_fallbackentropy != NULL) {
  				level = ISC_LOG_INFO;
-@@ -8229,8 +8240,8 @@ load_configuration(const char *filename, ns_server_t *server,
+@@ -8233,8 +8244,8 @@ load_configuration(const char *filename, ns_server_t *server,
  					      NS_LOGCATEGORY_GENERAL,
  					      NS_LOGMODULE_SERVER,
  					      level,
@@ -323,7 +323,7 @@ index c782073..bc59cbc 100644
  					      randomdev,
  					      isc_result_totext(result));
  			}
-@@ -8250,7 +8261,6 @@ load_configuration(const char *filename, ns_server_t *server,
+@@ -8254,7 +8265,6 @@ load_configuration(const char *filename, ns_server_t *server,
  				}
  				isc_entropy_detach(&ns_g_fallbackentropy);
  			}
@@ -331,7 +331,7 @@ index c782073..bc59cbc 100644
  #endif
  		}
  
-@@ -9018,6 +9028,7 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) {
+@@ -9022,6 +9032,7 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) {
  	server->in_roothints = NULL;
  	server->blackholeacl = NULL;
  	server->keepresporder = NULL;
@@ -339,7 +339,7 @@ index c782073..bc59cbc 100644
  
  	/* Must be first. */
  	CHECKFATAL(dst_lib_init2(ns_g_mctx, ns_g_entropy,
-@@ -9044,6 +9055,9 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) {
+@@ -9048,6 +9059,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");
@@ -349,7 +349,7 @@ index c782073..bc59cbc 100644
  
  	/*
  	 * Setup the server task, which is responsible for coordinating
-@@ -9250,7 +9264,8 @@ ns_server_destroy(ns_server_t **serverp) {
+@@ -9254,7 +9268,8 @@ ns_server_destroy(ns_server_t **serverp) {
  
  	if (server->zonemgr != NULL)
  		dns_zonemgr_detach(&server->zonemgr);
@@ -359,7 +359,7 @@ index c782073..bc59cbc 100644
  	if (server->tkeyctx != NULL)
  		dns_tkeyctx_destroy(&server->tkeyctx);
  
-@@ -13221,10 +13236,10 @@ newzone_cfgctx_destroy(void **cfgp) {
+@@ -13230,10 +13245,10 @@ newzone_cfgctx_destroy(void **cfgp) {
  
  static isc_result_t
  generate_salt(unsigned char *salt, size_t saltlen) {
@@ -372,7 +372,7 @@ index c782073..bc59cbc 100644
  	} rnd;
  	unsigned char text[512 + 1];
  	isc_region_t r;
-@@ -13234,9 +13249,10 @@ generate_salt(unsigned char *salt, size_t saltlen) {
+@@ -13243,9 +13258,10 @@ generate_salt(unsigned char *salt, size_t saltlen) {
  	if (saltlen > 256U)
  		return (ISC_R_RANGE);
  
@@ -455,7 +455,7 @@ index 2146f9b..64b8e74 100644
  	}
  #endif
 diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
-index 9bf100f..c161e71 100644
+index 33e06e6..539973c 100644
 --- a/doc/arm/Bv9ARM-book.xml
 +++ b/doc/arm/Bv9ARM-book.xml
 @@ -5076,22 +5076,45 @@ badresp:1,adberr:0,findfail:0,valfail:0]
@@ -570,13 +570,13 @@ index 0000000..11c3a7c
 +</section>
 +
 diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
-index 3a9cfcf..ded2000 100644
+index b16dab6..763ff7e 100644
 --- a/doc/arm/notes.xml
 +++ b/doc/arm/notes.xml
-@@ -23,6 +23,7 @@
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-sec-fixes.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-new-features.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-bug-fixes.xml"/>
+@@ -36,6 +36,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"/>
diff --git a/bind-9.11-serve-stale.patch b/bind-9.11-serve-stale.patch
index ed03636..350fe62 100644
--- a/bind-9.11-serve-stale.patch
+++ b/bind-9.11-serve-stale.patch
@@ -1,4 +1,4 @@
-From 1196b07e79e1d8d23afd1003a7a242ac06a2f2a2 Mon Sep 17 00:00:00 2001
+From 2bdcb7159b1ac097355e95864e979b4f68bc1a4e 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
@@ -276,7 +276,7 @@ Signed-off-by: Petr Menšík <pemensik@redhat.com>
  create mode 100755 bin/tests/system/serve-stale/tests.sh
 
 diff --git a/bin/named/config.c b/bin/named/config.c
-index 63da4b03f6..b598f9bfe3 100644
+index 63da4b0..b598f9b 100644
 --- a/bin/named/config.c
 +++ b/bin/named/config.c
 @@ -182,13 +182,14 @@ options {\n\
@@ -312,7 +312,7 @@ index 63da4b03f6..b598f9bfe3 100644
  	transfer-format many-answers;\n\
  	v6-bias 50;\n\
 diff --git a/bin/named/control.c b/bin/named/control.c
-index df23c26507..8b79850b3d 100644
+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,
@@ -325,7 +325,7 @@ index df23c26507..8b79850b3d 100644
  		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 8705fdd68a..1634154c1c 100644
+index 8705fdd..1634154 100644
 --- a/bin/named/include/named/control.h
 +++ b/bin/named/include/named/control.h
 @@ -69,6 +69,7 @@
@@ -337,7 +337,7 @@ index 8705fdd68a..1634154c1c 100644
  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 56bfcd4668..cd8db60ed4 100644
+index 56bfcd4..cd8db60 100644
 --- a/bin/named/include/named/log.h
 +++ b/bin/named/include/named/log.h
 @@ -32,6 +32,7 @@
@@ -349,7 +349,7 @@ index 56bfcd4668..cd8db60ed4 100644
  /*
   * Backwards compatibility.
 diff --git a/bin/named/include/named/query.h b/bin/named/include/named/query.h
-index 9661f56b72..445b578c08 100644
+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 {
@@ -389,22 +389,22 @@ index 9661f56b72..445b578c08 100644
  	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 b2c1d05497..86f0b2bfb7 100644
+index 8982d26..919ac28 100644
 --- a/bin/named/include/named/server.h
 +++ b/bin/named/include/named/server.h
-@@ -222,7 +222,10 @@ enum {
+@@ -224,7 +224,10 @@ enum {
  
- 	dns_nsstatscounter_keytagopt = 56,
+ 	dns_nsstatscounter_tcphighwater = 57,
  
--	dns_nsstatscounter_max = 57
-+	dns_nsstatscounter_trystale = 57,
-+	dns_nsstatscounter_usedstale = 58,
+-	dns_nsstatscounter_max = 58
++	dns_nsstatscounter_trystale = 58,
++	dns_nsstatscounter_usedstale = 59,
 +
-+	dns_nsstatscounter_max = 59
++	dns_nsstatscounter_max = 60
  };
  
  /*%
-@@ -761,4 +764,12 @@ ns_server_mkeys(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text);
+@@ -763,4 +766,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);
  
@@ -418,7 +418,7 @@ index b2c1d05497..86f0b2bfb7 100644
 +		     isc_buffer_t **text);
  #endif /* NAMED_SERVER_H */
 diff --git a/bin/named/log.c b/bin/named/log.c
-index 3aa25e9a95..12f178b342 100644
+index 3aa25e9..12f178b 100644
 --- a/bin/named/log.c
 +++ b/bin/named/log.c
 @@ -38,6 +38,7 @@ static isc_logcategory_t categories[] = {
@@ -430,7 +430,7 @@ index 3aa25e9a95..12f178b342 100644
  };
  
 diff --git a/bin/named/query.c b/bin/named/query.c
-index 55b7b7cbde..f872dfc842 100644
+index 0940714..882d69c 100644
 --- a/bin/named/query.c
 +++ b/bin/named/query.c
 @@ -125,10 +125,14 @@
@@ -733,7 +733,7 @@ index 55b7b7cbde..f872dfc842 100644
  	    (!PARTIALANSWER(client) || WANTRECURSION(client)
  	     || eresult == DNS_R_DROP)) {
 diff --git a/bin/named/server.c b/bin/named/server.c
-index 109f0dd09f..9580d9e095 100644
+index 0c1f08b..d195bca 100644
 --- a/bin/named/server.c
 +++ b/bin/named/server.c
 @@ -1722,7 +1722,8 @@ static bool
@@ -754,7 +754,7 @@ index 109f0dd09f..9580d9e095 100644
  	    dns_cache_getcachesize(originview->cache) != new_max_cache_size) {
  		return (false);
  	}
-@@ -3289,6 +3291,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
+@@ -3292,6 +3294,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;
@@ -762,7 +762,7 @@ index 109f0dd09f..9580d9e095 100644
  	dns_tsig_keyring_t *ring = NULL;
  	dns_view_t *pview = NULL;	/* Production view */
  	isc_mem_t *cmctx = NULL, *hmctx = NULL;
-@@ -3317,6 +3320,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
+@@ -3320,6 +3323,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;
@@ -770,7 +770,7 @@ index 109f0dd09f..9580d9e095 100644
  
  	REQUIRE(DNS_VIEW_VALID(view));
  
-@@ -3731,6 +3735,24 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
+@@ -3734,6 +3738,24 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
  	if (view->maxncachettl > 7 * 24 * 3600)
  		view->maxncachettl = 7 * 24 * 3600;
  
@@ -795,7 +795,7 @@ index 109f0dd09f..9580d9e095 100644
  	/*
  	 * Configure the view's cache.
  	 *
-@@ -3764,7 +3786,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
+@@ -3767,7 +3789,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,
@@ -805,7 +805,7 @@ index 109f0dd09f..9580d9e095 100644
  			isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
  				      NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
  				      "views %s and %s can't share the cache "
-@@ -3863,9 +3886,15 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
+@@ -3866,9 +3889,15 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
  
  	dns_cache_setcleaninginterval(cache, cleaning_interval);
  	dns_cache_setcachesize(cache, max_cache_size);
@@ -821,7 +821,7 @@ index 109f0dd09f..9580d9e095 100644
  	/*
  	 * Resolver.
  	 *
-@@ -4054,6 +4083,21 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
+@@ -4057,6 +4086,21 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
  		maxbits = 4096;
  	view->maxbits = maxbits;
  
@@ -843,7 +843,7 @@ index 109f0dd09f..9580d9e095 100644
  	/*
  	 * Set supported DNSSEC algorithms.
  	 */
-@@ -14414,3 +14458,132 @@ ns_server_dnstap(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) {
+@@ -14423,3 +14467,132 @@ ns_server_dnstap(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) {
  	return (ISC_R_NOTIMPLEMENTED);
  #endif
  }
@@ -977,10 +977,10 @@ index 109f0dd09f..9580d9e095 100644
 +	return (result);
 +}
 diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
-index 7e9ba43a73..92cfcc5e07 100644
+index 4cdf7d6..5b413e7 100644
 --- a/bin/named/statschannel.c
 +++ b/bin/named/statschannel.c
-@@ -295,6 +295,12 @@ init_desc(void) {
+@@ -297,6 +297,12 @@ init_desc(void) {
  		"QryNXRedirRLookup");
  	SET_NSSTATDESC(badcookie, "sent badcookie response", "QryBADCOOKIE");
  	SET_NSSTATDESC(keytagopt, "Keytag option received", "KeyTagOpt");
@@ -994,7 +994,7 @@ index 7e9ba43a73..92cfcc5e07 100644
  
  	/* Initialize resolver statistics */
 diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
-index 8083654ac7..d519983b88 100644
+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\
@@ -1007,7 +1007,7 @@ index 8083654ac7..d519983b88 100644
  		Print a zone's configuration.\n\
    sign zone [class [view]]\n\
 diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
-index 06b073aaea..6ae8e5da6b 100644
+index 06b073a..6ae8e5d 100644
 --- a/bin/rndc/rndc.docbook
 +++ b/bin/rndc/rndc.docbook
 @@ -688,6 +688,25 @@
@@ -1037,7 +1037,7 @@ index 06b073aaea..6ae8e5da6b 100644
  	<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 f3f1939b2a..9ff3f07941 100644
+index f3f1939..9ff3f07 100644
 --- a/bin/tests/system/chain/prereq.sh
 +++ b/bin/tests/system/chain/prereq.sh
 @@ -48,3 +48,10 @@ else
@@ -1052,7 +1052,7 @@ index f3f1939b2a..9ff3f07941 100644
 +    exit 1
 +fi
 diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
-index 81b8e30236..166f0e77f0 100644
+index f781966..d20a830 100644
 --- a/bin/tests/system/conf.sh.in
 +++ b/bin/tests/system/conf.sh.in
 @@ -125,7 +125,7 @@ PARALLELDIRS="dnssec rpzrecurse \
@@ -1065,7 +1065,7 @@ index 81b8e30236..166f0e77f0 100644
  	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 02aa6ab2ef..a77c7de98f 100644
+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 = {
@@ -1079,7 +1079,7 @@ index 02aa6ab2ef..a77c7de98f 100644
  /* Auxiliary driver functions. */
 diff --git a/bin/tests/system/serve-stale/.gitignore b/bin/tests/system/serve-stale/.gitignore
 new file mode 100644
-index 0000000000..2272eef9ec
+index 0000000..2272eef
 --- /dev/null
 +++ b/bin/tests/system/serve-stale/.gitignore
 @@ -0,0 +1,11 @@
@@ -1096,7 +1096,7 @@ index 0000000000..2272eef9ec
 +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 0000000000..2b39eca916
+index 0000000..2b39eca
 --- /dev/null
 +++ b/bin/tests/system/serve-stale/ans2/ans.pl.in
 @@ -0,0 +1,178 @@
@@ -1280,7 +1280,7 @@ index 0000000000..2b39eca916
 +}
 diff --git a/bin/tests/system/serve-stale/clean.sh b/bin/tests/system/serve-stale/clean.sh
 new file mode 100644
-index 0000000000..2397326374
+index 0000000..2397326
 --- /dev/null
 +++ b/bin/tests/system/serve-stale/clean.sh
 @@ -0,0 +1,15 @@
@@ -1301,7 +1301,7 @@ index 0000000000..2397326374
 +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 0000000000..8a75a10753
+index 0000000..8a75a10
 --- /dev/null
 +++ b/bin/tests/system/serve-stale/ns1/named1.conf.in
 @@ -0,0 +1,35 @@
@@ -1342,7 +1342,7 @@ index 0000000000..8a75a10753
 +};
 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 0000000000..072e6ec40d
+index 0000000..072e6ec
 --- /dev/null
 +++ b/bin/tests/system/serve-stale/ns1/named2.conf.in
 @@ -0,0 +1,35 @@
@@ -1383,7 +1383,7 @@ index 0000000000..072e6ec40d
 +};
 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 0000000000..eb9ad3ecf1
+index 0000000..eb9ad3e
 --- /dev/null
 +++ b/bin/tests/system/serve-stale/ns1/root.db
 @@ -0,0 +1,5 @@
@@ -1394,7 +1394,7 @@ index 0000000000..eb9ad3ecf1
 +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 0000000000..24a3293fb9
+index 0000000..24a3293
 --- /dev/null
 +++ b/bin/tests/system/serve-stale/ns3/named.conf.in
 @@ -0,0 +1,35 @@
@@ -1435,7 +1435,7 @@ index 0000000000..24a3293fb9
 +};
 diff --git a/bin/tests/system/serve-stale/prereq.sh b/bin/tests/system/serve-stale/prereq.sh
 new file mode 100644
-index 0000000000..a3bbef8f03
+index 0000000..a3bbef8
 --- /dev/null
 +++ b/bin/tests/system/serve-stale/prereq.sh
 @@ -0,0 +1,38 @@
@@ -1479,7 +1479,7 @@ index 0000000000..a3bbef8f03
 +fi
 diff --git a/bin/tests/system/serve-stale/setup.sh b/bin/tests/system/serve-stale/setup.sh
 new file mode 100644
-index 0000000000..690f43c813
+index 0000000..690f43c
 --- /dev/null
 +++ b/bin/tests/system/serve-stale/setup.sh
 @@ -0,0 +1,13 @@
@@ -1498,7 +1498,7 @@ index 0000000000..690f43c813
 +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 0000000000..201c996921
+index 0000000..201c996
 --- /dev/null
 +++ b/bin/tests/system/serve-stale/tests.sh
 @@ -0,0 +1,536 @@
@@ -2039,7 +2039,7 @@ index 0000000000..201c996921
 +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 c161e71058..ec1f6f591d 100644
+index 539973c..8528649 100644
 --- a/doc/arm/Bv9ARM-book.xml
 +++ b/doc/arm/Bv9ARM-book.xml
 @@ -4376,6 +4376,9 @@ badresp:1,adberr:0,findfail:0,valfail:0]
@@ -2090,7 +2090,7 @@ index c161e71058..ec1f6f591d 100644
  	  <varlistentry>
  	    <term><command>serial-update-method</command></term>
  	    <listitem>
-@@ -6257,6 +6275,22 @@ options {
+@@ -6275,6 +6293,22 @@ options {
  	      </listitem>
  	    </varlistentry>
  
@@ -2113,7 +2113,7 @@ index c161e71058..ec1f6f591d 100644
  	    <varlistentry>
  	      <term><command>nocookie-udp-size</command></term>
  	      <listitem>
-@@ -7465,14 +7499,20 @@ options {
+@@ -7483,14 +7517,20 @@ options {
  	      <term><command>resolver-query-timeout</command></term>
  	      <listitem>
  		<para>
@@ -2137,7 +2137,7 @@ index c161e71058..ec1f6f591d 100644
  	      </listitem>
  	    </varlistentry>
  	  </variablelist>
-@@ -8956,6 +8996,27 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
+@@ -8976,6 +9016,27 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
  	      </listitem>
  	    </varlistentry>
  
@@ -2166,7 +2166,7 @@ index c161e71058..ec1f6f591d 100644
  	      <term><command>min-roots</command></term>
  	      <listitem>
 diff --git a/doc/arm/logging-categories.xml b/doc/arm/logging-categories.xml
-index 181def7077..59f6afb049 100644
+index 181def7..59f6afb 100644
 --- a/doc/arm/logging-categories.xml
 +++ b/doc/arm/logging-categories.xml
 @@ -311,6 +311,17 @@
@@ -2188,7 +2188,7 @@ index 181def7077..59f6afb049 100644
  	<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 11c3a7ccd5..ba3c2cce9c 100644
+index 11c3a7c..ba3c2cc 100644
 --- a/doc/arm/notes-rh-changes.xml
 +++ b/doc/arm/notes-rh-changes.xml
 @@ -13,6 +13,9 @@
@@ -2220,7 +2220,7 @@ index 11c3a7ccd5..ba3c2cce9c 100644
  </section>
  
 diff --git a/doc/misc/options b/doc/misc/options
-index e11beed292..fde93c7093 100644
+index e11beed..fde93c7 100644
 --- a/doc/misc/options
 +++ b/doc/misc/options
 @@ -225,6 +225,7 @@ options {
@@ -2278,7 +2278,7 @@ index e11beed292..fde93c7093 100644
          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 e0803d4fa6..296e364bd9 100644
+index 5c057a4..7b82618 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) {
@@ -2489,7 +2489,7 @@ index e0803d4fa6..296e364bd9 100644
  			}
  		}
  	}
-@@ -1523,7 +1542,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
+@@ -1508,7 +1527,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
  				    "%" PRId64 "' "
  				    "is too small",
  				    mapsize);
@@ -2499,7 +2499,7 @@ index e0803d4fa6..296e364bd9 100644
  		} else if (mapsize > (1ULL << 40)) { /* 1 terabyte */
  			cfg_obj_log(obj, logctx,
  				    ISC_LOG_ERROR,
-@@ -1531,10 +1551,20 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
+@@ -1516,10 +1536,20 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
  				    "%" PRId64 "' "
  				    "is too large",
  				    mapsize);
@@ -2522,7 +2522,7 @@ index e0803d4fa6..296e364bd9 100644
  }
  
 diff --git a/lib/dns/cache.c b/lib/dns/cache.c
-index 4701ff8574..97e427a53c 100644
+index 4701ff8..97e427a 100644
 --- a/lib/dns/cache.c
 +++ b/lib/dns/cache.c
 @@ -138,6 +138,7 @@ struct dns_cache {
@@ -2592,7 +2592,7 @@ index 4701ff8574..97e427a53c 100644
   * The cleaner task is shutting down; do the necessary cleanup.
   */
 diff --git a/lib/dns/db.c b/lib/dns/db.c
-index ee3e00d53c..576aa65992 100644
+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) {
@@ -2622,7 +2622,7 @@ index ee3e00d53c..576aa65992 100644
 +	return (ISC_R_NOTIMPLEMENTED);
 +}
 diff --git a/lib/dns/ecdb.c b/lib/dns/ecdb.c
-index 6e5a4ae4e4..3aa0ac478d 100644
+index 47994ea..23bfe7d 100644
 --- a/lib/dns/ecdb.c
 +++ b/lib/dns/ecdb.c
 @@ -588,7 +588,9 @@ static dns_dbmethods_t ecdb_methods = {
@@ -2637,7 +2637,7 @@ index 6e5a4ae4e4..3aa0ac478d 100644
  
  static isc_result_t
 diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h
-index 62797dbbd4..714b78eb74 100644
+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);
@@ -2669,7 +2669,7 @@ index 62797dbbd4..714b78eb74 100644
  dns_cache_flush(dns_cache_t *cache);
  /*%<
 diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
-index ae6ae36596..5079053d91 100644
+index ae6ae36..5079053 100644
 --- a/lib/dns/include/dns/db.h
 +++ b/lib/dns/include/dns/db.h
 @@ -197,6 +197,8 @@ typedef struct dns_dbmethods {
@@ -2729,7 +2729,7 @@ index ae6ae36596..5079053d91 100644
  
  #endif /* DNS_DB_H */
 diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
-index 5295d8e4d7..97071ed496 100644
+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 {
@@ -2783,7 +2783,7 @@ index 5295d8e4d7..97071ed496 100644
  /*%
   * _OMITDNSSEC:
 diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
-index 6da41b7a5a..7b397cb6d2 100644
+index 6da41b7..7b397cb 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);
@@ -2852,7 +2852,7 @@ index 6da41b7a5a..7b397cb6d2 100644
  dns_resolver_getoptions(dns_resolver_t *resolver);
  
 diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
-index 567e8a879e..7bf2b60d42 100644
+index 567e8a8..7bf2b60 100644
 --- a/lib/dns/include/dns/types.h
 +++ b/lib/dns/include/dns/types.h
 @@ -385,6 +385,12 @@ typedef enum {
@@ -2869,7 +2869,7 @@ index 567e8a879e..7bf2b60d42 100644
   * Functions.
   */
 diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
-index c849dec154..647ca2ac08 100644
+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 {
@@ -2883,7 +2883,7 @@ index c849dec154..647ca2ac08 100644
  
  #define DNS_VIEW_MAGIC			ISC_MAGIC('V','i','e','w')
 diff --git a/lib/dns/master.c b/lib/dns/master.c
-index 2a87bca3bc..ac4bb195ca 100644
+index 2a87bca..ac4bb19 100644
 --- a/lib/dns/master.c
 +++ b/lib/dns/master.c
 @@ -1948,12 +1948,18 @@ load_text(dns_loadctx_t *lctx) {
@@ -2910,7 +2910,7 @@ index 2a87bca3bc..ac4bb195ca 100644
  
  		/*
 diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
-index 7edef6ad9b..daf355748b 100644
+index 13d1a3e..873b694 100644
 --- a/lib/dns/masterdump.c
 +++ b/lib/dns/masterdump.c
 @@ -81,6 +81,9 @@ struct dns_master_style {
@@ -2931,7 +2931,7 @@ index 7edef6ad9b..daf355748b 100644
  } dns_totext_ctx_t;
  
  LIBDNS_EXTERNAL_DATA const dns_master_style_t
-@@ -386,6 +390,7 @@ totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) {
+@@ -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;
@@ -2939,7 +2939,7 @@ index 7edef6ad9b..daf355748b 100644
  
  	return (ISC_R_SUCCESS);
  }
-@@ -1036,6 +1041,11 @@ dump_rdatasets_text(isc_mem_t *mctx, dns_name_t *name,
+@@ -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 {
@@ -2951,7 +2951,7 @@ index 7edef6ad9b..daf355748b 100644
  			isc_result_t result =
  				dump_rdataset(mctx, name, rds, ctx,
  					       buffer, f);
-@@ -1504,6 +1514,16 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
+@@ -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);
@@ -2968,7 +2968,7 @@ index 7edef6ad9b..daf355748b 100644
  
  	if (dctx->format == dns_masterformat_text &&
  	    (dctx->tctx.style.flags & DNS_STYLEFLAG_REL_OWNER) != 0) {
-@@ -1563,6 +1583,9 @@ writeheader(dns_dumpctx_t *dctx) {
+@@ -1555,6 +1575,9 @@ writeheader(dns_dumpctx_t *dctx) {
  		 * it in the zone case.
  		 */
  		if (dctx->do_date) {
@@ -2979,7 +2979,7 @@ index 7edef6ad9b..daf355748b 100644
  			RUNTIME_CHECK(result == ISC_R_SUCCESS);
  			isc_buffer_usedregion(&buffer, &r);
 diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
-index ada888cff9..39499359c8 100644
+index 738aa20..5055fcb 100644
 --- a/lib/dns/rbtdb.c
 +++ b/lib/dns/rbtdb.c
 @@ -488,6 +488,7 @@ typedef ISC_LIST(rdatasetheader_t)      rdatasetheaderlist_t;
@@ -3310,7 +3310,7 @@ index ada888cff9..39499359c8 100644
  				}
  			}
  			if (rbtversion != NULL && !header_nx) {
-@@ -8313,6 +8433,30 @@ nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) {
+@@ -8310,6 +8430,30 @@ nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) {
  	return (result);
  }
  
@@ -3341,7 +3341,7 @@ index ada888cff9..39499359c8 100644
  static dns_dbmethods_t zone_methods = {
  	attach,
  	detach,
-@@ -8358,7 +8502,9 @@ static dns_dbmethods_t zone_methods = {
+@@ -8355,7 +8499,9 @@ static dns_dbmethods_t zone_methods = {
  	NULL,
  	hashsize,
  	nodefullname,
@@ -3352,7 +3352,7 @@ index ada888cff9..39499359c8 100644
  };
  
  static dns_dbmethods_t cache_methods = {
-@@ -8406,7 +8552,9 @@ static dns_dbmethods_t cache_methods = {
+@@ -8403,7 +8549,9 @@ static dns_dbmethods_t cache_methods = {
  	setcachestats,
  	hashsize,
  	nodefullname,
@@ -3363,7 +3363,7 @@ index ada888cff9..39499359c8 100644
  };
  
  isc_result_t
-@@ -8677,7 +8825,7 @@ dns_rbtdb_create
+@@ -8674,7 +8822,7 @@ dns_rbtdb_create
  	rbtdb->rpzs = NULL;
  	rbtdb->load_rpzs = NULL;
  	rbtdb->rpz_num = DNS_RPZ_INVALID_NUM;
@@ -3372,7 +3372,7 @@ index ada888cff9..39499359c8 100644
  	/*
  	 * Version Initialization.
  	 */
-@@ -9095,7 +9243,8 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) {
+@@ -9092,7 +9240,8 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) {
  				 * rdatasets to work.
  				 */
  				if (NONEXISTENT(header) ||
@@ -3382,7 +3382,7 @@ index ada888cff9..39499359c8 100644
  					header = NULL;
  				break;
  			} else
-@@ -10283,7 +10432,7 @@ static inline bool
+@@ -10280,7 +10429,7 @@ static inline bool
  need_headerupdate(rdatasetheader_t *header, isc_stdtime_t now) {
  	if ((header->attributes &
  	     (RDATASET_ATTR_NONEXISTENT |
@@ -3391,7 +3391,7 @@ index ada888cff9..39499359c8 100644
  	      RDATASET_ATTR_ZEROTTL)) != 0)
  		return (false);
  
-@@ -10389,7 +10538,7 @@ expire_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header,
+@@ -10386,7 +10535,7 @@ expire_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header,
  	      bool tree_locked, expire_t reason)
  {
  	set_ttl(rbtdb, header, 0);
@@ -3401,7 +3401,7 @@ index ada888cff9..39499359c8 100644
  	/*
  	 * Caller must hold the node (write) lock.
 diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
-index cefa53d904..54a624fc25 100644
+index 04a58c0..164fc01 100644
 --- a/lib/dns/resolver.c
 +++ b/lib/dns/resolver.c
 @@ -141,16 +141,17 @@
@@ -3445,7 +3445,7 @@ index cefa53d904..54a624fc25 100644
  	/* Locked by lock. */
  	unsigned int			references;
  	bool			exiting;
-@@ -1602,14 +1607,12 @@ fctx_setretryinterval(fetchctx_t *fctx, unsigned int rtt) {
+@@ -1617,14 +1622,12 @@ fctx_setretryinterval(fetchctx_t *fctx, unsigned int rtt) {
  	unsigned int seconds;
  	unsigned int us;
  
@@ -3464,7 +3464,7 @@ index cefa53d904..54a624fc25 100644
  
  	/*
  	 * Add a fudge factor to the expected rtt based on the current
-@@ -4453,7 +4456,8 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
+@@ -4481,7 +4484,8 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
  	/*
  	 * Compute an expiration time for the entire fetch.
  	 */
@@ -3474,7 +3474,7 @@ index cefa53d904..54a624fc25 100644
  	iresult = isc_time_nowplusinterval(&fctx->expires, &interval);
  	if (iresult != ISC_R_SUCCESS) {
  		UNEXPECTED_ERROR(__FILE__, __LINE__,
-@@ -8937,6 +8941,8 @@ dns_resolver_create(dns_view_t *view,
+@@ -8965,6 +8969,8 @@ dns_resolver_create(dns_view_t *view,
  	res->spillattimer = NULL;
  	res->zspill = 0;
  	res->zero_no_soa_ttl = false;
@@ -3483,7 +3483,7 @@ index cefa53d904..54a624fc25 100644
  	res->query_timeout = DEFAULT_QUERY_TIMEOUT;
  	res->maxdepth = DEFAULT_RECURSION_DEPTH;
  	res->maxqueries = DEFAULT_MAX_QUERIES;
-@@ -10263,17 +10269,20 @@ dns_resolver_gettimeout(dns_resolver_t *resolver) {
+@@ -10291,17 +10297,20 @@ dns_resolver_gettimeout(dns_resolver_t *resolver) {
  }
  
  void
@@ -3512,7 +3512,7 @@ index cefa53d904..54a624fc25 100644
  }
  
  void
-@@ -10370,3 +10379,34 @@ dns_resolver_getquotaresponse(dns_resolver_t *resolver, dns_quotatype_t which)
+@@ -10398,3 +10407,34 @@ dns_resolver_getquotaresponse(dns_resolver_t *resolver, dns_quotatype_t which)
  
  	return (resolver->quotaresp[which]);
  }
@@ -3548,7 +3548,7 @@ index cefa53d904..54a624fc25 100644
 +	resolver->nonbackofftries = tries;
 +}
 diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
-index d4c8c673c8..ee9be79cb9 100644
+index d4c8c67..ee9be79 100644
 --- a/lib/dns/sdb.c
 +++ b/lib/dns/sdb.c
 @@ -1368,7 +1368,9 @@ static dns_dbmethods_t sdb_methods = {
@@ -3563,7 +3563,7 @@ index d4c8c673c8..ee9be79cb9 100644
  
  static isc_result_t
 diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
-index 0b9620c76c..331992ebdd 100644
+index 0b9620c..331992e 100644
 --- a/lib/dns/sdlz.c
 +++ b/lib/dns/sdlz.c
 @@ -1336,7 +1336,9 @@ static dns_dbmethods_t sdlzdb_methods = {
@@ -3578,7 +3578,7 @@ index 0b9620c76c..331992ebdd 100644
  
  /*
 diff --git a/lib/dns/tests/db_test.c b/lib/dns/tests/db_test.c
-index 35cf21d0f2..bf39545d4f 100644
+index 35cf21d..bf39545 100644
 --- a/lib/dns/tests/db_test.c
 +++ b/lib/dns/tests/db_test.c
 @@ -28,8 +28,9 @@
@@ -3809,7 +3809,7 @@ index 35cf21d0f2..bf39545d4f 100644
  						_setup, _teardown),
  		cmocka_unit_test_setup_teardown(dbtype_test,
 diff --git a/lib/dns/view.c b/lib/dns/view.c
-index a1a4301b5d..abf6a4cce9 100644
+index a1a4301..abf6a4c 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,
@@ -3823,7 +3823,7 @@ index a1a4301b5d..abf6a4cce9 100644
  	view->maxbits = 0;
  	view->v4_aaaa = dns_aaaa_ok;
 diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
-index 7bad989be1..bbf4b45c10 100644
+index 7bad989..bbf4b45 100644
 --- a/lib/isccfg/namedconf.c
 +++ b/lib/isccfg/namedconf.c
 @@ -1778,6 +1778,7 @@ view_clauses[] = {
diff --git a/bind.spec b/bind.spec
index f4f9f31..ee0a916 100644
--- a/bind.spec
+++ b/bind.spec
@@ -53,15 +53,15 @@
 
 # lib*.so.X versions of selected libraries
 %global sover_dns 1107
-%global sover_isc 1100
+%global sover_isc 1104
 %global sover_irs 161
 %global sover_isccfg 163
 
 Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name:     bind
 License:  MPLv2.0
-Version:  9.11.12
-Release:  6%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Version:  9.11.13
+Release:  1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -157,7 +157,6 @@ Patch173:bind-9.11-rh1732883.patch
 # Make sure jsonccp-devel does not interfere
 Patch174:bind-9.11-json-c.patch
 Patch175:bind-9.11-fips-disable.patch
-Patch176: bind-9.11-rh1768258.patch
 Patch177: bind-9.11-serve-stale.patch
 Patch178: bind-9.11-serve-stale-dbfix.patch
 
@@ -551,7 +550,6 @@ are used for building ISC DHCP.
 %patch173 -p1 -b .rh1732883
 %patch174 -p1 -b .json-c
 %patch175 -p1 -b .rh1709553
-%patch176 -p1 -b .rh1768258
 %patch177 -p1 -b .serve-stale
 %patch178 -p1 -b .rh1770492
 
@@ -1569,6 +1567,9 @@ fi;
 
 
 %changelog
+* Tue Nov 19 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.13-1
+- Update to 9.11.13
+
 * Tue Nov 19 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.12-6
 - Report failures on systemctl reload
 
diff --git a/sources b/sources
index 29d4646..d213c25 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (bind-9.11.12.tar.gz) = 7e2b9ef4ed5a00c2e5310c932c177887aed330d94eefc87d732dda010f2b71477e2f9d6ea89422ccbc8f6f04ceb83419b758218bcc02f25b34751bad974174e8
+SHA512 (bind-9.11.13.tar.gz) = 6e5289ff231b8d7d2f02ae02a1cf43abff3e507e1d96d8ec002dc71097fc77dc5514762ff1ea5918159c88319b1d5eed78c6dc1a7835173db234d4ee887644bc
+SHA512 (bind-9.11.13.tar.gz.asc) = 5b32adee7d45cdd2921126e898824839f6a0a5574c0ae5a441fc7df78681ebf872a276d6e434e8043cf9ec504f57c2b8fdf79fdb141e32dac5c4fa57c18d52f4