CVS commit: pkgsrc/x11

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Dec 15 10:29:59 UTC 2022

Modified Files:
        pkgsrc/x11/modular-xorg-server: Makefile Makefile.common distinfo
        pkgsrc/x11/modular-xorg-server/patches: patch-configure
        pkgsrc/x11/modular-xorg-xwayland: Makefile

Log Message:
modular-xorg-server*: update to 21.1.5

This release fixes 6 recently reported security vulnerabilities in
various extensions. The CVE numbers are:
CVE-2022-46340, CVE-2022-46341, CVE-2022-46342, CVE-2022-46343,
CVE-2022-46344, and CVE-2022-4283

For details on the these issues please see the security advisory here:
https://lists.x.org/archives/xorg-announce/2022-December/003302.html

Jeremy Huddleston Sequoia (3):
      xquartz: Remove unused macro (X11LIBDIR)
      xquartz: Move default applications list outside of the main executable
      meson: Don't build COMPOSITE for XQuartz

Peter Hutterer (8):
      Xtest: disallow GenericEvents in XTestSwapFakeInput
      Xi: disallow passive grabs with a detail > 255
      Xext: free the XvRTVideoNotify when turning off from the same client
      Xext: free the screen saver resource when replacing it
      Xi: return an error from XI property changes if verification failed
      Xi: avoid integer truncation in length check of ProcXIChangeProperty
      xkb: reset the radio_groups pointer to NULL after freeing it
      xserver 21.1.5


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/x11/modular-xorg-server/Makefile.common
cvs rdiff -u -r1.118 -r1.119 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/x11/modular-xorg-server/patches/patch-configure
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/modular-xorg-xwayland/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.134 pkgsrc/x11/modular-xorg-server/Makefile:1.135
--- pkgsrc/x11/modular-xorg-server/Makefile:1.134       Sun Jul 17 02:29:41 2022
+++ pkgsrc/x11/modular-xorg-server/Makefile     Thu Dec 15 10:29:59 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.134 2022/07/17 02:29:41 tnn Exp $
+# $NetBSD: Makefile,v 1.135 2022/12/15 10:29:59 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.50 pkgsrc/x11/modular-xorg-server/Makefile.common:1.51
--- pkgsrc/x11/modular-xorg-server/Makefile.common:1.50 Sun Jul 17 01:25:50 2022
+++ pkgsrc/x11/modular-xorg-server/Makefile.common      Thu Dec 15 10:29:59 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.50 2022/07/17 01:25:50 tnn Exp $
+# $NetBSD: Makefile.common,v 1.51 2022/12/15 10:29:59 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.4
+XORG_VERSION=  21.1.5
 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.118 pkgsrc/x11/modular-xorg-server/distinfo:1.119
--- pkgsrc/x11/modular-xorg-server/distinfo:1.118       Fri Jul 15 20:39:49 2022
+++ pkgsrc/x11/modular-xorg-server/distinfo     Thu Dec 15 10:29:59 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.118 2022/07/15 20:39:49 wiz Exp $
+$NetBSD: distinfo,v 1.119 2022/12/15 10:29:59 wiz Exp $
 
-BLAKE2s (xorg-server-21.1.4.tar.xz) = 97a0cd59c9035819ad3006d2429d4e0349d579d323c49053b0e3cc39949e38c1
-SHA512 (xorg-server-21.1.4.tar.xz) = eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f
-Size (xorg-server-21.1.4.tar.xz) = 4940176 bytes
-SHA1 (patch-configure) = 1d02efcf80d337b923006032d5bb9fccf811948d
+BLAKE2s (xorg-server-21.1.5.tar.xz) = 1cb7d9d6a887a3e978dcc085ed16a8e873588f9b75b2d2b0f6ca14f81b1991b8
+SHA512 (xorg-server-21.1.5.tar.xz) = a39c6ba36f94241d330b679a9a6fe2c5fda73fc3f5a9308a7a9cfd0d58503e407291759c9e553455c07cf5a3862952ae3904334eeca29c97ff5af7cffd2e6953
+Size (xorg-server-21.1.5.tar.xz) = 4929120 bytes
+SHA1 (patch-configure) = 8096805cb1ac6eb25e03fdbd1d3362b720f7354e
 SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92

Index: pkgsrc/x11/modular-xorg-server/patches/patch-configure
diff -u pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.8 pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.9
--- pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.8  Fri Jul 15 20:39:49 2022
+++ pkgsrc/x11/modular-xorg-server/patches/patch-configure      Thu Dec 15 10:29:59 2022
@@ -1,13 +1,13 @@
-$NetBSD: patch-configure,v 1.8 2022/07/15 20:39:49 wiz Exp $
+$NetBSD: patch-configure,v 1.9 2022/12/15 10:29:59 wiz Exp $
 
 Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64.
 (c.f. patch-hw_xfree86_os-support_bsd_i386.c)
 
 for netbsd, force pass pthread configure checks (pthread not needed)
 
---- configure.orig     2022-07-12 13:28:08.000000000 +0000
+--- configure.orig     2022-12-14 02:25:26.000000000 +0000
 +++ configure
-@@ -22981,7 +22981,7 @@ $as_echo "#define USE_ALPHA_PIO 1" >>con
+@@ -24606,7 +24606,7 @@ printf "%s\n" "#define USE_ALPHA_PIO 1" 
        esac
        GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
        ;;
@@ -16,16 +16,17 @@ for netbsd, force pass pthread configure
        ARM_VIDEO=yes
        DEFAULT_INT10="stub"
        ;;
-@@ -23023,7 +23023,7 @@ $as_echo "#define USE_DEV_IO 1" >>confde
- $as_echo "#define USE_DEV_IO 1" >>confdefs.h
+@@ -24648,7 +24648,8 @@ printf "%s\n" "#define USE_DEV_IO 1" >>c
+ printf "%s\n" "#define USE_DEV_IO 1" >>confdefs.h
   ;;
                *netbsd*)
--$as_echo "#define USE_I386_IOPL 1" >>confdefs.h
-+$as_echo "#define USE_AMD64_IOPL 1" >>confdefs.h
+-printf "%s\n" "#define USE_I386_IOPL 1" >>confdefs.h
++printf "%s\n" "#define USE_AMD64_IOPL 1" >>confdefs.h
++
  
                                SYS_LIBS=-lx86_64
                                ;;
-@@ -24789,7 +24789,8 @@ case ${host_os} in
+@@ -26523,7 +26524,8 @@ case ${host_os} in
        netbsd*)
        # use libc stubs, don't link against libpthread, to allow
        # dynamic loading

Index: pkgsrc/x11/modular-xorg-xwayland/Makefile
diff -u pkgsrc/x11/modular-xorg-xwayland/Makefile:1.14 pkgsrc/x11/modular-xorg-xwayland/Makefile:1.15
--- pkgsrc/x11/modular-xorg-xwayland/Makefile:1.14      Thu Aug 11 05:09:31 2022
+++ pkgsrc/x11/modular-xorg-xwayland/Makefile   Thu Dec 15 10:29:59 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2022/08/11 05:09:31 gutteridge Exp $
+# $NetBSD: Makefile,v 1.15 2022/12/15 10:29:59 wiz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-xorg-xwayland-${XORG_VERSION}
-PKGREVISION=   1
 
 .include "../../devel/wayland/platform.mk"