summaryrefslogtreecommitdiff
path: root/lang/python/python3/patches-setuptools/002-sorted-requires.patch
diff options
context:
space:
mode:
authorJeffery To <jeffery.to@gmail.com>2020-07-20 05:48:57 +0800
committerJeffery To <jeffery.to@gmail.com>2020-07-20 17:30:14 +0800
commit1a3cef77d465ea1a53e5c80f869908f359e98c5e (patch)
tree9e9aec35d2de295d6a28d1d3dde087be5a84841e /lang/python/python3/patches-setuptools/002-sorted-requires.patch
parent567c620bdc7d94039b623bd73edb3b4ab99c34f3 (diff)
python3: Update to 3.8.4, refresh/rework patches, backport patches
This version includes fixes for: * CVE-2020-14422: Hash collisions in IPv4Interface and IPv6Interface * CVE-2020-15523: Python uses invalid DLL path after calling Py_SetPath on Windows This version also includes support for OpenSSL 1.1.x builds that use 'no-deprecated' and '--api=1.1.0'[1], and so this removes the previous OpenSSL-related patches. This also backports fixes for security issues, including: * CVE-2019-20907: Infinite loop in the tarfile module This also updates the setuptools and pip packages to 47.1.0 and 20.1.1, respectively. [1]: https://github.com/python/cpython/pull/20566 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'lang/python/python3/patches-setuptools/002-sorted-requires.patch')
-rw-r--r--lang/python/python3/patches-setuptools/002-sorted-requires.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/python/python3/patches-setuptools/002-sorted-requires.patch b/lang/python/python3/patches-setuptools/002-sorted-requires.patch
index 2ad4795b3..9e48f523e 100644
--- a/lang/python/python3/patches-setuptools/002-sorted-requires.patch
+++ b/lang/python/python3/patches-setuptools/002-sorted-requires.patch
@@ -5,10 +5,10 @@ Index: b/setuptools/command/egg_info.py
===================================================================
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
-@@ -621,7 +621,7 @@ def warn_depends_obsolete(cmd, basename,
- def _write_requirements(stream, reqs):
- lines = yield_lines(reqs or ())
- append_cr = lambda line: line + '\n'
+@@ -641,7 +641,7 @@ def _write_requirements(stream, reqs):
+
+ def append_cr(line):
+ return line + '\n'
- lines = map(append_cr, lines)
+ lines = map(append_cr, sorted(lines))
stream.writelines(lines)