download.lst | 4 ++--
external/nss/clang-cl.patch.0 | 11 -----------
2 files changed, 2 insertions(+), 13 deletions(-)
New commits:
commit 8fffc33fe79c7643d0aaa045024f2fc2cc863cdf
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Jun 20 09:13:51 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Jun 20 15:24:37 2025 +0200
nss: upgrade to 3.113
Downloaded from
https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_113_RTM/src/nss-3.113-with-nspr-4.36.tar.gz
Change-Id: I9327a325fc2bdc1159c9dda1c8e54963b410e8e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186735
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit d6efc1cd776393fc70a8dc0e2e1d6dc26df38035)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186763
diff --git a/download.lst b/download.lst
index 31ccc42964f2..8dcea6687625 100644
--- a/download.lst
+++ b/download.lst
@@ -518,8 +518,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-NSS_SHA256SUM :=
a8ee2b4485c4d841b1f974a13037183071ac12520512e6ec6b7d38ff36e8a125
-NSS_TARBALL := nss-3.112-with-nspr-4.36.tar.gz
+NSS_SHA256SUM :=
b62d51d900b59502eea34be33e3089537fb73977ea6b76cea8d8e6a80e1d95df
+NSS_TARBALL := nss-3.113-with-nspr-4.36.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/nss/clang-cl.patch.0 b/external/nss/clang-cl.patch.0
index e20aab3b9ff1..dc5f8e0a884e 100644
--- a/external/nss/clang-cl.patch.0
+++ b/external/nss/clang-cl.patch.0
@@ -72,17 +72,6 @@
/* make GCC warn when we use these #defines */
typedef int __BLAPI_DEPRECATED __attribute__((deprecated));
#define DSA_SUBPRIME_LEN ((__BLAPI_DEPRECATED)DSA1_SUBPRIME_LEN)
---- nss/lib/util/pkcs11n.h
-+++ nss/lib/util/pkcs11n.h
-@@ -563,7 +563,7 @@
- /* keep the old value for compatibility reasons*/
- #define CKT_NSS_MUST_VERIFY ((__CKT_NSS_MUST_VERIFY)(CKT_NSS + 4))
- #else
--#ifdef _WIN32
-+#if defined _WIN32 && !defined __clang__
- /* This magic gets the windows compiler to give us a deprecation
- * warning */
- #pragma deprecated(CKT_NSS_UNTRUSTED, CKT_NSS_MUST_VERIFY, CKT_NSS_VALID)
# While MSVC uses
# #pragma warning(disable : 4103)
