initial package creation

Signed-off-by: Toshaan Bharvani <toshaan@powerel.org>

SOURCES/0001-record-Fix-out-of-bounds-access-in-SwapCreateRegiste.patch

@@ -0,0 +1,35 @@
+From a8644465d98beb08759546711b77bb617861c67f Mon Sep 17 00:00:00 2001
+From: Povilas Kanapickas <povilas@radix.lt>
+Date: Tue, 14 Dec 2021 15:00:00 +0200
+Subject: [PATCH xserver 1/4] record: Fix out of bounds access in
+ SwapCreateRegister()
+
+ZDI-CAN-14952, CVE-2021-4011
+
+This vulnerability was discovered and the fix was suggested by:
+Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
+
+Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
+(cherry picked from commit e56f61c79fc3cee26d83cda0f84ae56d5979f768)
+---
+ record/record.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/record/record.c b/record/record.c
+index be154525d..e123867a7 100644
+--- a/record/record.c
++++ b/record/record.c
+@@ -2516,8 +2516,8 @@ SwapCreateRegister(ClientPtr client, xRecordRegisterClientsReq * stuff)
+         swapl(pClientID);
+     }
+     if (stuff->nRanges >
+-        client->req_len - bytes_to_int32(sz_xRecordRegisterClientsReq)
+-        - stuff->nClients)
++        (client->req_len - bytes_to_int32(sz_xRecordRegisterClientsReq)
++        - stuff->nClients) / bytes_to_int32(sz_xRecordRange))
+         return BadLength;
+     RecordSwapRanges((xRecordRange *) pClientID, stuff->nRanges);
+     return Success;
+-- 
+2.33.1
+

SOURCES/0001-xwayland-eglstream-Demote-EGLstream-device-warning.patch

@@ -0,0 +1,43 @@
+From 0a7ed9ff7ea20f7b958a2ad9f9bd045080a3ad9a Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Mon, 15 Nov 2021 16:02:34 +0100
+Subject: [PATCH xserver 1/4] xwayland/eglstream: Demote EGLstream device
+ warning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If no EGLstream capable device is found at startup, Xwayland's EGLstream
+backend will log an error message "glamor: No eglstream capable devices
+found".
+
+However, considering that the vast majority of drivers do not implement
+EGLstream, the lack of EGLstream capable device is more of the norm than
+the exception.
+
+Change the error message to a log verbose message.
+
+Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+Reviewed-by: Simon Ser <contact@emersion.fr>
+Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
+(cherry picked from commit 96c82befa2c3f3dc3534743c67cc003c2106e9b0)
+---
+ hw/xwayland/xwayland-glamor-eglstream.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
+index 8d18caaf5..93d192d58 100644
+--- a/hw/xwayland/xwayland-glamor-eglstream.c
++++ b/hw/xwayland/xwayland-glamor-eglstream.c
+@@ -1144,7 +1144,7 @@ xwl_eglstream_get_device(struct xwl_screen *xwl_screen)
+     free(devices);
+ out:
+     if (!device)
+-        ErrorF("glamor: No eglstream capable devices found\n");
++        LogMessageVerb(X_INFO, 3, "glamor: No eglstream capable devices found\n");
+     return device;
+ }
+ 
+-- 
+2.33.1
+

SOURCES/0002-xfixes-Fix-out-of-bounds-access-in-ProcXFixesCreateP.patch

@@ -0,0 +1,44 @@
+From 3eb5445f6f7fa9f86de87adc768105d42bdbcf74 Mon Sep 17 00:00:00 2001
+From: Povilas Kanapickas <povilas@radix.lt>
+Date: Tue, 14 Dec 2021 15:00:01 +0200
+Subject: [PATCH xserver 2/4] xfixes: Fix out of bounds access in
+ *ProcXFixesCreatePointerBarrier()
+
+ZDI-CAN-14950, CVE-2021-4009
+
+This vulnerability was discovered and the fix was suggested by:
+Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
+
+Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
+(cherry picked from commit b5196750099ae6ae582e1f46bd0a6dad29550e02)
+---
+ xfixes/cursor.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/xfixes/cursor.c b/xfixes/cursor.c
+index 60580b88f..c5d4554b2 100644
+--- a/xfixes/cursor.c
++++ b/xfixes/cursor.c
+@@ -1010,7 +1010,8 @@ ProcXFixesCreatePointerBarrier(ClientPtr client)
+ {
+     REQUEST(xXFixesCreatePointerBarrierReq);
+ 
+-    REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, pad_to_int32(stuff->num_devices));
++    REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq,
++                       pad_to_int32(stuff->num_devices * sizeof(CARD16)));
+     LEGAL_NEW_RESOURCE(stuff->barrier, client);
+ 
+     return XICreatePointerBarrier(client, stuff);
+@@ -1027,7 +1028,8 @@ SProcXFixesCreatePointerBarrier(ClientPtr client)
+ 
+     swaps(&stuff->length);
+     swaps(&stuff->num_devices);
+-    REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, pad_to_int32(stuff->num_devices));
++    REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq,
++                       pad_to_int32(stuff->num_devices * sizeof(CARD16)));
+ 
+     swapl(&stuff->barrier);
+     swapl(&stuff->window);
+-- 
+2.33.1
+

