gnu: python-pyopenssl: Update to 17.2.0.

* gnu/packages/patches/python-pyopenssl-17.1.0-test-overflow.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/python.scm (python-pyopenssl, python2-pyopenssl): Update to 17.2.0.
[native-inputs]: Add PYTHON-FLAKY.
[source](patches): Remove.
This commit is contained in:
Marius Bakke 2017-07-22 14:19:43 +02:00
parent 4e52739c61
commit 2580c2f07f
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
3 changed files with 4 additions and 42 deletions

View File

@ -972,7 +972,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \
%D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
%D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
%D%/packages/patches/python-pyopenssl-17.1.0-test-overflow.patch \
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \
%D%/packages/patches/qemu-CVE-2017-7493.patch \ %D%/packages/patches/qemu-CVE-2017-7493.patch \
%D%/packages/patches/qemu-CVE-2017-8112.patch \ %D%/packages/patches/qemu-CVE-2017-8112.patch \

View File

@ -1,36 +0,0 @@
Resolves a test failure on 32-bit platforms.
https://github.com/pyca/pyopenssl/issues/657
Patch copied from upstream source repository:
https://github.com/pyca/pyopenssl/commit/ecc0325479c0d5c5f2ca88b4550e87cdb59d6c95
From ecc0325479c0d5c5f2ca88b4550e87cdb59d6c95 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Thu, 6 Jul 2017 22:14:44 -0400
Subject: [PATCH] Fixed #657 -- handle OverflowErrors on large allocation
requests
---
tests/test_rand.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/test_rand.py b/tests/test_rand.py
index bdd3af08..6adf72a1 100644
--- a/tests/test_rand.py
+++ b/tests/test_rand.py
@@ -32,10 +32,10 @@ def test_bytes_wrong_args(self, args):
def test_insufficient_memory(self):
"""
- `OpenSSL.rand.bytes` raises `MemoryError` if more bytes are requested
- than will fit in memory.
+ `OpenSSL.rand.bytes` raises `MemoryError` or `OverflowError` if more
+ bytes are requested than will fit in memory.
"""
- with pytest.raises(MemoryError):
+ with pytest.raises((MemoryError, OverflowError)):
rand.bytes(sys.maxsize)
def test_bytes(self):

View File

@ -7709,16 +7709,14 @@ message digests and key derivation functions.")
(define-public python-pyopenssl (define-public python-pyopenssl
(package (package
(name "python-pyopenssl") (name "python-pyopenssl")
(version "17.1.0") (version "17.2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pyOpenSSL" version)) (uri (pypi-uri "pyOpenSSL" version))
(patches
(search-patches "python-pyopenssl-17.1.0-test-overflow.patch"))
(sha256 (sha256
(base32 (base32
"0qwmqhfsq84ydir9dz273ypmlcvs7v71m1jns0sd4k0h6lfsa82s")))) "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -7742,7 +7740,8 @@ message digests and key derivation functions.")
(inputs (inputs
`(("openssl" ,openssl))) `(("openssl" ,openssl)))
(native-inputs (native-inputs
`(("python-pretend" ,python-pretend) `(("python-flaky" ,python-flaky)
("python-pretend" ,python-pretend)
("python-pytest" ,python-pytest-3.0))) ("python-pytest" ,python-pytest-3.0)))
(home-page "https://github.com/pyca/pyopenssl") (home-page "https://github.com/pyca/pyopenssl")
(synopsis "Python wrapper module around the OpenSSL library") (synopsis "Python wrapper module around the OpenSSL library")