CVS commit: pkgsrc/x11/modular-xorg-server

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 25 19:14:47 UTC 2025

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

Log Message:
modular-xorg-server: update to 21.1.16.

21.1.16

This release contains the fix for the issue reported in today's security
advisory: https://lists.x.org/archives/xorg-announce/2025-February/003584.html

  * CVE-2025-26594
  * CVE-2025-26595
  * CVE-2025-26596
  * CVE-2025-26597
  * CVE-2025-26598
  * CVE-2025-26599
  * CVE-2025-26600
  * CVE-2025-26601

Additionally, it also contains several other fixes, see below:

Alan Coopersmith (7):
       os: NextDPMSTimeout: mark intentional fallthroughs in switch
       xfree86: avoid memory leak on realloc failure
       Xi: avoid NULL pointer dereference if GetXTestDevice returns NULL
       render: avoid NULL pointer dereference if PictureFindVisual returns NULL
       dix: fix button offset when generating DeviceButtonStateNotify events
       dix: limit checks to MAX_VALUATORS when generating Xi events
       modesetting: avoid memory leak when ms_present_check_unflip() returns FALSE

Daniel Kahn Gillmor (1):
       autotools: enable static use of Nettle for SHA1

Doug Brown (1):
       dri2: Protect against dri2ClientPrivate assertion failures

Olivier Fourdan (18):
       glamor: Fix possible double-free
       os: Fix NULL pointer dereference
       xkb: Always use MAP_LENGTH keymap size
       os/connection: Make sure partial is initialized
       test: Fix xsync test
       Cursor: Refuse to free the root cursor
       xkb: Fix buffer overflow in XkbVModMaskText()
       xkb: Fix computation of XkbSizeKeySyms
       xkb: Fix buffer overflow in XkbChangeTypesOfKey()
       Xi: Fix barrier device search
       composite: Handle failure to redirect in compRedirectWindow()
       composite: initialize border clip even when pixmap alloc fails
       dix: Dequeue pending events on frozen device on removal
       sync: Do not let sync objects uninitialized
       sync: Check values before applying changes
       sync: Do not fail SyncAddTriggerToSyncObject()
       sync: Apply changes last in SyncChangeAlarmAttributes()
       xserver 21.1.16

Patrik Jakobsson (1):
       modesetting: Fix dirty updates for sw rotation

Peter Hutterer (3):
       dix: don't push the XKB state to a non-existing master keyboard
       Xi: when removing a master search for a disabled paired device
       dix: keep a ref to the rootCursor

Tj (1):
       xfree86: fbdevhw: fix pci detection on recent Linux

21.1.15

Alan Coopersmith (1):
      dix-config.h: add HAVE_SOCKLEN_T definition

Eric Curtin (1):
      config: add a quirk for Apple Silicon appledrm

Joaquim Monteiro (2):
      os: Fix assignment with incompatible pointer type
      os: Fix siHostnameAddrMatch in the case where h_addr isn't defined

Matt Turner (3):
      hw/xfree86: Fix -Wmissing-prototypes warnings
      hw/xfree86: Fix -Wincompatible-pointer-types sbus compile failure
      xserver 21.1.15


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/x11/modular-xorg-server/Makefile.common
cvs rdiff -u -r1.130 -r1.131 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/modular-xorg-server/hacks.mk

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.common
diff -u pkgsrc/x11/modular-xorg-server/Makefile.common:1.63 pkgsrc/x11/modular-xorg-server/Makefile.common:1.64
--- pkgsrc/x11/modular-xorg-server/Makefile.common:1.63 Tue Oct 29 20:50:53 2024
+++ pkgsrc/x11/modular-xorg-server/Makefile.common      Tue Feb 25 19:14:46 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.63 2024/10/29 20:50:53 wiz Exp $
+# $NetBSD: Makefile.common,v 1.64 2025/02/25 19:14:46 wiz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
-XORG_VERSION=  21.1.14
+XORG_VERSION=  21.1.16
 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.130 pkgsrc/x11/modular-xorg-server/distinfo:1.131
--- pkgsrc/x11/modular-xorg-server/distinfo:1.130       Tue Oct 29 20:50:53 2024
+++ pkgsrc/x11/modular-xorg-server/distinfo     Tue Feb 25 19:14:46 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.130 2024/10/29 20:50:53 wiz Exp $
+$NetBSD: distinfo,v 1.131 2025/02/25 19:14:46 wiz Exp $
 
-BLAKE2s (xorg-server-21.1.14.tar.xz) = 2653ab9f4cfc402d70bf8db033124ff7716e6b304600e94dc32c4d63c4fa14d4
-SHA512 (xorg-server-21.1.14.tar.xz) = 833d36ca4a409363dc021a50702bc29dbb32d074de319d6910a158b6e4d8f51a20c3b0de0486d9613d4e526fe4fd60ca306b3c9fcce7d014ca8cc10185afd973
-Size (xorg-server-21.1.14.tar.xz) = 5016608 bytes
+BLAKE2s (xorg-server-21.1.16.tar.xz) = f8a6257e898694fb3a0b815e948032d620f17f0001e6cc86cba0e48b2eb36fbe
+SHA512 (xorg-server-21.1.16.tar.xz) = 38fd4232a293a497d13f8b57e85e84cf6a531453a7d8d5de1a77d67ceaf8714d5770951a8a21f1b3f519e83be1fc0926dce269846e75a8b11aa1062dd507f67d
+Size (xorg-server-21.1.16.tar.xz) = 5025304 bytes
 SHA1 (patch-configure) = e1497e39151d602028fc33a2dd307347c6afec9e
 SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9

Index: pkgsrc/x11/modular-xorg-server/hacks.mk
diff -u pkgsrc/x11/modular-xorg-server/hacks.mk:1.1 pkgsrc/x11/modular-xorg-server/hacks.mk:1.2
--- pkgsrc/x11/modular-xorg-server/hacks.mk:1.1 Sun Apr 14 09:15:14 2024
+++ pkgsrc/x11/modular-xorg-server/hacks.mk     Tue Feb 25 19:14:46 2025
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2024/04/14 09:15:14 pho Exp $
+# $NetBSD: hacks.mk,v 1.2 2025/02/25 19:14:46 wiz Exp $
 
 .if !defined(MODULAR_XORG_SERVER_HACKS_MK)
 MODULAR_XORG_SERVER_HACKS_MK=  defined
@@ -18,7 +18,7 @@ MODULAR_XORG_SERVER_HACKS_MK= defined
 ### regression.
 ###
 .if ${MACHINE_PLATFORM:MNetBSD-9.*-aarch64} || \
-       ${MACHINE_PLATFORM:MNetBSD-10.0-aarch64}
+       ${MACHINE_PLATFORM} == NetBSD-10.0-aarch64
 PKG_HACKS+=    smart-scheduler-workaround
 CONFIGURE_ENV+=        ac_cv_func_setitimer=no
 .endif