download.lst | 4 ++-- external/nss/UnpackedTarball_nss.mk | 1 - external/nss/connectx.patch.0 | 11 ----------- external/nss/nss_macosx.patch | 23 ++++++++++++----------- 4 files changed, 14 insertions(+), 25 deletions(-)
New commits: commit aba5f8016965e42075e68faa17ddfd3b3213247d Author: Xisco Fauli <[email protected]> AuthorDate: Fri Dec 5 14:20:42 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Dec 9 17:20:05 2025 +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]> diff --git a/download.lst b/download.lst index 7a17cf0bdaf2..a66ae99efeb5 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 := 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/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 4774e36d0853..a33a293f972d 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -30,7 +30,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss-restore-manual-pre-dependencies.patch.1 \ external/nss/Wincompatible-function-pointer-types.patch.0 \ external/nss/nspr-win95-target.patch \ - external/nss/connectx.patch.0 \ $(if $(filter LINUX,$(OS)), \ external/nss/nss.disablefsync.patch \ external/nss/nss.getrandom.patch) \ diff --git a/external/nss/connectx.patch.0 b/external/nss/connectx.patch.0 deleted file mode 100644 index 29c6fd1a8469..000000000000 --- a/external/nss/connectx.patch.0 +++ /dev/null @@ -1,11 +0,0 @@ ---- nspr/pr/src/pthreads/ptio.c -+++ nspr/pr/src/pthreads/ptio.c -@@ -1989,7 +1989,7 @@ - PRIntn flags, const PRNetAddr* addr, - PRIntervalTime timeout) { - # if defined(LINUX) || HAS_CONNECTX -- PRInt32 syserrno, bytes = -1; -+ PRInt32 syserrno; ssize_t bytes = -1; - PRBool fNeedContinue = PR_FALSE; - pt_SockLen addr_len; - const PRNetAddr* addrp = addr; diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch index 13cf0cda706b..eaa025f1c205 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -23,32 +23,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))
