diff options
| author | Leo Famulari <leo@famulari.name> | 2021-12-18 15:30:41 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-12-22 18:37:27 -0500 |
| commit | 0751451ae3a77977916b67577837349219d482ec (patch) | |
| tree | f9d1e0fa3b35eb040f6f51ac976d0a684d0b881b /gnu/packages/xorg.scm | |
| parent | 488f1c589df00e802163af534294d93372e5c025 (diff) | |
| download | guix-patches-0751451ae3a77977916b67577837349219d482ec.tar guix-patches-0751451ae3a77977916b67577837349219d482ec.tar.gz | |
gnu: xorg-server: Update to 21.1.2 [security fixes].
Fixes CVE-2021-4008, CVE-2021-4009, CVE-2021-4010, and CVE-2021-4011.
* gnu/packages/xorg.scm (xorg-server): Update to 21.1.2.
(xorg-server-for-tests): Use version 21.1.1.
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9a854bcbf8..b09d95f770 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5235,16 +5235,15 @@ by the Xorg server.") (define-public xorg-server (package (name "xorg-server") - (version "21.1.1") + (version "21.1.2") (source (origin (method url-fetch) - (uri (string-append "https://xorg.freedesktop.org/archive/individual" "/xserver/xorg-server-" version ".tar.xz")) (sha256 (base32 - "0md7dqsc5qb30gym06c4zc2cjsdc5ps8nywk1bkcpix05kppybkq")) + "1c4dgvpv3kib8rhw37b00vc056nlb1z66c2lwzs4prz8kxmg82y2")) (patches (list ;; See: @@ -5361,7 +5360,30 @@ draggable titlebars and borders.") (define-public xorg-server-for-tests (hidden-package (package - (inherit xorg-server)))) + (inherit xorg-server) + (version "21.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://xorg.freedesktop.org/archive/individual" + "/xserver/xorg-server-" version ".tar.xz")) + (sha256 + (base32 + "0md7dqsc5qb30gym06c4zc2cjsdc5ps8nywk1bkcpix05kppybkq")) + (patches + (list + ;; See: + ;; https://lists.fedoraproject.org/archives/list/devel@lists. + ;; fedoraproject.org/message/JU655YB7AM4OOEQ4MOMCRHJTYJ76VFOK/ + (origin + (method url-fetch) + (uri (string-append + "http://pkgs.fedoraproject.org/cgit/rpms/xorg-x11-server.git" + "/plain/06_use-intel-only-on-pre-gen4.diff")) + (sha256 + (base32 + "0mm70y058r8s9y9jiv7q2myv0ycnaw3iqzm7d274410s0ik38w7q")) + (file-name "xorg-server-use-intel-only-on-pre-gen4.diff"))))))))) (define-public eglexternalplatform (package |