git: 07211700b8c9 - 2025Q4 - dns/bind9-devel: update 9.21.16

From: Mathieu Arnold <mat_at_FreeBSD.org>
Date: Wed, 17 Dec 2025 17:00:38 UTC
The branch 2025Q4 has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=07211700b8c980cfaaabaedcb5b732cdde2ea413

commit 07211700b8c980cfaaabaedcb5b732cdde2ea413
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2025-12-17 15:15:58 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2025-12-17 16:12:26 +0000

    dns/bind9-devel: update 9.21.16
    
    Changes:        https://downloads.isc.org/isc/bind9/9.21.16/doc/arm/html/notes.html#notes-for-bind-9-21-16
    (cherry picked from commit 07295850dac34a7c4abf07a3a57298a87d9e2755)
---
 dns/bind-tools/pkg-plist-devel                     | 10 +++----
 dns/bind9-devel/Makefile                           |  2 +-
 dns/bind9-devel/distinfo                           |  6 ++--
 .../files/extrapatch-bind-min-override-ttl         | 32 +++++++++++-----------
 dns/bind9-devel/files/patch-meson.build            | 22 +++++++--------
 dns/bind9-devel/files/patch-meson.options          |  4 +--
 dns/bind9-devel/pkg-plist                          | 11 ++++----
 7 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel
index 985a29ccc188..970451051e17 100644
--- a/dns/bind-tools/pkg-plist-devel
+++ b/dns/bind-tools/pkg-plist-devel
@@ -18,11 +18,11 @@ bin/named-rrchecker
 bin/nsec3hash
 bin/nslookup
 bin/nsupdate
-lib/bind-tools/libdns-9.21.15.so
-lib/bind-tools/libisc-9.21.15.so
-lib/bind-tools/libisccc-9.21.15.so
-lib/bind-tools/libisccfg-9.21.15.so
-lib/bind-tools/libns-9.21.15.so
+lib/bind-tools/libdns-9.21.16.so
+lib/bind-tools/libisc-9.21.16.so
+lib/bind-tools/libisccc-9.21.16.so
+lib/bind-tools/libisccfg-9.21.16.so
+lib/bind-tools/libns-9.21.16.so
 share/man/man1/arpaname.1.gz
 share/man/man1/delv.1.gz
 share/man/man1/dig.1.gz
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 831ef68aba02..981b3ca8ce8e 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -1,7 +1,7 @@
 # pkg-help formatted with fmt 59 63
 
 PORTNAME=	bind
-DISTVERSION=	9.21.15
+DISTVERSION=	9.21.16
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
 PORTREVISION=	0
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 1a744f107ab0..bf2d00c72c50 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1763564699
-SHA256 (bind-9.21.15.tar.xz) = fa6a5761188f7d3e1cba8968bd02a033bdfad0935905fadab09282b2fb2ec304
-SIZE (bind-9.21.15.tar.xz) = 5264212
+TIMESTAMP = 1765983486
+SHA256 (bind-9.21.16.tar.xz) = 521aa2003c5a7d78d8e589787025f39384065535818f4344cf9e14c086fda98d
+SIZE (bind-9.21.16.tar.xz) = 5271888
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index d3917c8d825e..f927b1a4772b 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
 Add the override-cache-ttl feature.
 
---- bin/include/defaultconfig.h.orig	2025-11-07 09:34:27 UTC
+--- bin/include/defaultconfig.h.orig	2025-12-09 17:51:25 UTC
 +++ bin/include/defaultconfig.h
 @@ -159,6 +159,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	2025-11-07 09:34:27 UTC
+--- bin/named/server.c.orig	2025-12-09 17:51:25 UTC
 +++ bin/named/server.c
-@@ -4198,6 +4198,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4082,6 +4082,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);
---- doc/arm/reference.rst.orig	2025-11-07 09:34:27 UTC
+--- doc/arm/reference.rst.orig	2025-12-09 17:51:25 UTC
 +++ doc/arm/reference.rst
 @@ -4154,6 +4154,10 @@ Tuning
     cannot exceed 7 days and is silently truncated to 7 days if set to a
@@ -37,7 +37,7 @@ Add the override-cache-ttl feature.
  .. namedconf:statement:: max-cache-ttl
     :tags: server
     :short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers.
