From owner-svn-ports-all@freebsd.org Thu Jun 15 11:46:31 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 788D9D88644; Thu, 15 Jun 2017 11:46:31 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 52A207261A; Thu, 15 Jun 2017 11:46:31 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5FBkUMJ042132; Thu, 15 Jun 2017 11:46:30 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5FBkUc0042130; Thu, 15 Jun 2017 11:46:30 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201706151146.v5FBkUc0042130@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 15 Jun 2017 11:46:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r443618 - in head/dns/bind9-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jun 2017 11:46:31 -0000 Author: mat Date: Thu Jun 15 11:46:29 2017 New Revision: 443618 URL: https://svnweb.freebsd.org/changeset/ports/443618 Log: Update to latest commit. MFH: 2017Q2 Security: CVE-2017-3140 Security: CVE-2017-3141 Sponsored by: Absolight Modified: head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind9-devel/distinfo (contents, props changed) head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl (contents, props changed) Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Thu Jun 15 11:13:47 2017 (r443617) +++ head/dns/bind9-devel/Makefile Thu Jun 15 11:46:29 2017 (r443618) @@ -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.05.30 -HASH= aa3a897 +ISCVERSION= 9.12.0a.2017.06.14 +HASH= d6b626e USES= cpe libedit Modified: head/dns/bind9-devel/distinfo ============================================================================== --- head/dns/bind9-devel/distinfo Thu Jun 15 11:13:47 2017 (r443617) +++ head/dns/bind9-devel/distinfo Thu Jun 15 11:46:29 2017 (r443618) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496736164 -SHA256 (bind9-aa3a897.tar.gz) = 2845f6b02275bc9edcbf73f39771d25853a31e5c5574d9e9932439f6832391dd -SIZE (bind9-aa3a897.tar.gz) = 11871283 +TIMESTAMP = 1497526827 +SHA256 (bind9-d6b626e.tar.gz) = 4c665fb50d3360510754fe27de6117827d04bf075300518943012a995b1cf52a +SIZE (bind9-d6b626e.tar.gz) = 11875169 Modified: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Thu Jun 15 11:13:47 2017 (r443617) +++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Thu Jun 15 11:46:29 2017 (r443618) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2017-04-24 07:26:47 UTC +--- bin/named/config.c.orig 2017-06-14 01:08:21 UTC +++ bin/named/config.c @@ -155,6 +155,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 2017-04-24 07:26:47 UTC +--- bin/named/server.c.orig 2017-06-14 01:08:21 UTC +++ bin/named/server.c -@@ -3702,6 +3702,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3713,6 +3713,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 2017-04-24 07:26:47 UTC +--- lib/dns/include/dns/view.h.orig 2017-06-14 01:08:21 UTC +++ lib/dns/include/dns/view.h @@ -143,6 +143,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 2017-04-24 07:26:47 UTC +--- lib/dns/resolver.c.orig 2017-06-14 01:08:21 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-04-24 07:26:47 UTC +--- lib/isccfg/namedconf.c.orig 2017-06-14 01:08:21 UTC +++ lib/isccfg/namedconf.c -@@ -1887,6 +1887,8 @@ view_clauses[] = { +@@ -1893,6 +1893,8 @@ view_clauses[] = { { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 },