pool/python
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 177274 from home:matejcik:dev

Browse Source 
- python-2.7.4-aarch64.patch: add missing bits of aarch64 support
- python-2.7.4-no-REUSEPORT.patch: disable test of
  missing kernel functionality
- drop unnecessary patch: python-2.7.1-distutils_test_path.patch
- switch to xz archive

OBS-URL: https://build.opensuse.org/request/show/177274
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=142
This commit is contained in:
Jan Matejek 2013-06-03 15:40:08 +00:00 committed by Git OBS Bridge
parent 58c938cba7
commit 4541ffca4e
16 changed files with 66 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Python-2.7.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:035f705d40f8ec966f43206ba5008708e911cbfa99ab3b984af1222e24e9a359
size 12146770

3
Python-2.7.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b477554864e616a041ee4d7cef9849751770bc7c39adaf78a94ea145c488059
size 12147710

3
Python-2.7.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f33c4cab167dc69e10962e1cebf1c0768e2d0e8575648130c20e6bda84551db1
size 10252148

30
pypirc-secure.diff
View File

@ -1,30 +0,0 @@
# HG changeset patch
# User Philip Jenvey <pjenvey@underboss.org>
# Date 1322701507 28800
# Branch 2.7
# Node ID e7c20a8476a0e2ca18f8040864cbc400818d8f24
# Parent 3ecddf168f1f554a17a047384fe0b02f2d688277
create the .pypirc securely
diff -r 3ecddf168f1f -r e7c20a8476a0 Lib/distutils/config.py
--- a/Lib/distutils/config.py Tue Nov 29 00:53:09 2011 +0100
+++ b/Lib/distutils/config.py Wed Nov 30 17:05:07 2011 -0800
@@ -42,16 +42,8 @@
def _store_pypirc(self, username, password):
"""Creates a default .pypirc file."""
rc = self._get_rc_file()
- f = open(rc, 'w')
- try:
- f.write(DEFAULT_PYPIRC % (username, password))
- finally:
- f.close()
- try:
- os.chmod(rc, 0600)
- except OSError:
- # should do something better here
- pass
+ with os.fdopen(os.open(rc, os.O_CREAT | os.O_WRONLY, 0600), 'w') as fp:
+ fp.write(DEFAULT_PYPIRC % (username, password))
def _read_pypirc(self):
"""Reads the .pypirc file."""

48
python-2.7.1-distutils_test_path.patch
View File

@ -1,48 +0,0 @@
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -279,20 +279,14 @@
# issue #5977 : distutils build_ext.get_outputs
# returns wrong result with --inplace
- other_tmp_dir = os.path.realpath(self.mkdtemp())
- old_wd = os.getcwd()
- os.chdir(other_tmp_dir)
- try:
- cmd.inplace = 1
- cmd.run()
- so_file = cmd.get_outputs()[0]
- finally:
- os.chdir(old_wd)
+ cmd.inplace = 1
+ cmd.run()
+ so_file = cmd.get_outputs()[0]
self.assertTrue(os.path.exists(so_file))
self.assertEqual(os.path.splitext(so_file)[-1],
sysconfig.get_config_var('SO'))
so_dir = os.path.dirname(so_file)
- self.assertEqual(so_dir, other_tmp_dir)
+ self.assertEqual(so_dir, os.getcwd())
cmd.compiler = None
cmd.inplace = 0
cmd.run()
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1547,16 +1547,5 @@
if not os.path.exists(TEMPDIR):
os.mkdir(TEMPDIR)
- # Define a writable temp dir that will be used as cwd while running
- # the tests. The name of the dir includes the pid to allow parallel
- # testing (see the -j option).
- TESTCWD = 'test_python_{}'.format(os.getpid())
-
- TESTCWD = os.path.join(TEMPDIR, TESTCWD)
-
- # Run the tests in a context manager that temporary changes the CWD to a
- # temporary and writable directory. If it's not possible to create or
- # change the CWD, the original CWD will be used. The original CWD is
- # available from test_support.SAVEDCWD.
- with test_support.temp_cwd(TESTCWD, quiet=True):
- main()
+ # do not change directory, because it breaks distutils tests
+ main()

18
python-2.7.4-aarch64.patch Normal file
View File

