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 cf971a91ecec..f46dff68043d 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.3a0.2020.07.31 +ISCVERSION= 9.17.3a0.2020.08.17 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= 0c85c4c42447ee9a0ad1b555417bfdfd80c3171c +GL_COMMIT= f85bb0691cdfe465f135c36fc6f4690d956903f1 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index b176d31d491d..29583334c0ab 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1596457484 -SHA256 (isc-projects-bind9-0c85c4c42447ee9a0ad1b555417bfdfd80c3171c_GL0.tar.gz) = c730df6d9b8ba000213e0a9b92aed813e40a1f0222b48637c6980c02467a95dc -SIZE (isc-projects-bind9-0c85c4c42447ee9a0ad1b555417bfdfd80c3171c_GL0.tar.gz) = 4257611 +TIMESTAMP = 1597666643 +SHA256 (isc-projects-bind9-f85bb0691cdfe465f135c36fc6f4690d956903f1_GL0.tar.gz) = fe56d45bad0a650a9b3a24b28a271dde8761af9e054f4c246a0f973873bd9ce9 +SIZE (isc-projects-bind9-f85bb0691cdfe465f135c36fc6f4690d956903f1_GL0.tar.gz) = 4271204 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 4aa8435a7669..0df0acb57951 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-07-31 15:55:58 UTC +--- bin/named/config.c.orig 2020-08-17 02:35:33 UTC +++ bin/named/config.c @@ -180,6 +180,7 @@ options {\n\ notify-source *;\n\ @@ -10,9 +10,9 @@ Add the override-cache-ttl feature. provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2020-07-31 15:55:58 UTC +--- bin/named/server.c.orig 2020-08-17 02:35:33 UTC +++ bin/named/server.c -@@ -4333,6 +4333,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4334,6 +4334,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 2020-07-31 15:55:58 UTC +--- lib/dns/include/dns/view.h.orig 2020-08-17 02:35:33 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,7 @@ struct dns_view { bool requestnsid; @@ -34,7 +34,7 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2020-07-31 15:55:58 UTC +--- lib/dns/resolver.c.orig 2020-08-17 02:35:33 UTC +++ lib/dns/resolver.c @@ -6247,6 +6247,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } @@ -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-07-31 15:55:58 UTC +--- lib/isccfg/namedconf.c.orig 2020-08-17 02:35:33 UTC +++ lib/isccfg/namedconf.c @@ -1993,6 +1993,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ |