Skip to contentSkip to conversation

python: Upgrade 2.7.16 -> 2.7.17

PATCH In review Adrian Bunk 1 participant 2 messages Nov 4, 2019 – Nov 11, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 python: Upgrade 2.7.16 -> 2.7.17

Patches applied upstream removed.

---
 ...-fix-one-do_populate_sysroot-warning.patch |  15 +-
 ...tive_2.7.16.bb => python-native_2.7.17.bb} |   0
 meta/recipes-devtools/python/python.inc       |  10 +-
 ...nt-parse-domains-containing-GH-13079.patch |  90 --------
 ...cape-the-server-title-of-DocXMLRPCSe.patch | 101 --------
 .../python/python/CVE-2018-20852.patch        | 123 ----------
 .../python/python/CVE-2019-9740.patch         | 216 ------------------
 .../python/bpo-35907-cve-2019-9948-fix.patch  |  55 -----
 .../python/bpo-35907-cve-2019-9948.patch      |  55 -----
 .../python/bpo-36216-cve-2019-9636-fix.patch  |  28 ---
 .../python/bpo-36216-cve-2019-9636.patch      | 111 ---------
 .../python/bpo-36742-cve-2019-10160.patch     |  81 -------
 .../python/python/builddir.patch              |   6 +-
 .../{python_2.7.16.bb => python_2.7.17.bb}    |   3 -
 14 files changed, 12 insertions(+), 882 deletions(-)
 rename meta/recipes-devtools/python/{python-native_2.7.16.bb => python-native_2.7.17.bb} (100%)
 delete mode 100644 meta/recipes-devtools/python/python/0001-2.7-bpo-34155-Dont-parse-domains-containing-GH-13079.patch
 delete mode 100644 meta/recipes-devtools/python/python/0001-2.7-bpo-38243-Escape-the-server-title-of-DocXMLRPCSe.patch
 delete mode 100644 meta/recipes-devtools/python/python/CVE-2018-20852.patch
 delete mode 100644 meta/recipes-devtools/python/python/CVE-2019-9740.patch
 delete mode 100644 meta/recipes-devtools/python/python/bpo-35907-cve-2019-9948-fix.patch
 delete mode 100644 meta/recipes-devtools/python/python/bpo-35907-cve-2019-9948.patch
 delete mode 100644 meta/recipes-devtools/python/python/bpo-36216-cve-2019-9636-fix.patch
 delete mode 100644 meta/recipes-devtools/python/python/bpo-36216-cve-2019-9636.patch
 delete mode 100644 meta/recipes-devtools/python/python/bpo-36742-cve-2019-10160.patch
 rename meta/recipes-devtools/python/{python_2.7.16.bb => python_2.7.17.bb} (97%)
meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch +7 -8
index 989818927d..1277eab4c0 100644
@@ -25,15 +25,14 @@ diff --git a/setup.py b/setup.py
 index 7bf13ed..6c0f29b 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -40,7 +40,7 @@ def add_dir_to_list(dirlist, dir):
-     1) 'dir' is not already in 'dirlist'
-     2) 'dir' actually exists, and is a directory."""
-     if dir is not None and os.path.isdir(dir) and dir not in dirlist:
--        dirlist.insert(0, dir)
-+        dirlist.append(dir)
+@@ -40,5 +40,5 @@ def add_dir_to_list(dirlist, dir):
+             dir_exists = os.path.isdir(dir)
+         if dir_exists:
+-            dirlist.insert(0, dir)
++            dirlist.append(dir)
+ 
+ MACOS_SDK_ROOT = None
 
- def macosx_sdk_root():
-     """
 -- 
 2.18.0
 
meta/recipes-devtools/python/python-native_2.7.17.bb renamed from meta/recipes-devtools/python/python-native_2.7.16.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/python/python-native_2.7.16.bb
rename to meta/recipes-devtools/python/python-native_2.7.17.bb
meta/recipes-devtools/python/python.inc +2 -8
index 1462b779e9..a630c26e89 100644
@@ -8,16 +8,10 @@ INC_PR = "r1"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e466242989bd33c1bd2b6a526a742498"
 
 SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
-           file://bpo-35907-cve-2019-9948.patch \
-           file://bpo-35907-cve-2019-9948-fix.patch \
-           file://bpo-36216-cve-2019-9636.patch \
-           file://bpo-36216-cve-2019-9636-fix.patch \
-           file://CVE-2019-9740.patch \
-           file://CVE-2018-20852.patch \
            "
 
-SRC_URI[md5sum] = "30157d85a2c0479c09ea2cbe61f2aaf5"
-SRC_URI[sha256sum] = "f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7"
+SRC_URI[md5sum] = "b3b6d2c92f42a60667814358ab9f0cfd"
+SRC_URI[sha256sum] = "4d43f033cdbd0aa7b7023c81b0e986fd11e653b5248dac9144d508f11812ba41"
 
 # python recipe is actually python 2.x
 # also, exclude pre-releases for both python 2.x and 3.x
