[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/14: gnu: OpenSSL: Remove replacement.
From: |
guix-commits |
Subject: |
01/14: gnu: OpenSSL: Remove replacement. |
Date: |
Sat, 12 Jun 2021 19:05:05 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 6a7a7c9d8f738f2133f85f80fcd04578d7f10511
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun May 23 18:38:02 2021 +0200
gnu: OpenSSL: Remove replacement.
* gnu/packages/tls.scm (openssl): Update to 1.1.1k.
[replacement]: Remove.
(openssl-1.1.1k): Remove variable.
---
gnu/packages/tls.scm | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 2930c61..31ffdb2 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -311,8 +311,7 @@ required structures.")
(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 @@ required structures.")
(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 @@ required structures.")
(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)
- branch core-updates updated (8ceff70 -> a6c292a), guix-commits, 2021/06/12
- 02/14: gnu: postgresql: Remove replacement., guix-commits, 2021/06/12
- 01/14: gnu: OpenSSL: Remove replacement.,
guix-commits <=
- 03/14: gnu: libx11: Update to 1.7.1., guix-commits, 2021/06/12
- 04/14: gnu: expat: Remove replacement., guix-commits, 2021/06/12
- 06/14: gnu: GCC: Switch to GCC 10., guix-commits, 2021/06/12
- 08/14: gnu: graphviz: Update to 2.47.1., guix-commits, 2021/06/12
- 05/14: gnu: curl: Absorb replacement., guix-commits, 2021/06/12
- 10/14: gnu: pango: Update to 1.48.4., guix-commits, 2021/06/12
- 11/14: gnu: poppler: Update to 21.05.0., guix-commits, 2021/06/12
- 07/14: gnu: python-attrs: Update to 21.2.0., guix-commits, 2021/06/12
- 09/14: gnu: harfbuzz: Update to 2.8.1., guix-commits, 2021/06/12
- 13/14: gnu: glib: Add "static" output., guix-commits, 2021/06/12