ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: util-linux: Fix CVE-2018-7738 without grafting.

Browse source 
* gnu/packages/linux.scm (util-linux)[replacement]: Remove field.
(util-linux-2.31.1): New variable.
* gnu/system.scm (%base-packages): Use util-linux-2.31.1.
This commit is contained in:
Leo Famulari 2018-03-19 17:13:26 -04:00
parent 8023f0fd03
commit af23710ff5
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/linux.scm
View file

@ -18,8 +18,8 @@
;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com> ;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.com> ;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.com>
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@ -547,7 +547,6 @@ (define-public psmisc
(define-public util-linux (define-public util-linux
(package (package
(name "util-linux") (name "util-linux")
(replacement util-linux/fixed)
(version "2.31") (version "2.31")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -635,14 +634,31 @@ (define-public util-linux
(license (list license:gpl3+ license:gpl2+ license:gpl2 license:lgpl2.0+ (license (list license:gpl3+ license:gpl2+ license:gpl2 license:lgpl2.0+
license:bsd-4 license:public-domain)))) license:bsd-4 license:public-domain))))
(define util-linux/fixed ;; The patch 'util-linux-CVE-2018-7738.patch' fixes a security bug in
;; the Bash completions for `mount`. Since this bug doesn't affect
;; other programs that link against libraries from util-linux, we don't
;; need to use a graft to make the fix available. Instead, users
;; installing util-linux will get the fix in this newer version, and
;; (@ (gnu system) %base-packages) takes care to use this package.
;; This solution was suggested here:
;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=30827#13>
(define-public util-linux-2.31.1
(package (package
(inherit util-linux) (inherit util-linux)
(source (name "util-linux")
(origin ;; XXX Don't update this without also updating %base-packages!
(inherit (package-source util-linux)) (version "2.31.1")
(patches (append (origin-patches (package-source util-linux)) (source (origin
(search-patches "util-linux-CVE-2018-7738.patch"))))))) (inherit (package-source util-linux))
(uri (string-append "mirror://kernel.org/linux/utils/"
name "/v" (version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"04fzrnrr3pvqskvjn9f81y0knh0jvvqx4lmbz5pd4lfdm5pv2l8s"))
(patches
(append (origin-patches (package-source util-linux))
(search-patches "util-linux-CVE-2018-7738.patch")))))))
(define-public ddate (define-public ddate
(package (package

4
gnu/system.scm
View file

@ -515,7 +515,9 @@ (define %base-packages
;; required for basic administrator tasks. ;; required for basic administrator tasks.
(cons* procps psmisc which less zile nano (cons* procps psmisc which less zile nano
pciutils usbutils pciutils usbutils
util-linux inetutils isc-dhcp ;; temporary package to fix CVE-2018-7738 without a graft
util-linux-2.31.1
inetutils isc-dhcp
(@ (gnu packages admin) shadow) ;for 'passwd' (@ (gnu packages admin) shadow) ;for 'passwd'
;; wireless-tools is deprecated in favor of iw, but it's still what ;; wireless-tools is deprecated in favor of iw, but it's still what