download.lst | 4 ++-- external/nss/UnpackedTarball_nss.mk | 1 + external/nss/connectx.patch.0 | 11 +++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-)
New commits: commit 7406240891e1541801083e08c3fccb2197132b42 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Nov 18 23:07:37 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 14:35:31 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) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200800 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index db85b903e761..39379ecb38db 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 := 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 38eaac01895f7861182aa512b068a3ba7f1d2a9b Author: Xisco Fauli <[email protected]> AuthorDate: Tue Oct 21 16:13:07 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 14:35:22 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) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200799 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index c0439abd8988..db85b903e761 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 := 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 027c09ae06f904c86a06bc83bdbafbf358f897c5 Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Sep 23 08:20:08 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 14:35:17 2026 +0100 external/nss: Fix -Wincompatible-pointer-types ...on macOS, where connectx(2) "appeared in Darwin 15.0.0" according to its man page, and where recent Clang with <https://github.com/llvm/llvm-project/commit/b24769855d97697de08e2296a548c033f193caf4> "[Clang] [Sema] Make `-Wincompatible-pointer-types` an error by default (#157364)" now started to fail with > ../../../../pr/src/pthreads/ptio.c:2046:58: error: incompatible pointer types passing 'PRInt32 *' (aka 'int *') to parameter of type 'size_t *' (aka 'unsigned long *') [-Wincompatible-pointer-types] > 2046 | CONNECT_DATA_IDEMPOTENT, iov, 1, &bytes, NULL); > | ^~~~~~ > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX26.0.sdk/usr/include/sys/socket.h:741:49: note: passing argument to parameter here > 741 | const struct iovec *, unsigned int, size_t *, sae_connid_t *); > | ^ > ../../../../pr/src/pthreads/ptio.c:2045:11: warning: unused variable 'rv' [-Wunused-variable] > 2045 | PRInt32 rv = connectx(fd->secret->md.osfd, &endpoints, SAE_ASSOCID_ANY, > | ^~ Change-Id: I047a987e443ab0283f38d997d03062fe969a65c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191375 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit 1edb882cd03a632644f90003e07ca57f4268b053) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200798 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 5915af095a54..a1e47c307a96 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -28,6 +28,7 @@ $(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 new file mode 100644 index 000000000000..29c6fd1a8469 --- /dev/null +++ b/external/nss/connectx.patch.0 @@ -0,0 +1,11 @@ +--- 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;
