date:20230206

CVS commit: src/sys/miscfs/nullfs

2023-02-06 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Mon Feb  6 10:32:58 UTC 2023

Modified Files:
src/sys/miscfs/nullfs: null_vfsops.c

Log Message:
Set IMNT_MPSAFE only if the lower layer has it set.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/miscfs/nullfs/null_vfsops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/miscfs/nullfs/null_vfsops.c
diff -u src/sys/miscfs/nullfs/null_vfsops.c:1.100 src/sys/miscfs/nullfs/null_vfsops.c:1.101
--- src/sys/miscfs/nullfs/null_vfsops.c:1.100	Fri Nov  4 11:20:39 2022
+++ src/sys/miscfs/nullfs/null_vfsops.c	Mon Feb  6 10:32:58 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: null_vfsops.c,v 1.100 2022/11/04 11:20:39 hannken Exp $	*/
+/*	$NetBSD: null_vfsops.c,v 1.101 2023/02/06 10:32:58 hannken Exp $	*/
 
 /*
  * Copyright (c) 1999 National Aeronautics & Space Administration
@@ -76,7 +76,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.100 2022/11/04 11:20:39 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.101 2023/02/06 10:32:58 hannken Exp $");
 
 #include 
 #include 
@@ -138,7 +138,7 @@ nullfs_mount(struct mount *mp, const cha
 	/* Create the mount point. */
 	nmp = kmem_zalloc(sizeof(struct null_mount), KM_SLEEP);
 	mp->mnt_data = nmp;
-	mp->mnt_iflag |= IMNT_MPSAFE;
+	mp->mnt_iflag |= lowerrootvp->v_mount->mnt_iflag & IMNT_MPSAFE;
 	mp->mnt_iflag |= lowerrootvp->v_mount->mnt_iflag & IMNT_SHRLOOKUP;
 
 	/*

CVS commit: src/sys/miscfs/nullfs

2023-02-06 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Mon Feb  6 10:32:58 UTC 2023

Modified Files:
src/sys/miscfs/nullfs: null_vfsops.c

Log Message:
Set IMNT_MPSAFE only if the lower layer has it set.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/miscfs/nullfs/null_vfsops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/x68k/x68k

2023-02-06 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Mon Feb  6 13:30:02 UTC 2023

Modified Files:
src/sys/arch/x68k/x68k: pmap_bootstrap.c

Log Message:
Remove an obsolete comment.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/x68k/x68k/pmap_bootstrap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/x68k/x68k

2023-02-06 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Mon Feb  6 13:30:02 UTC 2023

Modified Files:
src/sys/arch/x68k/x68k: pmap_bootstrap.c

Log Message:
Remove an obsolete comment.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/x68k/x68k/pmap_bootstrap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x68k/x68k/pmap_bootstrap.c
diff -u src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.61 src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.62
--- src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.61	Thu Dec 22 16:05:15 2016
+++ src/sys/arch/x68k/x68k/pmap_bootstrap.c	Mon Feb  6 13:30:02 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.61 2016/12/22 16:05:15 cherry Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.62 2023/02/06 13:30:02 tsutsui Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.61 2016/12/22 16:05:15 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.62 2023/02/06 13:30:02 tsutsui Exp $");
 
 #include "opt_m68k_arch.h"
 
@@ -229,7 +229,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
 		/* mark entries for map page tables */
 		for (i = 1; i <= nl1desc; i++)
 			stfree &= ~l2tobm(i);
-		/* mark an entry for kptmpa and lkptpa */
+		/* mark an entry for kptmpa */
 		stfree &= ~l2tobm(i);
 		/* mark entries not available */
 		for (i = MAXKL2SIZE; i < sizeof(stfree) * NBBY; i++)

CVS commit: src/sys/arch/evbarm/conf

2023-02-06 Thread Simon Burge

Module Name:src
Committed By:   simonb
Date:   Mon Feb  6 12:59:13 UTC 2023

Modified Files:
src/sys/arch/evbarm/conf: GENERIC.common

Log Message:
Enable UFS_DIRHASH (missed with previous change) and UFS_EXTATTR
(mistakenly commented out with previous change).


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbarm/conf/GENERIC.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/evbarm/conf

2023-02-06 Thread Simon Burge

Module Name:src
Committed By:   simonb
Date:   Mon Feb  6 12:59:13 UTC 2023

Modified Files:
src/sys/arch/evbarm/conf: GENERIC.common

Log Message:
Enable UFS_DIRHASH (missed with previous change) and UFS_EXTATTR
(mistakenly commented out with previous change).


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbarm/conf/GENERIC.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbarm/conf/GENERIC.common
diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.50 src/sys/arch/evbarm/conf/GENERIC.common:1.51
--- src/sys/arch/evbarm/conf/GENERIC.common:1.50	Thu Sep 29 10:10:06 2022
+++ src/sys/arch/evbarm/conf/GENERIC.common	Mon Feb  6 12:59:13 2023
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.common,v 1.50 2022/09/29 10:10:06 riastradh Exp $
+#	$NetBSD: GENERIC.common,v 1.51 2023/02/06 12:59:13 simonb Exp $
 #
 #	GENERIC evbarm kernel config (template)
 #
@@ -26,14 +26,21 @@ no file-system 	CODA
 no pseudo-device vcoda
 
 # File system options
+# ffs
 options 	FFS_EI		# FFS Endian Independent support
 #options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	UFS_ACL		# UFS Access Control Lists
-#options 	UFS_DIRHASH	# UFS Large Directory Hashing
-#options 	UFS_EXTATTR	# Extended attribute support for UFS1
+options 	UFS_DIRHASH	# UFS Large Directory Hashing
+options 	UFS_EXTATTR	# Extended attribute support for UFS1
 options 	WAPBL		# File system journaling support
+# lfs
+#options 	LFS_DIRHASH	# LFS version of UFS_DIRHASH
+# ext2fs
+#options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
+# immutable) behave as system flags.
+# other
 options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	NFSSERVER	# Network File System server

CVS commit: src/sys/fs/union

2023-02-06 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Mon Feb  6 10:33:32 UTC 2023

Modified Files:
src/sys/fs/union: union_vfsops.c

Log Message:
Set IMNT_MPSAFE only if all lower layers have it set.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/fs/union/union_vfsops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/fs/union

2023-02-06 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Mon Feb  6 10:33:32 UTC 2023

Modified Files:
src/sys/fs/union: union_vfsops.c

Log Message:
Set IMNT_MPSAFE only if all lower layers have it set.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/fs/union/union_vfsops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/fs/union/union_vfsops.c
diff -u src/sys/fs/union/union_vfsops.c:1.85 src/sys/fs/union/union_vfsops.c:1.86
--- src/sys/fs/union/union_vfsops.c:1.85	Mon Nov 21 10:37:14 2022
+++ src/sys/fs/union/union_vfsops.c	Mon Feb  6 10:33:32 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: union_vfsops.c,v 1.85 2022/11/21 10:37:14 hannken Exp $	*/
+/*	$NetBSD: union_vfsops.c,v 1.86 2023/02/06 10:33:32 hannken Exp $	*/
 
 /*
  * Copyright (c) 1994 The Regents of the University of California.
@@ -77,7 +77,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.85 2022/11/21 10:37:14 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.86 2023/02/06 10:33:32 hannken Exp $");
 
 #include 
 #include 
@@ -198,7 +198,14 @@ union_mount(struct mount *mp, const char
 		goto bad;
 	}
 
-	mp->mnt_iflag |= IMNT_MPSAFE;
+	/*
+	 * This mount is mp-safe if both lower mounts are mp-safe.
+	 */
+
+	if (((um->um_lowervp == NULLVP) ||
+	(um->um_lowervp->v_mount->mnt_iflag & IMNT_MPSAFE)) &&
+	(um->um_uppervp->v_mount->mnt_iflag & IMNT_MPSAFE))
+		mp->mnt_iflag |= IMNT_MPSAFE;
 
 	/*
 	 * Unless the mount is readonly, ensure that the top layer

CVS commit: src/etc/rc.d

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 11:53:04 UTC 2023

Modified Files:
src/etc/rc.d: iscsid_volumes

Log Message:
If /etc/iscsi/volumes does not exist, explicitly exit with 0 status


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/etc/rc.d/iscsid_volumes

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/etc/rc.d

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 11:53:04 UTC 2023

Modified Files:
src/etc/rc.d: iscsid_volumes

Log Message:
If /etc/iscsi/volumes does not exist, explicitly exit with 0 status


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/etc/rc.d/iscsid_volumes

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc.d/iscsid_volumes
diff -u src/etc/rc.d/iscsid_volumes:1.1 src/etc/rc.d/iscsid_volumes:1.2
--- src/etc/rc.d/iscsid_volumes:1.1	Fri Feb  3 13:53:40 2023
+++ src/etc/rc.d/iscsid_volumes	Mon Feb  6 11:53:03 2023
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: iscsid_volumes,v 1.1 2023/02/03 13:53:40 mlelstv Exp $
+# $NetBSD: iscsid_volumes,v 1.2 2023/02/06 11:53:03 martin Exp $
 #
 
 # PROVIDE: iscsid_volumes
@@ -16,7 +16,7 @@ stop_cmd="iscsid_volumes_stop"
 
 iscsid_volumes_start()
 {
-	test -f /etc/iscsi/volumes || return
+	test -f /etc/iscsi/volumes || return 0
 
 	while read host target digest auth user alias; do
 		case $host in
@@ -78,7 +78,7 @@ iscsid_volumes_start()
 
 iscsid_volumes_stop()
 {
-	test -f /etc/iscsi/volumes || return
+	test -f /etc/iscsi/volumes || return 0
 
 	while read host target digest auth user alias; do
 		case $host in

CVS commit: src/sys/arch/vax

2023-02-06 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Mon Feb  6 13:13:06 UTC 2023

Modified Files:
src/sys/arch/vax/conf: GENERIC INSTALL VAX780 files.vax
src/sys/arch/vax/include: qdreg.h
src/sys/arch/vax/vax: conf.c
src/sys/arch/vax/vsa: smg.c
Added Files:
src/sys/arch/vax/vsa: gpx.c

Log Message:
Add a support for gpx(4) color framebuffer found on VAXstation 3100.

Poted from OpenBSD/vax. Note smg(4) monochrome onboard framebuffer
driver is also changed attached only if gpx(4) is not installed
or flags 1 is specified in config files, as OpenBSD did.

Tested on my VAXstation 3100/m30 with and without 8bpp gpx(4).
Revied on port-vax@ and "Please go ahead!" from ragge@.
 https://mail-index.netbsd.org/port-vax/2023/01/thread1.html#004147

Worth to pullup to netbsd-10.


To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/vax/conf/INSTALL
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/vax/conf/VAX780
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/vax/conf/files.vax
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/include/qdreg.h
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/vax/vax/conf.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/vax/vsa/gpx.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/vax/vsa/smg.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/vax

2023-02-06 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Mon Feb  6 13:13:06 UTC 2023

Modified Files:
src/sys/arch/vax/conf: GENERIC INSTALL VAX780 files.vax
src/sys/arch/vax/include: qdreg.h
src/sys/arch/vax/vax: conf.c
src/sys/arch/vax/vsa: smg.c
Added Files:
src/sys/arch/vax/vsa: gpx.c

Log Message:
Add a support for gpx(4) color framebuffer found on VAXstation 3100.

Poted from OpenBSD/vax. Note smg(4) monochrome onboard framebuffer
driver is also changed attached only if gpx(4) is not installed
or flags 1 is specified in config files, as OpenBSD did.

Tested on my VAXstation 3100/m30 with and without 8bpp gpx(4).
Revied on port-vax@ and "Please go ahead!" from ragge@.
 https://mail-index.netbsd.org/port-vax/2023/01/thread1.html#004147

Worth to pullup to netbsd-10.


To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/vax/conf/INSTALL
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/vax/conf/VAX780
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/vax/conf/files.vax
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/include/qdreg.h
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/vax/vax/conf.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/vax/vsa/gpx.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/vax/vsa/smg.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/vax/conf/GENERIC
diff -u src/sys/arch/vax/conf/GENERIC:1.216 src/sys/arch/vax/conf/GENERIC:1.217
--- src/sys/arch/vax/conf/GENERIC:1.216	Thu Sep 29 10:10:10 2022
+++ src/sys/arch/vax/conf/GENERIC	Mon Feb  6 13:13:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.216 2022/09/29 10:10:10 riastradh Exp $
+# $NetBSD: GENERIC,v 1.217 2023/02/06 13:13:05 tsutsui Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/vax/conf/std.vax"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.216 $"
+#ident 		"GENERIC-$Revision: 1.217 $"
 
 # Here are all different supported CPU types listed.
 #options 	VAX8800		# VAX 8500, 8530, 8550, 8700, 8800
@@ -185,6 +185,7 @@ si1		at vsbus0 csr 0x200c0180 # VS2000/3
 asc0		at vsbus0 csr 0x200c0080 # VS4000/60 (or VLC) SCSI-ctlr
 asc0		at vsbus0 csr 0x2680 # VS4000/90 and 4000/10x SCSI-ctlr
 smg0		at vsbus0 csr 0x200f # Small monochrome display ctlr.
+gpx0		at vsbus0 csr 0x3c00 # VS3100 GPX display option
 #clr0		at vsbus0 csr 0x3000 # 4- or 8-bitplans color graphics
 spx0		at vsbus0 csr 0x3800 # Low Cost SPX on VS4000/90.
 lcg0		at vsbus0 csr 0x21801000 # VS4000/60 (or VLC) graphics
@@ -271,6 +272,7 @@ uk*		at scsibus? target? lun?
 
 # VAXstation graphics support
 wsdisplay*	at smg0
+wsdisplay*	at gpx0
 wsdisplay*	at spx0
 wsdisplay*	at lcg0
 #wsdisplay*	at clr0

Index: src/sys/arch/vax/conf/INSTALL
diff -u src/sys/arch/vax/conf/INSTALL:1.75 src/sys/arch/vax/conf/INSTALL:1.76
--- src/sys/arch/vax/conf/INSTALL:1.75	Mon Jan 20 18:38:21 2020
+++ src/sys/arch/vax/conf/INSTALL	Mon Feb  6 13:13:05 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.75 2020/01/20 18:38:21 thorpej Exp $
+#	$NetBSD: INSTALL,v 1.76 2023/02/06 13:13:05 tsutsui Exp $
 #
 # INSTALL kernel; all supported devices but nothing fancy.
 #
@@ -139,6 +139,7 @@ si1		at vsbus0 csr 0x200c0180 # VS2000/3
 asc0		at vsbus0 csr 0x200c0080 # VS4000/60 (or VLC) SCSI-ctlr
 asc0		at vsbus0 csr 0x2680 # VS4000/90 and 4000/10x SCSI-ctlr
 smg0		at vsbus0 csr 0x200f # Small monochrome display ctlr.
+gpx0		at vsbus0 csr 0x3c00 # VS3100 GPX display option
 #clr0		at vsbus0 csr 0x3000 # 4- or 8-bitplans color graphics
 spx0		at vsbus0 csr 0x3800 # Low Cost SPX on VS4000/90.
 #lcg0		at vsbus0 csr 0x21801000 # VS4000/60 (or VLC) graphics
@@ -217,6 +218,7 @@ cd*		at scsibus? target? lun?
 
 # VAXstation graphics support
 wsdisplay*	at smg0
+wsdisplay*	at gpx0
 wsdisplay*	at spx0
 #wsdisplay*	at lcg0
 #wsdisplay*	at clr0

Index: src/sys/arch/vax/conf/VAX780
diff -u src/sys/arch/vax/conf/VAX780:1.33 src/sys/arch/vax/conf/VAX780:1.34
--- src/sys/arch/vax/conf/VAX780:1.33	Sun Aug  7 02:52:30 2022
+++ src/sys/arch/vax/conf/VAX780	Mon Feb  6 13:13:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: VAX780,v 1.33 2022/08/07 02:52:30 simonb Exp $
+# $NetBSD: VAX780,v 1.34 2023/02/06 13:13:05 tsutsui Exp $
 #
 # 11/780,750,730 machine description file
 # 
@@ -171,6 +171,7 @@ ubi0		at mainbus0		# 11/730 direct unibu
 #asc0		at vsbus0 csr 0x200c0080 # VS4000/60 (or VLC) SCSI-ctlr
 #asc0		at vsbus0 csr 0x2680 # VS4000/90 and 4000/10x SCSI-ctlr
 #smg0		at vsbus0 csr 0x200f # Small monochrome display ctlr.
+#gpx0		at vsbus0 csr 0x3c00 # VS3100 GPX display option
 #clr0		at vsbus0 csr 0x3000 # 4- or 8-bitplans color graphics
 #spx0		at vsbus0 csr 0x3800 # Low Cost SPX on VS4000/90.
 #lcg0		at vsbus0 csr 0x21801000 # VS4000/60 (or VLC) graphics
@@ -251,6 +252,7 @@ mt*		at mscpbus? drive?	# MSCP tape
 
 #

CVS commit: [netbsd-10] src/doc

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:58:34 UTC 2023

Modified Files:
src/doc [netbsd-10]: CHANGES-10.0

Log Message:
Tickets #66 - #68


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-10.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-10.0
diff -u src/doc/CHANGES-10.0:1.1.2.28 src/doc/CHANGES-10.0:1.1.2.29
--- src/doc/CHANGES-10.0:1.1.2.28	Sun Feb  5 12:45:22 2023
+++ src/doc/CHANGES-10.0	Mon Feb  6 16:58:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-10.0,v 1.1.2.28 2023/02/05 12:45:22 martin Exp $
+# $NetBSD: CHANGES-10.0,v 1.1.2.29 2023/02/06 16:58:34 martin Exp $
 
 A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16
 until the 10.0 release:
@@ -766,3 +766,19 @@ external/gpl3/gcc/usr.bin/Makefile.inc		
 	requirements.
 	[mrg, ticket #65]
 
+sys/arch/vax/vsa/smg.c1.62
+
+	smg(4): make sure to call wsfont_init(9) as other framebuffer drivers.
+	[tsutsui, ticket #66]
+
+etc/etc.next68k/MAKEDEV.conf			1.6
+
+	next68k: remove obsolete bpf(4) entries.
+	[tsutsui, ticket #67]
+
+sys/fs/union/union_vfsops.c			1.86
+sys/miscfs/nullfs/null_vfsops.c			1.101
+
+	Set IMNT_MPSAFE only if all lower layers are MPSAFE.
+	[hannken, ticket #68]
+

CVS commit: [netbsd-10] src/doc

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:58:34 UTC 2023

Modified Files:
src/doc [netbsd-10]: CHANGES-10.0

Log Message:
Tickets #66 - #68


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-10.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-10] src/etc/etc.next68k

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:53:34 UTC 2023

Modified Files:
src/etc/etc.next68k [netbsd-10]: MAKEDEV.conf

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #67):

etc/etc.next68k/MAKEDEV.conf: revision 1.6

Remove obsolete bpf entries not neceerary for clonified bpf(4).
Fixes "MAKEDEV: bpf8: unknown device" errors.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.16.1 src/etc/etc.next68k/MAKEDEV.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/etc.next68k/MAKEDEV.conf
diff -u src/etc/etc.next68k/MAKEDEV.conf:1.5 src/etc/etc.next68k/MAKEDEV.conf:1.5.16.1
--- src/etc/etc.next68k/MAKEDEV.conf:1.5	Sun Jul  9 05:58:13 2017
+++ src/etc/etc.next68k/MAKEDEV.conf	Mon Feb  6 16:53:34 2023
@@ -1,10 +1,9 @@
-# $NetBSD: MAKEDEV.conf,v 1.5 2017/07/09 05:58:13 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5.16.1 2023/02/06 16:53:34 martin Exp $
 
 all_md)
 	makedev wscons sd0 sd1 sd2 sd3 tty0 tty1
 	makedev st0 st1 ch0 cd0 cd1
 	makedev ss0 uk0 uk1
-	makedev bpf8 bpf9 bpf10 bpf11
 	makedev scsibus0 scsibus1 scsibus2 scsibus3
 	makedev ses0 ses1 ses2 ses3
 	;;

CVS commit: [netbsd-10] src/etc/etc.next68k

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:53:34 UTC 2023

Modified Files:
src/etc/etc.next68k [netbsd-10]: MAKEDEV.conf

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #67):

etc/etc.next68k/MAKEDEV.conf: revision 1.6

Remove obsolete bpf entries not neceerary for clonified bpf(4).
Fixes "MAKEDEV: bpf8: unknown device" errors.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.16.1 src/etc/etc.next68k/MAKEDEV.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-10] src/sys/arch/vax/vsa

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:48:44 UTC 2023

Modified Files:
src/sys/arch/vax/vsa [netbsd-10]: smg.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #66):

sys/arch/vax/vsa/smg.c: revision 1.62

Make sure to call wsfont_init(9) as other framebuffer drivers.
Otherwise wsfont_find(9) always fails and wsdisplay(4) is not attached.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.61.6.1 src/sys/arch/vax/vsa/smg.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/vax/vsa/smg.c
diff -u src/sys/arch/vax/vsa/smg.c:1.61 src/sys/arch/vax/vsa/smg.c:1.61.6.1
--- src/sys/arch/vax/vsa/smg.c:1.61	Sat Aug  7 16:19:07 2021
+++ src/sys/arch/vax/vsa/smg.c	Mon Feb  6 16:48:44 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: smg.c,v 1.61 2021/08/07 16:19:07 thorpej Exp $ */
+/*	$NetBSD: smg.c,v 1.61.6.1 2023/02/06 16:48:44 martin Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.61 2021/08/07 16:19:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.61.6.1 2023/02/06 16:48:44 martin Exp $");
 
 #include 
 #include 
@@ -241,6 +241,7 @@ smg_attach(device_t parent, device_t sel
 	callout_reset(_cursor_ch, hz / 2, smg_crsr_blink, NULL);
 	curcmd = CUR_CMD_HSHI;
 	WRITECUR(CUR_CMD, curcmd);
+	wsfont_init();
 	if ((fcookie = wsfont_find(NULL, 8, 15, 0, WSDISPLAY_FONTORDER_R2L,
 	WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP)) < 0) {
 		aprint_error_dev(self, "could not find 8x15 font\n");
@@ -591,6 +592,7 @@ smgcninit(struct consdev *cndev)
 	curscr = _conscreen;
 	wsdisplay_cnattach(_stdscreen, _conscreen, 0, 0, 0);
 	cn_tab->cn_pri = CN_INTERNAL;
+	wsfont_init();
 	if ((fcookie = wsfont_find(NULL, 8, 15, 0, WSDISPLAY_FONTORDER_R2L,
 	WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP)) < 0)
 	{

CVS commit: [netbsd-10] src/sys/arch/vax/vsa

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:48:44 UTC 2023

Modified Files:
src/sys/arch/vax/vsa [netbsd-10]: smg.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #66):

sys/arch/vax/vsa/smg.c: revision 1.62

Make sure to call wsfont_init(9) as other framebuffer drivers.
Otherwise wsfont_find(9) always fails and wsdisplay(4) is not attached.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.61.6.1 src/sys/arch/vax/vsa/smg.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/doc

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 17:05:59 UTC 2023

Modified Files:
src/doc [netbsd-9]: CHANGES-9.4

Log Message:
Tickets #1585 - #1587


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.46 -r1.1.2.47 src/doc/CHANGES-9.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/doc

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 17:05:59 UTC 2023

Modified Files:
src/doc [netbsd-9]: CHANGES-9.4

Log Message:
Tickets #1585 - #1587


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.46 -r1.1.2.47 src/doc/CHANGES-9.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-9.4
diff -u src/doc/CHANGES-9.4:1.1.2.46 src/doc/CHANGES-9.4:1.1.2.47
--- src/doc/CHANGES-9.4:1.1.2.46	Sat Feb  4 16:21:31 2023
+++ src/doc/CHANGES-9.4	Mon Feb  6 17:05:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.4,v 1.1.2.46 2023/02/04 16:21:31 martin Exp $
+# $NetBSD: CHANGES-9.4,v 1.1.2.47 2023/02/06 17:05:59 martin Exp $
 
 A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4
 release:
@@ -742,3 +742,19 @@ lib/libc/thread-stub/thread-stub.c		1.31
 	instead of doing nothing when app is not linked with pthread.
 	[uwe, ticket #1584]
 
+sys/arch/vax/vsa/smg.c1.62
+
+	smg(4): make sure to call wsfont_init(9) as other framebuffer drivers.
+	[tsutsui, ticket #1585]
+
+etc/etc.next68k/MAKEDEV.conf			1.6
+
+	next68k: remove obsolete bpf(4) entries.
+	[tsutsui, ticket #1586]
+
+sys/fs/union/union_vfsops.c			1.86
+sys/miscfs/nullfs/null_vfsops.c			1.101 (via patch)
+
+	Set IMNT_MPSAFE only if all lower layers are MPSAFE.
+	[hannken, ticket #1587]
+

CVS commit: [netbsd-10] src/sys

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:57:24 UTC 2023

Modified Files:
src/sys/fs/union [netbsd-10]: union_vfsops.c
src/sys/miscfs/nullfs [netbsd-10]: null_vfsops.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #68):

sys/fs/union/union_vfsops.c: revision 1.86
sys/miscfs/nullfs/null_vfsops.c: revision 1.101

Set IMNT_MPSAFE only if all lower layers have it set.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.85.2.1 src/sys/fs/union/union_vfsops.c
cvs rdiff -u -r1.100 -r1.100.2.1 src/sys/miscfs/nullfs/null_vfsops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-10] src/sys

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:57:24 UTC 2023

Modified Files:
src/sys/fs/union [netbsd-10]: union_vfsops.c
src/sys/miscfs/nullfs [netbsd-10]: null_vfsops.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #68):

sys/fs/union/union_vfsops.c: revision 1.86
sys/miscfs/nullfs/null_vfsops.c: revision 1.101

Set IMNT_MPSAFE only if all lower layers have it set.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.85.2.1 src/sys/fs/union/union_vfsops.c
cvs rdiff -u -r1.100 -r1.100.2.1 src/sys/miscfs/nullfs/null_vfsops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/fs/union/union_vfsops.c
diff -u src/sys/fs/union/union_vfsops.c:1.85 src/sys/fs/union/union_vfsops.c:1.85.2.1
--- src/sys/fs/union/union_vfsops.c:1.85	Mon Nov 21 10:37:14 2022
+++ src/sys/fs/union/union_vfsops.c	Mon Feb  6 16:57:24 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: union_vfsops.c,v 1.85 2022/11/21 10:37:14 hannken Exp $	*/
+/*	$NetBSD: union_vfsops.c,v 1.85.2.1 2023/02/06 16:57:24 martin Exp $	*/
 
 /*
  * Copyright (c) 1994 The Regents of the University of California.
@@ -77,7 +77,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.85 2022/11/21 10:37:14 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.85.2.1 2023/02/06 16:57:24 martin Exp $");
 
 #include 
 #include 
@@ -198,7 +198,14 @@ union_mount(struct mount *mp, const char
 		goto bad;
 	}
 
-	mp->mnt_iflag |= IMNT_MPSAFE;
+	/*
+	 * This mount is mp-safe if both lower mounts are mp-safe.
+	 */
+
+	if (((um->um_lowervp == NULLVP) ||
+	(um->um_lowervp->v_mount->mnt_iflag & IMNT_MPSAFE)) &&
+	(um->um_uppervp->v_mount->mnt_iflag & IMNT_MPSAFE))
+		mp->mnt_iflag |= IMNT_MPSAFE;
 
 	/*
 	 * Unless the mount is readonly, ensure that the top layer

Index: src/sys/miscfs/nullfs/null_vfsops.c
diff -u src/sys/miscfs/nullfs/null_vfsops.c:1.100 src/sys/miscfs/nullfs/null_vfsops.c:1.100.2.1
--- src/sys/miscfs/nullfs/null_vfsops.c:1.100	Fri Nov  4 11:20:39 2022
+++ src/sys/miscfs/nullfs/null_vfsops.c	Mon Feb  6 16:57:24 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: null_vfsops.c,v 1.100 2022/11/04 11:20:39 hannken Exp $	*/
+/*	$NetBSD: null_vfsops.c,v 1.100.2.1 2023/02/06 16:57:24 martin Exp $	*/
 
 /*
  * Copyright (c) 1999 National Aeronautics & Space Administration
@@ -76,7 +76,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.100 2022/11/04 11:20:39 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.100.2.1 2023/02/06 16:57:24 martin Exp $");
 
 #include 
 #include 
@@ -138,7 +138,7 @@ nullfs_mount(struct mount *mp, const cha
 	/* Create the mount point. */
 	nmp = kmem_zalloc(sizeof(struct null_mount), KM_SLEEP);
 	mp->mnt_data = nmp;
-	mp->mnt_iflag |= IMNT_MPSAFE;
+	mp->mnt_iflag |= lowerrootvp->v_mount->mnt_iflag & IMNT_MPSAFE;
 	mp->mnt_iflag |= lowerrootvp->v_mount->mnt_iflag & IMNT_SHRLOOKUP;
 
 	/*

CVS commit: [netbsd-9] src/sys

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 17:04:48 UTC 2023

Modified Files:
src/sys/fs/union [netbsd-9]: union_vfsops.c
src/sys/miscfs/nullfs [netbsd-9]: null_vfsops.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #1587):

sys/fs/union/union_vfsops.c: revision 1.86
sys/miscfs/nullfs/null_vfsops.c: revision 1.101 (via patch)

Set IMNT_MPSAFE only if all lower layers have it set.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.79.4.1 src/sys/fs/union/union_vfsops.c
cvs rdiff -u -r1.95.4.1 -r1.95.4.2 src/sys/miscfs/nullfs/null_vfsops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/fs/union/union_vfsops.c
diff -u src/sys/fs/union/union_vfsops.c:1.79 src/sys/fs/union/union_vfsops.c:1.79.4.1
--- src/sys/fs/union/union_vfsops.c:1.79	Wed Feb 20 10:05:59 2019
+++ src/sys/fs/union/union_vfsops.c	Mon Feb  6 17:04:48 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: union_vfsops.c,v 1.79 2019/02/20 10:05:59 hannken Exp $	*/
+/*	$NetBSD: union_vfsops.c,v 1.79.4.1 2023/02/06 17:04:48 martin Exp $	*/
 
 /*
  * Copyright (c) 1994 The Regents of the University of California.
@@ -77,7 +77,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.79 2019/02/20 10:05:59 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.79.4.1 2023/02/06 17:04:48 martin Exp $");
 
 #include 
 #include 
@@ -200,7 +200,14 @@ union_mount(struct mount *mp, const char
 		goto bad;
 	}
 
-	mp->mnt_iflag |= IMNT_MPSAFE;
+	/*
+	 * This mount is mp-safe if both lower mounts are mp-safe.
+	 */
+
+	if (((um->um_lowervp == NULLVP) ||
+	(um->um_lowervp->v_mount->mnt_iflag & IMNT_MPSAFE)) &&
+	(um->um_uppervp->v_mount->mnt_iflag & IMNT_MPSAFE))
+		mp->mnt_iflag |= IMNT_MPSAFE;
 
 	/*
 	 * Unless the mount is readonly, ensure that the top layer

Index: src/sys/miscfs/nullfs/null_vfsops.c
diff -u src/sys/miscfs/nullfs/null_vfsops.c:1.95.4.1 src/sys/miscfs/nullfs/null_vfsops.c:1.95.4.2
--- src/sys/miscfs/nullfs/null_vfsops.c:1.95.4.1	Tue Dec 24 17:45:53 2019
+++ src/sys/miscfs/nullfs/null_vfsops.c	Mon Feb  6 17:04:48 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: null_vfsops.c,v 1.95.4.1 2019/12/24 17:45:53 martin Exp $	*/
+/*	$NetBSD: null_vfsops.c,v 1.95.4.2 2023/02/06 17:04:48 martin Exp $	*/
 
 /*
  * Copyright (c) 1999 National Aeronautics & Space Administration
@@ -76,7 +76,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.95.4.1 2019/12/24 17:45:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.95.4.2 2023/02/06 17:04:48 martin Exp $");
 
 #include 
 #include 
@@ -140,7 +140,7 @@ nullfs_mount(struct mount *mp, const cha
 	/* Create the mount point. */
 	nmp = kmem_zalloc(sizeof(struct null_mount), KM_SLEEP);
 	mp->mnt_data = nmp;
