[gentoo-commits] repo/gentoo:master commit in: dev-python/pyopenssl/, dev-python/pyopenssl/files/

[Stefan Strogin]

commit:     ed217e133fe9313a47ef34da94239693ce72440c
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  2 12:23:52 2020 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Wed Dec  2 12:25:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed217e13

dev-python/pyopenssl: add patch for LibreSSL

Closes: https://bugs.gentoo.org/757738
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 .../files/pyopenssl-20.0.0-libressl.patch          | 30 ++++++++++++++++++++++
 ...sl-20.0.0.ebuild => pyopenssl-20.0.0-r1.ebuild} |  2 ++
 2 files changed, 32 insertions(+)

diff --git a/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch b/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch
new file mode 100644
index 00000000000..6e9c7847fce
--- /dev/null
+++ b/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch
@@ -0,0 +1,30 @@
+From ecbd275386e5608f0f90d3536506d7f50026ffe6 Mon Sep 17 00:00:00 2001
+From: "Nathaniel J. Smith" <njs@×××××.com>
+Date: Thu, 1 Aug 2019 21:23:51 -0700
+Subject: [PATCH] Support openssl <1.1.1
+
+Upstream-Status: Inappropriate
+[https://github.com/pyca/pyopenssl/pull/861/commits/ecbd275386e5608f0f90d3536506d7f50026ffe6
+was accepted in 19.1.0 but later removed since the upstream dropped
+support of OpenSSL <1.1.1]
+Signed-off-by: Stefan Strogin <steils@g.o>
+---
+ src/OpenSSL/SSL.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
+index 6f785fc4..55211511 100644
+--- a/src/OpenSSL/SSL.py
++++ b/src/OpenSSL/SSL.py
+@@ -140,7 +140,10 @@ class _buffer(object):
+ OP_NO_TLSv1 = _lib.SSL_OP_NO_TLSv1
+ OP_NO_TLSv1_1 = _lib.SSL_OP_NO_TLSv1_1
+ OP_NO_TLSv1_2 = _lib.SSL_OP_NO_TLSv1_2
+-OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
++try:
++    OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
++except AttributeError:
++    pass
+ 
+ MODE_RELEASE_BUFFERS = _lib.SSL_MODE_RELEASE_BUFFERS
+ 

diff --git a/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
similarity index 96%
rename from dev-python/pyopenssl/pyopenssl-20.0.0.ebuild
rename to dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
index b09f1b1bdec..0e4a096a48a 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}
 		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
 distutils_enable_sphinx doc \
 	dev-python/sphinx_rtd_theme