From a9f84f93b45db712b3bd30943361a267cb85cf79 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 May 2021 14:23:18 +0200 Subject: gnu: libx11: Update replacement to 1.7.1 [fixes CVE-2021-31535]. * gnu/packages/xorg.scm (libx11/fixed): Update to 1.7.1. --- gnu/packages/xorg.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index dea4f8e304..1b9dfed34b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017 John Darrington -;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2017, 2020 Arun Isaac ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice @@ -5523,17 +5523,14 @@ draggable titlebars and borders.") (define-public libx11/fixed (package (inherit libx11) - (version "1.6.12") + (version "1.7.1A") (source (origin (method url-fetch) - (uri (string-append - "mirror://xorg/individual/lib/libX11-" - version - ".tar.bz2")) + (uri "mirror://xorg/individual/lib/libX11-1.7.1.tar.bz2") (sha256 (base32 - "1ivfzl1qwk8zh7gc0m5vb58gdxz11jwg7w3d356w16j1d5s2427i")))))) + "0isxad59hvdwggbxqqjjjg3zmih9xiq4d9mdsnqbyb2nmbg46kp6")))))) ;; packages of height 5 in the propagated-inputs tree -- cgit v1.2.3 From a80cde0326428c453218e7b9f6965d65c932fa7a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Jun 2021 18:51:33 +0200 Subject: gnu: console-setup: Update to 1.203. * gnu/packages/xorg.scm (console-setup): Update to 1.203. --- 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 1b9dfed34b..34d7997550 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6662,7 +6662,7 @@ output.") (define-public console-setup (package (name "console-setup") - (version "1.201") + (version "1.203") (source (origin (method git-fetch) @@ -6670,7 +6670,7 @@ output.") (url "https://salsa.debian.org/installer-team/console-setup.git") (commit version))) (sha256 - (base32 "0xkynb8d1813wph3p0sdvbpimx7zqkzh4c3mmqymp3pibcg7af5a")) + (base32 "1bavb8h4j1za2h7mxr109imicjmh7fp4099lvzfgavhjr3l3vsab")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From b6affc5c0466e801224db4400bb62ccc26cd5346 Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Sun, 6 Jun 2021 06:47:10 -0700 Subject: gnu: xterm: Update to 367. * gnu/packages/xorg.scm (xterm): Update to 367. Signed-off-by: Tobias Geerinckx-Rice --- 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 34d7997550..db058c697b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Jean-Baptiste Note ;;; Copyright © 2021 Nicolò Balzarotti +;;; Copyright © 2021 Matthew James Kraai ;;; ;;; This file is part of GNU Guix. ;;; @@ -6092,7 +6093,7 @@ to answer a question. Xmessage can also exit after a specified time.") (define-public xterm (package (name "xterm") - (version "366") + (version "367") (source (origin (method url-fetch) @@ -6102,7 +6103,7 @@ to answer a question. Xmessage can also exit after a specified time.") (string-append "ftp://ftp.invisible-island.net/xterm/" "xterm-" version ".tgz"))) (sha256 - (base32 "0vmzffy3hzgcgwx305h07ars5sxsq6nnl1ir4xqpxs9zjs2ji2w5")))) + (base32 "07y51l06n344pjyxdddq6sdvxw25nl10irl4avynkqjnqyqsiw97")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-wide-chars" "--enable-load-vt-fonts" -- cgit v1.2.3 From db6ff6da1588a84bdc02dfc8eccd59a885b46fde Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Jun 2021 16:15:29 +0200 Subject: gnu: xf86-input-libinput: Fix licence information. * gnu/packages/xorg.scm (xf86-input-libinput)[license]: This package is almost exclusively expat, with a single x11 file that's not installed. --- gnu/packages/xorg.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index db058c697b..8ab77d521d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2555,7 +2555,8 @@ including most mice, keyboards, tablets and touchscreens.") "xf86-input-libinput is an input driver for the Xorg X server based on libinput. It is a thin wrapper around libinput, so while it does provide all features that libinput supports it does little beyond.") - (license license:x11))) + (license (list license:x11 ; only install-sh + license:expat)))) ; everything else (define-public xf86-input-joystick (package -- cgit v1.2.3 From b2122b07dc24007263b92247cc479713c2101390 Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Sun, 6 Jun 2021 06:42:49 -0700 Subject: gnu: xf86-input-libinput: Update to 1.0.1. * gnu/packages/xorg.scm (xf86-input-libinput): Update to 1.0.1. Signed-off-by: Tobias Geerinckx-Rice --- 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 8ab77d521d..9156fb3163 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2530,7 +2530,7 @@ including most mice, keyboards, tablets and touchscreens.") (define-public xf86-input-libinput (package (name "xf86-input-libinput") - (version "0.30.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (string-append @@ -2538,7 +2538,7 @@ including most mice, keyboards, tablets and touchscreens.") name "-" version ".tar.bz2")) (sha256 (base32 - "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr")))) + "0nr4r9x8c7y1l0ipivjch5zps093mxmg2nqmfn2934am26fc9ppx")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit v1.2.3