Tue Feb 7 13:53:07 2023 UTC ()
modular-xorg-server: update to 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.

Finally, a bunch of Xquartz updates including the ability to correctly detect
ssh-tunneled clients as remote.

Jeremy Huddleston Sequoia (11):
      xquartz: Ignore SIGPIPE at process launch
      xquartz: Use xorg_backtrace() instead of rolling our own for debugging
      rootless: Add additional debug logging to help triage XQuartz fb/rootless/damage crashes
      xquartz: Fix building with autoconf
      xquartz: Update the about box copyright to 2023
      xquartz: Disable COMPOSITE at runtime
      Revert "meson: Don't build COMPOSITE for XQuartz"
      os: Update AllocNewConnection() debug logging to include whether or not the client is local
      os: Update GetLocalClientCreds to prefer getpeerucred() or SO_PEERCRED over getpeereid()
      os: Use LOCAL_PEERPID from sys/un.h if it is available to detemine the pid when falling back on getpeereids()
      darwin: Implement DetermineClientCmd for macOS

Mike Gorse (1):
      dix: Use CopyPartialInternalEvent in EnqueueEvent

Olivier Fourdan (1):
      dix: Fix overzealous caching of ResourceClientBits()

Peter Hutterer (2):
      Xi: fix potential use-after-free in DeepCopyPointerClasses
      xserver 21.1.7


