strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Expat: upgrade to release 2.6.2

Browse source 
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>
This commit is contained in:
Taichi Haradaguchi 2024-03-22 13:43:14 +01:00
parent cfd84d8a2a
commit 370ca73a45
3 changed files with 2 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download.lst
View file

@ -111,8 +111,8 @@ ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
EXPAT_SHA256SUM := cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e
EXPAT_TARBALL := expat-2.6.0.tar.xz
EXPAT_SHA256SUM := ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364
EXPAT_TARBALL := expat-2.6.2.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts

47
external/expat/0001-Fix-compiler-warnings.patch vendored
View file

@ -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

3
external/expat/UnpackedTarball_expat.mk vendored
View file

@ -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 \
))