Commit Graph

38 Commits

Author SHA1 Message Date
Ross Burton
4fab105c8f Revert "xwayland: mark CVEs fixed in 24.1.6 as fixed"
The CPE data in the NVD database is now complete, so these overrides are
no longer needed.

This reverts commit 76c7bb2b9c1b5300f957f11e1601816f8f90b501.

(From OE-Core rev: 693f79b94edb6793d718f97457b6ebd4fa4bfb43)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2025-05-19 17:35:43 +01:00
Peter Marko
77246fe064 xwayland: mark CVEs fixed in 24.1.6 as fixed
These are tracked as versionless redhat CVEs in NVD DB.

(From OE-Core rev: 76c7bb2b9c1b5300f957f11e1601816f8f90b501)

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2025-03-13 11:00:35 +00:00
Vijay Anusuri
001f0a14ff xwayland: upgrade 24.1.5 -> 24.1.6
Includes security fix

  * CVE-2025-26594
  * CVE-2025-26595
  * CVE-2025-26596
  * CVE-2025-26597
  * CVE-2025-26598
  * CVE-2025-26599
  * CVE-2025-26600
  * CVE-2025-26601

Ref: https://lists.x.org/archives/xorg-announce/2025-February/003584.html
     https://lists.x.org/archives/xorg-announce/2025-February/003586.html

(From OE-Core rev: c3f99b156a94e6687f2a6221a88d463730fd7561)

Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2025-03-03 18:01:29 +00:00
Wang Mingyu
8161ea284b xwayland: upgrade 24.1.4 -> 24.1.5
(From OE-Core rev: f04edcc6ab87b638989ebac0fe442926897c0277)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2025-02-18 22:53:45 +00:00
Vijay Anusuri
5a1c52e064 xwayland: upgrade 24.1.3 -> 24.1.4
Includes security fix CVE-2024-9632

Ref: https://lists.x.org/archives/xorg/2024-October/061766.html

(From OE-Core rev: 3fdc716d1260b4a92a46cfd2059ce044447f9172)

Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-11-06 12:18:05 +00:00
Wang Mingyu
9195202978 xwayland: upgrade 24.1.2 -> 24.1.3
(From OE-Core rev: b42744482d5b883c04e81b4be56ef19bc27caa3f)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-10-11 12:17:03 +01:00
Wang Mingyu
e15c4ee1e2 xwayland: upgrade 24.1.1 -> 24.1.2
(From OE-Core rev: 932450aebd8910118186fbea1f72aa77e3125743)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-08-21 21:51:49 +01:00
Wang Mingyu
b09f433ec9 xwayland: upgrade 24.1.0 -> 24.1.1
(From OE-Core rev: 26782d582663f430b8870008e0b2983f5bd29650)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-08-03 07:47:36 +01:00
Wang Mingyu
6327a50e03 xwayland: upgrade 23.2.6 -> 24.1.0
(From OE-Core rev: 04ccb375e6ff6f01b842818fa130bd5cb2be7e18)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-05-28 09:38:24 +01:00
Markus Volk
74361a6e6d xwayland: update 23.2.5 -> 23.2.6
- add a PACKAGECONFIG for libdecor
- add PACKAGECONFIGS for xwayland_ei to avoid auto select

(From OE-Core rev: cb12eca789ca7c434ed9e4a796c43844df0e5ada)

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-04-23 13:40:24 +01:00
Richard Purdie
f68203810d xwayland: Upgrade 23.2.4 -> 23.2.5
"""
This release contains the 3 security fixes that actually apply to
Xwayland reported in today's security advisory:

  * CVE-2024-31080
  * CVE-2024-31081
  * CVE-2024-31083

Additionally, it also contains a couple of other fixes, a copy/paste
error in the DeviceStateNotify event and a fix to enable buttons with
pointer gestures for backward compatibility with legacy X11 clients.
"""

https://lists.x.org/archives/xorg/2024-April/061614.html

(From OE-Core rev: c89fea4ffb101e3d7079e126721b95fdf199b4aa)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-04-08 23:33:32 +01:00
Khem Raj
db87a18a92 xwayland: Upgrade 23.2.3 -> 23.2.4
Cumulative Fixes for CVE-2023-6816, CVE-2024-0229, CVE-2024-21885, CVE-2024-21886,
CVE-2024-0408, CVE-2024-0409

