configure.ac | 2 download.lst | 4 - external/python3/UnpackedTarball_python3.mk | 1 external/python3/python-3.5.7-c99.patch.1 | 62 ++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 3 deletions(-)
New commits: commit 1cd2c3eb800f6ba2363f1033736b9dc5dcacf22c Author: Michael Stahl <[email protected]> AuthorDate: Wed Apr 3 11:03:17 2019 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Thu Apr 4 12:15:36 2019 +0200 python3: upgrade to release 3.5.7 Fixes CVE-2019-9636 CVE-2019-5010 CVE-2018-14647 Reviewed-on: https://gerrit.libreoffice.org/70182 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 3c7354a85a9bd47a2676aadaad2f6622fe2d959c) Reviewed-on: https://gerrit.libreoffice.org/70194 Reviewed-by: Thorsten Behrens <[email protected]> (cherry picked from commit a072b91c03f7e24cc5fe99e4b7462d37ef8d703b) Change-Id: If0a115960aed1ee90b63e6716c844669f0ec91e5 diff --git a/configure.ac b/configure.ac index 75f9946e22c0..4473502848af 100644 --- a/configure.ac +++ b/configure.ac @@ -8420,7 +8420,7 @@ internal) PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5 else PYTHON_VERSION_MINOR=5 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.6 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7 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 1b6009a6a63d..a49c54719c4d 100644 --- a/download.lst +++ b/download.lst @@ -139,8 +139,8 @@ ifeq ($(PYTHON_VERSION_MINOR),3) export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021 export PYTHON_TARBALL := Python-3.3.5.tgz else -export PYTHON_MD5SUM := f5a99f765e765336a3ebbb2a24ca2be3 -export PYTHON_TARBALL := Python-3.5.6.tar.xz +export PYTHON_MD5SUM := b1b4949786732494f4d6675c184aa765 +export PYTHON_TARBALL := Python-3.5.7.tar.xz endif export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index 04def4429860..5fe0212d86e3 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ external/python3/ubsan.patch.0 \ external/python3/python-3.5.tweak.strip.soabi.patch \ external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 \ + external/python3/python-3.5.7-c99.patch.1 \ )) ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),) diff --git a/external/python3/python-3.5.7-c99.patch.1 b/external/python3/python-3.5.7-c99.patch.1 new file mode 100644 index 000000000000..558166d9953f --- /dev/null +++ b/external/python3/python-3.5.7-c99.patch.1 @@ -0,0 +1,62 @@ +remove C99 which isn't suppored by all compilers yet + +--- python3/Modules/_pickle.c.orig 2019-04-03 16:34:01.380124314 +0200 ++++ python3/Modules/_pickle.c 2019-04-03 16:35:18.579005171 +0200 +@@ -674,9 +674,12 @@ + PyErr_NoMemory(); + return NULL; + } +- for (size_t i = 0; i < self->mt_allocated; i++) { ++ { ++ size_t i; ++ for (i = 0; i < self->mt_allocated; i++) { + Py_XINCREF(self->mt_table[i].me_key); + } ++ } + memcpy(new->mt_table, self->mt_table, + sizeof(PyMemoEntry) * self->mt_allocated); + +@@ -4204,7 +4207,9 @@ + return NULL; + + memo = self->pickler->memo; +- for (size_t i = 0; i < memo->mt_allocated; ++i) { ++ { ++ size_t i; ++ for (i = 0; i < memo->mt_allocated; ++i) { + PyMemoEntry entry = memo->mt_table[i]; + if (entry.me_key != NULL) { + int status; +@@ -4225,6 +4230,7 @@ + goto error; + } + } ++ } + return new_memo; + + error: +@@ -6791,10 +6797,13 @@ + if (new_memo == NULL) + return -1; + +- for (size_t i = 0; i < new_memo_size; i++) { ++ { ++ size_t i; ++ for (i = 0; i < new_memo_size; i++) { + Py_XINCREF(unpickler->memo[i]); + new_memo[i] = unpickler->memo[i]; + } ++ } + } + else if (PyDict_Check(obj)) { + Py_ssize_t i = 0; +@@ -6839,7 +6848,8 @@ + + error: + if (new_memo_size) { +- for (size_t i = new_memo_size - 1; i != SIZE_MAX; i--) { ++ size_t i; ++ for (i = new_memo_size - 1; i != SIZE_MAX; i--) { + Py_XDECREF(new_memo[i]); + } + PyMem_FREE(new_memo); commit e0122f0cfe8b38da214dac76ecff13e0ee0f6a6b Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jan 17 10:50:42 2019 +0000 Commit: Michael Stahl <[email protected]> CommitDate: Thu Apr 4 12:15:36 2019 +0200 upgrade to python 3.5.6 Reviewed-on: https://gerrit.libreoffice.org/66519 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins (cherry picked from commit 6808e1e5e2361220988dfa81cb35d03fb6e15855) Change-Id: I6cdfc50b2385c426e20ce0e9b216b18c763249b8 diff --git a/configure.ac b/configure.ac index 169360f27472..75f9946e22c0 100644 --- a/configure.ac +++ b/configure.ac @@ -8420,7 +8420,7 @@ internal) PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5 else PYTHON_VERSION_MINOR=5 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.6 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 fe71ec204ea1..1b6009a6a63d 100644 --- a/download.lst +++ b/download.lst @@ -139,8 +139,8 @@ ifeq ($(PYTHON_VERSION_MINOR),3) export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021 export PYTHON_TARBALL := Python-3.3.5.tgz else -export PYTHON_MD5SUM := f3763edf9824d5d3a15f5f646083b6e0 -export PYTHON_TARBALL := Python-3.5.5.tar.xz +export PYTHON_MD5SUM := f5a99f765e765336a3ebbb2a24ca2be3 +export PYTHON_TARBALL := Python-3.5.6.tar.xz endif export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
