diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2019-10-29 10:47:24 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-30 13:47:54 +0000 |
commit | 9cb405a3eb8c4f164775370851810e0159a9786f (patch) | |
tree | d3be14f85738ec2319c6c2feeafd02836faef29a /meta/recipes-devtools/python | |
parent | 2559517fafd6058ccf655eebc14e3c23003246a5 (diff) | |
download | poky-9cb405a3eb8c4f164775370851810e0159a9786f.tar.gz |
python: include CVE patches for python-native as well
Also avoids maintaining a different set of patches for both.
(From OE-Core rev: e73d5bb4a21497ed645e2a0a4b88c2eeaf65080a)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b3b1c00cc46b33ddbf7e008267032220e1e298af)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r-- | meta/recipes-devtools/python/python.inc | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python_2.7.16.bb | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc index 779df53521..8d0e90862c 100644 --- a/meta/recipes-devtools/python/python.inc +++ b/meta/recipes-devtools/python/python.inc | |||
@@ -8,6 +8,11 @@ INC_PR = "r1" | |||
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e466242989bd33c1bd2b6a526a742498" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e466242989bd33c1bd2b6a526a742498" |
9 | 9 | ||
10 | SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | 10 | SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ |
11 | file://bpo-35907-cve-2019-9948.patch \ | ||
12 | file://bpo-35907-cve-2019-9948-fix.patch \ | ||
13 | file://bpo-36216-cve-2019-9636.patch \ | ||
14 | file://bpo-36216-cve-2019-9636-fix.patch \ | ||
15 | file://CVE-2019-9740.patch \ | ||
11 | " | 16 | " |
12 | 17 | ||
13 | SRC_URI[md5sum] = "30157d85a2c0479c09ea2cbe61f2aaf5" | 18 | SRC_URI[md5sum] = "30157d85a2c0479c09ea2cbe61f2aaf5" |
diff --git a/meta/recipes-devtools/python/python_2.7.16.bb b/meta/recipes-devtools/python/python_2.7.16.bb index c6160ae0e8..a02a628cde 100644 --- a/meta/recipes-devtools/python/python_2.7.16.bb +++ b/meta/recipes-devtools/python/python_2.7.16.bb | |||
@@ -30,11 +30,6 @@ SRC_URI += " \ | |||
30 | file://support_SOURCE_DATE_EPOCH_in_py_compile_2.7.patch \ | 30 | file://support_SOURCE_DATE_EPOCH_in_py_compile_2.7.patch \ |
31 | file://float-endian.patch \ | 31 | file://float-endian.patch \ |
32 | file://0001-python2-use-cc_basename-to-replace-CC-for-checking-c.patch \ | 32 | file://0001-python2-use-cc_basename-to-replace-CC-for-checking-c.patch \ |
33 | file://bpo-35907-cve-2019-9948.patch \ | ||
34 | file://bpo-35907-cve-2019-9948-fix.patch \ | ||
35 | file://bpo-36216-cve-2019-9636.patch \ | ||
36 | file://bpo-36216-cve-2019-9636-fix.patch \ | ||
37 | file://CVE-2019-9740.patch \ | ||
38 | " | 33 | " |
39 | 34 | ||
40 | S = "${WORKDIR}/Python-${PV}" | 35 | S = "${WORKDIR}/Python-${PV}" |