Received: by mail.netbsd.org (Postfix, from userid 605) id 74CEE84E79; Tue, 20 Dec 2022 18:56:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A25E084E55 for ; Tue, 20 Dec 2022 18:56:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 0DitApOX2iL0 for ; Tue, 20 Dec 2022 18:56:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id B4F0984D05 for ; Tue, 20 Dec 2022 18:56:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A901CFA90; Tue, 20 Dec 2022 18:56:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_167156256628720" MIME-Version: 1.0 Date: Tue, 20 Dec 2022 18:56:06 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/x11/modular-xorg-server To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20221220185606.A901CFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_167156256628720 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Tue Dec 20 18:56:06 UTC 2022 Modified Files: pkgsrc/x11/modular-xorg-server: Makefile.common PLIST builtin.mk distinfo Log Message: modular-xorg-server: update to 21.1.6. This release fixes an invalid event type mask in XTestSwapFakeInput which was inadvertently changed from octal 0177 to hexadecimal 0x177 in the fix for CVE-2022-46340. It also includes backports for a couple of fixes in XQuartz and fixes for XKB (noticeably for CVE-2022-3550 and CVE-2022-3551). Jeremy Huddleston Sequoia (1): xquartz: Fix some formatting John D Pell (1): XQuartz: stub: Call LSOpenApplication instead of fork()/exec() Olivier Fourdan (1): xserver 21.1.6 Peter Hutterer (3): xkb: proof GetCountedString against request length attacks xkb: fix some possible memleaks in XkbGetKbdByName Xext: fix invalid event type mask in XTestSwapFakeInput To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 pkgsrc/x11/modular-xorg-server/Makefile.common cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/modular-xorg-server/PLIST cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/modular-xorg-server/builtin.mk cvs rdiff -u -r1.119 -r1.120 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. --_----------=_167156256628720 Content-Disposition: inline Content-Length: 4223 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/modular-xorg-server/Makefile.common diff -u pkgsrc/x11/modular-xorg-server/Makefile.common:1.51 pkgsrc/x11/modular-xorg-server/Makefile.common:1.52 --- pkgsrc/x11/modular-xorg-server/Makefile.common:1.51 Thu Dec 15 10:29:59 2022 +++ pkgsrc/x11/modular-xorg-server/Makefile.common Tue Dec 20 18:56:06 2022 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.51 2022/12/15 10:29:59 wiz Exp $ +# $NetBSD: Makefile.common,v 1.52 2022/12/20 18:56:06 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.5 +XORG_VERSION= 21.1.6 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} EXTRACT_SUFX= .tar.xz @@ -114,7 +114,7 @@ INSTALLATION_DIRS+= lib/xorg/modules/dri BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" -.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD" +.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD" CONFIGURE_ARGS+= --with-sha1=libc .else .include "../../security/nettle/buildlink3.mk" Index: pkgsrc/x11/modular-xorg-server/PLIST diff -u pkgsrc/x11/modular-xorg-server/PLIST:1.31 pkgsrc/x11/modular-xorg-server/PLIST:1.32 --- pkgsrc/x11/modular-xorg-server/PLIST:1.31 Fri Jul 15 20:39:49 2022 +++ pkgsrc/x11/modular-xorg-server/PLIST Tue Dec 20 18:56:06 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.31 2022/07/15 20:39:49 wiz Exp $ +@comment $NetBSD: PLIST,v 1.32 2022/12/20 18:56:06 wiz Exp $ bin/X bin/Xnest bin/Xorg @@ -167,7 +167,6 @@ lib/pkgconfig/xorg-server.pc ${PLIST.dri}lib/xorg/modules/drivers/modesetting_drv.la ${PLIST.dri}lib/xorg/modules/extensions/libglx.la lib/xorg/modules/input/inputtest_drv.la -lib/xorg/modules/input/inputtest_drv.so lib/xorg/modules/libexa.la lib/xorg/modules/libfbdevhw.la ${PLIST.dri}lib/xorg/modules/libglamoregl.la Index: pkgsrc/x11/modular-xorg-server/builtin.mk diff -u pkgsrc/x11/modular-xorg-server/builtin.mk:1.3 pkgsrc/x11/modular-xorg-server/builtin.mk:1.4 --- pkgsrc/x11/modular-xorg-server/builtin.mk:1.3 Mon Dec 20 07:29:09 2021 +++ pkgsrc/x11/modular-xorg-server/builtin.mk Tue Dec 20 18:56:06 2022 @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2021/12/20 07:29:09 nia Exp $ +# $NetBSD: builtin.mk,v 1.4 2022/12/20 18:56:06 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -15,9 +15,9 @@ PKGCONFIG_BASE.modular-xorg-server= ${X1 ### CHECK_BUILTIN.modular-xorg-server?= no -.if !empty(CHECK_BUILTIN.modular-xorg-server:M[nN][oO]) +.if ${CHECK_BUILTIN.modular-xorg-server:tl} == no -. if !empty(USE_BUILTIN.modular-xorg-server:M[yY][eE][sS]) +. if ${USE_BUILTIN.modular-xorg-server:tl} == yes BUILDLINK_PREFIX.modular-xorg-server= ${X11BASE} BUILDLINK_FILES.modular-xorg-server+= lib/pkgconfig/xorg-server.pc . endif Index: pkgsrc/x11/modular-xorg-server/distinfo diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.119 pkgsrc/x11/modular-xorg-server/distinfo:1.120 --- pkgsrc/x11/modular-xorg-server/distinfo:1.119 Thu Dec 15 10:29:59 2022 +++ pkgsrc/x11/modular-xorg-server/distinfo Tue Dec 20 18:56:06 2022 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.119 2022/12/15 10:29:59 wiz Exp $ +$NetBSD: distinfo,v 1.120 2022/12/20 18:56:06 wiz Exp $ -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 +BLAKE2s (xorg-server-21.1.6.tar.xz) = 343e8912a12751c6d3042cf8c25d75e41059db9abfd470d4563fad72a502ef77 +SHA512 (xorg-server-21.1.6.tar.xz) = 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 +Size (xorg-server-21.1.6.tar.xz) = 4977496 bytes SHA1 (patch-configure) = 8096805cb1ac6eb25e03fdbd1d3362b720f7354e SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9 --_----------=_167156256628720--