SOURCES/0002-xwayland-glamor-Change-errors-to-verbose-messages.patch

@@ -0,0 +1,88 @@
+From a515f4f4336efb8a2adf9a3ac141129708297d80 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Mon, 29 Nov 2021 11:45:35 +0100
+Subject: [PATCH xserver 2/4] xwayland/glamor: Change errors to verbose
+ messages
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On a normal startup sequence, the Xwayland glamor backend would log
+an error whenever a required Wayland protocol is missing.
+
+Those are not really errors though, more informational messages along
+the glamor backend selection process.
+
+Demote those errors to verbose messages to reduce the verbosity of
+Xwayland at startup by default.
+
+Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
+(cherry picked from commit 30d0d4a19be61dd7b61f5ced992cb299e6a38068)
+---
+ hw/xwayland/xwayland-glamor-eglstream.c | 6 ++++--
+ hw/xwayland/xwayland-glamor-gbm.c       | 2 +-
+ hw/xwayland/xwayland-glamor.c           | 6 ++++--
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
+index 93d192d58..5a20b452f 100644
+--- a/hw/xwayland/xwayland-glamor-eglstream.c
++++ b/hw/xwayland/xwayland-glamor-eglstream.c
+@@ -753,12 +753,14 @@ xwl_glamor_eglstream_has_wl_interfaces(struct xwl_screen *xwl_screen)
+         xwl_eglstream_get(xwl_screen);
+ 
+     if (xwl_eglstream->display == NULL) {
+-        ErrorF("glamor: 'wl_eglstream_display' not supported\n");
++        LogMessageVerb(X_INFO, 3,
++                       "glamor: 'wl_eglstream_display' not supported\n");
+         return FALSE;
+     }
+ 
+     if (xwl_eglstream->controller == NULL) {
+-        ErrorF("glamor: 'wl_eglstream_controller' not supported\n");
++        LogMessageVerb(X_INFO, 3,
++                       "glamor: 'wl_eglstream_controller' not supported\n");
+         return FALSE;
+     }
+ 
+diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
+index 466a1b052..e06b6f54b 100644
+--- a/hw/xwayland/xwayland-glamor-gbm.c
++++ b/hw/xwayland/xwayland-glamor-gbm.c
+@@ -835,7 +835,7 @@ xwl_glamor_gbm_has_wl_interfaces(struct xwl_screen *xwl_screen)
+     struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen);
+ 
+     if (xwl_gbm->drm == NULL) {
+-        ErrorF("glamor: 'wl_drm' not supported\n");
++        LogMessageVerb(X_INFO, 3, "glamor: 'wl_drm' not supported\n");
+         return FALSE;
+     }
+ 
+diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
+index deb398f91..541d5e923 100644
+--- a/hw/xwayland/xwayland-glamor.c
++++ b/hw/xwayland/xwayland-glamor.c
+@@ -412,7 +412,8 @@ xwl_glamor_select_gbm_backend(struct xwl_screen *xwl_screen)
+         return TRUE;
+     }
+     else
+-        ErrorF("Missing Wayland requirements for glamor GBM backend\n");
++        LogMessageVerb(X_INFO, 3,
++                       "Missing Wayland requirements for glamor GBM backend\n");
+ #endif
+ 
+     return FALSE;
+@@ -428,7 +429,8 @@ xwl_glamor_select_eglstream_backend(struct xwl_screen *xwl_screen)
+         return TRUE;
+     }
+     else
+-        ErrorF("Missing Wayland requirements for glamor EGLStream backend\n");
++        LogMessageVerb(X_INFO, 3,
++                       "Missing Wayland requirements for glamor EGLStream backend\n");
+ #endif
+ 
+     return FALSE;
+-- 
+2.33.1
+

