Accepting request 1030427 from home:bnavigator:branches:devel:languages:python
- Upstream post-release doc fix (gh#pyca/pyopenssl#1150) * The minimum cryptography version is now 38.0.x (and we now pin releases against cryptography major versions to prevent future breakage) - Add pyOpenSSL-pr1158-conditional-__all__.patch gh#pyca/pyopenssl#1158 OBS-URL: https://build.opensuse.org/request/show/1030427 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyOpenSSL?expand=0&rev=96
This commit is contained in:
parent
fcf55eaaab
commit
b067fdba7d
46
pyOpenSSL-pr1158-conditional-__all__.patch
Normal file
46
pyOpenSSL-pr1158-conditional-__all__.patch
Normal file
@ -0,0 +1,46 @@
|
||||
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
|
||||
index 9db7353..c2a49f2 100644
|
||||
--- a/src/OpenSSL/SSL.py
|
||||
+++ b/src/OpenSSL/SSL.py
|
||||
@@ -59,7 +59,7 @@ __all__ = [
|
||||
"OP_NO_TLSv1",
|
||||
"OP_NO_TLSv1_1",
|
||||
"OP_NO_TLSv1_2",
|
||||
- "OP_NO_TLSv1_3",
|
||||
+ # "OP_NO_TLSv1_3", conditionally added below
|
||||
"MODE_RELEASE_BUFFERS",
|
||||
"OP_SINGLE_DH_USE",
|
||||
"OP_SINGLE_ECDH_USE",
|
||||
@@ -84,8 +84,8 @@ __all__ = [
|
||||
"OP_NO_QUERY_MTU",
|
||||
"OP_COOKIE_EXCHANGE",
|
||||
"OP_NO_TICKET",
|
||||
- "OP_NO_RENEGOTIATION",
|
||||
- "OP_IGNORE_UNEXPECTED_EOF",
|
||||
+ # "OP_NO_RENEGOTIATION", conditionally added below
|
||||
+ # "OP_IGNORE_UNEXPECTED_EOF", conditionally added below
|
||||
"OP_ALL",
|
||||
"VERIFY_PEER",
|
||||
"VERIFY_FAIL_IF_NO_PEER_CERT",
|
||||
@@ -172,6 +172,7 @@ OP_NO_TLSv1_1 = _lib.SSL_OP_NO_TLSv1_1
|
||||
OP_NO_TLSv1_2 = _lib.SSL_OP_NO_TLSv1_2
|
||||
try:
|
||||
OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
|
||||
+ __all__ += ["OP_NO_TLSv1_3"]
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
@@ -208,11 +209,13 @@ OP_NO_TICKET = _lib.SSL_OP_NO_TICKET
|
||||
|
||||
try:
|
||||
OP_NO_RENEGOTIATION = _lib.SSL_OP_NO_RENEGOTIATION
|
||||
+ __all__ += ["OP_NO_RENEGOTIATION"]
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
try:
|
||||
OP_IGNORE_UNEXPECTED_EOF = _lib.SSL_OP_IGNORE_UNEXPECTED_EOF
|
||||
+ __all__ += ["OP_IGNORE_UNEXPECTED_EOF"]
|
||||
except AttributeError:
|
||||
pass
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 21 14:20:05 UTC 2022 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
- Upstream post-release doc fix (gh#pyca/pyopenssl#1150)
|
||||
* The minimum cryptography version is now 38.0.x (and we now pin
|
||||
releases against cryptography major versions to prevent future
|
||||
breakage)
|
||||
- Add pyOpenSSL-pr1158-conditional-__all__.patch
|
||||
gh#pyca/pyopenssl#1158
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 29 19:33:29 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
|
@ -36,12 +36,14 @@ Source: https://files.pythonhosted.org/packages/source/p/pyOpenSSL/pyOpe
|
||||
# PATCH-FIX-UPSTREAM skip-networked-test.patch gh#pyca/pyopenssl#68 mcepl@suse.com
|
||||
# Mark tests requiring network access
|
||||
Patch0: skip-networked-test.patch
|
||||
# PATCH-FIX-UPSTREAM pyOpenSSL-pr1158-conditional-__all__.patch gh#pyca/pyopenssl#1158
|
||||
Patch1: pyOpenSSL-pr1158-conditional-__all__.patch
|
||||
BuildRequires: %{python_module cffi}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-rpm-macros
|
||||
%if %{with test}
|
||||
BuildRequires: %{python_module cryptography >= 37.0.2}
|
||||
BuildRequires: %{python_module cryptography >= 38.0.0 with %python-cryptography < 39}
|
||||
BuildRequires: %{python_module flaky}
|
||||
BuildRequires: %{python_module pretend}
|
||||
BuildRequires: %{python_module pyOpenSSL >= %version}
|
||||
@ -50,7 +52,7 @@ BuildRequires: ca-certificates-mozilla
|
||||
BuildRequires: openssl
|
||||
%endif
|
||||
Requires: python-cffi
|
||||
Requires: python-cryptography >= 37.0.2
|
||||
Requires: (python-cryptography >= 38.0.0 with python-cryptography < 39)
|
||||
Provides: pyOpenSSL = %{version}
|
||||
BuildArch: noarch
|
||||
%python_subpackages
|
||||
@ -65,8 +67,7 @@ cryptography (<https://github.com/pyca/cryptography>), which provides (among
|
||||
other things) a cffi-based interface to OpenSSL.
|
||||
|
||||
%prep
|
||||
%setup -q -n pyOpenSSL-%{version}
|
||||
%autopatch -p1
|
||||
%autosetup -p1 -n pyOpenSSL-%{version}
|
||||
|
||||
%build
|
||||
%python_build
|
||||
@ -92,7 +93,7 @@ export LC_ALL=en_US.UTF-8
|
||||
%license LICENSE
|
||||
%doc *.rst
|
||||
%{python_sitelib}/OpenSSL/
|
||||
%{python_sitelib}/pyOpenSSL-%{version}-py*.egg-info
|
||||
%{python_sitelib}/pyOpenSSL-%{version}*-info
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user