download.lst | 4 +-- external/nss/ExternalProject_nss.mk | 2 - external/nss/UnpackedTarball_nss.mk | 1 external/nss/nss-3.13.5-zlib-werror.patch | 13 ----------- external/nss/nss_macosx.patch | 35 +++++++++++------------------- 5 files changed, 16 insertions(+), 39 deletions(-)
New commits: commit cac9cf1f0687f198d7aebe8810e3210de0431436 Author: Michael Stahl <[email protected]> AuthorDate: Mon Mar 2 10:58:56 2026 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 15:12:06 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) diff --git a/download.lst b/download.lst index ac6118df999c..40c8986a0668 100644 --- a/download.lst +++ b/download.lst @@ -409,8 +409,8 @@ NEON_TARBALL := neon-0.30.2.tar.gz # 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 b16bafd96a20..b1212b378b6a 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -13,38 +13,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 242fd3ec853afea1424bb1375f89b09c005ed66b Author: Xisco Fauli <[email protected]> AuthorDate: Tue Jan 20 11:32:04 2026 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 15:12:06 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 (cherry picked from commit 63f374caf3e7dda9999cf24ed53fd89dfc0f8725) diff --git a/download.lst b/download.lst index d07045cd96b7..ac6118df999c 100644 --- a/download.lst +++ b/download.lst @@ -409,8 +409,8 @@ NEON_TARBALL := neon-0.30.2.tar.gz # 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 commit 7d91a73e9de1885a6f4e273df79ab1448d0fc7fd Author: Xisco Fauli <[email protected]> AuthorDate: Thu Dec 11 10:22:14 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 15:12:06 2026 +0100 nss: upgrade to 3.119.1 Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_119_1_RTM/src/nss-3_119_1-with-nspr-4.38.2.tar.gz Change-Id: I281e1a7f7bb212e1e721deba6238f3bcc17795e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195436 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit a40ea776fe34d01682b4716d609e5b61d70226ae) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195912 Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit 328e95ffa3734afeb8e85891530af73bf5d511f8) diff --git a/download.lst b/download.lst index ad296433771b..d07045cd96b7 100644 --- a/download.lst +++ b/download.lst @@ -409,8 +409,8 @@ NEON_TARBALL := neon-0.30.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := 8f12f61ef814662bf991a289bc6724d078cd79f135e09e260adbc35dfa9acaf3 -NSS_TARBALL := nss-3.119-with-nspr-4.38.2.tar.gz +NSS_SHA256SUM := 1e86aacdce66c3bdd38bb011e617a3c93013ed6f802102365a589d6f686efe4b +NSS_TARBALL := nss-3.119.1-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 af6486070e88..b16bafd96a20 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -13,33 +13,38 @@ 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 -@@ -19,34 +19,39 @@ - endif +@@ -20,35 +20,37 @@ - ifeq (x86_64,$(CPU_ARCH)) + ifeq (,$(filter-out i%86,$(CPU_ARCH))) + ifdef USE_64 +ifeq (,$(findstring -arch ,$(CC))) CC += -arch x86_64 CCC += -arch x86_64 +endif override CPU_ARCH = x86_64 - else ifeq (i386,$(CPU_ARCH)) + else OS_REL_CFLAGS = -Di386 +ifeq (,$(findstring -arch ,$(CC))) CC += -arch i386 CCC += -arch i386 +endif override CPU_ARCH = x86 - else ifeq (,$(filter-out aarch64 arm,$(CPU_ARCH))) - CC += -arch arm64 - CCC += -arch arm64 - override CPU_ARCH = aarch64 - else ifeq (powerpc,$(CPU_ARCH)) + 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 +-override CPU_ARCH = ppc else - $(error Unknown CPU architecture) +- $(error Unknown CPU architecture) ++ifeq (arm,$(CPU_ARCH)) ++# Nothing set for arm currently. ++else ++endif endif ifneq (,$(MACOS_SDK_DIR)) @@ -57,7 +62,7 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk # GCC <= 3 DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0)) -@@ -108,7 +113,7 @@ +@@ -111,7 +113,7 @@ # May override this with different compatibility and current version numbers. DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1 # May override this with -bundle to create a loadable module. commit a6e31cb78e33668705c8c64bf6e089df78544ff6 Author: Christian Lohmaier <[email protected]> AuthorDate: Thu Dec 11 10:57:57 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 15:12:06 2026 +0100 fix nss/nspr build on intel macs regression from aba5f8016965e42075e68faa17ddfd3b3213247d nss' Darwin.mk uses uname -p to decide on the platform if CPU_ARCH is not set, and that still returns i386 on intel macs – in the old version that still worked since there was an additional ifdef USE_64 check that then set it to x86_64, but that has since been removed and only the custom guards to not add additional -arch parameter to the compiler flags remain, resulting in the built to attempt a 32bit and that then fails when it comes to the assembly instructions: mpi/mpi_sse2.s:35:5: error: instruction requires: Not 64-bit mode push %ebp ^ mpi/mpi_sse2.s:37:5: error: instruction requires: Not 64-bit mode push %edi ^ mpi/mpi_sse2.s:38:5: error: instruction requires: Not 64-bit mode push %esi ^ […] So don't rely on auto-detection and specify it explicitly as it was done for the other variants already, ironically also already for building for intel on arm. But the additional check whether it is building on arm is not necessary, our CPUNAME is sufficient already and that now superfluous bit can be removed. Change-Id: Ic467b06beb9b73e2d177eedede886681aa668b15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195439 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> Reviewed-by: Dan Williams <[email protected]> (cherry picked from commit e11962c57a1a955f1509a653deea352583f3f77e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195490 Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit d5071c1e46da4d85085e423d104a11dbbf485d5d) diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 87cefbbcbe2f..59f3bd3c176b 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ $(call gb_ExternalExecutable_get_dependencies,python) \ $(SRCDIR)/external/nss/nsinstall.py $(call gb_ExternalProject_run,build,\ - $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \ + $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1 CPU_ARCH=x86_64)) \ $(if $(filter iOS,$(OS)),\ $(if $(filter arm64,$(CC)),USE_64=1)) \ $(if $(filter MACOSX,$(OS)),\ commit a1128b1ddf975df1db2606aa1fe64bd41b537d4c Author: Xisco Fauli <[email protected]> AuthorDate: Fri Dec 5 14:20:42 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 15:12:06 2026 +0100 nss: upgrade to 3.119 * external/nss/connectx.patch.0 has been fixed upstream Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_119_RTM/src/nss-3.119-with-nspr-4.38.2.tar.gz Change-Id: I0477965c9ab62f21684278e5ed7860360521b270 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195081 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit aba5f8016965e42075e68faa17ddfd3b3213247d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195312 (cherry picked from commit fb22ad4fa2b3adc6b8502e6e22e6032a2075df21) diff --git a/download.lst b/download.lst index e32c125c85f8..ad296433771b 100644 --- a/download.lst +++ b/download.lst @@ -409,8 +409,8 @@ NEON_TARBALL := neon-0.30.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := 9e1f7da9f4e5e3bdfd73f7dc2c618d6125a12354aadaeedbb35af3699bc03e15 -NSS_TARBALL := nss-3.118.1-with-nspr-4.37.tar.gz +NSS_SHA256SUM := 8f12f61ef814662bf991a289bc6724d078cd79f135e09e260adbc35dfa9acaf3 +NSS_TARBALL := nss-3.119-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 46caa3dad450..af6486070e88 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -13,32 +13,33 @@ 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,13 +20,17 @@ +@@ -19,34 +19,39 @@ + endif - ifeq (,$(filter-out i%86,$(CPU_ARCH))) - ifdef USE_64 + ifeq (x86_64,$(CPU_ARCH)) +ifeq (,$(findstring -arch ,$(CC))) CC += -arch x86_64 CCC += -arch x86_64 +endif override CPU_ARCH = x86_64 - else + else ifeq (i386,$(CPU_ARCH)) OS_REL_CFLAGS = -Di386 +ifeq (,$(findstring -arch ,$(CC))) CC += -arch i386 CCC += -arch i386 +endif override CPU_ARCH = x86 - endif - else -@@ -33,19 +37,20 @@ - ifeq (arm,$(CPU_ARCH)) - # Nothing set for arm currently. - else + 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 - endif + override CPU_ARCH = ppc + else + $(error Unknown CPU architecture) endif ifneq (,$(MACOS_SDK_DIR)) commit 5c988d4171a5b5a829f22fd88d12a249a400f128 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Nov 18 23:07:37 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 15:12:05 2026 +0100 nss: upgrade to 3.118.1 Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_118_1_RTM/src/nss-3.118.1-with-nspr-4.37.tar.gz Change-Id: I9e9dcfed8e8f047862ff07c1f87220a52e26ae77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194179 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 045bd3292b9db696b35e3983bec4a4c038c2b0a4) diff --git a/download.lst b/download.lst index 0b756e86fd93..e32c125c85f8 100644 --- a/download.lst +++ b/download.lst @@ -409,8 +409,8 @@ NEON_TARBALL := neon-0.30.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := cda19ca82e3f4839b0cb72fc633545a83b3f73dd3385a24a176860c461773a70 -NSS_TARBALL := nss-3.117-with-nspr-4.37.tar.gz +NSS_SHA256SUM := 9e1f7da9f4e5e3bdfd73f7dc2c618d6125a12354aadaeedbb35af3699bc03e15 +NSS_TARBALL := nss-3.118.1-with-nspr-4.37.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit 5770a3ef347f7c3d62615f5c92a7194fc3d75a33 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Oct 21 16:13:07 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 15:12:05 2026 +0100 nss: upgrade to 3.117 Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_117_RTM/src/nss-3.117-with-nspr-4.37.tar.gz Change-Id: If381a7686a6d3db93e45778855ec74ee90be426b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192799 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit b168b52022d59e79dc2c3a9ebdb1b8b968b9c3e2) diff --git a/download.lst b/download.lst index 4c8bc223c20f..0b756e86fd93 100644 --- a/download.lst +++ b/download.lst @@ -409,8 +409,8 @@ NEON_TARBALL := neon-0.30.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := af6f21bae9f16534988842597871754450fd6cdbd786750e7cd069f8d231ce10 -NSS_TARBALL := nss-3.116-with-nspr-4.37.tar.gz +NSS_SHA256SUM := cda19ca82e3f4839b0cb72fc633545a83b3f73dd3385a24a176860c461773a70 +NSS_TARBALL := nss-3.117-with-nspr-4.37.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit 760361f74d5a9ac25077c1c31b038846ab84f83f Author: Xisco Fauli <[email protected]> AuthorDate: Mon Sep 15 12:00:07 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 15:12:05 2026 +0100 nss: upgrade to 3.116 0001-Bug-1983399-lib-softtoken-sdb.c-sftkdbti.h-Align-sft.patch.1 has been fixed upstream Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_116_RTM/src/nss-3.116-with-nspr-4.37.tar.gz Change-Id: I61f7efe779c89ca00e6698dd834cf282ea43f5d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190960 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit c46712bcd7a6f811aa406f2db97d94d3d1b67350) diff --git a/download.lst b/download.lst index 67bb35d74f86..4c8bc223c20f 100644 --- a/download.lst +++ b/download.lst @@ -409,8 +409,8 @@ NEON_TARBALL := neon-0.30.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := 5ff67daaa778ff302ccacdd00e665ce71da59f05dcdaab62bcdab6e23c90d320 -NSS_TARBALL := nss-3.115.1-with-nspr-4.37.tar.gz +NSS_SHA256SUM := af6f21bae9f16534988842597871754450fd6cdbd786750e7cd069f8d231ce10 +NSS_TARBALL := nss-3.116-with-nspr-4.37.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit 8d97847be604d23999368bf1f41abfd71bd160bc Author: Xisco Fauli <[email protected]> AuthorDate: Fri Aug 22 11:30:09 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 15:12:05 2026 +0100 nss: upgrade to 3.115.1 Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_115_1_RTM/src/nss-3.115.1-with-nspr-4.37.tar.gz Change-Id: Ie887520c9177bfca2a7aff78787f14109bb3c4fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190052 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit c55cd1bbef1d59bbf8733556a6cc7fcc8797ee17) diff --git a/download.lst b/download.lst index ffb30ca3747f..67bb35d74f86 100644 --- a/download.lst +++ b/download.lst @@ -409,8 +409,8 @@ NEON_TARBALL := neon-0.30.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := 83503e5c77024ecc6349e9d7216a8e8aa2423495da4ff752a65ad128638abacf -NSS_TARBALL := nss-3.115-with-nspr-4.37.tar.gz +NSS_SHA256SUM := 5ff67daaa778ff302ccacdd00e665ce71da59f05dcdaab62bcdab6e23c90d320 +NSS_TARBALL := nss-3.115.1-with-nspr-4.37.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit 5103e1b31724d57ea575aa67ebb16d57c35f6c37 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Aug 15 22:34:39 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 15:12:05 2026 +0100 nss: upgrade to 3.115 Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_115_RTM/src/nss-3.115-with-nspr-4.37.tar.gz Change-Id: I285043704622fa23a72bf5fd9932c20c2953d374 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189729 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit c2d0d27c6c132f6844b8eaaa8e3e05357f6c42d3) diff --git a/download.lst b/download.lst index abb228bd1a94..ffb30ca3747f 100644 --- a/download.lst +++ b/download.lst @@ -409,8 +409,8 @@ NEON_TARBALL := neon-0.30.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := aa927a8610354483b52fdb3c9445f3e2f4a231cc03754ed47e96d2697c2e2329 -NSS_TARBALL := nss-3.114-with-nspr-4.37.tar.gz +NSS_SHA256SUM := 83503e5c77024ecc6349e9d7216a8e8aa2423495da4ff752a65ad128638abacf +NSS_TARBALL := nss-3.115-with-nspr-4.37.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit 06f0fded3560f35355e8e7c87fdbbb8a10c5713c Author: Michael Stahl <[email protected]> AuthorDate: Wed Jun 1 12:42:43 2022 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 15:12:05 2026 +0100 nss: remove nss-3.13.5-zlib-werror.patch The zlib module should be used instead of NSS' bundled zlib since commit 1c748fefc3c5b42e3548a1a7f5017a579982005a Change-Id: I0d820cdd795712a7dbe27ef114f0efddd3f436ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135235 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit f2dc0bedeb7e32e1c78bf218a7277110cdb71ce5) diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 1e88265708a6..2b94be95547a 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,nss,$(NSS_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.patch \ - external/nss/nss-3.13.5-zlib-werror.patch \ external/nss/nss_macosx.patch \ external/nss/nss-win32-make.patch.1 \ external/nss/ubsan.patch.0 \ diff --git a/external/nss/nss-3.13.5-zlib-werror.patch b/external/nss/nss-3.13.5-zlib-werror.patch deleted file mode 100644 index 0cdbf7808f81..000000000000 --- a/external/nss/nss-3.13.5-zlib-werror.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/a/nss/lib/zlib/gzguts.h 2010-08-22 03:07:03.000000000 +0200 -+++ b/b/nss/lib/zlib/gzguts.h 2012-07-17 08:52:14.821552788 +0200 -@@ -26,6 +26,10 @@ - # define write _write - # define close _close - #endif -+ -+#ifndef _WIN32 -+#include <unistd.h> -+#endif - - #ifdef NO_DEFLATE /* for compatibility with old definition */ - # define NO_GZCOMPRESS