-	mp->mnt_iflag |= IMNT_MPSAFE;
+	mp->mnt_iflag |= lowerrootvp->v_mount->mnt_iflag & IMNT_MPSAFE;
 
 	/*
 	 * Make sure that the mount point is sufficiently initialized

CVS commit: [netbsd-9] src/sys

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 17:04:48 UTC 2023

Modified Files:
src/sys/fs/union [netbsd-9]: union_vfsops.c
src/sys/miscfs/nullfs [netbsd-9]: null_vfsops.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #1587):

sys/fs/union/union_vfsops.c: revision 1.86
sys/miscfs/nullfs/null_vfsops.c: revision 1.101 (via patch)

Set IMNT_MPSAFE only if all lower layers have it set.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.79.4.1 src/sys/fs/union/union_vfsops.c
cvs rdiff -u -r1.95.4.1 -r1.95.4.2 src/sys/miscfs/nullfs/null_vfsops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/sys/arch/vax/vsa

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:51:00 UTC 2023

Modified Files:
src/sys/arch/vax/vsa [netbsd-9]: smg.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1585):

sys/arch/vax/vsa/smg.c: revision 1.62

Make sure to call wsfont_init(9) as other framebuffer drivers.

Otherwise wsfont_find(9) always fails and wsdisplay(4) is not attached.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.58.4.1 src/sys/arch/vax/vsa/smg.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/vax/vsa/smg.c
diff -u src/sys/arch/vax/vsa/smg.c:1.58 src/sys/arch/vax/vsa/smg.c:1.58.4.1
--- src/sys/arch/vax/vsa/smg.c:1.58	Thu Mar 14 23:49:38 2019
+++ src/sys/arch/vax/vsa/smg.c	Mon Feb  6 16:51:00 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: smg.c,v 1.58 2019/03/14 23:49:38 thorpej Exp $ */
+/*	$NetBSD: smg.c,v 1.58.4.1 2023/02/06 16:51:00 martin Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.58 2019/03/14 23:49:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.58.4.1 2023/02/06 16:51:00 martin Exp $");
 
 #include 
 #include 
@@ -241,6 +241,7 @@ smg_attach(device_t parent, device_t sel
 	callout_reset(_cursor_ch, hz / 2, smg_crsr_blink, NULL);
 	curcmd = CUR_CMD_HSHI;
 	WRITECUR(CUR_CMD, curcmd);
+	wsfont_init();
 	if ((fcookie = wsfont_find(NULL, 8, 15, 0, WSDISPLAY_FONTORDER_R2L,
 	WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP)) < 0) {
 		aprint_error_dev(self, "could not find 8x15 font\n");
@@ -591,6 +592,7 @@ smgcninit(struct consdev *cndev)
 	curscr = _conscreen;
 	wsdisplay_cnattach(_stdscreen, _conscreen, 0, 0, 0);
 	cn_tab->cn_pri = CN_INTERNAL;
+	wsfont_init();
 	if ((fcookie = wsfont_find(NULL, 8, 15, 0, WSDISPLAY_FONTORDER_R2L,
 	WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP)) < 0)
 	{

CVS commit: [netbsd-9] src/sys/arch/vax/vsa

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:51:00 UTC 2023

Modified Files:
src/sys/arch/vax/vsa [netbsd-9]: smg.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1585):

sys/arch/vax/vsa/smg.c: revision 1.62

Make sure to call wsfont_init(9) as other framebuffer drivers.

Otherwise wsfont_find(9) always fails and wsdisplay(4) is not attached.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.58.4.1 src/sys/arch/vax/vsa/smg.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc/etc.next68k

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:54:53 UTC 2023

Modified Files:
src/etc/etc.next68k [netbsd-9]: MAKEDEV.conf

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1586):

etc/etc.next68k/MAKEDEV.conf: revision 1.6

Remove obsolete bpf entries not neceerary for clonified bpf(4).
Fixes "MAKEDEV: bpf8: unknown device" errors.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/etc/etc.next68k/MAKEDEV.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/etc.next68k/MAKEDEV.conf
diff -u src/etc/etc.next68k/MAKEDEV.conf:1.5 src/etc/etc.next68k/MAKEDEV.conf:1.5.8.1
--- src/etc/etc.next68k/MAKEDEV.conf:1.5	Sun Jul  9 05:58:13 2017
+++ src/etc/etc.next68k/MAKEDEV.conf	Mon Feb  6 16:54:53 2023
@@ -1,10 +1,9 @@
-# $NetBSD: MAKEDEV.conf,v 1.5 2017/07/09 05:58:13 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5.8.1 2023/02/06 16:54:53 martin Exp $
 
 all_md)
 	makedev wscons sd0 sd1 sd2 sd3 tty0 tty1
 	makedev st0 st1 ch0 cd0 cd1
 	makedev ss0 uk0 uk1
-	makedev bpf8 bpf9 bpf10 bpf11
 	makedev scsibus0 scsibus1 scsibus2 scsibus3
 	makedev ses0 ses1 ses2 ses3
 	;;

CVS commit: [netbsd-9] src/etc/etc.next68k

2023-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:54:53 UTC 2023

Modified Files:
src/etc/etc.next68k [netbsd-9]: MAKEDEV.conf

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1586):

etc/etc.next68k/MAKEDEV.conf: revision 1.6

Remove obsolete bpf entries not neceerary for clonified bpf(4).
Fixes "MAKEDEV: bpf8: unknown device" errors.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/etc/etc.next68k/MAKEDEV.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.bin/xlint/lint1

2023-02-06 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Mon Feb  6 20:26:05 UTC 2023

Modified Files:
src/usr.bin/xlint/lint1: Makefile
Removed Files:
src/usr.bin/xlint/lint1: Makefile.err-msgs-h

Log Message:
lint: inline separate Makefile


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.4 -r0 src/usr.bin/xlint/lint1/Makefile.err-msgs-h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/xlint/lint1/Makefile
diff -u src/usr.bin/xlint/lint1/Makefile:1.92 src/usr.bin/xlint/lint1/Makefile:1.93
--- src/usr.bin/xlint/lint1/Makefile:1.92	Tue Jul  5 22:50:41 2022
+++ src/usr.bin/xlint/lint1/Makefile	Mon Feb  6 20:26:05 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.92 2022/07/05 22:50:41 rillig Exp $
+#	$NetBSD: Makefile,v 1.93 2023/02/06 20:26:05 rillig Exp $
 
 .include 
 
@@ -76,7 +76,18 @@ LDADD+=		-ll
 DPADD+=		${LIBL}
 .endif
 
-.include "Makefile.err-msgs-h"
+err-msgs.h: err.c
+	${_MKTARGET_CREATE}
+	sp='[[:space:]]*'; \
+	from="^$$sp\(\".*\"\)\,$$sp/\*$$sp\(Q*[0-9][0-9]*\)$$sp\*/\$$"; \
+	${TOOL_SED} -n -e "s,$$from,#define MSG_\2 \1,p" < ${.ALLSRC:M*err.c} > ${.TARGET}.tmp
+	mv -f ${.TARGET}.tmp ${.TARGET}
+
+CLEANFILES+=	err-msgs.h
+DPSRCS+=	err-msgs.h
+CPPFLAGS+=	-I.
+
+externs1.h: err-msgs.h
 ${SRCS:Nerr.c}: err-msgs.h
 
 add-test: .PHONY

CVS commit: src/usr.bin/xlint/lint1

2023-02-06 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Mon Feb  6 20:26:05 UTC 2023

Modified Files:
src/usr.bin/xlint/lint1: Makefile
Removed Files:
src/usr.bin/xlint/lint1: Makefile.err-msgs-h

Log Message:
lint: inline separate Makefile


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.4 -r0 src/usr.bin/xlint/lint1/Makefile.err-msgs-h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.bin/xlint/lint1

2023-02-06 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Mon Feb  6 20:50:34 UTC 2023

Modified Files:
src/usr.bin/xlint/lint1: init.c

Log Message:
lint: condense code for handling initializations

Remove the assertion for a non-null initialization, as each code path
immediately dereferences it.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 src/usr.bin/xlint/lint1/init.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.bin/xlint/lint1

2023-02-06 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Mon Feb  6 20:50:34 UTC 2023

Modified Files:
src/usr.bin/xlint/lint1: init.c

Log Message:
lint: condense code for handling initializations

Remove the assertion for a non-null initialization, as each code path
immediately dereferences it.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 src/usr.bin/xlint/lint1/init.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/xlint/lint1/init.c
diff -u src/usr.bin/xlint/lint1/init.c:1.238 src/usr.bin/xlint/lint1/init.c:1.239
--- src/usr.bin/xlint/lint1/init.c:1.238	Fri Jan 13 19:41:50 2023
+++ src/usr.bin/xlint/lint1/init.c	Mon Feb  6 20:50:34 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.238 2023/01/13 19:41:50 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.239 2023/02/06 20:50:34 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -38,7 +38,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: init.c,v 1.238 2023/01/13 19:41:50 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.239 2023/02/06 20:50:34 rillig Exp $");
 #endif
 
 #include 
