summary refs log tree commit diff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2015-01-17 14:14:35 +0100
committerDomen Kožar <domen@dev.si>2015-01-17 14:15:18 +0100
commitc611f5837ce08335ffe6274541cd3dd134b97ae5 (patch)
tree34bd6ed493d192e10c2820e2b64607d74c806751 /pkgs/development/python-modules
parentca6434dcaae1c622f3d332f78aeaff1690db80a1 (diff)
downloadnixlib-c611f5837ce08335ffe6274541cd3dd134b97ae5.tar
nixlib-c611f5837ce08335ffe6274541cd3dd134b97ae5.tar.gz
nixlib-c611f5837ce08335ffe6274541cd3dd134b97ae5.tar.bz2
nixlib-c611f5837ce08335ffe6274541cd3dd134b97ae5.tar.lz
nixlib-c611f5837ce08335ffe6274541cd3dd134b97ae5.tar.xz
nixlib-c611f5837ce08335ffe6274541cd3dd134b97ae5.tar.zst
nixlib-c611f5837ce08335ffe6274541cd3dd134b97ae5.zip
fix gevent/eventlet on python 2.7.9, fixes #5782
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/gevent_sslwrap.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/gevent_sslwrap.patch b/pkgs/development/python-modules/gevent_sslwrap.patch
new file mode 100644
index 000000000000..6f104a638f07
--- /dev/null
+++ b/pkgs/development/python-modules/gevent_sslwrap.patch
@@ -0,0 +1,28 @@
+Index: b/gevent/ssl.py
+===================================================================
+--- a/gevent/ssl.py
++++ b/gevent/ssl.py
+@@ -81,15 +81,14 @@ class SSLSocket(socket):
+             self._sslobj = None
+         else:
+             # yes, create the SSL object
+-            if ciphers is None:
+-                self._sslobj = _ssl.sslwrap(self._sock, server_side,
+-                                            keyfile, certfile,
+-                                            cert_reqs, ssl_version, ca_certs)
+-            else:
+-                self._sslobj = _ssl.sslwrap(self._sock, server_side,
+-                                            keyfile, certfile,
+-                                            cert_reqs, ssl_version, ca_certs,
+-                                            ciphers)
++            ctx = SSLContext(ssl_version)
++            if keyfile or certfile:
++                ctx.load_cert_chain(certfile, keyfile)
++            if ca_certs:
++                ctx.load_verify_locations(ca_certs)
++            if ciphers:
++                ctx.set_ciphers(ciphers)
++            self._sslobj = ctx._wrap_socket(self._sock, server_side=server_side)
+             if do_handshake_on_connect:
+                 self.do_handshake()
+         self.keyfile = keyfile