From 02deb211379cd987a7fa0a3ee0171a84b310dac0 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 21 Jun 2022 07:34:24 +0200
Subject: gnu: openssl@1: Update to 1.1.1n and remove replacement.

* gnu/packages/tls.scm (openssl): Update to 1.1.1n.
[replacement]: Remove.
(openssl/fixed): Remove.
---
 gnu/packages/tls.scm | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index cf50a88410..bd1f010d0a 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -384,8 +384,7 @@ (define (target->openssl-target target)
 (define-public openssl
   (package
     (name "openssl")
-    (version "1.1.1l")
-    (replacement openssl/fixed)
+    (version "1.1.1n")
     (source (origin
               (method url-fetch)
               (uri (list (string-append "https://www.openssl.org/source/openssl-"
@@ -398,7 +397,7 @@ (define-public openssl
               (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
               (sha256
                (base32
-                "1lbblxps2fhmz7bqh058iywh5wxfignbfx1s1kz2fj63b5g3wyhb"))))
+                "0ymif8rlc5cf5qp5bh2pxlrgq6xryh7g4sqfvrdjg9gnli8ypp20"))))
     (build-system gnu-build-system)
     (outputs '("out"
                "doc"        ;6.8 MiB of man3 pages and full HTML documentation
@@ -503,25 +502,6 @@ (define-public openssl
     (license license:openssl)
     (home-page "https://www.openssl.org/")))
 
-(define openssl/fixed
-  (package
-    (inherit openssl)
-    (name "openssl")
-    (version "1.1.1n")
-    (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
-                "0ymif8rlc5cf5qp5bh2pxlrgq6xryh7g4sqfvrdjg9gnli8ypp20"))))))
-
 (define-public openssl-3.0
   (package
     (inherit openssl)
-- 
cgit v1.2.3