download.lst | 4 ++-- external/nss/clang-cl.patch.0 | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-)
New commits: commit 82cec887bd70f782bbfc1d405240cf182057ac33 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jun 20 09:13:51 2025 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Nov 10 08:22:48 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]> (cherry picked from commit c1019e992b503bc29c64e507d24d534336ffe2cc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193597 Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/download.lst b/download.lst index 993e15da89fa..d3985ab2153d 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) commit a5f02416aae3eded4302ea1d35d1d4c0678bf730 Author: Xisco Fauli <[email protected]> AuthorDate: Tue May 27 18:25:02 2025 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Nov 10 08:22:41 2025 +0100 nss: upgrade to 3.112 Downloaded https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_112_RTM/src/nss-3.112-with-nspr-4.36.tar.gz Change-Id: I755d5e89868870237ba3f7d04a9ec23e11fbba04 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185928 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 95b9691da797bc5bef17ce67dcfe69766ccf95ba) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193490 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit b06f330b68068216053bc13b8183bc334cc19d52) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193596 Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/download.lst b/download.lst index 7a6b54f92393..993e15da89fa 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 := 672f0af6cc9b577bee4906e2071b250d940b23e29ce516a721dc9561c421bbce -NSS_TARBALL := nss-3.111-with-nspr-4.36.tar.gz +NSS_SHA256SUM := a8ee2b4485c4d841b1f974a13037183071ac12520512e6ec6b7d38ff36e8a125 +NSS_TARBALL := nss-3.112-with-nspr-4.36.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit 41d64a45d69c8b7d3896cd1dd23501791de56e1a Author: Xisco Fauli <[email protected]> AuthorDate: Mon May 5 12:18:01 2025 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Nov 10 08:22:35 2025 +0100 nss: upgrade to 3.111 Downloaded https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_111_RTM/src/nss-3.111-with-nspr-4.36.tar.gz Change-Id: If08f3f13f590a8e17a64f97990a4aced9900dd62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184959 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit fe2af71719fa335ad232902451ffb8e6e666c7f7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193489 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> (cherry picked from commit 9c7aea7512ded25539c93b2b6469b8ad899a99b6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193595 Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/download.lst b/download.lst index b5840b566c08..7a6b54f92393 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 := 96114bef9e9692dda6e7793da26fedef0dc0449c3644ebe1122464e599a39dc0 -NSS_TARBALL := nss-3.110-with-nspr-4.36.tar.gz +NSS_SHA256SUM := 672f0af6cc9b577bee4906e2071b250d940b23e29ce516a721dc9561c421bbce +NSS_TARBALL := nss-3.111-with-nspr-4.36.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts
