[PATCH core-updates 0/2] Update xorgproto and xwayland

  • Done
  • quality assurance status badge
Details
3 participants
  • John Kehayias
  • Kaelyn Takata
  • Ludovic Courtès
Owner
unassigned
Submitted by
Kaelyn Takata
Severity
normal

Debbugs page

Kaelyn Takata wrote 1 years ago
[PATCH mesa-branch 0/2] Update xorgproto and xwayland
(address . guix-patches@gnu.org)(name . Kaelyn Takata)(address . kaelyn.alexi@protonmail.com)
cover.1699807940.git.kaelyn.alexi@protonmail.com
The xorg-server-xwayland update is primarily motivated by picking up the fixes
to last month's CVEs
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
Kaelyn Takata wrote 1 years ago
[PATCH mesa-branch 1/2] gnu: xorgproto: Update to 2023.2.
(address . 67136@debbugs.gnu.org)(name . Kaelyn Takata)(address . kaelyn.alexi@protonmail.com)
1c9e866c336f6b6bf0b85baf844a24a28c988104.1699807940.git.kaelyn.alexi@protonmail.com
* gnu/packages/xorg.scm (xorgproto): Update to 2023.2.

Change-Id: Ie0e4712e4ec3fe9620d160bedcfe74452fa6ae5d
---
gnu/packages/xorg.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
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
Kaelyn Takata wrote 1 years ago
[PATCH mesa-branch 2/2] gnu: xorg-server-xwayland: Update to 23.2.2.
(address . 67136@debbugs.gnu.org)(name . Kaelyn Takata)(address . kaelyn.alexi@protonmail.com)
35974f4d94d836292bb394c3ce1ff246b5d29503.1699807940.git.kaelyn.alexi@protonmail.com
* 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(-)

Toggle diff (40 lines)
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
Kaelyn wrote 1 years ago
(No Subject)
(name . control@debbugs.gnu.org)(address . control@debbugs.gnu.org)
9ZLblNs2vt5zvnNvPS-LD82navdTGVlLDsaxPcYXHQ-bPUvaAc6_jpn1xRvTGw-2rfBvZ_PogCSsTPh2RIyR3MCwzn15RUdy73ZVB5wUxM4=@protonmail.com
retitle 67136 [PATCH core-updates 0/2] Update xorgproto and xwayland
Kaelyn Takata wrote 1 years ago
[PATCH core-updates v3 1/2] gnu: xorgproto: Update to 2023.2.
(address . 67136@debbugs.gnu.org)(name . Kaelyn Takata)(address . kaelyn.alexi@protonmail.com)
b9973637666bac080af70a6f594e4ae07d34ab04.1702687204.git.kaelyn.alexi@protonmail.com
* gnu/packages/xorg.scm (xorgproto): Update to 2023.2.

Change-Id: Ie0e4712e4ec3fe9620d160bedcfe74452fa6ae5d
---
gnu/packages/xorg.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
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
Kaelyn Takata wrote 1 years ago
[PATCH core-updates v3 0/2] Update xorgproto and xwayland
(address . 67136@debbugs.gnu.org)(name . Kaelyn Takata)(address . kaelyn.alexi@protonmail.com)
cover.1702687204.git.kaelyn.alexi@protonmail.com
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
Kaelyn Takata wrote 1 years ago
[PATCH core-updates v3 2/2] gnu: xorg-server-xwayland: Update to 23.2.3.
(address . 67136@debbugs.gnu.org)(name . Kaelyn Takata)(address . kaelyn.alexi@protonmail.com)
412c4b43ebc05982aebab676aa3f9c68523da301.1702687204.git.kaelyn.alexi@protonmail.com
Fixes CVE-2023-5367 and CVE-2023-5380. See the X.Org security advisory
more information.

Also fixes CVE-2023-6377 and CVE-2023-6478. See the X.Org security advisory
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(-)

Toggle diff (40 lines)
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
Ludovic Courtès wrote 1 years ago
Re: [bug#67136] [PATCH core-updates v3 0/2] Update xorgproto and xwayland
(name . Kaelyn Takata)(address . kaelyn.alexi@protonmail.com)(address . 67136-done@debbugs.gnu.org)
87zfy4fuig.fsf@gnu.org
Hi,

Kaelyn Takata <kaelyn.alexi@protonmail.com> skribis:

Toggle quote (3 lines)
> gnu: xorgproto: Update to 2023.2.
> gnu: xorg-server-xwayland: Update to 23.2.3.

Applied on ‘core-updates’, thanks!

Ludo’.
Closed
John Kehayias wrote 1 years ago
Re: bug#67136: closed (Re: [bug#67136] [PATCH core-updates v3 0/2] Update xorgproto and xwayland)
(address . 67136@debbugs.gnu.org)
87frzwqcma.fsf@protonmail.com
Hi,

Toggle quote (2 lines)
> 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
?
Your comment

This issue is archived.

To comment on this conversation send an email to 67136@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 67136
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help