commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2024-09-25 21:52:50

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.29891 (New)


Package is "xorg-x11-server"

Wed Sep 25 21:52:50 2024 rev:434 rq:1202929 version:21.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2024-08-02 17:25:38.361103319 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.29891/xorg-x11-server.changes   
2024-09-25 21:52:56.519410117 +0200
@@ -1,0 +2,8 @@
+Tue Sep 24 11:20:23 UTC 2024 - Stefan Dirsch 
+
+- added conflicts to patterns-wsl-tmpfiles to Xserver packages
+  as this patterns package creates a symlink from /tmp/.X11-unix to
+  /mnt/wslg/.X11-unix and therefore prevents Xservers from creating
+  this needed directory (bsc#1230755)
+
+---



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.xCeKcy/_old  2024-09-25 21:52:57.667457868 +0200
+++ /var/tmp/diff_new_pack.xCeKcy/_new  2024-09-25 21:52:57.671458034 +0200
@@ -191,6 +191,7 @@
 # Unfortunately we need a requires here due to OBS not installing 'recommended'
 # packages :-(
 Requires:   xorg-x11-server-Xvfb
+Conflicts:  patterns-wsl-tmpfiles
 
 # PATCH-FEATURE-OPENSUSE n_xorg-x11-server-rpmmacros.patch 
dims...@opensuse.org -- Provide RPM macros to require correct ABI Versions.
 Patch1: N_default-module-path.diff
@@ -258,6 +259,7 @@
 Recommends: xorg-x11-fonts-core
 Provides:   xorg-x11-Xnest
 Obsoletes:  xorg-x11-Xnest
+Conflicts:  patterns-wsl-tmpfiles
 
 %description extra
 This package contains additional Xservers (Xephyr, Xnest).
@@ -273,6 +275,7 @@
 Provides:   xorg-x11-Xvfb
 Provides:   xorg-x11-server:/usr/bin/Xvfb
 Obsoletes:  xorg-x11-Xvfb
+Conflicts:  patterns-wsl-tmpfiles
 
 %description Xvfb
 This package contains the virtual Xserver Xvfb.

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2024-07-19 15:25:43

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.17339 (New)


Package is "xorg-x11-server"

Fri Jul 19 15:25:43 2024 rev:432 rq:1188381 version:21.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2024-06-13 15:37:49.877562362 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.17339/xorg-x11-server.changes   
2024-07-19 15:26:03.984153372 +0200
@@ -1,0 +2,9 @@
+Thu Jul 18 10:44:59 UTC 2024 - Stefan Dirsch 
+
+- u_fbdevhw_kernel6.9_break_fbdev_open.patch
+  * Linux kernel v6.9 has changed the symlink to point to the
+parent device.  This breaks fbdev_open() detection logic.
+Change it to use the subsystem symlink instead which will
+remain stable (gitlab xserver issue#1714)
+
+---

New:

  u_fbdevhw_kernel6.9_break_fbdev_open.patch

BETA DEBUG BEGIN:
  New:
- u_fbdevhw_kernel6.9_break_fbdev_open.patch
  * Linux kernel v6.9 has changed the symlink to point to the
BETA DEBUG END:



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.0FYknr/_old  2024-07-19 15:26:05.400209716 +0200
+++ /var/tmp/diff_new_pack.0FYknr/_new  2024-07-19 15:26:05.404209875 +0200
@@ -147,7 +147,7 @@
 Requires:   Mesa
 %if 0%{?suse_version} >= 1315
 Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 %endif
 Provides:   xorg-x11-server-glx
 Obsoletes:  xorg-x11-server-glx
@@ -240,6 +240,8 @@
 
 Patch1960:  u_sync-pci-ids-with-Mesa.patch
 
+Patch2000:  u_fbdevhw_kernel6.9_break_fbdev_open.patch
+
 Patch1218176:   u_miCloseScreen_check_for_null_pScreen_dev_private.patch
 Patch1222442:   U_render-Avoid-possible-double-free-in-ProcRenderAddGl.patch
 
@@ -397,6 +399,7 @@
 %patch -P 1921 -p1
 %patch -P 1930 -p1
 %patch -P 1960 -p1
+%patch -P 2000 -p1
 
 %patch -P 1218176 -p1
 

++ u_fbdevhw_kernel6.9_break_fbdev_open.patch ++
Linux kernel v6.9 has changed the symlink to point to the parent device.
This breaks fbdev_open() detection logic. Change it to use the subsystem
symlink instead which will remain stable.

Kernel v6.8:

[14.067] (II) fbdev_open() sysfs_path=/sys/class/graphics/fb0
[14.067] (II) fbdev_open() 
buf=../../devices/platform/vesa-framebuffer.0/graphics/fb0

Kernel v6.9:

[15.609] (II) fbdev_open() sysfs_path=/sys/class/graphics/fb0
[15.609] (II) fbdev_open() 
buf=../../devices/pci:00/:00:01.0/vesa-framebuffer.0/graphics/fb0

Originally found in automated Debian ISO QA testing [0] and confirmed in Linux 
[1].

Tested on kernels v6.9.7 and v6.8.12

[0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D1075713
[1] https://lore.kernel.org/lkml/lLyvPFC_APGHNfyGNHRpQy5izBikkaTPOpHooZIT3f=
FAoJPquSI31ZMueA99XTdr8ysir3X7O7IMdc6za-0m79vr_claeparHhoRouVgHOI=3D@proton=
.me/

Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1714
Signed-off-by: Tj 
---
 hw/xfree86/fbdevhw/fbdevhw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: xorg-server-21.1.12/hw/xfree86/fbdevhw/fbdevhw.c
===
--- xorg-server-21.1.12.orig/hw/xfree86/fbdevhw/fbdevhw.c
+++ xorg-server-21.1.12/hw/xfree86/fbdevhw/fbdevhw.c
@@ -335,9 +335,9 @@ fbdev_open(int scrnIndex, const char *de
 char *sysfs_path = NULL;
 char *node = strrchr(dev, '/') + 1;
 
-if (asprintf(&sysfs_path, "/sys/class/graphics/%s", node) < 0 ||
+if (asprintf(&sysfs_path, "/sys/class/graphics/%s/device/subsystem", 
node) < 0 ||
 readlink(sysfs_path, buf, sizeof(buf) - 1) < 0 ||
-strstr(buf, "devices/pci")) {
+strstr(buf, "bus/pci")) {
 free(sysfs_path);
 close(fd);
 return -1;

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2024-06-13 15:37:44

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.19518 (New)


Package is "xorg-x11-server"

Thu Jun 13 15:37:44 2024 rev:431 rq:1180219 version:21.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2024-04-11 19:40:26.640186650 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.19518/xorg-x11-server.changes   
2024-06-13 15:37:49.877562362 +0200
@@ -1,0 +2,7 @@
+Wed Jun 12 09:08:15 UTC 2024 - Daniel Garcia 
+
+- Fix python3 shebang in source python script to use specific python
+  interpreter and remove dependency on /usr/bin/python3
+  (bsc#1212476)
+
+---



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.JFn5qu/_old  2024-06-13 15:37:54.829743059 +0200
+++ /var/tmp/diff_new_pack.JFn5qu/_new  2024-06-13 15:37:54.833743205 +0200
@@ -62,6 +62,7 @@
 BuildRequires:  flex
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
+BuildRequires:  python-rpm-macros
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(bigreqsproto) >= 1.1.0
 BuildRequires:  pkgconfig(compositeproto)
@@ -146,7 +147,7 @@
 Requires:   Mesa
 %if 0%{?suse_version} >= 1315
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 %endif
 Provides:   xorg-x11-server-glx
 Obsoletes:  xorg-x11-server-glx
@@ -525,6 +526,8 @@
 chmod 0755 %{buildroot}/usr/src/xserver/config.guess
 chmod 0755 %{buildroot}/usr/src/xserver/config.sub
 chmod 0755 %{buildroot}/usr/src/xserver/install-sh
+# Fix python shebang, use specific python version to do not depend on 
/usr/bin/python3
+%{?python3_fix_shebang_path:%python3_fix_shebang_path 
%{buildroot}/usr/src/xserver/hw/xwin/glx/gen_gl_wrappers.py}
 
 %post
 %tmpfiles_create xkb.conf

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2024-04-11 19:40:24

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.29460 (New)


Package is "xorg-x11-server"

Thu Apr 11 19:40:24 2024 rev:430 rq:116 version:21.1.12

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2024-04-04 22:25:26.501506360 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.29460/xorg-x11-server.changes   
2024-04-11 19:40:26.640186650 +0200
@@ -1,0 +2,7 @@
+Wed Apr 10 13:20:43 UTC 2024 - Stefan Dirsch 
+
+- U_render-Avoid-possible-double-free-in-ProcRenderAddGl.patch
+  * fixes regression for security fix for CVE-2024-31083 (bsc#1222312, 
+boo#1222442, gitlab xserver issue #1659)
+
+---

New:

  U_render-Avoid-possible-double-free-in-ProcRenderAddGl.patch

BETA DEBUG BEGIN:
  New:
- U_render-Avoid-possible-double-free-in-ProcRenderAddGl.patch
  * fixes regression for security fix for CVE-2024-31083 (bsc#1222312, 
BETA DEBUG END:



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.LjGGyr/_old  2024-04-11 19:40:30.496329301 +0200
+++ /var/tmp/diff_new_pack.LjGGyr/_new  2024-04-11 19:40:30.496329301 +0200
@@ -240,6 +240,7 @@
 Patch1960:  u_sync-pci-ids-with-Mesa.patch
 
 Patch1218176:   u_miCloseScreen_check_for_null_pScreen_dev_private.patch
+Patch1222442:   U_render-Avoid-possible-double-free-in-ProcRenderAddGl.patch
 
 %description
 This package contains the X.Org Server.
@@ -398,6 +399,8 @@
 
 %patch -P 1218176 -p1
 
+%patch -P 1222442 -p1
+
 %build
 # We have some -z now related errors during X default startup (boo#1197994):
 # - when loading modesetting: gbm_bo_get_plane_count

++ U_render-Avoid-possible-double-free-in-ProcRenderAddGl.patch ++
>From c3c2218ab797516e4d63a93a078d77c6ce872d03 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan 
Date: Fri, 5 Apr 2024 15:24:49 +0200
Subject: [PATCH] render: Avoid possible double-free in ProcRenderAddGlyphs()

ProcRenderAddGlyphs() adds the glyph to the glyphset using AddGlyph() and
then frees it using FreeGlyph() to decrease the reference count, after
AddGlyph() has increased it.

AddGlyph() however may chose to reuse an existing glyph if it's already
in the glyphSet, and free the glyph that was given, in which case the
caller function, ProcRenderAddGlyphs() will call FreeGlyph() on an
already freed glyph, as reported by ASan:

  READ of size 4 thread T0
#0 in FreeGlyph xserver/render/glyph.c:252
#1 in ProcRenderAddGlyphs xserver/render/render.c:1174
#2 in Dispatch xserver/dix/dispatch.c:546
#3 in dix_main xserver/dix/main.c:271
#4 in main xserver/dix/stubmain.c:34
#5 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58
#6 in __libc_start_main_impl ../csu/libc-start.c:360
#7  (/usr/bin/Xwayland+0x44fe4)
  Address is located 0 bytes inside of 64-byte region
  freed by thread T0 here:
#0 in __interceptor_free libsanitizer/asan/asan_malloc_linux.cpp:52
#1 in _dixFreeObjectWithPrivates xserver/dix/privates.c:538
#2 in AddGlyph xserver/render/glyph.c:295
#3 in ProcRenderAddGlyphs xserver/render/render.c:1173
#4 in Dispatch xserver/dix/dispatch.c:546
#5 in dix_main xserver/dix/main.c:271
#6 in main xserver/dix/stubmain.c:34
#7 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58
  previously allocated by thread T0 here:
#0 in __interceptor_malloc libsanitizer/asan/asan_malloc_linux.cpp:69
#1 in AllocateGlyph xserver/render/glyph.c:355
#2 in ProcRenderAddGlyphs xserver/render/render.c:1085
#3 in Dispatch xserver/dix/dispatch.c:546
#4 in dix_main xserver/dix/main.c:271
#5 in main xserver/dix/stubmain.c:34
#6 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58
  SUMMARY: AddressSanitizer: heap-use-after-free xserver/render/glyph.c:252 in 
FreeGlyph

To avoid that, make sure not to free the given glyph in AddGlyph().

v2: Simplify the test using the boolean returned from AddGlyph() (Michel)
v3: Simplify even more by not freeing the glyph in AddGlyph() (Peter)

Fixes: bdca6c3d1 - render: fix refcounting of glyphs during ProcRenderAddGlyphs
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1659
Signed-off-by: Olivier Fourdan 
(cherry picked from commit 337d8d48b618d4fc0168a7b978be4c3447650b04)

Part-of: 
---
 render/glyph.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/render/glyph.c b/render/glyph.c
index d5fc5f3

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2024-02-27 22:44:47

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1770 (New)


Package is "xorg-x11-server"

Tue Feb 27 22:44:47 2024 rev:428 rq:1151681 version:21.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2024-02-23 16:40:14.376266837 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1770/xorg-x11-server.changes
2024-02-27 22:44:57.711170381 +0100
@@ -1,0 +2,5 @@
+Mon Feb 26 12:16:26 UTC 2024 - Dominique Leuenberger 
+
+- Use %patch -P N instead of deprecated %patchN.
+
+---



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.ZbqkdM/_old  2024-02-27 22:44:59.071219685 +0100
+++ /var/tmp/diff_new_pack.ZbqkdM/_new  2024-02-27 22:44:59.071219685 +0100
@@ -349,54 +349,54 @@
 sh %{SOURCE92} --verify . %{SOURCE91}
 
 %if 0%{?suse_version} < 1315
-%patch1
+%patch -P 1
 %endif
-%patch2 -p1
-%patch3 -p0
-%patch4 -p0
-%patch5 -p1
-%patch6 -p0
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
+%patch -P 2 -p1
+%patch -P 3 -p0
+%patch -P 4 -p0
+%patch -P 5 -p1
+%patch -P 6 -p0
+%patch -P 7 -p1
+%patch -P 8 -p1
+%patch -P 9 -p1
+%patch -P 10 -p1
+%patch -P 11 -p1
+%patch -P 12 -p1
 #
-%patch100 -p1
-#%patch101 -p1
-%patch104 -p1
-%patch117 -p1
-%patch160 -p1
-%patch208 -p1
-%patch209 -p1
+%patch -P 100 -p1
+#%patch -P 101 -p1
+%patch -P 104 -p1
+%patch -P 117 -p1
+%patch -P 160 -p1
+%patch -P 208 -p1
+%patch -P 209 -p1
 ### not applicable anymore
-#%patch210 -p1
-%patch215 -p1
+#%patch -P 210 -p1
+%patch -P 215 -p1
 ### apparently supersed by upstream
 ###  commit 078277e4d92f05a90c4715d61b89b9d9d38d68ea
 ###  Author: Dave Airlie 
 ###  Date:   Fri Aug 17 09:49:24 2012 +1000
 ###
 ###xf86: autobind GPUs to the screen
-#%patch1000 -p1
+#%patch -P 1000 -p1
 
 ### disabled for now
-#%patch1162 -p1
+#%patch -P 1162 -p1
 ### disabled for now
-#%patch1211 -p1
+#%patch -P 1211 -p1
 ### patch222 might not be applicable anymore
-#%patch1222 -p1
-%patch1401 -p1
-%patch1503 -p1
-%patch1900 -p1
-%patch1910 -p1
-%patch1920 -p1
-%patch1921 -p1
-%patch1930 -p1
-%patch1960 -p1
+#%patch -P 1222 -p1
+%patch -P 1401 -p1
+%patch -P 1503 -p1
+%patch -P 1900 -p1
+%patch -P 1910 -p1
+%patch -P 1920 -p1
+%patch -P 1921 -p1
+%patch -P 1930 -p1
+%patch -P 1960 -p1
 
-%patch1218176 -p1
+%patch -P 1218176 -p1
 
 %build
 # We have some -z now related errors during X default startup (boo#1197994):

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2024-02-23 16:40:13

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1770 (New)


Package is "xorg-x11-server"

Fri Feb 23 16:40:13 2024 rev:427 rq:1148344 version:21.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2024-02-12 18:53:00.416245857 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1770/xorg-x11-server.changes
2024-02-23 16:40:14.376266837 +0100
@@ -1,0 +2,20 @@
+Tue Feb 20 20:36:19 UTC 2024 - Stefan Dirsch 
+
+- fix permissions of files in xorg-x11-server-source for tigervnc
+  build later (needed since latest autoconf)
+
+---
+Thu Feb 15 17:08:16 UTC 2024 - Joan Torres 
+
+- Provide again xorg-x11-server-source
+  * xwayland sources are not meant for a generic server.
+  * https://github.com/TigerVNC/tigervnc/issues/1728
+
+---
+Thu Feb 15 10:46:29 UTC 2024 - Joan Torres 
+
+- Stop providing xorg-x11-server-source from xorg-x11-server
+  * Now the sources are provided by xwayland because it is more updated.
+  * Fixes bsc#1219892.
+
+---



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.3I0rBq/_old  2024-02-23 16:40:15.432305119 +0100
+++ /var/tmp/diff_new_pack.3I0rBq/_new  2024-02-23 16:40:15.432305119 +0100
@@ -518,6 +518,10 @@
 xargs cp --parents --target-directory=%{buildroot}/usr/src/xserver < 
source-file-list
 # unneeded python2 script; simply remove it (boo#1179591)
 rm -f %{buildroot}/usr/src/xserver/config/fdi2iclass.py
+# fix permissions for tigervnc build later (needed since latest autoconf)
+chmod 0755 %{buildroot}/usr/src/xserver/config.guess
+chmod 0755 %{buildroot}/usr/src/xserver/config.sub
+chmod 0755 %{buildroot}/usr/src/xserver/install-sh
 
 %post
 %tmpfiles_create xkb.conf

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2024-02-12 18:51:07

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1815 (New)


Package is "xorg-x11-server"

Mon Feb 12 18:51:07 2024 rev:426 rq:1146120 version:21.1.11

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2024-01-30 18:23:56.118738996 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1815/xorg-x11-server.changes
2024-02-12 18:53:00.416245857 +0100
@@ -1,0 +2,40 @@
+Mon Feb 12 09:58:50 UTC 2024 - Stefan Dirsch 
+
+- Release 21.1.11 also covers fixes for security issue CVE-2022-46340
+  and bug numbers bsc#1205874, bsc#1217765
+
+---
+Sun Feb 11 10:02:32 UTC 2024 - Stefan Dirsch 
+
+- Release 21.1.11 covers fixes for the following bug numbers, which
+  are not mentioned in this changelog before: bsc#1218845,
+  bsc#1218846, bsc#1216261, bsc#1216133, bsc#1216135
+
+---
+Sun Feb 11 09:41:05 UTC 2024 - Stefan Dirsch 
+
+- Release 21.1.11 supersedes the following patches still used with
+  xorg-x11-server 21.1.4 on sle15-sp5/Leap 15.5 and not mentioned in
+  this changelog as superseded before:
+  * U_Xext-fix-invalid-event-type-mask-in-XTestSwapFakeInp.patch
+  * U_bsc1216133-mi-reset-the-PointerWindows-reference-on-screen-swit.patch
+  * U_bsc1216135-Xi-randr-fix-handling-of-PropModeAppend-Prepend.patch
+  * U_bsc1216261-0001-mi-fix-CloseScreen-initialization-order.patch
+  * U_bsc1216261-0002-fb-properly-wrap-unwrap-CloseScreen.patch
+  * U_bsc1216261-0003-dix-always-initialize-pScreen-CloseScreen.patch
+  * bsc1218582-0001-dix-allocate-enough-space-for-logical-button-maps.patch
+  * bsc1218583-0001-dix-Allocate-sufficient-xEvents-for-our-DeviceStateN.patch
+  * bsc1218583-0002-dix-fix-DeviceStateNotify-event-calculation.patch
+  * bsc1218583-0003-Xi-when-creating-a-new-ButtonClass-set-the-number-of.patch
+  * bsc1218584-0001-Xi-flush-hierarchy-events-after-adding-removing-mast.patch
+  * bsc1218585-0001-Xi-do-not-keep-linked-list-pointer-during-recursion.patch
+  * bsc1218585-0002-dix-when-disabling-a-master-float-disabled-slaved-de.patch
+  * U_bsc1218845-glx-Call-XACE-hooks-on-the-GLX-buffer.patch
+  * U_bsc1218846-ephyr-xwayland-Use-the-proper-private-key-for-cursor.patch
+
+---
+Fri Feb  9 20:09:22 UTC 2024 - Stefan Dirsch 
+
+- xserver sources of this release fixes segfault in Xvnc (bsc#1219311)
+
+---



Other differences:
--

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2024-01-10 21:51:05

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.21961 (New)


Package is "xorg-x11-server"

Wed Jan 10 21:51:05 2024 rev:423 rq:1137765 version:21.1.9

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2024-01-07 21:39:12.109617278 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.21961/xorg-x11-server.changes   
2024-01-10 21:51:15.749931342 +0100
@@ -1,0 +2,8 @@
+Sat Jan  6 20:01:20 UTC 2024 - Stefan Dirsch 
+
+- u_miCloseScreen_check_for_null_pScreen_dev_private.patch
+  * miCloseScreen check for null pScreen dev private (bsc#1218176); 
+another regression introduced by 
+U_bsc1216261-0002-fb-properly-wrap-unwrap-CloseScreen.patch
+
+---

New:

  u_miCloseScreen_check_for_null_pScreen_dev_private.patch

BETA DEBUG BEGIN:
  New:
- u_miCloseScreen_check_for_null_pScreen_dev_private.patch
  * miCloseScreen check for null pScreen dev private (bsc#1218176); 
BETA DEBUG END:



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.ax56Mk/_old  2024-01-10 21:51:17.001976810 +0100
+++ /var/tmp/diff_new_pack.ax56Mk/_new  2024-01-10 21:51:17.001976810 +0100
@@ -246,6 +246,8 @@
 Patch1217765:   
U_bsc1217765-Xi-allocate-enough-XkbActions-for-our-buttons.patch
 Patch1217766:   
U_bsc1217766-randr-avoid-integer-truncation-in-length-check-of-Pr.patch
 
+Patch1218176:   u_miCloseScreen_check_for_null_pScreen_dev_private.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -407,6 +409,8 @@
 %patch1217765 -p1
 %patch1217766 -p1
 
+%patch1218176 -p1
+
 %build
 # We have some -z now related errors during X default startup (boo#1197994):
 # - when loading modesetting: gbm_bo_get_plane_count

++ u_miCloseScreen_check_for_null_pScreen_dev_private.patch ++
 mi/miscrinit.c |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Index: xorg-server-21.1.4/mi/miscrinit.c
===
--- xorg-server-21.1.4.orig/mi/miscrinit.c
+++ xorg-server-21.1.4/mi/miscrinit.c
@@ -121,7 +121,9 @@ miModifyPixmapHeader(PixmapPtr pPixmap,
 static Bool
 miCloseScreen(ScreenPtr pScreen)
 {
-return ((*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate));
+if (pScreen->devPrivate)
+return ((*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate));
+return TRUE;
 }
 
 static Bool

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2024-01-07 21:39:07

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.28375 (New)


Package is "xorg-x11-server"

Sun Jan  7 21:39:07 2024 rev:422 rq:1137260 version:21.1.9

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2023-12-14 22:02:32.422768468 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.28375/xorg-x11-server.changes   
2024-01-07 21:39:12.109617278 +0100
@@ -1,0 +2,10 @@
+Sat Jan  6 15:12:29 UTC 2024 - Stefan Dirsch 
+
+- n_xserver-optimus-autoconfig-hack.patch
+  u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch
+  u_xfree86-activate-GPU-screens-on-autobind.patch
+  * check dixPrivateKeyRegistered(rrPrivKey) before calling
+rrGetScrPriv() to avoid xserver crash when Xinerama is enabled
+(boo#1218240)
+
+ ---



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.Wqw84m/_old  2024-01-07 21:39:13.377663403 +0100
+++ /var/tmp/diff_new_pack.Wqw84m/_new  2024-01-07 21:39:13.377663403 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-x11-server
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ n_xserver-optimus-autoconfig-hack.patch ++
--- /var/tmp/diff_new_pack.Wqw84m/_old  2024-01-07 21:39:13.497667769 +0100
+++ /var/tmp/diff_new_pack.Wqw84m/_new  2024-01-07 21:39:13.501667914 +0100
@@ -62,7 +62,7 @@
  #include "picturestr.h"
  #include "randrstr.h"
  #include "glxvndabi.h"
-@@ -294,6 +295,231 @@ AddVTAtoms(CallbackListPtr *pcbl, void *
+@@ -294,6 +295,237 @@ AddVTAtoms(CallbackListPtr *pcbl, void *
 "Failed to register VT properties\n");
  }
  
@@ -92,6 +92,9 @@
 +} *outputConfigs;
 +int outputConfigsCount = 0, outputConfigsUsed = 0;
 +
++if (!dixPrivateKeyRegistered(rrPrivKey))
++return;
++
 +pMasterScrPriv = rrGetScrPriv(pMasterScreen);
 +if (!pMasterScrPriv)
 +return;
@@ -253,6 +256,9 @@
 +rrScrPrivPtr master_rp;
 +rrScrPrivPtr slave_rp;
 +
++if (!dixPrivateKeyRegistered(rrPrivKey))
++return;
++
 +master_rp = rrGetScrPriv(master);
 +slave_rp = rrGetScrPriv(slave);
 +

++ u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch ++
--- /var/tmp/diff_new_pack.Wqw84m/_old  2024-01-07 21:39:13.557669951 +0100
+++ /var/tmp/diff_new_pack.Wqw84m/_new  2024-01-07 21:39:13.565670243 +0100
@@ -25,9 +25,13 @@
 ===
 --- xorg-server-21.1.0.orig/randr/randr.c
 +++ xorg-server-21.1.0/randr/randr.c
-@@ -651,7 +651,9 @@ RRTellChanged(ScreenPtr pScreen)
+@@ -650,8 +650,13 @@ RRTellChanged(ScreenPtr pScreen)
+ pScrPriv->crtcs[i]->changed = FALSE;
  
  xorg_list_for_each_entry(iter, &primary->secondary_list, 
secondary_head) {
++if (!dixPrivateKeyRegistered(rrPrivKey)) {
++break;
++}
  pSecondaryScrPriv = rrGetScrPriv(iter);
 -pSecondaryScrPriv->provider->changed = FALSE;
 +if (pSecondaryScrPriv->provider) {

++ u_xfree86-activate-GPU-screens-on-autobind.patch ++
--- /var/tmp/diff_new_pack.Wqw84m/_old  2024-01-07 21:39:13.593671261 +0100
+++ /var/tmp/diff_new_pack.Wqw84m/_new  2024-01-07 21:39:13.597671407 +0100
@@ -59,7 +59,7 @@
  }
  
  static void
-@@ -258,6 +263,186 @@ AddVTAtoms(CallbackListPtr *pcbl, void *data, void 
*screen)
+@@ -258,6 +263,189 @@ AddVTAtoms(CallbackListPtr *pcbl, void *data, void 
*screen)
 "Failed to register VT properties\n");
  }
  
@@ -90,6 +90,9 @@
 +} *outputConfigs;
 +int outputConfigsCount = 0, outputConfigsUsed = 0;
 +
++if (!dixPrivateKeyRegistered(rrPrivKey))
++return;
++
 +pMasterScrPriv = rrGetScrPriv(pMasterScreen);
 +if (!pMasterScrPriv)
 +return;

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2023-12-14 22:02:29

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.25432 (New)


Package is "xorg-x11-server"

Thu Dec 14 22:02:29 2023 rev:421 rq:1132834 version:21.1.9

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2023-10-25 18:02:53.746590489 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.25432/xorg-x11-server.changes   
2023-12-14 22:02:32.422768468 +0100
@@ -1,0 +2,11 @@
+Mon Dec  4 18:49:47 UTC 2023 - Stefan Dirsch 
+
+- U_bsc1217765-Xi-allocate-enough-XkbActions-for-our-buttons.patch
+  * Out-of-bounds memory write in XKB button actions (CVE-2023-6377, 
+ZDI-CAN-22412, ZDI-CAN-22413, bsc#1217765)
+- U_bsc1217766-randr-avoid-integer-truncation-in-length-check-of-Pr.patch
+  * Out-of-bounds memory read in RRChangeOutputProperty and
+RRChangeProviderProperty (CVE-2023-6478, ZDI-CAN-22561,
+bsc#1217766)
+
+---

New:

  U_bsc1217765-Xi-allocate-enough-XkbActions-for-our-buttons.patch
  U_bsc1217766-randr-avoid-integer-truncation-in-length-check-of-Pr.patch

BETA DEBUG BEGIN:
  New:
- U_bsc1217765-Xi-allocate-enough-XkbActions-for-our-buttons.patch
  * Out-of-bounds memory write in XKB button actions (CVE-2023-6377, 
  New:ZDI-CAN-22412, ZDI-CAN-22413, bsc#1217765)
- U_bsc1217766-randr-avoid-integer-truncation-in-length-check-of-Pr.patch
  * Out-of-bounds memory read in RRChangeOutputProperty and
BETA DEBUG END:



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.xni97z/_old  2023-12-14 22:02:34.206832817 +0100
+++ /var/tmp/diff_new_pack.xni97z/_new  2023-12-14 22:02:34.210832961 +0100
@@ -243,6 +243,9 @@
 
 Patch1960:  u_sync-pci-ids-with-Mesa.patch
 
+Patch1217765:   
U_bsc1217765-Xi-allocate-enough-XkbActions-for-our-buttons.patch
+Patch1217766:   
U_bsc1217766-randr-avoid-integer-truncation-in-length-check-of-Pr.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -401,6 +404,9 @@
 %patch1940 -p1
 %patch1960 -p1
 
+%patch1217765 -p1
+%patch1217766 -p1
+
 %build
 # We have some -z now related errors during X default startup (boo#1197994):
 # - when loading modesetting: gbm_bo_get_plane_count

++ U_bsc1217765-Xi-allocate-enough-XkbActions-for-our-buttons.patch ++
>From 924fbcb74ae5434afa7ce4603cd85ebcbdcccad5 Mon Sep 17 00:00:00 2001
From: Peter Hutterer 
Date: Tue, 28 Nov 2023 15:19:04 +1000
Subject: [PATCH xserver] Xi: allocate enough XkbActions for our buttons

button->xkb_acts is supposed to be an array sufficiently large for all
our buttons, not just a single XkbActions struct. Allocating
insufficient memory here means when we memcpy() later in
XkbSetDeviceInfo we write into memory that wasn't ours to begin with,
leading to the usual security ooopsiedaisies.

CVE-2023-6377, ZDI-CAN-22412, ZDI-CAN-22413

This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
---
 Xi/exevents.c | 12 ++--
 dix/devices.c | 10 ++
 2 files changed, 16 insertions(+), 6 deletions(-)
--- a/Xi/exevents.c 
+++ a/Xi/exevents.c 
@@ -611,13 +611,13 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
 }
 
 if (from->button->xkb_acts) {
-if (!to->button->xkb_acts) {
-to->button->xkb_acts = calloc(1, sizeof(XkbAction));
-if (!to->button->xkb_acts)
-FatalError("[Xi] not enough memory for xkb_acts.\n");
-}
+size_t maxbuttons = max(to->button->numButtons, 
from->button->numButtons);
+to->button->xkb_acts = xnfreallocarray(to->button->xkb_acts,
+   maxbuttons,
+   sizeof(XkbAction));
+memset(to->button->xkb_acts, 0, maxbuttons * sizeof(XkbAction));
 memcpy(to->button->xkb_acts, from->button->xkb_acts,
-   sizeof(XkbAction));
+   from->button->numButtons * sizeof(XkbAction));
 }
 else {
 free(to->button->xkb_acts);
--- a/dix/devices.c 
+++ a/dix/devices.c 
@@ -2530,6 +2530,8 @@ RecalculateMasterButtons(DeviceIntPtr slave)
 
 if (master->button && master->button->numButtons != maxbuttons) {
 int i;
+int last_num_buttons = master->button->numButtons;
+
 DeviceChangedEvent event = {
 .header = ET_Internal,
 .type = ET_DeviceChanged,
@@ -2540,6 +2542,14 @@ Recalcula

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2023-10-25 18:02:08

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.24901 (New)


Package is "xorg-x11-server"

Wed Oct 25 18:02:08 2023 rev:420 rq:1120244 version:21.1.9

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2023-04-02 19:17:01.744418994 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.24901/xorg-x11-server.changes   
2023-10-25 18:02:53.746590489 +0200
@@ -1,0 +2,9 @@
+Wed Oct 25 11:05:06 UTC 2023 - Stefan Dirsch 
+
+- Update to version 21.1.9
+  * This release contains fixes for CVE-2023-5367, CVE-2023-5380
+and CVE-2023-5574 as reported in today's security advisory:
+https://lists.x.org/archives/xorg-announce/2023-October/003430.html
+- adjusted u_Use-better-fallbacks-to-generate-cookies-if-arc4rand.patch
+
+---

Old:

  xorg-server-21.1.8.tar.xz
  xorg-server-21.1.8.tar.xz.sig

New:

  xorg-server-21.1.9.tar.xz
  xorg-server-21.1.9.tar.xz.sig



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.b1ANse/_old  2023-10-25 18:02:54.778625198 +0200
+++ /var/tmp/diff_new_pack.b1ANse/_new  2023-10-25 18:02:54.782625333 +0200
@@ -36,7 +36,7 @@
 %endif
 
 Name:   xorg-x11-server
-Version:21.1.8
+Version:21.1.9
 Release:0
 URL:http://xorg.freedesktop.org/
 Summary:X

++ u_Use-better-fallbacks-to-generate-cookies-if-arc4rand.patch ++
--- /var/tmp/diff_new_pack.b1ANse/_old  2023-10-25 18:02:54.922630041 +0200
+++ /var/tmp/diff_new_pack.b1ANse/_new  2023-10-25 18:02:54.926630176 +0200
@@ -24,11 +24,11 @@
  os/auth.c   | 138 ++--
  3 files changed, 141 insertions(+), 7 deletions(-)
 
-Index: xorg-server-1.20.5/configure.ac
+Index: xorg-server-21.1.9/configure.ac
 ===
 xorg-server-1.20.5.orig/configure.ac
-+++ xorg-server-1.20.5/configure.ac
-@@ -134,7 +134,7 @@ AM_CONDITIONAL(SPECIAL_DTRACE_OBJECTS, [
+--- xorg-server-21.1.9.orig/configure.ac
 xorg-server-21.1.9/configure.ac
+@@ -132,7 +132,7 @@ AM_CONDITIONAL(SPECIAL_DTRACE_OBJECTS, [
  AC_HEADER_DIRENT
  AC_HEADER_STDC
  AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h \
@@ -37,20 +37,11 @@
  
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
-@@ -166,7 +166,7 @@ AC_REPLACE_FUNCS([reallocarray strcasecm
- AM_CONDITIONAL(POLL, [test "x$ac_cv_func_poll" = "xyes"])
- 
- AC_CHECK_LIB([bsd], [arc4random_buf])
--AC_CHECK_FUNCS([arc4random_buf])
-+AC_CHECK_FUNCS([arc4random_buf getentropy])
- 
- AC_CHECK_DECLS([program_invocation_short_name], [], [], [[#include 
]])
- 
-Index: xorg-server-1.20.5/include/dix-config.h.in
+Index: xorg-server-21.1.9/include/dix-config.h.in
 ===
 xorg-server-1.20.5.orig/include/dix-config.h.in
-+++ xorg-server-1.20.5/include/dix-config.h.in
-@@ -155,6 +155,9 @@
+--- xorg-server-21.1.9.orig/include/dix-config.h.in
 xorg-server-21.1.9/include/dix-config.h.in
+@@ -149,6 +149,9 @@
  /* Define to 1 if you have the `arc4random_buf' function. */
  #undef HAVE_ARC4RANDOM_BUF
  
@@ -60,7 +51,7 @@
  /* Define to use libc SHA1 functions */
  #undef HAVE_SHA1_IN_LIBC
  
-@@ -232,6 +235,9 @@
+@@ -226,6 +229,9 @@
  /* Define to 1 if you have the  header file. */
  #undef HAVE_SYS_UTSNAME_H
  
@@ -70,22 +61,22 @@
  /* Define to 1 if you have the `timingsafe_memcmp' function. */
  #undef HAVE_TIMINGSAFE_MEMCMP
  
-Index: xorg-server-1.20.5/os/auth.c
+Index: xorg-server-21.1.9/os/auth.c
 ===
 xorg-server-1.20.5.orig/os/auth.c
-+++ xorg-server-1.20.5/os/auth.c
-@@ -49,6 +49,10 @@ from The Open Group.
- #ifdef HAVE_LIBBSD
- #include  /* for arc4random_buf() */
+--- xorg-server-21.1.9.orig/os/auth.c
 xorg-server-21.1.9/os/auth.c
+@@ -34,6 +34,10 @@ from The Open Group.
+ #ifdef HAVE_DIX_CONFIG_H
+ #include 
  #endif
 +#include   
 +#ifdef HAVE_SYS_SYSCALL_H
 +#include   
 +#endif
  
- struct protocol {
- unsigned short name_length;
-@@ -310,16 +314,140 @@ GenerateAuthorization(unsigned name_leng
+ #include   
+ #include   
+@@ -308,16 +312,140 @@ GenerateAuthorization(unsigned name_leng
  
  #endif  /* XCSECURITY */
  

++ xorg-server-21.1.8.tar.xz -> xorg-server-21.1.9.tar.xz ++
 9473 lines of diff (skipped)

+++

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2023-04-02 19:16:56

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.9019 (New)


Package is "xorg-x11-server"

Sun Apr  2 19:16:56 2023 rev:419 rq:107 version:21.1.8

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2023-03-30 22:50:57.140473750 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.9019/xorg-x11-server.changes
2023-04-02 19:17:01.744418994 +0200
@@ -1,0 +2,13 @@
+Sat Apr  1 13:42:37 UTC 2023 - Bjørn Lie 
+
+- Update to version 21.1.8 (CVE-2023-1393):
+  * This release contains the fix for CVE-2023-1393
+  * composite: Fix use-after-free of the COW
+  * xkbUtils: use existing symbol names instead of deleted
+deprecated ones
+- Drop U_xserver-composite-Fix-use-after-free-of-the-COW.patch:
+  Fixed upstream
+- Switch back to tarball release, drop source service, add keyring
+  and sig files.
+
+---

Old:

  U_xserver-composite-Fix-use-after-free-of-the-COW.patch
  _service
  _servicedata
  xorg-server-21.1.7.tar.xz

New:

  xorg-server-21.1.8.tar.xz
  xorg-server-21.1.8.tar.xz.sig
  xorg-x11-server.keyring



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.bFh0C5/_old  2023-04-02 19:17:02.760424095 +0200
+++ /var/tmp/diff_new_pack.bFh0C5/_new  2023-04-02 19:17:02.764424115 +0200
@@ -36,14 +36,15 @@
 %endif
 
 Name:   xorg-x11-server
-Version:21.1.7
+Version:21.1.8
 Release:0
 URL:http://xorg.freedesktop.org/
 Summary:X
-# Source URL: http://xorg.freedesktop.org/archive/individual/xserver/
 License:MIT
 Group:  System/X11/Servers/XF86_4
-Source0:xorg-server-%{version}.tar.xz
+Source0:
https://xorg.freedesktop.org/archive/individual/xserver/xorg-server-%{version}.tar.xz
+Source10:   
https://xorg.freedesktop.org/archive/individual/xserver/xorg-server-%{version}.tar.xz.sig
+Source11:   xorg-x11-server.keyring
 Source1:sysconfig.displaymanager.template
 Source2:README.updates
 Source3:xorgcfg.tar.bz2
@@ -242,8 +243,6 @@
 
 Patch1960:  u_sync-pci-ids-with-Mesa.patch
 
-Patch1209543:   U_xserver-composite-Fix-use-after-free-of-the-COW.patch
-
 %description
 This package contains the X.Org Server.
 
@@ -402,8 +401,6 @@
 %patch1940 -p1
 %patch1960 -p1
 
-%patch1209543 -p1
-
 %build
 # We have some -z now related errors during X default startup (boo#1197994):
 # - when loading modesetting: gbm_bo_get_plane_count

++ xorg-server-21.1.7.tar.xz -> xorg-server-21.1.8.tar.xz ++
 5375 lines of diff (skipped)

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2023-03-30 22:50:52

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.31432 (New)


Package is "xorg-x11-server"

Thu Mar 30 22:50:52 2023 rev:418 rq:1075267 version:21.1.7

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2023-02-08 17:19:57.125842706 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.31432/xorg-x11-server.changes   
2023-03-30 22:50:57.140473750 +0200
@@ -1,0 +2,7 @@
+Wed Mar 22 13:48:21 UTC 2023 - Stefan Dirsch 
+
+- U_xserver-composite-Fix-use-after-free-of-the-COW.patch
+  * overlay window use-after-free (CVE-2023-1393, ZDI-CAN-19866,
+bsc#1209543)
+
+---

New:

  U_xserver-composite-Fix-use-after-free-of-the-COW.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.ZxB1d5/_old  2023-03-30 22:50:58.156479187 +0200
+++ /var/tmp/diff_new_pack.ZxB1d5/_new  2023-03-30 22:50:58.160479209 +0200
@@ -242,6 +242,8 @@
 
 Patch1960:  u_sync-pci-ids-with-Mesa.patch
 
+Patch1209543:   U_xserver-composite-Fix-use-after-free-of-the-COW.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -400,6 +402,8 @@
 %patch1940 -p1
 %patch1960 -p1
 
+%patch1209543 -p1
+
 %build
 # We have some -z now related errors during X default startup (boo#1197994):
 # - when loading modesetting: gbm_bo_get_plane_count

++ U_xserver-composite-Fix-use-after-free-of-the-COW.patch ++
>From 947bd1b3f4a23565bf10879ec41ba06ebe1e1c76 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan 
Date: Mon, 13 Mar 2023 11:08:47 +0100
Subject: [PATCH xserver] composite: Fix use-after-free of the COW

ZDI-CAN-19866/CVE-2023-1393

If a client explicitly destroys the compositor overlay window (aka COW),
we would leave a dangling pointer to that window in the CompScreen
structure, which will trigger a use-after-free later.

Make sure to clear the CompScreen pointer to the COW when the latter gets
destroyed explicitly by the client.

This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative

Signed-off-by: Olivier Fourdan 
Reviewed-by: Adam Jackson 
---
 composite/compwindow.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/composite/compwindow.c b/composite/compwindow.c
index 4e2494b86..b30da589e 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -620,6 +620,11 @@ compDestroyWindow(WindowPtr pWin)
 ret = (*pScreen->DestroyWindow) (pWin);
 cs->DestroyWindow = pScreen->DestroyWindow;
 pScreen->DestroyWindow = compDestroyWindow;
+
+/* Did we just destroy the overlay window? */
+if (pWin == cs->pOverlayWin)
+cs->pOverlayWin = NULL;
+
 /*compCheckTree (pWin->drawable.pScreen); can't check -- tree isn't good*/
 return ret;
 }
-- 
2.40.0

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2023-02-08 17:19:52

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.4462 (New)


Package is "xorg-x11-server"

Wed Feb  8 17:19:52 2023 rev:417 rq:1063640 version:21.1.7

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2023-01-26 14:12:07.964804959 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.4462/xorg-x11-server.changes
2023-02-08 17:19:57.125842706 +0100
@@ -1,0 +2,20 @@
+Tue Feb  7 14:35:33 UTC 2023 - Stefan Dirsch 
+
+- Update to version xorg-server-21.1.7:
+  * 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 and a
+crasher caused by ResourceClientBits not correctly honouring the
+MaxClients value in the configuration file.
+- supersedes U_Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch,
+  U_xorg-server-oob-read-enqueue-event.patch
+
+---
+Wed Feb  1 10:18:32 UTC 2023 - Stefan Dirsch 
+
+- U_Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch
+  * DeepCopyPointerClasses use-after-free (CVE-2023-0494, 
+ZDI-CAN-19596, bsc#1207783)
+
+---

Old:

  U_xorg-server-oob-read-enqueue-event.patch
  xserver-xorg-server-21.1.6.tar.xz

New:

  xorg-server-21.1.7.tar.xz



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.zE2Nwv/_old  2023-02-08 17:19:58.221848086 +0100
+++ /var/tmp/diff_new_pack.zE2Nwv/_new  2023-02-08 17:19:58.229848125 +0100
@@ -36,14 +36,14 @@
 %endif
 
 Name:   xorg-x11-server
-Version:21.1.6
+Version:21.1.7
 Release:0
 URL:http://xorg.freedesktop.org/
 Summary:X
 # Source URL: http://xorg.freedesktop.org/archive/individual/xserver/
 License:MIT
 Group:  System/X11/Servers/XF86_4
-Source0:xserver-xorg-server-%{version}.tar.xz
+Source0:xorg-server-%{version}.tar.xz
 Source1:sysconfig.displaymanager.template
 Source2:README.updates
 Source3:xorgcfg.tar.bz2
@@ -208,7 +208,6 @@
 Patch100:   u_01-Improved-ConfineToShape.patch
 Patch101:   
u_02-DIX-ConfineTo-Don-t-bother-about-the-bounding-box-when-grabbing-a-shaped-window.patch
 Patch104:   u_xorg-server-xdmcp.patch
-Patch105:   U_xorg-server-oob-read-enqueue-event.patch
 
 Patch117:   xorg-x11-server-byte-order.patch
 
@@ -348,7 +347,7 @@
 This package contains patched sources of X.Org Server.
 
 %prep
-%setup -q -n xserver-xorg-server-%{version} -a3
+%setup -q -n xorg-server-%{version} -a3
 # Early verification if the ABI Defines are correct. Let's not waste build 
cycles if the Provides are wrong at the end.
 sh %{SOURCE92} --verify . %{SOURCE91}
 
@@ -370,7 +369,6 @@
 %patch100 -p1
 #%patch101 -p1
 %patch104 -p1
-%patch105 -p1
 %patch117 -p1
 %patch160 -p1
 %patch208 -p1

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2023-01-26 13:57:05

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.32243 (New)


Package is "xorg-x11-server"

Thu Jan 26 13:57:05 2023 rev:416 rq:1060975 version:21.1.6

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2023-01-01 09:38:23.046622813 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.32243/xorg-x11-server.changes   
2023-01-26 14:12:07.964804959 +0100
@@ -1,0 +2,13 @@
+Wed Jan 25 16:02:23 UTC 2023 - Stefan Dirsch 
+
+- rename u_xorg-server-oob-read-enqueue-event.patch to 
+  U_xorg-server-oob-read-enqueue-event.patch since it's already
+  upstream
+
+---
+Wed Jan 25 03:15:56 UTC 2023 - Michael Gorse 
+
+- Add u_xorg-server-oob-read-enqueue-event.patch: fix an
+  out-of-bounds read in EnqueueEvent.
+
+---

New:

  U_xorg-server-oob-read-enqueue-event.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.dc1Qna/_old  2023-01-26 14:12:09.560813543 +0100
+++ /var/tmp/diff_new_pack.dc1Qna/_new  2023-01-26 14:12:09.568813586 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-x11-server
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -207,9 +207,8 @@
 Patch12:n_xorg-wrapper-anybody.patch
 Patch100:   u_01-Improved-ConfineToShape.patch
 Patch101:   
u_02-DIX-ConfineTo-Don-t-bother-about-the-bounding-box-when-grabbing-a-shaped-window.patch
-# PATCH-FIX-UPSTREAM u_x86emu-include-order.patch sch...@suse.de -- Change 
include order to avoid conflict with system header, remove duplicate definitions
-
 Patch104:   u_xorg-server-xdmcp.patch
+Patch105:   U_xorg-server-oob-read-enqueue-event.patch
 
 Patch117:   xorg-x11-server-byte-order.patch
 
@@ -371,6 +370,7 @@
 %patch100 -p1
 #%patch101 -p1
 %patch104 -p1
+%patch105 -p1
 %patch117 -p1
 %patch160 -p1
 %patch208 -p1

++ U_xorg-server-oob-read-enqueue-event.patch ++
>From 2ef5ef57bd37a8bec2ac454053b283c6f87c3b40 Mon Sep 17 00:00:00 2001
From: Mike Gorse 
Date: Wed, 25 Jan 2023 02:02:48 +
Subject: [PATCH] dix: Use CopyPartialInternalEvent in EnqueueEvent

The event might be a DeviceEvent allocated on the stack, in
AccessXKeyboardEvent for instance. Fixes out-of-bounds read.

Signed-off-by: Mike Gorse 
---
 dix/events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/events.c b/dix/events.c
index 782ed35dc..86f5357e8 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1215,7 +1215,7 @@ EnqueueEvent(InternalEvent *ev, DeviceIntPtr device)
 qe->pScreen = pSprite->hotPhys.pScreen;
 qe->months = currentTime.months;
 qe->event = (InternalEvent *) (qe + 1);
-memcpy(qe->event, event, eventlen);
+CopyPartialInternalEvent(qe->event, (InternalEvent *)event);
 xorg_list_append(&qe->next, &syncEvents.pending);
 }
 
-- 
2.39.0

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2023-01-01 09:38:20

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1563 (New)


Package is "xorg-x11-server"

Sun Jan  1 09:38:20 2023 rev:415 rq:1045913 version:21.1.6

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-12-15 19:24:17.263743105 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1563/xorg-x11-server.changes
2023-01-01 09:38:23.046622813 +0100
@@ -1,0 +2,37 @@
+Mon Dec 19 19:54:11 UTC 2022 - dmuel...@suse.com
+
+- Update to version xorg-server-21.1.6:
+  * xserver 21.1.6
+  * Xext: fix invalid event type mask in XTestSwapFakeInput
+  * xkb: fix some possible memleaks in XkbGetKbdByName
+  * xkb: proof GetCountedString against request length attacks
+  * xquartz: Fix some formatting
+  * XQuartz: stub: Call LSOpenApplication instead of fork()/exec()
+- drop the following upstream patches:
+  U_xkb-proof-GetCountedString-against-request-length-at.patch
+  U_xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch
+
+---
+Sat Dec 17 17:40:15 UTC 2022 - Dirk Müller 
+
+- Update to version xorg-server-21.1.5:
+  * xkb: reset the radio_groups pointer to NULL after freeing it
+  * Xi: avoid integer truncation in length check of ProcXIChangeProperty
+  * Xi: return an error from XI property changes if verification failed
+  * Xext: free the screen saver resource when replacing it
+  * Xext: free the XvRTVideoNotify when turning off from the same client
+  * Xi: disallow passive grabs with a detail > 255
+  * Xtest: disallow GenericEvents in XTestSwapFakeInput
+  * meson: Don't build COMPOSITE for XQuartz
+  * xquartz: Move default applications list outside of the main executable
+  * xquartz: Remove unused macro (X11LIBDIR)
+- drop the following upstream patches:
+  U_0007-xkb-reset-the-radio_groups-pointer-to-NULL-after-fre.patch
+  U_0002-Xi-return-an-error-from-XI-property-changes-if-verif.patch
+  U_0003-Xi-avoid-integer-truncation-in-length-check-of-ProcX.patch
+  U_0004-Xi-disallow-passive-grabs-with-a-detail-255.patch
+  U_0005-Xext-free-the-screen-saver-resource-when-replacing-i.patch
+  U_0006-Xext-free-the-XvRTVideoNotify-when-turning-off-from-.patch
+  U_0001-Xtest-disallow-GenericEvents-in-XTestSwapFakeInput.patch
+  
+---

Old:

  U_0001-Xtest-disallow-GenericEvents-in-XTestSwapFakeInput.patch
  U_0002-Xi-return-an-error-from-XI-property-changes-if-verif.patch
  U_0003-Xi-avoid-integer-truncation-in-length-check-of-ProcX.patch
  U_0004-Xi-disallow-passive-grabs-with-a-detail-255.patch
  U_0005-Xext-free-the-screen-saver-resource-when-replacing-i.patch
  U_0006-Xext-free-the-XvRTVideoNotify-when-turning-off-from-.patch
  U_0007-xkb-reset-the-radio_groups-pointer-to-NULL-after-fre.patch
  U_xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch
  U_xkb-proof-GetCountedString-against-request-length-at.patch
  xorg-server-21.1.4.tar.xz

New:

  xserver-xorg-server-21.1.6.tar.xz



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.DLeBTG/_old  2023-01-01 09:38:25.138634256 +0100
+++ /var/tmp/diff_new_pack.DLeBTG/_new  2023-01-01 09:38:25.142634277 +0100
@@ -36,16 +36,14 @@
 %endif
 
 Name:   xorg-x11-server
-Version:21.1.4
+Version:21.1.6
 Release:0
 URL:http://xorg.freedesktop.org/
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-
 Summary:X
 # Source URL: http://xorg.freedesktop.org/archive/individual/xserver/
 License:MIT
 Group:  System/X11/Servers/XF86_4
-Source0:xorg-server-%{version}.tar.xz
+Source0:xserver-xorg-server-%{version}.tar.xz
 Source1:sysconfig.displaymanager.template
 Source2:README.updates
 Source3:xorgcfg.tar.bz2
@@ -246,17 +244,6 @@
 
 Patch1960:  u_sync-pci-ids-with-Mesa.patch
 
-Patch1204412:   U_xkb-proof-GetCountedString-against-request-length-at.patch
-Patch1204416:   U_xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch
-
-Patch1205874:   U_0001-Xtest-disallow-GenericEvents-in-XTestSwapFakeInput.patch
-Patch1205875:   
U_0002-Xi-return-an-error-from-XI-property-changes-if-verif.patch
-Patch1205876:   
U_0003-Xi-avoid-integer-truncation-in-length-check-of-ProcX.patch
-Patch1205877:   U_0004-Xi-disallow-passive-grabs-with-a-detail-255.patch
-Patch1205878:   
U_0005-Xext-free-the-screen-saver-resource-when-replacing-i.patch
-Patch1205879:   
U_0006-Xext-free-the-XvRTVideoNo

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-12-15 19:24:14

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1835 (New)


Package is "xorg-x11-server"

Thu Dec 15 19:24:14 2022 rev:414 rq:1042895 version:21.1.4

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-11-08 10:53:55.989592588 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1835/xorg-x11-server.changes
2022-12-15 19:24:17.263743105 +0100
@@ -1,0 +2,29 @@
+Tue Dec  6 14:26:07 UTC 2022 - Stefan Dirsch 
+
+- U_0007-xkb-reset-the-radio_groups-pointer-to-NULL-after-fre.patch
+  * XkbGetKbdByName use-after-free (ZDI-CAN-19530, CVE-2022-4283,
+bsc#1206017)
+
+---
+Wed Nov 30 14:51:14 UTC 2022 - Stefan Dirsch 
+
+- U_0001-Xtest-disallow-GenericEvents-in-XTestSwapFakeInput.patch
+  * Server XTestSwapFakeInput stack overflow (ZDI-CAN 19265,
+CVE-2022-46340, bsc#1205874)
+- U_0002-Xi-return-an-error-from-XI-property-changes-if-verif.patch
+  * Xi: return an error from XI property changes if verification
+failed (no ZDI-CAN id, no CVE id, bsc#1205875)
+- U_0003-Xi-avoid-integer-truncation-in-length-check-of-ProcX.patch
+  * Server XIChangeProperty out-of-bounds access (ZDI-CAN 19405,
+CVE-2022-46344, bsc#1205876)
+- U_0004-Xi-disallow-passive-grabs-with-a-detail-255.patch
+  * Server XIPassiveUngrabDevice out-of-bounds access (ZDI-CAN 19381,
+CVE-2022-46341, bsc#1205877)
+- U_0005-Xext-free-the-screen-saver-resource-when-replacing-i.patch
+  * Server ScreenSaverSetAttributes use-after-free (ZDI-CAN 19404,
+CVE-2022-46343, bsc#1205878)
+- U_0006-Xext-free-the-XvRTVideoNotify-when-turning-off-from-.patch
+  * Server XvdiSelectVideoNotify use-after-free (ZDI-CAN 19400,
+CVE-2022-46342, bsc#1205879)
+
+---

New:

  U_0001-Xtest-disallow-GenericEvents-in-XTestSwapFakeInput.patch
  U_0002-Xi-return-an-error-from-XI-property-changes-if-verif.patch
  U_0003-Xi-avoid-integer-truncation-in-length-check-of-ProcX.patch
  U_0004-Xi-disallow-passive-grabs-with-a-detail-255.patch
  U_0005-Xext-free-the-screen-saver-resource-when-replacing-i.patch
  U_0006-Xext-free-the-XvRTVideoNotify-when-turning-off-from-.patch
  U_0007-xkb-reset-the-radio_groups-pointer-to-NULL-after-fre.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.SWxWbx/_old  2022-12-15 19:24:18.567750525 +0100
+++ /var/tmp/diff_new_pack.SWxWbx/_new  2022-12-15 19:24:18.571750547 +0100
@@ -249,6 +249,14 @@
 Patch1204412:   U_xkb-proof-GetCountedString-against-request-length-at.patch
 Patch1204416:   U_xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch
 
+Patch1205874:   U_0001-Xtest-disallow-GenericEvents-in-XTestSwapFakeInput.patch
+Patch1205875:   
U_0002-Xi-return-an-error-from-XI-property-changes-if-verif.patch
+Patch1205876:   
U_0003-Xi-avoid-integer-truncation-in-length-check-of-ProcX.patch
+Patch1205877:   U_0004-Xi-disallow-passive-grabs-with-a-detail-255.patch
+Patch1205878:   
U_0005-Xext-free-the-screen-saver-resource-when-replacing-i.patch
+Patch1205879:   
U_0006-Xext-free-the-XvRTVideoNotify-when-turning-off-from-.patch
+Patch1206017:   
U_0007-xkb-reset-the-radio_groups-pointer-to-NULL-after-fre.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -408,6 +416,13 @@
 %patch1960 -p1
 %patch1204412 -p1
 %patch1204416 -p1
+%patch1205874 -p1
+%patch1205875 -p1
+%patch1205876 -p1
+%patch1205877 -p1
+%patch1205878 -p1
+%patch1205879 -p1
+%patch1206017 -p1
 
 %build
 # We have some -z now related errors during X default startup (boo#1197994):

++ U_0001-Xtest-disallow-GenericEvents-in-XTestSwapFakeInput.patch ++
>From 2e8916efe9a8566f97a4c2231891ad0f555fced1 Mon Sep 17 00:00:00 2001
From: Peter Hutterer 
Date: Tue, 29 Nov 2022 12:55:45 +1000
Subject: [PATCH xserver 1/6] Xtest: disallow GenericEvents in
 XTestSwapFakeInput

XTestSwapFakeInput assumes all events in this request are
sizeof(xEvent) and iterates through these in 32-byte increments.
However, a GenericEvent may be of arbitrary length longer than 32 bytes,
so any GenericEvent in this list would result in subsequent events to be
misparsed.

Additional, the swapped event is written into a stack-allocated struct
xEvent (size 32 bytes). For any GenericEvent longer than 32 bytes,
swapping the event may thus smash the stack like an avocado on toast.

Catch this case early and return BadValue for any GenericEvent.
Which is what would happen in unswapped setups

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-11-08 10:53:43

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1597 (New)


Package is "xorg-x11-server"

Tue Nov  8 10:53:43 2022 rev:413 rq:1034269 version:21.1.4

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-11-07 15:55:58.882158064 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1597/xorg-x11-server.changes
2022-11-08 10:53:55.989592588 +0100
@@ -1,0 +2,5 @@
+Mon Nov  7 15:21:27 UTC 2022 - Stefan Dirsch 
+
+- Release 21.1 covers bugfixes and JIRA tickets for 
bsc#1176015,bsc#1182510,bsc#1182884,bsc#1184072,bsc#1184543,bsc#1184906,bsc#1186092,bsc#1188970,bsc#1194159,bsc#1196577,bsc#1197046,bsc#1197269,bsc#1200076,fdo#574,jsc#SLE-18653,jsc#SLE-8470
+
+---



Other differences:
--

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-11-07 15:55:55

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1597 (New)


Package is "xorg-x11-server"

Mon Nov  7 15:55:55 2022 rev:412 rq:1034184 version:21.1.4

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-11-03 19:13:48.427874374 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1597/xorg-x11-server.changes
2022-11-07 15:55:58.882158064 +0100
@@ -1,0 +2,27 @@
+Mon Nov  7 11:43:29 UTC 2022 - Stefan Dirsch 
+
+- Release 21.1 supersedes the following patches still used with
+  xorg-x11-server 1.20.3 on sle15-sp4/Leap 15.4:
+  * U_0002-DRI2-Add-another-Coffeelake-PCI-ID.patch
+  * U_0002-Fix-crash-on-XkbSetMap.patch
+  * U_0003-Fix-crash-on-XkbSetMap.patch
+  * U_0003-dri2-Sync-i965_pci_ids.h-from-mesa.patch
+  * U_0004-dri2-Set-fallback-driver-names-for-Intel-and-AMD-chi.patch
+  * U_0005-dri2-Sync-i965_pci_ids.h-from-mesa-iris_pci_ids.h.patch
+  * U_build-glx-Lower-gl-version-to-work-with-libglvnd.patch
+  * U_glamor-Make-pixmap-exportable-from-gbm_bo_from_pixma.patch
+  * U_hw_do-not-include-sys-io-with-glibc.patch
+  * U_meson-Fix-another-reference-to-gl-9.2.0.patch
+  * U_modesetting-Fix-broken-manpage-in-autoconf-build.patch
+  * U_present-wnmd-Fix-use-after-free-on-CRTC-removal.patch
+  * U_present-wnmd-Relax-assertion-on-CRTC-on-abort_vblank.patch
+  * U_xfree86-Change-displays-array-to-pointers-array-to-f.patch
+  * U_xfree86-Fix-NULL-pointer-dereference-crash.patch
+  * U_xkbsetdeviceinfo.patch
+  * u_sync-pci-ids-with-Mesa-21.2.4.patch
+  * u_xf86-Accept-devices-with-the-simpledrm-driver.patch
+  * u_xichangehierarchy-CVE-2020-14346.patch
+  * u_xkb-CVE-2020-14345.patch
+  * u_xkb-CVE-2020-14360.patch
+
+---



Other differences:
--

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-11-03 19:13:40

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.2275 (New)


Package is "xorg-x11-server"

Thu Nov  3 19:13:40 2022 rev:411 rq:1032921 version:21.1.4

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-10-20 11:10:10.379832651 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.2275/xorg-x11-server.changes
2022-11-03 19:13:48.427874374 +0100
@@ -1,0 +2,13 @@
+Wed Nov  2 15:37:07 UTC 2022 - Stefan Dirsch 
+
+- removed N_Disable-HW-Cursor-for-cirrus-and-mgag200-kernel-modules.patch 
+  * meanwhile cirrus and mgag200 Kernel drivers have been rewritten
+multiple times and no longer have (broken) hardware cursor
+
+---
+Wed Nov  2 12:29:59 UTC 2022 - Thomas Zimmermann 
+
+- u_xf86-Accept-devices-with-the-kernels-ofdrm-driver.patch
+  * Add workaround to support ofdrm
+
+---

Old:

  N_Disable-HW-Cursor-for-cirrus-and-mgag200-kernel-modules.patch

New:

  u_xf86-Accept-devices-with-the-kernels-ofdrm-driver.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.ncCU1r/_old  2022-11-03 19:13:49.695881830 +0100
+++ /var/tmp/diff_new_pack.ncCU1r/_new  2022-11-03 19:13:49.703881877 +0100
@@ -213,8 +213,6 @@
 
 Patch104:   u_xorg-server-xdmcp.patch
 
-Patch115:   N_Disable-HW-Cursor-for-cirrus-and-mgag200-kernel-modules.patch
-
 Patch117:   xorg-x11-server-byte-order.patch
 
 Patch160:   u_vesa-Add-VBEDPMSGetCapabilities-VBEDPMSGet.patch
@@ -240,6 +238,7 @@
 Patch1910:  u_modesetting-Fix-dirty-updates-for-sw-rotation.patch
 
 Patch1920:  u_xf86-Accept-devices-with-the-hyperv_drm-driver.patch
+Patch1921:  u_xf86-Accept-devices-with-the-kernels-ofdrm-driver.patch
 
 Patch1930:  u_xfree86-activate-GPU-screens-on-autobind.patch
 
@@ -377,7 +376,6 @@
 %patch100 -p1
 #%patch101 -p1
 %patch104 -p1
-%patch115 -p1
 %patch117 -p1
 %patch160 -p1
 %patch208 -p1
@@ -404,6 +402,7 @@
 %patch1900 -p1
 %patch1910 -p1
 %patch1920 -p1
+%patch1921 -p1
 %patch1930 -p1
 %patch1940 -p1
 %patch1960 -p1

++ u_xf86-Accept-devices-with-the-kernels-ofdrm-driver.patch ++
>From a7029faa7da778f9bab88d417e85041c631c87e6 Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann 
Date: Wed, 18 May 2022 10:44:06 +0200
Subject: [PATCH] xf86: Accept devices with the kernels ofdrm driver

Add a workaround to accept devices of the kernel's ofdrm driver.
Makes Xorg work on Open Firmware's pre-configured display with the
DRM graphics stack.

Signed-off-by: Thomas Zimmermann 
---
 hw/xfree86/common/xf86platformBus.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/xfree86/common/xf86platformBus.c 
b/hw/xfree86/common/xf86platformBus.c
index 071f44b2a..6a0c3177b 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -563,6 +563,9 @@ xf86platformProbeDev(DriverPtr drvp)
 /* Accept the device if the driver is hyperv_drm */
 if (strcmp(xf86_platform_devices[j].attribs->driver, 
"hyperv_drm") == 0)
 break;
+/* Accept the device if the driver is ofdrm */
+if (strcmp(xf86_platform_devices[j].attribs->driver, 
"ofdrm") == 0)
+break;
 /* Accept the device if the driver is simpledrm */
 if (strcmp(xf86_platform_devices[j].attribs->driver, 
"simpledrm") == 0)
 break;
-- 
2.38.0

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-10-20 11:10:08

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.2275 (New)


Package is "xorg-x11-server"

Thu Oct 20 11:10:08 2022 rev:410 rq:1030009 version:21.1.4

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-07-22 19:20:27.048580691 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.2275/xorg-x11-server.changes
2022-10-20 11:10:10.379832651 +0200
@@ -1,0 +2,8 @@
+Wed Oct 19 11:06:46 UTC 2022 - Stefan Dirsch 
+
+- U_xkb-proof-GetCountedString-against-request-length-at.patch
+  * security update for CVE-2022-3550 (bsc#1204412)
+- U_xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch
+  * security update for CVE-2022-3551 (bsc#1204416)
+
+---

New:

  U_xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch
  U_xkb-proof-GetCountedString-against-request-length-at.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.Wi1gwx/_old  2022-10-20 11:10:12.079836096 +0200
+++ /var/tmp/diff_new_pack.Wi1gwx/_new  2022-10-20 11:10:12.087836112 +0200
@@ -247,6 +247,9 @@
 
 Patch1960:  u_sync-pci-ids-with-Mesa.patch
 
+Patch1204412:   U_xkb-proof-GetCountedString-against-request-length-at.patch
+Patch1204416:   U_xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -404,6 +407,8 @@
 %patch1930 -p1
 %patch1940 -p1
 %patch1960 -p1
+%patch1204412 -p1
+%patch1204416 -p1
 
 %build
 # We have some -z now related errors during X default startup (boo#1197994):

++ U_xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch ++
>From 18f91b950e22c2a342a4fbc55e9ddf7534a707d2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer 
Date: Wed, 13 Jul 2022 11:23:09 +1000
Subject: [PATCH] xkb: fix some possible memleaks in XkbGetKbdByName

GetComponentByName returns an allocated string, so let's free that if we
fail somewhere.

Signed-off-by: Peter Hutterer 
---
 xkb/xkb.c | 26 --
 1 file changed, 20 insertions(+), 6 deletions(-)

Index: xorg-server-21.1.4/xkb/xkb.c
===
--- xorg-server-21.1.4.orig/xkb/xkb.c
+++ xorg-server-21.1.4/xkb/xkb.c
@@ -5940,18 +5940,32 @@ ProcXkbGetKbdByName(ClientPtr client)
 xkb = dev->key->xkbInfo->desc;
 status = Success;
 str = (unsigned char *) &stuff[1];
-if (GetComponentSpec(&str, TRUE, &status))  /* keymap, unsupported */
-return BadMatch;
+{
+char *keymap = GetComponentSpec(&str, TRUE, &status);  /* keymap, 
unsupported */
+if (keymap) {
+free(keymap);
+return BadMatch;
+}
+}
 names.keycodes = GetComponentSpec(&str, TRUE, &status);
 names.types = GetComponentSpec(&str, TRUE, &status);
 names.compat = GetComponentSpec(&str, TRUE, &status);
 names.symbols = GetComponentSpec(&str, TRUE, &status);
 names.geometry = GetComponentSpec(&str, TRUE, &status);
-if (status != Success)
+if (status == Success) {
+len = str - ((unsigned char *) stuff);
+if ((XkbPaddedSize(len) / 4) != stuff->length)
+status = BadLength;
+}
+
+if (status != Success) {
+free(names.keycodes);
+free(names.types);
+free(names.compat);
+free(names.symbols);
+free(names.geometry);
 return status;
-len = str - ((unsigned char *) stuff);
-if ((XkbPaddedSize(len) / 4) != stuff->length)
-return BadLength;
+}
 
 CHK_MASK_LEGAL(0x01, stuff->want, XkbGBN_AllComponentsMask);
 CHK_MASK_LEGAL(0x02, stuff->need, XkbGBN_AllComponentsMask);

++ U_xkb-proof-GetCountedString-against-request-length-at.patch ++
>From 11beef0b7f1ed290348e45618e5fa0d2bffcb72e Mon Sep 17 00:00:00 2001
From: Peter Hutterer 
Date: Tue, 5 Jul 2022 12:06:20 +1000
Subject: [PATCH] xkb: proof GetCountedString against request length attacks

GetCountedString did a check for the whole string to be within the
request buffer but not for the initial 2 bytes that contain the length
field. A swapped client could send a malformed request to trigger a
swaps() on those bytes, writing into random memory.

Signed-off-by: Peter Hutterer 
---
 xkb/xkb.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/xkb/xkb.c b/xkb/xkb.c
index f42f59ef3..1841cff26 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5137,6 +5137,11 @@ _GetCountedString(char **wire_inout, ClientPtr client, 
char **str)
 CARD1

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-07-22 19:20:24

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.21925 (New)


Package is "xorg-x11-server"

Fri Jul 22 19:20:24 2022 rev:409 rq:990429 version:21.1.4

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-07-13 14:32:04.829264603 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.21925/xorg-x11-server.changes   
2022-07-22 19:20:27.048580691 +0200
@@ -1,0 +2,26 @@
+Wed Jul 13 14:02:51 UTC 2022 - Stefan Dirsch 
+
+- rename u_sync-pci-ids-with-Mesa-22.0.0.patch to 
+  u_sync-pci-ids-with-Mesa.patch (currently synced with Mesa 22.1.3)
+
+---
+Wed Jul 13 13:52:38 UTC 2022 - Stefan Dirsch 
+
+- u_sync-pci-ids-with-Mesa-22.0.0.patch
+  * synced with Mesa 22.1.3; just adding a PCI ID for vmware was
+needed
+
+---
+Wed Jul 13 12:38:05 UTC 2022 - Stefan Dirsch 
+
+- Update to version 21.1
+  * This release fixes 2 recently reported security vulnerabilities
+in xkb, several regressions since 1.20.x and a number of
+miscellaneous bugs.
+- supersedes the following security patches
+  * U_boo1194181-001-xkb-swap-XkbSetDeviceInfo-and-XkbSetDeviceInfoCheck.patch
+  * U_boo1194179-001-xkb-rename-xkb_h-to-xkb-procs_h.patch
+  * U_boo1194179-002-xkb-add-request-length-validation-for-XkbSetGeometry.patch
+- supersedes U_Fix-build-with-gcc-12.patch
+
+---

Old:

  U_Fix-build-with-gcc-12.patch
  U_boo1194179-001-xkb-rename-xkb_h-to-xkb-procs_h.patch
  U_boo1194179-002-xkb-add-request-length-validation-for-XkbSetGeometry.patch
  U_boo1194181-001-xkb-swap-XkbSetDeviceInfo-and-XkbSetDeviceInfoCheck.patch
  u_sync-pci-ids-with-Mesa-22.0.0.patch
  xorg-server-21.1.3.tar.xz

New:

  u_sync-pci-ids-with-Mesa.patch
  xorg-server-21.1.4.tar.xz



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.dW2oYu/_old  2022-07-22 19:20:28.180582634 +0200
+++ /var/tmp/diff_new_pack.dW2oYu/_new  2022-07-22 19:20:28.184582642 +0200
@@ -36,7 +36,7 @@
 %endif
 
 Name:   xorg-x11-server
-Version:21.1.3
+Version:21.1.4
 Release:0
 URL:http://xorg.freedesktop.org/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -245,15 +245,7 @@
 
 Patch1940:  U_xephyr-Don-t-check-for-SeatId-anymore.patch
 
-Patch1950:  U_Fix-build-with-gcc-12.patch
-
-Patch1960:  u_sync-pci-ids-with-Mesa-22.0.0.patch
-
-#CVE-2022-2320, ZDI-CAN-16070, bsc#1194181
-Patch2001:  
U_boo1194181-001-xkb-swap-XkbSetDeviceInfo-and-XkbSetDeviceInfoCheck.patch
-#CVE-2022-2319, ZDI-CAN-16062, bsc#1194179
-Patch2101:  U_boo1194179-001-xkb-rename-xkb_h-to-xkb-procs_h.patch
-Patch2102:  
U_boo1194179-002-xkb-add-request-length-validation-for-XkbSetGeometry.patch
+Patch1960:  u_sync-pci-ids-with-Mesa.patch
 
 %description
 This package contains the X.Org Server.
@@ -411,11 +403,7 @@
 %patch1920 -p1
 %patch1930 -p1
 %patch1940 -p1
-%patch1950 -p1
 %patch1960 -p1
-%patch2001 -p1
-%patch2101 -p1
-%patch2102 -p1
 
 %build
 # We have some -z now related errors during X default startup (boo#1197994):

++ u_sync-pci-ids-with-Mesa-22.0.0.patch -> u_sync-pci-ids-with-Mesa.patch 
++
--- 
/work/SRC/openSUSE:Factory/xorg-x11-server/u_sync-pci-ids-with-Mesa-22.0.0.patch
2022-03-15 19:05:02.528953086 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.21925/u_sync-pci-ids-with-Mesa.patch
2022-07-22 19:20:26.888580417 +0200
@@ -1,8 +1,7 @@
-diff --git a/hw/xfree86/dri2/pci_ids/crocus_pci_ids.h 
b/hw/xfree86/dri2/pci_ids/crocus_pci_ids.h
-new file mode 100644
-index 0..9c9b6cd17
+Index: xorg-server-21.1.4/hw/xfree86/dri2/pci_ids/crocus_pci_ids.h
+===
 --- /dev/null
-+++ b/hw/xfree86/dri2/pci_ids/crocus_pci_ids.h
 xorg-server-21.1.4/hw/xfree86/dri2/pci_ids/crocus_pci_ids.h
 @@ -0,0 +1,104 @@
 +CHIPSET(0x29A2, i965,"BW",  "Intel(R) 965G")
 +CHIPSET(0x2992, i965,"BW",  "Intel(R) 965Q")
@@ -108,20 +107,19 @@
 +CHIPSET(0x22B1, chv, "BSW", "Intel(R) HD Graphics XXX") /* Overridden 
in brw_get_renderer_string */
 +CHIPSET(0x22B2, chv, "CHV", "Intel(R) HD Graphics")
 +CHIPSET(0x22B3, chv, "CHV", "Intel(R) HD Graphics")
-diff --git a/hw/xfree86/dri2/pci_ids/i810_pci_ids.h 
b/hw/xfree86/dri2/pci_ids/i810_pci_ids.h
-deleted file mode 100644
-index 7f

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-07-13 14:31:53

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1523 (New)


Package is "xorg-x11-server"

Wed Jul 13 14:31:53 2022 rev:408 rq:988635 version:21.1.3

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-05-12 22:58:01.416608559 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1523/xorg-x11-server.changes
2022-07-13 14:32:04.829264603 +0200
@@ -1,0 +2,11 @@
+Wed Jul  6 12:21:11 UTC 2022 - Stefan Dirsch 
+
+- U_boo1194181-001-xkb-swap-XkbSetDeviceInfo-and-XkbSetDeviceInfoCheck.patch
+  * Out-Of-Bounds Access in CheckSetDeviceIndicators()
+(CVE-2022-2320, ZDI-CAN-16070, bsc#1194181)
+- U_boo1194179-001-xkb-rename-xkb_h-to-xkb-procs_h.patch,
+  U_boo1194179-002-xkb-add-request-length-validation-for-XkbSetGeometry.patch
+  * Out-Of-Bounds Access in _CheckSetSections() 
+(CVE-2022-2319, ZDI-CAN-16062, bsc#1194179)
+
+---

New:

  U_boo1194179-001-xkb-rename-xkb_h-to-xkb-procs_h.patch
  U_boo1194179-002-xkb-add-request-length-validation-for-XkbSetGeometry.patch
  U_boo1194181-001-xkb-swap-XkbSetDeviceInfo-and-XkbSetDeviceInfoCheck.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.1jxjvX/_old  2022-07-13 14:32:07.413267938 +0200
+++ /var/tmp/diff_new_pack.1jxjvX/_new  2022-07-13 14:32:07.413267938 +0200
@@ -249,6 +249,12 @@
 
 Patch1960:  u_sync-pci-ids-with-Mesa-22.0.0.patch
 
+#CVE-2022-2320, ZDI-CAN-16070, bsc#1194181
+Patch2001:  
U_boo1194181-001-xkb-swap-XkbSetDeviceInfo-and-XkbSetDeviceInfoCheck.patch
+#CVE-2022-2319, ZDI-CAN-16062, bsc#1194179
+Patch2101:  U_boo1194179-001-xkb-rename-xkb_h-to-xkb-procs_h.patch
+Patch2102:  
U_boo1194179-002-xkb-add-request-length-validation-for-XkbSetGeometry.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -407,6 +413,9 @@
 %patch1940 -p1
 %patch1950 -p1
 %patch1960 -p1
+%patch2001 -p1
+%patch2101 -p1
+%patch2102 -p1
 
 %build
 # We have some -z now related errors during X default startup (boo#1197994):

++ U_boo1194179-001-xkb-rename-xkb_h-to-xkb-procs_h.patch ++
>From 04a2689e96b42330718517b2a3950aa2bb1ca017 Mon Sep 17 00:00:00 2001
From: Peter Hutterer 
Date: Mon, 4 Jul 2022 09:42:53 +1000
Subject: [PATCH] xkb: rename xkb.h to xkb-procs.h

This header merely defines the various protocol request handlers, so
let's rename it to something less generic and remove its include from
all the files that don't actually need it (which is almost all of them).

Signed-off-by: Peter Hutterer 
Reviewed-by: Olivier Fourdan 
---
 test/test_xkb.c| 1 -
 xkb/ddxLoad.c  | 1 -
 xkb/{xkb.h => xkb-procs.h} | 0
 xkb/xkb.c  | 2 +-
 xkb/xkbActions.c   | 1 -
 xkb/xkbEvents.c| 1 -
 xkb/xkbInit.c  | 1 -
 xkb/xkbLEDs.c  | 1 -
 xkb/xkbSwap.c  | 2 +-
 xkb/xkbUtils.c | 1 -
 xkb/xkbfmisc.c | 1 -
 11 files changed, 2 insertions(+), 10 deletions(-)
 rename xkb/{xkb.h => xkb-procs.h} (100%)

diff --git a/test/test_xkb.c b/test/test_xkb.c
index f81a7ed65..a13107390 100644
--- a/test/test_xkb.c
+++ b/test/test_xkb.c
@@ -48,7 +48,6 @@
 #include "../xkb/xkbgeom.h"
 #include 
 #include "xkbfile.h"
-#include "../xkb/xkb.h"
 #include 
 
 #include "tests-common.h"
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index f9b7b06d9..2d203ce11 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -43,7 +43,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #defineXKBSRV_NEED_FILE_FUNCS
 #include 
 #include 
-#include "xkb.h"
 
 #definePRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) 
reports:\""
 #defineERROR_PREFIX"\"> \""
diff --git a/xkb/xkb.h b/xkb/xkb-procs.h
similarity index 100%
rename from xkb/xkb.h
rename to xkb/xkb-procs.h
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 820cd7166..21c046913 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -38,7 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "extnsionst.h"
 #include "extinit.h"
 #include "xace.h"
-#include "xkb.h"
+#include "xkb-procs.h"
 #include "protocol-versions.h"
 
 #include 
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index db29091e7..5e9a6b6d6 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -38,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "exevents.h"
 #include "eventstr.h"
 #include 
-#include "xkb.h"
 #include 
 #include "mi.h"
 #include "mipointer.h"
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
in

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-05-12 22:57:46

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1538 (New)


Package is "xorg-x11-server"

Thu May 12 22:57:46 2022 rev:407 rq:976070 version:21.1.3

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-04-06 21:51:14.199741592 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1538/xorg-x11-server.changes
2022-05-12 22:58:01.416608559 +0200
@@ -1,0 +2,5 @@
+Tue May 10 13:04:38 UTC 2022 - Dirk M??ller 
+
+- add n_raise_default_clients.patch 
+
+---

New:

  n_raise_default_clients.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.NP3jq6/_old  2022-05-12 22:58:02.548610078 +0200
+++ /var/tmp/diff_new_pack.NP3jq6/_new  2022-05-12 22:58:02.552610084 +0200
@@ -199,6 +199,7 @@
 Patch2: N_zap_warning_xserver.diff
 Patch3: N_driver-autoconfig.diff
 Patch4: N_fix_fglrx_screendepth_issue.patch
+Patch5: n_raise_default_clients.patch
 Patch6: N_fix-dpi-values.diff
 Patch7: N_Install-Avoid-failure-on-wrapper-installation.patch
 Patch8: u_xorg-wrapper-Drop-supplemental-group-IDs.patch
@@ -363,6 +364,7 @@
 %patch2 -p1
 %patch3 -p0
 %patch4 -p0
+%patch5 -p1
 %patch6 -p0
 %patch7 -p1
 %patch8 -p1

++ n_raise_default_clients.patch ++
Author: Dirk Mueller 
Subject: Raise default client limit to 512
Patch-Mainline: Never

After a while of starting too many browser tabs, I ran into
xorg: Maximum number of clients reached

which also prevented me from starting a terminal window to debug
the issue.. so raise the default a bit. Based on 

https://plug-discuss.phxlinux.narkive.com/BWkQ7Xez/xorg-maximum-number-of-clients-reached
it appears other distros are also doing that.

--- xorg-server-21.1.3.orig/include/misc.h
+++ xorg-server-21.1.3/include/misc.h
@@ -88,7 +88,7 @@ OF THIS SOFTWARE.
 #define MAXGPUSCREENS  16
 #endif
 #define MAXCLIENTS 2048
-#define LIMITCLIENTS   256 /* Must be a power of 2 and <= MAXCLIENTS */
+#define LIMITCLIENTS   512 /* Must be a power of 2 and <= MAXCLIENTS */
 #define MAXEXTENSIONS   128
 #define MAXFORMATS 8
 #ifndef MAXDEVICES
--- xorg-server-21.1.3.orig/man/Xserver.man
+++ xorg-server-21.1.3/man/Xserver.man
@@ -317,9 +317,9 @@ A value of zero makes the stack size as
 of \-1 leaves the stack space limit unchanged.
 .TP 8
 .B \-maxclients
-.BR 64 | 128 | 256 | 512
+.BR 64 | 128 | 256 | 512 | 1024 | 2048
 Set the maximum number of clients allowed to connect to the X server.
-Acceptable values are 64, 128, 256 or 512.
+Acceptable values are 64, 128, 256, 512, 1024 or 2048.
 .TP 8
 .B \-render
 .BR default | mono | gray | color

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-04-06 21:51:06

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1900 (New)


Package is "xorg-x11-server"

Wed Apr  6 21:51:06 2022 rev:406 rq:966769 version:21.1.3

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-03-15 19:05:02.540953094 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1900/xorg-x11-server.changes
2022-04-06 21:51:14.199741592 +0200
@@ -1,0 +2,6 @@
+Wed Mar 30 12:36:36 UTC 2022 - Marcus Meissner 
+
+- disable -z now linking for now, as there are some missing symbol
+  issues. (boo#1197994)
+
+---



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.M17vUC/_old  2022-04-06 21:51:15.411727762 +0200
+++ /var/tmp/diff_new_pack.M17vUC/_new  2022-04-06 21:51:15.415727716 +0200
@@ -407,6 +407,13 @@
 %patch1960 -p1
 
 %build
+# We have some -z now related errors during X default startup (boo#1197994):
+# - when loading modesetting: gbm_bo_get_plane_count
+# - when loading fbdev: fbdevHWSave
+# - when loading vesa: VBESetModeParameters
+# this is directly visible on startup, so easy to test later on.
+export SUSE_ZNOW=0
+
 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
 test -e source-file-list || \
 find -L . -type f \! -name '*.orig' \! -path ./source-file-list > \

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-03-15 19:04:19

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.25692 (New)


Package is "xorg-x11-server"

Tue Mar 15 19:04:19 2022 rev:405 rq:961428 version:21.1.3

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-02-23 16:26:41.203509338 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.25692/xorg-x11-server.changes   
2022-03-15 19:05:02.540953094 +0100
@@ -1,0 +2,6 @@
+Sun Mar 13 09:51:32 UTC 2022 - Stefan Dirsch 
+
+- u_sync-pci-ids-with-Mesa-22.0.0.patch
+  * sync pci ids with Mesa 22.0.0
+
+---

New:

  u_sync-pci-ids-with-Mesa-22.0.0.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.C2lKUA/_old  2022-03-15 19:05:04.456954393 +0100
+++ /var/tmp/diff_new_pack.C2lKUA/_new  2022-03-15 19:05:04.460954395 +0100
@@ -246,6 +246,8 @@
 
 Patch1950:  U_Fix-build-with-gcc-12.patch
 
+Patch1960:  u_sync-pci-ids-with-Mesa-22.0.0.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -402,6 +404,7 @@
 %patch1930 -p1
 %patch1940 -p1
 %patch1950 -p1
+%patch1960 -p1
 
 %build
 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects

++ u_sync-pci-ids-with-Mesa-22.0.0.patch ++
 748 lines (skipped)

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-02-23 16:25:58

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1958 (New)


Package is "xorg-x11-server"

Wed Feb 23 16:25:58 2022 rev:404 rq:956864 version:21.1.3

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-02-14 22:35:53.513370023 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1958/xorg-x11-server.changes
2022-02-23 16:26:41.203509338 +0100
@@ -1,0 +2,6 @@
+Tue Feb 22 18:24:20 UTC 2022 - Bj??rn Lie 
+
+- U_Fix-build-with-gcc-12.patch
+  * render: Fix build with gcc 12 (glfdo#xorg/xserver!853).
+
+---

New:

  U_Fix-build-with-gcc-12.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.x3niR3/_old  2022-02-23 16:26:42.243509375 +0100
+++ /var/tmp/diff_new_pack.x3niR3/_new  2022-02-23 16:26:42.247509376 +0100
@@ -244,6 +244,8 @@
 
 Patch1940:  U_xephyr-Don-t-check-for-SeatId-anymore.patch
 
+Patch1950:  U_Fix-build-with-gcc-12.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -399,6 +401,7 @@
 %patch1920 -p1
 %patch1930 -p1
 %patch1940 -p1
+%patch1950 -p1
 
 %build
 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects

++ U_Fix-build-with-gcc-12.patch ++
>From c6b0dcb82d4db07a2f32c09a8c09c85a5f57248e Mon Sep 17 00:00:00 2001
From: Olivier Fourdan 
Date: Thu, 20 Jan 2022 10:20:38 +0100
Subject: [PATCH] render: Fix build with gcc 12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The xserver fails to compile with the latest gcc 12:

 render/picture.c: In function ???CreateSolidPicture???:
 render/picture.c:874:26: error: array subscript ???union _SourcePict[0]??? is 
partly outside array bounds of ???unsigned char[16]??? [-Werror=array-bounds]
  874 | pPicture->pSourcePict->type = SourcePictTypeSolidFill;
  |  ^~
 render/picture.c:868:45: note: object of size 16 allocated by ???malloc???
  868 | pPicture->pSourcePict = (SourcePictPtr) 
malloc(sizeof(PictSolidFill));
  | 
^
 render/picture.c: In function ???CreateLinearGradientPicture???:
 render/picture.c:906:26: error: array subscript ???union _SourcePict[0]??? is 
partly outside array bounds of ???unsigned char[32]??? [-Werror=array-bounds]
  906 | pPicture->pSourcePict->linear.type = SourcePictTypeLinear;
  |  ^~
 render/picture.c:899:45: note: object of size 32 allocated by ???malloc???
  899 | pPicture->pSourcePict = (SourcePictPtr) 
malloc(sizeof(PictLinearGradient));
  | 
^~
 render/picture.c: In function ???CreateConicalGradientPicture???:
 render/picture.c:989:26: error: array subscript ???union _SourcePict[0]??? is 
partly outside array bounds of ???unsigned char[32]??? [-Werror=array-bounds]
  989 | pPicture->pSourcePict->conical.type = SourcePictTypeConical;
  |  ^~
 render/picture.c:982:45: note: object of size 32 allocated by ???malloc???
  982 | pPicture->pSourcePict = (SourcePictPtr) 
malloc(sizeof(PictConicalGradient));
  | 
^~~
 cc1: some warnings being treated as errors
 ninja: build stopped: subcommand failed.

This is because gcc 12 has become stricter and raises a warning now.

Fix the warning/error by allocating enough memory to store the union
struct.

Signed-off-by: Olivier Fourdan 
Acked-by: Michel D??nzer 
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1256
---
 render/picture.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/render/picture.c b/render/picture.c
index afa0d258f..2be4b1954 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -865,7 +865,7 @@ CreateSolidPicture(Picture pid, xRenderColor * color, int 
*error)
 }
 
 pPicture->id = pid;
-pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill));
+pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
 if (!pPicture->pSourcePict) {
 *error = BadAlloc;
 free(pPicture);
@@ -896,7 +896,7 @@ CreateLinearGradientPicture(Picture pid, xPointFixed * p1, 
xPointFixed * p2,
 }
 
 pPicture->id = pid;
-pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient));
+pPicture->pSourcePict = (SourcePictPtr) malloc

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-02-14 22:35:52

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1956 (New)


Package is "xorg-x11-server"

Mon Feb 14 22:35:52 2022 rev:403 rq:953900 version:21.1.3

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-02-11 23:06:57.822531560 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1956/xorg-x11-server.changes
2022-02-14 22:35:53.513370023 +0100
@@ -1,0 +2,7 @@
+Sat Feb 12 11:12:33 UTC 2022 - Stefan Dirsch 
+
+- U_xephyr-Don-t-check-for-SeatId-anymore.patch
+  * fix mouse/keyboard focus in Xephyr (boo#1194658, 
+github issue#1289)
+
+---

New:

  U_xephyr-Don-t-check-for-SeatId-anymore.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.2EX7xW/_old  2022-02-14 22:35:55.297374672 +0100
+++ /var/tmp/diff_new_pack.2EX7xW/_new  2022-02-14 22:35:55.301374683 +0100
@@ -242,6 +242,8 @@
 
 Patch1930:  u_xfree86-activate-GPU-screens-on-autobind.patch
 
+Patch1940:  U_xephyr-Don-t-check-for-SeatId-anymore.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -396,6 +398,7 @@
 %patch1910 -p1
 %patch1920 -p1
 %patch1930 -p1
+%patch1940 -p1
 
 %build
 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects

++ U_xephyr-Don-t-check-for-SeatId-anymore.patch ++
>From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001
From: nerdopolis 
Date: Tue, 11 Jan 2022 18:41:42 -0500
Subject: [PATCH] xephyr: Don't check for SeatId anymore

After a change for the xserver to automatically determine the seat
based on the XDG_SEAT variable, xephyr stopped working. This was
because of an old feature where xephyr used to handle evdev
directly. This was dropped some time ago, and now this check is
not needed
---
 hw/kdrive/ephyr/ephyrinit.c | 34 --
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 020461db2..09cd28cb3 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -70,25 +70,23 @@ InitInput(int argc, char **argv)
 KdKeyboardInfo *ki;
 KdPointerInfo *pi;
 
-if (!SeatId) {
-KdAddKeyboardDriver(&EphyrKeyboardDriver);
-KdAddPointerDriver(&EphyrMouseDriver);
-
-if (!kdHasKbd) {
-ki = KdNewKeyboard();
-if (!ki)
-FatalError("Couldn't create Xephyr keyboard\n");
-ki->driver = &EphyrKeyboardDriver;
-KdAddKeyboard(ki);
-}
+KdAddKeyboardDriver(&EphyrKeyboardDriver);
+KdAddPointerDriver(&EphyrMouseDriver);
+
+if (!kdHasKbd) {
+ki = KdNewKeyboard();
+if (!ki)
+FatalError("Couldn't create Xephyr keyboard\n");
+ki->driver = &EphyrKeyboardDriver;
+KdAddKeyboard(ki);
+}
 
-if (!kdHasPointer) {
-pi = KdNewPointer();
-if (!pi)
-FatalError("Couldn't create Xephyr pointer\n");
-pi->driver = &EphyrMouseDriver;
-KdAddPointer(pi);
-}
+if (!kdHasPointer) {
+pi = KdNewPointer();
+if (!pi)
+FatalError("Couldn't create Xephyr pointer\n");
+pi->driver = &EphyrMouseDriver;
+KdAddPointer(pi);
 }
 
 KdInitInput();
-- 
2.34.1

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-02-11 23:06:40

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1956 (New)


Package is "xorg-x11-server"

Fri Feb 11 23:06:40 2022 rev:402 rq:953300 version:21.1.3

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2022-01-05 13:40:04.621540885 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1956/xorg-x11-server.changes
2022-02-11 23:06:57.822531560 +0100
@@ -1,0 +2,5 @@
+Thu Feb 10 20:26:44 UTC 2022 - Dirk M??ller 
+
+- fix bashisms in pre_checkins.sh (bsc#1195391) 
+
+---



Other differences:
--
++ pre_checkin.sh ++
--- /var/tmp/diff_new_pack.bpnE5b/_old  2022-02-11 23:06:59.170535304 +0100
+++ /var/tmp/diff_new_pack.bpnE5b/_new  2022-02-11 23:06:59.174535315 +0100
@@ -12,11 +12,11 @@
   grep ^.define.*${1}_VERSION ${xorg_src}/hw/xfree86/common/xf86Module.h | tr 
'(),' '  .' | awk '{ print $4$5 }'
 }
 
-if [ "$1" == "--tar" ]; then
+if [ "$1" = "--tar" ]; then
tmpdir=$(mktemp -d)
tar xf "$2" -C ${tmpdir}
xorg_src=${tmpdir}/*
-elif [ "$1" == "--verify" ]; then
+elif [ "$1" = "--verify" ]; then
xorg_src="$2"
prv_ext=".build"
 else
@@ -39,15 +39,18 @@
 abi_xinput=`extract_abi XINPUT`
 abi_extension=`extract_abi EXTENSION`
 
-A="Provides:   X11_ABI_XINPUT = ${abi_xinput}\nProvides:   
X11_ABI_VIDEODRV = ${abi_videodrv}\nProvides:   X11_ABI_ANSIC = 
${abi_ansic}\nProvides:   X11_ABI_EXTENSION = ${abi_extension}"
+cat > xorg-server-provides${prv_ext} < xorg-server-provides${prv_ext}
-
-if [ "$1" == "--tar" ]; then
+if [ "$1" = "--tar" ]; then
if [ -d ${tmpdir} ]; then
rm -rf ${tmpdir}
fi
-elif [ "$1" == "--verify" ]; then
+elif [ "$1" = "--verify" ]; then
diff "$3" xorg-server-provides${prv_ext}
 if [ $? -gt 0 ]; then
echo "The ABI verification failed... please run $0 before 
checking in"

++ xorg-server-provides ++
--- /var/tmp/diff_new_pack.bpnE5b/_old  2022-02-11 23:06:59.258535548 +0100
+++ /var/tmp/diff_new_pack.bpnE5b/_new  2022-02-11 23:06:59.258535548 +0100
@@ -1,5 +1,5 @@
-Provides: X11_ABI_XINPUT = 24.4
-Provides: X11_ABI_VIDEODRV = 25.2
-Provides: X11_ABI_ANSIC = 0.4
-Provides: X11_ABI_EXTENSION = 10.0
+Provides:   X11_ABI_XINPUT = 24.4
+Provides:   X11_ABI_VIDEODRV = 25.2
+Provides:   X11_ABI_ANSIC = 0.4
+Provides:   X11_ABI_EXTENSION = 10.0
 

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2022-01-05 13:39:42

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1896 (New)


Package is "xorg-x11-server"

Wed Jan  5 13:39:42 2022 rev:401 rq:943815 version:21.1.3

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2021-12-16 21:19:42.194530166 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1896/xorg-x11-server.changes
2022-01-05 13:40:04.621540885 +0100
@@ -1,0 +2,20 @@
+Mon Jan  3 21:03:34 UTC 2022 - Stefan Dirsch 
+
+- u_xfree86-activate-GPU-screens-on-autobind.patch 
+  * Part of the original patch by Dave Airlie has landed
+078277e4d92f05a90c4715d61b89b9d9d38d68ea, this contains the
+remainder of what was in SUSE before Xorg 21.1. 
+(github issue#1254, boo#1192751)
+
+---
+Mon Jan  3 18:29:59 UTC 2022 - Stefan Dirsch 
+
+- Update to version 21.1.3
+  * This release fixes several regressions since 1.20.x and 21.1.1 
++ glx/dri: Filter out fbconfigs that don't have a supported pixmap format
++ xf86/logind: Fix compilation error when built without logind/platform bus
++ xf86/logind: fix missing call to vtenter if the platform device is not 
paused
++ Convert more funcs to use InternalEvent.
++ os: Try to discover the current seat with the XDG_SEAT var first
+
+---
@@ -4 +24 @@
-- Update to version 21.1.1
+- Update to version 21.1.2

Old:

  xorg-server-21.1.2.tar.xz

New:

  u_xfree86-activate-GPU-screens-on-autobind.patch
  xorg-server-21.1.3.tar.xz



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.evXkWT/_old  2022-01-05 13:40:05.525541596 +0100
+++ /var/tmp/diff_new_pack.evXkWT/_new  2022-01-05 13:40:05.529541599 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-x11-server
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -36,7 +36,7 @@
 %endif
 
 Name:   xorg-x11-server
-Version:21.1.2
+Version:21.1.3
 Release:0
 URL:http://xorg.freedesktop.org/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -240,6 +240,8 @@
 
 Patch1920:  u_xf86-Accept-devices-with-the-hyperv_drm-driver.patch
 
+Patch1930:  u_xfree86-activate-GPU-screens-on-autobind.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -393,6 +395,7 @@
 %patch1900 -p1
 %patch1910 -p1
 %patch1920 -p1
+%patch1930 -p1
 
 %build
 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects

++ u_xfree86-activate-GPU-screens-on-autobind.patch ++
>From 358448649d39b6cf4de49c0f65ce2b5f4c702c65 Mon Sep 17 00:00:00 2001
From: Dave Airlie 
Date: Sun, 2 Jan 2022 01:27:31 +0200
Subject: [PATCH xserver] xfree86: activate GPU screens on autobind

Part of the original patch by Dave Airlie has landed
078277e4d92f05a90c4715d61b89b9d9d38d68ea, this contains the remainder of
what was in SUSE before Xorg 21.1.

Signed-off-by: Dave Airlie 
---
 dix/main.c   |   4 +
 hw/xfree86/common/xf86Init.c | 185 +++
 include/dix.h|   2 +
 3 files changed, 191 insertions(+)

diff --git a/dix/main.c b/dix/main.c
index bfc8addbe..c7b8ed49e 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -121,6 +121,8 @@ extern void Dispatch(void);
 
 CallbackListPtr RootWindowFinalizeCallback = NULL;
 
+CallbackListPtr RootWindowInitialized = NULL;
+
 int
 dix_main(int argc, char *argv[], char *envp[])
 {
@@ -242,6 +244,8 @@ dix_main(int argc, char *argv[], char *envp[])
 for (i = 0; i < screenInfo.numScreens; i++)
 InitRootWindow(screenInfo.screens[i]->root);
 
+CallCallbacks(&RootWindowInitialized, NULL);
+
 InitCoreDevices();
 InitInput(argc, argv);
 InitAndStartDevices();
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 380288ca4..9839cb19c 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -204,6 +204,9 @@ xf86HasTTYs(void)
 #endif
 }
 
+static void
+xf86AutoConfigProviderOutputs(CallbackListPtr *pcbl, void *data, void 
*call_data);
+
 static void
 xf86AutoConfigOutputDevices(void)
 {
@@ -217,6 +220,8 @@ xf86AutoConfigOutputDevices(void)
 RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
   xf86ScrnToScreen(xf8

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2021-12-16 21:18:58

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.2520 (New)


Package is "xorg-x11-server"

Thu Dec 16 21:18:58 2021 rev:400 rq:940758 version:21.1.2

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2021-12-06 23:59:44.260488974 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.2520/xorg-x11-server.changes
2021-12-16 21:19:42.194530166 +0100
@@ -1,0 +2,54 @@
+Wed Dec 15 15:08:07 UTC 2021 - Stefan Dirsch 
+
+- Update to version 21.1.1
+  * This release fixes 4 recently reported security vulnerabilities and
+several regressions.
+  * In particular, the real physical dimensions are no longer reported
+by the X server anymore as it was deemed to be a too disruptive
+change. X server will continue to report DPI as 96.
+- supersedes U_hw-xfree86-Propagate-physical-dimensions-from-DRM-co.patch
+- supersedes U_rendercompositeglyphs.patch
+- supersedes U_xfixes-Fix-out-of-bounds-access-in-ProcXFixesCreateP.patch
+- supersedes U_Xext-Fix-out-of-bounds-access-in-SProcScreenSaverSus.patch
+- supersedes U_record-Fix-out-of-bounds-access-in-SwapCreateRegiste.patch
+
+---
+Tue Dec 14 20:21:19 UTC 2021 - Stefan Dirsch 
+
+- U_xfixes-Fix-out-of-bounds-access-in-ProcXFixesCreateP.patch
+  * CVE-2021-4009/ZDI-CAN-14950 (bsc#1190487)
+The handler for the CreatePointerBarrier request of the XFixes
+extension does not properly validate the request length leading
+to out of bounds memory write.
+- U_Xext-Fix-out-of-bounds-access-in-SProcScreenSaverSus.patch
+  * CVE-2021-4010/ZDI-CAN-14951 (bsc#1190488)
+The handler for the Suspend request of the Screen Saver extension
+does not properly validate the request length leading to out of
+bounds memory write.
+- U_record-Fix-out-of-bounds-access-in-SwapCreateRegiste.patch
+  * CVE-2021-4011/ZDI-CAN-14952 (bsc#1190489)
+The handlers for the RecordCreateContext and RecordRegisterClients
+requests of the Record extension do not properly validate the request
+length leading to out of bounds memory write.
+
+---
+Tue Dec 14 15:31:41 UTC 2021 - Stefan Dirsch 
+
+- U_rendercompositeglyphs.patch
+  * X.Org Server SProcRenderCompositeGlyphs Out-Of-Bounds Access 
+Privilege Escalation Vulnerability [CVE-2021-4008, ZDI-CAN-14192]
+(boo#1193030)
+
+---
+Tue Dec 14 14:14:45 UTC 2021 - Thomas Zimmermann 
+
+- u_Support-configuration-files-under-run-X11-xorg.conf..patch
+- u_Add-udev-scripts-for-configuration-of-platform-devic.patch
+- u_Add-udev-rule-for-HyperV-devices.patch
+  * Remove udev-based configuration
+- u_Revert-xf86-Accept-devices-with-the-simpledrm-driver.patch
+  * Restore simpledrm workaround
+- u_xf86-Accept-devices-with-the-hyperv_drm-driver.patch
+  * Add workaround to support hyperv_drm
+
+---
@@ -5 +59 @@
-  * Fix SEGFAULT when parsing bus IDs of NULL
+  * Fix SEGFAULT when parsing bus IDs of NULL (boo#1193250)
@@ -8 +62 @@
-configuration files via udev.
+configuration files via udev. (boo#1193250)
@@ -10 +64 @@
-  * Generate configuration files for platform devices
+  * Generate configuration files for platform devices (boo#1193250)
@@ -12 +66 @@
-  * Code has been obsoleted by udev patchset
+  * Code has been obsoleted by udev patchset (boo#1193250)
@@ -14 +68 @@
-  * Same as for platform devices, but on HyperV
+  * Same as for platform devices, but on HyperV (boo#1193250)

Old:

  U_hw-xfree86-Propagate-physical-dimensions-from-DRM-co.patch
  u_Add-udev-rule-for-HyperV-devices.patch
  u_Add-udev-scripts-for-configuration-of-platform-devic.patch
  u_Revert-xf86-Accept-devices-with-the-simpledrm-driver.patch
  u_Support-configuration-files-under-run-X11-xorg.conf..patch
  xorg-server-21.1.1.tar.xz

New:

  u_xf86-Accept-devices-with-the-hyperv_drm-driver.patch
  xorg-server-21.1.2.tar.xz



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.Xdul0S/_old  2021-12-16 21:19:43.158530533 +0100
+++ /var/tmp/diff_new_pack.Xdul0S/_new  2021-12-16 21:19:43.162530534 +0100
@@ -36,7 +36,7 @@
 %endif
 
 Name:   xorg-x11-server
-Version:21.1.1
+Version:21.1.2
 Release:0
 URL:http://xorg.freedesktop.org/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -199,7 +199

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2021-12-06 23:59:14

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.31177 (New)


Package is "xorg-x11-server"

Mon Dec  6 23:59:14 2021 rev:399 rq:935539 version:21.1.1

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2021-11-22 23:04:07.493943946 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.31177/xorg-x11-server.changes   
2021-12-06 23:59:44.260488974 +0100
@@ -1,0 +2,15 @@
+Fri Dec  3 14:41:55 UTC 2021 - Thomas Zimmermann 
+
+- u_pci-primary-Fix-up-primary-PCI-device-detection-for-the-platfrom-bus.patch
+  * Fix SEGFAULT when parsing bus IDs of NULL
+- u_Support-configuration-files-under-run-X11-xorg.conf..patch
+  * Support configuration files under /run. Required for generating
+configuration files via udev.
+- u_Add-udev-scripts-for-configuration-of-platform-devic.patch
+  * Generate configuration files for platform devices
+- u_Revert-xf86-Accept-devices-with-the-simpledrm-driver.patch
+  * Code has been obsoleted by udev patchset
+- u_Add-udev-rule-for-HyperV-devices.patch
+  * Same as for platform devices, but on HyperV
+
+---

New:

  u_Add-udev-rule-for-HyperV-devices.patch
  u_Add-udev-scripts-for-configuration-of-platform-devic.patch
  u_Revert-xf86-Accept-devices-with-the-simpledrm-driver.patch
  u_Support-configuration-files-under-run-X11-xorg.conf..patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.Uo2bqi/_old  2021-12-06 23:59:45.596484249 +0100
+++ /var/tmp/diff_new_pack.Uo2bqi/_new  2021-12-06 23:59:45.604484221 +0100
@@ -239,6 +239,11 @@
 
 Patch1910:  u_modesetting-Fix-dirty-updates-for-sw-rotation.patch
 
+Patch1920:  u_Support-configuration-files-under-run-X11-xorg.conf..patch
+Patch1921:  u_Add-udev-scripts-for-configuration-of-platform-devic.patch
+Patch1922:  u_Revert-xf86-Accept-devices-with-the-simpledrm-driver.patch
+Patch1923:  u_Add-udev-rule-for-HyperV-devices.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -393,6 +398,10 @@
 %patch1503 -p1
 %patch1900 -p1
 %patch1910 -p1
+%patch1920 -p1
+%patch1921 -p1
+%patch1922 -p1
+%patch1923 -p1
 
 %build
 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
@@ -594,6 +603,12 @@
 %endif
 %{_bindir}/xorg-backtrace
 
+# sysfb support
+%{_sbindir}/x11sysfsconf
+%dir %{_sysconfdir}/udev
+%dir %{_sysconfdir}/udev/rules.d
+%{_sysconfdir}/udev/rules.d/99-xorg-sysfs.rules
+
 %if 0%{?have_wayland} == 1
 %files wayland
 %{_bindir}/Xwayland

++ u_Add-udev-rule-for-HyperV-devices.patch ++
>From ceb711ec1f98ba18bce1dc6ee6a091e304a0c883 Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann 
Date: Fri, 3 Dec 2021 10:24:20 +0100
Subject: Add udev rule for HyperV devices

Add a udev rule to generate configuration files for HyperV-based
graphics output.

Signed-off-by: Thomas Zimmermann 
---
 hw/xfree86/os-support/linux/99-xorg-sysfs.rules | 9 +
 1 file changed, 9 insertions(+)

diff --git a/hw/xfree86/os-support/linux/99-xorg-sysfs.rules 
b/hw/xfree86/os-support/linux/99-xorg-sysfs.rules
index 940d18ef5..0cc9ad7b6 100644
--- a/hw/xfree86/os-support/linux/99-xorg-sysfs.rules
+++ b/hw/xfree86/os-support/linux/99-xorg-sysfs.rules
@@ -27,3 +27,12 @@ ACTION=="add|remove", \
SUBSYSTEM=="drm", \
SUBSYSTEMS=="platform", \
RUN+="/usr/sbin/x11sysfsconf $env{ACTION} $env{DEVPATH}"
+
+# HyperV graphics devices
+ACTION=="add|remove", \
+   KERNEL=="card[0-9]", \
+   SUBSYSTEM=="drm", \
+   SUBSYSTEMS=="vmbus", \
+   KERNELS=="5620e0c7-8062-4dce-aeb7-520c7ef76171", \
+   DRIVERS=="hyperv_drm", \
+   RUN+="/usr/sbin/x11sysfsconf $env{ACTION} $env{DEVPATH}"
--
2.34.0

++ u_Add-udev-scripts-for-configuration-of-platform-devic.patch ++
>From edc3e2e465ff1423e7c6ba217bee78a0e0b60f0e Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann 
Date: Tue, 2 Nov 2021 14:29:08 +0100
Subject: Add udev scripts for configuration of platform devices

Generate configuration files for platform devices from udev rules
as X does not support auto-configuration. Implement support for
platform devices, such as simple-frambuffer, on top.

Signed-off-by: Thomas Zimmermann 
---
 .../os-support/linux/99-xorg-sysfs.rules  | 29 +++
 hw/xfree86/os-support/linux/Makefile.am   |  5 ++
 hw/xfree86/os-support/linux/x11sysfsconf  | 81 +++
 3 files changed, 115 insertions(+)
 create mode 100644 hw/xfree86/os-support/linux/99-xorg-sysfs.rules
 create mode 

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2021-11-22 23:03:50

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1895 (New)


Package is "xorg-x11-server"

Mon Nov 22 23:03:50 2021 rev:398 rq:932564 version:21.1.1

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2021-11-11 21:35:55.396866827 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1895/xorg-x11-server.changes
2021-11-22 23:04:07.493943946 +0100
@@ -1,0 +2,5 @@
+Fri Nov 19 15:49:28 UTC 2021 - Stefan Dirsch 
+
+- enable build of Xorg on s390x (jira#SLE-18632) 
+
+---



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.LeEmKF/_old  2021-11-22 23:04:09.289937919 +0100
+++ /var/tmp/diff_new_pack.LeEmKF/_new  2021-11-22 23:04:09.293937906 +0100
@@ -28,15 +28,11 @@
 %define build_suid_wrapper 1
 
 %if 0%{?build_suid_wrapper:1}
-  %ifarch s390 s390x
-%define build_suid_wrapper 0
-  %else
 %if 0%{?suse_version} >= 1550
   %define suid_wrapper_dir %{_bindir}
 %else
   %define build_suid_wrapper 0
 %endif
-  %endif
 %endif
 
 Name:   xorg-x11-server
@@ -144,16 +140,12 @@
 BuildRequires:  pkgconfig(libudev) >= 143
 %endif
 
-%ifnarch s390 s390x
 Requires(pre):  %fillup_prereq
-%endif
 Requires:   pkgconfig
 Requires:   xkbcomp
 Recommends: xorg-x11-fonts-core
-%ifnarch s390 s390x
 Requires:   libpixman-1-0 >= 0.24
 %(cat %{SOURCE91})
-%endif
 Requires:   Mesa
 %if 0%{?suse_version} >= 1315
 Requires(post): update-alternatives
@@ -432,15 +424,10 @@
 --with-sha1=libcrypto \
 --disable-linux-acpi \
 --disable-linux-apm \
-%ifarch s390 s390x
---disable-xorg \
---disable-aiglx \
-%else
 --enable-xorg \
 %if 0%{?suse_version} > 1120
 --enable-config-udev \
 %endif
-%endif
 %if 0%{?have_wayland} == 1
 --enable-xwayland \
 %else
@@ -472,7 +459,6 @@
 %install
 %make_install
 make -C hw/kdrive install DESTDIR=%{buildroot}
-%ifnarch s390 s390x
 # remove .la files
 find %{buildroot}%{_libdir}/xorg/modules/ -name "*.la" | \
   xargs rm
@@ -498,37 +484,24 @@
 mkdir -p 
%{buildroot}%{_libdir}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions}
 install -m 644 $RPM_SOURCE_DIR/README.updates 
%{buildroot}%{_libdir}/xorg/modules/updates
 %endif
-%else
-rm -f %{buildroot}%{_datadir}/aclocal/*.m4
-%endif
 # FATE#325524
 mkdir -p %{buildroot}%{_datadir}/factory/%{_localstatedir}/lib/xkb/compiled
 mv %{buildroot}%{_localstatedir}/lib/xkb/compiled/README.compiled 
%{buildroot}%{_datadir}/factory/%{_localstatedir}/lib/xkb/compiled/
 mkdir -p %{buildroot}%{_tmpfilesdir}
 install -m 644 %{S:7} %{buildroot}%{_tmpfilesdir}/xkb.conf
-%ifarch s390 s390x
-rm -f %{buildroot}%{_datadir}/X11/10-quirks.conf
-mkdir -p %{buildroot}%{_includedir}/xorg
-install -m 644 include/list.h \
- %{buildroot}%{_includedir}/xorg
-%endif
-%ifnarch s390 s390x
 mkdir -p %{buildroot}%{_fillupdir}
 install -m 644 %_sourcedir/sysconfig.displaymanager.template \
   %{buildroot}%{_fillupdir}/sysconfig.displaymanager-%{name}
-%endif
 install -m 755 $RPM_SOURCE_DIR/xorg-backtrace 
%{buildroot}%{_bindir}/xorg-backtrace
 cp %{S:90} .
 ./config.status --file xorg-x11-server.macros
 install -D xorg-x11-server.macros 
%{buildroot}/usr/lib/rpm/macros.d/macros.xorg-server
-%ifnarch s390 s390x
 %if 0%{?suse_version} >= 1315
 mkdir -p %{buildroot}%{_libdir}/xorg/modules/extensions/xorg
 mv  %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so \
 %{buildroot}%{_libdir}/xorg/modules/extensions/xorg/xorg-libglx.so
 ln -snf %{_sysconfdir}/alternatives/libglx.so 
%{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so
 %endif
-%endif
 
 mkdir -p %{buildroot}/usr/src/xserver
 xargs cp --parents --target-directory=%{buildroot}/usr/src/xserver < 
source-file-list
@@ -537,7 +510,6 @@
 
 %post
 %tmpfiles_create xkb.conf
-%ifnarch s390 s390x
 %{fillup_only -an displaymanager}
 # Move SaX2 generated xorg.conf file to xorg.conf.sle11
 #
@@ -565,17 +537,14 @@
 %_sbindir/update-alternatives \
 --force --install %{_libdir}/xorg/modules/extensions/libglx.so libglx.so 
%{_libdir}/xorg/modules/extensions/xorg/xorg-libglx.so 50
 %endif
-%endif
 exit 0
 
-%ifnarch s390 s390x
 %if 0%{?suse_version} >= 1315
 %postun
 if [ "$1" = 0 ] ; then
"%_sbindir/update-alternatives" --remove libglx.so 
%{_libdir}/xorg/modules/extensions/xorg/xorg-libglx.so
 fi
 %endif
-%endif
 
 %if 0%{?build_suid_wrapper} == 1
 %po

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2021-11-11 21:35:50

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1890 (New)


Package is "xorg-x11-server"

Thu Nov 11 21:35:50 2021 rev:397 rq:930821 version:21.1.1

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2021-08-02 12:04:51.977658631 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1890/xorg-x11-server.changes
2021-11-11 21:35:55.396866827 +0100
@@ -1,0 +2,54 @@
+Thu Nov 11 08:35:39 UTC 2021 - Stefan Dirsch 
+
+- U_hw-xfree86-Propagate-physical-dimensions-from-DRM-co.patch
+  * reverse apply this one to go back to fixed 96 dpi (gitlab 
+fdo/xserver issue#1241) 
+- N_fix-dpi-values.diff
+  * back to version for xserver < 21.1.0
+
+---
+Sun Nov  7 09:22:47 UTC 2021 - Stefan Dirsch 
+
+- Update to version 21.1.1
+  * s/__/@/ in inputtestdrv manpage
+  * Make xf86CompatOutput() return NULL when there are no privates
+  * Makefile.am: Add missing meson build files to release tarball 
+
+---
+Wed Oct 27 11:58:32 UTC 2021 - Stefan Dirsch 
+
+- Update to version 21.1.0
+  * The meson support is now fully mature. While autotools support
+will still be kept for this release series, it will be dropped
+afterwards.
+  * Glamor support for Xvfb.
+  * Variable refresh rate support in the modesetting driver.
+  * XInput 2.4 support which adds touchpad gestures.
+  * DMX DDX has been removed.
+  * X server now correctly reports display DPI in more cases. This
+may affect rendering of client applications that have their own
+workarounds for hi-DPI screens.
+  * A large number of small features and various bug fixes.
+- updated xorg-server-provides
+- supersedes patches
+  * U_Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
+  * U_dix-window-Use-ConfigureWindow-instead-of-MoveWindow.patch
+  * U_glamor_egl-Reject-OpenGL-2.1-early-on.patch
+  * u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch
+- refreshed patches
+  * N_fix-dpi-values.diff
+  * N_zap_warning_xserver.diff
+  * u_modesetting-Fix-dirty-updates-for-sw-rotation.patch
+  * u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch
+  * u_vesa-Add-VBEDPMSGetCapabilities-VBEDPMSGet.patch
+- disabled n_xserver-optimus-autoconfig-hack.patch, which I believe is 
+  superseded by:
+  commit 078277e4d92f05a90c4715d61b89b9d9d38d68ea
+  Author: Dave Airlie 
+  Date:   Fri Aug 17 09:49:24 2012 +1000
+
+xf86: autobind GPUs to the screen
+- added pkgconfig(libxcvt)
+- cvt binary moved to libxcvt0 package
+
+---

Old:

  U_Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
  U_dix-window-Use-ConfigureWindow-instead-of-MoveWindow.patch
  U_glamor_egl-Reject-OpenGL-2.1-early-on.patch
  u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch
  xorg-server-1.20.13.tar.xz

New:

  U_hw-xfree86-Propagate-physical-dimensions-from-DRM-co.patch
  xorg-server-21.1.1.tar.xz



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.NYkOfW/_old  2021-11-11 21:35:56.588867697 +0100
+++ /var/tmp/diff_new_pack.NYkOfW/_new  2021-11-11 21:35:56.588867697 +0100
@@ -40,7 +40,7 @@
 %endif
 
 Name:   xorg-x11-server
-Version:1.20.13
+Version:21.1.1
 Release:0
 URL:http://xorg.freedesktop.org/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -72,7 +72,6 @@
 BuildRequires:  pkgconfig(compositeproto)
 BuildRequires:  pkgconfig(damageproto) >= 1.1
 BuildRequires:  pkgconfig(dbus-1) >= 1.0
-BuildRequires:  pkgconfig(dmx) >= 1.0.99.1
 BuildRequires:  pkgconfig(dri) >= 7.8.0
 BuildRequires:  pkgconfig(dri2proto)
 BuildRequires:  pkgconfig(dri3proto)
@@ -96,6 +95,7 @@
 BuildRequires:  pkgconfig(kbproto) >= 1.0.3
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(libxcvt)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(pciaccess) >= 0.8.0
 BuildRequires:  pkgconfig(pixman-1) >= 0.24
@@ -207,6 +207,7 @@
 Patch2: N_zap_warning_xserver.diff
 Patch3: N_driver-autoconfig.diff
 Patch4: N_fix_fglrx_screendepth_issue.patch
+Patch5: U_hw-xfree86-Propagate-physical-dimensions-from-DRM-co.patch
 Patch6: N_fix-dpi-values.diff
 Patch7: N_Install-Avoid-failure-on-wrapper-installation.patch
 Patch8: u_xorg-wrapper-Drop-supplemental

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2021-08-02 12:04:36

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1899 (New)


Package is "xorg-x11-server"

Mon Aug  2 12:04:36 2021 rev:396 rq:909450 version:1.20.13

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2021-07-22 22:43:45.867168212 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1899/xorg-x11-server.changes
2021-08-02 12:04:51.977658631 +0200
@@ -1,0 +2,8 @@
+Fri Jul 30 15:07:59 UTC 2021 - Stefan Dirsch 
+
+- Update to version 1.20.13
+  * bugfix release
+- supersedes U_present-get_crtc-should-not-return-crtc-when-its-scr.patch,
+  U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch 
+
+---

Old:

  U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch
  U_present-get_crtc-should-not-return-crtc-when-its-scr.patch
  xorg-server-1.20.12.tar.xz

New:

  xorg-server-1.20.13.tar.xz



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.TMW99M/_old  2021-08-02 12:04:53.897658223 +0200
+++ /var/tmp/diff_new_pack.TMW99M/_new  2021-08-02 12:04:53.901658222 +0200
@@ -40,7 +40,7 @@
 %endif
 
 Name:   xorg-x11-server
-Version:1.20.12
+Version:1.20.13
 Release:0
 URL:http://xorg.freedesktop.org/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -252,8 +252,6 @@
 Patch1900:  u_no-lto-for-tests.patch
 
 Patch1910:  u_modesetting-Fix-dirty-updates-for-sw-rotation.patch
-Patch1911:  U_present-get_crtc-should-not-return-crtc-when-its-scr.patch
-Patch1912:  U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch
 
 %description
 This package contains the X.Org Server.
@@ -405,8 +403,6 @@
 %patch1801 -p1
 %patch1900 -p1
 %patch1910 -p1
-%patch1911 -p1
-%patch1912 -p1
 
 %build
 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects

++ xorg-server-1.20.12.tar.xz -> xorg-server-1.20.13.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/xorg-server-1.20.12/ChangeLog 
new/xorg-server-1.20.13/ChangeLog
--- old/xorg-server-1.20.12/ChangeLog   2021-07-08 21:22:52.0 +0200
+++ new/xorg-server-1.20.13/ChangeLog   2021-07-29 20:48:47.0 +0200
@@ -1,3 +1,34 @@
+commit 86a72cb1927dd91132d231bb7920b651704601ef
+Author: Matt Turner 
+Date:   Thu Jul 29 11:23:15 2021 -0700
+
+xserver 1.20.13
+
+Signed-off-by: Matt Turner 
+
+commit f85e4edba489316950fc3422f39e3c2ef8fb1ac5
+Author: ??ukasz Spintzyk 
+Date:   Thu Jul 22 13:12:05 2021 +0200
+
+modesetting: unflip not possible when glamor is not set
+
+This is fixing crashes of xfce when running under qemu
+
+(cherry picked from commit 8836b9d243444031b6396d39d345f2f83b5fa6a9)
+
+commit b03d7184b7906121a432b05473675937ab6c0f1e
+Author: ??ukasz Spintzyk 
+Date:   Mon Jul 19 14:25:28 2021 +0200
+
+present: fallback get_crtc to return crtc belonging to screen with present 
extension
+
+Since crtc can belong to secondary output that may not have present
+extension enabled we should fallback to first enabled crtc or fake crtc.
+
+Fix for issue xorg/xserver#1195
+
+(cherry picked from commit d6c02ffd9c910637f6b3b7249507998e9e45f93c)
+
 commit b88ad0b342c954109bfd4b1d32c04ff55545cb0f
 Author: Matt Turner 
 Date:   Thu Jul 8 12:15:21 2021 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/xorg-server-1.20.12/configure 
new/xorg-server-1.20.13/configure
--- old/xorg-server-1.20.12/configure   2021-07-08 21:22:30.0 +0200
+++ new/xorg-server-1.20.13/configure   2021-07-29 20:48:26.0 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xorg-server 1.20.12.
+# Generated by GNU Autoconf 2.69 for xorg-server 1.20.13.
 #
 # Report bugs to .
 #
@@ -651,8 +651,8 @@
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.20.12'
-PACKAGE_STRING='xorg-server 1.20.12'
+PACKAGE_VERSION='1.20.13'
+PACKAGE_STRING='xorg-server 1.20.13'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -2045,7 +2045,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configu

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2021-07-22 22:43:07

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.1899 (New)


Package is "xorg-x11-server"

Thu Jul 22 22:43:07 2021 rev:395 rq:907753 version:1.20.12

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2021-07-16 22:12:48.410802786 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.1899/xorg-x11-server.changes
2021-07-22 22:43:45.867168212 +0200
@@ -1,0 +2,13 @@
+Thu Jul 22 12:33:48 UTC 2021 - Stefan Dirsch 
+
+- U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch
+  * this should fixes crashes of xfce when running under qemu
+(boo#1188559) 
+
+---
+Thu Jul 22 09:30:11 UTC 2021 - Dirk M??ller 
+
+- add U_present-get_crtc-should-not-return-crtc-when-its-scr.patch 
(bsc#1188559)
+  https://gitlab.freedesktop.org/xorg/xserver/-/issues/1195
+
+---

New:

  U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch
  U_present-get_crtc-should-not-return-crtc-when-its-scr.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.po37Mo/_old  2021-07-22 22:43:46.675167158 +0200
+++ /var/tmp/diff_new_pack.po37Mo/_new  2021-07-22 22:43:46.675167158 +0200
@@ -252,6 +252,8 @@
 Patch1900:  u_no-lto-for-tests.patch
 
 Patch1910:  u_modesetting-Fix-dirty-updates-for-sw-rotation.patch
+Patch1911:  U_present-get_crtc-should-not-return-crtc-when-its-scr.patch
+Patch1912:  U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch
 
 %description
 This package contains the X.Org Server.
@@ -403,6 +405,8 @@
 %patch1801 -p1
 %patch1900 -p1
 %patch1910 -p1
+%patch1911 -p1
+%patch1912 -p1
 
 %build
 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects

++ U_modesetting-unflip-not-possible-when-glamor-is-not-s.patch ++
>From 3793e12407b6b1511c8655a2665ec5ce41bc820d Mon Sep 17 00:00:00 2001
From: Stefan Dirsch 
Date: Thu, 22 Jul 2021 14:31:35 +0200
Subject: [PATCH] modesetting: unflip not possible when glamor is not set

This is fixing crashes of xfce when running under qemu
---
 hw/xfree86/drivers/modesetting/present.c | 3 +++
 1 file changed, 3 insertions(+)

Index: xorg-server-1.20.12/hw/xfree86/drivers/modesetting/present.c
===
--- xorg-server-1.20.12.orig/hw/xfree86/drivers/modesetting/present.c
+++ xorg-server-1.20.12/hw/xfree86/drivers/modesetting/present.c
@@ -257,6 +257,9 @@ ms_present_check_unflip(RRCrtcPtr crtc,
 pixmap->devKind != drmmode_bo_get_pitch(&ms->drmmode.front_bo))
 return FALSE;
 
+if (!ms->drmmode.glamor)
+return FALSE;
+
 #ifdef GBM_BO_WITH_MODIFIERS
 /* Check if buffer format/modifier is supported by all active CRTCs */
 gbm = glamor_gbm_bo_from_pixmap(screen, pixmap);
++ U_present-get_crtc-should-not-return-crtc-when-its-scr.patch ++
>From 857f4de8a8fc14a0bce566baf07b0eedc1b6b5b5 Mon Sep 17 00:00:00 2001
From: Lukasz Spintzyk 
Date: Mon, 19 Jul 2021 08:17:09 +0200
Subject: [PATCH xserver] present: get_crtc should not return crtc when its
 screen does not have present extension

Since crtc can belong to secondary output that may not have present
extension enabled we should fallback to first enabled crtc or fake crtc.

Fix for issue xorg/xserver#1195
---
 present/present.c | 11 ++-
 randr/randr.c | 27 +++
 randr/randrstr.h  |  2 ++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/present/present.c b/present/present.c
index 3eddb7434..66411212b 100644
--- a/present/present.c
+++ b/present/present.c
@@ -59,11 +59,20 @@ present_get_crtc(WindowPtr window)
 {
 ScreenPtr   screen = window->drawable.pScreen;
 present_screen_priv_ptr screen_priv = present_screen_priv(screen);
+RRCrtcPtr   crtc = NULL;
+RROutputPtr firstOutput = NULL;
 
 if (!screen_priv)
 return NULL;
 
-return screen_priv->get_crtc(screen_priv, window);
+crtc = screen_priv->get_crtc(screen_priv, window);
+if (crtc && !present_screen_priv(crtc->pScreen)) {
+crtc = RRFirstEnabledCrtc(screen);
+}
+if (crtc && !present_screen_priv(crtc->pScreen)) {
+crtc = NULL;
+}
+return crtc;
 }
 
 /*
diff --git a/randr/randr.c b/randr/randr.c
index 5db8b5ced..afc867ea9 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -693,6 +693,33 @@ RRFirstOutput(ScreenPtr p

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2021-07-16 22:12:28

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.2632 (New)


Package is "xorg-x11-server"

Fri Jul 16 22:12:28 2021 rev:394 rq:905221 version:1.20.12

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2021-06-21 20:35:16.190597172 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.2632/xorg-x11-server.changes
2021-07-16 22:12:48.410802786 +0200
@@ -1,0 +2,6 @@
+Fri Jul  9 08:26:19 UTC 2021 - Stefan Dirsch 
+
+- Update to version 1.20.12
+  * bugfix release
+
+---

Old:

  xorg-server-1.20.11.tar.bz2

New:

  xorg-server-1.20.12.tar.xz



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.EcyTei/_old  2021-07-16 22:12:49.466795324 +0200
+++ /var/tmp/diff_new_pack.EcyTei/_new  2021-07-16 22:12:49.470795297 +0200
@@ -40,7 +40,7 @@
 %endif
 
 Name:   xorg-x11-server
-Version:1.20.11
+Version:1.20.12
 Release:0
 URL:http://xorg.freedesktop.org/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -49,7 +49,7 @@
 # Source URL: http://xorg.freedesktop.org/archive/individual/xserver/
 License:MIT
 Group:  System/X11/Servers/XF86_4
-Source0:xorg-server-%{version}.tar.bz2
+Source0:xorg-server-%{version}.tar.xz
 Source1:sysconfig.displaymanager.template
 Source2:README.updates
 Source3:xorgcfg.tar.bz2

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2021-06-21 20:35:02

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.2625 (New)


Package is "xorg-x11-server"

Mon Jun 21 20:35:02 2021 rev:393 rq:900639 version:1.20.11

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2021-06-14 23:10:40.088705253 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.2625/xorg-x11-server.changes
2021-06-21 20:35:16.190597172 +0200
@@ -1,0 +2,11 @@
+Thu Jun 17 11:43:48 UTC 2021 - Bj??rn Lie 
+
+- Drop U_xwayland-Allow-passing-a-fd.patch: We build xwayland in a
+  separate package now, so no need to keep this patch here.
+
+---
+Wed Jun 16 07:56:30 UTC 2021 - Ismail D??nmez 
+
+- Fix typo in %post: xbb.conf -> xkb.conf 
+
+---

Old:

  U_xwayland-Allow-passing-a-fd.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.ByuWfU/_old  2021-06-21 20:35:17.278598199 +0200
+++ /var/tmp/diff_new_pack.ByuWfU/_new  2021-06-21 20:35:17.278598199 +0200
@@ -245,8 +245,6 @@
 
 Patch1503:  u_xfree86-Do-not-claim-pci-slots-if-fb-slot-is-already.patch
 
-Patch1505:  U_xwayland-Allow-passing-a-fd.patch
-
 Patch1600:  U_glamor_egl-Reject-OpenGL-2.1-early-on.patch
 
 Patch1801:  U_Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
@@ -401,9 +399,6 @@
 %patch1401 -p1
 %patch1502 -p1
 %patch1503 -p1
-%if 0%{?have_wayland} == 1
-%patch1505 -p1
-%endif
 %patch1600 -p1
 %patch1801 -p1
 %patch1900 -p1
@@ -544,7 +539,7 @@
 rm -f %{buildroot}/usr/src/xserver/config/fdi2iclass.py
 
 %post
-%tmpfiles_create xbb.conf
+%tmpfiles_create xkb.conf
 %ifnarch s390 s390x
 %{fillup_only -an displaymanager}
 # Move SaX2 generated xorg.conf file to xorg.conf.sle11

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2021-06-14 23:10:33

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.32437 (New)


Package is "xorg-x11-server"

Mon Jun 14 23:10:33 2021 rev:392 rq:899508 version:1.20.11

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2021-04-22 18:03:35.530472044 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.32437/xorg-x11-server.changes   
2021-06-14 23:10:40.088705253 +0200
@@ -1,0 +2,7 @@
+Fri Jun 11 11:03:18 UTC 2021 - Patrik Jakobsson 
+
+- u_modesetting-Fix-dirty-updates-for-sw-rotation.patch
+  * Fixes broken rotation support for DRM drivers without hardware
+rotation support or direct vram access (bsc#1182955)
+
+---

New:

  u_modesetting-Fix-dirty-updates-for-sw-rotation.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.9EJVW3/_old  2021-06-14 23:10:41.040706972 +0200
+++ /var/tmp/diff_new_pack.9EJVW3/_new  2021-06-14 23:10:41.044706980 +0200
@@ -157,7 +157,7 @@
 Requires:   Mesa
 %if 0%{?suse_version} >= 1315
 Requires(post):   update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 %endif
 Provides:   xorg-x11-server-glx
 Obsoletes:  xorg-x11-server-glx
@@ -253,6 +253,8 @@
 
 Patch1900:  u_no-lto-for-tests.patch
 
+Patch1910:  u_modesetting-Fix-dirty-updates-for-sw-rotation.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -405,6 +407,7 @@
 %patch1600 -p1
 %patch1801 -p1
 %patch1900 -p1
+%patch1910 -p1
 
 %build
 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects

++ u_modesetting-Fix-dirty-updates-for-sw-rotation.patch ++
>From 7d2802f13eecb38babeeb54ceae978a409b5c5d4 Mon Sep 17 00:00:00 2001
From: Patrik Jakobsson 
Date: Wed, 9 Jun 2021 20:58:59 +0200
Subject: [PATCH] modesetting: Fix dirty updates for sw rotation
Patch-Mainline: To be upstreamed
References: bsc#1182955

Rotation is broken for all drm drivers not providing hardware rotation
support. Drivers that give direct access to vram and not needing dirty
updates still work but only by accident. The problem is caused by
modesetting not sending the correct fb_id to drmModeDirtyFB() and
passing the damage rects in the rotated state and not as the crtc
expects them. This patch takes care of both problems.

Signed-off-by: Patrik Jakobsson 
---
 hw/xfree86/drivers/modesetting/driver.c   | 81 ++-
 .../drivers/modesetting/drmmode_display.c |  2 +-
 .../drivers/modesetting/drmmode_display.h |  2 +
 3 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/hw/xfree86/drivers/modesetting/driver.c 
b/hw/xfree86/drivers/modesetting/driver.c
index ef4a314..deca1ed 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -503,9 +503,41 @@ GetRec(ScrnInfoPtr pScrn)
 return TRUE;
 }
 
+static void
+rotate_clip(PixmapPtr pixmap, BoxPtr rect, drmModeClip *clip, Rotation 
rotation)
+{
+int w = pixmap->drawable.width;
+int h = pixmap->drawable.height;
+
+if (rotation == RR_Rotate_90) {
+   /* Rotate 90 degrees counter clockwise */
+clip->x1 = rect->y1;
+   clip->x2 = rect->y2;
+   clip->y1 = w - rect->x2;
+   clip->y2 = w - rect->x1;
+} else if (rotation == RR_Rotate_180) {
+   /* Rotate 180 degrees */
+clip->x1 = w - rect->x2;
+   clip->x2 = w - rect->x1;
+   clip->y1 = h - rect->y2;
+   clip->y2 = h - rect->y1;
+} else if (rotation == RR_Rotate_270) {
+   /* Rotate 90 degrees clockwise */
+clip->x1 = h - rect->y2;
+   clip->x2 = h - rect->y1;
+   clip->y1 = rect->x1;
+   clip->y2 = rect->x2;
+} else {
+   clip->x1 = rect->x1;
+   clip->x2 = rect->x2;
+   clip->y1 = rect->y1;
+   clip->y2 = rect->y2;
+}
+}
+
 static int
-dispatch_dirty_region(ScrnInfoPtr scrn,
-  PixmapPtr pixmap, DamagePtr damage, int fb_id)
+dispatch_dirty_region(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
+ PixmapPtr pixmap, DamagePtr damage, int fb_id)
 {
 modesettingPtr ms = modesettingPTR(scrn);
 RegionPtr dirty = DamageRegion(damage);
@@ -520,13 +552,9 @@ dispatch_dirty_region(ScrnInfoPtr scrn,
 if (!clip)
 return -ENOMEM;
 
-/* XXX no need for copy? */
-for (i = 0; i < num_cliprects; i++, rect++) {
-clip[i].x1 = rect->x1;
-clip[i].y1 = rect->y1;
-clip[i].x2 = rect->x2;
-cl

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2021-04-22 18:03:25

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.12324 (New)


Package is "xorg-x11-server"

Thu Apr 22 18:03:25 2021 rev:391 rq:886705 version:1.20.11

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2021-03-10 08:46:38.350231511 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.12324/xorg-x11-server.changes   
2021-04-22 18:03:35.530472044 +0200
@@ -1,0 +2,21 @@
+Mon Apr 19 11:29:31 UTC 2021 - Stefan Dirsch 
+
+- disable build of Xwayland, which is now being built in separate
+  xwayland package with more recent sources (boo#1182677)
+
+---
+Tue Apr 13 15:32:45 UTC 2021 - Stefan Dirsch 
+
+- Update to version 1.20.11
+  * bugfix release
+- supersedes U_Fix-XChangeFeedbackControl-request-underflow.patch,
+  U_xkb-Fix-heap-overflow-caused-by-optimized-away-min.patch
+
+---
+Mon Apr 12 10:46:33 UTC 2021 - Stefan Dirsch 
+
+- U_Fix-XChangeFeedbackControl-request-underflow.patch
+  * Fix XChangeFeedbackControl() request underflow (CVE-2021-3472,
+ZDI-CAN-1259, bsc#1180128)
+
+---

Old:

  U_xkb-Fix-heap-overflow-caused-by-optimized-away-min.patch
  xserver-1.20.10.tar.xz

New:

  xorg-server-1.20.11.tar.bz2



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.gwrHXC/_old  2021-04-22 18:03:36.650473776 +0200
+++ /var/tmp/diff_new_pack.gwrHXC/_new  2021-04-22 18:03:36.650473776 +0200
@@ -22,9 +22,8 @@
 %endif
 
 %define pci_ids_dir %{_datadir}/X11/xorg_pci_ids
-%if 0%{?suse_version} >= 1330 || 0%{?build_xwayland}
-%define have_wayland 1
-%endif
+# now built separately in xwayland pkg with more recent sources (boo#1182677)
+%define have_wayland 0
 
 %define build_suid_wrapper 1
 
@@ -41,7 +40,7 @@
 %endif
 
 Name:   xorg-x11-server
-Version:1.20.10
+Version:1.20.11
 Release:0
 URL:http://xorg.freedesktop.org/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -50,7 +49,7 @@
 # Source URL: http://xorg.freedesktop.org/archive/individual/xserver/
 License:MIT
 Group:  System/X11/Servers/XF86_4
-Source0:xserver-%{version}.tar.xz
+Source0:xorg-server-%{version}.tar.bz2
 Source1:sysconfig.displaymanager.template
 Source2:README.updates
 Source3:xorgcfg.tar.bz2
@@ -242,8 +241,6 @@
 
 Patch1401:  u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch
 
-Patch1501:  U_xkb-Fix-heap-overflow-caused-by-optimized-away-min.patch
-
 Patch1502:  U_dix-window-Use-ConfigureWindow-instead-of-MoveWindow.patch
 
 Patch1503:  u_xfree86-Do-not-claim-pci-slots-if-fb-slot-is-already.patch
@@ -361,7 +358,7 @@
 This package contains patched sources of X.Org Server.
 
 %prep
-%setup -q -n xserver-%{version} -a3
+%setup -q -n xorg-server-%{version} -a3
 # Early verification if the ABI Defines are correct. Let's not waste build 
cycles if the Provides are wrong at the end.
 sh %{SOURCE92} --verify . %{SOURCE91}
 
@@ -400,10 +397,11 @@
 ### patch222 might not be applicable anymore
 #%patch1222 -p1
 %patch1401 -p1
-%patch1501 -p1
 %patch1502 -p1
 %patch1503 -p1
+%if 0%{?have_wayland} == 1
 %patch1505 -p1
+%endif
 %patch1600 -p1
 %patch1801 -p1
 %patch1900 -p1

commit xorg-x11-server for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2021-03-10 08:46:32

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.2378 (New)


Package is "xorg-x11-server"

Wed Mar 10 08:46:32 2021 rev:390 rq:876511 version:1.20.10

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2020-12-09 22:11:41.903083890 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.2378/xorg-x11-server.changes
2021-03-10 08:46:38.350231511 +0100
@@ -1,0 +2,8 @@
+Wed Mar  3 09:24:59 UTC 2021 - Stefan Dirsch 
+
+- reenabled LTO (boo#1133294)
+  * u_no-lto-for-tests.patch 
+disables LTO in test/ subtree, since "-Wl,-wrap" is not supported by LTO
+  * added "%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects"
+
+---

New:

  u_no-lto-for-tests.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.mqhtQV/_old  2021-03-10 08:46:39.986233199 +0100
+++ /var/tmp/diff_new_pack.mqhtQV/_new  2021-03-10 08:46:39.994233207 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-x11-server
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -254,6 +254,8 @@
 
 Patch1801:  U_Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
 
+Patch1900:  u_no-lto-for-tests.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -404,9 +406,10 @@
 %patch1505 -p1
 %patch1600 -p1
 %patch1801 -p1
+%patch1900 -p1
 
 %build
-%define _lto_cflags %{nil}
+%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
 test -e source-file-list || \
 find -L . -type f \! -name '*.orig' \! -path ./source-file-list > \
 source-file-list
@@ -470,7 +473,7 @@
 /usr/share/fonts/cyrillic:unscaled,\
 /usr/share/fonts/misc/sgi:unscaled,\
 /usr/share/fonts/truetype/,built-ins"
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 make -C hw/kdrive %{?_smp_mflags}
 
 %install

++ u_no-lto-for-tests.patch ++
--- xserver-1.20.10/test/Makefile.am.orig   2021-03-02 23:46:49.137916000 
+0100
+++ xserver-1.20.10/test/Makefile.am2021-03-02 23:47:48.691663000 +0100
@@ -105,6 +105,7 @@ tests_LDFLAGS = \
-Wl,-wrap,XISetEventMask \
-Wl,-wrap,AddResource \
-Wl,-wrap,GrabButton \
+   -fno-lto \
$()
 endif XORG
 

commit xorg-x11-server for openSUSE:Factory

[User for buildservice source handling]

Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2020-12-09 22:11:39

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.2328 (New)


Package is "xorg-x11-server"

Wed Dec  9 22:11:39 2020 rev:389 rq:853611 version:1.20.10

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2020-12-03 18:43:05.690186707 +0100
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.2328/xorg-x11-server.changes
2020-12-09 22:11:41.903083890 +0100
@@ -1,0 +2,44 @@
+Mon Dec 07 13:48:26 UTC 2020 - tobias.klausm...@freenet.de
+
+- Update to version 1.20.10:
+  * Check SetMap request length carefully.
+  * Fix XkbSetDeviceInfo() and SetDeviceIndicators() heap overflows
+  * present/wnmd: Translate update region to screen space
+  * modesetting: keep going if a modeset fails on EnterVT
+  * modesetting: check the kms state on EnterVT
+  * configure: Build hashtable for Xres and glvnd
+  * xwayland: Create an xwl_window for toplevel only
+  * xwayland: non-rootless requires the wl_shell protocol
+  * glamor: Update pixmap's devKind when making it exportable
+  * os: Fix instruction pointer written in xorg_backtrace
+  * present/wnmd: Execute copies at target_msc-1 already
+  * present/wnmd: Move up present_wnmd_queue_vblank
+  * present: Add present_vblank::exec_msc field
+  * present: Move flip target_msc adjustment out of present_vblank_create
+  * xwayland: Remove pending stream reference when freeing
+  * xwayland: use drmGetNodeTypeFromFd for checking if a node is a render one
+  * xwayland: Do not discard frame callbacks on allow commits
+  * present/wnmd: Remove dead check from present_wnmd_check_flip
+  * xwayland: Check window pixmap in xwl_present_check_flip2
+  * present/wnmd: Can't use page flipping for windows clipped by children
+  * xfree86: Take second reference for SavedCursor in xf86CursorSetCursor
+  * glamor: Fix glamor_poly_fill_rect_gl xRectangle::width/height handling
+  * include: Increase the number of max. input devices to 256.
+  * Revert "linux: Make platform device probe less fragile"
+  * Revert "linux: Fix platform device PCI detection for complex bus 
topologies"
+  * Revert "linux: Fix platform device probe for DT-based PCI"
+- Remove included pachtes
+  * U_xfree86_take_second_ref_for_xcursor.patch
+  * U_Revert-linux-Fix-platform-device-probe-for-DT-based-.patch
+  * U_Revert-linux-Fix-platform-device-PCI-detection-for-c.patch
+  * U_Revert-linux-Make-platform-device-probe-less-fragile.patch
+  * U_Fix-XkbSetDeviceInfo-and-SetDeviceIndicators-heap-ov.patch
+  * U_Check-SetMap-request-length-carefully.patch
+
+---
+Mon Dec  7 11:36:04 UTC 2020 - Stefan Dirsch 
+
+- remove unneeded python2 script 'fdi2iclass.py' from 
+  xorg-x11-server-sources subpackage (boo#1179591)
+
+---

Old:

  U_Check-SetMap-request-length-carefully.patch
  U_Fix-XkbSetDeviceInfo-and-SetDeviceIndicators-heap-ov.patch
  U_Revert-linux-Fix-platform-device-PCI-detection-for-c.patch
  U_Revert-linux-Fix-platform-device-probe-for-DT-based-.patch
  U_Revert-linux-Make-platform-device-probe-less-fragile.patch
  U_xfree86_take_second_ref_for_xcursor.patch
  xserver-1.20.9.tar.xz

New:

  xserver-1.20.10.tar.xz



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.vxSRf4/_old  2020-12-09 22:11:43.539085549 +0100
+++ /var/tmp/diff_new_pack.vxSRf4/_new  2020-12-09 22:11:43.539085549 +0100
@@ -41,7 +41,7 @@
 %endif
 
 Name:   xorg-x11-server
-Version:1.20.9
+Version:1.20.10
 Release:0
 URL:http://xorg.freedesktop.org/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -251,15 +251,8 @@
 Patch1505:  U_xwayland-Allow-passing-a-fd.patch
 
 Patch1600:  U_glamor_egl-Reject-OpenGL-2.1-early-on.patch
-Patch1700:  U_xfree86_take_second_ref_for_xcursor.patch
 
 Patch1801:  U_Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
-Patch1802:  U_Revert-linux-Fix-platform-device-probe-for-DT-based-.patch
-Patch1803:  U_Revert-linux-Fix-platform-device-PCI-detection-for-c.patch
-Patch1804:  U_Revert-linux-Make-platform-device-probe-less-fragile.patch
-
-Patch1901:  U_Fix-XkbSetDeviceInfo-and-SetDeviceIndicators-heap-ov.patch
-Patch1902:  U_Check-SetMap-request-length-carefully.patch
 
 %description
 This package contains the X.Org Server.
@@ -410,13 +403,7 @@
 %patch1503 -p1
 %patch1505 -p1
 %patch1600 -p1
-%patch1700 -p1
 %patch1801 -p1
-%patch1802 -p1
-%patch1803 -p1
-%patch1804 -p1
-%patch1901

commit xorg-x11-server for openSUSE:Factory

[User for buildservice source handling]

Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory 
checked in at 2020-12-03 18:41:42

Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-server.new.5913 (New)


Package is "xorg-x11-server"

Thu Dec  3 18:41:42 2020 rev:388 rq:852408 version:1.20.9

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes  
2020-10-07 14:16:38.337397530 +0200
+++ 
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.5913/xorg-x11-server.changes
2020-12-03 18:43:05.690186707 +0100
@@ -1,0 +2,14 @@
+Tue Dec  1 16:39:02 UTC 2020 - Stefan Dirsch 
+
+- U_Check-SetMap-request-length-carefully.patch
+  * XkbSetMap Out-Of-Bounds Access: Insufficient checks on the
+lengths of the XkbSetMap request can lead to out of bounds
+memory accesses in the X server. (ZDI-CAN 11572, 
+CVE-2020-14360, bsc#1174908)
+- U_Fix-XkbSetDeviceInfo-and-SetDeviceIndicators-heap-ov.patch
+  * XkbSetDeviceInfo Heap-based Buffer Overflow: Insufficient
+checks on input of the XkbSetDeviceInfo request can lead to a
+buffer overflow on the head in the X server. (ZDI-CAN 11389,
+CVE-2020-25712, bsc#1177596)
+
+---

New:

  U_Check-SetMap-request-length-carefully.patch
  U_Fix-XkbSetDeviceInfo-and-SetDeviceIndicators-heap-ov.patch



Other differences:
--
++ xorg-x11-server.spec ++
--- /var/tmp/diff_new_pack.bUxg1M/_old  2020-12-03 18:43:07.130188609 +0100
+++ /var/tmp/diff_new_pack.bUxg1M/_new  2020-12-03 18:43:07.134188614 +0100
@@ -258,6 +258,9 @@
 Patch1803:  U_Revert-linux-Fix-platform-device-PCI-detection-for-c.patch
 Patch1804:  U_Revert-linux-Make-platform-device-probe-less-fragile.patch
 
+Patch1901:  U_Fix-XkbSetDeviceInfo-and-SetDeviceIndicators-heap-ov.patch
+Patch1902:  U_Check-SetMap-request-length-carefully.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -412,6 +415,8 @@
 %patch1802 -p1
 %patch1803 -p1
 %patch1804 -p1
+%patch1901 -p1
+%patch1902 -p1
 
 %build
 %define _lto_cflags %{nil}

++ U_Check-SetMap-request-length-carefully.patch ++
From 446ff2d3177087b8173fa779fa5b77a2a128988b Mon Sep 17 00:00:00 2001
From: Matthieu Herrb 
Date: Thu, 12 Nov 2020 19:15:07 +0100
Subject: [PATCH] Check SetMap request length carefully.

Avoid out of bounds memory accesses on too short request.

ZDI-CAN 11572 /  CVE-2020-14360

This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative

Signed-off-by: Matthieu Herrb 
---
 xkb/xkb.c | 92 +++
 1 file changed, 92 insertions(+)

Index: xserver-1.20.9/xkb/xkb.c
===
--- xserver-1.20.9.orig/xkb/xkb.c
+++ xserver-1.20.9/xkb/xkb.c
@@ -2382,6 +2382,93 @@ SetVirtualModMap(XkbSrvInfoPtr xkbi,
 return (char *) wire;
 }
 
+#define _add_check_len(new) \
+if (len > UINT32_MAX - (new) || len > req_len - (new)) goto bad; \
+else len += new
+
+/**
+ * Check the length of the SetMap request
+ */
+static int
+_XkbSetMapCheckLength(xkbSetMapReq *req)
+{
+size_t len = sz_xkbSetMapReq, req_len = req->length << 2;
+xkbKeyTypeWireDesc *keytype;
+xkbSymMapWireDesc *symmap;
+BOOL preserve;
+int i, map_count, nSyms;
+
+if (req_len < len)
+goto bad;
+/* types */
+if (req->present & XkbKeyTypesMask) {
+keytype = (xkbKeyTypeWireDesc *)(req + 1);
+for (i = 0; i < req->nTypes; i++) {
+_add_check_len(XkbPaddedSize(sz_xkbKeyTypeWireDesc));
+if (req->flags & XkbSetMapResizeTypes) {
+_add_check_len(keytype->nMapEntries
+   * sz_xkbKTSetMapEntryWireDesc);
+preserve = keytype->preserve;
+map_count = keytype->nMapEntries;
+if (preserve) {
+_add_check_len(map_count * sz_xkbModsWireDesc);
+}
+keytype += 1;
+keytype = (xkbKeyTypeWireDesc *)
+  ((xkbKTSetMapEntryWireDesc *)keytype + map_count);
+if (preserve)
+keytype = (xkbKeyTypeWireDesc *)
+  ((xkbModsWireDesc *)keytype + map_count);
+}
+}
+}
+/* syms */
+if (req->present & XkbKeySymsMask) {
+symmap = (xkbSymMapWireDesc *)((char *)req + len);
+for (i = 0; i < req->nKeySyms; i++) {
+_add_check_len(sz_xkbSymMapWireDesc);
+nSyms = symmap->nSyms;
+_add_check_len(nSyms*sizeof(CARD32));
+symmap += 1;
+sy