add test.support to the core package (rhbz#596258)

led to a segfault running test_pyexpat.py (patch 110; upstream issue
    9054; rhbz#610312)

Conflicts:

	python3.spec

.gitignore

@@ -1,3 +1,2 @@
-/*.tar.*
+libpython-36a517ef7848cbd0b3dcc7371f32e47ac4c87eba.tar.gz
-/*.src.rpm
+Python-3.1.2.tar.bz2
-/results_python3*

00001-rpath.patch

@@ -1,33 +0,0 @@
-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
-

00102-lib64.patch

@@ -1,261 +0,0 @@
-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',
--        'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
-         'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-     'unix_home': {
-         'purelib': '$base/lib/python',
--        'platlib': '$base/lib/python',
-+        'platlib': '$base/lib64/python',
-         'headers': '$base/include/python/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-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":
-+        if plat_specific or standard_lib:
-+            lib = "lib64"
-+        else:
-+            lib = "lib"
-         libpython = os.path.join(prefix,
--                                 "lib", "python" + get_python_version())
-+                                 lib, "python" + get_python_version())
-         if standard_lib:
-             return libpython
-         else:
-diff --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 == '/':
-+            sitepackages.append(os.path.join(prefix, "lib64",
-+                                        "python" + sys.version[:3],
-+                                        "site-packages"))
-             sitepackages.append(os.path.join(prefix, "lib",
-                                         "python%d.%d" % sys.version_info[:2],
-                                         "site-packages"))
-         else:
-             sitepackages.append(prefix)
-+            sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
-             sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
-     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': {
--        'stdlib': '{installed_base}/lib/python{py_version_short}',
--        'platstdlib': '{platbase}/lib/python{py_version_short}',
-+        'stdlib': '{installed_base}/lib64/python{py_version_short}',
-+        'platstdlib': '{platbase}/lib64/python{py_version_short}',
-         'purelib': '{base}/lib/python{py_version_short}/site-packages',
--        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
-+        'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
-         'include':
-             '{installed_base}/include/python{py_version_short}{abiflags}',
-         'platinclude':
-@@ -62,10 +62,10 @@ _INSTALL_SCHEMES = {
-         'data': '{userbase}',
-         },
-     'posix_user': {
--        'stdlib': '{userbase}/lib/python{py_version_short}',
--        'platstdlib': '{userbase}/lib/python{py_version_short}',
-+        'stdlib': '{userbase}/lib64/python{py_version_short}',
-+        'platstdlib': '{userbase}/lib64/python{py_version_short}',
-         'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
--        'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
-+        'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
-         'include': '{userbase}/include/python{py_version_short}',
-         'scripts': '{userbase}/bin',
-         'data': '{userbase}',
-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)
-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
--SCRIPTDIR=	$(prefix)/lib
-+SCRIPTDIR=	$(prefix)/lib64
- ABIFLAGS=	@ABIFLAGS@
- 
- # Detailed destination directories
-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();
-         }
-     }
--    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;
-     }
-@@ -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
- 
- 
- 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:
--            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:
-@@ -953,11 +953,11 @@ class PyBuildExt(build_ext):
-             elif curses_library:
-                 readline_libs.append(curses_library)
-             elif self.compiler.find_library_file(self.lib_dirs +
--                                                     ['/usr/lib/termcap'],
-+                                                     ['/usr/lib64/termcap'],
-                                                      'termcap'):
-                 readline_libs.append('termcap')
-             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:
--- 
-2.24.1
-

00111-no-static-lib.patch

@@ -1,78 +0,0 @@
-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):	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
-@@ -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
--$(LIBRARY): $(LIBRARY_OBJS)
--	-rm -f $@
--	$(AR) $(ARFLAGS) $@ $(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); \
-@@ -693,7 +687,7 @@ Makefile Modules/config.c: Makefile.pre \
- 	@echo "The Makefile was updated, you may need to re-run make."
- 
- 
--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)
- 
- ############################################################################
-@@ -1557,17 +1551,6 @@ libainstall:	@DEF_MAKE_RULE@ python-config
- 		else	true; \
- 		fi; \
- 	done
--	@if test -d $(LIBRARY); then :; else \
--		if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
--			if test "$(SHLIB_SUFFIX)" = .dll; then \
--				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
--			else \
--				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
--			fi; \
--		else \
--			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
--		fi; \
--	fi
- 	$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
- 	$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
- 	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
--- 
-2.24.1
-

00189-use-rpm-wheels.patch

@@ -1,70 +0,0 @@
-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
-

00251-change-user-install-location.patch

@@ -1,64 +0,0 @@
-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

@@ -1,86 +0,0 @@
-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

@@ -1,55 +0,0 @@
-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
-

Python-3.1.1-rpath.patch

@@ -0,0 +1,20 @@
+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-timestamps.py

@@ -1,55 +0,0 @@
-"""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

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# The standard /usr/lib/rpm/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" | /usr/lib/rpm/find-provides
+
+exit 0

idle3.appdata.xml

@@ -1,35 +0,0 @@
-<?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

@@ -1,11 +0,0 @@
-[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

@@ -0,0 +1,17 @@
+/* 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

@@ -0,0 +1,12 @@
+# 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

@@ -0,0 +1,4 @@
+%__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))")
+%py3dir %{_builddir}/python3-%{name}-%{version}-%{release}

pyfuntop.stp

@@ -0,0 +1,21 @@
+#!/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.1-apply-our-changes-to-expected-shebang-for-test_imp.patch

@@ -0,0 +1,11 @@
+--- Python-3.1.1/Lib/test/test_imp.py.apply-our-changes-to-expected-shebang	2009-10-27 18:05:53.539540149 -0400
++++ Python-3.1.1/Lib/test/test_imp.py	2009-10-27 18:06:12.138538965 -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 python\n')
++        self.assertEqual(fp.readline(), '#!/usr/bin/python3.1\n')
+         fp.close()
+ 
+         fp, filename, info = imp.find_module("tokenize")

python-3.1.1-config.patch

@@ -0,0 +1,226 @@
+diff -up Python-3.1.1/Modules/Setup.dist.config Python-3.1.1/Modules/Setup.dist
+--- Python-3.1.1/Modules/Setup.dist.config	2009-06-04 05:30:30.000000000 -0400
++++ Python-3.1.1/Modules/Setup.dist	2010-01-25 23:08:55.179858352 -0500
+@@ -141,7 +141,7 @@ _symtable symtablemodule.c
+ # modules are to be built as shared libraries (see above for more
+ # detail; also note that *static* reverses this effect):
+ 
+-#*shared*
++*shared*
+ 
+ # GNU readline.  Unlike previous Python incarnations, GNU readline is
+ # now incorporated in an optional module, configured in the Setup file
+@@ -151,71 +151,71 @@ _symtable symtablemodule.c
+ # it, depending on your system -- see the GNU readline instructions.
+ # It's okay for this to be a shared library, too.
+ 
+-#readline readline.c -lreadline -ltermcap
++readline readline.c -lreadline -ltermcap
+ 
+ 
+ # Modules that should always be present (non UNIX dependent):
+ 
+-#array arraymodule.c	# array objects
+-#cmath cmathmodule.c # -lm # complex math library functions
+-#math mathmodule.c # -lm # math library functions, e.g. sin()
+-#_struct _struct.c	# binary structure packing/unpacking
+-#time timemodule.c # -lm # time operations and variables
+-#operator operator.c	# operator.add() and similar goodies
+-#_weakref _weakref.c	# basic weak reference support
+-#_testcapi _testcapimodule.c    # Python C API test module
+-#_random _randommodule.c	# Random number generator
+-#_collections _collectionsmodule.c # Container types
+-#itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
+-#atexit atexitmodule.c      # Register functions to be run at interpreter-shutdown
++array arraymodule.c	# array objects
++cmath cmathmodule.c # -lm # complex math library functions
++math mathmodule.c # -lm # math library functions, e.g. sin()
++_struct _struct.c	# binary structure packing/unpacking
++time timemodule.c # -lm # time operations and variables
++operator operator.c	# operator.add() and similar goodies
++_weakref _weakref.c	# basic weak reference support
++_testcapi _testcapimodule.c    # Python C API test module
++_random _randommodule.c	# Random number generator
++_collections _collectionsmodule.c # Container types
++itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
++atexit atexitmodule.c      # Register functions to be run at interpreter-shutdown
+ #_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
+-#_pickle _pickle.c	# pickle accelerator
++_pickle _pickle.c	# pickle accelerator
+ #datetime datetimemodule.c	# date/time type
+-#_bisect _bisectmodule.c	# Bisection algorithms
+-#_heapq _heapqmodule.c	# Heap queue algorithm
++_bisect _bisectmodule.c	# Bisection algorithms
++_heapq _heapqmodule.c	# Heap queue algorithm
+ 
+-#unicodedata unicodedata.c    # static Unicode character database
++unicodedata unicodedata.c    # static Unicode character database
+ 
+ 
+ # Modules with some UNIX dependencies -- on by default:
+ # (If you have a really backward UNIX, select and socket may not be
+ # supported...)
+ 
+-#fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
+-#spwd spwdmodule.c		# spwd(3) 
+-#grp grpmodule.c		# grp(3)
+-#select selectmodule.c	# select(2); not on ancient System V
++fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
++spwd spwdmodule.c		# spwd(3) 
++grp grpmodule.c		# grp(3)
++select selectmodule.c	# select(2); not on ancient System V
+ 
+ # Memory-mapped files (also works on Win32).
+-#mmap mmapmodule.c
++mmap mmapmodule.c
+ 
+ # CSV file helper
+-#_csv _csv.c
++_csv _csv.c
+ 
+ # Socket module helper for socket(2)
+-#_socket socketmodule.c
++_socket socketmodule.c
+ 
+ # Socket module helper for SSL support; you must comment out the other
+ # socket line above, and possibly edit the SSL variable:
+ #SSL=/usr/local/ssl
+-#_ssl _ssl.c \
+-#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
+-#	-L$(SSL)/lib -lssl -lcrypto
++_ssl _ssl.c \
++	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
++	-L$(SSL)/lib -lssl -lcrypto
+ 
+ # The crypt module is now disabled by default because it breaks builds
+ # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
+ #
+ # First, look at Setup.config; configure may have set this for you.
+ 
+-#crypt cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems
++crypt cryptmodule.c -lcrypt	# crypt(3); needs -lcrypt on some systems
+ 
+ 
+ # Some more UNIX dependent modules -- off by default, since these
+ # are not supported by all UNIX systems:
+ 
+-#nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
+-#termios termios.c	# Steen Lumholt's termios module
+-#resource resource.c	# Jeremy Hylton's rlimit interface
++nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
++termios termios.c	# Steen Lumholt's termios module
++resource resource.c	# Jeremy Hylton's rlimit interface
+ 
+ 
+ # Multimedia modules -- off by default.
+@@ -223,7 +223,7 @@ _symtable symtablemodule.c
+ # #993173 says audioop works on 64-bit platforms, though.
+ # These represent audio samples or images as strings:
+ 
+-#audioop audioop.c	# Operations on audio samples
++audioop audioop.c	# Operations on audio samples
+ 
+ 
+ # Note that the _md5 and _sha modules are normally only built if the
+@@ -238,9 +238,9 @@ _symtable symtablemodule.c
+ 
+ # The _sha module implements the SHA checksum algorithms.
+ # (NIST's Secure Hash Algorithms.)
+-#_sha shamodule.c
+-#_sha256 sha256module.c
+-#_sha512 sha512module.c
++_sha1 sha1module.c
++_sha256 sha256module.c
++_sha512 sha512module.c
+ 
+ 
+ # The _tkinter module.
+@@ -255,7 +255,7 @@ _symtable symtablemodule.c
+ # every system.
+ 
+ # *** Always uncomment this (leave the leading underscore in!):
+-# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
++_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
+ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
+ #	-L/usr/local/lib \
+ # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
+@@ -265,7 +265,7 @@ _symtable symtablemodule.c
+ # *** Or uncomment this for Solaris:
+ #	-I/usr/openwin/include \
+ # *** Uncomment and edit for Tix extension only:
+-#	-DWITH_TIX -ltix8.1.8.2 \
++	-DWITH_TIX -ltix \
+ # *** Uncomment and edit for BLT extension only:
+ #	-DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
+ # *** Uncomment and edit for PIL (TkImaging) extension only:
+@@ -274,7 +274,7 @@ _symtable symtablemodule.c
+ # *** Uncomment and edit for TOGL extension only:
+ #	-DWITH_TOGL togl.c \
+ # *** Uncomment and edit to reflect your Tcl/Tk versions:
+-#	-ltk8.2 -ltcl8.2 \
++	-ltk -ltcl \
+ # *** Uncomment and edit to reflect where your X11 libraries are:
+ #	-L/usr/X11R6/lib \
+ # *** Or uncomment this for Solaris:
+@@ -284,10 +284,10 @@ _symtable symtablemodule.c
+ # *** Uncomment for AIX:
+ #	-lld \
+ # *** Always uncomment this; X11 libraries to link with:
+-#	-lX11
++	-lX11
+ 
+ # Lance Ellinghaus's syslog module
+-#syslog syslogmodule.c		# syslog daemon interface
++syslog syslogmodule.c		# syslog daemon interface
+ 
+ 
+ # Curses support, requring the System V version of curses, often
+@@ -321,14 +321,14 @@ _symtable symtablemodule.c
+ #
+ # First, look at Setup.config; configure may have set this for you.
+ 
+-#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
++_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
+ 
+ 
+ # Helper module for various ascii-encoders
+-#binascii binascii.c
++binascii binascii.c
+ 
+ # Fred Drake's interface to the Python parser
+-#parser parsermodule.c
++parser parsermodule.c
+ 
+ 
+ # Lee Busby's SIGFPE modules.
+@@ -351,7 +351,7 @@ _symtable symtablemodule.c
+ # Andrew Kuchling's zlib module.
+ # This require zlib 1.1.3 (or later).
+ # See http://www.gzip.org/zlib/
+-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
++zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
+ 
+ # Interface to the Expat XML parser
+ #
+@@ -369,14 +369,14 @@ _symtable symtablemodule.c
+ # Hye-Shik Chang's CJKCodecs
+ 
+ # multibytecodec is required for all the other CJK codec modules
+-#_multibytecodec cjkcodecs/multibytecodec.c
++_multibytecodec cjkcodecs/multibytecodec.c
+ 
+-#_codecs_cn cjkcodecs/_codecs_cn.c
+-#_codecs_hk cjkcodecs/_codecs_hk.c
+-#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
+-#_codecs_jp cjkcodecs/_codecs_jp.c
+-#_codecs_kr cjkcodecs/_codecs_kr.c
+-#_codecs_tw cjkcodecs/_codecs_tw.c
++_codecs_cn cjkcodecs/_codecs_cn.c
++_codecs_hk cjkcodecs/_codecs_hk.c
++_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
++_codecs_jp cjkcodecs/_codecs_jp.c
++_codecs_kr cjkcodecs/_codecs_kr.c
++_codecs_tw cjkcodecs/_codecs_tw.c
+ 
+ # Example -- included for reference only:
+ # xx xxmodule.c

python-3.1.1-lib64.patch

@@ -0,0 +1,164 @@
+diff -ur Python-3.1.1.orig/Lib/distutils/command/install.py Python-3.1.1/Lib/distutils/command/install.py
+--- Python-3.1.1.orig/Lib/distutils/command/install.py	2009-09-24 15:28:57.000000000 -0600
++++ Python-3.1.1/Lib/distutils/command/install.py	2009-09-24 15:34:18.000000000 -0600
+@@ -47,14 +47,14 @@
+ INSTALL_SCHEMES = {
+     'unix_prefix': {
+         'purelib': '$base/lib/python$py_version_short/site-packages',
+-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
++        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
+         'headers': '$base/include/python$py_version_short/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
+     'unix_home': {
+         'purelib': '$base/lib/python',
+-        'platlib': '$base/lib/python',
++        'platlib': '$base/lib64/python',
+         'headers': '$base/include/python/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+diff -ur Python-3.1.1.orig/Lib/distutils/sysconfig.py Python-3.1.1/Lib/distutils/sysconfig.py
+--- Python-3.1.1.orig/Lib/distutils/sysconfig.py	2009-09-24 15:29:00.000000000 -0600
++++ Python-3.1.1/Lib/distutils/sysconfig.py	2009-09-24 15:34:18.000000000 -0600
+@@ -117,8 +117,12 @@
+         prefix = plat_specific and EXEC_PREFIX or PREFIX
+ 
+     if os.name == "posix":
++        if plat_specific or standard_lib:
++            lib = "lib64"
++        else:
++            lib = "lib"
+         libpython = os.path.join(prefix,
+-                                 "lib", "python" + get_python_version())
++                                 lib, "python" + get_python_version())
+         if standard_lib:
+             return libpython
+         else:
+diff -ur Python-3.1.1.orig/Lib/site.py Python-3.1.1/Lib/site.py
+--- Python-3.1.1.orig/Lib/site.py	2009-09-24 15:28:56.000000000 -0600
++++ Python-3.1.1/Lib/site.py	2009-09-24 15:34:18.000000000 -0600
+@@ -258,12 +258,16 @@
+         if sys.platform in ('os2emx', 'riscos'):
+             sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
+         elif os.sep == '/':
++            sitedirs.append(os.path.join(prefix, "lib64",
++                                        "python" + sys.version[:3],
++                                        "site-packages"))
+             sitedirs.append(os.path.join(prefix, "lib",
+                                         "python" + sys.version[:3],
+                                         "site-packages"))
+             sitedirs.append(os.path.join(prefix, "lib", "site-python"))
+         else:
+             sitedirs.append(prefix)
++            sitedirs.append(os.path.join(prefix, "lib64", "site-packages"))
+             sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
+ 
+         if sys.platform == "darwin":
+diff -ur Python-3.1.1.orig/Makefile.pre.in Python-3.1.1/Makefile.pre.in
+--- Python-3.1.1.orig/Makefile.pre.in	2009-09-24 15:26:58.000000000 -0600
++++ Python-3.1.1/Makefile.pre.in	2009-09-24 15:34:18.000000000 -0600
+@@ -90,11 +90,11 @@
+ 
+ # Expanded directories
+ BINDIR=		$(exec_prefix)/bin
+-LIBDIR=		$(exec_prefix)/lib
++LIBDIR=		$(exec_prefix)/lib64
+ MANDIR=		@mandir@
+ INCLUDEDIR=	@includedir@
+ CONFINCLUDEDIR=	$(exec_prefix)/include
+-SCRIPTDIR=	$(prefix)/lib
++SCRIPTDIR=	$(prefix)/lib64
+ 
+ # Detailed destination directories
+ BINLIBDEST=	$(LIBDIR)/python$(VERSION)
+diff -ur Python-3.1.1.orig/Modules/getpath.c Python-3.1.1/Modules/getpath.c
+--- Python-3.1.1.orig/Modules/getpath.c	2009-09-24 15:27:15.000000000 -0600
++++ Python-3.1.1/Modules/getpath.c	2009-09-24 15:36:58.000000000 -0600
+@@ -117,8 +117,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
+@@ -129,7 +129,7 @@
+ static wchar_t exec_prefix[MAXPATHLEN+1];
+ static wchar_t progpath[MAXPATHLEN+1];
+ static wchar_t *module_search_path = NULL;
+-static wchar_t lib_python[] = L"lib/python" VERSION;
++static wchar_t lib_python[] = L"lib64/python" VERSION;
+ 
+ /* In principle, this should use HAVE__WSTAT, and _wstat
+    should be detected by autoconf. However, no current
+@@ -603,7 +603,7 @@
+     }
+     else
+         wcsncpy(zip_path, L"" 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];
+@@ -613,7 +613,7 @@
+             fprintf(stderr,
+                 "Could not find platform dependent libraries <exec_prefix>\n");
+         wcsncpy(exec_prefix, L"" EXEC_PREFIX, MAXPATHLEN);
+-        joinpath(exec_prefix, L"lib/lib-dynload");
++        joinpath(exec_prefix, L"lib64/lib-dynload");
+     }
+     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
+ 
+diff -ur Python-3.1.1.orig/Modules/Setup.dist Python-3.1.1/Modules/Setup.dist
+--- Python-3.1.1.orig/Modules/Setup.dist	2009-09-24 15:27:30.000000000 -0600
++++ Python-3.1.1/Modules/Setup.dist	2009-09-24 15:45:49.000000000 -0600
+@@ -351,7 +351,7 @@
+ # Andrew Kuchling's zlib module.
+ # This require zlib 1.1.3 (or later).
+ # See http://www.gzip.org/zlib/
+-zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
++zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
+ 
+ # Interface to the Expat XML parser
+ #
+diff -ur Python-3.1.1.orig/setup.py Python-3.1.1/setup.py
+--- Python-3.1.1.orig/setup.py	2009-09-24 15:26:58.000000000 -0600
++++ Python-3.1.1/setup.py	2009-09-24 15:34:18.000000000 -0600
+@@ -295,7 +295,7 @@
+ 
+     def detect_modules(self):
+         # Ensure that /usr/local is always used
+-        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')
+ 
+         # Add paths specified in the environment variables LDFLAGS and
+@@ -522,11 +522,11 @@
+             elif self.compiler.find_library_file(lib_dirs, 'curses'):
+                 readline_libs.append('curses')
+             elif self.compiler.find_library_file(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) )
+         else:
+@@ -563,8 +563,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

python-3.1.1-no-static-lib.patch

@@ -0,0 +1,50 @@
+diff -up Python-3.1.1/Makefile.pre.in.no-static-lib Python-3.1.1/Makefile.pre.in
+--- Python-3.1.1/Makefile.pre.in.no-static-lib	2010-01-17 15:42:11.945858717 -0500
++++ Python-3.1.1/Makefile.pre.in	2010-01-17 16:44:32.788859363 -0500
+@@ -405,7 +405,7 @@ coverage:
+ 
+ 
+ # Build the interpreter
+-$(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY)
++$(BUILDPYTHON):	Modules/python.o $(LDLIBRARY)
+ 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
+ 			Modules/python.o \
+ 			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+@@ -421,18 +421,6 @@ sharedmods: $(BUILDPYTHON)
+ 	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+ 	esac
+ 
+-# 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)
+-	$(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
+-	$(AR) $(ARFLAGS) $@ $(MODOBJS)
+-	$(RANLIB) $@
+-
+ libpython$(VERSION).so: $(LIBRARY_OBJS)
+ 	if test $(INSTSONAME) != $(LDLIBRARY); then \
+ 		$(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+@@ -973,18 +961,6 @@ libainstall:	all
+ 		else	true; \
+ 		fi; \
+ 	done
+-	@if test -d $(LIBRARY); then :; else \
+-		if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
+-			if test "$(SO)" = .dll; then \
+-				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
+-			else \
+-				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
+-				$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
+-			fi; \
+-		else \
+-			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
+-		fi; \
+-	fi
+ 	$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
+ 	$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
+ 	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in

python-3.1.1-remove-mimeaudio-tests.patch

@@ -0,0 +1,55 @@
+--- Python-3.1.1/Lib/email/test/test_email.py.remove_mimeaudio_tests	2009-10-27 14:31:09.483539561 -0400
++++ Python-3.1.1/Lib/email/test/test_email.py	2009-10-27 14:31:27.663548053 -0400
+@@ -926,52 +926,6 @@ Blah blah blah
+ 
+ 
+ 
+-# Test the basic MIMEAudio class
+-class TestMIMEAudio(unittest.TestCase):
+-    def setUp(self):
+-        # Make sure we pick up the audiotest.au that lives in email/test/data.
+-        # In Python, there's an audiotest.au living in Lib/test but that isn't
+-        # included in some binary distros that don't include the test
+-        # package.  The trailing empty string on the .join() is significant
+-        # since findfile() will do a dirname().
+-        datadir = os.path.join(os.path.dirname(landmark), 'data', '')
+-        with open(findfile('audiotest.au', datadir), '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(payload), 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):

python-3.1.1-systemtap.patch

@@ -0,0 +1,322 @@
+diff -up Python-3.1.1/configure.in.systemtap Python-3.1.1/configure.in
+--- Python-3.1.1/configure.in.systemtap	2010-02-12 15:24:34.959845279 -0500
++++ Python-3.1.1/configure.in	2010-02-12 15:24:34.965845345 -0500
+@@ -2359,6 +2359,38 @@ then
+ fi
+ AC_MSG_RESULT($with_pymalloc)
+ 
++# Check for dtrace support
++AC_MSG_CHECKING(for --with-dtrace)
++AC_ARG_WITH(dtrace,
++            AC_HELP_STRING(--with(out)-dtrace, disable/enable dtrace support))
++
++if test ! -z "$with_dtrace"
++then
++    if dtrace -G -o /dev/null -s $srcdir/Include/pydtrace.d 2>/dev/null
++    then
++	AC_DEFINE(WITH_DTRACE, 1, 
++	 [Define if you want to compile in Dtrace support])
++	with_dtrace="Sun"
++	DTRACEOBJS="Python/dtrace.o"
++	DTRADEHDRS=""
++    elif dtrace -h -o /dev/null -s $srcdir/Include/pydtrace.d
++   then
++	AC_DEFINE(WITH_DTRACE, 1, 
++	 [Define if you want to compile in Dtrace support])
++	with_dtrace="Apple"
++	DTRACEOBJS=""
++	DTRADEHDRS="pydtrace.h"
++    else
++	with_dtrace="no"
++    fi
++else
++    with_dtrace="no"
++fi
++
++AC_MSG_RESULT($with_dtrace)
++AC_SUBST(DTRACEOBJS)
++AC_SUBST(DTRACEHDRS)
++
+ # Check for --with-wctype-functions
+ AC_MSG_CHECKING(for --with-wctype-functions)
+ AC_ARG_WITH(wctype-functions, 
+diff -up Python-3.1.1/Include/pydtrace.d.systemtap Python-3.1.1/Include/pydtrace.d
+--- Python-3.1.1/Include/pydtrace.d.systemtap	2010-02-12 15:24:34.966844913 -0500
++++ Python-3.1.1/Include/pydtrace.d	2010-02-12 15:24:34.966844913 -0500
+@@ -0,0 +1,10 @@
++provider python {
++	probe function__entry(const char *, const char *, int);
++	probe function__return(const char *, const char *, int);
++};
++
++#pragma D attributes Evolving/Evolving/Common provider python provider
++#pragma D attributes Private/Private/Common provider python module
++#pragma D attributes Private/Private/Common provider python function
++#pragma D attributes Evolving/Evolving/Common provider python name
++#pragma D attributes Evolving/Evolving/Common provider python args
+diff -up Python-3.1.1/Makefile.pre.in.systemtap Python-3.1.1/Makefile.pre.in
+--- Python-3.1.1/Makefile.pre.in.systemtap	2010-02-12 15:24:34.953845073 -0500
++++ Python-3.1.1/Makefile.pre.in	2010-02-12 15:24:34.990844336 -0500
+@@ -312,6 +312,7 @@ PYTHON_OBJS=	\
+ 		Python/dtoa.o \
+ 		Python/formatter_unicode.o \
+ 		Python/$(DYNLOADFILE) \
++		@DTRACEOBJS@ \
+ 		$(LIBOBJS) \
+ 		$(MACHDEP_OBJS) \
+ 		$(THREADOBJ)
+@@ -592,6 +593,18 @@ Python/formatter_unicode.o: $(srcdir)/Py
+ 				$(srcdir)/Objects/stringlib/formatter.h
+ 
+ 
++# Only needed with --with-dtrace
++buildinclude:
++	mkdir -p Include
++
++Include/pydtrace.h: buildinclude $(srcdir)/Include/pydtrace.d
++	dtrace -o $@ $(DFLAGS) -C -h -s $(srcdir)/Include/pydtrace.d
++
++Python/ceval.o: Include/pydtrace.h
++
++Python/dtrace.o: buildinclude $(srcdir)/Include/pydtrace.d Python/ceval.o
++	dtrace -o $@ $(DFLAGS) -C -G -s $(srcdir)/Include/pydtrace.d Python/ceval.o
++
+ ############################################################################
+ # Header files
+ 
+@@ -1224,6 +1237,6 @@ Python/thread.o: @THREADHEADERS@
+ .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
+ .PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools
+ .PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean 
+-.PHONY: smelly funny patchcheck
++.PHONY: smelly funny patchcheck buildinclude
+ 
+ # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+diff -up Python-3.1.1/pyconfig.h.in.systemtap Python-3.1.1/pyconfig.h.in
+--- Python-3.1.1/pyconfig.h.in.systemtap	2009-05-29 13:25:39.000000000 -0400
++++ Python-3.1.1/pyconfig.h.in	2010-02-12 15:24:34.991845511 -0500
+@@ -5,6 +5,9 @@
+ #define Py_PYCONFIG_H
+ 
+ 
++/* Define if building universal (internal helper macro) */
++#undef AC_APPLE_UNIVERSAL_BUILD
++
+ /* Define for AIX if your compiler is a genuine IBM xlC/xlC_r and you want
+    support for AIX C++ shared extension modules. */
+ #undef AIX_GENUINE_CPLUSPLUS
+@@ -995,6 +998,28 @@
+ /* Define if you want to use computed gotos in ceval.c. */
+ #undef USE_COMPUTED_GOTOS
+ 
++/* Enable extensions on AIX 3, Interix.  */
++#ifndef _ALL_SOURCE
++# undef _ALL_SOURCE
++#endif
++/* Enable GNU extensions on systems that have them.  */
++#ifndef _GNU_SOURCE
++# undef _GNU_SOURCE
++#endif
++/* Enable threading extensions on Solaris.  */
++#ifndef _POSIX_PTHREAD_SEMANTICS
++# undef _POSIX_PTHREAD_SEMANTICS
++#endif
++/* Enable extensions on HP NonStop.  */
++#ifndef _TANDEM_SOURCE
++# undef _TANDEM_SOURCE
++#endif
++/* Enable general extensions on Solaris.  */
++#ifndef __EXTENSIONS__
++# undef __EXTENSIONS__
++#endif
++
++
+ /* Define if a va_list is an array of some kind */
+ #undef VA_LIST_IS_ARRAY
+ 
+@@ -1011,6 +1036,9 @@
+ /* Define if you want documentation strings in extension modules */
+ #undef WITH_DOC_STRINGS
+ 
++/* Define if you want to compile in Dtrace support */
++#undef WITH_DTRACE
++
+ /* Define if you want to use the new-style (Openstep, Rhapsody, MacOS) dynamic
+    linker (dyld) instead of the old-style (NextStep) dynamic linker (rld).
+    Dyld is necessary to support frameworks. */
+@@ -1032,20 +1060,21 @@
+ /* Define to profile with the Pentium timestamp counter */
+ #undef WITH_TSC
+ 
+-/* Define to 1 if your processor stores words with the most significant byte
+-   first (like Motorola and SPARC, unlike Intel and VAX). */
+-#undef WORDS_BIGENDIAN
++/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
++   significant byte first (like Motorola and SPARC, unlike Intel). */
++#if defined AC_APPLE_UNIVERSAL_BUILD
++# if defined __BIG_ENDIAN__
++#  define WORDS_BIGENDIAN 1
++# endif
++#else
++# ifndef WORDS_BIGENDIAN
++#  undef WORDS_BIGENDIAN
++# endif
++#endif
+ 
+ /* Define if arithmetic is subject to x87-style double rounding issue */
+ #undef X87_DOUBLE_ROUNDING
+ 
+-/* Define to 1 if on AIX 3.
+-   System headers sometimes define this.
+-   We just want to avoid a redefinition error message.  */
+-#ifndef _ALL_SOURCE
+-# undef _ALL_SOURCE
+-#endif
+-
+ /* Define on OpenBSD to activate all library features */
+ #undef _BSD_SOURCE
+ 
+@@ -1064,15 +1093,25 @@
+ /* This must be defined on some systems to enable large file support. */
+ #undef _LARGEFILE_SOURCE
+ 
++/* Define to 1 if on MINIX. */
++#undef _MINIX
++
+ /* Define on NetBSD to activate all library features */
+ #undef _NETBSD_SOURCE
+ 
+ /* Define _OSF_SOURCE to get the makedev macro. */
+ #undef _OSF_SOURCE
+ 
++/* Define to 2 if the system does not provide POSIX.1 features except with
++   this defined. */
++#undef _POSIX_1_SOURCE
++
+ /* Define to activate features from IEEE Stds 1003.1-2001 */
+ #undef _POSIX_C_SOURCE
+ 
++/* Define to 1 if you need to in order for `stat' and other things to work. */
++#undef _POSIX_SOURCE
++
+ /* Define if you have POSIX threads, and your system does not define that. */
+ #undef _POSIX_THREADS
+ 
+@@ -1080,12 +1119,12 @@
+ #undef _REENTRANT
+ 
+ /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+-   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
++   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+    #define below would cause a syntax error. */
+ #undef _UINT32_T
+ 
+ /* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
+-   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
++   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+    #define below would cause a syntax error. */
+ #undef _UINT64_T
+ 
+diff -up Python-3.1.1/Python/ceval.c.systemtap Python-3.1.1/Python/ceval.c
+--- Python-3.1.1/Python/ceval.c.systemtap	2009-05-30 17:41:10.000000000 -0400
++++ Python-3.1.1/Python/ceval.c	2010-02-12 15:24:54.075844169 -0500
+@@ -19,6 +19,10 @@
+ 
+ #include <ctype.h>
+ 
++#ifdef WITH_DTRACE
++#include "pydtrace.h"
++#endif
++
+ #ifndef WITH_TSC
+ 
+ #define READ_TIMESTAMP(var)
+@@ -655,6 +659,69 @@ PyEval_EvalCode(PyCodeObject *co, PyObje
+ 			  NULL, NULL);
+ }
+ 
++#ifdef WITH_DTRACE
++struct frame_marker_info
++{
++	char *filename;
++	char *name;
++	int lineno;
++
++	PyObject *utf8_filename;
++	PyObject *utf8_name;
++};
++
++static void
++get_frame_marker_info(PyFrameObject *f, struct frame_marker_info *fmi)
++{
++	fmi->utf8_filename = PyUnicode_AsUTF8String(f->f_code->co_filename);
++	if (fmi->utf8_filename) {
++		fmi->filename = PyBytes_AsString(fmi->utf8_filename);
++	} else {
++		fmi->filename = NULL;
++		/* FIXME: clear the exception? */
++	}
++
++	fmi->utf8_name = PyUnicode_AsUTF8String(f->f_code->co_name);
++	if (fmi->utf8_name) {
++		fmi->name = PyBytes_AsString(fmi->utf8_name);
++	} else {
++		fmi->name = NULL;
++		/* FIXME: clear the exception? */
++	}
++
++	fmi->lineno = PyCode_Addr2Line(f->f_code, f->f_lasti);
++}
++
++static void
++release_frame_marker_info(struct frame_marker_info *fmi)
++{
++	Py_XDECREF(fmi->utf8_filename);
++	Py_XDECREF(fmi->utf8_name);
++}
++
++static void
++dtrace_entry(PyFrameObject *f)
++{
++	struct frame_marker_info fmi;
++	get_frame_marker_info(f, &fmi);
++	PYTHON_FUNCTION_ENTRY(fmi.filename, fmi.name, fmi.lineno);
++	release_frame_marker_info(&fmi);
++}
++
++static void
++dtrace_return(PyFrameObject *f)
++{
++	struct frame_marker_info fmi;
++	get_frame_marker_info(f, &fmi);
++	PYTHON_FUNCTION_RETURN(fmi.filename, fmi.name, fmi.lineno);
++	release_frame_marker_info(&fmi);
++}
++#else
++#define	PYTHON_FUNCTION_ENTRY_ENABLED() 0
++#define	PYTHON_FUNCTION_RETURN_ENABLED() 0
++#define	dtrace_entry(f)
++#define	dtrace_return(f)
++#endif
+ 
+ /* Interpreter main loop */
+ 
+@@ -1061,6 +1128,9 @@ PyEval_EvalFrameEx(PyFrameObject *f, int
+ 		}
+ 	}
+ 
++        if (PYTHON_FUNCTION_ENTRY_ENABLED())
++                dtrace_entry(f);
++
+ 	co = f->f_code;
+ 	names = co->co_names;
+ 	consts = co->co_consts;
+@@ -2907,6 +2977,8 @@ fast_yield:
+ 
+ 	/* pop frame */
+ exit_eval_frame:
++	if (PYTHON_FUNCTION_RETURN_ENABLED())
++		dtrace_return(f);
+ 	Py_LeaveRecursiveCall();
+ 	tstate->frame = f->f_back;
+ 

