Update to latest commit.

Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2017-07-31 10:43:55 +00:00
parent f930be27a9
commit 14a6f9a666
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=446953
3 changed files with 13 additions and 13 deletions

View file

@ -31,8 +31,8 @@ LICENSE= MPL
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.12.0a.2017.07.24
HASH= fd0039f
ISCVERSION= 9.12.0a.2017.07.29
HASH= 93ae9a0
USES= cpe libedit

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1500984576
SHA256 (bind9-fd0039f.tar.gz) = 10b3f2826c9cf513a7ffe4269d0454948b54ce2c1392c8e9e5fa567f8169a43d
SIZE (bind9-fd0039f.tar.gz) = 11882769
TIMESTAMP = 1501497412
SHA256 (bind9-93ae9a0.tar.gz) = 3796835eae382f9e299008d5cf1f2e2285e58029590c951d9c9cde5ca4a61fc0
SIZE (bind9-93ae9a0.tar.gz) = 11886050

View file

@ -1,6 +1,6 @@
--- bin/named/config.c.orig 2017-07-16 20:56:30 UTC
--- bin/named/config.c.orig 2017-07-29 01:10:15 UTC
+++ bin/named/config.c
@@ -155,6 +155,8 @@ options {\n\
@@ -156,6 +156,8 @@ options {\n\
lame-ttl 600;\n\
servfail-ttl 1;\n\
max-ncache-ttl 10800; /* 3 hours */\n\
@ -9,7 +9,7 @@
max-cache-ttl 604800; /* 1 week */\n\
transfer-format many-answers;\n\
max-cache-size 90%;\n\
--- bin/named/server.c.orig 2017-07-16 20:56:30 UTC
--- bin/named/server.c.orig 2017-07-29 01:10:15 UTC
+++ bin/named/server.c
@@ -3722,6 +3722,16 @@ configure_view(dns_view_t *view, dns_vie
}
@ -28,9 +28,9 @@
result = ns_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 2017-07-16 20:56:30 UTC
--- lib/dns/include/dns/view.h.orig 2017-07-29 01:10:15 UTC
+++ lib/dns/include/dns/view.h
@@ -143,6 +143,8 @@ struct dns_view {
@@ -144,6 +144,8 @@ struct dns_view {
isc_boolean_t requestnsid;
isc_boolean_t sendcookie;
dns_ttl_t maxcachettl;
@ -39,7 +39,7 @@
dns_ttl_t maxncachettl;
isc_uint32_t nta_lifetime;
isc_uint32_t nta_recheck;
--- lib/dns/resolver.c.orig 2017-07-16 20:56:30 UTC
--- lib/dns/resolver.c.orig 2017-07-29 01:10:15 UTC
+++ lib/dns/resolver.c
@@ -5468,6 +5468,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
@ -60,9 +60,9 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl)
--- lib/isccfg/namedconf.c.orig 2017-07-16 20:56:30 UTC
--- lib/isccfg/namedconf.c.orig 2017-07-29 01:10:15 UTC
+++ lib/isccfg/namedconf.c
@@ -1893,6 +1893,8 @@ view_clauses[] = {
@@ -1894,6 +1894,8 @@ view_clauses[] = {
{ "max-acache-size", &cfg_type_sizenodefault,
CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },