mirror of
https://github.com/openwrt/packages.git
synced 2025-12-20 17:41:20 +00:00
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>
This commit is contained in:
@@ -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():
|
||||
|
||||
Reference in New Issue
Block a user