03/04: gnu: openssl: Remove graft for 1.0.2n.

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 4a158286a683d5f599b829f797fc5e8e997af06d
Author: Marius Bakke <address@hidden>
Date:   Tue Dec 19 01:44:30 2017 +0100

    gnu: openssl: Remove graft for 1.0.2n.
    
    * gnu/packages/tls.scm (openssl): Update to 1.0.2n.
    (openssl-1.0.2n): 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 8eff723..64ee404 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -246,8 +246,7 @@ required structures.")
 (define-public openssl
   (package
    (name "openssl")
-   (version "1.0.2m")
-   (replacement openssl-1.0.2n)
+   (version "1.0.2n")
    (source (origin
              (method url-fetch)
              (uri (list (string-append 
"https://www.openssl.org/source/openssl-";
@@ -259,7 +258,7 @@ required structures.")
                                        "/" name "-" version ".tar.gz")))
              (sha256
               (base32
-               "03vvlfnxx4lhxc83ikfdl6jqph4h52y7lb7li03va6dkqrgg2vwc"))
+               "1zm82pyq5a9jm10q6iv7d3dih3xwjds4x30fqph3k317byvsn2rp"))
              (snippet
               '(begin
                  ;; Remove ELF files.  'substitute*' can't read them.
@@ -391,25 +390,6 @@ required structures.")
    (license license:openssl)
    (home-page "http://www.openssl.org/";)))
 
-;; Fixes CVE-2017-3735, CVE-2017-3736, CVE-2017-3737, and CVE-2017-3738.
-;; See <https://www.openssl.org/news/cl102.txt>.
-(define-public openssl-1.0.2n
-  (package
-    (inherit openssl)
-    (version "1.0.2n")
-    (source (origin
-              (inherit (package-source openssl))
-              (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")))
-              (sha256
-               (base32
-                "1zm82pyq5a9jm10q6iv7d3dih3xwjds4x30fqph3k317byvsn2rp"))))))
-
 (define-public openssl-next
   (package
     (inherit openssl)