rpm/python
SHA256
1
0
Fork 0
forked from pool/python
Code Pull Requests Activity

Accepting request 176926 from home:saschpe:branches:devel:languages:python:Factory

Browse Source 
- 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:
  + 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

OBS-URL: https://build.opensuse.org/request/show/176926
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=141
This commit is contained in:
Jan Matejek
2013-06-03 10:24:54 +00:00
committed by Git OBS Bridge
parent e2d644f110
commit 58c938cba7
31 changed files with 192 additions and 3531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3220
ctypes-libffi-aarch64.patch
View File

File diff suppressed because it is too large Load Diff

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

16
python-2.7.1-distutils_test_path.patch
View File

@@ -1,8 +1,6 @@
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
--- 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
@@ -27,11 +25,9 @@ Index: Python-2.7/Lib/distutils/tests/test_build_ext.py
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__':
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1547,16 +1547,5 @@
if not os.path.exists(TEMPDIR):
os.mkdir(TEMPDIR)

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 {

20
python-2.7.4-canonicalize2.patch
View File

@@ -1,7 +1,5 @@
Index: Python/sysmodule.c
===================================================================
--- Python/sysmodule.c.orig 2013-05-09 15:58:55.927351218 +0200
+++ Python/sysmodule.c 2013-05-09 16:02:24.137048172 +0200
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1620,7 +1620,20 @@
char *p = NULL;
Py_ssize_t n = 0;
@@ -56,10 +54,8 @@ Index: Python/sysmodule.c
if (PyList_Insert(path, 0, a) < 0)
Py_FatalError("sys.path.insert(0) failed");
Py_DECREF(a);
Index: pyconfig.h.in
===================================================================
--- pyconfig.h.in.orig 2013-05-09 15:58:55.941351601 +0200
+++ pyconfig.h.in 2013-05-09 16:02:24.138048200 +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
@@ -70,11 +66,9 @@ Index: pyconfig.h.in
/* Define to 1 if you have the `chown' function. */
#undef HAVE_CHOWN
Index: configure.ac
===================================================================
--- configure.ac.orig 2013-04-06 16:02:41.000000000 +0200
+++ configure.ac 2013-05-09 16:03:05.624184370 +0200
@@ -2878,7 +2878,7 @@
--- 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 \

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

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

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

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

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

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

104
python-2.7.4-multilib.patch
View File

@@ -1,8 +1,6 @@
Index: configure.ac
===================================================================
--- configure.ac.orig 2012-03-16 02:26:39.000000000 +0100
+++ configure.ac 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.ac
AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY)
Index: Include/pythonrun.h
===================================================================
--- Include/pythonrun.h.orig 2013-05-09 15:56:43.404729874 +0200
+++ Include/pythonrun.h 2013-05-09 15:56:45.143777371 +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 2013-05-09 15:56:43.405729901 +0200
+++ Lib/distutils/command/install.py 2013-05-09 15:56:45.144777398 +0200
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -22,6 +22,8 @@
from site import USER_SITE
@@ -79,10 +73,8 @@ 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 2013-05-09 15:56:43.405729901 +0200
+++ Lib/distutils/sysconfig.py 2013-05-09 15:56:45.144777398 +0200
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -119,8 +119,11 @@
prefix = plat_specific and EXEC_PREFIX or PREFIX
@@ -97,10 +89,8 @@ Index: Lib/distutils/sysconfig.py
if standard_lib:
return libpython
else:
Index: Lib/pydoc.py
===================================================================
--- Lib/pydoc.py.orig 2013-05-09 15:56:43.406729928 +0200
+++ Lib/pydoc.py 2013-05-09 15:56:45.145777426 +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 2013-05-09 15:56:43.407729956 +0200
+++ Lib/site.py 2013-05-09 15:56:45.146777453 +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 2013-05-09 15:56:43.408729983 +0200
+++ Lib/sysconfig.py 2013-05-09 15:56:45.146777453 +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 2013-05-09 15:56:43.408729983 +0200
+++ Lib/test/test_dl.py 2013-05-09 15:56:45.146777453 +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 2013-05-09 15:56:43.409730010 +0200
+++ Lib/test/test_site.py 2013-05-09 15:56:45.146777453 +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 2013-05-09 15:56:43.409730010 +0200
+++ Lib/trace.py 2013-05-09 15:56:45.147777480 +0200
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -754,10 +754,10 @@
# should I also call expanduser? (after all, could use $HOME)
@@ -227,10 +207,8 @@ 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 2013-05-09 15:56:43.410730038 +0200
+++ Makefile.pre.in 2013-05-09 15:56:45.147777480 +0200
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -87,6 +87,8 @@
# Machine-dependent subdirectories
@@ -240,7 +218,7 @@ Index: Makefile.pre.in
# Multiarch directory (may be empty)
MULTIARCH= @MULTIARCH@
@@ -574,6 +576,7 @@
@@ -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
@@ -616,7 +619,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 2013-05-09 15:56:43.411730065 +0200
+++ Modules/getpath.c 2013-05-09 15:56:45.148777508 +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 2013-05-09 15:56:43.411730065 +0200
+++ Python/getplatform.c 2013-05-09 15:56:45.148777508 +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 2013-05-09 15:56:43.412730092 +0200
+++ Python/sysmodule.c 2013-05-09 15:56:45.149777535 +0200
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1419,6 +1419,10 @@
PyString_FromString(Py_GetCopyright()));
SET_SYS_FROM_STRING("platform",
@@ -327,10 +299,8 @@ Index: Python/sysmodule.c
SET_SYS_FROM_STRING("executable",
PyString_FromString(Py_GetProgramFullPath()));
SET_SYS_FROM_STRING("prefix",
Index: setup.py
===================================================================
--- setup.py.orig 2013-05-09 15:56:43.414730147 +0200
+++ setup.py 2013-05-09 15:56:45.150777562 +0200
--- a/setup.py
+++ b/setup.py
@@ -437,7 +437,7 @@
def detect_modules(self):
@@ -338,9 +308,9 @@ Index: setup.py
- 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()
@@ -755,11 +755,11 @@
@@ -756,11 +756,11 @@
elif curses_library:
readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
@@ -354,7 +324,7 @@ Index: setup.py
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
@@ -1860,18 +1860,17 @@
@@ -1861,18 +1861,17 @@
# Check for various platform-specific directories
if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include')

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:90152532d4b7e87e52a464b4add626c7247b4db7bbd0d6ba9973fe823df72a7a
size 4460216

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:e8f46d251f6c7d4a9122b1eb32771bd3d715a83f42e0dae0c08ea2b8831cb824
size 10315479

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:27ae1c6e4b47832b7e0be4d1c34f5fd6cfae96b6363808ad021420c84b4041b2
size 10368275

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,

22
python-base.changes
View File

@@ -1,3 +1,25 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Mon May 13 09:24:29 UTC 2013 - dmueller@suse.com

27
python-base.spec
View File

@@ -18,7 +18,7 @@
Name: python-base
Version: 2.7.4
Version: 2.7.5
Release: 0
License: Python-2.0
Summary: Python Interpreter base package
@@ -37,22 +37,17 @@ Patch2: python-distutils-rpm-8.patch
Patch3: python-2.7.4-multilib.patch
Patch4: python-2.5.1-sqlite.patch
Patch5: python-2.7.4-canonicalize2.patch
Patch6: python-2.7rc2-configure.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
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
# PATCH-FIX-OPENSUSE Import aarch64 support for libffi in _ctypes module
Patch22: ctypes-libffi-aarch64.patch
Patch23: python-2.7.4-no-REUSEPORT.patch
# COMMON-PATCH-END
%define python_version %(echo %{tarversion} | head -c 3)
@@ -125,25 +120,21 @@ other applications.
# COMMON-PREP-BEGIN
%patch1 -p1
%patch2 -p1
%patch3
%patch4
%patch5
#%patch6
%patch7
%patch8
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch12
%patch13
%patch13 -p1
#skip test_io test for ppc,ppc64 as it broken.
%ifarch ppc ppc64
%patch15 -p1
%endif
%patch17
%patch18
%patch19 -p1
%patch17 -p1
%patch18 -p1
%patch20 -p1
#%patch22 -p1
%patch23 -p1
# drop Autoconf version requirement

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.

22
python-doc.changes
View File

@@ -1,3 +1,25 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Thu May 9 16:14:17 UTC 2013 - jmatejek@suse.com

33
python-doc.spec
View File

@@ -22,7 +22,7 @@ License: Python-2.0
Summary: Additional Package Documentation for Python
Url: http://www.python.org/
Group: Development/Languages/Python
%define pyver 2.7.4
%define pyver 2.7.5
%define tarname Python-%{pyver}
Source0: %{tarname}.tar.bz2
Source1: http://docs.python.org/%{version}/archives/python-%{pyver}-docs-html.tar.bz2
@@ -34,24 +34,18 @@ Patch2: python-distutils-rpm-8.patch
Patch3: python-2.7.4-multilib.patch
Patch4: python-2.5.1-sqlite.patch
Patch5: python-2.7.4-canonicalize2.patch
Patch6: python-2.7rc2-configure.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
Patch23: python-2.7.4-no-REUSEPORT.patch
# COMMON-PATCH-END
Provides: pyth_doc
Provides: pyth_ps
@@ -82,27 +76,22 @@ Python, and Macintosh Module Reference in PDF format.
# COMMON-PREP-BEGIN
%patch1 -p1
%patch2 -p1
%patch3
%patch4
%patch5
#%patch6
%patch7
%patch8
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch7 -p1
%patch8 -p1
%patch9 -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

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 */

23
python.changes
View File

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

33
python.spec
View File

@@ -16,7 +16,7 @@
#
Name: python
Version: 2.7.4
Version: 2.7.5
Release: 0
License: Python-2.0
Summary: Python Interpreter
@@ -42,24 +42,18 @@ Patch2: python-distutils-rpm-8.patch
Patch3: python-2.7.4-multilib.patch
Patch4: python-2.5.1-sqlite.patch
Patch5: python-2.7.4-canonicalize2.patch
Patch6: python-2.7rc2-configure.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
Patch23: python-2.7.4-no-REUSEPORT.patch
# COMMON-PATCH-END
BuildRequires: automake
BuildRequires: db-devel
@@ -165,27 +159,22 @@ implementation of the standard Unix DBM databases.
# COMMON-PREP-BEGIN
%patch1 -p1
%patch2 -p1
%patch3
%patch4
%patch5
#%patch6
%patch7
%patch8
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch7 -p1
%patch8 -p1
%patch9 -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

10
remove-static-libpython.diff
View File

@@ -1,7 +1,5 @@
Index: Makefile.pre.in
===================================================================
--- Makefile.pre.in.orig 2013-05-09 16:43:42.529229385 +0200
+++ Makefile.pre.in 2013-05-09 16:43:42.562230253 +0200
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -434,7 +434,7 @@
@@ -11,7 +9,7 @@ Index: Makefile.pre.in
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/python.o \
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
@@ -455,18 +455,6 @@
@@ -460,18 +460,6 @@
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
@@ -30,7 +28,7 @@ Index: Makefile.pre.in
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
@@ -1084,18 +1072,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
{