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

gnu: openssl: Incorporate grafted changes. 

* gnu/packages/tls.scm (openssl)[replacement]: Remove field.
[source](patches): Add 'openssl-1.0.2-CVE-2018-0495.patch' and
'openssl-1.0.2-CVE-2018-0732.patch'.
(openssl/fixed): Remove variable.
This commit is contained in:
Marius Bakke 2018-07-24 20:42:40 +02:00
parent 706ae8e15c
commit 5a0b3c3408
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/tls.scm
View File

@ -260,7 +260,6 @@ required structures.")
(define-public openssl (define-public openssl
(package (package
(name "openssl") (name "openssl")
(replacement openssl/fixed)
(version "1.0.2o") (version "1.0.2o")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -275,6 +274,8 @@ required structures.")
(base32 (base32
"0kcy13l701054nhpbd901mz32v1kn4g311z0nifd83xs2jbmqgzc")) "0kcy13l701054nhpbd901mz32v1kn4g311z0nifd83xs2jbmqgzc"))
(patches (search-patches "openssl-runpath.patch" (patches (search-patches "openssl-runpath.patch"
"openssl-1.0.2-CVE-2018-0495.patch"
"openssl-1.0.2-CVE-2018-0732.patch"
"openssl-c-rehash-in.patch")))) "openssl-c-rehash-in.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
@ -397,15 +398,6 @@ required structures.")
(license license:openssl) (license license:openssl)
(home-page "https://www.openssl.org/"))) (home-page "https://www.openssl.org/")))
(define openssl/fixed
(package
(inherit openssl)
(source (origin
(inherit (package-source openssl))
(patches (append (origin-patches (package-source openssl))
(search-patches "openssl-1.0.2-CVE-2018-0495.patch"
"openssl-1.0.2-CVE-2018-0732.patch")))))))
(define-public openssl-next (define-public openssl-next
(package (package
(inherit openssl) (inherit openssl)