From owner-svn-ports-all@freebsd.org Thu Jun 15 11:49:47 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 4C543D887C2; Thu, 15 Jun 2017 11:49:47 +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 23B8672791; Thu, 15 Jun 2017 11:49:47 +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 v5FBnkmR042540; Thu, 15 Jun 2017 11:49:46 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5FBnjI4042535; Thu, 15 Jun 2017 11:49:45 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201706151149.v5FBnjI4042535@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:49:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443619 - in branches/2017Q2/dns/bind9-devel: . files X-SVN-Group: ports-branches 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:49:47 -0000 Author: mat Date: Thu Jun 15 11:49:45 2017 New Revision: 443619 URL: https://svnweb.freebsd.org/changeset/ports/443619 Log: MFH: r439274 r439940 r440485 r440934 r441454 r441983 r442751 r443618 Update to latest commit. Security: CVE-2017-3140 Security: CVE-2017-3141 Sponsored by: Absolight Modified: branches/2017Q2/dns/bind9-devel/Makefile branches/2017Q2/dns/bind9-devel/distinfo branches/2017Q2/dns/bind9-devel/files/extrapatch-bind-min-override-ttl branches/2017Q2/dns/bind9-devel/files/patch-configure branches/2017Q2/dns/bind9-devel/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/dns/bind9-devel/Makefile ============================================================================== --- branches/2017Q2/dns/bind9-devel/Makefile Thu Jun 15 11:46:29 2017 (r443618) +++ branches/2017Q2/dns/bind9-devel/Makefile Thu Jun 15 11:49:45 2017 (r443619) @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc PORTREVISION= 0 .else # dns/bind9xx here -PORTREVISION= 2 +PORTREVISION= 0 .endif CATEGORIES= dns net ipv6 MASTER_SITES= LOCAL/mat/bind @@ -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.04.20 -HASH= 706c6ac5 +ISCVERSION= 9.12.0a.2017.06.14 +HASH= d6b626e USES= cpe libedit @@ -278,8 +278,8 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ \ - ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \ + ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .endif # BIND_TOOLS_SLAVE # Can't use USE_PYTHON=autoplist Modified: branches/2017Q2/dns/bind9-devel/distinfo ============================================================================== --- branches/2017Q2/dns/bind9-devel/distinfo Thu Jun 15 11:46:29 2017 (r443618) +++ branches/2017Q2/dns/bind9-devel/distinfo Thu Jun 15 11:49:45 2017 (r443619) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492693611 -SHA256 (bind9-706c6ac5.tar.gz) = ea2efadf91f26b97fbd4e79a6ce22dfd680440c3f76e2d8219a7208e989b087d -SIZE (bind9-706c6ac5.tar.gz) = 11874695 +TIMESTAMP = 1497526827 +SHA256 (bind9-d6b626e.tar.gz) = 4c665fb50d3360510754fe27de6117827d04bf075300518943012a995b1cf52a +SIZE (bind9-d6b626e.tar.gz) = 11875169 Modified: branches/2017Q2/dns/bind9-devel/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2017Q2/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Thu Jun 15 11:46:29 2017 (r443618) +++ branches/2017Q2/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Thu Jun 15 11:49:45 2017 (r443619) @@ -1,6 +1,6 @@ ---- bin/named/config.c.orig 2017-04-20 07:59:45 UTC +--- bin/named/config.c.orig 2017-06-14 01:08:21 UTC +++ bin/named/config.c -@@ -158,6 +158,8 @@ options {\n\ +@@ -155,6 +155,8 @@ options {\n\ lame-ttl 600;\n\ servfail-ttl 1;\n\ max-ncache-ttl 10800; /* 3 hours */\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-20 07:59:45 UTC +--- bin/named/server.c.orig 2017-06-14 01:08:21 UTC +++ bin/named/server.c -@@ -3751,6 +3751,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3713,6 +3713,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -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-04-20 07:59:45 UTC +--- lib/dns/include/dns/view.h.orig 2017-06-14 01:08:21 UTC +++ lib/dns/include/dns/view.h -@@ -146,6 +146,8 @@ struct dns_view { +@@ -143,6 +143,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-04-20 07:59:45 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,11 +60,11 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2017-04-20 07:59:45 UTC +--- lib/isccfg/namedconf.c.orig 2017-06-14 01:08:21 UTC +++ lib/isccfg/namedconf.c -@@ -1882,6 +1882,8 @@ view_clauses[] = { - { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, - { "max-acache-size", &cfg_type_sizenodefault, 0 }, +@@ -1893,6 +1893,8 @@ view_clauses[] = { + { "max-acache-size", &cfg_type_sizenodefault, + CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, + { "override-cache-ttl", &cfg_type_uint32, 0 }, + { "min-cache-ttl", &cfg_type_uint32, 0 }, Modified: branches/2017Q2/dns/bind9-devel/files/patch-configure ============================================================================== --- branches/2017Q2/dns/bind9-devel/files/patch-configure Thu Jun 15 11:46:29 2017 (r443618) +++ branches/2017Q2/dns/bind9-devel/files/patch-configure Thu Jun 15 11:49:45 2017 (r443619) @@ -1,6 +1,6 @@ ---- configure.orig 2017-04-13 01:05:08 UTC +--- configure.orig 2017-05-12 01:09:53 UTC +++ configure -@@ -14401,27 +14401,9 @@ done +@@ -14402,27 +14402,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -30,7 +30,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -14464,47 +14446,7 @@ $as_echo "no" >&6; } ;; +@@ -14465,47 +14447,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -79,7 +79,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -22666,7 +22608,7 @@ $as_echo "" >&6; } +@@ -22825,7 +22767,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: branches/2017Q2/dns/bind9-devel/pkg-plist ============================================================================== --- branches/2017Q2/dns/bind9-devel/pkg-plist Thu Jun 15 11:46:29 2017 (r443618) +++ branches/2017Q2/dns/bind9-devel/pkg-plist Thu Jun 15 11:49:45 2017 (r443619) @@ -12,7 +12,6 @@ bin/nsupdate include/bind9/check.h include/bind9/getaddresses.h include/bind9/version.h -include/dns/acache.h include/dns/acl.h include/dns/adb.h include/dns/badcache.h