configure.ac | 19 +++++++++++++------ download.lst | 4 ++-- 2 files changed, 15 insertions(+), 8 deletions(-)
New commits: commit f2325e4f9482e70cdde62f5ddfe6488d6f3b812e Author: Michael Stahl <[email protected]> AuthorDate: Wed Oct 1 18:40:51 2025 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Oct 15 23:20:42 2025 +0200 python3: upgrade to release 3.9.23 Fixes CVE-2025-4516 and also CVE-2025-4435 CVE-2024-12718 CVE-2025-4138 CVE-2025-4330 CVE-2025-4517 (the announcement for these claims they only affect >= 3.12 but they are patched in 3.9.23) Change-Id: I4b22a7783d8ee846978cce03c61e61550d76de0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191790 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/configure.ac b/configure.ac index 0a94b9c890c5..242e23c3655b 100644 --- a/configure.ac +++ b/configure.ac @@ -10122,7 +10122,7 @@ if test \( "$cross_compiling" = yes -a -z "$PYTHON_FOR_BUILD" \) -o "$enable_pyt SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 PYTHON_VERSION_MINOR=9 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.22 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.23 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 901f8d9371dd..607ead6876b9 100644 --- a/download.lst +++ b/download.lst @@ -658,8 +658,8 @@ POSTGRESQL_TARBALL := postgresql-13.16.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts -PYTHON_SHA256SUM := 8c136d199d3637a1fce98a16adc809c1d83c922d02d41f3614b34f8b6e7d38ec -PYTHON_TARBALL := Python-3.9.22.tar.xz +PYTHON_SHA256SUM := 61a42919e13d539f7673cf11d1c404380e28e540510860b9d242196e165709c9 +PYTHON_TARBALL := Python-3.9.23.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 4d0eab27f43d17ba54cebe89251ac7bba4c8ebdf Author: Michael Stahl <[email protected]> AuthorDate: Mon Aug 18 13:08:40 2025 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Oct 15 23:20:32 2025 +0200 rhbz#2354168 configure: workaround bogus "dbus-1" libs DBUS_LIBS contains -L/usr/lib64/pkgconfig/../../lib64 which eventually causes link failure: desktop/source/lib/init.cxx:6451: error: undefined reference to 'ublock_getCode_77' Reportedly realpath(1) is available even on macOS now so use it to resolve these paths. Change-Id: I754447ad23982918d6f8e80f839112db22b75205 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189864 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 457872f8cac849b319ad4f88a94c8390aa9e3df7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189879 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit db867ee5d6b6a239a7d822233ad022d18962ccd4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191788 diff --git a/configure.ac b/configure.ac index d9e40d7a1817..0a94b9c890c5 100644 --- a/configure.ac +++ b/configure.ac @@ -59,11 +59,18 @@ FilterLibs() else for f in $1; do case "$f" in - # let's start with Fedora's paths for now - -L/lib|-L/lib/|-L/lib64|-L/lib64/|-L/usr/lib|-L/usr/lib/|-L/usr/lib64|-L/usr/lib64/) - # ignore it: on UNIXoids it is searched by default anyway - # but if it's given explicitly then it may override other paths - # (on macOS it would be an error to use it instead of SDK) + -L*) + case `realpath "${f#-L}"` in + # let's start with Fedora's paths for now + /lib|/lib/|/lib64|/lib64/|/usr/lib|/usr/lib/|/usr/lib64|/usr/lib64/) + # ignore it: on UNIXoids it is searched by default anyway + # but if it's given explicitly then it may override other paths + # (on macOS it would be an error to use it instead of SDK) + ;; + *) + filteredlibs="$filteredlibs $f" + ;; + esac ;; *) filteredlibs="$filteredlibs $f"
