From nobody Thu Oct 28 06:36:56 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 47C10182A2AF; Thu, 28 Oct 2021 06:36:57 +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 4Hfwp117sjz3sDB; Thu, 28 Oct 2021 06:36:57 +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 07A1C1EEA9; Thu, 28 Oct 2021 06:36:57 +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 19S6auq5096803; Thu, 28 Oct 2021 06:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19S6auU6096802; Thu, 28 Oct 2021 06:36:56 GMT (envelope-from git) Date: Thu, 28 Oct 2021 06:36:56 GMT Message-Id: <202110280636.19S6auU6096802@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: e9bd5d3360e6 - 2021Q4 - dns/bind911: update to 9.11.36 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: e9bd5d3360e6bf3231432d074b95afede503c504 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9bd5d3360e6bf3231432d074b95afede503c504 commit e9bd5d3360e6bf3231432d074b95afede503c504 Author: Mathieu Arnold AuthorDate: 2021-10-28 06:16:46 +0000 Commit: Mathieu Arnold CommitDate: 2021-10-28 06:36:11 +0000 dns/bind911: update to 9.11.36 MFH: 2021Q4 Security: CVE-2021-25219 (cherry picked from commit b9bbd21cc84bb74418740be410cdd309d9c276c1) --- dns/bind911/Makefile | 2 +- dns/bind911/distinfo | 6 +++--- dns/bind911/files/patch-configure | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile index 597cda4b01f5..52c3483588ba 100644 --- a/dns/bind911/Makefile +++ b/dns/bind911/Makefile @@ -23,7 +23,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.35 +ISCVERSION= 9.11.36 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind911/distinfo b/dns/bind911/distinfo index e632a7c458fc..5af44adcefb6 100644 --- a/dns/bind911/distinfo +++ b/dns/bind911/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629962750 -SHA256 (bind-9.11.35.tar.gz) = 1c882705827b6aafa45d917ae3b20eccccc8d5df3c4477df44b04382e6c47562 -SIZE (bind-9.11.35.tar.gz) = 8308926 +TIMESTAMP = 1635400901 +SHA256 (bind-9.11.36.tar.gz) = c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681 +SIZE (bind-9.11.36.tar.gz) = 8313276 diff --git a/dns/bind911/files/patch-configure b/dns/bind911/files/patch-configure index 86334b22b29a..4c0a1ea036fd 100644 --- a/dns/bind911/files/patch-configure +++ b/dns/bind911/files/patch-configure @@ -3,9 +3,9 @@ - Make sure only json-c is detected. - Cleanup the BDB discovery code to find more recent versions. ---- configure.orig 2021-07-09 08:55:20 UTC +--- configure.orig 2021-10-11 19:35:49 UTC +++ configure -@@ -15744,27 +15744,9 @@ done +@@ -15691,27 +15691,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -35,7 +35,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 -@@ -15807,47 +15789,7 @@ $as_echo "no" >&6; } ;; +@@ -15754,47 +15736,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -84,7 +84,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -18722,7 +18664,7 @@ case "$use_libjson" in +@@ -18669,7 +18611,7 @@ case "$use_libjson" in auto|yes) for d in /usr /usr/local /opt/local do @@ -93,7 +93,7 @@ then if test ${d} != /usr then -@@ -18730,29 +18672,16 @@ case "$use_libjson" in +@@ -18677,29 +18619,16 @@ case "$use_libjson" in LIBS="$LIBS -L${d}/lib" fi have_libjson="yes" @@ -124,7 +124,7 @@ have_libjson_c="yes" else as_fn_error $? "$use_libjson/include/json{,-c}/json.h not found." "$LINENO" 5 -@@ -25019,7 +24948,7 @@ $as_echo "" >&6; } +@@ -24966,7 +24895,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh).