dns/bind916: update to 9.16.26

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

MFH:		2021Q1
(cherry picked from commit 774b522ad0e07c732d70e31fedfafdda72f0393e)

4 files changed, 15 insertions, 15 deletions

diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile
index 918533c7e540..54db3c0fa6da 100644
--- a/dns/bind916/Makefile
+++ b/dns/bind916/Makefile
@@ -7,7 +7,7 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 PORTREVISION=	0
 .else
 # dns/bind916 here
-PORTREVISION=	1
+PORTREVISION=	0
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
@@ -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.25
+ISCVERSION=	9.16.26
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind916/distinfo b/dns/bind916/distinfo
index 2ac4c796e2d9..959a5828f818 100644
--- a/dns/bind916/distinfo
+++ b/dns/bind916/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644499614
-SHA256 (bind-9.16.25.tar.xz) = 9fa328850f82843ef8b7bf1ff5322cb68b110273a33f375ba41f35270f5e1ff3
-SIZE (bind-9.16.25.tar.xz) = 5086780
+TIMESTAMP = 1645135962
+SHA256 (bind-9.16.26.tar.xz) = 70b39a5eb71650358ec9ba41da3050d32aeac0aeb4a466684b23f35affa7fb45
+SIZE (bind-9.16.26.tar.xz) = 5083848
diff --git a/dns/bind916/files/extrapatch-bind-min-override-ttl b/dns/bind916/files/extrapatch-bind-min-override-ttl
index 5dcd402cd7ad..80b48f982da0 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	2022-01-12 13:50:10 UTC
+--- bin/named/config.c.orig	2022-02-04 12:05:58 UTC
 +++ bin/named/config.c
 @@ -167,6 +167,7 @@ options {\n\
  	notify-source *;\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	2022-01-12 13:50:10 UTC
+--- bin/named/server.c.orig	2022-02-04 12:05:58 UTC
 +++ bin/named/server.c
-@@ -4421,6 +4421,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4435,6 +4435,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	2022-01-12 13:50:10 UTC
+--- lib/dns/include/dns/view.h.orig	2022-02-04 12:05:58 UTC
 +++ lib/dns/include/dns/view.h
 @@ -154,6 +154,7 @@ struct dns_view {
  	bool		      requestnsid;
@@ -34,7 +34,7 @@ Add the override-cache-ttl feature.
  	dns_ttl_t	      maxncachettl;
  	dns_ttl_t	      mincachettl;
  	dns_ttl_t	      minncachettl;
---- lib/dns/resolver.c.orig	2022-01-12 13:50:10 UTC
+--- lib/dns/resolver.c.orig	2022-02-04 12:05:58 UTC
 +++ lib/dns/resolver.c
 @@ -6478,6 +6478,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	2022-01-12 13:50:10 UTC
+--- lib/isccfg/namedconf.c.orig	2022-02-04 12:05:58 UTC
 +++ lib/isccfg/namedconf.c
 @@ -2050,6 +2050,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 2b1ba952e1ad..b1b9610f94ac 100644
--- a/dns/bind916/files/patch-configure
+++ b/dns/bind916/files/patch-configure
@@ -1,8 +1,8 @@
 Fixup gssapi and db detection.
 
---- configure.orig	2022-01-12 13:50:10 UTC
+--- configure.orig	2022-02-04 12:05:58 UTC
 +++ configure
-@@ -17769,27 +17769,9 @@ done
+@@ -17876,27 +17876,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
-@@ -17832,47 +17814,7 @@ $as_echo "no" >&6; } ;;
+@@ -17939,47 +17921,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
-@@ -23322,7 +23264,7 @@ $as_echo "" >&6; }
+@@ -23429,7 +23371,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).