[xsrc/trunk]: xsrc/external/mit/xorg-server/dist initial import of xorg-serve...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/d63c734104d2
branches:  trunk
changeset: 7413:d63c734104d2
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Feb 07 04:30:03 2023 +0000

description:
initial import of xorg-server-21.1.7

diffstat:

 external/mit/xorg-server/dist/ChangeLog                             |  1353 +++++----
 external/mit/xorg-server/dist/Xi/exevents.c                         |     4 +-
 external/mit/xorg-server/dist/dix/resource.c                        |    11 +-
 external/mit/xorg-server/dist/hw/xquartz/Makefile.am                |     2 +-
 external/mit/xorg-server/dist/hw/xquartz/Makefile.in                |     2 +-
 external/mit/xorg-server/dist/hw/xquartz/bundle/Info.plist.cpp      |     4 +-
 external/mit/xorg-server/dist/hw/xquartz/mach-startup/bundle-main.c |    12 +
 external/mit/xorg-server/dist/hw/xquartz/xpr/xprFrame.c             |    26 +-
 external/mit/xorg-server/dist/include/meson.build                   |     5 +-
 external/mit/xorg-server/dist/meson.build                           |    15 +-
 external/mit/xorg-server/dist/miext/rootless/rootlessCommon.c       |    44 +-
 external/mit/xorg-server/dist/os/client.c                           |   110 +-
 12 files changed, 958 insertions(+), 630 deletions(-)

diffs (truncated from 5822 to 300 lines):

diff -r eeaf009b9c88 -r d63c734104d2 external/mit/xorg-server/dist/ChangeLog
--- a/external/mit/xorg-server/dist/ChangeLog   Sun Feb 05 23:26:20 2023 +0000
+++ b/external/mit/xorg-server/dist/ChangeLog   Tue Feb 07 04:30:03 2023 +0000
@@ -1,3 +1,190 @@
+commit af9111ac7fa399a5a33fbfa145060e1850f41e0e
+Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+Date:   Tue Feb 7 10:30:37 2023 +1000
+
+    xserver 21.1.7
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+
+commit 9ca7d3f61a88ae6cf47fdf139b6215d745db976b
+Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+Date:   Wed Jan 25 11:41:40 2023 +1000
+
+    Xi: fix potential use-after-free in DeepCopyPointerClasses
+    
+    CVE-2023-0494, ZDI-CAN-19596
+    
+    This vulnerability was discovered by:
+    Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+    (cherry picked from commit 0ba6d8c37071131a49790243cdac55392ecf71ec)
+
+commit 4b925d388f76764dcb02dfd1cd7276262dcd7d74
+Author: Mike Gorse <mgorse%suse.com@localhost>
+Date:   Wed Jan 25 02:02:48 2023 +0000
+
+    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 <mgorse%suse.com@localhost>
+    (cherry picked from commit 2ef5ef57bd37a8bec2ac454053b283c6f87c3b40)
+
+commit 44d6c82ac82a78d904a6d47387ac363d9699b891
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date:   Wed Jan 18 10:38:41 2023 -0800
+
+    darwin: Implement DetermineClientCmd for macOS
+    
+    Withoug a proper implementation of DetermineClientCmd, clients that
+    connect via an ssh tunnel are miscategorized as local.  This results
+    in failures when we try to use SCM_RIGHTS (eg: in MIT-SHM).
+    
+    Fixes: https://github.com/XQuartz/XQuartz/issues/314
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+    (cherry picked from commit 0ea9b595891f2f31915538192961f3404d9ca699)
+
+commit 1317083fbc407dc9dbb04ba5b98187b75222a16f
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date:   Wed Jan 18 12:19:05 2023 -0800
+
+    os: Use LOCAL_PEERPID from sys/un.h if it is available to detemine the pid when falling back on getpeereids()
+    
+    This provides a way to determine the pid of a peer connection on
+    systems like darwin that do not support getpeerucred() nor
+    SO_PEERCRED.
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+    (cherry picked from commit 8a4ab2287398773a4868c220662d93bf84ec6241)
+
+commit a6c49106cef36e84eb11d64e325465250b7678be
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date:   Wed Jan 18 12:02:54 2023 -0800
+
+    os: Update GetLocalClientCreds to prefer getpeerucred() or SO_PEERCRED over getpeereid()
+    
+    GetLocalClientCreds() was preferring getpeereid() above other implementations.
+    
+    getpeereid(), however, only returns the effective uid and gid of the peer,
+    leaving the pid unset.  When this happens, we are unable to use the pid to
+    determine the peer's command line arguments and incorrectly treat ssh-tunneled
+    traffic as local.
+    
+    To address this, we now prioritize getpeerucred() or SO_PEERCRED as those two
+    implementations will return the pid in addition to uid and gid.
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+    (cherry picked from commit 165d5c1260edcb998c5cf31d3969723c7452aa7f)
+
+commit a220f53cb81248d06fb6f044c102c6ab8bffe2d5
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date:   Wed Jan 18 10:44:27 2023 -0800
+
+    os: Update AllocNewConnection() debug logging to include whether or not the client is local
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+    (cherry picked from commit 2577291f010e07173d0fc8b310ac355928f8ed7d)
+
+commit 07f9689507eee11bdbc2828ac1319fbde91ad27c
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date:   Sun Nov 27 22:25:49 2022 -0800
+
+    Revert "meson: Don't build COMPOSITE for XQuartz"
+    
+    This will allow us to remove build-time conditionalization on COMPOSITE
+    while still allowing XQuartz to disable it and use ROOTLESS.
+    
+    This reverts commit 5f2d652377995c0c0c3cf07463b5018450661d13
+    
+    (cherry picked from commit 66e7b7349dffda6fef51ed029fdc91b787ca4c08)
+
+commit 8ea43dd8bf8f8f2cb82a2a1f2c004ee873e7810d
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date:   Sun Nov 27 22:23:43 2022 -0800
+
+    xquartz: Disable COMPOSITE at runtime
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+    (cherry picked from commit 2567388a2957cef526df1b7efb2684aa74feb641)
+
+commit aa0d8d440c39beb276cd26723d822728ce394e01
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date:   Tue Jan 17 07:33:19 2023 -0800
+
+    xquartz: Update the about box copyright to 2023
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+    (cherry picked from commit 15077090d371a2679d274c5d129a3102762d18ec)
+
+commit 8feba178f8b73b983033c197c384c580a6397a41
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date:   Sat Jan 14 23:33:59 2023 -0800
+
+    xquartz: Fix building with autoconf
+    
+    Regressed-in: 5d302c378d9d21b34db2434425b766ac4f05de89
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+
+commit c8ef9e38187e00dbaf956893f987e15e8f42f61c
+Author: Olivier Fourdan <ofourdan%redhat.com@localhost>
+Date:   Tue Jul 12 14:44:48 2022 +0200
+
+    dix: Fix overzealous caching of ResourceClientBits()
+    
+    Commit c7311654 cached the value of ResourceClientBits(), but that value
+    depends on the `MaxClients` value set either from the command line or
+    from the configuration file.
+    
+    For the latter, a call to ResourceClientBits() is issued before the
+    configuration file is read, meaning that the cached value is from the
+    default, not from the maximum number of clients set in the configuration
+    file.
+    
+    That obviously causes all sort of issues, including memory corruption
+    and crashes of the Xserver when reaching the default limit value.
+    
+    To avoid that issue, also keep the LimitClient value, and recompute the
+    ilog2() value if that changes, as on startup when the value is set from
+    the the xorg.conf ServerFlags section.
+    
+    v2: Drop the `cache == 0` test
+        Rename cache vars
+    
+    Fixes: c7311654 - dix: cache ResourceClientBits() value
+    Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1310
+    Signed-off-by: Olivier Fourdan <ofourdan%redhat.com@localhost>
+    Reviewed-by: Adam Jackson <ajax%redhat.com@localhost>
+    (cherry picked from commit 2efa6d659508346358a1ef27b2393e18843f66a3)
+
+commit a0216de2367429788be4ef430026ada215106ff5
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date:   Wed Dec 14 23:45:13 2022 -0800
+
+    rootless: Add additional debug logging to help triage XQuartz fb/rootless/damage crashes
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+    (cherry picked from commit 07ed1a623a4b36cdb741a322008ba53d913dc765)
+
+commit 264272f3d76e4f1e50d984640c57de77aca9ba37
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date:   Wed Dec 14 17:07:46 2022 -0800
+
+    xquartz: Use xorg_backtrace() instead of rolling our own for debugging
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+    (cherry picked from commit d1a9a50792110683ae3f993eeeffeee79cf9cbce)
+
+commit 20f380c6d93be3ef561251584163d1fe1ae2d966
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date:   Wed Dec 21 01:18:11 2022 -0800
+
+    xquartz: Ignore SIGPIPE at process launch
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+    (cherry picked from commit 9a66690eaf67c19b90e07f39b16436d34b59e27a)
+
 commit 59b6fc88ed9f4b22397a568c2483e4c558856ffa
 Author: Olivier Fourdan <ofourdan%redhat.com@localhost>
 Date:   Mon Dec 19 10:46:20 2022 +0100
@@ -12813,7 +13000,7 @@
     Also add similar to meson.build
 
 commit 29a8baa031a87ef44d1e5320ecec5015d26fd385
-Merge: 2aec5c3c8 56c0a71fd
+Merge: 2aec5c3c81 56c0a71fdd
 Author: Aaron Plattner <aplattner%nvidia.com@localhost>
 Date:   Fri May 17 08:39:50 2019 -0700
 
@@ -30864,7 +31051,7 @@
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit 356db2340f5b473a7191c7969586ca5b0396c48f
-Merge: 9ed5b2635 03d99ef72
+Merge: 9ed5b26354 03d99ef729
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Fri Oct 28 09:05:54 2016 -0700
 
@@ -32805,7 +32992,7 @@
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit 265c4e66533243b60d92cffc7769ecadb0292c8d
-Merge: 3caf671ed f5f4d32ac
+Merge: 3caf671ed2 f5f4d32ac7
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Thu Sep 15 21:32:46 2016 -0700
 
@@ -33990,7 +34177,7 @@
     Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer%amd.com@localhost>
 
 commit 387d6b5df3e11de5cb88db8a559128fcb62e4e5a
-Merge: d2558f063 8bb9d460f
+Merge: d2558f063a 8bb9d460fb
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Sat Aug 13 09:12:19 2016 -0700
 
@@ -36189,7 +36376,7 @@
     Signed-off-by: Guilherme Quentel Melo <gqmelo%gmail.com@localhost>
 
 commit 266cf39a8f108e2f365a9772f4ee4d9fca88eb36
-Merge: fa7b70a9b 848089e0d
+Merge: fa7b70a9b8 848089e0dd
 Author: Adam Jackson <ajax%redhat.com@localhost>
 Date:   Mon Jun 20 11:21:40 2016 -0400
 
@@ -36832,7 +37019,7 @@
     Reviewed-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
 
 commit 3735ab965a4642273d070840bda4e827991e5219
-Merge: 7c77c42fe 43dbc556f
+Merge: 7c77c42fe8 43dbc556f3
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Thu Jun 2 07:47:16 2016 -0700
 
@@ -42597,7 +42784,7 @@
     Reviewed-by: Adam Jackson <ajax%redhat.com@localhost>
 
 commit 5b582a4a0350c253d729efb31b710851ae9a958e
-Merge: 1d4aa6724 27ad21254
+Merge: 1d4aa67242 27ad21254f
 Author: Adam Jackson <ajax%redhat.com@localhost>
 Date:   Mon Oct 19 12:23:22 2015 -0400
 
@@ -43208,7 +43395,7 @@
     Reviewed-by: Michel Dänzer <michel.daenzer%amd.com@localhost>
 
 commit dca5770af9e20bb1148374ebfd60931a81b148a2
-Merge: a31bbc450 21f384b7b
+Merge: a31bbc450a 21f384b7b8
 Author: Adam Jackson <ajax%redhat.com@localhost>
 Date:   Fri Sep 25 10:23:28 2015 -0400
 
@@ -43842,7 +44029,7 @@
     Signed-off-by: Adam Jackson <ajax%redhat.com@localhost>
 
 commit b25f7d0c165c4d32c73fbdf9080012503d319ba1
-Merge: db1089eaf 1ba4fde10
+Merge: db1089eafc 1ba4fde101
 Author: Adam Jackson <ajax%redhat.com@localhost>
 Date:   Mon Sep 21 17:34:48 2015 -0400
 
@@ -44465,7 +44652,7 @@
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit 7ecdfbf0af3547295b245efa754123db65cabb43
-Merge: bca4f4b56 a0b4f30b1
+Merge: bca4f4b56c a0b4f30b1f
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Mon Aug 17 18:53:25 2015 -0700
 
@@ -44712,7 +44899,7 @@
     Signed-off-by: Eric Anholt <eric%anholt.net@localhost>
 
 commit 2fcfa532532fbe4a7f668556808e6245ff4e36bc
-Merge: cb695b0f3 7b0f94062
+Merge: cb695b0f3b 7b0f940625
 Author: Eric Anholt <eric%anholt.net@localhost>
 Date:   Fri Jul 17 10:15:01 2015 -0700
 
@@ -45319,7 +45506,7 @@
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit 991712f1e8deeb6289ee0abd9910e279d6396246
-Merge: 0cd228073 3c859112d
+Merge: 0cd228073a 3c859112d3
 Author: Keith Packard <keithp%keithp.com@localhost>