(wiz)
diff -r1.136 -r1.137 pkgsrc/x11/modular-xorg-server/Makefile
diff -r1.53 -r1.54 pkgsrc/x11/modular-xorg-server/Makefile.common
diff -r1.120 -r1.121 pkgsrc/x11/modular-xorg-server/distinfo
diff -r1.24 -r1.25 pkgsrc/x11/modular-xorg-xephyr/Makefile
cvs diff -r1.136 -r1.137 pkgsrc/x11/modular-xorg-server/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile 2023/01/29 21:15:12 1.136
+++ pkgsrc/x11/modular-xorg-server/Makefile 2023/02/07 13:53:07 1.137
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.136 2023/01/29 21:15:12 ryoon Exp $ 1# $NetBSD: Makefile,v 1.137 2023/02/07 13:53:07 wiz Exp $
2 2
3DISTNAME= xorg-server-${XORG_VERSION} 3DISTNAME= xorg-server-${XORG_VERSION}
4PKGNAME= modular-${DISTNAME} 4PKGNAME= modular-${DISTNAME}
5PKGREVISION= 1 
6 5
7MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Modular X11 server from modular X.org 7COMMENT= Modular X11 server from modular X.org
9 8
10SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} 9SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
11 10
12NOT_FOR_PLATFORM= Darwin-*-* 11NOT_FOR_PLATFORM= Darwin-*-*
13 12
14.include "Makefile.common" 13.include "Makefile.common"
15 14
16CONFIGURE_ARGS+= --enable-xorg 15CONFIGURE_ARGS+= --enable-xorg
17CONFIGURE_ARGS+= --disable-xephyr 16CONFIGURE_ARGS+= --disable-xephyr
18CONFIGURE_ARGS+= --disable-xwayland 17CONFIGURE_ARGS+= --disable-xwayland
cvs diff -r1.53 -r1.54 pkgsrc/x11/modular-xorg-server/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile.common 2022/12/25 09:17:27 1.53
+++ pkgsrc/x11/modular-xorg-server/Makefile.common 2023/02/07 13:53:07 1.54
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.53 2022/12/25 09:17:27 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.54 2023/02/07 13:53:07 wiz Exp $
2# used by x11/modular-xorg-server/Makefile 2# used by x11/modular-xorg-server/Makefile
3# used by x11/modular-xorg-xephyr/Makefile 3# used by x11/modular-xorg-xephyr/Makefile
4# used by x11/modular-xorg-xwayland/Makefile 4# used by x11/modular-xorg-xwayland/Makefile
5 5
6XORG_VERSION= 21.1.6 6XORG_VERSION= 21.1.7
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11HOMEPAGE= https://xorg.freedesktop.org/ 11HOMEPAGE= https://xorg.freedesktop.org/
12LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause 12LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17USE_LANGUAGES+= c99 17USE_LANGUAGES+= c99
18 18
19CHECK_PORTABILITY_SKIP+= hw/xquartz/bundle/* 19CHECK_PORTABILITY_SKIP+= hw/xquartz/bundle/*
cvs diff -r1.120 -r1.121 pkgsrc/x11/modular-xorg-server/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/distinfo 2022/12/20 18:56:06 1.120
+++ pkgsrc/x11/modular-xorg-server/distinfo 2023/02/07 13:53:07 1.121
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.120 2022/12/20 18:56:06 wiz Exp $ 1$NetBSD: distinfo,v 1.121 2023/02/07 13:53:07 wiz Exp $
2 2
3BLAKE2s (xorg-server-21.1.6.tar.xz) = 343e8912a12751c6d3042cf8c25d75e41059db9abfd470d4563fad72a502ef77 3BLAKE2s (xorg-server-21.1.7.tar.xz) = 3e4178506a5eec4c2062024ad11a86f51e628e2ea5327050f66352ce4b6c6513
4SHA512 (xorg-server-21.1.6.tar.xz) = 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 4SHA512 (xorg-server-21.1.7.tar.xz) = e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5
5Size (xorg-server-21.1.6.tar.xz) = 4977496 bytes 5Size (xorg-server-21.1.7.tar.xz) = 4933292 bytes
6SHA1 (patch-configure) = 8096805cb1ac6eb25e03fdbd1d3362b720f7354e 6SHA1 (patch-configure) = 8096805cb1ac6eb25e03fdbd1d3362b720f7354e
7SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3 7SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
8SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9 8SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
9SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92 9SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
10SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a 10SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
11SHA1 (patch-hw_xfree86_os-support_bsd_alpha__video.c) = deb410b82c461ce36c15651795bf62370a56d5a4 11SHA1 (patch-hw_xfree86_os-support_bsd_alpha__video.c) = deb410b82c461ce36c15651795bf62370a56d5a4
12SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 521cf3bf2bb0529b4546d5343f67388bc59bd68b 12SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 521cf3bf2bb0529b4546d5343f67388bc59bd68b
13SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99 13SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
14SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230 14SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230
15SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b 15SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
16SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 50e6ffa8f58ffeed0f734d3bbabf1939649c3208 16SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 50e6ffa8f58ffeed0f734d3bbabf1939649c3208
17SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400 17SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
18SHA1 (patch-hw_xfree86_os-support_solaris_sun__init.c) = 6148072cfaf1cb8d0a2f465b51429563c8ea2c15 18SHA1 (patch-hw_xfree86_os-support_solaris_sun__init.c) = 6148072cfaf1cb8d0a2f465b51429563c8ea2c15
cvs diff -r1.24 -r1.25 pkgsrc/x11/modular-xorg-xephyr/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-xephyr/Makefile 2023/01/29 21:18:17 1.24
+++ pkgsrc/x11/modular-xorg-xephyr/Makefile 2023/02/07 13:53:07 1.25
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.24 2023/01/29 21:18:17 ryoon Exp $ 1# $NetBSD: Makefile,v 1.25 2023/02/07 13:53:07 wiz Exp $
2 2
3DISTNAME= xorg-server-${XORG_VERSION} 3DISTNAME= xorg-server-${XORG_VERSION}
4PKGNAME= modular-xorg-xephyr-${XORG_VERSION} 4PKGNAME= modular-xorg-xephyr-${XORG_VERSION}
5PKGREVISION= 1 
6 5
7DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo 6DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo
8PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches 7PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches
9 8
10MAINTAINER= khorben@defora.org 9MAINTAINER= khorben@defora.org
11COMMENT= Xephyr server based on kdrive from modular X.org 10COMMENT= Xephyr server based on kdrive from modular X.org
12 11
13BROKEN_ON_PLATFORM+= Darwin-*-* 12BROKEN_ON_PLATFORM+= Darwin-*-*
14 13
15.include "../../x11/modular-xorg-server/Makefile.common" 14.include "../../x11/modular-xorg-server/Makefile.common"
16 15
17CONFIGURE_ARGS+= --disable-xorg 16CONFIGURE_ARGS+= --disable-xorg
18CONFIGURE_ARGS+= --disable-xnest 17CONFIGURE_ARGS+= --disable-xnest