From d9bb90bf798bd31094ae54e61095c4830e6c32fd Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Wed, 28 Sep 2016 13:02:27 +0000 Subject: MFH: r422868 Update to latest commit. Security: CVE-2016-2776 Sponsored by: Absolight --- dns/bind9-devel/Makefile | 4 ++-- dns/bind9-devel/distinfo | 6 +++--- 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 7adcd218d88e..980c60feeac2 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -16,8 +16,8 @@ COMMENT= BIND DNS suite with updated DNSSEC and DNS64 LICENSE= MPL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.12.0a.2016.07.14 -HASH= 203b693 +ISCVERSION= 9.12.0a.2016.09.27 +HASH= e9917a5 MAKE_JOBS_UNSAFE= yes diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index fbebb2054ea7..0b1d439d5f6d 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1468926927 -SHA256 (bind9-203b693.tar.gz) = 1702e2e597c88234c319b2ab83a286e28e6e58e23790858d0165dee6de1f5957 -SIZE (bind9-203b693.tar.gz) = 11763050 +TIMESTAMP = 1475066593 +SHA256 (bind9-e9917a5.tar.gz) = 1f94fa4f291b4a1b6774730d3c6fd92d484b9658cc6f76e6dce63e5e3bfb6769 +SIZE (bind9-e9917a5.tar.gz) = 11799940 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 7639b30ad451..121d7725a780 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2016-07-14 05:13:57 UTC +--- bin/named/config.c.orig 2016-09-28 03:45:58 UTC +++ bin/named/config.c @@ -151,6 +151,8 @@ options {\n\ lame-ttl 600;\n\ @@ -9,9 +9,9 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 90%;\n\ ---- bin/named/server.c.orig 2016-07-14 05:13:57 UTC +--- bin/named/server.c.orig 2016-09-28 03:45:58 UTC +++ bin/named/server.c -@@ -3549,6 +3549,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3638,6 +3638,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -28,7 +28,7 @@ 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 2016-07-14 05:13:57 UTC +--- lib/dns/include/dns/view.h.orig 2016-09-28 03:45:58 UTC +++ lib/dns/include/dns/view.h @@ -145,6 +145,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -39,7 +39,7 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2016-07-14 05:13:57 UTC +--- lib/dns/resolver.c.orig 2016-09-28 03:45:58 UTC +++ lib/dns/resolver.c @@ -5431,6 +5431,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } @@ -60,7 +60,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2016-07-14 05:13:57 UTC +--- lib/isccfg/namedconf.c.orig 2016-09-28 03:45:58 UTC +++ lib/isccfg/namedconf.c @@ -1707,6 +1707,8 @@ view_clauses[] = { { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, -- cgit v1.2.3