diff --git a/srcpkgs/python/patches/patch-Lib_ssl_py b/srcpkgs/python/patches/patch-Lib_ssl_py index 5f29bfec91d..156a707172e 100644 --- a/srcpkgs/python/patches/patch-Lib_ssl_py +++ b/srcpkgs/python/patches/patch-Lib_ssl_py @@ -1,12 +1,11 @@ -$OpenBSD: patch-Lib_ssl_py,v 1.1 2014/04/19 13:53:15 espie Exp $ ---- Lib/ssl.py.orig Sat Apr 19 15:49:44 2014 -+++ Lib/ssl.py Sat Apr 19 15:49:58 2014 -@@ -62,7 +62,7 @@ import _ssl # if we can't import it, let t - from _ssl import OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_INFO, OPENSSL_VERSION - from _ssl import SSLError - from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED +--- 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 - from _ssl import \ - SSL_ERROR_ZERO_RETURN, \ - SSL_ERROR_WANT_READ, \ + + 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 index 2c12751b3b7..f1251fcd4d2 100644 --- a/srcpkgs/python/patches/patch-Modules__ssl_c +++ b/srcpkgs/python/patches/patch-Modules__ssl_c @@ -1,7 +1,6 @@ -$OpenBSD: patch-Modules__ssl_c,v 1.2 2014/07/11 06:59:43 rpointel Exp $ ---- Modules/_ssl.c.orig Mon Jun 30 04:05:42 2014 -+++ Modules/_ssl.c Wed Jul 9 11:41:16 2014 -@@ -1601,32 +1601,6 @@ Returns 1 if the OpenSSL PRNG has been seeded with eno +--- 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."); @@ -34,11 +33,11 @@ $OpenBSD: patch-Modules__ssl_c,v 1.2 2014/07/11 06:59:43 rpointel Exp $ #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}, diff --git a/srcpkgs/python/template b/srcpkgs/python/template index 13d2854e562..f8ac588337b 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.8 -revision=6 +version=2.7.9 +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=edde10a0cb7d14e2735e682882d5b287028d1485c456758154c19573db68075a +checksum=90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916 pre_configure() { # Ensure that internal copies of expat, libffi and zlib are not used.