Date: Wed, 01 Apr 2026 19:14:48 +0000 From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 07325220ed90 - 2026Q1 - dns/bind9-devel: update to 9.21.21 Message-ID: <69cd6ea8.3039b.5269ee4b@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2026Q1 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=07325220ed9036dcc2a9b6f9d86d328786bf7ea2 commit 07325220ed9036dcc2a9b6f9d86d328786bf7ea2 Author: Mathieu Arnold <mat@FreeBSD.org> AuthorDate: 2026-04-01 18:44:08 +0000 Commit: Mathieu Arnold <mat@FreeBSD.org> CommitDate: 2026-04-01 19:14:28 +0000 dns/bind9-devel: update to 9.21.21 Changes: https://downloads.isc.org/isc/bind9/9.21.21/doc/arm/html/changelog.html (cherry picked from commit 073987603c564a8c1fbe77e1ac8ae3e865a48bf1) --- dns/bind-tools/pkg-plist-devel | 11 ++++----- dns/bind9-devel/Makefile | 15 +++++-------- dns/bind9-devel/distinfo | 6 ++--- .../files/extrapatch-bind-min-override-ttl | 24 ++++++++++---------- dns/bind9-devel/files/patch-meson.build | 26 +++++++++++----------- dns/bind9-devel/files/patch-meson.options | 4 ++-- dns/bind9-devel/pkg-plist | 16 +++++++------ 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel index 514546c60b3b..70b5ae39e20b 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.20.so -lib/bind-tools/libisc-9.21.20.so -lib/bind-tools/libisccc-9.21.20.so -lib/bind-tools/libisccfg-9.21.20.so -lib/bind-tools/libns-9.21.20.so +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 share/man/man1/arpaname.1.gz share/man/man1/delv.1.gz share/man/man1/dig.1.gz @@ -44,6 +44,7 @@ share/man/man1/mdig.1.gz @comment share/man/man1/named-compilezone.1.gz @comment share/man/man1/named-journalprint.1.gz @comment share/man/man1/named-makejournal.1.gz +@comment share/man/man1/named-nzd2nzf.1.gz share/man/man1/named-rrchecker.1.gz share/man/man1/nsec3hash.1.gz share/man/man1/nslookup.1.gz diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 61ee48d1039f..58fb2a05c51f 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.20 +DISTVERSION= 9.21.21 .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here PORTREVISION= 0 @@ -37,7 +37,8 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libnghttp2.so:www/libnghttp2 \ liburcu.so:sysutils/liburcu \ - libuv.so:devel/libuv + libuv.so:devel/libuv \ + liblmdb.so:databases/lmdb .if !defined(BIND_TOOLS_SLAVE) RUN_DEPENDS= bind-tools>0:dns/bind-tools @@ -86,10 +87,10 @@ SUB_FILES= named.conf pkg-message PORTDOCS= * .endif # BIND_TOOLS_SLAVE -OPTIONS_DEFINE= DNSTAP DOCS GEOIP IDN LMDB OVERRIDECACHE QUERYTRACE \ +OPTIONS_DEFINE= DNSTAP DOCS GEOIP IDN OVERRIDECACHE QUERYTRACE \ START_LATE OPTIONS_DEFAULT= DNSTAP ${${OSREL:R} < 15:?GSSAPI_NONE:GSSAPI_BASE} IDN \ - LMDB STATS_JSON STATS_XML + STATS_JSON STATS_XML OPTIONS_GROUP= STATS OPTIONS_GROUP_STATS= STATS_JSON STATS_XML @@ -98,7 +99,7 @@ OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE .if defined(BIND_TOOLS_SLAVE) -OPTIONS_EXCLUDE= DOCS GEOIP LMDB OVERRIDECACHE QUERYTRACE START_LATE \ +OPTIONS_EXCLUDE= DOCS GEOIP OVERRIDECACHE QUERYTRACE START_LATE \ STATS_JSON STATS_XML .endif # BIND_TOOLS_SLAVE @@ -109,7 +110,6 @@ GSSAPI_BASE_DESC= Using ${${OSREL:R} < 15:?Heimdal in base (nsupdate is broken): GSSAPI_HEIMDAL_DESC= Using security/heimdal (nsupdate is broken) GSSAPI_MIT_DESC= Using security/krb5 GSSAPI_NONE_DESC= Disable -LMDB_DESC= Use LMDB for zone management OVERRIDECACHE_DESC= Use the override-cache patch QUERYTRACE_DESC= Enable the very verbose query tracelogging START_LATE_DESC= Start BIND late in the boot process (see help) @@ -151,9 +151,6 @@ IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IDN_USES= iconv IDN_MESON_ENABLED= idn -LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb -LMDB_MESON_ENABLED= lmdb - OVERRIDECACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl QUERYTRACE_MESON_ON= -Dtrace-logging=query diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index f5cbfd7cff18..cd8464c3fc04 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1774448037 -SHA256 (bind-9.21.20.tar.xz) = a812f70cf537017176e361e0459c5e92f0fa9627a336edf153c30801326f7f6b -SIZE (bind-9.21.20.tar.xz) = 5328196 +TIMESTAMP = 1775066927 +SHA256 (bind-9.21.21.tar.xz) = 44ebfae8b82b494f5cc4781b044fbd4c867b64dc22ae9c62c9197aab16389112 +SIZE (bind-9.21.21.tar.xz) = 5346552 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 54cea44e6716..29a543d90939 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/include/defaultconfig.h.orig 2026-03-13 21:37:44 UTC +--- bin/include/defaultconfig.h.orig 2026-03-31 16:30:02 UTC +++ bin/include/defaultconfig.h -@@ -160,6 +160,7 @@ options {\n\ +@@ -158,6 +158,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 2026-03-13 21:37:44 UTC +--- bin/named/server.c.orig 2026-03-31 16:30:02 UTC +++ bin/named/server.c -@@ -4085,6 +4085,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4081,6 +4081,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -24,7 +24,7 @@ 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-13 21:37:44 UTC +--- doc/arm/reference.rst.orig 2026-03-31 16:30:02 UTC +++ doc/arm/reference.rst @@ -4231,6 +4231,10 @@ Tuning cannot exceed 7 days and is silently truncated to 7 days if set to a @@ -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-13 21:37:44 UTC +--- doc/misc/options.orig 2026-03-31 16:30:02 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-13 21:37:44 UTC +--- lib/dns/include/dns/view.h.orig 2026-03-31 16:30:02 UTC +++ lib/dns/include/dns/view.h -@@ -155,6 +155,7 @@ struct dns_view { +@@ -157,6 +157,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-13 21:37:44 UTC +--- lib/dns/resolver.c.orig 2026-03-31 16:30:02 UTC +++ lib/dns/resolver.c -@@ -5969,6 +5969,12 @@ fixttls(dns_view_t *view, dns_rdataset_t *rdataset, +@@ -6066,6 +6066,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 2026-03-13 21:37:44 UTC +--- lib/isccfg/namedconf.c.orig 2026-03-31 16:30:02 UTC +++ lib/isccfg/namedconf.c -@@ -2424,6 +2424,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -2419,6 +2419,7 @@ static cfg_clausedef_t view_clauses[] = { { "nta-lifetime", &cfg_type_duration, 0, NULL }, { "nta-recheck", &cfg_type_duration, 0, NULL }, { "nxdomain-redirect", &cfg_type_astring, 0, NULL }, diff --git a/dns/bind9-devel/files/patch-meson.build b/dns/bind9-devel/files/patch-meson.build index 76f352816aac..ae49fd1b7ad2 100644 --- a/dns/bind9-devel/files/patch-meson.build +++ b/dns/bind9-devel/files/patch-meson.build @@ -1,8 +1,8 @@ Use bind-tools option to ease the server/tools package split ---- meson.build.orig 2026-02-04 14:54:40 UTC +--- meson.build.orig 2026-03-31 16:30:02 UTC +++ meson.build -@@ -72,6 +72,8 @@ zlib_opt = get_option('zlib').enable_auto_if(developer +@@ -71,6 +71,8 @@ zlib_opt = get_option('zlib').enable_auto_if(developer tracing_opt = get_option('tracing') zlib_opt = get_option('zlib').enable_auto_if(developer_mode) @@ -29,17 +29,17 @@ Use bind-tools option to ease the server/tools package split executable( 'named-checkconf', named_checkconf_src, -@@ -1593,7 +1598,9 @@ endif - ], - ) - endif +@@ -1591,7 +1596,9 @@ executable( + lmdb_dep, + ], + ) +endif +if bind_tools executable( 'named-rrchecker', named_rrchecker_src, -@@ -1606,6 +1613,7 @@ executable( +@@ -1604,6 +1611,7 @@ executable( ], ) @@ -47,7 +47,7 @@ Use bind-tools option to ease the server/tools package split named_deps = [] -@@ -1643,6 +1651,7 @@ named_srcconf = named_srcset.apply(config, strict: fal +@@ -1641,6 +1649,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(), -@@ -1670,7 +1679,9 @@ executable( +@@ -1669,7 +1678,9 @@ executable( named_srcconf.dependencies(), ], ) @@ -65,7 +65,7 @@ Use bind-tools option to ease the server/tools package split executable( 'nsec3hash', nsec3hash_src, -@@ -1715,7 +1726,9 @@ executable( +@@ -1714,7 +1725,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, -@@ -1810,6 +1823,7 @@ shared_library( +@@ -1809,6 +1822,7 @@ shared_library( libns_dep, ], ) @@ -83,7 +83,7 @@ Use bind-tools option to ease the server/tools package split subdir('doc') subdir('tests') -@@ -1886,7 +1900,6 @@ print(release_date, end="") +@@ -1885,7 +1899,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() -@@ -1907,6 +1920,7 @@ if doc_opt.allowed() +@@ -1906,6 +1919,7 @@ if doc_opt.allowed() install_man(man_pages) diff --git a/dns/bind9-devel/files/patch-meson.options b/dns/bind9-devel/files/patch-meson.options index 59c23f45115d..2eda3ebcf4e1 100644 --- a/dns/bind9-devel/files/patch-meson.options +++ b/dns/bind9-devel/files/patch-meson.options @@ -1,8 +1,8 @@ Add bind-tools option to ease the server/tools package split ---- meson.options.orig 2025-12-09 17:51:25 UTC +--- meson.options.orig 2026-03-31 16:30:02 UTC +++ meson.options -@@ -203,3 +203,5 @@ option( +@@ -196,3 +196,5 @@ option( value: 'auto', description: 'Enable Link Time Optimization for named.', ) diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index 88d44eabf842..282fb8a037ff 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -3,7 +3,7 @@ bin/named-checkzone bin/named-compilezone bin/named-journalprint bin/named-makejournal -%%LMDB%%bin/named-nzd2nzf +bin/named-nzd2nzf @sample etc/mtree/BIND.chroot.dist.sample @sample etc/mtree/BIND.chroot.local.dist.sample @sample %%ETCDIR%%/named.conf.sample @@ -25,6 +25,7 @@ include/dns/clientinfo.h include/dns/compress.h include/dns/db.h include/dns/dbiterator.h +include/dns/deleg.h include/dns/diff.h include/dns/dispatch.h include/dns/dlz.h @@ -191,6 +192,7 @@ include/isc/slist.h include/isc/sockaddr.h include/isc/spinlock.h include/isc/stats.h +include/isc/statsmulti.h include/isc/stdio.h include/isc/stdtime.h include/isc/strerr.h @@ -240,11 +242,11 @@ include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so lib/bind/synthrecord.so -lib/libdns-9.21.20.so -lib/libisc-9.21.20.so -lib/libisccc-9.21.20.so -lib/libisccfg-9.21.20.so -lib/libns-9.21.20.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 @comment share/man/man1/arpaname.1.gz @comment share/man/man1/delv.1.gz @comment share/man/man1/dig.1.gz @@ -266,7 +268,7 @@ share/man/man1/named-checkzone.1.gz share/man/man1/named-compilezone.1.gz share/man/man1/named-journalprint.1.gz share/man/man1/named-makejournal.1.gz -%%LMDB%%share/man/man1/named-nzd2nzf.1.gz +share/man/man1/named-nzd2nzf.1.gz @comment share/man/man1/named-rrchecker.1.gz @comment share/man/man1/nsec3hash.1.gz @comment share/man/man1/nslookup.1.gzhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69cd6ea8.3039b.5269ee4b>