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

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:
Mark H Weaver 2016-01-28 09:50:31 -05:00
parent bdbb7c1852
commit 19f339526f
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

@ -180,7 +180,7 @@ required structures.")
(define-public openssl (define-public openssl
(package (package
(name "openssl") (name "openssl")
(version "1.0.2e") (version "1.0.2f")
(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/"
@ -190,7 +190,7 @@ required structures.")
"/" name "-" version ".tar.gz"))) "/" name "-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72")) "171fkdg9v6j29d962nh6kb79kfm8kkhy7n9makw39d7jvvj4wawk"))
(patches (map search-patch (patches (map search-patch
'("openssl-runpath.patch" '("openssl-runpath.patch"
"openssl-c-rehash.patch"))))) "openssl-c-rehash.patch")))))
@ -246,27 +246,6 @@ required structures.")
(find-files (string-append out "/lib") (find-files (string-append out "/lib")
"\\.so")) "\\.so"))
#t))) #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 (add-before
'patch-source-shebangs 'patch-tests 'patch-source-shebangs 'patch-tests
(lambda* (#:key inputs native-inputs #:allow-other-keys) (lambda* (#:key inputs native-inputs #:allow-other-keys)