From nobody Tue Jan 14 21:28:38 2025 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 4YXj125tCGz5kSKg; Tue, 14 Jan 2025 21:28:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YXj123pqhz3CZg; Tue, 14 Jan 2025 21:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736890118; 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=liO17iXUdM/gdZkEzraAZYGiLSTuOjjWSc7Iz8/v3CA=; b=SWWyU/dw6ieeicxqVL/CKSmyVX3bvTrJPyqtbMWs354YG5LwwQ2nNiAwPumGCdofNdXVFF 97y7oRdSFTFkxTyhqHq8jdmTS2poVkksQ4/QaykXll11ptCrKtYFpSOqfCF+lMo4JjQ3B3 A1tG2Kjyujxm64VaQr6btkW9mmgTQmCE1RG0ufRs2E/hlY7/tP7/6pWOyQ4wd8ljRlbXLo dVmXn+vmfb1O/8pSJ8q/HuCTwyId6aaI+1LeHnHS6YDLVWDcnDX18zdf+qBY/xYQINfEeD q8Owj+0IJSb4n9+m9beTCv/TFaCW7gbd5EkUZBpA8ubGvRYAiAzYsWEChlsHyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736890118; 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=liO17iXUdM/gdZkEzraAZYGiLSTuOjjWSc7Iz8/v3CA=; b=QzSI528lXtOrZuZMoq0PO+qp9scImpgrHcHA5WpWVB7oRmWqHJrHDYKlK5Tm0ttKkfdDyn 9ycYGpayc6+2jOwtGJVx9YsOc0dVDPOVLk+WlbPVRNcmBqIHhZTtwfWP/DPCSB1zPtvIjm enJykda+TVSlyuKHQIAZert5XIO6BqD6kh+nVdqZto0OuTzAUu/iF0Rlx9cpFygfdqJ6gd nfAMhOmVZkQIXvBe/AuhaNCQlT4QDwR/xKqihY6m0pBhyarHfOei9A6mS4s27qiOxlYiTI 3v7snKGUAEfoXTTlYPJ7BvDnic7nrwS78ud+5smrDkJlt1sko23+UbFioEUsTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736890118; a=rsa-sha256; cv=none; b=qNB7YYWFIj+MZzIxzyjWEF3+od7ZqGh/HNLwOnqiq52u5SLUUSfawTjbZVIDNo81AbJpDr tmcx+Z//Wi3cQwQH6lOqXanDsCzgZj5zYcmM04YC+2ntbb/XFjkJrcPrIY62DICjGjjkW2 vrx3oDOmj8aYFbOM8dKk6RD8SuPGgMtxwRw6RK6f3gXw35siCHsnbYvWr8C/x98aNROFB2 GsSrHxA4qIv/2DMCNEhNQEhjS99adOVenF8ZeDjmIOJ7fadLePmxy3PD0BBoCpuQsEVB9g bMlDNHLyDF+PLMtirrD7TxevwyYYgXaNmNttQqCRCO7mcnf3y5vPhpaHh9/m8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YXj123QMYz2sK; Tue, 14 Jan 2025 21:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50ELScnN067880; Tue, 14 Jan 2025 21:28:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50ELSc7v067877; Tue, 14 Jan 2025 21:28:38 GMT (envelope-from git) Date: Tue, 14 Jan 2025 21:28:38 GMT Message-Id: <202501142128.50ELSc7v067877@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Santhosh Raju Subject: git: c46062a86678 - 2025Q1 - security/wolfssl: Fix arm64 build. 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: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fox X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: c46062a86678f04b9f65c057303c49ce41fa54b9 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by fox: URL: https://cgit.FreeBSD.org/ports/commit/?id=c46062a86678f04b9f65c057303c49ce41fa54b9 commit c46062a86678f04b9f65c057303c49ce41fa54b9 Author: Santhosh Raju AuthorDate: 2025-01-12 08:50:10 +0000 Commit: Santhosh Raju CommitDate: 2025-01-14 21:27:10 +0000 security/wolfssl: Fix arm64 build. - Pull in upstream patch https://github.com/wolfSSL/wolfssl/pull/8348 - Bump PORTREVISION (cherry picked from commit aee3a0f6c74eb14fd68dcb4f9525c7c99cda4db0) --- security/wolfssl/Makefile | 1 + security/wolfssl/files/patch-wolfcrypt_src_cpuid.c | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/security/wolfssl/Makefile b/security/wolfssl/Makefile index f4394249cd4d..37a0c09e6bdc 100644 --- a/security/wolfssl/Makefile +++ b/security/wolfssl/Makefile @@ -1,5 +1,6 @@ PORTNAME= wolfssl PORTVERSION= 5.7.6 +PORTREVISION= 1 CATEGORIES= security devel MASTER_SITES= https://www.wolfssl.com/ \ LOCAL/fox diff --git a/security/wolfssl/files/patch-wolfcrypt_src_cpuid.c b/security/wolfssl/files/patch-wolfcrypt_src_cpuid.c index 3dbdc77ce299..7ccf472ff56e 100644 --- a/security/wolfssl/files/patch-wolfcrypt_src_cpuid.c +++ b/security/wolfssl/files/patch-wolfcrypt_src_cpuid.c @@ -1,15 +1,18 @@ Fix the typo in the aarch64 macro -https://github.com/wolfSSL/wolfssl/pull/8346 +https://github.com/wolfSSL/wolfssl/issues/8347 --- wolfcrypt/src/cpuid.c.orig 2025-01-09 14:23:01 UTC +++ wolfcrypt/src/cpuid.c -@@ -259,7 +259,7 @@ +@@ -259,8 +259,10 @@ if (features & CPUID_AARCH64_FEAT_AES) cpuid_flags |= CPUID_AES; - if (features & CPUID_AARCH64_FEAT_PMULL) -+ if (features & CPUID_AARCH64_FEAT_AES_PMULL) ++ if (features & CPUID_AARCH64_FEAT_AES_PMULL) { ++ cpuid_flags |= CPUID_AES; cpuid_flags |= CPUID_PMULL; ++ } if (features & CPUID_AARCH64_FEAT_SHA256) cpuid_flags |= CPUID_SHA256; + if (features & CPUID_AARCH64_FEAT_SHA256_512)