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

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jun 18 13:46:03 UTC 2025

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

Log Message:
modular-xorg-{server,xephyr}: update to 21.1.17

This release contains the fixes for the issues reported in today's security
advisory: https://lists.x.org/archives/xorg/2025-June/062055.html

  * CVE-2025-49175
  * CVE-2025-49176
  * CVE-2025-49177
  * CVE-2025-49178
  * CVE-2025-49179
  * CVE-2025-49180

Additionally, this release includes a fix for CVE-2022-49737 which was
issued after the fix was merged back in 2022 and several other various fixes.

Alan Coopersmith (9):
      xkb: ensure XkbAllocNames sets num_rg to 0 on allocation failure
      xkb: Convert more sprintf calls to snprintf in xkbtext.c
      xkb: Add tbGetBufferString helper function
      pkgconfig files: Add URL
      dix-config.h: define HAVE_STRUCT_SOCKADDR_STORAGE for xtrans 1.6
      Xserver.man: remove X FireWall Proxy (xfwp) info
      Xserver.man: add Xwayland(1) to list of server-specific man pages
      Xserver.man: correct list of available authorization protocols
      XWin.man: fix typos in font change escapes

Enrico Weigelt, metux IT consult (1):
      xfree86: xf86helper: fix NULL dereference

José Expósito (1):
      xkb: Check that needed is > 0 in XkbResizeKeyActions

Martin Burggraf (1):
      xkb: correcting mathematical nonsense in XkbGeomFPText

Olivier Fourdan (8):
      render: Avoid 0 or less animated cursors
      os: Do not overflow the integer size with BigRequest
      xfixes: Check request length for SetClientDisconnectMode
      os: Account for bytes to ignore when sharing input buffer
      record: Check for overflow in RecordSanityCheckRegisterClients()
      randr: Check for overflow in RRChangeProviderProperty()
      xfree86: Check for RandR provider functions
      xserver 21.1.17

Peter Hutterer (5):
      mi: don't crash on miPointerGetPosition for disabled devices
      mi: guard miPointer functions against NULL dereferences
      Xi: disallow grabbing disabled devices
      dix: fix erroneous BUG_RETURN check
      dix: pick the right keyboard for focus FollowKeyboard

Tanguy Ortolo (1):
      xorg.conf.man: Complete the xorg.conf.5 manpage with Option "Disable"

tholin (1):
      dix: Hold input lock for AttachDevice()


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/x11/modular-xorg-server/Makefile.common
cvs rdiff -u -r1.131 -r1.132 pkgsrc/x11/modular-xorg-server/distinfo

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.65 pkgsrc/x11/modular-xorg-server/Makefile.common:1.66
--- pkgsrc/x11/modular-xorg-server/Makefile.common:1.65 Sun Mar 30 21:10:48 2025
+++ pkgsrc/x11/modular-xorg-server/Makefile.common      Wed Jun 18 13:46:03 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.65 2025/03/30 21:10:48 wiz Exp $
+# $NetBSD: Makefile.common,v 1.66 2025/06/18 13:46:03 wiz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
-XORG_VERSION=  21.1.16
+XORG_VERSION=  21.1.17
 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.131 pkgsrc/x11/modular-xorg-server/distinfo:1.132
--- pkgsrc/x11/modular-xorg-server/distinfo:1.131       Tue Feb 25 19:14:46 2025
+++ pkgsrc/x11/modular-xorg-server/distinfo     Wed Jun 18 13:46:03 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.131 2025/02/25 19:14:46 wiz Exp $
+$NetBSD: distinfo,v 1.132 2025/06/18 13:46:03 wiz Exp $
 
-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
+BLAKE2s (xorg-server-21.1.17.tar.xz) = 3a528c00151f10abd5150a003edf6e6099516d328f80567fb5b6f29e9e9b52f4
+SHA512 (xorg-server-21.1.17.tar.xz) = 6f301c532b2ad6edfab76f21f8e88c4bd9d7df88c12e52caaed72a2c2084547c323fd29ff8769fe0c1cb230b483d4620bc3f382df80899c6b58d3c12431d62d0
+Size (xorg-server-21.1.17.tar.xz) = 5035952 bytes
 SHA1 (patch-configure) = e1497e39151d602028fc33a2dd307347c6afec9e
 SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9