Skip to content
Snippets Groups Projects
Verified Commit 06035627 authored by Mathieu Arnold's avatar Mathieu Arnold
Browse files
parent c32c725d
No related branches found
No related tags found
No related merge requests found
......@@ -25,7 +25,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
USES= compiler:c11 cpe libedit pkgconfig ssl tar:xz
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.16.35
ISCVERSION= 9.16.36
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
......
TIMESTAMP = 1668616423
SHA256 (bind-9.16.35.tar.xz) = 3e159617f182465c300a917eef880492c37183341b1091cc6654710c1d8d7b3e
SIZE (bind-9.16.35.tar.xz) = 5102476
TIMESTAMP = 1671811369
SHA256 (bind-9.16.36.tar.xz) = 508c94e8c9884f6075fa820a51efae04a1758dbdd157b01695ea6cd07049c221
SIZE (bind-9.16.36.tar.xz) = 5105696
Add the override-cache-ttl feature.
--- bin/named/config.c.orig 2022-11-07 22:12:59 UTC
--- bin/named/config.c.orig 2022-12-12 14:43:23 UTC
+++ bin/named/config.c
@@ -176,6 +176,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 2022-11-07 22:12:59 UTC
--- bin/named/server.c.orig 2022-12-12 14:43:23 UTC
+++ bin/named/server.c
@@ -4426,6 +4426,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
@@ -4437,6 +4437,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
obj = NULL;
......@@ -24,7 +24,7 @@ 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);
--- lib/dns/include/dns/view.h.orig 2022-11-07 22:12:59 UTC
--- lib/dns/include/dns/view.h.orig 2022-12-12 14:43:23 UTC
+++ lib/dns/include/dns/view.h
@@ -154,6 +154,7 @@ struct dns_view {
bool requestnsid;
......@@ -34,9 +34,9 @@ Add the override-cache-ttl feature.
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
--- lib/dns/resolver.c.orig 2022-11-07 22:12:59 UTC
--- lib/dns/resolver.c.orig 2022-12-12 14:43:23 UTC
+++ lib/dns/resolver.c
@@ -6456,6 +6456,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
@@ -6494,6 +6494,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
}
/*
......@@ -49,9 +49,9 @@ Add the override-cache-ttl feature.
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig 2022-11-07 22:12:59 UTC
--- lib/isccfg/namedconf.c.orig 2022-12-12 14:43:23 UTC
+++ lib/isccfg/namedconf.c
@@ -2051,6 +2051,7 @@ static cfg_clausedef_t view_clauses[] = {
@@ -2053,6 +2053,7 @@ static cfg_clausedef_t view_clauses[] = {
#endif /* ifdef HAVE_LMDB */
{ "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment