* [bug#67136] [PATCH mesa-branch 0/2] Update xorgproto and xwayland
@ 2023-11-12 19:52 Kaelyn Takata via Guix-patches via
2023-11-12 19:55 ` [bug#67136] [PATCH mesa-branch 1/2] gnu: xorgproto: Update to 2023.2 Kaelyn Takata via Guix-patches via
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Kaelyn Takata via Guix-patches via @ 2023-11-12 19:52 UTC (permalink / raw)
To: 67136; +Cc: Kaelyn Takata
The xorg-server-xwayland update is primarily motivated by picking up the fixes
to last month's CVEs
(https://lists.x.org/archives/xorg/2023-October/003430.html), with the
xorgproto update being required for the newer xwayland releases because of an
updated presentproto.
Kaelyn Takata (2):
gnu: xorgproto: Update to 2023.2.
gnu: xorg-server-xwayland: Update to 23.2.2.
gnu/packages/xorg.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
base-commit: ab307cbb586584dab715ffcc6cf123d02ddcb6bf
--
2.41.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#67136] [PATCH mesa-branch 1/2] gnu: xorgproto: Update to 2023.2.
2023-11-12 19:52 [bug#67136] [PATCH mesa-branch 0/2] Update xorgproto and xwayland Kaelyn Takata via Guix-patches via
@ 2023-11-12 19:55 ` Kaelyn Takata via Guix-patches via
2023-11-12 19:55 ` [bug#67136] [PATCH mesa-branch 2/2] gnu: xorg-server-xwayland: Update to 23.2.2 Kaelyn Takata via Guix-patches via
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Kaelyn Takata via Guix-patches via @ 2023-11-12 19:55 UTC (permalink / raw)
To: 67136; +Cc: Kaelyn Takata
* gnu/packages/xorg.scm (xorgproto): Update to 2023.2.
Change-Id: Ie0e4712e4ec3fe9620d160bedcfe74452fa6ae5d
---
gnu/packages/xorg.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 8f359c3e2f..c08fe3ae34 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -245,14 +245,14 @@ (define-public bdftopcf
(define-public xorgproto
(package
(name "xorgproto")
- (version "2022.2")
+ (version "2023.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://xorg/individual/proto"
"/xorgproto-" version ".tar.xz"))
(sha256
(base32
- "17kbq1x68jl9mz69ays5c0w72lpkqi937raxk0im7y88pvrdn4sx"))))
+ "0b4c27aq25w1fccks49p020avf9jzh75kaq5qwnww51bp1yvq7xn"))))
(build-system gnu-build-system)
(propagated-inputs
;; To get util-macros in (almost?) all package inputs.
--
2.41.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#67136] [PATCH mesa-branch 2/2] gnu: xorg-server-xwayland: Update to 23.2.2.
2023-11-12 19:52 [bug#67136] [PATCH mesa-branch 0/2] Update xorgproto and xwayland Kaelyn Takata via Guix-patches via
2023-11-12 19:55 ` [bug#67136] [PATCH mesa-branch 1/2] gnu: xorgproto: Update to 2023.2 Kaelyn Takata via Guix-patches via
@ 2023-11-12 19:55 ` Kaelyn Takata via Guix-patches via
2023-12-16 1:00 ` [bug#67136] [PATCH core-updates v3 0/2] Update xorgproto and xwayland Kaelyn Takata via Guix-patches via
2023-12-21 6:43 ` [bug#67136] closed (Re: [bug#67136] [PATCH core-updates v3 0/2] Update xorgproto and xwayland) John Kehayias via Guix-patches via
3 siblings, 0 replies; 8+ messages in thread
From: Kaelyn Takata via Guix-patches via @ 2023-11-12 19:55 UTC (permalink / raw)
To: 67136; +Cc: Kaelyn Takata
* gnu/packages/xorg.scm (xorg-server-xwayland): Update to 23.2.2.
[inputs]: Add libxcvt.
[properties]: Set upstream-name.
Change-Id: I05427b1d93d07a4210466f290621c1ca5effb4af
---
gnu/packages/xorg.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index c08fe3ae34..680fb3546e 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5246,7 +5246,7 @@ (define-public egl-wayland
(define-public xorg-server-xwayland
(package
(name "xorg-server-xwayland")
- (version "21.1.3")
+ (version "23.2.2")
(source
(origin
(method url-fetch)
@@ -5254,7 +5254,7 @@ (define-public xorg-server-xwayland
"/xserver/xwayland-" version ".tar.xz"))
(sha256
(base32
- "18pqvg76grbsyxa3mm3j06i1l8cwb28nbn2gcnqpsk7x75zpbhpb"))))
+ "1a5h5si11j6m6n6zwjh3xhzcsayvwlsrry84z8gr87m4s8w0jz4z"))))
(inputs (list font-dejavu
dbus
egl-wayland
@@ -5264,6 +5264,7 @@ (define-public xorg-server-xwayland
libepoxy
libgcrypt
libtirpc
+ libxcvt
libxfont2
libxkbfile
pixman
@@ -5279,6 +5280,7 @@ (define-public xorg-server-xwayland
wayland
wayland-protocols)
'())))
+ (properties '((upstream-name . "xwayland")))
(build-system meson-build-system)
(arguments
`(#:configure-flags
--
2.41.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#67136] [PATCH core-updates v3 0/2] Update xorgproto and xwayland
2023-11-12 19:52 [bug#67136] [PATCH mesa-branch 0/2] Update xorgproto and xwayland Kaelyn Takata via Guix-patches via
2023-11-12 19:55 ` [bug#67136] [PATCH mesa-branch 1/2] gnu: xorgproto: Update to 2023.2 Kaelyn Takata via Guix-patches via
2023-11-12 19:55 ` [bug#67136] [PATCH mesa-branch 2/2] gnu: xorg-server-xwayland: Update to 23.2.2 Kaelyn Takata via Guix-patches via
@ 2023-12-16 1:00 ` Kaelyn Takata via Guix-patches via
2023-12-16 1:00 ` [bug#67136] [PATCH core-updates v3 1/2] gnu: xorgproto: Update to 2023.2 Kaelyn Takata via Guix-patches via
` (2 more replies)
2023-12-21 6:43 ` [bug#67136] closed (Re: [bug#67136] [PATCH core-updates v3 0/2] Update xorgproto and xwayland) John Kehayias via Guix-patches via
3 siblings, 3 replies; 8+ messages in thread
From: Kaelyn Takata via Guix-patches via @ 2023-12-16 1:00 UTC (permalink / raw)
To: 67136; +Cc: Kaelyn Takata
v3:
* Bump xwayland from 23.2.2 to 23.2.3 to pick up fixes for two additional CVEs.
Kaelyn Takata (2):
gnu: xorgproto: Update to 2023.2.
gnu: xorg-server-xwayland: Update to 23.2.3.
gnu/packages/xorg.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
base-commit: 55dedd4d69d6abc6cb3d8dabf3a0e6357d67944b
--
2.41.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#67136] [PATCH core-updates v3 1/2] gnu: xorgproto: Update to 2023.2.
2023-12-16 1:00 ` [bug#67136] [PATCH core-updates v3 0/2] Update xorgproto and xwayland Kaelyn Takata via Guix-patches via
@ 2023-12-16 1:00 ` Kaelyn Takata via Guix-patches via
2023-12-16 1:00 ` [bug#67136] [PATCH core-updates v3 2/2] gnu: xorg-server-xwayland: Update to 23.2.3 Kaelyn Takata via Guix-patches via
2023-12-20 21:12 ` bug#67136: [PATCH core-updates v3 0/2] Update xorgproto and xwayland Ludovic Courtès
2 siblings, 0 replies; 8+ messages in thread
From: Kaelyn Takata via Guix-patches via @ 2023-12-16 1:00 UTC (permalink / raw)
To: 67136; +Cc: Kaelyn Takata
* gnu/packages/xorg.scm (xorgproto): Update to 2023.2.
Change-Id: Ie0e4712e4ec3fe9620d160bedcfe74452fa6ae5d
---
gnu/packages/xorg.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 72256895f1..49d061c2bc 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -245,14 +245,14 @@ (define-public bdftopcf
(define-public xorgproto
(package
(name "xorgproto")
- (version "2022.2")
+ (version "2023.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://xorg/individual/proto"
"/xorgproto-" version ".tar.xz"))
(sha256
(base32
- "17kbq1x68jl9mz69ays5c0w72lpkqi937raxk0im7y88pvrdn4sx"))))
+ "0b4c27aq25w1fccks49p020avf9jzh75kaq5qwnww51bp1yvq7xn"))))
(build-system gnu-build-system)
(propagated-inputs
;; To get util-macros in (almost?) all package inputs.
--
2.41.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#67136] [PATCH core-updates v3 2/2] gnu: xorg-server-xwayland: Update to 23.2.3.
2023-12-16 1:00 ` [bug#67136] [PATCH core-updates v3 0/2] Update xorgproto and xwayland Kaelyn Takata via Guix-patches via
2023-12-16 1:00 ` [bug#67136] [PATCH core-updates v3 1/2] gnu: xorgproto: Update to 2023.2 Kaelyn Takata via Guix-patches via
@ 2023-12-16 1:00 ` Kaelyn Takata via Guix-patches via
2023-12-20 21:12 ` bug#67136: [PATCH core-updates v3 0/2] Update xorgproto and xwayland Ludovic Courtès
2 siblings, 0 replies; 8+ messages in thread
From: Kaelyn Takata via Guix-patches via @ 2023-12-16 1:00 UTC (permalink / raw)
To: 67136; +Cc: Kaelyn Takata
Fixes CVE-2023-5367 and CVE-2023-5380. See the X.Org security advisory
<https://lists.x.org/archives/xorg-announce/2023-October/003430.html> for
more information.
Also fixes CVE-2023-6377 and CVE-2023-6478. See the X.Org security advisory
<https://lists.x.org/archives/xorg-announce/2023-December/003435.html> for
more information.
* gnu/packages/xorg.scm (xorg-server-xwayland): Update to 23.2.3.
[inputs]: Add libxcvt.
[properties]: Set upstream-name.
Change-Id: I05427b1d93d07a4210466f290621c1ca5effb4af
---
gnu/packages/xorg.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 49d061c2bc..38261fda3c 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5246,7 +5246,7 @@ (define-public egl-wayland
(define-public xorg-server-xwayland
(package
(name "xorg-server-xwayland")
- (version "21.1.3")
+ (version "23.2.3")
(source
(origin
(method url-fetch)
@@ -5254,7 +5254,7 @@ (define-public xorg-server-xwayland
"/xserver/xwayland-" version ".tar.xz"))
(sha256
(base32
- "18pqvg76grbsyxa3mm3j06i1l8cwb28nbn2gcnqpsk7x75zpbhpb"))))
+ "00p30yyikh7h9xsqgir66xb06pspgjlibv1mi0n42irc4fkrm7gb"))))
(inputs (list font-dejavu
dbus
egl-wayland
@@ -5264,6 +5264,7 @@ (define-public xorg-server-xwayland
libepoxy
libgcrypt
libtirpc
+ libxcvt
libxfont2
libxkbfile
pixman
@@ -5279,6 +5280,7 @@ (define-public xorg-server-xwayland
wayland
wayland-protocols)
'())))
+ (properties '((upstream-name . "xwayland")))
(build-system meson-build-system)
(arguments
`(#:configure-flags
--
2.41.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* bug#67136: [PATCH core-updates v3 0/2] Update xorgproto and xwayland
2023-12-16 1:00 ` [bug#67136] [PATCH core-updates v3 0/2] Update xorgproto and xwayland Kaelyn Takata via Guix-patches via
2023-12-16 1:00 ` [bug#67136] [PATCH core-updates v3 1/2] gnu: xorgproto: Update to 2023.2 Kaelyn Takata via Guix-patches via
2023-12-16 1:00 ` [bug#67136] [PATCH core-updates v3 2/2] gnu: xorg-server-xwayland: Update to 23.2.3 Kaelyn Takata via Guix-patches via
@ 2023-12-20 21:12 ` Ludovic Courtès
2 siblings, 0 replies; 8+ messages in thread
From: Ludovic Courtès @ 2023-12-20 21:12 UTC (permalink / raw)
To: Kaelyn Takata; +Cc: 67136-done
Hi,
Kaelyn Takata <kaelyn.alexi@protonmail.com> skribis:
> gnu: xorgproto: Update to 2023.2.
> gnu: xorg-server-xwayland: Update to 23.2.3.
Applied on ‘core-updates’, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#67136] closed (Re: [bug#67136] [PATCH core-updates v3 0/2] Update xorgproto and xwayland)
2023-11-12 19:52 [bug#67136] [PATCH mesa-branch 0/2] Update xorgproto and xwayland Kaelyn Takata via Guix-patches via
` (2 preceding siblings ...)
2023-12-16 1:00 ` [bug#67136] [PATCH core-updates v3 0/2] Update xorgproto and xwayland Kaelyn Takata via Guix-patches via
@ 2023-12-21 6:43 ` John Kehayias via Guix-patches via
3 siblings, 0 replies; 8+ messages in thread
From: John Kehayias via Guix-patches via @ 2023-12-21 6:43 UTC (permalink / raw)
To: Ludovic Courtès, Kaelyn Takata; +Cc: 67136
Hi,
> Applied on ‘core-updates’, thanks!
Ah! I forgot to reply to the actual bug (and not just via the guix-devel
discussion) but I had applied these to the mesa-updates branch. I don't
think I had to make any tweaks besides a signed-off, maybe a commit log
tweak? So, I don't think there will be any conflicts later.
As for mesa-updates, I'm letting it build still but I think it is close.
I keep restarting "could not build missing derivation" failures and need
to see how it has fared on other architectures. So hopefully hitting
master soon; let me know if any questions when merging that into
core-updates but should be clean.
Sorry about that!
John
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-12-21 6:45 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-12 19:52 [bug#67136] [PATCH mesa-branch 0/2] Update xorgproto and xwayland Kaelyn Takata via Guix-patches via
2023-11-12 19:55 ` [bug#67136] [PATCH mesa-branch 1/2] gnu: xorgproto: Update to 2023.2 Kaelyn Takata via Guix-patches via
2023-11-12 19:55 ` [bug#67136] [PATCH mesa-branch 2/2] gnu: xorg-server-xwayland: Update to 23.2.2 Kaelyn Takata via Guix-patches via
2023-12-16 1:00 ` [bug#67136] [PATCH core-updates v3 0/2] Update xorgproto and xwayland Kaelyn Takata via Guix-patches via
2023-12-16 1:00 ` [bug#67136] [PATCH core-updates v3 1/2] gnu: xorgproto: Update to 2023.2 Kaelyn Takata via Guix-patches via
2023-12-16 1:00 ` [bug#67136] [PATCH core-updates v3 2/2] gnu: xorg-server-xwayland: Update to 23.2.3 Kaelyn Takata via Guix-patches via
2023-12-20 21:12 ` bug#67136: [PATCH core-updates v3 0/2] Update xorgproto and xwayland Ludovic Courtès
2023-12-21 6:43 ` [bug#67136] closed (Re: [bug#67136] [PATCH core-updates v3 0/2] Update xorgproto and xwayland) John Kehayias via Guix-patches via
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.