diff --git a/.gitmodules b/.gitmodules index 46caf118..53eea0f5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "buildroot"] path = buildroot url = https://github.com/buildroot/buildroot.git - branch = 2019.11.x + branch = 2019.08.x diff --git a/buildroot b/buildroot index 836b84a7..21e50b55 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 836b84a7743cbf7d6b745efd023217bed47e34e8 +Subproject commit 21e50b5598625bda1f6f98566113cce1dba976ae diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index f5a86e78..4c2de4d4 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -262,7 +262,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPS=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y -BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW=y BR2_PACKAGE_BASH_COMPLETION=y BR2_PACKAGE_FILE=y BR2_PACKAGE_SCREEN=y @@ -294,8 +294,6 @@ BR2_PACKAGE_HOST_PYTHON_CYTHON=y BR2_PACKAGE_HOST_PYTHON_LXML=y BR2_PACKAGE_HOST_PYTHON_SIX=y BR2_PACKAGE_HOST_PYTHON_XLRD=y -BR2_PACKAGE_HOST_PYTHON3=y -BR2_PACKAGE_HOST_PYTHON3_SSL=y BR2_PACKAGE_FIRSTBOOT_SERVICE=y BR2_PACKAGE_PREPARE_SYSTEM_SERVICE=y BR2_PACKAGE_PYTHON_MYCROFT=y diff --git a/buildroot-external/package/python-gtts/python-gtts.mk b/buildroot-external/package/python-gtts/python-gtts.mk index 22998654..06251700 100644 --- a/buildroot-external/package/python-gtts/python-gtts.mk +++ b/buildroot-external/package/python-gtts/python-gtts.mk @@ -12,3 +12,4 @@ PYTHON_GTTS_LICENSE = MIT PYTHON_GTTS_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/buildroot-patches/0003-Downgrade-python-netifaces-to-0.10.7.patch b/buildroot-patches/0003-Update-python-netifaces-to-0.10.7.patch similarity index 58% rename from buildroot-patches/0003-Downgrade-python-netifaces-to-0.10.7.patch rename to buildroot-patches/0003-Update-python-netifaces-to-0.10.7.patch index aa075a67..24655a42 100644 --- a/buildroot-patches/0003-Downgrade-python-netifaces-to-0.10.7.patch +++ b/buildroot-patches/0003-Update-python-netifaces-to-0.10.7.patch @@ -1,7 +1,7 @@ -From 701652ba2883b1032c26ba3e33c253f55d69a0e5 Mon Sep 17 00:00:00 2001 +From 2415c0b9d58a14000fe889400a560f037ba0aa28 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Tue, 3 Dec 2019 16:25:14 +0100 -Subject: [PATCH 1/1] Downgrade python-netifaces to 0.10.7 +Date: Mon, 29 Oct 2018 14:13:00 +0100 +Subject: [PATCH 1/1] Update python-netifaces to 0.10.7 --- package/python-netifaces/python-netifaces.hash | 1 + @@ -9,32 +9,30 @@ Subject: [PATCH 1/1] Downgrade python-netifaces to 0.10.7 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/python-netifaces/python-netifaces.hash b/package/python-netifaces/python-netifaces.hash -index f59208014b..fde136fe62 100644 +index 335f907d59..9b07d58082 100644 --- a/package/python-netifaces/python-netifaces.hash +++ b/package/python-netifaces/python-netifaces.hash -@@ -1,5 +1,6 @@ - # md5, sha256 from https://pypi.org/pypi/netifaces/json - md5 de92cc322b4f56047c073f802ad77860 netifaces-0.10.9.tar.gz - sha256 2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3 netifaces-0.10.9.tar.gz +@@ -1,3 +1,4 @@ + # md5 from https://pypi.python.org/pypi/netifaces/json, sha256 locally computed + md5 1d424cb5ef52907c5ab913011122a98b netifaces-0.10.6.tar.gz + sha256 0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0 netifaces-0.10.6.tar.gz +sha256 bd590fcb75421537d4149825e1e63cca225fd47dad861710c46bd1cb329d8cbd netifaces-0.10.7.tar.gz - # Locally computed sha256 checksums - sha256 b20b895164b72b9cc0170e6c0d60b14f9aaacc6862c0556eed41eaa348883705 LICENSE diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk -index 502529c008..101702e454 100644 +index 3258be7a95..3a287d0b0d 100644 --- a/package/python-netifaces/python-netifaces.mk +++ b/package/python-netifaces/python-netifaces.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_NETIFACES_VERSION = 0.10.9 +-PYTHON_NETIFACES_VERSION = 0.10.6 +PYTHON_NETIFACES_VERSION = 0.10.7 PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz --PYTHON_NETIFACES_SITE = https://files.pythonhosted.org/packages/0d/18/fd6e9c71a35b67a73160ec80a49da63d1eed2d2055054cc2995714949132 +-PYTHON_NETIFACES_SITE = https://pypi.python.org/packages/72/01/ba076082628901bca750bf53b322a8ff10c1d757dc29196a8e6082711c9d +PYTHON_NETIFACES_SITE = https://files.pythonhosted.org/packages/81/39/4e9a026265ba944ddf1fea176dbb29e0fe50c43717ba4fcf3646d099fe38 PYTHON_NETIFACES_LICENSE = MIT - PYTHON_NETIFACES_LICENSE_FILES = LICENSE + PYTHON_NETIFACES_LICENSE_FILES = README.rst PYTHON_NETIFACES_SETUP_TYPE = setuptools -- -2.24.0.rc1 +2.11.0 diff --git a/buildroot-patches/0004-Downgrade-Python3.9-back-to-Python3.7.4-till-wheels-.patch b/buildroot-patches/0004-Downgrade-Python3.9-back-to-Python3.7.4-till-wheels-.patch deleted file mode 100644 index 1f352d2c..00000000 --- a/buildroot-patches/0004-Downgrade-Python3.9-back-to-Python3.7.4-till-wheels-.patch +++ /dev/null @@ -1,1703 +0,0 @@ -From 47ca8c97ff62deef6ad494fb421a292f3ae65057 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Sat, 14 Dec 2019 12:35:58 +0100 -Subject: [PATCH 1/1] Downgrade Python3.9 back to Python3.7.4 till wheels are - availabe. This also included the host-openssl patch from before. - ---- - package/Config.in.host | 1 - - package/pkg-generic.mk | 1 - - package/python/python.mk | 4 +- - ...e-the-build-of-pyc-files-conditional.patch | 18 +++---- - ...taddrinfo-configure-test-when-cross-.patch | 8 +-- - ...re-to-disable-the-build-of-certain-e.patch | 37 +++++++------- - ...y-header-paths-for-cross-compilation.patch | 12 ++--- - ...ook-in-usr-lib-termcap-for-libraries.patch | 20 ++++---- - .../0006-Don-t-add-multiarch-paths.patch | 18 +++---- - .../0007-Abort-on-failed-module-build.patch | 8 +-- - .../0008-Serial-ioctl-workaround.patch | 8 +-- - ...e-shebang-of-Python-scripts-for-cros.patch | 4 +- - ...ig.sh.in-ensure-sed-invocations-only.patch | 8 +-- - ...locale-and-set-to-default-when-addin.patch | 16 +++--- - ...Add-importlib-fix-for-PEP-3147-issue.patch | 50 ++++++++----------- - ...-disable-installation-of-test-module.patch | 26 ++++++---- - .../0014-Add-an-option-to-disable-pydoc.patch | 26 +++++----- - ...015-Add-an-option-to-disable-lib2to3.patch | 34 ++++++------- - ...option-to-disable-the-sqlite3-module.patch | 16 +++--- - ...d-an-option-to-disable-the-tk-module.patch | 18 +++---- - ...-option-to-disable-the-curses-module.patch | 14 +++--- - .../0019-Add-an-option-to-disable-expat.patch | 18 +++---- - ...-Add-an-option-to-disable-CJK-codecs.patch | 8 +-- - .../0021-Add-an-option-to-disable-NIS.patch | 8 +-- - ...Add-an-option-to-disable-unicodedata.patch | 8 +-- - .../0023-Add-an-option-to-disable-IDLE.patch | 24 ++++----- - ...024-Add-an-option-to-disable-decimal.patch | 14 +++--- - ...on-to-disable-the-ossaudiodev-module.patch | 8 +-- - ...an-option-to-disable-openssl-support.patch | 8 +-- - ...ption-to-disable-the-readline-module.patch | 8 +-- - ...to-disable-zlib-bzip2-and-xz-modules.patch | 8 +-- - ...thon-config.sh-don-t-reassign-prefix.patch | 8 +-- - ...-Fix-cross-compiling-the-uuid-module.patch | 18 +++---- - ...Add-an-option-to-disable-uuid-module.patch | 8 +-- - ...-fix-building-on-older-distributions.patch | 4 +- - ...up-CC-print-multiarch-output-for-mus.patch | 8 +-- - package/python3/Config.in.host | 16 ------ - package/python3/python3.hash | 6 +-- - package/python3/python3.mk | 16 ++---- - 39 files changed, 257 insertions(+), 286 deletions(-) - delete mode 100644 package/python3/Config.in.host - -diff --git a/package/Config.in.host b/package/Config.in.host -index c0ac4fbbcc..108319a4a6 100644 ---- a/package/Config.in.host -+++ b/package/Config.in.host -@@ -58,7 +58,6 @@ menu "Host utilities" - source "package/python-lxml/Config.in.host" - source "package/python-six/Config.in.host" - source "package/python-xlrd/Config.in.host" -- source "package/python3/Config.in.host" - source "package/qemu/Config.in.host" - source "package/raspberrypi-usbboot/Config.in.host" - source "package/rauc/Config.in.host" -diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk -index 635040c2a0..7b3294a09a 100644 ---- a/package/pkg-generic.mk -+++ b/package/pkg-generic.mk -@@ -1060,7 +1060,6 @@ PACKAGES_USERS += $$($(2)_USERS)$$(sep) - endif - TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) - ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) --KEEP_PYTHON_PY_FILES += $$($(2)_KEEP_PY_FILES) - - ifeq ($$($(2)_SITE_METHOD),svn) - DL_TOOLS_DEPENDENCIES += svn -diff --git a/package/python/python.mk b/package/python/python.mk -index 41a981e3d3..8c2b195c91 100644 ---- a/package/python/python.mk -+++ b/package/python/python.mk -@@ -267,9 +267,7 @@ endif - - ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y) - define PYTHON_REMOVE_PY_FILES -- find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' \ -- $(if $(strip $(KEEP_PYTHON_PY_FILES)),-not \( $(call finddirclauses,$(TARGET_DIR),$(KEEP_PYTHON_PY_FILES)) \) ) \ -- -print0 | \ -+ find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' -print0 | \ - xargs -0 --no-run-if-empty rm -f - endef - PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PY_FILES -diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch -index 00a6884771..84bb881aa5 100644 ---- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch -+++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch -@@ -1,4 +1,4 @@ --From 586a67bb448290a98df45e9f61d803952d2aa761 Mon Sep 17 00:00:00 2001 -+From e568f4deb7c648e3265154574db753601636cdda Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 16:21:31 -0800 - Subject: [PATCH] Make the build of pyc files conditional -@@ -15,30 +15,30 @@ Signed-off-by: Andrey Smirnov - 2 files changed, 8 insertions(+) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index 502317aa0c..f9011c132a 100644 -+index 82e830727e..b38bd79121 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1455,6 +1455,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c -+@@ -1395,6 +1395,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c - $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi - +ifeq (@PYC_BUILD@,yes) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -- -j0 -d $(LIBDEST) -f \ --@@ -1482,6 +1483,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c -+ -d $(LIBDEST) -f \ -+@@ -1422,6 +1423,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c - $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ -- -j0 -d $(LIBDEST)/site-packages -f \ -+ -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - +endif - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - diff --git a/configure.ac b/configure.ac --index a189d42c2c..4690cdba9f 100644 -+index 962006704f..a76b5444df 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -1085,6 +1085,12 @@ fi -+@@ -1107,6 +1107,12 @@ fi - - AC_MSG_CHECKING(LDLIBRARY) - -@@ -52,5 +52,5 @@ index a189d42c2c..4690cdba9f 100644 - # library that we build, but we do not want to link against it (we - # will find it with a -framework option). For this reason there is an - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch -index 95db44a4d3..36b5af0338 100644 ---- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch -+++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch -@@ -1,4 +1,4 @@ --From 3b558cfb1670300afece09b957e1e4b7072bce6b Mon Sep 17 00:00:00 2001 -+From 8ec1677d16bef6d6ee5cee4ff004dfa3d0428e88 Mon Sep 17 00:00:00 2001 - From: Vanya Sergeev - Date: Wed, 23 Dec 2015 11:30:33 +0100 - Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling -@@ -10,10 +10,10 @@ Signed-off-by: Vanya Sergeev - 1 file changed, 1 insertion(+), 1 deletion(-) - - diff --git a/configure.ac b/configure.ac --index 4690cdba9f..ffeec102b7 100644 -+index a76b5444df..5f87c4db5a 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -4059,7 +4059,7 @@ fi -+@@ -4056,7 +4056,7 @@ fi - - AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) - -@@ -23,5 +23,5 @@ index 4690cdba9f..ffeec102b7 100644 - if test $ipv6 = yes - then - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch -index 9bdd9b4897..5068862105 100644 ---- a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch -+++ b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch -@@ -1,4 +1,4 @@ --From 36c138c15515e80f72a570b61da324e55ae3e80c Mon Sep 17 00:00:00 2001 -+From 2c2afc80831c518e5daf3df6c9e4c4ac0a7be001 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 16:33:22 -0800 - Subject: [PATCH] Add infrastructure to disable the build of certain extensions -@@ -40,14 +40,14 @@ Signed-off-by: Andrey Smirnov - --- - Makefile.pre.in | 6 +++++- - configure.ac | 2 ++ -- setup.py | 5 ++++- -- 3 files changed, 11 insertions(+), 2 deletions(-) -+ setup.py | 6 +++++- -+ 3 files changed, 12 insertions(+), 2 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index f9011c132a..e8a6bd5c03 100644 -+index b38bd79121..4ce917ab8d 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -205,6 +205,8 @@ FILEMODE= 644 -+@@ -206,6 +206,8 @@ FILEMODE= 644 - # configure script arguments - CONFIG_ARGS= @CONFIG_ARGS@ - -@@ -56,7 +56,7 @@ index f9011c132a..e8a6bd5c03 100644 - - # Subdirectories with code - SRCDIRS= @SRCDIRS@ --@@ -605,6 +607,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o -+@@ -619,6 +621,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o - esac; \ - echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -@@ -64,7 +64,7 @@ index f9011c132a..e8a6bd5c03 100644 - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ - $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ --@@ -1601,7 +1604,8 @@ libainstall: @DEF_MAKE_RULE@ python-config -+@@ -1528,7 +1531,8 @@ libainstall: @DEF_MAKE_RULE@ python-config - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: sharedmods -@@ -75,10 +75,10 @@ index f9011c132a..e8a6bd5c03 100644 - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ - diff --git a/configure.ac b/configure.ac --index ffeec102b7..7872b4dfee 100644 -+index 5f87c4db5a..d5ee2aedfb 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -2952,6 +2952,8 @@ LIBS="$withval $LIBS" -+@@ -2966,6 +2966,8 @@ LIBS="$withval $LIBS" - - PKG_PROG_PKG_CONFIG - -@@ -88,21 +88,22 @@ index ffeec102b7..7872b4dfee 100644 - AC_MSG_CHECKING(for --with-system-expat) - AC_ARG_WITH(system_expat, - diff --git a/setup.py b/setup.py --index 20d7f35652..d3f2cc1b37 100644 -+index fe477974bd..86643ae8bf 100644 - --- a/setup.py - +++ b/setup.py --@@ -24,7 +24,10 @@ from distutils.spawn import find_executable -- TEST_EXTENSIONS = True -+@@ -48,7 +48,11 @@ host_platform = get_platform() -+ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) - - # This global variable is used to hold the list of modules to be disabled. ---DISABLED_MODULE_LIST = [] -+-disabled_module_list = [] - +try: --+ DISABLED_MODULE_LIST = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ") -++ disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ") - +except KeyError: --+ DISABLED_MODULE_LIST = list() -- -++ disabled_module_list = list() -++ - -- def get_platform(): -+ def add_dir_to_list(dirlist, dir): -+ """Add the directory 'dir' to the list 'dirlist' (after any relative - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch -index 0ac5116213..b3a0e53289 100644 ---- a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch -+++ b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch -@@ -1,4 +1,4 @@ --From f5ed27c9b9efb4756630e5799be14fefdc3b2702 Mon Sep 17 00:00:00 2001 -+From e359a7a3c4f9e70360a068bef19c95938fdacede Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:33:14 +0100 - Subject: [PATCH] Adjust library/header paths for cross-compilation -@@ -21,7 +21,7 @@ Signed-off-by: Thomas Petazzoni - 2 files changed, 15 insertions(+), 5 deletions(-) - - diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py --index 2d7cdf063f..cba150075c 100644 -+index 74de782d8a..d0c847b365 100644 - --- a/Lib/distutils/command/build_ext.py - +++ b/Lib/distutils/command/build_ext.py - @@ -234,7 +234,10 @@ class build_ext(Command): -@@ -37,11 +37,11 @@ index 2d7cdf063f..cba150075c 100644 - # building python standard extensions - self.library_dirs.append('.') - diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py --index b51629eb94..011a437bcd 100644 -+index 2bcd1dd288..422c13fa4f 100644 - --- a/Lib/distutils/sysconfig.py - +++ b/Lib/distutils/sysconfig.py --@@ -18,10 +18,17 @@ from .errors import DistutilsPlatformError -- from .util import get_platform, get_host_platform -+@@ -17,10 +17,17 @@ import sys -+ from .errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. - -PREFIX = os.path.normpath(sys.prefix) -@@ -63,5 +63,5 @@ index b51629eb94..011a437bcd 100644 - # Path to the base directory of the project. On Windows the binary may - # live in project/PCbuild/win32 or project/PCbuild/amd64. - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch -index 935e0c3b55..8dd54f8b3b 100644 ---- a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch -+++ b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch -@@ -1,4 +1,4 @@ --From 5bcb991a8de2f1b9bdf44e78894417ed2ee137a5 Mon Sep 17 00:00:00 2001 -+From 01b588baf835ec95df7c5696eff1f6c07eaa1108 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:36:00 +0100 - Subject: [PATCH] Don't look in /usr/lib/termcap for libraries -@@ -9,23 +9,23 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 1 insertion(+), 4 deletions(-) - - diff --git a/setup.py b/setup.py --index d3f2cc1b37..5d504d7638 100644 -+index 86643ae8bf..cd00fbdbda 100644 - --- a/setup.py - +++ b/setup.py --@@ -955,12 +955,9 @@ class PyBuildExt(build_ext): -+@@ -894,12 +894,9 @@ class PyBuildExt(build_ext): - pass # Issue 7384: Already linked against curses or tinfo. - elif curses_library: - readline_libs.append(curses_library) --- elif self.compiler.find_library_file(self.lib_dirs + -+- elif self.compiler.find_library_file(lib_dirs + - - ['/usr/lib/termcap'], - - 'termcap'): --+ elif self.compiler.find_library_file(self.lib_dirs, 'termcap'): -++ elif self.compiler.find_library_file(lib_dirs, 'termcap'): - readline_libs.append('termcap') -- self.add(Extension('readline', ['readline.c'], --- library_dirs=['/usr/lib/termcap'], -- extra_link_args=readline_extra_link_args, -- libraries=readline_libs)) -+ exts.append( Extension('readline', ['readline.c'], -+- library_dirs=['/usr/lib/termcap'], -+ extra_link_args=readline_extra_link_args, -+ libraries=readline_libs) ) - else: - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0006-Don-t-add-multiarch-paths.patch -index ab1e295e70..a6ba6a8578 100644 ---- a/package/python3/0006-Don-t-add-multiarch-paths.patch -+++ b/package/python3/0006-Don-t-add-multiarch-paths.patch -@@ -1,4 +1,4 @@ --From b878b174e12a5cb2e1943f1f79d94033c1ee80d7 Mon Sep 17 00:00:00 2001 -+From 9055171433d5f6beae90815e8c075dc1e0938936 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:36:27 +0100 - Subject: [PATCH] Don't add multiarch paths -@@ -17,21 +17,21 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 1 insertion(+), 1 deletion(-) - - diff --git a/setup.py b/setup.py --index 5d504d7638..282a592dc6 100644 -+index cd00fbdbda..c956fa08d1 100644 - --- a/setup.py - +++ b/setup.py --@@ -654,10 +654,10 @@ class PyBuildExt(build_ext): -- if not CROSS_COMPILING: -+@@ -591,10 +591,10 @@ class PyBuildExt(build_ext): -+ if not cross_compiling: - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - + self.add_multiarch_paths() - # only change this for cross builds for 3.3, issues on Mageia -- if CROSS_COMPILING: -- self.add_cross_compiling_paths() -+ if cross_compiling: -+ self.add_gcc_paths() - - self.add_multiarch_paths() -- self.add_ldflags_cppflags() - -- def init_inc_lib_dirs(self): -+ # Add paths specified in the environment variables LDFLAGS and -+ # CPPFLAGS for header and library files. - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0007-Abort-on-failed-module-build.patch -index 1dcf8a017d..e8de7a5414 100644 ---- a/package/python3/0007-Abort-on-failed-module-build.patch -+++ b/package/python3/0007-Abort-on-failed-module-build.patch -@@ -1,4 +1,4 @@ --From fceda5bae52571213b6671ce0220d1a85b38f8c7 Mon Sep 17 00:00:00 2001 -+From 63ab4a20076740bd39985c7dee3d6231cdc74c75 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:43:24 +0100 - Subject: [PATCH] Abort on failed module build -@@ -14,10 +14,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 1 insertion(+) - - diff --git a/setup.py b/setup.py --index 282a592dc6..8fda3b4d47 100644 -+index c956fa08d1..b3add2be76 100644 - --- a/setup.py - +++ b/setup.py --@@ -444,6 +444,7 @@ class PyBuildExt(build_ext): -+@@ -402,6 +402,7 @@ class PyBuildExt(build_ext): - print("Failed to build these modules:") - print_three_column(failed) - print() -@@ -26,5 +26,5 @@ index 282a592dc6..8fda3b4d47 100644 - if self.failed_on_import: - failed = self.failed_on_import[:] - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0008-Serial-ioctl-workaround.patch b/package/python3/0008-Serial-ioctl-workaround.patch -index 9303e188c9..39d40f025a 100644 ---- a/package/python3/0008-Serial-ioctl-workaround.patch -+++ b/package/python3/0008-Serial-ioctl-workaround.patch -@@ -1,4 +1,4 @@ --From 91e8058cf9085795db64f43e2c9548926ea46ab0 Mon Sep 17 00:00:00 2001 -+From 20767cb868ff271f4501a6e023f367400882d75e Mon Sep 17 00:00:00 2001 - From: Baruch Siach - Date: Wed, 23 Dec 2015 11:44:02 +0100 - Subject: [PATCH] Serial ioctl() workaround -@@ -15,7 +15,7 @@ Signed-off-by: Baruch Siach - 1 file changed, 2 insertions(+) - - diff --git a/Modules/termios.c b/Modules/termios.c --index aee7f12c57..ba2ff77d06 100644 -+index b78d33e688..58b0444565 100644 - --- a/Modules/termios.c - +++ b/Modules/termios.c - @@ -15,7 +15,9 @@ -@@ -27,7 +27,7 @@ index aee7f12c57..ba2ff77d06 100644 - +#undef TIOCTTYGSTRUCT - - /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, -- * MDTR, MRI, and MRTS (apparently used internally by some things -+ * MDTR, MRI, and MRTS (appearantly used internally by some things - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch -index 32e3bdfea0..ce84d11bcf 100644 ---- a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch -+++ b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch -@@ -1,4 +1,4 @@ --From 3ec9bbf5bd9cced0005c99d7d65997b119abf2f6 Mon Sep 17 00:00:00 2001 -+From 8869b15c754ae615203b65a99e043f56770bacd5 Mon Sep 17 00:00:00 2001 - From: Christophe Vu-Brugier - Date: Wed, 23 Dec 2015 11:44:30 +0100 - Subject: [PATCH] Do not adjust the shebang of Python scripts for -@@ -31,5 +31,5 @@ index ccc70e6465..d6d54195c1 100644 - self.build_dir) - updated_files.append(outfile) - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch -index a8ccba7784..31f237e22f 100644 ---- a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch -+++ b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch -@@ -1,4 +1,4 @@ --From 7b3839bcf9f79988fb944cd65717839cde166cb8 Mon Sep 17 00:00:00 2001 -+From da3880edac19100f69891f225cc2f07a82be1e52 Mon Sep 17 00:00:00 2001 - From: Peter Korsgaard - Date: Thu, 20 Nov 2014 13:24:59 +0100 - Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match -@@ -25,7 +25,7 @@ Signed-off-by: Peter Korsgaard - 1 file changed, 7 insertions(+), 6 deletions(-) - - diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in --index 2602fe24c0..a1bc3cd5f7 100644 -+index d1d3275..9e259c0 100644 - --- a/Misc/python-config.sh.in - +++ b/Misc/python-config.sh.in - @@ -24,18 +24,19 @@ installed_prefix () -@@ -53,7 +53,7 @@ index 2602fe24c0..a1bc3cd5f7 100644 - VERSION="@VERSION@" - LIBM="@LIBM@" - LIBC="@LIBC@" --@@ -49,7 +50,7 @@ OPT="@OPT@" -+@@ -48,7 +49,7 @@ OPT="@OPT@" - PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" - LDVERSION="@LDVERSION@" - LIBDEST=${prefix_real}/lib/python${VERSION} -@@ -63,5 +63,5 @@ index 2602fe24c0..a1bc3cd5f7 100644 - PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" - INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" - -- --2.20.1 -+2.14.3 - -diff --git a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch -index 1a40b74d21..2444c4da34 100644 ---- a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch -+++ b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch -@@ -1,4 +1,4 @@ --From a9affe1f3f98342b682848c9b3f862ee194ff625 Mon Sep 17 00:00:00 2001 -+From 660ea434ad8f921db74c0e3f93aa3ff5daac44f3 Mon Sep 17 00:00:00 2001 - From: Samuel Cabrero - Date: Wed, 23 Dec 2015 11:45:48 +0100 - Subject: [PATCH] Override system locale and set to default when adding gcc -@@ -20,18 +20,18 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 1 insertion(+), 1 deletion(-) - - diff --git a/setup.py b/setup.py --index 8fda3b4d47..bb7eb44213 100644 -+index b3add2be76..29bfd174d2 100644 - --- a/setup.py - +++ b/setup.py --@@ -600,7 +600,7 @@ class PyBuildExt(build_ext): -- tmpfile = os.path.join(self.build_temp, 'ccpaths') -+@@ -558,7 +558,7 @@ class PyBuildExt(build_ext): -+ tmpfile = os.path.join(self.build_temp, 'gccpaths') - if not os.path.exists(self.build_temp): - os.makedirs(self.build_temp) --- ret = os.system('%s -E -v - %s 1>/dev/null' % (cc, tmpfile)) --+ ret = os.system('LC_ALL=C %s -E -v - %s 1>/dev/null' % (cc, tmpfile)) -+- ret = os.system('%s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) -++ ret = os.system('LC_ALL=C %s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) - is_gcc = False -- is_clang = False - in_incdirs = False -+ inc_dirs = [] - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch -index aacb6dca6c..5bc9bf498d 100644 ---- a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch -+++ b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch -@@ -1,4 +1,4 @@ --From c50b8e7fb9b2e61d4d195a055cd1bbf993cc455f Mon Sep 17 00:00:00 2001 -+From 9db508467be41bc35f06c0076c855b99a1519d24 Mon Sep 17 00:00:00 2001 - From: Christophe Vu-Brugier - Date: Wed, 22 Feb 2017 16:48:49 -0800 - Subject: [PATCH] Add importlib fix for PEP 3147 issue -@@ -21,14 +21,14 @@ Signed-off-by: Christophe Vu-Brugier - [ Andrey Smirnov: ported to Python 3.6 ] - Signed-off-by: Andrey Smirnov - --- -- Lib/importlib/_bootstrap_external.py | 44 ++++------------------------ -- 1 file changed, 5 insertions(+), 39 deletions(-) -+ Lib/importlib/_bootstrap_external.py | 38 +++++------------------------------- -+ 1 file changed, 5 insertions(+), 33 deletions(-) - - diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py --index b8ac482994..db034f605a 100644 -+index 9feec50842..3550013d58 100644 - --- a/Lib/importlib/_bootstrap_external.py - +++ b/Lib/importlib/_bootstrap_external.py --@@ -306,8 +306,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): -+@@ -283,8 +283,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): - a True value is the same as setting 'optimization' to the empty string - while a False value is equivalent to setting 'optimization' to '1'. - -@@ -37,7 +37,7 @@ index b8ac482994..db034f605a 100644 - """ - if debug_override is not None: - _warnings.warn('the debug_override parameter is deprecated; use ' --@@ -319,10 +317,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): -+@@ -296,10 +294,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): - path = _os.fspath(path) - head, tail = _path_split(path) - base, sep, rest = tail.rpartition('.') -@@ -49,12 +49,12 @@ index b8ac482994..db034f605a 100644 - if optimization is None: - if sys.flags.optimize == 0: - optimization = '' --@@ -359,46 +354,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): -- head.lstrip(path_separators), -- filename, -- ) --- return _path_join(head, _PYCACHE, filename) --+ return _path_join(head, filename) -+@@ -310,40 +305,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): -+ if not optimization.isalnum(): -+ raise ValueError('{!r} is not alphanumeric'.format(optimization)) -+ almost_filename = '{}.{}{}'.format(almost_filename, _OPT, optimization) -+- return _path_join(head, _PYCACHE, almost_filename + BYTECODE_SUFFIXES[0]) -++ return _path_join(head, almost_filename + BYTECODE_SUFFIXES[0]) - - - def source_from_cache(path): -@@ -71,29 +71,23 @@ index b8ac482994..db034f605a 100644 - - raise NotImplementedError('sys.implementation.cache_tag is None') - - path = _os.fspath(path) - - head, pycache_filename = _path_split(path) --- found_in_pycache_prefix = False --- if sys.pycache_prefix is not None: --- stripped_path = sys.pycache_prefix.rstrip(path_separators) --- if head.startswith(stripped_path + path_sep): --- head = head[len(stripped_path):] --- found_in_pycache_prefix = True --- if not found_in_pycache_prefix: --- head, pycache = _path_split(head) --- if pycache != _PYCACHE: --- raise ValueError(f'{_PYCACHE} not bottom-level directory in ' --- f'{path!r}') -+- head, pycache = _path_split(head) -+- if pycache != _PYCACHE: -+- raise ValueError('{} not bottom-level directory in ' -+- '{!r}'.format(_PYCACHE, path)) - - dot_count = pycache_filename.count('.') - - if dot_count not in {2, 3}: --- raise ValueError(f'expected only 2 or 3 dots in {pycache_filename!r}') -+- raise ValueError('expected only 2 or 3 dots in ' -+- '{!r}'.format(pycache_filename)) - - elif dot_count == 3: - - optimization = pycache_filename.rsplit('.', 2)[-2] - - if not optimization.startswith(_OPT): - - raise ValueError("optimization portion of filename does not start " --- f"with {_OPT!r}") -+- "with {!r}".format(_OPT)) - - opt_level = optimization[len(_OPT):] - - if not opt_level.isalnum(): --- raise ValueError(f"optimization level {optimization!r} is not an " --- "alphanumeric value") -+- raise ValueError("optimization level {!r} is not an alphanumeric " -+- "value".format(optimization)) - - base_filename = pycache_filename.partition('.')[0] - + head, filename = _path_split(path) - + base_filename = filename.partition('.')[0] -@@ -101,5 +95,5 @@ index b8ac482994..db034f605a 100644 - - - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch -index d34a2883ad..355e62f50d 100644 ---- a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch -+++ b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch -@@ -1,4 +1,4 @@ --From 5ee3e5ad62919c431b1f7b5ff91ddf606582df0e Mon Sep 17 00:00:00 2001 -+From bba0896a05e6406076893dd2f4c3b330e41082a6 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:01:18 -0800 - Subject: [PATCH] Add an option to disable installation of test modules -@@ -11,15 +11,15 @@ Signed-off-by: Samuel Martin - [ Andrey Smirnov: ported to Python 3.6 ] - Signed-off-by: Andrey Smirnov - --- -- Makefile.pre.in | 54 ++++++++++++++++++++++++++++++++----------------- -+ Makefile.pre.in | 55 ++++++++++++++++++++++++++++++++++++------------------- - configure.ac | 5 +++++ -- 2 files changed, 41 insertions(+), 18 deletions(-) -+ 2 files changed, 41 insertions(+), 19 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index e8a6bd5c03..3abee36f49 100644 -+index 4ce917ab8d..4110fff4ac 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1317,8 +1317,28 @@ maninstall: altmaninstall -+@@ -1261,8 +1261,28 @@ maninstall: altmaninstall - - # Install the library - XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax -@@ -49,11 +49,15 @@ index e8a6bd5c03..3abee36f49 100644 - + tkinter/test/test_ttk test \ - test/audiodata \ - test/capath test/data \ -- test/cjkencodings test/decimaltestdata \ --@@ -1376,26 +1396,24 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ -+ test/cjkencodings test/decimaltestdata test/xmltestdata \ -+diff --git a/Makefile.pre.in b/Makefile.pre.in -+index 1ff2362..194dbfc 100644 -+--- a/Makefile.pre.in -++++ b/Makefile.pre.in -+@@ -1336,26 +1336,24 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -+ test/test_importlib/source \ - test/test_importlib/zipdata01 \ - test/test_importlib/zipdata02 \ -- test/ziptestdata \ - - asyncio \ - test/test_asyncio \ - - collections concurrent concurrent/futures encodings \ -@@ -92,10 +96,10 @@ index e8a6bd5c03..3abee36f49 100644 - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ - diff --git a/configure.ac b/configure.ac --index 7872b4dfee..b820d18c7c 100644 -+index d5ee2aedfb..f924937fe1 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3213,6 +3213,11 @@ if test "$posix_threads" = "yes"; then -+@@ -3226,6 +3226,11 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_getcpuclockid) - fi - -@@ -108,5 +112,5 @@ index 7872b4dfee..b820d18c7c 100644 - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/package/python3/0014-Add-an-option-to-disable-pydoc.patch -index cdcabc0c11..bccd9facf5 100644 ---- a/package/python3/0014-Add-an-option-to-disable-pydoc.patch -+++ b/package/python3/0014-Add-an-option-to-disable-pydoc.patch -@@ -1,4 +1,4 @@ --From 13a8be57e79f2657c75391bfa524dc1ba4993b02 Mon Sep 17 00:00:00 2001 -+From 18a754e930e03d143d9392e49174cc370b334cdd Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:07:56 -0800 - Subject: [PATCH] Add an option to disable pydoc -@@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov - 3 files changed, 20 insertions(+), 3 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index 3abee36f49..6fa0549a56 100644 -+index 4110fff4ac..badb2af35d 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1289,7 +1289,9 @@ bininstall: altbininstall -+@@ -1231,7 +1231,9 @@ bininstall: altbininstall - -rm -f $(DESTDIR)$(BINDIR)/idle3 - (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) - -rm -f $(DESTDIR)$(BINDIR)/pydoc3 -@@ -29,8 +29,8 @@ index 3abee36f49..6fa0549a56 100644 - +endif - -rm -f $(DESTDIR)$(BINDIR)/2to3 - (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) -- if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ --@@ -1335,7 +1337,7 @@ LIBSUBDIRS= tkinter site-packages \ -+ -rm -f $(DESTDIR)$(BINDIR)/pyvenv -+@@ -1279,7 +1281,7 @@ LIBSUBDIRS= tkinter site-packages \ - multiprocessing multiprocessing/dummy \ - unittest \ - venv venv/scripts venv/scripts/common venv/scripts/posix \ -@@ -39,7 +39,7 @@ index 3abee36f49..6fa0549a56 100644 - - TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - tkinter/test/test_ttk test \ --@@ -1414,6 +1416,10 @@ ifeq (@TEST_MODULES@,yes) -+@@ -1354,6 +1356,10 @@ ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif - -@@ -51,10 +51,10 @@ index 3abee36f49..6fa0549a56 100644 - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ - diff --git a/configure.ac b/configure.ac --index b820d18c7c..f53cc86d89 100644 -+index f924937fe1..1621fa1611 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3213,6 +3213,12 @@ if test "$posix_threads" = "yes"; then -+@@ -3226,6 +3226,12 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_getcpuclockid) - fi - -@@ -68,10 +68,10 @@ index b820d18c7c..f53cc86d89 100644 - - AC_ARG_ENABLE(test-modules, - diff --git a/setup.py b/setup.py --index bb7eb44213..748c269960 100644 -+index 29bfd174d2..94dd337fef 100644 - --- a/setup.py - +++ b/setup.py --@@ -2401,6 +2401,12 @@ def main(): -+@@ -2376,6 +2376,12 @@ def main(): - # turn off warnings when deprecated modules are imported - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) -@@ -84,16 +84,16 @@ index bb7eb44213..748c269960 100644 - setup(# PyPI Metadata (PEP 301) - name = "Python", - version = sys.version.split()[0], --@@ -2425,8 +2431,7 @@ def main(): -+@@ -2400,8 +2406,7 @@ def main(): - # If you change the scripts installed here, you also need to - # check the PyBuildScripts command above, and change the links - # created by the bininstall target in Makefile.pre.in - - scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3", --- "Tools/scripts/2to3"] -+- "Tools/scripts/2to3", "Tools/scripts/pyvenv"] - + scripts = scripts - ) - - # --install-platlib - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch -index 03064612a0..fade361fab 100644 ---- a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch -+++ b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch -@@ -1,4 +1,4 @@ --From 868823f15bab031caf05dc5e8ce2eac076bfc82b Mon Sep 17 00:00:00 2001 -+From c2d279b4a19de7a32e8a73e320423f699d408380 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:15:31 -0800 - Subject: [PATCH] Add an option to disable lib2to3 -@@ -17,20 +17,20 @@ Signed-off-by: Andrey Smirnov - 3 files changed, 21 insertions(+), 6 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index 6fa0549a56..3e1f130532 100644 -+index badb2af35d..931cc3ed07 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1293,7 +1293,9 @@ ifeq (@PYDOC@,yes) -+@@ -1235,7 +1235,9 @@ ifeq (@PYDOC@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) - endif - -rm -f $(DESTDIR)$(BINDIR)/2to3 - +ifeq (@LIB2TO3@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) - +endif -+ -rm -f $(DESTDIR)$(BINDIR)/pyvenv -+ (cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv) - if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -- rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ -- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ --@@ -1328,7 +1330,6 @@ LIBSUBDIRS= tkinter site-packages \ -+@@ -1272,7 +1274,6 @@ LIBSUBDIRS= tkinter site-packages \ - html json http dbm xmlrpc \ - sqlite3 \ - logging csv wsgiref urllib \ -@@ -38,7 +38,7 @@ index 6fa0549a56..3e1f130532 100644 - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ - distutils distutils/command $(XMLLIBSUBDIRS) \ --@@ -1402,9 +1403,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -+@@ -1342,9 +1343,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - test/test_email test/test_email/data \ - test/test_json \ - sqlite3/test \ -@@ -48,7 +48,7 @@ index 6fa0549a56..3e1f130532 100644 - ctypes/test \ - idlelib/idle_test \ - distutils/tests \ --@@ -1412,6 +1410,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -+@@ -1352,6 +1350,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - test/test_tools test/test_warnings test/test_warnings/data \ - unittest/test unittest/test/testmock - -@@ -63,8 +63,8 @@ index 6fa0549a56..3e1f130532 100644 - ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif --@@ -1511,10 +1517,12 @@ ifeq (@PYC_BUILD@,yes) -- -j0 -d $(LIBDEST)/site-packages -f \ -+@@ -1451,10 +1457,12 @@ ifeq (@PYC_BUILD@,yes) -+ -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - endif - +ifeq (@LIB2TO3@,yes) -@@ -74,13 +74,13 @@ index 6fa0549a56..3e1f130532 100644 - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt - +endif - -- # bpo-21536: Misc/python-config.sh is generated in the build directory -- # from $(srcdir)Misc/python-config.sh.in. -+ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh -+ @ # Substitution happens here, as the completely-expanded BINDIR - diff --git a/configure.ac b/configure.ac --index f53cc86d89..caa8eaf88a 100644 -+index 1621fa1611..13b2edf8b7 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3225,6 +3225,12 @@ AC_ARG_ENABLE(test-modules, -+@@ -3238,6 +3238,12 @@ AC_ARG_ENABLE(test-modules, - AS_HELP_STRING([--disable-test-modules], [disable test modules]), - [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) - -@@ -94,10 +94,10 @@ index f53cc86d89..caa8eaf88a 100644 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) - diff --git a/setup.py b/setup.py --index 748c269960..1669797cad 100644 -+index 94dd337fef..76429e1326 100644 - --- a/setup.py - +++ b/setup.py --@@ -2402,10 +2402,11 @@ def main(): -+@@ -2377,10 +2377,11 @@ def main(): - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -@@ -112,5 +112,5 @@ index 748c269960..1669797cad 100644 - setup(# PyPI Metadata (PEP 301) - name = "Python", - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch -index 4f5e0dbd86..ed5e4cb29e 100644 ---- a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch -+++ b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch -@@ -1,4 +1,4 @@ --From 1a1d13a973d9dcbd6660bfef40cf35c7638f779b Mon Sep 17 00:00:00 2001 -+From f2965dfb1aa4f6b3216f3bb1d20f99326f127079 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:20:45 -0800 - Subject: [PATCH] Add option to disable the sqlite3 module -@@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov - 2 files changed, 14 insertions(+), 2 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index 3e1f130532..cf9add0bc7 100644 -+index 931cc3ed07..a1ce0712cd 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1328,7 +1328,6 @@ LIBSUBDIRS= tkinter site-packages \ -+@@ -1272,7 +1272,6 @@ LIBSUBDIRS= tkinter site-packages \ - email email/mime \ - ensurepip ensurepip/_bundled \ - html json http dbm xmlrpc \ -@@ -24,7 +24,7 @@ index 3e1f130532..cf9add0bc7 100644 - logging csv wsgiref urllib \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ --@@ -1402,7 +1401,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -+@@ -1342,7 +1341,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - test/test_asyncio \ - test/test_email test/test_email/data \ - test/test_json \ -@@ -32,7 +32,7 @@ index 3e1f130532..cf9add0bc7 100644 - ctypes/test \ - idlelib/idle_test \ - distutils/tests \ --@@ -1418,6 +1416,11 @@ TESTSUBDIRS += lib2to3/tests \ -+@@ -1358,6 +1356,11 @@ TESTSUBDIRS += lib2to3/tests \ - lib2to3/tests/data/fixers/myfixes - endif - -@@ -45,10 +45,10 @@ index 3e1f130532..cf9add0bc7 100644 - LIBSUBDIRS += $(TESTSUBDIRS) - endif - diff --git a/configure.ac b/configure.ac --index caa8eaf88a..79a8255f44 100644 -+index 13b2edf8b7..d7582cfea4 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3213,6 +3213,15 @@ if test "$posix_threads" = "yes"; then -+@@ -3226,6 +3226,15 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_getcpuclockid) - fi - -@@ -65,5 +65,5 @@ index caa8eaf88a..79a8255f44 100644 - - AC_ARG_ENABLE(pydoc, - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch -index b248ecd40c..347057e099 100644 ---- a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch -+++ b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch -@@ -1,4 +1,4 @@ --From c54cb57b3bd80fa2819f6409d5d2b98d82fbfcb2 Mon Sep 17 00:00:00 2001 -+From f96a00d42e714171f1d90501ed73594fddee570f Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:23:42 -0800 - Subject: [PATCH] Add an option to disable the tk module -@@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov - 2 files changed, 17 insertions(+), 3 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index cf9add0bc7..5d78419fd4 100644 -+index a1ce0712cd..dc1e917cc3 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1322,7 +1322,7 @@ maninstall: altmaninstall -+@@ -1266,7 +1266,7 @@ maninstall: altmaninstall - # Install the library - XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax - -@@ -25,7 +25,7 @@ index cf9add0bc7..5d78419fd4 100644 - asyncio \ - collections concurrent concurrent/futures encodings \ - email email/mime \ --@@ -1339,8 +1339,7 @@ LIBSUBDIRS= tkinter site-packages \ -+@@ -1283,8 +1283,7 @@ LIBSUBDIRS= tkinter site-packages \ - venv venv/scripts venv/scripts/common venv/scripts/posix \ - curses - -@@ -34,8 +34,8 @@ index cf9add0bc7..5d78419fd4 100644 - +TESTSUBDIRS= test \ - test/audiodata \ - test/capath test/data \ -- test/cjkencodings test/decimaltestdata \ --@@ -1408,6 +1407,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -+ test/cjkencodings test/decimaltestdata test/xmltestdata \ -+@@ -1348,6 +1347,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - test/test_tools test/test_warnings test/test_warnings/data \ - unittest/test unittest/test/testmock - -@@ -49,10 +49,10 @@ index cf9add0bc7..5d78419fd4 100644 - LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 - TESTSUBDIRS += lib2to3/tests \ - diff --git a/configure.ac b/configure.ac --index 79a8255f44..b5922451cc 100644 -+index d7582cfea4..6a56a5b0c1 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3222,6 +3222,15 @@ if test "$SQLITE3" = "no" ; then -+@@ -3235,6 +3235,15 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -@@ -69,5 +69,5 @@ index 79a8255f44..b5922451cc 100644 - - AC_ARG_ENABLE(pydoc, - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch -index d442f7b807..847f558269 100644 ---- a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch -+++ b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch -@@ -1,4 +1,4 @@ --From 332373ca25f2dbe5473330666ec49143506a4dc0 Mon Sep 17 00:00:00 2001 -+From 404aad42698c6d5cbd78421720f9a2bc0e8ec9fe Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:31:51 -0800 - Subject: [PATCH] Add an option to disable the curses module -@@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov - 2 files changed, 14 insertions(+), 2 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index 5d78419fd4..660c292765 100644 -+index dc1e917cc3..6a6bc082cd 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1336,8 +1336,7 @@ LIBSUBDIRS= site-packages \ -+@@ -1280,8 +1280,7 @@ LIBSUBDIRS= site-packages \ - turtledemo \ - multiprocessing multiprocessing/dummy \ - unittest \ -@@ -26,7 +26,7 @@ index 5d78419fd4..660c292765 100644 - - TESTSUBDIRS= test \ - test/audiodata \ --@@ -1413,6 +1412,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ -+@@ -1353,6 +1352,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ - tkinter/test/test_ttk - endif - -@@ -38,10 +38,10 @@ index 5d78419fd4..660c292765 100644 - LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 - TESTSUBDIRS += lib2to3/tests \ - diff --git a/configure.ac b/configure.ac --index b5922451cc..ea422a86a9 100644 -+index 6a56a5b0c1..5896b39ff9 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3231,6 +3231,15 @@ if test "$TK" = "no"; then -+@@ -3244,6 +3244,15 @@ if test "$TK" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" - fi - -@@ -58,5 +58,5 @@ index b5922451cc..ea422a86a9 100644 - - AC_ARG_ENABLE(pydoc, - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0019-Add-an-option-to-disable-expat.patch b/package/python3/0019-Add-an-option-to-disable-expat.patch -index 3015d1e107..8855858ece 100644 ---- a/package/python3/0019-Add-an-option-to-disable-expat.patch -+++ b/package/python3/0019-Add-an-option-to-disable-expat.patch -@@ -1,4 +1,4 @@ --From d88f2d3430bbbe285ae3de5fbc1bde34da7f0478 Mon Sep 17 00:00:00 2001 -+From 63fc5bc90cb57460552b544cbed0c2939759ab9e Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 22 Feb 2017 17:40:45 -0800 - Subject: [PATCH] Add an option to disable expat -@@ -20,10 +20,10 @@ Signed-off-by: Andrey Smirnov - 3 files changed, 19 insertions(+), 7 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index 660c292765..f49abf8395 100644 -+index 6a6bc082cd..dc4b92b6fe 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1331,7 +1331,7 @@ LIBSUBDIRS= site-packages \ -+@@ -1275,7 +1275,7 @@ LIBSUBDIRS= site-packages \ - logging csv wsgiref urllib \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ -@@ -32,7 +32,7 @@ index 660c292765..f49abf8395 100644 - importlib \ - turtledemo \ - multiprocessing multiprocessing/dummy \ --@@ -1416,6 +1416,10 @@ ifeq (@CURSES@,yes) -+@@ -1356,6 +1356,10 @@ ifeq (@CURSES@,yes) - LIBSUBDIRS += curses - endif - -@@ -44,10 +44,10 @@ index 660c292765..f49abf8395 100644 - LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 - TESTSUBDIRS += lib2to3/tests \ - diff --git a/configure.ac b/configure.ac --index ea422a86a9..3c1e2c088d 100644 -+index 5896b39ff9..6f21482207 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -2955,13 +2955,21 @@ PKG_PROG_PKG_CONFIG -+@@ -2969,13 +2969,21 @@ PKG_PROG_PKG_CONFIG - AC_SUBST(DISABLED_EXTENSIONS) - - # Check for use of the system expat library -@@ -75,10 +75,10 @@ index ea422a86a9..3c1e2c088d 100644 - # Check for use of the system libffi library - AC_MSG_CHECKING(for --with-system-ffi) - diff --git a/setup.py b/setup.py --index 1669797cad..d2727c0da5 100644 -+index 76429e1326..38aa5e605e 100644 - --- a/setup.py - +++ b/setup.py --@@ -1576,7 +1576,7 @@ class PyBuildExt(build_ext): -+@@ -1529,7 +1529,7 @@ class PyBuildExt(build_ext): - # - # More information on Expat can be found at www.libexpat.org. - # -@@ -88,5 +88,5 @@ index 1669797cad..d2727c0da5 100644 - define_macros = [] - extra_compile_args = [] - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch -index dfe8614a5d..ee81e0bcfa 100644 ---- a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch -+++ b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch -@@ -1,4 +1,4 @@ --From 347f359b484c8e34b49f71132701252b966d93aa Mon Sep 17 00:00:00 2001 -+From 3335500cb13a6bc1ab41dfcf00b33e6ade3b9764 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:49:55 +0100 - Subject: [PATCH] Add an option to disable CJK codecs -@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 6 insertions(+) - - diff --git a/configure.ac b/configure.ac --index 3c1e2c088d..30a92f9c2e 100644 -+index 6f21482207..c7742faf41 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3230,6 +3230,12 @@ if test "$SQLITE3" = "no" ; then -+@@ -3243,6 +3243,12 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -@@ -26,5 +26,5 @@ index 3c1e2c088d..30a92f9c2e 100644 - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0021-Add-an-option-to-disable-NIS.patch b/package/python3/0021-Add-an-option-to-disable-NIS.patch -index 35bfe5aed9..d38f858be8 100644 ---- a/package/python3/0021-Add-an-option-to-disable-NIS.patch -+++ b/package/python3/0021-Add-an-option-to-disable-NIS.patch -@@ -1,4 +1,4 @@ --From ff9bebed083c5d20fe31f94b868f6f1a8c6cc744 Mon Sep 17 00:00:00 2001 -+From e52d4868cc1192f7e1c147aebaf4fc6f7de30357 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:50:11 +0100 - Subject: [PATCH] Add an option to disable NIS -@@ -12,10 +12,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 6 insertions(+) - - diff --git a/configure.ac b/configure.ac --index 30a92f9c2e..20f326db46 100644 -+index c7742faf41..42a871bb09 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3236,6 +3236,12 @@ AC_ARG_ENABLE(codecs-cjk, -+@@ -3249,6 +3249,12 @@ AC_ARG_ENABLE(codecs-cjk, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" - fi]) - -@@ -29,5 +29,5 @@ index 30a92f9c2e..20f326db46 100644 - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch -index a8ec0e499f..17e9861e0f 100644 ---- a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch -+++ b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch -@@ -1,4 +1,4 @@ --From 47f9caca90e6c8c18736e5dfd0acf47aae27eefb Mon Sep 17 00:00:00 2001 -+From 69d3e8f0438d01adde55e90eeabafa4abefd3b02 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:50:27 +0100 - Subject: [PATCH] Add an option to disable unicodedata -@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 6 insertions(+) - - diff --git a/configure.ac b/configure.ac --index 20f326db46..99bbc37b07 100644 -+index 42a871bb09..1d610e132b 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3242,6 +3242,12 @@ AC_ARG_ENABLE(nis, -+@@ -3255,6 +3255,12 @@ AC_ARG_ENABLE(nis, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -@@ -26,5 +26,5 @@ index 20f326db46..99bbc37b07 100644 - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/package/python3/0023-Add-an-option-to-disable-IDLE.patch -index bb23879e34..4cec314065 100644 ---- a/package/python3/0023-Add-an-option-to-disable-IDLE.patch -+++ b/package/python3/0023-Add-an-option-to-disable-IDLE.patch -@@ -1,4 +1,4 @@ --From c3ad1d6fc8f1fa56ee0522389227454710bf7877 Mon Sep 17 00:00:00 2001 -+From 5bbd94f014c89665d02a8a32442822ab7c5520d0 Mon Sep 17 00:00:00 2001 - From: Maxime Ripard - Date: Wed, 22 Feb 2017 17:45:14 -0800 - Subject: [PATCH] Add an option to disable IDLE -@@ -16,12 +16,12 @@ Signed-off-by: Andrey Smirnov - 3 files changed, 15 insertions(+), 2 deletions(-) - - diff --git a/Makefile.pre.in b/Makefile.pre.in --index f49abf8395..bc777e6504 100644 -+index dc4b92b6fe..3e43066d90 100644 - --- a/Makefile.pre.in - +++ b/Makefile.pre.in --@@ -1287,7 +1287,9 @@ bininstall: altbininstall -- -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc -- (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) -+@@ -1229,7 +1229,9 @@ bininstall: altbininstall -+ -rm -f $(DESTDIR)$(LIBPC)/python3.pc -+ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc) - -rm -f $(DESTDIR)$(BINDIR)/idle3 - +ifeq (@IDLE@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -@@ -29,7 +29,7 @@ index f49abf8395..bc777e6504 100644 - -rm -f $(DESTDIR)$(BINDIR)/pydoc3 - ifeq (@PYDOC@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) --@@ -1330,7 +1332,6 @@ LIBSUBDIRS= site-packages \ -+@@ -1274,7 +1276,6 @@ LIBSUBDIRS= site-packages \ - html json http dbm xmlrpc \ - logging csv wsgiref urllib \ - ctypes ctypes/macholib \ -@@ -37,7 +37,7 @@ index f49abf8395..bc777e6504 100644 - distutils distutils/command \ - importlib \ - turtledemo \ --@@ -1420,6 +1421,10 @@ ifeq (@EXPAT@,yes) -+@@ -1360,6 +1361,10 @@ ifeq (@EXPAT@,yes) - LIBSUBDIRS += $(XMLLIBSUBDIRS) - endif - -@@ -49,10 +49,10 @@ index f49abf8395..bc777e6504 100644 - LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 - TESTSUBDIRS += lib2to3/tests \ - diff --git a/configure.ac b/configure.ac --index 99bbc37b07..8c9706582e 100644 -+index 1d610e132b..2699e7ceb1 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3284,6 +3284,12 @@ AC_ARG_ENABLE(lib2to3, -+@@ -3297,6 +3297,12 @@ AC_ARG_ENABLE(lib2to3, - AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), - [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) - -@@ -66,10 +66,10 @@ index 99bbc37b07..8c9706582e 100644 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) - diff --git a/setup.py b/setup.py --index d2727c0da5..9f09b3d985 100644 -+index 38aa5e605e..d642825c1e 100644 - --- a/setup.py - +++ b/setup.py --@@ -2402,11 +2402,13 @@ def main(): -+@@ -2377,11 +2377,13 @@ def main(): - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -@@ -85,5 +85,5 @@ index d2727c0da5..9f09b3d985 100644 - setup(# PyPI Metadata (PEP 301) - name = "Python", - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0024-Add-an-option-to-disable-decimal.patch b/package/python3/0024-Add-an-option-to-disable-decimal.patch -index 7d96f5c416..5e02f0e218 100644 ---- a/package/python3/0024-Add-an-option-to-disable-decimal.patch -+++ b/package/python3/0024-Add-an-option-to-disable-decimal.patch -@@ -1,4 +1,4 @@ --From c82efeabd2f9b89ff2ecd5261eceeeb3af022ae8 Mon Sep 17 00:00:00 2001 -+From 0870559b9af82b55f1fd8b35528510f563577256 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:51:31 +0100 - Subject: [PATCH] Add an option to disable decimal -@@ -17,10 +17,10 @@ Signed-off-by: Adam Duskett - 2 files changed, 13 insertions(+), 6 deletions(-) - - diff --git a/configure.ac b/configure.ac --index 8c9706582e..e6255babb6 100644 -+index 2699e7ceb1..e2c3b6f25c 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3006,13 +3006,20 @@ fi -+@@ -3020,13 +3020,20 @@ fi - AC_SUBST(LIBFFI_INCLUDEDIR) - - # Check for use of the system libmpdec library -@@ -47,11 +47,11 @@ index 8c9706582e..e6255babb6 100644 - # Check for support for loadable sqlite extensions - AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) - diff --git a/setup.py b/setup.py --index 9f09b3d985..a7f2e23d87 100644 -+index d642825c1e..5b98255857 100644 - --- a/setup.py - +++ b/setup.py --@@ -2076,7 +2076,7 @@ class PyBuildExt(build_ext): -- # Stefan Krah's _decimal module -+@@ -2054,7 +2054,7 @@ class PyBuildExt(build_ext): -+ def _decimal_ext(self): - extra_compile_args = [] - undef_macros = [] - - if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"): -@@ -60,5 +60,5 @@ index 9f09b3d985..a7f2e23d87 100644 - libraries = [':libmpdec.so.2'] - sources = ['_decimal/_decimal.c'] - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch -index 56f56adfcb..b7b195a15f 100644 ---- a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch -+++ b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch -@@ -1,4 +1,4 @@ --From c68234aba844cb1034fdcfb50aef03da454723f9 Mon Sep 17 00:00:00 2001 -+From a04fb6159e394ec8346cd49993fdf70db3e1b184 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Wed, 23 Dec 2015 11:51:58 +0100 - Subject: [PATCH] Add an option to disable the ossaudiodev module -@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 6 insertions(+) - - diff --git a/configure.ac b/configure.ac --index e6255babb6..5809233aac 100644 -+index e2c3b6f25c..8e3dded25e 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3021,6 +3021,12 @@ else -+@@ -3035,6 +3035,12 @@ else - fi - AC_SUBST(MPDEC) - -@@ -26,5 +26,5 @@ index e6255babb6..5809233aac 100644 - AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) - AC_ARG_ENABLE(loadable-sqlite-extensions, - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch -index ced3fa93e7..2d569e92dc 100644 ---- a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch -+++ b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch -@@ -1,4 +1,4 @@ --From 8faf197969bf531279d5c59a5bb2bc3a21acc378 Mon Sep 17 00:00:00 2001 -+From 4b001683ad1cb1d90b7c389e67447a250fa9c218 Mon Sep 17 00:00:00 2001 - From: Nicolas Cavallari - Date: Wed, 22 Feb 2017 17:55:59 -0800 - Subject: [PATCH] Add an option to disable openssl support. -@@ -9,10 +9,10 @@ Signed-off-by: Nicolas Cavallari - 1 file changed, 6 insertions(+) - - diff --git a/configure.ac b/configure.ac --index 5809233aac..6b09bafda4 100644 -+index 8e3dded25e..28bcdabd67 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3261,6 +3261,12 @@ AC_ARG_ENABLE(unicodedata, -+@@ -3274,6 +3274,12 @@ AC_ARG_ENABLE(unicodedata, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" - fi]) - -@@ -26,5 +26,5 @@ index 5809233aac..6b09bafda4 100644 - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch -index e70c9984e4..1a28dd8274 100644 ---- a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch -+++ b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch -@@ -1,4 +1,4 @@ --From 6e3923f90497ba7230b62fdd3f2dca1cb79852bf Mon Sep 17 00:00:00 2001 -+From d35deaa5c65c29f2a56a29fd5fc1dadadd485eaf Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Tue, 7 Mar 2017 23:29:05 +0100 - Subject: [PATCH] Add an option to disable the readline module -@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 6 insertions(+) - - diff --git a/configure.ac b/configure.ac --index 6b09bafda4..b64518eed5 100644 -+index 28bcdabd67..484f6ebaca 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3267,6 +3267,12 @@ AC_ARG_ENABLE(openssl, -+@@ -3280,6 +3280,12 @@ AC_ARG_ENABLE(openssl, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" - fi]) - -@@ -26,5 +26,5 @@ index 6b09bafda4..b64518eed5 100644 - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch -index 004b3d1c8f..4bf60fd6c7 100644 ---- a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch -+++ b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch -@@ -1,4 +1,4 @@ --From e6f44f93db96ed7f3b2baa0e09ea32a32c78c638 Mon Sep 17 00:00:00 2001 -+From 9e95f88906f850caa789977dab4b0f256b575254 Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Tue, 7 Mar 2017 23:31:11 +0100 - Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules -@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 18 insertions(+) - - diff --git a/configure.ac b/configure.ac --index b64518eed5..d07e371c57 100644 -+index 484f6ebaca..79538df0cf 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3273,6 +3273,24 @@ AC_ARG_ENABLE(readline, -+@@ -3286,6 +3286,24 @@ AC_ARG_ENABLE(readline, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" - fi]) - -@@ -38,5 +38,5 @@ index b64518eed5..d07e371c57 100644 - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), - -- --2.20.1 -+2.13.5 - -diff --git a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch -index f69b887c9b..0edaebdb65 100644 ---- a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch -+++ b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch -@@ -1,4 +1,4 @@ --From e3221e3b714374e1e53dc11c9556733bd2807c2c Mon Sep 17 00:00:00 2001 -+From 21f787cb9bf0c1440981262f03bc881c5b77c0d8 Mon Sep 17 00:00:00 2001 - From: Matt Weber - Date: Fri, 6 Oct 2017 09:54:15 -0500 - Subject: [PATCH] python-config.sh: don't reassign ${prefix} -@@ -27,7 +27,7 @@ Signed-off-by: Matthew Weber - 1 file changed, 2 insertions(+), 2 deletions(-) - - diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in --index a1bc3cd5f7..164d2d3603 100644 -+index 9e259c0..8b249d9 100644 - --- a/Misc/python-config.sh.in - +++ b/Misc/python-config.sh.in - @@ -31,7 +31,7 @@ prefix_real=$(installed_prefix "$0") -@@ -39,7 +39,7 @@ index a1bc3cd5f7..164d2d3603 100644 - exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#") - exec_prefix_real=${prefix_real} - includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#") --@@ -49,7 +49,7 @@ LDLIBRARY="@LDLIBRARY@" -+@@ -48,7 +48,7 @@ LINKFORSHARED="@LINKFORSHARED@" - OPT="@OPT@" - PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" - LDVERSION="@LDVERSION@" -@@ -49,5 +49,5 @@ index a1bc3cd5f7..164d2d3603 100644 - SO="@EXT_SUFFIX@" - PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" - -- --2.20.1 -+2.14.3 - -diff --git a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch -index d39befaf1c..a2dcdb1b08 100644 ---- a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch -+++ b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch -@@ -1,4 +1,4 @@ --From 28008e1e4f0349241d22aace3c54f7e9425c6c1f Mon Sep 17 00:00:00 2001 -+From ad4537a75c798341824ab18bd1dc622f8dc2bc3a Mon Sep 17 00:00:00 2001 - From: Adam Duskett - Date: Fri, 20 Jul 2018 10:17:39 -0400 - Subject: [PATCH] Fix cross compiling the uuid module -@@ -20,19 +20,19 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 2 insertions(+), 1 deletion(-) - - diff --git a/setup.py b/setup.py --index a7f2e23d87..b0274a3f67 100644 -+index 1a7085c5c4..f33d0b57b8 100644 - --- a/setup.py - +++ b/setup.py --@@ -1674,7 +1674,8 @@ class PyBuildExt(build_ext): -+@@ -1671,7 +1671,8 @@ class PyBuildExt(build_ext): -+ missing.append('_tkinter') - -- def detect_uuid(self): - # Build the _uuid module if possible --- uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"]) --+ uuid_incs = find_file("uuid.h", self.inc_dirs, --+ [os.path.join(inc_dir, 'uuid') for inc_dir in self.inc_dirs]) -+- uuid_incs = find_file("uuid.h", inc_dirs, ["/usr/include/uuid"]) -++ uuid_incs = find_file("uuid.h", inc_dirs, -++ [os.path.join(inc_dir, 'uuid') for inc_dir in inc_dirs]) - if uuid_incs is not None: -- if self.compiler.find_library_file(self.lib_dirs, 'uuid'): -+ if self.compiler.find_library_file(lib_dirs, 'uuid'): - uuid_libs = ['uuid'] - -- --2.20.1 -+2.14.4 - -diff --git a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/package/python3/0031-Add-an-option-to-disable-uuid-module.patch -index a777475c9e..1c674b5446 100644 ---- a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch -+++ b/package/python3/0031-Add-an-option-to-disable-uuid-module.patch -@@ -1,4 +1,4 @@ --From 74007603df0921450f14e8626df36140426cc300 Mon Sep 17 00:00:00 2001 -+From 1fe33c7bee9e6410f56c956ea19efd2f617176ae Mon Sep 17 00:00:00 2001 - From: Thomas Petazzoni - Date: Sat, 18 Aug 2018 10:54:56 +0200 - Subject: [PATCH] Add an option to disable uuid module -@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni - 1 file changed, 9 insertions(+) - - diff --git a/configure.ac b/configure.ac --index d07e371c57..55ab6c3c26 100644 -+index b022460e73..505b7c9be0 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -3309,6 +3309,15 @@ if test "$CURSES" = "no"; then -+@@ -3322,6 +3322,15 @@ if test "$CURSES" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" - fi - -@@ -29,5 +29,5 @@ index d07e371c57..55ab6c3c26 100644 - - AC_ARG_ENABLE(pydoc, - -- --2.20.1 -+2.14.4 - -diff --git a/package/python3/0032-fix-building-on-older-distributions.patch b/package/python3/0032-fix-building-on-older-distributions.patch -index 69998a36dd..8b848d383d 100644 ---- a/package/python3/0032-fix-building-on-older-distributions.patch -+++ b/package/python3/0032-fix-building-on-older-distributions.patch -@@ -1,4 +1,4 @@ --From 3ddda00652f809a3bd8b4e3f7b0a3a4270b280a6 Mon Sep 17 00:00:00 2001 -+From ba10bac420398270a0b992e85d93383373d5fcac Mon Sep 17 00:00:00 2001 - From: Adam Duskett - Date: Thu, 16 Aug 2018 14:52:37 -0700 - Subject: [PATCH] fix building on older distributions -@@ -34,5 +34,5 @@ index 224585c69b..ef458c0c63 100644 - os.unlink(new_path) - - -- --2.20.1 -+2.14.4 - -diff --git a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch -index 5a5a104dc5..19a0f23e7b 100644 ---- a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch -+++ b/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch -@@ -1,4 +1,4 @@ --From 5932fedd9d1d43a230fa353df434f253e9d2b5a0 Mon Sep 17 00:00:00 2001 -+From e1a2c27bcb9091f851ef7a9c7d59822a125a0b8e Mon Sep 17 00:00:00 2001 - From: Peter Korsgaard - Date: Fri, 2 Aug 2019 15:53:16 +0200 - Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for -@@ -29,10 +29,10 @@ Signed-off-by: Peter Korsgaard - 1 file changed, 3 insertions(+), 1 deletion(-) - - diff --git a/configure.ac b/configure.ac --index 55ab6c3c26..4a6d0662ac 100644 -+index e5fb7e7b0b..9c64f960d6 100644 - --- a/configure.ac - +++ b/configure.ac --@@ -700,7 +700,9 @@ then -+@@ -724,7 +724,9 @@ then - fi - - -@@ -44,5 +44,5 @@ index 55ab6c3c26..4a6d0662ac 100644 - - AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) - -- --2.20.1 -+2.11.0 - -diff --git a/package/python3/Config.in.host b/package/python3/Config.in.host -deleted file mode 100644 -index 70b5dacdde..0000000000 ---- a/package/python3/Config.in.host -+++ /dev/null -@@ -1,16 +0,0 @@ --config BR2_PACKAGE_HOST_PYTHON3 -- bool "host python3" -- help -- The python language interpreter. Host package. -- -- http://www.python.org/ -- --if BR2_PACKAGE_HOST_PYTHON3 -- --config BR2_PACKAGE_HOST_PYTHON3_SSL -- bool "ssl" -- select BR2_PACKAGE_HOST_OPENSSL -- help -- _ssl module for host Python3. -- --endif -diff --git a/package/python3/python3.hash b/package/python3/python3.hash -index de317e897d..4a82e1dd9c 100644 ---- a/package/python3/python3.hash -+++ b/package/python3/python3.hash -@@ -1,5 +1,5 @@ --# From https://www.python.org/downloads/release/python-380/ --md5 dbac8df9d8b9edc678d0f4cacdb7dbb0 Python-3.8.0.tar.xz -+# From https://www.python.org/downloads/release/python-374/ -+md5 d33e4aae66097051c2eca45ee3604803 Python-3.7.4.tar.xz - # Locally computed --sha256 b356244e13fb5491da890b35b13b2118c3122977c2cd825e3eb6e7d462030d84 Python-3.8.0.tar.xz -+sha256 fb799134b868199930b75f26678f18932214042639cd52b16da7fd134cd9b13f Python-3.7.4.tar.xz - sha256 a77d71d6be6f9032e6b6e5d2cf6da68f9eeab9036edfbc043633c8979cd5e82c LICENSE -diff --git a/package/python3/python3.mk b/package/python3/python3.mk -index a6692c5257..22cdbc96f8 100644 ---- a/package/python3/python3.mk -+++ b/package/python3/python3.mk -@@ -4,8 +4,8 @@ - # - ################################################################################ - --PYTHON3_VERSION_MAJOR = 3.8 --PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).0 -+PYTHON3_VERSION_MAJOR = 3.7 -+PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).4 - PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz - PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) - PYTHON3_LICENSE = Python-2.0, others -@@ -39,13 +39,7 @@ HOST_PYTHON3_CONF_ENV += \ - - PYTHON3_DEPENDENCIES = host-python3 libffi - --HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi -- --ifeq ($(BR2_PACKAGE_HOST_PYTHON3_SSL),y) --HOST_PYTHON3_DEPENDENCIES += host-openssl --else --HOST_PYTHON3_CONF_OPTS += --disable-openssl --endif -+HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi host-openssl - - PYTHON3_INSTALL_STAGING = YES - -@@ -285,9 +279,7 @@ endif - - ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY),y) - define PYTHON3_REMOVE_PY_FILES -- find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) -name '*.py' \ -- $(if $(strip $(KEEP_PYTHON_PY_FILES)),-not \( $(call finddirclauses,$(TARGET_DIR),$(KEEP_PYTHON_PY_FILES)) \) ) \ -- -print0 | \ -+ find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) -name '*.py' -print0 | \ - xargs -0 --no-run-if-empty rm -f - endef - PYTHON3_TARGET_FINALIZE_HOOKS += PYTHON3_REMOVE_PY_FILES --- -2.24.0.rc1 - diff --git a/buildroot-patches/0004-Upgrade-python-pillow-to-6.2.1.patch b/buildroot-patches/0004-Upgrade-python-pillow-to-6.2.1.patch new file mode 100644 index 00000000..fa5ecacb --- /dev/null +++ b/buildroot-patches/0004-Upgrade-python-pillow-to-6.2.1.patch @@ -0,0 +1,36 @@ +From ea5047295ff6bce30ba65eb53f0e610c0600052d Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Fri, 15 Nov 2019 13:09:01 +0100 +Subject: [PATCH 1/1] Upgrade python-pillow to 6.2.1 + +--- + package/python-pillow/python-pillow.hash | 2 +- + package/python-pillow/python-pillow.mk | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash +index fe72d01d38..4864d61ce7 100644 +--- a/package/python-pillow/python-pillow.hash ++++ b/package/python-pillow/python-pillow.hash +@@ -1,4 +1,4 @@ + # sha256 for python-pillow from https://pypi.org/project/Pillow/ + # sha256 for LICENSE locally computed +-sha256 0804f77cb1e9b6dbd37601cee11283bba39a8d44b9ddb053400c58e0c0d7d9de Pillow-6.1.0.tar.gz ++sha256 bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1 Pillow-6.2.1.tar.gz + sha256 64ea4328ed56392b423ef968519a9ad427e3de9b985862c95ed2ed4d793d22ee LICENSE +diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk +index a4121da2b4..ae277dc2d2 100644 +--- a/package/python-pillow/python-pillow.mk ++++ b/package/python-pillow/python-pillow.mk +@@ -4,7 +4,7 @@ + # + ################################################################################ + +-PYTHON_PILLOW_VERSION = 6.1.0 ++PYTHON_PILLOW_VERSION = 6.2.1 + PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz + PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/51/fe/18125dc680720e4c3086dd3f5f95d80057c41ab98326877fc7d3ff6d0ee5 + PYTHON_PILLOW_LICENSE = PIL Software License +-- +2.24.0.rc1 + diff --git a/buildroot-patches/0005-Downgrade-dbus-python-back-to-Python3.7-compatible-v.patch b/buildroot-patches/0005-Downgrade-dbus-python-back-to-Python3.7-compatible-v.patch deleted file mode 100644 index 13e66377..00000000 --- a/buildroot-patches/0005-Downgrade-dbus-python-back-to-Python3.7-compatible-v.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 287a3b1a8c05ac091870b2b3b305d12b584f6531 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Sun, 15 Dec 2019 10:45:06 +0100 -Subject: [PATCH 1/1] Downgrade dbus-python back to Python3.7 compatible - version. - ---- - package/dbus-python/Config.in | 2 +- - package/dbus-python/dbus-python.hash | 3 +-- - package/dbus-python/dbus-python.mk | 19 ++++++++++--------- - 3 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in -index 4bfb59ed91..332726348d 100644 ---- a/package/dbus-python/Config.in -+++ b/package/dbus-python/Config.in -@@ -4,7 +4,7 @@ config BR2_PACKAGE_DBUS_PYTHON - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_PACKAGE_DBUS - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 -- select BR2_PACKAGE_LIBGLIB2 -+ select BR2_PACKAGE_DBUS_GLIB - # pyexpat: runtime dependency only - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 -diff --git a/package/dbus-python/dbus-python.hash b/package/dbus-python/dbus-python.hash -index 58b0a75908..5bf2f507c6 100644 ---- a/package/dbus-python/dbus-python.hash -+++ b/package/dbus-python/dbus-python.hash -@@ -1,6 +1,5 @@ - # Locally calculated after checking pgp signature --sha256 cdd4de2c4f5e58f287b12013ed7b41dee81d503c8d0d2397c5bd2fb01badf260 dbus-python-1.2.12.tar.gz -+sha256 abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f dbus-python-1.2.8.tar.gz - - # Locally calculated - sha256 1e4562245383fdb5203b1769789e5b28bba21af4923aea7e8b2614f7f93623c0 COPYING --sha256 064523e3ab64d6f03904132b2cc4a1bd8500586edb4cd050c2ff2b96aed4c33b dbus-gmain/COPYING -diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk -index cf4882d8ee..eaf4e5f483 100644 ---- a/package/dbus-python/dbus-python.mk -+++ b/package/dbus-python/dbus-python.mk -@@ -4,13 +4,16 @@ - # - ################################################################################ - --DBUS_PYTHON_VERSION = 1.2.12 -+DBUS_PYTHON_VERSION = 1.2.8 - DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python - DBUS_PYTHON_INSTALL_STAGING = YES --DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain) --DBUS_PYTHON_LICENSE_FILES = COPYING dbus-gmain/COPYING --DBUS_PYTHON_DEPENDENCIES = dbus libglib2 --HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 -+DBUS_PYTHON_LICENSE = MIT -+DBUS_PYTHON_LICENSE_FILES = COPYING -+DBUS_PYTHON_DEPENDENCIES = dbus-glib -+DBUS_PYTHON_CONF_OPTS = --disable-html-docs --disable-api-docs -+ -+HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus-glib -+HOST_DBUS_PYTHON_CONF_OPTS = --disable-html-docs --disable-api-docs - - ifeq ($(BR2_PACKAGE_PYTHON),y) - DBUS_PYTHON_DEPENDENCIES += python host-python -@@ -32,16 +35,14 @@ DBUS_PYTHON_DEPENDENCIES += python3 host-python3 - DBUS_PYTHON_CONF_ENV += \ - PYTHON=$(HOST_DIR)/bin/python3 \ - PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ -- PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \ -- PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" -+ PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" - - HOST_DBUS_PYTHON_DEPENDENCIES += host-python3 - - HOST_DBUS_PYTHON_CONF_ENV += \ - PYTHON=$(HOST_DIR)/bin/python3 \ - PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python3-config --includes`" \ -- PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python3-config --ldflags`" \ -- PYTHON_EXTRA_LIBS="`$(HOST_DIR)/usr/bin/python3-config --libs --embed`" -+ PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python3-config --ldflags`" - endif - - $(eval $(autotools-package)) --- -2.24.0.rc1 - diff --git a/buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch b/buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch index 37f3f4b9..b925f3c3 100644 --- a/buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch +++ b/buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch @@ -1,6 +1,6 @@ -From 098fca8b97aafe3c6d92d93c7abf6b9c931e292b Mon Sep 17 00:00:00 2001 +From 8c2bf3b497d2aacd47d206103d269afb0b017168 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Tue, 3 Dec 2019 16:31:35 +0100 +Date: Mon, 28 Oct 2019 13:58:07 +0100 Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1 --- @@ -9,32 +9,32 @@ Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash -index 3081e41540..5a6d45124a 100644 +index e61bffa840..8626528a97 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json - md5 7ca9d297c23ca0074c1cf173bed061b0 psutil-5.6.4.tar.gz - sha256 512e854d68f8b42f79b2c7864d997b39125baff9bcff00028ce43543867de7c4 psutil-5.6.4.tar.gz + md5 1bbc1788588cc3c2c461cd98a830ba72 psutil-5.6.3.tar.gz + sha256 863a85c1c0a5103a12c05a35e59d336e1d665747e531256e061213e2e90f63f3 psutil-5.6.3.tar.gz +sha256 fe0ea53b302f68fca1c2a3bac289e11344456786141b73391ed4022b412d5455 psutil-5.2.1.tar.gz # Locally computed sha256 checksums sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk -index 0edf1c669b..162d1b7f50 100644 +index bb4d58930f..162d1b7f50 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_PSUTIL_VERSION = 5.6.4 +-PYTHON_PSUTIL_VERSION = 5.6.3 +PYTHON_PSUTIL_VERSION = 5.2.1 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz --PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/47/ea/d3b6d6fd0b4a6c12984df652525f394e68c8678d2b05075219144eb3a1cf +-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/1c/ca/5b8c1fe032a458c2c4bcbe509d1401dca9dda35c7fc46b36bb81c2834740 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/b8/47/c85fbcd23f40892db6ecc88782beb6ee66d22008c2f9821d777cb1984240 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE -- -2.24.0.rc1 +2.11.0 diff --git a/buildroot-patches/0011-Downgrade-python-websocket-client-to-0.54.0.patch b/buildroot-patches/0011-Downgrade-python-websocket-client-to-0.54.0.patch index 58c0c7e5..f071b3f4 100644 --- a/buildroot-patches/0011-Downgrade-python-websocket-client-to-0.54.0.patch +++ b/buildroot-patches/0011-Downgrade-python-websocket-client-to-0.54.0.patch @@ -1,40 +1,41 @@ -From ef65c12a6bbcf4e6bf329d7b7e654f30414aac77 Mon Sep 17 00:00:00 2001 +From cc13c52d8a7c8816b093688421b45dab0c620be6 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Tue, 3 Dec 2019 16:36:04 +0100 +Date: Sat, 7 Sep 2019 17:03:17 +0200 Subject: [PATCH 1/1] Downgrade python-websocket-client to 0.54.0 --- package/python-websocket-client/python-websocket-client.hash | 1 + - package/python-websocket-client/python-websocket-client.mk | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) + package/python-websocket-client/python-websocket-client.mk | 5 +++-- + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash -index 735cb53e1c..a740da5245 100644 +index 3672ca074b..70ea66a652 100644 --- a/package/python-websocket-client/python-websocket-client.hash +++ b/package/python-websocket-client/python-websocket-client.hash -@@ -1,5 +1,6 @@ - # md5, sha256 from https://pypi.org/pypi/websocket-client/json - md5 89484bd5dac71123ae6a09b2f90fe62c websocket_client-0.56.0.tar.gz - sha256 1fd5520878b68b84b5748bb30e592b10d0a91529d5383f74f4964e72b297fd3a websocket_client-0.56.0.tar.gz +@@ -2,3 +2,4 @@ + md5 790b3ecb5364293ad70c59a1b92debb1 websocket_client-0.47.0.tar.gz + sha256 a453dc4dfa6e0db3d8fd7738a308a88effe6240c59f3226eb93e8f020c216149 websocket_client-0.47.0.tar.gz + sha256 e580b2a1a57c33085dd6a07cff693d828f7c3fa8a11ce56ade2a62c46951930d LICENSE +sha256 e51562c91ddb8148e791f0155fdb01325d99bb52c4cdbb291aee7a3563fd0849 websocket_client-0.54.0.tar.gz - # Locally computed sha256 checksums - sha256 a47b06717e8a3cf01d1307141287b1b4fa17fe4bb8785633d2fc6f57cb71d05e LICENSE diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk -index 518f7b29a9..98cc941efe 100644 +index 58c8407db3..e07f9c5a6a 100644 --- a/package/python-websocket-client/python-websocket-client.mk +++ b/package/python-websocket-client/python-websocket-client.mk -@@ -4,9 +4,9 @@ +@@ -4,11 +4,12 @@ # ################################################################################ --PYTHON_WEBSOCKET_CLIENT_VERSION = 0.56.0 +-PYTHON_WEBSOCKET_CLIENT_VERSION = 0.47.0 +PYTHON_WEBSOCKET_CLIENT_VERSION = 0.54.0 PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz --PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/c5/01/8c9c7de6c46f88e70b5a3276c791a2be82ae83d8e0d0cc030525ee2866fd +-PYTHON_WEBSOCKET_CLIENT_SITE = https://pypi.python.org/packages/c9/bb/8d3dd9063cfe0cd5d03fe6a1f74ddd948f384e9c1eff0eb978f3976a7d27 +PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/35/d4/14e446a82bc9172d088ebd81c0b02c5ca8481bfeecb13c9ef07998f9249b PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools - # Project was under LGPL-2.1+, but was relicensed under - # BSD-3-Clause. The LICENSE file contains the BSD-3-Clause text, but + PYTHON_WEBSOCKET_CLIENT_LICENSE = LGPL-2.1+ + PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE + + $(eval $(python-package)) ++$(eval $(host-python-package)) -- -2.24.0.rc1 +2.11.0 diff --git a/buildroot-patches/0012-Add-host-openssl-dependency-to-python3.patch b/buildroot-patches/0012-Add-host-openssl-dependency-to-python3.patch new file mode 100644 index 00000000..49b32666 --- /dev/null +++ b/buildroot-patches/0012-Add-host-openssl-dependency-to-python3.patch @@ -0,0 +1,35 @@ +From f1468008e466ce9aa27449c98ce775b292945190 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Mon, 7 Jan 2019 16:59:08 +0100 +Subject: [PATCH 1/1] Add host-openssl dependency to python3 + +--- + package/python3/python3.mk | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/package/python3/python3.mk b/package/python3/python3.mk +index 8fbb95b9ad..0f8cce45dc 100644 +--- a/package/python3/python3.mk ++++ b/package/python3/python3.mk +@@ -26,8 +26,7 @@ HOST_PYTHON3_CONF_OPTS += \ + --enable-unicodedata \ + --disable-test-modules \ + --disable-idle3 \ +- --disable-ossaudiodev \ +- --disable-openssl ++ --disable-ossaudiodev + + # Make sure that LD_LIBRARY_PATH overrides -rpath. + # This is needed because libpython may be installed at the same time that +@@ -40,7 +39,7 @@ HOST_PYTHON3_CONF_ENV += \ + + PYTHON3_DEPENDENCIES = host-python3 libffi + +-HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi ++HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi host-openssl + + PYTHON3_INSTALL_STAGING = YES + +-- +2.11.0 + diff --git a/buildroot-patches/0018-Bump-RPI-Firmware-version-to-latest.patch b/buildroot-patches/0018-Bump-RPI-Firmware-version-to-latest.patch new file mode 100644 index 00000000..ade983b2 --- /dev/null +++ b/buildroot-patches/0018-Bump-RPI-Firmware-version-to-latest.patch @@ -0,0 +1,35 @@ +From 9e52511e6b9f427c99aef62b5f8d1f3de6f9528c Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Mon, 28 Oct 2019 14:35:36 +0100 +Subject: [PATCH 1/1] Bump RPI Firmware version to latest + +--- + package/rpi-firmware/rpi-firmware.hash | 2 +- + package/rpi-firmware/rpi-firmware.mk | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash +index 61834f7d42..5f6f94d606 100644 +--- a/package/rpi-firmware/rpi-firmware.hash ++++ b/package/rpi-firmware/rpi-firmware.hash +@@ -1,3 +1,3 @@ + # Locally computed +-sha256 c82c40cf37fac36160a7f6b9c314506beb942bf113a55d30fa163c56a4f98946 rpi-firmware-bcf40b5c2b94178c7564fb451098d44968e44af5.tar.gz ++sha256 6e04cfca954c8e087eae81837a0813a642dcca58f05bcfdf6a15e69dc657a30e rpi-firmware-9f4983548584d4f70e6eec5270125de93a081483.tar.gz + sha256 ba76edfc10a248166d965b8eaf320771c44f4f432d4fce2fd31fd272e7038add boot/LICENCE.broadcom +diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk +index 717f705f66..c9e7b35268 100644 +--- a/package/rpi-firmware/rpi-firmware.mk ++++ b/package/rpi-firmware/rpi-firmware.mk +@@ -4,7 +4,7 @@ + # + ################################################################################ + +-RPI_FIRMWARE_VERSION = bcf40b5c2b94178c7564fb451098d44968e44af5 ++RPI_FIRMWARE_VERSION = 9f4983548584d4f70e6eec5270125de93a081483 + RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) + RPI_FIRMWARE_LICENSE = BSD-3-Clause + RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom +-- +2.11.0 + diff --git a/buildroot-patches/0020-Upgrade-python-pyyaml-to-5.1.2.patch b/buildroot-patches/0020-Upgrade-python-pyyaml-to-5.1.2.patch new file mode 100644 index 00000000..f9f1eed4 --- /dev/null +++ b/buildroot-patches/0020-Upgrade-python-pyyaml-to-5.1.2.patch @@ -0,0 +1,38 @@ +From 625a432767c65656904369584b23f1f1bf901f76 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Sun, 24 Nov 2019 11:51:57 +0100 +Subject: [PATCH 1/1] Upgrade python-pyyaml to 5.1.2 + +--- + package/python-pyyaml/python-pyyaml.hash | 1 + + package/python-pyyaml/python-pyyaml.mk | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash +index 256742feb6..7bdaca9859 100644 +--- a/package/python-pyyaml/python-pyyaml.hash ++++ b/package/python-pyyaml/python-pyyaml.hash +@@ -1,3 +1,4 @@ + # md5, sha256 from https://pypi.python.org/pypi/pyyaml/json + md5 a842bc7391e145bbe4e7fd0d32da1132 PyYAML-4.2b4.tar.gz + sha256 3c17fb92c8ba2f525e4b5f7941d850e7a48c3a59b32d331e2502a3cdc6648e76 PyYAML-4.2b4.tar.gz ++sha256 01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4 PyYAML-5.1.2.tar.gz +diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk +index b73b4356a0..165a938f11 100644 +--- a/package/python-pyyaml/python-pyyaml.mk ++++ b/package/python-pyyaml/python-pyyaml.mk +@@ -4,9 +4,9 @@ + # + ################################################################################ + +-PYTHON_PYYAML_VERSION = 4.2b4 ++PYTHON_PYYAML_VERSION = 5.1.2 + PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz +-PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a8/c6/a8d1555e795dbd0375c3c93b576ca13bbf139db51ea604afa19a2c35fc03 ++PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe + PYTHON_PYYAML_SETUP_TYPE = distutils + PYTHON_PYYAML_LICENSE = MIT + PYTHON_PYYAML_LICENSE_FILES = LICENSE +-- +2.24.0.rc1 + diff --git a/buildroot-patches/0021-Downgrade-python-dateutil-to-2.7.5.patch b/buildroot-patches/0021-Downgrade-python-dateutil-to-2.7.5.patch index 7b036364..cfd73744 100644 --- a/buildroot-patches/0021-Downgrade-python-dateutil-to-2.7.5.patch +++ b/buildroot-patches/0021-Downgrade-python-dateutil-to-2.7.5.patch @@ -1,39 +1,39 @@ -From 49c4b14af92d607156c16a5c0759a01cee0f7268 Mon Sep 17 00:00:00 2001 +From d51497c842d0d84758cf400cf793173306202386 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Tue, 3 Dec 2019 16:57:10 +0100 +Date: Mon, 9 Sep 2019 15:58:14 +0200 Subject: [PATCH 1/1] Downgrade python-dateutil to 2.7.5 --- - package/python-dateutil/python-dateutil.hash | 1 + + package/python-dateutil/python-dateutil.hash | 2 +- package/python-dateutil/python-dateutil.mk | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-dateutil/python-dateutil.hash b/package/python-dateutil/python-dateutil.hash -index f3dc69f272..834d0b79b5 100644 +index eecba7d35a..4cee523d00 100644 --- a/package/python-dateutil/python-dateutil.hash +++ b/package/python-dateutil/python-dateutil.hash -@@ -1,5 +1,6 @@ +@@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-dateutil/json - md5 f2a1d4b680b297b367a974664ca3a4f6 python-dateutil-2.8.1.tar.gz - sha256 73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c python-dateutil-2.8.1.tar.gz + md5 354db28843d949f1bc3e49e8458e22df python-dateutil-2.8.0.tar.gz +-sha256 c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e python-dateutil-2.8.0.tar.gz +sha256 88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02 python-dateutil-2.7.5.tar.gz # Locally computed sha256 checksums sha256 ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e LICENSE diff --git a/package/python-dateutil/python-dateutil.mk b/package/python-dateutil/python-dateutil.mk -index 759261d2d1..5e90398331 100644 +index 4c915c8e83..5e90398331 100644 --- a/package/python-dateutil/python-dateutil.mk +++ b/package/python-dateutil/python-dateutil.mk @@ -4,8 +4,8 @@ # ################################################################################ --PYTHON_DATEUTIL_VERSION = 2.8.1 --PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/be/ed/5bbc91f03fa4c839c4c7360375da77f9659af5f7086b7a7bdda65771c8e0 +-PYTHON_DATEUTIL_VERSION = 2.8.0 +-PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/ad/99/5b2e99737edeb28c71bcbec5b5dda19d0d9ef3ca3e92e3e925e7c0bb364c +PYTHON_DATEUTIL_VERSION = 2.7.5 +PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/0e/01/68747933e8d12263d41ce08119620d9a7e5eb72c876a3442257f74490da0 PYTHON_DATEUTIL_SETUP_TYPE = setuptools PYTHON_DATEUTIL_LICENSE = BSD-3-Clause PYTHON_DATEUTIL_LICENSE_FILES = LICENSE -- -2.24.0.rc1 +2.11.0 diff --git a/buildroot-patches/0022-Upgrade-python-tornado-to-6.0.3.patch b/buildroot-patches/0022-Upgrade-python-tornado-to-6.0.3.patch new file mode 100644 index 00000000..6c9e6a39 --- /dev/null +++ b/buildroot-patches/0022-Upgrade-python-tornado-to-6.0.3.patch @@ -0,0 +1,40 @@ +From 5f667546586532dddec1a93236be0acb58584535 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Sun, 24 Nov 2019 11:57:16 +0100 +Subject: [PATCH 1/1] Upgrade python-tornado to 6.0.3 + +--- + package/python-tornado/python-tornado.hash | 1 + + package/python-tornado/python-tornado.mk | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash +index 18560b17ce..3158063ca8 100644 +--- a/package/python-tornado/python-tornado.hash ++++ b/package/python-tornado/python-tornado.hash +@@ -1,5 +1,6 @@ + # md5, sha256 from https://pypi.org/pypi/tornado/json + md5 63a26fdd0bf1154d4a5e9144b7028dd0 tornado-6.0.1.tar.gz + sha256 de274c65f45f6656c375cdf1759dbf0bc52902a1e999d12a35eb13020a641a53 tornado-6.0.1.tar.gz ++sha256 c845db36ba616912074c5b1ee897f8e0124df269468f25e4fe21fe72f6edd7a9 tornado-6.0.3.tar.gz + # Locally computed sha256 checksums + sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk +index fe65d7516e..e326fadcb5 100644 +--- a/package/python-tornado/python-tornado.mk ++++ b/package/python-tornado/python-tornado.mk +@@ -4,9 +4,9 @@ + # + ################################################################################ + +-PYTHON_TORNADO_VERSION = 6.0.1 ++PYTHON_TORNADO_VERSION = 6.0.3 + PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz +-PYTHON_TORNADO_SITE = https://pypi.python.org/packages/b1/7f/8109821ff9df1bf3519169e34646705c32ac13be6a4d51a79ed57f47686e ++PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/30/78/2d2823598496127b21423baffaa186b668f73cd91887fcef78b6eade136b + PYTHON_TORNADO_LICENSE = Apache-2.0 + PYTHON_TORNADO_LICENSE_FILES = LICENSE + PYTHON_TORNADO_SETUP_TYPE = setuptools +-- +2.24.0.rc1 + diff --git a/buildroot-patches/0023-Bump-RPI-BT-Firmware-version-to-latest.patch b/buildroot-patches/0023-Bump-RPI-BT-Firmware-version-to-latest.patch new file mode 100644 index 00000000..0d947019 --- /dev/null +++ b/buildroot-patches/0023-Bump-RPI-BT-Firmware-version-to-latest.patch @@ -0,0 +1,35 @@ +From b7c3b4b1cbc21c15affbf2d7199e1fe8ca4c6162 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Mon, 28 Oct 2019 15:48:48 +0100 +Subject: [PATCH 1/1] Bump RPI BT Firmware version to latest + +--- + package/rpi-bt-firmware/rpi-bt-firmware.hash | 2 +- + package/rpi-bt-firmware/rpi-bt-firmware.mk | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash +index a3c7281d75..a9703150df 100644 +--- a/package/rpi-bt-firmware/rpi-bt-firmware.hash ++++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash +@@ -1,3 +1,3 @@ + # Locally computed +-sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-bt-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz ++sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-bt-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz + sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk +index 23923453c4..785f007cc3 100644 +--- a/package/rpi-bt-firmware/rpi-bt-firmware.mk ++++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk +@@ -4,7 +4,7 @@ + # + ################################################################################ + +-RPI_BT_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327 ++RPI_BT_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 + RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) + RPI_BT_FIRMWARE_LICENSE = PROPRIETARY + RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx +-- +2.11.0 + diff --git a/buildroot-patches/0024-Bump-RPI-Wifi-Firmware-version-to-latest.patch b/buildroot-patches/0024-Bump-RPI-Wifi-Firmware-version-to-latest.patch new file mode 100644 index 00000000..4b67770e --- /dev/null +++ b/buildroot-patches/0024-Bump-RPI-Wifi-Firmware-version-to-latest.patch @@ -0,0 +1,35 @@ +From d4e129660fede6331859dd3c955dbcdff851d8c9 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Mon, 28 Oct 2019 15:53:01 +0100 +Subject: [PATCH 1/1] Bump RPI Wifi Firmware version to latest + +--- + package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +- + package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +index 5de9e0f13f..c1f9494577 100644 +--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash ++++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +@@ -1,3 +1,3 @@ + # Locally calculated +-sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-wifi-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz ++sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz + sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +index 9dd1854b9a..6be02509fe 100644 +--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk ++++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +@@ -4,7 +4,7 @@ + # + ################################################################################ + +-RPI_WIFI_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327 ++RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 + RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) + RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY + RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx +-- +2.11.0 + diff --git a/buildroot-patches/0027-Downgrade-python-urllib3-to-1.24.2.patch b/buildroot-patches/0027-Downgrade-python-urllib3-to-1.24.2.patch index 6b41dfd4..dedbd4a8 100644 --- a/buildroot-patches/0027-Downgrade-python-urllib3-to-1.24.2.patch +++ b/buildroot-patches/0027-Downgrade-python-urllib3-to-1.24.2.patch @@ -1,40 +1,42 @@ -From 1710083a2e96bc5ab95f6cf4d16cd683902fee30 Mon Sep 17 00:00:00 2001 +From 1d3d028e59a115f86fdac8b5bbd39dcc5565561c Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Tue, 3 Dec 2019 17:11:39 +0100 +Date: Tue, 29 Oct 2019 19:33:27 +0100 Subject: [PATCH 1/1] Downgrade python-urllib3 to 1.24.2 --- - package/python-urllib3/python-urllib3.hash | 1 + + package/python-urllib3/python-urllib3.hash | 6 +++--- package/python-urllib3/python-urllib3.mk | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash -index 91b9e44622..0f01c43757 100644 +index e61f754aa3..ec075cb4f6 100644 --- a/package/python-urllib3/python-urllib3.hash +++ b/package/python-urllib3/python-urllib3.hash -@@ -1,5 +1,6 @@ +@@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urllib3/json - md5 a7504a9fcb7ed4ffa482fe098c80b6d4 urllib3-1.25.6.tar.gz - sha256 9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86 urllib3-1.25.6.tar.gz +-md5 f09e95a5c42a7cc7ff7cb6a14c55fb69 urllib3-1.25.3.tar.gz +-sha256 dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232 urllib3-1.25.3.tar.gz ++md5 20bb5a170a534bd0acd98bfc007fcc22 urllib3-1.24.2.tar.gz +sha256 9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3 urllib3-1.24.2.tar.gz # Locally computed sha256 checksums - sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt +-sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt ++sha256 11db569430ca5ad793f1399297b8df5041a22137abaf90642ea71da21d59121c LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk -index 8383cbe8e8..893d32d976 100644 +index 5d8ec34f39..893d32d976 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_URLLIB3_VERSION = 1.25.6 +-PYTHON_URLLIB3_VERSION = 1.25.3 +PYTHON_URLLIB3_VERSION = 1.24.2 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz --PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/ff/44/29655168da441dff66de03952880c6e2d17b252836ff1aa4421fba556424 +-PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/4c/13/2386233f7ee40aa8444b47f7463338f3cbdf00c316627558784e3f542f07 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/fd/fa/b21f4f03176463a6cccdb612a5ff71b927e5224e83483012747c12fc5d62 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_SETUP_TYPE = setuptools -- -2.24.0.rc1 +2.11.0 diff --git a/buildroot-patches/0028-Downgrade-python-pyalsaaudio-to-0.8.2.patch b/buildroot-patches/0028-Downgrade-python-pyalsaaudio-to-0.8.2.patch deleted file mode 100644 index f3346ece..00000000 --- a/buildroot-patches/0028-Downgrade-python-pyalsaaudio-to-0.8.2.patch +++ /dev/null @@ -1,42 +0,0 @@ -From afd7a5c614ad0f4741e378d7aab2c0369dc68508 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Sat, 7 Dec 2019 17:59:27 +0100 -Subject: [PATCH 1/1] Downgrade python-alsaaudio to 0.8.2 - ---- - package/python-alsaaudio/python-alsaaudio.hash | 1 + - package/python-alsaaudio/python-alsaaudio.mk | 6 +++--- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/package/python-alsaaudio/python-alsaaudio.hash b/package/python-alsaaudio/python-alsaaudio.hash -index 476bc8f1a1..9086f32599 100644 ---- a/package/python-alsaaudio/python-alsaaudio.hash -+++ b/package/python-alsaaudio/python-alsaaudio.hash -@@ -1,5 +1,6 @@ - # md5, sha256 from https://pypi.org/pypi/pyalsaaudio/json - md5 b46f69561bc85fc52e698b2440ca251e pyalsaaudio-0.8.4.tar.gz - sha256 84e8f8da544d7f4bd96479ce4a237600077984d9be1d7f16c1d9a492ecf50085 pyalsaaudio-0.8.4.tar.gz -+sha256 b6df486f1c4035041a5f3800496b86c64e48e4a7d47f94dcbca11b0187aa3a15 pyalsaaudio-0.8.2.tar.gz - # Locally computed sha256 checksums - sha256 ef6ba930f96986d78082e67c817ac617b9e833d60d5a0460f24c9c674a010935 LICENSE -diff --git a/package/python-alsaaudio/python-alsaaudio.mk b/package/python-alsaaudio/python-alsaaudio.mk -index 3344583cf7..9944c8b44a 100644 ---- a/package/python-alsaaudio/python-alsaaudio.mk -+++ b/package/python-alsaaudio/python-alsaaudio.mk -@@ -4,10 +4,10 @@ - # - ################################################################################ - --PYTHON_ALSAAUDIO_VERSION = 0.8.4 -+PYTHON_ALSAAUDIO_VERSION = 0.8.2 - PYTHON_ALSAAUDIO_SOURCE = pyalsaaudio-$(PYTHON_ALSAAUDIO_VERSION).tar.gz --PYTHON_ALSAAUDIO_SITE = https://files.pythonhosted.org/packages/52/b6/44871791929d9d7e11325af0b7be711388dfeeab17147988f044a41a6d83 --PYTHON_ALSAAUDIO_SETUP_TYPE = setuptools -+PYTHON_ALSAAUDIO_SITE = https://files.pythonhosted.org/packages/0d/99/1f48912b5ffccecdd0c0c477023f4eaf45ebac6c92bc1865c7142c570d6d -+PYTHON_ALSAAUDIO_SETUP_TYPE = distutils - PYTHON_ALSAAUDIO_LICENSE = Python-2.0 - PYTHON_ALSAAUDIO_LICENSE_FILES = LICENSE - PYTHON_ALSAAUDIO_DEPENDENCIES = alsa-lib --- -2.24.0.rc1 -