---- doc/misc/options.orig	2025-11-07 09:34:27 UTC
+--- doc/misc/options.orig	2025-12-09 17:51:25 UTC
 +++ doc/misc/options
 @@ -171,6 +171,7 @@ options {
  	masterfile-style ( full | relative );
@@ -47,7 +47,7 @@ Add the override-cache-ttl feature.
  	max-cache-ttl <duration>;
  	max-clients-per-query <integer>;
  	max-ixfr-ratio ( unlimited | <percentage> );
---- lib/dns/include/dns/view.h.orig	2025-11-07 09:34:27 UTC
+--- lib/dns/include/dns/view.h.orig	2025-12-09 17:51:25 UTC
 +++ lib/dns/include/dns/view.h
 @@ -155,6 +155,7 @@ struct dns_view {
  	bool		      requestzoneversion;
@@ -57,9 +57,9 @@ Add the override-cache-ttl feature.
  	dns_ttl_t	      maxncachettl;
  	dns_ttl_t	      mincachettl;
  	dns_ttl_t	      minncachettl;
---- lib/dns/resolver.c.orig	2025-11-07 09:34:27 UTC
+--- lib/dns/resolver.c.orig	2025-12-09 17:51:25 UTC
 +++ lib/dns/resolver.c
-@@ -5836,6 +5836,12 @@ fixttls(dns_view_t *view, dns_rdataset_t *rdataset,
+@@ -6014,6 +6014,12 @@ fixttls(dns_view_t *view, dns_rdataset_t *rdataset,
  fixttls(dns_view_t *view, dns_rdataset_t *rdataset,
  	dns_rdataset_t *sigrdataset) {
  	/*
@@ -72,13 +72,13 @@ Add the override-cache-ttl feature.
  	 * Enforce the configured maximum and minimum cache TTL.
  	 */
  	if (rdataset->ttl > view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2025-11-07 09:34:27 UTC
+--- lib/isccfg/namedconf.c.orig	2025-12-09 17:51:25 UTC
 +++ lib/isccfg/namedconf.c
-@@ -2399,6 +2399,7 @@ static cfg_clausedef_t view_clauses[] = {
- 	{ "nta-lifetime", &cfg_type_duration, 0 },
- 	{ "nta-recheck", &cfg_type_duration, 0 },
- 	{ "nxdomain-redirect", &cfg_type_astring, 0 },
-+	{ "override-cache-ttl", &cfg_type_duration, 0 },
- 	{ "preferred-glue", &cfg_type_astring, 0 },
+@@ -2429,6 +2429,7 @@ static cfg_clausedef_t view_clauses[] = {
+ 	{ "nta-lifetime", &cfg_type_duration, 0, NULL },
+ 	{ "nta-recheck", &cfg_type_duration, 0, NULL },
+ 	{ "nxdomain-redirect", &cfg_type_astring, 0, NULL },
++	{ "override-cache-ttl", &cfg_type_duration, 0, NULL },
+ 	{ "preferred-glue", &cfg_type_astring, 0, NULL },
  	{ "prefetch", &cfg_type_prefetch, 0, prefetch_merge },
- 	{ "provide-ixfr", &cfg_type_boolean, 0 },
+ 	{ "provide-ixfr", &cfg_type_boolean, 0, NULL },
diff --git a/dns/bind9-devel/files/patch-meson.build b/dns/bind9-devel/files/patch-meson.build
index cb4803b883bd..9eebdab4a4ca 100644
--- a/dns/bind9-devel/files/patch-meson.build
+++ b/dns/bind9-devel/files/patch-meson.build
@@ -1,6 +1,6 @@
 Use bind-tools option to ease the server/tools package split
 
---- meson.build.orig	2025-11-07 09:34:27 UTC
+--- meson.build.orig	2025-12-09 17:51:25 UTC
 +++ meson.build
 @@ -72,6 +72,8 @@ zlib_opt = get_option('zlib').enable_auto_if(developer
  tracing_opt = get_option('tracing')
@@ -11,7 +11,7 @@ Use bind-tools option to ease the server/tools package split
  build_options = meson.build_options()
  if build_options == ''
      build_options = 'default'
-@@ -1215,6 +1217,7 @@ libisccfg_dep = declare_dependency(
+@@ -1291,6 +1293,7 @@ libisccfg_dep = declare_dependency(
      include_directories: isccfg_inc,
  )
  
@@ -19,7 +19,7 @@ Use bind-tools option to ease the server/tools package split
  executable(
      'arpaname',
      arpaname_src,
-@@ -1427,7 +1430,9 @@ executable(
+@@ -1503,7 +1506,9 @@ executable(
          libisc_dep,
      ],
  )
@@ -29,7 +29,7 @@ Use bind-tools option to ease the server/tools package split
  executable(
      'named-checkconf',
      named_checkconf_src,
-@@ -1501,7 +1506,9 @@ endif
+@@ -1577,7 +1582,9 @@ endif
          ],
      )
  endif
@@ -39,7 +39,7 @@ Use bind-tools option to ease the server/tools package split
  executable(
      'named-rrchecker',
      named_rrchecker_src,
-@@ -1514,6 +1521,7 @@ executable(
+@@ -1590,6 +1597,7 @@ executable(
      ],
  
  )
@@ -47,7 +47,7 @@ Use bind-tools option to ease the server/tools package split
  
  named_deps = []
  
-@@ -1551,6 +1559,7 @@ named_srcconf = named_srcset.apply(config, strict: fal
+@@ -1627,6 +1635,7 @@ named_srcconf = named_srcset.apply(config, strict: fal
  
  named_srcconf = named_srcset.apply(config, strict: false)
  
@@ -55,7 +55,7 @@ Use bind-tools option to ease the server/tools package split
  executable(
      'named',
      named_srcconf.sources(),
-@@ -1578,7 +1587,9 @@ executable(
+@@ -1654,7 +1663,9 @@ executable(
          named_srcconf.dependencies(),
      ],
  )
@@ -65,7 +65,7 @@ Use bind-tools option to ease the server/tools package split
  executable(
      'nsec3hash',
      nsec3hash_src,
-@@ -1623,7 +1634,9 @@ executable(
+@@ -1699,7 +1710,9 @@ executable(
          edit_dep,
      ],
  )
@@ -75,7 +75,7 @@ Use bind-tools option to ease the server/tools package split
  executable(
      'rndc-confgen',
      rndc_confgen_src,
-@@ -1719,6 +1732,7 @@ shared_library(
+@@ -1794,6 +1807,7 @@ shared_library(
          libns_dep,
      ],
  )
@@ -83,7 +83,7 @@ Use bind-tools option to ease the server/tools package split
  
  subdir('doc')
  subdir('tests')
-@@ -1795,7 +1809,6 @@ print(release_date, end="")
+@@ -1870,7 +1884,6 @@ print(release_date, end="")
  print(release_date, end="")
  '''
  
@@ -91,7 +91,7 @@ Use bind-tools option to ease the server/tools package split
      release_date = ''
      if python.found()
          release_date = run_command(python, ['-c', get_release_date], check: true).stdout()
-@@ -1816,6 +1829,7 @@ if doc_opt.allowed()
+@@ -1891,6 +1904,7 @@ if doc_opt.allowed()
  
      install_man(man_pages)
  
diff --git a/dns/bind9-devel/files/patch-meson.options b/dns/bind9-devel/files/patch-meson.options
index 441182e7a208..59c23f45115d 100644
--- a/dns/bind9-devel/files/patch-meson.options
+++ b/dns/bind9-devel/files/patch-meson.options
@@ -1,9 +1,9 @@
 Add bind-tools option to ease the server/tools package split
 
---- meson.options.orig	2025-11-19 15:19:33 UTC
+--- meson.options.orig	2025-12-09 17:51:25 UTC
 +++ meson.options
 @@ -203,3 +203,5 @@ option(
-     value: 'thin',
+     value: 'auto',
      description: 'Enable Link Time Optimization for named.',
  )
 +
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 7c5a4250cc31..0700b80365d0 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -104,6 +104,7 @@ include/dns/validator.h
 include/dns/view.h
 include/dns/xfrin.h
 include/dns/zone.h
+include/dns/zonefetch.h
 include/dns/zoneverify.h
 include/dns/zt.h
 include/dst/dst.h
@@ -236,11 +237,11 @@ include/ns/xfrout.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
 lib/bind/synthrecord.so
-lib/libdns-9.21.15.so
-lib/libisc-9.21.15.so
-lib/libisccc-9.21.15.so
-lib/libisccfg-9.21.15.so
-lib/libns-9.21.15.so
+lib/libdns-9.21.16.so
+lib/libisc-9.21.16.so
+lib/libisccc-9.21.16.so
+lib/libisccfg-9.21.16.so
+lib/libns-9.21.16.so
 @comment share/man/man1/arpaname.1.gz
 @comment share/man/man1/delv.1.gz
 @comment share/man/man1/dig.1.gz