[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/94: gnu: OpenSSL: Incorporate grafted changes.
From: |
guix-commits |
Subject: |
10/94: gnu: OpenSSL: Incorporate grafted changes. |
Date: |
Thu, 5 Dec 2019 12:15:28 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit e554eba02c8f5fc090ca54476a0ad6a1de9cc5c0
Author: Marius Bakke <address@hidden>
Date: Tue Dec 3 00:04:11 2019 +0100
gnu: OpenSSL: Incorporate grafted changes.
* gnu/packages/tls.scm (openssl): Update to 1.1.1d.
[replacement]: Remove field.
(openssl-1.1.1d): Remove variable.
---
gnu/packages/tls.scm | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index da9ba93..7e1bf83 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -300,8 +300,7 @@ required structures.")
(define-public openssl
(package
(name "openssl")
- (version "1.1.1c")
- (replacement openssl-1.1.1d)
+ (version "1.1.1d")
(source (origin
(method url-fetch)
(uri (list (string-append
"https://www.openssl.org/source/openssl-"
@@ -313,7 +312,7 @@ required structures.")
"/openssl-" version ".tar.gz")))
(sha256
(base32
- "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn"))
+ "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy"))
(patches (search-patches "openssl-1.1-c-rehash-in.patch"))))
(build-system gnu-build-system)
(outputs '("out"
@@ -425,24 +424,6 @@ required structures.")
(license license:openssl)
(home-page "https://www.openssl.org/")))
-(define openssl-1.1.1d
- (package/inherit
- openssl
- (version "1.1.1d")
- (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
- "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy"))))))
-
(define-public openssl-1.0
(package
(inherit openssl)
- branch core-updates updated (60bd56c -> 8c42cee), guix-commits, 2019/12/05
- 02/94: gnu: libjpeg-turbo: Remove graft for 2.0.3., guix-commits, 2019/12/05
- 04/94: gnu: fribidi: Remove defunct replacement., guix-commits, 2019/12/05
- 03/94: gnu: perl: Remove obsolete workaround., guix-commits, 2019/12/05
- 08/94: gnu: nghttp2: Update to 1.40.0., guix-commits, 2019/12/05
- 05/94: gnu: avahi: Incorporate grafted changes., guix-commits, 2019/12/05
- 10/94: gnu: OpenSSL: Incorporate grafted changes.,
guix-commits <=
- 19/94: gnu: libtiff: Update to 4.1.0., guix-commits, 2019/12/05
- 09/94: gnu: curl: Update to 7.67.0., guix-commits, 2019/12/05
- 12/94: gnu: ghostscript: Update to 9.50., guix-commits, 2019/12/05
- 25/94: gnu: sqlite: Update to 3.30.1., guix-commits, 2019/12/05
- 28/94: gnu: libtasn1: Update to 4.15.0., guix-commits, 2019/12/05
- 39/94: gnu: python-fonttools: Update to 4.2.0., guix-commits, 2019/12/05
- 49/94: gnu: libxcomposite: Do not build static libraries., guix-commits, 2019/12/05
- 41/94: gnu: harfbuzz: Update to 2.6.4., guix-commits, 2019/12/05
- 54/94: gnu: libxpm: Do not build static libraries., guix-commits, 2019/12/05
- 74/94: gnu: xcb-util: Do not build static libraries., guix-commits, 2019/12/05