dns/bind920: sync with upstream

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

View file

@ -1,7 +1,7 @@
# pkg-help formatted with fmt 59 63
PORTNAME= bind
DISTVERSION= 9.20.4
DISTVERSION= 9.20.5
.if defined(BIND_TOOLS_SLAVE)
# dns/bind-tools here
PORTREVISION= 0

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1734171467
SHA256 (bind-9.20.4.tar.xz) = 3a8e1a05e00e3e9bc02bdffded7862faf7726ba76ba997f42ab487777bd8210b
SIZE (bind-9.20.4.tar.xz) = 5620536
TIMESTAMP = 1738572773
SHA256 (bind-9.20.5.tar.xz) = 19274fd739c023772b4212a0b6c201cf4364855fa7e6a7d3db49693f55db1ab8
SIZE (bind-9.20.5.tar.xz) = 5634832

View file

@ -1,8 +1,8 @@
Add the override-cache-ttl feature.
--- bin/named/config.c.orig 2024-12-03 12:33:15 UTC
--- bin/named/config.c.orig 2025-01-20 13:20:45 UTC
+++ bin/named/config.c
@@ -183,6 +183,7 @@ options {\n\
@@ -184,6 +184,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 2024-12-03 12:33:15 UTC
--- bin/named/server.c.orig 2025-01-20 13:20:45 UTC
+++ bin/named/server.c
@@ -4604,6 +4604,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
@@ -4618,6 +4618,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 2024-12-03 12:33:15 UTC
--- doc/arm/reference.rst.orig 2025-01-20 13:20:45 UTC
+++ doc/arm/reference.rst
@@ -4363,6 +4363,10 @@ Tuning
@@ -4360,6 +4360,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.
--- lib/dns/include/dns/view.h.orig 2024-12-03 12:33:15 UTC
--- lib/dns/include/dns/view.h.orig 2025-01-20 13:20:45 UTC
+++ lib/dns/include/dns/view.h
@@ -151,6 +151,7 @@ struct dns_view {
bool requestnsid;
@ -47,9 +47,9 @@ Add the override-cache-ttl feature.
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
--- lib/dns/resolver.c.orig 2024-12-03 12:33:15 UTC
--- lib/dns/resolver.c.orig 2025-01-20 13:20:45 UTC
+++ lib/dns/resolver.c
@@ -5893,6 +5893,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
@@ -5963,6 +5963,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
}
/*
@ -62,9 +62,9 @@ Add the override-cache-ttl feature.
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig 2024-12-03 12:33:16 UTC
--- lib/isccfg/namedconf.c.orig 2025-01-20 13:20:46 UTC
+++ lib/isccfg/namedconf.c
@@ -2215,6 +2215,7 @@ static cfg_clausedef_t view_clauses[] = {
@@ -2220,6 +2220,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 },

View file

@ -241,15 +241,15 @@ include/ns/update.h
include/ns/xfrout.h
lib/bind/filter-a.so
lib/bind/filter-aaaa.so
lib/libdns-9.20.4.so
lib/libdns-9.20.5.so
lib/libdns.so
lib/libisc-9.20.4.so
lib/libisc-9.20.5.so
lib/libisc.so
lib/libisccc-9.20.4.so
lib/libisccc-9.20.5.so
lib/libisccc.so
lib/libisccfg-9.20.4.so
lib/libisccfg-9.20.5.so
lib/libisccfg.so
lib/libns-9.20.4.so
lib/libns-9.20.5.so
lib/libns.so
@comment share/man/man1/arpaname.1.gz
@comment share/man/man1/delv.1.gz