From 42aba60b4a6e509e2de1ebbc0e0d69bffd013ca8 Mon Sep 17 00:00:00 2001 From: Toshaan Bharvani Date: Wed, 20 Dec 2023 14:14:12 +0100 Subject: [PATCH] update to new xwayland Signed-off-by: Toshaan Bharvani --- SPECS/xorg-x11-server-Xwayland.spec | 48 +++++++++++++++++++---------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/SPECS/xorg-x11-server-Xwayland.spec b/SPECS/xorg-x11-server-Xwayland.spec index 6b13629..116492a 100644 --- a/SPECS/xorg-x11-server-Xwayland.spec +++ b/SPECS/xorg-x11-server-Xwayland.spec @@ -8,7 +8,7 @@ Summary: Xwayland Name: xorg-x11-server-Xwayland -Version: 21.1.3 +Version: 22.1.9 Release: 2%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist} URL: http://www.x.org @@ -18,20 +18,6 @@ Source0: https://gitlab.freedesktop.org/xorg/%{pkgname}/-/archive/%{commit}/%{ Source0: https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz %endif -Patch1: 0001-xwayland-eglstream-Demote-EGLstream-device-warning.patch -Patch2: 0002-xwayland-glamor-Change-errors-to-verbose-messages.patch -Patch3: 0003-xwayland-glamor-Log-backend-selected-for-debug.patch -Patch4: 0004-xwayland-eglstream-Prefer-EGLstream-if-available.patch - -# CVE-2021-4011 -Patch10001: 0001-record-Fix-out-of-bounds-access-in-SwapCreateRegiste.patch -# CVE-2021-4009 -Patch10002: 0002-xfixes-Fix-out-of-bounds-access-in-ProcXFixesCreateP.patch -# CVE-2021-4010 -Patch10003: 0003-Xext-Fix-out-of-bounds-access-in-SProcScreenSaverSus.patch -# CVE-2021-4008 -Patch10004: 0004-render-Fix-out-of-bounds-access-in-SProcRenderCompos.patch - License: MIT Requires: xorg-x11-server-common @@ -42,11 +28,10 @@ BuildRequires: git-core BuildRequires: meson BuildRequires: wayland-devel -BuildRequires: pkgconfig(wayland-client) >= 1.3.0 +BuildRequires: pkgconfig(wayland-client) >= 1.18.0 BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(wayland-eglstream-protocols) -BuildRequires: pkgconfig(dmx) BuildRequires: pkgconfig(epoxy) BuildRequires: pkgconfig(fontenc) BuildRequires: pkgconfig(libdrm) >= 2.4.0 @@ -71,6 +56,7 @@ BuildRequires: pkgconfig(xshmfence) >= 1.1 BuildRequires: pkgconfig(xtrans) >= 1.3.2 BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xv) +BuildRequires: pkgconfig(libxcvt) BuildRequires: xorg-x11-proto-devel >= 7.7-10 BuildRequires: mesa-libGL-devel >= 9.2 @@ -137,6 +123,34 @@ rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb %{_libdir}/pkgconfig/xwayland.pc %changelog +* Tue Apr 25 2023 Olivier Fourdan - 22.1.9-2 +- Rebuild (#2158761) + +* Mon Apr 3 2023 Olivier Fourdan - 22.1.9-1 +- xwayland 22.1.9 (#2158761) + +* Fri Mar 31 2023 Olivier Fourdan - 21.1.3-8 +- Fix CVE-2023-1393 (#2180299) + +* Tue Feb 7 2023 Olivier Fourdan - 21.1.3-7 +- Fix CVE-2023-0494 (#2166974) + +* Mon Dec 19 2022 Peter Hutterer - 21.1.3-6 +- Follow-up fix for CVE-2022-46340 (#2151778) + +* Wed Dec 14 2022 Peter Hutterer - 21.1.3-5 +- CVE fix for: CVE-2022-4283 (#2151803), CVE-2022-46340 (#2151778), + CVE-2022-46341 (#2151783), CVE-2022-46342 (#2151786), + CVE-2022-46343 (#2151793), CVE-2022-46344 (#2151796) + +* Mon Nov 14 2022 Olivier Fourdan - 21.1.3-4 +- Fix CVE-2022-3550, CVE-2022-3551 + Resolves: rhbz#2140769, rhbz#2140771 + +* Fri Jul 29 2022 Olivier Fourdan - 21.1.3-3 +- CVE fix for: CVE-2022-2319/ZDI-CAN-16062, CVE-2022-2320/ZDI-CAN-16070 + Resolves: rhbz#2110440, rhbz#2110433 + * Fri Jan 7 2022 Olivier Fourdan - 21.1.3-2 - CVE fix for: CVE-2021-4008 (#2038067), CVE-2021-4009 (#2038070), CVE-2021-4010 (#2038072), CVE-2021-4011 (#2038074)