configure.ac | 4 +-
download.lst | 8 ++--
external/expat/0001-Fix-compiler-warnings.patch | 47 ------------------------
external/expat/UnpackedTarball_expat.mk | 3 -
4 files changed, 6 insertions(+), 56 deletions(-)
New commits:
commit 7e698f51550e366e76fadd19eea5461a70140043
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Mar 25 18:51:16 2024 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Mar 25 20:20:16 2024 +0100
Bump version to 23.05.10.1
Change-Id: I44284fe9816161a4ec98d1ee079cfde84951c421
diff --git a/configure.ac b/configure.ac
index 665e59b9a1f3..ea178f56c8e4 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],[23.05.9.4],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.10.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 64ea22d83d791351f33d6d30a8036bd7b1c36b96
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Mar 20 10:52:09 2024 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Mar 25 20:20: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/configure.ac b/configure.ac
index e512feac736f..665e59b9a1f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10002,7 +10002,7 @@ if test \( "$cross_compiling" = yes -a -z
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=8
- PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.18
+ PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.19
if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in
download.lst])
fi
diff --git a/download.lst b/download.lst
index 75b05604496a..0f41363c1b28 100644
--- a/download.lst
+++ b/download.lst
@@ -534,8 +534,8 @@ POSTGRESQL_TARBALL := postgresql-13.10.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
-PYTHON_SHA256SUM :=
3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f
-PYTHON_TARBALL := Python-3.8.18.tar.xz
+PYTHON_SHA256SUM :=
d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076
+PYTHON_TARBALL := Python-3.8.19.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
commit 2f92cb37f7df574d0e6322107d01b000933a52cc
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Mar 22 13:43:14 2024 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Mar 25 20:20:16 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 1145fa8d08e1..75b05604496a 100644
--- a/download.lst
+++ b/download.lst
@@ -106,8 +106,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
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 \
))
