Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Jan 2025 21:28:38 GMT
From:      Santhosh Raju <fox@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: c46062a86678 - 2025Q1 - security/wolfssl: Fix arm64 build.
Message-ID:  <202501142128.50ELSc7v067877@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2025Q1 has been updated by fox:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c46062a86678f04b9f65c057303c49ce41fa54b9

commit c46062a86678f04b9f65c057303c49ce41fa54b9
Author:     Santhosh Raju <fox@FreeBSD.org>
AuthorDate: 2025-01-12 08:50:10 +0000
Commit:     Santhosh Raju <fox@FreeBSD.org>
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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501142128.50ELSc7v067877>