Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Feb 2025 10:01:38 GMT
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 069389781f67 - main - dns/bind9-devel: upgrade to 9.21.4
Message-ID:  <202502031001.513A1cos033321@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=069389781f672ea4065704181f799050333e1f17

commit 069389781f672ea4065704181f799050333e1f17
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2025-02-03 09:57:50 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2025-02-03 10:00:11 +0000

    dns/bind9-devel: upgrade to 9.21.4
    
    Security:       CVE-2024-11187, CVE-2024-12705
---
 dns/bind-tools/pkg-plist-devel                     | 10 ++++-----
 dns/bind9-devel/Makefile                           |  2 +-
 dns/bind9-devel/distinfo                           |  6 +++---
 .../files/extrapatch-bind-min-override-ttl         | 24 +++++++++++-----------
 dns/bind9-devel/pkg-plist                          | 12 +++++------
 5 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel
index f451a25dabfb..1609ae2a249e 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.3.so
+lib/bind-tools/libdns-9.21.4.so
 lib/bind-tools/libdns.so
-lib/bind-tools/libisc-9.21.3.so
+lib/bind-tools/libisc-9.21.4.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisccc-9.21.3.so
+lib/bind-tools/libisccc-9.21.4.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccfg-9.21.3.so
+lib/bind-tools/libisccfg-9.21.4.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libns-9.21.3.so
+lib/bind-tools/libns-9.21.4.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 50fff6e129fa..d2132ad8f0cc 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.3
+DISTVERSION=	9.21.4
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
 PORTREVISION=	0
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 2e49bd2dd574..1f86284199e7 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734171556
-SHA256 (bind-9.21.3.tar.xz) = 8fe04f713f5da38392e9e8d990f516d809b5af785e7e87c29f4de11bb30be02a
-SIZE (bind-9.21.3.tar.xz) = 5533408
+TIMESTAMP = 1738573073
+SHA256 (bind-9.21.4.tar.xz) = f98efd18c98896c00112fd5cb7e4004d5284be139a5fa9d35f98ed66c5b84a08
+SIZE (bind-9.21.4.tar.xz) = 5527896
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 4829ab2fe4f3..9280dab46c28 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-12-03 09:47:47 UTC
+--- bin/named/config.c.orig	2025-01-20 12:57:29 UTC
 +++ bin/named/config.c
-@@ -179,6 +179,7 @@ options {\n\
+@@ -180,6 +180,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-12-03 09:47:47 UTC
+--- bin/named/server.c.orig	2025-01-20 12:57:29 UTC
 +++ bin/named/server.c
-@@ -4302,6 +4302,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4201,6 +4201,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-12-03 09:47:48 UTC
+--- doc/arm/reference.rst.orig	2025-01-20 12:57:29 UTC
 +++ doc/arm/reference.rst
-@@ -4235,6 +4235,10 @@ Tuning
+@@ -4109,6 +4109,10 @@ Tuning
     cannot exceed 7 days and is silently truncated to 7 days if set to a
     greater value.
  
@@ -37,9 +37,9 @@ 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-12-03 09:47:48 UTC
+--- lib/dns/include/dns/view.h.orig	2025-01-20 12:57:29 UTC
 +++ lib/dns/include/dns/view.h
-@@ -151,6 +151,7 @@ struct dns_view {
+@@ -147,6 +147,7 @@ struct dns_view {
  	bool		      requestnsid;
  	bool		      sendcookie;
  	dns_ttl_t	      maxcachettl;
@@ -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-12-03 09:47:48 UTC
+--- lib/dns/resolver.c.orig	2025-01-20 12:57:29 UTC
 +++ lib/dns/resolver.c
-@@ -5894,6 +5894,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -5963,6 +5963,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-12-03 09:47:48 UTC
+--- lib/isccfg/namedconf.c.orig	2025-01-20 12:57:29 UTC
 +++ lib/isccfg/namedconf.c
-@@ -2095,6 +2095,7 @@ static cfg_clausedef_t view_clauses[] = {
+@@ -2068,6 +2068,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/pkg-plist b/dns/bind9-devel/pkg-plist
index 73f2ff18659d..bab8bc647af1 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -144,7 +144,6 @@ include/isc/httpd.h
 include/isc/interfaceiter.h
 include/isc/iterated_hash.h
 include/isc/job.h
-include/isc/lang.h
 include/isc/lex.h
 include/isc/list.h
 include/isc/log.h
@@ -228,22 +227,21 @@ include/ns/listenlist.h
 include/ns/notify.h
 include/ns/query.h
 include/ns/server.h
-include/ns/sortlist.h
 include/ns/stats.h
 include/ns/types.h
 include/ns/update.h
 include/ns/xfrout.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
-lib/libdns-9.21.3.so
+lib/libdns-9.21.4.so
 lib/libdns.so
-lib/libisc-9.21.3.so
+lib/libisc-9.21.4.so
 lib/libisc.so
-lib/libisccc-9.21.3.so
+lib/libisccc-9.21.4.so
 lib/libisccc.so
-lib/libisccfg-9.21.3.so
+lib/libisccfg-9.21.4.so
 lib/libisccfg.so
-lib/libns-9.21.3.so
+lib/libns-9.21.4.so
 lib/libns.so
 @comment share/man/man1/arpaname.1.gz
 @comment share/man/man1/delv.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502031001.513A1cos033321>