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 <maxking@users.noreply.github.com>
-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 <jpic@users.noreply.github.com>
----
- 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 <vstinner@redhat.com>
-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</strong></a>(x: bytes)</dt></dl>'),
-             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<script>')
-+        self.serv.set_server_documentation('test_documentation<script>')
-+        self.assertEqual('test_title<script>', self.serv.server_title)
-+        self.assertEqual('test_documentation<script>',
-+                self.serv.server_documentation)
-+
-+        generated = self.serv.generate_html_documentation()
-+        title = re.search(r'<title>(.+?)</title>', generated).group()
-+        documentation = re.search(r'<p><tt>(.+?)</tt></p>', generated).group()
-+        self.assertEqual('<title>Python: test_title&lt;script&gt;</title>', title)
-+        self.assertEqual('<p><tt>test_documentation&lt;script&gt;</tt></p>', documentation)
-+
- 
- if __name__ == '__main__':
-     unittest.main()
-Index: python3.5-3.5.2/Lib/xmlrpc/server.py
-===================================================================
---- python3.5-3.5.2.orig/Lib/xmlrpc/server.py	2019-10-07 09:02:07.977389134 -0400
-+++ python3.5-3.5.2/Lib/xmlrpc/server.py	2019-10-07 09:02:07.969389105 -0400
-@@ -106,6 +106,7 @@ server.handle_request()
- 
- from xmlrpc.client import Fault, dumps, loads, gzip_encode, gzip_decode
- from http.server import BaseHTTPRequestHandler
-+import html
- import http.server
- import socketserver
- import sys
-@@ -887,7 +888,7 @@ class XMLRPCDocGenerator:
-                                 methods
-                             )
- 
--        return documenter.page(self.server_title, documentation)
-+        return documenter.page(html.escape(self.server_title), documentation)
- 
- class DocXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
-     """XML-RPC and documentation request handler class.
diff --git a/Python-nis-requires-tirpc.patch b/Python-nis-requires-tirpc.patch
deleted file mode 100644
index 79dde83..0000000
--- a/Python-nis-requires-tirpc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Python-3.4.1/setup.py.omv~	2014-06-12 17:30:45.911154584 +0200
-+++ Python-3.4.1/setup.py	2014-06-12 17:31:29.622608116 +0200
-@@ -1249,9 +1249,9 @@ class PyBuildExt(build_ext):
-             if (host_platform not in ['cygwin', 'qnx6'] and
-                 find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
-                 if (self.compiler.find_library_file(lib_dirs, 'nsl')):
--                    libs = ['nsl']
-+                    libs = ['nsl','tirpc']
-                 else:
--                    libs = []
-+                    libs = ['tirpc']
-                 exts.append( Extension('nis', ['nismodule.c'],
-                                        libraries = libs) )
-             else:
diff --git a/Python-select-requires-libm.patch b/Python-select-requires-libm.patch
deleted file mode 100644
index 478e530..0000000
--- a/Python-select-requires-libm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Python-3.4.1/setup.py.omv~	2014-06-12 16:47:09.873859551 +0200
-+++ Python-3.4.1/setup.py	2014-06-12 16:47:34.373553262 +0200
-@@ -625,7 +625,7 @@ class PyBuildExt(build_ext):
-             missing.append('spwd')
- 
-         # select(2); not on ancient System V
--        exts.append( Extension('select', ['selectmodule.c']) )
-+        exts.append( Extension('select', ['selectmodule.c'], libraries=['m']) )
- 
-         # Fred Drake's interface to the Python parser
-         exts.append( Extension('parser', ['parsermodule.c']) )
diff --git a/avoid_test_docxmlrpc_race.patch b/avoid_test_docxmlrpc_race.patch
deleted file mode 100644
index f860bf8..0000000
--- a/avoid_test_docxmlrpc_race.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-
-# HG changeset patch
-# User Martin Panter <vadmium+py@gmail.com>
-# Date 1471675858 0
-# Node ID 397f0504417207f02b611092f444b5a24d3d1a41
-# Parent  7ddbc22639435d234609181a14cba7182c58df5e
-Issue #27614: Avoid race in test_docxmlrpc server setup
-
-Index: python3.5-3.5.2/Lib/test/test_docxmlrpc.py
-===================================================================
---- python3.5-3.5.2.orig/Lib/test/test_docxmlrpc.py	2019-10-08 09:06:31.993379083 -0400
-+++ python3.5-3.5.2/Lib/test/test_docxmlrpc.py	2019-10-08 09:06:31.989379062 -0400
-@@ -4,12 +4,8 @@ import re
- import sys
- from test import support
- threading = support.import_module('threading')
--import time
--import socket
- import unittest
- 
--PORT = None
--
- def make_request_and_skipIf(condition, reason):
-     # If we skip the test, we have to make a request because
-     # the server created in setUp blocks expecting one to come in.
-@@ -24,13 +20,10 @@ def make_request_and_skipIf(condition, r
-     return decorator
- 
- 
--def server(evt, numrequests):
-+def make_server():
-     serv = DocXMLRPCServer(("localhost", 0), logRequests=False)
- 
-     try:
--        global PORT
--        PORT = serv.socket.getsockname()[1]
--
-         # Add some documentation
-         serv.set_server_title("DocXMLRPCServer Test Documentation")
-         serv.set_server_name("DocXMLRPCServer Test Docs")
-@@ -67,43 +60,31 @@ def server(evt, numrequests):
-         serv.register_function(lambda x, y: x-y)
-         serv.register_function(annotation)
-         serv.register_instance(ClassWithAnnotation())
--
--        while numrequests > 0:
--            serv.handle_request()
--            numrequests -= 1
--    except socket.timeout:
--        pass
--    finally:
-+        return serv
-+    except:
-         serv.server_close()
--        PORT = None
--        evt.set()
-+        raise
- 
- class DocXMLRPCHTTPGETServer(unittest.TestCase):
-     def setUp(self):
--        self._threads = support.threading_setup()
-         # Enable server feedback
-         DocXMLRPCServer._send_traceback_header = True
- 
--        self.evt = threading.Event()
--        threading.Thread(target=server, args=(self.evt, 1)).start()
--
--        # wait for port to be assigned
--        deadline = time.monotonic() + 10.0
--        while PORT is None:
--            time.sleep(0.010)
--            if time.monotonic() > deadline:
--                break
-+        self.serv = make_server()
-+        self.thread = threading.Thread(target=self.serv.serve_forever)
-+        self.thread.start()
- 
-+        PORT = self.serv.server_address[1]
-         self.client = http.client.HTTPConnection("localhost:%d" % PORT)
- 
-     def tearDown(self):
-         self.client.close()
- 
--        self.evt.wait()
--
-         # Disable server feedback
-         DocXMLRPCServer._send_traceback_header = False
--        support.threading_cleanup(*self._threads)
-+        self.serv.shutdown()
-+        self.thread.join()
-+        self.serv.server_close()
- 
-     def test_valid_get_response(self):
-         self.client.request("GET", "/")
diff --git a/python-2.7.13-lib64.patch b/python-2.7.13-lib64.patch
deleted file mode 100644
index 0b01217..0000000
--- a/python-2.7.13-lib64.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-diff -Naur Python-2.7.13.orig/configure.ac Python-2.7.13/configure.ac
---- Python-2.7.13.orig/configure.ac	2017-12-03 17:32:19.000000000 +0300
-+++ Python-2.7.13/configure.ac	2017-12-03 17:32:27.000000000 +0300
-@@ -759,6 +759,41 @@
-     ;;
- esac
- 
-+AC_SUBST(ARCH)
-+AC_MSG_CHECKING(ARCH)
-+ARCH=`uname -m`
-+case $ARCH in
-+i?86) ARCH=i386;;
-+esac
-+AC_MSG_RESULT($ARCH)
-+
-+AC_SUBST(LIB)
-+AC_MSG_CHECKING(LIB)
-+case $ac_sys_system in
-+Linux*)
-+  # Test if the compiler is 64bit
-+  echo 'int i;' > conftest.$ac_ext
-+  python_cv_cc_64bit_output=no
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *"ELF 64"*)
-+      python_cv_cc_64bit_output=yes
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+esac
-+
-+case $ARCH:$python_cv_cc_64bit_output in
-+ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
-+  LIB="lib64"
-+  ;;
-+*:*)
-+  LIB="lib"
-+  ;;
-+esac
-+AC_MSG_RESULT($LIB)
- 
- AC_SUBST(LIBRARY)
- AC_MSG_CHECKING(LIBRARY)
-diff -Naur Python-2.7.13.orig/Include/pythonrun.h Python-2.7.13/Include/pythonrun.h
---- Python-2.7.13.orig/Include/pythonrun.h	2017-12-03 17:32:19.000000000 +0300
-+++ Python-2.7.13/Include/pythonrun.h	2017-12-03 17:32:26.000000000 +0300
-@@ -108,6 +108,8 @@
- /* In their own files */
- PyAPI_FUNC(const char *) Py_GetVersion(void);
- PyAPI_FUNC(const char *) Py_GetPlatform(void);
-+PyAPI_FUNC(const char *) Py_GetArch(void);
-+PyAPI_FUNC(const char *) Py_GetLib(void);
- PyAPI_FUNC(const char *) Py_GetCopyright(void);
- PyAPI_FUNC(const char *) Py_GetCompiler(void);
- PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
-diff -Naur Python-2.7.13.orig/Lib/distutils/command/install.py Python-2.7.13/Lib/distutils/command/install.py
---- Python-2.7.13.orig/Lib/distutils/command/install.py	2017-12-03 17:32:22.000000000 +0300
-+++ Python-2.7.13/Lib/distutils/command/install.py	2017-12-03 17:32:27.000000000 +0300
-@@ -22,6 +22,8 @@
- from site import USER_SITE
- 
- 
-+libname = sys.lib
-+
- if sys.version < "2.2":
-     WINDOWS_SCHEME = {
-         'purelib': '$base',
-@@ -42,14 +44,14 @@
- INSTALL_SCHEMES = {
-     'unix_prefix': {
-         'purelib': '$base/lib/python$py_version_short/site-packages',
--        'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+        'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
-         'headers': '$base/include/python$py_version_short/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-     'unix_home': {
-         'purelib': '$base/lib/python',
--        'platlib': '$base/lib/python',
-+        'platlib': '$base/'+libname+'/python',
-         'headers': '$base/include/python/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-diff -Naur Python-2.7.13.orig/Lib/distutils/sysconfig.py Python-2.7.13/Lib/distutils/sysconfig.py
---- Python-2.7.13.orig/Lib/distutils/sysconfig.py	2017-12-03 17:32:22.000000000 +0300
-+++ Python-2.7.13/Lib/distutils/sysconfig.py	2017-12-03 17:32:27.000000000 +0300
-@@ -119,8 +119,12 @@
-         prefix = plat_specific and EXEC_PREFIX or PREFIX
- 
-     if os.name == "posix":
-+        if plat_specific:
-+            lib = sys.lib
-+        else:
-+            lib = 'lib'
-         libpython = os.path.join(prefix,
--                                 "lib", "python" + get_python_version())
-+                                 lib, "python" + get_python_version())
-         if standard_lib:
-             return libpython
-         else:
-@@ -230,7 +234,8 @@
-         else:
-             inc_dir = project_base
-     else:
--        inc_dir = get_python_inc(plat_specific=1)
-+        prefix = EXEC_PREFIX or PREFIX
-+        inc_dir = os.path.join(prefix, "include", "multiarch-" + sys.arch + "-linux", "python" + sys.version[:3])
-     if get_python_version() < '2.2':
-         config_h = 'config.h'
-     else:
-diff -Naur Python-2.7.13.orig/Lib/distutils/tests/test_install.py Python-2.7.13/Lib/distutils/tests/test_install.py
---- Python-2.7.13.orig/Lib/distutils/tests/test_install.py	2017-12-03 17:32:22.000000000 +0300
-+++ Python-2.7.13/Lib/distutils/tests/test_install.py	2017-12-03 17:32:27.000000000 +0300
-@@ -57,8 +57,9 @@
-             self.assertEqual(got, expected)
- 
-         libdir = os.path.join(destination, "lib", "python")
-+        platlibdir =  os.path.join(destination, sys.lib, "python")
-         check_path(cmd.install_lib, libdir)
--        check_path(cmd.install_platlib, libdir)
-+        check_path(cmd.install_platlib, platlibdir)
-         check_path(cmd.install_purelib, libdir)
-         check_path(cmd.install_headers,
-                    os.path.join(destination, "include", "python", "foopkg"))
-diff -Naur Python-2.7.13.orig/Lib/site.py Python-2.7.13/Lib/site.py
---- Python-2.7.13.orig/Lib/site.py	2017-12-03 17:32:22.000000000 +0300
-+++ Python-2.7.13/Lib/site.py	2017-12-03 17:40:44.000000000 +0300
-@@ -288,13 +288,18 @@
-         if sys.platform in ('os2emx', 'riscos'):
-             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
-         elif os.sep == '/':
--            sitepackages.append(os.path.join(prefix, "lib",
-+            sitepackages.append(os.path.join(prefix, sys.lib,
-                                         "python" + sys.version[:3],
-                                         "site-packages"))
--            sitepackages.append(os.path.join(prefix, "lib", "site-python"))
-+            sitepackages.append(os.path.join(prefix, sys.lib, "site-python"))
-+            if sys.lib != 'lib':
-+                    sitepackages.append(os.path.join(prefix, 'lib',
-+                                                     "python" + sys.version[:3],
-+                                                     "site-packages"))
-+                    sitepackages.append(os.path.join(prefix, 'lib', "site-python"))
-         else:
-             sitepackages.append(prefix)
--            sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
-+            sitepackages.append(os.path.join(prefix, sys.lib, "site-packages"))
-     return sitepackages
- 
- def addsitepackages(known_paths):
-diff -Naur Python-2.7.13.orig/Lib/sysconfig.py Python-2.7.13/Lib/sysconfig.py
---- Python-2.7.13.orig/Lib/sysconfig.py	2017-12-03 17:32:23.000000000 +0300
-+++ Python-2.7.13/Lib/sysconfig.py	2017-12-03 17:32:27.000000000 +0300
-@@ -7,20 +7,20 @@
- 
- _INSTALL_SCHEMES = {
-     'posix_prefix': {
--        'stdlib': '{base}/lib/python{py_version_short}',
--        'platstdlib': '{platbase}/lib/python{py_version_short}',
-+        'stdlib': '{base}/'+sys.lib+'/python{py_version_short}',
-+        'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}',
-         'purelib': '{base}/lib/python{py_version_short}/site-packages',
--        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
-+        'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages',
-         'include': '{base}/include/python{py_version_short}',
-         'platinclude': '{platbase}/include/python{py_version_short}',
-         'scripts': '{base}/bin',
-         'data': '{base}',
-         },
-     'posix_home': {
--        'stdlib': '{base}/lib/python',
--        'platstdlib': '{base}/lib/python',
-+        'stdlib': '{base}/'+sys.lib+'/python',
-+        'platstdlib': '{base}/'+sys.lib+'/python',
-         'purelib': '{base}/lib/python',
--        'platlib': '{base}/lib/python',
-+        'platlib': '{base}/'+sys.lib+'/python',
-         'include': '{base}/include/python',
-         'platinclude': '{base}/include/python',
-         'scripts': '{base}/bin',
-@@ -65,10 +65,10 @@
-         'data'   : '{userbase}',
-         },
-     'posix_user': {
--        'stdlib': '{userbase}/lib/python{py_version_short}',
--        'platstdlib': '{userbase}/lib/python{py_version_short}',
-+        'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
-+        'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
-         'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
--        'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
-+        'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages',
-         'include': '{userbase}/include/python{py_version_short}',
-         'scripts': '{userbase}/bin',
-         'data'   : '{userbase}',
-diff -Naur Python-2.7.13.orig/Makefile.pre.in Python-2.7.13/Makefile.pre.in
---- Python-2.7.13.orig/Makefile.pre.in	2017-12-03 17:32:19.000000000 +0300
-+++ Python-2.7.13/Makefile.pre.in	2017-12-03 17:32:27.000000000 +0300
-@@ -92,6 +92,8 @@
- 
- # Machine-dependent subdirectories
- MACHDEP=	@MACHDEP@
-+LIB=		@LIB@
-+ARCH=		@ARCH@
- 
- # Multiarch directory (may be empty)
- MULTIARCH=	@MULTIARCH@
-@@ -111,7 +113,7 @@
- MANDIR=		@mandir@
- INCLUDEDIR=	@includedir@
- CONFINCLUDEDIR=	$(exec_prefix)/include
--SCRIPTDIR=	$(prefix)/lib
-+SCRIPTDIR=	$(prefix)/$(LIB)
- 
- # Detailed destination directories
- BINLIBDEST=	$(LIBDIR)/python$(VERSION)
-@@ -708,7 +710,7 @@
- Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
- 
- Python/getplatform.o: $(srcdir)/Python/getplatform.c
--		$(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
-+		$(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c
- 
- Python/importdl.o: $(srcdir)/Python/importdl.c
- 		$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
-diff -Naur Python-2.7.13.orig/Modules/getpath.c Python-2.7.13/Modules/getpath.c
---- Python-2.7.13.orig/Modules/getpath.c	2017-12-03 17:32:25.000000000 +0300
-+++ Python-2.7.13/Modules/getpath.c	2017-12-03 17:32:27.000000000 +0300
-@@ -100,6 +100,19 @@
- #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
- #endif
- 
-+#ifndef LIB_PYTHON
-+#if defined(__x86_64__) || defined(__powerpc64__)
-+#define LIB_PYTHON "lib64/python" VERSION
-+#else
-+#define LIB_PYTHON "lib/python" VERSION
-+#endif
-+#endif
-+
-+#ifndef PYTHONPATH
-+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
-+              EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
-+#endif
-+
- #ifndef LANDMARK
- #define LANDMARK "os.py"
- #endif
-@@ -108,7 +121,7 @@
- static char exec_prefix[MAXPATHLEN+1];
- static char progpath[MAXPATHLEN+1];
- static char *module_search_path = NULL;
--static char lib_python[] = "lib/python" VERSION;
-+static char lib_python[] = LIB_PYTHON;
- 
- static void
- reduce(char *dir)
-diff -Naur Python-2.7.13.orig/Python/getplatform.c Python-2.7.13/Python/getplatform.c
---- Python-2.7.13.orig/Python/getplatform.c	2017-12-03 17:32:21.000000000 +0300
-+++ Python-2.7.13/Python/getplatform.c	2017-12-03 17:32:27.000000000 +0300
-@@ -10,3 +10,23 @@
- {
- 	return PLATFORM;
- }
-+
-+#ifndef ARCH
-+#define ARCH "unknown"
-+#endif
-+
-+const char *
-+Py_GetArch(void)
-+{
-+	return ARCH;
-+}
-+
-+#ifndef LIB
-+#define LIB "lib"
-+#endif
-+
-+const char *
-+Py_GetLib(void)
-+{
-+	return LIB;
-+}
-diff -Naur Python-2.7.13.orig/Python/sysmodule.c Python-2.7.13/Python/sysmodule.c
---- Python-2.7.13.orig/Python/sysmodule.c	2017-12-03 17:32:21.000000000 +0300
-+++ Python-2.7.13/Python/sysmodule.c	2017-12-03 17:32:27.000000000 +0300
-@@ -1439,6 +1439,10 @@
-                         PyString_FromString(Py_GetPlatform()));
-     SET_SYS_FROM_STRING("executable",
-                         PyString_FromString(Py_GetProgramFullPath()));
-+    SET_SYS_FROM_STRING("arch",
-+		    	PyString_FromString(Py_GetArch()));
-+    SET_SYS_FROM_STRING("lib",
-+		    	PyString_FromString(Py_GetLib()));
-     SET_SYS_FROM_STRING("prefix",
-                         PyString_FromString(Py_GetPrefix()));
-     SET_SYS_FROM_STRING("exec_prefix",
-diff -Naur Python-2.7.13.orig/setup.py Python-2.7.13/setup.py
---- Python-2.7.13.orig/setup.py	2017-12-03 17:32:19.000000000 +0300
-+++ Python-2.7.13/setup.py	2017-12-03 17:32:27.000000000 +0300
-@@ -512,6 +512,7 @@
-         except NameError:
-             have_unicode = 0
- 
-+        libname = sys.lib
-         # lib_dirs and inc_dirs are used to search for files;
-         # if a file is found in one of those directories, it can
-         # be assumed that no additional -I,-L directives are needed.
-@@ -523,8 +524,7 @@
-                 ):
-                 add_dir_to_list(inc_dirs, d)
-             for d in (
--                '/lib64', '/usr/lib64',
--                '/lib', '/usr/lib',
-+                libname, '/usr/'+libname
-                 ):
-                 add_dir_to_list(lib_dirs, d)
-         exts = []
-@@ -782,11 +782,11 @@
-             elif curses_library:
-                 readline_libs.append(curses_library)
-             elif self.compiler.find_library_file(lib_dirs +
--                                                     ['/usr/lib/termcap'],
-+                                                     ['/usr/'+libname+'/termcap'],
-                                                      'termcap'):
-                 readline_libs.append('termcap')
-             exts.append( Extension('readline', ['readline.c'],
--                                   library_dirs=['/usr/lib/termcap'],
-+                                   library_dirs=['/usr/'+libname+'/termcap'],
-                                    extra_link_args=readline_extra_link_args,
-                                    libraries=readline_libs) )
-         else:
-@@ -1941,8 +1941,8 @@
-             added_lib_dirs.append('/usr/openwin/lib')
-         elif os.path.exists('/usr/X11R6/include'):
-             include_dirs.append('/usr/X11R6/include')
--            added_lib_dirs.append('/usr/X11R6/lib64')
--            added_lib_dirs.append('/usr/X11R6/lib')
-+            added_lib_dirs.append('/usr/X11R6/'+sys.lib)
-+            #added_lib_dirs.append('/usr/X11R6/lib')
-         elif os.path.exists('/usr/X11R5/include'):
-             include_dirs.append('/usr/X11R5/include')
-             added_lib_dirs.append('/usr/X11R5/lib')
diff --git a/python3-3.4.0-add-rewheel-module.patch b/python3-3.4.0-add-rewheel-module.patch
deleted file mode 100644
index 280cdc3..0000000
--- a/python3-3.4.0-add-rewheel-module.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-unchanged:
---- Python-3.4.0rc3/Lib/ensurepip/__init__.py	2014-03-10 07:56:33.000000000 +0100
-+++ Python-3.4.0rc3-rewheel/Lib/ensurepip/__init__.py	2014-03-12 09:57:12.917120853 +0100
-@@ -1,8 +1,10 @@
- import os
- import os.path
- import pkgutil
-+import shutil
- import sys
- import tempfile
-+from ensurepip import rewheel
- 
- 
- __all__ = ["version", "bootstrap"]
-@@ -38,6 +40,8 @@ def _run_pip(args, additional_paths=None
- 
-     # Install the bundled software
-     import pip
-+    if args[0] in ["install", "list", "wheel"]:
-+        args.append('--pre')
-     pip.main(args)
- 
- 
-@@ -87,20 +90,40 @@ def bootstrap(*, root=None, upgrade=Fals
-         # omit pip and easy_install
-         os.environ["ENSUREPIP_OPTIONS"] = "install"
- 
--    with tempfile.TemporaryDirectory() as tmpdir:
--        # Put our bundled wheels into a temporary directory and construct the
--        # additional paths that need added to sys.path
--        additional_paths = []
-+    whls = []
-+    rewheel_dir = None
-+    # try to see if we have system-wide versions of _PROJECTS
-+    dep_records = rewheel.find_system_records([p[0] for p in _PROJECTS])
-+    # TODO: check if system-wide versions are the newest ones
-+    # if --upgrade is used?
-+    if all(dep_records):
-+        # if we have all _PROJECTS installed system-wide, we'll recreate
-+        # wheels from them and install those
-+        rewheel_dir = tempfile.TemporaryDirectory()
-+        for dr in dep_records:
-+            new_whl = rewheel.rewheel_from_record(dr, rewheel_dir.name)
-+            whls.append(os.path.join(rewheel_dir.name, new_whl))
-+    else:
-+        # if we don't have all the _PROJECTS installed system-wide,
-+        # let's just fall back to bundled wheels
-         for project, version in _PROJECTS:
--            wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
--            whl = pkgutil.get_data(
-+            whl = os.path.join(
-+                os.path.dirname(__file__),
-                 "ensurepip",
--                "_bundled/{}".format(wheel_name),
-+                "bundled",
-+                "{}-{}-py2.py3-none-any.whl".format(project, version)
-             )
--            with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
--                fp.write(whl)
-+            whls.append(whl)
- 
--            additional_paths.append(os.path.join(tmpdir, wheel_name))
-+    with tempfile.TemporaryDirectory() as tmpdir:
-+        # Put our bundled wheels into a temporary directory and construct the
-+        # additional paths that need added to sys.path
-+        additional_paths = []
-+        for whl in whls:
-+            shutil.copy(whl, tmpdir)
-+            additional_paths.append(os.path.join(tmpdir, os.path.basename(whl)))
-+        if rewheel_dir:
-+            rewheel_dir.cleanup()
- 
-         # Construct the arguments to be passed to the pip command
-         args = ["install", "--no-index", "--find-links", tmpdir]
-unchanged:
---- Python-3.4.0rc3/Lib/ensurepip/rewheel/__init__.py	1970-01-01 01:00:00.000000000 +0100
-+++ Python-3.4.0rc3-rewheel/Lib/ensurepip/rewheel/__init__.py	2014-03-12 09:55:30.413152104 +0100
-@@ -0,0 +1,133 @@
-+import argparse
-+import csv
-+import email.parser
-+import os
-+import io
-+import re
-+import site
-+import subprocess
-+import sys
-+import zipfile
-+
-+def run():
-+    parser = argparse.ArgumentParser(description='Recreate wheel of package with given RECORD.')
-+    parser.add_argument('record_path',
-+                        help='Path to RECORD file')
-+    parser.add_argument('-o', '--output-dir',
-+                        help='Dir where to place the wheel, defaults to current working dir.',
-+                        dest='outdir',
-+                        default=os.path.curdir)
-+
-+    ns = parser.parse_args()
-+    retcode = 0
-+    try:
-+        print(rewheel_from_record(**vars(ns)))
-+    except BaseException as e:
-+        print('Failed: {}'.format(e))
-+        retcode = 1
-+    sys.exit(1)
-+
-+def find_system_records(projects):
-+    """Return list of paths to RECORD files for system-installed projects.
-+
-+    If a project is not installed, the resulting list contains None instead
-+    of a path to its RECORD
-+    """
-+    records = []
-+    # get system site-packages dirs
-+    sys_sitepack = site.getsitepackages([sys.base_prefix, sys.base_exec_prefix])
-+    sys_sitepack = [sp for sp in sys_sitepack if os.path.exists(sp)]
-+    # try to find all projects in all system site-packages
-+    for project in projects:
-+        path = None
-+        for sp in sys_sitepack:
-+            dist_info_re = os.path.join(sp, project) + '-[^\{0}]+\.dist-info'.format(os.sep)
-+            candidates = [os.path.join(sp, p) for p in os.listdir(sp)]
-+            # filter out candidate dirs based on the above regexp
-+            filtered = [c for c in candidates if re.match(dist_info_re, c)]
-+            # if we have 0 or 2 or more dirs, something is wrong...
-+            if len(filtered) == 1:
-+                path = filtered[0]
-+        records.append(os.path.join(path, 'RECORD'))
-+    return records
-+
-+def rewheel_from_record(record_path, outdir):
-+    """Recreates a whee of package with given record_path and returns path
-+    to the newly created wheel."""
-+    site_dir = os.path.dirname(os.path.dirname(record_path))
-+    record_relpath = record_path[len(site_dir):].strip(os.path.sep)
-+    to_write, to_omit = get_records_to_pack(site_dir, record_relpath)
-+    new_wheel_name = get_wheel_name(record_path)
-+    new_wheel_path = os.path.join(outdir, new_wheel_name + '.whl')
-+
-+    new_wheel = zipfile.ZipFile(new_wheel_path, mode='w', compression=zipfile.ZIP_DEFLATED)
-+    # we need to write a new record with just the files that we will write,
-+    # e.g. not binaries and *.pyc/*.pyo files
-+    new_record = io.StringIO()
-+    writer = csv.writer(new_record)
-+
-+    # handle files that we can write straight away
-+    for f, sha_hash, size in to_write:
-+        new_wheel.write(os.path.join(site_dir, f), arcname=f)
-+        writer.writerow([f, sha_hash,size])
-+
-+    # rewrite the old wheel file with a new computed one
-+    writer.writerow([record_relpath, '', ''])
-+    new_wheel.writestr(record_relpath, new_record.getvalue())
-+
-+    new_wheel.close()
-+
-+    return new_wheel.filename
-+
-+def get_wheel_name(record_path):
-+    """Return proper name of the wheel, without .whl."""
-+    wheel_info_path = os.path.join(os.path.dirname(record_path), 'WHEEL')
-+    wheel_info = email.parser.Parser().parsestr(io.open(wheel_info_path, encoding='utf-8').read())
-+    metadata_path = os.path.join(os.path.dirname(record_path), 'METADATA')
-+    metadata = email.parser.Parser().parsestr(io.open(metadata_path, encoding='utf-8').read())
-+
-+    # construct name parts according to wheel spec
-+    distribution = metadata.get('Name')
-+    version = metadata.get('Version')
-+    build_tag = '' # nothing for now
-+    lang_tag = []
-+    for t in wheel_info.get_all('Tag'):
-+        lang_tag.append(t.split('-')[0])
-+    lang_tag = '.'.join(lang_tag)
-+    abi_tag, plat_tag = wheel_info.get('Tag').split('-')[1:3]
-+    # leave out build tag, if it is empty
-+    to_join = filter(None, [distribution, version, build_tag, lang_tag, abi_tag, plat_tag])
-+    return '-'.join(list(to_join))
-+
-+def get_records_to_pack(site_dir, record_relpath):
-+    """Accepts path of sitedir and path of RECORD file relative to it.
-+    Returns two lists:
-+    - list of files that can be written to new RECORD straight away
-+    - list of files that shouldn't be written or need some processing
-+      (pyc and pyo files, scripts)
-+    """
-+    record_contents = open(os.path.join(site_dir, record_relpath)).read()
-+    # temporary fix for https://github.com/pypa/pip/issues/1376
-+    # we need to ignore files under ".data" directory
-+    data_dir = os.path.dirname(record_relpath).strip(os.path.sep)
-+    data_dir = data_dir[:-len('dist-info')] + 'data'
-+
-+    to_write = []
-+    to_omit = []
-+    for l in record_contents.splitlines():
-+        spl = l.split(',')
-+        if len(spl) == 3:
-+            # new record will omit (or write differently):
-+            # - abs paths, paths with ".." (entry points),
-+            # - pyc+pyo files
-+            # - the old RECORD file
-+            # TODO: is there any better way to recognize an entry point?
-+            if os.path.isabs(spl[0]) or spl[0].startswith('..') or \
-+               spl[0].endswith('.pyc') or spl[0].endswith('.pyo') or \
-+               spl[0] == record_relpath or spl[0].startswith(data_dir):
-+                to_omit.append(spl)
-+            else:
-+                to_write.append(spl)
-+        else:
-+            pass # bad RECORD or empty line
-+    return to_write, to_omit
-only in patch2:
-unchanged:
---- Python-3.4.0/Makefile.pre.in	2014-04-01 12:02:48.188136172 +0200
-+++ Python-3.4.0-new/Makefile.pre.in	2014-04-01 12:03:23.770394025 +0200
-@@ -1140,7 +1140,7 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter
- 		test/test_asyncio \
- 		collections concurrent concurrent/futures encodings \
- 		email email/mime test/test_email test/test_email/data \
--		ensurepip ensurepip/_bundled \
-+		ensurepip ensurepip/_bundled ensurepip/rewheel \
- 		html json test/test_json http dbm xmlrpc \
- 		sqlite3 sqlite3/test \
- 		logging csv wsgiref urllib \
diff --git a/python3-3.4.0-ctypes-should-build-with-libffi-multilib-wrapper.patch b/python3-3.4.0-ctypes-should-build-with-libffi-multilib-wrapper.patch
deleted file mode 100644
index e224fc6..0000000
--- a/python3-3.4.0-ctypes-should-build-with-libffi-multilib-wrapper.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Python-3.3.2/setup.py.orig	2013-07-01 15:23:24.377711044 +0200
-+++ Python-3.3.2/setup.py	2013-07-01 15:23:34.094676496 +0200
-@@ -1882,7 +1882,8 @@
-                     if not line:
-                         ffi_inc = None
-                         break
--                    if line.startswith('#define LIBFFI_H'):
-+                    if line.startswith('#define LIBFFI_H') or \
-+                       line.startswith('#define ffi_wrapper_h'):
-                         break
-         ffi_lib = None
-         if ffi_inc is not None:
diff --git a/python3-3.4.0-disable-parts-of-test_socket-in-rpm-build.patch b/python3-3.4.0-disable-parts-of-test_socket-in-rpm-build.patch
deleted file mode 100644
index 0e28036..0000000
--- a/python3-3.4.0-disable-parts-of-test_socket-in-rpm-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up Python-3.3.0b1/Lib/test/test_socket.py.disable-test_socket-in-rpm-builds Python-3.3.0b1/Lib/test/test_socket.py
---- Python-3.3.0b1/Lib/test/test_socket.py.disable-test_socket-in-rpm-builds	2012-07-24 15:02:30.823355067 -0400
-+++ Python-3.3.0b1/Lib/test/test_socket.py	2012-07-24 15:08:13.021354999 -0400
-@@ -2188,6 +2188,7 @@ class RecvmsgGenericStreamTests(RecvmsgG
-     # Tests which require a stream socket and can use either recvmsg()
-     # or recvmsg_into().
- 
-+    @unittest._skipInRpmBuild('fails intermittently when run within Koji')
-     def testRecvmsgEOF(self):
-         # Receive end-of-stream indicator (b"", peer socket closed).
-         msg, ancdata, flags, addr = self.doRecvmsg(self.serv_sock, 1024)
diff --git a/python3-3.4.0-disable-test_fs_holes-in-rpm-build.patch b/python3-3.4.0-disable-test_fs_holes-in-rpm-build.patch
deleted file mode 100644
index 9fa91d5..0000000
--- a/python3-3.4.0-disable-test_fs_holes-in-rpm-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up cpython-59223da36dec/Lib/test/test_posix.py.disable-test_fs_holes-in-rpm-build cpython-59223da36dec/Lib/test/test_posix.py
---- cpython-59223da36dec/Lib/test/test_posix.py.disable-test_fs_holes-in-rpm-build	2012-08-07 17:15:59.000000000 -0400
-+++ cpython-59223da36dec/Lib/test/test_posix.py	2012-08-07 17:16:53.528330330 -0400
-@@ -973,6 +973,7 @@ class PosixTester(unittest.TestCase):
-         posix.RTLD_GLOBAL
-         posix.RTLD_LOCAL
- 
-+    @unittest._skipInRpmBuild('running kernel may not match kernel in chroot')
-     @unittest.skipUnless(hasattr(os, 'SEEK_HOLE'),
-                          "test needs an OS that reports file holes")
-     def test_fs_holes(self):
diff --git a/python3-3.4.0-disable-tests-in-test_io.patch b/python3-3.4.0-disable-tests-in-test_io.patch
deleted file mode 100644
index d81a2d0..0000000
--- a/python3-3.4.0-disable-tests-in-test_io.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up Python-2.7.2/Lib/test/test_io.py.disable-tests-in-test_io Python-2.7.2/Lib/test/test_io.py
---- Python-2.7.2/Lib/test/test_io.py.disable-tests-in-test_io	2011-09-01 14:18:45.963304089 -0400
-+++ Python-2.7.2/Lib/test/test_io.py	2011-09-01 15:08:53.796098413 -0400
-@@ -2669,6 +2669,7 @@ class SignalsTest(unittest.TestCase):
-         self.check_interrupted_read_retry(lambda x: x,
-                                           mode="r")
- 
-+    @unittest.skip('rhbz#732998')
-     @unittest.skipUnless(threading, 'Threading required for this test.')
-     def check_interrupted_write_retry(self, item, **fdopen_kwargs):
-         """Check that a buffered write, when it gets interrupted (either
diff --git a/python3-3.4.0-dont-duplicate-flags-in-sysconfig.patch b/python3-3.4.0-dont-duplicate-flags-in-sysconfig.patch
deleted file mode 100644
index fc49b30..0000000
--- a/python3-3.4.0-dont-duplicate-flags-in-sysconfig.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -r 39b9b05c3085 Lib/distutils/sysconfig.py
---- a/Lib/distutils/sysconfig.py	Wed Apr 10 00:27:23 2013 +0200
-+++ b/Lib/distutils/sysconfig.py	Wed Apr 10 10:14:18 2013 +0200
-@@ -362,7 +362,10 @@
-                     done[n] = item = ""
-                 if found:
-                     after = value[m.end():]
--                    value = value[:m.start()] + item + after
-+                    value = value[:m.start()]
-+                    if item.strip() not in value:
-+                        value += item
-+                    value += after
-                     if "$" in after:
-                         notdone[name] = value
-                     else:
-diff -r 39b9b05c3085 Lib/sysconfig.py
---- a/Lib/sysconfig.py	Wed Apr 10 00:27:23 2013 +0200
-+++ b/Lib/sysconfig.py	Wed Apr 10 10:14:18 2013 +0200
-@@ -296,7 +296,10 @@
- 
-                 if found:
-                     after = value[m.end():]
--                    value = value[:m.start()] + item + after
-+                    value = value[:m.start()]
-+                    if item.strip() not in value:
-+                        value += item
-+                    value += after
-                     if "$" in after:
-                         notdone[name] = value
-                     else:
diff --git a/python3-3.4.0-dont-raise-from-py_compile.patch b/python3-3.4.0-dont-raise-from-py_compile.patch
deleted file mode 100644
index 25c4a9d..0000000
--- a/python3-3.4.0-dont-raise-from-py_compile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 7fa3e824a4ee Lib/test/test_py_compile.py
---- a/Lib/test/test_py_compile.py	Tue Oct 29 22:25:06 2013 -0400
-+++ b/Lib/test/test_py_compile.py	Wed Oct 30 11:08:31 2013 +0100
-@@ -54,6 +54,10 @@
-         self.assertTrue(os.path.exists(self.pyc_path))
-         self.assertFalse(os.path.exists(self.cache_path))
- 
-+    def test_bad_coding(self):
-+        bad_coding = os.path.join(os.path.dirname(__file__), 'bad_coding2.py')
-+        self.assertIsNone(py_compile.compile(bad_coding, doraise=False))
-+
-     def test_relative_path(self):
-         py_compile.compile(os.path.relpath(self.source_path),
-                            os.path.relpath(self.pyc_path))
diff --git a/python3-3.4.0-hashlib-fips.patch b/python3-3.4.0-hashlib-fips.patch
deleted file mode 100644
index db0a49a..0000000
--- a/python3-3.4.0-hashlib-fips.patch
+++ /dev/null
@@ -1,640 +0,0 @@
-diff -Naur Python-3.5.2.orig/Lib/hashlib.py Python-3.5.2/Lib/hashlib.py
---- Python-3.5.2.orig/Lib/hashlib.py	2016-08-26 14:22:28.656434887 +0300
-+++ Python-3.5.2/Lib/hashlib.py	2016-08-26 14:22:28.684434819 +0300
-@@ -23,6 +23,16 @@
- Choose your hash function wisely.  Some have known collision weaknesses.
- sha384 and sha512 will be slow on 32 bit platforms.
- 
-+If the underlying implementation supports "FIPS mode", and this is enabled, it
-+may restrict the available hashes to only those that are compliant with FIPS
-+regulations.  For example, it may deny the use of MD5, on the grounds that this
-+is not secure for uses such as authentication, system integrity checking, or
-+digital signatures.   If you need to use such a hash for non-security purposes
-+(such as indexing into a data structure for speed), you can override the keyword
-+argument "usedforsecurity" from True to False to signify that your code is not
-+relying on the hash for security purposes, and this will allow the hash to be
-+usable even in FIPS mode.
-+
- Hash objects have these methods:
-  - update(arg): Update the hash object with the bytes in arg. Repeated calls
-                 are equivalent to a single call with the concatenation of all
-@@ -62,6 +72,19 @@
- __all__ = __always_supported + ('new', 'algorithms_guaranteed',
-                                 'algorithms_available', 'pbkdf2_hmac')
- 
-+import functools
-+def __ignore_usedforsecurity(func):
-+    """Used for sha3_* functions. Until OpenSSL implements them, we want
-+    to use them from Python _sha3 module, but we want them to accept
-+    usedforsecurity argument too."""
-+    # TODO: remove this function when OpenSSL implements sha3
-+    @functools.wraps(func)
-+    def inner(*args, **kwargs):
-+        if 'usedforsecurity' in kwargs:
-+            kwargs.pop('usedforsecurity')
-+        return func(*args, **kwargs)
-+    return inner
-+
- 
- __builtin_constructor_cache = {}
- 
-@@ -100,34 +123,41 @@
-         f = getattr(_hashlib, 'openssl_' + name)
-         # Allow the C module to raise ValueError.  The function will be
-         # defined but the hash not actually available thanks to OpenSSL.
--        f()
-+        # We pass "usedforsecurity=False" to disable FIPS-based restrictions:
-+        # at this stage we're merely seeing if the function is callable,
-+        # rather than using it for actual work.
-+        f(usedforsecurity=False)
-         # Use the C function directly (very fast)
-         return f
-     except (AttributeError, ValueError):
-+        # TODO: We want to just raise here when OpenSSL implements sha3
-+        # because we want to make sure that Fedora uses everything from OpenSSL
-         return __get_builtin_constructor(name)
- 
- 
--def __py_new(name, data=b''):
--    """new(name, data=b'') - Return a new hashing object using the named algorithm;
--    optionally initialized with data (which must be bytes).
-+def __py_new(name, data=b'', usedforsecurity=True):
-+    """new(name, data=b'', usedforsecurity=True) - Return a new hashing object using
-+    the named algorithm; optionally initialized with data (which must be bytes).
-+    The 'usedforsecurity' keyword argument does nothing, and is for compatibilty
-+    with the OpenSSL implementation
-     """
-     return __get_builtin_constructor(name)(data)
- 
- 
--def __hash_new(name, data=b''):
--    """new(name, data=b'') - Return a new hashing object using the named algorithm;
--    optionally initialized with data (which must be bytes).
-+def __hash_new(name, data=b'', usedforsecurity=True):
-+    """new(name, data=b'', usedforsecurity=True) - Return a new hashing object using
-+    the named algorithm; optionally initialized with data (which must be bytes).
-+    
-+    Override 'usedforsecurity' to False when using for non-security purposes in
-+    a FIPS environment
-     """
-     try:
--        return _hashlib.new(name, data)
-+        return _hashlib.new(name, data, usedforsecurity)
-     except ValueError:
--        # If the _hashlib module (OpenSSL) doesn't support the named
--        # hash, try using our builtin implementations.
--        # This allows for SHA224/256 and SHA384/512 support even though
--        # the OpenSSL library prior to 0.9.8 doesn't provide them.
-+        # TODO: We want to just raise here when OpenSSL implements sha3
-+        # because we want to make sure that Fedora uses everything from OpenSSL
-         return __get_builtin_constructor(name)(data)
- 
--
- try:
-     import _hashlib
-     new = __hash_new
-@@ -207,7 +237,10 @@
-     # try them all, some may not work due to the OpenSSL
-     # version not supporting that algorithm.
-     try:
--        globals()[__func_name] = __get_hash(__func_name)
-+        func = __get_hash(__func_name)
-+        if 'sha3_' in __func_name:
-+            func = __ignore_usedforsecurity(func)
-+        globals()[__func_name] = func
-     except ValueError:
-         import logging
-         logging.exception('code for hash %s was not found.', __func_name)
-@@ -215,3 +248,4 @@
- # Cleanup locals()
- del __always_supported, __func_name, __get_hash
- del __py_new, __hash_new, __get_openssl_constructor
-+del __ignore_usedforsecurity
-diff -Naur Python-3.5.2.orig/Lib/test/test_hashlib.py Python-3.5.2/Lib/test/test_hashlib.py
---- Python-3.5.2.orig/Lib/test/test_hashlib.py	2016-08-26 14:22:28.673434846 +0300
-+++ Python-3.5.2/Lib/test/test_hashlib.py	2016-08-26 14:22:28.684434819 +0300
-@@ -24,7 +24,22 @@
- COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
- 
- c_hashlib = import_fresh_module('hashlib', fresh=['_hashlib'])
--py_hashlib = import_fresh_module('hashlib', blocked=['_hashlib'])
-+# skipped on Fedora, since we always use OpenSSL implementation
-+# py_hashlib = import_fresh_module('hashlib', blocked=['_hashlib'])
-+
-+def openssl_enforces_fips():
-+    # Use the "openssl" command (if present) to try to determine if the local
-+    # OpenSSL is configured to enforce FIPS
-+    from subprocess import Popen, PIPE
-+    try:
-+        p = Popen(['openssl', 'md5'],
-+                  stdin=PIPE, stdout=PIPE, stderr=PIPE)
-+    except OSError:
-+        # "openssl" command not found
-+        return False
-+    stdout, stderr = p.communicate(input=b'abc')
-+    return b'unknown cipher' in stderr
-+OPENSSL_ENFORCES_FIPS = openssl_enforces_fips()
- 
- def hexstr(s):
-     assert isinstance(s, bytes), repr(s)
-@@ -34,6 +49,16 @@
-         r += h[(i >> 4) & 0xF] + h[i & 0xF]
-     return r
- 
-+# hashlib and _hashlib-based functions support a "usedforsecurity" keyword
-+# argument, and FIPS mode requires that it be used overridden with a False
-+# value for these selftests to work.  Other cryptographic code within Python
-+# doesn't support this keyword.
-+# Modify a function to one in which "usedforsecurity=False" is added to the
-+# keyword arguments:
-+def suppress_fips(f):
-+    def g(*args, **kwargs):
-+        return f(*args, usedforsecurity=False, **kwargs)
-+    return g
- 
- class HashLibTestCase(unittest.TestCase):
-     supported_hash_names = ( 'md5', 'MD5', 'sha1', 'SHA1',
-@@ -63,11 +88,11 @@
-         # For each algorithm, test the direct constructor and the use
-         # of hashlib.new given the algorithm name.
-         for algorithm, constructors in self.constructors_to_test.items():
--            constructors.add(getattr(hashlib, algorithm))
-+            constructors.add(suppress_fips(getattr(hashlib, algorithm)))
-             def _test_algorithm_via_hashlib_new(data=None, _alg=algorithm):
-                 if data is None:
--                    return hashlib.new(_alg)
--                return hashlib.new(_alg, data)
-+                    return suppress_fips(hashlib.new)(_alg)
-+                return suppress_fips(hashlib.new)(_alg, data)
-             constructors.add(_test_algorithm_via_hashlib_new)
- 
-         _hashlib = self._conditional_import_module('_hashlib')
-@@ -79,26 +104,12 @@
-             for algorithm, constructors in self.constructors_to_test.items():
-                 constructor = getattr(_hashlib, 'openssl_'+algorithm, None)
-                 if constructor:
--                    constructors.add(constructor)
-+                    constructors.add(suppress_fips(constructor))
- 
-         def add_builtin_constructor(name):
-             constructor = getattr(hashlib, "__get_builtin_constructor")(name)
-             self.constructors_to_test[name].add(constructor)
- 
--        _md5 = self._conditional_import_module('_md5')
--        if _md5:
--            add_builtin_constructor('md5')
--        _sha1 = self._conditional_import_module('_sha1')
--        if _sha1:
--            add_builtin_constructor('sha1')
--        _sha256 = self._conditional_import_module('_sha256')
--        if _sha256:
--            add_builtin_constructor('sha224')
--            add_builtin_constructor('sha256')
--        _sha512 = self._conditional_import_module('_sha512')
--        if _sha512:
--            add_builtin_constructor('sha384')
--            add_builtin_constructor('sha512')
- 
-         super(HashLibTestCase, self).__init__(*args, **kwargs)
- 
-@@ -148,9 +159,6 @@
-             else:
-                 del sys.modules['_md5']
-         self.assertRaises(TypeError, get_builtin_constructor, 3)
--        constructor = get_builtin_constructor('md5')
--        self.assertIs(constructor, _md5.md5)
--        self.assertEqual(sorted(builtin_constructor_cache), ['MD5', 'md5'])
- 
-     def test_hexdigest(self):
-         for cons in self.hash_constructors:
-@@ -433,6 +441,65 @@
- 
-         self.assertEqual(expected_hash, hasher.hexdigest())
- 
-+    def test_issue9146(self):
-+        # Ensure that various ways to use "MD5" from "hashlib" don't segfault:
-+        m = hashlib.md5(usedforsecurity=False)
-+        m.update(b'abc\n')
-+        self.assertEquals(m.hexdigest(), "0bee89b07a248e27c83fc3d5951213c1")
-+        
-+        m = hashlib.new('md5', usedforsecurity=False)
-+        m.update(b'abc\n')
-+        self.assertEquals(m.hexdigest(), "0bee89b07a248e27c83fc3d5951213c1")
-+        
-+        m = hashlib.md5(b'abc\n', usedforsecurity=False)
-+        self.assertEquals(m.hexdigest(), "0bee89b07a248e27c83fc3d5951213c1")
-+        
-+        m = hashlib.new('md5', b'abc\n', usedforsecurity=False)
-+        self.assertEquals(m.hexdigest(), "0bee89b07a248e27c83fc3d5951213c1")
-+
-+    @unittest.skipUnless(OPENSSL_ENFORCES_FIPS,
-+                         'FIPS enforcement required for this test.')
-+    def test_hashlib_fips_mode(self):        
-+        # Ensure that we raise a ValueError on vanilla attempts to use MD5
-+        # in hashlib in a FIPS-enforced setting:
-+        with self.assertRaisesRegexp(ValueError, '.*unknown cipher'):
-+            m = hashlib.md5()
-+            
-+        if not self._conditional_import_module('_md5'):
-+            with self.assertRaisesRegexp(ValueError, '.*unknown cipher'):
-+                m = hashlib.new('md5')
-+
-+    @unittest.skipUnless(OPENSSL_ENFORCES_FIPS,
-+                         'FIPS enforcement required for this test.')
-+    def test_hashopenssl_fips_mode(self):
-+        # Verify the _hashlib module's handling of md5:
-+        _hashlib = self._conditional_import_module('_hashlib')
-+        if _hashlib:
-+            assert hasattr(_hashlib, 'openssl_md5')
-+
-+            # Ensure that _hashlib raises a ValueError on vanilla attempts to
-+            # use MD5 in a FIPS-enforced setting:
-+            with self.assertRaisesRegexp(ValueError, '.*unknown cipher'):
-+                m = _hashlib.openssl_md5()
-+            with self.assertRaisesRegexp(ValueError, '.*unknown cipher'):
-+                m = _hashlib.new('md5')
-+
-+            # Ensure that in such a setting we can whitelist a callsite with
-+            # usedforsecurity=False and have it succeed:
-+            m = _hashlib.openssl_md5(usedforsecurity=False)
-+            m.update(b'abc\n')
-+            self.assertEquals(m.hexdigest(), "0bee89b07a248e27c83fc3d5951213c1")
-+        
-+            m = _hashlib.new('md5', usedforsecurity=False)
-+            m.update(b'abc\n')
-+            self.assertEquals(m.hexdigest(), "0bee89b07a248e27c83fc3d5951213c1")
-+       
-+            m = _hashlib.openssl_md5(b'abc\n', usedforsecurity=False)
-+            self.assertEquals(m.hexdigest(), "0bee89b07a248e27c83fc3d5951213c1")
-+        
-+            m = _hashlib.new('md5', b'abc\n', usedforsecurity=False)
-+            self.assertEquals(m.hexdigest(), "0bee89b07a248e27c83fc3d5951213c1")
-+
- 
- class KDFTests(unittest.TestCase):
- 
-@@ -517,6 +584,7 @@
-             iterations=1, dklen=None)
-         self.assertEqual(out, self.pbkdf2_results['sha1'][0][0])
- 
-+    @unittest.skip('skipped on Fedora, as we always use OpenSSL pbkdf2_hmac')
-     def test_pbkdf2_hmac_py(self):
-         self._test_pbkdf2_hmac(py_hashlib.pbkdf2_hmac)
- 
-diff -Naur Python-3.5.2.orig/Modules/_hashopenssl.c Python-3.5.2/Modules/_hashopenssl.c
---- Python-3.5.2.orig/Modules/_hashopenssl.c	2016-08-26 14:22:28.624434964 +0300
-+++ Python-3.5.2/Modules/_hashopenssl.c	2016-08-26 14:22:28.685434817 +0300
-@@ -20,6 +20,8 @@
- 
- 
- /* EVP is the preferred interface to hashing in OpenSSL */
-+#include <openssl/ssl.h>
-+#include <openssl/err.h>
- #include <openssl/evp.h>
- #include <openssl/hmac.h>
- /* We use the object interface to discover what hashes OpenSSL supports. */
-@@ -45,11 +47,19 @@
- 
- static PyTypeObject EVPtype;
- 
-+/* Struct to hold all the cached information we need on a specific algorithm.
-+   We have one of these per algorithm */
-+typedef struct {
-+    PyObject *name_obj;
-+    EVP_MD_CTX ctxs[2];
-+    /* ctx_ptrs will point to ctxs unless an error occurred, when it will
-+       be NULL: */
-+    EVP_MD_CTX *ctx_ptrs[2];
-+    PyObject *error_msgs[2];
-+} EVPCachedInfo;
- 
--#define DEFINE_CONSTS_FOR_NEW(Name)  \
--    static PyObject *CONST_ ## Name ## _name_obj = NULL; \
--    static EVP_MD_CTX CONST_new_ ## Name ## _ctx; \
--    static EVP_MD_CTX *CONST_new_ ## Name ## _ctx_p = NULL;
-+#define DEFINE_CONSTS_FOR_NEW(Name) \
-+    static EVPCachedInfo cached_info_ ##Name;
- 
- DEFINE_CONSTS_FOR_NEW(md5)
- DEFINE_CONSTS_FOR_NEW(sha1)
-@@ -92,6 +102,48 @@
-     }
- }
- 
-+static void
-+mc_ctx_init(EVP_MD_CTX *ctx, int usedforsecurity)
-+{
-+    EVP_MD_CTX_init(ctx);
-+
-+    /*
-+      If the user has declared that this digest is being used in a
-+      non-security role (e.g. indexing into a data structure), set
-+      the exception flag for openssl to allow it
-+    */
-+    if (!usedforsecurity) {
-+#ifdef EVP_MD_CTX_FLAG_NON_FIPS_ALLOW
-+        EVP_MD_CTX_set_flags(ctx,
-+                             EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
-+#endif
-+    }
-+}
-+
-+/* Get an error msg for the last error as a PyObject */
-+static PyObject *
-+error_msg_for_last_error(void)
-+{
-+    char *errstr;
-+
-+    errstr = ERR_error_string(ERR_peek_last_error(), NULL);
-+    ERR_clear_error();
-+
-+    return PyUnicode_FromString(errstr); /* Can be NULL */
-+}
-+
-+static void
-+set_evp_exception(void)
-+{
-+    char *errstr;
-+
-+    errstr = ERR_error_string(ERR_peek_last_error(), NULL);
-+    ERR_clear_error();
-+
-+    PyErr_SetString(PyExc_ValueError, errstr);
-+}
-+
-+
- /* Internal methods for a hash object */
- 
- static void
-@@ -259,15 +311,16 @@
- static int
- EVP_tp_init(EVPobject *self, PyObject *args, PyObject *kwds)
- {
--    static char *kwlist[] = {"name", "string", NULL};
-+    static char *kwlist[] = {"name", "string", "usedforsecurity", NULL};
-     PyObject *name_obj = NULL;
-     PyObject *data_obj = NULL;
-+    int usedforsecurity = 1;
-     Py_buffer view;
-     char *nameStr;
-     const EVP_MD *digest;
- 
--    if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:HASH", kwlist,
--                                     &name_obj, &data_obj)) {
-+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|Oi:HASH", kwlist,
-+                                     &name_obj, &data_obj, &usedforsecurity)) {
-         return -1;
-     }
- 
-@@ -288,7 +341,12 @@
-             PyBuffer_Release(&view);
-         return -1;
-     }
--    EVP_DigestInit(&self->ctx, digest);
-+    mc_ctx_init(&self->ctx, usedforsecurity);
-+    if (!EVP_DigestInit_ex(&self->ctx, digest, NULL)) {
-+        set_evp_exception();
-+        PyBuffer_Release(&view);
-+        return -1;
-+    }
- 
-     self->name = name_obj;
-     Py_INCREF(self->name);
-@@ -372,7 +430,8 @@
- static PyObject *
- EVPnew(PyObject *name_obj,
-        const EVP_MD *digest, const EVP_MD_CTX *initial_ctx,
--       const unsigned char *cp, Py_ssize_t len)
-+       const unsigned char *cp, Py_ssize_t len,
-+       int usedforsecurity)
- {
-     EVPobject *self;
- 
-@@ -387,7 +446,12 @@
-     if (initial_ctx) {
-         EVP_MD_CTX_copy(&self->ctx, initial_ctx);
-     } else {
--        EVP_DigestInit(&self->ctx, digest);
-+        mc_ctx_init(&self->ctx, usedforsecurity);
-+        if (!EVP_DigestInit_ex(&self->ctx, digest, NULL)) {
-+            set_evp_exception();
-+            Py_DECREF(self);
-+            return NULL;
-+        }
-     }
- 
-     if (cp && len) {
-@@ -411,21 +475,29 @@
- An optional string argument may be provided and will be\n\
- automatically hashed.\n\
- \n\
--The MD5 and SHA1 algorithms are always supported.\n");
-+The MD5 and SHA1 algorithms are always supported.\n\
-+\n\
-+An optional \"usedforsecurity=True\" keyword argument is provided for use in\n\
-+environments that enforce FIPS-based restrictions.  Some implementations of\n\
-+OpenSSL can be configured to prevent the usage of non-secure algorithms (such\n\
-+as MD5).  If you have a non-security use for these algorithms (e.g. a hash\n\
-+table), you can override this argument by marking the callsite as\n\
-+\"usedforsecurity=False\".");
- 
- static PyObject *
- EVP_new(PyObject *self, PyObject *args, PyObject *kwdict)
- {
--    static char *kwlist[] = {"name", "string", NULL};
-+    static char *kwlist[] = {"name", "string", "usedforsecurity", NULL};
-     PyObject *name_obj = NULL;
-     PyObject *data_obj = NULL;
-+    int usedforsecurity = 1;
-     Py_buffer view = { 0 };
-     PyObject *ret_obj;
-     char *name;
-     const EVP_MD *digest;
- 
--    if (!PyArg_ParseTupleAndKeywords(args, kwdict, "O|O:new", kwlist,
--                                     &name_obj, &data_obj)) {
-+    if (!PyArg_ParseTupleAndKeywords(args, kwdict, "O|Oi:new", kwlist,
-+                                     &name_obj, &data_obj, &usedforsecurity)) {
-         return NULL;
-     }
- 
-@@ -439,7 +511,8 @@
- 
-     digest = EVP_get_digestbyname(name);
- 
--    ret_obj = EVPnew(name_obj, digest, NULL, (unsigned char*)view.buf, view.len);
-+    ret_obj = EVPnew(name_obj, digest, NULL, (unsigned char*)view.buf, view.len,
-+                     usedforsecurity);
- 
-     if (data_obj)
-         PyBuffer_Release(&view);
-@@ -722,57 +795,115 @@
- 
- 
- /*
-- *  This macro generates constructor function definitions for specific
-- *  hash algorithms.  These constructors are much faster than calling
-- *  the generic one passing it a python string and are noticably
-- *  faster than calling a python new() wrapper.  Thats important for
-+ *  This macro and function generates a family of constructor function
-+ *  definitions for specific hash algorithms.  These constructors are much
-+ *  faster than calling the generic one passing it a python string and are
-+ *  noticably faster than calling a python new() wrapper.  That's important for
-  *  code that wants to make hashes of a bunch of small strings.
-  */
- #define GEN_CONSTRUCTOR(NAME)  \
-     static PyObject * \
--    EVP_new_ ## NAME (PyObject *self, PyObject *args) \
-+    EVP_new_ ## NAME (PyObject *self, PyObject *args, PyObject *kwdict)        \
-     { \
--        PyObject *data_obj = NULL; \
--        Py_buffer view = { 0 }; \
--        PyObject *ret_obj; \
--     \
--        if (!PyArg_ParseTuple(args, "|O:" #NAME , &data_obj)) { \
--            return NULL; \
--        } \
--     \
--        if (data_obj) \
--            GET_BUFFER_VIEW_OR_ERROUT(data_obj, &view); \
--     \
--        ret_obj = EVPnew( \
--                    CONST_ ## NAME ## _name_obj, \
--                    NULL, \
--                    CONST_new_ ## NAME ## _ctx_p, \
--                    (unsigned char*)view.buf, \
--                    view.len); \
--     \
--        if (data_obj) \
--            PyBuffer_Release(&view); \
--        return ret_obj; \
-+       return implement_specific_EVP_new(self, args, kwdict,      \
-+                                         "|Oi:" #NAME,            \
-+                                         &cached_info_ ## NAME ); \
-+    }
-+
-+static PyObject *
-+implement_specific_EVP_new(PyObject *self, PyObject *args, PyObject *kwdict,
-+                           const char *format,
-+                           EVPCachedInfo *cached_info)
-+{
-+    static char *kwlist[] = {"string", "usedforsecurity", NULL}; 
-+    PyObject *data_obj = NULL;
-+    Py_buffer view = { 0 };
-+    int usedforsecurity = 1;
-+    int idx;
-+    PyObject *ret_obj = NULL;
-+
-+    assert(cached_info);
-+
-+    if (!PyArg_ParseTupleAndKeywords(args, kwdict, format, kwlist,
-+                                     &data_obj, &usedforsecurity)) {
-+        return NULL;
-+    }
-+
-+    if (data_obj)
-+       GET_BUFFER_VIEW_OR_ERROUT(data_obj, &view);
-+
-+    idx = usedforsecurity ? 1 : 0;
-+
-+    /*
-+     * If an error occurred during creation of the global content, the ctx_ptr
-+     * will be NULL, and the error_msg will hopefully be non-NULL:
-+     */
-+    if (cached_info->ctx_ptrs[idx]) {
-+        /* We successfully initialized this context; copy it: */
-+        ret_obj = EVPnew(cached_info->name_obj,
-+                         NULL,
-+                         cached_info->ctx_ptrs[idx],
-+                         (unsigned char*)view.buf, view.len,
-+                         usedforsecurity);
-+    } else {
-+        /* Some kind of error happened initializing the global context for
-+           this (digest, usedforsecurity) pair.
-+           Raise an exception with the saved error message: */
-+        if (cached_info->error_msgs[idx]) {
-+            PyErr_SetObject(PyExc_ValueError, cached_info->error_msgs[idx]);
-+        } else {
-+            PyErr_SetString(PyExc_ValueError, "Error initializing hash");
-+        }
-     }
- 
-+    if (data_obj)
-+        PyBuffer_Release(&view);
-+
-+    return ret_obj;
-+}
-+
- /* a PyMethodDef structure for the constructor */
- #define CONSTRUCTOR_METH_DEF(NAME)  \
--    {"openssl_" #NAME, (PyCFunction)EVP_new_ ## NAME, METH_VARARGS, \
-+    {"openssl_" #NAME, (PyCFunction)EVP_new_ ## NAME, \
-+        METH_VARARGS|METH_KEYWORDS, \
-         PyDoc_STR("Returns a " #NAME \
-                   " hash object; optionally initialized with a string") \
-     }
- 
--/* used in the init function to setup a constructor: initialize OpenSSL
--   constructor constants if they haven't been initialized already.  */
--#define INIT_CONSTRUCTOR_CONSTANTS(NAME)  do { \
--    if (CONST_ ## NAME ## _name_obj == NULL) { \
--        CONST_ ## NAME ## _name_obj = PyUnicode_FromString(#NAME); \
--        if (EVP_get_digestbyname(#NAME)) { \
--            CONST_new_ ## NAME ## _ctx_p = &CONST_new_ ## NAME ## _ctx; \
--            EVP_DigestInit(CONST_new_ ## NAME ## _ctx_p, EVP_get_digestbyname(#NAME)); \
--        } \
--    } \
-+/*
-+  Macro/function pair to set up the constructors.
-+
-+  Try to initialize a context for each hash twice, once with
-+  EVP_MD_CTX_FLAG_NON_FIPS_ALLOW and once without.
-+  
-+  Any that have errors during initialization will end up with a NULL ctx_ptrs
-+  entry, and err_msgs will be set (unless we're very low on memory)
-+*/
-+#define INIT_CONSTRUCTOR_CONSTANTS(NAME)  do {    \
-+    init_constructor_constant(&cached_info_ ## NAME, #NAME); \
- } while (0);
-+static void
-+init_constructor_constant(EVPCachedInfo *cached_info, const char *name)
-+{
-+    assert(cached_info);
-+    cached_info->name_obj = PyUnicode_FromString(name);
-+    if (EVP_get_digestbyname(name)) {
-+        int i;
-+        for (i=0; i<2; i++) {
-+            mc_ctx_init(&cached_info->ctxs[i], i);
-+            if (EVP_DigestInit_ex(&cached_info->ctxs[i],
-+                                  EVP_get_digestbyname(name), NULL)) {
-+                /* Success: */
-+                cached_info->ctx_ptrs[i] = &cached_info->ctxs[i];
-+            } else {
-+                /* Failure: */
-+              cached_info->ctx_ptrs[i] = NULL;
-+              cached_info->error_msgs[i] = error_msg_for_last_error();
-+            }
-+        }
-+    }
-+}
-+
- 
- GEN_CONSTRUCTOR(md5)
- GEN_CONSTRUCTOR(sha1)
-@@ -819,13 +950,10 @@
- {
-     PyObject *m, *openssl_md_meth_names;
- 
--    OpenSSL_add_all_digests();
--    ERR_load_crypto_strings();
-+    SSL_load_error_strings();
-+    SSL_library_init();
- 
--    /* TODO build EVP_functions openssl_* entries dynamically based
--     * on what hashes are supported rather than listing many
--     * but having some be unsupported.  Only init appropriate
--     * constants. */
-+    OpenSSL_add_all_digests();
- 
-     Py_TYPE(&EVPtype) = &PyType_Type;
-     if (PyType_Ready(&EVPtype) < 0)
diff --git a/python3-3.4.0-more-configuration-flags.patch b/python3-3.4.0-more-configuration-flags.patch
deleted file mode 100644
index 1067af1..0000000
--- a/python3-3.4.0-more-configuration-flags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -up Python-3.3.0b1/configure.ac.more-configuration-flags Python-3.3.0b1/configure.ac
---- Python-3.3.0b1/configure.ac.more-configuration-flags	2012-07-20 13:25:33.232864839 -0400
-+++ Python-3.3.0b1/configure.ac	2012-07-20 13:25:33.314863815 -0400
-@@ -2585,6 +2585,30 @@ else AC_MSG_RESULT(no)
- fi],
- [AC_MSG_RESULT(no)])
- 
-+AC_MSG_CHECKING(for --with-count-allocs)
-+AC_ARG_WITH(count-allocs,
-+[  --with(out)count-allocs  enable/disable per-type instance accounting], [
-+if test "$withval" != no
-+then 
-+  AC_DEFINE(COUNT_ALLOCS, 1,
-+    [Define to keep records of the number of instances of each type]) 
-+    AC_MSG_RESULT(yes)
-+else AC_MSG_RESULT(no)
-+fi],
-+[AC_MSG_RESULT(no)])
-+
-+AC_MSG_CHECKING(for --with-call-profile)
-+AC_ARG_WITH(call-profile,
-+[  --with(out)-call-profile  enable/disable statistics on function call invocation], [
-+if test "$withval" != no
-+then 
-+  AC_DEFINE(CALL_PROFILE, 1, 
-+    [Define to keep records on function call invocation]) 
-+    AC_MSG_RESULT(yes)
-+else AC_MSG_RESULT(no)
-+fi],
-+[AC_MSG_RESULT(no)])
-+
- # Check for Python-specific malloc support
- AC_MSG_CHECKING(for --with-pymalloc)
- AC_ARG_WITH(pymalloc,
-diff -up Python-3.3.0b1/pyconfig.h.in.more-configuration-flags Python-3.3.0b1/pyconfig.h.in
---- Python-3.3.0b1/pyconfig.h.in.more-configuration-flags	2012-07-20 13:25:33.000000000 -0400
-+++ Python-3.3.0b1/pyconfig.h.in	2012-07-20 13:26:02.826494869 -0400
-@@ -12,6 +12,12 @@
-    support for AIX C++ shared extension modules. */
- #undef AIX_GENUINE_CPLUSPLUS
- 
-+/* Define to keep records on function call invocation */
-+#undef CALL_PROFILE
-+
-+/* Define to keep records of the number of instances of each type */
-+#undef COUNT_ALLOCS
-+
- /* Define if C doubles are 64-bit IEEE 754 binary format, stored in ARM
-    mixed-endian order (byte order 45670123) */
- #undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754
diff --git a/python3-3.4.0-uid-gid-overflows.patch b/python3-3.4.0-uid-gid-overflows.patch
deleted file mode 100644
index 43bd394..0000000
--- a/python3-3.4.0-uid-gid-overflows.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- Python-3.4.0b1/Lib/test/test_os.py.orig	2013-11-27 12:07:32.368411798 +0100
-+++ Python-3.4.0b1/Lib/test/test_os.py	2013-11-27 12:12:11.220265174 +0100
-@@ -1319,30 +1319,36 @@
-     def test_setuid(self):
-         if os.getuid() != 0:
-             self.assertRaises(OSError, os.setuid, 0)
-+        self.assertRaises(TypeError, os.setuid, 'not an int')
-         self.assertRaises(OverflowError, os.setuid, 1<<32)
- 
-     @unittest.skipUnless(hasattr(os, 'setgid'), 'test needs os.setgid()')
-     def test_setgid(self):
-         if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
-             self.assertRaises(OSError, os.setgid, 0)
-+        self.assertRaises(TypeError, os.setgid, 'not an int')
-         self.assertRaises(OverflowError, os.setgid, 1<<32)
- 
-     @unittest.skipUnless(hasattr(os, 'seteuid'), 'test needs os.seteuid()')
-     def test_seteuid(self):
-         if os.getuid() != 0:
-             self.assertRaises(OSError, os.seteuid, 0)
-+        self.assertRaises(TypeError, os.seteuid, 'not an int')
-         self.assertRaises(OverflowError, os.seteuid, 1<<32)
- 
-     @unittest.skipUnless(hasattr(os, 'setegid'), 'test needs os.setegid()')
-     def test_setegid(self):
-         if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
-             self.assertRaises(OSError, os.setegid, 0)
-+        self.assertRaises(TypeError, os.setegid, 'not an int')
-         self.assertRaises(OverflowError, os.setegid, 1<<32)
- 
-     @unittest.skipUnless(hasattr(os, 'setreuid'), 'test needs os.setreuid()')
-     def test_setreuid(self):
-         if os.getuid() != 0:
-             self.assertRaises(OSError, os.setreuid, 0, 0)
-+        self.assertRaises(TypeError, os.setreuid, 'not an int', 0)
-+        self.assertRaises(TypeError, os.setreuid, 0, 'not an int')
-         self.assertRaises(OverflowError, os.setreuid, 1<<32, 0)
-         self.assertRaises(OverflowError, os.setreuid, 0, 1<<32)
- 
-@@ -1358,6 +1364,8 @@
-     def test_setregid(self):
-         if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
-             self.assertRaises(OSError, os.setregid, 0, 0)
-+        self.assertRaises(TypeError, os.setregid, 'not an int', 0)
-+        self.assertRaises(TypeError, os.setregid, 0, 'not an int')
-         self.assertRaises(OverflowError, os.setregid, 1<<32, 0)
-         self.assertRaises(OverflowError, os.setregid, 0, 1<<32)
- 
---- Python-3.4.0b1/Lib/test/test_pwd.py.orig	2013-11-24 21:36:55.000000000 +0100
-+++ Python-3.4.0b1/Lib/test/test_pwd.py	2013-11-27 12:07:32.369411798 +0100
-@@ -89,9 +89,9 @@
-         # In some cases, byuids isn't a complete list of all users in the
-         # system, so if we try to pick a value not in byuids (via a perturbing
-         # loop, say), pwd.getpwuid() might still be able to find data for that
--        # uid. Using sys.maxint may provoke the same problems, but hopefully
-+        # uid. Using 2**32 - 2 may provoke the same problems, but hopefully
-         # it will be a more repeatable failure.
--        fakeuid = sys.maxsize
-+        fakeuid = 2**32 - 2
-         self.assertNotIn(fakeuid, byuids)
-         self.assertRaises(KeyError, pwd.getpwuid, fakeuid)
- 
diff --git a/python3-3.4.2-distutils-init.patch b/python3-3.4.2-distutils-init.patch
deleted file mode 100644
index 5d0ba49..0000000
--- a/python3-3.4.2-distutils-init.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-# From Debian: Use _sysconfigdata.py in distutils to initialize distutils
-
---- a/Lib/distutils/sysconfig.py	2015-08-29 18:10:19.904450919 +0200
-+++ a/Lib/distutils/sysconfig.py	2015-08-29 18:14:53.452695881 +0200
-@@ -431,38 +431,11 @@
- 
- def _init_posix():
-     """Initialize the module as appropriate for POSIX systems."""
--    g = {}
--    # load the installed Makefile:
--    try:
--        filename = get_makefile_filename()
--        parse_makefile(filename, g)
--    except OSError as msg:
--        my_msg = "invalid Python installation: unable to open %s" % filename
--        if hasattr(msg, "strerror"):
--            my_msg = my_msg + " (%s)" % msg.strerror
--
--        raise DistutilsPlatformError(my_msg)
--
--    # load the installed pyconfig.h:
--    try:
--        filename = get_config_h_filename()
--        with open(filename) as file:
--            parse_config_h(file, g)
--    except OSError as msg:
--        my_msg = "invalid Python installation: unable to open %s" % filename
--        if hasattr(msg, "strerror"):
--            my_msg = my_msg + " (%s)" % msg.strerror
--
--        raise DistutilsPlatformError(my_msg)
--
--    # On AIX, there are wrong paths to the linker scripts in the Makefile
--    # -- these paths are relative to the Python source, but when installed
--    # the scripts are in another directory.
--    if python_build:
--        g['LDSHARED'] = g['BLDSHARED']
--
-+    # _sysconfigdata is generated at build time, see the sysconfig module
-+    from _sysconfigdata import build_time_vars
-     global _config_vars
--    _config_vars = g
-+    _config_vars = {}
-+    _config_vars.update(build_time_vars)
- 
- 
- def _init_nt():
diff --git a/python3-3.4.3-skip-distutils-tests-that-fail-in-rpmbuild.patch b/python3-3.4.3-skip-distutils-tests-that-fail-in-rpmbuild.patch
deleted file mode 100644
index 40c683f..0000000
--- a/python3-3.4.3-skip-distutils-tests-that-fail-in-rpmbuild.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur Python-3.4.3.orig/Lib/distutils/tests/test_bdist_rpm.py Python-3.4.3/Lib/distutils/tests/test_bdist_rpm.py
---- Python-3.4.3.orig/Lib/distutils/tests/test_bdist_rpm.py	2015-02-26 22:32:26.000000000 +0400
-+++ Python-3.4.3/Lib/distutils/tests/test_bdist_rpm.py	2015-02-26 22:32:26.000000000 +0400
-@@ -23,6 +23,7 @@
- 
- """
- 
-+@unittest._skipInRpmBuild("don't try to nest one rpm build inside another rpm build")
- class BuildRpmTestCase(support.TempdirManager,
-                        support.EnvironGuard,
-                        support.LoggingSilencer,
diff --git a/python3-3.5.0-add-rpmbuild-hooks-to-unittest.patch b/python3-3.5.0-add-rpmbuild-hooks-to-unittest.patch
deleted file mode 100644
index 041abce..0000000
--- a/python3-3.5.0-add-rpmbuild-hooks-to-unittest.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -up Python-3.2.2/Lib/unittest/case.py.add-rpmbuild-hooks-to-unittest Python-3.2.2/Lib/unittest/case.py
---- Python-3.2.2/Lib/unittest/case.py.add-rpmbuild-hooks-to-unittest	2011-09-03 12:16:44.000000000 -0400
-+++ Python-3.2.2/Lib/unittest/case.py	2011-09-09 06:35:16.365568382 -0400
-@@ -3,6 +3,7 @@
- import sys
- import functools
- import difflib
-+import os
- import logging
- import pprint
- import re
-@@ -101,5 +102,42 @@ def expectedFailure(func):
-         raise self.test_case.failureException(msg)
- 
-+# Non-standard/downstream-only hooks for handling issues with specific test
-+# cases:
-+
-+def _skipInRpmBuild(reason):
-+    """
-+    Non-standard/downstream-only decorator for marking a specific unit test
-+    to be skipped when run within the %check of an rpmbuild.
-+
-+    Specifically, this takes effect when WITHIN_PYTHON_RPM_BUILD is set within
-+    the environment, and has no effect otherwise.
-+    """
-+    if 'WITHIN_PYTHON_RPM_BUILD' in os.environ:
-+        return skip(reason)
-+    else:
-+        return _id
-+
-+def _expectedFailureInRpmBuild(func):
-+    """
-+    Non-standard/downstream-only decorator for marking a specific unit test
-+    as expected to fail within the %check of an rpmbuild.
-+
-+    Specifically, this takes effect when WITHIN_PYTHON_RPM_BUILD is set within
-+    the environment, and has no effect otherwise.
-+    """
-+    @functools.wraps(func)
-+    def wrapper(*args, **kwargs):
-+        if 'WITHIN_PYTHON_RPM_BUILD' in os.environ:
-+            try:
-+                func(*args, **kwargs)
-+            except Exception:
-+                raise _ExpectedFailure(sys.exc_info())
-+            raise _UnexpectedSuccess
-+        else:
-+            # Call directly:
-+            func(*args, **kwargs)
-+    return wrapper
-+
- class _AssertRaisesBaseContext(_BaseTestCaseContext):
- 
-     def __init__(self, expected, test_case, expected_regex=None):
-diff -up Python-3.2.2/Lib/unittest/__init__.py.add-rpmbuild-hooks-to-unittest Python-3.2.2/Lib/unittest/__init__.py
---- Python-3.2.2/Lib/unittest/__init__.py.add-rpmbuild-hooks-to-unittest	2011-09-03 12:16:44.000000000 -0400
-+++ Python-3.2.2/Lib/unittest/__init__.py	2011-09-09 06:35:16.366568382 -0400
-@@ -57,7 +57,8 @@ __unittest = True
- 
- from .result import TestResult
- from .case import (TestCase, FunctionTestCase, SkipTest, skip, skipIf,
--                   skipUnless, expectedFailure)
-+                   skipUnless, expectedFailure,
-+                   _skipInRpmBuild, _expectedFailureInRpmBuild)
- from .suite import BaseTestSuite, TestSuite
- from .loader import (TestLoader, defaultTestLoader, makeSuite, getTestCaseNames,
-                      findTestCases)
diff --git a/python3-3.5.0-make-libpl-respect-lib64.patch b/python3-3.5.0-make-libpl-respect-lib64.patch
deleted file mode 100644
index 4a6703b..0000000
--- a/python3-3.5.0-make-libpl-respect-lib64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up Python-3.5.0/Makefile.pre.in.lib Python-3.5.0/Makefile.pre.in
---- Python-3.5.0/Makefile.pre.in.lib	2015-09-21 15:39:47.928286620 +0200
-+++ Python-3.5.0/Makefile.pre.in	2015-09-21 15:42:58.004042762 +0200
-@@ -1340,7 +1340,7 @@ inclinstall:
- 
- # Install the library and miscellaneous stuff needed for extending/embedding
- # This goes into $(exec_prefix)
--LIBPL=		@LIBPL@
-+LIBPL=		$(LIBDEST)/config-$(LDVERSION)
- 
- # pkgconfig directory
- LIBPC=		$(LIBDIR)/pkgconfig
diff --git a/python3-3.5.0-no-static-lib.patch b/python3-3.5.0-no-static-lib.patch
deleted file mode 100644
index 4134f98..0000000
--- a/python3-3.5.0-no-static-lib.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -up cpython-59223da36dec/Makefile.pre.in.no-static-lib cpython-59223da36dec/Makefile.pre.in
---- cpython-59223da36dec/Makefile.pre.in.no-static-lib	2012-08-07 16:43:43.296466422 -0400
-+++ cpython-59223da36dec/Makefile.pre.in	2012-08-07 16:44:13.299464371 -0400
-@@ -549,7 +549,7 @@ clinic: $(BUILDPYTHON)
- 	$(RUNSHARED) $(PYTHON_FOR_BUILD) ./Tools/clinic/clinic.py --make
- 
- # Build the interpreter
--$(BUILDPYTHON):	Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
-+$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY)
- 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
- 
- platform: $(BUILDPYTHON) pybuilddir.txt
-@@ -584,18 +584,6 @@ sharedmods: $(BUILDPYTHON) $(SYSCONFIGDA
- 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
- 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
- 
--# Build static library
--# avoid long command lines, same as LIBRARY_OBJS
--$(LIBRARY): $(LIBRARY_OBJS)
--	-rm -f $@
--	$(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
--	$(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
--	$(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
--	$(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o
--	$(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
--	$(AR) $(ARFLAGS) $@ $(MODOBJS)
--	$(RANLIB) $@
--
- libpython$(LDVERSION).so: $(LIBRARY_OBJS)
- 	if test $(INSTSONAME) != $(LDLIBRARY); then \
- 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-@@ -673,7 +673,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.d
- 		echo "-----------------------------------------------"; \
- 	fi
- 
--Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
-+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
- 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
- 
- ############################################################################
-@@ -1345,18 +1345,6 @@ libainstall:	all python-config
- 		else	true; \
- 		fi; \
- 	done
--	@if test -d $(LIBRARY); then :; else \
--		if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
--			if test "$(SHLIB_SUFFIX)" = .dll; then \
--				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
--			else \
--				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
--				$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
--			fi; \
--		else \
--			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
--		fi; \
--	fi
- 	$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
- 	$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
- 	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
diff --git a/python3-3.5.2-fdr-lib64-fix-for-test_install.patch b/python3-3.5.2-fdr-lib64-fix-for-test_install.patch
deleted file mode 100644
index 79923ae..0000000
--- a/python3-3.5.2-fdr-lib64-fix-for-test_install.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit f5f8c02d2ed86f971871e2d3eb524c3e773a9235
-Author: Philippe Makowski <pmakowski@espelida.com>
-Date:   Sun Jul 3 14:29:59 2016 +0200
-
-    fdr-lib64-fix-for-test_install
-
-diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
-index 9313330..3d80e96 100644
---- a/Lib/distutils/tests/test_install.py
-+++ b/Lib/distutils/tests/test_install.py
-@@ -56,8 +56,9 @@ class InstallTestCase(support.TempdirManager,
-             self.assertEqual(got, expected)
- 
-         libdir = os.path.join(destination, "lib", "python")
-+        platlibdir = os.path.join(destination, "lib64", "python")
-         check_path(cmd.install_lib, libdir)
--        check_path(cmd.install_platlib, libdir)
-+        check_path(cmd.install_platlib, platlibdir)
-         check_path(cmd.install_purelib, libdir)
-         check_path(cmd.install_headers,
-                    os.path.join(destination, "include", "python", "foopkg"))
diff --git a/python3-3.5.2-fix-test_gdb-noise.patch b/python3-3.5.2-fix-test_gdb-noise.patch
deleted file mode 100644
index 4eda139..0000000
--- a/python3-3.5.2-fix-test_gdb-noise.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur Python-3.5.2.orig/Lib/test/test_gdb.py Python-3.5.2/Lib/test/test_gdb.py
---- Python-3.5.2.orig/Lib/test/test_gdb.py	2016-08-26 14:24:30.755139630 +0300
-+++ Python-3.5.2/Lib/test/test_gdb.py	2016-08-26 14:24:30.765139606 +0300
-@@ -144,6 +144,14 @@
-         commands = ['set breakpoint pending yes',
-                     'break %s' % breakpoint,
- 
-+                    # GDB as of Fedora 17 onwards can distinguish between the
-+                    # value of a variable at entry vs current value:
-+                    #   http://sourceware.org/gdb/onlinedocs/gdb/Variables.html
-+                    # which leads to the selftests failing with errors like this:
-+                    #   AssertionError: 'v@entry=()' != '()'
-+                    # Disable this:
-+                    'set print entry-values no',
-+
-                     # The tests assume that the first frame of printed
-                     #  backtrace will not contain program counter,
-                     #  that is however not guaranteed by gdb
-@@ -206,6 +214,10 @@
-             # ignore all warnings
-             'warning: ',
-             )
-+        ignore_patterns += ('warning: Unable to open',
-+                            'Missing separate debuginfo for',
-+                            'Try: yum --disablerepo=',
-+                            'Undefined set print command')
-         for line in errlines:
-             if not line:
-                 continue
diff --git a/python3-3.5.2-module-linkage.patch b/python3-3.5.2-module-linkage.patch
deleted file mode 100644
index 118a7f5..0000000
--- a/python3-3.5.2-module-linkage.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur Python-3.5.2.orig/setup.py Python-3.5.2/setup.py
---- Python-3.5.2.orig/setup.py	2016-08-26 14:18:13.959050012 +0300
-+++ Python-3.5.2/setup.py	2016-08-26 14:19:17.015897822 +0300
-@@ -616,7 +616,7 @@
-                                libraries=math_libs) )
- 
-         # time libraries: librt may be needed for clock_gettime()
--        time_libs = []
-+        time_libs = ['m']
-         lib = sysconfig.get_config_var('TIMEMODULE_LIB')
-         if lib:
-             time_libs.append(lib)
-@@ -1975,7 +1975,7 @@
-                         include_dirs=include_dirs,
-                         extra_compile_args=extra_compile_args,
-                         extra_link_args=extra_link_args,
--                        libraries=[],
-+                        libraries=['m', 'dl'],
-                         sources=sources,
-                         depends=depends)
-         # function my_sqrt() needs math library for sqrt()
-@@ -2031,7 +2031,7 @@
-                                                          'Modules',
-                                                          '_decimal',
-                                                          'libmpdec'))]
--            libraries = []
-+            libraries = ['m']
-             sources = [
-               '_decimal/_decimal.c',
-               '_decimal/libmpdec/basearith.c',
diff --git a/python3-3.5.2-multilib.patch b/python3-3.5.2-multilib.patch
deleted file mode 100644
index 4cd86da..0000000
--- a/python3-3.5.2-multilib.patch
+++ /dev/null
@@ -1,340 +0,0 @@
-diff -Naur Python-3.5.2.orig/configure.ac Python-3.5.2.new/configure.ac
---- Python-3.5.2.orig/configure.ac	2018-02-14 17:15:38.443097227 +0300
-+++ Python-3.5.2.new/configure.ac	2018-02-14 17:17:45.846734280 +0300
-@@ -876,6 +876,41 @@
- AC_SUBST(PLATDIR)
- AC_SUBST(PLATFORM_TRIPLET)
- 
-+AC_SUBST(ARCH)
-+AC_MSG_CHECKING(ARCH)
-+ARCH=`uname -m`
-+case $ARCH in
-+i?86) ARCH=i386;;
-+esac
-+AC_MSG_RESULT($ARCH)
-+
-+AC_SUBST(LIB)
-+AC_MSG_CHECKING(LIB)
-+case $ac_sys_system in
-+Linux*)
-+  # Test if the compiler is 64bit
-+  echo 'int i;' > conftest.$ac_ext
-+  python_cv_cc_64bit_output=no
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *"ELF 64"*)
-+      python_cv_cc_64bit_output=yes
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+esac
-+
-+case $ARCH:$python_cv_cc_64bit_output in
-+ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
-+  LIB="lib64"
-+  ;;
-+*:*)
-+  LIB="lib"
-+  ;;
-+esac
-+AC_MSG_RESULT($LIB)
- 
- AC_MSG_CHECKING([for -Wl,--no-as-needed])
- save_LDFLAGS="$LDFLAGS"
-diff -Naur Python-3.5.2.orig/Include/pythonrun.h Python-3.5.2.new/Include/pythonrun.h
---- Python-3.5.2.orig/Include/pythonrun.h	2018-02-14 17:15:38.393097369 +0300
-+++ Python-3.5.2.new/Include/pythonrun.h	2018-02-14 17:17:45.844734286 +0300
-@@ -23,6 +23,9 @@
- } PyCompilerFlags;
- #endif
- 
-+PyAPI_FUNC(const char *) Py_GetArch(void);
-+PyAPI_FUNC(const char *) Py_GetLib(void);
-+
- #ifndef Py_LIMITED_API
- PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *);
- PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *);
-diff -Naur Python-3.5.2.orig/Lib/distutils/command/install.py Python-3.5.2.new/Lib/distutils/command/install.py
---- Python-3.5.2.orig/Lib/distutils/command/install.py	2018-02-14 17:15:38.465097164 +0300
-+++ Python-3.5.2.new/Lib/distutils/command/install.py	2018-02-14 17:17:45.844734286 +0300
-@@ -19,6 +19,8 @@
- from site import USER_SITE
- HAS_USER_SITE = True
- 
-+libname = sys.lib
-+
- WINDOWS_SCHEME = {
-     'purelib': '$base/Lib/site-packages',
-     'platlib': '$base/Lib/site-packages',
-@@ -30,7 +32,7 @@
- INSTALL_SCHEMES = {
-     'unix_prefix': {
-         'purelib': '$base/lib/python$py_version_short/site-packages',
--        'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+        'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
-         'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-diff -Naur Python-3.5.2.orig/Lib/distutils/sysconfig.py Python-3.5.2.new/Lib/distutils/sysconfig.py
---- Python-3.5.2.orig/Lib/distutils/sysconfig.py	2018-02-14 17:15:38.465097164 +0300
-+++ Python-3.5.2.new/Lib/distutils/sysconfig.py	2018-02-15 13:37:37.327823379 +0300
-@@ -132,8 +132,12 @@
-             prefix = plat_specific and EXEC_PREFIX or PREFIX
- 
-     if os.name == "posix":
-+        if plat_specific:
-+            lib = sys.lib
-+        else:
-+            lib = 'lib'
-         libpython = os.path.join(prefix,
--                                 "lib", "python" + get_python_version())
-+                                 lib, "python" + get_python_version())
-         if standard_lib:
-             return libpython
-         else:
-diff -Naur Python-3.5.2.orig/Lib/pydoc.py Python-3.5.2.new/Lib/pydoc.py
---- Python-3.5.2.orig/Lib/pydoc.py	2018-02-14 17:15:38.463097169 +0300
-+++ Python-3.5.2.new/Lib/pydoc.py	2018-02-14 17:17:45.845734283 +0300
-@@ -384,7 +384,7 @@
-     docmodule = docclass = docroutine = docother = docproperty = docdata = fail
- 
-     def getdocloc(self, object,
--                  basedir=os.path.join(sys.base_exec_prefix, "lib",
-+                  basedir=os.path.join(sys.base_exec_prefix, sys.lib,
-                                        "python%d.%d" %  sys.version_info[:2])):
-         """Return the location of module docs or None"""
- 
-diff -Naur Python-3.5.2.orig/Lib/site.py Python-3.5.2.new/Lib/site.py
---- Python-3.5.2.orig/Lib/site.py	2018-02-14 17:15:38.455097192 +0300
-+++ Python-3.5.2.new/Lib/site.py	2018-02-15 12:44:40.357844949 +0300
-@@ -303,12 +303,16 @@
-         seen.add(prefix)
- 
-         if os.sep == '/':
--            sitepackages.append(os.path.join(prefix, "lib",
-+            sitepackages.append(os.path.join(prefix, sys.lib,
-                                         "python" + sys.version[:3],
-                                         "site-packages"))
-+            if sys.lib != 'lib':
-+                    sitepackages.append(os.path.join(prefix, 'lib',
-+                                                     "python" + sys.version[:3],
-+                                                     "site-packages"))
-         else:
-             sitepackages.append(prefix)
--            sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
-+            sitepackages.append(os.path.join(prefix, sys.lib, "site-packages"))
-         if sys.platform == "darwin":
-             # for framework builds *only* we add the standard Apple
-             # locations.
-diff -Naur Python-3.5.2.orig/Lib/sysconfig.py Python-3.5.2.new/Lib/sysconfig.py
---- Python-3.5.2.orig/Lib/sysconfig.py	2018-02-14 17:15:38.462097172 +0300
-+++ Python-3.5.2.new/Lib/sysconfig.py	2018-02-14 17:17:45.845734283 +0300
-@@ -20,10 +20,10 @@
- 
- _INSTALL_SCHEMES = {
-     'posix_prefix': {
--        'stdlib': '{installed_base}/lib/python{py_version_short}',
--        'platstdlib': '{platbase}/lib/python{py_version_short}',
-+        'stdlib': '{installed_base}/'+sys.lib+'/python{py_version_short}',
-+        'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}',
-         'purelib': '{base}/lib/python{py_version_short}/site-packages',
--        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
-+        'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages',
-         'include':
-             '{installed_base}/include/python{py_version_short}{abiflags}',
-         'platinclude':
-@@ -32,10 +32,10 @@
-         'data': '{base}',
-         },
-     'posix_home': {
--        'stdlib': '{installed_base}/lib/python',
--        'platstdlib': '{base}/lib/python',
-+        'stdlib': '{installed_base}/'+sys.lib+'/python',
-+        'platstdlib': '{base}/'+sys.lib+'/python',
-         'purelib': '{base}/lib/python',
--        'platlib': '{base}/lib/python',
-+        'platlib': '{base}/'+sys.lib+'/python',
-         'include': '{installed_base}/include/python',
-         'platinclude': '{installed_base}/include/python',
-         'scripts': '{base}/bin',
-@@ -61,10 +61,10 @@
-         'data': '{userbase}',
-         },
-     'posix_user': {
--        'stdlib': '{userbase}/lib/python{py_version_short}',
--        'platstdlib': '{userbase}/lib/python{py_version_short}',
-+        'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
-+        'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
-         'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
--        'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
-+        'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages',
-         'include': '{userbase}/include/python{py_version_short}',
-         'scripts': '{userbase}/bin',
-         'data': '{userbase}',
-diff -Naur Python-3.5.2.orig/Lib/trace.py Python-3.5.2.new/Lib/trace.py
---- Python-3.5.2.orig/Lib/trace.py	2018-02-14 17:15:38.461097175 +0300
-+++ Python-3.5.2.new/Lib/trace.py	2018-02-14 17:17:45.845734283 +0300
-@@ -749,10 +749,10 @@
-                 # should I also call expanduser? (after all, could use $HOME)
- 
-                 s = s.replace("$prefix",
--                              os.path.join(sys.base_prefix, "lib",
-+                              os.path.join(sys.base_prefix, sys.lib,
-                                            "python" + sys.version[:3]))
-                 s = s.replace("$exec_prefix",
--                              os.path.join(sys.base_exec_prefix, "lib",
-+                              os.path.join(sys.base_exec_prefix, sys.lib,
-                                            "python" + sys.version[:3]))
-                 s = os.path.normpath(s)
-                 ignore_dirs.append(s)
-diff -Naur Python-3.5.2.orig/Makefile.pre.in Python-3.5.2.new/Makefile.pre.in
---- Python-3.5.2.orig/Makefile.pre.in	2018-02-14 17:15:38.394097367 +0300
-+++ Python-3.5.2.new/Makefile.pre.in	2018-02-14 17:17:45.845734283 +0300
-@@ -106,6 +106,8 @@
- 
- # Machine-dependent subdirectories
- MACHDEP=	@MACHDEP@
-+LIB=		@LIB@
-+ARCH=		@ARCH@
- 
- # Multiarch directory (may be empty)
- MULTIARCH=	@MULTIARCH@
-@@ -125,7 +127,7 @@
- MANDIR=		@mandir@
- INCLUDEDIR=	@includedir@
- CONFINCLUDEDIR=	$(exec_prefix)/include
--SCRIPTDIR=	$(prefix)/lib
-+SCRIPTDIR=	@libdir@
- ABIFLAGS=	@ABIFLAGS@
- 
- # Detailed destination directories
-@@ -753,6 +755,7 @@
- 		-DEXEC_PREFIX='"$(exec_prefix)"' \
- 		-DVERSION='"$(VERSION)"' \
- 		-DVPATH='"$(VPATH)"' \
-+		-DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' \
- 		-o $@ $(srcdir)/Modules/getpath.c
- 
- Programs/python.o: $(srcdir)/Programs/python.c
-@@ -833,7 +836,7 @@
- Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
- 
- Python/getplatform.o: $(srcdir)/Python/getplatform.c
--		$(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
-+		$(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c
- 
- Python/importdl.o: $(srcdir)/Python/importdl.c
- 		$(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
-diff -Naur Python-3.5.2.orig/Modules/getpath.c Python-3.5.2.new/Modules/getpath.c
---- Python-3.5.2.orig/Modules/getpath.c	2018-02-14 17:15:38.427097272 +0300
-+++ Python-3.5.2.new/Modules/getpath.c	2018-02-14 17:17:45.845734283 +0300
-@@ -105,6 +105,13 @@
- #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
- #endif
- 
-+#define LIB_PYTHON LIB "/python" VERSION
-+
-+#ifndef PYTHONPATH
-+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
-+        EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
-+#endif
-+
- #ifndef LANDMARK
- #define LANDMARK L"os.py"
- #endif
-@@ -113,6 +120,7 @@
- static wchar_t exec_prefix[MAXPATHLEN+1];
- static wchar_t progpath[MAXPATHLEN+1];
- static wchar_t *module_search_path = NULL;
-+static wchar_t *lib_python = L"" LIB_PYTHON;
- 
- /* Get file status. Encode the path to the locale encoding. */
- 
-@@ -494,7 +502,7 @@
-     _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL);
-     _prefix = Py_DecodeLocale(PREFIX, NULL);
-     _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL);
--    lib_python = Py_DecodeLocale("lib/python" VERSION, NULL);
-+    lib_python = Py_DecodeLocale(LIB_PYTHON, NULL);
- 
-     if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
-         Py_FatalError(
-diff -Naur Python-3.5.2.orig/Python/getplatform.c Python-3.5.2.new/Python/getplatform.c
---- Python-3.5.2.orig/Python/getplatform.c	2018-02-14 17:15:38.447097215 +0300
-+++ Python-3.5.2.new/Python/getplatform.c	2018-02-14 17:17:45.845734283 +0300
-@@ -10,3 +10,23 @@
- {
- 	return PLATFORM;
- }
-+
-+#ifndef ARCH
-+#define ARCH "unknown"
-+#endif
-+
-+const char *
-+Py_GetArch(void)
-+{
-+	return ARCH;
-+}
-+
-+#ifndef LIB
-+#define LIB "lib"
-+#endif
-+
-+const char *
-+Py_GetLib(void)
-+{
-+	return LIB;
-+}
-diff -Naur Python-3.5.2.orig/Python/sysmodule.c Python-3.5.2.new/Python/sysmodule.c
---- Python-3.5.2.orig/Python/sysmodule.c	2018-02-14 17:15:38.447097215 +0300
-+++ Python-3.5.2.new/Python/sysmodule.c	2018-02-14 17:17:45.845734283 +0300
-@@ -1790,6 +1790,10 @@
-                         PyUnicode_FromString(Py_GetCopyright()));
-     SET_SYS_FROM_STRING("platform",
-                         PyUnicode_FromString(Py_GetPlatform()));
-+    SET_SYS_FROM_STRING("arch",
-+                        PyUnicode_FromString(Py_GetArch()));
-+    SET_SYS_FROM_STRING("lib",
-+                        PyUnicode_FromString(Py_GetLib()));
-     SET_SYS_FROM_STRING("executable",
-                         PyUnicode_FromWideChar(
-                                Py_GetProgramFullPath(), -1));
-diff -Naur Python-3.5.2.orig/setup.py Python-3.5.2.new/setup.py
---- Python-3.5.2.orig/setup.py	2018-02-14 17:15:38.447097215 +0300
-+++ Python-3.5.2.new/setup.py	2018-02-14 17:17:45.846734280 +0300
-@@ -492,7 +492,7 @@
-         # directories (i.e. '.' and 'Include') must be first.  See issue
-         # 10520.
-         if not cross_compiling:
--            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+            add_dir_to_list(self.compiler.library_dirs, os.path.join('/usr/local', sys.lib))
-             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-         # only change this for cross builds for 3.3, issues on Mageia
-         if cross_compiling:
-@@ -549,8 +549,7 @@
-         # be assumed that no additional -I,-L directives are needed.
-         if not cross_compiling:
-             lib_dirs = self.compiler.library_dirs + [
--                '/lib64', '/usr/lib64',
--                '/lib', '/usr/lib',
-+                '/' + sys.lib, '/usr/' + sys.lib,
-                 ]
-             inc_dirs = self.compiler.include_dirs + ['/usr/include']
-         else:
-@@ -780,11 +779,11 @@
-             elif curses_library:
-                 readline_libs.append(curses_library)
-             elif self.compiler.find_library_file(lib_dirs +
--                                                     ['/usr/lib/termcap'],
-+                                                     ['/usr/'+sys.lib+'/termcap'],
-                                                      'termcap'):
-                 readline_libs.append('termcap')
-             exts.append( Extension('readline', ['readline.c'],
--                                   library_dirs=['/usr/lib/termcap'],
-+                                   library_dirs=['/usr/'+sys.lib+'/termcap'],
-                                    extra_link_args=readline_extra_link_args,
-                                    libraries=readline_libs) )
-         else:
diff --git a/python3.spec b/python3.spec
index 1b56f0e..57c69c8 100644
--- a/python3.spec
+++ b/python3.spec
@@ -33,7 +33,7 @@
 Summary:        An interpreted, interactive object-oriented programming language
 Name:           python3
 Version:        3.8.1
-Release:        9
+Release:        10
 License:        Modified CNRI Open Source License
 Group:          Development/Python