(From OE-Core rev: 6a2e44340c8ae2a60e33696ad944e327a24479d5)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-01-30 15:15:54 +00:00
Wang Mingyu
9cd6986348 xwayland: upgrade 23.2.2 -> 23.2.3
(From OE-Core rev: bf0bb7b94ed4930145af5f1fb3836157daceb6bb)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-12-23 08:46:00 +00:00
Ross Burton
ed4aed02b6 xwayland: upgrade to 23.2.2
e4487cae1 Bump version to 23.2.2
1e8478455 Xi/randr: fix handling of PropModeAppend/Prepend (CVE-2023-5367)
829a99117 Switch to libbsd-overlay
4f8a851b6 xwayland: Cancel the EI disconnect timer when freed
cc79b2a83 glamor: xv: Fix invalid accessing of plane attributes for NV12
07c18c90e xwayland: Give up on EI on setup failure
10353a01a xwayland: Add an option to enable EI portal support
4f8e209d2 xwayland/glamor/gbm: Set GBM_BO_USE_LINEAR if only LINEAR modifier is supported
c9a842e60 xwayland/present: Handle NULL window_priv in xwl_present_cleanup
2bd43be92 glamor: fixes GL_INVALID_ENUM errors on ES if there is no quads

(From OE-Core rev: 7d0fc94d09db76d4c4d6ca9d2da1b30768f68c9e)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-11-09 16:57:26 +00:00
Alexander Kanavin
ff3a5c4e43 xwayland: upgrade 23.1.2 -> 23.2.1
(From OE-Core rev: de357ee49f7843939bc09888a0b3318d7f8cd195)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-09-26 10:35:27 +01:00
Wang Mingyu
c14fb8602e xwayland: upgrade 23.1.1 -> 23.1.2
(From OE-Core rev: 78105a13af9886d94740533b72c1c665fdf08e9f)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-06-28 07:56:33 +01:00
Wang Mingyu
42badb5444 xwayland: upgrade 22.1.8 -> 23.1.1
(From OE-Core rev: 35fdbd0ea81650a0421d50fb53989d96c5956331)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-04-13 11:56:07 +01:00
Wang Mingyu
b91779afad xwayland: upgrade 22.1.7 -> 22.1.8
(From OE-Core rev: e0ca374267cce807d12d706564989900fe61bd97)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-02-15 10:21:35 +00:00
Alexander Kanavin
1e3f280267 xwayland: upgrade 22.1.5 -> 22.1.7
(From OE-Core rev: c37ec8b2d91605d6eb5228f0a447fb83f111edc3)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-01-06 12:03:47 +00:00
Carlos Alberto Lopez Perez
8bd4aa73db xwayland: libxshmfence is needed when dri3 is enabled
* The build error happens already at configure time:

| meson.build: ERROR: Problem encountered: DRI3 requested, but xshmfence not found

(From OE-Core rev: 451fe4a067432b432b9cd38d2fc78072f6ce5421)

Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-12-06 15:23:18 +00:00
Wang Mingyu
93b26a86ef xwayland: upgrade 22.1.4 -> 22.1.5
(From OE-Core rev: 48ca760427f14ae291bf2ebf6f93f8d0fb27e3ab)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-11-15 09:38:37 +00:00
Alexander Kanavin
669cc26c4c xwayland: upgrade 22.1.3 -> 22.1.4
(From OE-Core rev: 553c080e0e30c8f6b69b4c5fae72903ee45ef6ae)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-11-08 22:47:16 +00:00
Alexander Kanavin
6bafed6b30 xwayland: upgrade 22.1.2 -> 22.1.3
(From OE-Core rev: 229e3ad289a5e2c890b25497857140952acc3d67)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-07-23 13:55:26 +01:00
Richard Purdie
614163fccc xwayland: upgrade 22.1.1 -> 22.1.2
(From OE-Core rev: 0fd8934f51080313f54326b634593d11385b3338)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-06-04 11:28:23 +01:00
Alexander Kanavin
564f5a6d5c xwayland: upgrade 22.1.0 -> 22.1.1
(From OE-Core rev: aa0028e19651665f6671d7c57646cfc97c7ba763)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-05-05 21:17:38 +01:00
Alexander Kanavin
cb87a65dfb xwayland: update 21.1.4 -> 22.1.0
(From OE-Core rev: d62790354fd562afef004ea002017079972620f1)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-03-09 11:46:27 +00:00
Richard Purdie
b0130fcf91 meta/meta-selftest/meta-skeleton: Update LICENSE variable to use SPDX license identifiers
An automated conversion using scripts/contrib/convert-spdx-licenses.py to
convert to use the standard SPDX license identifiers. Two recipes in meta-selftest
were not converted as they're that way specifically for testing. A change in
linux-firmware was also skipped and may need a more manual tweak.

