import python2-2.7.18-6.module+el8.5.0+11014+88fc0d0b

SOURCES/00355-CVE-2020-27619.patch

@@ -0,0 +1,42 @@
+diff --git a/Lib/test/multibytecodec_support.py b/Lib/test/multibytecodec_support.py
+index 5b2329b6d84..53b5d64d453 100644
+--- a/Lib/test/multibytecodec_support.py
++++ b/Lib/test/multibytecodec_support.py
+@@ -279,30 +279,22 @@ class TestBase_Mapping(unittest.TestCase):
+             self._test_mapping_file_plain()
+ 
+     def _test_mapping_file_plain(self):
+-        _unichr = lambda c: eval("u'\\U%08x'" % int(c, 16))
+-        unichrs = lambda s: u''.join(_unichr(c) for c in s.split('+'))
++        def unichrs(s):
++            return ''.join(unichr(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 = chr(csetval & 0xff)
+-                elif csetval >= 0x1000000:
+-                    csetch = chr(csetval >> 24) + chr((csetval >> 16) & 0xff) + \
+-                             chr((csetval >> 8) & 0xff) + chr(csetval & 0xff)
+-                elif csetval >= 0x10000:
+-                    csetch = chr(csetval >> 16) + \
+-                             chr((csetval >> 8) & 0xff) + chr(csetval & 0xff)
+-                elif csetval >= 0x100:
+-                    csetch = chr(csetval >> 8) + chr(csetval & 0xff)
+-                else:
++                if data[0][:2] != '0x':
++                    self.fail("Invalid line: {!r}".format(line))
++                csetch = bytes.fromhex(data[0][2:])
++                if len(csetch) == 1 and 0x80 <= csetch[0]:
+                     continue
+ 
+                 unich = unichrs(data[1])

SPECS/python2.spec

@@ -104,7 +104,7 @@ Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 # Remember to also rebase python2-docs when changing this:
 Version: 2.7.18
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: Python
 Group: Development/Languages
 Requires: %{python}-libs%{?_isa} = %{version}-%{release}
@@ -710,6 +710,12 @@ Patch351: 00351-cve-2019-20907-fix-infinite-loop-in-tarfile.patch
 # - https://bugs.python.org/issue39603
 Patch354: 00354-cve-2020-26116-http-request-method-crlf-injection-in-httplib.patch
 
+# 00355 #
+# No longer call eval() on content received via HTTP in the CJK codec tests
+# Backported from the python3 branches upstream: https://bugs.python.org/issue41944
+# Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1889886
+Patch355: 00355-CVE-2020-27619.patch
+
 # 00357 #
 # Security fix for CVE-2021-3177
 # Stack-based buffer overflow in PyCArg_repr in _ctypes/callproc.c
@@ -1047,6 +1053,7 @@ rm Lib/ensurepip/_bundled/*.whl
 git apply %{PATCH351}
 
 %patch354 -p1
+%patch355 -p1
 %patch357 -p1
 %patch359 -p1
 
@@ -1987,6 +1994,10 @@ fi
 # ======================================================
 
 %changelog
+* Wed May 12 2021 Charalampos Stratakis <cstratak@redhat.com> - 2.7.18-6
+- Security fix for CVE-2020-27619: eval() call on content received via HTTP in the CJK codec tests
+Resolves: rhbz#1889886
+
 * Fri Apr 16 2021 Charalampos Stratakis <cstratak@redhat.com> - 2.7.18-5
 - Fix for CVE-2021-23336
 Resolves: rhbz#1928904