guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: certbot, python-acme: Update to 0.18.2.


From: Leo Famulari
Subject: 01/01: gnu: certbot, python-acme: Update to 0.18.2.
Date: Mon, 25 Sep 2017 03:27:34 -0400 (EDT)

lfam pushed a commit to branch master
in repository guix.

commit 66660960ba75233ae5b6c539f43d97d06d64e9ad
Author: Leo Famulari <address@hidden>
Date:   Sun Sep 24 17:56:19 2017 -0400

    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.
---
 gnu/local.mk                                       |  1 -
 .../python-acme-dont-use-openssl-rand.patch        | 28 ----------------------
 gnu/packages/tls.scm                               |  7 +++---
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index acae773..12a6681 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 7892062..0000000
--- 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 add371f..3251c10 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]