(From OE-Core rev: ceda3238cdbf1beb216ae9ddb242470d5dfc25e0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-20 16:45:25 +00:00
Tom Hochstein
5d5ca5ec3a xwayland: Add xkbcomp runtime dependency
Trying to run an xterm fails with the error:
xterm: Xt error: Can't open display: :0

Checking systemctl status weston shows an error:
Jan 19 21:24:16 imx8mq-evk weston[396]: sh: line 1: /usr/bin/xkbcomp: No such file or directory

Adding xkbcomp to the rootfs fixes these errors. Checking the history
one finds that the runtime dependency for the old xserver was
removed because it wasn't in the correct location [1], then restored
because it was still needed [2].

[1] bdcc5e8f12
[2] f2330ebc30

(From OE-Core rev: 535e6df5b5e53dd95438985dcff554cd17302837)

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-03 09:05:14 +00:00
Alexander Kanavin
851edf4ebc xwayland: upgrade 21.1.3 -> 21.1.4
(From OE-Core rev: caa2e927b273d67d116674c495de67f6374a45b0)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-01-20 11:57:29 +00:00
Alexander Kanavin
3350a1401d xwayland: upgrade 21.1.2 -> 21.1.3
(From OE-Core rev: 9bf945400f2a88f600450040ef130aed8e91566c)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-11-21 11:05:01 +00:00
Richard Purdie
596cbbf615 recipes: Add missing pkgconfig inherit
Various recipes were missing a pkgconfig inherit or pkgconfig-native
dependency despite using pkgconfig.

Add the inherit to igt-gpu-tools/gdb/libmodulemd/libwpe/xwayland/waffle
shaderc/iputils/wpebackend-fdo/lttng-ust/cargo.

(From OE-Core rev: 777d9744570c2dc119dc5d04985896bbb1da5885)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-09-21 23:44:08 +01:00
Richard Purdie
bb6ddc3691 Convert to new override syntax
This is the result of automated script conversion:

scripts/contrib/convert-overrides.py <oe-core directory>

converting the metadata to use ":" as the override character instead of "_".

(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-02 15:44:10 +01:00
Alexander Kanavin
019bded64b xwayland: upgrade 21.1.1 -> 21.1.2
(From OE-Core rev: 0c5a104c1e553800f4621b2f97cc8028ce5632b0)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-07-16 21:23:44 +01:00
Alexander Kanavin
08b30a33bd xwayland: exclude development snapshots from upstream version checks
(From OE-Core rev: d31fa2a23997f656cd7459d682df8ab82f549267)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-07-08 14:58:28 +01:00
Max Krummenacher
9c591cfa06 xwayland: port packageconfig from xserver-xorg recipe
Copy the packageconfig options from the xserver-xorg recipe to
allow configuring for non mesa opengl backends.

Keep the defaults as set in the xserver-xorg recipe.

The following options no longer exists and are dropped:
udev dga dri dri2 xshmfence xmlto systemd-logind systemd xwayland

(From OE-Core rev: fce9c89c33ba6c6540fc92b729e0b7b34a6d7a3b)

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-06-27 22:51:05 +01:00
Andreas Müller
d71ed04ebf xwayland: remove protocol.txt - it clashes with xserver-xorg
* Images with wayland-compositors + xwayland + xserver fail to build
* Fedora - they introduced standalone xwayland - does same [1]

[1] https://src.fedoraproject.org/rpms/xorg-x11-server-Xwayland/blob/rawhide/f/xorg-x11-server-Xwayland.spec

(From OE-Core rev: ace7a71b09df24de7b70f52edcd425366f39d56e)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-06 08:41:26 +01:00
Martin Jansa
5625fbdfa5 xwayland: add opengl to REQUIRED_DISTRO_FEATURES
* it depends on libepoxy which has this restriction
* fixes:
  ERROR: Nothing PROVIDES 'libepoxy' (but openembedded-core/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb DEPENDS on or otherwise requires it)
  libepoxy was skipped: missing required distro feature 'opengl' (not in DISTRO_FEATURES)
  ERROR: Nothing RPROVIDES 'xwayland' (but openembedded-core/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb RDEPENDS on or otherwise requires it)
  No eligible RPROVIDERs exist for 'xwayland'
  NOTE: Runtime target 'xwayland' is unbuildable, removing...
  Missing or unbuildable dependency chain was: ['xwayland']
  ERROR: Nothing RPROVIDES 'xwayland-dev' (but openembedded-core/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb RDEPENDS on or otherwise requires it)
  No eligible RPROVIDERs exist for 'xwayland-dev'
  NOTE: Runtime target 'xwayland-dev' is unbuildable, removing...
  Missing or unbuildable dependency chain was: ['xwayland-dev']

(From OE-Core rev: d5455a8f636599d6be8c36ea1578274148d558df)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-23 10:12:08 +01:00
Alexander Kanavin
07d33c8ec8 xwayland: add a standalone recipe
Please see here for the rationale for splitting XWayland out of
main xserver-xorg tree:
https://fedoraproject.org/wiki/Changes/XwaylandStandalone

Release announcement:
https://lists.x.org/archives/xorg-announce/2021-March/003076.html

(From OE-Core rev: 1533d913af0aac5524d2f9ebacaeafb5891124e2)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-20 13:56:48 +01:00