gnu: OpenSSL: Remove replacement.

* gnu/packages/tls.scm (openssl): Update to 1.1.1k.
[replacement]: Remove.
(openssl-1.1.1k): Remove variable.
This commit is contained in:
Marius Bakke 2021-05-23 18:38:02 +02:00
parent 8ceff70007
commit 6a7a7c9d8f
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -311,8 +311,7 @@ (define-public guile3.0-gnutls
(define-public openssl
(package
(name "openssl")
(version "1.1.1j")
(replacement openssl-1.1.1k)
(version "1.1.1k")
(source (origin
(method url-fetch)
(uri (list (string-append "https://www.openssl.org/source/openssl-"
@ -325,7 +324,7 @@ (define-public openssl
(patches (search-patches "openssl-1.1-c-rehash-in.patch"))
(sha256
(base32
"1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma"))))
"1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9"))))
(build-system gnu-build-system)
(outputs '("out"
"doc" ;6.8 MiB of man3 pages and full HTML documentation
@ -446,25 +445,6 @@ (define-public openssl
(license license:openssl)
(home-page "https://www.openssl.org/")))
;; Replacement package to fix CVE-2021-3449 and CVE-2021-3450.
(define openssl-1.1.1k
(package
(inherit openssl)
(version "1.1.1k")
(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
"1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9"))))))
(define-public openssl-1.0
(package
(inherit openssl)