CVS commit: pkgsrc/x11

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Dec 13 07:45: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,xephyr}: update to 21.1.10

This release contains fixes for CVE-2023-6377 and CVE-2023-6478 as
reported in today's security advisory:
https://lists.x.org/archives/xorg-announce/2023-December/003435.html

Peter Hutterer (3):
      randr: avoid integer truncation in length check of ProcRRChange*Property
      Xi: allocate enough XkbActions for our buttons
      xserver 21.1.10

nerdopolis (1):
      xephyr: Don't check for SeatId anymore


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/x11/modular-xorg-server/Makefile.common
cvs rdiff -u -r1.124 -r1.125 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r1.26 -r1.27 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.140 pkgsrc/x11/modular-xorg-server/Makefile:1.141
--- pkgsrc/x11/modular-xorg-server/Makefile:1.140       Sun Nov 12 13:24:19 2023
+++ pkgsrc/x11/modular-xorg-server/Makefile     Wed Dec 13 07:45:07 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.140 2023/11/12 13:24:19 wiz Exp $
+# $NetBSD: Makefile,v 1.141 2023/12/13 07:45: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.58 pkgsrc/x11/modular-xorg-server/Makefile.common:1.59
--- pkgsrc/x11/modular-xorg-server/Makefile.common:1.58 Wed Oct 25 09:06:19 2023
+++ pkgsrc/x11/modular-xorg-server/Makefile.common      Wed Dec 13 07:45:07 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.58 2023/10/25 09:06:19 wiz Exp $
+# $NetBSD: Makefile.common,v 1.59 2023/12/13 07:45:07 wiz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
-XORG_VERSION=  21.1.9
+XORG_VERSION=  21.1.10
 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.124 pkgsrc/x11/modular-xorg-server/distinfo:1.125
--- pkgsrc/x11/modular-xorg-server/distinfo:1.124       Wed Oct 25 09:06:19 2023
+++ pkgsrc/x11/modular-xorg-server/distinfo     Wed Dec 13 07:45:07 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.124 2023/10/25 09:06:19 wiz Exp $
+$NetBSD: distinfo,v 1.125 2023/12/13 07:45:07 wiz Exp $
 
-BLAKE2s (xorg-server-21.1.9.tar.xz) = f350cf205183006a21f16e0c843b4d19ffe9d00b2d1ee1ff650be351ee273236
-SHA512 (xorg-server-21.1.9.tar.xz) = 9044e1b9222616fb63aea444b75f4ca6582edb7d899018f8ea30359e57edf04b1555e69397ebc4d288f7e36d6b82a54dde3895f11d414573d229e908ac17bfe8
-Size (xorg-server-21.1.9.tar.xz) = 4935860 bytes
+BLAKE2s (xorg-server-21.1.10.tar.xz) = b7773fcdab7bd8ae649e35ca25e4238c0ff2915f46e2ad1bff6c3f49df4a2fae
+SHA512 (xorg-server-21.1.10.tar.xz) = 8135d9b7c0c71f427ba0a3b80741fee4f6ae195779399b73261a00858882f3516e367a08e2da1403734b04eacabae9aa231e5375eff23b57a3ff764e9caf8926
+Size (xorg-server-21.1.10.tar.xz) = 4935984 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.26 pkgsrc/x11/modular-xorg-xephyr/Makefile:1.27
--- pkgsrc/x11/modular-xorg-xephyr/Makefile:1.26        Sun Nov 12 13:24:19 2023
+++ pkgsrc/x11/modular-xorg-xephyr/Makefile     Wed Dec 13 07:45:07 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2023/11/12 13:24:19 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2023/12/13 07:45: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