From 8fc19c94fdb2996135426c90894c3cf0d6763994 Mon Sep 17 00:00:00 2001
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Wed, 13 Dec 2023 10:37:45 +0100
Subject: [PATCH] x11-servers/xorg-server: Update to 21.1.10

Security:       CVE-2023-6377, CVE-2023-6478
Sponsored by:   Beckhoff Automation GmbH & Co. KG
---
 x11-servers/xorg-server/Makefile              |  4 +-
 x11-servers/xorg-server/distinfo              |  6 +-
 ...xephyr_Dont_check_for_SeatId_anymore.patch | 63 -------------------
 3 files changed, 4 insertions(+), 69 deletions(-)
 delete mode 100644 x11-servers/xorg-server/files/0002-xephyr_Dont_check_for_SeatId_anymore.patch

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index ccb282de8c63c..2fbe0289c8ca9 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xorg
-PORTVERSION=	21.1.9
+PORTVERSION=	21.1.10
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
@@ -14,8 +14,6 @@ LICENSE=	MIT
 FLAVORS=	xorg xnest xephyr xvfb
 FLAVOR?=	${FLAVORS:[1]}
 
-EXTRA_PATCHES=	${FILESDIR}/0002-xephyr_Dont_check_for_SeatId_anymore.patch:-p1
-
 USES=		compiler:c11 cpe gl meson pkgconfig tar:xz xorg
 USE_GL=		gl
 
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index e45ad0c84119f..85c455d1a0098 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698308109
-SHA256 (xorg-server-21.1.9.tar.xz) = ff697be2011b4c4966b7806929e51b7a08e9d33800d505305d26d9ccde4b533a
-SIZE (xorg-server-21.1.9.tar.xz) = 4935860
+TIMESTAMP = 1702448243
+SHA256 (xorg-server-21.1.10.tar.xz) = ceb0b3a2efc57ac3ccf388d3dc88b97615068639fb284d469689ae3d105611d0
+SIZE (xorg-server-21.1.10.tar.xz) = 4935984
diff --git a/x11-servers/xorg-server/files/0002-xephyr_Dont_check_for_SeatId_anymore.patch b/x11-servers/xorg-server/files/0002-xephyr_Dont_check_for_SeatId_anymore.patch
deleted file mode 100644
index f0158bfe1ad33..0000000000000
--- a/x11-servers/xorg-server/files/0002-xephyr_Dont_check_for_SeatId_anymore.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001
-From: nerdopolis <bluescreen_avenger@verizon.net>
-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();
--- 
-GitLab
-