diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-12-08 11:14:21 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-12-08 14:06:57 +0100 |
| commit | c4868e38289baf3a9a74bdf32166d321f7365725 (patch) | |
| tree | 120f7e5eef93cfb59ffb600f1df6f4d697918cd5 | |
| parent | 51a365c1834ced822ca3e1cfdf625edf6b883513 (diff) | |
| download | guix-c4868e38289baf3a9a74bdf32166d321f7365725.tar.gz guix-c4868e38289baf3a9a74bdf32166d321f7365725.zip | |
gnu: openssl: 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.
| -rw-r--r-- | gnu/packages/tls.scm | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 42ea384524..d604ad3d01 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -287,8 +287,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-" @@ -298,10 +297,10 @@ required structures.") (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 - "0d9zv9srjqivs8nn099fpbjv1wyhfcb8lzy491dpmfngdvz6nv0q")) - (patches (search-patches "openssl-1.1-c-rehash-in.patch")))) + "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x")))) (build-system gnu-build-system) (outputs '("out" "doc" ;6.8 MiB of man3 pages and full HTML documentation @@ -420,24 +419,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) |