dns/bind918: sync with upstream

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2025-02-06 12:42:51 +01:00
parent 765f2c95a6
commit 201dce2b39
4 changed files with 19 additions and 19 deletions

View file

@ -1,7 +1,7 @@
# pkg-help formatted with fmt 59 63 # pkg-help formatted with fmt 59 63
PORTNAME= bind PORTNAME= bind
DISTVERSION= 9.18.32 DISTVERSION= 9.18.33
PORTREVISION= 0 PORTREVISION= 0
CATEGORIES= dns net CATEGORIES= dns net
MASTER_SITES= ISC/bind9/${DISTVERSION} MASTER_SITES= ISC/bind9/${DISTVERSION}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1734171277 TIMESTAMP = 1738572657
SHA256 (bind-9.18.32.tar.xz) = dc840cdf9d54578d98400f2edf7008b1b33a1721be6e490eb1e42d0d11d9cff4 SHA256 (bind-9.18.33.tar.xz) = fb373fac5ebbc41c645160afd5a9fb451918f6c0e69ab1d9474154e2b515de40
SIZE (bind-9.18.32.tar.xz) = 5332480 SIZE (bind-9.18.33.tar.xz) = 5341616

View file

@ -1,8 +1,8 @@
Add the override-cache-ttl feature. Add the override-cache-ttl feature.
--- bin/named/config.c.orig 2024-12-03 13:00:51 UTC --- bin/named/config.c.orig 2025-01-20 13:39:30 UTC
+++ bin/named/config.c +++ bin/named/config.c
@@ -185,6 +185,7 @@ options {\n\ @@ -186,6 +186,7 @@ options {\n\
notify-source *;\n\ notify-source *;\n\
notify-source-v6 *;\n\ notify-source-v6 *;\n\
nsec3-test-zone no;\n\ nsec3-test-zone no;\n\
@ -10,7 +10,7 @@ Add the override-cache-ttl feature.
parental-source *;\n\ parental-source *;\n\
parental-source-v6 *;\n\ parental-source-v6 *;\n\
provide-ixfr true;\n\ provide-ixfr true;\n\
--- bin/named/server.c.orig 2024-12-03 13:00:51 UTC --- bin/named/server.c.orig 2025-01-20 13:39:30 UTC
+++ bin/named/server.c +++ bin/named/server.c
@@ -4663,6 +4663,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl @@ -4663,6 +4663,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
} }
@ -24,7 +24,7 @@ Add the override-cache-ttl feature.
result = named_config_get(maps, "max-cache-ttl", &obj); result = named_config_get(maps, "max-cache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS); INSIST(result == ISC_R_SUCCESS);
view->maxcachettl = cfg_obj_asduration(obj); view->maxcachettl = cfg_obj_asduration(obj);
--- doc/arm/reference.rst.orig 2024-12-03 13:00:51 UTC --- doc/arm/reference.rst.orig 2025-01-20 13:39:31 UTC
+++ doc/arm/reference.rst +++ doc/arm/reference.rst
@@ -4388,6 +4388,10 @@ Tuning @@ -4388,6 +4388,10 @@ Tuning
cannot exceed 7 days and is silently truncated to 7 days if set to a 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 .. namedconf:statement:: max-cache-ttl
:tags: server :tags: server
:short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers. :short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers.
--- lib/dns/include/dns/view.h.orig 2024-12-03 13:00:51 UTC --- lib/dns/include/dns/view.h.orig 2025-01-20 13:39:31 UTC
+++ lib/dns/include/dns/view.h +++ lib/dns/include/dns/view.h
@@ -157,6 +157,7 @@ struct dns_view { @@ -157,6 +157,7 @@ struct dns_view {
bool requestnsid; bool requestnsid;
@ -47,9 +47,9 @@ Add the override-cache-ttl feature.
dns_ttl_t maxncachettl; dns_ttl_t maxncachettl;
dns_ttl_t mincachettl; dns_ttl_t mincachettl;
dns_ttl_t minncachettl; dns_ttl_t minncachettl;
--- lib/dns/resolver.c.orig 2024-12-03 13:00:51 UTC --- lib/dns/resolver.c.orig 2025-01-20 13:39:31 UTC
+++ lib/dns/resolver.c +++ lib/dns/resolver.c
@@ -6306,6 +6306,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes @@ -6355,6 +6355,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
} }
/* /*
@ -62,7 +62,7 @@ Add the override-cache-ttl feature.
* Enforce the configure maximum cache TTL. * Enforce the configure maximum cache TTL.
*/ */
if (rdataset->ttl > res->view->maxcachettl) { if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig 2024-12-03 13:00:51 UTC --- lib/isccfg/namedconf.c.orig 2025-01-20 13:39:31 UTC
+++ lib/isccfg/namedconf.c +++ lib/isccfg/namedconf.c
@@ -2105,6 +2105,7 @@ static cfg_clausedef_t view_clauses[] = { @@ -2105,6 +2105,7 @@ static cfg_clausedef_t view_clauses[] = {
#endif /* ifdef HAVE_LMDB */ #endif /* ifdef HAVE_LMDB */

View file

@ -240,19 +240,19 @@ include/ns/xfrout.h
lib/bind/filter-a.so lib/bind/filter-a.so
lib/bind/filter-aaaa.so lib/bind/filter-aaaa.so
lib/libbind9.so lib/libbind9.so
lib/libbind9-9.18.32.so lib/libbind9-9.18.33.so
lib/libdns.so lib/libdns.so
lib/libdns-9.18.32.so lib/libdns-9.18.33.so
lib/libirs.so lib/libirs.so
lib/libirs-9.18.32.so lib/libirs-9.18.33.so
lib/libisc.so lib/libisc.so
lib/libisc-9.18.32.so lib/libisc-9.18.33.so
lib/libisccc.so lib/libisccc.so
lib/libisccc-9.18.32.so lib/libisccc-9.18.33.so
lib/libisccfg.so lib/libisccfg.so
lib/libisccfg-9.18.32.so lib/libisccfg-9.18.33.so
lib/libns.so lib/libns.so
lib/libns-9.18.32.so lib/libns-9.18.33.so
@comment share/man/man1/arpaname.1.gz @comment share/man/man1/arpaname.1.gz
@comment share/man/man1/delv.1.gz @comment share/man/man1/delv.1.gz
@comment share/man/man1/dig.1.gz @comment share/man/man1/dig.1.gz