Enable https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup on power and arm

https://bugzilla.redhat.com/show_bug.cgi?id=1795575 is "fixed for almost a month"

.gitignore

@@ -1 +1,3 @@
 /*.tar.*
+/*.src.rpm
+/results_python3*

00001-rpath.patch

@@ -0,0 +1,33 @@
+From bf01d6c367d9cb8f6594afa87c16f0498ae7321f Mon Sep 17 00:00:00 2001
+From: David Malcolm <dmalcolm@redhat.com>
+Date: Wed, 13 Jan 2010 21:25:18 +0000
+Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard
+ library path from rpath Was Patch0 in ivazquez' python3000 specfile
+
+---
+ Lib/distutils/unixccompiler.py | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
+index d10a78da31..4df4b67810 100644
+--- a/Lib/distutils/unixccompiler.py
++++ b/Lib/distutils/unixccompiler.py
+@@ -82,6 +82,15 @@ class UnixCCompiler(CCompiler):
+     if sys.platform == "cygwin":
+         exe_extension = ".exe"
+ 
++    def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
++        """Remove standard library path from rpath"""
++        libraries, library_dirs, runtime_library_dirs = super()._fix_lib_args(
++            libraries, library_dirs, runtime_library_dirs)
++        libdir = sysconfig.get_config_var('LIBDIR')
++        if runtime_library_dirs and (libdir in runtime_library_dirs):
++            runtime_library_dirs.remove(libdir)
++        return libraries, library_dirs, runtime_library_dirs
++
+     def preprocess(self, source, output_file=None, macros=None,
+                    include_dirs=None, extra_preargs=None, extra_postargs=None):
+         fixed_args = self._fix_compile_args(None, macros, include_dirs)
+-- 
+2.24.1
+

00003-remove-mimeaudio-tests.patch

@@ -1,51 +0,0 @@
-diff -up Python-3.3.0rc1/Lib/test/test_email/test_email.py.remove-mimeaudio-tests Python-3.3.0rc1/Lib/test/test_email/test_email.py
---- Python-3.3.0rc1/Lib/test/test_email/test_email.py.remove-mimeaudio-tests	2012-08-25 15:22:10.000000000 -0400
-+++ Python-3.3.0rc1/Lib/test/test_email/test_email.py	2012-08-27 11:00:11.936964586 -0400
-@@ -1321,47 +1321,6 @@ Blah blah blah
-         self.assertEqual(b.getvalue(), source + b'>From R\xc3\xb6lli\n')
- 
- 
--# Test the basic MIMEAudio class
--class TestMIMEAudio(unittest.TestCase):
--    def setUp(self):
--        with openfile('audiotest.au', 'rb') as fp:
--            self._audiodata = fp.read()
--        self._au = MIMEAudio(self._audiodata)
--
--    def test_guess_minor_type(self):
--        self.assertEqual(self._au.get_content_type(), 'audio/basic')
--
--    def test_encoding(self):
--        payload = self._au.get_payload()
--        self.assertEqual(base64.decodebytes(bytes(payload, 'ascii')),
--                self._audiodata)
--
--    def test_checkSetMinor(self):
--        au = MIMEAudio(self._audiodata, 'fish')
--        self.assertEqual(au.get_content_type(), 'audio/fish')
--
--    def test_add_header(self):
--        eq = self.assertEqual
--        unless = self.assertTrue
--        self._au.add_header('Content-Disposition', 'attachment',
--                            filename='audiotest.au')
--        eq(self._au['content-disposition'],
--           'attachment; filename="audiotest.au"')
--        eq(self._au.get_params(header='content-disposition'),
--           [('attachment', ''), ('filename', 'audiotest.au')])
--        eq(self._au.get_param('filename', header='content-disposition'),
--           'audiotest.au')
--        missing = []
--        eq(self._au.get_param('attachment', header='content-disposition'), '')
--        unless(self._au.get_param('foo', failobj=missing,
--                                  header='content-disposition') is missing)
--        # Try some missing stuff
--        unless(self._au.get_param('foobar', missing) is missing)
--        unless(self._au.get_param('attachment', missing,
--                                  header='foobar') is missing)
--
--
--
- # Test the basic MIMEImage class
- class TestMIMEImage(unittest.TestCase):
-     def setUp(self):

00055-systemtap.patch

@@ -1,837 +0,0 @@
-diff -up Python-3.3.0rc2/configure.ac.systemtap Python-3.3.0rc2/configure.ac
---- Python-3.3.0rc2/configure.ac.systemtap	2012-09-09 05:11:14.000000000 -0400
-+++ Python-3.3.0rc2/configure.ac	2012-09-10 09:17:21.114511781 -0400
-@@ -2678,6 +2678,23 @@ if test "$with_valgrind" != no; then
-     OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT"
- fi
- 
-+# Check for systemtap support
-+# On Linux, /usr/bin/dtrace is in fact a shim to SystemTap
-+AC_MSG_CHECKING([for --with-systemtap])
-+AC_ARG_WITH([systemtap],
-+            AC_HELP_STRING([--with(out)-systemtap], [disable/enable SystemTap support]),,
-+            with_systemtap=no)
-+AC_MSG_RESULT([$with_systemtap])
-+if test "$with_systemtap" != no; then
-+    AC_DEFINE(WITH_SYSTEMTAP, 1,
-+        [Define if you want to compile in SystemTap support])
-+    SYSTEMTAPOBJS="Python/pysystemtap.o"
-+    SYSTEMTAPDEPS="\$(srcdir)/Python/pysystemtap.h"
-+fi
-+
-+AC_SUBST(SYSTEMTAPOBJS)
-+AC_SUBST(SYSTEMTAPDEPS)
-+
- # -I${DLINCLDIR} is added to the compile rule for importdl.o
- AC_SUBST(DLINCLDIR)
- DLINCLDIR=.
-diff -up Python-3.3.0rc2/configure.systemtap Python-3.3.0rc2/configure
---- Python-3.3.0rc2/configure.systemtap	2012-09-09 05:11:14.000000000 -0400
-+++ Python-3.3.0rc2/configure	2012-09-10 09:17:21.116511780 -0400
-@@ -618,6 +618,8 @@ TRUE
- MACHDEP_OBJS
- DYNLOADFILE
- DLINCLDIR
-+SYSTEMTAPDEPS
-+SYSTEMTAPOBJS
- THREADOBJ
- LDLAST
- USE_THREAD_MODULE
-@@ -779,6 +781,7 @@ with_doc_strings
- with_tsc
- with_pymalloc
- with_valgrind
-+with_systemtap
- with_fpectl
- with_libm
- with_libc
-@@ -1456,6 +1459,7 @@ Optional Packages:
-   --with(out)-tsc         enable/disable timestamp counter profile
-   --with(out)-pymalloc    disable/enable specialized mallocs
-   --with-valgrind         Enable Valgrind support
-+  --with(out)-systemtap   disable/enable SystemTap support
-   --with-fpectl           enable SIGFPE catching
-   --with-libm=STRING      math library
-   --with-libc=STRING      C library
-@@ -10065,6 +10069,31 @@ fi
-     OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT"
- fi
- 
-+# Check for systemtap support
-+# On Linux, /usr/bin/dtrace is in fact a shim to SystemTap
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-systemtap" >&5
-+$as_echo_n "checking for --with-systemtap... " >&6; }
-+
-+# Check whether --with-systemtap was given.
-+if test "${with_systemtap+set}" = set; then :
-+  withval=$with_systemtap;
-+else
-+  with_systemtap=no
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_systemtap" >&5
-+$as_echo "$with_systemtap" >&6; }
-+if test "$with_systemtap" != no; then
-+
-+$as_echo "#define WITH_SYSTEMTAP 1" >>confdefs.h
-+
-+    SYSTEMTAPOBJS="Python/pysystemtap.o"
-+    SYSTEMTAPDEPS="\$(srcdir)/Python/pysystemtap.h"
-+fi
-+
-+
-+
-+
- # -I${DLINCLDIR} is added to the compile rule for importdl.o
- 
- DLINCLDIR=.
-diff -up Python-3.3.0rc2/Doc/howto/index.rst.systemtap Python-3.3.0rc2/Doc/howto/index.rst
---- Python-3.3.0rc2/Doc/howto/index.rst.systemtap	2012-09-09 05:10:51.000000000 -0400
-+++ Python-3.3.0rc2/Doc/howto/index.rst	2012-09-10 09:17:21.117511779 -0400
-@@ -29,4 +29,5 @@ Currently, the HOWTOs are:
-    argparse.rst
-    ipaddress.rst
-    clinic.rst
-+   instrumentation.rst
- 
-diff -up Python-3.3.0rc2/Doc/howto/instrumentation.rst.systemtap Python-3.3.0rc2/Doc/howto/instrumentation.rst
---- Python-3.3.0rc2/Doc/howto/instrumentation.rst.systemtap	2012-09-10 09:17:21.117511779 -0400
-+++ Python-3.3.0rc2/Doc/howto/instrumentation.rst	2012-09-10 09:17:21.117511779 -0400
-@@ -0,0 +1,295 @@
-+.. _instrumentation:
-+
-+====================================
-+Instrumenting CPython with SystemTap
-+====================================
-+
-+:author: David Malcolm <dmalcolm@redhat.com>
-+
-+DTrace and SystemTap are monitoring tools, each providing a way to inspect
-+what the processes on a computer system are doing.  They both use
-+domain-specific languages allowing a user to write scripts which:
-+
-+  - filter which processes are to be observed
-+  - gather data from the processes of interest
-+  - generate reports on the data
-+
-+As of Python 3.3, CPython can be built with embedded "markers" that can be
-+observed by a SystemTap script, making it easier to monitor what the CPython
-+processes on a system are doing.
-+
-+.. Potentially this document could be expanded to also cover DTrace markers.
-+   However, I'm not a DTrace expert.
-+
-+.. I'm using ".. code-block:: c" for SystemTap scripts, as "c" is syntactically
-+   the closest match that Sphinx supports
-+
-+
-+Enabling the static markers
-+---------------------------
-+
-+In order to build CPython with the embedded markers for SystemTap, the
-+SystemTap development tools must be installed.
-+
-+On a Fedora or Red Hat Enterprise Linux machine, this can be done via::
-+
-+   yum install systemtap-sdt-devel
-+
-+CPython must then be configured `--with-systemtap`::
-+
-+   checking for --with-systemtap... yes
-+
-+You can verify if the SystemTap static markers are present in the built
-+binary by seeing if it contains a ".note.stapsdt" section.
-+
-+.. code-block:: bash
-+
-+   $ eu-readelf -S ./python | grep .note.stapsdt
-+   [29] .note.stapsdt        NOTE         0000000000000000 00308d78 000000b8  0        0   0  4
-+
-+If you've built python as a shared library (with --enable-shared), you need
-+to look instead within the shared library.  For example:
-+
-+.. code-block:: bash
-+
-+   $ eu-readelf -S libpython3.3dm.so.1.0 | grep .note.stapsdt
-+   [28] .note.stapsdt        NOTE         0000000000000000 00365b68 000000b8  0        0   0  4
-+
-+Earlier versions of SystemTap stored the markers in a ".probes" section.
-+
-+For the curious, you can see the metadata for the static markers using this
-+invocation.
-+
-+.. code-block:: bash
-+
-+  $ eu-readelf -x .note.stapsdt ./python
-+
-+  Hex dump of section [29] '.note.stapsdt', 184 bytes at offset 0x308d78:
-+    0x00000000 08000000 45000000 03000000 73746170 ....E.......stap
-+    0x00000010 73647400 d4664b00 00000000 4fc36600 sdt..fK.....O.f.
-+    0x00000020 00000000 488d9000 00000000 70797468 ....H.......pyth
-+    0x00000030 6f6e0066 756e6374 696f6e5f 5f656e74 on.function__ent
-+    0x00000040 72790038 40257261 78203840 25726478 ry.8@%rax 8@%rdx
-+    0x00000050 202d3440 25656378 00000000 08000000  -4@%ecx........
-+    0x00000060 46000000 03000000 73746170 73647400 F.......stapsdt.
-+    0x00000070 0d674b00 00000000 4fc36600 00000000 .gK.....O.f.....
-+    0x00000080 4a8d9000 00000000 70797468 6f6e0066 J.......python.f
-+    0x00000090 756e6374 696f6e5f 5f726574 75726e00 unction__return.
-+    0x000000a0 38402572 61782038 40257264 78202d34 8@%rax 8@%rdx -4
-+    0x000000b0 40256563 78000000                   @%ecx...
-+
-+and a sufficiently modern eu-readelf can print the metadata:
-+
-+.. code-block:: bash
-+
-+  $ eu-readelf -n ./python
-+
-+  Note section [ 1] '.note.gnu.build-id' of 36 bytes at offset 0x190:
-+    Owner          Data size  Type
-+    GNU                   20  GNU_BUILD_ID
-+      Build ID: a28f8db1b224530b0d38ad7b82a249cf7c3f18d6
-+
-+  Note section [27] '.note.stapsdt' of 184 bytes at offset 0x1ae884:
-+    Owner          Data size  Type
-+    stapsdt               70  Version: 3
-+      PC: 0xe0d3a, Base: 0x14b150, Semaphore: 0x3ae882
-+      Provider: python, Name: function__return, Args: '8@%rbx 8@%r13 -4@%eax'
-+    stapsdt               69  Version: 3
-+      PC: 0xe0f37, Base: 0x14b150, Semaphore: 0x3ae880
-+      Provider: python, Name: function__entry, Args: '8@%rbx 8@%r13 -4@%eax'
-+
-+The above metadata contains information for SystemTap describing how it can
-+patch strategically-placed machine code instructions to enable the tracing
-+hooks used by a SystemTap script.
-+
-+
-+Static markers
-+--------------
-+
-+The low-level way to use the SystemTap integration is to use the static
-+markers directly.  This requires you to explicitly state the binary file
-+containing them.
-+
-+For example, this script can be used to show the call/return hierarchy of a
-+Python script:
-+
-+.. code-block:: c
-+
-+   probe process('python').mark("function__entry") {
-+        filename = user_string($arg1);
-+        funcname = user_string($arg2);
-+        lineno = $arg3;
-+
-+        printf("%s => %s in %s:%d\\n",
-+               thread_indent(1), funcname, filename, lineno);
-+   }
-+
-+   probe process('python').mark("function__return") {
-+       filename = user_string($arg1);
-+       funcname = user_string($arg2);
-+       lineno = $arg3;
-+
-+       printf("%s <= %s in %s:%d\\n",
-+              thread_indent(-1), funcname, filename, lineno);
-+   }
-+
-+It can be invoked like this:
-+
-+.. code-block:: bash
-+
-+   $ stap \
-+     show-call-hierarchy.stp \
-+     -c ./python test.py
-+
-+The output looks like this::
-+
-+   11408 python(8274):        => __contains__ in Lib/_abcoll.py:362
-+   11414 python(8274):         => __getitem__ in Lib/os.py:425
-+   11418 python(8274):          => encode in Lib/os.py:490
-+   11424 python(8274):          <= encode in Lib/os.py:493
-+   11428 python(8274):         <= __getitem__ in Lib/os.py:426
-+   11433 python(8274):        <= __contains__ in Lib/_abcoll.py:366
-+
-+where the columns are:
-+
-+  - time in microseconds since start of script
-+
-+  - name of executable
-+
-+  - PID of process
-+
-+and the remainder indicates the call/return hierarchy as the script executes.
-+
-+For a `--enable-shared` build of CPython, the markers are contained within the
-+libpython shared library, and the probe's dotted path needs to reflect this. For
-+example, this line from the above example::
-+
-+   probe process('python').mark("function__entry") {
-+
-+should instead read::
-+
-+   probe process('python').library("libpython3.3dm.so.1.0").mark("function__entry") {
-+
-+(assuming a debug build of CPython 3.3)
-+
-+.. I'm reusing the "c:function" type for markers
-+
-+.. c:function:: function__entry(str filename, str funcname, int lineno)
-+
-+   This marker indicates that execution of a Python function has begun.  It is
-+   only triggered for pure-python (bytecode) functions.
-+
-+   The filename, function name, and line number are provided back to the
-+   tracing script as positional arguments, which must be accessed using
-+   `$arg1`, `$arg2`:
-+
-+       * `$arg1` : `(const char *)` filename, accessible using `user_string($arg1)`
-+
-+       * `$arg2` : `(const char *)` function name, accessible using
-+         `user_string($arg2)`
-+
-+       * `$arg3` : `int` line number
-+
-+       * `$arg4` : `(PyFrameObject *)`, the frame being executed
-+
-+.. c:function:: function__return(str filename, str funcname, int lineno)
-+
-+   This marker is the converse of `function__entry`, and indicates that
-+   execution of a Python function has ended (either via ``return``, or via an
-+   exception).  It is only triggered for pure-python (bytecode) functions.
-+
-+   The arguments are the same as for `function__entry`
-+
-+
-+Tapsets
-+-------
-+
-+The higher-level way to use the SystemTap integration is to use a "tapset":
-+SystemTap's equivalent of a library, which hides some of the lower-level
-+details of the static markers.
-+
-+Here is a tapset file, based on a non-shared build of CPython:
-+
-+.. code-block:: c
-+
-+    /*
-+       Provide a higher-level wrapping around the function__entry and
-+       function__return markers:
-+     */
-+    probe python.function.entry = process("python").mark("function__entry")
-+    {
-+        filename = user_string($arg1);
-+        funcname = user_string($arg2);
-+        lineno = $arg3;
-+        frameptr = $arg4
-+    }
-+    probe python.function.return = process("python").mark("function__return")
-+    {
-+        filename = user_string($arg1);
-+        funcname = user_string($arg2);
-+        lineno = $arg3;
-+        frameptr = $arg4
-+    }
-+
-+If this file is installed in SystemTap's tapset directory (e.g.
-+`/usr/share/systemtap/tapset`), then these additional probepoints become
-+available:
-+
-+.. c:function:: python.function.entry(str filename, str funcname, int lineno, frameptr)
-+
-+   This probe point indicates that execution of a Python function has begun.
-+   It is only triggered for pure-python (bytecode) functions.
-+
-+.. c:function:: python.function.return(str filename, str funcname, int lineno, frameptr)
-+
-+   This probe point is the converse of `python.function.return`, and indicates
-+   that execution of a Python function has ended (either via ``return``, or
-+   via an exception).  It is only triggered for pure-python (bytecode) functions.
-+
-+
-+Examples
-+--------
-+This SystemTap script uses the tapset above to more cleanly implement the
-+example given above of tracing the Python function-call hierarchy, without
-+needing to directly name the static markers:
-+
-+.. code-block:: c
-+
-+    probe python.function.entry
-+    {
-+      printf("%s => %s in %s:%d\n",
-+             thread_indent(1), funcname, filename, lineno);
-+    }
-+
-+    probe python.function.return
-+    {
-+      printf("%s <= %s in %s:%d\n",
-+             thread_indent(-1), funcname, filename, lineno);
-+    }
-+
-+
-+The following script uses the tapset above to provide a top-like view of all
-+running CPython code, showing the top 20 most frequently-entered bytecode
-+frames, each second, across the whole system:
-+
-+.. code-block:: c
-+
-+    global fn_calls;
-+
-+    probe python.function.entry
-+    {
-+      fn_calls[pid(), filename, funcname, lineno] += 1;
-+    }
-+
-+    probe timer.ms(1000) {
-+        printf("\033[2J\033[1;1H") /* clear screen */
-+        printf("%6s %80s %6s %30s %6s\n",
-+               "PID", "FILENAME", "LINE", "FUNCTION", "CALLS")
-+        foreach ([pid, filename, funcname, lineno] in fn_calls- limit 20) {
-+            printf("%6d %80s %6d %30s %6d\n",
-+                pid, filename, lineno, funcname,
-+                fn_calls[pid, filename, funcname, lineno]);
-+        }
-+        delete fn_calls;
-+    }
-+
-diff -up Python-3.3.0rc2/Lib/test/test_systemtap.py.systemtap Python-3.3.0rc2/Lib/test/test_systemtap.py
---- Python-3.3.0rc2/Lib/test/test_systemtap.py.systemtap	2012-09-10 09:17:21.117511779 -0400
-+++ Python-3.3.0rc2/Lib/test/test_systemtap.py	2012-09-10 09:17:21.117511779 -0400
-@@ -0,0 +1,234 @@
-+# Verify that systemtap static probes work
-+#
-+import subprocess
-+import sys
-+import sysconfig
-+import os
-+import unittest
-+
-+from test.support import run_unittest, TESTFN, unlink
-+
-+if '--with-systemtap' not in sysconfig.get_config_var('CONFIG_ARGS'):
-+    raise unittest.SkipTest("Python was not configured --with-systemtap")
-+
-+try:
-+    _, stap_version = subprocess.Popen(["stap", "-V"],
-+                                       stdout=subprocess.PIPE,
-+                                       stderr=subprocess.PIPE,
-+                                       ).communicate()
-+except OSError:
-+    # This is what "no stap" looks like.  There may, however, be other
-+    # errors that manifest this way too.
-+    raise unittest.SkipTest("Couldn't find stap on the path")
-+
-+def invoke_systemtap_script(script, cmd):
-+    # Start a child process, probing with the given systemtap script
-+    # (passed as stdin to the "stap" tool)
-+    # The script should be a bytes instance
-+    # Return (stdout, stderr) pair
-+
-+    p = subprocess.Popen(["stap", "-", '-vv', '-c', cmd],
-+                         stdin=subprocess.PIPE,
-+                         stdout=subprocess.PIPE,
-+                         stderr=subprocess.PIPE)
-+    out, err = p.communicate(input=script)
-+    return out, err
-+
-+# Verify that stap can run a simple "hello world"-style script
-+# This can fail for various reasons:
-+# - missing kernel headers
-+# - permissions (a non-root user needs to be in the "stapdev" group)
-+TRIVIAL_STAP_SCRIPT = b'probe begin { println("hello world") exit () }'
-+
-+out, err = invoke_systemtap_script(TRIVIAL_STAP_SCRIPT, 'true')
-+if out != b'hello world\n':
-+    raise unittest.SkipTest("Test systemtap script did not run; stderr was: %s" % err)
-+
-+# We don't expect stderr to be empty, since we're invoking stap with "-vv": stap
-+# will (we hope) generate debugging output on stderr.
-+
-+def invoke_python_under_systemtap(script, pythoncode=None, pythonfile=None):
-+    # Start a child python process, probing with the given systemtap script
-+    # (passed as stdin to the "stap" tool)
-+    # The script should be a bytes instance
-+    # Return (stdout, stderr) pair
-+
-+    if pythonfile:
-+        pythoncmd = '%s %s' % (sys.executable, pythonfile)
-+    else:
-+        pythoncmd = '%s -c %r' % (sys.executable, pythoncode)
-+
-+    # The process tree of a stap invocation of a command goes through
-+    # something like this:
-+    #    stap ->fork/exec(staprun; exec stapio ->f/e(-c cmd); exec staprun -r)
-+    # and this trip through setuid leads to LD_LIBRARY_PATH being dropped,
-+    # which would lead to an --enable-shared build of python failing to be
-+    # find its libpython, with an error like:
-+    #    error while loading shared libraries: libpython3.3dm.so.1.0: cannot
-+    #    open shared object file: No such file or directory
-+    # Hence we need to jump through some hoops to expose LD_LIBRARY_PATH to
-+    # the invoked python process:
-+    LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')
-+    if LD_LIBRARY_PATH:
-+        pythoncmd = 'env LD_LIBRARY_PATH=%s ' % LD_LIBRARY_PATH + pythoncmd
-+
-+    return invoke_systemtap_script(script, pythoncmd)
-+
-+# When using the static markers, we need to supply the prefix of a systemtap
-+# dotted probe point that containing the marker.
-+# See http://sourceware.org/systemtap/langref/Probe_points.html
-+#
-+# We need to determine if this is a shared-library build
-+#
-+# Note that sysconfig can get this wrong; see:
-+#   http://bugs.python.org/issue14774
-+#
-+if '--enable-shared' in sysconfig.get_config_var('CONFIG_ARGS'):
-+    # For a shared-library build, the markers are in library(INSTSONAME):
-+    INSTSONAME = sysconfig.get_config_var('INSTSONAME')
-+    probe_prefix = 'process("%s").library("%s")' % (sys.executable, INSTSONAME)
-+else:
-+    # For a non-shared-library build, we can simply use sys.executable:
-+    probe_prefix = 'process("%s")' % sys.executable
-+
-+# The following script ought to generate lots of lines showing recursive
-+# function entry and return, of the form:
-+#     11408 python(8274):        => __contains__ in Lib/_abcoll.py:362
-+#     11414 python(8274):         => __getitem__ in Lib/os.py:425
-+#     11418 python(8274):          => encode in Lib/os.py:490
-+#     11424 python(8274):          <= encode in Lib/os.py:493
-+#     11428 python(8274):         <= __getitem__ in Lib/os.py:426
-+#     11433 python(8274):        <= __contains__ in Lib/_abcoll.py:366
-+# where the column are:
-+#  - time in microseconds since start of script
-+#  - name of executable
-+#  - PID of process
-+#  and the remainder indicates the call/return hierarchy
-+
-+hierarchy_script = ('''
-+probe %s.mark("function__entry") {
-+    filename = user_string($arg1);
-+    funcname = user_string($arg2);
-+    lineno = $arg3;
-+
-+    printf("%%s => %%s in %%s:%%d\\n", thread_indent(1), funcname, filename, lineno);
-+}
-+
-+probe %s.mark("function__return") {
-+    filename = user_string($arg1);
-+    funcname = user_string($arg2);
-+    lineno = $arg3;
-+
-+    printf("%%s <= %%s in %%s:%%d\\n", thread_indent(-1), funcname, filename, lineno);
-+}
-+''' % (probe_prefix, probe_prefix)).encode('utf-8')
-+
-+
-+class ErrorDumper:
-+    # A context manager that dumps extra information if an exception is raised,
-+    # to help track down why the problem occurred
-+    def __init__(self, out, err):
-+        self.out = out
-+        self.err = err
-+
-+    def __enter__(self):
-+        pass
-+
-+    def __exit__(self, type_, value, traceback):
-+        if type_:
-+            # an exception is being raised:
-+            print('stdout: %s' % out.decode())
-+            print('stderr: %s' % err.decode())
-+
-+class SystemtapTests(unittest.TestCase):
-+
-+    def test_invoking_python(self):
-+        # Ensure that we can invoke python under stap, with a trivial stap
-+        # script:
-+        out, err = invoke_python_under_systemtap(
-+            b'probe begin { println("hello from stap") exit () }',
-+            pythoncode="print('hello from python')")
-+        with ErrorDumper(out, err):
-+            self.assertIn(b'hello from stap', out)
-+            self.assertIn(b'hello from python', out)
-+
-+    def test_function_entry(self):
-+        # Ensure that the function_entry static marker works
-+        out, err = invoke_python_under_systemtap(hierarchy_script)
-+        # stdout ought to contain various lines showing recursive function
-+        # entry and return (see above)
-+
-+        # Uncomment this for debugging purposes:
-+        # print(out.decode('utf-8'))
-+
-+        #   Executing the cmdline-supplied "pass":
-+        #      0 python(8274): => <module> in <string>:1
-+        #      5 python(8274): <= <module> in <string>:1
-+        with ErrorDumper(out, err):
-+            self.assertIn(b'=> <module> in <string>:1', out,
-+                          msg="stdout: %s\nstderr: %s\n" % (out, err))
-+
-+    def test_function_encoding(self):
-+        # Ensure that function names containing non-Latin 1 code
-+        # points are handled:
-+        pythonfile = TESTFN
-+        try:
-+            unlink(pythonfile)
-+            f = open(pythonfile, "wb")
-+            f.write("""
-+# Sample script with non-ASCII filename, for use by test_systemtap.py
-+# Implicitly UTF-8
-+
-+def 文字化け():
-+    '''Function with non-ASCII identifier; I believe this reads "mojibake"'''
-+    print("hello world!")
-+
-+文字化け()
-+""".encode('utf-8'))
-+            f.close()
-+
-+            out, err = invoke_python_under_systemtap(hierarchy_script,
-+                                                     pythonfile=pythonfile)
-+            out_utf8 = out.decode('utf-8')
-+            with ErrorDumper(out, err):
-+                self.assertIn('=> <module> in %s:5' % pythonfile, out_utf8)
-+                self.assertIn(' => 文字化け in %s:5' % pythonfile, out_utf8)
-+                self.assertIn(' <= 文字化け in %s:7' % pythonfile, out_utf8)
-+                self.assertIn('<= <module> in %s:9' % pythonfile, out_utf8)
-+        finally:
-+            unlink(pythonfile)
-+
-+    @unittest.skipIf(sys.getfilesystemencoding() == 'ascii',
-+                     'the test filename is not encodable with ASCII')
-+    def test_filename_encoding(self):
-+        # Ensure that scripts names containing non-Latin 1 code
-+        # points are handled:
-+        pythonfile = TESTFN + '_☠.py'
-+        try:
-+            unlink(pythonfile)
-+            f = open(pythonfile, "wb")
-+            f.write("""
-+def foo():
-+    '''Function with non-ASCII identifier; I believe this reads "mojibake"'''
-+    print("hello world!")
-+
-+foo()
-+""".encode('utf-8'))
-+            f.close()
-+
-+            out, err = invoke_python_under_systemtap(hierarchy_script,
-+                                                     pythonfile=pythonfile)
-+            out_utf8 = out.decode('utf-8')
-+            with ErrorDumper(out, err):
-+                self.assertIn('=> <module> in %s:2' % pythonfile, out_utf8)
-+                self.assertIn(' => foo in %s:2' % pythonfile, out_utf8)
-+                self.assertIn(' <= foo in %s:4' % pythonfile, out_utf8)
-+                self.assertIn('<= <module> in %s:6' % pythonfile, out_utf8)
-+        finally:
-+            unlink(pythonfile)
-+
-+def test_main():
-+    run_unittest(SystemtapTests)
-+
-+if __name__ == "__main__":
-+    test_main()
-diff -up Python-3.3.0rc2/Makefile.pre.in.systemtap Python-3.3.0rc2/Makefile.pre.in
---- Python-3.3.0rc2/Makefile.pre.in.systemtap	2012-09-09 05:11:05.000000000 -0400
-+++ Python-3.3.0rc2/Makefile.pre.in	2012-09-10 09:19:51.195501518 -0400
-@@ -363,6 +363,7 @@ PYTHON_OBJS=	\
- 		Python/formatter_unicode.o \
- 		Python/fileutils.o \
- 		Python/$(DYNLOADFILE) \
-+		@SYSTEMTAPOBJS@ \
- 		$(LIBOBJS) \
- 		$(MACHDEP_OBJS) \
- 		$(THREADOBJ)
-@@ -713,7 +714,8 @@ Objects/setobject.o: $(srcdir)/Objects/s
- $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
- 	$(OPCODETARGETGEN) $(OPCODETARGETS_H)
- 
--Python/ceval.o: $(OPCODETARGETS_H) $(srcdir)/Python/ceval_gil.h
-+Python/ceval.o: $(OPCODETARGETS_H) $(srcdir)/Python/ceval_gil.h \
-+			$(srcdir)/Python/ceval_systemtap.h @SYSTEMTAPDEPS@
- 
- Python/frozen.o: Python/importlib.h
- 
-@@ -724,6 +726,13 @@ Objects/typeobject.o: $(srcdir)/Objects/
- Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py
- 	$(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > Objects/typeslots.inc
- 
-+# Only needed with --with-systemtap; not a public header:
-+$(srcdir)/Python/pysystemtap.h: $(srcdir)/Python/pysystemtap.d
-+	dtrace -o $@ $(DFLAGS) -C -h -s $(srcdir)/Python/pysystemtap.d
-+
-+Python/pysystemtap.o: $(srcdir)/Python/pysystemtap.d Python/ceval.o
-+	dtrace -o $@ $(DFLAGS) -C -G -s $(srcdir)/Python/pysystemtap.d Python/ceval.o
-+
- ############################################################################
- # Header files
- 
-@@ -1345,6 +1354,7 @@ clean: pycremoval
- 	-rm -f pybuilddir.txt
- 	-rm -f Lib/lib2to3/*Grammar*.pickle
- 	-rm -f Modules/_testembed Modules/_freeze_importlib
-+	-rm -f $(srcdir)/Python/pysystemtap.h
- 
- profile-removal:
- 	find . -name '*.gc??' -exec rm -f {} ';'
-diff -up Python-3.3.0rc2/Misc/NEWS.systemtap Python-3.3.0rc2/Misc/NEWS
---- Python-3.3.0rc2/Misc/NEWS.systemtap	2012-09-09 05:11:05.000000000 -0400
-+++ Python-3.3.0rc2/Misc/NEWS	2012-09-10 09:17:21.120511781 -0400
-@@ -619,6 +619,11 @@ Core and Builtins
- 
- - Issue #15038: Optimize python Locks on Windows.
- 
-+- Issue #14776: Added a new --with-systemtap configure-time option, which adds
-+  static markers for SystemTap so that SystemTap scripts can observe bytecode
-+  frames being entered and exited and so generate reports on what Python code
-+  is being exectuted.
-+
- Library
- -------
- 
-diff -up Python-3.3.0rc2/pyconfig.h.in.systemtap Python-3.3.0rc2/pyconfig.h.in
---- Python-3.3.0rc2/pyconfig.h.in.systemtap	2012-09-09 05:11:14.000000000 -0400
-+++ Python-3.3.0rc2/pyconfig.h.in	2012-09-10 09:17:21.120511781 -0400
-@@ -1306,6 +1306,9 @@
- /* Define if you want to compile in Python-specific mallocs */
- #undef WITH_PYMALLOC
- 
-+/* Define if you want to compile in SystemTap support */
-+#undef WITH_SYSTEMTAP
-+
- /* Define if you want to compile in rudimentary thread support */
- #undef WITH_THREAD
- 
-diff -up Python-3.3.0rc2/Python/ceval.c.systemtap Python-3.3.0rc2/Python/ceval.c
---- Python-3.3.0rc2/Python/ceval.c.systemtap	2012-09-09 05:11:12.000000000 -0400
-+++ Python-3.3.0rc2/Python/ceval.c	2012-09-10 09:17:21.122511781 -0400
-@@ -18,6 +18,8 @@
- 
- #include <ctype.h>
- 
-+#include "ceval_systemtap.h"
-+
- #ifndef WITH_TSC
- 
- #define READ_TIMESTAMP(var)
-@@ -1160,6 +1162,10 @@ PyEval_EvalFrameEx(PyFrameObject *f, int
-         }
-     }
- 
-+    if (PYTHON_FUNCTION_ENTRY_ENABLED()) {
-+        systemtap_function_entry(f);
-+    }
-+
-     co = f->f_code;
-     names = co->co_names;
-     consts = co->co_consts;
-@@ -3077,6 +3083,11 @@ fast_yield:
- 
-     /* pop frame */
- exit_eval_frame:
-+
-+    if (PYTHON_FUNCTION_RETURN_ENABLED()) {
-+        systemtap_function_return(f);
-+    }
-+
-     Py_LeaveRecursiveCall();
-     f->f_executing = 0;
-     tstate->frame = f->f_back;
-diff -up Python-3.3.0rc2/Python/ceval_systemtap.h.systemtap Python-3.3.0rc2/Python/ceval_systemtap.h
---- Python-3.3.0rc2/Python/ceval_systemtap.h.systemtap	2012-09-10 09:17:21.122511781 -0400
-+++ Python-3.3.0rc2/Python/ceval_systemtap.h	2012-09-10 09:17:21.122511781 -0400
-@@ -0,0 +1,86 @@
-+/*
-+  Support for SystemTap static markers  
-+*/
-+
-+#ifdef WITH_SYSTEMTAP
-+
-+#include "pysystemtap.h"
-+
-+/*
-+  A struct to hold all of the information gathered when one of the traceable
-+  markers is triggered
-+*/
-+struct frame_marker_info
-+{
-+    PyObject *filename_obj;
-+    PyObject *funcname_obj;
-+    const char *filename;
-+    const char *funcname;
-+    int lineno;
-+};
-+
-+static void
-+get_frame_marker_info(PyFrameObject *f, struct frame_marker_info *fmi)
-+{
-+    PyObject *ptype;
-+    PyObject *pvalue;
-+    PyObject *ptraceback;
-+
-+    PyErr_Fetch(&ptype, &pvalue, &ptraceback);
-+
-+    fmi->filename_obj = PyUnicode_EncodeFSDefault(f->f_code->co_filename);
-+    if (fmi->filename_obj) {
-+        fmi->filename = PyBytes_AsString(fmi->filename_obj);
-+    } else {
-+        fmi->filename = NULL;
-+    }
-+
-+    fmi->funcname_obj = PyUnicode_AsUTF8String(f->f_code->co_name);
-+    if (fmi->funcname_obj) {
-+        fmi->funcname = PyBytes_AsString(fmi->funcname_obj);
-+    } else {
-+        fmi->funcname = NULL;
-+    }
-+
-+    fmi->lineno = PyCode_Addr2Line(f->f_code, f->f_lasti);
-+
-+    PyErr_Restore(ptype, pvalue, ptraceback);
-+
-+}
-+
-+static void
-+release_frame_marker_info(struct frame_marker_info *fmi)
-+{
-+    Py_XDECREF(fmi->filename_obj);
-+    Py_XDECREF(fmi->funcname_obj);
-+}
-+
-+static void
-+systemtap_function_entry(PyFrameObject *f)
-+{
-+    struct frame_marker_info fmi;
-+    get_frame_marker_info(f, &fmi);
-+    PYTHON_FUNCTION_ENTRY(fmi.filename, fmi.funcname, fmi.lineno, f);
-+    release_frame_marker_info(&fmi);
-+}
-+
-+static void
-+systemtap_function_return(PyFrameObject *f)
-+{
-+    struct frame_marker_info fmi;
-+    get_frame_marker_info(f, &fmi);
-+    PYTHON_FUNCTION_RETURN(fmi.filename, fmi.funcname, fmi.lineno, f);
-+    release_frame_marker_info(&fmi);
-+}
-+
-+#else /* #ifdef WITH_SYSTEMTAP */
-+
-+/*
-+  When configured --without-systemtap, everything compiles away to nothing:
-+*/
-+#define PYTHON_FUNCTION_ENTRY_ENABLED() 0
-+#define PYTHON_FUNCTION_RETURN_ENABLED() 0
-+#define systemtap_function_entry(f)
-+#define systemtap_function_return(f)
-+
-+#endif
-diff -up Python-3.3.0rc2/Python/pysystemtap.d.systemtap Python-3.3.0rc2/Python/pysystemtap.d
---- Python-3.3.0rc2/Python/pysystemtap.d.systemtap	2012-09-10 09:17:21.122511781 -0400
-+++ Python-3.3.0rc2/Python/pysystemtap.d	2012-09-10 09:17:21.122511781 -0400
-@@ -0,0 +1,4 @@
-+provider python {
-+    probe function__entry(const char *, const char *, int, PyFrameObject *);
-+    probe function__return(const char *, const char *, int, PyFrameObject *);
-+};

