diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2015-11-16 14:59:01 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-11-16 14:59:01 +0000 |
commit | ad02e0f4df850839dd4dca8beb1dedc41db444d3 (patch) | |
tree | 28fbbe3a79057e2b5a38fb5d7165eac9c56a5862 /dns | |
parent | Update to v5.23.4-119-g0632167. (diff) |
Update to commit 2df6324.
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=401766
Diffstat (limited to 'dns')
-rw-r--r-- | dns/bind9-devel/Makefile | 4 | ||||
-rw-r--r-- | dns/bind9-devel/distinfo | 4 | ||||
-rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 42 |
3 files changed, 25 insertions, 25 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 8d0a39d46c4b..e9e4b5d7270b 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -19,8 +19,8 @@ COMMENT= BIND DNS suite with updated DNSSEC and DNS64 LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.0.a20151109 -HASH= e13d04f +ISCVERSION= 9.11.0.a20151116 +HASH= 2df6324 MAKE_JOBS_UNSAFE= yes diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index 64b08a8245e2..0b47852efe3f 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (bind9-e13d04f.tar.gz) = a1d58d7498c9603e2951d834547b33c50f1f4cee7d1543d65c335af0498db62e -SIZE (bind9-e13d04f.tar.gz) = 10994697 +SHA256 (bind9-2df6324.tar.gz) = e6ea70f7939067f8942e6d95f0c3e8c31f7a427ad0ba6ce54f9125dff06ecda0 +SIZE (bind9-2df6324.tar.gz) = 10996063 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index e480bec52c90..027675dc7ee3 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,20 +1,19 @@ -diff -Nabdur bind-9.6.0-P1.orig/bin/named/config.c bind-9.6.0-P1/bin/named/config.c ---- bin/named/config.c 2009-05-22 12:24:49.000000000 +0400 -+++ bin/named/config.c 2009-05-22 12:31:35.000000000 +0400 -@@ -129,6 +129,8 @@ - min-roots 2;\n\ +--- bin/named/config.c.orig 2015-11-11 11:38:39 UTC ++++ bin/named/config.c +@@ -158,6 +158,8 @@ options {\n\ lame-ttl 600;\n\ + servfail-ttl 1;\n\ max-ncache-ttl 10800; /* 3 hours */\n\ + override-cache-ttl 0; /* do not override */\n\ + min-cache-ttl 0; /* no minimal, zero is allowed */\n\ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ + max-cache-size 90%;\n\ max-cache-size 0;\n\ -diff -Nabdur bind-9.6.0-P1.orig/bin/named/server.c bind-9.6.0-P1/bin/named/server.c ---- bin/named/server.c 2009-05-22 12:24:49.000000000 +0400 -+++ bin/named/server.c 2009-05-22 12:32:18.000000000 +0400 -@@ -1727,6 +1727,16 @@ - CHECK(mustbesecure(obj, view->resolver)); +--- bin/named/server.c.orig 2015-11-11 11:38:39 UTC ++++ bin/named/server.c +@@ -3020,6 +3020,16 @@ configure_view(dns_view_t *view, dns_vie + } obj = NULL; + result = ns_config_get(maps, "override-cache-ttl", &obj); @@ -30,22 +29,22 @@ diff -Nabdur bind-9.6.0-P1.orig/bin/named/server.c bind-9.6.0-P1/bin/named/serve result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); -diff -Nabdur bind-9.6.0-P1.orig/lib/dns/include/dns/view.h bind-9.6.0-P1/lib/dns/include/dns/view.h ---- lib/dns/include/dns/view.h 2009-05-22 12:24:49.000000000 +0400 -+++ lib/dns/include/dns/view.h 2009-05-22 12:29:03.000000000 +0400 -@@ -131,6 +131,8 @@ - isc_boolean_t provideixfr; + view->maxcachettl = cfg_obj_asuint32(obj); +--- lib/dns/include/dns/view.h.orig 2015-11-11 11:38:39 UTC ++++ lib/dns/include/dns/view.h +@@ -152,6 +152,8 @@ struct dns_view { isc_boolean_t requestnsid; + isc_boolean_t sendcookie; dns_ttl_t maxcachettl; + dns_ttl_t mincachettl; + dns_ttl_t overridecachettl; dns_ttl_t maxncachettl; - in_port_t dstport; + isc_uint32_t nta_lifetime; + isc_uint32_t nta_recheck; dns_aclenv_t aclenv; -diff -Nabdur bind-9.6.0-P1.orig/lib/dns/resolver.c bind-9.6.0-P1/lib/dns/resolver.c ---- lib/dns/resolver.c 2009-05-22 12:24:49.000000000 +0400 -+++ lib/dns/resolver.c 2009-05-22 12:30:41.000000000 +0400 -@@ -4054,6 +4054,18 @@ +--- lib/dns/resolver.c.orig 2015-11-11 11:38:39 UTC ++++ lib/dns/resolver.c +@@ -5397,6 +5397,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -64,7 +63,8 @@ diff -Nabdur bind-9.6.0-P1.orig/lib/dns/resolver.c bind-9.6.0-P1/lib/dns/resolve * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2015-11-05 13:15:23 UTC + if (rdataset->ttl > res->view->maxcachettl) +--- lib/isccfg/namedconf.c.orig 2015-11-11 11:38:39 UTC +++ lib/isccfg/namedconf.c @@ -1676,6 +1676,8 @@ view_clauses[] = { { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, |