From nobody Thu Oct 28 06:36:58 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AAF1D182A391; Thu, 28 Oct 2021 06:36:58 +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 4Hfwp23M4vz3sJy; Thu, 28 Oct 2021 06:36:58 +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 391FC1F013; Thu, 28 Oct 2021 06:36:58 +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 19S6awH7096834; Thu, 28 Oct 2021 06:36:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19S6awFm096833; Thu, 28 Oct 2021 06:36:58 GMT (envelope-from git) Date: Thu, 28 Oct 2021 06:36:58 GMT Message-Id: <202110280636.19S6awFm096833@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: 5390428a5160 - 2021Q4 - dns/bind916: update to 9.16.22 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 5390428a516077ae48fd9e077f730f156be0ab8e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=5390428a516077ae48fd9e077f730f156be0ab8e commit 5390428a516077ae48fd9e077f730f156be0ab8e Author: Mathieu Arnold AuthorDate: 2021-10-28 06:17:58 +0000 Commit: Mathieu Arnold CommitDate: 2021-10-28 06:36:39 +0000 dns/bind916: update to 9.16.22 MFH: 2021Q4 Security: CVE-2021-25219 (cherry picked from commit 43b84549fb478bdf8cbd77db6f2ca6b84ba22c72) --- dns/bind916/Makefile | 2 +- dns/bind916/distinfo | 6 +++--- dns/bind916/files/extrapatch-bind-min-override-ttl | 12 ++++++------ dns/bind916/files/patch-configure | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile index 3265d09cd51d..d94b6a22822a 100644 --- a/dns/bind916/Makefile +++ b/dns/bind916/Makefile @@ -40,7 +40,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools USES= compiler:c11 cpe libedit pkgconfig ssl tar:xz # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.16.21 +ISCVERSION= 9.16.22 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind916/distinfo b/dns/bind916/distinfo index ce029531078a..3c1f2bc303a4 100644 --- a/dns/bind916/distinfo +++ b/dns/bind916/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632745650 -SHA256 (bind-9.16.21.tar.xz) = 65da5fd4fb80b7d0d7452876f81fd6d67cdcee54a5e3c1d65610334665dfa815 -SIZE (bind-9.16.21.tar.xz) = 5057816 +TIMESTAMP = 1635400990 +SHA256 (bind-9.16.22.tar.xz) = 65e7b2af6479db346e2fc99bcfb6ec3240066468e09dbec575ebc7c57d994061 +SIZE (bind-9.16.22.tar.xz) = 5059000 diff --git a/dns/bind916/files/extrapatch-bind-min-override-ttl b/dns/bind916/files/extrapatch-bind-min-override-ttl index e1f06078adc4..8a588257cc20 100644 --- a/dns/bind916/files/extrapatch-bind-min-override-ttl +++ b/dns/bind916/files/extrapatch-bind-min-override-ttl @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2021-09-07 09:37:05 UTC +--- bin/named/config.c.orig 2021-10-13 10:56:16 UTC +++ bin/named/config.c @@ -180,6 +180,7 @@ options {\n\ notify-source *;\n\ @@ -10,9 +10,9 @@ Add the override-cache-ttl feature. parental-source *;\n\ parental-source-v6 *;\n\ provide-ixfr true;\n\ ---- bin/named/server.c.orig 2021-09-07 09:37:05 UTC +--- bin/named/server.c.orig 2021-10-13 10:56:16 UTC +++ bin/named/server.c -@@ -4411,6 +4411,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4413,6 +4413,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-09-07 09:37:05 UTC +--- lib/dns/include/dns/view.h.orig 2021-10-13 10:56:16 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-09-07 09:37:05 UTC +--- lib/dns/resolver.c.orig 2021-10-13 10:56:16 UTC +++ lib/dns/resolver.c @@ -6476,6 +6476,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } @@ -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 2021-09-07 09:37:05 UTC +--- lib/isccfg/namedconf.c.orig 2021-10-13 10:56:16 UTC +++ lib/isccfg/namedconf.c @@ -2048,6 +2048,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ diff --git a/dns/bind916/files/patch-configure b/dns/bind916/files/patch-configure index de6888343d83..62f59c6713da 100644 --- a/dns/bind916/files/patch-configure +++ b/dns/bind916/files/patch-configure @@ -1,8 +1,8 @@ Fixup gssapi and db detection. ---- configure.orig 2021-06-08 10:45:10 UTC +--- configure.orig 2021-10-13 10:56:16 UTC +++ configure -@@ -17758,27 +17758,9 @@ done +@@ -17760,27 +17760,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -32,7 +32,7 @@ Fixup gssapi and db detection. { $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 -@@ -17821,47 +17803,7 @@ $as_echo "no" >&6; } ;; +@@ -17823,47 +17805,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -81,7 +81,7 @@ Fixup gssapi and db detection. DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -23262,7 +23204,7 @@ $as_echo "" >&6; } +@@ -23264,7 +23206,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh).