dns/bind9-devel: upgrade to 9.21.7

Changes:	https://downloads.isc.org/isc/bind9/9.21.7/doc/arm/html/notes.html#notes-for-bind-9-21-7

6 files changed, 33 insertions, 36 deletions

diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel
index dc6fe07b3a68..e98cf0265fba 100644
--- a/dns/bind-tools/pkg-plist-devel
+++ b/dns/bind-tools/pkg-plist-devel
@@ -18,15 +18,15 @@ bin/named-rrchecker
 bin/nsec3hash
 bin/nslookup
 bin/nsupdate
-lib/bind-tools/libdns-9.21.6.so
+lib/bind-tools/libdns-9.21.7.so
 lib/bind-tools/libdns.so
-lib/bind-tools/libisc-9.21.6.so
+lib/bind-tools/libisc-9.21.7.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisccc-9.21.6.so
+lib/bind-tools/libisccc-9.21.7.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccfg-9.21.6.so
+lib/bind-tools/libisccfg-9.21.7.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libns-9.21.6.so
+lib/bind-tools/libns-9.21.7.so
 lib/bind-tools/libns.so
 share/man/man1/arpaname.1.gz
 share/man/man1/delv.1.gz
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index aef7c3b485dc..33117e7339a8 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.6
+DISTVERSION=	9.21.7
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
 PORTREVISION=	0
@@ -57,9 +57,7 @@ GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--sysconfdir=${ETCDIR} \
 		--with-libxml2 \
-		--with-openssl=${OPENSSLBASE} \
-		--enable-dnsrps \
-		--with-readline=libedit
+		--with-openssl=${OPENSSLBASE}
 ETCDIR=		${PREFIX}/etc/namedb
 
 # FIXME: figure out why build fails if enabled
@@ -84,7 +82,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFAULT=	GSSAPI_NONE IDN JSON LMDB \
 			TCP_FASTOPEN DNSTAP
-OPTIONS_DEFINE=		DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
+OPTIONS_DEFINE=		DNSTAP DOCS GEOIP IDN JSON LARGE_FILE LMDB \
 			OVERRIDECACHE QUERYTRACE \
 			START_LATE TCP_FASTOPEN
 
@@ -100,7 +98,6 @@ OPTIONS_EXCLUDE=	DOCS GEOIP LMDB \
 OPTIONS_SUB=	yes
 
 DNSTAP_DESC=		Provides fast passive logging of DNS messages
-FIXED_RRSET_DESC=	Enable fixed rrset ordering
 GSSAPI_BASE_DESC=	Using Heimdal in base (nsupdate is broken)
 GSSAPI_HEIMDAL_DESC=	Using security/heimdal (nsupdate is broken)
 GSSAPI_MIT_DESC=	Using security/krb5
@@ -121,8 +118,6 @@ DNSTAP_CONFIGURE_ENABLE=	dnstap
 DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm \
 				libprotobuf-c.so:devel/protobuf-c
 
-FIXED_RRSET_CONFIGURE_ENABLE=	fixed-rrset
-
 GEOIP_CONFIGURE_ENABLE=	geoip
 GEOIP_CONFIGURE_WITH=	maxminddb
 GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index e10386dbde29..2c33a3e26b6b 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742398615
-SHA256 (bind-9.21.6.tar.xz) = ff9722bdb353df442ca95444148aa23e3d16153e4576d2bdaa008fa7f37e019c
-SIZE (bind-9.21.6.tar.xz) = 5551792
+TIMESTAMP = 1744829551
+SHA256 (bind-9.21.7.tar.xz) = f9cd6c8e9cc7fd0ae6438a26072063b2d0aa11594493ecf4655f29abdc704b89
+SIZE (bind-9.21.7.tar.xz) = 5558888
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 9b95adc939c6..40fe995a0760 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,8 +1,8 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2025-02-11 17:45:15 UTC
+--- bin/named/config.c.orig	2025-04-09 14:26:29 UTC
 +++ bin/named/config.c
-@@ -180,6 +180,7 @@ options {\n\
+@@ -183,6 +183,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	2025-02-11 17:45:15 UTC
+--- bin/named/server.c.orig	2025-04-09 14:26:29 UTC
 +++ bin/named/server.c
-@@ -4203,6 +4203,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4204,6 +4204,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);
---- doc/arm/reference.rst.orig	2025-02-11 17:45:15 UTC
+--- doc/arm/reference.rst.orig	2025-04-09 14:26:29 UTC
 +++ doc/arm/reference.rst
