[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: openssl@1.1: Ungraft.
From: |
guix-commits |
Subject: |
02/02: gnu: openssl@1.1: Ungraft. |
Date: |
Wed, 20 Dec 2023 13:07:09 -0500 (EST) |
civodul pushed a commit to branch core-updates
in repository guix.
commit ce47c368b7733a40f23a955f250431e7202c6e0c
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Dec 20 19:02:57 2023 +0100
gnu: openssl@1.1: Ungraft.
* gnu/packages/tls.scm (openssl-1.1): Update to 1.1.1u.
[replacement]: Remove.
(openssl/fixed): Remove.
Change-Id: Idd77b57276ea132eee8c2c3fe801150c7789ac59
---
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 3dd412a4c5..9baf371a47 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -437,8 +437,7 @@ OpenSSL for TARGET."
(define-public openssl-1.1
(package
(name "openssl")
- (version "1.1.1q")
- (replacement openssl/fixed)
+ (version "1.1.1u")
(source (origin
(method url-fetch)
(uri (list (string-append
"https://www.openssl.org/source/openssl-"
@@ -451,7 +450,7 @@ OpenSSL for TARGET."
(patches (search-patches "openssl-1.1-c-rehash-in.patch"))
(sha256
(base32
- "1jhhzp4gh6ymidxm1ckjk948l583awp0w3y2nvqdz7022kk9r4yp"))))
+ "1ipbcdlqyxbj5lagasrq2p6gn0036wq6hqp7gdnd1v1ya95xiy72"))))
(build-system gnu-build-system)
(outputs '("out"
"doc" ;6.8 MiB of man3 pages and full HTML documentation
@@ -561,25 +560,6 @@ OpenSSL for TARGET."
(license license:openssl)
(home-page "https://www.openssl.org/")))
-(define openssl/fixed
- (package
- (inherit openssl-1.1)
- (name "openssl")
- (version "1.1.1u")
- (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
- "1ipbcdlqyxbj5lagasrq2p6gn0036wq6hqp7gdnd1v1ya95xiy72"))))))
-
(define-public openssl-3.0
(package
(inherit openssl-1.1)