From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] python3: Update to version 3.6.0
Date: Mon, 16 Jan 2017 16:46:05 +0000
Message-ID: <1484585165.30934.27.camel@ipfire.org>
In-Reply-To: <20170113123500.2602-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2061270577288497218=="
List-Id: <development.lists.ipfire.org>

--===============2061270577288497218==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hello,

this will be a difficult one to merge since various modules depend on this and
need to be rebuilt. At the moment nothing required for the buildsystem is
depending on Python 3 AFAIK which makes it rather easy to build this version.

However, when Pakfire is ported to Python 3, this will be a huge problem.

Any thoughts how we could come up with a good transition method?

-Michael

On Fri, 2017-01-13 at 13:35 +0100, Stefan Schantl wrote:
> This is a major update to the latest stable version of the
> Python 3 series.
>=20
> Fixes #11086.
>=20
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> =C2=A0...-3.4.3-lib64.patch =3D> python-3.6.0-lib64.patch} | 118 ++++++++++=
--------
> ---
> =C2=A0python3/python3.nm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=
=A0=C2=A040 +++----
> =C2=A02 files changed, 77 insertions(+), 81 deletions(-)
> =C2=A0rename python3/{python-3.4.3-lib64.patch =3D> python-3.6.0-lib64.patc=
h} (67%)
>=20
> diff --git a/python3/python-3.4.3-lib64.patch b/python3/python-3.6.0-
> lib64.patch
> similarity index 67%
> rename from python3/python-3.4.3-lib64.patch
> rename to python3/python-3.6.0-lib64.patch
> index db5fd95..8e9ae4e 100644
> --- a/python3/python-3.4.3-lib64.patch
> +++ b/python3/python-3.6.0-lib64.patch
> @@ -1,6 +1,8 @@
> ---- Python-3.4.0b1/Lib/distutils/command/install.py.lib64=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A02013-11-24
> 21:36:54.000000000 +0100
> -+++ Python-3.4.0b1/Lib/distutils/command/install.py=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A02013-11-27
> 11:10:43.821150774 +0100
> -@@ -45,14 +45,14 @@ else:
> +diff --git a/Lib/distutils/command/install.py
> b/Lib/distutils/command/install.py
> +index 9474e9c..c0ce4c6 100644
> +--- a/Lib/distutils/command/install.py
> ++++ b/Lib/distutils/command/install.py
> +@@ -30,14 +30,14 @@ WINDOWS_SCHEME =3D {
> =C2=A0 INSTALL_SCHEMES =3D {
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'unix_prefix': {
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'purelib': '$ba=
se/lib/python$py_version_short/site-packages',
> @@ -17,9 +19,11 @@
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'headers': '$ba=
se/include/python/$dist_name',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'scripts': '$ba=
se/bin',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'data'=C2=A0=C2=
=A0=C2=A0: '$base',
> ---- Python-3.4.0b1/Lib/distutils/sysconfig.py.lib64	2013-11-24
> 21:36:54.000000000 +0100
> -+++ Python-3.4.0b1/Lib/distutils/sysconfig.py	2013-11-27
> 11:10:43.821150774 +0100
> -@@ -141,8 +141,12 @@
> +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
> +index 026cca7..6d3e077 100644
> +--- a/Lib/distutils/sysconfig.py
> ++++ b/Lib/distutils/sysconfig.py
> +@@ -132,8 +132,12 @@ def get_python_lib(plat_specific=3D0, standard_lib=3D=
0,
> prefix=3DNone):
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0prefix =3D plat_specific and EXEC_PREFIX or PREFIX
> =C2=A0=C2=A0
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if os.name =3D=3D "posix":
> @@ -33,9 +37,11 @@
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if standard_lib:
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0return libpython
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0else:
> ---- Python-3.4.0b1/Lib/site.py.lib64	2013-11-24 21:36:54.000000000
> +0100
> -+++ Python-3.4.0b1/Lib/site.py	2013-11-27 11:10:43.822150773 +0100
> -@@ -304,12 +304,16 @@
> +diff --git a/Lib/site.py b/Lib/site.py
> +index a84e3bb..ba0d3ea 100644
> +--- a/Lib/site.py
> ++++ b/Lib/site.py
> +@@ -303,11 +303,15 @@ def getsitepackages(prefixes=3DNone):
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0seen.add(prefix)
> =C2=A0=C2=A0
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if os.sep =3D=
=3D '/':
> @@ -43,18 +49,19 @@
> =C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0"python" + sys.version[:3],
> =C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0"site-packages"))
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0sitepackages.append(os.path.join(prefix, "lib",
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0"python" + sys.version[:3],
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0"python%d.%d" %
> sys.version_info[:2],
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0"site-packages"))
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0sitepackages.append(os.path.join(prefix, "lib", "site-python"))
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0else:
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0sitepackages.append(prefix)
> =C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0sitepackages.append(os.path.join(prefix, "lib64", "site-
> packages"))
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0sitepackages.append(os.path.join(prefix, "lib", "site-
> packages"))
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if sys.platform=
 =3D=3D "darwin":
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0# for framework builds *only* we add the standard Apple
> ---- Python-3.4.0b1/Lib/sysconfig.py.lib64	2013-11-24
> 21:36:54.000000000 +0100
> -+++ Python-3.4.0b1/Lib/sysconfig.py	2013-11-27 11:10:43.822150773
> +0100
> -@@ -20,10 +20,10 @@
> +diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
> +index b9bbfe5..2a5f29c 100644
> +--- a/Lib/sysconfig.py
> ++++ b/Lib/sysconfig.py
> +@@ -20,10 +20,10 @@ __all__ =3D [
> =C2=A0=C2=A0
> =C2=A0 _INSTALL_SCHEMES =3D {
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'posix_prefix': {
> @@ -68,7 +75,7 @@
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'include':
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0'{installed_base}/include/python{py_version_short}{abiflags}',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'platinclude':
> -@@ -61,10 +61,10 @@
> +@@ -61,10 +61,10 @@ _INSTALL_SCHEMES =3D {
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'data': '{userb=
ase}',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0},
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'posix_user': {
> @@ -82,30 +89,26 @@
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'include': '{us=
erbase}/include/python{py_version_short}',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'scripts': '{us=
erbase}/bin',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'data': '{userb=
ase}',
> ---- Python-3.4.0b1/Lib/test/test_site.py.lib64	2013-11-24
> 21:36:55.000000000 +0100
> -+++ Python-3.4.0b1/Lib/test/test_site.py	2013-11-27 11:10:43.822150773
> +0100
> -@@ -244,12 +244,15 @@
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0self.assertEqual(dirs[2], wanted)
> +diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
> +index f698927..bc977b5 100644
> +--- a/Lib/test/test_site.py
> ++++ b/Lib/test/test_site.py
> +@@ -248,8 +248,8 @@ class HelperFunctionsTests(unittest.TestCase):
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0self.assertEqual(dirs[1], wanted)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0elif os.sep =3D=
=3D '/':
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0# OS X non-framwework builds, Linux, FreeBSD, etc
> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0s=
elf.assertEqual(len(dirs), 2)
> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0w=
anted =3D os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
> -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0s=
elf.assertEqual(len(dirs), 3)
> -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0w=
anted =3D os.path.join('xoxo', 'lib64', 'python' +
> sys.version[:3],
> +-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0s=
elf.assertEqual(len(dirs), 1)
> +-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0w=
anted =3D os.path.join('xoxo', 'lib',
> ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0s=
elf.assertEqual(len(dirs), 2)
> ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0w=
anted =3D os.path.join('xoxo', 'lib64',
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'python%d.%d' =
% sys.version_info[:2],
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'site-packa=
ges')
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0self.assertEqual(dirs[0], wanted)
> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0w=
anted =3D os.path.join('xoxo', 'lib', 'site-python')
> -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0w=
anted =3D os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
> -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'site-packages')
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0self.assertEqual(dirs[1], wanted)
> -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0w=
anted =3D os.path.join('xoxo', 'lib', 'site-python')
> -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0s=
elf.assertEqual(dirs[2], wanted)
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0else:
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0# other platforms
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0self.assertEqual(len(dirs), 2)
> ---- Python-3.4.0b1/Makefile.pre.in.lib64	2013-11-27 11:10:43.814150786
> +0100
> -+++ Python-3.4.0b1/Makefile.pre.in	2013-11-27 11:10:43.823150771 +0100
> -@@ -115,7 +115,7 @@
> +diff --git a/Makefile.pre.in b/Makefile.pre.in
> +index 8fa7934..a693917 100644
> +--- a/Makefile.pre.in
> ++++ b/Makefile.pre.in
> +@@ -126,7 +126,7 @@ LIBDIR=3D		@libdir@
> =C2=A0 MANDIR=3D		@mandir@
> =C2=A0 INCLUDEDIR=3D	@includedir@
> =C2=A0 CONFINCLUDEDIR=3D	$(exec_prefix)/include
> @@ -114,29 +117,20 @@
> =C2=A0 ABIFLAGS=3D	@ABIFLAGS@
> =C2=A0=C2=A0
> =C2=A0 # Detailed destination directories
> ---- Python-3.4.0b1/Modules/getpath.c.lib64	2013-11-24
> 21:36:56.000000000 +0100
> -+++ Python-3.4.0b1/Modules/getpath.c	2013-11-27 11:17:33.619449704
> +0100
> -@@ -122,8 +122,8 @@
> - #endif
> -=C2=A0
> - #ifndef PYTHONPATH
> --#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
> -+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
> -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
> - #endif
> -=C2=A0
> - #ifndef LANDMARK
> -@@ -498,7 +498,7 @@
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_pythonpath =3D _Py_char2wchar(PYTHONPATH, N=
ULL);
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_prefix =3D _Py_char2wchar(PREFIX, NULL);
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_exec_prefix =3D _Py_char2wchar(EXEC_PREFIX,=
 NULL);
> --=C2=A0=C2=A0=C2=A0=C2=A0lib_python =3D _Py_char2wchar("lib/python" VERSIO=
N, NULL);
> -+=C2=A0=C2=A0=C2=A0=C2=A0lib_python =3D _Py_char2wchar("lib64/python" VERS=
ION, NULL);
> +diff --git a/Modules/getpath.c b/Modules/getpath.c
> +index 65b47a3..eaa756c 100644
> +--- a/Modules/getpath.c
> ++++ b/Modules/getpath.c
> +@@ -494,7 +494,7 @@ calculate_path(void)
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_pythonpath =3D Py_DecodeLocale(PYTHONPATH, =
NULL);
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_prefix =3D Py_DecodeLocale(PREFIX, NULL);
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_exec_prefix =3D Py_DecodeLocale(EXEC_PREFIX=
, NULL);
> +-=C2=A0=C2=A0=C2=A0=C2=A0lib_python =3D Py_DecodeLocale("lib/python" VERSI=
ON, NULL);
> ++=C2=A0=C2=A0=C2=A0=C2=A0lib_python =3D Py_DecodeLocale("lib64/python" VER=
SION, NULL);
> =C2=A0=C2=A0
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (!_pythonpath || !_prefix || !_exec_=
prefix || !lib_python) {
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Py_FatalError(
> -@@ -687,7 +687,7 @@
> +@@ -683,7 +683,7 @@ calculate_path(void)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0else
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0wcsncpy(zip_pat=
h, _prefix, MAXPATHLEN);
> @@ -145,7 +139,7 @@
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0bufsz =3D wcslen(zip_path);=C2=A0=C2=A0=
=C2=A0/* Replace "00" with version */
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0zip_path[bufsz - 6] =3D VERSION[0];
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0zip_path[bufsz - 5] =3D VERSION[2];
> -@@ -699,7 +699,7 @@
> +@@ -695,7 +695,7 @@ calculate_path(void)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0fprintf(stderr,
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"Could not find platform dependent libraries
> <exec_prefix>\n");
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0wcsncpy(exec_pr=
efix, _exec_prefix, MAXPATHLEN);
> @@ -154,9 +148,11 @@
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/* If we found EXEC_PREFIX do *not* red=
uce it!=C2=A0=C2=A0(Yet.) */
> =C2=A0=C2=A0
> ---- Python-3.4.0b1/setup.py.lib64	2013-11-24 21:36:56.000000000 +0100
> -+++ Python-3.4.0b1/setup.py	2013-11-27 11:10:43.824150769 +0100
> -@@ -441,7 +441,7 @@
> +diff --git a/setup.py b/setup.py
> +index 0f2dfc4..da37896 100644
> +--- a/setup.py
> ++++ b/setup.py
> +@@ -492,7 +492,7 @@ class PyBuildExt(build_ext):
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# directories (=
i.e. '.' and 'Include') must be first.=C2=A0=C2=A0See issue
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# 10520.
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if not cross_co=
mpiling:
> @@ -165,7 +161,7 @@
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0add_dir_to_list(self.compiler.include_dirs,
> '/usr/local/include')
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# only change t=
his for cross builds for 3.3, issues on Mageia
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if cross_compil=
ing:
> -@@ -718,11 +718,11 @@
> +@@ -780,11 +780,11 @@ class PyBuildExt(build_ext):
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0elif curses_library:
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0readline_libs.append(curses_library)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0elif self.compiler.find_library_file(lib_dirs +
> @@ -179,7 +175,7 @@
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0extra=
_link_args=3Dreadline_extra_link_args,
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0libra=
ries=3Dreadline_libs) )
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0else:
> -@@ -759,8 +759,8 @@
> +@@ -821,8 +821,8 @@ class PyBuildExt(build_ext):
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0if krb5_h:
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0ssl_incs +=3D krb5_h
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0ssl_libs =3D fi=
nd_library_file(self.compiler, 'ssl',lib_dirs,
> diff --git a/python3/python3.nm b/python3/python3.nm
> index 26343d5..cc26941 100644
> --- a/python3/python3.nm
> +++ b/python3/python3.nm
> @@ -4,9 +4,9 @@
> =C2=A0#####################################################################=
########
> ##
> =C2=A0
> =C2=A0name=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D python3
> -major_ver=C2=A0=C2=A0=3D 3.4
> -version=C2=A0=C2=A0=C2=A0=C2=A0=3D %{major_ver}.3
> -release=C2=A0=C2=A0=C2=A0=C2=A0=3D 2
> +major_ver=C2=A0=C2=A0=3D 3.6
> +version=C2=A0=C2=A0=C2=A0=C2=A0=3D %{major_ver}.0
> +release=C2=A0=C2=A0=C2=A0=C2=A0=3D 1
> =C2=A0thisapp=C2=A0=C2=A0=C2=A0=C2=A0=3D Python-%{version}
> =C2=A0
> =C2=A0groups=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D Development/Languages
> @@ -63,7 +63,7 @@ build
> =C2=A0
> =C2=A0	prepare_cmds
> =C2=A0		if [ "%{lib}" =3D "lib64" ]; then
> -			patch -Np1 -i %{DIR_SOURCE}/python-3.4.3-lib64.patch
> +			patch -Np1 -i %{DIR_SOURCE}/python-3.6.0-lib64.patch
> =C2=A0		fi
> =C2=A0
> =C2=A0		# Remove embedded copies of expat and libffi
> @@ -86,24 +86,24 @@ build
> =C2=A0		--enable-shared \
> =C2=A0		--without-ensurepip
> =C2=A0
> -	#test
> -	#	LD_LIBRARY_PATH=3D$(pwd) $(pwd)/python \
> -	#		-m test.regrtest \
> -	#		--verbose \
> -	#		--findleaks \
> -	#		-x test_distutils \
> -	#		-x test_faulthandler \
> -	#		-x test_gdb \
> -	#		-x test_email \
> -	#		-x test_subprocess \
> -	#		-x test_float \
> -	#		-x test_cmath \
> -	#		-x test_asynchat \
> -	#		-x test_asyncore
> -	#
> +	test
> +		LD_LIBRARY_PATH=3D$(pwd) $(pwd)/python \
> +			-m test.regrtest \
> +			--verbose \
> +			--findleaks \
> +			-x test_distutils \
> +			-x test_faulthandler \
> +			-x test_gdb \
> +			-x test_email \
> +			-x test_subprocess \
> +			-x test_float \
> +			-x test_cmath \
> +			-x test_asynchat \
> +			-x test_asyncore
> +=09
> =C2=A0	#	# test_subprocess won't work on grsecurity-enabled kernels
> =C2=A0	#	# test_float and test_cmath do not work on armv5tel (soft
> FPU)
> -	#end
> +	end
> =C2=A0
> =C2=A0	install_cmds
> =C2=A0		install -d -m 0755 %{BUILDROOT}%{pylibdir}/site-
> packages/__pycache__

--===============2061270577288497218==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSllmUGpOQUFvSkVJQjU4UDl2a0FrSE1aOFAvQTZwYzhYTXZGUlJWM0lqVFo3Y1hwNU0K
WkNrRmQrUmlFRFlpK3Vib0xxL3U0Znhjb3ZiMkMwS0l6UGRsTUk2Y1UrWGRKYk4yK3paa1dyUGRr
VjE2UThTawpqWmRpcW56eG1IU0JMM2RkY0gwM3hoMkFpWGVpNTBvVStOcnBPMWIxS2VyZlNjQUEw
My80aUlzNjRQcXYyNlBICi8xVUxFNlE1dEwzTnFGczZEa0ozSTMwMHMxU0pmREhNTVZwR0lQZnV1
ay9UOG1Ea1BhUHQxQ3FMUmdzaUFmNUkKLzF1dU5GWTVpUG5TcmxhSnBST3ZlWXRvRG51SlJ2RDd1
anNodlZ0dGpZYUd5RUZlUnBRM3VCYWFwRUxjQkRXNQp1SG9KbkpQRFhJZjErOEN0QXVwU083Njlr
NmROcGdyckZyZndVUGh2Ti90aHorNmpvNlFKc01SZHRtaHNtUDFvCkZGRk50WDdBNERpUjltWGQz
Nkk2K0ZGbWE5SUxkeXc0ajhoeUI3RmJYZWFjbnFNYkJ0VG1sVm5YdmxIaVBkY2wKY3VJWUcyTm8y
UHRDYzNzb24xR2grMUk0czQ5azR4TXkybGdCb2xvY2hGTHRHSkRIekZESGxaNFlmNnQwNVJqbwph
Ry93Tm9YRHFzbk5aOC9RT0cxQ0JVb2N6S0ZQU0U2eWltM2RhUGZUdGdUNUJwVkR3OVl1dUw4OENW
cEdhMTgzCnN6elZ5bUZWNmhMY2lyYUxQY3lzdDZWNFJ1anJBbE54RmZZRnRNaXZWM3hsd0FhN3Ny
d3NQU0pvdlZubUJoR0gKSHBtRkRzZUsyQjA0SUxVMzlESDYyRmpTNDVUS0l5N1Nkd3FycEFXeXo1
Tkl1MlhhMGhlTjVGWnVCOVBzTEsxZQpDMStKbndrM0wzZ0xnODRRV1lBRgo9SVJOUAotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============2061270577288497218==--