@ -0,0 +1,18 @@
# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1367276434 -7200
# Node ID 05e8999a3901b4853e60d6701510e9b3dd54a7f3
# Parent 84cef4f1999ad9e362694cdac2f65f0981e3d5d0
Add missing fficonfig.py bits for aarch64
diff -r 84cef4f1999a -r 05e8999a3901 Modules/_ctypes/libffi/fficonfig.py.in
--- a/Modules/_ctypes/libffi/fficonfig.py.in Mon Apr 29 16:09:39 2013 -0400
+++ b/Modules/_ctypes/libffi/fficonfig.py.in Tue Apr 30 01:00:34 2013 +0200
@@ -28,6 +28,7 @@
'PA': ['src/pa/linux.S', 'src/pa/ffi.c'],
'PA_LINUX': ['src/pa/linux.S', 'src/pa/ffi.c'],
'PA_HPUX': ['src/pa/hpux32.S', 'src/pa/ffi.c'],
+ 'AARCH64' : ['src/aarch64/ffi.c', 'src/aarch64/sysv.S'],
}
ffi_sources += ffi_platforms['@TARGET@']

4
python-2.7.5-docs-html.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:90152532d4b7e87e52a464b4add626c7247b4db7bbd0d6ba9973fe823df72a7a
size 4460216
oid sha256:e0c6c2ba73ce50d60132782045d6a372f75adb8d0165547a0472288c01acaa46
size 4460619

4
python-2.7.5-docs-pdf-a4.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e8f46d251f6c7d4a9122b1eb32771bd3d715a83f42e0dae0c08ea2b8831cb824
size 10315479
oid sha256:6c5dbdc06a740b6418a25d88c5d631e0991039c920ad91a5090369076fe25aea
size 10317921

4
python-2.7.5-docs-pdf-letter.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:27ae1c6e4b47832b7e0be4d1c34f5fd6cfae96b6363808ad021420c84b4041b2
size 10368275
oid sha256:d6ce4c0f4885cbf60518d4280417fd2611fee636f2457b1fa8a0b4d8feb2c5b0
size 10370393

0
python-2.7.4-multilib.patch → python-2.7.5-multilib.patch
View File

14
python-base.changes
View File

@ -1,7 +1,18 @@
-------------------------------------------------------------------
Thu May 30 16:40:16 UTC 2013 - jmatejek@suse.com
- python-2.7.4-aarch64.patch: add missing bits of aarch64 support
- python-2.7.4-no-REUSEPORT.patch: disable test of
missing kernel functionality
- drop unnecessary patch: python-2.7.1-distutils_test_path.patch
- switch to xz archive
-------------------------------------------------------------------
Tue May 28 08:42:49 UTC 2013 - speilicke@suse.com
- Update to version 2.7.5:
+ bugfix-only release
+ fixes several important regressions introduced in 2.7.4
+ Issue #15535: Fixed regression in the pickling of named tuples by
removing the __dict__ property introduced in 2.7.4.
+ Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3,
@ -13,9 +24,6 @@ Tue May 28 08:42:49 UTC 2013 - speilicke@suse.com
+ Issue #17610: Don't rely on non-standard behavior of the C qsort() function. 12
See http://hg.python.org/cpython/file/ab05e7dd2788/Misc/NEWS for more
- Drop upstreamed patches:
+ python-2.7rc2-configure.patch
+ python-2.7.3-multiprocessing-join.patch
+ ctypes-libffi-aarch64.patch
+ python-2.7.3-fix-dbm-64bit-bigendian.patch
+ python-test_structmembers.patch
- Rebased other patches

10
python-base.spec
View File

@ -26,7 +26,7 @@ Url: http://www.python.org/
Group: Development/Languages/Python
%define tarversion %{version}
%define tarname Python-%{tarversion}
Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.bz2
Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz
Source1: macros.python
Source2: baselibs.conf
Source3: README.SUSE
@ -34,12 +34,11 @@ Source5: _local.pth
# COMMON-PATCH-BEGIN
Patch1: python-2.7-dirs.patch
Patch2: python-distutils-rpm-8.patch
Patch3: python-2.7.4-multilib.patch
Patch3: python-2.7.5-multilib.patch
Patch4: python-2.5.1-sqlite.patch
Patch5: python-2.7.4-canonicalize2.patch
Patch7: python-2.6-gettext-plurals.patch
Patch8: python-2.6b3-curses-panel.patch
Patch9: python-2.7.1-distutils_test_path.patch
Patch10: sparc_longdouble.patch
Patch13: python-2.7.2-fix_date_time_compiler.patch
Patch15: python-2.7.2-disable-tests-in-test_io.patch
@ -48,12 +47,15 @@ Patch17: remove-static-libpython.diff
Patch18: python-2.7.3-ssl_ca_path.patch
# PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle.
Patch20: python-bundle-lang.patch
# PATCH-FIX-OPENSUSE Properly support aarch64 in _ctypes module
Patch22: python-2.7.4-aarch64.patch
Patch23: python-2.7.4-no-REUSEPORT.patch
# COMMON-PATCH-END
%define python_version %(echo %{tarversion} | head -c 3)
BuildRequires: automake
BuildRequires: fdupes libbz2-devel
BuildRequires: pkg-config
BuildRequires: xz
BuildRequires: zlib-devel
# for the test suite
BuildRequires: netcfg
@ -125,7 +127,6 @@ other applications.
%patch5 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch13 -p1
#skip test_io test for ppc,ppc64 as it broken.
@ -135,6 +136,7 @@ other applications.
%patch17 -p1
%patch18 -p1
%patch20 -p1
%patch22 -p1
%patch23 -p1
# drop Autoconf version requirement

19
python-doc.changes
View File

@ -1,24 +1,7 @@
-------------------------------------------------------------------
Tue May 28 08:42:49 UTC 2013 - speilicke@suse.com
- Update to version 2.7.5:
+ Issue #15535: Fixed regression in the pickling of named tuples by
removing the __dict__ property introduced in 2.7.4.
+ Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3,
such as was shipped with Centos 5 and Mac OS X 10.4.
+ Issue #17703: Fix a regression where an illegal use of Py_DECREF() after
interpreter finalization can cause a crash.
+ Issue #16447: Fixed potential segmentation fault when setting __name__ on a
class.
+ Issue #17610: Don't rely on non-standard behavior of the C qsort() function. 12
See http://hg.python.org/cpython/file/ab05e7dd2788/Misc/NEWS for more
- Drop upstreamed patches:
+ python-2.7rc2-configure.patch
+ python-2.7.3-multiprocessing-join.patch
+ ctypes-libffi-aarch64.patch
+ python-2.7.3-fix-dbm-64bit-bigendian.patch
+ python-test_structmembers.patch
- Rebased other patches
- Update to version 2.7.5
-------------------------------------------------------------------
Thu May 9 16:14:17 UTC 2013 - jmatejek@suse.com

12
python-doc.spec
View File

@ -24,19 +24,21 @@ Url: http://www.python.org/
Group: Development/Languages/Python
%define pyver 2.7.5
%define tarname Python-%{pyver}
Source0: %{tarname}.tar.bz2
Source0: %{tarname}.tar.xz
Source1: http://docs.python.org/%{version}/archives/python-%{pyver}-docs-html.tar.bz2
Source2: http://docs.python.org/%{version}/archives/python-%{pyver}-docs-pdf-a4.tar.bz2
Source3: http://docs.python.org/%{version}/archives/python-%{pyver}-docs-pdf-letter.tar.bz2
%if 0%{suse_version} <= 1210
BuildRequires: xz
%endif
# COMMON-PATCH-BEGIN
Patch1: python-2.7-dirs.patch
Patch2: python-distutils-rpm-8.patch
Patch3: python-2.7.4-multilib.patch
Patch3: python-2.7.5-multilib.patch
Patch4: python-2.5.1-sqlite.patch
Patch5: python-2.7.4-canonicalize2.patch
Patch7: python-2.6-gettext-plurals.patch
Patch8: python-2.6b3-curses-panel.patch
Patch9: python-2.7.1-distutils_test_path.patch
Patch10: sparc_longdouble.patch
Patch13: python-2.7.2-fix_date_time_compiler.patch
Patch15: python-2.7.2-disable-tests-in-test_io.patch
@ -45,6 +47,8 @@ Patch17: remove-static-libpython.diff
Patch18: python-2.7.3-ssl_ca_path.patch
# PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle.
Patch20: python-bundle-lang.patch
# PATCH-FIX-OPENSUSE Properly support aarch64 in _ctypes module
Patch22: python-2.7.4-aarch64.patch
Patch23: python-2.7.4-no-REUSEPORT.patch
# COMMON-PATCH-END
Provides: pyth_doc
@ -81,7 +85,6 @@ Python, and Macintosh Module Reference in PDF format.
%patch5 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch13 -p1
#skip test_io test for ppc,ppc64 as it broken.
@ -91,6 +94,7 @@ Python, and Macintosh Module Reference in PDF format.
%patch17 -p1
%patch18 -p1
%patch20 -p1
%patch22 -p1
%patch23 -p1
# drop Autoconf version requirement

