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

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jun  3 13:11:56 UTC 2026

Modified Files:
        pkgsrc/x11/modular-xorg-server: Makefile Makefile.common distinfo
        pkgsrc/x11/modular-xorg-server/patches: patch-configure
            patch-hw_xfree86_os-support_bus_Sbus.c
Removed Files:
        pkgsrc/x11/modular-xorg-server/patches: patch-os_xsha1.c

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

Security fix release.


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/x11/modular-xorg-server/Makefile.common
cvs rdiff -u -r1.134 -r1.135 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r1.10 -r1.11 \
    pkgsrc/x11/modular-xorg-server/patches/patch-configure
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_Sbus.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/modular-xorg-server/patches/patch-os_xsha1.c

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.146 pkgsrc/x11/modular-xorg-server/Makefile:1.147
--- pkgsrc/x11/modular-xorg-server/Makefile:1.146       Thu May 14 16:42:29 2026
+++ pkgsrc/x11/modular-xorg-server/Makefile     Wed Jun  3 13:11:56 2026
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.146 2026/05/14 16:42:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.147 2026/06/03 13:11:56 wiz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-${DISTNAME}
-PKGREVISION=   2
 
 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.67 pkgsrc/x11/modular-xorg-server/Makefile.common:1.68
--- pkgsrc/x11/modular-xorg-server/Makefile.common:1.67 Wed Jun 18 20:48:11 2025
+++ pkgsrc/x11/modular-xorg-server/Makefile.common      Wed Jun  3 13:11:56 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.67 2025/06/18 20:48:11 wiz Exp $
+# $NetBSD: Makefile.common,v 1.68 2026/06/03 13:11:56 wiz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
-XORG_VERSION=  21.1.18
+XORG_VERSION=  21.1.23
 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.134 pkgsrc/x11/modular-xorg-server/distinfo:1.135
--- pkgsrc/x11/modular-xorg-server/distinfo:1.134       Sun May 24 10:12:27 2026
+++ pkgsrc/x11/modular-xorg-server/distinfo     Wed Jun  3 13:11:56 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.134 2026/05/24 10:12:27 tnn Exp $
+$NetBSD: distinfo,v 1.135 2026/06/03 13:11:56 wiz Exp $
 
-BLAKE2s (xorg-server-21.1.18.tar.xz) = bb95936718e7c554fd77e033a00f9b6a3c55a17793d0fd627d5c222a99d4e710
-SHA512 (xorg-server-21.1.18.tar.xz) = 839ce759fc0e5405599c4cff0acf381f278d22b465b9fb9e335b5fd1c63f6d546788e4e869854026eb4b1e1a77a83b60d6fef472cf8534d45630f31b587a50dd
-Size (xorg-server-21.1.18.tar.xz) = 5037376 bytes
-SHA1 (patch-configure) = e1497e39151d602028fc33a2dd307347c6afec9e
+BLAKE2s (xorg-server-21.1.23.tar.xz) = 1e4f0010eccc686ca91f6d61dd24d891b49795079f04bd4f44fe75d87d093445
+SHA512 (xorg-server-21.1.23.tar.xz) = 7eae854af1b5db1f5d1e59cb9d26b86d98fa176d4f80f70935c707f17982d0446a0a8ad8d29c922edbd208435f995b027604fbb72e62a7bf3ba79f2f570aa0bb
+Size (xorg-server-21.1.23.tar.xz) = 5069780 bytes
+SHA1 (patch-configure) = 5dc88dbac3fc35822f83d336ee5ab7af4e84251f
 SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
