From 144d74f841c1c05d7e3697bdcc1a838b34f8bb57 Mon Sep 17 00:00:00 2001 From: Ivan Kozlov Date: Sat, 25 Jul 2020 15:15:12 +0800 Subject: gnu: Replace transset-df with transset. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit transset-df was last updated in 2007. The patches got merged upstream a long time ago, which is maintained by the X.Org project. * gnu/packages/xorg.scm (transset): New variable. (transset-df): Define as ‘deprecated package’. Signed-off-by: 宋文武 --- gnu/packages/xorg.scm | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e1a877703f..6783a2a217 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6570,47 +6570,33 @@ cursor to any point on the screen with a few key strokes. It also simulates mouse click. You can do everything mouse can do with a keyboard.") (license license:bsd-3))) -(define-public transset-df +(define-public transset (package - (name "transset-df") - (version "6") + (name "transset") + (version "1.0.2") (source (origin (method url-fetch) - (uri (string-append "http://forchheimer.se/" name "/" name "-" version - ".tar.gz")) + (uri (string-append "https://www.x.org/releases/individual/app/" + name "-" version ".tar.gz")) (sha256 (base32 - "1vnykwwrv75miigbhmcwxniw8xnhsdyzhqydip2m9crxi2lwhqs5")))) + "0rya202y87dwl35jnmq8hs3arzdrv5z4vf1xmi0py4rnmhdpszaw")))) (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'setenv - (lambda _ - (setenv "CC" (which "gcc")) - #t)) - (delete 'configure) - (delete 'check) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "transset-df" bin) - #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libxcomposite" ,libxcomposite) - ("libxdamager" ,libxdamage) + ("libxdamage" ,libxdamage) ("libxrender" ,libxrender))) (synopsis "Set the transparency of X11 windows") - (description "The @command{transset-df} command allows you to set the -opacity of X11 windows. This patched version of X.Org's @command{transset} -adds functionality, including: selecting window by clicking (as transset), -selecting windows by pointing select actual focused X11 window, selecting by -window name or id, forcing toggle, increase or decrease opacity.") - (home-page "https://forchheimer.se/transset-df/") + (description "@command{transset} is a simple program for X servers +supporting the XFIXES, DAMAGE, and COMPOSITE extensions. It lets the +user set the transparency on a window.") + (home-page "https://gitlab.freedesktop.org/xorg/app/transset") (license license:x11))) +(define-public transset-df + (deprecated-package "transset-df" transset)) + (define-public bdfresize (package (name "bdfresize") -- cgit v1.2.3 From d7d85c6412f6c2077ea930c7e525371912100193 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 1 Aug 2020 03:04:38 -0400 Subject: gnu: libx11: Replace with 1.6.10 [fixes CVE-2020-14344]. * gnu/packages/xorg.scm (libx11/fixed): New variable. (libx11)[replacement]: New field. --- gnu/packages/xorg.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6783a2a217..b58a5521ca 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014 Andreas Enge -;;; Copyright © 2014, 2015, 2017, 2018 Mark H Weaver +;;; Copyright © 2014, 2015, 2017, 2018, 2020 Mark H Weaver ;;; Copyright © 2014, 2015 Eric Bavier ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2015 Eric Dvorsak @@ -5492,6 +5492,7 @@ draggable titlebars and borders.") (package (name "libx11") (version "1.6.9") + (replacement libx11/fixed) (source (origin (method url-fetch) @@ -5529,6 +5530,19 @@ draggable titlebars and borders.") (description "Xorg Core X11 protocol client library.") (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 (define-public libxcursor -- cgit v1.2.3 From cf1d1f4f79ddf3a75b960ef52116221cc9732600 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 1 Aug 2020 03:16:40 -0400 Subject: gnu: xorg-server: Fix CVE-2020-14347 via graft. * gnu/packages/patches/xorg-server-CVE-2020-14347.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/xorg.scm (xorg-server/fixed): New variable. (xorg-server)[replacement]: New field. (xorg-server-wayland): Use package/inherit. --- gnu/local.mk | 1 + .../patches/xorg-server-CVE-2020-14347.patch | 33 ++++++++++++++++++++++ gnu/packages/xorg.scm | 14 +++++++-- 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/xorg-server-CVE-2020-14347.patch (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 181212c70b..b7c98aeef2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1650,6 +1650,7 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-voodoo-pcitag.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ + %D%/packages/patches/xorg-server-CVE-2020-14347.patch \ %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ diff --git a/gnu/packages/patches/xorg-server-CVE-2020-14347.patch b/gnu/packages/patches/xorg-server-CVE-2020-14347.patch new file mode 100644 index 0000000000..c54b93d764 --- /dev/null +++ b/gnu/packages/patches/xorg-server-CVE-2020-14347.patch @@ -0,0 +1,33 @@ +From aac28e162e5108510065ad4c323affd6deffd816 Mon Sep 17 00:00:00 2001 +From: Matthieu Herrb +Date: Sat, 25 Jul 2020 19:33:23 +0200 +Subject: [PATCH] fix for ZDI-11426 + +Avoid leaking un-initalized memory to clients by zeroing the +whole pixmap on initial allocation. + +This vulnerability was discovered by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Matthieu Herrb +Reviewed-by: Alan Coopersmith +--- + dix/pixmap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dix/pixmap.c b/dix/pixmap.c +index 1186d7dbb..5a0146bbb 100644 +--- a/dix/pixmap.c ++++ b/dix/pixmap.c +@@ -116,7 +116,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize) + if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize) + return NullPixmap; + +- pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize); ++ pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize); + if (!pPixmap) + return NullPixmap; + +-- +2.27.0 + diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b58a5521ca..560e6b6a1c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5327,6 +5327,7 @@ over Xlib, including: (package (name "xorg-server") (version "1.20.8") + (replacement xorg-server/fixed) (source (origin (method url-fetch) @@ -5450,6 +5451,16 @@ communicates with the user via graphical controls such as buttons and draggable titlebars and borders.") (license license:x11))) +(define xorg-server/fixed ; Fixes CVE-2020-14347 + (package + (inherit xorg-server) + (source + (origin + (inherit (package-source xorg-server)) + (patches + (append (origin-patches (package-source xorg-server)) + (search-patches "xorg-server-CVE-2020-14347.patch"))))))) + ;; This package is intended to be used when building GTK+. ;; Note: It's currently marked as "hidden" to avoid having two non-eq? ;; packages with the same name and version. @@ -5468,8 +5479,7 @@ draggable titlebars and borders.") "18bfl04ihw1jr3h0fs522nnxxq5ixjay77y9dcymnkzk23q8cndx"))))))) (define-public xorg-server-xwayland - (package - (inherit xorg-server) + (package/inherit xorg-server (name "xorg-server-xwayland") (inputs `(("wayland" ,wayland) -- cgit v1.2.3 From 413c7522b66da0370b0ba165b4b4465fb43ee3c6 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 8 Aug 2020 11:15:45 +0300 Subject: gnu: Add xdialog. * gnu/packages/xorg.scm (xdialog): New variable. --- gnu/packages/xorg.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 560e6b6a1c..9fd01225f9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2017, 2020 Arun Isaac ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Kei Kebreau -;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2018, 2020 Oleg Pykhalov ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2019 nee ;;; Copyright © 2019 Yoshinori Arai @@ -6791,3 +6791,33 @@ that Make knows which object files must be recompiled when a dependency has changed.") (home-page "https://gitlab.freedesktop.org/xorg/util/gccmakedep") (license license:x11))) + +(define-public xdialog + (package + (name "xdialog") + (version "2.3.1") + (source (origin + (method url-fetch) + (uri (string-append "http://xdialog.free.fr/Xdialog-" + version ".tar.bz2")) + (sha256 + (base32 + "16jqparb33lfq4cvd9l3jgd7fq86fk9gv2ixc8vgqibid6cnhi0x")))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("gettext" ,gettext-minimal) + ("gtk" ,gtk+-2))) + (arguments + `(#:configure-flags '("--with-gtk2"))) + (build-system gnu-build-system) + (home-page "http://xdialog.free.fr/") + (synopsis "Convert a terminal program into a program with an X interface") + (description "X11 replacement for the text util dialog Xdialog is designed +to be a drop-in replacement for the dialog and cdialog programs. It converts +any terminal-based program into a program with an X interface. The dialogs +are easier to see and use, and Xdialog adds more functionality such as a help +button and box, a treeview, an editbox, file and directory selectors, a range +box, and a calendar. It uses GTK+, and will match your desktop theme.") + (license license:gpl2+))) -- cgit v1.2.3 From 80f5f953387479fe132f9405937339d0f9507792 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Aug 2020 15:59:44 +0200 Subject: gnu: font-alias: Update to 1.0.4. * gnu/packages/xorg.scm (font-alias): Update to 1.0.4. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9fd01225f9..0dca81804a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -528,10 +528,10 @@ Resources file.") (define-public font-alias (package (name "font-alias") - (version "1.0.3") + (version "1.0.4") (source (xorg-font-origin name version - "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb")) + "0xjjjindczv3g7m1597l0x19zz75xy70wh5garghz61fpzl1l4gk")) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (arguments -- cgit v1.2.3 From b92e8d70ca4899b763afe3b7d09453619d657baf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Aug 2020 16:01:33 +0200 Subject: gnu: font-misc-ethiopic: Update to 1.0.4. * gnu/packages/xorg.scm (font-misc-ethiopic): Update to 1.0.4. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0dca81804a..3d02575713 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -701,10 +701,10 @@ For example: @code{6x10}, @code{9x15bold}, etc.") (define-public font-misc-ethiopic (package (name "font-misc-ethiopic") - (version "1.0.3") + (version "1.0.4") (source (xorg-font-origin name version - "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk")) + "1q2azkdwc4x3kh53xclwpf9q654k70lhiyns1cjq594wvxnhz339")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) -- cgit v1.2.3 From fb21bc23233374354abf3ad3bc830fb02ccbbc83 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 7 Aug 2020 19:10:02 +0200 Subject: gnu: xterm: Update to 358. This fixes: . * gnu/packages/xorg.scm (xterm): Update to 358, [inputs]: add libxcursor. Signed-off-by: Mathieu Othacehe --- gnu/packages/xorg.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3d02575713..98a8de856c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6113,7 +6113,7 @@ to answer a question. Xmessage can also exit after a specified time.") (define-public xterm (package (name "xterm") - (version "353") + (version "358") (source (origin (method url-fetch) (uri (list @@ -6123,7 +6123,7 @@ to answer a question. Xmessage can also exit after a specified time.") "xterm-" version ".tgz"))) (sha256 (base32 - "0s5pkfn4r8iy09s1q1y78zhnr9f3sm6wgbqir7azaqggkppd68g5")))) + "0yxzdwchfvkq784qadxalnbnxr4k2hdgli9w1dq9j2lic9li1nvw")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-wide-chars" "--enable-load-vt-fonts" @@ -6141,6 +6141,7 @@ to answer a question. Xmessage can also exit after a specified time.") ("libICE" ,libice) ("libSM" ,libsm) ("libX11" ,libx11) + ("libXcursor" ,libxcursor) ("libXext" ,libxext) ("libXt" ,libxt) ("xorgproto" ,xorgproto) -- cgit v1.2.3 From 04072ac87b05aed52ebf2953dd882935656e0805 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Aug 2020 18:37:37 +0200 Subject: gnu: xpra: Update to 4.0.3. * gnu/packages/xorg.scm (xpra): Update to 4.0.3. --- gnu/packages/xorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 98a8de856c..9dc9fc1e7c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6307,15 +6307,14 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "4.0.2") + (version "4.0.3") (source (origin (method url-fetch) (uri (string-append "https://www.xpra.org/src/xpra-" version ".tar.xz")) (sha256 - (base32 - "1cs39jzi59hkl421xmhi549ndmdfzkg0ap45f4nlsn9zr9zwmp3x")) + (base32 "05afdspf51fbya6jg6971i3ddqn8p4mg3v3aaqyi3chx4q1807rp")) (patches (search-patches "xpra-4.0.1-systemd-run.patch")))) (build-system python-build-system) ;; see also http://xpra.org/trac/wiki/Dependencies -- cgit v1.2.3 From b137d320b0071e13c3db754562dea71f2075e88f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Aug 2020 17:05:16 +0200 Subject: gnu: xf86-video-geode: Update to 2.11.20. * gnu/packages/xorg.scm (xf86-video-geode): Update to 2.11.20. --- gnu/packages/xorg.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9dc9fc1e7c..99c3431a8b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2920,18 +2920,15 @@ It supports a variety of Adreno graphics chipsets.") (define-public xf86-video-geode (package (name "xf86-video-geode") - (version "2.11.19") + (version "2.11.20") (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/driver/xf86-video-geode-" - version - ".tar.bz2")) - (sha256 - (base32 - "0zn9gb49grds5mcs1dlrx241k2w1sgqmx4i5x7v6159xxqhlqsf6")) - (patches (search-patches "xf86-video-geode-glibc-2.20.patch")))) + (origin + (method url-fetch) + (uri (string-append "mirror://xorg/individual/driver/xf86-video-geode-" + version ".tar.bz2")) + (sha256 + (base32 "0r2dz0agg0k5wrqdbicji6mh6svzyl0xgqk76hpcfdlzn2zx15zl")) + (patches (search-patches "xf86-video-geode-glibc-2.20.patch")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 2577a0196f246f73a754b9b2a0ffdd6b9e64cdda Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Aug 2020 17:09:24 +0200 Subject: gnu: xf86-video-geode: Remove unnecessary patch. * gnu/packages/xorg.scm (xf86-video-geode)[source]: Remove patch. * gnu/packages/patches/xf86-video-geode-glibc-2.20.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/xf86-video-geode-glibc-2.20.patch | 15 --------------- gnu/packages/xorg.scm | 3 +-- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-geode-glibc-2.20.patch (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/local.mk b/gnu/local.mk index d7f28c7a18..44680da70b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1663,7 +1663,6 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/x265-arm-flags.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ - %D%/packages/patches/xf86-video-geode-glibc-2.20.patch \ %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ %D%/packages/patches/xf86-video-savage-xorg-compat.patch \ %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \ diff --git a/gnu/packages/patches/xf86-video-geode-glibc-2.20.patch b/gnu/packages/patches/xf86-video-geode-glibc-2.20.patch deleted file mode 100644 index 4dc69e3611..0000000000 --- a/gnu/packages/patches/xf86-video-geode-glibc-2.20.patch +++ /dev/null @@ -1,15 +0,0 @@ -Allow builds with glibc 2.20. -Based on a patch by Peter Hutterer . -See . - ---- xf86-video-geode-2.11.16/src/lx_memory.c.~1~ 2014-07-16 16:59:37.000000000 -0400 -+++ xf86-video-geode-2.11.16/src/lx_memory.c 2014-12-19 00:38:11.753388268 -0500 -@@ -23,6 +23,8 @@ - * software without specific prior written permission. - */ - -+#include -+ - #include "xf86.h" - #include "geode.h" - #include "cim/cim_regs.h" diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 99c3431a8b..d4c4ab9ecc 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2927,8 +2927,7 @@ It supports a variety of Adreno graphics chipsets.") (uri (string-append "mirror://xorg/individual/driver/xf86-video-geode-" version ".tar.bz2")) (sha256 - (base32 "0r2dz0agg0k5wrqdbicji6mh6svzyl0xgqk76hpcfdlzn2zx15zl")) - (patches (search-patches "xf86-video-geode-glibc-2.20.patch")))) + (base32 "0r2dz0agg0k5wrqdbicji6mh6svzyl0xgqk76hpcfdlzn2zx15zl")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From e5d9a7d40564c94bc315b7307130d77f241a3335 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Aug 2020 02:26:18 +0200 Subject: gnu: xterm: Update to 359. * gnu/packages/xorg.scm (xterm): Update to 359. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d4c4ab9ecc..bb49d40fb6 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6109,7 +6109,7 @@ to answer a question. Xmessage can also exit after a specified time.") (define-public xterm (package (name "xterm") - (version "358") + (version "359") (source (origin (method url-fetch) (uri (list @@ -6119,7 +6119,7 @@ to answer a question. Xmessage can also exit after a specified time.") "xterm-" version ".tgz"))) (sha256 (base32 - "0yxzdwchfvkq784qadxalnbnxr4k2hdgli9w1dq9j2lic9li1nvw")))) + "0lcjifz027j99zf2dnms0h43xp5zznxr39safrpyarv59jlmdjii")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-wide-chars" "--enable-load-vt-fonts" -- cgit v1.2.3 From 6e7bede9bed8280fe0399aa1cae7e58bf1fdc6b2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 26 Aug 2020 17:05:56 -0400 Subject: gnu: xorg-server: Update replacement to 1.20.9 [security-fixes]. Includes fixes for CVE-2020-1436, CVE-2020-14345, CVE-2020-14346, and CVE-2020-14361. * gnu/packages/xorg.scm (xorg-server/fixed): Update to 1.20.9. * gnu/packages/patches/xorg-server-CVE-2020-14347.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/xorg-server-CVE-2020-14347.patch | 33 ---------------------- gnu/packages/xorg.scm | 11 +++++--- 3 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/xorg-server-CVE-2020-14347.patch (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 2f851afe4e..97a494f24a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1674,7 +1674,6 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-voodoo-pcitag.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ - %D%/packages/patches/xorg-server-CVE-2020-14347.patch \ %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ diff --git a/gnu/packages/patches/xorg-server-CVE-2020-14347.patch b/gnu/packages/patches/xorg-server-CVE-2020-14347.patch deleted file mode 100644 index c54b93d764..0000000000 --- a/gnu/packages/patches/xorg-server-CVE-2020-14347.patch +++ /dev/null @@ -1,33 +0,0 @@ -From aac28e162e5108510065ad4c323affd6deffd816 Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb -Date: Sat, 25 Jul 2020 19:33:23 +0200 -Subject: [PATCH] fix for ZDI-11426 - -Avoid leaking un-initalized memory to clients by zeroing the -whole pixmap on initial allocation. - -This vulnerability was discovered by: -Jan-Niklas Sohn working with Trend Micro Zero Day Initiative - -Signed-off-by: Matthieu Herrb -Reviewed-by: Alan Coopersmith ---- - dix/pixmap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dix/pixmap.c b/dix/pixmap.c -index 1186d7dbb..5a0146bbb 100644 ---- a/dix/pixmap.c -+++ b/dix/pixmap.c -@@ -116,7 +116,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize) - if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize) - return NullPixmap; - -- pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize); -+ pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize); - if (!pPixmap) - return NullPixmap; - --- -2.27.0 - diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bb49d40fb6..b3aa7e7192 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5447,15 +5447,18 @@ communicates with the user via graphical controls such as buttons and draggable titlebars and borders.") (license license:x11))) -(define xorg-server/fixed ; Fixes CVE-2020-14347 +(define xorg-server/fixed ; security fixes (package (inherit xorg-server) + (version "1.20.9") (source (origin (inherit (package-source xorg-server)) - (patches - (append (origin-patches (package-source xorg-server)) - (search-patches "xorg-server-CVE-2020-14347.patch"))))))) + (uri (string-append "mirror://xorg/individual/xserver/" + "xorg-server-" version ".tar.bz2")) + (sha256 + (base32 + "0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2")))))) ;; This package is intended to be used when building GTK+. ;; Note: It's currently marked as "hidden" to avoid having two non-eq? -- cgit v1.2.3 From 008a9217c4c7aed9575a5ebbd4fc54aa20c90292 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Sep 2020 23:01:06 +0300 Subject: gnu: xf86-video-amdgpu: Update to 19.1.0. * gnu/packages/xorg.scm (xf86-video-amdgpu): Update to 19.1.0. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b3aa7e7192..39af5f8b01 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2015 Cyrill Schenkel -;;; Copyright © 2016, 2017, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Nikita ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 David Craven @@ -2714,14 +2714,14 @@ as USB mice.") (define-public xf86-video-amdgpu (package (name "xf86-video-amdgpu") - (version "19.0.1") + (version "19.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/" "xf86-video-amdgpu-" version ".tar.bz2")) (sha256 - (base32 "1mf6s7i423b2xyl469kwnakrpp5fr41sm8hh7vli5jxdd8crg8da")))) + (base32 "0pgy4ihnja0vm8504qw7qxh3pdpa3p9k6967nz15m6b1mvha83jg")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From d11948a11967bfb6eb15833afa920c5124b259a2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Sep 2020 23:08:36 +0300 Subject: gnu: xf86-video-ati: Update to 19.1.0. * gnu/packages/xorg.scm (xf86-video-ati): Update to 19.1.0. [arguments]: Enable glamor. --- gnu/packages/xorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 39af5f8b01..e777e778a7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2781,20 +2781,19 @@ X server.") (define-public xf86-video-ati (package (name "xf86-video-ati") - (version "19.0.1") + (version "19.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/" "xf86-video-ati-" version ".tar.bz2")) (sha256 - (base32 "1c31g5q5p3nk9nscwikh1vvfnhdwsxiw7j8v678nlm34hrfh3djw")))) + (base32 "0j9w4axsqlycv4v14g53xyhkm9h7d27b2fcv9lrzb9gf54b5m7v5")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (arguments `(#:configure-flags `("--disable-glamor"))) ; TODO: Enable glamor (home-page "https://www.x.org/wiki/") (synopsis "ATI Radeon video driver for X server") (description -- cgit v1.2.3 From 49db1ef2b0a0be730f2bd0cfd6396e146990b1d1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Sep 2020 23:16:29 +0300 Subject: gnu: xf86-video-sis: Update to 0.12.0. * gnu/packages/xorg.scm (xf86-video-sis): Update to 0.12.0. [source]: Remove patch. * gnu/packages/patches/xf86-video-sis-xorg-compat.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/xf86-video-sis-xorg-compat.patch | 18 ------------------ gnu/packages/xorg.scm | 9 ++++----- 3 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-sis-xorg-compat.patch (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/local.mk b/gnu/local.mk index dfb9640b47..44f7d612ad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1673,7 +1673,6 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ %D%/packages/patches/xf86-video-savage-xorg-compat.patch \ %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \ - %D%/packages/patches/xf86-video-sis-xorg-compat.patch \ %D%/packages/patches/xf86-video-tga-remove-mibstore.patch \ %D%/packages/patches/xf86-video-voodoo-pcitag.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ diff --git a/gnu/packages/patches/xf86-video-sis-xorg-compat.patch b/gnu/packages/patches/xf86-video-sis-xorg-compat.patch deleted file mode 100644 index ebe9715d13..0000000000 --- a/gnu/packages/patches/xf86-video-sis-xorg-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Remove use of interface no longer provided by xorg-server. - -Patch taken from upstream: -https://cgit.freedesktop.org/xorg/driver/xf86-video-sis/commit/?id=4b1356a2b7fd06e9a05d134caa4033681c939737 - -diff --git a/src/sis_driver.c b/src/sis_driver.c -index 8f06164..513f68b 100644 ---- a/src/sis_driver.c -+++ b/src/sis_driver.c -@@ -2738,7 +2738,7 @@ SiSPrintModes(ScrnInfoPtr pScrn) - float hsync, refresh = 0.0; - char *desc, *desc2, *prefix, *uprefix, *output; - -- xf86DrvMsg(pScrn->scrnIndex, pScrn->virtualFrom, "Virtual size is %dx%d " -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Virtual size is %dx%d " - "(pitch %d)\n", pScrn->virtualX, pScrn->virtualY, - pScrn->displayWidth); - diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e777e778a7..868a0626b5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3363,7 +3363,7 @@ Xorg X server.") (define-public xf86-video-sis (package (name "xf86-video-sis") - (version "0.10.9") + (version "0.12.0") (source (origin (method url-fetch) @@ -3371,16 +3371,15 @@ Xorg X server.") "mirror://xorg/individual/driver/xf86-video-sis-" version ".tar.bz2")) - (patches (search-patches "xf86-video-sis-xorg-compat.patch")) (sha256 - (base32 - "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj")))) + (base32 + "0nrs6cjldlhakx5987fiiggjrlzilsbdc7l9pz22x1iwslbkz78i")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") (synopsis "Sis video driver for X server") (description -- cgit v1.2.3