[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/files/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     d04c1df10dda5f9494befc12dfc2ab2de6f2d575
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Jan  3 15:31:40 2025 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 22:47:06 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d04c1df1

dev-libs/nss: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...s-3.106-bmo-1927096-fix-broken-test-files.patch | 33 ---------
 .../nss-3.90-remove-support-of-curve25519.patch    | 78 ----------------------
 .../nss/files/nss-3.90.2-backport-D180718.patch    | 35 ----------
 ...-1885749-disable-ASM-C25519-on-non-X86_64.patch | 35 ----------
 4 files changed, 181 deletions(-)

diff --git a/dev-libs/nss/files/nss-3.106-bmo-1927096-fix-broken-test-files.patch b/dev-libs/nss/files/nss-3.106-bmo-1927096-fix-broken-test-files.patch
deleted file mode 100644
index 069e97e6aacf..000000000000
--- a/dev-libs/nss/files/nss-3.106-bmo-1927096-fix-broken-test-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/tests/tools/tools.sh b/tests/tools/tools.sh
---- a/tests/tools/tools.sh
-+++ b/tests/tools/tools.sh
-@@ -542,25 +542,25 @@
-   check_tmpfile
- 
-   echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
-   ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
-   ret=$?
--  html_msg $ret 19 "Fail to list private key with bad iterator"
-+  html_msg $ret 17 "Fail to list private key with bad iterator"
-   check_tmpfile
- 
-   echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
-   ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
-   ret=$?
-   echo "Fail to list private key with bad salt val=$ret"
--  html_msg $ret 19 "Fail to import private key with bad salt"
-+  html_msg $ret 17 "Fail to import private key with bad salt"
-   check_tmpfile
- 
-   echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
-   ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
-   ret=$?
-   echo "Fail to import private key with no length val=$ret"
--  html_msg $ret 19 "Fail to import private key with no length"
-+  html_msg $ret 17 "Fail to import private key with no length"
-   check_tmpfile
- }
- 
- ############################## tools_p12 ###############################
- # local shell function to test basic functionality of pk12util
-

