Date: Wed, 20 May 2026 15:31:12 +0000 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: 074766800a37 - main - dns/bind9-devel: update to 9.21.22 Message-ID: <6a0dd3c0.44e30.7d061ced@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=074766800a3726261e66db0e93b668fc8f93514a commit 074766800a3726261e66db0e93b668fc8f93514a Author: Mathieu Arnold <mat@FreeBSD.org> AuthorDate: 2026-05-20 15:06:03 +0000 Commit: Mathieu Arnold <mat@FreeBSD.org> CommitDate: 2026-05-20 15:30:20 +0000 dns/bind9-devel: update to 9.21.22 Changes: https://downloads.isc.org/isc/bind9/9.21.22/doc/arm/html/notes.html#notes-for-bind-9-21-22 Security: CVE-2026-3592, CVE-2026-3039, CVE-2026-5946, CVE-2026-5950, CVE-2026-5947, CVE-2026-3593 --- dns/bind-tools/pkg-plist-devel | 10 +++++----- dns/bind9-devel/Makefile | 2 +- dns/bind9-devel/distinfo | 6 +++--- .../files/extrapatch-bind-min-override-ttl | 22 +++++++++++----------- dns/bind9-devel/files/patch-meson.build | 22 +++++++++++----------- dns/bind9-devel/pkg-plist | 12 +++++++----- 6 files changed, 38 insertions(+), 36 deletions(-) diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel index 70b5ae39e20b..c319e0fe5f75 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.21.so -lib/bind-tools/libisc-9.21.21.so -lib/bind-tools/libisccc-9.21.21.so -lib/bind-tools/libisccfg-9.21.21.so -lib/bind-tools/libns-9.21.21.so +lib/bind-tools/libdns-9.21.22.so +lib/bind-tools/libisc-9.21.22.so +lib/bind-tools/libisccc-9.21.22.so +lib/bind-tools/libisccfg-9.21.22.so +lib/bind-tools/libns-9.21.22.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 63240b60cbb0..c5f59f5f059d 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.21 +DISTVERSION= 9.21.22 .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here PORTREVISION= 0 diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index cd8464c3fc04..b98b281783e3 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1775066927 -SHA256 (bind-9.21.21.tar.xz) = 44ebfae8b82b494f5cc4781b044fbd4c867b64dc22ae9c62c9197aab16389112 -SIZE (bind-9.21.21.tar.xz) = 5346552 +TIMESTAMP = 1779288444 +SHA256 (bind-9.21.22.tar.xz) = 305dd3fa3f86fccc4a15b4a9423132ce1f394a89949f6577b4d0e2b3fbd52f3b +SIZE (bind-9.21.22.tar.xz) = 5383844 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 29a543d90939..66b594a209fb 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/include/defaultconfig.h.orig 2026-03-31 16:30:02 UTC +--- bin/include/defaultconfig.h.orig 2026-05-08 14:37:49 UTC +++ bin/include/defaultconfig.h @@ -158,6 +158,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 2026-03-31 16:30:02 UTC +--- bin/named/server.c.orig 2026-05-08 14:37:49 UTC +++ bin/named/server.c -@@ -4081,6 +4081,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4088,6 +4088,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 2026-03-31 16:30:02 UTC +--- doc/arm/reference.rst.orig 2026-05-08 14:37:49 UTC +++ doc/arm/reference.rst -@@ -4231,6 +4231,10 @@ Tuning +@@ -4233,6 +4233,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. ---- doc/misc/options.orig 2026-03-31 16:30:02 UTC +--- doc/misc/options.orig 2026-05-08 14:37:49 UTC +++ doc/misc/options @@ -171,6 +171,7 @@ options { masterfile-style ( full | relative ); @@ -47,9 +47,9 @@ Add the override-cache-ttl feature. max-cache-ttl <duration>; max-clients-per-query <integer>; max-delegation-servers <integer>; // experimental ---- lib/dns/include/dns/view.h.orig 2026-03-31 16:30:02 UTC +--- lib/dns/include/dns/view.h.orig 2026-05-08 14:37:49 UTC +++ lib/dns/include/dns/view.h -@@ -157,6 +157,7 @@ struct dns_view { +@@ -159,6 +159,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 2026-03-31 16:30:02 UTC +--- lib/dns/resolver.c.orig 2026-05-08 14:37:49 UTC +++ lib/dns/resolver.c -@@ -6066,6 +6066,12 @@ fixttls(dns_view_t *view, dns_rdataset_t *rdataset, +@@ -6043,6 +6043,12 @@ fixttls(dns_view_t *view, dns_rdataset_t *rdataset, fixttls(dns_view_t *view, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { /* @@ -72,7 +72,7 @@ Add the override-cache-ttl feature. * Enforce the configured maximum and minimum cache TTL. */ if (rdataset->ttl > view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2026-03-31 16:30:02 UTC +--- lib/isccfg/namedconf.c.orig 2026-05-08 14:37:49 UTC +++ lib/isccfg/namedconf.c @@ -2419,6 +2419,7 @@ static cfg_clausedef_t view_clauses[] = { { "nta-lifetime", &cfg_type_duration, 0, NULL }, diff --git a/dns/bind9-devel/files/patch-meson.build b/dns/bind9-devel/files/patch-meson.build index ae49fd1b7ad2..2aba71f4ad71 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 2026-03-31 16:30:02 UTC +--- meson.build.orig 2026-05-08 14:37:49 UTC +++ meson.build @@ -71,6 +71,8 @@ zlib_opt = get_option('zlib').enable_auto_if(developer tracing_opt = get_option('tracing') @@ -11,7 +11,7 @@ Use bind-tools option to ease the server/tools package split build_options = meson.build_options() if build_options == '' build_options = 'default' -@@ -1306,6 +1308,7 @@ libisccfg_dep = declare_dependency( +@@ -1338,6 +1340,7 @@ libisccfg_dep = declare_dependency( include_directories: isccfg_inc, ) @@ -19,7 +19,7 @@ Use bind-tools option to ease the server/tools package split executable( 'arpaname', arpaname_src, -@@ -1518,7 +1521,9 @@ executable( +@@ -1565,7 +1568,9 @@ executable( libisc_dep, ], ) @@ -29,7 +29,7 @@ Use bind-tools option to ease the server/tools package split executable( 'named-checkconf', named_checkconf_src, -@@ -1591,7 +1596,9 @@ executable( +@@ -1642,7 +1647,9 @@ executable( lmdb_dep, ], ) @@ -39,7 +39,7 @@ Use bind-tools option to ease the server/tools package split executable( 'named-rrchecker', named_rrchecker_src, -@@ -1604,6 +1611,7 @@ executable( +@@ -1656,6 +1663,7 @@ executable( ], ) @@ -47,7 +47,7 @@ Use bind-tools option to ease the server/tools package split named_deps = [] -@@ -1641,6 +1649,7 @@ named_srcconf = named_srcset.apply(config, strict: fal +@@ -1693,6 +1701,7 @@ named_srcconf = named_srcset.apply(config, strict: fal named_srcconf = named_srcset.apply(config, strict: false) @@ -55,7 +55,7 @@ Use bind-tools option to ease the server/tools package split executable( 'named', named_srcconf.sources(), -@@ -1669,7 +1678,9 @@ executable( +@@ -1721,7 +1730,9 @@ executable( named_srcconf.dependencies(), ], ) @@ -65,7 +65,7 @@ Use bind-tools option to ease the server/tools package split executable( 'nsec3hash', nsec3hash_src, -@@ -1714,7 +1725,9 @@ executable( +@@ -1769,7 +1780,9 @@ executable( edit_dep, ], ) @@ -75,7 +75,7 @@ Use bind-tools option to ease the server/tools package split executable( 'rndc-confgen', rndc_confgen_src, -@@ -1809,6 +1822,7 @@ shared_library( +@@ -1867,6 +1880,7 @@ shared_library( libns_dep, ], ) @@ -83,7 +83,7 @@ Use bind-tools option to ease the server/tools package split subdir('doc') subdir('tests') -@@ -1885,7 +1899,6 @@ print(release_date, end="") +@@ -1945,7 +1959,6 @@ print(release_date, end="") print(release_date, end="") ''' @@ -91,7 +91,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() -@@ -1906,6 +1919,7 @@ if doc_opt.allowed() +@@ -1966,6 +1979,7 @@ if doc_opt.allowed() install_man(man_pages) diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index 282fb8a037ff..577a0390a31d 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -107,6 +107,8 @@ include/dns/view.h include/dns/xfrin.h include/dns/zone.h include/dns/zonefetch.h +include/dns/zonemgr.h +include/dns/zoneproperties.h include/dns/zoneverify.h include/dns/zt.h include/dst/dst.h @@ -242,11 +244,11 @@ include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so lib/bind/synthrecord.so -lib/libdns-9.21.21.so -lib/libisc-9.21.21.so -lib/libisccc-9.21.21.so -lib/libisccfg-9.21.21.so -lib/libns-9.21.21.so +lib/libdns-9.21.22.so +lib/libisc-9.21.22.so +lib/libisccc-9.21.22.so +lib/libisccfg-9.21.22.so +lib/libns-9.21.22.so @comment share/man/man1/arpaname.1.gz @comment share/man/man1/delv.1.gz @comment share/man/man1/dig.1.gzhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a0dd3c0.44e30.7d061ced>