download.lst | 4 ++-- external/nss/nss_macosx.patch | 39 ++++++++++++--------------------------- 2 files changed, 14 insertions(+), 29 deletions(-)
New commits: commit d779f470fd11387056ad3dff28ef1c90d784a9cc Author: Michael Stahl <[email protected]> AuthorDate: Mon Mar 2 10:58:56 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Mar 2 17:59:32 2026 +0100 nss: upgrade to release 3.121 Fixes CVE-2026-2781 Change-Id: I49936c56638dc6ce2bc5d7cf7d591586d4c5924a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200787 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit e340bae8d3fb6b8d5ba4880e4853b975d48e8a8e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200815 Tested-by: Jenkins diff --git a/download.lst b/download.lst index 76540df4845d..58bf4102df0f 100644 --- a/download.lst +++ b/download.lst @@ -523,8 +523,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := fb5aa56fa35d963d4c65278328e2e9c99c2484c86f0e41537412477739dcf997 -NSS_TARBALL := nss-3.120-with-nspr-4.38.2.tar.gz +NSS_SHA256SUM := 76b9a1364bc4522abc652c4d676498d5062f502f64e38b32e9e2c7a3fff530f1 +NSS_TARBALL := nss-3.121-with-nspr-4.38.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch index e553cfda7042..eac99c97d9d5 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -23,38 +23,23 @@ diff -ru a/nspr/configure b/nspr/configure diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk --- a/a/nss/coreconf/Darwin.mk 2014-09-29 16:50:22.992304799 +0100 +++ b/b/nss/coreconf/Darwin.mk 2014-09-29 16:51:59.214931953 +0100 -@@ -20,35 +20,37 @@ +@@ -20,6 +20,7 @@ + CPU_ARCH := $(shell uname -p) + endif - ifeq (,$(filter-out i%86,$(CPU_ARCH))) - ifdef USE_64 +ifeq (,$(findstring -arch ,$(CC))) + ifeq (,$(filter-out i%86 x86_64,$(CPU_ARCH))) + ifdef USE_64 CC += -arch x86_64 - CCC += -arch x86_64 -+endif - override CPU_ARCH = x86_64 +@@ -46,6 +47,7 @@ else - OS_REL_CFLAGS = -Di386 -+ifeq (,$(findstring -arch ,$(CC))) - CC += -arch i386 - CCC += -arch i386 -+endif - override CPU_ARCH = x86 + $(error Unknown CPU architecture) endif --else ifeq (,$(filter-out aarch64 arm,$(CPU_ARCH))) --CC += -arch arm64 --CCC += -arch arm64 --override CPU_ARCH = aarch64 --else ifeq (powerpc,$(CPU_ARCH)) --OS_REL_CFLAGS = -Dppc --CC += -arch ppc --CCC += -arch ppc --override CPU_ARCH = ppc - else -- $(error Unknown CPU architecture) -+ifeq (arm,$(CPU_ARCH)) -+# Nothing set for arm currently. -+else -+endif ++endif # findstring -arch + + ifeq (,$(filter-out ppc ppc64,$(CPU_ARCH))) + ifneq ($(NSS_DISABLE_CRYPTO_VSX),0) +@@ -54,12 +56,16 @@ endif ifneq (,$(MACOS_SDK_DIR)) commit 36b4bfe5469aab7923a0bf19055c5172f9b02805 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Jan 20 11:32:04 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Mar 2 17:59:26 2026 +0100 nss: upgrade to 3.120 Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_120_RTM/src/nss-3.120-with-nspr-4.38.2.tar.gz Change-Id: I710faca7e285ff4de9a86d8041a69d38f62e149c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197653 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200814 diff --git a/download.lst b/download.lst index c8c2b5440a36..76540df4845d 100644 --- a/download.lst +++ b/download.lst @@ -523,8 +523,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := 1e86aacdce66c3bdd38bb011e617a3c93013ed6f802102365a589d6f686efe4b -NSS_TARBALL := nss-3.119.1-with-nspr-4.38.2.tar.gz +NSS_SHA256SUM := fb5aa56fa35d963d4c65278328e2e9c99c2484c86f0e41537412477739dcf997 +NSS_TARBALL := nss-3.120-with-nspr-4.38.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts
