From 31b0412870785a851f8477bc9ab5713c0e7e0598 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 15 Oct 2020 22:12:20 +0200 Subject: gnu: openssl@1.1: Update to 1.1.1g and remove replacement. * gnu/packages/tls.scm (openssl): Update to 1.1.1g. [replacement]: Remove. (openssl-1.1.1g): Remove. --- gnu/packages/tls.scm | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 510f0571c1..517bf1dc3d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -299,8 +299,7 @@ required structures.") (define-public openssl (package (name "openssl") - (version "1.1.1f") - (replacement openssl-1.1.1g) + (version "1.1.1g") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -312,7 +311,7 @@ required structures.") "/openssl-" version ".tar.gz"))) (sha256 (base32 - "0d9zv9srjqivs8nn099fpbjv1wyhfcb8lzy491dpmfngdvz6nv0q")) + "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x")) (patches (search-patches "openssl-1.1-c-rehash-in.patch")))) (build-system gnu-build-system) (outputs '("out" @@ -424,24 +423,6 @@ required structures.") (license license:openssl) (home-page "https://www.openssl.org/"))) -(define openssl-1.1.1g - (package - (inherit openssl) - (version "1.1.1g") - (source (origin - (method url-fetch) - (uri (list (string-append "https://www.openssl.org/source/openssl-" - version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/" - "openssl-" version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/old/" - (string-trim-right version char-set:letter) - "/openssl-" version ".tar.gz"))) - (patches (search-patches "openssl-1.1-c-rehash-in.patch")) - (sha256 - (base32 - "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x")))))) - (define-public openssl-1.0 (package (inherit openssl) -- cgit v1.2.3