diff options
author | Trevor Gamblin <trevor.gamblin@windriver.com> | 2021-06-22 14:40:59 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-27 08:38:34 +0100 |
commit | cf285f96825a1b21a1c04f3c98ab21604b590e60 (patch) | |
tree | 3824601604abfb26f2bb78de9a10428077cea95a | |
parent | e1cb57a498806953f14c82c3b2435040f99ca126 (diff) | |
download | poky-cf285f96825a1b21a1c04f3c98ab21604b590e60.tar.gz |
python3-pip: upgrade 20.0.2 -> 21.1.2
21.1.2 contains a fix for CVE-2021-3572
(https://github.com/pypa/pip/commit/e46bdda9711392fec0c45c1175bae6db847cb30b)
The LICENSE.txt signature changed due to an update to the copyright
dates, but the terms are the same.
Also update 0001-change-shebang-to-python3.patch to cover all files in
pip's src directory, since we need to ensure compatibility.
Finally, fix the ordering of the "inherit" and "SRC_URI" lines so that
devtool will correctly identify that there is a new version upstream.
(From OE-Core rev: 2135167ca86ff9d112ef3e71f5320c775d075b6c)
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch | 128 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-pip_21.1.2.bb (renamed from meta/recipes-devtools/python/python3-pip_20.0.2.bb) | 10 |
2 files changed, 103 insertions, 35 deletions
diff --git a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch index 00cffe169b..0187001168 100644 --- a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch +++ b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch | |||
@@ -1,32 +1,30 @@ | |||
1 | From e7a00e9b5104ae2fbcea32a35c85760b77fae7e5 Mon Sep 17 00:00:00 2001 | 1 | From baa85a4dab2e8d64eb25d1181b6420db25ce919a Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Trevor Gamblin <trevor.gamblin@windriver.com> |
3 | Date: Thu, 23 Apr 2020 09:42:10 +0000 | 3 | Date: Tue, 22 Jun 2021 12:31:46 -0400 |
4 | Subject: [PATCH] change shebang to python3 | 4 | Subject: [PATCH] change shebang to python3 |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Inappropriate (OE-specific) |
7 | 7 | ||
8 | pip will drop support of python2 from 21.0 | 8 | Despite no longer supporting python2, some files in the pip source refer |
9 | to "python" instead of "python3", so patch them as needed to ensure that | ||
10 | they correctly reference the python3 binary. | ||
9 | 11 | ||
10 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 12 | Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> |
11 | --- | 13 | --- |
12 | src/pip/_internal/__init__.py | 2 +- | 14 | src/pip/_vendor/appdirs.py | 2 +- |
13 | src/pip/_vendor/appdirs.py | 2 +- | 15 | src/pip/_vendor/chardet/langbulgarianmodel.py | 2 +- |
14 | src/pip/_vendor/chardet/cli/chardetect.py | 2 +- | 16 | src/pip/_vendor/chardet/langgreekmodel.py | 2 +- |
15 | src/pip/_vendor/requests/certs.py | 2 +- | 17 | src/pip/_vendor/chardet/langhebrewmodel.py | 2 +- |
16 | 4 files changed, 4 insertions(+), 4 deletions(-) | 18 | src/pip/_vendor/chardet/langhungarianmodel.py | 2 +- |
19 | src/pip/_vendor/chardet/langrussianmodel.py | 2 +- | ||
20 | src/pip/_vendor/chardet/langthaimodel.py | 2 +- | ||
21 | src/pip/_vendor/chardet/langturkishmodel.py | 2 +- | ||
22 | src/pip/_vendor/chardet/metadata/languages.py | 2 +- | ||
23 | src/pip/_vendor/requests/certs.py | 2 +- | ||
24 | 10 files changed, 10 insertions(+), 10 deletions(-) | ||
17 | 25 | ||
18 | diff --git a/src/pip/_internal/__init__.py b/src/pip/_internal/__init__.py | ||
19 | index 3aa8a46..e1ad179 100755 | ||
20 | --- a/src/pip/_internal/__init__.py | ||
21 | +++ b/src/pip/_internal/__init__.py | ||
22 | @@ -1,4 +1,4 @@ | ||
23 | -#!/usr/bin/env python | ||
24 | +#!/usr/bin/env python3 | ||
25 | import pip._internal.utils.inject_securetransport # noqa | ||
26 | from pip._internal.utils.typing import MYPY_CHECK_RUNNING | ||
27 | |||
28 | diff --git a/src/pip/_vendor/appdirs.py b/src/pip/_vendor/appdirs.py | 26 | diff --git a/src/pip/_vendor/appdirs.py b/src/pip/_vendor/appdirs.py |
29 | index 3a52b75..ad3f81d 100644 | 27 | index 33a3b7741..60b9ef5f7 100644 |
30 | --- a/src/pip/_vendor/appdirs.py | 28 | --- a/src/pip/_vendor/appdirs.py |
31 | +++ b/src/pip/_vendor/appdirs.py | 29 | +++ b/src/pip/_vendor/appdirs.py |
32 | @@ -1,4 +1,4 @@ | 30 | @@ -1,4 +1,4 @@ |
@@ -35,18 +33,88 @@ index 3a52b75..ad3f81d 100644 | |||
35 | # -*- coding: utf-8 -*- | 33 | # -*- coding: utf-8 -*- |
36 | # Copyright (c) 2005-2010 ActiveState Software Inc. | 34 | # Copyright (c) 2005-2010 ActiveState Software Inc. |
37 | # Copyright (c) 2013 Eddy Petrișor | 35 | # Copyright (c) 2013 Eddy Petrișor |
38 | diff --git a/src/pip/_vendor/chardet/cli/chardetect.py b/src/pip/_vendor/chardet/cli/chardetect.py | 36 | diff --git a/src/pip/_vendor/chardet/langbulgarianmodel.py b/src/pip/_vendor/chardet/langbulgarianmodel.py |
39 | index c61136b..a497e98 100644 | 37 | index e963a5097..97ea6cea8 100644 |
40 | --- a/src/pip/_vendor/chardet/cli/chardetect.py | 38 | --- a/src/pip/_vendor/chardet/langbulgarianmodel.py |
41 | +++ b/src/pip/_vendor/chardet/cli/chardetect.py | 39 | +++ b/src/pip/_vendor/chardet/langbulgarianmodel.py |
40 | @@ -1,4 +1,4 @@ | ||
41 | -#!/usr/bin/env python | ||
42 | +#!/usr/bin/env python3 | ||
43 | # -*- coding: utf-8 -*- | ||
44 | |||
45 | from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel | ||
46 | diff --git a/src/pip/_vendor/chardet/langgreekmodel.py b/src/pip/_vendor/chardet/langgreekmodel.py | ||
47 | index d99528ede..4a127ea83 100644 | ||
48 | --- a/src/pip/_vendor/chardet/langgreekmodel.py | ||
49 | +++ b/src/pip/_vendor/chardet/langgreekmodel.py | ||
50 | @@ -1,4 +1,4 @@ | ||
51 | -#!/usr/bin/env python | ||
52 | +#!/usr/bin/env python3 | ||
53 | # -*- coding: utf-8 -*- | ||
54 | |||
55 | from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel | ||
56 | diff --git a/src/pip/_vendor/chardet/langhebrewmodel.py b/src/pip/_vendor/chardet/langhebrewmodel.py | ||
57 | index 484c652a4..676c1a711 100644 | ||
58 | --- a/src/pip/_vendor/chardet/langhebrewmodel.py | ||
59 | +++ b/src/pip/_vendor/chardet/langhebrewmodel.py | ||
60 | @@ -1,4 +1,4 @@ | ||
61 | -#!/usr/bin/env python | ||
62 | +#!/usr/bin/env python3 | ||
63 | # -*- coding: utf-8 -*- | ||
64 | |||
65 | from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel | ||
66 | diff --git a/src/pip/_vendor/chardet/langhungarianmodel.py b/src/pip/_vendor/chardet/langhungarianmodel.py | ||
67 | index bbc5cda64..042eae70a 100644 | ||
68 | --- a/src/pip/_vendor/chardet/langhungarianmodel.py | ||
69 | +++ b/src/pip/_vendor/chardet/langhungarianmodel.py | ||
70 | @@ -1,4 +1,4 @@ | ||
71 | -#!/usr/bin/env python | ||
72 | +#!/usr/bin/env python3 | ||
73 | # -*- coding: utf-8 -*- | ||
74 | |||
75 | from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel | ||
76 | diff --git a/src/pip/_vendor/chardet/langrussianmodel.py b/src/pip/_vendor/chardet/langrussianmodel.py | ||
77 | index 5594452b5..564b02e58 100644 | ||
78 | --- a/src/pip/_vendor/chardet/langrussianmodel.py | ||
79 | +++ b/src/pip/_vendor/chardet/langrussianmodel.py | ||
80 | @@ -1,4 +1,4 @@ | ||
81 | -#!/usr/bin/env python | ||
82 | +#!/usr/bin/env python3 | ||
83 | # -*- coding: utf-8 -*- | ||
84 | |||
85 | from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel | ||
86 | diff --git a/src/pip/_vendor/chardet/langthaimodel.py b/src/pip/_vendor/chardet/langthaimodel.py | ||
87 | index 9a37db573..c97487959 100644 | ||
88 | --- a/src/pip/_vendor/chardet/langthaimodel.py | ||
89 | +++ b/src/pip/_vendor/chardet/langthaimodel.py | ||
90 | @@ -1,4 +1,4 @@ | ||
91 | -#!/usr/bin/env python | ||
92 | +#!/usr/bin/env python3 | ||
93 | # -*- coding: utf-8 -*- | ||
94 | |||
95 | from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel | ||
96 | diff --git a/src/pip/_vendor/chardet/langturkishmodel.py b/src/pip/_vendor/chardet/langturkishmodel.py | ||
97 | index 43f4230ae..7e710c371 100644 | ||
98 | --- a/src/pip/_vendor/chardet/langturkishmodel.py | ||
99 | +++ b/src/pip/_vendor/chardet/langturkishmodel.py | ||
100 | @@ -1,4 +1,4 @@ | ||
101 | -#!/usr/bin/env python | ||
102 | +#!/usr/bin/env python3 | ||
103 | # -*- coding: utf-8 -*- | ||
104 | |||
105 | from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel | ||
106 | diff --git a/src/pip/_vendor/chardet/metadata/languages.py b/src/pip/_vendor/chardet/metadata/languages.py | ||
107 | index 3237d5abf..aa2ec7c35 100644 | ||
108 | --- a/src/pip/_vendor/chardet/metadata/languages.py | ||
109 | +++ b/src/pip/_vendor/chardet/metadata/languages.py | ||
42 | @@ -1,4 +1,4 @@ | 110 | @@ -1,4 +1,4 @@ |
43 | -#!/usr/bin/env python | 111 | -#!/usr/bin/env python |
44 | +#!/usr/bin/env python3 | 112 | +#!/usr/bin/env python3 |
113 | # -*- coding: utf-8 -*- | ||
45 | """ | 114 | """ |
46 | Script which takes one or more file paths and reports on their detected | 115 | Metadata about languages used by our model training code for our |
47 | encodings | ||
48 | diff --git a/src/pip/_vendor/requests/certs.py b/src/pip/_vendor/requests/certs.py | 116 | diff --git a/src/pip/_vendor/requests/certs.py b/src/pip/_vendor/requests/certs.py |
49 | index 06a594e..bfa7839 100644 | 117 | index 06a594e58..bfa7839a4 100644 |
50 | --- a/src/pip/_vendor/requests/certs.py | 118 | --- a/src/pip/_vendor/requests/certs.py |
51 | +++ b/src/pip/_vendor/requests/certs.py | 119 | +++ b/src/pip/_vendor/requests/certs.py |
52 | @@ -1,4 +1,4 @@ | 120 | @@ -1,4 +1,4 @@ |
@@ -56,5 +124,5 @@ index 06a594e..bfa7839 100644 | |||
56 | 124 | ||
57 | """ | 125 | """ |
58 | -- | 126 | -- |
59 | 2.24.1 | 127 | 2.31.1 |
60 | 128 | ||
diff --git a/meta/recipes-devtools/python/python3-pip_20.0.2.bb b/meta/recipes-devtools/python/python3-pip_21.1.2.bb index 99eeea2edf..7367dfdc21 100644 --- a/meta/recipes-devtools/python/python3-pip_20.0.2.bb +++ b/meta/recipes-devtools/python/python3-pip_21.1.2.bb | |||
@@ -2,16 +2,16 @@ SUMMARY = "The PyPA recommended tool for installing Python packages" | |||
2 | HOMEPAGE = "https://pypi.org/project/pip" | 2 | HOMEPAGE = "https://pypi.org/project/pip" |
3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c4fa2b50f55649f43060fa04b0919b9b" |
6 | 6 | ||
7 | DEPENDS += "python3 python3-setuptools-native" | 7 | DEPENDS += "python3 python3-setuptools-native" |
8 | 8 | ||
9 | SRC_URI += "file://0001-change-shebang-to-python3.patch" | 9 | inherit pypi distutils3 |
10 | 10 | ||
11 | SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" | 11 | SRC_URI += "file://0001-change-shebang-to-python3.patch" |
12 | SRC_URI[sha256sum] = "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" | ||
13 | 12 | ||
14 | inherit pypi distutils3 | 13 | SRC_URI[md5sum] = "a867fd51eacfd5293f5b7e0c2e7867a7" |
14 | SRC_URI[sha256sum] = "eb5df6b9ab0af50fe1098a52fd439b04730b6e066887ff7497357b9ebd19f79b" | ||
15 | 15 | ||
16 | do_install_append() { | 16 | do_install_append() { |
17 | # Install as pip3 and leave pip2 as default | 17 | # Install as pip3 and leave pip2 as default |