ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-19 21:27:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libx11: Update to 1.6.10 and remove replacement.

Browse source 
* gnu/packages/xorg.scm (libx11): Update to 1.6.10.
[replacement]: Remove.
(libx11/fixed): Remove.
This commit is contained in:
Ludovic Courtès 2020-10-15 10:40:24 +02:00
parent 5d3cec7654
commit bbc8385e81
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/xorg.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2017, 2018, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2017, 2018, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Cyrill Schenkel <cyrill.schenkel@gmail.com> ;;; Copyright © 2015 Cyrill Schenkel <cyrill.schenkel@gmail.com>
@ -5498,8 +5498,7 @@ (define-public xorg-server-xwayland
(define-public libx11 (define-public libx11
(package (package
(name "libx11") (name "libx11")
(version "1.6.9") (version "1.6.10")
(replacement libx11/fixed)
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -5509,7 +5508,7 @@ (define-public libx11
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1ldyn9c6pyx54sxzaw120n3q42rqi7b503aqmyjky6fn038fiiww")))) "09k2pqmqbn2m1bpgl7jfxyqxaaxsnzbnp2bp8ycmqldqi5ln4j5g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ;8 MiB of man pages + XML "doc")) ;8 MiB of man pages + XML
@ -5537,19 +5536,6 @@ (define-public libx11
(description "Xorg Core X11 protocol client library.") (description "Xorg Core X11 protocol client library.")
(license license:x11))) (license license:x11)))
(define libx11/fixed ; Fixes CVE-2020-14344
(package
(inherit libx11)
(version "1.6.A")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://xorg/individual/lib/libX11-1.6.10.tar.bz2"))
(sha256
(base32
"09k2pqmqbn2m1bpgl7jfxyqxaaxsnzbnp2bp8ycmqldqi5ln4j5g"))))))
;; packages of height 5 in the propagated-inputs tree ;; packages of height 5 in the propagated-inputs tree
(define-public libxcursor (define-public libxcursor