diff options
author | Derek Straka <derek@asterius.io> | 2018-01-26 14:25:31 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-13 10:55:38 +0100 |
commit | 5a353c4210536df8f075281f03862a6ddcb729ef (patch) | |
tree | 745d5ae51aec5025f9adc9316998c4e03ab876f3 /meta/recipes-devtools/python/python/Don-t-use-getentropy-on-Linux.patch | |
parent | a47d077ff45e7e4144d8d3dd937787bb4abb071f (diff) | |
download | poky-5a353c4210536df8f075281f03862a6ddcb729ef.tar.gz |
python: Upgrade both python and python-native to 2.7.14
Rebased:
- python/01-use-proper-tools-for-cross-build.patch
- python/fix-makefile-for-ptest.patch
- python/parallel-makeinst-create-bindir.patch
Removed Upstreamed Patch:
- python/Don-t-use-getentropy-on-Linux.patch
Updated license checksum for changes in the copyright date. The license
terms remain unchanged
Added an extra do_compile item to create the native pgen that no longer
gets compiled by default
(From OE-Core rev: 9f2de4f9cf1eb6de75dc789bd0549f45c7a68c55)
(From OE-Core rev: 00bdc9752e76fb66bb7eb8d6c3249aa031f14fdb)
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[Bug fix release only]
CVE-2017-9233
CVE-2016-0718
CVE-2012-0876
CVE-2016-4472
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python/Don-t-use-getentropy-on-Linux.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/Don-t-use-getentropy-on-Linux.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-devtools/python/python/Don-t-use-getentropy-on-Linux.patch b/meta/recipes-devtools/python/python/Don-t-use-getentropy-on-Linux.patch deleted file mode 100644 index 38e53778dc..0000000000 --- a/meta/recipes-devtools/python/python/Don-t-use-getentropy-on-Linux.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | ||
4 | |||
5 | From 905d1b30ac7cb0e31c57cec0533825c8f170b942 Mon Sep 17 00:00:00 2001 | ||
6 | From: Victor Stinner <victor.stinner@gmail.com> | ||
7 | Date: Mon, 9 Jan 2017 11:10:41 +0100 | ||
8 | Subject: [PATCH] Don't use getentropy() on Linux | ||
9 | |||
10 | Issue #29188: Support glibc 2.24 on Linux: don't use getentropy() function but | ||
11 | read from /dev/urandom to get random bytes, for example in os.urandom(). On | ||
12 | Linux, getentropy() is implemented which getrandom() is blocking mode, whereas | ||
13 | os.urandom() should not block. | ||
14 | |||
15 | (cherry picked from commit 2687486756721e39164fa9f597e468c35d495227) | ||
16 | --- | ||
17 | Python/random.c | 11 +++++++++-- | ||
18 | 1 file changed, 9 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/Python/random.c b/Python/random.c | ||
21 | index b4bc1f3..f3f5d14 100644 | ||
22 | --- a/Python/random.c | ||
23 | +++ b/Python/random.c | ||
24 | @@ -94,8 +94,15 @@ win32_urandom(unsigned char *buffer, Py_ssize_t size, int raise) | ||
25 | } | ||
26 | |||
27 | /* Issue #25003: Don't use getentropy() on Solaris (available since | ||
28 | - * Solaris 11.3), it is blocking whereas os.urandom() should not block. */ | ||
29 | -#elif defined(HAVE_GETENTROPY) && !defined(sun) | ||
30 | + Solaris 11.3), it is blocking whereas os.urandom() should not block. | ||
31 | + | ||
32 | + Issue #29188: Don't use getentropy() on Linux since the glibc 2.24 | ||
33 | + implements it with the getrandom() syscall which can fail with ENOSYS, | ||
34 | + and this error is not supported in py_getentropy() and getrandom() is called | ||
35 | + with flags=0 which blocks until system urandom is initialized, which is not | ||
36 | + the desired behaviour to seed the Python hash secret nor for os.urandom(): | ||
37 | + see the PEP 524 which was only implemented in Python 3.6. */ | ||
38 | +#elif defined(HAVE_GETENTROPY) && !defined(sun) && !defined(linux) | ||
39 | #define PY_GETENTROPY 1 | ||
40 | |||
41 | /* Fill buffer with size pseudo-random bytes generated by getentropy(). | ||