git: 07187300bd3d - main - dns/bind9-devel: update to 9.21.12
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 10 Sep 2025 19:25:59 UTC
The branch main has been updated by mat:
URL: https://cgit.FreeBSD.org/ports/commit/?id=07187300bd3ddcffb82a487d5476b3092785c0b7
commit 07187300bd3ddcffb82a487d5476b3092785c0b7
Author: Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2025-09-10 19:07:36 +0000
Commit: Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2025-09-10 19:25:46 +0000
dns/bind9-devel: update to 9.21.12
Changes: https://downloads.isc.org/isc/bind9/9.21.12/doc/arm/html/notes.html#notes-for-bind-9-21-12
---
dns/bind-tools/pkg-plist-devel | 20 ++----
dns/bind9-devel/Makefile | 2 +-
dns/bind9-devel/distinfo | 6 +-
.../files/extrapatch-bind-min-override-ttl | 26 ++++----
dns/bind9-devel/files/patch-meson.build | 72 +++-------------------
dns/bind9-devel/pkg-plist | 21 ++-----
6 files changed, 38 insertions(+), 109 deletions(-)
diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel
index 5d111aa132b6..f669818a7c03 100644
--- a/dns/bind-tools/pkg-plist-devel
+++ b/dns/bind-tools/pkg-plist-devel
@@ -18,21 +18,11 @@ bin/named-rrchecker
bin/nsec3hash
bin/nslookup
bin/nsupdate
-lib/bind-tools/libdns.so.9.21.11
-lib/bind-tools/libdns.so.9.21
-lib/bind-tools/libdns.so
-lib/bind-tools/libisc.so.9.21.11
-lib/bind-tools/libisc.so.9.21
-lib/bind-tools/libisc.so
-lib/bind-tools/libisccc.so.9.21.11
-lib/bind-tools/libisccc.so.9.21
-lib/bind-tools/libisccc.so
-lib/bind-tools/libisccfg.so.9.21.11
-lib/bind-tools/libisccfg.so.9.21
-lib/bind-tools/libisccfg.so
-lib/bind-tools/libns.so.9.21.11
-lib/bind-tools/libns.so.9.21
-lib/bind-tools/libns.so
+lib/bind-tools/libdns-9.21.12.so
+lib/bind-tools/libisc-9.21.12.so
+lib/bind-tools/libisccc-9.21.12.so
+lib/bind-tools/libisccfg-9.21.12.so
+lib/bind-tools/libns-9.21.12.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 cded8d4f852e..b6e69c17a82c 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.11
+DISTVERSION= 9.21.12
.if defined(BIND_TOOLS_SLAVE)
# dns/bind-tools here
PORTREVISION= 0
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 2da0ae351602..4fb49af27c49 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1756270638
-SHA256 (bind-9.21.11.tar.xz) = b2262ed7d691767e59cdf53e9f6e914fe116ff180295a2fe43a36d77143efcee
-SIZE (bind-9.21.11.tar.xz) = 5217656
+TIMESTAMP = 1757530153
+SHA256 (bind-9.21.12.tar.xz) = b32a53d0ce5dc0e00d200cabc4c46974c635ea435bd88a195f9981e15c25e1e7
+SIZE (bind-9.21.12.tar.xz) = 5231764
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index d07b689fc121..0cf1e4292643 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-08-13 17:10:38 UTC
+--- bin/named/config.c.orig 2025-09-04 15:54:02 UTC
+++ bin/named/config.c
-@@ -187,6 +187,7 @@ options {\n\
+@@ -186,6 +186,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-08-13 17:10:38 UTC
+--- bin/named/server.c.orig 2025-09-04 15:54:02 UTC
+++ bin/named/server.c
-@@ -4233,6 +4233,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4275,6 +4275,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-08-13 17:10:38 UTC
+--- doc/arm/reference.rst.orig 2025-09-04 15:54:02 UTC
+++ doc/arm/reference.rst
-@@ -4187,6 +4187,10 @@ Tuning
+@@ -4173,6 +4173,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-08-13 17:10:38 UTC
+--- doc/misc/options.orig 2025-09-04 15:54:02 UTC
+++ doc/misc/options
-@@ -171,6 +171,7 @@ options {
+@@ -172,6 +172,7 @@ options {
masterfile-style ( full | relative );
match-mapped-addresses <boolean>;
max-cache-size ( default | unlimited | <sizeval> | <percentage> );
@@ -47,7 +47,7 @@ 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-08-13 17:10:38 UTC
+--- lib/dns/include/dns/view.h.orig 2025-09-04 15:54:02 UTC
+++ lib/dns/include/dns/view.h
@@ -148,6 +148,7 @@ struct dns_view {
bool requestzoneversion;
@@ -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-08-13 17:10:38 UTC
+--- lib/dns/resolver.c.orig 2025-09-04 15:54:02 UTC
+++ lib/dns/resolver.c
-@@ -5766,6 +5766,12 @@ fixttls(dns_view_t *view, dns_rdataset_t *rdataset,
+@@ -5776,6 +5776,12 @@ fixttls(dns_view_t *view, dns_rdataset_t *rdataset,
fixttls(dns_view_t *view, dns_rdataset_t *rdataset,
dns_rdataset_t *sigrdataset) {
/*
@@ -72,9 +72,9 @@ 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-08-13 17:10:38 UTC
+--- lib/isccfg/namedconf.c.orig 2025-09-04 15:54:02 UTC
+++ lib/isccfg/namedconf.c
-@@ -2084,6 +2084,7 @@ static cfg_clausedef_t view_clauses[] = {
+@@ -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 },
diff --git a/dns/bind9-devel/files/patch-meson.build b/dns/bind9-devel/files/patch-meson.build
index d0e04c456b02..69f07446f567 100644
--- a/dns/bind9-devel/files/patch-meson.build
+++ b/dns/bind9-devel/files/patch-meson.build
@@ -1,6 +1,6 @@
Use bind-tools option to ease the server/tools package split
---- meson.build.orig 2025-08-13 17:10:38 UTC
+--- meson.build.orig 2025-09-04 15:54:02 UTC
+++ meson.build
@@ -69,6 +69,8 @@ zlib_opt = get_option('zlib')
tracing_opt = get_option('tracing')
@@ -11,59 +11,7 @@ Use bind-tools option to ease the server/tools package split
if meson.version().version_compare('>=1.1.0')
build_options = meson.build_options()
if build_options == ''
-@@ -976,9 +978,15 @@ isc_srcconf = isc_srcset.apply(config, strict: false)
-
- isc_srcconf = isc_srcset.apply(config, strict: false)
-
-+project_version = meson.project_version()
-+soversion_parts = project_version.split('.') # ['1', '2', '3']
-+soversion = '@0@.@1@'.format(soversion_parts[0], soversion_parts[1])
-+
- libisc = library(
- 'isc',
- isc_srcconf.sources(),
-+ version: project_version,
-+ soversion: soversion,
- objects: isc_probe_objects,
- install: true,
- install_rpath: libdir,
-@@ -1006,6 +1014,8 @@ libdns = library(
- libdns = library(
- 'dns',
- dns_srcconf.sources(),
-+ version: project_version,
-+ soversion: soversion,
- include_directories: dns_inc,
- install: true,
- install_rpath: libdir,
-@@ -1040,6 +1050,8 @@ libns = library(
- libns = library(
- 'ns',
- ns_srcconf.sources(),
-+ version: project_version,
-+ soversion: soversion,
- objects: ns_probe_objects,
- install: true,
- install_rpath: libdir,
-@@ -1066,6 +1078,8 @@ libisccc = library(
- libisccc = library(
- 'isccc',
- isccc_srcconf.sources(),
-+ version: project_version,
-+ soversion: soversion,
- implicit_include_directories: false,
- include_directories: isccc_inc,
- install: true,
-@@ -1087,6 +1101,8 @@ libisccfg = library(
- libisccfg = library(
- 'isccfg',
- isccfg_srcconf.sources(),
-+ version: project_version,
-+ soversion: soversion,
- implicit_include_directories: false,
- include_directories: isccfg_inc,
- install: true,
-@@ -1107,6 +1123,7 @@ named_srcconf = named_srcset.apply(config, strict: fal
+@@ -1159,6 +1175,7 @@ named_srcconf = named_srcset.apply(config, strict: fal
named_srcconf = named_srcset.apply(config, strict: false)
@@ -71,7 +19,7 @@ Use bind-tools option to ease the server/tools package split
executable(
'arpaname',
arpaname_src,
-@@ -1335,7 +1352,9 @@ executable(
+@@ -1371,7 +1388,9 @@ executable(
libisc_dep,
],
)
@@ -81,7 +29,7 @@ Use bind-tools option to ease the server/tools package split
executable(
'named-checkconf',
named_checkconf_src,
-@@ -1413,7 +1432,9 @@ endif
+@@ -1444,7 +1463,9 @@ endif
],
)
endif
@@ -91,7 +39,7 @@ Use bind-tools option to ease the server/tools package split
executable(
'named-rrchecker',
named_rrchecker_src,
-@@ -1427,7 +1448,9 @@ executable(
+@@ -1457,7 +1478,9 @@ executable(
],
)
@@ -101,7 +49,7 @@ Use bind-tools option to ease the server/tools package split
executable(
'named',
named_srcconf.sources(),
-@@ -1458,7 +1481,9 @@ executable(
+@@ -1487,7 +1510,9 @@ executable(
named_srcconf.dependencies(),
],
)
@@ -111,7 +59,7 @@ Use bind-tools option to ease the server/tools package split
executable(
'nsec3hash',
nsec3hash_src,
-@@ -1506,7 +1531,9 @@ executable(
+@@ -1532,7 +1557,9 @@ executable(
edit_dep,
],
)
@@ -121,7 +69,7 @@ Use bind-tools option to ease the server/tools package split
executable(
'rndc-confgen',
rndc_confgen_src,
-@@ -1592,6 +1619,7 @@ shared_library(
+@@ -1613,6 +1640,7 @@ shared_library(
libns_dep,
],
)
@@ -129,7 +77,7 @@ Use bind-tools option to ease the server/tools package split
subdir('doc')
subdir('tests')
-@@ -1659,7 +1687,6 @@ print(release_date, end="")
+@@ -1680,7 +1708,6 @@ print(release_date, end="")
print(release_date, end="")
'''
@@ -137,7 +85,7 @@ Use bind-tools option to ease the server/tools package split
release_date = ''
if python.found()
release_date = run_command(python, ['-c', get_release_date], check: true).stdout()
-@@ -1680,6 +1707,7 @@ if doc_opt.allowed()
+@@ -1701,6 +1728,7 @@ if doc_opt.allowed()
install_man(man_pages)
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 236e8d0a7722..4ab574014273 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -117,6 +117,7 @@ include/isc/backtrace.h
include/isc/barrier.h
include/isc/base32.h
include/isc/base64.h
+include/isc/bit.h
include/isc/buffer.h
include/isc/commandline.h
include/isc/counter.h
@@ -234,21 +235,11 @@ include/ns/update.h
include/ns/xfrout.h
lib/bind/filter-a.so
lib/bind/filter-aaaa.so
-lib/libdns.so.9.21.11
-lib/libdns.so.9.21
-lib/libdns.so
-lib/libisc.so.9.21.11
-lib/libisc.so.9.21
-lib/libisc.so
-lib/libisccc.so.9.21.11
-lib/libisccc.so.9.21
-lib/libisccc.so
-lib/libisccfg.so.9.21.11
-lib/libisccfg.so.9.21
-lib/libisccfg.so
-lib/libns.so.9.21.11
-lib/libns.so.9.21
-lib/libns.so
+lib/libdns-9.21.12.so
+lib/libisc-9.21.12.so
+lib/libisccc-9.21.12.so
+lib/libisccfg-9.21.12.so
+lib/libns-9.21.12.so
@comment share/man/man1/arpaname.1.gz
@comment share/man/man1/delv.1.gz
@comment share/man/man1/dig.1.gz