diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2020-07-20 05:48:57 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2020-07-20 17:30:14 +0800 |
| commit | 1a3cef77d465ea1a53e5c80f869908f359e98c5e (patch) | |
| tree | 9e9aec35d2de295d6a28d1d3dde087be5a84841e /lang/python/python3/patches-pip | |
| parent | 567c620bdc7d94039b623bd73edb3b4ab99c34f3 (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-pip')
| -rw-r--r-- | lang/python/python3/patches-pip/001-pep517-pyc-fix.patch | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/lang/python/python3/patches-pip/001-pep517-pyc-fix.patch b/lang/python/python3/patches-pip/001-pep517-pyc-fix.patch index c284f0111..b07cdd19e 100644 --- a/lang/python/python3/patches-pip/001-pep517-pyc-fix.patch +++ b/lang/python/python3/patches-pip/001-pep517-pyc-fix.patch @@ -1,13 +1,22 @@ diff -Nurp a/pip/_vendor/pep517/wrappers.py b/pip/_vendor/pep517/wrappers.py ---- a/pip/_vendor/pep517/wrappers.py 2019-07-30 20:02:13.000000000 +0800 -+++ b/pip/_vendor/pep517/wrappers.py 2020-04-24 17:23:35.764905235 +0800 -@@ -10,6 +10,9 @@ from . import compat +--- a/pip/_vendor/pep517/wrappers.py 2020-05-19 10:39:38.000000000 +0800 ++++ b/pip/_vendor/pep517/wrappers.py 2020-06-30 20:19:05.495033208 +0800 +@@ -14,11 +14,16 @@ try: + import importlib.resources as resources - _in_proc_script = pjoin(dirname(abspath(__file__)), '_in_process.py') + def _in_proc_script_path(): +- return resources.path(__package__, '_in_process.py') ++ if resources.is_resource(__package__, '_in_process.py'): ++ return resources.path(__package__, '_in_process.py') ++ return resources.path(__package__, '_in_process.pyc') + except ImportError: + @contextmanager + def _in_proc_script_path(): +- yield pjoin(dirname(abspath(__file__)), '_in_process.py') ++ _in_proc_script = pjoin(dirname(abspath(__file__)), '_in_process.py') ++ if not os.path.isfile(_in_proc_script): ++ _in_proc_script = pjoin(dirname(abspath(__file__)), '_in_process.pyc') ++ yield _in_proc_script -+if not os.path.isfile(_in_proc_script): -+ _in_proc_script = pjoin(dirname(abspath(__file__)), '_in_process.pyc') -+ @contextmanager - def tempdir(): |