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

Accepting request 177479 from devel:languages:python:Factory

Browse Source 
- Update to version 2.7.5
- disable Source URLs for docs (the doc archives are regenerated
  every day and autobuild detects this as "upstream file is different"
  error)
- switch to xz archive

OBS-URL: https://build.opensuse.org/request/show/177479
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python?expand=0&rev=90
This commit is contained in:
Stephan Kulow 2013-06-25 04:57:35 +00:00 committed by Git OBS Bridge
commit ba778fdd84
35 changed files with 327 additions and 3663 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Python-2.7.3.tar.bz2
View File

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

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

3220
ctypes-libffi-aarch64.patch
View File

File diff suppressed because it is too large Load Diff

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."""

6
python-2.5.1-sqlite.patch
View File

@ -1,6 +1,6 @@
--- Modules/_sqlite/cursor.c
+++ Modules/_sqlite/cursor.c
@@ -782,6 +782,9 @@
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -837,6 +837,9 @@
goto error;
}

4
python-2.6-gettext-plurals.patch
View File

@ -1,7 +1,7 @@
Index: Lib/gettext.py
===================================================================
--- Lib/gettext.py.orig
+++ Lib/gettext.py
--- a/Lib/gettext.py.orig
+++ b/Lib/gettext.py
@@ -311,8 +311,9 @@ class GNUTranslations(NullTranslations):
self._charset = v.split('charset=')[1]
elif k == 'plural-forms':

4
python-2.6b3-curses-panel.patch
View File

@ -1,5 +1,5 @@
--- Modules/_curses_panel.c
+++ Modules/_curses_panel.c
--- a/Modules/_curses_panel.c
+++ b/Modules/_curses_panel.c
@@ -14,7 +14,7 @@
#include "py_curses.h"

8
python-2.7-dirs.patch
View File

@ -1,8 +1,6 @@
Index: Python-2.7/Makefile.pre.in
===================================================================
--- Python-2.7.orig/Makefile.pre.in
+++ Python-2.7/Makefile.pre.in
@@ -94,7 +94,7 @@ LIBDIR= @libdir@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -106,7 +106,7 @@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include

3
python-2.7-docs-html.tar.bz2
View File

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

3
python-2.7-docs-pdf-a4.tar.bz2
View File

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

3
python-2.7-docs-pdf-letter.tar.bz2
View File

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

52
python-2.7.1-distutils_test_path.patch
View File

@ -1,52 +0,0 @@
Index: Python-2.7/Lib/distutils/tests/test_build_ext.py
===================================================================
--- Python-2.7.orig/Lib/distutils/tests/test_build_ext.py
+++ Python-2.7/Lib/distutils/tests/test_build_ext.py
@@ -261,20 +261,14 @@ class BuildExtTestCase(support.TempdirMa
# 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()
Index: Python-2.7/Lib/test/regrtest.py
===================================================================
--- Python-2.7.orig/Lib/test/regrtest.py
+++ Python-2.7/Lib/test/regrtest.py
@@ -1503,16 +1503,5 @@ if __name__ == '__main__':
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()

6
python-2.7.2-disable-tests-in-test_io.patch
View File

@ -1,6 +1,6 @@
--- Python-2.7.2/Lib/test/test_io.py.disable-tests-in-test_io 2011-09-01 14:18:45.963304089 -0400
+++ Python-2.7.2/Lib/test/test_io.py 2011-09-01 15:08:53.796098413 -0400
@@ -2669,6 +2669,7 @@ class SignalsTest(unittest.TestCase):
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2970,6 +2970,7 @@
self.check_interrupted_read_retry(lambda x: x,
mode="r")

6
python-2.7.2-fix_date_time_compiler.patch
View File

@ -1,6 +1,6 @@
--- Makefile.pre.in
+++ Makefile.pre.in
@@ -524,8 +524,15 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -573,8 +573,15 @@
-DHGVERSION="\"`LC_ALL=C $(HGVERSION)`\"" \
-DHGTAG="\"`LC_ALL=C $(HGTAG)`\"" \
-DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \

25
python-2.7.3-fix-dbm-64bit-bigendian.patch
View File

@ -1,25 +0,0 @@
Index: Python-2.7.3/Modules/dbmmodule.c
===================================================================
--- Python-2.7.3.orig/Modules/dbmmodule.c
+++ Python-2.7.3/Modules/dbmmodule.c
@@ -168,12 +168,18 @@ static int
dbm_contains(register dbmobject *dp, PyObject *v)
{
datum key, val;
+ Py_ssize_t dsize;
- if (PyString_AsStringAndSize(v, (char **)&key.dptr,
- (Py_ssize_t *)&key.dsize)) {
+ if (PyString_AsStringAndSize(v, (char **)&key.dptr, &dsize)) {
return -1;
}
+ /* Coerce from Py_ssize_t down to int: */
+ if (dsize > INT_MAX) {
+ return -1;
+ }
+ key.dsize = dsize;
+
/* Expand check_dbmobject_open to return -1 */
if (dp->di_dbm == NULL) {
PyErr_SetString(DbmError, "DBM object has already been closed");

36
python-2.7.3-multiprocessing-join.patch
View File

@ -1,36 +0,0 @@
# HG changeset patch
# User Richard Oudkerk <shibturn@gmail.com>
# Date 1340030251 -3600
# Node ID 4c07b9c49b75a10874d98841bb2d826f118835a3
# Parent 8b38a81ba3bfa0535b3e7719c3b0e62343a56698
Issue #15101: Make pool finalizer avoid joining current thread
diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
--- a/Lib/multiprocessing/pool.py
+++ b/Lib/multiprocessing/pool.py
@@ -489,7 +489,8 @@ class Pool(object):
# We must wait for the worker handler to exit before terminating
# workers because we don't want workers to be restarted behind our back.
debug('joining worker handler')
- worker_handler.join()
+ if threading.current_thread() is not worker_handler:
+ worker_handler.join(1e100)
# Terminate workers which haven't already finished.
if pool and hasattr(pool[0], 'terminate'):
@@ -499,10 +500,12 @@ class Pool(object):
p.terminate()
debug('joining task handler')
- task_handler.join(1e100)
+ if threading.current_thread() is not task_handler:
+ task_handler.join(1e100)
debug('joining result handler')
- result_handler.join(1e100)
+ if threading.current_thread() is not result_handler:
+ result_handler.join(1e100)
if pool and hasattr(pool[0], 'terminate'):
debug('joining pool workers')

10
python-2.7.3-ssl_ca_path.patch
View File

@ -1,8 +1,6 @@
Index: Modules/_ssl.c
===================================================================
--- Modules/_ssl.c.orig
+++ Modules/_ssl.c
@@ -271,6 +271,7 @@ newPySSLObject(PySocketSockObject *Sock,
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -271,6 +271,7 @@
char *errstr = NULL;
int ret;
int verification_mode;
@ -10,7 +8,7 @@ Index: Modules/_ssl.c
self = PyObject_New(PySSLObject, &PySSL_Type); /* Create new object */
if (self == NULL)
@@ -331,11 +332,23 @@ newPySSLObject(PySocketSockObject *Sock,
@@ -331,11 +332,23 @@
"verification of other-side certificates.");
goto fail;
} else {

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

36
python-2.7.3rc2-canonicalize2.patch → python-2.7.4-canonicalize2.patch
View File

@ -1,7 +1,5 @@
Index: Python/sysmodule.c
===================================================================
--- Python/sysmodule.c.orig 2012-03-28 20:13:00.000000000 +0200
+++ Python/sysmodule.c 2012-03-28 20:13:00.000000000 +0200
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1620,7 +1620,20 @@
char *p = NULL;
Py_ssize_t n = 0;
@ -56,23 +54,8 @@ Index: Python/sysmodule.c
if (PyList_Insert(path, 0, a) < 0)
Py_FatalError("sys.path.insert(0) failed");
Py_DECREF(a);
Index: configure.in
===================================================================
--- configure.in.orig 2012-03-28 20:13:00.000000000 +0200
+++ configure.in 2012-03-28 20:13:00.000000000 +0200
@@ -2761,7 +2761,7 @@
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
initgroups kill killpg lchmod lchown lstat mkfifo mknod mktime \
mremap nice pathconf pause plock poll pthread_init \
- putenv readlink realpath \
+ putenv readlink realpath canonicalize_file_name \
select sem_open sem_timedwait sem_getvalue sem_unlink setegid seteuid \
setgid \
setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
Index: pyconfig.h.in
===================================================================
--- pyconfig.h.in.orig 2012-03-16 02:26:39.000000000 +0100
+++ pyconfig.h.in 2012-03-28 20:13:00.000000000 +0200
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -106,6 +106,9 @@
/* Define to 1 if you have the 'chflags' function. */
#undef HAVE_CHFLAGS
@ -83,3 +66,14 @@ Index: pyconfig.h.in
/* Define to 1 if you have the `chown' function. */
#undef HAVE_CHOWN
--- a/configure.ac
+++ b/configure.ac
@@ -2913,7 +2913,7 @@
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
initgroups kill killpg lchmod lchown lstat mkfifo mknod mktime \
mremap nice pathconf pause plock poll pthread_init \
- putenv readlink realpath \
+ putenv readlink realpath canonicalize_file_name \
select sem_open sem_timedwait sem_getvalue sem_unlink setegid seteuid \
setgid \
setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \

19
python-2.7.4-no-REUSEPORT.patch Normal file
View File

@ -0,0 +1,19 @@
Index: Python-2.7.4/Lib/test/test_support.py
===================================================================
--- Python-2.7.4.orig/Lib/test/test_support.py 2013-04-06 16:02:32.000000000 +0200
+++ Python-2.7.4/Lib/test/test_support.py 2013-05-09 17:46:46.789663295 +0200
@@ -371,10 +371,10 @@
if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR) == 1:
raise TestFailed("tests should never set the SO_REUSEADDR " \
"socket option on TCP/IP sockets!")
- if hasattr(socket, 'SO_REUSEPORT'):
- if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1:
- raise TestFailed("tests should never set the SO_REUSEPORT " \
- "socket option on TCP/IP sockets!")
+# if hasattr(socket, 'SO_REUSEPORT'):
+# if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1:
+# raise TestFailed("tests should never set the SO_REUSEPORT " \
+# "socket option on TCP/IP sockets!")
if hasattr(socket, 'SO_EXCLUSIVEADDRUSE'):
sock.setsockopt(socket.SOL_SOCKET, socket.SO_EXCLUSIVEADDRUSE, 1)

3
python-2.7.5-docs-html.tar.bz2 Normal file
View File

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

3
python-2.7.5-docs-pdf-a4.tar.bz2 Normal file
View File

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

3
python-2.7.5-docs-pdf-letter.tar.bz2 Normal file
View File

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

128
python-2.7.3rc2-multilib.patch → python-2.7.5-multilib.patch
View File

@ -1,8 +1,6 @@
Index: configure.in
===================================================================
--- configure.in.orig 2012-03-16 02:26:39.000000000 +0100
+++ configure.in 2012-03-28 20:09:13.000000000 +0200
@@ -630,6 +630,41 @@
--- a/configure.ac
+++ b/configure.ac
@@ -732,6 +732,41 @@
;;
esac
@ -44,10 +42,8 @@ Index: configure.in
AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY)
Index: Include/pythonrun.h
===================================================================
--- Include/pythonrun.h.orig 2012-03-16 02:26:31.000000000 +0100
+++ Include/pythonrun.h 2012-03-28 20:09:13.000000000 +0200
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@ -108,6 +108,8 @@
/* In their own files */
PyAPI_FUNC(const char *) Py_GetVersion(void);
@ -57,10 +53,8 @@ Index: Include/pythonrun.h
PyAPI_FUNC(const char *) Py_GetCopyright(void);
PyAPI_FUNC(const char *) Py_GetCompiler(void);
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
Index: Lib/distutils/command/install.py
===================================================================
--- Lib/distutils/command/install.py.orig 2012-03-28 20:09:11.000000000 +0200
+++ Lib/distutils/command/install.py 2012-03-28 20:09:13.000000000 +0200
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -22,6 +22,8 @@
from site import USER_SITE
@ -79,11 +73,9 @@ Index: Lib/distutils/command/install.py
'headers': '$base/include/python$py_version_short/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
Index: Lib/distutils/sysconfig.py
===================================================================
--- Lib/distutils/sysconfig.py.orig 2012-03-16 02:26:31.000000000 +0100
+++ Lib/distutils/sysconfig.py 2012-03-28 20:09:13.000000000 +0200
@@ -114,8 +114,11 @@
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -119,8 +119,11 @@
prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
@ -97,10 +89,8 @@ Index: Lib/distutils/sysconfig.py
if standard_lib:
return libpython
else:
Index: Lib/pydoc.py
===================================================================
--- Lib/pydoc.py.orig 2012-03-16 02:26:33.000000000 +0100
+++ Lib/pydoc.py 2012-03-28 20:09:13.000000000 +0200
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -352,7 +352,7 @@
docloc = os.environ.get("PYTHONDOCS",
@ -110,11 +100,9 @@ Index: Lib/pydoc.py
"python"+sys.version[0:3])
if (isinstance(object, type(os)) and
(object.__name__ in ('errno', 'exceptions', 'gc', 'imp',
Index: Lib/site.py
===================================================================
--- Lib/site.py.orig 2012-03-16 02:26:33.000000000 +0100
+++ Lib/site.py 2012-03-28 20:09:13.000000000 +0200
@@ -300,13 +300,18 @@
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -288,13 +288,18 @@
if sys.platform in ('os2emx', 'riscos'):
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
elif os.sep == '/':
@ -136,10 +124,8 @@ Index: Lib/site.py
if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple
# locations.
Index: Lib/sysconfig.py
===================================================================
--- Lib/sysconfig.py.orig 2012-03-16 02:26:33.000000000 +0100
+++ Lib/sysconfig.py 2012-03-28 20:09:13.000000000 +0200
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -7,10 +7,10 @@
_INSTALL_SCHEMES = {
@ -168,10 +154,8 @@ Index: Lib/sysconfig.py
'include': '{userbase}/include/python{py_version_short}',
'scripts': '{userbase}/bin',
'data' : '{userbase}',
Index: Lib/test/test_dl.py
===================================================================
--- Lib/test/test_dl.py.orig 2012-03-16 02:26:34.000000000 +0100
+++ Lib/test/test_dl.py 2012-03-28 20:09:13.000000000 +0200
--- a/Lib/test/test_dl.py
+++ b/Lib/test/test_dl.py
@@ -5,10 +5,11 @@
import unittest
from test.test_support import verbose, import_module
@ -186,10 +170,8 @@ Index: Lib/test/test_dl.py
('/usr/bin/cygwin1.dll', 'getpid'),
('/usr/lib/libc.dylib', 'getpid'),
]
Index: Lib/test/test_site.py
===================================================================
--- Lib/test/test_site.py.orig 2012-03-16 02:26:34.000000000 +0100
+++ Lib/test/test_site.py 2012-03-28 20:11:10.000000000 +0200
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -241,12 +241,16 @@
self.assertEqual(dirs[2], wanted)
elif os.sep == '/':
@ -210,10 +192,8 @@ Index: Lib/test/test_site.py
else:
# other platforms
self.assertEqual(len(dirs), 2)
Index: Lib/trace.py
===================================================================
--- Lib/trace.py.orig 2012-03-16 02:26:34.000000000 +0100
+++ Lib/trace.py 2012-03-28 20:09:13.000000000 +0200
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -754,10 +754,10 @@
# should I also call expanduser? (after all, could use $HOME)
@ -227,20 +207,18 @@ Index: Lib/trace.py
"python" + sys.version[:3]))
s = os.path.normpath(s)
ignore_dirs.append(s)
Index: Makefile.pre.in
===================================================================
--- Makefile.pre.in.orig 2012-03-28 20:09:11.000000000 +0200
+++ Makefile.pre.in 2012-03-28 20:09:13.000000000 +0200
@@ -81,6 +81,8 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -87,6 +87,8 @@
# Machine-dependent subdirectories
MACHDEP= @MACHDEP@
+LIB= @LIB@
+ARCH= @ARCH@
# Install prefix for architecture-independent files
prefix= @prefix@
@@ -533,6 +535,7 @@
# Multiarch directory (may be empty)
MULTIARCH= @MULTIARCH@
@@ -579,6 +581,7 @@
-DEXEC_PREFIX='"$(exec_prefix)"' \
-DVERSION='"$(VERSION)"' \
-DVPATH='"$(VPATH)"' \
@ -248,7 +226,7 @@ Index: Makefile.pre.in
-o $@ $(srcdir)/Modules/getpath.c
Modules/python.o: $(srcdir)/Modules/python.c
@@ -567,7 +570,7 @@
@@ -621,7 +624,7 @@
Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
Python/getplatform.o: $(srcdir)/Python/getplatform.c
@ -257,10 +235,8 @@ Index: Makefile.pre.in
Python/importdl.o: $(srcdir)/Python/importdl.c
$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
Index: Modules/getpath.c
===================================================================
--- Modules/getpath.c.orig 2012-03-16 02:26:37.000000000 +0100
+++ Modules/getpath.c 2012-03-28 20:09:13.000000000 +0200
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -116,9 +116,11 @@
#define EXEC_PREFIX PREFIX
#endif
@ -284,10 +260,8 @@ Index: Modules/getpath.c
static void
reduce(char *dir)
Index: Python/getplatform.c
===================================================================
--- Python/getplatform.c.orig 2012-03-16 02:26:38.000000000 +0100
+++ Python/getplatform.c 2012-03-28 20:09:13.000000000 +0200
--- a/Python/getplatform.c
+++ b/Python/getplatform.c
@@ -10,3 +10,23 @@
{
return PLATFORM;
@ -312,10 +286,8 @@ Index: Python/getplatform.c
+{
+ return LIB;
+}
Index: Python/sysmodule.c
===================================================================
--- Python/sysmodule.c.orig 2012-03-16 02:26:39.000000000 +0100
+++ Python/sysmodule.c 2012-03-28 20:09:13.000000000 +0200
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1419,6 +1419,10 @@
PyString_FromString(Py_GetCopyright()));
SET_SYS_FROM_STRING("platform",
@ -327,30 +299,18 @@ Index: Python/sysmodule.c
SET_SYS_FROM_STRING("executable",
PyString_FromString(Py_GetProgramFullPath()));
SET_SYS_FROM_STRING("prefix",
Index: setup.py
===================================================================
--- setup.py.orig 2012-03-16 02:26:39.000000000 +0100
+++ setup.py 2012-03-28 20:09:13.000000000 +0200
@@ -369,7 +369,7 @@
--- a/setup.py
+++ b/setup.py
@@ -437,7 +437,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/' + sys.lib)
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
self.add_gcc_paths()
self.add_multiarch_paths()
@@ -427,8 +427,7 @@
# if a file is found in one of those directories, it can
# be assumed that no additional -I,-L directives are needed.
lib_dirs = self.compiler.library_dirs + [
- '/lib64', '/usr/lib64',
- '/lib', '/usr/lib',
+ '/' + sys.lib, '/usr/' + sys.lib,
]
inc_dirs = self.compiler.include_dirs + ['/usr/include']
exts = []
@@ -677,11 +676,11 @@
@@ -756,11 +756,11 @@
elif curses_library:
readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
@ -364,9 +324,9 @@ Index: setup.py
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
@@ -1753,18 +1752,17 @@
@@ -1861,18 +1861,17 @@
# Check for various platform-specific directories
if platform == 'sunos5':
if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
- added_lib_dirs.append('/usr/openwin/lib')
+ added_lib_dirs.append('/usr/openwin/' + sys.lib)
@ -386,4 +346,4 @@ Index: setup.py
+ added_lib_dirs.append('/usr/X11/' + sys.lib)
# If Cygwin, then verify that X is installed before proceeding
if platform == 'cygwin':
if host_platform == 'cygwin':

26
python-2.7rc2-configure.patch
View File

@ -1,26 +0,0 @@
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -3892,9 +3892,18 @@ then
fi
# check for readline 4.0
-AC_CHECK_LIB(readline, rl_pre_input_hook,
- AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1,
- [Define if you have readline 4.0]), ,$READLINE_LIBS)
+AC_MSG_CHECKING([for rl_pre_input_hook in -lreadline])
+AC_CACHE_VAL(ac_cv_have_rl_re_input_hook, [
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>
+#include <readline/readline.h>],
+ [return rl_pre_input_hook != 0])],
+ ac_cv_have_rl_re_input_hook=yes,
+ ac_cv_have_rl_re_input_hook=no)])
+AC_MSG_RESULT($ac_cv_have_rl_re_input_hook)
+if test "$ac_cv_have_rl_re_input_hook" = yes; then
+ AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1,
+ [Define if you have readline 4.0])
+fi
# also in 4.0
AC_CHECK_LIB(readline, rl_completion_display_matches_hook,

51
python-base.changes
View File

@ -1,3 +1,54 @@
-------------------------------------------------------------------
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,
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.7.3-fix-dbm-64bit-bigendian.patch
+ python-test_structmembers.patch
- Rebased other patches
-------------------------------------------------------------------
Mon May 13 09:24:29 UTC 2013 - dmueller@suse.com
- add aarch64 to the list of 64-bit platforms
------------------------------------------------------------------
Thu May 9 16:11:23 UTC 2013 - jmatejek@suse.com
- update to 2.7.4
* bugfix-only release
- drop upstreamed patches:
pypirc-secure.diff
python-2.7.3-multiprocessing-join.patch
ctypes-libffi-aarch64.patch
- drop python-2.7rc2-configure.patch as it doesn't seem necessary anymore
-------------------------------------------------------------------
Fri Apr 5 13:33:27 UTC 2013 - idonmez@suse.com
- Add Source URL, see https://en.opensuse.org/SourceUrls
-------------------------------------------------------------------
Wed Feb 27 17:04:32 UTC 2013 - schwab@suse.de

52
python-base.spec
View File

@ -18,7 +18,7 @@
Name: python-base
Version: 2.7.3
Version: 2.7.5
Release: 0
License: Python-2.0
Summary: Python Interpreter base package
@ -26,7 +26,7 @@ Url: http://www.python.org/
Group: Development/Languages/Python
%define tarversion %{version}
%define tarname Python-%{tarversion}
Source0: %{tarname}.tar.bz2
Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz
Source1: macros.python
Source2: baselibs.conf
Source3: README.SUSE
@ -34,32 +34,28 @@ Source5: _local.pth
# COMMON-PATCH-BEGIN
Patch1: python-2.7-dirs.patch
Patch2: python-distutils-rpm-8.patch
Patch3: python-2.7.3rc2-multilib.patch
Patch3: python-2.7.5-multilib.patch
Patch4: python-2.5.1-sqlite.patch
Patch5: python-2.7.3rc2-canonicalize2.patch
Patch6: python-2.7rc2-configure.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
Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch
Patch13: python-2.7.2-fix_date_time_compiler.patch
Patch15: python-2.7.2-disable-tests-in-test_io.patch
Patch16: pypirc-secure.diff
Patch17: remove-static-libpython.diff
# PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions
Patch18: python-2.7.3-ssl_ca_path.patch
Patch19: python-2.7.3-fix-dbm-64bit-bigendian.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
Patch21: python-2.7.3-multiprocessing-join.patch
# PATCH-FIX-OPENSUSE Import aarch64 support for libffi in _ctypes module
Patch22: ctypes-libffi-aarch64.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
@ -117,7 +113,7 @@ often compared to Tcl, Perl, Scheme, or Java. You can find an overview
of Python in the documentation and tutorials included in the python-doc
(HTML) or python-doc-pdf (PDF) packages.
This package contains libpython2.6 shared library for embedding in
This package contains libpython2.7 shared library for embedding in
other applications.
%prep
@ -126,31 +122,26 @@ other applications.
# COMMON-PREP-BEGIN
%patch1 -p1
%patch2 -p1
%patch3
%patch4
%patch5
%patch6
%patch7
%patch8
%patch9 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch7 -p1
%patch8 -p1
%patch10 -p1
%patch12
%patch13
%patch13 -p1
#skip test_io test for ppc,ppc64 as it broken.
%ifarch ppc ppc64
%patch15 -p1
%endif
%patch16 -p1
%patch17
%patch18
%patch19 -p1
%patch17 -p1
%patch18 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
# COMMON-PREP-END
%patch23 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.in
sed -i 's/^version_required/dnl version_required/' configure.ac
# COMMON-PREP-END
%build
export OPT="%{optflags}"
@ -290,6 +281,7 @@ cp Makefile Makefile.pre.in Makefile.pre %{buildroot}%{_libdir}/python%{python_v
%doc %{_docdir}/%{name}/LICENSE
%doc %{_docdir}/%{name}/README.SUSE
%doc %{_mandir}/man1/python.1*
%doc %{_mandir}/man1/python2.1*
%doc %{_mandir}/man1/python%{python_version}.1*
%dir %{_includedir}/python%{python_version}
%{_includedir}/python%{python_version}/pyconfig.h
@ -376,7 +368,7 @@ cp Makefile Makefile.pre.in Makefile.pre %{buildroot}%{_libdir}/python%{python_v
%{_libdir}/python%{python_version}/lib-dynload/_multibytecodec.so
%{_libdir}/python%{python_version}/lib-dynload/Python-%{tarversion}-py%{python_version}.egg-info
# these modules don't support 64-bit arches (disabled by setup.py)
%ifnarch alpha ia64 x86_64 s390x ppc64 sparc64
%ifnarch alpha ia64 x86_64 s390x ppc64 sparc64 aarch64
# requires sizeof(int) == sizeof(long) == sizeof(char*)
%{_libdir}/python%{python_version}/lib-dynload/dl.so
%endif

12
python-distutils-rpm-8.patch
View File

@ -1,8 +1,6 @@
Index: Python-2.6.2/Lib/distutils/command/install.py
===================================================================
--- Python-2.6.2.orig/Lib/distutils/command/install.py
+++ Python-2.6.2/Lib/distutils/command/install.py
@@ -168,6 +168,8 @@ class install (Command):
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -154,6 +154,8 @@
('record=', None,
"filename in which to record list of installed files"),
@ -11,7 +9,7 @@ Index: Python-2.6.2/Lib/distutils/command/install.py
]
boolean_options = ['compile', 'force', 'skip-build', 'user']
@@ -243,6 +245,7 @@ class install (Command):
@@ -229,6 +231,7 @@
#self.install_info = None
self.record = None
@ -19,7 +17,7 @@ Index: Python-2.6.2/Lib/distutils/command/install.py
# -- Option finalizing methods -------------------------------------
@@ -592,12 +595,61 @@ class install (Command):
@@ -578,12 +581,61 @@
self.create_path_file()
# write list of installed files, if requested.

25
python-doc.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Tue Jun 4 13:23:28 UTC 2013 - jmatejek@suse.com
- disable Source URLs for docs (the doc archives are regenerated
every day and autobuild detects this as "upstream file is different"
error)
-------------------------------------------------------------------
Tue May 28 08:42:49 UTC 2013 - speilicke@suse.com
- Update to version 2.7.5
-------------------------------------------------------------------
Thu May 9 16:14:17 UTC 2013 - jmatejek@suse.com
- update to 2.7.4
- removed %docdir/python/README from package (conflict with python-base)
- removed ACKS (is now part of Misc docs)
-------------------------------------------------------------------
Fri Apr 5 13:33:29 UTC 2013 - idonmez@suse.com
- Add Source URL, see https://en.opensuse.org/SourceUrls
- Fix installation so we don't create double sub-directories
-------------------------------------------------------------------
Thu May 17 17:49:31 UTC 2012 - jfunk@funktronics.ca

69
python-doc.spec
View File

@ -22,36 +22,39 @@ License: Python-2.0
Summary: Additional Package Documentation for Python
Url: http://www.python.org/
Group: Development/Languages/Python
%define pyver 2.7.3
%define pyver 2.7.5
%define tarname Python-%{pyver}
Source0: %{tarname}.tar.bz2
Source1: python-%{version}-docs-html.tar.bz2
Source2: python-%{version}-docs-pdf-a4.tar.bz2
Source3: python-%{version}-docs-pdf-letter.tar.bz2
Source0: %{tarname}.tar.xz
# docs for current version are regenerated every day
# this messes with autobuild "file changed" checks
#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
Source1: python-%{pyver}-docs-html.tar.bz2
Source2: python-%{pyver}-docs-pdf-a4.tar.bz2
Source3: 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.3rc2-multilib.patch
Patch3: python-2.7.5-multilib.patch
Patch4: python-2.5.1-sqlite.patch
Patch5: python-2.7.3rc2-canonicalize2.patch
Patch6: python-2.7rc2-configure.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
Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch
Patch13: python-2.7.2-fix_date_time_compiler.patch
Patch15: python-2.7.2-disable-tests-in-test_io.patch
Patch16: pypirc-secure.diff
Patch17: remove-static-libpython.diff
# PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions
Patch18: python-2.7.3-ssl_ca_path.patch
Patch19: python-2.7.3-fix-dbm-64bit-bigendian.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
Patch21: python-2.7.3-multiprocessing-join.patch
# PATCH-FIX-OPENSUSE Import aarch64 support for libffi in _ctypes module
Patch22: ctypes-libffi-aarch64.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
Provides: pyth_ps
@ -82,27 +85,25 @@ Python, and Macintosh Module Reference in PDF format.
# COMMON-PREP-BEGIN
%patch1 -p1
%patch2 -p1
%patch3
%patch4
%patch5
%patch6
%patch7
%patch8
%patch9 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch7 -p1
%patch8 -p1
%patch10 -p1
%patch12
%patch13
%patch13 -p1
#skip test_io test for ppc,ppc64 as it broken.
%ifarch ppc ppc64
%patch15 -p1
%endif
%patch16 -p1
%patch17
%patch18
%patch19 -p1
%patch17 -p1
%patch18 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac
# COMMON-PREP-END
%build
@ -111,15 +112,14 @@ Python, and Macintosh Module Reference in PDF format.
%install
export PDOCS=%{buildroot}%{_docdir}/python
install -d -m 755 $PDOCS/Misc
install -d -m 755 $PDOCS/paper-a4 $PDOCS/paper-letter $PDOCS/html
tar xfj %{SOURCE1} -C $PDOCS/
mv $PDOCS/python-%{version}-docs-html $PDOCS/html
mv $PDOCS/python-%{pyver}-docs-html $PDOCS/html
tar xfj %{SOURCE2} -C $PDOCS
mv $PDOCS/docs-pdf $PDOCS/paper-a4
tar xfj %{SOURCE3} -C $PDOCS
mv $PDOCS/docs-pdf $PDOCS/paper-letter
install -c -m 644 Doc/ACKS.txt $PDOCS/ACKS.txt
install -c -m 644 README $PDOCS/README
# this is part of main package
#install -c -m 644 README $PDOCS/README
for i in Misc/* ; do
[ -f $i ] && install -c -m 644 $i $PDOCS/Misc/
done
@ -129,8 +129,7 @@ done
%dir %{_docdir}/python
%doc %{_docdir}/python/Misc
%doc %{_docdir}/python/html
%doc %{_docdir}/python/ACKS.txt
%doc %{_docdir}/python/README
#%doc %{_docdir}/python/README
%files pdf
%defattr(644,root,root,755)

21
python-test_structmembers.patch
View File

@ -1,21 +0,0 @@
Index: Modules/_testcapimodule.c
===================================================================
--- Modules/_testcapimodule.c (revision 85001)
+++ Modules/_testcapimodule.c (working copy)
@@ -5,6 +5,7 @@
* standard Python regression test, via Lib/test/test_capi.py.
*/
+#define PY_SSIZE_T_CLEAN
#include "Python.h"
#include <float.h>
#include "structmember.h"
@@ -593,7 +594,7 @@
{
PyObject *tuple, *obj;
Py_UNICODE *value;
- int len;
+ Py_ssize_t len;
/* issue4122: Undefined reference to _Py_ascii_whitespace on Windows */
/* Just use the macro and check that it compiles */

33
python.changes
View File

@ -1,3 +1,36 @@
-------------------------------------------------------------------
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,
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
-------------------------------------------------------------------
Thu May 9 16:14:07 UTC 2013 - jmatejek@suse.com
- update to 2.7.4
* bugfix-only release
-------------------------------------------------------------------
Fri Apr 5 13:33:33 UTC 2013 - idonmez@suse.com
- Add Source URL, see https://en.opensuse.org/SourceUrls
-------------------------------------------------------------------
Mon Feb 25 17:24:52 UTC 2013 - jmatejek@suse.com

47
python.spec
View File

@ -16,7 +16,7 @@
#
Name: python
Version: 2.7.3
Version: 2.7.5
Release: 0
License: Python-2.0
Summary: Python Interpreter
@ -24,7 +24,7 @@ Url: http://www.python.org/
Group: Development/Languages/Python
%define tarversion %{version}
%define tarname Python-%{tarversion}
Source0: %{tarname}.tar.bz2
Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz
Source1: README.SUSE
Source2: pythonstart
Source3: python.sh
@ -39,27 +39,22 @@ Source4: python.csh
# COMMON-PATCH-BEGIN
Patch1: python-2.7-dirs.patch
Patch2: python-distutils-rpm-8.patch
Patch3: python-2.7.3rc2-multilib.patch
Patch3: python-2.7.5-multilib.patch
Patch4: python-2.5.1-sqlite.patch
Patch5: python-2.7.3rc2-canonicalize2.patch
Patch6: python-2.7rc2-configure.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
Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch
Patch13: python-2.7.2-fix_date_time_compiler.patch
Patch15: python-2.7.2-disable-tests-in-test_io.patch
Patch16: pypirc-secure.diff
Patch17: remove-static-libpython.diff
# PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions
Patch18: python-2.7.3-ssl_ca_path.patch
Patch19: python-2.7.3-fix-dbm-64bit-bigendian.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
Patch21: python-2.7.3-multiprocessing-join.patch
# PATCH-FIX-OPENSUSE Import aarch64 support for libffi in _ctypes module
Patch22: ctypes-libffi-aarch64.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
BuildRequires: db-devel
@ -73,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}
@ -165,31 +161,26 @@ implementation of the standard Unix DBM databases.
# COMMON-PREP-BEGIN
%patch1 -p1
%patch2 -p1
%patch3
%patch4
%patch5
%patch6
%patch7
%patch8
%patch9 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch7 -p1
%patch8 -p1
%patch10 -p1
%patch12
%patch13
%patch13 -p1
#skip test_io test for ppc,ppc64 as it broken.
%ifarch ppc ppc64
%patch15 -p1
%endif
%patch16 -p1
%patch17
%patch18
%patch19 -p1
%patch17 -p1
%patch18 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
# COMMON-PREP-END
%patch23 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.in
sed -i 's/^version_required/dnl version_required/' configure.ac
# COMMON-PREP-END
# remove newslist.py because of bad license
rm Demo/scripts/newslist.*

14
remove-static-libpython.diff
View File

@ -1,6 +1,6 @@
--- Makefile.pre.in
+++ Makefile.pre.in
@@ -396,7 +396,7 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -434,7 +434,7 @@
# Build the interpreter
@ -9,9 +9,9 @@
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/python.o \
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
@@ -412,18 +412,6 @@
*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
esac
@@ -460,18 +460,6 @@
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-# Build static library
-# avoid long command lines, same as LIBRARY_OBJS
@ -28,7 +28,7 @@
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
@@ -1008,18 +996,6 @@
@@ -1089,18 +1077,6 @@
else true; \
fi; \
done

8
sparc_longdouble.patch
View File

@ -5,11 +5,9 @@ Python ticket 6029
Modules/_ctypes/libffi/src/sparc/ffi.c | 5 +++++
1 file changed, 5 insertions(+)
Index: Python-2.6.5/Modules/_ctypes/libffi/src/sparc/ffi.c
===================================================================
--- Python-2.6.5.orig/Modules/_ctypes/libffi/src/sparc/ffi.c
+++ Python-2.6.5/Modules/_ctypes/libffi/src/sparc/ffi.c
@@ -586,6 +586,11 @@ ffi_closure_sparc_inner_v9(ffi_closure *
--- a/Modules/_ctypes/libffi/src/sparc/ffi.c
+++ b/Modules/_ctypes/libffi/src/sparc/ffi.c
@@ -652,6 +652,11 @@
}
else
{