From nobody Tue Jan 4 22:20:20 2022 X-Original-To: dev-commits-ports-all@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 0A0C31920E85; Tue, 4 Jan 2022 22:20:21 +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 4JT6W85Stxz4mgh; Tue, 4 Jan 2022 22:20:20 +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 9B6EB20FA3; Tue, 4 Jan 2022 22:20:20 +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 204MKKG2069137; Tue, 4 Jan 2022 22:20:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 204MKK9m069134; Tue, 4 Jan 2022 22:20:20 GMT (envelope-from git) Date: Tue, 4 Jan 2022 22:20:20 GMT Message-Id: <202201042220.204MKK9m069134@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 76941a47e63c - main - security/boringssl: update to the recent commit. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76941a47e63c8348bf81c3ad933dda4678486b06 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641334820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q+U3fIhHGohdr12/ek6Ahj04RpLIEcBrcTIvD5qcUH4=; b=kATi6dltqjMNaHeshyVn9390OGNctkqTPtGGAClFVfqTVN7zfkFf33pDiaHt15YeG9NMcI Cpt+C0eIpMszDUF8CHprOYWkMboIRpmJLNPetFi5kjHtOUFr7oub18mFL9iYUCF8Yeuws9 oqg2kpZwGaGaKd3kaTKOT725lQVjVFQEu7z/URjB9pXSh932zKdJJ1kxqHkXLc7RbyWgxc /sfQ0X8x8MmutkVDxJ5eDrrd97HBqQZkSnEed81Ay1MFE1ip3Rms5zf5mDX9I+7GgocyD1 xGffTiJDTcNs5UApUTRXLDXyreLGkxnmj7pNj1v9yyID+RtJ84U5aPi95ZR7bA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641334820; a=rsa-sha256; cv=none; b=wJA/vnUa4QpNUcS/KOyGAtFCPM5tEpwe74YGEibLRIlhqfLhQMHBoogNf6MlFgkOnoQV6M 7M7x6sGaK4J5ZpqL00Dzzs7S6vmkIm96dGLfWt3WXkowRby54/2a+tHjRvV0NC7JCYvXaK Ejp4e7jKNv7Y7OU4F1qp16KGZmDP38HPzVGMQQ9x1z17/iW7W1QW0DLuofAP5Z5Kn8YjK/ SrA+7sHMpwTck/e1hlAmHloB4Y8r0Bs8SS5CMeZZoULmt7aMceIUwfwQ6vy2t3pCLxLsXK bSuzOtloGeF8FLMcnOTh6Y828CCZENaJQBSOL38hxZbWh6I/jVUOASla4hOprw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=76941a47e63c8348bf81c3ad933dda4678486b06 commit 76941a47e63c8348bf81c3ad933dda4678486b06 Author: Sergey A. Osokin AuthorDate: 2022-01-04 22:19:01 +0000 Commit: Sergey A. Osokin CommitDate: 2022-01-04 22:20:11 +0000 security/boringssl: update to the recent commit. Based on patches submitted by: Ashish SHUKLA --- security/boringssl/Makefile | 19 +++++++++++---- security/boringssl/distinfo | 14 ++++++++--- .../files/patch-ssl_test_handshake__util.cc | 28 ++++++++++++++++++++++ .../files/patch-ssl_test_handshake__util.h | 11 +++++++++ 4 files changed, 65 insertions(+), 7 deletions(-) diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile index 7fd734050030..5e774a683ecf 100644 --- a/security/boringssl/Makefile +++ b/security/boringssl/Makefile @@ -1,6 +1,5 @@ PORTNAME= boringssl -PORTVERSION= 0.0.0.0.2020.04.29.01 -PORTREVISION= 1 +PORTVERSION= 0.0.0.0.2021.12.21.01 CATEGORIES= security MAINTAINER= ports@FreeBSD.org @@ -15,12 +14,24 @@ CPE_VENDOR= google USE_GITHUB= yes GH_ACCOUNT= google -GH_TAGNAME= 6a71840 +GH_TAGNAME= 9bcc12d +GH_TUPLE= golang:crypto:c07d793c2f9a:golang_crypto/vendor/golang.org/x/crypto \ + golang:net:04defd469f4e:golang_net/vendor/golang.org/x/net \ + golang:sys:04245dca01da:golang_sys/vendor/golang.org/x/sys \ + golang:term:7de9c90e9dd1:golang_term/vendor/golang.org/x/term CMAKE_ARGS+= -DBUILD_SHARED_LIBS=1 \ -DCMAKE_BUILD_TYPE=Release USE_LDCONFIG= yes -LDFLAGS+= -Wl,-rpath,${PREFIX}/lib +LDFLAGS+= -Wl,-rpath,${LOCALBASE}/lib TEST_TARGET= run_tests +GO_BUILDFLAGS+= -mod=vendor +MAKE_ENV+= GOPATH=${WRKSRC}/vendor GOPROXY=off + +post-patch: + @${GREP} -FRl -- '-D_XOPEN_SOURCE=700' ${WRKSRC} | \ + ${XARGS} ${REINPLACE_CMD} -e 's,-D_XOPEN_SOURCE=700,,' + @${GREP} -FRl '${GO_EXECUTABLE} run ' ${WRKSRC} | \ + ${XARGS} ${REINPLACE_CMD} -r -e 's,([$][{]GO_EXECUTABLE[}] run),\1 ${GO_BUILDFLAGS},' do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tool/bssl ${STAGEDIR}${PREFIX}/bin/ diff --git a/security/boringssl/distinfo b/security/boringssl/distinfo index 5ed4feb25203..e2ac64e11294 100644 --- a/security/boringssl/distinfo +++ b/security/boringssl/distinfo @@ -1,3 +1,11 @@ -TIMESTAMP = 1588184752 -SHA256 (google-boringssl-0.0.0.0.2020.04.29.01-6a71840_GH0.tar.gz) = 2d4c0c64b59ca1346b7e9f4ab3ace7e62a8e7b98b6a778b16016e23d5b94e859 -SIZE (google-boringssl-0.0.0.0.2020.04.29.01-6a71840_GH0.tar.gz) = 26708723 +TIMESTAMP = 1641280446 +SHA256 (google-boringssl-0.0.0.0.2021.12.21.01-9bcc12d_GH0.tar.gz) = 529e77f24d8a1e5286ab9cd1fc649e8ffe484d7d149c4889650067bc2537f274 +SIZE (google-boringssl-0.0.0.0.2021.12.21.01-9bcc12d_GH0.tar.gz) = 30725757 +SHA256 (golang-crypto-c07d793c2f9a_GH0.tar.gz) = bd1e0856c43287c6ebd20d59e2b4f2ffa91c5cc275dbb02bb2cfc822e6dc18a4 +SIZE (golang-crypto-c07d793c2f9a_GH0.tar.gz) = 1732023 +SHA256 (golang-net-04defd469f4e_GH0.tar.gz) = 6009a6f0989341df975799276ff1c49af650d4a4ed3fd6db3501b91eb601810d +SIZE (golang-net-04defd469f4e_GH0.tar.gz) = 1252122 +SHA256 (golang-sys-04245dca01da_GH0.tar.gz) = b90ec2bae1f7e395eb368638a6627199efdc28fa9c592a72aac0ae32351fd5d7 +SIZE (golang-sys-04245dca01da_GH0.tar.gz) = 1231301 +SHA256 (golang-term-7de9c90e9dd1_GH0.tar.gz) = 73603eaab2ab2bfe05061d64ad09f8ed7469de6964a672398f7bf82cffb4b1da +SIZE (golang-term-7de9c90e9dd1_GH0.tar.gz) = 15239 diff --git a/security/boringssl/files/patch-ssl_test_handshake__util.cc b/security/boringssl/files/patch-ssl_test_handshake__util.cc new file mode 100644 index 000000000000..e30126eda3b8 --- /dev/null +++ b/security/boringssl/files/patch-ssl_test_handshake__util.cc @@ -0,0 +1,28 @@ +--- ssl/test/handshake_util.cc.orig 2022-01-03 17:27:50 UTC ++++ ssl/test/handshake_util.cc +@@ -21,8 +21,14 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#endif + #include + #include ++#ifdef __FreeBSD__ ++#include ++#endif + #include + #endif + +@@ -37,6 +43,10 @@ + + #include + #include ++ ++#ifdef __FreeBSD__ ++extern char **environ; ++#endif + + using namespace bssl; + diff --git a/security/boringssl/files/patch-ssl_test_handshake__util.h b/security/boringssl/files/patch-ssl_test_handshake__util.h new file mode 100644 index 000000000000..0c0ef2e8d3bf --- /dev/null +++ b/security/boringssl/files/patch-ssl_test_handshake__util.h @@ -0,0 +1,11 @@ +--- ssl/test/handshake_util.h.orig 2022-01-03 17:26:22 UTC ++++ ssl/test/handshake_util.h +@@ -22,7 +22,7 @@ + #include "settings_writer.h" + + +-#if defined(OPENSSL_LINUX) && !defined(OPENSSL_ANDROID) ++#if defined(OPENSSL_LINUX) || defined(OPENSSL_FREEBSD) && !defined(OPENSSL_ANDROID) + #define HANDSHAKER_SUPPORTED + #endif +