diff options
| author | Leo Famulari <leo@famulari.name> | 2017-09-24 17:56:19 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-09-25 03:27:24 -0400 |
| commit | 66660960ba75233ae5b6c539f43d97d06d64e9ad (patch) | |
| tree | 349fce4e45ce8416d72b42f50f7815110abd96ea /gnu | |
| parent | edd38aa898306c4cf1dd9761c5a502fa7fee13d6 (diff) | |
gnu: certbot, python-acme: Update to 0.18.2.
* gnu/packages/tls.scm (certbot, python-acme): Update to 0.18.2.
* gnu/packages/patches/python-acme-dont-use-openssl-rand.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/python-acme-dont-use-openssl-rand.patch | 28 | ||||
| -rw-r--r-- | gnu/packages/tls.scm | 7 |
3 files changed, 3 insertions, 33 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index acae773269..12a6681544 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -553,7 +553,6 @@ dist_patch_DATA = \ %D%/packages/patches/ceph-disable-unittest-throttle.patch \ %D%/packages/patches/ceph-skip-collect-sys-info-test.patch \ %D%/packages/patches/ceph-skip-unittest_blockdev.patch \ - %D%/packages/patches/python-acme-dont-use-openssl-rand.patch \ %D%/packages/patches/chicken-CVE-2017-6949.patch \ %D%/packages/patches/chicken-CVE-2017-11343.patch \ %D%/packages/patches/chmlib-inttypes.patch \ diff --git a/gnu/packages/patches/python-acme-dont-use-openssl-rand.patch b/gnu/packages/patches/python-acme-dont-use-openssl-rand.patch deleted file mode 100644 index 78920629c0..0000000000 --- a/gnu/packages/patches/python-acme-dont-use-openssl-rand.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix build with PyOpenSSL > 17.2.0. - -See <https://github.com/certbot/certbot/issues/5111>. - -Patch copied from upstream source repository: -https://github.com/certbot/certbot/commit/f6be07da74c664b57ac8c053585f919c79f9af44 - -diff --git a/acme/crypto_util.py b/acme/crypto_util.py -index de15284c03..b8fba03488 100644 ---- a/acme/crypto_util.py -+++ b/acme/crypto_util.py -@@ -2,6 +2,7 @@ - import binascii - import contextlib - import logging -+import os - import re - import socket - import sys -@@ -243,7 +244,7 @@ def gen_ss_cert(key, domains, not_before=None, - """ - assert domains, "Must provide one or more hostnames for the cert." - cert = OpenSSL.crypto.X509() -- cert.set_serial_number(int(binascii.hexlify(OpenSSL.rand.bytes(16)), 16)) -+ cert.set_serial_number(int(binascii.hexlify(os.urandom(16)), 16)) - cert.set_version(2) - - extensions = [ diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index add371ffa3..3251c102b0 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -486,14 +486,13 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.18.1") + (version "0.18.2") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) - (patches (search-patches "python-acme-dont-use-openssl-rand.patch")) (sha256 (base32 - "0ry6vhfkhds28sg232hngwfnkqihsxv9r8w92c6nz45r7w56qk0y")))) + "1xiy8m7501g5l9kpdmyvyz72nfnl72l19qkrf76fyvby7adzm3ki")))) (build-system python-build-system) (arguments `(#:phases @@ -541,7 +540,7 @@ netcat implementation that supports TLS.") (uri (pypi-uri name version)) (sha256 (base32 - "0k3bqfkjxyg0qivs4a6iz6gyqx8li4hgn8m268r72lxgq46ay2mf")))) + "16lw4n7kwnkvh9sz2f97c7ad1wwp33mg5fc332lpy5n17zpfc8h1")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) |