dns/bind916: update to 9.16.25

Add back the Administrator Reference Manual in the DOCS option.

Changes:	https://downloads.isc.org/isc/bind9/9.16.25/doc/arm/html/notes.html#notes-for-bind-9-16-25

9 files changed, 39 insertions, 52 deletions

diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile
index 3a0451047978..8e2e5191c870 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.24
+ISCVERSION=	9.16.25
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
@@ -139,6 +139,10 @@ DLZ_POSTGRESQL_USES=		pgsql
 
 DLZ_STUB_CONFIGURE_ON=	--with-dlz-stub=yes
 
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
+			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
+DOCS_USES=	python:env
+
 DNSTAP_CONFIGURE_ENABLE=	dnstap
 DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm \
 				libprotobuf-c.so:devel/protobuf-c
@@ -234,6 +238,9 @@ post-patch-PORTREVISION-on:
 		${WRKSRC}/version
 .  endif
 
+post-build-DOCS-on:
+	cd ${WRKSRC}/doc/arm && ${MAKE} html
+
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree
 	${MKDIR} ${STAGEDIR}${ETCDIR}
@@ -251,9 +258,10 @@ post-install:
 		${STAGEDIR}${ETCDIR}/rndc.conf.sample
 
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \
 		${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc/arm/_build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/arm
 .else
 
 post-install-MANPAGES-on:
diff --git a/dns/bind916/distinfo b/dns/bind916/distinfo
index 0822338b9214..2ac4c796e2d9 100644
--- a/dns/bind916/distinfo
+++ b/dns/bind916/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639580045
-SHA256 (bind-9.16.24.tar.xz) = 5582f3734bd6232284f93f14206b8a46d1f819dea4797ae157066f6963b08507
-SIZE (bind-9.16.24.tar.xz) = 5070180
+TIMESTAMP = 1644499614
+SHA256 (bind-9.16.25.tar.xz) = 9fa328850f82843ef8b7bf1ff5322cb68b110273a33f375ba41f35270f5e1ff3
+SIZE (bind-9.16.25.tar.xz) = 5086780
diff --git a/dns/bind916/files/extrapatch-bind-min-override-ttl b/dns/bind916/files/extrapatch-bind-min-override-ttl
index c6778f90d64e..5dcd402cd7ad 100644
--- a/dns/bind916/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind916/files/extrapatch-bind-min-override-ttl
@@ -1,8 +1,8 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2021-11-05 09:03:26 UTC
+--- bin/named/config.c.orig	2022-01-12 13:50:10 UTC
 +++ bin/named/config.c
-@@ -165,6 +165,7 @@ options {\n\
+@@ -167,6 +167,7 @@ options {\n\
  	notify-source *;\n\
  	notify-source-v6 *;\n\
  	nsec3-test-zone no;\n\
@@ -10,9 +10,9 @@ Add the override-cache-ttl feature.
  	parental-source *;\n\
  	parental-source-v6 *;\n\
  	provide-ixfr true;\n\
---- bin/named/server.c.orig	2021-11-05 09:03:26 UTC
+--- bin/named/server.c.orig	2022-01-12 13:50:10 UTC
 +++ bin/named/server.c
-@@ -4415,6 +4415,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4421,6 +4421,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
  
  	obj = NULL;
@@ -24,9 +24,9 @@ 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-11-05 09:03:26 UTC
+--- lib/dns/include/dns/view.h.orig	2022-01-12 13:50:10 UTC
 +++ lib/dns/include/dns/view.h
-@@ -152,6 +152,7 @@ struct dns_view {
+@@ -154,6 +154,7 @@ struct dns_view {
  	bool		      requestnsid;
  	bool		      sendcookie;
  	dns_ttl_t	      maxcachettl;
@@ -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-11-05 09:03:26 UTC
+--- lib/dns/resolver.c.orig	2022-01-12 13:50:10 UTC
 +++ lib/dns/resolver.c
-@@ -6476,6 +6476,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6478,6 +6478,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
  		}
  
  		/*
@@ -49,9 +49,9 @@ Add the override-cache-ttl feature.
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2021-11-05 09:03:26 UTC
+--- lib/isccfg/namedconf.c.orig	2022-01-12 13:50:10 UTC
 +++ lib/isccfg/namedconf.c
-@@ -2048,6 +2048,7 @@ static cfg_clausedef_t view_clauses[] = {
+@@ -2050,6 +2050,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
  	{ "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE },
  	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
diff --git a/dns/bind916/files/extrapatch-bind-tools b/dns/bind916/files/extrapatch-bind-tools
index 966809ffc7cd..9db9e178cdea 100644
--- a/dns/bind916/files/extrapatch-bind-tools
+++ b/dns/bind916/files/extrapatch-bind-tools
@@ -1,8 +1,8 @@
 Only select the "tools" part of bind for building.
 
---- Makefile.in.orig	2021-06-08 10:45:10 UTC
+--- Makefile.in.orig	2022-01-12 13:50:10 UTC
 +++ Makefile.in
-@@ -17,7 +17,7 @@ W3M = @W3M@
+@@ -19,7 +19,7 @@ W3M = @W3M@
  
  VERSION=@BIND9_VERSION@
  
@@ -11,7 +11,7 @@ Only select the "tools" part of bind for building.
  TARGETS =
  PREREQS =	bind.keys.h
  
-@@ -51,7 +51,6 @@ installdirs:
+@@ -53,7 +53,6 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sysconfdir}
  
  install:: installdirs
@@ -19,9 +19,9 @@ Only select the "tools" part of bind for building.
  
  uninstall::
  	rm -f ${DESTDIR}${sysconfdir}/bind.keys
---- bin/Makefile.in.orig	2021-06-08 10:45:10 UTC
+--- bin/Makefile.in.orig	2022-01-12 13:50:10 UTC
 +++ bin/Makefile.in
-@@ -11,8 +11,8 @@ srcdir =	@srcdir@
+@@ -13,8 +13,8 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
  
diff --git a/dns/bind916/files/extrapatch-no-bind-tools b/dns/bind916/files/extrapatch-no-bind-tools
index 04e8afa2513d..76bfcc3d0385 100644
--- a/dns/bind916/files/extrapatch-no-bind-tools
+++ b/dns/bind916/files/extrapatch-no-bind-tools
@@ -1,8 +1,8 @@
 Exclude the "tools" from building and installing.
 
---- bin/Makefile.in.orig	2020-06-10 21:01:43 UTC
+--- bin/Makefile.in.orig	2022-01-12 13:50:10 UTC
 +++ bin/Makefile.in
-@@ -11,8 +11,8 @@ srcdir =	@srcdir@
+@@ -13,8 +13,8 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
  
@@ -13,9 +13,9 @@ Exclude the "tools" from building and installing.
  TARGETS =
  
  @BIND9_MAKE_RULES@
---- bin/tools/Makefile.in.orig	2020-06-10 21:01:43 UTC
+--- bin/tools/Makefile.in.orig	2022-01-12 13:50:10 UTC
 +++ bin/tools/Makefile.in
-@@ -43,10 +43,7 @@ SUBDIRS =
+@@ -45,10 +45,7 @@ SUBDIRS =
  
  DNSTAPTARGETS =	dnstap-read@EXEEXT@
  NZDTARGETS =	named-nzd2nzf@EXEEXT@
@@ -27,7 +27,7 @@ Exclude the "tools" from building and installing.
  
  DNSTAPSRCS  =	dnstap-read.c
  NZDSRCS  =	named-nzd2nzf.c
-@@ -103,16 +100,6 @@ dnstap:
+@@ -105,16 +102,6 @@ dnstap:
  		${DESTDIR}${bindir}
  
  install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
diff --git a/dns/bind916/files/patch-bin_named_include_named_globals.h b/dns/bind916/files/patch-bin_named_include_named_globals.h
index 36cc5a746f75..69cafb3c70fa 100644
--- a/dns/bind916/files/patch-bin_named_include_named_globals.h
+++ b/dns/bind916/files/patch-bin_named_include_named_globals.h
@@ -1,8 +1,8 @@
 We reference the pid file as being run/named/pid everywere else.
 
---- bin/named/include/named/globals.h.orig	2020-02-12 20:03:44 UTC
+--- bin/named/include/named/globals.h.orig	2022-01-12 13:50:10 UTC
 +++ bin/named/include/named/globals.h
-@@ -127,7 +127,7 @@ EXTERN bool named_g_forcelock		   INIT(false);
+@@ -129,7 +129,7 @@ EXTERN bool named_g_forcelock		   INIT(false);
  
  #if NAMED_RUN_PID_DIR
  EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/"
diff --git a/dns/bind916/files/patch-bin_tests_system_dlzexternal_Makefile.in b/dns/bind916/files/patch-bin_tests_system_dlzexternal_Makefile.in
index 5fbeafc70626..0a6aaf7927cf 100644
--- a/dns/bind916/files/patch-bin_tests_system_dlzexternal_Makefile.in
+++ b/dns/bind916/files/patch-bin_tests_system_dlzexternal_Makefile.in
@@ -1,8 +1,8 @@
 BIND9 seems to be abusing LDFLAGS here, and it breaks our linker.
 
---- bin/tests/system/dlzexternal/Makefile.in.orig	2019-06-28 12:33:29 UTC
+--- bin/tests/system/dlzexternal/Makefile.in.orig	2022-01-12 13:50:10 UTC
 +++ bin/tests/system/dlzexternal/Makefile.in
-@@ -35,7 +35,7 @@ OBJS =
+@@ -37,7 +37,7 @@ OBJS =
  @BIND9_MAKE_RULES@
  
  CFLAGS =	@CFLAGS@ @SO_CFLAGS@
diff --git a/dns/bind916/files/patch-configure b/dns/bind916/files/patch-configure
index 5e4c9474965a..2b1ba952e1ad 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-12-07 12:24:49 UTC
+--- configure.orig	2022-01-12 13:50:10 UTC
 +++ configure
 @@ -17769,27 +17769,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
-@@ -23320,7 +23262,7 @@ $as_echo "" >&6; }
+@@ -23322,7 +23264,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind916/files/patch-mr-5626 b/dns/bind916/files/patch-mr-5626
deleted file mode 100644
index 6cb9becc16e0..000000000000
--- a/dns/bind916/files/patch-mr-5626
+++ /dev/null
@@ -1,21 +0,0 @@
---- lib/isc/netmgr/netmgr.c.orig	2021-12-07 12:24:49 UTC
-+++ 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 FLA
- 
- 	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);