summary refs log tree commit diff
path: root/gnu/packages/tls.scm
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2016-10-03 17:00:06 -0400
committerLeo Famulari <leo@famulari.name>2016-10-06 17:50:17 -0400
commit1d8de185b80958cbb0c10621e1dd790aa327064b (patch)
tree2f41630bb0d0ce89cbd4cfb29395fd2b7c4bee97 /gnu/packages/tls.scm
parent17b56c06e9b146e13f04deffaaa87f57b71c5995 (diff)
downloadguix-1d8de185b80958cbb0c10621e1dd790aa327064b.tar.gz
gnu: openssl: Update to 1.0.2j.
* gnu/packages/tls.scm (openssl): Update to 1.0.2j.
[replacement]: Remove field
[source]: Remove 'openssl-CVE-2016-2177.patch' and
'openssl-CVE-2016-2178.patch'.
(openssl-1.0.2j): Remove variable.
(openssl-next)[replacement]: Remove field.
* gnu/packages/patches/openssl-CVE-2016-2177.patch,
gnu/packages/patches/openssl-CVE-2016-2178.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/packages/tls.scm')
-rw-r--r--gnu/packages/tls.scm28
1 files changed, 3 insertions, 25 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 8e9c9287fa..2e3a11b51b 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -214,8 +214,7 @@ required structures.")
 (define-public openssl
   (package
    (name "openssl")
-   (replacement openssl-1.0.2j)
-   (version "1.0.2h")
+   (version "1.0.2j")
    (source (origin
              (method url-fetch)
              (uri (list (string-append "ftp://ftp.openssl.org/source/"
@@ -225,11 +224,9 @@ required structures.")
                                        "/" name "-" version ".tar.gz")))
              (sha256
               (base32
-               "06996ds1rk8xhnyb5y273a7xkcxhggp4bq1g02rab55d7bjhfh0x"))
+               "0cf4ar97ijfc7mg35zdgpad6x8ivkdx9qii6mz35khi1ps9g5bz7"))
              (patches (search-patches "openssl-runpath.patch"
-                                      "openssl-c-rehash-in.patch"
-                                      "openssl-CVE-2016-2177.patch"
-                                      "openssl-CVE-2016-2178.patch"))))
+                                      "openssl-c-rehash-in.patch"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "doc"                               ;1.5MiB of man3 pages
@@ -354,29 +351,10 @@ required structures.")
    (license license:openssl)
    (home-page "http://www.openssl.org/")))
 
-(define openssl-1.0.2j
-  (package
-    (inherit openssl)
-    (name "openssl")
-    (version "1.0.2j")
-    (source (origin
-              (method url-fetch)
-              (uri (list (string-append "ftp://ftp.openssl.org/source/"
-                                        name "-" version ".tar.gz")
-                         (string-append "ftp://ftp.openssl.org/source/old/"
-                                        (string-trim-right version char-set:letter)
-                                        "/" name "-" version ".tar.gz")))
-              (sha256
-               (base32
-                "0cf4ar97ijfc7mg35zdgpad6x8ivkdx9qii6mz35khi1ps9g5bz7"))
-              (patches (search-patches "openssl-runpath.patch"
-                                       "openssl-c-rehash-in.patch"))))))
-
 (define-public openssl-next
   (package
     (inherit openssl)
     (name "openssl")
-    (replacement #f)
     (version "1.1.0b")
     (source (origin
              (method url-fetch)