dns/bind916: Update to 9.16.17.

Changes:	https://downloads.isc.org/isc/bind9/9.16.17/doc/arm/html/notes.html#notes-for-bind-9-16-17
MFH:		yes
(cherry picked from commit bd84c5b4f210c3ac266a2eaa33f0481d47a87053)

6 files changed, 19 insertions, 17 deletions

diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile
index cf23c7d650cf..7d2bcaba7c35 100644
--- a/dns/bind916/Makefile
+++ b/dns/bind916/Makefile
@@ -40,7 +40,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.16
+ISCVERSION=	9.16.17
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind916/distinfo b/dns/bind916/distinfo
index 8101fe002ee4..011391ed2f6d 100644
--- a/dns/bind916/distinfo
+++ b/dns/bind916/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621600291
-SHA256 (bind-9.16.16.tar.xz) = 6c913902adf878e7dc5e229cea94faefc9d40f44775a30213edd08860f761d7b
-SIZE (bind-9.16.16.tar.xz) = 5016864
+TIMESTAMP = 1623917461
+SHA256 (bind-9.16.17.tar.xz) = 6a4d4a0aefcab852bf415d48212cab5b1110269b74dcb119bdbf303bff385cfa
+SIZE (bind-9.16.17.tar.xz) = 5021984
diff --git a/dns/bind916/files/extrapatch-bind-min-override-ttl b/dns/bind916/files/extrapatch-bind-min-override-ttl
index 0fa5d5fd7dac..36e82c339d80 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-04-19 13:45:50 UTC
+--- bin/named/config.c.orig	2021-06-08 10:45:10 UTC
 +++ bin/named/config.c
 @@ -180,6 +180,7 @@ options {\n\
  	notify-source *;\n\
@@ -10,7 +10,7 @@ Add the override-cache-ttl feature.
  	provide-ixfr true;\n\
  	qname-minimization relaxed;\n\
  	query-source address *;\n\
---- bin/named/server.c.orig	2021-04-19 13:45:50 UTC
+--- bin/named/server.c.orig	2021-06-08 10:45:10 UTC
 +++ bin/named/server.c
 @@ -4364,6 +4364,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
@@ -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-04-19 13:45:50 UTC
+--- lib/dns/include/dns/view.h.orig	2021-06-08 10:45:10 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-04-19 13:45:50 UTC
+--- lib/dns/resolver.c.orig	2021-06-08 10:45:10 UTC
 +++ lib/dns/resolver.c
-@@ -6477,6 +6477,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6476,6 +6476,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-04-19 13:45:50 UTC
+--- lib/isccfg/namedconf.c.orig	2021-06-08 10:45:10 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/extrapatch-bind-tools b/dns/bind916/files/extrapatch-bind-tools
index da9da5dfd8da..966809ffc7cd 100644
--- a/dns/bind916/files/extrapatch-bind-tools
+++ b/dns/bind916/files/extrapatch-bind-tools
@@ -1,6 +1,6 @@
 Only select the "tools" part of bind for building.
 
---- Makefile.in.orig	2020-09-04 10:44:49 UTC
+--- Makefile.in.orig	2021-06-08 10:45:10 UTC
 +++ Makefile.in
 @@ -17,7 +17,7 @@ W3M = @W3M@
  
@@ -11,15 +11,15 @@ Only select the "tools" part of bind for building.
  TARGETS =
  PREREQS =	bind.keys.h
  
-@@ -53,7 +53,6 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
+@@ -51,7 +51,6 @@ installdirs:
+ 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sysconfdir}
  
  install:: installdirs
 -	${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir}
  
  uninstall::
  	rm -f ${DESTDIR}${sysconfdir}/bind.keys
---- bin/Makefile.in.orig	2020-09-04 10:44:49 UTC
+--- bin/Makefile.in.orig	2021-06-08 10:45:10 UTC
 +++ bin/Makefile.in
 @@ -11,8 +11,8 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
diff --git a/dns/bind916/files/patch-configure b/dns/bind916/files/patch-configure
index acd2d5d131a4..de6888343d83 100644
--- a/dns/bind916/files/patch-configure
+++ b/dns/bind916/files/patch-configure
@@ -1,6 +1,6 @@
 Fixup gssapi and db detection.
 
---- configure.orig	2021-04-19 13:45:50 UTC
+--- configure.orig	2021-06-08 10:45:10 UTC
 +++ configure
 @@ -17758,27 +17758,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
-@@ -23231,7 +23173,7 @@ $as_echo "" >&6; }
+@@ -23262,7 +23204,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 4fc8dbff7cad..d95b32c06e4f 100644
--- a/dns/bind916/pkg-plist
+++ b/dns/bind916/pkg-plist
@@ -131,6 +131,7 @@ include/isc/assertions.h
 include/isc/astack.h
 include/isc/atomic.h
 include/isc/backtrace.h
+include/isc/barrier.h
 include/isc/base32.h
 include/isc/base64.h
 include/isc/bind9.h
@@ -169,6 +170,7 @@ include/isc/likely.h
 include/isc/list.h
 include/isc/log.h
 include/isc/magic.h
+include/isc/managers.h
 include/isc/md.h
 include/isc/mem.h
 include/isc/meminfo.h
@@ -220,9 +222,9 @@ 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/url.h
 include/isc/utf8.h
 include/isc/util.h
 include/isc/version.h