MFH: r568799 r568800

Update BIND9 to 9.16.13 & 9.11.29.

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

8 files changed, 24 insertions, 23 deletions

diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index b6fe93f959f2..569aea0769f6 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.28
+ISCVERSION=	9.11.29
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind911/distinfo b/dns/bind911/distinfo
index c0dd6c90834f..3e623c34c866 100644
--- a/dns/bind911/distinfo
+++ b/dns/bind911/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613395465
-SHA256 (bind-9.11.28.tar.gz) = 1090cbe6caba37c404d1075887da7e5282ae9a2bc6172d722df15cd480975e74
-SIZE (bind-9.11.28.tar.gz) = 8295208
+TIMESTAMP = 1616162892
+SHA256 (bind-9.11.29.tar.gz) = c7bbc751cc6e9ba84038c55a29475ae004a71df8067127be73e4770de99e7b07
+SIZE (bind-9.11.29.tar.gz) = 8297010
diff --git a/dns/bind911/files/patch-configure b/dns/bind911/files/patch-configure
index fa5be408ee89..b6a5e514857b 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	2021-02-04 13:06:04 UTC
+--- configure.orig	2021-03-09 12:49:28 UTC
 +++ configure
 @@ -15692,27 +15692,9 @@ done
  		# problems start to show up.
@@ -84,7 +84,7 @@
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -18662,7 +18604,7 @@ case "$use_libjson" in
+@@ -18670,7 +18612,7 @@ case "$use_libjson" in
  	auto|yes)
  		for d in /usr /usr/local /opt/local
  		do
@@ -93,7 +93,7 @@
  			then
  				if test ${d} != /usr
  				then
-@@ -18670,29 +18612,16 @@ case "$use_libjson" in
+@@ -18678,29 +18620,16 @@ case "$use_libjson" in
  					LIBS="$LIBS -L${d}/lib"
  				fi
  				have_libjson="yes"
@@ -124,7 +124,7 @@
  			have_libjson_c="yes"
  		else
  			as_fn_error $? "$use_libjson/include/json{,-c}/json.h not found." "$LINENO" 5
-@@ -24987,7 +24916,7 @@ $as_echo "" >&6; }
+@@ -24995,7 +24924,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile
index c53d99bf8a28..7625f9a9621d 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.12
+ISCVERSION=	9.16.13
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind916/distinfo b/dns/bind916/distinfo
index 29951fde7de0..f8676a064949 100644
--- a/dns/bind916/distinfo
+++ b/dns/bind916/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613395604
-SHA256 (bind-9.16.12.tar.xz) = 9914af9311fd349cab441097898d94fb28d0bfd9bf6ed04fe1f97f042644da7f
-SIZE (bind-9.16.12.tar.xz) = 5017756
+TIMESTAMP = 1616162959
+SHA256 (bind-9.16.13.tar.xz) = a54cc793fa5b69b35f610f2095760f8238dff5cfd52419f7ee1c9c227da4cc08
+SIZE (bind-9.16.13.tar.xz) = 5028340
diff --git a/dns/bind916/files/extrapatch-bind-min-override-ttl b/dns/bind916/files/extrapatch-bind-min-override-ttl
index 053fc1974329..755dc8db3166 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	2021-02-04 11:35:16 UTC
+--- bin/named/config.c.orig	2021-03-11 13:20:59 UTC
 +++ bin/named/config.c
 @@ -180,6 +180,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	2021-02-04 11:35:16 UTC
+--- bin/named/server.c.orig	2021-03-11 13:20:59 UTC
 +++ bin/named/server.c
-@@ -4347,6 +4347,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4353,6 +4353,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	2021-02-04 11:35:16 UTC
+--- lib/dns/include/dns/view.h.orig	2021-03-11 13:20:59 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	2021-02-04 11:35:16 UTC
+--- lib/dns/resolver.c.orig	2021-03-11 13:20:59 UTC
 +++ lib/dns/resolver.c
-@@ -6478,6 +6478,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6477,6 +6477,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	2021-02-04 11:35:16 UTC
+--- lib/isccfg/namedconf.c.orig	2021-03-11 13:20:59 UTC
 +++ lib/isccfg/namedconf.c
 @@ -2047,6 +2047,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 22eedf9170bf..e4ca7e96bb34 100644
--- a/dns/bind916/files/patch-configure
+++ b/dns/bind916/files/patch-configure
@@ -1,8 +1,8 @@
 Fixup gssapi and db detection.
 
---- configure.orig	2021-02-04 11:35:16 UTC
+--- configure.orig	2021-03-11 13:20:59 UTC
 +++ configure
-@@ -17701,27 +17701,9 @@ done
+@@ -17761,27 +17761,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -32,7 +32,7 @@ Fixup gssapi and db detection.
  		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
  $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
  		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -17764,47 +17746,7 @@ $as_echo "no" >&6; } ;;
+@@ -17824,47 +17806,7 @@ $as_echo "no" >&6; } ;;
  		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  		esac
  
@@ -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
-@@ -23199,7 +23141,7 @@ $as_echo "" >&6; }
+@@ -23263,7 +23205,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind916/pkg-plist b/dns/bind916/pkg-plist
index 4dd80c7a5edb..4fc8dbff7cad 100644
--- a/dns/bind916/pkg-plist
+++ b/dns/bind916/pkg-plist
@@ -220,6 +220,7 @@ include/isc/taskpool.h
 include/isc/thread.h
 include/isc/time.h
 include/isc/timer.h
+include/isc/tls.h
 include/isc/tm.h
 include/isc/types.h
 include/isc/utf8.h