[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/18: gnu: OpenSSL: Absorb grafted replacement.
From: |
guix-commits |
Subject: |
15/18: gnu: OpenSSL: Absorb grafted replacement. |
Date: |
Sun, 6 Jun 2021 15:26:58 -0400 (EDT) |
lfam pushed a commit to branch wip-ungrafting
in repository guix.
commit 54fc0b4ee21418ece2d4a37ec8294403d7818f93
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Sun Jun 6 14:14:27 2021 -0400
gnu: OpenSSL: Absorb grafted replacement.
* gnu/packages/tls.scm (openssl): Update to 1.1.1k.
[replacement]: Remove field.
(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 55410f3..0ad3af3 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -306,8 +306,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-"
@@ -320,7 +319,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
@@ -441,25 +440,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)
- 07/18: gnu: c-ares: Absorb grafted replacement., (continued)
- 07/18: gnu: c-ares: Absorb grafted replacement., guix-commits, 2021/06/06
- 08/18: gnu: unzip: Absorb grafted replacement., guix-commits, 2021/06/06
- 12/18: gnu: python-pygments: Absorb grafted replacement., guix-commits, 2021/06/06
- 13/18: gnu: SQLite: Absorb grafted replacement., guix-commits, 2021/06/06
- 04/18: gnu: zziplib: Absorb grafted replacement., guix-commits, 2021/06/06
- 11/18: gnu: python-urllib3: Absorb grafted replacement., guix-commits, 2021/06/06
- 09/18: gnu: MariaDB: Absorb grafted replacement., guix-commits, 2021/06/06
- 17/18: gnu: libx11: Absorb grafted replacement., guix-commits, 2021/06/06
- 10/18: gnu: Graphviz: Absorb grafted replacement., guix-commits, 2021/06/06
- 14/18: gnu: curl: Absorb grafted replacement., guix-commits, 2021/06/06
- 15/18: gnu: OpenSSL: Absorb grafted replacement.,
guix-commits <=
- 16/18: gnu: expat: Absorb grafted replacement., guix-commits, 2021/06/06
- 18/18: gnu: GnuTLS: Absorb grafted replacement., guix-commits, 2021/06/06