-@@ -4109,6 +4109,10 @@ Tuning
+@@ -4163,6 +4163,10 @@ Tuning
     cannot exceed 7 days and is silently truncated to 7 days if set to a
     greater value.
  
@@ -37,19 +37,19 @@ 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.
---- lib/dns/include/dns/view.h.orig	2025-02-11 17:45:15 UTC
+--- lib/dns/include/dns/view.h.orig	2025-04-09 14:26:29 UTC
 +++ lib/dns/include/dns/view.h
-@@ -147,6 +147,7 @@ struct dns_view {
- 	bool		      requestnsid;
+@@ -148,6 +148,7 @@ struct dns_view {
+ 	bool		      requestzoneversion;
  	bool		      sendcookie;
  	dns_ttl_t	      maxcachettl;
 +	dns_ttl_t	      overridecachettl;
  	dns_ttl_t	      maxncachettl;
  	dns_ttl_t	      mincachettl;
  	dns_ttl_t	      minncachettl;
---- lib/dns/resolver.c.orig	2025-02-11 17:45:15 UTC
+--- lib/dns/resolver.c.orig	2025-04-09 14:26:29 UTC
 +++ lib/dns/resolver.c
-@@ -5960,6 +5960,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -5937,6 +5937,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
  		}
  
  		/*
@@ -62,7 +62,7 @@ Add the override-cache-ttl feature.
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2025-02-11 17:45:15 UTC
+--- lib/isccfg/namedconf.c.orig	2025-04-09 14:26:29 UTC
 +++ lib/isccfg/namedconf.c
 @@ -2068,6 +2068,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
diff --git a/dns/bind9-devel/files/patch-bin_named_include_named_globals.h b/dns/bind9-devel/files/patch-bin_named_include_named_globals.h
index 27eec09d1c24..54a05c73c851 100644
--- a/dns/bind9-devel/files/patch-bin_named_include_named_globals.h
+++ b/dns/bind9-devel/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	2024-12-03 09:47:47 UTC
+--- bin/named/include/named/globals.h.orig	2025-04-09 14:26:29 UTC
 +++ bin/named/include/named/globals.h
-@@ -118,7 +118,7 @@ EXTERN const char *named_g_defaultsessionkeyfile INIT(
+@@ -117,7 +117,7 @@ EXTERN const char *named_g_defaultpidfile INIT(NAMED_L
  
  #if NAMED_RUN_PID_DIR
  EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/"
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 466c8e05e06d..2099b7727cb4 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -103,7 +103,6 @@ include/dns/validator.h
 include/dns/view.h
 include/dns/xfrin.h
 include/dns/zone.h
-include/dns/zonekey.h
 include/dns/zoneverify.h
 include/dns/zt.h
 include/dst/dst.h
@@ -131,6 +130,7 @@ include/isc/error.h
 include/isc/file.h
 include/isc/formatcheck.h
 include/isc/fuzz.h
+include/isc/fxhash.h
 include/isc/getaddresses.h
 include/isc/hash.h
 include/isc/hashmap.h
@@ -172,6 +172,7 @@ include/isc/quota.h
 include/isc/radix.h
 include/isc/random.h
 include/isc/ratelimiter.h
+include/isc/readline.h
 include/isc/refcount.h
 include/isc/regex.h
 include/isc/region.h
@@ -179,6 +180,7 @@ include/isc/result.h
 include/isc/rwlock.h
 include/isc/safe.h
 include/isc/serial.h
+include/isc/sieve.h
 include/isc/signal.h
 include/isc/siphash.h
 include/isc/sockaddr.h
@@ -232,15 +234,15 @@ include/ns/update.h
 include/ns/xfrout.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
-lib/libdns-9.21.6.so
+lib/libdns-9.21.7.so
 lib/libdns.so
-lib/libisc-9.21.6.so
+lib/libisc-9.21.7.so
 lib/libisc.so
-lib/libisccc-9.21.6.so
+lib/libisccc-9.21.7.so
 lib/libisccc.so
-lib/libisccfg-9.21.6.so
+lib/libisccfg-9.21.7.so
 lib/libisccfg.so
-lib/libns-9.21.6.so
+lib/libns-9.21.7.so
 lib/libns.so
 @comment share/man/man1/arpaname.1.gz
 @comment share/man/man1/delv.1.gz