SOURCES/0003-Xext-Fix-out-of-bounds-access-in-SProcScreenSaverSus.patch

@@ -0,0 +1,34 @@
+From fe0c050276c09f43cc1ae80b4553db42398ca84c Mon Sep 17 00:00:00 2001
+From: Povilas Kanapickas <povilas@radix.lt>
+Date: Tue, 14 Dec 2021 15:00:02 +0200
+Subject: [PATCH xserver 3/4] Xext: Fix out of bounds access in
+ SProcScreenSaverSuspend()
+
+ZDI-CAN-14951, CVE-2021-4010
+
+This vulnerability was discovered and the fix was suggested by:
+Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
+
+Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
+(cherry picked from commit 6c4c53010772e3cb4cb8acd54950c8eec9c00d21)
+---
+ Xext/saver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Xext/saver.c b/Xext/saver.c
+index 1d7e3cadf..f813ba08d 100644
+--- a/Xext/saver.c
++++ b/Xext/saver.c
+@@ -1351,8 +1351,8 @@ SProcScreenSaverSuspend(ClientPtr client)
+     REQUEST(xScreenSaverSuspendReq);
+ 
+     swaps(&stuff->length);
+-    swapl(&stuff->suspend);
+     REQUEST_SIZE_MATCH(xScreenSaverSuspendReq);
++    swapl(&stuff->suspend);
+     return ProcScreenSaverSuspend(client);
+ }
+ 
+-- 
+2.33.1
+

SOURCES/0003-xwayland-glamor-Log-backend-selected-for-debug.patch

@@ -0,0 +1,42 @@
+From 3206e133cb768709d32f260ac4b1bb17a46141a7 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed, 17 Nov 2021 13:09:58 +0100
+Subject: [PATCH xserver 3/4] xwayland/glamor: Log backend selected for debug
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add (verbose) statements to trace the actual backend used with glamor.
+
+That can be useful for debugging.
+
+Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
+(cherry picked from commit c5d1fed9fa32244739677ec5c58ea87b261e023b)
+---
+ hw/xwayland/xwayland-glamor.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
+index 541d5e923..b34eafabb 100644
+--- a/hw/xwayland/xwayland-glamor.c
++++ b/hw/xwayland/xwayland-glamor.c
+@@ -409,6 +409,7 @@ xwl_glamor_select_gbm_backend(struct xwl_screen *xwl_screen)
+     if (xwl_screen->gbm_backend.is_available &&
+         xwl_glamor_has_wl_interfaces(xwl_screen, &xwl_screen->gbm_backend)) {
+         xwl_screen->egl_backend = &xwl_screen->gbm_backend;
++        LogMessageVerb(X_INFO, 3, "glamor: Using GBM backend\n");
+         return TRUE;
+     }
+     else
+@@ -426,6 +427,7 @@ xwl_glamor_select_eglstream_backend(struct xwl_screen *xwl_screen)
+     if (xwl_screen->eglstream_backend.is_available &&
+         xwl_glamor_has_wl_interfaces(xwl_screen, &xwl_screen->eglstream_backend)) {
+         xwl_screen->egl_backend = &xwl_screen->eglstream_backend;
++        LogMessageVerb(X_INFO, 3, "glamor: Using EGLStream backend\n");
+         return TRUE;
+     }
+     else
+-- 
+2.33.1
+

SOURCES/0004-render-Fix-out-of-bounds-access-in-SProcRenderCompos.patch

