download.lst | 4 ++-- external/nss/clang-cl.patch.0 | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-)
New commits: commit 7151002bdb2a5f31ba0eae3a98c8a74b93d1df10 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Jul 31 17:13:05 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Fri Nov 7 15:52:50 2025 +0100 nss: upgrade to 3.114 Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_114_RTM/src/nss-3.114-with-nspr-4.37.tar.gz Change-Id: Id3c3d002790d92ca8f17c676ce447dae8c26e16b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188688 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 6cda2dbfbf5d855e6194cd530a6f66099279bd90) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193493 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index a62950437bed..788b936f99b6 100644 --- a/download.lst +++ b/download.lst @@ -580,8 +580,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := ae99a9a473f8117f542dfb33daa26a584db21776ef053b48cd24fa7b9d802dc7 -NSS_TARBALL := nss-3.113.1-with-nspr-4.36.tar.gz +NSS_SHA256SUM := aa927a8610354483b52fdb3c9445f3e2f4a231cc03754ed47e96d2697c2e2329 +NSS_TARBALL := nss-3.114-with-nspr-4.37.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit e996185cfe7c1f10c6f09cb5b79a7a3af693697a Author: Xisco Fauli <[email protected]> AuthorDate: Wed Jul 2 09:59:50 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Fri Nov 7 15:52:44 2025 +0100 nss: upgrade to 3.113.1 Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_113_1_RTM/src/nss-3.113.1-with-nspr-4.36.tar.gz Change-Id: Ib5aed4732e2e4b98d6a3514a25b63a5eb32d8bf1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187265 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 7ff0fd67cfe5514094249f2f5580ea38a8619357) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193492 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index e578e3ee8d6d..a62950437bed 100644 --- a/download.lst +++ b/download.lst @@ -580,8 +580,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := b62d51d900b59502eea34be33e3089537fb73977ea6b76cea8d8e6a80e1d95df -NSS_TARBALL := nss-3.113-with-nspr-4.36.tar.gz +NSS_SHA256SUM := ae99a9a473f8117f542dfb33daa26a584db21776ef053b48cd24fa7b9d802dc7 +NSS_TARBALL := nss-3.113.1-with-nspr-4.36.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit c1019e992b503bc29c64e507d24d534336ffe2cc Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jun 20 09:13:51 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Fri Nov 7 15:52:36 2025 +0100 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 <[email protected]> (cherry picked from commit d6efc1cd776393fc70a8dc0e2e1d6dc26df38035) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193491 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index 5d62df0b67dc..e578e3ee8d6d 100644 --- a/download.lst +++ b/download.lst @@ -580,8 +580,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)