meta/recipes-devtools/python/python/0001-2.7-bpo-34155-Dont-parse-domains-containing-GH-13079.patch deleted +0 -90

90 lines not on this page · raw message

meta/recipes-devtools/python/python/0001-2.7-bpo-38243-Escape-the-server-title-of-DocXMLRPCSe.patch deleted +0 -101

101 lines not on this page · raw message

meta/recipes-devtools/python/python/CVE-2018-20852.patch deleted +0 -123

123 lines not on this page · raw message

meta/recipes-devtools/python/python/CVE-2019-9740.patch deleted +0 -216

216 lines not on this page · raw message

meta/recipes-devtools/python/python/bpo-35907-cve-2019-9948-fix.patch deleted +0 -55

55 lines not on this page · raw message

meta/recipes-devtools/python/python/bpo-35907-cve-2019-9948.patch deleted +0 -55

55 lines not on this page · raw message

meta/recipes-devtools/python/python/bpo-36216-cve-2019-9636-fix.patch deleted +0 -28
deleted file mode 100644
index 2ce4d2cde7..0000000000
@@ -1,28 +0,0 @@
-From 06b5ee585d6e76bdbb4002f642d864d860cbbd2b Mon Sep 17 00:00:00 2001
-From: Steve Dower <[email protected]>
-Date: Tue, 12 Mar 2019 08:23:33 -0700
-Subject: [PATCH] bpo-36216: Only print test messages when verbose
-
-CVE: CVE-2019-9636
- 
-Upstream-Status: Backport https://github.com/python/cpython/pull/12291/commits/06b5ee585d6e76bdbb4002f642d864d860cbbd2b
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- Lib/test/test_urlparse.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
-index 73b0228ea8e3..1830d0b28688 100644
---- a/Lib/test/test_urlparse.py
-+++ b/Lib/test/test_urlparse.py
-@@ -644,7 +644,8 @@ def test_urlsplit_normalization(self):
-         for scheme in [u"http", u"https", u"ftp"]:
-             for c in denorm_chars:
-                 url = u"{}://netloc{}false.netloc/path".format(scheme, c)
--                print "Checking %r" % url
-+                if test_support.verbose:
-+                    print "Checking %r" % url
-                 with self.assertRaises(ValueError):
-                     urlparse.urlsplit(url)
- 
meta/recipes-devtools/python/python/bpo-36216-cve-2019-9636.patch deleted +0 -111

111 lines not on this page · raw message

meta/recipes-devtools/python/python/bpo-36742-cve-2019-10160.patch deleted +0 -81

81 lines not on this page · raw message

meta/recipes-devtools/python/python/builddir.patch +3 -3
index ad629a022e..950a634064 100644
@@ -35,9 +35,9 @@ Index: Python-2.7.9/Lib/distutils/sysconfig.py
 --- Python-2.7.9.orig/Lib/distutils/sysconfig.py
 +++ Python-2.7.9/Lib/distutils/sysconfig.py
 @@ -26,6 +26,9 @@ EXEC_PREFIX = os.path.normpath(sys.exec_
- # live in project/PCBuild9.  If we're dealing with an x64 Windows build,
- # it'll live in project/PCbuild/amd64.
- project_base = os.path.dirname(os.path.abspath(sys.executable))
+     # sys.executable can be empty if argv[0] has been changed and Python is
+     # unable to retrieve the real program name
+     project_base = os.getcwd()
 +_PYTHONBUILDDIR = os.environ.get("PYTHONBUILDDIR", None)
 +if _PYTHONBUILDDIR:
 +    project_base = _PYTHONBUILDDIR
meta/recipes-devtools/python/python_2.7.17.bb renamed from meta/recipes-devtools/python/python_2.7.16.bb +0 -3
similarity index 97%
rename from meta/recipes-devtools/python/python_2.7.16.bb
rename to meta/recipes-devtools/python/python_2.7.17.bb
index 625c5312a6..5b856a5097 100644
@@ -30,9 +30,6 @@ SRC_URI += " \
            file://support_SOURCE_DATE_EPOCH_in_py_compile_2.7.patch \
            file://float-endian.patch \
            file://0001-python2-use-cc_basename-to-replace-CC-for-checking-c.patch \
-           file://0001-2.7-bpo-34155-Dont-parse-domains-containing-GH-13079.patch \
-           file://bpo-36742-cve-2019-10160.patch \
-           file://0001-2.7-bpo-38243-Escape-the-server-title-of-DocXMLRPCSe.patch \
 "
 
 S = "${WORKDIR}/Python-${PV}"
Signature · 1 line
2.17.1
#1 lore raw

ping

Whatever layer will ship Python2 in Yocto 3.1 will want this, and it is also desirable for stable branches for getting security fixes.

Thanks
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed