From f08aeec29a2912bcf17dfea173ce36122a614ad9 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Dec 17 2021 14:25:24 +0000
Subject: xserver 1.20.14


CVE-2021-4008/ZDI-CAN-14192 (#2026059, #2032941)
CVE-2021-4009/ZDI-CAN-14950 (#2026072, #2032943)
CVE-2021-4010/ZDI-CAN-14951 (#2026073, #2032944)
CVE-2021-4011/ZDI-CAN-14952 (#2026074, #2032945)

---

diff --git a/.gitignore b/.gitignore
index ae892e8..89c66cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ xorg-server-1.9.1.tar.bz2
 *.bz2
 *.xz
 /xorg-x11-server-1.15.0-1.fc21.src.rpm
+/xorg-server-1.20.14.tar.gz
diff --git a/sources b/sources
index 8b4e4a9..32cd6fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xorg-server-1.20.11.tar.bz2) = 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2
+SHA512 (xorg-server-1.20.14.tar.xz) = be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 0781fe2..f4cac33 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -45,8 +45,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.20.11
-Release:   3%{?gitdate:.%{gitdate}}%{?dist}
+Version:   1.20.14
+Release:   1%{?gitdate:.%{gitdate}}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 
@@ -59,7 +59,7 @@ Source0:   xorg-server-%{gitdate}.tar.xz
 Source1:   make-git-snapshot.sh
 Source2:   commitid
 %else
-Source0:   https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
+Source0:   https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz
 Source1:   gitignore
 %endif
 
@@ -512,6 +512,13 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Fri Dec 17 2021 Olivier <ofourdan@redhat.com> - 1.20.14-1
+- xserver 1.20.14
+  CVE-2021-4008/ZDI-CAN-14192 (#2026059, #2032941)
+  CVE-2021-4009/ZDI-CAN-14950 (#2026072, #2032943)
+  CVE-2021-4010/ZDI-CAN-14951 (#2026073, #2032944)
+  CVE-2021-4011/ZDI-CAN-14952 (#2026074, #2032945)
+
 * Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.20.11-3
 - Rebuilt with OpenSSL 3.0.0