diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-07-24 02:52:00 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-24 02:52:00 +0100 |
commit | e19b21c73e5feac42ade97baf3eeb45c58a2f234 (patch) | |
tree | f524a01a657ca0dd25be3a5bf70fbb6b694b0275 /app-emulation/ganeti/files/ganeti-2.15.2-pyopenssl.patch | |
parent | fceabcd48faf4c890719a14ac4ed93b6b7993364 (diff) |
gentoo auto-resync : 24:07:2022 - 02:51:59
Diffstat (limited to 'app-emulation/ganeti/files/ganeti-2.15.2-pyopenssl.patch')
-rw-r--r-- | app-emulation/ganeti/files/ganeti-2.15.2-pyopenssl.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/app-emulation/ganeti/files/ganeti-2.15.2-pyopenssl.patch b/app-emulation/ganeti/files/ganeti-2.15.2-pyopenssl.patch deleted file mode 100644 index 882c4f19acbe..000000000000 --- a/app-emulation/ganeti/files/ganeti-2.15.2-pyopenssl.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/lib/http/__init__.py -+++ b/lib/http/__init__.py -@@ -88,6 +88,12 @@ - # send/receive quantum - SOCK_BUF_SIZE = 32768 - -+# OpenSSL.SSL.ConnectionType was deprecated in pyopenssl-19.1.0: -+try: -+ ssl_conn_type = OpenSSL.SSL.Connection -+except AttributeError: -+ ssl_conn_type = OpenSSL.SSL.ConnectionType -+ - - class HttpError(Exception): - """Internal exception for HTTP errors. -@@ -377,7 +383,7 @@ - - # Handshake is only supported by SSL sockets - if (op == SOCKOP_HANDSHAKE and -- not isinstance(sock, OpenSSL.SSL.ConnectionType)): -+ not isinstance(sock, ssl_conn_type)): - return - - # No override by default -@@ -414,7 +420,7 @@ - return sock.recv(arg1) - - elif op == SOCKOP_SHUTDOWN: -- if isinstance(sock, OpenSSL.SSL.ConnectionType): -+ if isinstance(sock, ssl_conn_type): - # PyOpenSSL's shutdown() doesn't take arguments - return sock.shutdown() - else: |