mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 23:46:13 -05:00
gnu: openssl: Update to 1.0.2f [fixes CVE-2015-3197 and CVE-2016-0701].
* gnu/packages/tls.scm (openssl): Update to 1.0.2f. [arguments]: Remove the 'fix-broken-symlinks' phase.
This commit is contained in:
parent
bdbb7c1852
commit
19f339526f
1 changed files with 2 additions and 23 deletions
|
@ -180,7 +180,7 @@ (define-public gnutls
|
|||
(define-public openssl
|
||||
(package
|
||||
(name "openssl")
|
||||
(version "1.0.2e")
|
||||
(version "1.0.2f")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "ftp://ftp.openssl.org/source/"
|
||||
|
@ -190,7 +190,7 @@ (define-public openssl
|
|||
"/" name "-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72"))
|
||||
"171fkdg9v6j29d962nh6kb79kfm8kkhy7n9makw39d7jvvj4wawk"))
|
||||
(patches (map search-patch
|
||||
'("openssl-runpath.patch"
|
||||
"openssl-c-rehash.patch")))))
|
||||
|
@ -246,27 +246,6 @@ (define-public openssl
|
|||
(find-files (string-append out "/lib")
|
||||
"\\.so"))
|
||||
#t)))
|
||||
(add-after
|
||||
'unpack 'fix-broken-symlinks
|
||||
(lambda _
|
||||
;; Repair the broken symlinks in the openssl-1.0.2e tarball.
|
||||
(let* ((link-prefix "openssl-1.0.2e/")
|
||||
(link-prefix-length (string-length link-prefix))
|
||||
(broken-links
|
||||
(find-files "." (lambda (file stat)
|
||||
(and (eq? 'symlink (stat:type stat))
|
||||
(string-prefix? link-prefix
|
||||
(readlink file)))))))
|
||||
(when (null? broken-links)
|
||||
(error "The 'fix-broken-symlinks' phase is obsolete; remove it"))
|
||||
(for-each (lambda (file)
|
||||
(let* ((old-target (readlink file))
|
||||
(new-target (string-drop old-target
|
||||
link-prefix-length)))
|
||||
(delete-file file)
|
||||
(symlink new-target file)))
|
||||
broken-links)
|
||||
#t)))
|
||||
(add-before
|
||||
'patch-source-shebangs 'patch-tests
|
||||
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||
|
|
Loading…
Reference in a new issue