diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2024-03-22 13:43:14 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2024-03-26 10:08:43 +0100 |
| commit | 2c6b04c863dfe6023aebe7b482b929ee405f3967 (patch) | |
| tree | f45d8156c8737e98275a42996184d425a275e560 | |
| parent | 1278be1beeb2200c5df89fb3189342491fc42b2d (diff) | |
Expat: upgrade to release 2.6.2
Fixes CVE-2024-28757
Change-Id: Id85044fa9d8eda922425e580e9d6979f6563e98a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165129
Tested-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
(cherry picked from commit 370ca73a45b291e172918b4c8fcbc37ccaa434cf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165177
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/expat/0001-Fix-compiler-warnings.patch | 47 | ||||
| -rw-r--r-- | external/expat/UnpackedTarball_expat.mk | 3 |
3 files changed, 2 insertions, 52 deletions
diff --git a/download.lst b/download.lst index 0b22fab601e4..449a7a84a3b9 100644 --- a/download.lst +++ b/download.lst @@ -50,8 +50,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz export ETONYEK_SHA256SUM := b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a export ETONYEK_VERSION_MICRO := 10 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz -export EXPAT_SHA256SUM := cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e -export EXPAT_TARBALL := expat-2.6.0.tar.xz +export EXPAT_SHA256SUM := ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 +export EXPAT_TARBALL := expat-2.6.2.tar.xz export FIREBIRD_SHA256SUM := acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76 export FIREBIRD_TARBALL := Firebird-3.0.7.33374-0.tar.bz2 export FONTCONFIG_SHA256SUM := a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c diff --git a/external/expat/0001-Fix-compiler-warnings.patch b/external/expat/0001-Fix-compiler-warnings.patch deleted file mode 100644 index adec5ed0d9be..000000000000 --- a/external/expat/0001-Fix-compiler-warnings.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3f60a47cb5716bb810789a12ef6024c1dc448164 Mon Sep 17 00:00:00 2001 -From: Taichi Haradaguchi <20001722@ymail.ne.jp> -Date: Fri, 9 Feb 2024 19:28:35 +0900 -Subject: [PATCH] Fix compiler warnings - -> In file included from ./../lib/internal.h:149, -> from codepage.c:38: -> ./../lib/expat.h:1045:5: warning: "XML_GE" is not defined, evaluates to 0 [-Wundef] -> 1045 | #if XML_GE == 1 -> | ^~~~~~ -> ./../lib/internal.h:158:5: warning: "XML_GE" is not defined, evaluates to 0 [-Wundef] -> 158 | #if XML_GE == 1 -> | ^~~~~~ ---- - expat/lib/expat.h | 2 +- - expat/lib/internal.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/expat/lib/expat.h b/expat/lib/expat.h -index 95464b0d..79bbfb61 100644 ---- a/expat/lib/expat.h -+++ b/expat/lib/expat.h -@@ -1042,7 +1042,7 @@ typedef struct { - XMLPARSEAPI(const XML_Feature *) - XML_GetFeatureList(void); - --#if XML_GE == 1 -+#if defined(XML_GE) && XML_GE == 1 - /* Added in Expat 2.4.0 for XML_DTD defined and - * added in Expat 2.6.0 for XML_GE == 1. */ - XMLPARSEAPI(XML_Bool) -diff --git a/expat/lib/internal.h b/expat/lib/internal.h -index cce71e4c..208c6b67 100644 ---- a/expat/lib/internal.h -+++ b/expat/lib/internal.h -@@ -155,7 +155,7 @@ extern "C" { - void _INTERNAL_trim_to_complete_utf8_characters(const char *from, - const char **fromLimRef); - --#if XML_GE == 1 -+#if defined(XML_GE) && XML_GE == 1 - unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser); - unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser); - const char *unsignedCharToPrintable(unsigned char c); --- -2.43.1 - diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk index 465105f2ca8c..5d4f41f6d147 100644 --- a/external/expat/UnpackedTarball_expat.mk +++ b/external/expat/UnpackedTarball_expat.mk @@ -13,10 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL))) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,expat,conftools)) -# * external/expat/0001-Fix-compiler-warnings.patch was sent to upstream as -# <https://github.com/libexpat/libexpat/pull/819> "Fix compiler warnings": $(eval $(call gb_UnpackedTarball_add_patches,expat,\ - external/expat/0001-Fix-compiler-warnings.patch \ external/expat/expat-winapi.patch \ )) |