download.lst | 6 +++--- external/libxml2/ExternalPackage_libxml2.mk | 2 +- external/libxml2/libxml2-XMLCALL-redefine.patch.0 | 8 ++++---- external/libxml2/libxml2-icu-sym.patch.0 | 8 ++++---- external/libxml2/libxml2-icu.patch.0 | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-)
New commits: commit 134626f09af28f58f483844ea4a5ca92341651f2 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Feb 19 09:38:27 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Thu Oct 16 21:03:49 2025 +0200 libxml2: upgrade to 2.13.6 Downloaded from https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.6.tar.xz Change-Id: Ia52a7fd49d9db7a339e5defacce866e4aad34efc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181867 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 09721edb1c48c996b965b2e533f271d9df401414) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181874 Reviewed-by: Michael Weghorn <[email protected]> (cherry picked from commit a023afdad6888b39c6efaaaebfc3c70f736b7a0b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192529 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index c01afdbee5ad..8e8dd552f0d9 100644 --- a/download.lst +++ b/download.lst @@ -527,8 +527,8 @@ XMLSEC_TARBALL := xmlsec1-1.3.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBXML_SHA256SUM := 74fc163217a3964257d3be39af943e08861263c4231f9ef5b496b6f6d4c7b2b6 -LIBXML_VERSION_MICRO := 5 +LIBXML_SHA256SUM := f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96 +LIBXML_VERSION_MICRO := 6 LIBXML_TARBALL := libxml2-2.13.$(LIBXML_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick commit 4f648041fcfee783336fecdd6a7e16f781dbbf0e Author: Xisco Fauli <[email protected]> AuthorDate: Wed Nov 13 09:49:58 2024 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Thu Oct 16 21:03:45 2025 +0200 libxml2: upgrade to 2.13.5 Downloaded from https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.5.tar.xz Change-Id: I8b88b49fdda737c74bc0c2b3b18b14ada3389f20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176519 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit d7c396771303c772bb8ed8c01b3b76d74946f179) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192528 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index ffbd5108fc3e..c01afdbee5ad 100644 --- a/download.lst +++ b/download.lst @@ -527,8 +527,8 @@ XMLSEC_TARBALL := xmlsec1-1.3.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBXML_SHA256SUM := 65d042e1c8010243e617efb02afda20b85c2160acdbfbcb5b26b80cec6515650 -LIBXML_VERSION_MICRO := 4 +LIBXML_SHA256SUM := 74fc163217a3964257d3be39af943e08861263c4231f9ef5b496b6f6d4c7b2b6 +LIBXML_VERSION_MICRO := 5 LIBXML_TARBALL := libxml2-2.13.$(LIBXML_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick commit d14a50fb8556bf33acf6b0bb85a321e9279afd53 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Sep 18 15:54:25 2024 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Thu Oct 16 21:03:42 2025 +0200 libxml2: upgrade to 2.13.4 * 0001-ofz-70675-XML_ERR_FATAL-not-ending-parse.patch.0 is no longer needed. fixed upstream Downloaded from https://download-fallback.gnome.org/sources/libxml2/2.13/libxml2-2.13.4.tar.xz Change-Id: I7d39940ad5b197b302c57110e147aef7d2b911d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173621 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit d500848976b6244048684a9972322b582559910a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192527 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index 8fb433e4fdda..ffbd5108fc3e 100644 --- a/download.lst +++ b/download.lst @@ -527,8 +527,8 @@ XMLSEC_TARBALL := xmlsec1-1.3.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBXML_SHA256SUM := 0805d7c180cf09caad71666c7a458a74f041561a532902454da5047d83948138 -LIBXML_VERSION_MICRO := 3 +LIBXML_SHA256SUM := 65d042e1c8010243e617efb02afda20b85c2160acdbfbcb5b26b80cec6515650 +LIBXML_VERSION_MICRO := 4 LIBXML_TARBALL := libxml2-2.13.$(LIBXML_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick commit 88559570d1eaf3c33e210c982574b4449f788a32 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Jul 24 17:37:25 2024 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Thu Oct 16 21:03:36 2025 +0200 libxml2: upgrade to 2.13.3 it fixes CVE-2024-40896 Downloaded from https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.3.tar.xz Change-Id: Icba636106cc9d1f096f5479bd80d5e30712c2e6a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170975 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 6ddd8287d27736032c02084f124dab95c4715dda) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192526 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/download.lst b/download.lst index b720774a2b02..8fb433e4fdda 100644 --- a/download.lst +++ b/download.lst @@ -527,9 +527,9 @@ XMLSEC_TARBALL := xmlsec1-1.3.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBXML_SHA256SUM := 59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590 -LIBXML_VERSION_MICRO := 9 -LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz +LIBXML_SHA256SUM := 0805d7c180cf09caad71666c7a458a74f041561a532902454da5047d83948138 +LIBXML_VERSION_MICRO := 3 +LIBXML_TARBALL := libxml2-2.13.$(LIBXML_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/libxml2/ExternalPackage_libxml2.mk b/external/libxml2/ExternalPackage_libxml2.mk index 799044575f9a..17190c77fd18 100644 --- a/external/libxml2/ExternalPackage_libxml2.mk +++ b/external/libxml2/ExternalPackage_libxml2.mk @@ -21,7 +21,7 @@ else # COM=MSC $(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll)) endif else # OS!=WNT -$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.12.$(LIBXML_VERSION_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.13.$(LIBXML_VERSION_MICRO))) endif endif # DISABLE_DYNLOADING diff --git a/external/libxml2/libxml2-XMLCALL-redefine.patch.0 b/external/libxml2/libxml2-XMLCALL-redefine.patch.0 index d9ca23be7ce4..57d23d885943 100644 --- a/external/libxml2/libxml2-XMLCALL-redefine.patch.0 +++ b/external/libxml2/libxml2-XMLCALL-redefine.patch.0 @@ -1,11 +1,11 @@ --- include/libxml/xmlexports.h 2023-05-24 12:48:46.179570708 +0100 +++ include/libxml/xmlexports.h 2023-05-24 12:48:56.563577488 +0100 -@@ -38,8 +38,6 @@ +@@ -31,8 +31,6 @@ + #define XMLPUBVAR XMLPUBLIC extern - /** DOC_DISABLE */ /* Compatibility */ -#define XMLCALL -#define XMLCDECL - #if !defined(LIBXML_DLL_IMPORT) - #define LIBXML_DLL_IMPORT XMLPUBVAR + #ifndef LIBXML_DLL_IMPORT + #define LIBXML_DLL_IMPORT XMLPUBVAR #endif diff --git a/external/libxml2/libxml2-icu-sym.patch.0 b/external/libxml2/libxml2-icu-sym.patch.0 index 07676228da19..d89a1c4c544b 100644 --- a/external/libxml2/libxml2-icu-sym.patch.0 +++ b/external/libxml2/libxml2-icu-sym.patch.0 @@ -3,14 +3,14 @@ Find bundled ICU in workdir and use debug .libs when needed diff -up win32/Makefile.msvc.dt win32/Makefile.msvc --- win32/Makefile.msvc.dt 2014-07-18 19:00:23.372103963 +0200 +++ win32/Makefile.msvc 2014-07-18 19:01:39.347982929 +0200 -@@ -46,6 +46,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" +@@ -42,6 +42,7 @@ CC = cl.exe CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 $(CRUNTIME) CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX) +CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common - !if "$(WITH_THREADS)" != "no" - CFLAGS = $(CFLAGS) /D "_REENTRANT" - !endif + !if "$(WITH_THREADS)" == "ctls" + CFLAGS = $(CFLAGS) /D "XML_THREAD_LOCAL=__declspec(thread)" + !else if "$(WITH_THREADS)" == "posix" @@ -62,7 +63,9 @@ # The linker and its options. LD = link.exe diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0 index 84197763f878..85ce8b3aba2b 100644 --- a/external/libxml2/libxml2-icu.patch.0 +++ b/external/libxml2/libxml2-icu.patch.0 @@ -3,14 +3,14 @@ Find bundled ICU in workdir and use debug .libs when needed diff -up win32/Makefile.msvc.dt win32/Makefile.msvc --- win32/Makefile.msvc.dt 2014-07-18 19:00:23.372103963 +0200 +++ win32/Makefile.msvc 2014-07-18 19:01:39.347982929 +0200 -@@ -45,6 +45,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" +@@ -42,6 +42,7 @@ CC = cl.exe CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 $(CRUNTIME) CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX) +CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common - !if "$(WITH_THREADS)" != "no" - CFLAGS = $(CFLAGS) /D "_REENTRANT" - !endif + !if "$(WITH_THREADS)" == "ctls" + CFLAGS = $(CFLAGS) /D "XML_THREAD_LOCAL=__declspec(thread)" + !else if "$(WITH_THREADS)" == "posix" @@ -67,6 +68,7 @@ CFLAGS = $(CFLAGS) $(SOLARINC) # The linker and its options. LD = link.exe