@@ -197,13 +197,12 @@ has_automatic_storage_duration(const sym
 static bool
 can_init_character_array(const type_t *ltp, const tnode_t *rn)
 {
-	tspec_t lst, rst;
 
 	if (!(ltp != NULL && ltp->t_tspec == ARRAY && rn->tn_op == STRING))
 		return false;
 
-	lst = ltp->t_subt->t_tspec;
-	rst = rn->tn_type->t_subt->t_tspec;
+	tspec_t lst = ltp->t_subt->t_tspec;
+	tspec_t rst = rn->tn_type->t_subt->t_tspec;
 
 	return rst == CHAR
 	? lst == CHAR || lst == UCHAR || lst == SCHAR
@@ -247,9 +246,8 @@ look_up_member(const type_t *tp, const c
 static void
 update_type_of_array_of_unknown_size(sym_t *sym, size_t size)
 {
-	type_t *tp;
 
-	tp = block_dup_type(sym->s_type);
+	type_t *tp = block_dup_type(sym->s_type);
 	tp->t_dim = (int)size;
 	tp->t_incomplete_array = false;
 	sym->s_type = tp;
@@ -274,12 +272,12 @@ check_bit_field_init(const tnode_t *ln, 
 static void
 check_non_constant_initializer(const tnode_t *tn, const sym_t *sym)
 {
-	const sym_t *unused_sym;
-	ptrdiff_t unused_offs;
 
 	if (tn == NULL || tn->tn_op == CON)
 		return;
 
+	const sym_t *unused_sym;
+	ptrdiff_t unused_offs;
 	if (constant_addr(tn, _sym, _offs))
 		return;
 
@@ -306,14 +304,11 @@ check_trad_no_auto_aggregate(const sym_t
 static void
 check_init_expr(const type_t *ltp, sym_t *lsym, tnode_t *rn)
 {
-	tnode_t *ln;
-	type_t *lutp;
-	tspec_t lt, rt;
 
-	lutp = expr_unqualified_type(ltp);
+	type_t *lutp = expr_unqualified_type(ltp);
 
 	/* Create a temporary node for the left side. */
-	ln = expr_zero_alloc(sizeof(*ln));
+	tnode_t *ln = expr_zero_alloc(sizeof(*ln));
 	ln->tn_op = NAME;
 	ln->tn_type = lutp;
 	ln->tn_lvalue = true;
@@ -321,8 +316,8 @@ check_init_expr(const type_t *ltp, sym_t
 
 	rn = cconv(rn);
 
-	lt = ln->tn_type->t_tspec;
-	rt = rn->tn_type->t_tspec;
+	tspec_t lt = ln->tn_type->t_tspec;
+	tspec_t rt = rn->tn_type->t_tspec;
 
 	debug_step("typeok '%s', '%s'",
 	type_name(ln->tn_type), type_name(rn->tn_type));
@@ -352,6 +347,7 @@ check_init_expr(const type_t *ltp, sym_t
 static const type_t *
 designator_type(const designator *dr, const type_t *tp)
 {
+
 	switch (tp->t_tspec) {
 	case STRUCT:
 	case UNION:
@@ -410,7 +406,6 @@ designator_debug(const designator *dr)
 static void
 designation_debug(const designation *dn)
 {
-	size_t i;
 
 	if (dn->dn_len == 0) {
 		debug_step("designation: (empty)");
@@ -419,7 +414,7 @@ designation_debug(const designation *dn)
 
 	debug_print_indent();
 	debug_printf("designation: ");
-	for (i = 0; i < dn->dn_len; i++)
+	for (size_t i = 0; i < dn->dn_len; i++)
 		designator_debug(dn->dn_items + i);
 	debug_printf("\n");
 }
@@ -439,7 +434,6 @@ static void
 designation_push(designation *dn, designator_kind kind,
 		 const sym_t *member, size_t subscript)
 {
-	designator *dr;
 
 	if (dn->dn_len == dn->dn_cap) {
 		dn->dn_cap += 4;
@@ -447,7 +441,7 @@ designation_push(designation *dn, design
 		dn->dn_cap * sizeof(dn->dn_items[0]));
 	}
 
-	dr = >dn_items[dn->dn_len++];
+	designator *dr = >dn_items[dn->dn_len++];
 	dr->dr_kind = kind;
 	dr->dr_member = member;
 	dr->dr_subscript = subscript;
@@ -486,9 +480,8 @@ designation_descend(designation *dn, con
 static const type_t *
 designation_type(const designation *dn, const type_t *tp)
 {
-	size_t i;
 
-	for (i = 0; i < dn->dn_len && tp != NULL; i++)
+	for (size_t i = 0; i < dn->dn_len && tp != NULL; i++)
 		tp = designator_type(dn->dn_items + i, tp);
 	return tp;
 }
@@ -496,9 +489,8 @@ designation_type(const designation *dn, 
 static const type_t *
 designation_parent_type(const designation *dn, const type_t *tp)
 {
-	size_t i;
 
-	for (i = 0; i + 1 < dn->dn_len && tp != NULL; i++)
+	for (size_t i = 0; i + 1 < dn->dn_len && tp != NULL; i++)
 		tp = designator_type(dn->dn_items + i, tp);
 	return tp;
 }
@@ -507,9 +499,8 @@ designation_parent_type(const

CVS commit: src/share/man/man4

2023-02-06 Thread David H. Gutteridge

Module Name:src
Committed By:   gutteridge
Date:   Tue Feb  7 01:17:41 UTC 2023

Modified Files:
src/share/man/man4: bpf.4

Log Message:
bpf.4: fix a garbled item heading

Make the BIOCSDIRECTION & BIOCGDIRECTION entry like those around it.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/share/man/man4/bpf.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/bpf.4
diff -u src/share/man/man4/bpf.4:1.65 src/share/man/man4/bpf.4:1.66
--- src/share/man/man4/bpf.4:1.65	Wed Nov 30 06:03:41 2022
+++ src/share/man/man4/bpf.4	Tue Feb  7 01:17:41 2023
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\"
-.\"	$NetBSD: bpf.4,v 1.65 2022/11/30 06:03:41 ozaki-r Exp $
+.\"	$NetBSD: bpf.4,v 1.66 2023/02/07 01:17:41 gutteridge Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1992, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -319,9 +319,7 @@ interface should be returned by BPF.
 Set to zero to see only incoming packets on the interface.
 Set to one to see packets originating locally and remotely on the interface.
 This flag is initialized to one by default.
-.It Dv BIOCSDIRECTION
-.It Dv BIOCGDIRECTION
-.Pq Li u_int
+.It Dv BIOCSDIRECTION , BIOCGDIRECTION Pq Li u_int
 Set or get the setting determining whether incoming, outgoing, or all packets
 on the interface should be returned by BPF.
 Set to

CVS commit: src/share/man/man4

2023-02-06 Thread David H. Gutteridge

Module Name:src
Committed By:   gutteridge
Date:   Tue Feb  7 01:17:41 UTC 2023

Modified Files:
src/share/man/man4: bpf.4

Log Message:
bpf.4: fix a garbled item heading

Make the BIOCSDIRECTION & BIOCGDIRECTION entry like those around it.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/share/man/man4/bpf.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/net

2023-02-06 Thread David H. Gutteridge

Module Name:src
Committed By:   gutteridge
Date:   Tue Feb  7 01:46:37 UTC 2023

Modified Files:
src/sys/net: bpf.c

Log Message:
bpf.c: fix a few typos and grammatical issues in comments


To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 src/sys/net/bpf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/net

2023-02-06 Thread David H. Gutteridge

Module Name:src
Committed By:   gutteridge
Date:   Tue Feb  7 01:46:37 UTC 2023

Modified Files:
src/sys/net: bpf.c

Log Message:
bpf.c: fix a few typos and grammatical issues in comments


To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 src/sys/net/bpf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.249 src/sys/net/bpf.c:1.250
--- src/sys/net/bpf.c:1.249	Wed Nov 30 06:02:37 2022
+++ src/sys/net/bpf.c	Tue Feb  7 01:46:37 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: bpf.c,v 1.249 2022/11/30 06:02:37 ozaki-r Exp $	*/
+/*	$NetBSD: bpf.c,v 1.250 2023/02/07 01:46:37 gutteridge Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.249 2022/11/30 06:02:37 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.250 2023/02/07 01:46:37 gutteridge Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_bpf.h"
@@ -417,7 +417,7 @@ bpf_movein(struct ifnet *ifp, struct uio
 		}
 	}
 
-	/* Insure the data is properly aligned */
+	/* Ensure the data is properly aligned */
 	if (align > 0)
 		m->m_data += align;
 
@@ -1759,7 +1759,7 @@ _bpf_mtap2(struct bpf_if *bp, void *data
 
 	/*
 	 * Craft on-stack mbuf suitable for passing to bpf_filter.
-	 * Note that we cut corners here; we only setup what's
+	 * Note that we cut corners here; we only set up what's
 	 * absolutely needed--this mbuf should never go anywhere else.
 	 */
 	(void)memset(, 0, sizeof(mb));
@@ -1834,7 +1834,7 @@ _bpf_mtap_af(struct bpf_if *bp, uint32_t
 /*
  * Put the SLIP pseudo-"link header" in place.
  * Note this M_PREPEND() should never fail,
- * swince we know we always have enough space
+ * since we know we always have enough space
  * in the input buffer.
  */
 static void
@@ -1985,7 +1985,7 @@ bpf_hdrlen(struct bpf_d *d)
 
 /*
  * Move the packet data from interface memory (pkt) into the
- * store buffer. Call the wakeup functions if it's time to wakeup
+ * store buffer. Call the wakeup functions if it's time to wake up
  * a listener (buffer full), "cpfn" is the routine called to do the
  * actual data transfer. memcpy is passed in to copy contiguous chunks,
  * while bpf_mcpy is passed in to copy mbuf chains.  In the latter case,

CVS commit: src

2023-02-06 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Mon Feb  6 21:01:56 UTC 2023

Modified Files:
src/tests/usr.bin/xlint/lint1: t_integration.sh
src/usr.bin/xlint/lint1: cgram.y externs1.h init.c

Log Message:
lint: eliminate unnecessary indirection

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/tests/usr.bin/xlint/lint1/t_integration.sh
cvs rdiff -u -r1.432 -r1.433 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.172 -r1.173 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.239 -r1.240 src/usr.bin/xlint/lint1/init.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/usr.bin/xlint/lint1/t_integration.sh
diff -u src/tests/usr.bin/xlint/lint1/t_integration.sh:1.76 src/tests/usr.bin/xlint/lint1/t_integration.sh:1.77
--- src/tests/usr.bin/xlint/lint1/t_integration.sh:1.76	Fri Jun 17 20:24:00 2022
+++ src/tests/usr.bin/xlint/lint1/t_integration.sh	Mon Feb  6 21:01:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_integration.sh,v 1.76 2022/06/17 20:24:00 rillig Exp $
+# $NetBSD: t_integration.sh,v 1.77 2023/02/06 21:01:55 rillig Exp $
 #
 # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -131,8 +131,7 @@ check_lint1()
 	fi
 
 	# shellcheck disable=SC2086
-	# XXX: -s 'exit:any' would be better
-	atf_check -s 'ignore' -o "save:$exp" \
+	atf_check -s 'exit' -o "save:$exp" \
 	"$lint1" $flags "$src" "$wrk_ln"
 	atf_check lua "$(atf_get_srcdir)/check-expect.lua" "$src"
 

Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.432 src/usr.bin/xlint/lint1/cgram.y:1.433
--- src/usr.bin/xlint/lint1/cgram.y:1.432	Sun Jan 29 18:13:56 2023
+++ src/usr.bin/xlint/lint1/cgram.y	Mon Feb  6 21:01:55 2023
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.432 2023/01/29 18:13:56 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.433 2023/02/06 21:01:55 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: cgram.y,v 1.432 2023/01/29 18:13:56 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.433 2023/02/06 21:01:55 rillig Exp $");
 #endif
 
 #include 
@@ -470,7 +470,7 @@ postfix_expression:
 		if (!allow_c99)
 			 /* compound literals are a C99/GCC extension */
 			 gnuism(319);
-		$$ = build_name(*current_initsym(), false);
+		$$ = build_name(current_initsym(), false);
 		end_initialization();
 	  }
 	| T_LPAREN compound_statement_lbrace {

Index: src/usr.bin/xlint/lint1/externs1.h
diff -u src/usr.bin/xlint/lint1/externs1.h:1.172 src/usr.bin/xlint/lint1/externs1.h:1.173
--- src/usr.bin/xlint/lint1/externs1.h:1.172	Sun Jan 29 18:13:56 2023
+++ src/usr.bin/xlint/lint1/externs1.h	Mon Feb  6 21:01:55 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: externs1.h,v 1.172 2023/01/29 18:13:56 rillig Exp $	*/
+/*	$NetBSD: externs1.h,v 1.173 2023/02/06 21:01:55 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -344,7 +344,7 @@ extern	void	bitfieldtype(int);
  */
 extern	void	begin_initialization(sym_t *);
 extern	void	end_initialization(void);
-extern	sym_t	**current_initsym(void);
+extern	sym_t	*current_initsym(void);
 
 extern	void	init_rbrace(void);
 extern	void	init_lbrace(void);

Index: src/usr.bin/xlint/lint1/init.c
diff -u src/usr.bin/xlint/lint1/init.c:1.239 src/usr.bin/xlint/lint1/init.c:1.240
--- src/usr.bin/xlint/lint1/init.c:1.239	Mon Feb  6 20:50:34 2023
+++ src/usr.bin/xlint/lint1/init.c	Mon Feb  6 21:01:55 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.239 2023/02/06 20:50:34 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.240 2023/02/06 21:01:55 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -38,7 +38,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: init.c,v 1.239 2023/02/06 20:50:34 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.240 2023/02/06 21:01:55 rillig Exp $");
 #endif
 
 #include 
@@ -1003,11 +1003,11 @@ done:
 static initialization *init;
 
 
-sym_t **
+sym_t *
 current_initsym(void)
 {
 
-	return >in_sym;
+	return init->in_sym;
 }
 
 void

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

2023-02-06 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Mon Feb  6 22:22:12 UTC 2023

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_subr.c

Log Message:
dtrace: re-fix aggregations to report from all online CPUs

Reapply the fix to dt_status() from rev 1.10
("Don't return success when the target CPU is offline")
which was lost in rev 1.12 ("sync with FreeBSD").
The FreeBSD version that we have been using since then does run on NetBSD
but always reports that CPU 0 is online and all other CPUs are offline,
because the sysctl that it uses does not exist on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.14 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.15
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.14	Sun Sep  6 21:49:32 2020
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c	Mon Feb  6 22:22:12 2023
@@ -49,6 +49,11 @@
 #include 
 #include 
 #include 
+#ifdef __NetBSD__
+#include 
+#include 
+#include 
+#endif
 
 #include 
 
@@ -501,6 +506,27 @@ dt_ioctl(dtrace_hdl_t *dtp, u_long val, 
 	return (-1);
 }
 
+#ifdef __NetBSD__
+static bool
+cpu_online(processorid_t cpu)
+{
+	cpustate_t cs;
+	int fd, online = false;
+
+	if ((fd = open(_PATH_CPUCTL, O_RDONLY)) < 0)
+		return false;
+
+	cs.cs_id = cpu;
+	if (ioctl(fd, IOC_CPU_GETSTATE, ) == 0) {
+		if (cs.cs_online)
+			online = true;
+	}
+
+	close(fd);
+	return online;
+}
+#endif
+
 int
 dt_status(dtrace_hdl_t *dtp, processorid_t cpu)
 {
@@ -509,7 +535,8 @@ dt_status(dtrace_hdl_t *dtp, processorid
 	if (v == NULL) {
 #ifdef illumos
 		return (p_online(cpu, P_STATUS));
-#else
+#endif
+#ifdef __FreeBSD__
 		int maxid = 0;
 		size_t len = sizeof(maxid);
 		if (sysctlbyname("kern.smp.maxid", , , NULL, 0) != 0)
@@ -517,6 +544,9 @@ dt_status(dtrace_hdl_t *dtp, processorid
 		else
 			return (cpu <= maxid ? 1 : -1);
 #endif
+#ifdef __NetBSD__
+		return cpu_online(cpu) ? 1 : -1;
+#endif
 	}
 
 	return (v->dtv_status(dtp->dt_varg, cpu));

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

2023-02-06 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Mon Feb  6 22:22:12 UTC 2023

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_subr.c

Log Message:
dtrace: re-fix aggregations to report from all online CPUs

Reapply the fix to dt_status() from rev 1.10
("Don't return success when the target CPU is offline")
which was lost in rev 1.12 ("sync with FreeBSD").
The FreeBSD version that we have been using since then does run on NetBSD
but always reports that CPU 0 is online and all other CPUs are offline,
because the sysctl that it uses does not exist on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src

2023-02-06 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Mon Feb  6 21:01:56 UTC 2023

Modified Files:
src/tests/usr.bin/xlint/lint1: t_integration.sh
src/usr.bin/xlint/lint1: cgram.y externs1.h init.c

Log Message:
lint: eliminate unnecessary indirection

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/tests/usr.bin/xlint/lint1/t_integration.sh
cvs rdiff -u -r1.432 -r1.433 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.172 -r1.173 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.239 -r1.240 src/usr.bin/xlint/lint1/init.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/tests/usr.bin/xlint/lint1

2023-02-06 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Mon Feb  6 21:20:58 UTC 2023

Modified Files:
src/tests/usr.bin/xlint/lint1: t_integration.sh

Log Message:
tests/lint: sync reference to platform properties generator


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/tests/usr.bin/xlint/lint1/t_integration.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/usr.bin/xlint/lint1/t_integration.sh
diff -u src/tests/usr.bin/xlint/lint1/t_integration.sh:1.77 src/tests/usr.bin/xlint/lint1/t_integration.sh:1.78
--- src/tests/usr.bin/xlint/lint1/t_integration.sh:1.77	Mon Feb  6 21:01:55 2023
+++ src/tests/usr.bin/xlint/lint1/t_integration.sh	Mon Feb  6 21:20:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_integration.sh,v 1.77 2023/02/06 21:01:55 rillig Exp $
+# $NetBSD: t_integration.sh,v 1.78 2023/02/06 21:20:58 rillig Exp $
 #
 # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -36,7 +36,7 @@ configure_test_case()
 	# shellcheck disable=SC2016
 	awk='
 		BEGIN {
-			# see usr.bin/xlint/arch/*/targparam.h
+			# see ./gen-platforms.sh
 			platform["aarch64"]	= "uchar lp64  long ldbl-128"
 			platform["alpha"]	= "schar lp64  long ldbl-64"
 			platform["arm"]		= "uchar ilp32 long ldbl-64"

CVS commit: src/tests/usr.bin/xlint/lint1

2023-02-06 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Mon Feb  6 21:20:58 UTC 2023

Modified Files:
src/tests/usr.bin/xlint/lint1: t_integration.sh

Log Message:
tests/lint: sync reference to platform properties generator


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/tests/usr.bin/xlint/lint1/t_integration.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server

2023-02-06 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Feb  7 04:45:32 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/dix: events.c
xsrc/external/mit/xorg-server/dist/os: access.c connection.c
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h

Log Message:
merge xorg-server 21.1.7.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/dix/events.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/os/access.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/os/connection.c
cvs rdiff -u -r1.48 -r1.49 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.28 -r1.29 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/configure
diff -u xsrc/external/mit/xorg-server/dist/configure:1.15 xsrc/external/mit/xorg-server/dist/configure:1.16
--- xsrc/external/mit/xorg-server/dist/configure:1.15	Sun Jan  8 00:24:51 2023
+++ xsrc/external/mit/xorg-server/dist/configure	Tue Feb  7 04:45:31 2023
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for xorg-server 21.1.6.
+# Generated by GNU Autoconf 2.71 for xorg-server 21.1.7.
 #
 # Report bugs to .
 #
@@ -682,8 +682,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='21.1.6'
-PACKAGE_STRING='xorg-server 21.1.6'
+PACKAGE_VERSION='21.1.7'
+PACKAGE_STRING='xorg-server 21.1.7'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -2000,7 +2000,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xorg-server 21.1.6 to adapt to many kinds of systems.
+\`configure' configures xorg-server 21.1.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2071,7 +2071,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 21.1.6:";;
+ short | recursive ) echo "Configuration of xorg-server 21.1.7:";;
esac
   cat <<\_ACEOF
 
@@ -2256,10 +2256,10 @@ Optional Packages:
   org.x)
   --with-bundle-version=VERSION
   Version to use for X11.app's CFBundleVersion
-  (default: 21.1.6)
+  (default: 21.1.7)
   --with-bundle-version-string=VERSION
   Version to use for X11.app's
-  CFBundleShortVersionString (default: 21.1.6)
+  CFBundleShortVersionString (default: 21.1.7)
   --with-sparkle-feed-url=URL
   URL for the Sparkle feed (default:
   https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2473,7 +2473,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 21.1.6
+xorg-server configure 21.1.7
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -3130,7 +3130,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xorg-server $as_me 21.1.6, which was
+It was created by xorg-server $as_me 21.1.7, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3887,7 +3887,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-RELEASE_DATE="2022-12-19"
+RELEASE_DATE="2023-02-07"
 RELEASE_NAME="Caramel Ice Cream"
 
 
@@ -4405,7 +4405,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='21.1.6'
+ VERSION='21.1.7'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -25180,7 +25180,7 @@ if test ${with_bundle_version+y}
 then :
   withval=$with_bundle_version;  BUNDLE_VERSION="${withval}"
 else $as_nop
-   BUNDLE_VERSION="21.1.6"
+   BUNDLE_VERSION="21.1.7"
 fi
 
 
@@ -26229,7 +26229,6 @@ printf "%s\n" "$xorg_cv_Carbon_framework
 			XVFB=no
 			XNEST=no
 
-			COMPOSITE=no
 			DGA=no
 			DPMSExtension=no
 			XF86VIDMODE=no
@@

CVS commit: xsrc/external/mit/xorg-server

2023-02-06 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Feb  7 04:45:32 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/dix: events.c
xsrc/external/mit/xorg-server/dist/os: access.c connection.c
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h

Log Message:
merge xorg-server 21.1.7.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/dix/events.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/os/access.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/os/connection.c
cvs rdiff -u -r1.48 -r1.49 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.28 -r1.29 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/mk

2023-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  7 04:46:00 UTC 2023

Modified Files:
src/share/mk: bsd.x11.mk

Log Message:
bump xorg-server version.


To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/share/mk/bsd.x11.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.148 src/share/mk/bsd.x11.mk:1.149
--- src/share/mk/bsd.x11.mk:1.148	Sun Jan  8 00:25:44 2023
+++ src/share/mk/bsd.x11.mk	Tue Feb  7 04:46:00 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.x11.mk,v 1.148 2023/01/08 00:25:44 mrg Exp $
+#	$NetBSD: bsd.x11.mk,v 1.149 2023/02/07 04:46:00 mrg Exp $
 
 .include 
 
@@ -134,7 +134,7 @@ XORG_VERSION_CURRENT="(((${XORG_SERVER_M
 .else
 XORG_SERVER_MAJOR=	21
 XORG_SERVER_MINOR=	1
-XORG_SERVER_TEENY=	6
+XORG_SERVER_TEENY=	7
 XORG_VERSION_CURRENT="((1000) + ((${XORG_SERVER_MAJOR}) * 10) + ((${XORG_SERVER_MINOR}) * 1000) + ${XORG_SERVER_TEENY})"
 .endif

CVS commit: src/share/mk

2023-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  7 04:46:00 UTC 2023

Modified Files:
src/share/mk: bsd.x11.mk

Log Message:
bump xorg-server version.


To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/share/mk/bsd.x11.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/mk

2023-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  7 04:53:54 UTC 2023

Modified Files:
src/share/mk: bsd.lib.mk

Log Message:
fix code attempting to skip adding "-g" if "-g*" already is used.

in bsd.lib.mk there's a check for "MKDEBUG != no" that will add
-g to CFLAGS (maybe) and to CSHLIBFLAGS (always), given that it
isn't in CFLAGS already.. except the conditional is "||" instead
of "&&" and since the MKDEBUG/NODEBUG checks pass, the CFLAGS
check isn't even performed.

additionally, check CXXFLAGS as well as CFLAGS.

this fixes the attempt to use "-g1" in the llvmrt build, which
fails because the compile lines end up being "... -g1 .. -g ..",
(the "-g" comes from the CSHLIBFLAGS variable in that case.)

this reduces the size of llvm-enabled gallium debug by ~1.5GiB
on amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.389 -r1.390 src/share/mk/bsd.lib.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/mk

2023-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  7 04:53:54 UTC 2023

Modified Files:
src/share/mk: bsd.lib.mk

Log Message:
fix code attempting to skip adding "-g" if "-g*" already is used.

in bsd.lib.mk there's a check for "MKDEBUG != no" that will add
-g to CFLAGS (maybe) and to CSHLIBFLAGS (always), given that it
isn't in CFLAGS already.. except the conditional is "||" instead
of "&&" and since the MKDEBUG/NODEBUG checks pass, the CFLAGS
check isn't even performed.

additionally, check CXXFLAGS as well as CFLAGS.

this fixes the attempt to use "-g1" in the llvmrt build, which
fails because the compile lines end up being "... -g1 .. -g ..",
(the "-g" comes from the CSHLIBFLAGS variable in that case.)

this reduces the size of llvm-enabled gallium debug by ~1.5GiB
on amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.389 -r1.390 src/share/mk/bsd.lib.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.389 src/share/mk/bsd.lib.mk:1.390
--- src/share/mk/bsd.lib.mk:1.389	Tue Mar 29 22:48:04 2022
+++ src/share/mk/bsd.lib.mk	Tue Feb  7 04:53:54 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.389 2022/03/29 22:48:04 christos Exp $
+#	$NetBSD: bsd.lib.mk,v 1.390 2023/02/07 04:53:54 mrg Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include 
@@ -169,8 +169,10 @@ MKSHLIBOBJS= yes
 MKSHLIBOBJS= no
 .endif
 
-.if (${MKDEBUG:Uno} != "no" && !defined(NODEBUG)) || \
-(defined(CFLAGS) && !empty(CFLAGS:M*-g*))
+# Avoid adding "-g" if we already have a "-g*" option.
+.if (${MKDEBUG:Uno} != "no" && !defined(NODEBUG)) && \
+(!defined(CFLAGS) || empty(CFLAGS:M-g*)) && \
+(!defined(CXXFLAGS) || empty(CXXFLAGS:M-g*))
 # We only add -g to the shared library objects
 # because we don't currently split .a archives.
 CSHLIBFLAGS+=	-g

CVS commit: src/external/mit/xorg/lib

2023-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  7 06:19:03 UTC 2023

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/gallium.old: Makefile

Log Message:
apply -g1 to the gallium sources as well.  saves another couple of 100MB.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/gallium.old/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/mit/xorg/lib

2023-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  7 06:19:03 UTC 2023

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/gallium.old: Makefile

Log Message:
apply -g1 to the gallium sources as well.  saves another couple of 100MB.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/gallium.old/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.48 src/external/mit/xorg/lib/gallium/Makefile:1.49
--- src/external/mit/xorg/lib/gallium/Makefile:1.48	Sun Jul 11 20:52:06 2021
+++ src/external/mit/xorg/lib/gallium/Makefile	Tue Feb  7 06:19:03 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2021/07/11 20:52:06 mrg Exp $
+# $NetBSD: Makefile,v 1.49 2023/02/07 06:19:03 mrg Exp $
 
 # Link the gallium mega driver.
 
@@ -28,6 +28,12 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libd
 CFLAGS+=	-pthread
 LDFLAGS+=	-pthread
 
+# Reduce debugging for these extremely large objects.
+.if ${MKDEBUG:Uno} != "no"
+CXXFLAGS+=	-g1
+CFLAGS+=	-g1
+.endif
+
 GALLIUM_SUBDIRS= \
 	auxiliary \
 	auxiliary/cso_cache \

Index: src/external/mit/xorg/lib/gallium.old/Makefile
diff -u src/external/mit/xorg/lib/gallium.old/Makefile:1.4 src/external/mit/xorg/lib/gallium.old/Makefile:1.5
--- src/external/mit/xorg/lib/gallium.old/Makefile:1.4	Thu Sep 29 18:58:04 2022
+++ src/external/mit/xorg/lib/gallium.old/Makefile	Tue Feb  7 06:19:03 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/09/29 18:58:04 rjs Exp $
+# $NetBSD: Makefile,v 1.5 2023/02/07 06:19:03 mrg Exp $
 
 # Transparent struct/union broken
 NOLINT=yes
@@ -31,6 +31,12 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libd
 CFLAGS+=	-pthread
 LDFLAGS+=	-pthread
 
+# Reduce debugging for these extremely large objects.
+.if ${MKDEBUG:Uno} != "no"
+CXXFLAGS+=	-g1
+CFLAGS+=	-g1
+.endif
+
 GALLIUM_SUBDIRS= \
 	auxiliary \
 	auxiliary/cso_cache \

CVS import: xsrc/external/mit/xorg-server/dist

2023-02-06 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Feb  7 04:30:20 UTC 2023

Update of /cvsroot/xsrc/external/mit/xorg-server/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv7038

Log Message:
initial import of xorg-server-21.1.7

Status:

Vendor Tag: xorg
Release Tags:   xorg-server-21-1-7

U xsrc/external/mit/xorg-server/dist/Makefile.am
C xsrc/external/mit/xorg-server/dist/configure
C xsrc/external/mit/xorg-server/dist/configure.ac
U xsrc/external/mit/xorg-server/dist/aclocal.m4
U xsrc/external/mit/xorg-server/dist/Makefile.in
U xsrc/external/mit/xorg-server/dist/xorg-server.pc.in
U xsrc/external/mit/xorg-server/dist/xserver.ent.in
U xsrc/external/mit/xorg-server/dist/COPYING
U xsrc/external/mit/xorg-server/dist/ChangeLog
U xsrc/external/mit/xorg-server/dist/INSTALL
U xsrc/external/mit/xorg-server/dist/README.md
U xsrc/external/mit/xorg-server/dist/compile
U xsrc/external/mit/xorg-server/dist/config.guess
U xsrc/external/mit/xorg-server/dist/config.sub
U xsrc/external/mit/xorg-server/dist/install-sh
U xsrc/external/mit/xorg-server/dist/ltmain.sh
U xsrc/external/mit/xorg-server/dist/missing
U xsrc/external/mit/xorg-server/dist/xorg-server.m4
U xsrc/external/mit/xorg-server/dist/autogen.sh
U xsrc/external/mit/xorg-server/dist/meson_options.txt
U xsrc/external/mit/xorg-server/dist/meson.build
U xsrc/external/mit/xorg-server/dist/devbook.am
U xsrc/external/mit/xorg-server/dist/docbook.am
U xsrc/external/mit/xorg-server/dist/manpages.am
U xsrc/external/mit/xorg-server/dist/depcomp
U xsrc/external/mit/xorg-server/dist/ylwrap
U xsrc/external/mit/xorg-server/dist/test-driver
U xsrc/external/mit/xorg-server/dist/composite/meson.build
U xsrc/external/mit/xorg-server/dist/composite/Makefile.am
U xsrc/external/mit/xorg-server/dist/composite/compositeext.h
U xsrc/external/mit/xorg-server/dist/composite/Makefile.in
U xsrc/external/mit/xorg-server/dist/composite/compalloc.c
U xsrc/external/mit/xorg-server/dist/composite/compext.c
U xsrc/external/mit/xorg-server/dist/composite/compint.h
U xsrc/external/mit/xorg-server/dist/composite/compinit.c
U xsrc/external/mit/xorg-server/dist/composite/compoverlay.c
U xsrc/external/mit/xorg-server/dist/composite/compwindow.c
U xsrc/external/mit/xorg-server/dist/config/meson.build
U xsrc/external/mit/xorg-server/dist/config/Makefile.am
U xsrc/external/mit/xorg-server/dist/config/Makefile.in
U xsrc/external/mit/xorg-server/dist/config/config.c
U xsrc/external/mit/xorg-server/dist/config/config-backends.h
U xsrc/external/mit/xorg-server/dist/config/dbus-core.c
U xsrc/external/mit/xorg-server/dist/config/udev.c
U xsrc/external/mit/xorg-server/dist/config/hal.c
U xsrc/external/mit/xorg-server/dist/config/wscons.c
U xsrc/external/mit/xorg-server/dist/config/x11-input.fdi
U xsrc/external/mit/xorg-server/dist/config/fdi2iclass.py
U xsrc/external/mit/xorg-server/dist/config/10-quirks.conf
U xsrc/external/mit/xorg-server/dist/damageext/meson.build
U xsrc/external/mit/xorg-server/dist/damageext/Makefile.am
U xsrc/external/mit/xorg-server/dist/damageext/Makefile.in
U xsrc/external/mit/xorg-server/dist/damageext/damageext.c
U xsrc/external/mit/xorg-server/dist/damageext/damageextint.h
U xsrc/external/mit/xorg-server/dist/dbe/meson.build
U xsrc/external/mit/xorg-server/dist/dbe/Makefile.am
U xsrc/external/mit/xorg-server/dist/dbe/dbestruct.h
U xsrc/external/mit/xorg-server/dist/dbe/Makefile.in
U xsrc/external/mit/xorg-server/dist/dbe/dbe.c
U xsrc/external/mit/xorg-server/dist/dbe/midbe.c
U xsrc/external/mit/xorg-server/dist/dbe/midbe.h
U xsrc/external/mit/xorg-server/dist/dix/meson.build
U xsrc/external/mit/xorg-server/dist/dix/Makefile.am
U xsrc/external/mit/xorg-server/dist/dix/protocol.txt
U xsrc/external/mit/xorg-server/dist/dix/Makefile.in
U xsrc/external/mit/xorg-server/dist/dix/atom.c
U xsrc/external/mit/xorg-server/dist/dix/colormap.c
U xsrc/external/mit/xorg-server/dist/dix/cursor.c
U xsrc/external/mit/xorg-server/dist/dix/devices.c
U xsrc/external/mit/xorg-server/dist/dix/dispatch.c
U xsrc/external/mit/xorg-server/dist/dix/dispatch.h
U xsrc/external/mit/xorg-server/dist/dix/dixfonts.c
U xsrc/external/mit/xorg-server/dist/dix/main.c
U xsrc/external/mit/xorg-server/dist/dix/dixutils.c
U xsrc/external/mit/xorg-server/dist/dix/enterleave.c
U xsrc/external/mit/xorg-server/dist/dix/enterleave.h
C xsrc/external/mit/xorg-server/dist/dix/events.c
U xsrc/external/mit/xorg-server/dist/dix/eventconvert.c
U xsrc/external/mit/xorg-server/dist/dix/extension.c
U xsrc/external/mit/xorg-server/dist/dix/gc.c
U xsrc/external/mit/xorg-server/dist/dix/getevents.c
U xsrc/external/mit/xorg-server/dist/dix/gestures.c
U xsrc/external/mit/xorg-server/dist/dix/globals.c
U xsrc/external/mit/xorg-server/dist/dix/glyphcurs.c
U xsrc/external/mit/xorg-server/dist/dix/grabs.c
U xsrc/external/mit/xorg-server/dist/dix/initatoms.c
U xsrc/external/mit/xorg-server/dist/dix/inpututils.c
U xsrc/external/mit/xorg-server/dist/dix/pixmap.c
U xsrc/external/mit/xorg-server/dist/dix/privates.c
U

CVS import: xsrc/external/mit/xorg-server/dist

2023-02-06 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Feb  7 04:30:20 UTC 2023

Update of /cvsroot/xsrc/external/mit/xorg-server/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv7038

Log Message:
initial import of xorg-server-21.1.7

Status:

Vendor Tag: xorg
Release Tags:   xorg-server-21-1-7

U xsrc/external/mit/xorg-server/dist/Makefile.am
C xsrc/external/mit/xorg-server/dist/configure
C xsrc/external/mit/xorg-server/dist/configure.ac
U xsrc/external/mit/xorg-server/dist/aclocal.m4
U xsrc/external/mit/xorg-server/dist/Makefile.in
U xsrc/external/mit/xorg-server/dist/xorg-server.pc.in
U xsrc/external/mit/xorg-server/dist/xserver.ent.in
U xsrc/external/mit/xorg-server/dist/COPYING
U xsrc/external/mit/xorg-server/dist/ChangeLog
U xsrc/external/mit/xorg-server/dist/INSTALL
U xsrc/external/mit/xorg-server/dist/README.md
U xsrc/external/mit/xorg-server/dist/compile
U xsrc/external/mit/xorg-server/dist/config.guess
U xsrc/external/mit/xorg-server/dist/config.sub
U xsrc/external/mit/xorg-server/dist/install-sh
U xsrc/external/mit/xorg-server/dist/ltmain.sh
U xsrc/external/mit/xorg-server/dist/missing
U xsrc/external/mit/xorg-server/dist/xorg-server.m4
U xsrc/external/mit/xorg-server/dist/autogen.sh
U xsrc/external/mit/xorg-server/dist/meson_options.txt
U xsrc/external/mit/xorg-server/dist/meson.build
U xsrc/external/mit/xorg-server/dist/devbook.am
U xsrc/external/mit/xorg-server/dist/docbook.am
U xsrc/external/mit/xorg-server/dist/manpages.am
U xsrc/external/mit/xorg-server/dist/depcomp
U xsrc/external/mit/xorg-server/dist/ylwrap
U xsrc/external/mit/xorg-server/dist/test-driver
U xsrc/external/mit/xorg-server/dist/composite/meson.build
U xsrc/external/mit/xorg-server/dist/composite/Makefile.am
U xsrc/external/mit/xorg-server/dist/composite/compositeext.h
U xsrc/external/mit/xorg-server/dist/composite/Makefile.in
U xsrc/external/mit/xorg-server/dist/composite/compalloc.c
U xsrc/external/mit/xorg-server/dist/composite/compext.c
U xsrc/external/mit/xorg-server/dist/composite/compint.h
U xsrc/external/mit/xorg-server/dist/composite/compinit.c
U xsrc/external/mit/xorg-server/dist/composite/compoverlay.c
U xsrc/external/mit/xorg-server/dist/composite/compwindow.c
U xsrc/external/mit/xorg-server/dist/config/meson.build
U xsrc/external/mit/xorg-server/dist/config/Makefile.am
U xsrc/external/mit/xorg-server/dist/config/Makefile.in
U xsrc/external/mit/xorg-server/dist/config/config.c
U xsrc/external/mit/xorg-server/dist/config/config-backends.h
U xsrc/external/mit/xorg-server/dist/config/dbus-core.c
U xsrc/external/mit/xorg-server/dist/config/udev.c
U xsrc/external/mit/xorg-server/dist/config/hal.c
U xsrc/external/mit/xorg-server/dist/config/wscons.c
U xsrc/external/mit/xorg-server/dist/config/x11-input.fdi
U xsrc/external/mit/xorg-server/dist/config/fdi2iclass.py
U xsrc/external/mit/xorg-server/dist/config/10-quirks.conf
U xsrc/external/mit/xorg-server/dist/damageext/meson.build
U xsrc/external/mit/xorg-server/dist/damageext/Makefile.am
U xsrc/external/mit/xorg-server/dist/damageext/Makefile.in
U xsrc/external/mit/xorg-server/dist/damageext/damageext.c
U xsrc/external/mit/xorg-server/dist/damageext/damageextint.h
U xsrc/external/mit/xorg-server/dist/dbe/meson.build
U xsrc/external/mit/xorg-server/dist/dbe/Makefile.am
U xsrc/external/mit/xorg-server/dist/dbe/dbestruct.h
U xsrc/external/mit/xorg-server/dist/dbe/Makefile.in
U xsrc/external/mit/xorg-server/dist/dbe/dbe.c
U xsrc/external/mit/xorg-server/dist/dbe/midbe.c
U xsrc/external/mit/xorg-server/dist/dbe/midbe.h
U xsrc/external/mit/xorg-server/dist/dix/meson.build
U xsrc/external/mit/xorg-server/dist/dix/Makefile.am
U xsrc/external/mit/xorg-server/dist/dix/protocol.txt
U xsrc/external/mit/xorg-server/dist/dix/Makefile.in
U xsrc/external/mit/xorg-server/dist/dix/atom.c
U xsrc/external/mit/xorg-server/dist/dix/colormap.c
U xsrc/external/mit/xorg-server/dist/dix/cursor.c
U xsrc/external/mit/xorg-server/dist/dix/devices.c
U xsrc/external/mit/xorg-server/dist/dix/dispatch.c
U xsrc/external/mit/xorg-server/dist/dix/dispatch.h
U xsrc/external/mit/xorg-server/dist/dix/dixfonts.c
U xsrc/external/mit/xorg-server/dist/dix/main.c
U xsrc/external/mit/xorg-server/dist/dix/dixutils.c
U xsrc/external/mit/xorg-server/dist/dix/enterleave.c
U xsrc/external/mit/xorg-server/dist/dix/enterleave.h
C xsrc/external/mit/xorg-server/dist/dix/events.c
U xsrc/external/mit/xorg-server/dist/dix/eventconvert.c
U xsrc/external/mit/xorg-server/dist/dix/extension.c
U xsrc/external/mit/xorg-server/dist/dix/gc.c
U xsrc/external/mit/xorg-server/dist/dix/getevents.c
U xsrc/external/mit/xorg-server/dist/dix/gestures.c
U xsrc/external/mit/xorg-server/dist/dix/globals.c
U xsrc/external/mit/xorg-server/dist/dix/glyphcurs.c
U xsrc/external/mit/xorg-server/dist/dix/grabs.c
U xsrc/external/mit/xorg-server/dist/dix/initatoms.c
U xsrc/external/mit/xorg-server/dist/dix/inpututils.c
U xsrc/external/mit/xorg-server/dist/dix/pixmap.c
U xsrc/external/mit/xorg-server/dist/dix/privates.c
U

CVS commit: xsrc/external/mit/beforelight/dist

2023-02-06 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Feb  7 05:05:51 UTC 2023

Added Files:
xsrc/external/mit/beforelight/dist: compile
Removed Files:
xsrc/external/mit/beforelight/dist: README

Log Message:
merge beforelight 1.0.6


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/beforelight/dist/README
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/beforelight/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/beforelight/dist

2023-02-06 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Feb  7 05:05:51 UTC 2023

Added Files:
xsrc/external/mit/beforelight/dist: compile
Removed Files:
xsrc/external/mit/beforelight/dist: README

Log Message:
merge beforelight 1.0.6


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/beforelight/dist/README
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/beforelight/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: xsrc/external/mit/beforelight/dist/compile
diff -u /dev/null xsrc/external/mit/beforelight/dist/compile:1.3
--- /dev/null	Tue Feb  7 05:05:51 2023
+++ xsrc/external/mit/beforelight/dist/compile	Tue Feb  7 05:05:51 2023
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to  or send patches to
+# .
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+/ | /[!/]*) # absolute file, and not a UNC file
+  if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	file_conv=mingw
+	;;
+	  CYGWIN*)
+	file_conv=cygwin
+	;;
+	  *)
+	file_conv=wine
+	;;
+	esac
+  fi
+  case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+  esac
+  ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+lib_path=$file
+  else
+lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+IFS=$save_IFS
+if $shared && test -f "$dir/$lib.dll.lib"; then
+  found=yes
+  lib=$dir/$lib.dll.lib
+  break
+fi
+if test -f "$dir/$lib.lib"; then
+  found=yes
+  lib=$dir/$lib.lib
+  break
+fi
+if test -f "$dir/lib$lib.a"; then
+  found=yes
+  lib=$dir/lib$lib.a
+  break
+fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+if test -n "$eat"; then
+  eat=
+else
+  case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	*.o | *.[oO][bB][jJ])
+	  func_file_conv "$2"
+	  set x "$@" -Fo"$file"
+	  shift
+	  ;;
+	*)
+	  func_file_conv "$2"
+	  set x "$@" -Fe"$file"
+	  shift
+	  ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+

CVS import: xsrc/external/mit/beforelight/dist

2023-02-06 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Feb  7 05:05:29 UTC 2023

Update of /cvsroot/xsrc/external/mit/beforelight/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv18059

Log Message:
initial import of beforelight-1.0.6

Status:

Vendor Tag: xorg
Release Tags:   beforelight-1-0-6

U xsrc/external/mit/beforelight/dist/missing
U xsrc/external/mit/beforelight/dist/depcomp
U xsrc/external/mit/beforelight/dist/Makefile.am
U xsrc/external/mit/beforelight/dist/config.sub
C xsrc/external/mit/beforelight/dist/compile
U xsrc/external/mit/beforelight/dist/config.guess
U xsrc/external/mit/beforelight/dist/COPYING
U xsrc/external/mit/beforelight/dist/Makefile.in
U xsrc/external/mit/beforelight/dist/b4light.c
U xsrc/external/mit/beforelight/dist/configure
U xsrc/external/mit/beforelight/dist/aclocal.m4
U xsrc/external/mit/beforelight/dist/install-sh
N xsrc/external/mit/beforelight/dist/README.md
U xsrc/external/mit/beforelight/dist/configure.ac
U xsrc/external/mit/beforelight/dist/ChangeLog
U xsrc/external/mit/beforelight/dist/config.h.in
U xsrc/external/mit/beforelight/dist/INSTALL
U xsrc/external/mit/beforelight/dist/man/Makefile.am
U xsrc/external/mit/beforelight/dist/man/beforelight.man
U xsrc/external/mit/beforelight/dist/man/Makefile.in
U xsrc/external/mit/beforelight/dist/app-defaults/Beforelight

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/beforelight/dist

CVS import: xsrc/external/mit/beforelight/dist

2023-02-06 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Feb  7 05:05:29 UTC 2023

Update of /cvsroot/xsrc/external/mit/beforelight/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv18059

Log Message:
initial import of beforelight-1.0.6

Status:

Vendor Tag: xorg
Release Tags:   beforelight-1-0-6

U xsrc/external/mit/beforelight/dist/missing
U xsrc/external/mit/beforelight/dist/depcomp
U xsrc/external/mit/beforelight/dist/Makefile.am
U xsrc/external/mit/beforelight/dist/config.sub
C xsrc/external/mit/beforelight/dist/compile
U xsrc/external/mit/beforelight/dist/config.guess
U xsrc/external/mit/beforelight/dist/COPYING
U xsrc/external/mit/beforelight/dist/Makefile.in
U xsrc/external/mit/beforelight/dist/b4light.c
U xsrc/external/mit/beforelight/dist/configure
U xsrc/external/mit/beforelight/dist/aclocal.m4
U xsrc/external/mit/beforelight/dist/install-sh
N xsrc/external/mit/beforelight/dist/README.md
U xsrc/external/mit/beforelight/dist/configure.ac
U xsrc/external/mit/beforelight/dist/ChangeLog
U xsrc/external/mit/beforelight/dist/config.h.in
U xsrc/external/mit/beforelight/dist/INSTALL
U xsrc/external/mit/beforelight/dist/man/Makefile.am
U xsrc/external/mit/beforelight/dist/man/beforelight.man
U xsrc/external/mit/beforelight/dist/man/Makefile.in
U xsrc/external/mit/beforelight/dist/app-defaults/Beforelight

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/beforelight/dist

CVS commit: xsrc/external/mit/xorg-server.old/dist/Xi

2023-02-06 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Feb  7 07:29:44 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server.old/dist/Xi: exevents.c

Log Message:
pullover fix from xorg-server 21.1.7:

https://gitlab.freedesktop.org/xorg/xserver/-/commit/0ba6d8c37071131a49790243cdac55392ecf71ec

Xi: fix potential use-after-free in DeepCopyPointerClasses

CVE-2023-0494, ZDI-CAN-19596

This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative

Signed-off-by: Peter Hutterer's avatarPeter Hutterer 


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/Xi/exevents.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server.old/dist/Xi

2023-02-06 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Feb  7 07:29:44 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server.old/dist/Xi: exevents.c

Log Message:
pullover fix from xorg-server 21.1.7:

https://gitlab.freedesktop.org/xorg/xserver/-/commit/0ba6d8c37071131a49790243cdac55392ecf71ec

Xi: fix potential use-after-free in DeepCopyPointerClasses

CVE-2023-0494, ZDI-CAN-19596

This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative

Signed-off-by: Peter Hutterer's avatarPeter Hutterer 


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/Xi/exevents.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server.old/dist/Xi/exevents.c
diff -u xsrc/external/mit/xorg-server.old/dist/Xi/exevents.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/Xi/exevents.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/Xi/exevents.c:1.1.1.1	Thu Jun  9 09:07:56 2016
+++ xsrc/external/mit/xorg-server.old/dist/Xi/exevents.c	Tue Feb  7 07:29:44 2023
@@ -586,8 +586,10 @@ DeepCopyPointerClasses(DeviceIntPtr from
 }
 memcpy(to->button->xkb_acts, from->button->xkb_acts,
 sizeof(XkbAction));
-} else
+} else {
 free(to->button->xkb_acts);
+to->button->xkb_acts = NULL;
+	}
 
  memcpy(to->button->labels, from->button->labels,
 from->button->numButtons * sizeof(Atom));

58 matches

Mail list logo