configure.ac | 6 +++++- download.lst | 4 ++-- external/nss/ExternalProject_nss.mk | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-)
New commits: commit 9a69e89e0cc7f74b1f994664438f34690074ed43 Author: Michael Stahl <[email protected]> AuthorDate: Thu Mar 31 20:33:02 2022 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Fri Apr 1 15:28:31 2022 +0200 nss: build with zlib module on WNT Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 1c748fefc3c5b42e3548a1a7f5017a579982005a) Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6 diff --git a/configure.ac b/configure.ac index c796a3985ebf..7d056feaedbb 100644 --- a/configure.ac +++ b/configure.ac @@ -7574,7 +7574,11 @@ else SYSTEM_ZLIB= BUILD_TYPE="$BUILD_TYPE ZLIB" ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib" - ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib" + if test "$COM" = "MSC"; then + ZLIB_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/zlib.lib" + else + ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib" + fi fi AC_SUBST(ZLIB_CFLAGS) AC_SUBST(ZLIB_LIBS) diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 132ce96ce9da..a404284ac837 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -23,9 +23,10 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ $(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \ OS_TARGET=WIN95 \ NSS_DISABLE_AVX2=1 \ + USE_SYSTEM_ZLIB=1 \ $(if $(filter X86_64,$(CPUNAME)),USE_64=1) \ LIB="$(ILIB)" \ - XCFLAGS="-arch:SSE $(SOLARINC)" \ + XCFLAGS="-arch:SSE $(SOLARINC) $(ZLIB_CFLAGS)" \ $(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \ NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \ ,nss) commit 4051644b73f24cc5c28513cdd54a11f7cfe7c6c0 Author: Michael Stahl <[email protected]> AuthorDate: Thu Mar 31 12:13:23 2022 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Fri Apr 1 15:28:31 2022 +0200 zlib: upgrade to release 1.2.12 Fixes CVE-2018-25032 external/zlib/ubsan.patch: remove, fixed upstream Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132358 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit bfb6c4c65781a610d21409d974227d73f264f41a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132191 Reviewed-by: Thorsten Behrens <[email protected]> (cherry picked from commit b91ebecaaa1582a7cbeda519eb6097a6a866135f) Change-Id: I2aa9a9008b9cf7efd970c5fff0df7029204204f8 diff --git a/download.lst b/download.lst index 10157b37b31b..2214236425bf 100644 --- a/download.lst +++ b/download.lst @@ -247,8 +247,8 @@ export WPS_VERSION_MICRO := 9 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz export XSLTML_SHA256SUM := 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -export ZLIB_SHA256SUM := 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 -export ZLIB_TARBALL := zlib-1.2.11.tar.xz +export ZLIB_SHA256SUM := 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 +export ZLIB_TARBALL := zlib-1.2.12.tar.xz export ZMF_SHA256SUM := 27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22 export ZMF_TARBALL := libzmf-0.0.2.tar.xz
