diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2024-03-20 10:52:09 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2024-03-27 15:38:30 +0100 |
| commit | d26c05fb8cdf1bfbd8f0af411c5220d778c3a3a8 (patch) | |
| tree | 3e9972affdb65654c40d8f0111b0cfde376f4221 | |
| parent | Expat: upgrade to release 2.6.2 (diff) | |
| download | core-d26c05fb8cdf1bfbd8f0af411c5220d778c3a3a8.tar.gz core-d26c05fb8cdf1bfbd8f0af411c5220d778c3a3a8.zip | |
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.stahl@allotropia.de>
(cherry picked from commit 0633e4b4205334dd65ec64d7f3e306ee125e31be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165009
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/python3/python-3.3.0-darwin.patch.1 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 97f2e134b737..1f01097740cd 100644 --- a/configure.ac +++ b/configure.ac @@ -9775,7 +9775,7 @@ internal) SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 PYTHON_VERSION_MINOR=8 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16 + 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 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 diff --git a/external/python3/python-3.3.0-darwin.patch.1 b/external/python3/python-3.3.0-darwin.patch.1 index 39d3c9180a19..d262d55cd5b3 100644 --- a/external/python3/python-3.3.0-darwin.patch.1 +++ b/external/python3/python-3.3.0-darwin.patch.1 @@ -49,7 +49,7 @@ diff -ru python3.orig/Mac/Resources/app/Info.plist.in python3/Mac/Resources/app/ - <string>Python</string> + <string>LibreOfficePython</string> <key>CFBundleGetInfoString</key> - <string>%version%, (c) 2001-2020 Python Software Foundation.</string> + <string>%version%, (c) 2001-2023 Python Software Foundation.</string> <key>CFBundleHelpBookFolder</key> diff -ru python3.orig/Mac/Resources/framework/Info.plist.in python3/Mac/Resources/framework/Info.plist.in --- python3.orig/Mac/Resources/framework/Info.plist.in 2015-07-05 18:50:07.000000000 +0200 |