From nobody Tue Jul 26 15:58:14 2022 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 4LshQb12Gjz4XNh3; Tue, 26 Jul 2022 15:58:15 +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 4LshQb0Skmz3S9D; Tue, 26 Jul 2022 15:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658851095; 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=+hCbIBXCLmuqJIYHoJIGrxBGRwR6Yxv3RgLIFdl2vtM=; b=r+WMtNQxnUjpls/vzgfrbAHVT7tD9HaeVWEhfy4L+ZgIwt0c64h7mhew4eS8eUaKZQGx2O J0e8a5R//PtnyPU38ZRRNsuy+mqPefih8BscXFHANNB+rKeUB4B39XE+gT8Y49UJoGmIqL pJU60cGpnLtSf9NelOF4R/nNoyXVfWctgeexmp4EqSI+v+KnWG/XqmMfhk8BATQm8qavHL zI5myHO+eKIWFBPJR9cJqhosTMs63xiCxVMVDOgXrKWAOFtbs5rOvo0GRvKu/HkeF802BG C12q96m6BUGsoBjgOUoBo0VFmOtQevEbK6RgC8/oR1V7aIyxRXZ/FgVdOXGzRg== 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 4LshQZ6c6JzjV0; Tue, 26 Jul 2022 15:58:14 +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 26QFwEUO033495; Tue, 26 Jul 2022 15:58:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QFwER9033494; Tue, 26 Jul 2022 15:58:14 GMT (envelope-from git) Date: Tue, 26 Jul 2022 15:58:14 GMT Message-Id: <202207261558.26QFwER9033494@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 7f36bd97535d - 2022Q3 - security/boringssl: fix build on armv7 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: osa X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 7f36bd97535d43af5e459dffe1ae9d56aff1a38a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658851095; 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=+hCbIBXCLmuqJIYHoJIGrxBGRwR6Yxv3RgLIFdl2vtM=; b=GsqnHWsGljKf7Asc+yPxIhL4E8H0QZYtylkc9Ptd9DRpMTjGfxp51joeMEdFIDFMRXIB2l pc4K6TYrYjo8rRkhcTvltIk/pJ5sOpc6Q6k/P1RtSCTFxJ+TZlB0ViLTT7XnRhnvfWJtO4 f7GkovkqxrIkKaOQLwllet8fpRYdoY2bvz5T/st2JwBXvoMcx+6t16zlYfLf591GfRrJQx Q5ilN5iXsXIN0fnXHOcRTyHuSShuy5UF2F5bVPX7MkJEAh1TKQjnoMaieu+M2f71fUb2td p1gdwIS6dqZT6p5c3fZ2GWqNL9Dsd2bpoLKOq6xeDBYqicyoYateoXU626tt6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658851095; a=rsa-sha256; cv=none; b=pM+UwaZrX02Q8eK/OzSbAPDbGnW0fNG05qQb/8AHiltEmmKlG55Ek0gyYfSr6gnmQWJdfP q6JdaaFvN5355R2X0zZpyDHHaxVjFcLEgvQ26zpbDt7ryRtsrfP8Nh+mbGNxgtDyaN0Qms 474VY89IlI328bY+dtdMyLk8f+98wFmVa05vCJWrGM309ntHGh6E40HlK1zPp46snDri4a xTrbTsKojbY1844P3Sa78/6b7Cr6Gfdlmu6bcWehMdQJ2AyzJSjcsK1ROj6XCyGulXgC81 C49atJWm313292VwtOiEwemqdSfLjVQrNJ0kkjSzz7qtYpVv9ZZz0Dq6hvxDoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f36bd97535d43af5e459dffe1ae9d56aff1a38a commit 7f36bd97535d43af5e459dffe1ae9d56aff1a38a Author: Sergey A. Osokin AuthorDate: 2022-07-26 15:56:17 +0000 Commit: Sergey A. Osokin CommitDate: 2022-07-26 15:58:01 +0000 security/boringssl: fix build on armv7 Bump PORTREVISION. PR: 265440 (cherry picked from commit 8f5d3084280d550de4eeedddaf47ac4a9d33e6b7) --- security/boringssl/Makefile | 2 +- .../boringssl/files/patch-crypto_CMakeLists.txt | 14 ++++-- .../files/patch-crypto_cpu__arm__freebsd.c | 55 ++++++++++++++++++++++ 3 files changed, 67 insertions(+), 4 deletions(-) diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile index 1a7f69d7f80e..45ccb2abe6b6 100644 --- a/security/boringssl/Makefile +++ b/security/boringssl/Makefile @@ -1,6 +1,6 @@ PORTNAME= boringssl PORTVERSION= 0.0.0.0.2022.07.25.01 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= osa@FreeBSD.org diff --git a/security/boringssl/files/patch-crypto_CMakeLists.txt b/security/boringssl/files/patch-crypto_CMakeLists.txt index b32c3e7389fb..6755b7553615 100644 --- a/security/boringssl/files/patch-crypto_CMakeLists.txt +++ b/security/boringssl/files/patch-crypto_CMakeLists.txt @@ -1,6 +1,14 @@ ---- crypto/CMakeLists.txt.orig 2022-01-21 15:36:31 UTC -+++ crypto/CMakeLists.txt -@@ -462,6 +462,7 @@ if(FIPS_DELOCATE OR FIPS_SHARED) +--- crypto/CMakeLists.txt.orig 2022-07-25 14:53:51.000000000 -0400 ++++ crypto/CMakeLists.txt 2022-07-26 11:40:36.847197000 -0400 +@@ -267,6 +267,7 @@ + cpu_aarch64_fuchsia.c + cpu_aarch64_linux.c + cpu_aarch64_win.c ++ cpu_arm_freebsd.c + cpu_arm_linux.c + cpu_arm.c + cpu_intel.c +@@ -464,6 +465,7 @@ endif() SET_TARGET_PROPERTIES(crypto PROPERTIES LINKER_LANGUAGE C) diff --git a/security/boringssl/files/patch-crypto_cpu__arm__freebsd.c b/security/boringssl/files/patch-crypto_cpu__arm__freebsd.c new file mode 100644 index 000000000000..eab921b971a7 --- /dev/null +++ b/security/boringssl/files/patch-crypto_cpu__arm__freebsd.c @@ -0,0 +1,55 @@ +--- crypto/cpu_arm_freebsd.c.orig 2022-07-24 00:49:45 UTC ++++ crypto/cpu_arm_freebsd.c +@@ -0,0 +1,52 @@ ++/* Copyright (c) 2016, Google Inc. ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY ++ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION ++ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ ++ ++#include "internal.h" ++ ++#if defined(OPENSSL_ARM) && defined(OPENSSL_FREEBSD) && \ ++ !defined(OPENSSL_STATIC_ARMCAP) ++#include ++#include ++ ++#include ++#include ++ ++extern uint32_t OPENSSL_armcap_P; ++ ++void OPENSSL_cpuid_setup(void) { ++ unsigned long hwcap = 0, hwcap2 = 0; ++ ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap); ++ elf_aux_info(AT_HWCAP2, &hwcap2, sizeof hwcap2); ++ ++ // Matching OpenSSL, only report other features if NEON is present. ++ if (hwcap & HWCAP_NEON) { ++ OPENSSL_armcap_P |= ARMV7_NEON; ++ ++ if (hwcap2 & HWCAP2_AES) { ++ OPENSSL_armcap_P |= ARMV8_AES; ++ } ++ if (hwcap2 & HWCAP2_PMULL) { ++ OPENSSL_armcap_P |= ARMV8_PMULL; ++ } ++ if (hwcap2 & HWCAP2_SHA1) { ++ OPENSSL_armcap_P |= ARMV8_SHA1; ++ } ++ if (hwcap2 & HWCAP2_SHA2) { ++ OPENSSL_armcap_P |= ARMV8_SHA256; ++ } ++ } ++} ++ ++#endif // OPENSSL_ARM && OPENSSL_OPENBSD && !OPENSSL_STATIC_ARMCAP