CVS commit: pkgsrc/x11

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb  7 13:53:07 UTC 2023

Modified Files:
        pkgsrc/x11/modular-xorg-server: Makefile Makefile.common distinfo
        pkgsrc/x11/modular-xorg-xephyr: Makefile

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/x11/modular-xorg-server/Makefile.common
cvs rdiff -u -r1.120 -r1.121 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/modular-xorg-xephyr/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/modular-xorg-server/Makefile
diff -u pkgsrc/x11/modular-xorg-server/Makefile:1.136 pkgsrc/x11/modular-xorg-server/Makefile:1.137
--- pkgsrc/x11/modular-xorg-server/Makefile:1.136       Sun Jan 29 21:15:12 2023
+++ pkgsrc/x11/modular-xorg-server/Makefile     Tue Feb  7 13:53:07 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.136 2023/01/29 21:15:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.137 2023/02/07 13:53:07 wiz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-${DISTNAME}
-PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Modular X11 server from modular X.org

Index: pkgsrc/x11/modular-xorg-server/Makefile.common
diff -u pkgsrc/x11/modular-xorg-server/Makefile.common:1.53 pkgsrc/x11/modular-xorg-server/Makefile.common:1.54
--- pkgsrc/x11/modular-xorg-server/Makefile.common:1.53 Sun Dec 25 09:17:27 2022
+++ pkgsrc/x11/modular-xorg-server/Makefile.common      Tue Feb  7 13:53:07 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.53 2022/12/25 09:17:27 wiz Exp $
+# $NetBSD: Makefile.common,v 1.54 2023/02/07 13:53:07 wiz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 # used by x11/modular-xorg-xwayland/Makefile
 
-XORG_VERSION=  21.1.6
+XORG_VERSION=  21.1.7
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/x11/modular-xorg-server/distinfo
diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.120 pkgsrc/x11/modular-xorg-server/distinfo:1.121
--- pkgsrc/x11/modular-xorg-server/distinfo:1.120       Tue Dec 20 18:56:06 2022
+++ pkgsrc/x11/modular-xorg-server/distinfo     Tue Feb  7 13:53:07 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.120 2022/12/20 18:56:06 wiz Exp $
+$NetBSD: distinfo,v 1.121 2023/02/07 13:53:07 wiz Exp $
 
-BLAKE2s (xorg-server-21.1.6.tar.xz) = 343e8912a12751c6d3042cf8c25d75e41059db9abfd470d4563fad72a502ef77
-SHA512 (xorg-server-21.1.6.tar.xz) = 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239
-Size (xorg-server-21.1.6.tar.xz) = 4977496 bytes
+BLAKE2s (xorg-server-21.1.7.tar.xz) = 3e4178506a5eec4c2062024ad11a86f51e628e2ea5327050f66352ce4b6c6513
+SHA512 (xorg-server-21.1.7.tar.xz) = e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5
+Size (xorg-server-21.1.7.tar.xz) = 4933292 bytes
 SHA1 (patch-configure) = 8096805cb1ac6eb25e03fdbd1d3362b720f7354e
 SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9

Index: pkgsrc/x11/modular-xorg-xephyr/Makefile
diff -u pkgsrc/x11/modular-xorg-xephyr/Makefile:1.24 pkgsrc/x11/modular-xorg-xephyr/Makefile:1.25
--- pkgsrc/x11/modular-xorg-xephyr/Makefile:1.24        Sun Jan 29 21:18:17 2023
+++ pkgsrc/x11/modular-xorg-xephyr/Makefile     Tue Feb  7 13:53:07 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2023/01/29 21:18:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2023/02/07 13:53:07 wiz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-xorg-xephyr-${XORG_VERSION}
-PKGREVISION=   1
 
 DISTINFO_FILE=         ${.CURDIR}/../../x11/modular-xorg-server/distinfo
 PATCHDIR=              ${.CURDIR}/../../x11/modular-xorg-server/patches