configure.ac | 5 ++++- download.lst | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit 7be130278c83b68bff0a1c05c61a931340ff8e6c Author: Michael Stahl <michael.st...@cib.de> AuthorDate: Thu Jun 28 18:30:28 2018 +0200 Commit: Michael Stahl <michael.st...@cib.de> CommitDate: Fri Jan 18 16:03:47 2019 +0100 python3: upgrade to release 3.5.5 Fixes CVE-2017-1000158. Reviewed-on: https://gerrit.libreoffice.org/56609 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@cib.de> (cherry picked from commit 744feb55a11263ae0947ab59db76b949b5863acf) Reviewed-on: https://gerrit.libreoffice.org/56673 Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de> (cherry picked from commit f764237989d8aa081a30b3518add39af4bb23632) Change-Id: I1871f031e3431253a3403f2ea2b586bcc4aa1016 diff --git a/configure.ac b/configure.ac index a1b8778cb787..08955eae1e7d 100644 --- a/configure.ac +++ b/configure.ac @@ -8274,7 +8274,7 @@ internal) SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 PYTHON_VERSION_MINOR=5 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.4 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5 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 cc0082bfad21..b3fb713f09d1 100644 --- a/download.lst +++ b/download.lst @@ -194,8 +194,8 @@ export POPPLER_SHA256SUM := e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112 export POPPLER_TARBALL := poppler-0.73.0.tar.xz export POSTGRESQL_SHA256SUM := db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461 export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 -export PYTHON_SHA256SUM := 6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44 -export PYTHON_TARBALL := Python-3.5.4.tgz +export PYTHON_SHA256SUM := 063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009 +export PYTHON_TARBALL := Python-3.5.5.tar.xz export RAPTOR_SHA256SUM := ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz export RASQAL_SHA256SUM := 6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c commit 35ded2fafc44ba3af7c9f5e63050d0d9ef65867a Author: Michael Stahl <mst...@redhat.com> AuthorDate: Tue Aug 22 22:26:43 2017 +0200 Commit: Michael Stahl <michael.st...@cib.de> CommitDate: Fri Jan 18 16:03:17 2019 +0100 configure: try to keep PYTHON_VERSION from going stale Since it was set to 3.5.0, the bundled python was upgraded twice, but the directory is still named python-core-3.5.0 :( Change-Id: I15eec4148c2436e1f289d9851ce5bd212d4a368a Reviewed-on: https://gerrit.libreoffice.org/41433 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Stahl <mst...@redhat.com> (cherry picked from commit ac3a4fe35e873de17eefb46c3f5e792aded6b0a5) diff --git a/configure.ac b/configure.ac index f39c422d3f2c..a1b8778cb787 100644 --- a/configure.ac +++ b/configure.ac @@ -8274,7 +8274,10 @@ internal) SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 PYTHON_VERSION_MINOR=5 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.4 + 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 AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L"${PYTHON_VERSION}"]) BUILD_TYPE="$BUILD_TYPE PYTHON" # Embedded Python dies without Home set _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits