Python: update to Python-2.7.9

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2015-01-03 16:41:42 +01:00
parent 3ceb1fe8e7
commit 59c60b083e
11 changed files with 21 additions and 24 deletions

View File

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

View File

@ -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},