From owner-dev-commits-ports-branches@freebsd.org Sat Jul 24 11:45:54 2021 Return-Path: Delivered-To: dev-commits-ports-branches@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 48B8F65F343; Sat, 24 Jul 2021 11:45:54 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GX4Bp1D2mz4ZwL; Sat, 24 Jul 2021 11:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EABC37A7B; Sat, 24 Jul 2021 11:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16OBjrkE097568; Sat, 24 Jul 2021 11:45:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16OBjrDO097567; Sat, 24 Jul 2021 11:45:53 GMT (envelope-from git) Date: Sat, 24 Jul 2021 11:45:53 GMT Message-Id: <202107241145.16OBjrDO097567@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mathieu Arnold Subject: git: ec77d013f3dc - 2021Q3 - dns/bind916: Fix patch MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: ec77d013f3dcaff9d26df54b38d624bc7de62a91 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jul 2021 11:45:54 -0000 The branch 2021Q3 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec77d013f3dcaff9d26df54b38d624bc7de62a91 commit ec77d013f3dcaff9d26df54b38d624bc7de62a91 Author: Mathieu Arnold AuthorDate: 2021-07-24 11:39:55 +0000 Commit: Mathieu Arnold CommitDate: 2021-07-24 11:45:37 +0000 dns/bind916: Fix patch Pointy hat: mat (cherry picked from commit 8d1799264b126343b400fe22a73c90882da7fe9b) --- dns/bind916/files/extrapatch-bind-min-override-ttl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dns/bind916/files/extrapatch-bind-min-override-ttl b/dns/bind916/files/extrapatch-bind-min-override-ttl index 36e82c339d80..1dce8f15d7d6 100644 --- a/dns/bind916/files/extrapatch-bind-min-override-ttl +++ b/dns/bind916/files/extrapatch-bind-min-override-ttl @@ -1,18 +1,18 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2021-06-08 10:45:10 UTC +--- bin/named/config.c.orig 2021-07-09 08:02:03 UTC +++ bin/named/config.c @@ -180,6 +180,7 @@ options {\n\ notify-source *;\n\ notify-source-v6 *;\n\ nsec3-test-zone no;\n\ + override-cache-ttl 0; /* do not override */\n\ + parental-source *;\n\ + parental-source-v6 *;\n\ provide-ixfr true;\n\ - qname-minimization relaxed;\n\ - query-source address *;\n\ ---- bin/named/server.c.orig 2021-06-08 10:45:10 UTC +--- bin/named/server.c.orig 2021-07-09 08:02:03 UTC +++ bin/named/server.c -@@ -4364,6 +4364,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4406,6 +4406,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 2021-06-08 10:45:10 UTC +--- lib/dns/include/dns/view.h.orig 2021-07-09 08:02:03 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,7 @@ struct dns_view { bool requestnsid; @@ -34,7 +34,7 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2021-06-08 10:45:10 UTC +--- lib/dns/resolver.c.orig 2021-07-09 08:02:03 UTC +++ lib/dns/resolver.c @@ -6476,6 +6476,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } @@ -49,9 +49,9 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2021-06-08 10:45:10 UTC +--- lib/isccfg/namedconf.c.orig 2021-07-09 08:02:03 UTC +++ lib/isccfg/namedconf.c -@@ -2047,6 +2047,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -2048,6 +2048,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 },