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

gnu: nettle: Update to 3.2 [fixes CVE-2015-{8803,8804,8805}]. 

* gnu/packages/nettle.scm (nettle): Update to 3.2.
This commit is contained in:
Mark H Weaver 2016-02-04 01:32:28 -05:00
parent 4ecbf6d282
commit 42395bf514
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/nettle.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -59,30 +60,17 @@ themselves.")
;; This version is not API-compatible with version 2. In particular, lsh ;; This version is not API-compatible with version 2. In particular, lsh
;; cannot use it yet. So keep it separate. ;; cannot use it yet. So keep it separate.
(package (inherit nettle-2) (package (inherit nettle-2)
(version "3.1.1") (version "3.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/nettle/nettle-" (uri (string-append "mirror://gnu/nettle/nettle-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0k1x57zviysvi91lkk66cg8v819vywm5g5yqs22wppfqcifx5m2z")))) "15wxhk52yc62rx0pddmry66hqm6z5brrrkx4npd3wh9nybg86hpa"))))
(arguments (arguments
`(#:phases (substitute-keyword-arguments (package-arguments nettle-2)
(modify-phases %standard-phases ((#:configure-flags flags)
(add-after ;; Build "fat" binaries where the right implementation is chosen
'configure 'disable-ifunc-init-method ;; at run time based on CPU features (starting from 3.1.)
(lambda _ `(cons "--enable-fat" ,flags))))))
;; Work around problems with the ifunc initialization method in
;; nettle. For details, see
;; <http://lists.lysator.liu.se/pipermail/nettle-bugs/2015/003389.html>
;; and <https://sourceware.org/ml/libc-help/2015-06/msg00010.html>.
(substitute* "config.h"
(("#define HAVE_LINK_IFUNC 1")
"/* #undef HAVE_LINK_IFUNC */"))
#t)))
,@(substitute-keyword-arguments (package-arguments nettle-2)
((#:configure-flags flags)
;; Build "fat" binaries where the right implementation is chosen
;; at run time based on CPU features (starting from 3.1.)
`(cons "--enable-fat" ,flags)))))))