@@ -0,0 +1,53 @@
+From 59c977bff66de77bd93ce8853e33e1b4ca661a49 Mon Sep 17 00:00:00 2001
+From: Povilas Kanapickas <povilas@radix.lt>
+Date: Tue, 14 Dec 2021 15:00:03 +0200
+Subject: [PATCH xserver 4/4] render: Fix out of bounds access in
+ SProcRenderCompositeGlyphs()
+
+ZDI-CAN-14192, CVE-2021-4008
+
+This vulnerability was discovered and the fix was suggested by:
+Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
+
+Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
+(cherry picked from commit ebce7e2d80e7c80e1dda60f2f0bc886f1106ba60)
+---
+ render/render.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/render/render.c b/render/render.c
+index c376090ca..456f156d4 100644
+--- a/render/render.c
++++ b/render/render.c
+@@ -2309,6 +2309,9 @@ SProcRenderCompositeGlyphs(ClientPtr client)
+ 
+         i = elt->len;
+         if (i == 0xff) {
++            if (buffer + 4 > end) {
++                return BadLength;
++            }
+             swapl((int *) buffer);
+             buffer += 4;
+         }
+@@ -2319,12 +2322,18 @@ SProcRenderCompositeGlyphs(ClientPtr client)
+                 buffer += i;
+                 break;
+             case 2:
++                if (buffer + i * 2 > end) {
++                    return BadLength;
++                }
+                 while (i--) {
+                     swaps((short *) buffer);
+                     buffer += 2;
+                 }
+                 break;
+             case 4:
++                if (buffer + i * 4 > end) {
++                    return BadLength;
++                }
+                 while (i--) {
+                     swapl((int *) buffer);
+                     buffer += 4;
+-- 
+2.33.1
+

SOURCES/0004-xwayland-eglstream-Prefer-EGLstream-if-available.patch

@@ -0,0 +1,64 @@
+From bdc00ba749ac6cde35c025f5f6b1a5b49c1f4960 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed, 17 Nov 2021 09:56:52 +0100
+Subject: [PATCH xserver 4/4] xwayland/eglstream: Prefer EGLstream if available
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Currently, when given the choice, Xwayland will pick the GBM backend
+over the EGLstream backend if both are available, unless the command
+line option “-eglstream” is specified.
+
+The NVIDIA proprietary driver had no support for GBM until driver series
+495, but starting with the driver series 495, both can be used.
+
+But there are other requirements with the rest of the stack, typically
+Mesa, egl-wayland, libglvnd as documented in the NVIDIA driver.
+
+So if the NVIDIA driver series 495 gets installed, Xwayland will pick
+the GBM backend even if EGLstream is available and may fail to render
+properly.
+
+To avoid that issue, prefer EGLstream if EGLstream and all the Wayland
+interfaces are available, and fallback to GBM automatically unless
+“-eglstream” was specified.
+
+With this, the compositor, given the choice, can decide which actual
+backend Xwayland would use by advertising (or not) the Wayland
+"wl_eglstream_controller" interface.
+
+This change has no impact on compositors which do not have support for
+EGLstream in the first place.
+
+Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+Acked-by: Michel Dänzer <mdaenzer@redhat.com>
+(cherry picked from commit 6dd9709bd85cf5de4067887818c864220b951355)
+---
+ hw/xwayland/xwayland-glamor.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
+index b34eafabb..f46b677f5 100644
+--- a/hw/xwayland/xwayland-glamor.c
++++ b/hw/xwayland/xwayland-glamor.c
+@@ -441,14 +441,10 @@ xwl_glamor_select_eglstream_backend(struct xwl_screen *xwl_screen)
+ void
+ xwl_glamor_select_backend(struct xwl_screen *xwl_screen, Bool use_eglstream)
+ {
+-    if (use_eglstream) {
+-        if (!xwl_glamor_select_eglstream_backend(xwl_screen))
++    if (!xwl_glamor_select_eglstream_backend(xwl_screen)) {
++        if (!use_eglstream)
+             xwl_glamor_select_gbm_backend(xwl_screen);
+     }
+-    else {
+-        if (!xwl_glamor_select_gbm_backend(xwl_screen))
+-            xwl_glamor_select_eglstream_backend(xwl_screen);
+-    }
+ }
+ 
+ Bool
+-- 
+2.33.1
+

SPECS/xorg-x11-server-Xwayland.spec

@@ -0,0 +1,183 @@
+%global commit 280aac5a0ee09c45b17ec4be0681397f7c34c12e
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+#global gitdate 20210201
+%global pkgname %{?gitdate:xserver}%{!?gitdate:xwayland}
+
+%global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
+
+Summary:   Xwayland
+Name:      xorg-x11-server-Xwayland
+Version:   21.1.3
+Release:   2%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
+
+URL:       http://www.x.org
+%if 0%{?gitdate}
+Source0:   https://gitlab.freedesktop.org/xorg/%{pkgname}/-/archive/%{commit}/%{pkgname}-%{shortcommit}.tar.gz
+%else
+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
+Requires: libEGL
+
+BuildRequires: gcc
+BuildRequires: git-core
+BuildRequires: meson
+
+BuildRequires: wayland-devel
+BuildRequires: pkgconfig(wayland-client) >= 1.3.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
+BuildRequires: pkgconfig(libssl)
+BuildRequires: pkgconfig(libtirpc)
+BuildRequires: pkgconfig(pixman-1)
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xau)
+BuildRequires: pkgconfig(xdmcp)
+BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xfont2)
+BuildRequires: pkgconfig(xi)
+BuildRequires: pkgconfig(xinerama)
+BuildRequires: pkgconfig(xkbfile)
+BuildRequires: pkgconfig(xmu)
+BuildRequires: pkgconfig(xorg-macros) >= 1.17
+BuildRequires: pkgconfig(xpm)
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(xres)
+BuildRequires: pkgconfig(xshmfence) >= 1.1
+BuildRequires: pkgconfig(xtrans) >= 1.3.2
+BuildRequires: pkgconfig(xtst)
+BuildRequires: pkgconfig(xv)
+BuildRequires: xorg-x11-proto-devel >= 7.7-10
+
+BuildRequires: mesa-libGL-devel >= 9.2
+BuildRequires: mesa-libEGL-devel
+BuildRequires: mesa-libgbm-devel
+
+BuildRequires: audit-libs-devel
+BuildRequires: libselinux-devel >= 2.0.86-1
+
+# libunwind is Exclusive for the following arches
+%ifarch aarch64 %{arm} hppa ia64 mips ppc ppc64 %{ix86} x86_64
+%if !0%{?rhel}
+BuildRequires: libunwind-devel
+%endif
+%endif
+
+BuildRequires: pkgconfig(xcb-aux)
+BuildRequires: pkgconfig(xcb-image)
+BuildRequires: pkgconfig(xcb-icccm)
+BuildRequires: pkgconfig(xcb-keysyms)
+BuildRequires: pkgconfig(xcb-renderutil)
+
+%description
+Xwayland is an X server for running X clients under Wayland.
+
+%package devel
+Summary: Development package
+Requires: pkgconfig
+
+%description devel
+The development package provides the developmental files which are
+necessary for developing Wayland compositors using Xwayland.
+
+%prep
+%autosetup -S git_am -n %{pkgname}-%{?gitdate:%{commit}}%{!?gitdate:%{version}}
+
+%build
+%meson \
+        -Dxwayland_eglstream=true \
+        -Ddefault_font_path=%{default_font_path} \
+        -Dbuilder_string="Build ID: %{name} %{version}-%{release}" \
+        -Dxkb_output_dir=%{_localstatedir}/lib/xkb \
+        -Dxcsecurity=true \
+        -Dglamor=true \
+        -Ddri3=true
+
+%meson_build
+
+%install
+%meson_install
+
+# Remove unwanted files/dirs
+rm $RPM_BUILD_ROOT%{_mandir}/man1/Xserver.1*
+rm -Rf $RPM_BUILD_ROOT%{_libdir}/xorg
+rm -Rf $RPM_BUILD_ROOT%{_includedir}/xorg
+rm -Rf $RPM_BUILD_ROOT%{_datadir}/aclocal
+rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb
+
+%files
+%{_bindir}/Xwayland
+%{_mandir}/man1/Xwayland.1*
+
+%files devel
+%{_libdir}/pkgconfig/xwayland.pc
+
+%changelog
+* Fri Jan  7 2022 Olivier Fourdan <ofourdan@redhat.com> - 21.1.3-2
+- CVE fix for: CVE-2021-4008 (#2038067), CVE-2021-4009 (#2038070),
+  CVE-2021-4010 (#2038072), CVE-2021-4011 (#2038074)
+
+* Thu Dec  2 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.3-1
+- Rebase to 21.1.3 (rhbz#2015839)
+- Prefer EGLstream if both EGLstream and GBM are usable
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 21.1.1-6
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Mon Aug  9 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-5
+- Backport the latest fixes from Xwayland for EGLstream (rhbz#1977742)
+
+* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 21.1.1-4
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
+
+* Mon Jun 21 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-3
+- Fix a use-after-free in the previous changes for GLX
+
+* Thu Jun 17 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-2
+- Backport fixes for GLX and EGLstream (#1969486)
+
+* Thu Jun 17 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-1
+- xwayland 21.1.1 (#1952897)
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 21.1.0-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Thu Mar  18 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.0-1
+- xwayland 21.1.0
+
+* Thu Mar  4 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.0.99.902-1
+- xwayland 21.0.99.902
+- Remove xdmcp, udev, udev_kms build options
+- Stop overriding the vendor name, same as xorg-x11-server
+
+* Thu Feb 18 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.0.99.901-1
+- xwayland 21.0.99.901
+
+* Mon Feb  1 2021 Olivier Fourdan <ofourdan@redhat.com> - 1.20.99.1-0.1.20210201git5429791
+- Initial import (#1912335).