diff mbox series

[meta-oe,21/66] nss: upgrade 3.107 -> 3.108

Message ID 1739178095-26432-21-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-webserver,01/66] apache2: upgrade 2.4.62 -> 2.4.63 | expand

Commit Message

Mingyu Wang (Fujitsu) Feb. 10, 2025, 9 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
refreshed for 3.108

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...dd-a-configure-option-to-disable-ARM-HW-cryp.patch | 11 ++++-------
 .../nss/{nss_3.107.bb => nss_3.108.bb}                |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)
 rename meta-oe/recipes-support/nss/{nss_3.107.bb => nss_3.108.bb} (99%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
index 5debd13488..63f822be25 100644
--- a/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
+++ b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
@@ -1,4 +1,4 @@ 
-From 781a21fa9b0d8d8d6df0de45e3c9dc3f3e74be8f Mon Sep 17 00:00:00 2001
+From 459ee39104228a958a0999e1a7d4c43e4e6fe4f0 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 18 Dec 2019 12:29:50 +0100
 Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto
@@ -36,7 +36,7 @@  index 0ebfc92..3ee7623 100644
  ifeq (,$(filter-out WINNT,$(OS_TARGET)))
  ifndef USE_64
 diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
-index d728867..8b4de1d 100644
+index a2f63a6..743158e 100644
 --- a/nss/lib/freebl/gcm.c
 +++ b/nss/lib/freebl/gcm.c
 @@ -18,6 +18,7 @@
@@ -53,8 +53,5 @@  index d728867..8b4de1d 100644
  #endif
 +#endif
  
- /* Forward declarations */
- SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
--- 
-2.25.1
-
+ #if defined(__ARM_NEON) || defined(__ARM_NEON__)
+ #include <arm_neon.h>
diff --git a/meta-oe/recipes-support/nss/nss_3.107.bb b/meta-oe/recipes-support/nss/nss_3.108.bb
similarity index 99%
rename from meta-oe/recipes-support/nss/nss_3.107.bb
rename to meta-oe/recipes-support/nss/nss_3.108.bb
index 23e046b0a9..0c42f40bb0 100644
--- a/meta-oe/recipes-support/nss/nss_3.107.bb
+++ b/meta-oe/recipes-support/nss/nss_3.108.bb
@@ -33,7 +33,7 @@  SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/$
            file://0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch \
            file://0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
            "
-SRC_URI[sha256sum] = "7f7e96473e38150771a615f5d40e8c41ba3a19385301ae0c525091f2fc9d6729"
+SRC_URI[sha256sum] = "a0f6fcb5dbadc1635b43827517a979e3a6d005d0788527802a6b31e2c5f66eec"
 
 UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/"
 UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)"