diff options
| -rw-r--r-- | dns/bind9-devel/Makefile | 4 | ||||
| -rw-r--r-- | dns/bind9-devel/distinfo | 6 | ||||
| -rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 7bbed645040a..1e64cffbbbc6 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -48,13 +48,13 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools # XXX: remove tar:bz2 USES= autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:bz2 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.17.6a0.2020.10.23 +ISCVERSION= 9.17.6a0.2020.11.08 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= f8de3df76c39188ef69911c7d3f7c77087cdb1e1 +GL_COMMIT= f6d967db542554511a071e946a87edadb0687c86 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index 14cb1d906d98..c9b2b830a2e8 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1603705633 -SHA256 (isc-projects-bind9-f8de3df76c39188ef69911c7d3f7c77087cdb1e1_GL0.tar.gz) = a4788cad920624adfa7b324aa17eca11b40d35825d0b8fc71e75ab5684177fb1 -SIZE (isc-projects-bind9-f8de3df76c39188ef69911c7d3f7c77087cdb1e1_GL0.tar.gz) = 4356210 +TIMESTAMP = 1604920313 +SHA256 (isc-projects-bind9-f6d967db542554511a071e946a87edadb0687c86_GL0.tar.gz) = d9a697b39082e554628a2805ac9b51ffc62008eb2527b8f8c5334e657ab7c937 +SIZE (isc-projects-bind9-f6d967db542554511a071e946a87edadb0687c86_GL0.tar.gz) = 4364563 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index a2ae17926ee4..aa7eb2c639ad 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2020-10-23 20:08:43 UTC +--- bin/named/config.c.orig 2020-11-08 22:06:04 UTC +++ bin/named/config.c @@ -180,6 +180,7 @@ options {\n\ notify-source *;\n\ @@ -10,7 +10,7 @@ Add the override-cache-ttl feature. provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2020-10-23 20:08:43 UTC +--- bin/named/server.c.orig 2020-11-08 22:06:04 UTC +++ bin/named/server.c @@ -4343,6 +4343,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); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asduration(obj); ---- lib/dns/include/dns/view.h.orig 2020-10-23 20:08:43 UTC +--- lib/dns/include/dns/view.h.orig 2020-11-08 22:06:04 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,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 2020-10-23 20:08:43 UTC +--- lib/dns/resolver.c.orig 2020-11-08 22:06:04 UTC +++ lib/dns/resolver.c -@@ -6187,6 +6187,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -6185,6 +6185,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } /* @@ -49,7 +49,7 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2020-10-23 20:08:43 UTC +--- lib/isccfg/namedconf.c.orig 2020-11-08 22:06:04 UTC +++ lib/isccfg/namedconf.c @@ -1993,6 +1993,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ |