configure.ac | 2 -
download.lst | 8 ++--
external/expat/0001-Fix-compiler-warnings.patch | 47 ------------------------
external/expat/UnpackedTarball_expat.mk | 3 -
4 files changed, 5 insertions(+), 55 deletions(-)
New commits:
commit 1e89c80eeefa9714ff2c04474d71618f66727a62
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Mar 26 10:15:03 2024 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Mar 26 10:15:03 2024 +0100
Bump version to 22.05.23.1
Change-Id: I4947db88e1faf5fd92174ceda05fd5ecfd4fe804
diff --git a/configure.ac b/configure.ac
index 97f2e134b737..6ea508f7683b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([Collabora Office],[22.05.22.2],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.23.1],[],[],[https://collaboraoffice.com/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just
fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails
hard
commit 05e7564acd09873502e46a71c941b7cbfa0a95f2
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Mar 20 10:52:09 2024 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Mar 26 10:10:16 2024 +0100
python3: upgrade to release 3.8.19
Fixes CVE-2023-6597 and also CVE-2024-0450
Change-Id: Iebca2608e16a966356736201c63f1be5185430d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165053
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit 0633e4b4205334dd65ec64d7f3e306ee125e31be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165009
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index 449a7a84a3b9..3c27bcbe0942 100644
--- a/download.lst
+++ b/download.lst
@@ -248,8 +248,8 @@ export POPPLER_DATA_SHA256SUM :=
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb
export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
export POSTGRESQL_SHA256SUM :=
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
export POSTGRESQL_TARBALL := postgresql-13.8.tar.bz2
-export PYTHON_SHA256SUM :=
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
-export PYTHON_TARBALL := Python-3.8.16.tar.xz
+export PYTHON_SHA256SUM :=
d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076
+export PYTHON_TARBALL := Python-3.8.19.tar.xz
export QXP_SHA256SUM :=
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
export QXP_TARBALL := libqxp-0.0.2.tar.xz
export RAPTOR_SHA256SUM :=
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
commit 2c6b04c863dfe6023aebe7b482b929ee405f3967
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Mar 22 13:43:14 2024 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Mar 26 10:08:43 2024 +0100
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 <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 370ca73a45b291e172918b4c8fcbc37ccaa434cf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165177
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
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 <20001...@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 \
))
