download.lst | 4 ++-- external/nss/ExternalProject_nss.mk | 1 - xmlsecurity/CppunitTest_xmlsecurity_signing2.mk | 1 + 3 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit c7fca2a8248293ef01574c56fa55e9a584ccc7bb Author: Xisco Fauli <[email protected]> AuthorDate: Fri Mar 14 12:28:51 2025 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Nov 10 08:21:43 2025 +0100 nss: remove obsolete target it has been removed in recent versions of nss. Do it in preparation for the upgrade. Change-Id: I2dbcdb065c59e3d79235fb8a17dc072f4826319b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182914 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit acf84f9e21999327b831580691430db8c8fe8a71) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193562 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 79e7f8eb2b2e..fa7f780522b1 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -30,7 +30,6 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ MOZ_DEBUG_SYMBOLS=1 \ MOZ_DEBUG_FLAGS=" " \ OPT_CODE_SIZE=0) \ - OS_TARGET=WIN95 \ USE_SYSTEM_ZLIB=1 \ $(if $(filter X86_64,$(CPUNAME)),USE_64=1) \ $(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \ commit 76fe510858d2889758c7015994e7ffe4bc64e783 Author: Michael Stahl <[email protected]> AuthorDate: Wed Jan 8 14:07:17 2025 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Nov 10 08:21:36 2025 +0100 xmlsecurity: fix --without-system-nss build signing2.cxx:71: error: undefined reference to 'NSS_OptionSet' (regression from commit f0efcb917049547ad0496c004830ff0153602071) Change-Id: Idad3f7d5d1a2cb642ac3485a750cdc7631fbf4df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179954 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins (cherry picked from commit b57f1f7be140c5c69136e2b5c8b8826b1b27141a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179961 Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 2ad6d850d3565b8db82bcac0a64d499e3b48bd8a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193561 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing2.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing2.mk index 0cd450121979..a396a4e2ce23 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_signing2.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_signing2.mk @@ -42,6 +42,7 @@ ifneq ($(OS),WNT) ifneq (,$(ENABLE_NSS)) $(eval $(call gb_CppunitTest_use_externals,xmlsecurity_signing2,\ nssutil3 \ + nss3 \ )) endif endif commit 39ce9d6b5a6a6d49ba112640558124de2be88af8 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Aug 28 11:55:59 2024 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Nov 10 08:21:29 2025 +0100 tdf#162589: Revert "nss: 3.101.2 is the ESR release" This reverts commit 4a5b52f8bcb7b5d4eb2fc4ba6560ba1e88c36503. It seems going from nss-3.102.1-with-nspr-4.35.tar.gz to nss-3.101.2-with-nspr-4.35.tar.gz breaks the installation. See https://bugs.documentfoundation.org/show_bug.cgi?id=162589#c11 and https://bugs.documentfoundation.org/show_bug.cgi?id=162589#c13 However, going from nss-3.99-with-nspr-4.35.tar.gz to nss-3.101.2-with-nspr-4.35.tar.gz doesn't break it, See https://bugs.documentfoundation.org/show_bug.cgi?id=162589#c12 Change-Id: Idc2e118c7efe5ba570e68f998460bc05ac74a714 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172493 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 12ce43bda25015dc3e681312b64680a996f5a8dd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193560 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/download.lst b/download.lst index 5aa1a8a38305..c654660bda47 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 := ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa -NSS_TARBALL := nss-3.101.2-with-nspr-4.35.tar.gz +NSS_SHA256SUM := ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65 +NSS_TARBALL := nss-3.102.1-with-nspr-4.35.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts
