diff --git a/srcpkgs/python/patches/patch-Lib_socket_py b/srcpkgs/python/patches/patch-Lib_socket_py deleted file mode 100644 index f67c0bf6fb..0000000000 --- a/srcpkgs/python/patches/patch-Lib_socket_py +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-Lib_socket_py,v 1.1 2014/04/19 14:17:47 espie Exp $ ---- Lib/socket.py.orig Sat Apr 19 16:07:48 2014 -+++ Lib/socket.py Sat Apr 19 16:07:54 2014 -@@ -67,7 +67,6 @@ else: - from _ssl import SSLError as sslerror - from _ssl import \ - RAND_add, \ -- RAND_egd, \ - RAND_status, \ - SSL_ERROR_ZERO_RETURN, \ - SSL_ERROR_WANT_READ, \ diff --git a/srcpkgs/python/patches/patch-Lib_ssl_py b/srcpkgs/python/patches/patch-Lib_ssl_py deleted file mode 100644 index 156a707172..0000000000 --- a/srcpkgs/python/patches/patch-Lib_ssl_py +++ /dev/null @@ -1,11 +0,0 @@ ---- Lib/ssl.py.orig 2014-12-10 20:17:54.474351131 +0000 -+++ Lib/ssl.py 2014-12-10 20:18:04.791994596 +0000 -@@ -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 - - def _import_symbols(prefix): - for n in dir(_ssl): diff --git a/srcpkgs/python/patches/patch-Modules__ssl_c b/srcpkgs/python/patches/patch-Modules__ssl_c deleted file mode 100644 index f1251fcd4d..0000000000 --- a/srcpkgs/python/patches/patch-Modules__ssl_c +++ /dev/null @@ -1,44 +0,0 @@ ---- Modules/_ssl.c.orig 2014-12-10 20:20:14.442511336 +0000 -+++ Modules/_ssl.c 2014-12-10 20:21:40.094552482 +0000 -@@ -3301,32 +3301,6 @@ - It is necessary to seed the PRNG with RAND_add() on some platforms before\n\ - using the ssl() function."); - --static PyObject * --PySSL_RAND_egd(PyObject *self, PyObject *arg) --{ -- int bytes; -- -- if (!PyString_Check(arg)) -- return PyErr_Format(PyExc_TypeError, -- "RAND_egd() expected string, found %s", -- Py_TYPE(arg)->tp_name); -- bytes = RAND_egd(PyString_AS_STRING(arg)); -- if (bytes == -1) { -- PyErr_SetString(PySSLErrorObject, -- "EGD connection failed or EGD did not return " -- "enough data to seed the PRNG"); -- return NULL; -- } -- return PyInt_FromLong(bytes); --} -- --PyDoc_STRVAR(PySSL_RAND_egd_doc, --"RAND_egd(path) -> bytes\n\ --\n\ --Queries the entropy gather daemon (EGD) on the socket named by 'path'.\n\ --Returns number of bytes read. Raises SSLError if connection to EGD\n\ --fails or if it does not provide enough data to seed PRNG."); -- - #endif /* HAVE_OPENSSL_RAND */ - - -@@ -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_VARARGS, -- PySSL_RAND_egd_doc}, - {"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS, - PySSL_RAND_status_doc}, - #endif diff --git a/srcpkgs/python/template b/srcpkgs/python/template index ff60f6aa1f..a109b6e74a 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -3,8 +3,8 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter". # pkgname=python -version=2.7.9 -revision=6 +version=2.7.10 +revision=1 wrksrc="Python-${version}" hostmakedepends="pkg-config" makedepends=" @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="http://www.python.org" license="PSF" distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.xz" -checksum=90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916 +checksum=1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0 pre_configure() { # Ensure that internal copies of expat, libffi and zlib are not used.