diff --git a/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch b/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch
deleted file mode 100644
index d883db8181d1..000000000000
--- a/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-# HG changeset patch
-# User Natalia Kulatova <nkulatova@mozilla.com>
-# Date 1687519432 0
-#      Fri Jun 23 11:23:52 2023 +0000
-# Node ID 653f4c1b58425219c0e9c005d555994a3fe1fa72
-# Parent  f095bf91ffaa273ea38ca6df34c905e5442de012
-Bug 1836925 - Removing the support of Curve25519 r=bbeurdouche,nss-reviewers
-
-Differential Revision: https://phabricator.services.mozilla.com/D180068
-
-diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/Makefile
---- a/lib/freebl/Makefile	Fri Jun 23 08:56:27 2023 +0000
-+++ b/lib/freebl/Makefile	Fri Jun 23 11:23:52 2023 +0000
-@@ -568,9 +568,6 @@
-             HAVE_INT128_SUPPORT = 1
-             DEFINES += -DHAVE_INT128_SUPPORT
-     else ifeq (1,$(CC_IS_GCC))
--        ifeq ($(CPU_ARCH),x86_64)
--            SUPPORTS_VALE_CURVE25519 = 1
--        endif
-         ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
-             HAVE_INT128_SUPPORT = 1
-             DEFINES += -DHAVE_INT128_SUPPORT
-@@ -595,11 +592,6 @@
-     DEFINES += -DKRML_VERIFIED_UINT128
- endif
- 
--ifdef SUPPORTS_VALE_CURVE25519
--    VERIFIED_SRCS += Hacl_Curve25519_64.c
--    DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM
--endif
--
- ifndef NSS_DISABLE_CHACHAPOLY
-     ifeq ($(CPU_ARCH),x86_64)
-         ifndef NSS_DISABLE_AVX2
-diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/freebl.gyp
---- a/lib/freebl/freebl.gyp	Fri Jun 23 08:56:27 2023 +0000
-+++ b/lib/freebl/freebl.gyp	Fri Jun 23 11:23:52 2023 +0000
-@@ -866,12 +866,6 @@
-           }],
-         ],
-       }],
--      [ 'supports_vale_curve25519==1', {
--        'defines': [
--          # The Makefile does version-tests on GCC, but we're not doing that here.
--          'HACL_CAN_COMPILE_INLINE_ASM',
--        ],
--      }],
-       [ 'OS=="linux" or OS=="android"', {
-         'conditions': [
-           [ 'target_arch=="x64"', {
-@@ -934,11 +928,6 @@
-   'variables': {
-     'module': 'nss',
-     'conditions': [
--      [ 'target_arch=="x64" and cc_is_gcc==1', {
--        'supports_vale_curve25519%': 1,
--      }, {
--        'supports_vale_curve25519%': 0,
--      }],
-       [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
-         'have_int128_support%': 1,
-       }, {
-diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/freebl_base.gypi
---- a/lib/freebl/freebl_base.gypi	Fri Jun 23 08:56:27 2023 +0000
-+++ b/lib/freebl/freebl_base.gypi	Fri Jun 23 11:23:52 2023 +0000
-@@ -154,11 +154,6 @@
-         'ecl/curve25519_32.c',
-       ],
-     }],
--    ['supports_vale_curve25519==1', {
--      'sources': [
--        'verified/Hacl_Curve25519_64.c',
--      ],
--    }],
-     ['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', {
-       'sources': [
-         # Gyp does not support per-file cflags, so working around like this.

diff --git a/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch b/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch
deleted file mode 100644
index 102ed5227488..000000000000
--- a/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/nss-dev/nss/commit/6ab861ba652985ce5985a3fb1ddc87a15aac5027
-https://bugzilla.mozilla.org/show_bug.cgi?id=1835357
-https://phabricator.services.mozilla.com/D180718
-
-From 6ab861ba652985ce5985a3fb1ddc87a15aac5027 Mon Sep 17 00:00:00 2001
-From: Robert Relyea <rrelyea@redhat.com>
-Date: Mon, 12 Jun 2023 11:18:03 -0700
-Subject: [PATCH] Bug 1835357 dbtests.sh failure in "certutil dump keys with
- explicit default trust flags" r=jschanck
-
- Fix the time value so we don't fail on slower or overloaded platforms.
-
- bob
-
-Differential Revision: https://phabricator.services.mozilla.com/D180718
-
---HG--
-extra : rebase_source : 3fb50de29dbf5f635cae10e962eb995c25cd108a
----
- tests/dbtests/dbtests.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/dbtests/dbtests.sh b/tests/dbtests/dbtests.sh
-index b0b195d4d0..c82ea85caf 100755
---- a/tests/dbtests/dbtests.sh
-+++ b/tests/dbtests/dbtests.sh
-@@ -366,7 +366,7 @@ dbtest_main()
-       RARRAY=($dtime)
-       TIMEARRAY=(${RARRAY[1]//./ })
-       echo "${TIMEARRAY[0]} seconds"
--      test ${TIMEARRAY[0]} -lt 2
-+      test ${TIMEARRAY[0]} -lt 5
-       ret=$?
-       html_msg ${ret} 0 "certutil dump keys with explicit default trust flags"
-     fi

diff --git a/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch b/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch
deleted file mode 100644
index e5769308144c..000000000000
--- a/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-
-# HG changeset patch
-# User Natalia Kulatova <nkulatova@mozilla.com>
-# Date 1685981398 0
-# Node ID 52a5d8fe37410d940e7d3ca244146ebc46a7d52a
-# Parent  52969cff7db635e0ee10fad66eed2c0cfdcf999b
-Bug 1836781 - Disabling ASM C25519 for A but X86_64 r=bbeurdouche,nss-reviewers
-
-Differential Revision: https://phabricator.services.mozilla.com/D179969
-
-diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
---- a/lib/freebl/Makefile
-+++ b/lib/freebl/Makefile
-@@ -563,17 +563,19 @@ endif # target == SunO
- ifdef USE_64
- # no __int128 at least up to lcc 1.23 (pretending to be gcc5)
- # NB: CC_NAME is not defined here
- ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc)
-     ifdef CC_IS_CLANG
-             HAVE_INT128_SUPPORT = 1
-             DEFINES += -DHAVE_INT128_SUPPORT
-     else ifeq (1,$(CC_IS_GCC))
--        SUPPORTS_VALE_CURVE25519 = 1
-+        ifeq ($(CPU_ARCH),x86_64)
-+            SUPPORTS_VALE_CURVE25519 = 1
-+        endif
-         ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
-             HAVE_INT128_SUPPORT = 1
-             DEFINES += -DHAVE_INT128_SUPPORT
-         endif
-         ifneq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION))))
-             NSS_DISABLE_AVX2 = 1
-         endif
-         ifeq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION))))
-