14
python.changes
View File

@ -1,7 +1,14 @@
-------------------------------------------------------------------
Thu May 30 16:40:16 UTC 2013 - jmatejek@suse.com
- switch to xz archive
-------------------------------------------------------------------
Tue May 28 08:42:49 UTC 2013 - speilicke@suse.com
- Update to version 2.7.5:
+ bugfix-only release
+ fixes several important regressions introduced in 2.7.4
+ Issue #15535: Fixed regression in the pickling of named tuples by
removing the __dict__ property introduced in 2.7.4.
+ Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3,
@ -12,13 +19,6 @@ Tue May 28 08:42:49 UTC 2013 - speilicke@suse.com
class.
+ Issue #17610: Don't rely on non-standard behavior of the C qsort() function. 12
See http://hg.python.org/cpython/file/ab05e7dd2788/Misc/NEWS for more
- Drop upstreamed patches:
+ python-2.7rc2-configure.patch
+ python-2.7.3-multiprocessing-join.patch
+ ctypes-libffi-aarch64.patch
+ python-2.7.3-fix-dbm-64bit-bigendian.patch
+ python-test_structmembers.patch
- Rebased other patches
-------------------------------------------------------------------
Thu May 9 16:14:07 UTC 2013 - jmatejek@suse.com

10
python.spec
View File

@ -24,7 +24,7 @@ Url: http://www.python.org/
Group: Development/Languages/Python
%define tarversion %{version}
%define tarname Python-%{tarversion}
Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.bz2
Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz
Source1: README.SUSE
Source2: pythonstart
Source3: python.sh
@ -39,12 +39,11 @@ Source4: python.csh
# COMMON-PATCH-BEGIN
Patch1: python-2.7-dirs.patch
Patch2: python-distutils-rpm-8.patch
Patch3: python-2.7.4-multilib.patch
Patch3: python-2.7.5-multilib.patch
Patch4: python-2.5.1-sqlite.patch
Patch5: python-2.7.4-canonicalize2.patch
Patch7: python-2.6-gettext-plurals.patch
Patch8: python-2.6b3-curses-panel.patch
Patch9: python-2.7.1-distutils_test_path.patch
Patch10: sparc_longdouble.patch
Patch13: python-2.7.2-fix_date_time_compiler.patch
Patch15: python-2.7.2-disable-tests-in-test_io.patch
@ -53,6 +52,8 @@ Patch17: remove-static-libpython.diff
Patch18: python-2.7.3-ssl_ca_path.patch
# PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle.
Patch20: python-bundle-lang.patch
# PATCH-FIX-OPENSUSE Properly support aarch64 in _ctypes module
Patch22: python-2.7.4-aarch64.patch
Patch23: python-2.7.4-no-REUSEPORT.patch
# COMMON-PATCH-END
BuildRequires: automake
@ -67,6 +68,7 @@ BuildRequires: readline-devel
BuildRequires: sqlite-devel
BuildRequires: tk-devel
BuildRequires: xorg-x11-devel
BuildRequires: xz
%define python_version %(echo %{tarversion} | head -c 3)
%define idle_name idle
Requires: python-base = %{version}
@ -164,7 +166,6 @@ implementation of the standard Unix DBM databases.
%patch5 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch13 -p1
#skip test_io test for ppc,ppc64 as it broken.
@ -174,6 +175,7 @@ implementation of the standard Unix DBM databases.
%patch17 -p1
%patch18 -p1
%patch20 -p1
%patch22 -p1
%patch23 -p1
# drop Autoconf version requirement