diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2024-03-22 13:43:14 +0100 |
|---|---|---|
| committer | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2024-03-22 15:57:29 +0100 |
| commit | 370ca73a45b291e172918b4c8fcbc37ccaa434cf (patch) | |
| tree | 3b8a0779447a47a52ac0b397c43241a9c2f7f512 /external/expat | |
| parent | cfd84d8a2add8b5c121d027458ac7692d90b5c7a (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>
Diffstat (limited to 'external/expat')
| -rw-r--r-- | external/expat/0001-Fix-compiler-warnings.patch | 47 | ||||
| -rw-r--r-- | external/expat/UnpackedTarball_expat.mk | 3 |
2 files changed, 0 insertions, 50 deletions
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 \ )) |