@@ -13,10 +13,9 @@ SHA1 (patch-hw_xfree86_os-support_bsd_ar
 SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
 SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230
 SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = e227a473f48f921c9c20bdc8b536c91ecc41a542
-SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 50e6ffa8f58ffeed0f734d3bbabf1939649c3208
+SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 25a47f3249856f4c31b292ed82e0fba6fc10a86e
 SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
 SHA1 (patch-hw_xfree86_os-support_solaris_sun__init.c) = 6148072cfaf1cb8d0a2f465b51429563c8ea2c15
 SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
 SHA1 (patch-os_backtrace.c) = 8cf93febb737dd850706d140b467b73f61ecd3ad
-SHA1 (patch-os_xsha1.c) = 2d33d8797056f3e77f6afa19f68bfe9a5dd3a315

Index: pkgsrc/x11/modular-xorg-server/patches/patch-configure
diff -u pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.10 pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.11
--- pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.10 Sat Jan 13 20:35:21 2024
+++ pkgsrc/x11/modular-xorg-server/patches/patch-configure      Wed Jun  3 13:11:56 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.10 2024/01/13 20:35:21 riastradh Exp $
+$NetBSD: patch-configure,v 1.11 2026/06/03 13:11:56 wiz Exp $
 
 Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64.
 (c.f. patch-hw_xfree86_os-support_bsd_i386.c)
@@ -7,9 +7,9 @@ for netbsd, force pass pthread configure
 
 For NetBSD, on m68k, sh3, and mips, use ppc_video.c as we do in xsrc.
 
---- configure.orig     2023-12-13 01:31:14.000000000 +0000
+--- configure.orig     2026-06-02 00:10:39.000000000 +0000
 +++ configure
-@@ -24672,7 +24672,7 @@ printf "%s\n" "#define USE_ALPHA_PIO 1" 
+@@ -26175,7 +26175,7 @@ printf "%s\n" "#define USE_ALPHA_PIO 1" >>confdefs.h
        esac
        GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
        ;;
@@ -18,7 +18,7 @@ For NetBSD, on m68k, sh3, and mips, use 
        ARM_VIDEO=yes
        DEFAULT_INT10="stub"
        ;;
-@@ -24693,7 +24693,7 @@ printf "%s\n" "#define USE_ALPHA_PIO 1" 
+@@ -26196,7 +26196,7 @@ printf "%s\n" "#define USE_ALPHA_PIO 1" >>confdefs.h
                                ;;
        esac
          ;;
@@ -27,17 +27,18 @@ For NetBSD, on m68k, sh3, and mips, use 
        PPC_VIDEO=yes
        case $host_os in
                *freebsd*)      DEFAULT_INT10=stub ;;
-@@ -24714,7 +24714,8 @@ printf "%s\n" "#define USE_DEV_IO 1" >>c
+@@ -26217,8 +26217,9 @@ printf "%s\n" "#define USE_DEV_IO 1" >>confdefs.h
  printf "%s\n" "#define USE_DEV_IO 1" >>confdefs.h
   ;;
                *netbsd*)
 -printf "%s\n" "#define USE_I386_IOPL 1" >>confdefs.h
 +printf "%s\n" "#define USE_AMD64_IOPL 1" >>confdefs.h
-+
  
++
                                SYS_LIBS=-lx86_64
                                ;;
-@@ -26588,7 +26589,8 @@ case ${host_os} in
+               *openbsd*)
+@@ -28234,7 +28235,8 @@ case ${host_os} in
        netbsd*)
        # use libc stubs, don't link against libpthread, to allow
        # dynamic loading

Index: pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_Sbus.c
diff -u pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_Sbus.c:1.5 pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_Sbus.c:1.6
--- pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_Sbus.c:1.5   Fri Jul 15 20:39:49 2022
+++ pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_Sbus.c       Wed Jun  3 13:11:56 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-hw_xfree86_os-support_bus_Sbus.c,v 1.5 2022/07/15 20:39:49 wiz Exp $
+$NetBSD: patch-hw_xfree86_os-support_bus_Sbus.c,v 1.6 2026/06/03 13:11:56 wiz Exp $
 
 Merge most of netbsdSbus.c from xsrc, but leave the Solaris support in place.
 
---- hw/xfree86/os-support/bus/Sbus.c.orig      2022-07-12 13:27:57.000000000 +0000
+--- hw/xfree86/os-support/bus/Sbus.c.orig      2026-06-02 00:10:30.000000000 +0000
 +++ hw/xfree86/os-support/bus/Sbus.c
 @@ -34,6 +34,9 @@
  #ifdef __sun
@@ -24,7 +24,7 @@ Merge most of netbsdSbus.c from xsrc, bu
  
  sbusDevicePtr *xf86SbusInfo = NULL;
  
-@@ -68,15 +73,27 @@ struct sbus_devtable sbusDeviceTable[] =
+@@ -68,15 +73,27 @@ struct sbus_devtable sbusDeviceTable[] = {
      {SBUS_DEVICE_GT, FBTYPE_SUNGT, "gt", NULL, "Sun Graphics Tower"},
      {SBUS_DEVICE_MGX, -1, "mgx", NULL, "Quantum 3D MGXplus"},
      {SBUS_DEVICE_LEO, FBTYPE_SUNLEO, "leo", "sunleo", "Sun ZX or Turbo ZX"},
@@ -182,16 +182,14 @@ Merge most of netbsdSbus.c from xsrc, bu
      promRootNode = promGetSibling(0);
      if (!promRootNode) {
          sparcPromClose();
-@@ -399,9 +468,9 @@ sparcPromAssignNodes(void)
+@@ -399,8 +468,8 @@ sparcPromAssignNodes(void)
           * were the types of the cards missed. */
          char buffer[64];
          int fbNum, devId;
 -        static struct {
 -            int devId;
--            char *prefix;
 +        static const struct {
 +            const int devId;
-+            const char *prefix;
+             const char *prefix;
          } procFbPrefixes[] = {
              {SBUS_DEVICE_BW2, "BWtwo"},
-             {SBUS_DEVICE_CG14, "CGfourteen"},