gnu: openssl@1: Update to 1.1.1n and remove replacement.

* gnu/packages/tls.scm (openssl): Update to 1.1.1n.
[replacement]: Remove.
(openssl/fixed): Remove.
This commit is contained in:
Ludovic Courtès 2022-06-21 07:34:24 +02:00
parent 04c716afa5
commit 02deb21137
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -384,8 +384,7 @@ OpenSSL for TARGET."
(define-public openssl (define-public openssl
(package (package
(name "openssl") (name "openssl")
(version "1.1.1l") (version "1.1.1n")
(replacement openssl/fixed)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://www.openssl.org/source/openssl-" (uri (list (string-append "https://www.openssl.org/source/openssl-"
@ -398,7 +397,7 @@ OpenSSL for TARGET."
(patches (search-patches "openssl-1.1-c-rehash-in.patch")) (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
(sha256 (sha256
(base32 (base32
"1lbblxps2fhmz7bqh058iywh5wxfignbfx1s1kz2fj63b5g3wyhb")))) "0ymif8rlc5cf5qp5bh2pxlrgq6xryh7g4sqfvrdjg9gnli8ypp20"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc" ;6.8 MiB of man3 pages and full HTML documentation "doc" ;6.8 MiB of man3 pages and full HTML documentation
@ -503,25 +502,6 @@ OpenSSL for TARGET."
(license license:openssl) (license license:openssl)
(home-page "https://www.openssl.org/"))) (home-page "https://www.openssl.org/")))
(define openssl/fixed
(package
(inherit openssl)
(name "openssl")
(version "1.1.1n")
(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
"0ymif8rlc5cf5qp5bh2pxlrgq6xryh7g4sqfvrdjg9gnli8ypp20"))))))
(define-public openssl-3.0 (define-public openssl-3.0
(package (package
(inherit openssl) (inherit openssl)