configure.ac | 2 +- download.lst | 4 ++-- svx/source/sdr/contact/viewobjectcontact.cxx | 1 + 3 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit ebbcd3d6024203d3c457089fbfda3b9c8132cb5f Author: Michael Stahl <[email protected]> AuthorDate: Mon Aug 28 10:13:28 2023 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Mon Aug 28 17:33:12 2023 +0200 python3: upgrade to release 3.8.18 Fixes CVE-2023-40217 Change-Id: Ie08af471009b7f5c42aa6875dd4f9d886ad1d617 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156183 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit c1586ef57b5770f80ef200ab38ff4538c2dfb145) diff --git a/configure.ac b/configure.ac index ec3bdb6e3a19..5e8904798988 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}.17 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.18 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 8b5d876b4f4e..9b8e9fc07e15 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 := 2e54b0c68191f16552f6de2e97a2396540572a219f6bbb28591a137cecc490a9 -PYTHON_TARBALL := Python-3.8.17.tar.xz +PYTHON_SHA256SUM := 3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f +PYTHON_TARBALL := Python-3.8.18.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 8a21b8d923b8c899675588e14c9b4c9763eb486c Author: Michael Stahl <[email protected]> AuthorDate: Mon Aug 28 17:33:01 2023 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Mon Aug 28 17:33:12 2023 +0200 svx: fix build Change-Id: I900db1675c110568bc33e4e21babae55a941a626 diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx index 7191743188e1..db9498a726ad 100644 --- a/svx/source/sdr/contact/viewobjectcontact.cxx +++ b/svx/source/sdr/contact/viewobjectcontact.cxx @@ -38,6 +38,7 @@ #include <svx/svdoole2.hxx> #include <sdr/contact/viewcontactofsdrole2obj.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> +#include <sal/log.hxx> using namespace com::sun::star;
