summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2023-06-07 11:16:03 +0200
committerMichael Stahl <michael.stahl@allotropia.de>2023-06-07 16:09:28 +0200
commitee45744ffaa5218579387a53873d47eac56b92de (patch)
tree117cdee81a0d1c1beaeaa7f7346a3775e1376199
parent829658fda824f465c596cdd7bcaf6397d8e66982 (diff)
python3: upgrade to release 3.8.17
Fixes CVE-2023-24329 and a few more obscure security issues. Change-Id: I4b073ce02c0377e2791e4593d20f2b756de0c8cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152696 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 734d53534a6ca023e9c2eb819cde889b01818f1b)
-rw-r--r--configure.ac2
-rw-r--r--download.lst4
-rw-r--r--external/python3/python-3.3.0-darwin.patch.12
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 6986a174de09..4867f4ef1629 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8796,7 +8796,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}.17
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 550c5ef12453..dcb9e7925a51 100644
--- a/download.lst
+++ b/download.lst
@@ -480,8 +480,8 @@ POSTGRESQL_TARBALL := postgresql-13.10.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
-PYTHON_SHA256SUM := d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
-PYTHON_TARBALL := Python-3.8.16.tar.xz
+PYTHON_SHA256SUM := 2e54b0c68191f16552f6de2e97a2396540572a219f6bbb28591a137cecc490a9
+PYTHON_TARBALL := Python-3.8.17.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
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