git: 0720952005c5 - 2025Q4 - dns/bind9-devel: update to 9.21.15
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 19 Nov 2025 17:59:59 UTC
The branch 2025Q4 has been updated by mat:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0720952005c551d76597667bc7c6b57c01110ff9
commit 0720952005c551d76597667bc7c6b57c01110ff9
Author: Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2025-11-19 15:25:10 +0000
Commit: Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2025-11-19 16:03:03 +0000
dns/bind9-devel: update to 9.21.15
Changes: https://downloads.isc.org/isc/bind9/9.21.15/doc/arm/html/notes.html#notes-for-bind-9-21-15
(cherry picked from commit 072621202d0f832622f9bedcac1c5f98a39a58dc)
---
dns/bind-tools/pkg-plist-devel | 10 ++---
dns/bind9-devel/Makefile | 3 +-
dns/bind9-devel/distinfo | 6 +--
.../files/extrapatch-bind-min-override-ttl | 44 ++++++++++----------
.../files/patch-bin_named_include_named_globals.h | 4 +-
dns/bind9-devel/files/patch-meson.build | 47 +++++++++-------------
dns/bind9-devel/files/patch-meson.options | 10 +++++
dns/bind9-devel/files/patch-meson__options.txt | 13 ------
dns/bind9-devel/pkg-plist | 11 ++---
9 files changed, 67 insertions(+), 81 deletions(-)
diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel
index 7458022d4844..985a29ccc188 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.14.so
-lib/bind-tools/libisc-9.21.14.so
-lib/bind-tools/libisccc-9.21.14.so
-lib/bind-tools/libisccfg-9.21.14.so
-lib/bind-tools/libns-9.21.14.so
+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
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 4f12ce040686..831ef68aba02 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.14
+DISTVERSION= 9.21.15
.if defined(BIND_TOOLS_SLAVE)
# dns/bind-tools here
PORTREVISION= 0
@@ -60,7 +60,6 @@ USE_RC_SUBR= named
MESON_ARGS= --localstatedir=/var \
--sysconfdir=${ETCDIR} \
- -Dcap=disabled \
-Ddoh=enabled \
-Djemalloc=disabled
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 169eafe4262a..1a744f107ab0 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1761142037
-SHA256 (bind-9.21.14.tar.xz) = 003b94d1404ec33174f28951de4ba261742de333cb869e6b909f1ada3261fe9f
-SIZE (bind-9.21.14.tar.xz) = 5257932
+TIMESTAMP = 1763564699
+SHA256 (bind-9.21.15.tar.xz) = fa6a5761188f7d3e1cba8968bd02a033bdfad0935905fadab09282b2fb2ec304
+SIZE (bind-9.21.15.tar.xz) = 5264212
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 1ef483b64a5c..d3917c8d825e 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,18 +1,18 @@
Add the override-cache-ttl feature.
---- bin/named/config.c.orig 2025-10-18 09:48:52 UTC
-+++ bin/named/config.c
-@@ -186,6 +186,7 @@ options {\n\
+--- bin/include/defaultconfig.h.orig 2025-11-07 09:34:27 UTC
++++ bin/include/defaultconfig.h
+@@ -159,6 +159,7 @@ options {\n\
notify-source *;\n\
notify-source-v6 *;\n\
nsec3-test-zone no;\n\
-+ override-cache-ttl 0; /* do not override */\n\
++ override-cache-ttl 0;\n\
parental-source *;\n\
parental-source-v6 *;\n\
provide-ixfr true;\n\
---- bin/named/server.c.orig 2025-10-18 09:48:52 UTC
+--- bin/named/server.c.orig 2025-11-07 09:34:27 UTC
+++ bin/named/server.c
-@@ -4276,6 +4276,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4198,6 +4198,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-10-18 09:48:52 UTC
+--- doc/arm/reference.rst.orig 2025-11-07 09:34:27 UTC
+++ doc/arm/reference.rst
-@@ -4175,6 +4175,10 @@ Tuning
+@@ -4154,6 +4154,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.
---- doc/misc/options.orig 2025-10-18 09:48:52 UTC
+--- doc/misc/options.orig 2025-11-07 09:34:27 UTC
+++ doc/misc/options
-@@ -172,6 +172,7 @@ options {
+@@ -171,6 +171,7 @@ options {
masterfile-style ( full | relative );
match-mapped-addresses <boolean>;
max-cache-size ( default | unlimited | <sizeval> | <percentage> );
@@ -47,9 +47,9 @@ 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-10-18 09:48:52 UTC
+--- lib/dns/include/dns/view.h.orig 2025-11-07 09:34:27 UTC
+++ lib/dns/include/dns/view.h
-@@ -148,6 +148,7 @@ struct dns_view {
+@@ -155,6 +155,7 @@ struct dns_view {
bool requestzoneversion;
bool sendcookie;
dns_ttl_t maxcachettl;
@@ -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-10-18 09:48:52 UTC
+--- lib/dns/resolver.c.orig 2025-11-07 09:34:27 UTC
+++ lib/dns/resolver.c
-@@ -5839,6 +5839,12 @@ fixttls(dns_view_t *view, dns_rdataset_t *rdataset,
+@@ -5836,6 +5836,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-10-18 09:48:52 UTC
+--- lib/isccfg/namedconf.c.orig 2025-11-07 09:34:27 UTC
+++ lib/isccfg/namedconf.c
-@@ -2086,6 +2086,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 },
+@@ -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 },
- { "max-cache-ttl", &cfg_type_duration, 0 },
- { "max-clients-per-query", &cfg_type_uint32, 0 },
- { "max-ncache-ttl", &cfg_type_duration, 0 },
+ { "preferred-glue", &cfg_type_astring, 0 },
+ { "prefetch", &cfg_type_prefetch, 0, prefetch_merge },
+ { "provide-ixfr", &cfg_type_boolean, 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 a1c99ff29218..fab799b8a88e 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 2025-10-18 09:48:52 UTC
+--- bin/named/include/named/globals.h.orig 2025-11-07 09:34:27 UTC
+++ bin/named/include/named/globals.h
-@@ -112,7 +112,7 @@ EXTERN const char *named_g_defaultpidfile INIT(NAMED_L
+@@ -108,7 +108,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/files/patch-meson.build b/dns/bind9-devel/files/patch-meson.build
index 93ec124f974a..cb4803b883bd 100644
--- a/dns/bind9-devel/files/patch-meson.build
+++ b/dns/bind9-devel/files/patch-meson.build
@@ -1,26 +1,17 @@
Use bind-tools option to ease the server/tools package split
---- meson.build.orig 2025-10-18 09:48:52 UTC
+--- meson.build.orig 2025-11-07 09:34:27 UTC
+++ meson.build
-@@ -72,6 +72,8 @@ zlib_opt = get_option('zlib')
+@@ -72,6 +72,8 @@ zlib_opt = get_option('zlib').enable_auto_if(developer
tracing_opt = get_option('tracing')
- zlib_opt = get_option('zlib')
+ zlib_opt = get_option('zlib').enable_auto_if(developer_mode)
+bind_tools = get_option('bind-tools').enabled()
+
- if meson.version().version_compare('>=1.1.0')
- build_options = meson.build_options()
- if build_options == ''
-@@ -408,7 +410,7 @@ if fuzz_opt.enabled()
-
- fuzz_link_args = []
- if fuzz_opt.enabled()
-- if fuzz_backed_opt != 'none'
-+ if fuzz_backend_opt != 'none'
- if get_option('b_lundef') != false
- warning('fuzzing will fail to build properly without -Db_lundef=false')
- endif
-@@ -1222,6 +1224,7 @@ libisccfg_dep = declare_dependency(
+ build_options = meson.build_options()
+ if build_options == ''
+ build_options = 'default'
+@@ -1215,6 +1217,7 @@ libisccfg_dep = declare_dependency(
include_directories: isccfg_inc,
)
@@ -28,7 +19,7 @@ Use bind-tools option to ease the server/tools package split
executable(
'arpaname',
arpaname_src,
-@@ -1434,7 +1437,9 @@ executable(
+@@ -1427,7 +1430,9 @@ executable(
libisc_dep,
],
)
@@ -38,7 +29,7 @@ Use bind-tools option to ease the server/tools package split
executable(
'named-checkconf',
named_checkconf_src,
-@@ -1507,7 +1512,9 @@ endif
+@@ -1501,7 +1506,9 @@ endif
],
)
endif
@@ -48,15 +39,15 @@ Use bind-tools option to ease the server/tools package split
executable(
'named-rrchecker',
named_rrchecker_src,
-@@ -1520,6 +1527,7 @@ executable(
+@@ -1514,6 +1521,7 @@ executable(
],
)
+endif
- named_c_args = []
- named_link_args = []
-@@ -1559,6 +1567,7 @@ named_srcconf = named_srcset.apply(config, strict: fal
+ named_deps = []
+
+@@ -1551,6 +1559,7 @@ named_srcconf = named_srcset.apply(config, strict: fal
named_srcconf = named_srcset.apply(config, strict: false)
@@ -64,29 +55,27 @@ Use bind-tools option to ease the server/tools package split
executable(
'named',
named_srcconf.sources(),
-@@ -1586,7 +1595,9 @@ executable(
+@@ -1578,7 +1587,9 @@ executable(
named_srcconf.dependencies(),
],
)
--
+endif
-+
+
+if bind_tools
executable(
'nsec3hash',
nsec3hash_src,
-@@ -1631,7 +1642,9 @@ executable(
+@@ -1623,7 +1634,9 @@ executable(
edit_dep,
],
)
--
+endif
-+
+
+if not bind_tools
executable(
'rndc-confgen',
rndc_confgen_src,
-@@ -1727,6 +1740,7 @@ shared_library(
+@@ -1719,6 +1732,7 @@ shared_library(
libns_dep,
],
)
diff --git a/dns/bind9-devel/files/patch-meson.options b/dns/bind9-devel/files/patch-meson.options
new file mode 100644
index 000000000000..441182e7a208
--- /dev/null
+++ b/dns/bind9-devel/files/patch-meson.options
@@ -0,0 +1,10 @@
+Add bind-tools option to ease the server/tools package split
+
+--- meson.options.orig 2025-11-19 15:19:33 UTC
++++ meson.options
+@@ -203,3 +203,5 @@ option(
+ value: 'thin',
+ description: 'Enable Link Time Optimization for named.',
+ )
++
++option('bind-tools', type: 'feature', value: 'disabled', description: 'build tools only')
diff --git a/dns/bind9-devel/files/patch-meson__options.txt b/dns/bind9-devel/files/patch-meson__options.txt
deleted file mode 100644
index 560cce5e84d7..000000000000
--- a/dns/bind9-devel/files/patch-meson__options.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Add bind-tools option to ease the server/tools package split
-
---- meson_options.txt.orig 2025-10-18 09:48:52 UTC
-+++ meson_options.txt
-@@ -197,6 +197,8 @@ option(
- description: 'enable the memory leak detection in external libraries (libxml2, libuv, OpenSSL)',
- )
-
-+option('bind-tools', type: 'feature', value: 'disabled', description: 'build tools only')
-+
- option(
- 'named-lto',
- type: 'combo',
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 898473da6fa4..7c5a4250cc31 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -59,6 +59,7 @@ include/dns/message.h
include/dns/name.h
include/dns/nametree.h
include/dns/ncache.h
+include/dns/notify.h
include/dns/nsec.h
include/dns/nsec3.h
include/dns/nta.h
@@ -235,11 +236,11 @@ include/ns/xfrout.h
lib/bind/filter-a.so
lib/bind/filter-aaaa.so
lib/bind/synthrecord.so
-lib/libdns-9.21.14.so
-lib/libisc-9.21.14.so
-lib/libisccc-9.21.14.so
-lib/libisccfg-9.21.14.so
-lib/libns-9.21.14.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
@comment share/man/man1/arpaname.1.gz
@comment share/man/man1/delv.1.gz
@comment share/man/man1/dig.1.gz