From f19acd10ab1aaba18b85e3781b7ff8012c6f62d3677c344154d48b29fc9718a4 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Mon, 11 May 2015 14:16:17 +0000 Subject: [PATCH 1/4] Accepting request 305779 from home:fstrba:freetype2 For factory, build against the new freetype2-bootstrap package and avoid OBS build cycles OBS-URL: https://build.opensuse.org/request/show/305779 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=175 --- python.changes | 6 ++++++ python.spec | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/python.changes b/python.changes index 8619fd5..f54c1f8 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 7 15:04:03 UTC 2015 - fstrba@suse.com + +- For openSUSE:Factory, build against the new freetype2-bootstrap + package to avoid build cycles in the build service. + ------------------------------------------------------------------- Wed Feb 25 16:31:37 UTC 2015 - jmatejek@suse.com diff --git a/python.spec b/python.spec index 29cbd9d..b261506 100644 --- a/python.spec +++ b/python.spec @@ -85,6 +85,10 @@ Obsoletes: python21 Obsoletes: python-64bit %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1320 +BuildRequires: freetype2-bootstrap +#!BuildIgnore: libfreetype6 +%endif %description Python is an interpreted, object-oriented programming language, and is From 19fa21847cda53863b34067e17101ce00ea47ef0097a4bdbb9162995148c667e Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 21 May 2015 13:52:43 +0000 Subject: [PATCH 2/4] Accepting request 307908 from home:fstrba:freetype2 Revert the freetype2-bootstrap change, since it does not work OBS-URL: https://build.opensuse.org/request/show/307908 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=177 --- python-base.spec | 2 +- python-doc.spec | 3 ++- python.changes | 6 ------ python.spec | 9 +++------ 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/python-base.spec b/python-base.spec index 7583b5b..9c82331 100644 --- a/python-base.spec +++ b/python-base.spec @@ -1,7 +1,7 @@ # # spec file for package python-base # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/python-doc.spec b/python-doc.spec index dc7ea33..b306f8a 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -1,7 +1,7 @@ # # spec file for package python-doc # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-doc Version: 2.7.9 Release: 0 diff --git a/python.changes b/python.changes index f54c1f8..8619fd5 100644 --- a/python.changes +++ b/python.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Thu May 7 15:04:03 UTC 2015 - fstrba@suse.com - -- For openSUSE:Factory, build against the new freetype2-bootstrap - package to avoid build cycles in the build service. - ------------------------------------------------------------------- Wed Feb 25 16:31:37 UTC 2015 - jmatejek@suse.com diff --git a/python.spec b/python.spec index b261506..f5e5efe 100644 --- a/python.spec +++ b/python.spec @@ -1,7 +1,7 @@ # # spec file for package python # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python Version: 2.7.9 Release: 0 @@ -70,8 +71,8 @@ BuildRequires: ncurses-devel BuildRequires: readline-devel BuildRequires: sqlite-devel BuildRequires: tk-devel -BuildRequires: pkgconfig(x11) BuildRequires: xz +BuildRequires: pkgconfig(x11) %define python_version %(echo %{tarversion} | head -c 3) %define idle_name idle Requires: python-base = %{version} @@ -85,10 +86,6 @@ Obsoletes: python21 Obsoletes: python-64bit %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1320 -BuildRequires: freetype2-bootstrap -#!BuildIgnore: libfreetype6 -%endif %description Python is an interpreted, object-oriented programming language, and is From 46580c6555cf7078753e07ce981423553095c20b5555f33f491d885e6b024304 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 21 May 2015 13:58:17 +0000 Subject: [PATCH 3/4] - for SLE 12 SP1, disable SSL verification-by-default for backwards compatibility (python-2.7.9-sles-disable-verification-by-default.patch) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=178 --- ....7.9-sles-disable-verification-by-default.patch | 14 ++++++++++++++ python-base.spec | 5 +++++ python-doc.spec | 5 +++++ python.changes | 6 ++++++ python.spec | 5 +++++ 5 files changed, 35 insertions(+) create mode 100644 python-2.7.9-sles-disable-verification-by-default.patch diff --git a/python-2.7.9-sles-disable-verification-by-default.patch b/python-2.7.9-sles-disable-verification-by-default.patch new file mode 100644 index 0000000..9e58d33 --- /dev/null +++ b/python-2.7.9-sles-disable-verification-by-default.patch @@ -0,0 +1,14 @@ +Index: Python-2.7.9/Lib/ssl.py +=================================================================== +--- Python-2.7.9.orig/Lib/ssl.py 2015-05-14 15:02:05.872792333 +0200 ++++ Python-2.7.9/Lib/ssl.py 2015-05-14 15:23:27.874013424 +0200 +@@ -469,7 +469,8 @@ + return context + + # Used by http.client if no context is explicitly passed. +-_create_default_https_context = create_default_context ++# PATCH-SLE: still use unverified context. see PEP476 ++_create_default_https_context = _create_unverified_context + + + # Backwards compatibility alias, even though it's not a public name. diff --git a/python-base.spec b/python-base.spec index 9c82331..cc3290e 100644 --- a/python-base.spec +++ b/python-base.spec @@ -54,6 +54,8 @@ Patch31: python-2.7.7-mhlib-linkcount.patch Patch32: python-2.7-urllib2-localnet-ssl.patch # PATCH-FIX-UPSTREAM accept directory-based CA paths as well Patch33: python-2.7.9-ssl_ca_path.patch +# PATCH-FEATURE-SLE disable SSL verification-by-default in http clients +Patch34: python-2.7.9-sles-disable-verification-by-default.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake @@ -144,6 +146,9 @@ other applications. %patch31 -p1 %patch32 -p1 %patch33 -p1 +%if %{suse_version} == 1315 +%patch34 -p1 +%endif # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac diff --git a/python-doc.spec b/python-doc.spec index b306f8a..e962be2 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -55,6 +55,8 @@ Patch31: python-2.7.7-mhlib-linkcount.patch Patch32: python-2.7-urllib2-localnet-ssl.patch # PATCH-FIX-UPSTREAM accept directory-based CA paths as well Patch33: python-2.7.9-ssl_ca_path.patch +# PATCH-FEATURE-SLE disable SSL verification-by-default in http clients +Patch34: python-2.7.9-sles-disable-verification-by-default.patch # COMMON-PATCH-END Provides: pyth_doc Provides: pyth_ps @@ -99,6 +101,9 @@ Python, and Macintosh Module Reference in PDF format. %patch31 -p1 %patch32 -p1 %patch33 -p1 +%if %{suse_version} == 1315 +%patch34 -p1 +%endif # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac diff --git a/python.changes b/python.changes index 8619fd5..6d1b3b0 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 14 13:27:09 UTC 2015 - jmatejek@suse.com + +- for SLE 12 SP1, disable SSL verification-by-default for backwards + compatibility (python-2.7.9-sles-disable-verification-by-default.patch) + ------------------------------------------------------------------- Wed Feb 25 16:31:37 UTC 2015 - jmatejek@suse.com diff --git a/python.spec b/python.spec index f5e5efe..071757f 100644 --- a/python.spec +++ b/python.spec @@ -59,6 +59,8 @@ Patch31: python-2.7.7-mhlib-linkcount.patch Patch32: python-2.7-urllib2-localnet-ssl.patch # PATCH-FIX-UPSTREAM accept directory-based CA paths as well Patch33: python-2.7.9-ssl_ca_path.patch +# PATCH-FEATURE-SLE disable SSL verification-by-default in http clients +Patch34: python-2.7.9-sles-disable-verification-by-default.patch # COMMON-PATCH-END BuildRequires: automake BuildRequires: db-devel @@ -179,6 +181,9 @@ implementation of the standard Unix DBM databases. %patch31 -p1 %patch32 -p1 %patch33 -p1 +%if %{suse_version} == 1315 +%patch34 -p1 +%endif # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac From 7825b670abdd70c4618664800378023d81edbc6eb90f4ca8294e6da8fd31722e Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 21 May 2015 15:02:40 +0000 Subject: [PATCH 4/4] Accepting request 307974 from home:Andreas_Schwab:Factory - Reenable test_posix on aarch64 OBS-URL: https://build.opensuse.org/request/show/307974 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=179 --- python-base.changes | 5 +++++ python-base.spec | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/python-base.changes b/python-base.changes index bbbd72c..ba6c373 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 19 11:18:12 UTC 2015 - schwab@suse.de + +- Reenable test_posix on aarch64 + ------------------------------------------------------------------- Sun Dec 21 19:14:17 UTC 2014 - schwab@suse.de diff --git a/python-base.spec b/python-base.spec index cc3290e..81545a7 100644 --- a/python-base.spec +++ b/python-base.spec @@ -207,10 +207,6 @@ EXCLUDE="$EXCLUDE test_multiprocessing test_thread" # qemu bug (siginterrupt handling) EXCLUDE="$EXCLUDE test_signal" %endif -%ifarch aarch64 -# qemu bug (wrong USE_UID16) -EXCLUDE="$EXCLUDE test_posix" -%endif # This test (part of test_uuid) requires real network interfaces # so that ifconfig output has "HWaddr ". Some kvm instances