git: 0691729392db - 2025Q1 - dns/bind9-devel: update to 9.21.5

From: Mathieu Arnold <mat_at_FreeBSD.org>
Date: Wed, 19 Feb 2025 17:33:28 UTC
The branch 2025Q1 has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0691729392db8acf429e1f2a96efcabebe794423

commit 0691729392db8acf429e1f2a96efcabebe794423
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2025-02-19 16:55:14 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2025-02-19 17:32:01 +0000

    dns/bind9-devel: update to 9.21.5
    
    Changes:        https://downloads.isc.org/isc/bind9/9.21.5/doc/arm/html/notes.html
    (cherry picked from commit 0697086149da92607efc99384b773f914bc558f7)
---
 dns/bind-tools/pkg-plist-devel                         | 10 +++++-----
 dns/bind9-devel/Makefile                               |  2 +-
 dns/bind9-devel/distinfo                               |  6 +++---
 dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 16 ++++++++--------
 dns/bind9-devel/pkg-plist                              | 11 ++++++-----
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel
index 1609ae2a249e..d9308f3ba899 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.4.so
+lib/bind-tools/libdns-9.21.5.so
 lib/bind-tools/libdns.so
-lib/bind-tools/libisc-9.21.4.so
+lib/bind-tools/libisc-9.21.5.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisccc-9.21.4.so
+lib/bind-tools/libisccc-9.21.5.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccfg-9.21.4.so
+lib/bind-tools/libisccfg-9.21.5.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libns-9.21.4.so
+lib/bind-tools/libns-9.21.5.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 d2132ad8f0cc..d98da9bbbf9d 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.4
+DISTVERSION=	9.21.5
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
 PORTREVISION=	0
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 1f86284199e7..2c8717b6dcb0 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738573073
-SHA256 (bind-9.21.4.tar.xz) = f98efd18c98896c00112fd5cb7e4004d5284be139a5fa9d35f98ed66c5b84a08
-SIZE (bind-9.21.4.tar.xz) = 5527896
+TIMESTAMP = 1739983818
+SHA256 (bind-9.21.5.tar.xz) = afe46892950a6676fe198b90aa25b7b856cdc468997fac135dc260f313d6455f
+SIZE (bind-9.21.5.tar.xz) = 5536528
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 9280dab46c28..9b95adc939c6 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/named/config.c.orig	2025-01-20 12:57:29 UTC
+--- bin/named/config.c.orig	2025-02-11 17:45:15 UTC
 +++ bin/named/config.c
 @@ -180,6 +180,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-01-20 12:57:29 UTC
+--- bin/named/server.c.orig	2025-02-11 17:45:15 UTC
 +++ bin/named/server.c
-@@ -4201,6 +4201,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4203,6 +4203,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-01-20 12:57:29 UTC
+--- doc/arm/reference.rst.orig	2025-02-11 17:45:15 UTC
 +++ doc/arm/reference.rst
 @@ -4109,6 +4109,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.
---- lib/dns/include/dns/view.h.orig	2025-01-20 12:57:29 UTC
+--- lib/dns/include/dns/view.h.orig	2025-02-11 17:45:15 UTC
 +++ lib/dns/include/dns/view.h
 @@ -147,6 +147,7 @@ struct dns_view {
  	bool		      requestnsid;
@@ -47,9 +47,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-01-20 12:57:29 UTC
+--- lib/dns/resolver.c.orig	2025-02-11 17:45:15 UTC
 +++ lib/dns/resolver.c
-@@ -5963,6 +5963,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -5960,6 +5960,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-01-20 12:57:29 UTC
+--- lib/isccfg/namedconf.c.orig	2025-02-11 17:45:15 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/pkg-plist b/dns/bind9-devel/pkg-plist
index bab8bc647af1..eb74126013b9 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -35,6 +35,7 @@ include/dns/ds.h
 include/dns/dsdigest.h
 include/dns/dyndb.h
 include/dns/ecs.h
+include/dns/ede.h
 include/dns/edns.h
 include/dns/enumclass.h
 include/dns/enumtype.h
@@ -233,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.4.so
+lib/libdns-9.21.5.so
 lib/libdns.so
-lib/libisc-9.21.4.so
+lib/libisc-9.21.5.so
 lib/libisc.so
-lib/libisccc-9.21.4.so
+lib/libisccc-9.21.5.so
 lib/libisccc.so
-lib/libisccfg-9.21.4.so
+lib/libisccfg-9.21.5.so
 lib/libisccfg.so
-lib/libns-9.21.4.so
+lib/libns-9.21.5.so
 lib/libns.so
 @comment share/man/man1/arpaname.1.gz
 @comment share/man/man1/delv.1.gz