From 59c60b083e2f942bab10fc8d3c1d179e477b6a0f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 3 Jan 2015 16:41:42 +0100 Subject: [PATCH] Python: update to Python-2.7.9 Signed-off-by: Stephan Raue --- packages/lang/Python/package.mk | 2 +- ....patch => Python-2.7.9-001_xcompile.patch} | 0 ...h => Python-2.7.9-002_xcompile_path.patch} | 0 ...-2.7.9-003_xcompile_disable_modules.patch} | 0 ...9-004_xcompile_fix_libffi_configure.patch} | 0 ...005_dont_generate_pyo_and_pyc_files.patch} | 0 ...Python-2.7.9-008-reread-environment.patch} | 0 ...=> Python-2.7.9-009-distutils-rpath.patch} | 0 ...h => Python-2.7.9-015_no_static_lib.patch} | 0 ...thon-2.7.9-016-default-is-optimized.patch} | 0 ...n-2.7.9-020-remove_RAND-egd-support.patch} | 43 +++++++++---------- 11 files changed, 21 insertions(+), 24 deletions(-) rename packages/lang/Python/patches/{Python-2.7.8-001_xcompile.patch => Python-2.7.9-001_xcompile.patch} (100%) rename packages/lang/Python/patches/{Python-2.7.8-002_xcompile_path.patch => Python-2.7.9-002_xcompile_path.patch} (100%) rename packages/lang/Python/patches/{Python-2.7.8-003_xcompile_disable_modules.patch => Python-2.7.9-003_xcompile_disable_modules.patch} (100%) rename packages/lang/Python/patches/{Python-2.7.8-004_xcompile_fix_libffi_configure.patch => Python-2.7.9-004_xcompile_fix_libffi_configure.patch} (100%) rename packages/lang/Python/patches/{Python-2.7.8-005_dont_generate_pyo_and_pyc_files.patch => Python-2.7.9-005_dont_generate_pyo_and_pyc_files.patch} (100%) rename packages/lang/Python/patches/{Python-2.7.8-008-reread-environment.patch => Python-2.7.9-008-reread-environment.patch} (100%) rename packages/lang/Python/patches/{Python-2.7.8-009-distutils-rpath.patch => Python-2.7.9-009-distutils-rpath.patch} (100%) rename packages/lang/Python/patches/{Python-2.7.8-015_no_static_lib.patch => Python-2.7.9-015_no_static_lib.patch} (100%) rename packages/lang/Python/patches/{Python-2.7.8-016-default-is-optimized.patch => Python-2.7.9-016-default-is-optimized.patch} (100%) rename packages/lang/Python/patches/{Python-2.7.8-020-remove_RAND-egd-support.patch => Python-2.7.9-020-remove_RAND-egd-support.patch} (61%) diff --git a/packages/lang/Python/package.mk b/packages/lang/Python/package.mk index 311aa4a77f2..50ae5f3c203 100644 --- a/packages/lang/Python/package.mk +++ b/packages/lang/Python/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="Python" -PKG_VERSION="2.7.8" +PKG_VERSION="2.7.9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/lang/Python/patches/Python-2.7.8-001_xcompile.patch b/packages/lang/Python/patches/Python-2.7.9-001_xcompile.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.8-001_xcompile.patch rename to packages/lang/Python/patches/Python-2.7.9-001_xcompile.patch diff --git a/packages/lang/Python/patches/Python-2.7.8-002_xcompile_path.patch b/packages/lang/Python/patches/Python-2.7.9-002_xcompile_path.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.8-002_xcompile_path.patch rename to packages/lang/Python/patches/Python-2.7.9-002_xcompile_path.patch diff --git a/packages/lang/Python/patches/Python-2.7.8-003_xcompile_disable_modules.patch b/packages/lang/Python/patches/Python-2.7.9-003_xcompile_disable_modules.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.8-003_xcompile_disable_modules.patch rename to packages/lang/Python/patches/Python-2.7.9-003_xcompile_disable_modules.patch diff --git a/packages/lang/Python/patches/Python-2.7.8-004_xcompile_fix_libffi_configure.patch b/packages/lang/Python/patches/Python-2.7.9-004_xcompile_fix_libffi_configure.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.8-004_xcompile_fix_libffi_configure.patch rename to packages/lang/Python/patches/Python-2.7.9-004_xcompile_fix_libffi_configure.patch diff --git a/packages/lang/Python/patches/Python-2.7.8-005_dont_generate_pyo_and_pyc_files.patch b/packages/lang/Python/patches/Python-2.7.9-005_dont_generate_pyo_and_pyc_files.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.8-005_dont_generate_pyo_and_pyc_files.patch rename to packages/lang/Python/patches/Python-2.7.9-005_dont_generate_pyo_and_pyc_files.patch diff --git a/packages/lang/Python/patches/Python-2.7.8-008-reread-environment.patch b/packages/lang/Python/patches/Python-2.7.9-008-reread-environment.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.8-008-reread-environment.patch rename to packages/lang/Python/patches/Python-2.7.9-008-reread-environment.patch diff --git a/packages/lang/Python/patches/Python-2.7.8-009-distutils-rpath.patch b/packages/lang/Python/patches/Python-2.7.9-009-distutils-rpath.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.8-009-distutils-rpath.patch rename to packages/lang/Python/patches/Python-2.7.9-009-distutils-rpath.patch diff --git a/packages/lang/Python/patches/Python-2.7.8-015_no_static_lib.patch b/packages/lang/Python/patches/Python-2.7.9-015_no_static_lib.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.8-015_no_static_lib.patch rename to packages/lang/Python/patches/Python-2.7.9-015_no_static_lib.patch diff --git a/packages/lang/Python/patches/Python-2.7.8-016-default-is-optimized.patch b/packages/lang/Python/patches/Python-2.7.9-016-default-is-optimized.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.8-016-default-is-optimized.patch rename to packages/lang/Python/patches/Python-2.7.9-016-default-is-optimized.patch diff --git a/packages/lang/Python/patches/Python-2.7.8-020-remove_RAND-egd-support.patch b/packages/lang/Python/patches/Python-2.7.9-020-remove_RAND-egd-support.patch similarity index 61% rename from packages/lang/Python/patches/Python-2.7.8-020-remove_RAND-egd-support.patch rename to packages/lang/Python/patches/Python-2.7.9-020-remove_RAND-egd-support.patch index 50f8f85e462..fa8639ad5c2 100644 --- a/packages/lang/Python/patches/Python-2.7.8-020-remove_RAND-egd-support.patch +++ b/packages/lang/Python/patches/Python-2.7.9-020-remove_RAND-egd-support.patch @@ -1,8 +1,7 @@ -diff --git a/Lib/socket.py b/Lib/socket.py -index aac04f6..02aa293 100644 ---- a/Lib/socket.py -+++ b/Lib/socket.py -@@ -67,7 +67,6 @@ else: +diff -Naur Python-2.7.9/Lib/socket.py Python-2.7.9.patch/Lib/socket.py +--- Python-2.7.9/Lib/socket.py 2014-12-10 16:59:40.000000000 +0100 ++++ Python-2.7.9.patch/Lib/socket.py 2015-01-03 14:29:58.115421938 +0100 +@@ -67,7 +67,6 @@ from _ssl import SSLError as sslerror from _ssl import \ RAND_add, \ @@ -10,24 +9,22 @@ index aac04f6..02aa293 100644 RAND_status, \ SSL_ERROR_ZERO_RETURN, \ SSL_ERROR_WANT_READ, \ -diff --git a/Lib/ssl.py b/Lib/ssl.py -index 666cea3..64e196a 100644 ---- a/Lib/ssl.py -+++ b/Lib/ssl.py -@@ -62,7 +62,7 @@ import _ssl # if we can't import it, let the error propagate - from _ssl import OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_INFO, OPENSSL_VERSION - from _ssl import SSLError - from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED +diff -Naur Python-2.7.9/Lib/ssl.py Python-2.7.9.patch/Lib/ssl.py +--- Python-2.7.9/Lib/ssl.py 2014-12-10 16:59:40.000000000 +0100 ++++ Python-2.7.9.patch/Lib/ssl.py 2015-01-03 14:30:32.551484567 +0100 +@@ -106,7 +106,7 @@ + from _ssl import (VERIFY_DEFAULT, VERIFY_CRL_CHECK_LEAF, VERIFY_CRL_CHECK_CHAIN, + VERIFY_X509_STRICT) + from _ssl import txt2obj as _txt2obj, nid2obj as _nid2obj -from _ssl import RAND_status, RAND_egd, RAND_add +from _ssl import RAND_status, RAND_add - from _ssl import \ - SSL_ERROR_ZERO_RETURN, \ - SSL_ERROR_WANT_READ, \ -diff --git a/Modules/_ssl.c b/Modules/_ssl.c -index 752b033..9541df7 100644 ---- a/Modules/_ssl.c -+++ b/Modules/_ssl.c -@@ -1601,32 +1601,6 @@ Returns 1 if the OpenSSL PRNG has been seeded with enough data and 0 if not.\n\ + + def _import_symbols(prefix): + for n in dir(_ssl): +diff -Naur Python-2.7.9/Modules/_ssl.c Python-2.7.9.patch/Modules/_ssl.c +--- Python-2.7.9/Modules/_ssl.c 2014-12-10 16:59:53.000000000 +0100 ++++ Python-2.7.9.patch/Modules/_ssl.c 2015-01-03 14:31:22.944576245 +0100 +@@ -3301,32 +3301,6 @@ It is necessary to seed the PRNG with RAND_add() on some platforms before\n\ using the ssl() function."); @@ -60,11 +57,11 @@ index 752b033..9541df7 100644 #endif /* HAVE_OPENSSL_RAND */ -@@ -1640,8 +1614,6 @@ static PyMethodDef PySSL_methods[] = { +@@ -3720,8 +3694,6 @@ #ifdef HAVE_OPENSSL_RAND {"RAND_add", PySSL_RAND_add, METH_VARARGS, PySSL_RAND_add_doc}, -- {"RAND_egd", PySSL_RAND_egd, METH_O, +- {"RAND_egd", PySSL_RAND_egd, METH_VARARGS, - PySSL_RAND_egd_doc}, {"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS, PySSL_RAND_status_doc},