MFH: r556502 r556504

Update to 9.11.25 & 9.16.9.

Changes: https://downloads.isc.org/isc/bind9/9.11.25/RELEASE-NOTES-bind-9.11.25.html
Changes: https://downloads.isc.org/isc/bind9/9.16.9/doc/arm/html/notes.html#notes-for-bind-9-16-9

7 files changed, 19 insertions, 19 deletions

diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index 75466a96133c..4a51a89a058b 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 USES=	cpe libedit pkgconfig
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.11.24
+ISCVERSION=	9.11.25
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind911/distinfo b/dns/bind911/distinfo
index 33a0682577a1..00d01ebe6f4f 100644
--- a/dns/bind911/distinfo
+++ b/dns/bind911/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603640264
-SHA256 (bind-9.11.24.tar.gz) = f261587c5d37c7f14e8393547c4556faefa701a646930f1b6408d71519a30428
-SIZE (bind-9.11.24.tar.gz) = 8273237
+TIMESTAMP = 1606573875
+SHA256 (bind-9.11.25.tar.gz) = 8491c24e5a3da68f421d0fcb946602c8d0ff963012fdd176b8026c8890f3a117
+SIZE (bind-9.11.25.tar.gz) = 8284943
diff --git a/dns/bind911/files/patch-configure b/dns/bind911/files/patch-configure
index 22c47c328542..d24fd8d2f49d 100644
--- a/dns/bind911/files/patch-configure
+++ b/dns/bind911/files/patch-configure
@@ -3,7 +3,7 @@
 - Make sure only json-c is detected.
 - Cleanup the BDB discovery code to find more recent versions.
 
---- configure.orig	2020-10-13 11:00:08 UTC
+--- configure.orig	2020-11-16 21:14:24 UTC
 +++ configure
 @@ -15692,27 +15692,9 @@ done
  		# problems start to show up.
@@ -124,7 +124,7 @@
  			have_libjson_c="yes"
  		else
  			as_fn_error $? "$use_libjson/include/json{,-c}/json.h not found." "$LINENO" 5
-@@ -24967,7 +24896,7 @@ $as_echo "" >&6; }
+@@ -24986,7 +24915,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile
index 85bb11626ff9..54e5d80bc0bb 100644
--- a/dns/bind916/Makefile
+++ b/dns/bind916/Makefile
@@ -41,7 +41,7 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 
 USES=		compiler:c11 cpe libedit pkgconfig ssl tar:xz
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.16.8
+ISCVERSION=	9.16.9
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind916/distinfo b/dns/bind916/distinfo
index c920ee7babca..fafaaf70ab0a 100644
--- a/dns/bind916/distinfo
+++ b/dns/bind916/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603640347
-SHA256 (bind-9.16.8.tar.xz) = 9e9b9c563692be86ec41f670f6b70e26c14e72445c742d7b5eb4db7d2b5e8d31
-SIZE (bind-9.16.8.tar.xz) = 3253744
+TIMESTAMP = 1606573953
+SHA256 (bind-9.16.9.tar.xz) = bcb292c4d738a46e3cbcb8afaa25ecf54f77652fa575135da9a2a1d525304a5a
+SIZE (bind-9.16.9.tar.xz) = 3260964
diff --git a/dns/bind916/files/extrapatch-bind-min-override-ttl b/dns/bind916/files/extrapatch-bind-min-override-ttl
index 252830317883..ac8dcacc3f71 100644
--- a/dns/bind916/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind916/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2020-10-13 08:41:40 UTC
+--- bin/named/config.c.orig	2020-11-16 14:44:37 UTC
 +++ bin/named/config.c
 @@ -179,6 +179,7 @@ options {\n\
  	notify-source *;\n\
@@ -10,9 +10,9 @@ Add the override-cache-ttl feature.
  	provide-ixfr true;\n\
  	qname-minimization relaxed;\n\
  	query-source address *;\n\
---- bin/named/server.c.orig	2020-10-13 08:41:40 UTC
+--- bin/named/server.c.orig	2020-11-16 14:44:37 UTC
 +++ bin/named/server.c
-@@ -4341,6 +4341,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4344,6 +4344,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
  
  	obj = NULL;
@@ -24,7 +24,7 @@ Add the override-cache-ttl feature.
  	result = named_config_get(maps, "max-cache-ttl", &obj);
  	INSIST(result == ISC_R_SUCCESS);
  	view->maxcachettl = cfg_obj_asduration(obj);
---- lib/dns/include/dns/view.h.orig	2020-10-13 08:41:40 UTC
+--- lib/dns/include/dns/view.h.orig	2020-11-16 14:44:37 UTC
 +++ lib/dns/include/dns/view.h
 @@ -152,6 +152,7 @@ struct dns_view {
  	bool		      requestnsid;
@@ -34,9 +34,9 @@ Add the override-cache-ttl feature.
  	dns_ttl_t	      maxncachettl;
  	dns_ttl_t	      mincachettl;
  	dns_ttl_t	      minncachettl;
---- lib/dns/resolver.c.orig	2020-10-13 08:41:40 UTC
+--- lib/dns/resolver.c.orig	2020-11-16 14:44:37 UTC
 +++ lib/dns/resolver.c
-@@ -6273,6 +6273,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6274,6 +6274,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
  		}
  
  		/*
@@ -49,7 +49,7 @@ Add the override-cache-ttl feature.
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2020-10-13 08:41:40 UTC
+--- lib/isccfg/namedconf.c.orig	2020-11-16 14:44:37 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1990,6 +1990,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
diff --git a/dns/bind916/files/patch-configure b/dns/bind916/files/patch-configure
index b3a1474da4d5..b07f9c49095b 100644
--- a/dns/bind916/files/patch-configure
+++ b/dns/bind916/files/patch-configure
@@ -1,6 +1,6 @@
 Fixup gssapi and db detection.
 
---- configure.orig	2020-10-13 08:41:40 UTC
+--- configure.orig	2020-11-16 14:44:37 UTC
 +++ configure
 @@ -17698,27 +17698,9 @@ done
  		# problems start to show up.
@@ -81,7 +81,7 @@ Fixup gssapi and db detection.
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -23207,7 +23149,7 @@ $as_echo "" >&6; }
+@@ -23220,7 +23162,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).