diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2025-10-22 16:21:37 +0200 | 
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2025-10-22 17:19:20 +0200 | 
| commit | 072263106b4dd95b6a19bd33a234bb5fa619b426 (patch) | |
| tree | 11b71e890c412a0f16d8e9ca55b343f4b670040d | |
| parent | dns/bind920: update to 9.20.15 (diff) | |
dns/bind9-devel: update to 9.21.14
Changes:	https://downloads.isc.org/isc/bind9/9.21.14/doc/arm/html/notes.html
| -rw-r--r-- | dns/bind-tools/pkg-plist-devel | 10 | ||||
| -rw-r--r-- | dns/bind9-devel/Makefile | 2 | ||||
| -rw-r--r-- | dns/bind9-devel/distinfo | 6 | ||||
| -rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 20 | ||||
| -rw-r--r-- | dns/bind9-devel/files/patch-bin_named_include_named_globals.h | 4 | ||||
| -rw-r--r-- | dns/bind9-devel/files/patch-meson.build | 45 | ||||
| -rw-r--r-- | dns/bind9-devel/files/patch-meson__options.txt | 11 | ||||
| -rw-r--r-- | dns/bind9-devel/pkg-plist | 12 | 
8 files changed, 65 insertions, 45 deletions
diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel index f669818a7c03..7458022d4844 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.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 +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  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 c761307a0811..4b02550a4ea2 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.12 +DISTVERSION=	9.21.14  .if defined(BIND_TOOLS_SLAVE)  # dns/bind-tools here  PORTREVISION=	0 diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index 4fb49af27c49..169eafe4262a 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1757530153 -SHA256 (bind-9.21.12.tar.xz) = b32a53d0ce5dc0e00d200cabc4c46974c635ea435bd88a195f9981e15c25e1e7 -SIZE (bind-9.21.12.tar.xz) = 5231764 +TIMESTAMP = 1761142037 +SHA256 (bind-9.21.14.tar.xz) = 003b94d1404ec33174f28951de4ba261742de333cb869e6b909f1ada3261fe9f +SIZE (bind-9.21.14.tar.xz) = 5257932 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 0cf1e4292643..1ef483b64a5c 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/named/config.c.orig	2025-09-04 15:54:02 UTC +--- bin/named/config.c.orig	2025-10-18 09:48:52 UTC  +++ bin/named/config.c  @@ -186,6 +186,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	2025-09-04 15:54:02 UTC +--- bin/named/server.c.orig	2025-10-18 09:48:52 UTC  +++ bin/named/server.c -@@ -4275,6 +4275,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4276,6 +4276,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-09-04 15:54:02 UTC +--- doc/arm/reference.rst.orig	2025-10-18 09:48:52 UTC  +++ doc/arm/reference.rst -@@ -4173,6 +4173,10 @@ Tuning +@@ -4175,6 +4175,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	2025-09-04 15:54:02 UTC +--- doc/misc/options.orig	2025-10-18 09:48:52 UTC  +++ doc/misc/options  @@ -172,6 +172,7 @@ options {   	masterfile-style ( full | relative ); @@ -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-09-04 15:54:02 UTC +--- lib/dns/include/dns/view.h.orig	2025-10-18 09:48:52 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-09-04 15:54:02 UTC +--- lib/dns/resolver.c.orig	2025-10-18 09:48:52 UTC  +++ lib/dns/resolver.c -@@ -5776,6 +5776,12 @@ fixttls(dns_view_t *view, dns_rdataset_t *rdataset, +@@ -5839,6 +5839,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	2025-09-04 15:54:02 UTC +--- lib/isccfg/namedconf.c.orig	2025-10-18 09:48:52 UTC  +++ lib/isccfg/namedconf.c  @@ -2086,6 +2086,7 @@ static cfg_clausedef_t view_clauses[] = {   #endif /* ifdef HAVE_LMDB */ 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 1aa15addc16f..a1c99ff29218 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-08-13 17:10:38 UTC +--- bin/named/include/named/globals.h.orig	2025-10-18 09:48:52 UTC  +++ bin/named/include/named/globals.h -@@ -113,7 +113,7 @@ EXTERN const char *named_g_defaultpidfile INIT(NAMED_L +@@ -112,7 +112,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 69f07446f567..93ec124f974a 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	2025-09-04 15:54:02 UTC +--- meson.build.orig	2025-10-18 09:48:52 UTC  +++ meson.build -@@ -69,6 +69,8 @@ zlib_opt = get_option('zlib') +@@ -72,6 +72,8 @@ zlib_opt = get_option('zlib')   tracing_opt = get_option('tracing')   zlib_opt = get_option('zlib') @@ -11,15 +11,24 @@ 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 == '' -@@ -1159,6 +1175,7 @@ named_srcconf = named_srcset.apply(config, strict: fal +@@ -408,7 +410,7 @@ if fuzz_opt.enabled() - named_srcconf = named_srcset.apply(config, strict: false) + 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( +     include_directories: isccfg_inc, + )  +if bind_tools   executable(       'arpaname',       arpaname_src, -@@ -1371,7 +1388,9 @@ executable( +@@ -1434,7 +1437,9 @@ executable(           libisc_dep,       ],   ) @@ -29,7 +38,7 @@ Use bind-tools option to ease the server/tools package split   executable(       'named-checkconf',       named_checkconf_src, -@@ -1444,7 +1463,9 @@ endif +@@ -1507,7 +1512,9 @@ endif           ],       )   endif @@ -39,37 +48,45 @@ Use bind-tools option to ease the server/tools package split   executable(       'named-rrchecker',       named_rrchecker_src, -@@ -1457,7 +1478,9 @@ executable( +@@ -1520,6 +1527,7 @@ executable(       ],   )  +endif + named_c_args = [] + named_link_args = [] +@@ -1559,6 +1567,7 @@ named_srcconf = named_srcset.apply(config, strict: fal +  + named_srcconf = named_srcset.apply(config, strict: false) +   +if not bind_tools   executable(       'named',       named_srcconf.sources(), -@@ -1487,7 +1510,9 @@ executable( +@@ -1586,7 +1595,9 @@ executable(           named_srcconf.dependencies(),       ],   ) +-  +endif -  ++  +if bind_tools   executable(       'nsec3hash',       nsec3hash_src, -@@ -1532,7 +1557,9 @@ executable( +@@ -1631,7 +1642,9 @@ executable(           edit_dep,       ],   ) +-  +endif -  ++  +if not bind_tools   executable(       'rndc-confgen',       rndc_confgen_src, -@@ -1613,6 +1640,7 @@ shared_library( +@@ -1727,6 +1740,7 @@ shared_library(           libns_dep,       ],   ) @@ -77,7 +94,7 @@ Use bind-tools option to ease the server/tools package split   subdir('doc')   subdir('tests') -@@ -1680,7 +1708,6 @@ print(release_date, end="") +@@ -1795,7 +1809,6 @@ print(release_date, end="")   print(release_date, end="")   ''' @@ -85,7 +102,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() -@@ -1701,6 +1728,7 @@ if doc_opt.allowed() +@@ -1816,6 +1829,7 @@ if doc_opt.allowed()       install_man(man_pages) diff --git a/dns/bind9-devel/files/patch-meson__options.txt b/dns/bind9-devel/files/patch-meson__options.txt index 954a01fff5ad..560cce5e84d7 100644 --- a/dns/bind9-devel/files/patch-meson__options.txt +++ b/dns/bind9-devel/files/patch-meson__options.txt @@ -1,10 +1,13 @@  Add bind-tools option to ease the server/tools package split ---- meson_options.txt.orig	2025-07-19 11:32:37 UTC +--- meson_options.txt.orig	2025-10-18 09:48:52 UTC  +++ meson_options.txt -@@ -188,3 +188,5 @@ option( -     value: 'disabled', +@@ -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 4ab574014273..898473da6fa4 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -125,7 +125,6 @@ include/isc/crypto.h  include/isc/dir.h  include/isc/dnsstream.h  include/isc/endian.h -include/isc/entropy.h  include/isc/errno.h  include/isc/error.h  include/isc/file.h @@ -235,11 +234,12 @@ include/ns/update.h  include/ns/xfrout.h  lib/bind/filter-a.so  lib/bind/filter-aaaa.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 +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  @comment share/man/man1/arpaname.1.gz  @comment share/man/man1/delv.1.gz  @comment share/man/man1/dig.1.gz  | 
