Update to latest commit.

This commit is contained in:
Mathieu Arnold 2018-10-08 10:15:35 +00:00
parent 87fba9a597
commit 8b3077b380
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=481532
3 changed files with 12 additions and 12 deletions

View file

@ -40,13 +40,13 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2
# XXX: remove tar:bz2
USES= cpe libedit ssl tar:bz2
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.13.1a0.2018.09.28
ISCVERSION= 9.13.1a0.2018.10.05
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
GL_COMMIT= c93acb99492526a8263ad1afd1fd10a0f41392fe
GL_COMMIT= e8f66bcfa36b89586319372a7fe626fbf4e49a03
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1538402699
SHA256 (isc-projects-bind9-c93acb99492526a8263ad1afd1fd10a0f41392fe_GL0.tar.gz) = a3daca06a93905ab6d35d796d6c28b9b5b2e06902fdb33e7bb371937908db074
SIZE (isc-projects-bind9-c93acb99492526a8263ad1afd1fd10a0f41392fe_GL0.tar.gz) = 7263218
TIMESTAMP = 1538992970
SHA256 (isc-projects-bind9-e8f66bcfa36b89586319372a7fe626fbf4e49a03_GL0.tar.gz) = 391ce0d8cdc9d714a8fc2339ea914e0ad8a6ba85cc0f60cc1beeda86edb3e145
SIZE (isc-projects-bind9-e8f66bcfa36b89586319372a7fe626fbf4e49a03_GL0.tar.gz) = 7274863

View file

@ -1,4 +1,4 @@
--- bin/named/config.c.orig 2018-09-11 19:56:29 UTC
--- bin/named/config.c.orig 2018-10-05 18:25:00 UTC
+++ bin/named/config.c
@@ -174,12 +174,14 @@ options {\n\
max-recursion-queries 75;\n\
@ -15,9 +15,9 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
--- bin/named/server.c.orig 2018-09-11 19:56:29 UTC
--- bin/named/server.c.orig 2018-10-05 18:25:00 UTC
+++ bin/named/server.c
@@ -4075,6 +4075,16 @@ configure_view(dns_view_t *view, dns_vie
@@ -4102,6 +4102,16 @@ configure_view(dns_view_t *view, dns_vie
}
obj = NULL;
@ -34,7 +34,7 @@
result = named_config_get(maps, "max-cache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS);
view->maxcachettl = cfg_obj_asuint32(obj);
--- lib/dns/include/dns/view.h.orig 2018-09-11 19:56:29 UTC
--- lib/dns/include/dns/view.h.orig 2018-10-05 18:25:00 UTC
+++ lib/dns/include/dns/view.h
@@ -153,6 +153,8 @@ struct dns_view {
bool requestnsid;
@ -45,7 +45,7 @@
dns_ttl_t maxncachettl;
uint32_t nta_lifetime;
uint32_t nta_recheck;
--- lib/dns/resolver.c.orig 2018-09-11 19:56:29 UTC
--- lib/dns/resolver.c.orig 2018-10-05 18:25:00 UTC
+++ lib/dns/resolver.c
@@ -5758,6 +5758,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
@ -66,9 +66,9 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig 2018-09-11 19:56:29 UTC
--- lib/isccfg/namedconf.c.orig 2018-10-05 18:25:00 UTC
+++ lib/isccfg/namedconf.c
@@ -1920,6 +1920,8 @@ view_clauses[] = {
@@ -1921,6 +1921,8 @@ view_clauses[] = {
{ "max-acache-size", &cfg_type_sizenodefault,
CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },