[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - configure.ac download.lst external/python3
configure.ac |2
download.lst |4 -
external/python3/ExternalProject_python3.mk |6 -
external/python3/UnpackedTarball_python3.mk |2
external/python3/python-3.3.5-pyexpat-symbols.patch.1 | 28
external/python3/python-3.5.7-c99.patch.1 | 62 --
6 files changed, 5 insertions(+), 99 deletions(-)
New commits:
commit 1a02ab9354ac0bfc385e655fb1748278517b1778
Author: Michael Stahl
AuthorDate: Mon Nov 18 18:45:46 2019 +0100
Commit: Michael Stahl
CommitDate: Fri Nov 22 14:38:57 2019 +0100
python3: upgrade to release 3.5.9
Fixes CVE-2019-9948 CVE-2019-9740 CVE-2019-10160 CVE-2019-16056
and expat CVE-2019-15903.
python-3.3.5-pyexpat-symbols.patch.1 fails to apply, and it's a
mystery why --with-system-expat is used everywhere but on MacOSX,
where 292af048ace2d4b455b2da3a22c784cb05db1d09 disabled it for no
obvious reason, so try to remove the special case and get rid of the
patch.
Reviewed-on: https://gerrit.libreoffice.org/83117
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit b0930d56130fdddfe65e92b081a8afad77974076)
Reviewed-on: https://gerrit.libreoffice.org/83189
Reviewed-by: Thorsten Behrens
(cherry picked from commit 0d4b1f624349361e5bf11b58ccc9e0e295c0e4aa)
Remove external/python3/python-3.5.7-c99.patch.1 - was apparently
reverted upstream.
Change-Id: I5ba4532eb6e7c2fb90daba95d132dcc7c9013d96
Reviewed-on: https://gerrit.libreoffice.org/83426
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/configure.ac b/configure.ac
index 0a912c2bf238..d6e72337e25c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8449,7 +8449,7 @@ internal)
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.9
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 993b5d105bcd..1d050742084c 100644
--- a/download.lst
+++ b/download.lst
@@ -134,8 +134,8 @@ export PNG_TARBALL := libpng-1.6.37.tar.xz
export POPPLER_MD5SUM := 1ce581bde2f23fa55bee13d8c61ac0df
export POPPLER_TARBALL := poppler-0.74.0.tar.xz
export POSTGRESQL_TARBALL :=
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_MD5SUM := b1b4949786732494f4d6675c184aa765
-export PYTHON_TARBALL := Python-3.5.7.tar.xz
+export PYTHON_MD5SUM := ef7f82485e83c7f8f8bcb920a9c2457b
+export PYTHON_TARBALL := Python-3.5.9.tar.xz
export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
export REDLAND_TARBALL :=
32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index f91399c0af52..de3c9faed444 100755
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -43,9 +43,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
else
-# this was added in 2004, hopefully is obsolete now (and why only intel
anyway)? $(if $(filter SOLARIS-INTEL,$(OS)$(CPUNAME)),--disable-ipv6)
-
-# --with-system-expat: this should find the one in the solver (or system)
+# --with-system-expat: this should find the one in the workdir (or system)
# create a symlink "LO_lib" because the .so are in a directory with platform
# specific name like build/lib.linux-x86_64-3.3
@@ -61,7 +59,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(ENABLE_VALGRIND),--with-valgrind) \
--prefix=/python-inst \
- $(if $(filter MACOSX,$(OS)),,--with-system-expat) \
+ --with-system-expat \
$(if $(filter AIX,$(OS)), \
--disable-ipv6 --with-threads OPT="-g0 -fwrapv -O3
-Wall", \
$(if $(gb_Module_CURRENTMODULE_DEBUG_ENABLED), \
diff --git a/external/python3/UnpackedTarball_python3.mk
b/external/python3/UnpackedTarball_python3.mk
index 5fe0212d86e3..048716423c13 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -24,11 +24,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/python-3.3.0-i42553.patch.2 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
- external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - configure.ac download.lst external/Module_external.mk external/python33
configure.ac| 33
download.lst|7
external/Module_external.mk |2
external/python33/ExternalPackage_python3.mk| 829 --
external/python33/ExternalProject_python3.mk| 148 -
external/python33/GeneratedPackage_python3.mk | 18
external/python33/Makefile |7
external/python33/Module_python33.mk| 24
external/python33/README|1
external/python33/UnpackedTarball_python3.mk| 61
external/python33/clang-cl.patch.0 | 11
external/python33/i100492-freebsd.patch.1 | 80 -
external/python33/python-3.3.0-clang.patch.1| 13
external/python33/python-3.3.0-darwin.patch.1 | 85 -
external/python33/python-3.3.0-gcc-4.8.patch.1 | 15
external/python33/python-3.3.0-i42553.patch.2 | 18
external/python33/python-3.3.0-msvc-disable.patch.1 | 47
external/python33/python-3.3.0-msvc-x64.patch.1 | 289 ---
external/python33/python-3.3.0-msvc2012.patch.1 | 72
external/python33/python-3.3.0-pythreadstate.patch.1| 15
external/python33/python-3.3.0-ssl.patch.1 | 208 --
external/python33/python-3.3.3-aix.patch.1 | 145 -
external/python33/python-3.3.3-disable-obmalloc.patch.0 | 21
external/python33/python-3.3.3-elf-rpath.patch.1| 13
external/python33/python-3.3.3-msvc2012-winxp.patch.1 | 117 -
external/python33/python-3.3.3-py17797.patch.1 | 45
external/python33/python-3.3.5-darwin-gnu-xargs.patch.1 | 12
external/python33/python-3.3.5-pyexpat-symbols.patch.1 | 28
external/python33/python-3.3.5-vs2013.patch.1 | 14
external/python33/python-lsan.patch.0 | 19
external/python33/python-msvc-disable-sse2.patch.1 | 23
external/python33/python-vc2013.patch.1 | 1213
external/python33/ubsan.patch.0 | 79 -
33 files changed, 7 insertions(+), 3705 deletions(-)
New commits:
commit a5f0e613a5b2017c8e9a9373f3c175529d321bb2
Author: David Ostrovsky
AuthorDate: Sun Jan 22 22:54:44 2017 +0100
Commit: Thorsten Behrens
CommitDate: Thu Aug 16 15:54:12 2018 +0200
Drop support for MSVC 2013
Reviewed-on: https://gerrit.libreoffice.org/22588
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit 84b36c704d73362d4d86dc9e9c0efa0625958347)
Conflicts:
configure.ac
download.lst
external/python33/ExternalPackage_python3.mk
external/python33/ExternalProject_python3.mk
external/python33/Module_python33.mk
external/python33/UnpackedTarball_python3.mk
external/python33/clang-cl.patch.0
Change-Id: Ibf47c9ff7b5fb098e284a58c547b61286264dd80
diff --git a/configure.ac b/configure.ac
index 71775caff9df..00807ded1efe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3299,8 +3299,6 @@ map_vs_year_to_version()
unset vsversion
case $1 in
-2013)
-vsversion=12.0;;
2015)
vsversion=14.0;;
*)
@@ -3395,7 +3393,7 @@ find_ucrt()
find_msvc()
{
-# Find Visual C++ 2013/2015
+# Find Visual C++ 2015
# Args: $1 (optional) : The VS version year
# Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot
@@ -3418,10 +3416,6 @@ find_msvc()
if test -n "$vctest"; then
vcnumwithdot=$ver
case "$vcnumwithdot" in
-12.0)
-vcyear=2013
-vcnum=120
-;;
14.0)
vcyear=2015
vcnum=140
@@ -3447,7 +3441,7 @@ if test "$_os" = "WINNT"; then
if test -n "$with_visual_studio"; then
AC_MSG_ERROR([No Visual Studio $with_visual_studio
installation found])
else
-AC_MSG_ERROR([No Visual Studio 2013/2015 installation found])
+AC_MSG_ERROR([No Visual Studio 2015 installation found])
fi
fi
@@ -3515,10 +3509,6 @@ if test "$_os" = "WINNT"; then
# Find the version of devenv.exe
DEVENV="$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe"
-if test ! -e "$DEVENV" -a "$vcnum" = "120"; then
-# for Visual Studio 2013 Express, fall back
-DEVENV="$VC_PRODUCT_DIR/../Common7/IDE/WDExpress.exe"
-fi
if test ! -e "$DEVENV"; then
AC_MSG_ERROR([No devenv.exe found, Visual Studio installation
broken?])
fi
@@ -5393,7 +5383,7 @@ find_msms()
my_msm_file=Microsoft_VC${VCVER}_CRT_x86.msm
AC_MSG_CHECKING([for $my_msm_file])
msmdir=
-for ver in 12.0 14.0; do
+for ver in 14.0; do
reg_get_value_32
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - configure.ac download.lst
configure.ac |2 +-
download.lst |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 083673e9c852fec9c1f1caf28714f1d7266aa89d
Author: Michael Stahl
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
(cherry picked from commit 744feb55a11263ae0947ab59db76b949b5863acf)
Reviewed-on: https://gerrit.libreoffice.org/56684
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
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
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
