From owner-svn-ports-head@freebsd.org Mon Sep 7 15:13:32 2020 Return-Path: Delivered-To: svn-ports-head@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 81E8C3CC84B; Mon, 7 Sep 2020 15:13:32 +0000 (UTC) (envelope-from mat@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 4BlWy430zNz4FhG; Mon, 7 Sep 2020 15:13:32 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BABB211F3; Mon, 7 Sep 2020 15:13:32 +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 087FDWdZ057998; Mon, 7 Sep 2020 15:13:32 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 087FDVAU057995; Mon, 7 Sep 2020 15:13:31 GMT (envelope-from mat@FreeBSD.org) Message-Id: <202009071513.087FDVAU057995@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 7 Sep 2020 15:13:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547896 - in head/dns/bind9-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/dns/bind9-devel: . files X-SVN-Commit-Revision: 547896 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2020 15:13:32 -0000 Author: mat Date: Mon Sep 7 15:13:31 2020 New Revision: 547896 URL: https://svnweb.freebsd.org/changeset/ports/547896 Log: Update to latest commit. 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 Mon Sep 7 15:13:13 2020 (r547895) +++ head/dns/bind9-devel/Makefile Mon Sep 7 15:13:31 2020 (r547896) @@ -9,7 +9,7 @@ PORTREVISION= 0 .else # XXX: correct version # dns/bind9xx here -PORTREVISION= 2 +PORTREVISION= 0 .endif CATEGORIES= dns net # XXX: put the ISC master_site @@ -48,13 +48,13 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools # XXX: remove tar:bz2 USES= autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:bz2 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.17.4a0.2020.08.31 +ISCVERSION= 9.17.4a0.2020.09.04 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= 96c4010fe5cc08b9a4cf208962df64fd85bfb781 +GL_COMMIT= 4ed3238eace80c3701c6bbf6457e09201d5a9262 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} Modified: head/dns/bind9-devel/distinfo ============================================================================== --- head/dns/bind9-devel/distinfo Mon Sep 7 15:13:13 2020 (r547895) +++ head/dns/bind9-devel/distinfo Mon Sep 7 15:13:31 2020 (r547896) @@ -1,3 +1,3 @@ -TIMESTAMP = 1598874594 -SHA256 (isc-projects-bind9-96c4010fe5cc08b9a4cf208962df64fd85bfb781_GL0.tar.gz) = 1586b5d8f0b322ff95f927e933f84fe3085873adc985f2f063f8a68deddcacd9 -SIZE (isc-projects-bind9-96c4010fe5cc08b9a4cf208962df64fd85bfb781_GL0.tar.gz) = 4339850 +TIMESTAMP = 1599490624 +SHA256 (isc-projects-bind9-4ed3238eace80c3701c6bbf6457e09201d5a9262_GL0.tar.gz) = 6640ace40e2386cbe3a86e183cc2d092c8ac52f096baa56a4dfd2c6e9a2f03dc +SIZE (isc-projects-bind9-4ed3238eace80c3701c6bbf6457e09201d5a9262_GL0.tar.gz) = 4342623 Modified: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon Sep 7 15:13:13 2020 (r547895) +++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon Sep 7 15:13:31 2020 (r547896) @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2020-08-24 11:39:18 UTC +--- bin/named/config.c.orig 2020-09-04 21:22:20 UTC +++ bin/named/config.c @@ -180,6 +180,7 @@ options {\n\ notify-source *;\n\ @@ -10,9 +10,9 @@ Add the override-cache-ttl feature. provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2020-08-24 11:39:18 UTC +--- bin/named/server.c.orig 2020-09-04 21:22:20 UTC +++ bin/named/server.c -@@ -4334,6 +4334,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4343,6 +4343,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -24,7 +24,7 @@ Add the override-cache-ttl feature. result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asduration(obj); ---- lib/dns/include/dns/view.h.orig 2020-08-24 11:39:18 UTC +--- lib/dns/include/dns/view.h.orig 2020-09-04 21:22:20 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,7 @@ struct dns_view { bool requestnsid; @@ -34,9 +34,9 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2020-08-24 11:39:18 UTC +--- lib/dns/resolver.c.orig 2020-09-04 21:22:20 UTC +++ lib/dns/resolver.c -@@ -6256,6 +6256,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -6263,6 +6263,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } /* @@ -49,7 +49,7 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2020-08-24 11:39:18 UTC +--- lib/isccfg/namedconf.c.orig 2020-09-04 21:22:20 UTC +++ lib/isccfg/namedconf.c @@ -1993,6 +1993,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */