aboutsummaryrefslogtreecommitdiff
path: root/dns/bind9-devel
diff options
context:
space:
mode:
Diffstat (limited to 'dns/bind9-devel')
-rw-r--r--dns/bind9-devel/Makefile5
-rw-r--r--dns/bind9-devel/distinfo6
-rw-r--r--dns/bind9-devel/files/extrapatch-bind-min-override-ttl64
-rw-r--r--dns/bind9-devel/files/patch-bin_named_include_named_globals.h4
-rw-r--r--dns/bind9-devel/files/patch-meson.build122
-rw-r--r--dns/bind9-devel/files/patch-meson.options10
-rw-r--r--dns/bind9-devel/files/patch-meson__options.txt8
-rw-r--r--dns/bind9-devel/pkg-plist27
8 files changed, 108 insertions, 138 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 5f2ffdbc3007..45ad8418379e 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.10
+DISTVERSION= 9.21.15
.if defined(BIND_TOOLS_SLAVE)
# dns/bind-tools here
PORTREVISION= 0
@@ -43,7 +43,7 @@ LIB_DEPENDS= libnghttp2.so:www/libnghttp2 \
RUN_DEPENDS= bind-tools>0:dns/bind-tools
.endif
-USES= compiler:c11 cpe gnome libedit libtool meson perl5 pkgconfig \
+USES= compiler:c11 cpe gnome libedit meson perl5 pkgconfig \
ssl tar:xz
CPE_VENDOR= isc
@@ -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 f7c1f8770c43..1a744f107ab0 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1752909925
-SHA256 (bind-9.21.10.tar.xz) = bb1ea8d74d9b4f597f6d4622e8238f6f76a2e101fe17a5f2c64fc18f530da113
-SIZE (bind-9.21.10.tar.xz) = 5197276
+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 a8654eeaa0a9..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-07-04 09:34:56 UTC
-+++ bin/named/config.c
-@@ -187,6 +187,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-07-04 09:34:56 UTC
+--- bin/named/server.c.orig 2025-11-07 09:34:27 UTC
+++ bin/named/server.c
-@@ -4236,6 +4236,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-07-04 09:34:56 UTC
+--- doc/arm/reference.rst.orig 2025-11-07 09:34:27 UTC
+++ doc/arm/reference.rst
-@@ -4187,6 +4187,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,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-07-04 09:34:56 UTC
+--- doc/misc/options.orig 2025-11-07 09:34:27 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-ixfr-ratio ( unlimited | <percentage> );
---- lib/dns/include/dns/view.h.orig 2025-07-04 09:34:56 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,28 +57,28 @@ Add the override-cache-ttl feature.
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
---- lib/dns/resolver.c.orig 2025-07-04 09:34:56 UTC
+--- lib/dns/resolver.c.orig 2025-11-07 09:34:27 UTC
+++ lib/dns/resolver.c
-@@ -5918,6 +5918,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
- }
-
- /*
-+ * Enforce the configure cache TTL override.
-+ */
-+ if (res->view->overridecachettl)
-+ rdataset->ttl = res->view->overridecachettl;
+@@ -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) {
+ /*
++ * Enforce the configured cache TTL override.
++ */
++ if (view->overridecachettl)
++ rdataset->ttl = view->overridecachettl;
+
-+ /*
- * Enforce the configure maximum cache TTL.
- */
- if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2025-07-04 09:34:56 UTC
++ /*
+ * Enforce the configured maximum and minimum cache TTL.
+ */
+ if (rdataset->ttl > view->maxcachettl) {
+--- lib/isccfg/namedconf.c.orig 2025-11-07 09:34:27 UTC
+++ lib/isccfg/namedconf.c
-@@ -2084,6 +2084,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 54a05c73c851..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-04-09 14:26:29 UTC
+--- bin/named/include/named/globals.h.orig 2025-11-07 09:34:27 UTC
+++ bin/named/include/named/globals.h
-@@ -117,7 +117,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 ff19913b1a32..cb4803b883bd 100644
--- a/dns/bind9-devel/files/patch-meson.build
+++ b/dns/bind9-devel/files/patch-meson.build
@@ -1,75 +1,25 @@
---- meson.build.orig 2025-07-04 09:34:56 UTC
+Use bind-tools option to ease the server/tools package split
+
+--- meson.build.orig 2025-11-07 09:34:27 UTC
+++ meson.build
-@@ -69,6 +69,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 == ''
-@@ -956,9 +958,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,
-@@ -986,6 +994,8 @@ libdns = library(
- libdns = library(
- 'dns',
- dns_srcconf.sources(),
-+ version: project_version,
-+ soversion: soversion,
- include_directories: dns_inc,
- install: true,
- install_rpath: libdir,
-@@ -1020,6 +1030,8 @@ libns = library(
- libns = library(
- 'ns',
- ns_srcconf.sources(),
-+ version: project_version,
-+ soversion: soversion,
- objects: ns_probe_objects,
- install: true,
- install_rpath: libdir,
-@@ -1046,6 +1058,8 @@ libisccc = library(
- libisccc = library(
- 'isccc',
- isccc_srcconf.sources(),
-+ version: project_version,
-+ soversion: soversion,
- implicit_include_directories: false,
- include_directories: isccc_inc,
- install: true,
-@@ -1067,6 +1081,8 @@ libisccfg = library(
- libisccfg = library(
- 'isccfg',
- isccfg_srcconf.sources(),
-+ version: project_version,
-+ soversion: soversion,
- implicit_include_directories: false,
+ build_options = meson.build_options()
+ if build_options == ''
+ build_options = 'default'
+@@ -1215,6 +1217,7 @@ libisccfg_dep = declare_dependency(
include_directories: isccfg_inc,
- install: true,
-@@ -1087,6 +1103,7 @@ named_srcconf = named_srcset.apply(config, strict: fal
-
- named_srcconf = named_srcset.apply(config, strict: false)
+ )
+if bind_tools
executable(
'arpaname',
arpaname_src,
-@@ -1315,7 +1332,9 @@ executable(
+@@ -1427,7 +1430,9 @@ executable(
libisc_dep,
],
)
@@ -79,7 +29,33 @@
executable(
'named-checkconf',
named_checkconf_src,
-@@ -1438,7 +1457,9 @@ executable(
+@@ -1501,7 +1506,9 @@ endif
+ ],
+ )
+ endif
++endif
+
++if bind_tools
+ executable(
+ 'named-rrchecker',
+ named_rrchecker_src,
+@@ -1514,6 +1521,7 @@ executable(
+ ],
+
+ )
++endif
+
+ named_deps = []
+
+@@ -1551,6 +1559,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(),
+@@ -1578,7 +1587,9 @@ executable(
named_srcconf.dependencies(),
],
)
@@ -89,7 +65,7 @@
executable(
'nsec3hash',
nsec3hash_src,
-@@ -1486,7 +1507,9 @@ executable(
+@@ -1623,7 +1634,9 @@ executable(
edit_dep,
],
)
@@ -99,7 +75,7 @@
executable(
'rndc-confgen',
rndc_confgen_src,
-@@ -1572,6 +1595,7 @@ shared_library(
+@@ -1719,6 +1732,7 @@ shared_library(
libns_dep,
],
)
@@ -107,19 +83,19 @@
subdir('doc')
subdir('tests')
-@@ -1632,7 +1656,6 @@ alias_target('doc-misc', doc_misc_targets)
-
- alias_target('doc-misc', doc_misc_targets)
+@@ -1795,7 +1809,6 @@ print(release_date, end="")
+ print(release_date, end="")
+ '''
-if doc_opt.allowed()
- man_srcconf = man_srcset.apply(config, strict: false)
- foreach man : man_srcconf.sources()
- man_pages += configure_file(
-@@ -1647,6 +1670,7 @@ if doc_opt.allowed()
+ release_date = ''
+ if python.found()
+ release_date = run_command(python, ['-c', get_release_date], check: true).stdout()
+@@ -1816,6 +1829,7 @@ if doc_opt.allowed()
install_man(man_pages)
+if doc_opt.allowed()
if sphinx_build.found()
- meson.add_dist_script(
- 'util' / 'meson-dist-package.sh',
+ alias_target('doc-misc', doc_misc_targets)
+
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 de50de448714..000000000000
--- a/dns/bind9-devel/files/patch-meson__options.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- meson_options.txt.orig 2025-07-19 11:32:37 UTC
-+++ meson_options.txt
-@@ -188,3 +188,5 @@ option(
- value: 'disabled',
- description: 'enable the memory leak detection in external libraries (libxml2, libuv, OpenSSL)',
- )
-+
-+option('bind-tools', type: 'feature', value: 'disabled', description: 'build tools only')
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 0231f563dd78..7c5a4250cc31 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -4,7 +4,6 @@ bin/named-compilezone
bin/named-journalprint
bin/named-makejournal
%%LMDB%%bin/named-nzd2nzf
-bin/named-rrchecker
@sample etc/mtree/BIND.chroot.dist.sample
@sample etc/mtree/BIND.chroot.local.dist.sample
@sample %%ETCDIR%%/named.conf.sample
@@ -35,6 +34,7 @@ include/dns/dnssec.h
include/dns/dnstap.h
include/dns/ds.h
include/dns/dsdigest.h
+include/dns/dsync.h
include/dns/dyndb.h
include/dns/ecs.h
include/dns/ede.h
@@ -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
@@ -117,6 +118,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
@@ -124,7 +126,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
@@ -234,21 +235,12 @@ include/ns/update.h
include/ns/xfrout.h
lib/bind/filter-a.so
lib/bind/filter-aaaa.so
-lib/libdns.so.9.21.10
-lib/libdns.so.9.21
-lib/libdns.so
-lib/libisc.so.9.21.10
-lib/libisc.so.9.21
-lib/libisc.so
-lib/libisccc.so.9.21.10
-lib/libisccc.so.9.21
-lib/libisccc.so
-lib/libisccfg.so.9.21.10
-lib/libisccfg.so.9.21
-lib/libisccfg.so
-lib/libns.so.9.21.10
-lib/libns.so.9.21
-lib/libns.so
+lib/bind/synthrecord.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
@@ -269,6 +261,7 @@ share/man/man1/named-checkconf.1.gz
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
@comment share/man/man1/named-rrchecker.1.gz
@comment share/man/man1/nsec3hash.1.gz
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-26 01:53:30 +0000