git: 0682194907ff - 2024Q4 - dns/bind9-devel: update to 9.21.3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Mathieu Arnold <mat_at_FreeBSD.org>
Date: Sun, 15 Dec 2024 07:15:27 UTC
The branch 2024Q4 has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0682194907ff9186b9d2e96c3b6cf6ef1b63c7c5

commit 0682194907ff9186b9d2e96c3b6cf6ef1b63c7c5
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2024-12-14 10:36:07 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2024-12-15 07:14:33 +0000

    dns/bind9-devel: update to 9.21.3
    
    Changes:        https://downloads.isc.org/isc/bind9/9.21.3/doc/arm/html/notes.html
    (cherry picked from commit 0688680a26dc53bc1b70c57319502e7031706699)
---
 dns/bind-tools/pkg-plist-devel                     | 10 +++++-----
 dns/bind9-devel/Makefile                           |  5 ++---
 dns/bind9-devel/distinfo                           |  6 +++---
 .../files/extrapatch-bind-min-override-ttl         | 22 +++++++++++-----------
 .../files/patch-bin_named_include_named_globals.h  |  4 ++--
 dns/bind9-devel/pkg-plist                          | 15 +++++++--------
 6 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel
index 0161cd42cfa8..f451a25dabfb 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.1.so
+lib/bind-tools/libdns-9.21.3.so
 lib/bind-tools/libdns.so
-lib/bind-tools/libisc-9.21.1.so
+lib/bind-tools/libisc-9.21.3.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisccc-9.21.1.so
+lib/bind-tools/libisccc-9.21.3.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccfg-9.21.1.so
+lib/bind-tools/libisccfg-9.21.3.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libns-9.21.1.so
+lib/bind-tools/libns-9.21.3.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 5e46075d88ed..2276f4733a43 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.1
+DISTVERSION=	9.21.3
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
 PORTREVISION=	0
@@ -214,8 +214,7 @@ post-install:
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
-	${INSTALL_DATA} ${WRKSRC}/CHANGES* \
-		${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/arm/_build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/arm
 .else
 
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index b5b1ac20e103..2e49bd2dd574 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1726753891
-SHA256 (bind-9.21.1.tar.xz) = d17b641c7e64991ec1842f3e40609ef43c336abc2b42749865e2be7db260c19b
-SIZE (bind-9.21.1.tar.xz) = 5834220
+TIMESTAMP = 1734171556
+SHA256 (bind-9.21.3.tar.xz) = 8fe04f713f5da38392e9e8d990f516d809b5af785e7e87c29f4de11bb30be02a
+SIZE (bind-9.21.3.tar.xz) = 5533408
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 90f4edeb993e..4829ab2fe4f3 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	2024-09-09 13:09:11 UTC
+--- bin/named/config.c.orig	2024-12-03 09:47:47 UTC
 +++ bin/named/config.c
-@@ -180,6 +180,7 @@ options {\n\
+@@ -179,6 +179,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	2024-09-09 13:09:11 UTC
+--- bin/named/server.c.orig	2024-12-03 09:47:47 UTC
 +++ bin/named/server.c
-@@ -4599,6 +4599,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4302,6 +4302,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	2024-09-09 13:09:11 UTC
+--- doc/arm/reference.rst.orig	2024-12-03 09:47:48 UTC
 +++ doc/arm/reference.rst
-@@ -4296,6 +4296,10 @@ Tuning
+@@ -4235,6 +4235,10 @@ Tuning
     cannot exceed 7 days and is silently truncated to 7 days if set to a
     greater value.
  
@@ -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	2024-09-09 13:09:11 UTC
+--- lib/dns/include/dns/view.h.orig	2024-12-03 09:47:48 UTC
 +++ lib/dns/include/dns/view.h
 @@ -151,6 +151,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	2024-09-09 13:09:11 UTC
+--- lib/dns/resolver.c.orig	2024-12-03 09:47:48 UTC
 +++ lib/dns/resolver.c
-@@ -5907,6 +5907,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -5894,6 +5894,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
  		}
  
  		/*
@@ -62,9 +62,9 @@ Add the override-cache-ttl feature.
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2024-09-09 13:09:11 UTC
+--- lib/isccfg/namedconf.c.orig	2024-12-03 09:47:48 UTC
 +++ lib/isccfg/namedconf.c
-@@ -2208,6 +2208,7 @@ static cfg_clausedef_t view_clauses[] = {
+@@ -2095,6 +2095,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
  	{ "max-acache-size", NULL, CFG_CLAUSEFLAG_ANCIENT },
  	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
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 9a5b3d64dd73..27eec09d1c24 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-09-09 13:09:11 UTC
+--- bin/named/include/named/globals.h.orig	2024-12-03 09:47:47 UTC
 +++ bin/named/include/named/globals.h
-@@ -119,7 +119,7 @@ EXTERN const char *named_g_defaultsessionkeyfile INIT(
+@@ -118,7 +118,7 @@ EXTERN const char *named_g_defaultsessionkeyfile INIT(
  
  #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 8fd5dd0c86a9..73f2ff18659d 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -29,7 +29,6 @@ include/dns/dispatch.h
 include/dns/dlz.h
 include/dns/dlz_dlopen.h
 include/dns/dns64.h
-include/dns/dnsrps.h
 include/dns/dnssec.h
 include/dns/dnstap.h
 include/dns/ds.h
@@ -52,7 +51,6 @@ include/dns/keymgr.h
 include/dns/keystore.h
 include/dns/keytable.h
 include/dns/keyvalues.h
-include/dns/librpz.h
 include/dns/master.h
 include/dns/masterdump.h
 include/dns/message.h
@@ -67,7 +65,6 @@ include/dns/order.h
 include/dns/peer.h
 include/dns/private.h
 include/dns/qp.h
-include/dns/rbt.h
 include/dns/rcode.h
 include/dns/rdata.h
 include/dns/rdataclass.h
@@ -123,6 +120,7 @@ include/isc/buffer.h
 include/isc/commandline.h
 include/isc/condition.h
 include/isc/counter.h
+include/isc/crypto.h
 include/isc/dir.h
 include/isc/dnsstream.h
 include/isc/endian.h
@@ -137,6 +135,7 @@ include/isc/getaddresses.h
 include/isc/hash.h
 include/isc/hashmap.h
 include/isc/heap.h
+include/isc/helper.h
 include/isc/hex.h
 include/isc/histo.h
 include/isc/hmac.h
@@ -236,15 +235,15 @@ include/ns/update.h
 include/ns/xfrout.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
-lib/libdns-9.21.1.so
+lib/libdns-9.21.3.so
 lib/libdns.so
-lib/libisc-9.21.1.so
+lib/libisc-9.21.3.so
 lib/libisc.so
-lib/libisccc-9.21.1.so
+lib/libisccc-9.21.3.so
 lib/libisccc.so
-lib/libisccfg-9.21.1.so
+lib/libisccfg-9.21.3.so
 lib/libisccfg.so
-lib/libns-9.21.1.so
+lib/libns-9.21.3.so
 lib/libns.so
 @comment share/man/man1/arpaname.1.gz
 @comment share/man/man1/delv.1.gz