[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - configure.ac download.lst

Michael Stahl Michael.Stahl at cib.de
Fri Jun 29 12:54:41 UTC 2018


 configure.ac |    2 +-
 download.lst |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 083673e9c852fec9c1f1caf28714f1d7266aa89d
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Thu Jun 28 18:30:28 2018 +0200

    python3: upgrade to release 3.5.5
    
    Fixes CVE-2017-1000158.
    
    Change-Id: I1871f031e3431253a3403f2ea2b586bcc4aa1016
    Reviewed-on: https://gerrit.libreoffice.org/56609
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 744feb55a11263ae0947ab59db76b949b5863acf)
    Reviewed-on: https://gerrit.libreoffice.org/56684
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/configure.ac b/configure.ac
index 816410692087..050abf42f794 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8298,7 +8298,7 @@ internal)
         PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
     else
         PYTHON_VERSION_MINOR=5
-        PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.4
+        PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
     fi
     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])
diff --git a/download.lst b/download.lst
index 6309c54993a5..49ed2b743f72 100644
--- a/download.lst
+++ b/download.lst
@@ -137,8 +137,8 @@ ifeq ($(PYTHON_VERSION_MINOR),3)
 export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
 export PYTHON_TARBALL := Python-3.3.5.tgz
 else
-export PYTHON_MD5SUM := 2ed4802b7a2a7e40d2e797272bf388ec
-export PYTHON_TARBALL := Python-3.5.4.tgz
+export PYTHON_MD5SUM := f3763edf9824d5d3a15f5f646083b6e0
+export PYTHON_TARBALL := Python-3.5.5.tar.xz
 endif
 
 export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz


More information about the Libreoffice-commits mailing list