mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xorg-server: Update to 1.20.10 [fixes CVE-2020-14360, CVE-2020-25712].

Browse source 
* gnu/packages/xorg.scm (xorg-server): Update to 1.20.10.
(xorg-server-for-tests): Stay on 1.20.9.
This commit is contained in:
Marius Bakke 2020-12-01 21:16:22 +01:00
parent 3cf19b83d6
commit f4450e8ca9
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/xorg.scm
View file

@ -11,7 +11,7 @@
;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2017 John Darrington <jmd@gnu.org> ;;; Copyright © 2016, 2017 John Darrington <jmd@gnu.org>
;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017, 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@ -5309,7 +5309,7 @@ (define-public libxcb
(define-public xorg-server (define-public xorg-server
(package (package
(name "xorg-server") (name "xorg-server")
(version "1.20.9") (version "1.20.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -5317,7 +5317,7 @@ (define-public xorg-server
"xorg-server-" version ".tar.bz2")) "xorg-server-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2")) "16bwrf0ag41l7jbrllbix8z6avc5yimga7ihvq4ch3a5hb020x4p"))
(patches (patches
(list (list
;; See: ;; See:
@ -5436,10 +5436,19 @@ (define-public xorg-server
;; This package is intended to be used when building GTK+. ;; This package is intended to be used when building GTK+.
;; Note: It's currently marked as "hidden" to avoid having two non-eq? ;; Note: It's currently marked as "hidden" to avoid having two non-eq?
;; packages with the same name and version. ;; packages with the same name and version.
;; TODO: Inherit source from xorg-server in a future rebuild cycle.
(define-public xorg-server-for-tests (define-public xorg-server-for-tests
(hidden-package (hidden-package
(package (package
(inherit xorg-server)))) (inherit xorg-server)
(version "1.20.9")
(source (origin
(inherit (package-source xorg-server))
(uri (string-append "mirror://xorg/individual/xserver/"
"xorg-server-" version ".tar.bz2"))
(sha256
(base32
"0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2")))))))
(define-public xorg-server-xwayland (define-public xorg-server-xwayland
(package/inherit xorg-server (package/inherit xorg-server