CVS commit: src/sys/dev

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sat Jul 16 06:52:41 UTC 2022

Modified Files:
src/sys/dev/ic: mfireg.h
src/sys/dev/pci: mfii.c

Log Message:
Add max 256 VD support.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ic/mfireg.h
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/mfii.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/dev/ic/mfireg.h
diff -u src/sys/dev/ic/mfireg.h:1.23 src/sys/dev/ic/mfireg.h:1.24
--- src/sys/dev/ic/mfireg.h:1.23	Sat Jul  9 11:44:57 2022
+++ src/sys/dev/ic/mfireg.h	Sat Jul 16 06:52:40 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mfireg.h,v 1.23 2022/07/09 11:44:57 msaitoh Exp $ */
+/* $NetBSD: mfireg.h,v 1.24 2022/07/16 06:52:40 msaitoh Exp $ */
 /* $OpenBSD: mfireg.h,v 1.24 2006/06/19 19:05:45 marco Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom 
@@ -809,7 +809,23 @@ struct mfi_ctrl_props {
 		uint32_t	allowBootWithPinnedCache	:1;
 		uint32_t	disableSpinDownHS		:1;
 		uint32_t	enableJBOD			:1;
-		uint32_t	reserved			:18;
+		uint32_t	disableCacheBypass		:1;
+		uint32_t	useDiskActivityForLocate	:1;
+		uint32_t	enablePI			:1;
+		uint32_t	preventPIImport			:1;
+		uint32_t	useGlobalSparesForEmergency	:1;
+		uint32_t	useUnconfGoodForEmergency	:1;
+		uint32_t	useEmergencySparesforSMARTer	:1;
+		uint32_t	forceSGPIOForQuadOnly		:1;
+		uint32_t	enableConfigAutoBalance		:1;
+		uint32_t	enableVirtualCache		:1;
+		uint32_t	enableAutoLockRecovery		:1;
+		uint32_t	disableImmediateIO		:1;
+		uint32_t	disableT10RebuildAssist		:1;
+		uint32_t	ignore64ldRestriction		:1;
+		uint32_t	enableSwZone			:1;
+		uint32_t	limitMaxRateSATA3G		:1;
+		uint32_t	reserved			:2;
 	} OnOffProperties;
 	/*
 	 * % of source LD to be reserved for auto snapshot in snapshot
@@ -967,7 +983,111 @@ struct mfi_ctrl_info {
 	uint8_t			mci_reserved2[11];
 	struct mfi_ctrl_props	mci_properties;
 	char			mci_package_version[0x60];
-	uint8_t			mci_pad[0x800 - 0x6a0];
+
+	uint64_t		mci_dev_iface_port_addr2[8];
+	uint8_t			mci_reserved3[128];
+
+	struct {
+		uint16_t raid_level_0;
+		uint16_t raid_level_1;
+		uint16_t raid_level_5;
+		uint16_t raid_level_1e;
+		uint16_t raid_level_6;
+		uint16_t raid_level_10;
+		uint16_t raid_level_50;
+		uint16_t raid_level_60;
+		uint16_t raid_level_1e_rlq0;
+		uint16_t raid_level_1e0_rlq0;
+		uint16_t reserved[6];
+	} __packed		mci_pds_for_raid_levels;
+
+	uint16_t		mci_max_pds;
+	uint16_t		mci_max_ded_hsps;
+	uint16_t		mci_max_global_hsps;
+	uint16_t		mci_ddf_size;
+	uint8_t			mci_max_lds_per_array;
+	uint8_t			mci_partitions_in_ddf;
+	uint8_t			mci_lock_key_binding;
+	uint8_t			mci_max_pits_per_ld;
+	uint8_t			mci_max_views_per_ld;
+	uint8_t			mci_max_target_id;
+	uint16_t		mci_max_bvl_vd_size;
+
+	uint16_t		mci_max_configurable_ssc_size;
+	uint16_t		mci_current_ssc_size;
+
+	char			mci_expander_fw_version[12];
+
+	uint16_t		mci_pfk_trial_time_remaining;
+	uint16_t		mci_cache_memory_size;
+
+	uint32_t		mci_adapter_ops2;
+#define MFI_INFO_AOPS2_SUPP_PI_CTRL	0x0001
+#define MFI_INFO_AOPS2_SUPP_LD_PIT1	0x0002
+#define MFI_INFO_AOPS2_SUPP_LD_PIT2	0x0004
+#define MFI_INFO_AOPS2_SUPP_LD_PIT3	0x0008
+#define MFI_INFO_AOPS2_SUPP_LD_BBMI	0x0010
+#define MFI_INFO_AOPS2_SUPP_SHIELD_STAT	0x0020
+#define MFI_INFO_AOPS2_BLK_SSD_WC_CNG	0x0040
+#define MFI_INFO_AOPS2_SUPP_SUSPRES_BGO	0x0080
+#define MFI_INFO_AOPS2_SUPP_EMERG_SPARE	0x0100
+#define MFI_INFO_AOPS2_SUPP_SET_LNKSPD	0x0200
+#define MFI_INFO_AOPS2_SUPP_BT_PFK_CNG	0x0400
+#define MFI_INFO_AOPS2_SUPP_JBOD	0x0800
+#define MFI_INFO_AOPS2_DIS_ONLN_PFK_CNG	0x1000
+#define MFI_INFO_AOPS2_SUPP_PERF_TUNE	0x2000
+#define MFI_INFO_AOPS2_SUPP_SSD_PREAD	0x4000
+#define MFI_INFO_AOPS2_RT_SCHED		0x8000
+#define MFI_INFO_AOPS2_SUPP_RESET_NOW	0x0001
+#define MFI_INFO_AOPS2_SUPP_EMU_DRIVE	0x0002
+#define MFI_INFO_AOPS2_HEADLESS_MODE	0x0004
+#define MFI_INFO_AOPS2_DEDIC_HSPARE_LIM	0x0008
+#define MFI_INFO_AOPS2_SUPP_UNEVEN_SPAN	0x0010
+
+	uint8_t			mci_drv_version[32];
+	uint8_t			mci_max_da_pd_count_spinup_60;
+	uint8_t			mci_temperature_roc;
+	uint8_t			mci_temperature_ctrl;
+	uint8_t			mci_reserved4;
+	uint16_t		mci_max_configurable_pds;
+	uint8_t			mci_reserved5[2];
+
+	uint32_t		cluster;
+
+	char			cluster_id[16];
+	char			reserved6[4];
+
+	uint32_t		mci_adapter_ops3;
+#define MFI_INFO_AOPS3_SUPP_PERSONALTY_CHANGE	0x0003
+#define MFI_INFO_AOPS3_SUPP_THERMAL_POLL_INTVL	0x0004
+#define MFI_INFO_AOPS3_SUPP_DIS_IMMEDIATE_IO	0x0008
+#define MFI_INFO_AOPS3_SUPP_T10_REBUILD_ASSIST	0x0010
+#define MFI_INFO_AOPS3_SUPP_MAX_EXT_LDS		0x0020
+#define MFI_INFO_AOPS3_SUPP_CRASH_DUMP		0x0040
+#define MFI_INFO_AOPS3_SUPP_SW_SONE		0x0080
+#define MFI_INFO_AOPS3_SUPP_DEBUG_QUEUE		0x0100
+#define MFI_INFO_AOPS3_SUPP_NVCACHE_ERASE	0x0200
+#define MFI_INFO_AOPS3_SUPP_FORCE_TO_512E	0x0400
+#define MFI_INFO_A

CVS commit: src/sys/dev

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sat Jul 16 06:52:41 UTC 2022

Modified Files:
src/sys/dev/ic: mfireg.h
src/sys/dev/pci: mfii.c

Log Message:
Add max 256 VD support.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ic/mfireg.h
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/mfii.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/x86/x86

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Sat Jul 16 06:27:24 UTC 2022

Modified Files:
src/sys/arch/x86/x86: genfb_machdep.c

Log Message:
Use pixel format information from bootloader.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x86/x86/genfb_machdep.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/x86/x86/genfb_machdep.c
diff -u src/sys/arch/x86/x86/genfb_machdep.c:1.16 src/sys/arch/x86/x86/genfb_machdep.c:1.17
--- src/sys/arch/x86/x86/genfb_machdep.c:1.16	Thu Jan 28 01:57:31 2021
+++ src/sys/arch/x86/x86/genfb_machdep.c	Sat Jul 16 06:27:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_machdep.c,v 1.16 2021/01/28 01:57:31 jmcneill Exp $ */
+/* $NetBSD: genfb_machdep.c,v 1.17 2022/07/16 06:27:24 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 2009 Jared D. McNeill 
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.16 2021/01/28 01:57:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.17 2022/07/16 06:27:24 mlelstv Exp $");
 
 #include 
 #include 
@@ -141,6 +141,12 @@ x86_genfb_init(void)
 	ri->ri_height = fbinfo->height;
 	ri->ri_depth = fbinfo->depth;
 	ri->ri_stride = fbinfo->stride;
+	ri->ri_rnum = fbinfo->rnum;
+	ri->ri_gnum = fbinfo->gnum;
+	ri->ri_bnum = fbinfo->bnum;
+	ri->ri_rpos = fbinfo->rpos;
+	ri->ri_gpos = fbinfo->gpos;
+	ri->ri_bpos = fbinfo->bpos;
 	if (x86_genfb_use_shadowfb && lookup_bootinfo(BTINFO_EFI) != NULL) {
 		/* XXX The allocated memory is never released... */
 		ri->ri_bits = kmem_alloc(ri->ri_stride * ri->ri_height,

CVS commit: src/sys/arch/x86/x86

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Sat Jul 16 06:27:24 UTC 2022

Modified Files:
src/sys/arch/x86/x86: genfb_machdep.c

Log Message:
Use pixel format information from bootloader.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x86/x86/genfb_machdep.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

[Tetsuya Isaki]

Module Name:src
Committed By:   isaki
Date:   Sat Jul 16 04:55:35 UTC 2022

Modified Files:
src/sys/arch/x68k/dev: powsw.c
src/sys/arch/x68k/x68k: machdep.c

Log Message:
The system should halt if the powerdown fails.
On X680x0 hardware, front power button is an alternate switch.
If the power button is left on, the power will not turn off.
In addition, with this change, power_switch_is_off in powsw.c is
no longer necessary.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x68k/dev/powsw.c
cvs rdiff -u -r1.208 -r1.209 src/sys/arch/x68k/x68k/machdep.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

[Tetsuya Isaki]

Module Name:src
Committed By:   isaki
Date:   Sat Jul 16 04:55:35 UTC 2022

Modified Files:
src/sys/arch/x68k/dev: powsw.c
src/sys/arch/x68k/x68k: machdep.c

Log Message:
The system should halt if the powerdown fails.
On X680x0 hardware, front power button is an alternate switch.
If the power button is left on, the power will not turn off.
In addition, with this change, power_switch_is_off in powsw.c is
no longer necessary.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x68k/dev/powsw.c
cvs rdiff -u -r1.208 -r1.209 src/sys/arch/x68k/x68k/machdep.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/dev/powsw.c
diff -u src/sys/arch/x68k/dev/powsw.c:1.3 src/sys/arch/x68k/dev/powsw.c:1.4
--- src/sys/arch/x68k/dev/powsw.c:1.3	Sat Jul 16 04:49:07 2022
+++ src/sys/arch/x68k/dev/powsw.c	Sat Jul 16 04:55:35 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: powsw.c,v 1.3 2022/07/16 04:49:07 isaki Exp $	*/
+/*	$NetBSD: powsw.c,v 1.4 2022/07/16 04:55:35 isaki Exp $	*/
 
 /*
  * Copyright (c) 2011 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: powsw.c,v 1.3 2022/07/16 04:49:07 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: powsw.c,v 1.4 2022/07/16 04:55:35 isaki Exp $");
 
 #include 
 #include 
@@ -50,8 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: powsw.c,v 1.
 
 #include "ioconf.h"
 
-extern int power_switch_is_off;		/* XXX should be in .h */
-
 //#define POWSW_DEBUG
 
 #if defined(POWSW_DEBUG)
@@ -96,7 +94,6 @@ static void powsw_attach(device_t, devic
 static int  powsw_intr(void *);
 static void powsw_softintr(void *);
 static void powsw_pswitch_event(void *);
-static void powsw_shutdown_check(void *);
 static void powsw_reset_counter(struct powsw_softc *);
 static void powsw_set_aer(struct powsw_softc *, int);
 
@@ -152,9 +149,6 @@ powsw_attach(device_t parent, device_t s
 	callout_init(&sc->sc_callout, 0);
 	callout_setfunc(&sc->sc_callout, powsw_softintr, sc);
 
-	if (shutdownhook_establish(powsw_shutdown_check, sc) == NULL)
-		panic("%s: can't establish shutdown hook", xname);
-
 	if (intio_intr_establish(desc->vector, xname, powsw_intr, sc) < 0)
 		panic("%s: can't establish interrupt", xname);
 
@@ -256,19 +250,6 @@ powsw_pswitch_event(void *arg)
 }
 
 static void
-powsw_shutdown_check(void *arg)
-{
-	struct powsw_softc *sc = arg;
-	int poweroff;
-
-	poweroff = sc->sc_prev;
-	if (poweroff)
-		power_switch_is_off = 1;
-	DPRINTF("powsw_shutdown_check %s = %d\n",
-	device_xname(sc->sc_dev), power_switch_is_off);
-}
-
-static void
 powsw_reset_counter(struct powsw_softc *sc)
 {
 

Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.208 src/sys/arch/x68k/x68k/machdep.c:1.209
--- src/sys/arch/x68k/x68k/machdep.c:1.208	Sat Jun 25 08:19:01 2022
+++ src/sys/arch/x68k/x68k/machdep.c	Sat Jul 16 04:55:35 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.208 2022/06/25 08:19:01 isaki Exp $	*/
+/*	$NetBSD: machdep.c,v 1.209 2022/07/16 04:55:35 isaki Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.208 2022/06/25 08:19:01 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.209 2022/07/16 04:55:35 isaki Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -482,7 +482,6 @@ SYSCTL_SETUP(sysctl_machdep_setup, "sysc
 }
 
 int	waittime = -1;
-int	power_switch_is_off = 0;
 
 void
 cpu_reboot(int howto, char *bootstr)
@@ -529,7 +528,6 @@ cpu_reboot(int howto, char *bootstr)
 	/* a) RB_POWERDOWN
 	 *  a1: the power switch is still on
 	 *	Power cannot be removed; simply halt the system (b)
-	 *	Power switch state is checked in shutdown hook
 	 *  a2: the power switch is off
 	 *	Remove the power
 	 * b) RB_HALT
@@ -537,7 +535,7 @@ cpu_reboot(int howto, char *bootstr)
 	 * c) otherwise
 	 *	Reboot
 	 */
-	if (((howto & RB_POWERDOWN) == RB_POWERDOWN) && power_switch_is_off) {
+	if ((howto & RB_POWERDOWN) == RB_POWERDOWN) {
 		printf("powering off...\n");
 		delay(100);
 
@@ -548,10 +546,8 @@ cpu_reboot(int howto, char *bootstr)
 		intio_set_sysport_powoff(0x0f);
 		intio_set_sysport_powoff(0x0f);
 		delay(100);
-		printf("WARNING: powerdown failed\n");
-		delay(100);
-		/* PASSTHROUGH even if came back */
-	} else if ((howto & RB_HALT) == RB_HALT) {
+	}
+	if ((howto & RB_HALT) != 0) {
 		printf("System halted.  Hit any key to reboot.\n\n");
 		cnpollc(1);
 		(void)cngetc();

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

[Tetsuya Isaki]

Module Name:src
Committed By:   isaki
Date:   Sat Jul 16 04:49:07 UTC 2022

Modified Files:
src/sys/arch/x68k/dev: powsw.c

Log Message:
Style fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/dev/powsw.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/dev

[Tetsuya Isaki]

Module Name:src
Committed By:   isaki
Date:   Sat Jul 16 04:49:07 UTC 2022

Modified Files:
src/sys/arch/x68k/dev: powsw.c

Log Message:
Style fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/dev/powsw.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/dev/powsw.c
diff -u src/sys/arch/x68k/dev/powsw.c:1.2 src/sys/arch/x68k/dev/powsw.c:1.3
--- src/sys/arch/x68k/dev/powsw.c:1.2	Thu May 26 14:33:29 2022
+++ src/sys/arch/x68k/dev/powsw.c	Sat Jul 16 04:49:07 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: powsw.c,v 1.2 2022/05/26 14:33:29 tsutsui Exp $	*/
+/*	$NetBSD: powsw.c,v 1.3 2022/07/16 04:49:07 isaki Exp $	*/
 
 /*
  * Copyright (c) 2011 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: powsw.c,v 1.2 2022/05/26 14:33:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: powsw.c,v 1.3 2022/07/16 04:49:07 isaki Exp $");
 
 #include 
 #include 
@@ -55,7 +55,7 @@ extern int power_switch_is_off;		/* XXX 
 //#define POWSW_DEBUG
 
 #if defined(POWSW_DEBUG)
-#define DPRINTF(fmt...)	printf(fmt)
+#define DPRINTF(fmt...)		printf(fmt)
 #define DEBUG_LOG_ADD(c)	sc->sc_log[sc->sc_loglen++] = (c)
 #define DEBUG_LOG_PRINT()	do {	\
 	sc->sc_log[sc->sc_loglen] = '\0';	\
@@ -69,12 +69,12 @@ extern int power_switch_is_off;		/* XXX 
 
 /* mask */
 #define POWSW_ALARM		(0x01)
-#define POWSW_EXTERNAL	(0x02)
+#define POWSW_EXTERNAL		(0x02)
 #define POWSW_FRONT		(0x04)
 
 /* parameter */
-#define POWSW_MAX_TICK	(30)
-#define POWSW_THRESHOLD	(10)
+#define POWSW_MAX_TICK		(30)
+#define POWSW_THRESHOLD		(10)
 
 struct powsw_softc {
 	device_t sc_dev;
@@ -111,7 +111,7 @@ typedef const struct {
 } powsw_desc_t;
 
 static powsw_desc_t powsw_desc[2] = {
-	{ 66, POWSW_FRONT,		"Front Switch", },
+	{ 66, POWSW_FRONT,	"Front Switch", },
 	{ 65, POWSW_EXTERNAL,	"External Power Switch", },
 	/* XXX I'm not sure about alarm bit */
 };
@@ -120,6 +120,7 @@ static powsw_desc_t powsw_desc[2] = {
 static int
 powsw_match(device_t parent, cfdata_t cf, void *aux)
 {
+
 	return 1;
 }
 
@@ -223,7 +224,8 @@ powsw_softintr(void *arg)
 
 		if (sc->sc_last_sw == sc->sc_prev) {
 			/* switch state is not changed, it was a noise */
-			DPRINTF(" ignore(sw=%d,prev=%d)\n", sc->sc_last_sw, sc->sc_prev);
+			DPRINTF(" ignore(sw=%d,prev=%d)\n",
+			sc->sc_last_sw, sc->sc_prev);
 		} else {
 			/* switch state has been changed */
 			sc->sc_prev = sc->sc_last_sw;
@@ -231,7 +233,8 @@ powsw_softintr(void *arg)
 			sysmon_task_queue_sched(0, powsw_pswitch_event, sc);
 		}
 		powsw_reset_counter(sc);
-		mfp_bit_set_ierb(sc->sc_mask);	// enable interrupt
+		/* enable interrupt */
+		mfp_bit_set_ierb(sc->sc_mask);
 	}
 
 	splx(s);
@@ -249,7 +252,7 @@ powsw_pswitch_event(void *arg)
 	poweroff ? "off(PRESS)" : "on(RELEASE)");
 
 	sysmon_pswitch_event(&sc->sc_smpsw,
-		poweroff ? PSWITCH_EVENT_PRESSED : PSWITCH_EVENT_RELEASED);
+	poweroff ? PSWITCH_EVENT_PRESSED : PSWITCH_EVENT_RELEASED);
 }
 
 static void
@@ -262,12 +265,13 @@ powsw_shutdown_check(void *arg)
 	if (poweroff)
 		power_switch_is_off = 1;
 	DPRINTF("powsw_shutdown_check %s = %d\n",
-		device_xname(sc->sc_dev), power_switch_is_off);
+	device_xname(sc->sc_dev), power_switch_is_off);
 }
 
 static void
 powsw_reset_counter(struct powsw_softc *sc)
 {
+
 	sc->sc_last_sw = -1;
 	sc->sc_tick = 0;
 	sc->sc_count = 0;
@@ -279,6 +283,7 @@ powsw_reset_counter(struct powsw_softc *
 static void
 powsw_set_aer(struct powsw_softc *sc, int aer)
 {
+
 	KASSERT(aer == 0 || aer == 1);
 
 	if (aer == 0) {

re: CVS commit: xsrc/external/mit/xorg-server/dist/hw

[matthew green]

"Izumi Tsutsui" writes:
> Module Name:  xsrc
> Committed By: tsutsui
> Date: Sat Jul 16 00:02:18 UTC 2022
>
> Modified Files:
>   xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c
>   xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c
>
> Log Message:
> Merge AbortDDX() into ddxGiveUp() as other upstream DDX servers.
>
> https://gitlab.freedesktop.org/xorg/xserver/-/commit/a23eba2a91024d27da45e5aee1f4215f7ec2ae82
> > These are so close to identical that most DDXes implement one in terms
> > of the other. All the relevant cases can be distinguished by the error
> > code, so merge the functions together to make things simpler.

thanks.  i didn't want to go further than necessary to
unbreak builds etc, but i did consider this too.


.mrg.m

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

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 16 00:02:18 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c

Log Message:
Merge AbortDDX() into ddxGiveUp() as other upstream DDX servers.

https://gitlab.freedesktop.org/xorg/xserver/-/commit/a23eba2a91024d27da45e5aee1f4215f7ec2ae82
> These are so close to identical that most DDXes implement one in terms
> of the other. All the relevant cases can be distinguished by the error
> code, so merge the functions together to make things simpler.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.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/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.11 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.12
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.11	Fri Jul 15 19:10:11 2022
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c	Sat Jul 16 00:02:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.11 2022/07/15 19:10:11 mrg Exp $ */
+/* $NetBSD: x68kInit.c,v 1.12 2022/07/16 00:02:18 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -182,14 +182,14 @@ CloseInput(void)
 }
 
 /*-
- * function "AbortDDX" [ called by OS ]
+ * function "ddxGiveUp" [ called by DIX ]
  *
  *  purpose:  free signal handler and close frame buffers
  *  argument: ExitCode
  *  returns:  nothing
  *---*/
-static void
-AbortDDX(enum ExitCode error)
+void
+ddxGiveUp(enum ExitCode error)
 {
 int i;
 X68kScreenRec *screen;
@@ -208,19 +208,6 @@ AbortDDX(enum ExitCode error)
 }
 
 /*-
- * function "ddxGiveUp" [ called by DIX ]
- *
- *  purpose:  do nothing but call AbortDDX.
- *  argument: nothing
- *  returns:  nothing
- *---*/
-void
-ddxGiveUp(enum ExitCode error)
-{
-AbortDDX(error);
-}
-
-/*-
  * function "ddxProcessArgument"[ called by OS ]
  *
  *  purpose:  process X68k dependent arguments

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.8	Fri Jul 15 19:10:11 2022
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c	Sat Jul 16 00:02:18 2022
@@ -155,11 +155,18 @@ sunEnqueueEvents(void)
 }
 }
 
-/*
- * DDX - specific abort routine.  Called by AbortServer().
- */
-static void
-AbortDDX(enum ExitCode error)
+#if INPUTTHREAD
+/** This function is called in Xserver/os/inputthread.c when starting
+the input thread. */
+void
+ddxInputThreadInit(void)
+{
+}
+#endif
+
+/* Called by AbortServer(). */
+void
+ddxGiveUp(enum ExitCode error)
 {
 int		i;
 ScreenPtr	pScreen;
@@ -185,22 +192,6 @@ AbortDDX(enum ExitCode error)
 LogClose(error);
 }
 
-#if INPUTTHREAD
-/** This function is called in Xserver/os/inputthread.c when starting
-the input thread. */
-void
-ddxInputThreadInit(void)
-{
-}
-#endif
-
-/* Called by GiveUp(). */
-void
-ddxGiveUp(enum ExitCode error)
-{
-AbortDDX(error);
-}
-
 int
 ddxProcessArgument(int argc, char *argv[], int i)
 {

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

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 16 00:02:18 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c

Log Message:
Merge AbortDDX() into ddxGiveUp() as other upstream DDX servers.

https://gitlab.freedesktop.org/xorg/xserver/-/commit/a23eba2a91024d27da45e5aee1f4215f7ec2ae82
> These are so close to identical that most DDXes implement one in terms
> of the other. All the relevant cases can be distinguished by the error
> code, so merge the functions together to make things simpler.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c

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

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

[matthew green]

> These changes cause build errors on at least sun3 servers:
>  https://releng.netbsd.org/builds/HEAD/202207150750Z/sun3.build.failed

this should be fixed now.


.mrg.

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 19:12:39 UTC 2022

Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile

Log Message:
fix driver list for sgimips, make Xsun and Xvfb build.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/xorg-server/hw/vfb/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/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.107 src/external/mit/xorg/server/drivers/Makefile:1.108
--- src/external/mit/xorg/server/drivers/Makefile:1.107	Fri Jul 15 04:53:05 2022
+++ src/external/mit/xorg/server/drivers/Makefile	Fri Jul 15 19:12:39 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.107 2022/07/15 04:53:05 mrg Exp $
+#	$NetBSD: Makefile,v 1.108 2022/07/15 19:12:39 mrg Exp $
 
 .include 
 
@@ -275,9 +275,6 @@ SUBDIR+= \
 	xf86-video-mga
 .endif	# ${MACHINE} == "prep"
 
-# needs porting for xorg-server 21.1.3
-#	xf86-video-glint
-#	xf86-video-s3
 .if ${MACHINE} == "sgimips"
 SUBDIR+= \
 	xf86-video-cirrus \
@@ -286,7 +283,9 @@ SUBDIR+= \
 .if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 SUBDIR+= \
 	xf86-video-crime \
-	xf86-video-newport
+	xf86-video-glint \
+	xf86-video-newport \
+	xf86-video-s3
 .endif  # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 .endif	# ${MACHINE} == "sgimips"
 

Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.12 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.13
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.12	Sat Aug 21 15:57:00 2021
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile	Fri Jul 15 19:12:39 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2021/08/21 15:57:00 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.13 2022/07/15 19:12:39 mrg Exp $
 
 .include 
 
@@ -33,6 +33,7 @@ CPPFLAGS+=	-UXFree86LOADER -UXF86VIDMODE
 		-UXF86DRI -UXF86BIGFONT
 
 CPPFLAGS+=	-UHAVE_XORG_CONFIG_H
+CPPFLAGS+=	-D_OPENBSD_SOURCE
 
 CPPFLAGS.x68kConfig.c=	 -DX11_LIBDIR=\"${X11ETCDIR}\"
 

Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.6 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.7
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.6	Sat Aug 21 15:57:00 2021
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun	Fri Jul 15 19:12:39 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.Xsun,v 1.6 2021/08/21 15:57:00 tsutsui Exp $
+#	$NetBSD: Makefile.Xsun,v 1.7 2022/07/15 19:12:39 mrg Exp $
 
 .include 
 
@@ -15,6 +15,7 @@ WARNS?=	2
 BUILDSYMLINKS=
 CPPFLAGS+=	-DDEFAULT_LOGDIR=\"/var/log\" -DDEFAULT_LOGPREFIX=\"${PROG}.\"
 CPPFLAGS+=	-DINCLUDE_CG2_HEADER
+CPPFLAGS+=	-D_OPENBSD_SOURCE -D_XTYPEDEF_POINTER=1
 #CPPFLAGS+=	-DLOWMEMFTPT
 
 # for Xsun (8bpp)

Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.21 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.22
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.21	Thu Aug 19 11:03:04 2021
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile	Fri Jul 15 19:12:39 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 2021/08/19 11:03:04 mrg Exp $
+#	$NetBSD: Makefile,v 1.22 2022/07/15 19:12:39 mrg Exp $
 
 .include 
 
@@ -28,7 +28,8 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 
 		-UGLXEXT
 
 CPPFLAGS+=	${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
-		-DHAS_SHM -DHAS_MMAP -UXFree86LOADER
+		-DHAS_SHM -DHAS_MMAP -UXFree86LOADER \
+		-D_OPENBSD_SOURCE
 
 .include "../../Makefile.common"
 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 19:12:39 UTC 2022

Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile

Log Message:
fix driver list for sgimips, make Xsun and Xvfb build.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile

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/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 19:10:11 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c x68kKbd.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c sunKbd.c
xsrc/external/mit/xorg-server/dist/os: utils.c

Log Message:
couple of changes needed for xorg-server 21.1.4.

- AbortDDX() is removed, make it static to avoid code churn since
  it is used by internal code now
- LegalModifier() is gone
- if the PRESENT extension isn't included, don't enable the
  -fakescreenfps option since it require PRESENT.

fixes builds for sun3 and x68k.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/os/utils.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/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.10 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.11
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.10	Tue Dec  8 10:33:47 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c	Fri Jul 15 19:10:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.10 2020/12/08 10:33:47 mrg Exp $ */
+/* $NetBSD: x68kInit.c,v 1.11 2022/07/15 19:10:11 mrg Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -188,7 +188,7 @@ CloseInput(void)
  *  argument: ExitCode
  *  returns:  nothing
  *---*/
-void
+static void
 AbortDDX(enum ExitCode error)
 {
 int i;

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.12 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.13
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.12	Wed Mar 17 15:02:27 2021
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c	Fri Jul 15 19:10:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.12 2021/03/17 15:02:27 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.13 2022/07/15 19:10:11 mrg Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -403,10 +403,4 @@ x68kSetLeds(X68kKbdPrivPtr pPriv, uint8_
 ErrorF("Failed to set keyboard lights\n");
 }
 
-Bool
-LegalModifier(unsigned int key, DeviceIntPtr pDev)
-{
-return TRUE;
-}
-
 /* EOF x68kKbd.c */

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.8
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.7	Fri Oct 15 17:42:04 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c	Fri Jul 15 19:10:11 2022
@@ -158,7 +158,7 @@ sunEnqueueEvents(void)
 /*
  * DDX - specific abort routine.  Called by AbortServer().
  */
-void
+static void
 AbortDDX(enum ExitCode error)
 {
 int		i;

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.11 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.12
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.11	Fri Oct 15 17:42:04 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Fri Jul 15 19:10:11 2022
@@ -907,10 +907,3 @@ sunChangeKbdTranslation(int fd, Bool mak
 #endif /* } */
 return 0;
 }
-
-/*ARGSUSED*/
-Bool
-LegalModifier(unsigned int key, DeviceIntPtr pDev)
-{
-return TRUE;
-}

Index: xsrc/external/mit/xorg-server/dist/os/utils.c
diff -u xsrc/external/mit/xorg-server/dist/os/utils.c:1.12 xsrc/external/mit/xorg-server/dist/os/utils.c:1.13
--- xsrc/external/mit/xorg-server/dist/os/utils.c:1.12	Fri Jul 15 09:10:38 2022
+++ xsrc/external/mit/xorg-server/dist/os/utils.c	Fri Jul 15 19:10:11 2022
@@ -787,6 +787,7 @@ ProcessCommandLine(int argc, char *argv[
 UseMsg();
 }
 else if (strcmp(argv[i], "-fakescreenfps") == 0) {
+#ifdef PRESENT
 if (++i < argc) {
 FakeScreenFps = (uint32_t) atoi(argv[i]);
 if (FakeScreenFps < 1 || FakeScreenFps > 600)
@@ -794,6 +795,10 @@ ProcessCommandLine(int argc, char *argv[
 }
 else
 UseMsg();
+#else
+FatalError("fakescreenfps not available without PRESENT\n");
+UseMsg();
+#endif
 }
 else if (strcmp(argv[

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 19:10:11 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c x68kKbd.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c sunKbd.c
xsrc/external/mit/xorg-server/dist/os: utils.c

Log Message:
couple of changes needed for xorg-server 21.1.4.

- AbortDDX() is removed, make it static to avoid code churn since
  it is used by internal code now
- LegalModifier() is gone
- if the PRESENT extension isn't included, don't enable the
  -fakescreenfps option since it require PRESENT.

fixes builds for sun3 and x68k.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/os/utils.c

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

CVS commit: src/distrib/sets/lists

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 18:58:09 UTC 2022

Modified Files:
src/distrib/sets/lists/xdebug: md.sgimips
src/distrib/sets/lists/xserver: md.sgimips

Log Message:
revert part of the previous - sgimips is still default to xorg-server 1.10.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xdebug/md.sgimips
cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/xserver/md.sgimips

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

Modified files:

Index: src/distrib/sets/lists/xdebug/md.sgimips
diff -u src/distrib/sets/lists/xdebug/md.sgimips:1.16 src/distrib/sets/lists/xdebug/md.sgimips:1.17
--- src/distrib/sets/lists/xdebug/md.sgimips:1.16	Fri Jul 15 04:47:56 2022
+++ src/distrib/sets/lists/xdebug/md.sgimips	Fri Jul 15 18:58:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.16 2022/07/15 04:47:56 mrg Exp $
+# $NetBSD: md.sgimips,v 1.17 2022/07/15 18:58:09 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
@@ -35,7 +35,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug	xdebug-xf86-video-cirrus-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/crime_drv.so.0.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/crime_drv.so.0.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-obsolete	xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-obsolete	xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libcrime_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xserver/md.sgimips
diff -u src/distrib/sets/lists/xserver/md.sgimips:1.68 src/distrib/sets/lists/xserver/md.sgimips:1.69
--- src/distrib/sets/lists/xserver/md.sgimips:1.68	Fri Jul 15 04:47:56 2022
+++ src/distrib/sets/lists/xserver/md.sgimips	Fri Jul 15 18:58:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.68 2022/07/15 04:47:56 mrg Exp $	x11
+# $NetBSD: md.sgimips,v 1.69 2022/07/15 18:58:09 mrg Exp $	x11
 ./usr/X11R7/bin/X	xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg	xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf	xserver-xorg-server-bin	xorg
@@ -14,8 +14,10 @@
 ./usr/X11R7/lib/modules/drivers/crime_drv.so		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/lib/modules/drivers/crime_drv.so.0		-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/crime_drv.so.0		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/glint_drv.so		xserver-obsolete	obsolete
-./usr/X11R7/lib/modules/drivers/glint_drv.so.1		xserver-obsolete	obsolete
+./usr/X11R7/lib/modules/drivers/glint_drv.so		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/glint_drv.so		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/drivers/glint_drv.so.1		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/glint_drv.so.1		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so		xserver-xf86-video-mga-drivers	xorg
@@ -160,6 +162,8 @@
 ./usr/X11R7/man/cat4/crime.0-unknown-	.cat,xorg,xorg_server_ver=110
 ./usr/X11R7/man/cat4/crime.0xserver-obsolete	.cat,xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/man/cat4/exa.0xserver-xf86-video-exa-catman	.cat,xorg
+./usr/X11R7/man/cat4/glint.0-unknown-	.cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/glint.0xserver-obsolete	.cat,xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/man/cat4/kbd.0xserver-xf86-input-keyboard-catman	.cat,xorg
 ./usr/X11R7/man/cat4/mousedrv.0xserver-xf86-input-mouse-catman	.cat,xorg
 ./usr/X11R7/man/cat4/newport.0-unknown-	.cat,xorg,xorg_server_ver=110
@@ -176,7 +180,8 @@
 ./usr/X11R7/man/html4/crime.html			-unknown-	html,xorg,xorg_server_ver=110
 ./usr/X11R7/man/html4/crime.html			xserver-obsolete	html,xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/man/html4/exa.htmlxserver-xf86-video-exa-htmlman	html,xorg
-./usr/X11R7/man/html4/glint.html			xserver-obsolete	obsolete
+./usr/X11R7/man/html4/glint.html			-unknown-	html,xor

CVS commit: src/distrib/sets/lists

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 18:58:09 UTC 2022

Modified Files:
src/distrib/sets/lists/xdebug: md.sgimips
src/distrib/sets/lists/xserver: md.sgimips

Log Message:
revert part of the previous - sgimips is still default to xorg-server 1.10.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xdebug/md.sgimips
cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/xserver/md.sgimips

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

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

[Izumi Tsutsui]

> Module Name:  xsrc
> Committed By: mrg
> Date: Fri Jul 15 04:10:54 UTC 2022
> 
> Modified Files:
>   xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
>   xorg-config.h xorg-server.h
> Removed Files:
>   xsrc/external/mit/xorg-server/include: xf86Build.h
> 
> Log Message:
> update these for xorg-server 21.1.3.

>> --- dix-config.h 23 Aug 2021 22:34:58 -  1.44
>> +++ dix-config.h 15 Jul 2022 04:10:54 -  1.45
>>  :
>> 
>>  /* Define to 1 if you have the `reallocarray' function. */
>> -/* #define HAVE_REALLOCARRAY 1 */
>> +#define HAVE_REALLOCARRAY 1
>> 
>>  :
>>  
>>  /* Don't let Xdefs.h define 'pointer' */
>> -#define _XTYPEDEF_POINTER
>> +#define _XTYPEDEF_POINTER   1
 
These changes cause build errors on at least sun3 servers:
 https://releng.netbsd.org/builds/HEAD/202207150750Z/sun3.build.failed

---
/home/source/ab/HEAD/xsrc/external/mit/xorg-server/dist/hw/vfb/InitOutput.c: In 
function 'ddxProcessArgument':
/home/source/ab/HEAD/xsrc/external/mit/xorg-server/dist/hw/vfb/InitOutput.c:293:17:
 warning: implicit declaration of function 'reallocarray'; did you mean 
'reallocarr'? [-Wimplicit-function-declaration]
  293 | reallocarray(vfbScreens, screenNum + 1, 
sizeof(*vfbScreens));
  | ^~~~
  | reallocarr

/home/source/ab/HEAD/xsrc/external/mit/xorg-server/dist/../include/dix-config.h:471:
 error: "_XTYPEDEF_POINTER" redefined [-Werror]
  471 | #define _XTYPEDEF_POINTER   1

---
Izumi Tsutsui

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Fri Jul 15 17:20:56 UTC 2022

Modified Files:
src/doc [netbsd-8]: CHANGES-8.3

Log Message:
Ticket #1752


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.138 -r1.1.2.139 src/doc/CHANGES-8.3

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-8.3
diff -u src/doc/CHANGES-8.3:1.1.2.138 src/doc/CHANGES-8.3:1.1.2.139
--- src/doc/CHANGES-8.3:1.1.2.138	Mon Jul 11 14:17:49 2022
+++ src/doc/CHANGES-8.3	Fri Jul 15 17:20:56 2022
@@ -1,4 +1,4 @@
- $NetBSD: CHANGES-8.3,v 1.1.2.138 2022/07/11 14:17:49 martin Exp $
+ $NetBSD: CHANGES-8.3,v 1.1.2.139 2022/07/15 17:20:56 martin Exp $
 
 A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
 release:
@@ -2705,3 +2705,12 @@ sys/dev/pci/if_wm.c1.719-1.720,1.722
 	  - KNF.
 	[msaitoh, ticket #1751]
 
+xsrc-9/external/mit/xorg-server/dist/xkb/xkb.c		apply patch
+
+	Cherry-pick upstream fixes for
+	 * CVE-2022-2319/ZDI-CAN-16062: X.Org Server ProcXkbSetGeometry
+	   Out-Of-Bounds Access
+	 * CVE-2022-2320/ZDI-CAN-16070: X.Org Server ProcXkbSetDeviceInfo
+	   Out-Of-Bounds Access
+	[mrg, ticket #1752]
+

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Fri Jul 15 17:20:56 UTC 2022

Modified Files:
src/doc [netbsd-8]: CHANGES-8.3

Log Message:
Ticket #1752


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.138 -r1.1.2.139 src/doc/CHANGES-8.3

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

CVS commit: [netbsd-8] xsrc/external/mit/xorg-server/dist/xkb

[Martin Husemann]

Module Name:xsrc
Committed By:   martin
Date:   Fri Jul 15 17:19:23 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/xkb [netbsd-8]: xkb.c

Log Message:
Apply patch, requested by mrg in ticket #1752:

xsrc-9/external/mit/xorg-server/dist/xkb/xkb.c  apply patch

Cherry-pick upstream fixes for
 * CVE-2022-2319/ZDI-CAN-16062: X.Org Server ProcXkbSetGeometry Out-Of-Bounds
   Access
 * CVE-2022-2320/ZDI-CAN-16070: X.Org Server ProcXkbSetDeviceInfo Out-Of-Bounds
   Access


To generate a diff of this commit:
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 xsrc/external/mit/xorg-server/dist/xkb/xkb.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/dist/xkb/xkb.c
diff -u xsrc/external/mit/xorg-server/dist/xkb/xkb.c:1.3.2.1 xsrc/external/mit/xorg-server/dist/xkb/xkb.c:1.3.2.2
--- xsrc/external/mit/xorg-server/dist/xkb/xkb.c:1.3.2.1	Sun Dec  6 10:24:47 2020
+++ xsrc/external/mit/xorg-server/dist/xkb/xkb.c	Fri Jul 15 17:19:23 2022
@@ -5126,7 +5126,7 @@ _GetCountedString(char **wire_inout, Cli
 }
 
 static Status
-_CheckSetDoodad(char **wire_inout,
+_CheckSetDoodad(char **wire_inout, xkbSetGeometryReq *req,
 XkbGeometryPtr geom, XkbSectionPtr section, ClientPtr client)
 {
 char *wire;
@@ -5137,6 +5137,9 @@ _CheckSetDoodad(char **wire_inout,
 Status status;
 
 dWire = (xkbDoodadWireDesc *) (*wire_inout);
+if (!_XkbCheckRequestBounds(client, req, dWire, dWire + 1))
+return BadLength;
+
 any = dWire->any;
 wire = (char *) &dWire[1];
 if (client->swapped) {
@@ -5239,7 +5242,7 @@ _CheckSetDoodad(char **wire_inout,
 }
 
 static Status
-_CheckSetOverlay(char **wire_inout,
+_CheckSetOverlay(char **wire_inout, xkbSetGeometryReq *req,
  XkbGeometryPtr geom, XkbSectionPtr section, ClientPtr client)
 {
 register int r;
@@ -5250,6 +5253,9 @@ _CheckSetOverlay(char **wire_inout,
 
 wire = *wire_inout;
 olWire = (xkbOverlayWireDesc *) wire;
+if (!_XkbCheckRequestBounds(client, req, olWire, olWire + 1))
+return BadLength;
+
 if (client->swapped) {
 swapl(&olWire->name);
 }
@@ -5261,6 +5267,9 @@ _CheckSetOverlay(char **wire_inout,
 xkbOverlayKeyWireDesc *kWire;
 XkbOverlayRowPtr row;
 
+if (!_XkbCheckRequestBounds(client, req, rWire, rWire + 1))
+return BadLength;
+
 if (rWire->rowUnder > section->num_rows) {
 client->errorValue = _XkbErrCode4(0x20, r, section->num_rows,
   rWire->rowUnder);
@@ -5269,6 +5278,9 @@ _CheckSetOverlay(char **wire_inout,
 row = XkbAddGeomOverlayRow(ol, rWire->rowUnder, rWire->nKeys);
 kWire = (xkbOverlayKeyWireDesc *) &rWire[1];
 for (k = 0; k < rWire->nKeys; k++, kWire++) {
+if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1))
+return BadLength;
+
 if (XkbAddGeomOverlayKey(ol, row,
  (char *) kWire->over,
  (char *) kWire->under) == NULL) {
@@ -5302,6 +5314,9 @@ _CheckSetSections(XkbGeometryPtr geom,
 register int r;
 xkbRowWireDesc *rWire;
 
+if (!_XkbCheckRequestBounds(client, req, sWire, sWire + 1))
+return BadLength;
+
 if (client->swapped) {
 swapl(&sWire->name);
 swaps(&sWire->top);
@@ -5327,6 +5342,9 @@ _CheckSetSections(XkbGeometryPtr geom,
 XkbRowPtr row;
 xkbKeyWireDesc *kWire;
 
+if (!_XkbCheckRequestBounds(client, req, rWire, rWire + 1))
+return BadLength;
+
 if (client->swapped) {
 swaps(&rWire->top);
 swaps(&rWire->left);
@@ -5338,16 +5356,19 @@ _CheckSetSections(XkbGeometryPtr geom,
 row->left = rWire->left;
 row->vertical = rWire->vertical;
 kWire = (xkbKeyWireDesc *) &rWire[1];
-for (k = 0; k < rWire->nKeys; k++) {
+for (k = 0; k < rWire->nKeys; k++, kWire++) {
 XkbKeyPtr key;
 
+if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1))
+return BadLength;
+
 key = XkbAddGeomKey(row);
 if (!key)
 return BadAlloc;
-memcpy(key->name.name, kWire[k].name, XkbKeyNameLength);
-key->gap = kWire[k].gap;
-key->shape_ndx = kWire[k].shapeNdx;
-key->color_ndx = kWire[k].colorNdx;
+memcpy(key->name.name, kWire->name, XkbKeyNameLength);
+key->gap = kWire->gap;
+key->shape_ndx = kWire->shapeNdx;
+key->color_ndx = kWire->colorNdx;
 if (key->shape_ndx >= geom->num_shapes) {
 client->errorValue = _XkbErrCode3(0x10, key->shape_ndx,

CVS commit: [netbsd-8] xsrc/external/mit/xorg-server/dist/xkb

[Martin Husemann]

Module Name:xsrc
Committed By:   martin
Date:   Fri Jul 15 17:19:23 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/xkb [netbsd-8]: xkb.c

Log Message:
Apply patch, requested by mrg in ticket #1752:

xsrc-9/external/mit/xorg-server/dist/xkb/xkb.c  apply patch

Cherry-pick upstream fixes for
 * CVE-2022-2319/ZDI-CAN-16062: X.Org Server ProcXkbSetGeometry Out-Of-Bounds
   Access
 * CVE-2022-2320/ZDI-CAN-16070: X.Org Server ProcXkbSetDeviceInfo Out-Of-Bounds
   Access


To generate a diff of this commit:
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 xsrc/external/mit/xorg-server/dist/xkb/xkb.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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Fri Jul 15 17:18:23 UTC 2022

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

Log Message:
Ticket #1478


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.109 -r1.1.2.110 src/doc/CHANGES-9.3

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.3
diff -u src/doc/CHANGES-9.3:1.1.2.109 src/doc/CHANGES-9.3:1.1.2.110
--- src/doc/CHANGES-9.3:1.1.2.109	Mon Jul 11 14:13:46 2022
+++ src/doc/CHANGES-9.3	Fri Jul 15 17:18:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.3,v 1.1.2.109 2022/07/11 14:13:46 martin Exp $
+# $NetBSD: CHANGES-9.3,v 1.1.2.110 2022/07/15 17:18:23 martin Exp $
 
 A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3
 release:
@@ -1864,3 +1864,12 @@ sys/dev/pci/if_wm.c1.719-1.720,1.722
 	  - KNF.
 	[msaitoh, ticket #1477]
 
+xsrc-9/external/mit/xorg-server/dist/xkb/xkb.c		apply patch
+
+	Cherry-pick upstream fixes for
+	 * CVE-2022-2319/ZDI-CAN-16062: X.Org Server ProcXkbSetGeometry
+	   Out-Of-Bounds Access
+	 * CVE-2022-2320/ZDI-CAN-16070: X.Org Server ProcXkbSetDeviceInfo
+	   Out-Of-Bounds Access
+	[mrg, ticket #1478]
+

CVS commit: [netbsd-9] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Fri Jul 15 17:18:23 UTC 2022

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

Log Message:
Ticket #1478


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.109 -r1.1.2.110 src/doc/CHANGES-9.3

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

CVS commit: [netbsd-9] xsrc/external/mit/xorg-server/dist/xkb

[Martin Husemann]

Module Name:xsrc
Committed By:   martin
Date:   Fri Jul 15 17:17:02 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/xkb [netbsd-9]: xkb.c

Log Message:
Apply patch, requested by mrg in ticket #1478:

xsrc-9/external/mit/xorg-server/dist/xkb/xkb.c  apply patch

Cherry-pick upstream fixes for
 * CVE-2022-2319/ZDI-CAN-16062: X.Org Server ProcXkbSetGeometry Out-Of-Bounds
   Access
 * CVE-2022-2320/ZDI-CAN-16070: X.Org Server ProcXkbSetDeviceInfo Out-Of-Bounds
   Access


To generate a diff of this commit:
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 xsrc/external/mit/xorg-server/dist/xkb/xkb.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/dist/xkb/xkb.c
diff -u xsrc/external/mit/xorg-server/dist/xkb/xkb.c:1.4.2.1 xsrc/external/mit/xorg-server/dist/xkb/xkb.c:1.4.2.2
--- xsrc/external/mit/xorg-server/dist/xkb/xkb.c:1.4.2.1	Sun Dec  6 10:18:02 2020
+++ xsrc/external/mit/xorg-server/dist/xkb/xkb.c	Fri Jul 15 17:17:02 2022
@@ -5151,7 +5151,7 @@ _GetCountedString(char **wire_inout, Cli
 }
 
 static Status
-_CheckSetDoodad(char **wire_inout,
+_CheckSetDoodad(char **wire_inout, xkbSetGeometryReq *req,
 XkbGeometryPtr geom, XkbSectionPtr section, ClientPtr client)
 {
 char *wire;
@@ -5162,6 +5162,9 @@ _CheckSetDoodad(char **wire_inout,
 Status status;
 
 dWire = (xkbDoodadWireDesc *) (*wire_inout);
+if (!_XkbCheckRequestBounds(client, req, dWire, dWire + 1))
+return BadLength;
+
 any = dWire->any;
 wire = (char *) &dWire[1];
 if (client->swapped) {
@@ -5264,7 +5267,7 @@ _CheckSetDoodad(char **wire_inout,
 }
 
 static Status
-_CheckSetOverlay(char **wire_inout,
+_CheckSetOverlay(char **wire_inout, xkbSetGeometryReq *req,
  XkbGeometryPtr geom, XkbSectionPtr section, ClientPtr client)
 {
 register int r;
@@ -5275,6 +5278,9 @@ _CheckSetOverlay(char **wire_inout,
 
 wire = *wire_inout;
 olWire = (xkbOverlayWireDesc *) wire;
+if (!_XkbCheckRequestBounds(client, req, olWire, olWire + 1))
+return BadLength;
+
 if (client->swapped) {
 swapl(&olWire->name);
 }
@@ -5286,6 +5292,9 @@ _CheckSetOverlay(char **wire_inout,
 xkbOverlayKeyWireDesc *kWire;
 XkbOverlayRowPtr row;
 
+if (!_XkbCheckRequestBounds(client, req, rWire, rWire + 1))
+return BadLength;
+
 if (rWire->rowUnder > section->num_rows) {
 client->errorValue = _XkbErrCode4(0x20, r, section->num_rows,
   rWire->rowUnder);
@@ -5294,6 +5303,9 @@ _CheckSetOverlay(char **wire_inout,
 row = XkbAddGeomOverlayRow(ol, rWire->rowUnder, rWire->nKeys);
 kWire = (xkbOverlayKeyWireDesc *) &rWire[1];
 for (k = 0; k < rWire->nKeys; k++, kWire++) {
+if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1))
+return BadLength;
+
 if (XkbAddGeomOverlayKey(ol, row,
  (char *) kWire->over,
  (char *) kWire->under) == NULL) {
@@ -5327,6 +5339,9 @@ _CheckSetSections(XkbGeometryPtr geom,
 register int r;
 xkbRowWireDesc *rWire;
 
+if (!_XkbCheckRequestBounds(client, req, sWire, sWire + 1))
+return BadLength;
+
 if (client->swapped) {
 swapl(&sWire->name);
 swaps(&sWire->top);
@@ -5352,6 +5367,9 @@ _CheckSetSections(XkbGeometryPtr geom,
 XkbRowPtr row;
 xkbKeyWireDesc *kWire;
 
+if (!_XkbCheckRequestBounds(client, req, rWire, rWire + 1))
+return BadLength;
+
 if (client->swapped) {
 swaps(&rWire->top);
 swaps(&rWire->left);
@@ -5363,16 +5381,19 @@ _CheckSetSections(XkbGeometryPtr geom,
 row->left = rWire->left;
 row->vertical = rWire->vertical;
 kWire = (xkbKeyWireDesc *) &rWire[1];
-for (k = 0; k < rWire->nKeys; k++) {
+for (k = 0; k < rWire->nKeys; k++, kWire++) {
 XkbKeyPtr key;
 
+if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1))
+return BadLength;
+
 key = XkbAddGeomKey(row);
 if (!key)
 return BadAlloc;
-memcpy(key->name.name, kWire[k].name, XkbKeyNameLength);
-key->gap = kWire[k].gap;
-key->shape_ndx = kWire[k].shapeNdx;
-key->color_ndx = kWire[k].colorNdx;
+memcpy(key->name.name, kWire->name, XkbKeyNameLength);
+key->gap = kWire->gap;
+key->shape_ndx = kWire->shapeNdx;
+key->color_ndx = kWire->colorNdx;
 if (key->shape_ndx >= geom->num_shapes) {
 client->errorValue = _XkbErrCode3(0x10, key->shape_ndx,

CVS commit: [netbsd-9] xsrc/external/mit/xorg-server/dist/xkb

[Martin Husemann]

Module Name:xsrc
Committed By:   martin
Date:   Fri Jul 15 17:17:02 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/xkb [netbsd-9]: xkb.c

Log Message:
Apply patch, requested by mrg in ticket #1478:

xsrc-9/external/mit/xorg-server/dist/xkb/xkb.c  apply patch

Cherry-pick upstream fixes for
 * CVE-2022-2319/ZDI-CAN-16062: X.Org Server ProcXkbSetGeometry Out-Of-Bounds
   Access
 * CVE-2022-2320/ZDI-CAN-16070: X.Org Server ProcXkbSetDeviceInfo Out-Of-Bounds
   Access


To generate a diff of this commit:
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 xsrc/external/mit/xorg-server/dist/xkb/xkb.c

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

CVS commit: src/distrib/sets/lists/xdebug

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 11:34:59 UTC 2022

Modified Files:
src/distrib/sets/lists/xdebug: md.amd64

Log Message:
properly mark glint_drv has obsolete.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/xdebug/md.amd64

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

Modified files:

Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.60 src/distrib/sets/lists/xdebug/md.amd64:1.61
--- src/distrib/sets/lists/xdebug/md.amd64:1.60	Fri Jul 15 04:47:56 2022
+++ src/distrib/sets/lists/xdebug/md.amd64	Fri Jul 15 11:34:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.60 2022/07/15 04:47:56 mrg Exp $
+# $NetBSD: md.amd64,v 1.61 2022/07/15 11:34:59 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC_g.axdebug-libI810XvMC-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libIntelXvMC_g.a			xdebug-libIntelXvMC-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			xdebug-libchromeXvMCPro-debuglib	xorg,debuglib,compatx11file
@@ -90,7 +90,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug	xdebug-obsolete	obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug	xdebug-xf86-video-cirrus-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug	xdebug-obsolete	obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-obsolete		xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug	xdebug-xf86-video-i128-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug	xdebug-xf86-video-i740-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv.so.2.debug	xdebug-xf86-video-intel-debug		xorg,debug

CVS commit: src/distrib/sets/lists/xdebug

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 11:34:59 UTC 2022

Modified Files:
src/distrib/sets/lists/xdebug: md.amd64

Log Message:
properly mark glint_drv has obsolete.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/xdebug/md.amd64

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

CVS commit: src/distrib/sets/lists

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 10:44:21 UTC 2022

Modified Files:
src/distrib/sets/lists/xdebug: md.bebox md.cats md.ibmnws md.prep
src/distrib/sets/lists/xserver: md.bebox

Log Message:
fix some builds (no longer built drivers.)


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/xdebug/md.bebox \
src/distrib/sets/lists/xdebug/md.prep
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/xdebug/md.cats
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xdebug/md.ibmnws
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xserver/md.bebox

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

Modified files:

Index: src/distrib/sets/lists/xdebug/md.bebox
diff -u src/distrib/sets/lists/xdebug/md.bebox:1.14 src/distrib/sets/lists/xdebug/md.bebox:1.15
--- src/distrib/sets/lists/xdebug/md.bebox:1.14	Fri Jul 15 04:47:56 2022
+++ src/distrib/sets/lists/xdebug/md.bebox	Fri Jul 15 10:44:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.bebox,v 1.14 2022/07/15 04:47:56 mrg Exp $
+# $NetBSD: md.bebox,v 1.15 2022/07/15 10:44:21 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -22,7 +22,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.2.debug	xdebug-xf86-video-mga-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug	xdebug-xf86-video-s3-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug	xdebug-obsolete	obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug	xdebug-xf86-video-s3virge-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug	-unknown-	xorg,debug,xorg_server_ver=110
Index: src/distrib/sets/lists/xdebug/md.prep
diff -u src/distrib/sets/lists/xdebug/md.prep:1.14 src/distrib/sets/lists/xdebug/md.prep:1.15
--- src/distrib/sets/lists/xdebug/md.prep:1.14	Fri Jul 15 04:47:56 2022
+++ src/distrib/sets/lists/xdebug/md.prep	Fri Jul 15 10:44:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.prep,v 1.14 2022/07/15 04:47:56 mrg Exp $
+# $NetBSD: md.prep,v 1.15 2022/07/15 10:44:21 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -22,7 +22,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.2.debug	xdebug-xf86-video-mga-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug	xdebug-xf86-video-s3-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug	xdebug-obsolete	obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug	-unknown-	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug	xdebug-obsolete	xorg,obsolete,xorg_server_ver=120

Index: src/distrib/sets/lists/xdebug/md.cats
diff -u src/distrib/sets/lists/xdebug/md.cats:1.19 src/distrib/sets/lists/xdebug/md.cats:1.20
--- src/distrib/sets/lists/xdebug/md.cats:1.19	Fri Jul 15 04:47:56 2022
+++ src/distrib/sets/lists/xdebug/md.cats	Fri Jul 15 10:44:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.19 2022/07/15 04:47:56 mrg Exp $
+# $NetBSD: md.cats,v 1.20 2022/07/15 10:44:21 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
@@ -78,7 +78,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug	xdebug-xf86-video-nv-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.6.debug	xdebug-xf86-video-radeon-kms-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug	xdebug-obsolete		xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug	xdebug-xf86-video-s3-debug		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_

CVS commit: src/distrib/sets/lists

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 10:44:21 UTC 2022

Modified Files:
src/distrib/sets/lists/xdebug: md.bebox md.cats md.ibmnws md.prep
src/distrib/sets/lists/xserver: md.bebox

Log Message:
fix some builds (no longer built drivers.)


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/xdebug/md.bebox \
src/distrib/sets/lists/xdebug/md.prep
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/xdebug/md.cats
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xdebug/md.ibmnws
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xserver/md.bebox

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/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 09:12:24 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h

Log Message:
update for xorg-server 21.1.4.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.25 -r1.26 \
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: xsrc/external/mit/xorg-server/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 09:12:24 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h

Log Message:
update for xorg-server 21.1.4.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.25 -r1.26 \
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/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.45 xsrc/external/mit/xorg-server/include/dix-config.h:1.46
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.45	Fri Jul 15 04:10:54 2022
+++ xsrc/external/mit/xorg-server/include/dix-config.h	Fri Jul 15 09:12:24 2022
@@ -349,7 +349,7 @@
 #define XINERAMA 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT ((1000) + ((21) * 10) + ((1) * 1000) + 3)
+#define XORG_VERSION_CURRENT ((1000) + ((21) * 10) + ((1) * 1000) + 4)
 
 /* Build Xv Extension */
 #define XvExtension 1

Index: xsrc/external/mit/xorg-server/include/version-config.h
diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.15 xsrc/external/mit/xorg-server/include/version-config.h:1.16
--- xsrc/external/mit/xorg-server/include/version-config.h:1.15	Fri Jul 15 04:10:54 2022
+++ xsrc/external/mit/xorg-server/include/version-config.h	Fri Jul 15 09:12:24 2022
@@ -5,13 +5,13 @@
 #define VERSION_CONFIG_H
 
 /* Vendor man version */
-#define VENDOR_MAN_VERSION "Version 21.1.3"
+#define VENDOR_MAN_VERSION "Version 21.1.4"
 
 /* Vendor name */
 #define VENDOR_NAME "The X.Org Foundation"
 
 /* Vendor release */
-#define VENDOR_RELEASE ((1000) + ((21) * 10) + ((1) * 1000) + 3)
+#define VENDOR_RELEASE ((1000) + ((21) * 10) + ((1) * 1000) + 4)
 
 #endif /* VERSION_CONFIG_H */
 

Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.25 xsrc/external/mit/xorg-server/include/xorg-config.h:1.26
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.25	Fri Jul 15 04:10:54 2022
+++ xsrc/external/mit/xorg-server/include/xorg-config.h	Fri Jul 15 09:12:24 2022
@@ -17,7 +17,7 @@
 #define XORGSERVER 1
 
 /* Current X.Org version. */
-#define XORG_VERSION_CURRENT ((1000) + ((21) * 10) + ((1) * 1000) + 3)
+#define XORG_VERSION_CURRENT ((1000) + ((21) * 10) + ((1) * 1000) + 4)
 
 /* Name of X server. */
 #define __XSERVERNAME__ "Xorg"
Index: xsrc/external/mit/xorg-server/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.25 xsrc/external/mit/xorg-server/include/xorg-server.h:1.26
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.25	Fri Jul 15 04:10:54 2022
+++ xsrc/external/mit/xorg-server/include/xorg-server.h	Fri Jul 15 09:12:24 2022
@@ -140,7 +140,7 @@
 #define XORGSERVER 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT ((1000) + ((21) * 10) + ((1) * 1000) + 3)
+#define XORG_VERSION_CURRENT ((1000) + ((21) * 10) + ((1) * 1000) + 4)
 
 /* Build Xv Extension */
 #define XvExtension 1

CVS commit: src/share/mk

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 09:11:02 UTC 2022

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

Log Message:
update for xorg-server 21.1.4.


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 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.144 src/share/mk/bsd.x11.mk:1.145
--- src/share/mk/bsd.x11.mk:1.144	Fri Jul 15 04:51:29 2022
+++ src/share/mk/bsd.x11.mk	Fri Jul 15 09:11:02 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.x11.mk,v 1.144 2022/07/15 04:51:29 mrg Exp $
+#	$NetBSD: bsd.x11.mk,v 1.145 2022/07/15 09:11:02 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=	3
+XORG_SERVER_TEENY=	4
 XORG_VERSION_CURRENT="((1000) + ((${XORG_SERVER_MAJOR}) * 10) + ((${XORG_SERVER_MINOR}) * 1000) + ${XORG_SERVER_TEENY})"
 .endif
 

CVS commit: src/share/mk

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 09:11:02 UTC 2022

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

Log Message:
update for xorg-server 21.1.4.


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 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: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 09:10:38 UTC 2022

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: connection.c utils.c
xsrc/external/mit/xorg-server/dist/xkb: xkb.c
Removed Files:
xsrc/external/mit/xorg-server/dist/hw/xquartz/bundle: Xquartz.plist

Log Message:
merge xorg-server 21.1.4.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/dix/events.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xorg-server/dist/hw/xquartz/bundle/Xquartz.plist
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/os/connection.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/os/utils.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/xkb/xkb.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/dist/configure
diff -u xsrc/external/mit/xorg-server/dist/configure:1.12 xsrc/external/mit/xorg-server/dist/configure:1.13
--- xsrc/external/mit/xorg-server/dist/configure:1.12	Fri Jul 15 02:18:56 2022
+++ xsrc/external/mit/xorg-server/dist/configure	Fri Jul 15 09:10:38 2022
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xorg-server 21.1.3.
+# Generated by GNU Autoconf 2.69 for xorg-server 21.1.4.
 #
 # Report bugs to .
 #
@@ -651,8 +651,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='21.1.3'
-PACKAGE_STRING='xorg-server 21.1.3'
+PACKAGE_VERSION='21.1.4'
+PACKAGE_STRING='xorg-server 21.1.4'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -1971,7 +1971,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.3 to adapt to many kinds of systems.
+\`configure' configures xorg-server 21.1.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2042,7 +2042,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 21.1.3:";;
+ short | recursive ) echo "Configuration of xorg-server 21.1.4:";;
esac
   cat <<\_ACEOF
 
@@ -2227,10 +2227,10 @@ Optional Packages:
   org.x)
   --with-bundle-version=VERSION
   Version to use for X11.app's CFBundleVersion
-  (default: 21.1.3)
+  (default: 21.1.4)
   --with-bundle-version-string=VERSION
   Version to use for X11.app's
-  CFBundleShortVersionString (default: 21.1.3)
+  CFBundleShortVersionString (default: 21.1.4)
   --with-sparkle-feed-url=URL
   URL for the Sparkle feed (default:
   https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2443,7 +2443,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 21.1.3
+xorg-server configure 21.1.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3152,7 +3152,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.3, which was
+It was created by xorg-server $as_me 21.1.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3500,7 +3500,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-RELEASE_DATE="2022-01-02"
+RELEASE_DATE="2022-07-12"
 RELEASE_NAME="Caramel Ice Cream"
 
 
@@ -3709,12 +3709,7 @@ program_transform_name=`$as_echo "$progr
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@@ -4019,7 +4014,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='21.1.3'
+ VERSION='21.1.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16337,11 +16332,11 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
   # to the OS version, if on x86, and 10.4, 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 09:10:38 UTC 2022

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: connection.c utils.c
xsrc/external/mit/xorg-server/dist/xkb: xkb.c
Removed Files:
xsrc/external/mit/xorg-server/dist/hw/xquartz/bundle: Xquartz.plist

Log Message:
merge xorg-server 21.1.4.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/dix/events.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xorg-server/dist/hw/xquartz/bundle/Xquartz.plist
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/os/connection.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/os/utils.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/xkb/xkb.c

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 09:09:11 UTC 2022

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

Log Message:
initial import of xorg-server-21.1.4

Status:

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

U xsrc/external/mit/xorg-server/dist/test-driver
U xsrc/external/mit/xorg-server/dist/missing
U xsrc/external/mit/xorg-server/dist/depcomp
U xsrc/external/mit/xorg-server/dist/ltmain.sh
U xsrc/external/mit/xorg-server/dist/install-sh
U xsrc/external/mit/xorg-server/dist/ylwrap
C xsrc/external/mit/xorg-server/dist/configure.ac
U xsrc/external/mit/xorg-server/dist/Makefile.am
U xsrc/external/mit/xorg-server/dist/aclocal.m4
U xsrc/external/mit/xorg-server/dist/compile
U xsrc/external/mit/xorg-server/dist/docbook.am
U xsrc/external/mit/xorg-server/dist/meson.build
U xsrc/external/mit/xorg-server/dist/Makefile.in
U xsrc/external/mit/xorg-server/dist/COPYING
U xsrc/external/mit/xorg-server/dist/meson_options.txt
C xsrc/external/mit/xorg-server/dist/configure
U xsrc/external/mit/xorg-server/dist/README.md
U xsrc/external/mit/xorg-server/dist/config.sub
U xsrc/external/mit/xorg-server/dist/xorg-server.pc.in
U xsrc/external/mit/xorg-server/dist/devbook.am
U xsrc/external/mit/xorg-server/dist/xserver.ent.in
U xsrc/external/mit/xorg-server/dist/ChangeLog
U xsrc/external/mit/xorg-server/dist/autogen.sh
U xsrc/external/mit/xorg-server/dist/manpages.am
U xsrc/external/mit/xorg-server/dist/config.guess
U xsrc/external/mit/xorg-server/dist/INSTALL
U xsrc/external/mit/xorg-server/dist/xorg-server.m4
U xsrc/external/mit/xorg-server/dist/glamor/glamor_transfer.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_render.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_eglmodule.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_image.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_compositerects.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_prepare.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_fbo.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_debug.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_largepixmap.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_segs.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_program.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_transform.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_egl.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_utils.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_egl_stubs.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_triangles.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_sync.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_picture.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_gradient.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_font.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_egl_ext.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_vbo.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_core.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_window.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_dash.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_xv.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_priv.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_prepare.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_lines.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_addtraps.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_pixmap.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_text.c
U xsrc/external/mit/xorg-server/dist/glamor/Makefile.am
U xsrc/external/mit/xorg-server/dist/glamor/glamor_composite_glyphs.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_transfer.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_context.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_glx.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_glyphblt.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_rects.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_font.c
U xsrc/external/mit/xorg-server/dist/glamor/meson.build
U xsrc/external/mit/xorg-server/dist/glamor/glamor_points.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_trapezoid.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_transform.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_egl.c
U xsrc/external/mit/xorg-server/dist/glamor/Makefile.in
U xsrc/external/mit/xorg-server/dist/glamor/glamor_spans.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_utils.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_copy.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_program.h
U xsrc/external/mit/xorg-server/dist/dix/window.c
U xsrc/external/mit/xorg-server/dist/dix/swaprep.c
U xsrc/external/mit/xorg-server/dist/dix/enterleave.h
U xsrc/external/mit/xorg-server/dist/dix/grabs.c
U xsrc/external/mit/xorg-server/dist/dix/buildatoms
U xsrc

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 09:09:11 UTC 2022

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

Log Message:
initial import of xorg-server-21.1.4

Status:

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

U xsrc/external/mit/xorg-server/dist/test-driver
U xsrc/external/mit/xorg-server/dist/missing
U xsrc/external/mit/xorg-server/dist/depcomp
U xsrc/external/mit/xorg-server/dist/ltmain.sh
U xsrc/external/mit/xorg-server/dist/install-sh
U xsrc/external/mit/xorg-server/dist/ylwrap
C xsrc/external/mit/xorg-server/dist/configure.ac
U xsrc/external/mit/xorg-server/dist/Makefile.am
U xsrc/external/mit/xorg-server/dist/aclocal.m4
U xsrc/external/mit/xorg-server/dist/compile
U xsrc/external/mit/xorg-server/dist/docbook.am
U xsrc/external/mit/xorg-server/dist/meson.build
U xsrc/external/mit/xorg-server/dist/Makefile.in
U xsrc/external/mit/xorg-server/dist/COPYING
U xsrc/external/mit/xorg-server/dist/meson_options.txt
C xsrc/external/mit/xorg-server/dist/configure
U xsrc/external/mit/xorg-server/dist/README.md
U xsrc/external/mit/xorg-server/dist/config.sub
U xsrc/external/mit/xorg-server/dist/xorg-server.pc.in
U xsrc/external/mit/xorg-server/dist/devbook.am
U xsrc/external/mit/xorg-server/dist/xserver.ent.in
U xsrc/external/mit/xorg-server/dist/ChangeLog
U xsrc/external/mit/xorg-server/dist/autogen.sh
U xsrc/external/mit/xorg-server/dist/manpages.am
U xsrc/external/mit/xorg-server/dist/config.guess
U xsrc/external/mit/xorg-server/dist/INSTALL
U xsrc/external/mit/xorg-server/dist/xorg-server.m4
U xsrc/external/mit/xorg-server/dist/glamor/glamor_transfer.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_render.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_eglmodule.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_image.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_compositerects.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_prepare.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_fbo.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_debug.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_largepixmap.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_segs.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_program.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_transform.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_egl.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_utils.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_egl_stubs.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_triangles.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_sync.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_picture.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_gradient.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_font.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_egl_ext.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_vbo.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_core.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_window.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_dash.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_xv.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_priv.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_prepare.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_lines.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_addtraps.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_pixmap.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_text.c
U xsrc/external/mit/xorg-server/dist/glamor/Makefile.am
U xsrc/external/mit/xorg-server/dist/glamor/glamor_composite_glyphs.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_transfer.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_context.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_glx.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_glyphblt.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_rects.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_font.c
U xsrc/external/mit/xorg-server/dist/glamor/meson.build
U xsrc/external/mit/xorg-server/dist/glamor/glamor_points.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_trapezoid.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_transform.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_egl.c
U xsrc/external/mit/xorg-server/dist/glamor/Makefile.in
U xsrc/external/mit/xorg-server/dist/glamor/glamor_spans.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_utils.h
U xsrc/external/mit/xorg-server/dist/glamor/glamor_copy.c
U xsrc/external/mit/xorg-server/dist/glamor/glamor_program.h
U xsrc/external/mit/xorg-server/dist/dix/window.c
U xsrc/external/mit/xorg-server/dist/dix/swaprep.c
U xsrc/external/mit/xorg-server/dist/dix/enterleave.h
U xsrc/external/mit/xorg-server/dist/dix/grabs.c
U xsrc/external/mit/xorg-server/dist/dix/buildatoms
U xsrc

re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[matthew green]

Valery Ushakov writes:
> On Fri, Jul 15, 2022 at 05:08:56 +, matthew green wrote:
>
> > Modified Files:
> > xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
> > drmmode_display.c
> > 
> > Log Message:
> > use "1ULL << 32" for a 64 bit member, not 1UL.
>
> We should be able to use UINT64_C(1) here, or?

not for upstream-able.  ULL is wrong on systems where the
libdrm "__u64" isn't a long long, but a long, but it should
be OK as it built on both 32 / 64 for me.

thanks.


.mrg.

Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[Valery Ushakov]

On Fri, Jul 15, 2022 at 05:08:56 +, matthew green wrote:

> Modified Files:
>   xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
>   drmmode_display.c
> 
> Log Message:
> use "1ULL << 32" for a 64 bit member, not 1UL.

We should be able to use UINT64_C(1) here, or?

-uwe