diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-01-24 21:04:54 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-01-24 21:04:54 -0500 |
| commit | 412bee5e2931a53066ae593808935608d54a4345 (patch) | |
| tree | 28b297694296115f056ead6de81d24bbd98d75f5 /gnu/packages/linux.scm | |
| parent | 68716289995d106c7adc779548eebc5df324e6cf (diff) | |
| parent | 880d647d0f1a0ea0aea2af84fa2e99e3286b65a1 (diff) | |
| download | patches-412bee5e2931a53066ae593808935608d54a4345.tar patches-412bee5e2931a53066ae593808935608d54a4345.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3ca4ef1868..6500aa51f5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2,10 +2,10 @@ ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> -;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> -;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; ;;; This file is part of GNU Guix. @@ -286,7 +286,9 @@ for SYSTEM, or #f if there is no configuration for SYSTEM." (uri (linux-libre-urls version)) (sha256 (base32 - "1839xsaifs7vvyblzin8jps0gqi10xmz1l9p4x0j27vmdj39jgpm")))) + "1839xsaifs7vvyblzin8jps0gqi10xmz1l9p4x0j27vmdj39jgpm")) + (patches + (list (search-patch "linux-libre-CVE-2016-0728.patch"))))) (build-system gnu-build-system) (supported-systems '("x86_64-linux" "i686-linux")) (native-inputs `(("perl" ,perl) @@ -1234,7 +1236,7 @@ processes currently causing I/O.") (define-public fuse (package (name "fuse") - (version "2.9.4") + (version "2.9.5") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -1245,7 +1247,7 @@ processes currently causing I/O.") "/fuse-" version ".tar.gz"))) (sha256 (base32 - "1qbwp63a2bp0bchabkwiyzszi9x5krlk2pwk2is6g35gyszw1sbb")))) + "1dfvbi1p57svbv2sfnbqwpnsk219spvjnlapf35azhgzqlf3g7sp")))) (build-system gnu-build-system) (inputs `(("util-linux" ,util-linux))) (arguments |