aboutsummaryrefslogtreecommitdiffstats
path: root/dns/bind9-devel
diff options
context:
space:
mode:
Diffstat (limited to 'dns/bind9-devel')
-rw-r--r--dns/bind9-devel/Makefile3
-rw-r--r--dns/bind9-devel/distinfo6
-rw-r--r--dns/bind9-devel/files/extrapatch-bind-min-override-ttl44
-rw-r--r--dns/bind9-devel/files/patch-bin_named_include_named_globals.h4
-rw-r--r--dns/bind9-devel/files/patch-meson.build40
-rw-r--r--dns/bind9-devel/files/patch-meson.options10
-rw-r--r--dns/bind9-devel/files/patch-meson__options.txt10
-rw-r--r--dns/bind9-devel/pkg-plist13
8 files changed, 68 insertions, 62 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index c761307a0811..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.12
+DISTVERSION= 9.21.15
.if defined(BIND_TOOLS_SLAVE)
# dns/bind-tools here
PORTREVISION= 0
@@ -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 4fb49af27c49..1a744f107ab0 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 = 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 0cf1e4292643..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-09-04 15:54:02 UTC
-+++ bin/named/config.c
-@@ -186,6 +186,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-09-04 15:54:02 UTC
+--- bin/named/server.c.orig 2025-11-07 09:34:27 UTC
+++ bin/named/server.c
-@@ -4275,6 +4275,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-09-04 15:54:02 UTC
+--- doc/arm/reference.rst.orig 2025-11-07 09:34:27 UTC
+++ doc/arm/reference.rst
-@@ -4173,6 +4173,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,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-09-04 15:54:02 UTC
+--- doc/misc/options.orig 2025-11-07 09:34:27 UTC
+++ doc/misc/options
-@@ -172,6 +172,7 @@ options {
+@@ -171,6 +171,7 @@ options {
masterfile-style ( full | relative );
match-mapped-addresses <boolean>;
max-cache-size ( default | unlimited | <sizeval> | <percentage> );
@@ -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-09-04 15:54:02 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,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-11-07 09:34:27 UTC
+++ lib/dns/resolver.c
-@@ -5776,6 +5776,12 @@ fixttls(dns_view_t *view, dns_rdataset_t *rdataset,
+@@ -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) {
/*
@@ -72,13 +72,13 @@ 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-11-07 09:34:27 UTC
+++ lib/isccfg/namedconf.c
-@@ -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 },
+@@ -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 1aa15addc16f..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-08-13 17:10:38 UTC
+--- bin/named/include/named/globals.h.orig 2025-11-07 09:34:27 UTC
+++ bin/named/include/named/globals.h
-@@ -113,7 +113,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 69f07446f567..cb4803b883bd 100644
--- a/dns/bind9-devel/files/patch-meson.build
+++ b/dns/bind9-devel/files/patch-meson.build
@@ -1,25 +1,25 @@
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-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 == ''
-@@ -1159,6 +1175,7 @@ named_srcconf = named_srcset.apply(config, strict: fal
-
- named_srcconf = named_srcset.apply(config, strict: false)
+ build_options = meson.build_options()
+ if build_options == ''
+ build_options = 'default'
+@@ -1215,6 +1217,7 @@ libisccfg_dep = declare_dependency(
+ include_directories: isccfg_inc,
+ )
+if bind_tools
executable(
'arpaname',
arpaname_src,
-@@ -1371,7 +1388,9 @@ executable(
+@@ -1427,7 +1430,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,
-@@ -1444,7 +1463,9 @@ endif
+@@ -1501,7 +1506,9 @@ endif
],
)
endif
@@ -39,17 +39,23 @@ Use bind-tools option to ease the server/tools package split
executable(
'named-rrchecker',
named_rrchecker_src,
-@@ -1457,7 +1478,9 @@ executable(
+@@ -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(),
-@@ -1487,7 +1510,9 @@ executable(
+@@ -1578,7 +1587,9 @@ executable(
named_srcconf.dependencies(),
],
)
@@ -59,7 +65,7 @@ Use bind-tools option to ease the server/tools package split
executable(
'nsec3hash',
nsec3hash_src,
-@@ -1532,7 +1557,9 @@ executable(
+@@ -1623,7 +1634,9 @@ executable(
edit_dep,
],
)
@@ -69,7 +75,7 @@ Use bind-tools option to ease the server/tools package split
executable(
'rndc-confgen',
rndc_confgen_src,
-@@ -1613,6 +1640,7 @@ shared_library(
+@@ -1719,6 +1732,7 @@ shared_library(
libns_dep,
],
)
@@ -77,7 +83,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 +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()
-@@ -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 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 954a01fff5ad..000000000000
--- a/dns/bind9-devel/files/patch-meson__options.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-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
-@@ -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 4ab574014273..7c5a4250cc31 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -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
@@ -125,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
@@ -235,11 +235,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.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