00102-lib64.patch

@@ -1,6 +1,42 @@
---- Python-3.4.0b1/Lib/distutils/command/install.py.lib64     2013-11-24 21:36:54.000000000 +0100
-+++ Python-3.4.0b1/Lib/distutils/command/install.py     2013-11-27 11:10:43.821150774 +0100
-@@ -45,14 +45,14 @@ else:
+From 96580364051672475607c88cdb31ec875cea6e97 Mon Sep 17 00:00:00 2001
+From: David Malcolm <dmalcolm@redhat.com>
+Date: Wed, 13 Jan 2010 21:25:18 +0000
+Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/
+ instead or /usr/lib/
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Only used when "%{_lib}" == "lib64".
+
+Co-authored-by: David Malcolm <dmalcolm@redhat.com>
+Co-authored-by: Thomas Spura <tomspur@fedoraproject.org>
+Co-authored-by: Slavek Kabrda <bkabrda@redhat.com>
+Co-authored-by: Matej Stuchlik <mstuchli@redhat.com>
+Co-authored-by: Tomas Orsava <torsava@redhat.com>
+Co-authored-by: Charalampos Stratakis <cstratak@redhat.com>
+Co-authored-by: Petr Viktorin <pviktori@redhat.com>
+Co-authored-by: Miro Hrončok <miro@hroncok.cz>
+Co-authored-by: Iryna Shcherbina <shcherbina.iryna@gmail.com>
+---
+ Lib/distutils/command/install.py    |  4 ++--
+ Lib/distutils/sysconfig.py          |  6 +++++-
+ Lib/distutils/tests/test_install.py |  3 ++-
+ Lib/site.py                         |  4 ++++
+ Lib/sysconfig.py                    | 12 ++++++------
+ Lib/test/test_site.py               |  4 ++--
+ Makefile.pre.in                     |  2 +-
+ Modules/getpath.c                   |  6 +++---
+ configure                           |  4 ++--
+ configure.ac                        |  4 ++--
+ setup.py                            |  6 +++---
+ 11 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
+index c625c95bf7..ae4f915669 100644
+--- a/Lib/distutils/command/install.py
++++ b/Lib/distutils/command/install.py
+@@ -30,14 +30,14 @@ WINDOWS_SCHEME = {
  INSTALL_SCHEMES = {
      'unix_prefix': {
          'purelib': '$base/lib/python$py_version_short/site-packages',
@@ -17,9 +53,11 @@
          'headers': '$base/include/python/$dist_name',
          'scripts': '$base/bin',
          'data'   : '$base',
---- Python-3.4.0b1/Lib/distutils/sysconfig.py.lib64	2013-11-24 21:36:54.000000000 +0100
-+++ Python-3.4.0b1/Lib/distutils/sysconfig.py	2013-11-27 11:10:43.821150774 +0100
-@@ -141,8 +141,12 @@
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index b51629eb94..9a4892a737 100644
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -146,8 +146,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
              prefix = plat_specific and EXEC_PREFIX or PREFIX
  
      if os.name == "posix":
@@ -33,9 +71,26 @@
          if standard_lib:
              return libpython
          else:
---- Python-3.4.0b1/Lib/site.py.lib64	2013-11-24 21:36:54.000000000 +0100
-+++ Python-3.4.0b1/Lib/site.py	2013-11-27 11:10:43.822150773 +0100
-@@ -304,12 +304,16 @@
+diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
+index 287ab1989e..d4c05e0ab1 100644
+--- a/Lib/distutils/tests/test_install.py
++++ b/Lib/distutils/tests/test_install.py
+@@ -57,8 +57,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/Lib/site.py b/Lib/site.py
+index a065ab0b5d..22d53fa562 100644
+--- a/Lib/site.py
++++ b/Lib/site.py
+@@ -335,11 +335,15 @@ def getsitepackages(prefixes=None):
          seen.add(prefix)
  
          if os.sep == '/':
@@ -43,18 +98,19 @@
 +                                        "python" + sys.version[:3],
 +                                        "site-packages"))
              sitepackages.append(os.path.join(prefix, "lib",
-                                         "python" + sys.version[:3],
+                                         "python%d.%d" % sys.version_info[:2],
                                          "site-packages"))
-             sitepackages.append(os.path.join(prefix, "lib", "site-python"))
          else:
              sitepackages.append(prefix)
 +            sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
              sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
-         if sys.platform == "darwin":
-             # for framework builds *only* we add the standard Apple
---- Python-3.4.0b1/Lib/sysconfig.py.lib64	2013-11-24 21:36:54.000000000 +0100
-+++ Python-3.4.0b1/Lib/sysconfig.py	2013-11-27 11:10:43.822150773 +0100
-@@ -20,10 +20,10 @@
+     return sitepackages
+ 
+diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
+index b9e2fafbc0..0ae6d35b69 100644
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -20,10 +20,10 @@ __all__ = [
  
  _INSTALL_SCHEMES = {
      'posix_prefix': {
@@ -68,7 +124,7 @@
          'include':
              '{installed_base}/include/python{py_version_short}{abiflags}',
          'platinclude':
-@@ -61,10 +61,10 @@
+@@ -62,10 +62,10 @@ _INSTALL_SCHEMES = {
          'data': '{userbase}',
          },
      'posix_user': {
@@ -82,30 +138,26 @@
          'include': '{userbase}/include/python{py_version_short}',
          'scripts': '{userbase}/bin',
          'data': '{userbase}',
---- Python-3.4.0b1/Lib/test/test_site.py.lib64	2013-11-24 21:36:55.000000000 +0100
-+++ Python-3.4.0b1/Lib/test/test_site.py	2013-11-27 11:10:43.822150773 +0100
-@@ -244,12 +244,15 @@
-             self.assertEqual(dirs[2], wanted)
-         elif os.sep == '/':
-             # OS X non-framwework builds, Linux, FreeBSD, etc
--            self.assertEqual(len(dirs), 2)
--            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
-+            self.assertEqual(len(dirs), 3)
-+            wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3],
+diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
+index 41c4229919..543c88432a 100644
+--- a/Lib/test/test_site.py
++++ b/Lib/test/test_site.py
+@@ -266,8 +266,8 @@ class HelperFunctionsTests(unittest.TestCase):
+         dirs = site.getsitepackages()
+         if os.sep == '/':
+             # OS X, Linux, FreeBSD, etc
+-            self.assertEqual(len(dirs), 1)
+-            wanted = os.path.join('xoxo', 'lib',
++            self.assertEqual(len(dirs), 2)
++            wanted = os.path.join('xoxo', 'lib64',
+                                   'python%d.%d' % sys.version_info[:2],
                                    'site-packages')
              self.assertEqual(dirs[0], wanted)
--            wanted = os.path.join('xoxo', 'lib', 'site-python')
-+            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
-+                                  'site-packages')
-             self.assertEqual(dirs[1], wanted)
-+            wanted = os.path.join('xoxo', 'lib', 'site-python')
-+            self.assertEqual(dirs[2], wanted)
-         else:
-             # other platforms
-             self.assertEqual(len(dirs), 2)
---- Python-3.4.0b1/Makefile.pre.in.lib64	2013-11-27 11:10:43.814150786 +0100
-+++ Python-3.4.0b1/Makefile.pre.in	2013-11-27 11:10:43.823150771 +0100
-@@ -115,7 +115,7 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index a914a9c70f..406a441082 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -143,7 +143,7 @@ LIBDIR=		@libdir@
  MANDIR=		@mandir@
  INCLUDEDIR=	@includedir@
  CONFINCLUDEDIR=	$(exec_prefix)/include
@@ -114,79 +166,96 @@
  ABIFLAGS=	@ABIFLAGS@
  
  # Detailed destination directories
---- Python-3.4.0b1/Modules/getpath.c.lib64	2013-11-24 21:36:56.000000000 +0100
-+++ Python-3.4.0b1/Modules/getpath.c	2013-11-27 11:17:33.619449704 +0100
-@@ -122,8 +122,8 @@
- #endif
- 
- #ifndef PYTHONPATH
--#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
--              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
-+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
-+              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
- #endif
- 
- #ifndef LANDMARK
-@@ -498,7 +498,7 @@
-     _pythonpath = _Py_char2wchar(PYTHONPATH, NULL);
-     _prefix = _Py_char2wchar(PREFIX, NULL);
-     _exec_prefix = _Py_char2wchar(EXEC_PREFIX, NULL);
--    lib_python = _Py_char2wchar("lib/python" VERSION, NULL);
-+    lib_python = _Py_char2wchar("lib64/python" VERSION, NULL);
- 
-     if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
-         Py_FatalError(
-@@ -687,7 +687,7 @@
+diff --git a/Modules/getpath.c b/Modules/getpath.c
+index b727f66953..a0c5fb6139 100644
+--- a/Modules/getpath.c
++++ b/Modules/getpath.c
+@@ -730,7 +730,7 @@ calculate_exec_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig,
+         if (safe_wcscpy(exec_prefix, calculate->exec_prefix, exec_prefix_len) < 0) {
+             return PATHLEN_ERR();
+         }
+-        status = joinpath(exec_prefix, L"lib/lib-dynload", exec_prefix_len);
++        status = joinpath(exec_prefix, L"lib64/lib-dynload", exec_prefix_len);
+         if (_PyStatus_EXCEPTION(status)) {
+             return status;
+         }
+@@ -1067,7 +1067,7 @@ calculate_zip_path(PyCalculatePath *calculate, const wchar_t *prefix,
+             return PATHLEN_ERR();
+         }
      }
-     else
-         wcsncpy(zip_path, _prefix, MAXPATHLEN);
--    joinpath(zip_path, L"lib/python00.zip");
-+    joinpath(zip_path, L"lib64/python00.zip");
-     bufsz = wcslen(zip_path);   /* Replace "00" with version */
-     zip_path[bufsz - 6] = VERSION[0];
-     zip_path[bufsz - 5] = VERSION[2];
-@@ -699,7 +699,7 @@
-             fprintf(stderr,
-                 "Could not find platform dependent libraries <exec_prefix>\n");
-         wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
--        joinpath(exec_prefix, L"lib/lib-dynload");
-+        joinpath(exec_prefix, L"lib64/lib-dynload");
+-    status = joinpath(zip_path, L"lib/python00.zip", zip_path_len);
++    status = joinpath(zip_path, L"lib64/python00.zip", zip_path_len);
+     if (_PyStatus_EXCEPTION(status)) {
+         return status;
      }
-     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
+@@ -1197,7 +1197,7 @@ calculate_init(PyCalculatePath *calculate, const PyConfig *config)
+     if (!calculate->exec_prefix) {
+         return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
+     }
+-    calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);
++    calculate->lib_python = Py_DecodeLocale("lib64/python" VERSION, &len);
+     if (!calculate->lib_python) {
+         return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
+     }
+diff --git a/configure b/configure
+index a979363acf..b89ae1be3c 100755
+--- a/configure
++++ b/configure
+@@ -15188,9 +15188,9 @@ fi
  
---- Python-3.4.0b1/setup.py.lib64	2013-11-24 21:36:56.000000000 +0100
-+++ Python-3.4.0b1/setup.py	2013-11-27 11:10:43.824150769 +0100
-@@ -441,7 +441,7 @@
+ 
+ if test x$PLATFORM_TRIPLET = x; then
+-  LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
++  LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
+ else
+-  LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
++  LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
+ fi
+ 
+ 
+diff --git a/configure.ac b/configure.ac
+index e57ef7c38b..c59cbc223f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4674,9 +4674,9 @@ fi
+ dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
+ AC_SUBST(PY_ENABLE_SHARED)
+ if test x$PLATFORM_TRIPLET = x; then
+-  LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
++  LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
+ else
+-  LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
++  LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
+ fi
+ AC_SUBST(LIBPL)
+ 
+diff --git a/setup.py b/setup.py
+index 20d7f35652..024a1035c0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -649,7 +649,7 @@ class PyBuildExt(build_ext):
          # directories (i.e. '.' and 'Include') must be first.  See issue
          # 10520.
-         if not cross_compiling:
+         if not CROSS_COMPILING:
 -            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 +            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
              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:
-@@ -718,11 +718,11 @@
+         if CROSS_COMPILING:
+@@ -953,11 +953,11 @@ class PyBuildExt(build_ext):
              elif curses_library:
                  readline_libs.append(curses_library)
-             elif self.compiler.find_library_file(lib_dirs +
+             elif self.compiler.find_library_file(self.lib_dirs +
 -                                                     ['/usr/lib/termcap'],
 +                                                     ['/usr/lib64/termcap'],
                                                       'termcap'):
                  readline_libs.append('termcap')
-             exts.append( Extension('readline', ['readline.c'],
--                                   library_dirs=['/usr/lib/termcap'],
-+                                   library_dirs=['/usr/lib64/termcap'],
-                                    extra_link_args=readline_extra_link_args,
-                                    libraries=readline_libs) )
+             self.add(Extension('readline', ['readline.c'],
+-                               library_dirs=['/usr/lib/termcap'],
++                               library_dirs=['/usr/lib64/termcap'],
+                                extra_link_args=readline_extra_link_args,
+                                libraries=readline_libs))
          else:
-@@ -759,8 +759,8 @@
-             if krb5_h:
-                 ssl_incs += krb5_h
-         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
--                                     ['/usr/local/ssl/lib',
--                                      '/usr/contrib/ssl/lib/'
-+                                     ['/usr/local/ssl/lib64',
-+                                      '/usr/contrib/ssl/lib64/'
-                                      ] )
- 
-         if (ssl_incs is not None and
+-- 
+2.24.1
+

00104-lib64-fix-for-test_install.patch

@@ -1,13 +0,0 @@
---- Python-2.7.2/Lib/distutils/tests/test_install.py.lib64	2011-09-08 17:51:57.851405376 -0400
-+++ Python-2.7.2/Lib/distutils/tests/test_install.py	2011-09-08 18:40:46.754205096 -0400
-@@ -41,8 +41,9 @@ class InstallTestCase(support.TempdirMan
-             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"))

00111-no-static-lib.patch

@@ -1,44 +1,61 @@
-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
-@@ -464,7 +464,7 @@ coverage:
- 	$(RUNSHARED) $(PYTHON_FOR_BUILD) ./Tools/clinic/clinic.py --make
+From fb93392b0f4975a02775a608611dc9ceb20c06ad Mon Sep 17 00:00:00 2001
+From: David Malcolm <dmalcolm@redhat.com>
+Date: Mon, 18 Jan 2010 17:59:07 +0000
+Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Downstream only: not appropriate for upstream.
+
+See https://bugzilla.redhat.com/show_bug.cgi?id=556092
+
+Co-authored-by: David Malcolm <dmalcolm@redhat.com>
+Co-authored-by: Bohuslav Kabrda <bkabrda@redhat.com>
+Co-authored-by: Matej Stuchlik <mstuchli@redhat.com>
+Co-authored-by: Robert Kuska <rkuska@redhat.com>
+Co-authored-by: Charalampos Stratakis <cstratak@redhat.com>
+Co-authored-by: Miro Hrončok <miro@hroncok.cz>
+---
+ Makefile.pre.in | 21 ++-------------------
+ 1 file changed, 2 insertions(+), 19 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 406a441082..917303dd92 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -562,7 +562,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
+ 	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
  
  # Build the interpreter
--$(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
-+$(BUILDPYTHON):	Modules/python.o $(LDLIBRARY) $(PY3LIBRARY)
- 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+-$(BUILDPYTHON):	Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
++$(BUILDPYTHON):	Programs/python.o $(LDLIBRARY) $(PY3LIBRARY)
+ 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
  
  platform: $(BUILDPYTHON) pybuilddir.txt
-@@ -480,18 +480,6 @@ sharedmods: $(BUILDPYTHON) $(SYSCONFIGDA
+@@ -610,12 +610,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
  		_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) $@
+-	$(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)
 -
- libpython$(LDVERSION).so: $(LIBRARY_OBJS)
+ libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
  	if test $(INSTSONAME) != $(LDLIBRARY); then \
- 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-@@ -581,7 +569,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.d
- 		echo "-----------------------------------------------"; \
- 	fi
+ 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
+@@ -693,7 +687,7 @@ Makefile Modules/config.c: Makefile.pre \
+ 	@echo "The Makefile was updated, you may need to re-run make."
  
--Modules/_testembed: Modules/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
-+Modules/_testembed: Modules/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
- 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+-Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
++Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
+ 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
  
  ############################################################################
-@@ -1155,18 +1143,6 @@ libainstall:	all python-config
+@@ -1557,17 +1551,6 @@ libainstall:	@DEF_MAKE_RULE@ python-config
  		else	true; \
  		fi; \
  	done
@@ -48,12 +65,14 @@ diff -up cpython-59223da36dec/Makefile.pre.in.no-static-lib cpython-59223da36dec
 -				$(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) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
+ 	$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
  	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
+-- 
+2.24.1
+

00113-more-configuration-flags.patch

@@ -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

00125-less-verbose-COUNT_ALLOCS.patch

@@ -1,20 +0,0 @@
-diff -up Python-2.7/Python/pythonrun.c.less-verbose-COUNT_ALLOCS Python-2.7/Python/pythonrun.c
---- Python-2.7/Python/pythonrun.c.less-verbose-COUNT_ALLOCS	2010-08-17 14:49:33.321913909 -0400
-+++ Python-2.7/Python/pythonrun.c	2010-08-17 14:54:48.750910403 -0400
-@@ -470,7 +470,15 @@ Py_Finalize(void)
- 
-     /* Debugging stuff */
- #ifdef COUNT_ALLOCS
--    dump_counts(stdout);
-+    /* This is a downstream Fedora modification.
-+       The upstream default with COUNT_ALLOCS is to always dump the counts to
-+       stdout on exit.  For our debug builds its useful to have the info from
-+       COUNT_ALLOCS available, but the stdout info here gets in the way, so
-+       we make it optional, wrapping it in an environment variable (modelled
-+       on the other PYTHONDUMP* env variables):
-+    */
-+    if (Py_GETENV("PYTHONDUMPCOUNTS"))
-+        dump_counts(stdout);
- #endif
-     /* dump hash stats */
-     _PyHash_Fini();

00131-disable-tests-in-test_io.patch

@@ -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

00132-add-rpmbuild-hooks-to-unittest.patch

@@ -1,68 +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,6 +102,43 @@ 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, callable_obj=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)

00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch

@@ -1,21 +0,0 @@
-diff -up Python-3.3.0b2/Lib/test/test_sys.py.fix-COUNT_ALLOCS-failure-in-test_sys Python-3.3.0b2/Lib/test/test_sys.py
---- Python-3.3.0b2/Lib/test/test_sys.py.fix-COUNT_ALLOCS-failure-in-test_sys	2012-08-11 02:54:16.000000000 -0400
-+++ Python-3.3.0b2/Lib/test/test_sys.py	2012-08-13 14:50:15.253720597 -0400
-@@ -835,12 +835,17 @@ class SizeofTest(unittest.TestCase):
-         # type
-         # static type: PyTypeObject
-         s = vsize('P2n15Pl4Pn9Pn11PIP')
-+        # COUNT_ALLOCS adds a further 3 Py_ssize_t and 2 pointers:
-+        if hasattr(sys, 'getcounts'):
-+            s += struct.calcsize('3P2P')
-         check(int, s)
-         # (PyTypeObject + PyNumberMethods + PyMappingMethods +
-         #  PySequenceMethods + PyBufferProcs + 4P)
-         s = vsize('P2n15Pl4Pn9Pn11PIP') + struct.calcsize('34P 3P 10P 2P 4P')
-         # Separate block for PyDictKeysObject with 4 entries
-         s += struct.calcsize("2nPn") + 4*struct.calcsize("n2P")
-+        if hasattr(sys, 'getcounts'):
-+            s += struct.calcsize('3P2P')
-         # class
-         class newstyleclass(object): pass
-         check(newstyleclass, s)

00135-fix-test-within-test_weakref-in-debug-build.patch

@@ -1,17 +0,0 @@
-diff -up Python-3.2b2/Lib/test/test_weakref.py.test-weakref-COUNT_ALLOCS_fix Python-3.2b2/Lib/test/test_weakref.py
---- Python-3.2b2/Lib/test/test_weakref.py.test-weakref-COUNT_ALLOCS_fix	2010-12-28 20:33:46.963364990 -0500
-+++ Python-3.2b2/Lib/test/test_weakref.py	2010-12-28 20:35:44.115935248 -0500
-@@ -583,9 +583,10 @@ class ReferencesTestCase(TestBase):
-         # been cleared without their callbacks executing.  OTOH, the weakref
-         # to C is bound to a function local (wr), and wasn't trash, so that
-         # callback should have been invoked when C went away.
--        self.assertEqual(alist, ["C went away"])
--        # The remaining weakref should be dead now (its callback ran).
--        self.assertEqual(wr(), None)
-+        if not hasattr(sys, 'getcounts'):
-+            self.assertEqual(alist, ["C went away"])
-+            # The remaining weakref should be dead now (its callback ran).
-+            self.assertEqual(wr(), None)
- 
-         del alist[:]
-         gc.collect()

00137-skip-distutils-tests-that-fail-in-rpmbuild.patch

@@ -1,12 +0,0 @@
-diff -up Python-3.2.2/Lib/distutils/tests/test_bdist_rpm.py.skip-distutils-tests-that-fail-in-rpmbuild Python-3.2.2/Lib/distutils/tests/test_bdist_rpm.py
---- Python-3.2.2/Lib/distutils/tests/test_bdist_rpm.py.skip-distutils-tests-that-fail-in-rpmbuild	2011-09-03 12:16:40.000000000 -0400
-+++ Python-3.2.2/Lib/distutils/tests/test_bdist_rpm.py	2011-09-10 05:04:56.328852558 -0400
-@@ -23,6 +23,7 @@ setup(name='foo', version='0.1', py_modu
- 
- """
- 
-+@unittest._skipInRpmBuild("don't try to nest one rpm build inside another rpm build")
- class BuildRpmTestCase(support.TempdirManager,
-                        support.LoggingSilencer,
-                        unittest.TestCase):
-diff -up Python-3.2.2/Lib/distutils/tests/test_build_ext.py.skip-distutils-tests-that-fail-in-rpmbuild Python-3.2.2/Lib/distutils/tests/test_build_ext.py

00139-skip-test_float-known-failure-on-arm.patch

@@ -1,11 +0,0 @@
-diff -up Python-2.7.2/Lib/test/test_float.py.skip-test_float-known-failure-on-arm Python-2.7.2/Lib/test/test_float.py
---- Python-2.7.2/Lib/test/test_float.py.skip-test_float-known-failure-on-arm	2011-09-08 19:34:09.000986128 -0400
-+++ Python-2.7.2/Lib/test/test_float.py	2011-09-08 19:34:57.969982779 -0400
-@@ -1072,6 +1072,7 @@ class HexFloatTestCase(unittest.TestCase
-                     self.identical(got, expected)
- 
- 
-+    @unittest.skip('Known failure on ARM: http://bugs.python.org/issue8265')
-     def test_from_hex(self):
-         MIN = self.MIN;
-         MAX = self.MAX;

00141-fix-tests_with_COUNT_ALLOCS.patch

@@ -1,113 +0,0 @@
-diff -r e245b0d7209b Lib/test/test_gc.py
---- a/Lib/test/test_gc.py	Sun Oct 20 02:01:29 2013 -0700
-+++ b/Lib/test/test_gc.py	Fri Nov 08 13:25:29 2013 +0100
-@@ -127,10 +127,16 @@
-         del a
-         self.assertNotEqual(gc.collect(), 0)
-         del B, C
--        self.assertNotEqual(gc.collect(), 0)
-+        if hasattr(sys, 'getcounts'):
-+            self.assertEqual(gc.collect(), 0)
-+        else:
-+            self.assertNotEqual(gc.collect(), 0)
-         A.a = A()
-         del A
--        self.assertNotEqual(gc.collect(), 0)
-+        if hasattr(sys, 'getcounts'):
-+            self.assertEqual(gc.collect(), 0)
-+        else:
-+            self.assertNotEqual(gc.collect(), 0)
-         self.assertEqual(gc.collect(), 0)
- 
-     def test_method(self):
-@@ -618,6 +624,8 @@
-         stderr = run_command(code % "gc.DEBUG_SAVEALL")
-         self.assertNotIn(b"uncollectable objects at shutdown", stderr)
- 
-+    @unittest.skipIf(hasattr(sys, 'getcounts'),
-+                     'types are immortal if COUNT_ALLOCS is used')
-     def test_gc_main_module_at_shutdown(self):
-         # Create a reference cycle through the __main__ module and check
-         # it gets collected at interpreter shutdown.
-@@ -632,6 +640,8 @@
-         rc, out, err = assert_python_ok('-c', code)
-         self.assertEqual(out.strip(), b'__del__ called')
- 
-+    @unittest.skipIf(hasattr(sys, 'getcounts'),
-+                     'types are immortal if COUNT_ALLOCS is used')
-     def test_gc_ordinary_module_at_shutdown(self):
-         # Same as above, but with a non-__main__ module.
-         with temp_dir() as script_dir:
-diff -r e245b0d7209b Lib/test/test_module.py
---- a/Lib/test/test_module.py	Sun Oct 20 02:01:29 2013 -0700
-+++ b/Lib/test/test_module.py	Fri Nov 08 13:25:29 2013 +0100
-@@ -81,6 +81,8 @@
-         gc_collect()
-         self.assertEqual(f().__dict__["bar"], 4)
- 
-+    @unittest.skipIf(hasattr(sys, 'getcounts'), 
-+                     'types are immortal if COUNT_ALLOCS is used')
-     def test_clear_dict_in_ref_cycle(self):
-         destroyed = []
-         m = ModuleType("foo")
-@@ -96,6 +98,8 @@
-         gc_collect()
-         self.assertEqual(destroyed, [1])
- 
-+    @unittest.skipIf(hasattr(sys, 'getcounts'), 
-+                     'types are immortal if COUNT_ALLOCS is used')
-     def test_weakref(self):
-         m = ModuleType("foo")
-         wr = weakref.ref(m)
-@@ -190,6 +194,8 @@
-         self.assertEqual(r[-len(ends_with):], ends_with,
-                          '{!r} does not end with {!r}'.format(r, ends_with))
- 
-+    @unittest.skipIf(hasattr(sys, 'getcounts'),
-+                     'skipping since COUNT_ALLOCS was used, see issue19527')
-     def test_module_finalization_at_shutdown(self):
-         # Module globals and builtins should still be available during shutdown
-         rc, out, err = assert_python_ok("-c", "from test import final_a")
---- a/Lib/test/test_io.py.orig	2014-01-09 14:43:44.000000000 +0100
-+++ b/Lib/test/test_io.py	2014-01-09 14:50:30.839597351 +0100
-@@ -2611,6 +2611,8 @@
-             """.format(iomod=iomod, kwargs=kwargs)
-         return assert_python_ok("-c", code)
- 
-+    @unittest.skipIf(hasattr(sys, 'getrefcount'),
-+                     'types are immortal if COUNT_ALLOCS is used')
-     def test_create_at_shutdown_without_encoding(self):
-         rc, out, err = self._check_create_at_shutdown()
-         if err:
-@@ -2621,6 +2623,8 @@
-         else:
-             self.assertEqual("ok", out.decode().strip())
- 
-+    @unittest.skipIf(hasattr(sys, 'getrefcount'),
-+                     'types are immortal if COUNT_ALLOCS is used')
-     def test_create_at_shutdown_with_encoding(self):
-         rc, out, err = self._check_create_at_shutdown(encoding='utf-8',
-                                                       errors='strict')
---- a/Lib/test/test_logging.py.orig	2014-01-09 14:53:07.016388198 +0100
-+++ b/Lib/test/test_logging.py	2014-01-09 14:54:25.654282973 +0100
-@@ -3398,6 +3398,8 @@
-         logging.setLoggerClass(logging.Logger)
-         self.assertEqual(logging.getLoggerClass(), logging.Logger)
- 
-+    @unittest.skipIf(hasattr(sys, 'getcounts'),
-+                     'types are immortal if COUNT_ALLOCS is used')
-     def test_logging_at_shutdown(self):
-         # Issue #20037
-         code = """if 1:
-
---- a/Lib/test/test_warnings.py.orig   2014-01-09 15:10:12.454997100 +0100
-+++ b/Lib/test/test_warnings.py    2014-01-09 15:11:14.028913478 +0100
-@@ -780,6 +780,8 @@
-             assert_python_ok('-c', 'pass', '-W', 'always', PYTHONPATH=cwd)
- 
- class FinalizationTest(unittest.TestCase):
-+    @unittest.skipIf(hasattr(sys, 'getcounts'),
-+                     'types are immortal if COUNT_ALLOCS is used')
-     def test_finalization(self):
-         # Issue #19421: warnings.warn() should not crash
-         # during Python finalization

00143-tsc-on-ppc.patch

@@ -1,58 +0,0 @@
-diff -up Python-2.7.2/Python/ceval.c.tsc-on-ppc Python-2.7.2/Python/ceval.c
---- Python-2.7.2/Python/ceval.c.tsc-on-ppc	2011-08-23 14:59:48.051300849 -0400
-+++ Python-2.7.2/Python/ceval.c	2011-08-23 15:33:25.412162902 -0400
-@@ -37,24 +37,42 @@ typedef unsigned long long uint64;
- */
- #if defined(__ppc__) || defined (__powerpc__)
- 
--#define READ_TIMESTAMP(var) ppc_getcounter(&var)
-+#if defined( __powerpc64__) || defined(__LP64__)
-+/* 64-bit PowerPC */
-+#define READ_TIMESTAMP(var) ppc64_getcounter(&var)
-+static void
-+ppc64_getcounter(uint64 *v)
-+{
-+    /* On 64-bit PowerPC we can read the 64-bit timebase directly into a
-+       64-bit register */
-+    uint64 timebase;
-+#ifdef _ARCH_PWR4
-+    asm volatile ("mfspr %0,268" : "=r" (timebase));
-+#else
-+    asm volatile ("mftb %0" : "=r" (timebase));
-+#endif
-+    *v = timebase;
-+}
-+
-+#else
-+/* 32-bit PowerPC */
-+#define READ_TIMESTAMP(var) ppc32_getcounter(&var)
- 
- static void
--ppc_getcounter(uint64 *v)
-+ppc32_getcounter(uint64 *v)
- {
--    unsigned long tbu, tb, tbu2;
-+    union { long long ll; long ii[2]; } u;
-+    long tmp;
- 
-   loop:
--    asm volatile ("mftbu %0" : "=r" (tbu) );
--    asm volatile ("mftb  %0" : "=r" (tb)  );
--    asm volatile ("mftbu %0" : "=r" (tbu2));
--    if (__builtin_expect(tbu != tbu2, 0)) goto loop;
--
--    /* The slightly peculiar way of writing the next lines is
--       compiled better by GCC than any other way I tried. */
--    ((long*)(v))[0] = tbu;
--    ((long*)(v))[1] = tb;
-+    asm volatile ("mftbu %0" : "=r" (u.ii[0]) );
-+    asm volatile ("mftb  %0" : "=r" (u.ii[1]) );
-+    asm volatile ("mftbu %0" : "=r" (tmp));
-+    if (__builtin_expect(u.ii[0] != tmp, 0)) goto loop;
-+
-+    *v = u.ll;
- }
-+#endif /* powerpc 32/64 bit */
- 
- #elif defined(__i386__)
- 

00146-hashlib-fips.patch

@@ -1,637 +0,0 @@
---- Python-3.4.0b1/Lib/hashlib.py.hashlib-fips	2013-11-24 21:36:54.000000000 +0100
-+++ Python-3.4.0b1/Lib/hashlib.py	2013-11-27 11:45:17.073617547 +0100
-@@ -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
-@@ -63,6 +73,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 = {}
- 
-@@ -108,34 +131,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
-@@ -215,7 +245,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)
-@@ -223,3 +256,4 @@
- # Cleanup locals()
- del __always_supported, __func_name, __get_hash
- del __py_new, __hash_new, __get_openssl_constructor
-+del __ignore_usedforsecurity
---- Python-3.4.0b1/Lib/test/test_hashlib.py	2013-11-27 11:55:42.769601363 +0100
-+++ Python-3.4.0b1/Lib/test/test_hashlib.py	2013-11-28 09:33:03.929008508 +0100
-@@ -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',
-@@ -66,11 +91,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')
-@@ -82,26 +107,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)
- 
-@@ -157,9 +169,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:
-@@ -558,6 +567,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):
- 
-@@ -639,6 +707,7 @@
-         with self.assertRaisesRegex(ValueError, 'unsupported hash type'):
-             pbkdf2('unknown', b'pass', b'salt', 1)
- 
-+    @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)
- 
---- Python-3.4.0b1/Modules/_hashopenssl.c.hashlib-fips	2013-11-24 21:36:56.000000000 +0100
-+++ Python-3.4.0b1/Modules/_hashopenssl.c	2013-11-27 12:01:57.443537463 +0100
-@@ -19,6 +19,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. */
-@@ -48,11 +50,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)
-@@ -97,6 +107,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
-@@ -281,15 +333,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;
-     }
- 
-@@ -310,7 +363,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);
-@@ -394,7 +452,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;
- 
-@@ -409,7 +468,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) {
-@@ -433,21 +497,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;
-     }
- 
-@@ -461,7 +533,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);
-@@ -742,57 +815,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)
-@@ -843,13 +974,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)

00150-disable-rAssertAlmostEqual-cmath-on-ppc.patch

@@ -1,11 +0,0 @@
-diff -up Python-3.2.2/Lib/test/test_cmath.py.ppc Python-3.2.2/Lib/test/test_cmath.py
---- Python-3.2.2/Lib/test/test_cmath.py.ppc	2011-12-07 23:43:55.000000000 +0100
-+++ Python-3.2.2/Lib/test/test_cmath.py	2011-12-07 23:49:44.000000000 +0100
-@@ -95,6 +95,7 @@ class CMathTests(unittest.TestCase):
-         self.assertFloatIdentical(x.real, y.real)
-         self.assertFloatIdentical(x.imag, y.imag)
- 
-+    @unittest.skip('Known failure on PPC: glibc bug https://bugzilla.redhat.com/show_bug.cgi?id=750811')
-     def rAssertAlmostEqual(self, a, b, rel_err = 2e-15, abs_err = 5e-323,
-                            msg=None):
-         """Fail if the two floating-point numbers are not almost equal.

00153-fix-test_gdb-noise.patch

@@ -1,31 +0,0 @@
---- Lib/test/test_gdb.py.old	2012-04-11 21:04:01.367073855 -0400
-+++ Lib/test/test_gdb.py	2012-04-12 08:52:58.320288761 -0400
-@@ -96,6 +96,15 @@ class DebuggerTests(unittest.TestCase):
-         # Generate a list of commands in gdb's language:
-         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',
-+
-                     'run']
-         if cmds_after_breakpoint:
-             commands += cmds_after_breakpoint
---- Lib/test/test_gdb.py.old	2012-04-11 21:04:01.367073855 -0400
-+++ Lib/test/test_gdb.py	2012-04-12 08:52:58.320288761 -0400
-@@ -144,6 +153,10 @@
-             'Missing separate debuginfo for ',
-             'Try: zypper install -C ',
-             )
-+        ignore_patterns += ('warning: Unable to open',
-+                            'Missing separate debuginfo for',
-+                            'Try: yum --disablerepo=',
-+                            'Undefined set print command')
-         for line in errlines:
-             if not line.startswith(ignore_patterns):
-                 unexpected_errlines.append(line)

00155-avoid-ctypes-thunks.patch

@@ -1,15 +0,0 @@
-diff -up Python-3.2.3/Lib/ctypes/__init__.py.rhbz814391 Python-3.2.3/Lib/ctypes/__init__.py
---- Python-3.2.3/Lib/ctypes/__init__.py.rhbz814391	2012-04-20 15:12:49.017867692 -0400
-+++ Python-3.2.3/Lib/ctypes/__init__.py	2012-04-20 15:15:09.501111408 -0400
-@@ -275,11 +275,6 @@ def _reset_cache():
-     # _SimpleCData.c_char_p_from_param
-     POINTER(c_char).from_param = c_char_p.from_param
-     _pointer_type_cache[None] = c_void_p
--    # XXX for whatever reasons, creating the first instance of a callback
--    # function is needed for the unittests on Win64 to succeed.  This MAY
--    # be a compiler bug, since the problem occurs only when _ctypes is
--    # compiled with the MS SDK compiler.  Or an uninitialized variable?
--    CFUNCTYPE(c_int)(lambda: None)
- 
- def create_unicode_buffer(init, size=None):
-     """create_unicode_buffer(aString) -> character array

00156-gdb-autoload-safepath.patch

@@ -1,52 +0,0 @@
-diff -up Python-3.2.3/Lib/test/test_gdb.py.gdb-autoload-safepath Python-3.2.3/Lib/test/test_gdb.py
---- Python-3.2.3/Lib/test/test_gdb.py.gdb-autoload-safepath	2012-04-30 17:16:24.092706954 -0400
-+++ Python-3.2.3/Lib/test/test_gdb.py	2012-04-30 17:17:13.275703592 -0400
-@@ -46,6 +46,19 @@ def gdb_has_frame_select():
- 
- HAS_PYUP_PYDOWN = gdb_has_frame_select()
- 
-+def gdb_has_autoload_safepath():
-+    # Recent GDBs will only auto-load scripts from certain safe
-+    # locations, so we will need to turn off this protection.
-+    # However, if the GDB doesn't have it, then the following
-+    # command will generate noise on stderr (rhbz#817072):
-+    cmd = "--eval-command=set auto-load safe-path /"
-+    p = subprocess.Popen(["gdb", "--batch", cmd],
-+                         stderr=subprocess.PIPE)
-+    _, stderr = p.communicate()
-+    return b'"on" or "off" expected.' not in stderr
-+    
-+HAS_AUTOLOAD_SAFEPATH = gdb_has_autoload_safepath()
-+
- BREAKPOINT_FN='builtin_id'
- 
- class DebuggerTests(unittest.TestCase):
-@@ -106,15 +119,28 @@ class DebuggerTests(unittest.TestCase):
-                     'set print entry-values no',
- 
-                     'run']
-+
-+        if HAS_AUTOLOAD_SAFEPATH:
-+            # Recent GDBs will only auto-load scripts from certain safe
-+            # locations.
-+            # Where necessary, turn off this protection to ensure that
-+            # our -gdb.py script can be loaded - but not on earlier gdb builds
-+            # as this would generate noise on stderr (rhbz#817072):
-+            init_commands = ['set auto-load safe-path /']
-+        else:
-+            init_commands = []
-+
-         if cmds_after_breakpoint:
-             commands += cmds_after_breakpoint
-         else:
-             commands += ['backtrace']
- 
-+        # print init_commands
-         # print commands
- 
-         # Use "commands" to generate the arguments with which to invoke "gdb":
-         args = ["gdb", "--batch"]
-+        args += ['--init-eval-command=%s' % cmd for cmd in init_commands]
-         args += ['--eval-command=%s' % cmd for cmd in commands]
-         args += ["--args",
-                  sys.executable]

00157-uid-gid-overflows.patch

@@ -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)
- 

00160-disable-test_fs_holes-in-rpm-build.patch

@@ -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):

00163-disable-parts-of-test_socket-in-rpm-build.patch

@@ -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)

00164-disable-interrupted_write-tests-on-ppc.patch

@@ -1,52 +0,0 @@
-diff -up Python-3.3.0b1/Lib/test/test_exceptions.py.846849 Python-3.3.0b1/Lib/test/test_exceptions.py
---- Python-3.3.0b1/Lib/test/test_exceptions.py.846849	2012-06-26 22:19:47.000000000 +0200
-+++ Python-3.3.0b1/Lib/test/test_exceptions.py	2012-08-13 17:41:28.845403486 +0200
-@@ -401,6 +401,7 @@ class ExceptionTests(unittest.TestCase):
-         self.assertIsNone(e.__context__)
-         self.assertIsNone(e.__cause__)
- 
-+    @unittest.skip('rhbz#846849')
-     def testChainingDescriptors(self):
-         try:
-             raise Exception()
-diff -up Python-3.3.0b1/Lib/test/test_io.py.846849 Python-3.3.0b1/Lib/test/test_io.py
---- Python-3.3.0b1/Lib/test/test_io.py.846849	2012-06-26 22:19:48.000000000 +0200
-+++ Python-3.3.0b1/Lib/test/test_io.py	2012-08-13 17:41:28.846403451 +0200
-@@ -2938,12 +2938,15 @@ class SignalsTest(unittest.TestCase):
-                 if e.errno != errno.EBADF:
-                     raise
- 
-+    @unittest.skip('rhbz#846849')
-     def test_interrupted_write_unbuffered(self):
-         self.check_interrupted_write(b"xy", b"xy", mode="wb", buffering=0)
- 
-+    @unittest.skip('rhbz#846849')
-     def test_interrupted_write_buffered(self):
-         self.check_interrupted_write(b"xy", b"xy", mode="wb")
- 
-+    @unittest.skip('rhbz#846849')
-     def test_interrupted_write_text(self):
-         self.check_interrupted_write("xy", b"xy", mode="w", encoding="ascii")
- 
-diff -up Python-3.3.0b1/Lib/test/test_raise.py.846849 Python-3.3.0b1/Lib/test/test_raise.py
---- Python-3.3.0b1/Lib/test/test_raise.py.846849	2012-08-13 17:42:16.719714213 +0200
-+++ Python-3.3.0b1/Lib/test/test_raise.py	2012-08-13 17:43:02.544097272 +0200
-@@ -151,6 +151,7 @@ class TestRaise(unittest.TestCase):
- 
- class TestCause(unittest.TestCase):
- 
-+    @unittest.skip('rhbz#846849')
-     def testCauseSyntax(self):
-         try:
-             try:
-diff -up Python-3.3.0b1/Lib/test/test_traceback.py.846849 Python-3.3.0b1/Lib/test/test_traceback.py
---- Python-3.3.0b1/Lib/test/test_traceback.py.846849	2012-08-13 17:44:19.714374275 +0200
-+++ Python-3.3.0b1/Lib/test/test_traceback.py	2012-08-13 17:44:43.515534435 +0200
-@@ -246,6 +246,7 @@ class BaseExceptionReportingTests:
-         self.check_zero_div(blocks[0])
-         self.assertIn('inner_raise() # Marker', blocks[2])
- 
-+    @unittest.skip('rhbz#846849')
-     def test_context_suppression(self):
-         try:
-             try:

00173-workaround-ENOPROTOOPT-in-bind_port.patch

@@ -1,12 +0,0 @@
---- Python-3.4.0b1/Lib/test/support/__init__.py.orig	2013-11-27 12:14:26.507216624 +0100
-+++ Python-3.4.0b1/Lib/test/support/__init__.py	2013-11-27 12:17:01.490805587 +0100
-@@ -593,7 +593,8 @@
-             if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR) == 1:
-                 raise TestFailed("tests should never set the SO_REUSEADDR "   \
-                                  "socket option on TCP/IP sockets!")
--        if hasattr(socket, 'SO_REUSEPORT'):
-+        if hasattr(socket, 'SO_REUSEPORT') \
-+                and 'WITHIN_PYTHON_RPM_BUILD' not in os.environ: # rhbz#913732
-             try:
-                 if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1:
-                     raise TestFailed("tests should never set the SO_REUSEPORT "   \

00175-fix-configure-Wformat.patch

@@ -1,12 +0,0 @@
-diff -up Python-3.3.0/configure.ac.fix-configure-Wformat Python-3.3.0/configure.ac
---- Python-3.3.0/configure.ac.fix-configure-Wformat	2013-03-25 16:09:09.127667472 -0400
-+++ Python-3.3.0/configure.ac	2013-03-25 16:09:16.442666967 -0400
-@@ -1308,7 +1308,7 @@ if test "$GCC" = "yes"
- then
-   AC_MSG_CHECKING(whether gcc supports ParseTuple __format__)
-   save_CFLAGS=$CFLAGS
--  CFLAGS="$CFLAGS -Werror"
-+  CFLAGS="$CFLAGS -Werror -Wformat"
-   AC_COMPILE_IFELSE([
-     AC_LANG_PROGRAM([[void f(char*,...)__attribute((format(PyArg_ParseTuple, 1, 2)));]], [[]])
-   ],[

00176-upstream-issue16754-so-extension.patch

@@ -1,11 +0,0 @@
---- Python-3.3.0/Lib/distutils/sysconfig.py	2012-09-29 10:00:28.000000000 +0200
-+++ Python-3.3.0/Lib/distutils/sysconfig.py	2012-12-22 20:14:49.661337174 +0100
-@@ -228,7 +228,7 @@ def customize_compiler(compiler):
-             linker_exe=cc,
-             archiver=archiver)
- 
--        compiler.shared_lib_extension = so_ext
-+        #compiler.shared_lib_extension = so_ext
- 
- 
- def get_config_h_filename():

00178-dont-duplicate-flags-in-sysconfig.patch

@@ -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:

00179-dont-raise-error-on-gdb-corrupted-frames-in-backtrace.patch

@@ -1,48 +0,0 @@
---- a/Tools/gdb/libpython.py	2013-04-06 03:41:58.000000000 -0400
-+++ b/Tools/gdb/libpython.py	2013-04-24 03:51:04.720540343 -0400
-@@ -274,6 +274,9 @@
-                 self.tp_name = tp_name
-                 self.address = address
- 
-+            def __len__(self):
-+                return len(repr(self))
-+
-             def __repr__(self):
-                 # For the NULL pointer, we have no way of knowing a type, so
-                 # special-case it as per
-@@ -881,6 +884,8 @@
-         filename = self.filename()
-         try:
-             f = open(os_fsencode(filename), 'r')
-+        except TypeError: # filename is FakeRepr
-+            return None
-         except IOError:
-             return None
-         with f:
-@@ -1523,9 +1528,12 @@
- 
-     def print_summary(self):
-         if self.is_evalframeex():
--            pyop = self.get_pyop()
--            if pyop:
-+            try:
-+                pyop = self.get_pyop()
-                 line = pyop.get_truncated_repr(MAX_OUTPUT_LEN)
-+            except:
-+                pyop = None
-+            if pyop:
-                 write_unicode(sys.stdout, '#%i %s\n' % (self.get_index(), line))
-                 if not pyop.is_optimized_out():
-                     line = pyop.current_line()
-@@ -1542,7 +1550,10 @@
- 
-     def print_traceback(self):
-         if self.is_evalframeex():
--            pyop = self.get_pyop()
-+            try:
-+                pyop = self.get_pyop()
-+            except:
-+                pyop = None
-             if pyop:
-                 pyop.print_traceback()
-                 if not pyop.is_optimized_out():

00180-python-add-support-for-ppc64p7.patch

@@ -1,12 +0,0 @@
-diff -r de35eae9048a config.sub
---- a/config.sub	Wed Apr 24 23:33:20 2013 +0200
-+++ b/config.sub	Thu Apr 25 08:51:00 2013 +0200
-@@ -1008,7 +1008,7 @@
- 		;;
- 	ppc64)	basic_machine=powerpc64-unknown
- 		;;
--	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
- 		basic_machine=powerpc64le-unknown

00184-ctypes-should-build-with-libffi-multilib-wrapper.patch

@@ -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:

00186-dont-raise-from-py_compile.patch

@@ -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))

00187-change-match_hostname-to-follow-RFC-6125.patch

@@ -1,188 +0,0 @@
---- a/Doc/library/ssl.rst
-+++ b/Doc/library/ssl.rst
-@@ -283,10 +283,10 @@ Certificate handling
-    Verify that *cert* (in decoded format as returned by
-    :meth:`SSLSocket.getpeercert`) matches the given *hostname*.  The rules
-    applied are those for checking the identity of HTTPS servers as outlined
--   in :rfc:`2818`, except that IP addresses are not currently supported.
--   In addition to HTTPS, this function should be suitable for checking the
--   identity of servers in various SSL-based protocols such as FTPS, IMAPS,
--   POPS and others.
-+   in :rfc:`2818` and :rfc:`6125`, except that IP addresses are not currently
-+   supported. In addition to HTTPS, this function should be suitable for
-+   checking the identity of servers in various SSL-based protocols such as
-+   FTPS, IMAPS, POPS and others.
- 
-    :exc:`CertificateError` is raised on failure. On success, the function
-    returns nothing::
-@@ -301,6 +301,13 @@ Certificate handling
- 
-    .. versionadded:: 3.2
- 
-+   .. versionchanged:: 3.3.3
-+      The function now follows :rfc:`6125`, section 6.4.3 and does neither
-+      match multiple wildcards (e.g. ``*.*.com`` or ``*a*.example.org``) nor
-+      a wildcard inside an internationalized domain names (IDN) fragment.
-+      IDN A-labels such as ``www*.xn--pthon-kva.org`` are still supported,
-+      but ``x*.python.org`` no longer matches ``xn--tda.python.org``.
-+
- .. function:: cert_time_to_seconds(timestring)
- 
-    Returns a floating-point value containing a normal seconds-after-the-epoch
-unchanged:
---- a/Lib/ssl.py
-+++ b/Lib/ssl.py
-@@ -129,25 +129,53 @@ class CertificateError(ValueError):
-     pass
- 
- 
--def _dnsname_to_pat(dn, max_wildcards=1):
-+def _dnsname_match(dn, hostname, max_wildcards=1):
-+    """Matching according to RFC 6125, section 6.4.3
-+
-+    http://tools.ietf.org/html/rfc6125#section-6.4.3
-+    """
-     pats = []
--    for frag in dn.split(r'.'):
--        if frag.count('*') > max_wildcards:
--            # Issue #17980: avoid denials of service by refusing more
--            # than one wildcard per fragment.  A survery of established
--            # policy among SSL implementations showed it to be a
--            # reasonable choice.
--            raise CertificateError(
--                "too many wildcards in certificate DNS name: " + repr(dn))
--        if frag == '*':
--            # When '*' is a fragment by itself, it matches a non-empty dotless
--            # fragment.
--            pats.append('[^.]+')
--        else:
--            # Otherwise, '*' matches any dotless fragment.
--            frag = re.escape(frag)
--            pats.append(frag.replace(r'\*', '[^.]*'))
--    return re.compile(r'\A' + r'\.'.join(pats) + r'\Z', re.IGNORECASE)
-+    if not dn:
-+        return False
-+
-+    leftmost, *remainder = dn.split(r'.')
-+
-+    wildcards = leftmost.count('*')
-+    if wildcards > max_wildcards:
-+        # Issue #17980: avoid denials of service by refusing more
-+        # than one wildcard per fragment.  A survery of established
-+        # policy among SSL implementations showed it to be a
-+        # reasonable choice.
-+        raise CertificateError(
-+            "too many wildcards in certificate DNS name: " + repr(dn))
-+
-+    # speed up common case w/o wildcards
-+    if not wildcards:
-+        return dn.lower() == hostname.lower()
-+
-+    # RFC 6125, section 6.4.3, subitem 1.
-+    # The client SHOULD NOT attempt to match a presented identifier in which
-+    # the wildcard character comprises a label other than the left-most label.
-+    if leftmost == '*':
-+        # When '*' is a fragment by itself, it matches a non-empty dotless
-+        # fragment.
-+        pats.append('[^.]+')
-+    elif leftmost.startswith('xn--') or hostname.startswith('xn--'):
-+        # RFC 6125, section 6.4.3, subitem 3.
-+        # The client SHOULD NOT attempt to match a presented identifier
-+        # where the wildcard character is embedded within an A-label or
-+        # U-label of an internationalized domain name.
-+        pats.append(re.escape(leftmost))
-+    else:
-+        # Otherwise, '*' matches any dotless string, e.g. www*
-+        pats.append(re.escape(leftmost).replace(r'\*', '[^.]*'))
-+
-+    # add the remaining fragments, ignore any wildcards
-+    for frag in remainder:
-+        pats.append(re.escape(frag))
-+
-+    pat = re.compile(r'\A' + r'\.'.join(pats) + r'\Z', re.IGNORECASE)
-+    return pat.match(hostname)
- 
- 
- def match_hostname(cert, hostname):
-unchanged:
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -304,11 +304,7 @@ class BasicSocketTests(unittest.TestCase
-         fail(cert, 'Xa.com')
-         fail(cert, '.a.com')
- 
--        cert = {'subject': ((('commonName', 'a.*.com'),),)}
--        ok(cert, 'a.foo.com')
--        fail(cert, 'a..com')
--        fail(cert, 'a.com')
--
-+        # only match one left-most wildcard
-         cert = {'subject': ((('commonName', 'f*.com'),),)}
-         ok(cert, 'foo.com')
-         ok(cert, 'f.com')
-@@ -323,6 +319,36 @@ class BasicSocketTests(unittest.TestCase
-         fail(cert, 'example.org')
-         fail(cert, 'null.python.org')
- 
-+        # error cases with wildcards
-+        cert = {'subject': ((('commonName', '*.*.a.com'),),)}
-+        fail(cert, 'bar.foo.a.com')
-+        fail(cert, 'a.com')
-+        fail(cert, 'Xa.com')
-+        fail(cert, '.a.com')
-+
-+        cert = {'subject': ((('commonName', 'a.*.com'),),)}
-+        fail(cert, 'a.foo.com')
-+        fail(cert, 'a..com')
-+        fail(cert, 'a.com')
-+
-+        # wildcard doesn't match IDNA prefix 'xn--'
-+        idna = 'püthon.python.org'.encode("idna").decode("ascii")
-+        cert = {'subject': ((('commonName', idna),),)}
-+        ok(cert, idna)
-+        cert = {'subject': ((('commonName', 'x*.python.org'),),)}
-+        fail(cert, idna)
-+        cert = {'subject': ((('commonName', 'xn--p*.python.org'),),)}
-+        fail(cert, idna)
-+
-+        # wildcard in first fragment and  IDNA A-labels in sequent fragments
-+        # are supported.
-+        idna = 'www*.pythön.org'.encode("idna").decode("ascii")
-+        cert = {'subject': ((('commonName', idna),),)}
-+        ok(cert, 'www.pythön.org'.encode("idna").decode("ascii"))
-+        ok(cert, 'www1.pythön.org'.encode("idna").decode("ascii"))
-+        fail(cert, 'ftp.pythön.org'.encode("idna").decode("ascii"))
-+        fail(cert, 'pythön.org'.encode("idna").decode("ascii"))
-+
-         # Slightly fake real-world example
-         cert = {'notAfter': 'Jun 26 21:41:46 2011 GMT',
-                 'subject': ((('commonName', 'linuxfrz.org'),),),
-@@ -383,7 +409,7 @@ class BasicSocketTests(unittest.TestCase
-         cert = {'subject': ((('commonName', 'a*b.com'),),)}
-         ok(cert, 'axxb.com')
-         cert = {'subject': ((('commonName', 'a*b.co*'),),)}
--        ok(cert, 'axxb.com')
-+        fail(cert, 'axxb.com')
-         cert = {'subject': ((('commonName', 'a*b*.com'),),)}
-         with self.assertRaises(ssl.CertificateError) as cm:
-             ssl.match_hostname(cert, 'axxbxxc.com')
---- a/Lib/ssl.py
-+++ b/Lib/ssl.py
-@@ -192,7 +192,7 @@ def match_hostname(cert, hostname):
-     san = cert.get('subjectAltName', ())
-     for key, value in san:
-         if key == 'DNS':
--            if _dnsname_to_pat(value).match(hostname):
-+            if _dnsname_match(value, hostname):
-                 return
-             dnsnames.append(value)
-     if not dnsnames:
-@@ -203,7 +203,7 @@ def match_hostname(cert, hostname):
-                 # XXX according to RFC 2818, the most specific Common Name
-                 # must be used.
-                 if key == 'commonName':
--                    if _dnsname_to_pat(value).match(hostname):
-+                    if _dnsname_match(value, hostname):
-                         return
-                     dnsnames.append(value)
-     if len(dnsnames) > 1:

00188-fix-lib2to3-tests-when-hashlib-doesnt-compile-properly.patch

@@ -1,11 +0,0 @@
-diff -r 28c04e954bb6 Lib/lib2to3/main.py
---- a/Lib/lib2to3/main.py	Tue Oct 29 22:25:55 2013 -0400
-+++ b/Lib/lib2to3/main.py	Wed Nov 06 14:33:07 2013 +0100
-@@ -213,6 +213,7 @@
- 
-     # Set up logging handler
-     level = logging.DEBUG if options.verbose else logging.INFO
-+    logging.root.handlers = []
-     logging.basicConfig(format='%(name)s: %(message)s', level=level)
-     logger = logging.getLogger('lib2to3.main')
- 

00189-add-rewheel-module.patch

@@ -1,232 +0,0 @@
-diff -Nur Python-3.4.1/Lib/ensurepip/__init__.py Python-3.4.1-rewheel/Lib/ensurepip/__init__.py
---- Python-3.4.1/Lib/ensurepip/__init__.py	2014-08-21 10:49:30.792695824 +0200
-+++ Python-3.4.1-rewheel/Lib/ensurepip/__init__.py	2014-08-21 10:10:41.958341726 +0200
-@@ -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 @@
- 
-     # Install the bundled software
-     import pip
-+    if args[0] in ["install", "list", "wheel"]:
-+        args.append('--pre')
-     pip.main(args)
- 
- 
-@@ -87,20 +91,39 @@
-         # omit pip and easy_install
-         os.environ["ENSUREPIP_OPTIONS"] = "install"
- 
-+    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:
-+            whl = os.path.join(
-+                os.path.dirname(__file__),
-+                "_bundled",
-+                "{}-{}-py2.py3-none-any.whl".format(project, version)
-+            )
-+            whls.append(whl)
-+
-     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 project, version in _PROJECTS:
--            wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
--            whl = pkgutil.get_data(
--                "ensurepip",
--                "_bundled/{}".format(wheel_name),
--            )
--            with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
--                fp.write(whl)
--
--            additional_paths.append(os.path.join(tmpdir, wheel_name))
-+        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]
-diff -Nur Python-3.4.1/Lib/ensurepip/rewheel/__init__.py Python-3.4.1-rewheel/Lib/ensurepip/rewheel/__init__.py
---- Python-3.4.1/Lib/ensurepip/rewheel/__init__.py	1970-01-01 01:00:00.000000000 +0100
-+++ Python-3.4.1-rewheel/Lib/ensurepip/rewheel/__init__.py	2014-08-21 10:11:22.560320121 +0200
-@@ -0,0 +1,143 @@
-+import argparse
-+import codecs
-+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]
-+        if path is not None:
-+            records.append(os.path.join(path, 'RECORD'))
-+        else:
-+            records.append(None)
-+    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')
-+    with codecs.open(wheel_info_path, encoding='utf-8') as wheel_info_file:
-+        wheel_info = email.parser.Parser().parsestr(wheel_info_file.read())
-+
-+    metadata_path = os.path.join(os.path.dirname(record_path), 'METADATA')
-+    with codecs.open(metadata_path, encoding='utf-8') as metadata_file:
-+        metadata = email.parser.Parser().parsestr(metadata_file.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_file_path = os.path.join(site_dir, record_relpath)
-+    with codecs.open(record_file_path, encoding='utf-8') as record_file:
-+        record_contents = record_file.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
-diff -Nur Python-3.4.1/Makefile.pre.in Python-3.4.1-rewheel/Makefile.pre.in
---- Python-3.4.1/Makefile.pre.in	2014-08-21 10:49:31.512695040 +0200
-+++ Python-3.4.1-rewheel/Makefile.pre.in	2014-08-21 10:10:41.961341722 +0200
-@@ -1145,7 +1145,7 @@
- 		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 \

00189-use-rpm-wheels.patch

@@ -0,0 +1,70 @@
+From 72d6cb277804f58b660bf96d8f5efff78d88491c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Wed, 15 Aug 2018 15:36:29 +0200
+Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels
+
+We keep them in /usr/share/python-wheels
+---
+ Lib/ensurepip/__init__.py | 32 ++++++++++++++++++++++----------
+ 1 file changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
+index fc0edec6e3..731817a3f0 100644
+--- a/Lib/ensurepip/__init__.py
++++ b/Lib/ensurepip/__init__.py
+@@ -1,16 +1,31 @@
++import distutils.version
++import glob
+ import os
+ import os.path
+-import pkgutil
+ import sys
+ import tempfile
+ 
+ 
+ __all__ = ["version", "bootstrap"]
+ 
++_WHEEL_DIR = "/usr/share/python-wheels/"
+ 
+-_SETUPTOOLS_VERSION = "41.2.0"
++_wheels = {}
+ 
+-_PIP_VERSION = "19.2.3"
++def _get_most_recent_wheel_version(pkg):
++    prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))
++    _wheels[pkg] = {}
++    for suffix in "-py2.py3-none-any.whl", "-py3-none-any.whl":
++        pattern = "{}*{}".format(prefix, suffix)
++        for path in glob.glob(pattern):
++            version_str = path[len(prefix):-len(suffix)]
++            _wheels[pkg][version_str] = os.path.basename(path)
++    return str(max(_wheels[pkg], key=distutils.version.LooseVersion))
++
++
++_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
++
++_PIP_VERSION = _get_most_recent_wheel_version("pip")
+ 
+ _PROJECTS = [
+     ("setuptools", _SETUPTOOLS_VERSION),
+@@ -95,13 +110,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
+         # additional paths that need added to sys.path
+         additional_paths = []
+         for project, version in _PROJECTS:
+-            wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
+-            whl = pkgutil.get_data(
+-                "ensurepip",
+-                "_bundled/{}".format(wheel_name),
+-            )
+-            with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
+-                fp.write(whl)
++            wheel_name = _wheels[project][version]
++            with open(os.path.join(_WHEEL_DIR, wheel_name), "rb") as sfp:
++                with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
++                    fp.write(sfp.read())
+ 
+             additional_paths.append(os.path.join(tmpdir, wheel_name))
+ 
+-- 
+2.24.1
+

00192-buffer-overflow.patch

@@ -1,42 +0,0 @@
-
-# HG changeset patch
-# User Benjamin Peterson <benjamin@python.org>
-# Date 1389672775 18000
-# Node ID 7f176a45211ff3cb85a2fbdc75f7979d642bb563
-# Parent  ed1c27b68068c942c6e845bdf8e987e963d50920# Parent  9c56217e5c793685eeaf0ee224848c402bdf1e4c
-merge 3.2 (#20246)
-
-diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
---- a/Lib/test/test_socket.py
-+++ b/Lib/test/test_socket.py
-@@ -4538,6 +4538,14 @@ class BufferIOTest(SocketConnectedTest):
- 
-     _testRecvFromIntoMemoryview = _testRecvFromIntoArray
- 
-+    def testRecvFromIntoSmallBuffer(self):
-+        # See issue #20246.
-+        buf = bytearray(8)
-+        self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)
-+
-+    def _testRecvFromIntoSmallBuffer(self):
-+        self.serv_conn.send(MSG*2048)
-+
- 
- TIPC_STYPE = 2000
- TIPC_LOWER = 200
-diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
---- a/Modules/socketmodule.c
-+++ b/Modules/socketmodule.c
-@@ -2935,6 +2935,11 @@ sock_recvfrom_into(PySocketSockObject *s
-     if (recvlen == 0) {
-         /* If nbytes was not specified, use the buffer's length */
-         recvlen = buflen;
-+    } else if (recvlen > buflen) {
-+        PyBuffer_Release(&pbuf);
-+        PyErr_SetString(PyExc_ValueError,
-+                        "nbytes is greater than the length of the buffer");
-+        return NULL;
-     }
- 
-     readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);
-

00193-skip-correct-num-of-pycfile-bytes-in-modulefinder.patch

@@ -1,65 +0,0 @@
-
-# HG changeset patch
-# User Brett Cannon <brett@python.org>
-# Date 1393602285 18000
-# Node ID 432cb56db05d73f55d211501bf0dfc767768923b
-# Parent  ade5e4922a54cb84c99ec924ab7c700a014893da
-Issue #20778: Fix modulefinder to work with bytecode-only modules.
-
-Bug filed and initial attempt at a patch by Bohuslav Kabrda.
-
-diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
---- a/Lib/modulefinder.py
-+++ b/Lib/modulefinder.py
-@@ -287,7 +287,7 @@ class ModuleFinder:
-             if fp.read(4) != imp.get_magic():
-                 self.msgout(2, "raise ImportError: Bad magic number", pathname)
-                 raise ImportError("Bad magic number in %s" % pathname)
--            fp.read(4)
-+            fp.read(8)  # Skip mtime and size.
-             co = marshal.load(fp)
-         else:
-             co = None
-diff --git a/Lib/test/test_modulefinder.py b/Lib/test/test_modulefinder.py
---- a/Lib/test/test_modulefinder.py
-+++ b/Lib/test/test_modulefinder.py
-@@ -1,5 +1,7 @@
- import os
- import errno
-+import importlib.machinery
-+import py_compile
- import shutil
- import unittest
- import tempfile
-@@ -208,6 +210,14 @@ a/module.py
-                                 from . import *
- """]
- 
-+bytecode_test = [
-+    "a",
-+    ["a"],
-+    [],
-+    [],
-+    ""
-+]
-+
- 
- def open_file(path):
-     dirname = os.path.dirname(path)
-@@ -288,6 +298,16 @@ class ModuleFinderTest(unittest.TestCase
-     def test_relative_imports_4(self):
-         self._do_test(relative_import_test_4)
- 
-+    def test_bytecode(self):
-+        base_path = os.path.join(TEST_DIR, 'a')
-+        source_path = base_path + importlib.machinery.SOURCE_SUFFIXES[0]
-+        bytecode_path = base_path + importlib.machinery.BYTECODE_SUFFIXES[0]
-+        with open_file(source_path) as file:
-+            file.write('testing_modulefinder = True\n')
-+        py_compile.compile(source_path, cfile=bytecode_path)
-+        os.remove(source_path)
-+        self._do_test(bytecode_test)
-+
- 
- def test_main():
-     support.run_unittest(ModuleFinderTest)

00195-dont-add-Werror-declaration-after-statement.patch

@@ -1,86 +0,0 @@
-diff --git a/Makefile.pre.in b/Makefile.pre.in
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -71,12 +71,17 @@
- BASECFLAGS=	@BASECFLAGS@
- BASECPPFLAGS=	@BASECPPFLAGS@
- CONFIGURE_CFLAGS=	@CFLAGS@
-+# CFLAGS_NODIST is used for building the interpreter and stdlib C extensions.
-+# Use it when a compiler flag should _not_ be part of the distutils CFLAGS
-+# once Python is installed (Issue #21121).
-+CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@
- CONFIGURE_CPPFLAGS=	@CPPFLAGS@
- CONFIGURE_LDFLAGS=	@LDFLAGS@
- # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
- # command line to append to these values without stomping the pre-set
- # values.
- PY_CFLAGS=	$(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
-+PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST)
- # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
- # be able to build extension modules using the directories specified in the
- # environment variables
-@@ -91,7 +96,7 @@
- # Extra C flags added for building the interpreter object files.
- CFLAGSFORSHARED=@CFLAGSFORSHARED@
- # C flags used for building the interpreter object files
--PY_CORE_CFLAGS=	$(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
-+PY_CORE_CFLAGS=	$(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
- 
- 
- # Machine-dependent subdirectories
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -662,6 +662,7 @@
- LIBTOOL_CRUFT
- OTHER_LIBTOOL_OPT
- UNIVERSAL_ARCH_FLAGS
-+CFLAGS_NODIST
- BASECFLAGS
- OPT
- ABIFLAGS
-@@ -6504,7 +6505,7 @@
- 
-     if test $ac_cv_declaration_after_statement_warning = yes
-     then
--      BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement"
-+      CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement"
-     fi
- 
-     # if using gcc on alpha, use -mieee to get (near) full IEEE 754
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -1147,6 +1147,7 @@
- fi
- 
- AC_SUBST(BASECFLAGS)
-+AC_SUBST(CFLAGS_NODIST)
- 
- # The -arch flags for universal builds on OSX
- UNIVERSAL_ARCH_FLAGS=
-@@ -1231,7 +1232,7 @@
- 
-     if test $ac_cv_declaration_after_statement_warning = yes
-     then
--      BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement"
-+      CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement"
-     fi
- 
-     # if using gcc on alpha, use -mieee to get (near) full IEEE 754
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -19,6 +19,12 @@
- 
- cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
- 
-+# Add special CFLAGS reserved for building the interpreter and the stdlib
-+# modules (Issue #21121).
-+cflags = sysconfig.get_config_var('CFLAGS')
-+py_cflags_nodist = sysconfig.get_config_var('PY_CFLAGS_NODIST')
-+sysconfig.get_config_vars()['CFLAGS'] = cflags + ' ' + py_cflags_nodist
-+
- def get_platform():
-     # cross build
-     if "_PYTHON_HOST_PLATFORM" in os.environ:

00196-test-gdb-match-addr-before-builtin.patch

@@ -1,30 +0,0 @@
-Subject: python3.test gdb match addr before builtin
-From: Michel Normand <normand@linux.vnet.ibm.com>
-
-For ppc64le archi and python3... and gdb... versions
-the test_gdb.py need a change of re.match to handle address before the builtin_id word.
-Of course there is no error if this substring is not present.
-===
-...
-#0  0x00003fffb7dd0898 in builtin_id (self=<module at remote 0x3fffb7901440>, v=<unknown at remote 0x3fffb7f68910>) at /builddir/build/BUILD/Python-3.3.2/Python/bltinmodule.c:966
-....xxxxxxxxxxxxxxxxxxxxxx <= added regexp
-===
-
-Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
----
- Lib/test/test_gdb.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: Python-3.3.2/Lib/test/test_gdb.py
-===================================================================
---- Python-3.3.2.orig/Lib/test/test_gdb.py
-+++ Python-3.3.2/Lib/test/test_gdb.py
-@@ -230,7 +230,7 @@ class DebuggerTests(unittest.TestCase):
-         # gdb can insert additional '\n' and space characters in various places
-         # in its output, depending on the width of the terminal it's connected
-         # to (using its "wrap_here" function)
--        m = re.match('.*#0\s+builtin_id\s+\(self\=.*,\s+v=\s*(.*?)\)\s+at\s+\S*Python/bltinmodule.c.*',
-+        m = re.match('.*#0\s+(?: 0x[0-9a-f]+\s+in\s+)?builtin_id\s+\(self\=.*,\s+v=\s*(.*?)\)\s+at\s+\S*Python/bltinmodule.c.*',
-                      gdb_output, re.DOTALL)
-         if not m:
-             self.fail('Unexpected gdb output: %r\n%s' % (gdb_output, gdb_output))

00197-fix-CVE-2014-4650.patch

@@ -1,34 +0,0 @@
-# HG changeset patch
-# User Benjamin Peterson <benjamin@python.org>
-# Date 1402796473 25200
-# Node ID 847e288d6e93dba049c280f40979e16a1378d0f6
-# Parent  6f1f387759913d91cb307d2783b3a40c48fe7424# Parent  5676797f3a3eccaf38e2c500e77ed39c68923cc9
-merge 3.3 (#21766)
-
-diff --git a/Lib/http/server.py b/Lib/http/server.py
---- a/Lib/http/server.py
-+++ b/Lib/http/server.py
-@@ -977,7 +977,7 @@ class CGIHTTPRequestHandler(SimpleHTTPRe
-         (and the next character is a '/' or the end of the string).
- 
-         """
--        collapsed_path = _url_collapse_path(self.path)
-+        collapsed_path = _url_collapse_path(urllib.parse.unquote(self.path))
-         dir_sep = collapsed_path.find('/', 1)
-         head, tail = collapsed_path[:dir_sep], collapsed_path[dir_sep+1:]
-         if head in self.cgi_directories:
-diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
---- a/Lib/test/test_httpservers.py
-+++ b/Lib/test/test_httpservers.py
-@@ -485,6 +485,11 @@ class CGIHTTPServerTestCase(BaseTestCase
-                 (res.read(), res.getheader('Content-type'), res.status))
-         self.assertEqual(os.environ['SERVER_SOFTWARE'], signature)
- 
-+    def test_urlquote_decoding_in_cgi_check(self):
-+        res = self.request('/cgi-bin%2ffile1.py')
-+        self.assertEqual((b'Hello World\n', 'text/html', 200),
-+                (res.read(), res.getheader('Content-type'), res.status))
-+
- 
- class SocketlessRequestHandler(SimpleHTTPRequestHandler):
-     def __init__(self):

00251-change-user-install-location.patch

@@ -0,0 +1,64 @@
+From a1f0ea8fae6fb87cdc9d9c16bc0898e8f66fa907 Mon Sep 17 00:00:00 2001
+From: Michal Cyprian <m.cyprian@gmail.com>
+Date: Mon, 26 Jun 2017 16:32:56 +0200
+Subject: [PATCH] 00251: Change user install location
+
+Set values of prefix and exec_prefix in distutils install command
+to /usr/local if executable is /usr/bin/python* and RPM build
+is not detected to make pip and distutils install into separate location.
+
+Fedora Change: https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
+---
+ Lib/distutils/command/install.py | 15 +++++++++++++--
+ Lib/site.py                      |  9 ++++++++-
+ 2 files changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
+index ae4f915669..0e4fd5b74a 100644
+--- a/Lib/distutils/command/install.py
++++ b/Lib/distutils/command/install.py
+@@ -418,8 +418,19 @@ class install(Command):
+                     raise DistutilsOptionError(
+                           "must not supply exec-prefix without prefix")
+ 
+-                self.prefix = os.path.normpath(sys.prefix)
+-                self.exec_prefix = os.path.normpath(sys.exec_prefix)
++                # self.prefix is set to sys.prefix + /local/
++                # if neither RPM build nor virtual environment is
++                # detected to make pip and distutils install packages
++                # into the separate location.
++                if (not (hasattr(sys, 'real_prefix') or
++                    sys.prefix != sys.base_prefix) and
++                    'RPM_BUILD_ROOT' not in os.environ):
++                    addition = "/local"
++                else:
++                    addition = ""
++
++                self.prefix = os.path.normpath(sys.prefix) + addition
++                self.exec_prefix = os.path.normpath(sys.exec_prefix) + addition
+ 
+             else:
+                 if self.exec_prefix is None:
+diff --git a/Lib/site.py b/Lib/site.py
+index 22d53fa562..9513526109 100644
+--- a/Lib/site.py
++++ b/Lib/site.py
+@@ -348,7 +348,14 @@ def getsitepackages(prefixes=None):
+     return sitepackages
+ 
+ def addsitepackages(known_paths, prefixes=None):
+-    """Add site-packages to sys.path"""
++    """Add site-packages to sys.path
++
++    '/usr/local' is included in PREFIXES if RPM build is not detected
++    to make packages installed into this location visible.
++
++    """
++    if ENABLE_USER_SITE and 'RPM_BUILD_ROOT' not in os.environ:
++        PREFIXES.insert(0, "/usr/local")
+     for sitedir in getsitepackages(prefixes):
+         if os.path.isdir(sitedir):
+             addsitedir(sitedir, known_paths)
+-- 
+2.24.1
+

00274-fix-arch-names.patch

@@ -0,0 +1,86 @@
+From b60a8fee7e91e36b48a2ea27d1bb9f42642c3eb2 Mon Sep 17 00:00:00 2001
+From: Petr Viktorin <pviktori@redhat.com>
+Date: Mon, 28 Aug 2017 17:16:46 +0200
+Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change
+ to match Fedora
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Co-authored-by: Petr Viktorin <pviktori@redhat.com>
+Co-authored-by: Miro Hrončok <miro@hroncok.cz>
+Co-authored-by: Tomas Orsava <torsava@redhat.com>
+---
+ config.sub   |  2 +-
+ configure.ac | 16 ++++++++--------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/config.sub b/config.sub
+index ba37cf99e2..52a9ec6662 100755
+--- a/config.sub
++++ b/config.sub
+@@ -1042,7 +1042,7 @@ case $basic_machine in
+ 		;;
+ 	ppc64)	basic_machine=powerpc64-unknown
+ 		;;
+-	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64le | powerpc64little)
+ 		basic_machine=powerpc64le-unknown
+diff --git a/configure.ac b/configure.ac
+index c59cbc223f..a3e1c04e1b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -747,9 +747,9 @@ cat >> conftest.c <<EOF
+         alpha-linux-gnu
+ # elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP)
+ #  if defined(__ARMEL__)
+-        arm-linux-gnueabihf
++        arm-linux-gnueabi
+ #  else
+-        armeb-linux-gnueabihf
++        armeb-linux-gnueabi
+ #  endif
+ # elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)
+ #  if defined(__ARMEL__)
+@@ -789,7 +789,7 @@ cat >> conftest.c <<EOF
+ #  elif _MIPS_SIM == _ABIN32
+         mips64el-linux-gnuabin32
+ #  elif _MIPS_SIM == _ABI64
+-        mips64el-linux-gnuabi64
++        mips64el-linux-gnu
+ #  else
+ #   error unknown platform triplet
+ #  endif
+@@ -799,22 +799,22 @@ cat >> conftest.c <<EOF
+ #  elif _MIPS_SIM == _ABIN32
+         mips64-linux-gnuabin32
+ #  elif _MIPS_SIM == _ABI64
+-        mips64-linux-gnuabi64
++        mips64-linux-gnu
+ #  else
+ #   error unknown platform triplet
+ #  endif
+ # elif defined(__or1k__)
+         or1k-linux-gnu
+ # elif defined(__powerpc__) && defined(__SPE__)
+-        powerpc-linux-gnuspe
++        ppc-linux-gnuspe
+ # elif defined(__powerpc64__)
+ #  if defined(__LITTLE_ENDIAN__)
+-        powerpc64le-linux-gnu
++        ppc64le-linux-gnu
+ #  else
+-        powerpc64-linux-gnu
++        ppc64-linux-gnu
+ #  endif
+ # elif defined(__powerpc__)
+-        powerpc-linux-gnu
++        ppc-linux-gnu
+ # elif defined(__s390x__)
+         s390x-linux-gnu
+ # elif defined(__s390__)
+-- 
+2.24.1
+

00328-pyc-timestamp-invalidation-mode.patch

@@ -0,0 +1,55 @@
+From 0d41a311e805af08637e3f6dc0fb6fae32e508ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Thu, 11 Jul 2019 13:44:13 +0200
+Subject: [PATCH] 00328: Restore pyc to TIMESTAMP invalidation mode as default
+ in rpmbuild
+
+Since Fedora 31, the $SOURCE_DATE_EPOCH is set in rpmbuild to the latest
+%changelog date. This makes Python default to the CHECKED_HASH pyc
+invalidation mode, bringing more reproducible builds traded for an import
+performance decrease. To avoid that, we don't default to CHECKED_HASH
+when $RPM_BUILD_ROOT is set (i.e. when we are building RPM packages).
+
+See https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/57#comment-27426
+---
+ Lib/py_compile.py           | 3 ++-
+ Lib/test/test_py_compile.py | 2 ++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Lib/py_compile.py b/Lib/py_compile.py
+index 21736896af..310bed5620 100644
+--- a/Lib/py_compile.py
++++ b/Lib/py_compile.py
+@@ -70,7 +70,8 @@ class PycInvalidationMode(enum.Enum):
+ 
+ 
+ def _get_default_invalidation_mode():
+-    if os.environ.get('SOURCE_DATE_EPOCH'):
++    if (os.environ.get('SOURCE_DATE_EPOCH') and not
++            os.environ.get('RPM_BUILD_ROOT')):
+         return PycInvalidationMode.CHECKED_HASH
+     else:
+         return PycInvalidationMode.TIMESTAMP
+diff --git a/Lib/test/test_py_compile.py b/Lib/test/test_py_compile.py
+index d4a68c9320..ed09874023 100644
+--- a/Lib/test/test_py_compile.py
++++ b/Lib/test/test_py_compile.py
+@@ -17,6 +17,7 @@ def without_source_date_epoch(fxn):
+     def wrapper(*args, **kwargs):
+         with support.EnvironmentVarGuard() as env:
+             env.unset('SOURCE_DATE_EPOCH')
++            env.unset('RPM_BUILD_ROOT')
+             return fxn(*args, **kwargs)
+     return wrapper
+ 
+@@ -27,6 +28,7 @@ def with_source_date_epoch(fxn):
+     def wrapper(*args, **kwargs):
+         with support.EnvironmentVarGuard() as env:
+             env['SOURCE_DATE_EPOCH'] = '123456789'
++            env.unset('RPM_BUILD_ROOT')
+             return fxn(*args, **kwargs)
+     return wrapper
+ 
+-- 
+2.24.1
+

05000-autotool-intermediates.patch

@@ -1,72 +0,0 @@
-diff -up ./configure.autotool-intermediates ./configure
---- ./configure.autotool-intermediates	2013-04-09 14:52:49.831773426 +0200
-+++ ./configure	2013-04-09 14:52:53.204765347 +0200
-@@ -802,6 +802,8 @@ with_thread
- enable_ipv6
- with_doc_strings
- with_tsc
-+with_count_allocs
-+with_call_profile
- with_pymalloc
- with_valgrind
- with_systemtap
-@@ -1479,6 +1481,8 @@ Optional Packages:
-                           deprecated; use --with(out)-threads
-   --with(out)-doc-strings disable/enable documentation strings
-   --with(out)-tsc         enable/disable timestamp counter profile
-+  --with(out)count-allocs  enable/disable per-type instance accounting
-+  --with(out)-call-profile  enable/disable statistics on function call invocation
-   --with(out)-pymalloc    disable/enable specialized mallocs
-   --with-valgrind         Enable Valgrind support
-   --with(out)-systemtap   disable/enable SystemTap support
-@@ -10117,6 +10121,50 @@ $as_echo "#define WITH_TSC 1" >>confdefs
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-count-allocs" >&5
-+$as_echo_n "checking for --with-count-allocs... " >&6; }
-+
-+# Check whether --with-count-allocs was given.
-+if test "${with_count_allocs+set}" = set; then :
-+  withval=$with_count_allocs;
-+if test "$withval" != no
-+then
-+
-+$as_echo "#define COUNT_ALLOCS 1" >>confdefs.h
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-call-profile" >&5
-+$as_echo_n "checking for --with-call-profile... " >&6; }
-+
-+# Check whether --with-call-profile was given.
-+if test "${with_call_profile+set}" = set; then :
-+  withval=$with_call_profile;
-+if test "$withval" != no
-+then
-+
-+$as_echo "#define CALL_PROFILE 1" >>confdefs.h
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi

Python-3.1.1-rpath.patch

@@ -1,20 +0,0 @@
-diff -up Python-3.1.1/Lib/distutils/unixccompiler.py.rpath Python-3.1.1/Lib/distutils/unixccompiler.py
---- Python-3.1.1/Lib/distutils/unixccompiler.py.rpath	2009-09-04 17:29:34.000000000 -0400
-+++ Python-3.1.1/Lib/distutils/unixccompiler.py	2009-09-04 17:49:54.000000000 -0400
-@@ -141,6 +141,16 @@ class UnixCCompiler(CCompiler):
-     if sys.platform == "cygwin":
-         exe_extension = ".exe"
- 
-+    def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
-+        """Remove standard library path from rpath"""
-+        libraries, library_dirs, runtime_library_dirs = super(
-+            self.__class__, self)._fix_lib_args(libraries, library_dirs,
-+            runtime_library_dirs)
-+        libdir = sysconfig.get_config_var('LIBDIR')
-+        if runtime_library_dirs and (libdir in runtime_library_dirs):
-+            runtime_library_dirs.remove(libdir)
-+        return libraries, library_dirs, runtime_library_dirs
-+
-     def preprocess(self, source, output_file=None, macros=None,
-                    include_dirs=None, extra_preargs=None, extra_postargs=None):
-         fixed_args = self._fix_compile_args(None, macros, include_dirs)

check-pyc-and-pyo-timestamps.py

@@ -1,50 +0,0 @@
-"""Checks if all *.pyc and *.pyo files have later mtime than their *.py files."""
-
-import imp
-import os
-import sys
-
-# list of test and other files that we expect not to have bytecode
-not_compiled = [
-    'test/bad_coding.py',
-    'test/bad_coding2.py',
-    'test/badsyntax_3131.py',
-    'test/badsyntax_future3.py',
-    'test/badsyntax_future4.py',
-    'test/badsyntax_future5.py',
-    'test/badsyntax_future6.py',
-    'test/badsyntax_future7.py',
-    'test/badsyntax_future8.py',
-    'test/badsyntax_future9.py',
-    'test/badsyntax_future10.py',
-    'test/badsyntax_pep3120.py',
-    'lib2to3/tests/data/bom.py',
-    'lib2to3/tests/data/crlf.py',
-    'lib2to3/tests/data/different_encoding.py',
-    'lib2to3/tests/data/false_encoding.py',
-    'lib2to3/tests/data/py2_test_grammar.py',
-    '.debug-gdb.py',
-]
-failed = 0
-
-def bytecode_expected(source):
-    for f in not_compiled:
-        if source.endswith(f):
-            return False
-    return True
-
-compiled = filter(lambda f: bytecode_expected(f), sys.argv[1:])
-for f in compiled:
-    # check both pyo and pyc
-    to_check = map(lambda b: imp.cache_from_source(f, b), (True, False))
-    f_mtime = os.path.getmtime(f)
-    for c in to_check:
-        c_mtime = os.path.getmtime(c)
-        if c_mtime < f_mtime:
-            sys.stderr.write('Failed bytecompilation timestamps check: ')
-            sys.stderr.write('Bytecode file {} is older than source file {}.\n'.format(c, f))
-            failed += 1
-
-if failed:
-    sys.stderr.write('\n{} files failed bytecompilation timestamps check.\n'.format(failed))
-    sys.exit(1)

check-pyc-timestamps.py

@@ -0,0 +1,55 @@
+"""Checks if all *.pyc files have later mtime than their *.py files."""
+
+import os
+import sys
+from importlib.util import cache_from_source
+from pathlib import Path
+
+
+RPM_BUILD_ROOT = os.environ.get('RPM_BUILD_ROOT', '')
+
+# ...cpython-3X.pyc
+# ...cpython-3X.opt-1.pyc
+# ...cpython-3X.opt-2.pyc
+LEVELS = (None, 1, 2)
+
+# list of globs of test and other files that we expect not to have bytecode
+not_compiled = [
+    '/usr/bin/*',
+    '*/test/bad_coding.py',
+    '*/test/bad_coding2.py',
+    '*/test/badsyntax_*.py',
+    '*/lib2to3/tests/data/bom.py',
+    '*/lib2to3/tests/data/crlf.py',
+    '*/lib2to3/tests/data/different_encoding.py',
+    '*/lib2to3/tests/data/false_encoding.py',
+    '*/lib2to3/tests/data/py2_test_grammar.py',
+    '*.debug-gdb.py',
+]
+
+
+def bytecode_expected(path):
+    path = Path(path[len(RPM_BUILD_ROOT):])
+    for glob in not_compiled:
+        if path.match(glob):
+            return False
+    return True
+
+
+failed = 0
+compiled = (path for path in sys.argv[1:] if bytecode_expected(path))
+for path in compiled:
+    to_check = (cache_from_source(path, optimization=opt) for opt in LEVELS)
+    f_mtime = os.path.getmtime(path)
+    for pyc in to_check:
+        c_mtime = os.path.getmtime(pyc)
+        if c_mtime < f_mtime:
+            print('Failed bytecompilation timestamps check: '
+                  f'Bytecode file {pyc} is older than source file {path}',
+                  file=sys.stderr)
+            failed += 1
+
+if failed:
+    print(f'\n{failed} files failed bytecompilation timestamps check.',
+          file=sys.stderr)
+    sys.exit(1)

find-provides-without-python-sonames.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# The standard find-provides script
-# adds provides lines for all SONAME directives in all shared libraries,
-# even if those libraries are not in the LD_LIBRARY_PATH
-
-# This leads to the rpm having a redundant Provides "foo.so" for all of the
-# various foo.so Python c modules
-
-# So we strip out all /usr/lib/python lines first, before running them through
-# the standard script:
-grep -v "/usr/lib/python" | grep -v "/usr/lib64/python" | \
-    /usr/lib/rpm/redhat/find-provides
-
-exit 0

idle3.appdata.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Copyright 2017 Zbigniew Jędrzejewski-Szmek -->
+<application>
+  <id type="desktop">idle3.desktop</id>
+  <name>IDLE3</name>
+  <metadata_licence>CC0</metadata_licence>
+  <project_license>Python-2.0</project_license>
+  <summary>Python 3 Integrated Development and Learning Environment</summary>
+  <description>
+    <p>
+      IDLE is Python’s Integrated Development and Learning Environment.
+      The GUI is uniform between Windows, Unix, and Mac OS X.
+      IDLE provides an easy way to start writing, running, and debugging
+      Python code.
+    </p>
+    <p>
+      IDLE is written in pure Python, and uses the tkinter GUI toolkit.
+      It provides:
+    </p>
+    <ul>
+       <li>a Python shell window (interactive interpreter) with colorizing of code input, output, and error messages,</li>
+       <li>a multi-window text editor with multiple undo, Python colorizing, smart indent, call tips, auto completion, and other features,</li>
+       <li>search within any window, replace within editor windows, and search through multiple files (grep),</li>
+       <li>a debugger with persistent breakpoints, stepping, and viewing of global and local namespaces.</li>
+    </ul>
+  </description>
+  <url type="homepage">https://docs.python.org/3/library/idle.html</url>
+  <screenshots>
+    <screenshot type="default">http://in.waw.pl/~zbyszek/fedora/idle3-appdata/idle3-main-window.png</screenshot>
+    <screenshot>http://in.waw.pl/~zbyszek/fedora/idle3-appdata/idle3-class-browser.png</screenshot>
+    <screenshot>http://in.waw.pl/~zbyszek/fedora/idle3-appdata/idle3-code-viewer.png</screenshot>
+  </screenshots>
+  <update_contact>zbyszek@in.waw.pl</update_contact>
+</application>

idle3.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=IDLE 3
+Comment=Python 3 Integrated Development and Learning Environment
+Exec=idle3 %F
+TryExec=idle3
+Terminal=false
+Type=Application
+Icon=idle3
+Categories=Development;IDE;
+MimeType=text/x-python;

libpython.stp

@@ -1,17 +0,0 @@
-/* Systemtap tapset to make it easier to trace Python */
-
-/*
-   Define python.function.entry/return:
-*/
-probe python.function.entry = process("python3").library("LIBRARY_PATH").mark("function__entry")
-{
-    filename = user_string($arg1);
-    funcname = user_string($arg2);
-    lineno = $arg3;
-}
-probe python.function.return = process("python3").library("LIBRARY_PATH").mark("function__return")
-{
-    filename = user_string($arg1);
-    funcname = user_string($arg2);
-    lineno = $arg3;
-}

macros.pybytecompile

@@ -1,12 +0,0 @@
-# Note that the path could itself be a python file, or a directory
-
-# Python's compile_all module only works on directories, and requires a max
-# recursion depth
-
-%py_byte_compile()\
-python_binary="%1"\
-bytecode_compilation_path="%2"\
-find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2]) for f in sys.argv[1:]]' || :\
-\
-find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2]) for f in sys.argv[1:]]' || :\
-%{nil}

macros.python3

@@ -1,6 +0,0 @@
-%__python3 /usr/bin/python3
-%python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-%python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
-%python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")
-%python3_version_nodots %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3].replace('.',''))")
-%py3dir %{_builddir}/python3-%{name}-%{version}-%{release}

pyfuntop.stp

@@ -1,21 +0,0 @@
-#!/usr/bin/stap 
-
-global fn_calls;
-
-probe python.function.entry
-{ 
-  fn_calls[pid(), filename, funcname, lineno] += 1;
-}
-
-probe timer.ms(1000) {
-    printf("\033[2J\033[1;1H") /* clear screen */
-    printf("%6s %80s %6s %30s %6s\n",
-           "PID", "FILENAME", "LINE", "FUNCTION", "CALLS")
-    foreach ([pid, filename, funcname, lineno] in fn_calls- limit 20) {
-        printf("%6d %80s %6d %30s %6d\n",
-            pid, filename, lineno, funcname,
-            fn_calls[pid, filename, funcname, lineno]);
-    }
-
-    delete fn_calls;
-}

python-3.1.2-fix-expat-issue9054.patch

@@ -1,14 +0,0 @@
-Index: Modules/pyexpat.c
-===================================================================
---- Modules/pyexpat.c	(revision 81539)
-+++ Modules/pyexpat.c	(working copy)
-@@ -415,6 +415,9 @@
-     PyObject *args;
-     PyObject *temp;
- 
-+    if (!have_handler(self, CharacterData))
-+        return -1;
-+
-     args = PyTuple_New(1);
-     if (args == NULL)
-         return -1;

python-3.2a1-apply-our-changes-to-expected-shebang-for-test_imp.patch

@@ -1,12 +0,0 @@
-diff -up Python-3.2a1/Lib/test/test_imp.py.apply-our-changes-to-expected-shebang Python-3.2a1/Lib/test/test_imp.py
---- Python-3.2a1/Lib/test/test_imp.py.apply-our-changes-to-expected-shebang	2010-08-02 15:57:49.151002176 -0400
-+++ Python-3.2a1/Lib/test/test_imp.py	2010-08-02 15:58:40.428010729 -0400
-@@ -52,7 +52,7 @@ class ImportTests(unittest.TestCase):
-         self.assertNotEqual(fp, None)
-         self.assertEqual(fp.encoding, "iso-8859-1")
-         self.assertEqual(fp.tell(), 0)
--        self.assertEqual(fp.readline(), '#!/usr/bin/env python3\n')
-+        self.assertEqual(fp.readline(), '#!/usr/bin/python3.2\n')
-         fp.close()
- 
-         fp, filename, info = imp.find_module("tokenize")

python-3.2a1-debug-build.patch

@@ -1,290 +0,0 @@
-diff -up Python-3.2a1/configure.in.debug-build Python-3.2a1/configure.in
---- Python-3.2a1/configure.in.debug-build	2010-08-20 16:06:24.616082276 -0400
-+++ Python-3.2a1/configure.in	2010-08-20 16:06:24.632127011 -0400
-@@ -584,7 +584,7 @@ AC_SUBST(LIBRARY)
- AC_MSG_CHECKING(LIBRARY)
- if test -z "$LIBRARY"
- then
--	LIBRARY='libpython$(VERSION).a'
-+	LIBRARY='libpython$(VERSION)$(DEBUG_EXT).a'
- fi
- AC_MSG_RESULT($LIBRARY)
- 
-@@ -726,8 +726,8 @@ if test $enable_shared = "yes"; then
- 	  INSTSONAME="$LDLIBRARY".$SOVERSION
-           ;;
-     Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
--	  LDLIBRARY='libpython$(VERSION).so'
--	  BLDLIBRARY='-L. -lpython$(VERSION)'
-+	  LDLIBRARY='libpython$(VERSION)$(DEBUG_EXT).so'
-+	  BLDLIBRARY='-L. -lpython$(VERSION)$(DEBUG_EXT)'
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- 	  case $ac_sys_system in
- 	      FreeBSD*)
-@@ -825,6 +825,14 @@ else AC_MSG_RESULT(no); Py_DEBUG='false'
- fi],
- [AC_MSG_RESULT(no)])
- 
-+if test "$Py_DEBUG" = 'true'
-+then
-+	DEBUG_EXT=_d
-+	DEBUG_SUFFIX=-debug
-+fi
-+AC_SUBST(DEBUG_EXT)
-+AC_SUBST(DEBUG_SUFFIX)
-+
- # XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be
- # merged with this chunk of code?
- 
-diff -up Python-3.2a1/Lib/distutils/command/build_ext.py.debug-build Python-3.2a1/Lib/distutils/command/build_ext.py
---- Python-3.2a1/Lib/distutils/command/build_ext.py.debug-build	2010-07-22 08:50:05.000000000 -0400
-+++ Python-3.2a1/Lib/distutils/command/build_ext.py	2010-08-20 16:06:24.633125472 -0400
-@@ -673,7 +673,10 @@ class build_ext(Command):
-         so_ext = get_config_var('SO')
-         if os.name == 'nt' and self.debug:
-             return os.path.join(*ext_path) + '_d' + so_ext
--        return os.path.join(*ext_path) + so_ext
-+        
-+        # Similarly, extensions in debug mode are named 'module_d.so', to
-+        # avoid adding the _d to the SO config variable:
-+        return os.path.join(*ext_path) + (sys.pydebug and "_d" or "") + so_ext
- 
-     def get_export_symbols(self, ext):
-         """Return the list of symbols that a shared extension has to
-@@ -754,6 +757,8 @@ class build_ext(Command):
-                 template = "python%d.%d"
-                 pythonlib = (template %
-                              (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-+                if sys.pydebug:
-+                    pythonlib += '_d'
-                 return ext.libraries + [pythonlib]
-             else:
-                 return ext.libraries
-diff -up Python-3.2a1/Lib/distutils/sysconfig.py.debug-build Python-3.2a1/Lib/distutils/sysconfig.py
---- Python-3.2a1/Lib/distutils/sysconfig.py.debug-build	2010-08-20 16:06:24.623083865 -0400
-+++ Python-3.2a1/Lib/distutils/sysconfig.py	2010-08-20 16:06:24.633125472 -0400
-@@ -83,7 +83,8 @@ def get_python_inc(plat_specific=0, pref
-             else:
-                 incdir = os.path.join(get_config_var('srcdir'), 'Include')
-                 return os.path.normpath(incdir)
--        return os.path.join(prefix, "include", "python" + get_python_version())
-+        return os.path.join(prefix, "include",
-+                            "python" + get_python_version() + (sys.pydebug and '-debug' or ''))
-     elif os.name == "nt":
-         return os.path.join(prefix, "include")
-     elif os.name == "mac":
-@@ -229,7 +230,7 @@ def get_makefile_filename():
-     if python_build:
-         return os.path.join(os.path.dirname(sys.executable), "Makefile")
-     lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
--    return os.path.join(lib_dir, "config", "Makefile")
-+    return os.path.join(lib_dir, "config" + (sys.pydebug and "-debug" or ""), "Makefile")
- 
- 
- def parse_config_h(fp, g=None):
-diff -up Python-3.2a1/Makefile.pre.in.debug-build Python-3.2a1/Makefile.pre.in
---- Python-3.2a1/Makefile.pre.in.debug-build	2010-08-20 16:06:24.624081000 -0400
-+++ Python-3.2a1/Makefile.pre.in	2010-08-20 16:06:57.287084214 -0400
-@@ -105,8 +105,8 @@ SCRIPTDIR=	$(prefix)/lib64
- # Detailed destination directories
- BINLIBDEST=	$(LIBDIR)/python$(VERSION)
- LIBDEST=	$(SCRIPTDIR)/python$(VERSION)
--INCLUDEPY=	$(INCLUDEDIR)/python$(VERSION)
--CONFINCLUDEPY=	$(CONFINCLUDEDIR)/python$(VERSION)
-+INCLUDEPY=	$(INCLUDEDIR)/python$(VERSION)$(DEBUG_SUFFIX)
-+CONFINCLUDEPY=	$(CONFINCLUDEDIR)/python$(VERSION)$(DEBUG_SUFFIX)
- LIBP=		$(LIBDIR)/python$(VERSION)
- 
- # Symbols used for using shared libraries
-@@ -120,6 +120,12 @@ DESTSHARED=	$(BINLIBDEST)/lib-dynload
- EXE=		@EXEEXT@
- BUILDEXE=	@BUILDEXEEXT@
- 
-+# DEBUG_EXT is used by ELF files (names and SONAMEs); it will be "_d" for a debug build
-+# DEBUG_SUFFIX is used by filesystem paths; it will be "-debug" for a debug build
-+# Both will be empty in an optimized build
-+DEBUG_EXT=	@DEBUG_EXT@
-+DEBUG_SUFFIX=	@DEBUG_SUFFIX@
-+
- # Short name and location for Mac OS X Python framework
- UNIVERSALSDK=@UNIVERSALSDK@
- PYTHONFRAMEWORK=	@PYTHONFRAMEWORK@
-@@ -183,7 +189,7 @@ LIBOBJDIR=	Python/
- LIBOBJS=	@LIBOBJS@
- 
- PYTHON=		python$(EXE)
--BUILDPYTHON=	python$(BUILDEXE)
-+BUILDPYTHON=	python$(BUILD_SUFFIX)$(BUILDEXE)
- 
- # The task to run while instrument when building the profile-opt target
- PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
-@@ -433,7 +439,7 @@ sharedmods: $(BUILDPYTHON)
- 	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(PY_LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
- 	esac
- 
--libpython$(VERSION).so: $(LIBRARY_OBJS)
-+libpython$(VERSION)$(DEBUG_EXT).so: $(LIBRARY_OBJS)
- 	if test $(INSTSONAME) != $(LDLIBRARY); then \
- 		$(LDSHARED) $(PY_LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
- 		$(LN) -f $(INSTSONAME) $@; \
-@@ -817,7 +823,7 @@ altbininstall: $(BUILDPYTHON)
- 		else	true; \
- 		fi; \
- 	done
--	$(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
-+	$(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(DEBUG_SUFFIX)$(EXE)
- 	if test -f $(LDLIBRARY); then \
- 		if test -n "$(DLLLIBRARY)" ; then \
- 			$(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \
-@@ -831,15 +837,15 @@ altbininstall: $(BUILDPYTHON)
- 	fi
- 
- bininstall: altbininstall
--	-if test -f $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE); \
--	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE); \
-+	-if test -f $(DESTDIR)$(BINDIR)/$(PYTHON)3$(DEBUG_SUFFIX)$(EXE) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON)3$(DEBUG_SUFFIX)$(EXE); \
-+	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON)3$(DEBUG_SUFFIX)$(EXE); \
- 	else true; \
- 	fi
--	(cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)3$(EXE))
--	-rm -f $(DESTDIR)$(BINDIR)/python3-config
--	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
--	-rm -f $(DESTDIR)$(LIBPC)/python3.pc
--	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc)
-+	(cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(DEBUG_SUFFIX)$(EXE) $(PYTHON)3$(DEBUG_SUFFIX)$(EXE))
-+	-rm -f $(DESTDIR)$(BINDIR)/python3$(DEBUG_SUFFIX)-config
-+	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(DEBUG_SUFFIX)-config python3$(DEBUG_SUFFIX)-config)
-+	-rm -f $(DESTDIR)$(LIBPC)/python3$(DEBUG_SUFFIX).pc
-+	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)$(DEBUG_SUFFIX).pc python3$(DEBUG_SUFFIX).pc)
- 
- # Install the manual page
- maninstall:
-@@ -965,10 +971,10 @@ $(srcdir)/Lib/$(PLATDIR):
- 	export EXE; EXE="$(BUILDEXE)"; \
- 	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
- 
--python-config: $(srcdir)/Misc/python-config.in
-+python$(DEBUG_SUFFIX)-config: $(srcdir)/Misc/python-config.in
- 	# Substitution happens here, as the completely-expanded BINDIR
- 	# is not available in configure
--	sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
-+	sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(DEBUG_SUFFIX)$(EXE)," < $(srcdir)/Misc/python-config.in >python$(DEBUG_SUFFIX)-config
- 
- # Install the include files
- INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -990,12 +996,12 @@ inclinstall:
- 
- # Install the library and miscellaneous stuff needed for extending/embedding
- # This goes into $(exec_prefix)
--LIBPL=		$(LIBP)/config
-+LIBPL=		$(LIBP)/config$(DEBUG_SUFFIX)
- 
- # pkgconfig directory
- LIBPC=		$(LIBDIR)/pkgconfig
- 
--libainstall:	all python-config
-+libainstall:	all python$(DEBUG_SUFFIX)-config
- 	@for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \
- 	do \
- 		if test ! -d $(DESTDIR)$$i; then \
-@@ -1011,11 +1017,11 @@ libainstall:	all python-config
- 	$(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
- 	$(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local
- 	$(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config
--	$(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc
-+	$(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION)$(DEBUG_SUFFIX).pc
- 	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
- 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
--	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
--	rm python-config
-+	$(INSTALL_SCRIPT) python$(DEBUG_SUFFIX)-config $(DESTDIR)$(BINDIR)/python$(VERSION)$(DEBUG_SUFFIX)-config
-+	rm python$(DEBUG_SUFFIX)-config
- 	@if [ -s Modules/python.exp -a \
- 		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
- 		echo; echo "Installing support files for building shared extension modules on AIX:"; \
-diff -up Python-3.2a1/Misc/python-config.in.debug-build Python-3.2a1/Misc/python-config.in
---- Python-3.2a1/Misc/python-config.in.debug-build	2010-04-06 17:30:42.000000000 -0400
-+++ Python-3.2a1/Misc/python-config.in	2010-08-20 16:06:24.635124366 -0400
-@@ -45,7 +45,7 @@ for opt in opt_flags:
- 
-     elif opt in ('--libs', '--ldflags'):
-         libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
--        libs.append('-lpython'+pyver)
-+        libs.append('-lpython' + pyver + (sys.pydebug and "_d" or ""))
-         # add the prefix/lib/pythonX.Y/config dir, but only if there is no
-         # shared library in prefix/lib/.
-         if opt == '--ldflags':
-diff -up Python-3.2a1/Modules/makesetup.debug-build Python-3.2a1/Modules/makesetup
---- Python-3.2a1/Modules/makesetup.debug-build	2010-07-09 12:30:58.000000000 -0400
-+++ Python-3.2a1/Modules/makesetup	2010-08-20 16:06:24.635124366 -0400
-@@ -233,7 +233,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
- 			*$mod.o*)	base=$mod;;
- 			*)		base=${mod}module;;
- 			esac
--			file="$srcdir/$base\$(SO)"
-+			file="$srcdir/$base\$(DEBUG_EXT)\$(SO)"
- 			case $doconfig in
- 			no)	SHAREDMODS="$SHAREDMODS $file";;
- 			esac
-diff -up Python-3.2a1/Python/dynload_shlib.c.debug-build Python-3.2a1/Python/dynload_shlib.c
---- Python-3.2a1/Python/dynload_shlib.c.debug-build	2010-05-09 11:52:27.000000000 -0400
-+++ Python-3.2a1/Python/dynload_shlib.c	2010-08-20 16:06:24.635124366 -0400
-@@ -46,11 +46,16 @@ const struct filedescr _PyImport_DynLoad
-     {"module.exe", "rb", C_EXTENSION},
-     {"MODULE.EXE", "rb", C_EXTENSION},
- #else
-+#ifdef Py_DEBUG
-+    {"_d.so", "rb", C_EXTENSION},
-+    {"module_d.so", "rb", C_EXTENSION},
-+#else
-     {".so", "rb", C_EXTENSION},
-     {"module.so", "rb", C_EXTENSION},
--#endif
--#endif
--#endif
-+#endif /* Py_DEBUG */
-+#endif /* __VMS */
-+#endif /* defined(PYOS_OS2) && defined(PYCC_GCC) */
-+#endif /* __CYGWIN__ */
-     {0, 0}
- };
- 
-diff -up Python-3.2a1/Python/sysmodule.c.debug-build Python-3.2a1/Python/sysmodule.c
---- Python-3.2a1/Python/sysmodule.c.debug-build	2010-07-06 06:53:30.000000000 -0400
-+++ Python-3.2a1/Python/sysmodule.c	2010-08-20 16:06:24.636251716 -0400
-@@ -1598,6 +1598,12 @@ _PySys_Init(void)
-     WindowsVersionType.tp_new = NULL;
- #endif
- 
-+#ifdef Py_DEBUG
-+    PyDict_SetItemString(sysdict, "pydebug", Py_True);
-+#else
-+    PyDict_SetItemString(sysdict, "pydebug", Py_False);
-+#endif
-+
-     /* float repr style: 0.03 (short) vs 0.029999999999999999 (legacy) */
- #ifndef PY_NO_SHORT_FLOAT_REPR
-     SET_SYS_FROM_STRING("float_repr_style",
-diff -up Python-3.2a1/runtests.sh.debug-build Python-3.2a1/runtests.sh
---- Python-3.2a1/runtests.sh.debug-build	2008-10-17 08:05:40.000000000 -0400
-+++ Python-3.2a1/runtests.sh	2010-08-20 16:06:24.637251276 -0400
-@@ -16,11 +16,14 @@ Flags (arguments starting with '-') are 
- regrtest.py, except for -x, which is processed here."
- 
- # Choose the Python binary.
--case `uname` in
--Darwin) PYTHON=./python.exe;;
--CYGWIN*) PYTHON=./python.exe;;
--*)      PYTHON=./python;;
--esac
-+if [ -z $PYTHON ]
-+then
-+    case `uname` in
-+    Darwin) PYTHON=./python.exe;;
-+    CYGWIN*) PYTHON=./python.exe;;
-+    *)      PYTHON=./python;;
-+    esac
-+fi
- 
- PYTHON="$PYTHON -bb"
- 

python-3.2a1-fix-parallel-make.patch

@@ -1,37 +0,0 @@
-diff -up Python-3.2a1/Makefile.pre.in.parallel-grammar Python-3.2a1/Makefile.pre.in
---- Python-3.2a1/Makefile.pre.in.parallel-grammar	2010-08-20 15:09:13.613527156 -0400
-+++ Python-3.2a1/Makefile.pre.in	2010-08-20 15:10:31.428135355 -0400
-@@ -222,6 +222,7 @@ IO_OBJS=	\
- 
- ##########################################################################
- # Grammar
-+GRAMMAR_STAMP=	$(srcdir)/grammar-stamp
- GRAMMAR_H=	$(srcdir)/Include/graminit.h
- GRAMMAR_C=	$(srcdir)/Python/graminit.c
- GRAMMAR_INPUT=	$(srcdir)/Grammar/Grammar
-@@ -557,9 +558,24 @@ Modules/python.o: $(srcdir)/Modules/pyth
- 
- $(IO_OBJS): $(IO_H)
- 
--$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
-+# GNU "make" interprets rules with two dependents as two copies of the rule.
-+#
-+# In a parallel build this can lead to pgen being run twice, once for each of
-+# GRAMMAR_H and GRAMMAR_C, leading to race conditions in which the compiler
-+# reads a partially-overwritten copy of one of these files, leading to syntax
-+# errors (or linker errors if the fragment happens to be syntactically valid C)
-+#
-+# See http://www.gnu.org/software/hello/manual/automake/Multiple-Outputs.html
-+# for more information
-+#
-+# Introduce ".grammar-stamp" as a contrived single output from PGEN to avoid
-+# this:
-+$(GRAMMAR_H) $(GRAMMAR_C): $(GRAMMAR_STAMP)
-+
-+$(GRAMMAR_STAMP): $(PGEN) $(GRAMMAR_INPUT)
- 		-@$(INSTALL) -d Include
- 		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+		touch $(GRAMMAR_STAMP)
- 
- $(PGEN):	$(PGENOBJS)
- 		$(CC) $(OPT) $(PY_LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)

python-3.2b2-fix-ppc-debug-build.patch

@@ -1,19 +0,0 @@
-diff -up Python-3.2b2/Python/ceval.c.fix-ppc-debug-build Python-3.2b2/Python/ceval.c
---- Python-3.2b2/Python/ceval.c.fix-ppc-debug-build	2011-01-05 16:37:27.007598805 -0500
-+++ Python-3.2b2/Python/ceval.c	2011-01-05 16:45:06.562652472 -0500
-@@ -30,10 +30,11 @@
- 
- typedef unsigned long long uint64;
- 
--#if defined(__ppc__) /* <- Don't know if this is the correct symbol; this
--                           section should work for GCC on any PowerPC
--                           platform, irrespective of OS.
--                           POWER?  Who knows :-) */
-+/* PowerPC suppport.
-+   "__ppc__" appears to be the preprocessor definition to detect on OS X, whereas
-+   "__powerpc__" appears to be the correct one for Linux with GCC
-+*/
-+#if defined(__ppc__) || defined (__powerpc__)
- 
- #define READ_TIMESTAMP(var) ppc_getcounter(&var)
- 

python-3.2rc1-s390-tsc.patch

@@ -1,17 +0,0 @@
-diff -up Python-3.2rc1/Python/ceval.c.s390-tsc Python-3.2rc1/Python/ceval.c
---- Python-3.2rc1/Python/ceval.c.s390-tsc	2011-02-04 05:11:27.585224435 -0500
-+++ Python-3.2rc1/Python/ceval.c	2011-02-04 05:12:38.065223933 -0500
-@@ -74,6 +74,13 @@ ppc_getcounter(uint64 *v)
-                          "=a" (((int*)&(val))[0]), "=d" (((int*)&(val))[1]));
- 
- 
-+#elif defined(__s390__)
-+
-+/* covers both s390 and s390x */
-+
-+#define READ_TIMESTAMP(val) \
-+    __asm__ __volatile__("stck %0" : "=Q" (val) : : "cc")
-+
- #else
- 
- #error "Don't know how to implement timestamp counter for this architecture"

python3-arm-skip-failing-fragile-test.patch

@@ -1,12 +0,0 @@
---- Python-3.3.2/Lib/test/test_gdb.py.orig	2013-07-26 09:52:15.533852708 -0500
-+++ Python-3.3.2/Lib/test/test_gdb.py	2013-07-26 15:07:53.733623014 -0500
-@@ -729,8 +729,7 @@
-     foo\(1, 2, 3\)
- ''')
- 
--    @unittest.skipUnless(_thread,
--                         "Python was compiled without thread support")
-+    @unittest.skip('Known failure on ARM: https://bugzilla.redhat.com/show_bug.cgi?id=986713')
-     def test_threads(self):
-         'Verify that "py-bt" indicates threads that are waiting for the GIL'
-         cmd = '''

python3.rpmlintrc

@@ -0,0 +1,84 @@
+# KNOWN BUGS:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1489816
+addFilter(r'crypto-policy-non-compliance-openssl')
+
+
+# TESTS:
+addFilter(r'(zero-length|pem-certificate|uncompressed-zip) /usr/lib(64)?/python3\.\d+/test')
+
+
+# OTHER DELIBERATES:
+# chroot function
+addFilter(r'missing-call-to-chdir-with-chroot')
+
+# intentionally unversioned and selfobsoleted
+addFilter(r'unversioned-explicit-obsoletes python')
+addFilter(r'self-obsoletion python3\d+ obsoletes python3\d+')
+
+# intentionally hardcoded
+addFilter(r'hardcoded-library-path in %{_prefix}/lib/(debug/%{_libdir}|python%{pybasever})')
+
+# intentional for our pythonXY package
+addFilter(r'python3\d+\.[^:]+: (E|W): devel-file-in-non-devel-package')
+
+# we have non binary stuff, python files
+addFilter(r'only-non-binary-in-usr-lib')
+
+# some devel files that are deliberately needed
+addFilter(r'devel-file-in-non-devel-package /usr/include/python3\.\d+m?/pyconfig-(32|64)\.h')
+addFilter(r'devel-file-in-non-devel-package /usr/lib(64)?/python3\.\d+/distutils/tests/xxmodule\.c')
+
+
+# SORRY, NOT SORRY:
+# manual pages
+addFilter(r'no-manual-page-for-binary (idle|pydoc|pyvenv|2to3|python3?-debug|pathfix|msgfmt|pygettext)')
+addFilter(r'no-manual-page-for-binary python3?.*-config$')
+addFilter(r'no-manual-page-for-binary python3\.\d+d?m?$')
+
+# missing documentation from subpackages
+addFilter(r'^python3\d*-(debug|tkinter|test|idle)\.[^:]+: (E|W): no-documentation')
+
+# platform python is obsoleted, but not provided
+addFilter(r'obsolete-not-provided platform-python')
+
+
+# RPMLINT IMPERFECTIONS
+# https://github.com/rpm-software-management/rpmlint/issues/123
+addFilter(r'python-bytecode-wrong-magic-value .* expected 33\d\d \(3\.7\), found 3393')
+# https://github.com/rpm-software-management/rpmlint/pull/133
+addFilter(r'python-bytecode-wrong-magic-value .* expected 33\d\d \(3\.7\), found 3394')
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1550562
+# https://github.com/rpm-software-management/rpmlint/issues/128
+addFilter(r'python-bytecode-inconsistent-mtime .* 1970')
+
+# debugsource
+addFilter(r'^python3\d*-debugsource\.[^:]+: (E|W): no-documentation')
+
+# debuginfo
+addFilter(r'^python3\d*-debuginfo\.[^:]+: (E|W): useless-provides debuginfo\(build-id\)')
+
+# this is OK for F28+
+addFilter(r'library-without-ldconfig-post')
+
+# debug package contains devel and non-devel files
+addFilter(r'python3\d*-debug\.[^:]+: (E|W): (non-)?devel-file-in-(non-)?devel-package')
+
+# this goes to other subpackage, hence not actually dangling, the read error is bogus
+addFilter(r'dangling-relative-symlink /usr/lib(64)?/pkgconfig/python-3\.\d+dm?(-embed)?\.pc python-3\.\d+(-embed)?\.pc')
+addFilter(r'read-error /usr/lib(64)?/pkgconfig/python-3\.\d+dm?(-embed)?\.pc \[Errno 2\]')
+
+# the python-unversioned-command package contains dangling symlinks by design
+addFilter(r'^python-unversioned-command\.[^:]+: (E|W): dangling-relative-symlink '
+          r'(/usr/bin/python \./python3|/usr/share/man/man1/python\.1\S* ./python3\.1\S*)$')
+
+# we need this macro to evaluate, even if the line starts with #
+addFilter(r'macro-in-comment %\{_pyconfig(32|64)_h\}')
+
+# Python modules don't need to be linked against libc
+# Since 3.8 they are no longer linked against libpython3.8.so.1.0
+addFilter(r'E: library-not-linked-against-libc /usr/lib(64)?/python3\.\d+/lib-dynload/')
+addFilter(r'E: shared-lib-without-dependency-information /usr/lib(64)?/python3\.\d+/lib-dynload/')
+
+# SPELLING ERRORS
+addFilter(r'spelling-error .* en_US (bytecode|pyc|filename|tkinter|namespaces|pytest) ')

sources

@@ -1 +1,2 @@
-6cafc183b4106476dd73d5738d7f616a  Python-3.4.1.tar.xz
+SHA512 (Python-3.8.2.tar.xz) = ca37ad0e7c5845f5f228566aa8ff654a8f428c7d4a5aaabff29baebb0ca3219b31ba8bb2607f89e37cf3fc564f023b8407e53a4f2c47bd99122c1cc222613e37
+SHA512 (Python-3.8.2.tar.xz.asc) = 765796ab5539576bbf1578e05cdb041dbc9a9ca0d6d2040a473a00a293b49f90be11ea6e33b47889da33b25f8e360fad4adeec292f0d43e5fae233d1f03bafd2

systemtap-example.stp

@@ -1,19 +0,0 @@
-/*
-    Example usage of the Python systemtap tapset to show a nested view of all
-    Python function calls (and returns) across the whole system.
-
-    Run this using
-        stap systemtap-example.stp
-    to instrument all Python processes on the system, or (for example) using
-        stap systemtap-example.stp -c COMMAND
-    to instrument a specific program (implemented in Python)
-*/
-probe python.function.entry
-{
-  printf("%s => %s in %s:%d\n", thread_indent(1), funcname, filename, lineno);
-}
-
-probe python.function.return
-{
-  printf("%s <= %s in %s:%d\n", thread_indent(-1), funcname, filename, lineno);
-}

temporarily-disable-tests-requiring-SIGHUP.patch

@@ -1,25 +0,0 @@
-diff -up Python-3.4.0/Lib/test/test_asyncio/test_events.py.orig Python-3.4.0/Lib/test/test_asyncio/test_events.py
---- Python-3.4.0/Lib/test/test_asyncio/test_events.py.orig	2014-04-15 13:18:49.696215288 +0200
-+++ Python-3.4.0/Lib/test/test_asyncio/test_events.py	2014-04-15 13:18:56.104258453 +0200
-@@ -1528,7 +1528,7 @@ class SubprocessTestsMixin:
-         self.loop.run_until_complete(proto.completed)
-         self.check_terminated(proto.returncode)
- 
--    @unittest.skipIf(sys.platform == 'win32', "Don't have SIGHUP")
-+    @unittest.skipIf(True, "Temporarily skipped (rhbz#1088233)")
-     def test_subprocess_send_signal(self):
-         prog = os.path.join(os.path.dirname(__file__), 'echo.py')
- 
-
-diff -up Python-3.4.0/Lib/test/test_asyncio/test_subprocess.py.orig Python-3.4.0/Lib/test/test_asyncio/test_subprocess.py
---- Python-3.4.0/Lib/test/test_asyncio/test_subprocess.py.orig	2014-04-17 12:03:32.777827520 +0200
-+++ Python-3.4.0/Lib/test/test_asyncio/test_subprocess.py	2014-04-17 12:04:37.614210481 +0200
-@@ -108,7 +108,7 @@ class SubprocessMixin:
-         else:
-             self.assertEqual(-signal.SIGTERM, returncode)
- 
--    @unittest.skipIf(sys.platform == 'win32', "Don't have SIGHUP")
-+    @unittest.skipIf(True, "Temporarily skipped (rhbz#1088233)")
-     def test_send_signal(self):
-         args = PROGRAM_BLOCKED
-         create = asyncio.create_subprocess_exec(*args, loop=self.loop)

tests/.fmf/version

@@ -0,0 +1 @@
+1

tests/provision.fmf

@@ -0,0 +1,4 @@
+---
+standard-inventory-qcow2:
+  qemu:
+    m: 3G  # Amount of VM memory

tests/tests.yml

@@ -0,0 +1,34 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    repositories:
+    - repo: "https://src.fedoraproject.org/tests/python.git"
+      dest: "python"
+    tests:
+    - smoke:
+        dir: python/smoke
+        run: VERSION=3.8 ./venv.sh
+    - debugsmoke:
+        dir: python/smoke
+        run: PYTHON=python3-debug TOX=false VERSION=3.8 ./venv.sh
+    - selftest:
+        dir: python/selftest
+        run: VERSION=3.8 X="-x test_wsgiref" ./parallel.sh
+    - debugtest:
+        dir: python/selftest
+        run: VERSION=3.8 PYTHON=python3-debug X="-x test_wsgiref" ./parallel.sh
+    - debugflags:
+        dir: python/flags
+        run: python3-debug ./assertflags.py -Og
+    required_packages:
+    - gcc  # for extension building in venv and selftest
+    - gdb  # for test_gdb
+    - python3-debug  # for leak testing
+    - python3-devel  # for extension building in venv and selftest
+    - python3-tkinter  # for selftest
+    - python3-test  # for selftest
+    - python3-tox  # for venv tests
+    - glibc-all-langpacks # for locale tests