nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: openssl: Incorporate grafted changes. 

This un-grafts 544db93caf.

* gnu/packages/tls.scm (openssl): Update to 1.0.2k.
[replacement]: Remove field.
(openssl-1.0.2k): Remove variable.
(openssl-next)[replacement]: Remove field.
This commit is contained in:
Marius Bakke 2017-02-21 15:08:02 +01:00
parent 9e5af7b456
commit 4c145d21d1
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnu/packages/tls.scm
View File

@ -228,8 +228,7 @@ required structures.")
(define-public openssl (define-public openssl
(package (package
(name "openssl") (name "openssl")
(replacement openssl-1.0.2k) (version "1.0.2k")
(version "1.0.2j")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "ftp://ftp.openssl.org/source/" (uri (list (string-append "ftp://ftp.openssl.org/source/"
@ -239,7 +238,7 @@ required structures.")
"/" name "-" version ".tar.gz"))) "/" name "-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"0cf4ar97ijfc7mg35zdgpad6x8ivkdx9qii6mz35khi1ps9g5bz7")) "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb"))
(patches (search-patches "openssl-runpath.patch" (patches (search-patches "openssl-runpath.patch"
"openssl-c-rehash-in.patch")))) "openssl-c-rehash-in.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -365,29 +364,9 @@ required structures.")
(license license:openssl) (license license:openssl)
(home-page "http://www.openssl.org/"))) (home-page "http://www.openssl.org/")))
(define openssl-1.0.2k
(package
(inherit openssl)
(name "openssl")
(version "1.0.2k")
(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
"1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb"))
(patches (search-patches "openssl-runpath.patch"
"openssl-c-rehash-in.patch"))))))
(define-public openssl-next (define-public openssl-next
(package (package
(inherit openssl) (inherit openssl)
(replacement #f)
(name "openssl") (name "openssl")
(version "1.1.0e") (version "1.1.0e")
(source (origin (source (origin