From 179bde64cb630b3a20df656bb7f9de54afda2e329d9c0e9e8a068fd7ba957d80 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 7 Feb 2023 14:32:28 +0000
Subject: [PATCH] - Update to version 22.1.8   * This release contains the fix
 for CVE-2023-0494 in today's     security advisory:    
 https://lists.x.org/archives/xorg-announce/2023-February/003320.html   * It
 also fixes a second possible OOB access during EnqueueEvent. - supersedes
 U_Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xwayland?expand=0&rev=44
---
 ...-use-after-free-in-DeepCopyPointerCl.patch |  20 ------------------
 xwayland-22.1.8.tar.xz                        |   3 +++
 xwayland-22.1.8.tar.xz.sig                    | Bin 0 -> 95 bytes
 xwayland.changes                              |  10 +++++++++
 xwayland.spec                                 |   1 -
 5 files changed, 13 insertions(+), 21 deletions(-)
 delete mode 100644 U_Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch
 create mode 100644 xwayland-22.1.8.tar.xz
 create mode 100644 xwayland-22.1.8.tar.xz.sig

diff --git a/U_Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch b/U_Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch
deleted file mode 100644
index a19074e..0000000
--- a/U_Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-@@ -, +, @@ 
- DeepCopyPointerClasses
----
- Xi/exevents.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
---- a/Xi/exevents.c	
-+++ a/Xi/exevents.c	
-@@ -619,8 +619,10 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
-             memcpy(to->button->xkb_acts, from->button->xkb_acts,
-                    sizeof(XkbAction));
-         }
--        else
-+        else {
-             free(to->button->xkb_acts);
-+            to->button->xkb_acts = NULL;
-+        }
- 
-         memcpy(to->button->labels, from->button->labels,
-                from->button->numButtons * sizeof(Atom));
--- 
diff --git a/xwayland-22.1.8.tar.xz b/xwayland-22.1.8.tar.xz
new file mode 100644
index 0000000..dc1c560
--- /dev/null
+++ b/xwayland-22.1.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73
+size 1273668
diff --git a/xwayland-22.1.8.tar.xz.sig b/xwayland-22.1.8.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..c3e67d27804073bafd0b6f7c99b0f282f974ef90c25c1ce1539dac7a3b83b7da
GIT binary patch
literal 95
zcmeB(WnmCxVvrS6WJ$l%_9@B!=wI)xO0gmZx%=e2T^(4Nk{{W1GH`JUz(msLGR!Y?
vNxycXwnA-nkl{;<3mQ+Z^-pYOSa2pxAn!%*_re>s52_yrwR0SvYn}!GVV)-$

literal 0
HcmV?d00001

diff --git a/xwayland.changes b/xwayland.changes
index 4486cf6..5585808 100644
--- a/xwayland.changes
+++ b/xwayland.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Feb  7 14:29:21 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to version 22.1.8
+  * This release contains the fix for CVE-2023-0494 in today's
+    security advisory: 
+    https://lists.x.org/archives/xorg-announce/2023-February/003320.html
+  * It also fixes a second possible OOB access during EnqueueEvent.
+- supersedes U_Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch
+
 -------------------------------------------------------------------
 Thu Feb  2 15:39:06 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xwayland.spec b/xwayland.spec
index 0432cd6..7e3c614 100644
--- a/xwayland.spec
+++ b/xwayland.spec
@@ -33,7 +33,6 @@ Group:          System/X11/Servers/XF86_4
 Source0:        %{url}/archive/individual/xserver/%{name}-%{version}.tar.xz
 Source1:        %{url}/archive/individual/xserver/%{name}-%{version}.tar.xz.sig
 Source2:        xwayland.keyring
-Patch1207783:   U_Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch
 
 BuildRequires:  meson
 BuildRequires:  ninja