From owner-svn-ports-all@freebsd.org Thu Jun 18 08:29:58 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3A5533488F1; Thu, 18 Jun 2020 08:29:58 +0000 (UTC) (envelope-from philip@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49nZqp0kQGz4JFM; Thu, 18 Jun 2020 08:29:58 +0000 (UTC) (envelope-from philip@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0FE762E0B7; Thu, 18 Jun 2020 08:29:58 +0000 (UTC) (envelope-from philip@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05I8TvAC095917; Thu, 18 Jun 2020 08:29:57 GMT (envelope-from philip@FreeBSD.org) Received: (from philip@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05I8Tvj4095914; Thu, 18 Jun 2020 08:29:57 GMT (envelope-from philip@FreeBSD.org) Message-Id: <202006180829.05I8Tvj4095914@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: philip set sender to philip@FreeBSD.org using -f From: Philip Paeps Date: Thu, 18 Jun 2020 08:29:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r539535 - in branches/2020Q2/dns/bind911: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: philip X-SVN-Commit-Paths: in branches/2020Q2/dns/bind911: . files X-SVN-Commit-Revision: 539535 X-SVN-Commit-Repository: ports 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.33 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, 18 Jun 2020 08:29:58 -0000 Author: philip Date: Thu Jun 18 08:29:57 2020 New Revision: 539535 URL: https://svnweb.freebsd.org/changeset/ports/539535 Log: MFH: r539519 dns/bind911: update to 9.11.20. Security: CVE-2020-8619 Submitted by: mat (maintainer) Approved by: ports-secteam (joneum) Modified: branches/2020Q2/dns/bind911/Makefile branches/2020Q2/dns/bind911/distinfo branches/2020Q2/dns/bind911/files/extrapatch-bind-min-override-ttl branches/2020Q2/dns/bind911/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/dns/bind911/Makefile ============================================================================== --- branches/2020Q2/dns/bind911/Makefile Thu Jun 18 08:22:04 2020 (r539534) +++ branches/2020Q2/dns/bind911/Makefile Thu Jun 18 08:29:57 2020 (r539535) @@ -3,6 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} +PORTREVISION= 0 CATEGORIES= dns net MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 911 @@ -23,7 +24,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools USES= cpe libedit pkgconfig # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.19 +ISCVERSION= 9.11.20 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} Modified: branches/2020Q2/dns/bind911/distinfo ============================================================================== --- branches/2020Q2/dns/bind911/distinfo Thu Jun 18 08:22:04 2020 (r539534) +++ branches/2020Q2/dns/bind911/distinfo Thu Jun 18 08:29:57 2020 (r539535) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589559723 -SHA256 (bind-9.11.19.tar.gz) = 0dee554a4caa368948b32da9a0c97b516c19103bc13ff5b3762c5d8552f52329 -SIZE (bind-9.11.19.tar.gz) = 8230483 +TIMESTAMP = 1592316422 +SHA256 (bind-9.11.20.tar.gz) = 306831a738a275693bbe1d6839a09b34a2c8b5c26f8a42ea57ef000a6a99c2b6 +SIZE (bind-9.11.20.tar.gz) = 8244703 Modified: branches/2020Q2/dns/bind911/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2020Q2/dns/bind911/files/extrapatch-bind-min-override-ttl Thu Jun 18 08:22:04 2020 (r539534) +++ branches/2020Q2/dns/bind911/files/extrapatch-bind-min-override-ttl Thu Jun 18 08:29:57 2020 (r539535) @@ -1,7 +1,7 @@ - Add the min-cache-ttl config knob. - Add the override-cache-ttl config knob. ---- bin/named/config.c.orig 2020-05-06 12:50:24 UTC +--- bin/named/config.c.orig 2020-06-10 18:00:37 UTC +++ bin/named/config.c @@ -182,6 +182,8 @@ options {\n\ " max-acache-size 16M;\n\ @@ -12,7 +12,7 @@ max-clients-per-query 100;\n\ max-ncache-ttl 10800; /* 3 hours */\n\ max-recursion-depth 7;\n\ ---- bin/named/server.c.orig 2020-05-06 12:50:24 UTC +--- bin/named/server.c.orig 2020-06-10 18:00:37 UTC +++ bin/named/server.c @@ -3720,6 +3720,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } @@ -31,7 +31,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 2020-05-06 12:50:24 UTC +--- lib/dns/include/dns/view.h.orig 2020-06-10 18:00:37 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,8 @@ struct dns_view { bool requestnsid; @@ -42,9 +42,9 @@ dns_ttl_t maxncachettl; uint32_t nta_lifetime; uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2020-05-06 12:50:24 UTC +--- lib/dns/resolver.c.orig 2020-06-10 18:00:37 UTC +++ lib/dns/resolver.c -@@ -5553,6 +5553,18 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -5549,6 +5549,18 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } /* @@ -63,7 +63,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2020-05-06 12:50:24 UTC +--- lib/isccfg/namedconf.c.orig 2020-06-10 18:00:37 UTC +++ lib/isccfg/namedconf.c @@ -1773,6 +1773,8 @@ view_clauses[] = { #endif Modified: branches/2020Q2/dns/bind911/pkg-plist ============================================================================== --- branches/2020Q2/dns/bind911/pkg-plist Thu Jun 18 08:22:04 2020 (r539534) +++ branches/2020Q2/dns/bind911/pkg-plist Thu Jun 18 08:29:57 2020 (r539535) @@ -223,6 +223,7 @@ include/isc/time.h include/isc/timer.h include/isc/tm.h include/isc/types.h +include/isc/utf8.h include/isc/util.h include/isc/version.h include/isc/xml.h