aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-10-29 10:47:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-30 13:47:05 +0000
commite73d5bb4a21497ed645e2a0a4b88c2eeaf65080a (patch)
tree99d94c388a5e52d8a2244d09699fc2b7a46cc3c7
parentfe2d5b0d56201110323911d206243fdcc7f80115 (diff)
downloadopenembedded-core-contrib-e73d5bb4a21497ed645e2a0a4b88c2eeaf65080a.tar.gz
openembedded-core-contrib-e73d5bb4a21497ed645e2a0a4b88c2eeaf65080a.tar.bz2
openembedded-core-contrib-e73d5bb4a21497ed645e2a0a4b88c2eeaf65080a.zip
python: include CVE patches for python-native as well
Also avoids maintaining a different set of patches for both. 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>
-rw-r--r--meta/recipes-devtools/python/python.inc5
-rw-r--r--meta/recipes-devtools/python/python_2.7.16.bb5
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 779df535215..8d0e90862c8 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -8,6 +8,11 @@ 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 \
"
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 c6160ae0e8c..a02a628cdec 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 += " \
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://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 \
"
S = "${WORKDIR}/Python-${PV}"