-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update python36 to version 3.6.12 / rev 4 via SR 852415
https://build.opensuse.org/request/show/852415 by user mcepl + dimstar_suse - Add CVE-2020-27619-no-eval-http-content.patch fixing CVE-2020-27619 (bsc#1178009), where Lib/test/multibytecodec_support calls eval() on content retrieved via HTTP. - Add patch sphnix-update-removed-function.patch to no longer call a now removed function (gh#python/cpython#13236). As a consequence, no longer pin Sphinx version. - Pin Sphinx version to fix doc subpackage - Change setuptools and pip version numbers according to new wheels - Add ignore_pip_deprec_warn.patch to switch of persistently failing test. - Replace bundled wheels for pip and setuptools with the updated ones (bsc#1176262 CVE-2019-20916). - Handful of changes to make python36 compatible with SLE15 and SLE12 (jsc#ECO-2799, jsc#SLE-13738) - Rebase bpo23395-PyErr_SetInterrupt-signal.patch - Fix build with RP
- Loading branch information
1 parent
4086a13
commit c38825c
Showing
6 changed files
with
840 additions
and
3 deletions.
There are no files selected for viewing
Binary file not shown.
Large diffs are not rendered by default.
Oops, something went wrong.
58 changes: 58 additions & 0 deletions
58
packages/p/python36/CVE-2020-27619-no-eval-http-content.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| From 7577b2d21ed82ad3aa5f60b7f1258760de0b2ad8 Mon Sep 17 00:00:00 2001 | ||
| From: Serhiy Storchaka <storchaka@gmail.com> | ||
| Date: Tue, 6 Oct 2020 15:14:51 +0300 | ||
| Subject: [PATCH] bpo-41944: No longer call eval() on content received via HTTP | ||
| in the CJK codec tests (GH-22566) (cherry picked from commit | ||
| 2ef5caa58febc8968e670e39e3d37cf8eef3cab8) | ||
|
|
||
| Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> | ||
| --- | ||
| Lib/test/multibytecodec_support.py | 22 +++++++------------ | ||
| .../2020-10-05-17-43-46.bpo-41944.rf1dYb.rst | 1 + | ||
| 2 files changed, 9 insertions(+), 14 deletions(-) | ||
| create mode 100644 Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst | ||
|
|
||
| --- a/Lib/test/multibytecodec_support.py | ||
| +++ b/Lib/test/multibytecodec_support.py | ||
| @@ -300,29 +300,23 @@ class TestBase_Mapping(unittest.TestCase | ||
| self._test_mapping_file_plain() | ||
|
|
||
| def _test_mapping_file_plain(self): | ||
| - unichrs = lambda s: ''.join(map(chr, map(eval, s.split('+')))) | ||
| + def unichrs(s): | ||
| + return ''.join(chr(int(x, 16)) for x in s.split('+')) | ||
| + | ||
| urt_wa = {} | ||
|
|
||
| with self.open_mapping_file() as f: | ||
| for line in f: | ||
| if not line: | ||
| break | ||
| - data = line.split('#')[0].strip().split() | ||
| + data = line.split('#')[0].split() | ||
| if len(data) != 2: | ||
| continue | ||
|
|
||
| - csetval = eval(data[0]) | ||
| - if csetval <= 0x7F: | ||
| - csetch = bytes([csetval & 0xff]) | ||
| - elif csetval >= 0x1000000: | ||
| - csetch = bytes([(csetval >> 24), ((csetval >> 16) & 0xff), | ||
| - ((csetval >> 8) & 0xff), (csetval & 0xff)]) | ||
| - elif csetval >= 0x10000: | ||
| - csetch = bytes([(csetval >> 16), ((csetval >> 8) & 0xff), | ||
| - (csetval & 0xff)]) | ||
| - elif csetval >= 0x100: | ||
| - csetch = bytes([(csetval >> 8), (csetval & 0xff)]) | ||
| - else: | ||
| + if data[0][:2] != '0x': | ||
| + self.fail(f"Invalid line: {line!r}") | ||
| + csetch = bytes.fromhex(data[0][2:]) | ||
| + if len(csetch) == 1 and 0x80 <= csetch[0]: | ||
| continue | ||
|
|
||
| unich = unichrs(data[1]) | ||
| --- /dev/null | ||
| +++ b/Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst | ||
| @@ -0,0 +1 @@ | ||
| +Tests for CJK codecs no longer call ``eval()`` on content received via HTTP. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| From 960bb883769e5c64a63b014590d75654db87ffb0 Mon Sep 17 00:00:00 2001 | ||
| From: Pablo Galindo <Pablogsal@gmail.com> | ||
| Date: Fri, 10 May 2019 22:58:17 +0100 | ||
| Subject: [PATCH] Fix sphinx deprecation warning about env.note_versionchange() | ||
| (GH-13236) | ||
|
|
||
| --- | ||
| Doc/tools/extensions/pyspecific.py | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| Index: Python-3.6.12/Doc/tools/extensions/pyspecific.py | ||
| =================================================================== | ||
| --- Python-3.6.12.orig/Doc/tools/extensions/pyspecific.py | ||
| +++ Python-3.6.12/Doc/tools/extensions/pyspecific.py | ||
| @@ -231,7 +231,7 @@ class DeprecatedRemoved(Directive): | ||
| translatable=False) | ||
| node.append(para) | ||
| env = self.state.document.settings.env | ||
| - env.note_versionchange('deprecated', version[0], node, self.lineno) | ||
| + env.get_domain('changeset').note_changeset(node) | ||
| return [node] + messages | ||
|
|
||
|
|