python-3.1.1-with-system-expat.patch

@@ -0,0 +1,67 @@
+diff -up Python-3.1.1/configure.in.expat Python-3.1.1/configure.in
+--- Python-3.1.1/configure.in.expat	2010-01-25 23:02:05.488859572 -0500
++++ Python-3.1.1/configure.in	2010-01-25 23:02:21.425857866 -0500
+@@ -1853,6 +1853,13 @@ LIBS="$withval $LIBS"
+ ],
+ [AC_MSG_RESULT(no)])
+ 
++# Check for use of the system expat library
++AC_MSG_CHECKING(for --with-system-expat)
++AC_ARG_WITH(system_expat,
++            AC_HELP_STRING(--with-system-expat, build pyexpat module using an installed expat library))
++
++AC_MSG_RESULT($with_system_expat)
++
+ # Check for use of the system libffi library
+ AC_MSG_CHECKING(for --with-system-ffi)
+ AC_ARG_WITH(system_ffi,
+diff -up Python-3.1.1/setup.py.expat Python-3.1.1/setup.py
+--- Python-3.1.1/setup.py.expat	2010-01-25 23:02:11.254859198 -0500
++++ Python-3.1.1/setup.py	2010-01-25 23:02:21.426857993 -0500
+@@ -1110,19 +1110,26 @@ class PyBuildExt(build_ext):
+         #
+         # More information on Expat can be found at www.libexpat.org.
+         #
+-        expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
+-        define_macros = [
+-            ('HAVE_EXPAT_CONFIG_H', '1'),
+-        ]
++        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
++            expat_inc = []
++            define_macros = []
++            expat_lib = ['expat']
++            expat_sources = []
++        else:
++            expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')]
++            define_macros = [
++                ('HAVE_EXPAT_CONFIG_H', '1'),
++            ]
++            expat_lib = []
++            expat_sources = ['expat/xmlparse.c',
++                             'expat/xmlrole.c',
++                             'expat/xmltok.c']
+ 
+         exts.append(Extension('pyexpat',
+                               define_macros = define_macros,
+-                              include_dirs = [expatinc],
+-                              sources = ['pyexpat.c',
+-                                         'expat/xmlparse.c',
+-                                         'expat/xmlrole.c',
+-                                         'expat/xmltok.c',
+-                                         ],
++                              include_dirs = expat_inc,
++                              libraries = expat_lib,
++                              sources = ['pyexpat.c'] + expat_sources
+                               ))
+ 
+         # Fredrik Lundh's cElementTree module.  Note that this also
+@@ -1132,7 +1139,8 @@ class PyBuildExt(build_ext):
+             define_macros.append(('USE_PYEXPAT_CAPI', None))
+             exts.append(Extension('_elementtree',
+                                   define_macros = define_macros,
+-                                  include_dirs = [expatinc],
++                                  include_dirs = expat_inc,
++                                  libraries = expat_lib,
+                                   sources = ['_elementtree.c'],
+                                   ))
+         else:

python-3.1.2-CVE-2008-5983.patch

@@ -0,0 +1,120 @@
+diff -up Python-3.1.2/Doc/c-api/init.rst.CVE-2008-5983 Python-3.1.2/Doc/c-api/init.rst
+--- Python-3.1.2/Doc/c-api/init.rst.CVE-2008-5983	2010-01-09 13:48:46.000000000 -0500
++++ Python-3.1.2/Doc/c-api/init.rst	2010-06-04 15:19:26.724089244 -0400
+@@ -22,6 +22,7 @@ Initialization, Finalization, and Thread
+       module: sys
+       triple: module; search; path
+       single: PySys_SetArgv()
++      single: PySys_SetArgvEx()
+       single: Py_Finalize()
+ 
+    Initialize the Python interpreter.  In an application embedding  Python, this
+@@ -31,7 +32,7 @@ Initialization, Finalization, and Thread
+    the table of loaded modules (``sys.modules``), and creates the fundamental
+    modules :mod:`builtins`, :mod:`__main__` and :mod:`sys`.  It also initializes
+    the module search path (``sys.path``). It does not set ``sys.argv``; use
+-   :cfunc:`PySys_SetArgv` for that.  This is a no-op when called for a second time
++   :cfunc:`PySys_SetArgvEx` for that.  This is a no-op when called for a second time
+    (without calling :cfunc:`Py_Finalize` first).  There is no return value; it is a
+    fatal error if the initialization fails.
+ 
+@@ -344,7 +345,7 @@ Initialization, Finalization, and Thread
+    ``sys.version``.
+ 
+ 
+-.. cfunction:: void PySys_SetArgv(int argc, wchar_t **argv)
++.. cfunction:: void PySys_SetArgvEx(int argc, wchar_t **argv, int updatepath)
+ 
+    .. index::
+       single: main()
+@@ -359,14 +360,41 @@ Initialization, Finalization, and Thread
+    string.  If this function fails to initialize :data:`sys.argv`, a fatal
+    condition is signalled using :cfunc:`Py_FatalError`.
+ 
+-   This function also prepends the executed script's path to :data:`sys.path`.
+-   If no script is executed (in the case of calling ``python -c`` or just the
+-   interactive interpreter), the empty string is used instead.
++   If *updatepath* is zero, this is all the function does.  If *updatepath*
++   is non-zero, the function also modifies :data:`sys.path` according to the
++   following algorithm:
++
++   - If the name of an existing script is passed in ``argv[0]``, the absolute
++     path of the directory where the script is located is prepended to
++     :data:`sys.path`.
++   - Otherwise (that is, if *argc* is 0 or ``argv[0]`` doesn't point
++     to an existing file name), an empty string is prepended to
++     :data:`sys.path`, which is the same as prepending the current working
++     directory (``"."``).
++
++   .. note::
++      It is recommended that applications embedding the Python interpreter
++      for purposes other than executing a single script pass 0 as *updatepath*,
++      and update :data:`sys.path` themselves if desired.
++      See `CVE-2008-5983 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5983>`_.
++
++      On versions before 3.1.3, you can achieve the same effect by manually
++      popping the first :data:`sys.path` element after having called
++      :cfunc:`PySys_SetArgv`, for example using::
++
++         PyRun_SimpleString("import sys; sys.path.pop(0)\n");
++
++   .. versionadded:: 3.1.3
+ 
+    .. XXX impl. doesn't seem consistent in allowing 0/NULL for the params;
+       check w/ Guido.
+ 
+ 
++.. cfunction:: void PySys_SetArgv(int argc, wchar_t **argv)
++
++   This function works like :cfunc:`PySys_SetArgv` with *updatepath* set to 1.
++
++
+ .. cfunction:: void Py_SetPythonHome(wchar_t *home)
+ 
+    Set the default "home" directory, that is, the location of the standard
+diff -up Python-3.1.2/Include/sysmodule.h.CVE-2008-5983 Python-3.1.2/Include/sysmodule.h
+--- Python-3.1.2/Include/sysmodule.h.CVE-2008-5983	2008-04-13 09:53:33.000000000 -0400
++++ Python-3.1.2/Include/sysmodule.h	2010-06-04 15:19:26.721088968 -0400
+@@ -10,6 +10,7 @@ extern "C" {
+ PyAPI_FUNC(PyObject *) PySys_GetObject(const char *);
+ PyAPI_FUNC(int) PySys_SetObject(const char *, PyObject *);
+ PyAPI_FUNC(void) PySys_SetArgv(int, wchar_t **);
++PyAPI_FUNC(void) PySys_SetArgvEx(int, wchar_t **, int);
+ PyAPI_FUNC(void) PySys_SetPath(const wchar_t *);
+ 
+ PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...)
+diff -up Python-3.1.2/Misc/NEWS.CVE-2008-5983 Python-3.1.2/Misc/NEWS
+diff -up Python-3.1.2/Python/sysmodule.c.CVE-2008-5983 Python-3.1.2/Python/sysmodule.c
+--- Python-3.1.2/Python/sysmodule.c.CVE-2008-5983	2010-06-04 15:19:26.000000000 -0400
++++ Python-3.1.2/Python/sysmodule.c	2010-06-04 15:20:59.932964188 -0400
+@@ -1561,7 +1561,7 @@ _wrealpath(const wchar_t *path, wchar_t 
+ #endif
+ 
+ void
+-PySys_SetArgv(int argc, wchar_t **argv)
++PySys_SetArgvEx(int argc, wchar_t **argv, int updatepath)
+ {
+ #if defined(HAVE_REALPATH)
+ 	wchar_t fullpath[MAXPATHLEN];
+@@ -1574,7 +1574,7 @@ PySys_SetArgv(int argc, wchar_t **argv)
+ 		Py_FatalError("no mem for sys.argv");
+ 	if (PySys_SetObject("argv", av) != 0)
+ 		Py_FatalError("can't assign sys.argv");
+-	if (path != NULL) {
++	if (updatepath && path != NULL) {
+ 		wchar_t *argv0 = argv[0];
+ 		wchar_t *p = NULL;
+ 		Py_ssize_t n = 0;
+@@ -1661,6 +1661,12 @@ PySys_SetArgv(int argc, wchar_t **argv)
+ 	Py_DECREF(av);
+ }
+ 
++void
++PySys_SetArgv(int argc, wchar_t **argv)
++{
++	PySys_SetArgvEx(argc, argv, 1);
++}
++
+ 
+ /* APIs to write to sys.stdout or sys.stderr using a printf-like interface.
+    Adapted from code submitted by Just van Rossum.

python-3.1.2-CVE-2010-1634.patch

@@ -0,0 +1,209 @@
+--- python/branches/py3k/Modules/audioop.c	2010/05/09 15:52:27	81032
++++ python/branches/py3k/Modules/audioop.c	2010/05/11 13:09:58	81081
+@@ -834,7 +834,7 @@
+ audioop_tostereo(PyObject *self, PyObject *args)
+ {
+     signed char *cp, *ncp;
+-    int len, new_len, size, val1, val2, val = 0;
++    int len, size, val1, val2, val = 0;
+     double fac1, fac2, fval, maxval;
+     PyObject *rv;
+     int i;
+@@ -851,14 +851,13 @@
+         return 0;
+     }
+ 
+-    new_len = len*2;
+-    if (new_len < 0) {
++    if (len > INT_MAX/2) {
+         PyErr_SetString(PyExc_MemoryError,
+                         "not enough memory for output buffer");
+         return 0;
+     }
+ 
+-    rv = PyBytes_FromStringAndSize(NULL, new_len);
++    rv = PyBytes_FromStringAndSize(NULL, len*2);
+     if ( rv == 0 )
+         return 0;
+     ncp = (signed char *)PyBytes_AsString(rv);
+@@ -1021,7 +1020,7 @@
+ {
+     signed char *cp;
+     unsigned char *ncp;
+-    int len, new_len, size, size2, val = 0;
++    int len, size, size2, val = 0;
+     PyObject *rv;
+     int i, j;
+ 
+@@ -1035,13 +1034,12 @@
+         return 0;
+     }
+ 
+-    new_len = (len/size)*size2;
+-    if (new_len < 0) {
++    if (len/size > INT_MAX/size2) {
+         PyErr_SetString(PyExc_MemoryError,
+                         "not enough memory for output buffer");
+         return 0;
+     }
+-    rv = PyBytes_FromStringAndSize(NULL, new_len);
++    rv = PyBytes_FromStringAndSize(NULL, (len/size)*size2);
+     if ( rv == 0 )
+         return 0;
+     ncp = (unsigned char *)PyBytes_AsString(rv);
+@@ -1077,7 +1075,6 @@
+     int chan, d, *prev_i, *cur_i, cur_o;
+     PyObject *state, *samps, *str, *rv = NULL;
+     int bytes_per_frame;
+-    size_t alloc_size;
+ 
+     weightA = 1;
+     weightB = 0;
+@@ -1120,14 +1117,13 @@
+     inrate /= d;
+     outrate /= d;
+ 
+-    alloc_size = sizeof(int) * (unsigned)nchannels;
+-    if (alloc_size < (unsigned)nchannels) {
++    if ((size_t)nchannels > PY_SIZE_MAX/sizeof(int)) {
+         PyErr_SetString(PyExc_MemoryError,
+                         "not enough memory for output buffer");
+         return 0;
+     }
+-    prev_i = (int *) malloc(alloc_size);
+-    cur_i = (int *) malloc(alloc_size);
++    prev_i = (int *) malloc(nchannels * sizeof(int));
++    cur_i = (int *) malloc(nchannels * sizeof(int));
+     if (prev_i == NULL || cur_i == NULL) {
+         (void) PyErr_NoMemory();
+         goto exit;
+@@ -1164,25 +1160,16 @@
+            ceiling(len*outrate/inrate) output frames, and each frame
+            requires bytes_per_frame bytes.  Computing this
+            without spurious overflow is the challenge; we can
+-           settle for a reasonable upper bound, though. */
+-        int ceiling;   /* the number of output frames */
+-        int nbytes;    /* the number of output bytes needed */
+-        int q = len / inrate;
+-        /* Now len = q * inrate + r exactly (with r = len % inrate),
+-           and this is less than q * inrate + inrate = (q+1)*inrate.
+-           So a reasonable upper bound on len*outrate/inrate is
+-           ((q+1)*inrate)*outrate/inrate =
+-           (q+1)*outrate.
+-        */
+-        ceiling = (q+1) * outrate;
+-        nbytes = ceiling * bytes_per_frame;
+-        /* See whether anything overflowed; if not, get the space. */
+-        if (q+1 < 0 ||
+-            ceiling / outrate != q+1 ||
+-            nbytes / bytes_per_frame != ceiling)
++           settle for a reasonable upper bound, though, in this
++           case ceiling(len/inrate) * outrate. */
++
++        /* compute ceiling(len/inrate) without overflow */
++        int q = len > 0 ? 1 + (len - 1) / inrate : 0;
++        if (outrate > INT_MAX / q / bytes_per_frame)
+             str = NULL;
+         else
+-            str = PyBytes_FromStringAndSize(NULL, nbytes);
++            str = PyBytes_FromStringAndSize(NULL,
++                                            q * outrate * bytes_per_frame);
+ 
+         if (str == NULL) {
+             PyErr_SetString(PyExc_MemoryError,
+@@ -1300,7 +1287,7 @@
+     unsigned char *cp;
+     unsigned char cval;
+     signed char *ncp;
+-    int len, new_len, size, val;
++    int len, size, val;
+     PyObject *rv;
+     int i;
+ 
+@@ -1313,18 +1300,17 @@
+         return 0;
+     }
+ 
+-    new_len = len*size;
+-    if (new_len < 0) {
++    if (len > INT_MAX/size) {
+         PyErr_SetString(PyExc_MemoryError,
+                         "not enough memory for output buffer");
+         return 0;
+     }
+-    rv = PyBytes_FromStringAndSize(NULL, new_len);
++    rv = PyBytes_FromStringAndSize(NULL, len*size);
+     if ( rv == 0 )
+         return 0;
+     ncp = (signed char *)PyBytes_AsString(rv);
+ 
+-    for ( i=0; i < new_len; i += size ) {
++    for ( i=0; i < len*size; i += size ) {
+         cval = *cp++;
+         val = st_ulaw2linear16(cval);
+ 
+@@ -1374,7 +1360,7 @@
+     unsigned char *cp;
+     unsigned char cval;
+     signed char *ncp;
+-    int len, new_len, size, val;
++    int len, size, val;
+     PyObject *rv;
+     int i;
+ 
+@@ -1387,18 +1373,17 @@
+         return 0;
+     }
+ 
+-    new_len = len*size;
+-    if (new_len < 0) {
++    if (len > INT_MAX/size) {
+         PyErr_SetString(PyExc_MemoryError,
+                         "not enough memory for output buffer");
+         return 0;
+     }
+-    rv = PyBytes_FromStringAndSize(NULL, new_len);
++    rv = PyBytes_FromStringAndSize(NULL, len*size);
+     if ( rv == 0 )
+         return 0;
+     ncp = (signed char *)PyBytes_AsString(rv);
+ 
+-    for ( i=0; i < new_len; i += size ) {
++    for ( i=0; i < len*size; i += size ) {
+         cval = *cp++;
+         val = st_alaw2linear16(cval);
+ 
+@@ -1523,7 +1508,7 @@
+ {
+     signed char *cp;
+     signed char *ncp;
+-    int len, new_len, size, valpred, step, delta, index, sign, vpdiff;
++    int len, size, valpred, step, delta, index, sign, vpdiff;
+     PyObject *rv, *str, *state;
+     int i, inputbuffer = 0, bufferstep;
+ 
+@@ -1545,13 +1530,12 @@
+     } else if ( !PyArg_ParseTuple(state, "ii", &valpred, &index) )
+         return 0;
+ 
+-    new_len = len*size*2;
+-    if (new_len < 0) {
++    if (len > (INT_MAX/2)/size) {
+         PyErr_SetString(PyExc_MemoryError,
+                         "not enough memory for output buffer");
+         return 0;
+     }
+-    str = PyBytes_FromStringAndSize(NULL, new_len);
++    str = PyBytes_FromStringAndSize(NULL, len*size*2);
+     if ( str == 0 )
+         return 0;
+     ncp = (signed char *)PyBytes_AsString(str);
+@@ -1559,7 +1543,7 @@
+     step = stepsizeTable[index];
+     bufferstep = 0;
+ 
+-    for ( i=0; i < new_len; i += size ) {
++    for ( i=0; i < len*size*2; i += size ) {
+         /* Step 1 - get the delta value and compute next index */
+         if ( bufferstep ) {
+             delta = inputbuffer & 0xf;

python-3.1.2-CVE-2010-2089.patch

@@ -0,0 +1,313 @@
+diff -up Python-3.1.2/Modules/audioop.c.CVE-2010-2089 Python-3.1.2/Modules/audioop.c
+--- Python-3.1.2/Modules/audioop.c.CVE-2010-2089	2010-06-04 14:55:04.281964205 -0400
++++ Python-3.1.2/Modules/audioop.c	2010-06-04 15:04:32.896088959 -0400
+@@ -295,6 +295,29 @@ static int stepsizeTable[89] = {
+ 
+ static PyObject *AudioopError;
+ 
++static int
++audioop_check_size(int size)
++{
++        if ( size != 1 && size != 2 && size != 4 ) {
++                PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
++                return 0;
++        } else {
++                return 1;
++        }
++}
++
++static int
++audioop_check_parameters(int len, int size)
++{
++        if (!audioop_check_size(size))
++                return 0;
++        if ( len % size != 0 ) {
++                PyErr_SetString(AudioopError, "not a whole number of frames");
++                return 0;
++        }
++        return 1;
++}
++
+ static PyObject *
+ audioop_getsample(PyObject *self, PyObject *args)
+ {
+@@ -304,10 +327,8 @@ audioop_getsample(PyObject *self, PyObje
+ 
+     if ( !PyArg_ParseTuple(args, "s#ii:getsample", &cp, &len, &size, &i) )
+         return 0;
+-    if ( size != 1 && size != 2 && size != 4 ) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_parameters(len, size))
++        return NULL;
+     if ( i < 0 || i >= len/size ) {
+         PyErr_SetString(AudioopError, "Index out of range");
+         return 0;
+@@ -328,10 +349,8 @@ audioop_max(PyObject *self, PyObject *ar
+ 
+     if ( !PyArg_ParseTuple(args, "s#i:max", &cp, &len, &size) )
+         return 0;
+-    if ( size != 1 && size != 2 && size != 4 ) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_parameters(len, size))
++        return NULL;
+     for ( i=0; i<len; i+= size) {
+         if ( size == 1 )      val = (int)*CHARP(cp, i);
+         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
+@@ -352,10 +371,8 @@ audioop_minmax(PyObject *self, PyObject 
+ 
+     if (!PyArg_ParseTuple(args, "s#i:minmax", &cp, &len, &size))
+         return NULL;
+-    if (size != 1 && size != 2 && size != 4) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
++    if (!audioop_check_parameters(len, size))
+         return NULL;
+-    }
+     for (i = 0; i < len; i += size) {
+         if (size == 1) val = (int) *CHARP(cp, i);
+         else if (size == 2) val = (int) *SHORTP(cp, i);
+@@ -376,10 +393,8 @@ audioop_avg(PyObject *self, PyObject *ar
+ 
+     if ( !PyArg_ParseTuple(args, "s#i:avg", &cp, &len, &size) )
+         return 0;
+-    if ( size != 1 && size != 2 && size != 4 ) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_parameters(len, size))
++        return NULL;
+     for ( i=0; i<len; i+= size) {
+         if ( size == 1 )      val = (int)*CHARP(cp, i);
+         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
+@@ -403,10 +418,8 @@ audioop_rms(PyObject *self, PyObject *ar
+ 
+     if ( !PyArg_ParseTuple(args, "s#i:rms", &cp, &len, &size) )
+         return 0;
+-    if ( size != 1 && size != 2 && size != 4 ) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_parameters(len, size))
++        return NULL;
+     for ( i=0; i<len; i+= size) {
+         if ( size == 1 )      val = (int)*CHARP(cp, i);
+         else if ( size == 2 ) val = (int)*SHORTP(cp, i);
+@@ -614,10 +627,8 @@ audioop_avgpp(PyObject *self, PyObject *
+ 
+     if ( !PyArg_ParseTuple(args, "s#i:avgpp", &cp, &len, &size) )
+         return 0;
+-    if ( size != 1 && size != 2 && size != 4 ) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_parameters(len, size))
++        return NULL;
+     /* Compute first delta value ahead. Also automatically makes us
+     ** skip the first extreme value
+     */
+@@ -671,10 +682,8 @@ audioop_maxpp(PyObject *self, PyObject *
+ 
+     if ( !PyArg_ParseTuple(args, "s#i:maxpp", &cp, &len, &size) )
+         return 0;
+-    if ( size != 1 && size != 2 && size != 4 ) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_parameters(len, size))
++        return NULL;
+     /* Compute first delta value ahead. Also automatically makes us
+     ** skip the first extreme value
+     */
+@@ -722,10 +731,8 @@ audioop_cross(PyObject *self, PyObject *
+ 
+     if ( !PyArg_ParseTuple(args, "s#i:cross", &cp, &len, &size) )
+         return 0;
+-    if ( size != 1 && size != 2 && size != 4 ) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_parameters(len, size))
++        return NULL;
+     ncross = -1;
+     prevval = 17; /* Anything <> 0,1 */
+     for ( i=0; i<len; i+= size) {
+@@ -751,6 +758,9 @@ audioop_mul(PyObject *self, PyObject *ar
+     if ( !PyArg_ParseTuple(args, "s#id:mul", &cp, &len, &size, &factor ) )
+         return 0;
+ 
++    if (!audioop_check_parameters(len, size))
++        return NULL;
++
+     if ( size == 1 ) maxval = (double) 0x7f;
+     else if ( size == 2 ) maxval = (double) 0x7fff;
+     else if ( size == 4 ) maxval = (double) 0x7fffffff;
+@@ -793,6 +803,14 @@ audioop_tomono(PyObject *self, PyObject 
+     if ( !PyArg_ParseTuple(args, "s*idd:tomono",
+                            &pcp, &size, &fac1, &fac2 ) )
+         return 0;
++
++    if (!audioop_check_parameters(len, size))
++        return NULL;
++    if ( ((len / size) & 1) != 0 ) {
++        PyErr_SetString(AudioopError, "not a whole number of frames");
++        return NULL;
++    }
++
+     cp = pcp.buf;
+     len = pcp.len;
+ 
+@@ -843,6 +861,9 @@ audioop_tostereo(PyObject *self, PyObjec
+                            &cp, &len, &size, &fac1, &fac2 ) )
+         return 0;
+ 
++    if (!audioop_check_parameters(len, size))
++        return NULL;
++
+     if ( size == 1 ) maxval = (double) 0x7f;
+     else if ( size == 2 ) maxval = (double) 0x7fff;
+     else if ( size == 4 ) maxval = (double) 0x7fffffff;
+@@ -901,6 +922,9 @@ audioop_add(PyObject *self, PyObject *ar
+                       &cp1, &len1, &cp2, &len2, &size ) )
+         return 0;
+ 
++    if (!audioop_check_parameters(len1, size))
++        return NULL;
++
+     if ( len1 != len2 ) {
+         PyErr_SetString(AudioopError, "Lengths should be the same");
+         return 0;
+@@ -955,10 +979,8 @@ audioop_bias(PyObject *self, PyObject *a
+                       &cp, &len, &size , &bias) )
+         return 0;
+ 
+-    if ( size != 1 && size != 2 && size != 4) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_parameters(len, size))
++        return NULL;
+ 
+     rv = PyBytes_FromStringAndSize(NULL, len);
+     if ( rv == 0 )
+@@ -991,10 +1013,8 @@ audioop_reverse(PyObject *self, PyObject
+                       &cp, &len, &size) )
+         return 0;
+ 
+-    if ( size != 1 && size != 2 && size != 4 ) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_parameters(len, size))
++        return NULL;
+ 
+     rv = PyBytes_FromStringAndSize(NULL, len);
+     if ( rv == 0 )
+@@ -1028,11 +1048,10 @@ audioop_lin2lin(PyObject *self, PyObject
+                       &cp, &len, &size, &size2) )
+         return 0;
+ 
+-    if ( (size != 1 && size != 2 && size != 4) ||
+-         (size2 != 1 && size2 != 2 && size2 != 4)) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_parameters(len, size))
++        return NULL;
++    if (!audioop_check_size(size2))
++        return NULL;
+ 
+     if (len/size > INT_MAX/size2) {
+         PyErr_SetString(PyExc_MemoryError,
+@@ -1082,10 +1101,8 @@ audioop_ratecv(PyObject *self, PyObject 
+                           &nchannels, &inrate, &outrate, &state,
+                           &weightA, &weightB))
+         return NULL;
+-    if (size != 1 && size != 2 && size != 4) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
++    if (!audioop_check_size(size))
+         return NULL;
+-    }
+     if (nchannels < 1) {
+         PyErr_SetString(AudioopError, "# of channels should be >= 1");
+         return NULL;
+@@ -1261,10 +1278,8 @@ audioop_lin2ulaw(PyObject *self, PyObjec
+                            &cp, &len, &size) )
+         return 0 ;
+ 
+-    if ( size != 1 && size != 2 && size != 4) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_parameters(len, size))
++        return NULL;
+ 
+     rv = PyBytes_FromStringAndSize(NULL, len/size);
+     if ( rv == 0 )
+@@ -1295,10 +1310,8 @@ audioop_ulaw2lin(PyObject *self, PyObjec
+                            &cp, &len, &size) )
+         return 0;
+ 
+-    if ( size != 1 && size != 2 && size != 4) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_size(size))
++        return NULL;
+ 
+     if (len > INT_MAX/size) {
+         PyErr_SetString(PyExc_MemoryError,
+@@ -1334,10 +1347,8 @@ audioop_lin2alaw(PyObject *self, PyObjec
+                            &cp, &len, &size) )
+         return 0;
+ 
+-    if ( size != 1 && size != 2 && size != 4) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_parameters(len, size))
++        return NULL;
+ 
+     rv = PyBytes_FromStringAndSize(NULL, len/size);
+     if ( rv == 0 )
+@@ -1368,10 +1379,8 @@ audioop_alaw2lin(PyObject *self, PyObjec
+                            &cp, &len, &size) )
+         return 0;
+ 
+-    if ( size != 1 && size != 2 && size != 4) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_size(size))
++        return NULL;
+ 
+     if (len > INT_MAX/size) {
+         PyErr_SetString(PyExc_MemoryError,
+@@ -1409,10 +1418,8 @@ audioop_lin2adpcm(PyObject *self, PyObje
+         return 0;
+ 
+ 
+-    if ( size != 1 && size != 2 && size != 4) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_parameters(len, size))
++        return NULL;
+ 
+     str = PyBytes_FromStringAndSize(NULL, len/(size*2));
+     if ( str == 0 )
+@@ -1516,10 +1523,8 @@ audioop_adpcm2lin(PyObject *self, PyObje
+                            &cp, &len, &size, &state) )
+         return 0;
+ 
+-    if ( size != 1 && size != 2 && size != 4) {
+-        PyErr_SetString(AudioopError, "Size should be 1, 2 or 4");
+-        return 0;
+-    }
++    if (!audioop_check_size(size))
++        return NULL;
+ 
+     /* Decode state, should have (value, step) */
+     if ( state == Py_None ) {

python-3.1.2-fix-expat-issue9054.patch

@@ -0,0 +1,14 @@
+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;

python3-r80382-r80385-lone-surrogate-and-utf8-error-handler.patch

@@ -0,0 +1,184 @@
+Index: Python-3.1.2/Objects/unicodeobject.c
+===================================================================
+--- Python-3.1.2.orig/Objects/unicodeobject.c
++++ Python-3.1.2/Objects/unicodeobject.c
+@@ -159,6 +159,12 @@ static PyObject *unicode_encode_call_err
+        const Py_UNICODE *unicode, Py_ssize_t size, PyObject **exceptionObject,
+        Py_ssize_t startpos, Py_ssize_t endpos, Py_ssize_t *newpos);
+ 
++static void raise_encode_exception(PyObject **exceptionObject,
++                                   const char *encoding,
++                                   const Py_UNICODE *unicode, Py_ssize_t size,
++                                   Py_ssize_t startpos, Py_ssize_t endpos,
++                                   const char *reason);
++
+ /* Same for linebreaks */
+ static unsigned char ascii_linebreak[] = {
+     0, 0, 0, 0, 0, 0, 0, 0,
+@@ -2453,67 +2459,98 @@ PyUnicode_EncodeUTF8(const Py_UNICODE *s
+     for (i = 0; i < size;) {
+         Py_UCS4 ch = s[i++];
+ 
+-        if (ch < 0x80)
++        if (ch < 0x80) {
+             /* Encode ASCII */
+             *p++ = (char) ch;
+ 
+-        else if (ch < 0x0800) {
++        } else if (ch < 0x0800) {
+             /* Encode Latin-1 */
+             *p++ = (char)(0xc0 | (ch >> 6));
+             *p++ = (char)(0x80 | (ch & 0x3f));
+-        }
+-        else {
+-            /* Encode UCS2 Unicode ordinals */
+-            if (ch < 0x10000) {
++        } else if (0xD800 <= ch && ch <= 0xDFFF) {
+ #ifndef Py_UNICODE_WIDE
+-                /* Special case: check for high surrogate */
+-                if (0xD800 <= ch && ch <= 0xDBFF && i != size) {
+-                    Py_UCS4 ch2 = s[i];
+-                    /* Check for low surrogate and combine the two to
+-                       form a UCS4 value */
+-                    if (0xDC00 <= ch2 && ch2 <= 0xDFFF) {
+-                        ch = ((ch - 0xD800) << 10 | (ch2 - 0xDC00)) + 0x10000;
+-                        i++;
+-                        goto encodeUCS4;
+-                    }
+-                    /* Fall through: handles isolated high surrogates */
+-                }
++            /* Special case: check for high and low surrogate */
++            if (ch <= 0xDBFF && i != size && 0xDC00 <= s[i] && s[i] <= 0xDFFF) {
++                Py_UCS4 ch2 = s[i];
++                /* Combine the two surrogates to form a UCS4 value */
++                ch = ((ch - 0xD800) << 10 | (ch2 - 0xDC00)) + 0x10000;
++                i++;
++
++                /* Encode UCS4 Unicode ordinals */
++                *p++ = (char)(0xf0 | (ch >> 18));
++                *p++ = (char)(0x80 | ((ch >> 12) & 0x3f));
++                *p++ = (char)(0x80 | ((ch >> 6) & 0x3f));
++                *p++ = (char)(0x80 | (ch & 0x3f));
++
++            } else {
+ #endif
+-                if (ch >= 0xd800 && ch <= 0xdfff) {
+-                    Py_ssize_t newpos;
+-                    PyObject *rep;
+-                    char *prep;
+-                    int k;
+-                    rep = unicode_encode_call_errorhandler
+-                        (errors, &errorHandler, "utf-8", "surrogates not allowed", 
+-                         s, size, &exc, i-1, i, &newpos);
+-                    if (!rep)
+-                        goto error;
+-                    /* Implementation limitations: only support error handler that return
+-                       bytes, and only support up to four replacement bytes. */
+-                    if (!PyBytes_Check(rep)) {
+-                        PyErr_SetString(PyExc_TypeError, "error handler should have returned bytes");
+-                        Py_DECREF(rep);
++                Py_ssize_t newpos;
++                PyObject *rep;
++                Py_ssize_t repsize, k;
++                rep = unicode_encode_call_errorhandler
++                    (errors, &errorHandler, "utf-8", "surrogates not allowed",
++                     s, size, &exc, i-1, i, &newpos);
++                if (!rep)
++                    goto error;
++
++                if (PyBytes_Check(rep))
++                    repsize = PyBytes_GET_SIZE(rep);
++                else
++                    repsize = PyUnicode_GET_SIZE(rep);
++
++                if (repsize > 4) {
++                    Py_ssize_t offset;
++
++                    if (result == NULL)
++                        offset = p - stackbuf;
++                    else
++                        offset = p - PyBytes_AS_STRING(result);
++
++                    if (nallocated > PY_SSIZE_T_MAX - repsize + 4) {
++                        /* integer overflow */
++                        PyErr_NoMemory();
+                         goto error;
+                     }
+-                    if (PyBytes_Size(rep) > 4) {
+-                        PyErr_SetString(PyExc_TypeError, "error handler returned too many bytes");
+-                        Py_DECREF(rep);
+-                        goto error;
++                    nallocated += repsize - 4;
++                    if (result != NULL) {
++                        if (_PyBytes_Resize(&result, nallocated) < 0)
++                            goto error;
++                    } else {
++                        result = PyBytes_FromStringAndSize(NULL, nallocated);
++                        if (result == NULL)
++                            goto error;
++                        Py_MEMCPY(PyBytes_AS_STRING(result), stackbuf, offset);
+                     }
+-                    prep = PyBytes_AsString(rep);
+-                    for(k = PyBytes_Size(rep); k > 0; k--)
++                    p = PyBytes_AS_STRING(result) + offset;
++                }
++
++                if (PyBytes_Check(rep)) {
++                    char *prep = PyBytes_AS_STRING(rep);
++                    for(k = repsize; k > 0; k--)
+                         *p++ = *prep++;
+-                    Py_DECREF(rep);
+-                    continue;
+-                    
++                } else /* rep is unicode */ {
++                    Py_UNICODE *prep = PyUnicode_AS_UNICODE(rep);
++                    Py_UNICODE c;
++
++                    for(k=0; k<repsize; k++) {
++                        c = prep[k];
++                        if (0x80 <= c) {
++                            raise_encode_exception(&exc, "utf-8", s, size,
++                                                   i-1, i, "surrogates not allowed");
++                            goto error;
++                        }
++                        *p++ = (char)prep[k];
++                    }
+                 }
+-                *p++ = (char)(0xe0 | (ch >> 12));
+-                *p++ = (char)(0x80 | ((ch >> 6) & 0x3f));
+-                *p++ = (char)(0x80 | (ch & 0x3f));
+-                continue;
++                Py_DECREF(rep);
++#ifndef Py_UNICODE_WIDE
+             }
+-          encodeUCS4:
++#endif
++        } else if (ch < 0x10000) {
++            *p++ = (char)(0xe0 | (ch >> 12));
++            *p++ = (char)(0x80 | ((ch >> 6) & 0x3f));
++            *p++ = (char)(0x80 | (ch & 0x3f));
++        } else /* ch >= 0x10000 */ {
+             /* Encode UCS4 Unicode ordinals */
+             *p++ = (char)(0xf0 | (ch >> 18));
+             *p++ = (char)(0x80 | ((ch >> 12) & 0x3f));
+Index: Python-3.1.2/Lib/test/test_codecs.py
+===================================================================
+--- Python-3.1.2.orig/Lib/test/test_codecs.py
++++ Python-3.1.2/Lib/test/test_codecs.py
+@@ -571,6 +571,16 @@ class UTF8Test(ReadTest):
+     def test_lone_surrogates(self):
+         self.assertRaises(UnicodeEncodeError, "\ud800".encode, "utf-8")
+         self.assertRaises(UnicodeDecodeError, b"\xed\xa0\x80".decode, "utf-8")
++        self.assertEqual("[\uDC80]".encode("utf-8", "backslashreplace"),
++                         b'[\\udc80]')
++        self.assertEqual("[\uDC80]".encode("utf-8", "xmlcharrefreplace"),
++                         b'[&#56448;]')
++        self.assertEqual("[\uDC80]".encode("utf-8", "surrogateescape"),
++                         b'[\x80]')
++        self.assertEqual("[\uDC80]".encode("utf-8", "ignore"),
++                         b'[]')
++        self.assertEqual("[\uDC80]".encode("utf-8", "replace"),
++                         b'[?]')
+ 
+     def test_surrogatepass_handler(self):
+         self.assertEquals("abc\ud800def".encode("utf-8", "surrogatepass"),

python3.rpmlintrc

@@ -1,84 +0,0 @@
-# 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,2 +1 @@
-SHA512 (Python-3.8.2.tar.xz) = ca37ad0e7c5845f5f228566aa8ff654a8f428c7d4a5aaabff29baebb0ca3219b31ba8bb2607f89e37cf3fc564f023b8407e53a4f2c47bd99122c1cc222613e37
+45350b51b58a46b029fb06c61257e350  Python-3.1.2.tar.bz2
-SHA512 (Python-3.8.2.tar.xz.asc) = 765796ab5539576bbf1578e05cdb041dbc9a9ca0d6d2040a473a00a293b49f90be11ea6e33b47889da33b25f8e360fad4adeec292f0d43e5fae233d1f03bafd2

systemtap-example.stp

@@ -0,0 +1,19 @@
+/*
+    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);
+}

tests/.fmf/version

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

tests/provision.fmf

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

tests/tests.yml

@@ -1,34 +0,0 @@
----
-- 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