From e5f9ad64d465ceb91b7b9004d5a2fc3f89dcda1e Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 12 Feb 2020 11:19:44 +0300 Subject: [PATCH] delete not used patches --- CVE-2019-16056.patch | 107 --- CVE-2019-16935.patch | 71 -- Python-nis-requires-tirpc.patch | 14 - Python-select-requires-libm.patch | 11 - avoid_test_docxmlrpc_race.patch | 94 --- python-2.7.13-lib64.patch | 345 ---------- python3-3.4.0-add-rewheel-module.patch | 224 ------ ...d-build-with-libffi-multilib-wrapper.patch | 12 - ...le-parts-of-test_socket-in-rpm-build.patch | 11 - ...0-disable-test_fs_holes-in-rpm-build.patch | 11 - python3-3.4.0-disable-tests-in-test_io.patch | 11 - ....0-dont-duplicate-flags-in-sysconfig.patch | 30 - ...on3-3.4.0-dont-raise-from-py_compile.patch | 14 - python3-3.4.0-hashlib-fips.patch | 640 ------------------ python3-3.4.0-more-configuration-flags.patch | 50 -- python3-3.4.0-uid-gid-overflows.patch | 62 -- python3-3.4.2-distutils-init.patch | 47 -- ...istutils-tests-that-fail-in-rpmbuild.patch | 11 - ...3.5.0-add-rpmbuild-hooks-to-unittest.patch | 67 -- python3-3.5.0-make-libpl-respect-lib64.patch | 12 - python3-3.5.0-no-static-lib.patch | 59 -- ...3.5.2-fdr-lib64-fix-for-test_install.patch | 21 - python3-3.5.2-fix-test_gdb-noise.patch | 29 - python3-3.5.2-module-linkage.patch | 30 - python3-3.5.2-multilib.patch | 340 ---------- python3.spec | 2 +- 26 files changed, 1 insertion(+), 2324 deletions(-) delete mode 100644 CVE-2019-16056.patch delete mode 100644 CVE-2019-16935.patch delete mode 100644 Python-nis-requires-tirpc.patch delete mode 100644 Python-select-requires-libm.patch delete mode 100644 avoid_test_docxmlrpc_race.patch delete mode 100644 python-2.7.13-lib64.patch delete mode 100644 python3-3.4.0-add-rewheel-module.patch delete mode 100644 python3-3.4.0-ctypes-should-build-with-libffi-multilib-wrapper.patch delete mode 100644 python3-3.4.0-disable-parts-of-test_socket-in-rpm-build.patch delete mode 100644 python3-3.4.0-disable-test_fs_holes-in-rpm-build.patch delete mode 100644 python3-3.4.0-disable-tests-in-test_io.patch delete mode 100644 python3-3.4.0-dont-duplicate-flags-in-sysconfig.patch delete mode 100644 python3-3.4.0-dont-raise-from-py_compile.patch delete mode 100644 python3-3.4.0-hashlib-fips.patch delete mode 100644 python3-3.4.0-more-configuration-flags.patch delete mode 100644 python3-3.4.0-uid-gid-overflows.patch delete mode 100644 python3-3.4.2-distutils-init.patch delete mode 100644 python3-3.4.3-skip-distutils-tests-that-fail-in-rpmbuild.patch delete mode 100644 python3-3.5.0-add-rpmbuild-hooks-to-unittest.patch delete mode 100644 python3-3.5.0-make-libpl-respect-lib64.patch delete mode 100644 python3-3.5.0-no-static-lib.patch delete mode 100644 python3-3.5.2-fdr-lib64-fix-for-test_install.patch delete mode 100644 python3-3.5.2-fix-test_gdb-noise.patch delete mode 100644 python3-3.5.2-module-linkage.patch delete mode 100644 python3-3.5.2-multilib.patch diff --git a/CVE-2019-16056.patch b/CVE-2019-16056.patch deleted file mode 100644 index 284c75c..0000000 --- a/CVE-2019-16056.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 063eba280a11d3c9a5dd9ee5abe4de640907951b Mon Sep 17 00:00:00 2001 -From: Abhilash Raj -Date: Fri, 6 Sep 2019 22:24:05 -0700 -Subject: [PATCH] [3.5] bpo-34155: Dont parse domains containing @ (GH-13079) - (#15317) - -https://bugs.python.org/issue34155 -(cherry picked from commit 8cb65d1381b027f0b09ee36bfed7f35bb4dec9a9) - -Co-authored-by: jpic ---- - Lib/email/_header_value_parser.py | 2 ++ - Lib/email/_parseaddr.py | 11 ++++++++++- - Lib/test/test_email/test__header_value_parser.py | 10 ++++++++++ - Lib/test/test_email/test_email.py | 14 ++++++++++++++ - .../2019-05-04-13-33-37.bpo-34155.MJll68.rst | 1 + - 5 files changed, 37 insertions(+), 1 deletion(-) - create mode 100644 Misc/NEWS.d/next/Security/2019-05-04-13-33-37.bpo-34155.MJll68.rst - -Index: python3.5-3.5.2/Lib/email/_header_value_parser.py -=================================================================== ---- python3.5-3.5.2.orig/Lib/email/_header_value_parser.py 2019-10-07 09:01:59.365357330 -0400 -+++ python3.5-3.5.2/Lib/email/_header_value_parser.py 2019-10-07 09:01:59.361357315 -0400 -@@ -1966,6 +1966,8 @@ def get_domain(value): - token, value = get_dot_atom(value) - except errors.HeaderParseError: - token, value = get_atom(value) -+ if value and value[0] == '@': -+ raise errors.HeaderParseError('Invalid Domain') - if leader is not None: - token[:0] = [leader] - domain.append(token) -Index: python3.5-3.5.2/Lib/email/_parseaddr.py -=================================================================== ---- python3.5-3.5.2.orig/Lib/email/_parseaddr.py 2019-10-07 09:01:59.365357330 -0400 -+++ python3.5-3.5.2/Lib/email/_parseaddr.py 2019-10-07 09:01:59.361357315 -0400 -@@ -379,7 +379,12 @@ class AddrlistClass: - aslist.append('@') - self.pos += 1 - self.gotonext() -- return EMPTYSTRING.join(aslist) + self.getdomain() -+ domain = self.getdomain() -+ if not domain: -+ # Invalid domain, return an empty address instead of returning a -+ # local part to denote failed parsing. -+ return EMPTYSTRING -+ return EMPTYSTRING.join(aslist) + domain - - def getdomain(self): - """Get the complete domain name from an address.""" -@@ -394,6 +399,10 @@ class AddrlistClass: - elif self.field[self.pos] == '.': - self.pos += 1 - sdlist.append('.') -+ elif self.field[self.pos] == '@': -+ # bpo-34155: Don't parse domains with two `@` like -+ # `a@malicious.org@important.com`. -+ return EMPTYSTRING - elif self.field[self.pos] in self.atomends: - break - else: -Index: python3.5-3.5.2/Lib/test/test_email/test__header_value_parser.py -=================================================================== ---- python3.5-3.5.2.orig/Lib/test/test_email/test__header_value_parser.py 2019-10-07 09:01:59.365357330 -0400 -+++ python3.5-3.5.2/Lib/test/test_email/test__header_value_parser.py 2019-10-07 09:01:59.361357315 -0400 -@@ -1418,6 +1418,16 @@ class TestParser(TestParserMixin, TestEm - self.assertEqual(addr_spec.domain, 'example.com') - self.assertEqual(addr_spec.addr_spec, 'star.a.star@example.com') - -+ def test_get_addr_spec_multiple_domains(self): -+ with self.assertRaises(errors.HeaderParseError): -+ parser.get_addr_spec('star@a.star@example.com') -+ -+ with self.assertRaises(errors.HeaderParseError): -+ parser.get_addr_spec('star@a@example.com') -+ -+ with self.assertRaises(errors.HeaderParseError): -+ parser.get_addr_spec('star@172.17.0.1@example.com') -+ - # get_obs_route - - def test_get_obs_route_simple(self): -Index: python3.5-3.5.2/Lib/test/test_email/test_email.py -=================================================================== ---- python3.5-3.5.2.orig/Lib/test/test_email/test_email.py 2019-10-07 09:01:59.365357330 -0400 -+++ python3.5-3.5.2/Lib/test/test_email/test_email.py 2019-10-07 09:01:59.361357315 -0400 -@@ -2999,6 +2999,20 @@ class TestMiscellaneous(TestEmailBase): - self.assertEqual(utils.parseaddr('<>'), ('', '')) - self.assertEqual(utils.formataddr(utils.parseaddr('<>')), '') - -+ def test_parseaddr_multiple_domains(self): -+ self.assertEqual( -+ utils.parseaddr('a@b@c'), -+ ('', '') -+ ) -+ self.assertEqual( -+ utils.parseaddr('a@b.c@c'), -+ ('', '') -+ ) -+ self.assertEqual( -+ utils.parseaddr('a@172.17.0.1@c'), -+ ('', '') -+ ) -+ - def test_noquote_dump(self): - self.assertEqual( - utils.formataddr(('A Silly Person', 'person@dom.ain')), diff --git a/CVE-2019-16935.patch b/CVE-2019-16935.patch deleted file mode 100644 index 31950cd..0000000 --- a/CVE-2019-16935.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 1698cacfb924d1df452e78d11a4bf81ae7777389 Mon Sep 17 00:00:00 2001 -From: Victor Stinner -Date: Sat, 28 Sep 2019 09:33:00 +0200 -Subject: [PATCH] bpo-38243, xmlrpc.server: Escape the server_title (GH-16373) - (GH-16441) - -Escape the server title of xmlrpc.server.DocXMLRPCServer -when rendering the document page as HTML. - -(cherry picked from commit e8650a4f8c7fb76f570d4ca9c1fbe44e91c8dfaa) ---- - Lib/test/test_docxmlrpc.py | 16 ++++++++++++++++ - Lib/xmlrpc/server.py | 3 ++- - .../2019-09-25-13-21-09.bpo-38243.1pfz24.rst | 3 +++ - 3 files changed, 21 insertions(+), 1 deletion(-) - create mode 100644 Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst - -Index: python3.5-3.5.2/Lib/test/test_docxmlrpc.py -=================================================================== ---- python3.5-3.5.2.orig/Lib/test/test_docxmlrpc.py 2019-10-07 09:02:07.977389134 -0400 -+++ python3.5-3.5.2/Lib/test/test_docxmlrpc.py 2019-10-07 09:02:07.969389105 -0400 -@@ -1,5 +1,6 @@ - from xmlrpc.server import DocXMLRPCServer - import http.client -+import re - import sys - from test import support - threading = support.import_module('threading') -@@ -212,6 +213,21 @@ class DocXMLRPCHTTPGETServer(unittest.Te - b'method_annotation(x: bytes)'), - response.read()) - -+ def test_server_title_escape(self): -+ # bpo-38243: Ensure that the server title and documentation -+ # are escaped for HTML. -+ self.serv.set_server_title('test_title