summaryrefslogtreecommitdiff
path: root/lang/python27/files/patch-Modules___ssl.c
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2015-07-03 13:27:40 +0000
committerBernard Spil <brnrd@FreeBSD.org>2015-07-03 13:27:40 +0000
commit9390be9165c7248208eb40596ee57ee9a9ae2175 (patch)
treea3bb027b3755b181927204f8d9d39d61af6cd430 /lang/python27/files/patch-Modules___ssl.c
parent- Add missing change in 1.32.0 update (diff)
lang/python: Update to 2.7.10
The FreeBSD Python team welcomes Python 2.7.10 to the Ports tree! Announcement: https://www.python.org/downloads/release/python-2710/ Changelog: https://hg.python.org/cpython/raw-file/v2.7.10/Misc/NEWS Important changes for this release: - Python 2.7.10 is a bug fix release of the Python 2.7.x series. - Fixes issues with LibreSSL 2.2+ PR: 192511, 201088 Differentialr Revision: D2637 Reviewed by: koobs (mentor), vsevolod (mentor), antoine Approved by: koobs (mentor)
Diffstat (limited to 'lang/python27/files/patch-Modules___ssl.c')
-rw-r--r--lang/python27/files/patch-Modules___ssl.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/lang/python27/files/patch-Modules___ssl.c b/lang/python27/files/patch-Modules___ssl.c
new file mode 100644
index 000000000000..305e643f701c
--- /dev/null
+++ b/lang/python27/files/patch-Modules___ssl.c
@@ -0,0 +1,23 @@
+# Since LibreSSL 2.2.0 there is a define OPENSSL_NO_EGD
+# Upstreamed Issue http://bugs.python.org/24557
+
+--- Modules/_ssl.c.orig 2015-05-23 16:09:19 UTC
++++ Modules/_ssl.c
+@@ -3380,7 +3380,7 @@ using the ssl() function.");
+ #endif /* HAVE_OPENSSL_RAND */
+
+
+-#ifdef HAVE_RAND_EGD
++#ifndef OPENSSL_NO_EGD
+
+ static PyObject *
+ PySSL_RAND_egd(PyObject *self, PyObject *arg)
+@@ -3804,7 +3804,7 @@ static PyMethodDef PySSL_methods[] = {
+ {"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
+ PySSL_RAND_status_doc},
+ #endif
+-#ifdef HAVE_RAND_EGD
++#ifndef OPENSSL_NO_EGD
+ {"RAND_egd", PySSL_RAND_egd, METH_VARARGS,
+ PySSL_RAND_egd_doc},
+ #endif