Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyopenssl/files/
Date: Fri, 30 Apr 2021 23:27:53
Message-Id: 1619825245.4bd02b6404d5cfaae416d6dad4b52a9391b1ee0c.sam@gentoo
1 commit: 4bd02b6404d5cfaae416d6dad4b52a9391b1ee0c
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 30 23:15:37 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 30 23:27:25 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bd02b64
7
8 dev-python/pyopenssl: drop obsolete LibreSSL patch
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 .../files/pyopenssl-20.0.0-libressl.patch | 30 ----------------------
13 1 file changed, 30 deletions(-)
14
15 diff --git a/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch b/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch
16 deleted file mode 100644
17 index 6e9c7847fce..00000000000
18 --- a/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch
19 +++ /dev/null
20 @@ -1,30 +0,0 @@
21 -From ecbd275386e5608f0f90d3536506d7f50026ffe6 Mon Sep 17 00:00:00 2001
22 -From: "Nathaniel J. Smith" <njs@×××××.com>
23 -Date: Thu, 1 Aug 2019 21:23:51 -0700
24 -Subject: [PATCH] Support openssl <1.1.1
25 -
26 -Upstream-Status: Inappropriate
27 -[https://github.com/pyca/pyopenssl/pull/861/commits/ecbd275386e5608f0f90d3536506d7f50026ffe6
28 -was accepted in 19.1.0 but later removed since the upstream dropped
29 -support of OpenSSL <1.1.1]
30 -Signed-off-by: Stefan Strogin <steils@g.o>
31 ----
32 - src/OpenSSL/SSL.py | 5 ++++-
33 - 1 file changed, 4 insertions(+), 1 deletion(-)
34 -
35 -diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
36 -index 6f785fc4..55211511 100644
37 ---- a/src/OpenSSL/SSL.py
38 -+++ b/src/OpenSSL/SSL.py
39 -@@ -140,7 +140,10 @@ class _buffer(object):
40 - OP_NO_TLSv1 = _lib.SSL_OP_NO_TLSv1
41 - OP_NO_TLSv1_1 = _lib.SSL_OP_NO_TLSv1_1
42 - OP_NO_TLSv1_2 = _lib.SSL_OP_NO_TLSv1_2
43 --OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
44 -+try:
45 -+ OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
46 -+except AttributeError:
47 -+ pass
48 -
49 - MODE_RELEASE_BUFFERS = _lib.SSL_MODE_RELEASE_BUFFERS
50 -