From a6e7eaa26b82d051222ea4ec242e7ac409966e92 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 10 2020 09:50:13 +0000
Subject: import xorg-x11-server-1.20.4-13.el7_9


---

diff --git a/SOURCES/0001-animcur-Nerf-AnumCurTimerNotify-when-pScreen-NULL.patch b/SOURCES/0001-animcur-Nerf-AnumCurTimerNotify-when-pScreen-NULL.patch
new file mode 100644
index 0000000..20b0284
--- /dev/null
+++ b/SOURCES/0001-animcur-Nerf-AnumCurTimerNotify-when-pScreen-NULL.patch
@@ -0,0 +1,28 @@
+From 2e54bfc16230a77a6dd1083f9263b0dfe8189a6c Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 17 Jun 2020 15:16:20 -0400
+Subject: [PATCH xserver] animcur: Nerf AnumCurTimerNotify when pScreen == NULL
+
+This is a terrible band-aid, but maybe it works.
+---
+ render/animcur.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/render/animcur.c b/render/animcur.c
+index ef27bda278..44d40c23cd 100644
+--- a/render/animcur.c
++++ b/render/animcur.c
+@@ -131,6 +131,10 @@ AnimCurTimerNotify(OsTimerPtr timer, CARD32 now, void *arg)
+ {
+     DeviceIntPtr dev = arg;
+     ScreenPtr pScreen = dev->spriteInfo->anim.pScreen;
++
++    if (!pScreen)
++        return 0; /* aieee */
++
+     AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
+ 
+     AnimCurPtr ac = GetAnimCur(dev->spriteInfo->sprite->current);
+-- 
+2.23.0
+
diff --git a/SOURCES/0001-mi-When-en-dis-abling-extensions-match-names-case-in.patch b/SOURCES/0001-mi-When-en-dis-abling-extensions-match-names-case-in.patch
new file mode 100644
index 0000000..1c8f71e
--- /dev/null
+++ b/SOURCES/0001-mi-When-en-dis-abling-extensions-match-names-case-in.patch
@@ -0,0 +1,34 @@
+From 2710e0997b69326ff7103229508e43b511903278 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 29 Oct 2020 15:32:36 -0400
+Subject: [PATCH] mi: When {en,dis}abling extensions, match names
+ case-insensitively
+
+Both because extension names are inconsistently capitalized on the wire,
+and because the table we're walking spells it COMPOSITE not Composite.
+The latter is certainly also a bug, but there's no reason for us to be
+that strict.
+
+[mustard: backport to 1.20.4 - ajax]
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ mi/miinitext.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mi/miinitext.c b/mi/miinitext.c
+index b7c7021..3a7f83f 100644
+--- a/mi/miinitext.c
++++ b/mi/miinitext.c
+@@ -215,7 +215,7 @@ EnableDisableExtensionError(const char *name, Bool enable)
+ 
+     for (i = 0; i < ARRAY_SIZE(staticExtensions); i++) {
+         ext = &staticExtensions[i];
+-        if ((strcmp(name, ext->name) == 0) && (ext->disablePtr == NULL)) {
++        if ((strcasecmp(name, ext->name) == 0) && (ext->disablePtr == NULL)) {
+             ErrorF("[mi] Extension \"%s\" can not be disabled\n", name);
+             found = TRUE;
+             break;
+-- 
+2.23.0
+
diff --git a/SPECS/xorg-x11-server.spec b/SPECS/xorg-x11-server.spec
index 881fa4b..8bf439b 100644
--- a/SPECS/xorg-x11-server.spec
+++ b/SPECS/xorg-x11-server.spec
@@ -42,7 +42,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.20.4
-Release:   12%{?gitdate:.%{gitdate}}%{?dist}
+Release:   13%{?gitdate:.%{gitdate}}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -130,6 +130,12 @@ Patch9900: 0001-xfree86-Only-switch-to-original-VT-if-it-is-active.patch
 # Bug 1763001 - Xorg.#.log show "(EE) modeset(0): [DRI2] No driver mapping found..."
 Patch9910: 0001-dri2-Set-fallback-driver-names-for-Intel-and-AMD-chi.patch
 
+# Bug 1846652 - X server crash when moving animated cursor between screens
+Patch9920: 0001-animcur-Nerf-AnumCurTimerNotify-when-pScreen-NULL.patch
+
+# Bug 1666896 - Case sensitivity when enabling/disabling X extensions breaks disabling Composite extension
+Patch9930: 0001-mi-When-en-dis-abling-extensions-match-names-case-in.patch
+
 # CVE-2020-14345
 Patch10001: 0001-Correct-bounds-checking-in-XkbSetNames.patch
 # CVE-2020-14346
@@ -620,6 +626,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Nov  2 2020 Michel Dänzer <mdaenzer@redhat.com> - 1.20.4-13
+- Re-apply fixes from 1.20.4-11
+
 * Fri Oct 30 2020 Michel Dänzer <mdaenzer@redhat.com> - 1.20.4-12
 - CVE fixes for: CVE-2020-14345 (#1872389), CVE-2020-14346 (#1872393),
   CVE-2020-14361 (#1872400), CVE-2020-14362 (#1872407)