CVS commit: src/lib/libm
Module Name:src
Committed By: jklos
Date: Thu Dec 21 06:32:20 UTC 2023
Modified Files:
src/lib/libm: Makefile
Log Message:
Fix building with M68040 and M68060 options.
To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.222 src/lib/libm/Makefile:1.223
--- src/lib/libm/Makefile:1.222 Sun Oct 8 13:47:51 2023
+++ src/lib/libm/Makefile Thu Dec 21 06:32:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.222 2023/10/08 13:47:51 he Exp $
+# $NetBSD: Makefile,v 1.223 2023/12/21 06:32:20 jklos Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -144,14 +144,14 @@ SUBDIR=arch/i387
.if defined(M68060)
.PATH: ${.CURDIR}/arch/m68060
.include "${.CURDIR}/arch/m68060/Makefile.list"
-COPTS+=-m68060
+COPTS+= -m68060
.PATH: ${.CURDIR}/arch/m68k
ARCH_SRCS += s_ceil.S s_copysign.S s_finite.S s_floor.S s_rint.S
.elif defined(M68040)
.PATH: ${.CURDIR}/arch/m68k
-COPTS+=-m68040
+COPTS+= -m68040
ARCH_SRCS = s_copysign.S s_finite.S
-.else
+.endif
.if (${MKSOFTFLOAT} == "no")
.PATH: ${.CURDIR}/arch/mc68881 ${.CURDIR}/arch/m68k
ARCH_SRCS = e_acos.S e_asin.S e_atanh.S e_cosh.S e_exp.S e_fmod.S e_log.S \
@@ -160,7 +160,6 @@ ARCH_SRCS = e_acos.S e_asin.S e_atanh.S
s_log1p.S s_logb.S s_rint.S s_scalbn.S s_sin.S s_tan.S s_tanh.S
COMMON_SRCS += fenv.c s_nexttoward.c s_rintl.c
.endif
-.endif
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
# end of m68k
CVS commit: src/lib/libm
Module Name:src Committed By: jklos Date: Thu Dec 21 06:32:20 UTC 2023 Modified Files: src/lib/libm: Makefile Log Message: Fix building with M68040 and M68060 options. To generate a diff of this commit: cvs rdiff -u -r1.222 -r1.223 src/lib/libm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: andvar Date: Wed Dec 20 21:03:50 UTC 2023 Modified Files: src/sys/kern: kern_lwp.c Log Message: s/deatched/detached/ in comment. While here, fix an article before annoyance. To generate a diff of this commit: cvs rdiff -u -r1.268 -r1.269 src/sys/kern/kern_lwp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: andvar Date: Wed Dec 20 21:03:50 UTC 2023 Modified Files: src/sys/kern: kern_lwp.c Log Message: s/deatched/detached/ in comment. While here, fix an article before annoyance. To generate a diff of this commit: cvs rdiff -u -r1.268 -r1.269 src/sys/kern/kern_lwp.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/kern/kern_lwp.c diff -u src/sys/kern/kern_lwp.c:1.268 src/sys/kern/kern_lwp.c:1.269 --- src/sys/kern/kern_lwp.c:1.268 Wed Dec 20 20:35:37 2023 +++ src/sys/kern/kern_lwp.c Wed Dec 20 21:03:50 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_lwp.c,v 1.268 2023/12/20 20:35:37 andvar Exp $ */ +/* $NetBSD: kern_lwp.c,v 1.269 2023/12/20 21:03:50 andvar Exp $ */ /*- * Copyright (c) 2001, 2006, 2007, 2008, 2009, 2019, 2020, 2023 @@ -217,7 +217,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.268 2023/12/20 20:35:37 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.269 2023/12/20 21:03:50 andvar Exp $"); #include "opt_ddb.h" #include "opt_lockdebug.h" @@ -1171,7 +1171,7 @@ lwp_exit(struct lwp *l) * Get rid of all references to the LWP that others (e.g. procfs) * may have, and mark the LWP as a zombie. If the LWP is detached, * mark it waiting for collection in the proc structure. Note that - * before we can do that, we need to free any other dead, deatched + * before we can do that, we need to free any other dead, detached * LWP waiting to meet its maker. * * All conditions need to be observed upon under the same hold of @@ -1666,7 +1666,7 @@ lwp_eprio(lwp_t *l) * The function of the boost is to get the LWP onto a CPU and * running quickly. Once that happens the LWP loses the priority * boost and could be preempted very quickly by another LWP but that - * won't happen often enough to be a annoyance. + * won't happen often enough to be an annoyance. */ if (pri <= MAXPRI_USER && l->l_boostpri > MAXPRI_USER) pri = (pri >> 1) + l->l_boostpri;
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Wed Dec 20 20:35:37 UTC 2023 Modified Files: src/sys/arch/alpha/alpha: machdep.c src/sys/kern: init_sysctl_base.c kern_lwp.c Log Message: fix tripple n typos in "running"/"domainname", also one missing n in comments. To generate a diff of this commit: cvs rdiff -u -r1.376 -r1.377 src/sys/arch/alpha/alpha/machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/kern/init_sysctl_base.c cvs rdiff -u -r1.267 -r1.268 src/sys/kern/kern_lwp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Wed Dec 20 20:35:37 UTC 2023 Modified Files: src/sys/arch/alpha/alpha: machdep.c src/sys/kern: init_sysctl_base.c kern_lwp.c Log Message: fix tripple n typos in "running"/"domainname", also one missing n in comments. To generate a diff of this commit: cvs rdiff -u -r1.376 -r1.377 src/sys/arch/alpha/alpha/machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/kern/init_sysctl_base.c cvs rdiff -u -r1.267 -r1.268 src/sys/kern/kern_lwp.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/alpha/alpha/machdep.c diff -u src/sys/arch/alpha/alpha/machdep.c:1.376 src/sys/arch/alpha/alpha/machdep.c:1.377 --- src/sys/arch/alpha/alpha/machdep.c:1.376 Thu Aug 3 03:07:35 2023 +++ src/sys/arch/alpha/alpha/machdep.c Wed Dec 20 20:35:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.376 2023/08/03 03:07:35 rin Exp $ */ +/* $NetBSD: machdep.c,v 1.377 2023/12/20 20:35:37 andvar Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2019, 2020 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.376 2023/08/03 03:07:35 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.377 2023/12/20 20:35:37 andvar Exp $"); #include #include @@ -156,7 +156,7 @@ int unusedmem; /* amount of memory for int unknownmem; /* amount of memory with an unknown use */ int cputype; /* system type, from the RPB */ -bool alpha_is_qemu; /* true if we've detected runnnig in qemu */ +bool alpha_is_qemu; /* true if we've detected running in qemu */ int bootdev_debug = 0; /* patchable, or from DDB */ Index: src/sys/kern/init_sysctl_base.c diff -u src/sys/kern/init_sysctl_base.c:1.8 src/sys/kern/init_sysctl_base.c:1.9 --- src/sys/kern/init_sysctl_base.c:1.8 Tue Oct 31 12:37:23 2017 +++ src/sys/kern/init_sysctl_base.c Wed Dec 20 20:35:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysctl_base.c,v 1.8 2017/10/31 12:37:23 martin Exp $ */ +/* $NetBSD: init_sysctl_base.c,v 1.9 2023/12/20 20:35:37 andvar Exp $ */ /*- * Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: init_sysctl_base.c,v 1.8 2017/10/31 12:37:23 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysctl_base.c,v 1.9 2023/12/20 20:35:37 andvar Exp $"); #include #include @@ -270,7 +270,7 @@ SYSCTL_SETUP(sysctl_hwbase_setup, "sysct } /* - * sysctl helper function for kern.hostname and kern.domainnname. + * sysctl helper function for kern.hostname and kern.domainname. * resets the relevant recorded length when the underlying name is * changed. */ Index: src/sys/kern/kern_lwp.c diff -u src/sys/kern/kern_lwp.c:1.267 src/sys/kern/kern_lwp.c:1.268 --- src/sys/kern/kern_lwp.c:1.267 Sun Oct 15 10:28:14 2023 +++ src/sys/kern/kern_lwp.c Wed Dec 20 20:35:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_lwp.c,v 1.267 2023/10/15 10:28:14 riastradh Exp $ */ +/* $NetBSD: kern_lwp.c,v 1.268 2023/12/20 20:35:37 andvar Exp $ */ /*- * Copyright (c) 2001, 2006, 2007, 2008, 2009, 2019, 2020, 2023 @@ -60,7 +60,7 @@ * * Runnable: the LWP is parked on a run queue, and may soon be * chosen to run by an idle processor, or by a processor that - * has been asked to preempt a currently runnning but lower + * has been asked to preempt a currently running but lower * priority LWP. * * LSIDL @@ -217,7 +217,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.267 2023/10/15 10:28:14 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.268 2023/12/20 20:35:37 andvar Exp $"); #include "opt_ddb.h" #include "opt_lockdebug.h"
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: andvar Date: Wed Dec 20 19:43:51 UTC 2023 Removed Files: src/sys/arch/sparc64/conf: NONPLUS NONPLUS64 Log Message: Remove NONPLUS(64) kernel configs, which are not part of autobuild configs, unmaintained and fail to build. Approved by eeh (who committed them originally) by email and martin. To generate a diff of this commit: cvs rdiff -u -r1.60 -r0 src/sys/arch/sparc64/conf/NONPLUS cvs rdiff -u -r1.59 -r0 src/sys/arch/sparc64/conf/NONPLUS64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: andvar Date: Wed Dec 20 19:43:51 UTC 2023 Removed Files: src/sys/arch/sparc64/conf: NONPLUS NONPLUS64 Log Message: Remove NONPLUS(64) kernel configs, which are not part of autobuild configs, unmaintained and fail to build. Approved by eeh (who committed them originally) by email and martin. To generate a diff of this commit: cvs rdiff -u -r1.60 -r0 src/sys/arch/sparc64/conf/NONPLUS cvs rdiff -u -r1.59 -r0 src/sys/arch/sparc64/conf/NONPLUS64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src
Committed By: skrll
Date: Wed Dec 20 18:09:19 UTC 2023
Modified Files:
src/sys/dev/hyperv: if_hvn.c
src/sys/dev/ic: dwc_gmac.c
src/sys/dev/pci: if_ena.c if_ixl.c
src/sys/dev/pci/igc: if_igc.c
src/sys/dev/scsipi: if_dse.c if_se.c
Log Message:
Remove unnecssary #include
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/hyperv/if_hvn.c
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/ic/dwc_gmac.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/pci/if_ena.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/pci/if_ixl.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/igc/if_igc.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/scsipi/if_dse.c
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/scsipi/if_se.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/hyperv/if_hvn.c
diff -u src/sys/dev/hyperv/if_hvn.c:1.25 src/sys/dev/hyperv/if_hvn.c:1.26
--- src/sys/dev/hyperv/if_hvn.c:1.25 Fri Dec 8 21:46:02 2023
+++ src/sys/dev/hyperv/if_hvn.c Wed Dec 20 18:09:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hvn.c,v 1.25 2023/12/08 21:46:02 andvar Exp $ */
+/* $NetBSD: if_hvn.c,v 1.26 2023/12/20 18:09:18 skrll Exp $ */
/* $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $ */
/*-
@@ -35,13 +35,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.25 2023/12/08 21:46:02 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.26 2023/12/20 18:09:18 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_hvn.h"
#include "opt_inet.h"
#include "opt_inet6.h"
-#include "opt_net_mpsafe.h"
#endif
#include
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.79 src/sys/dev/ic/dwc_gmac.c:1.80
--- src/sys/dev/ic/dwc_gmac.c:1.79 Tue Aug 1 07:04:15 2023
+++ src/sys/dev/ic/dwc_gmac.c Wed Dec 20 18:09:19 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.79 2023/08/01 07:04:15 mrg Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.80 2023/12/20 18:09:19 skrll Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,13 +41,12 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.79 2023/08/01 07:04:15 mrg Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.80 2023/12/20 18:09:19 skrll Exp $");
/* #define DWC_GMAC_DEBUG 1 */
#ifdef _KERNEL_OPT
#include "opt_inet.h"
-#include "opt_net_mpsafe.h"
#endif
#include
Index: src/sys/dev/pci/if_ena.c
diff -u src/sys/dev/pci/if_ena.c:1.40 src/sys/dev/pci/if_ena.c:1.41
--- src/sys/dev/pci/if_ena.c:1.40 Sun Nov 5 18:26:11 2023
+++ src/sys/dev/pci/if_ena.c Wed Dec 20 18:09:19 2023
@@ -28,15 +28,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef _KERNEL_OPT
-#include "opt_net_mpsafe.h"
-#endif
-
#include
#if 0
__FBSDID("$FreeBSD: head/sys/dev/ena/ena.c 333456 2018-05-10 09:37:54Z mw $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.40 2023/11/05 18:26:11 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.41 2023/12/20 18:09:19 skrll Exp $");
#include
#include
Index: src/sys/dev/pci/if_ixl.c
diff -u src/sys/dev/pci/if_ixl.c:1.95 src/sys/dev/pci/if_ixl.c:1.96
--- src/sys/dev/pci/if_ixl.c:1.95 Fri Oct 13 04:43:35 2023
+++ src/sys/dev/pci/if_ixl.c Wed Dec 20 18:09:19 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.95 2023/10/13 04:43:35 yamaguchi Exp $ */
+/* $NetBSD: if_ixl.c,v 1.96 2023/12/20 18:09:19 skrll Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -74,10 +74,9 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.95 2023/10/13 04:43:35 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.96 2023/12/20 18:09:19 skrll Exp $");
#ifdef _KERNEL_OPT
-#include "opt_net_mpsafe.h"
#include "opt_if_ixl.h"
#endif
Index: src/sys/dev/pci/igc/if_igc.c
diff -u src/sys/dev/pci/igc/if_igc.c:1.8 src/sys/dev/pci/igc/if_igc.c:1.9
--- src/sys/dev/pci/igc/if_igc.c:1.8 Thu Nov 2 09:29:30 2023
+++ src/sys/dev/pci/igc/if_igc.c Wed Dec 20 18:09:19 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_igc.c,v 1.8 2023/11/02 09:29:30 rin Exp $ */
+/* $NetBSD: if_igc.c,v 1.9 2023/12/20 18:09:19 skrll Exp $ */
/* $OpenBSD: if_igc.c,v 1.13 2023/04/28 10:18:57 bluhm Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
@@ -30,10 +30,9 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.8 2023/11/02 09:29:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.9 2023/12/20 18:09:19 skrll Exp $");
#ifdef _KERNEL_OPT
-#include "opt_net_mpsafe.h"
#include "opt_if_igc.h"
#if 0 /* notyet */
#include "vlan.h"
Index: src/sys/dev/scsipi/if_dse.c
diff -u src/sys/dev/scsipi/if_dse.c:1.3 src/sys/dev/scsipi/if_dse.c:1.4
--- src/sys/dev/scsipi/if_dse.c:1.3 Thu Dec 22 23:06:11 2022
+++ src/sys/dev/scsipi/if_dse.c Wed Dec 20 18:09:19 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dse.c,v 1.3 2022/12/22 23:06:11 nat Exp $ */
+/* $NetBSD: if_dse.c,v 1.4 2023/12/20 18:09:19 skrll Exp $ */
/*
* Driver for DaynaPORT SCSI/Link
CVS commit: src/sys/dev
Module Name:src Committed By: skrll Date: Wed Dec 20 18:09:19 UTC 2023 Modified Files: src/sys/dev/hyperv: if_hvn.c src/sys/dev/ic: dwc_gmac.c src/sys/dev/pci: if_ena.c if_ixl.c src/sys/dev/pci/igc: if_igc.c src/sys/dev/scsipi: if_dse.c if_se.c Log Message: Remove unnecssary #include To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/dev/hyperv/if_hvn.c cvs rdiff -u -r1.79 -r1.80 src/sys/dev/ic/dwc_gmac.c cvs rdiff -u -r1.40 -r1.41 src/sys/dev/pci/if_ena.c cvs rdiff -u -r1.95 -r1.96 src/sys/dev/pci/if_ixl.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/igc/if_igc.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/scsipi/if_dse.c cvs rdiff -u -r1.118 -r1.119 src/sys/dev/scsipi/if_se.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Dec 20 17:19:16 UTC 2023 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openssh To generate a diff of this commit: cvs rdiff -u -r1.1968 -r1.1969 src/doc/3RDPARTY cvs rdiff -u -r1.3023 -r1.3024 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1968 src/doc/3RDPARTY:1.1969 --- src/doc/3RDPARTY:1.1968 Mon Dec 18 10:52:37 2023 +++ src/doc/3RDPARTY Wed Dec 20 12:19:15 2023 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1968 2023/12/18 15:52:37 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1969 2023/12/20 17:19:15 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1076,7 +1076,7 @@ Notes: Patch applied after OpenSSH import. Package: OpenSSH -Version: 9.5 +Version: 9.6 Current Vers: 9.6 / portable 9.6p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.3023 src/doc/CHANGES:1.3024 --- src/doc/CHANGES:1.3023 Mon Dec 18 10:52:37 2023 +++ src/doc/CHANGES Wed Dec 20 12:19:16 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3023 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3024 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -242,4 +242,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0: kernel: Modularize compat90. [pgoyette 20231209] libsa: Add NFSv3 support. [mlelstv 20231212] dhcpcd: Import version 10.0.6. [roy 20231218] - + OpenSSH: Import 9.6. [christos 20231220]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Dec 20 17:19:16 UTC 2023 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openssh To generate a diff of this commit: cvs rdiff -u -r1.1968 -r1.1969 src/doc/3RDPARTY cvs rdiff -u -r1.3023 -r1.3024 src/doc/CHANGES 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
Module Name:src Committed By: christos Date: Wed Dec 20 17:17:21 UTC 2023 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libssh To generate a diff of this commit: cvs rdiff -u -r1.972 -r1.973 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.333 -r1.334 src/distrib/sets/lists/debug/shl.mi 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/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.972 src/distrib/sets/lists/base/shl.mi:1.973 --- src/distrib/sets/lists/base/shl.mi:1.972 Wed Oct 25 16:22:00 2023 +++ src/distrib/sets/lists/base/shl.mi Wed Dec 20 12:17:21 2023 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.972 2023/10/25 20:22:00 christos Exp $ +# $NetBSD: shl.mi,v 1.973 2023/12/20 17:17:21 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -876,9 +876,8 @@ ./usr/lib/libsqlite3.so.1.5 base-sys-shlib compatfile ./usr/lib/libss.sobase-obsolete obsolete ./usr/lib/libssh.sobase-secsh-shlib compatfile -./usr/lib/libssh.so.45base-secsh-shlib compatfile -./usr/lib/libssh.so.45.0 base-obsolete obsolete -./usr/lib/libssh.so.45.1 base-secsh-shlib compatfile +./usr/lib/libssh.so.46base-secsh-shlib compatfile +./usr/lib/libssh.so.46.1 base-secsh-shlib compatfile ./usr/lib/libssl.sobase-crypto-shlib compatfile ./usr/lib/libssl.so.12base-crypto-shlib compatfile,openssl=10 ./usr/lib/libssl.so.12.0 base-crypto-shlib compatfile,openssl=10 Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.333 src/distrib/sets/lists/debug/shl.mi:1.334 --- src/distrib/sets/lists/debug/shl.mi:1.333 Wed Oct 25 16:22:00 2023 +++ src/distrib/sets/lists/debug/shl.mi Wed Dec 20 12:17:21 2023 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.333 2023/10/25 20:22:00 christos Exp $ +# $NetBSD: shl.mi,v 1.334 2023/12/20 17:17:21 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -288,8 +288,7 @@ ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug comp-sys-debug debug,compatfile,skey ./usr/libdata/debug/usr/lib/libsl.so.7.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libsqlite3.so.1.5.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libssh.so.45.0.debug comp-obsolete obsolete -./usr/libdata/debug/usr/lib/libssh.so.45.1.debug comp-secsh-debug debug,compatfile +./usr/libdata/debug/usr/lib/libssh.so.46.1.debug comp-secsh-debug debug,compatfile ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug comp-crypto-debug debug,compatfile,openssl=10 ./usr/libdata/debug/usr/lib/libssl.so.14.0.debug comp-crypto-debug debug,compatfile,openssl=11 ./usr/libdata/debug/usr/lib/libssl.so.15.0.debug comp-crypto-debug debug,compatfile,openssl=30
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Wed Dec 20 17:17:21 UTC 2023 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libssh To generate a diff of this commit: cvs rdiff -u -r1.972 -r1.973 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.333 -r1.334 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh
Module Name:src Committed By: christos Date: Wed Dec 20 17:15:21 UTC 2023 Modified Files: src/crypto/external/bsd/openssh/bin: Makefile.inc src/crypto/external/bsd/openssh/bin/ssh: Makefile src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent auth2.c authfd.c authfd.h channels.c channels.h cipher.c cipher.h clientloop.c kex.c kex.h log.c misc.c misc.h monitor_wrap.c mux.c packet.c packet.h readconf.c readconf.h scp.c servconf.c sftp-client.c ssh-add.1 ssh-add.c ssh-agent.c ssh-pkcs11-client.c ssh-pkcs11.h ssh.1 ssh.c ssh2.h ssh_config.5 sshconnect.c sshconnect.h sshconnect2.c sshd.c sshkey.c sshsig.c version.h xmalloc.h src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib: shlib_version Log Message: Merge conflicts between 9.5 and 9.6 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/bin/Makefile.inc cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/bin/ssh/Makefile cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/PROTOCOL cvs rdiff -u -r1.14 -r1.15 \ src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \ src/crypto/external/bsd/openssh/dist/ssh2.h cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/auth2.c cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/authfd.c \ src/crypto/external/bsd/openssh/dist/log.c \ src/crypto/external/bsd/openssh/dist/misc.h cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/authfd.h \ src/crypto/external/bsd/openssh/dist/cipher.h \ src/crypto/external/bsd/openssh/dist/sshconnect.h cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/channels.c cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/channels.h \ src/crypto/external/bsd/openssh/dist/packet.h cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/cipher.c cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/clientloop.c \ src/crypto/external/bsd/openssh/dist/ssh.1 cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/kex.c \ src/crypto/external/bsd/openssh/dist/monitor_wrap.c \ src/crypto/external/bsd/openssh/dist/readconf.h cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/kex.h cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/misc.c \ src/crypto/external/bsd/openssh/dist/mux.c \ src/crypto/external/bsd/openssh/dist/sftp-client.c cvs rdiff -u -r1.49 -r1.50 src/crypto/external/bsd/openssh/dist/packet.c \ src/crypto/external/bsd/openssh/dist/sshd.c cvs rdiff -u -r1.43 -r1.44 src/crypto/external/bsd/openssh/dist/readconf.c \ src/crypto/external/bsd/openssh/dist/servconf.c \ src/crypto/external/bsd/openssh/dist/version.h cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/scp.c cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/ssh-add.1 cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/ssh-add.c cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/ssh-agent.c \ src/crypto/external/bsd/openssh/dist/sshconnect.c cvs rdiff -u -r1.18 -r1.19 \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/ssh-pkcs11.h cvs rdiff -u -r1.44 -r1.45 src/crypto/external/bsd/openssh/dist/ssh.c cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/ssh_config.5 cvs rdiff -u -r1.45 -r1.46 src/crypto/external/bsd/openssh/dist/sshconnect2.c cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/sshkey.c cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/sshsig.c cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/xmalloc.h cvs rdiff -u -r1.15 -r1.16 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 cvs rdiff -u -r1.17 -r1.18 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.4096 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.6144 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.7680 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.8192 cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/crypto/external/bsd/openssh
Module Name:src Committed By: christos Date: Wed Dec 20 17:15:21 UTC 2023 Modified Files: src/crypto/external/bsd/openssh/bin: Makefile.inc src/crypto/external/bsd/openssh/bin/ssh: Makefile src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent auth2.c authfd.c authfd.h channels.c channels.h cipher.c cipher.h clientloop.c kex.c kex.h log.c misc.c misc.h monitor_wrap.c mux.c packet.c packet.h readconf.c readconf.h scp.c servconf.c sftp-client.c ssh-add.1 ssh-add.c ssh-agent.c ssh-pkcs11-client.c ssh-pkcs11.h ssh.1 ssh.c ssh2.h ssh_config.5 sshconnect.c sshconnect.h sshconnect2.c sshd.c sshkey.c sshsig.c version.h xmalloc.h src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib: shlib_version Log Message: Merge conflicts between 9.5 and 9.6 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/bin/Makefile.inc cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/bin/ssh/Makefile cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/PROTOCOL cvs rdiff -u -r1.14 -r1.15 \ src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \ src/crypto/external/bsd/openssh/dist/ssh2.h cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/auth2.c cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/authfd.c \ src/crypto/external/bsd/openssh/dist/log.c \ src/crypto/external/bsd/openssh/dist/misc.h cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/authfd.h \ src/crypto/external/bsd/openssh/dist/cipher.h \ src/crypto/external/bsd/openssh/dist/sshconnect.h cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/channels.c cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/channels.h \ src/crypto/external/bsd/openssh/dist/packet.h cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/cipher.c cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/clientloop.c \ src/crypto/external/bsd/openssh/dist/ssh.1 cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/kex.c \ src/crypto/external/bsd/openssh/dist/monitor_wrap.c \ src/crypto/external/bsd/openssh/dist/readconf.h cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/kex.h cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/misc.c \ src/crypto/external/bsd/openssh/dist/mux.c \ src/crypto/external/bsd/openssh/dist/sftp-client.c cvs rdiff -u -r1.49 -r1.50 src/crypto/external/bsd/openssh/dist/packet.c \ src/crypto/external/bsd/openssh/dist/sshd.c cvs rdiff -u -r1.43 -r1.44 src/crypto/external/bsd/openssh/dist/readconf.c \ src/crypto/external/bsd/openssh/dist/servconf.c \ src/crypto/external/bsd/openssh/dist/version.h cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/scp.c cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/ssh-add.1 cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/ssh-add.c cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/ssh-agent.c \ src/crypto/external/bsd/openssh/dist/sshconnect.c cvs rdiff -u -r1.18 -r1.19 \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/ssh-pkcs11.h cvs rdiff -u -r1.44 -r1.45 src/crypto/external/bsd/openssh/dist/ssh.c cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/ssh_config.5 cvs rdiff -u -r1.45 -r1.46 src/crypto/external/bsd/openssh/dist/sshconnect2.c cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/sshkey.c cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/sshsig.c cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/xmalloc.h cvs rdiff -u -r1.15 -r1.16 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 cvs rdiff -u -r1.17 -r1.18 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.4096 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.6144 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.7680 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.8192 cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Wed Dec 20 17:11:31 UTC 2023 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13410 Log Message: Import OpenSSH 9.6/9.6p1 (2023-12-18) Last was 9.5 Changes since OpenSSH 9.5 = This release contains a number of security fixes, some small features and bugfixes. Security This release contains fixes for a newly-discovered weakness in the SSH transport protocol, a logic error relating to constrained PKCS#11 keys in ssh-agent(1) and countermeasures for programs that invoke ssh(1) with user or hostnames containing invalid characters. * ssh(1), sshd(8): implement protocol extensions to thwart the so-called "Terrapin attack" discovered by Fabian B�umer, Marcus Brinkmann and J�rg Schwenk. This attack allows a MITM to effect a limited break of the integrity of the early encrypted SSH transport protocol by sending extra messages prior to the commencement of encryption, and deleting an equal number of consecutive messages immediately after encryption starts. A peer SSH client/server would not be able to detect that messages were deleted. While cryptographically novel, the security impact of this attack is fortunately very limited as it only allows deletion of consecutive messages, and deleting most messages at this stage of the protocol prevents user user authentication from proceeding and results in a stuck connection. The most serious identified impact is that it lets a MITM to delete the SSH2_MSG_EXT_INFO message sent before authentication starts, allowing the attacker to disable a subset of the keystroke timing obfuscation features introduced in OpenSSH 9.5. There is no other discernable impact to session secrecy or session integrity. OpenSSH 9.6 addresses this protocol weakness through a new "strict KEX" protocol extension that will be automatically enabled when both the client and server support it. This extension makes two changes to the SSH transport protocol to improve the integrity of the initial key exchange. Firstly, it requires endpoints to terminate the connection if any unnecessary or unexpected message is received during key exchange (including messages that were previously legal but not strictly required like SSH2_MSG_DEBUG). This removes most malleability from the early protocol. Secondly, it resets the Message Authentication Code counter at the conclusion of each key exchange, preventing previously inserted messages from being able to make persistent changes to the sequence number across completion of a key exchange. Either of these changes should be sufficient to thwart the Terrapin Attack. More details of these changes are in the PROTOCOL file in the OpenSSH source distribition. * ssh-agent(1): when adding PKCS#11-hosted private keys while specifying destination constraints, if the PKCS#11 token returned multiple keys then only the first key had the constraints applied. Use of regular private keys, FIDO tokens and unconstrained keys are unaffected. * ssh(1): if an invalid user or hostname that contained shell metacharacters was passed to ssh(1), and a ProxyCommand, LocalCommand directive or "match exec" predicate referenced the user or hostname via %u, %h or similar expansion token, then an attacker who could supply arbitrary user/hostnames to ssh(1) could potentially perform command injection depending on what quoting was present in the user-supplied ssh_config(5) directive. This situation could arise in the case of git submodules, where a repository could contain a submodule with shell characters in its user/hostname. Git does not ban shell metacharacters in user or host names when checking out repositories from untrusted sources. Although we believe it is the user's responsibility to ensure validity of arguments passed to ssh(1), especially across a security boundary such as the git example above, OpenSSH 9.6 now bans most shell metacharacters from user and hostnames supplied via the command-line. This countermeasure is not guaranteed to be effective in all situations, as it is infeasible for ssh(1) to universally filter shell metacharacters potentially relevant to user-supplied commands. User/hostnames provided via ssh_config(5) are not subject to these restrictions, allowing configurations that use strange names to continue to be used, under the assumption that the user knows what they are doing in their own configuration files. Potentially incompatible changes * ssh(1), sshd(8): the RFC4254 connection/channels protocol provides a TCP-like window mechanism that limits the amount of data that can be sent without acceptance from the peer. In cases where this limit was exceeded by a non-conforming peer SSH
CVS import: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Wed Dec 20 17:11:31 UTC 2023 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13410 Log Message: Import OpenSSH 9.6/9.6p1 (2023-12-18) Last was 9.5 Changes since OpenSSH 9.5 = This release contains a number of security fixes, some small features and bugfixes. Security This release contains fixes for a newly-discovered weakness in the SSH transport protocol, a logic error relating to constrained PKCS#11 keys in ssh-agent(1) and countermeasures for programs that invoke ssh(1) with user or hostnames containing invalid characters. * ssh(1), sshd(8): implement protocol extensions to thwart the so-called "Terrapin attack" discovered by Fabian B�umer, Marcus Brinkmann and J�rg Schwenk. This attack allows a MITM to effect a limited break of the integrity of the early encrypted SSH transport protocol by sending extra messages prior to the commencement of encryption, and deleting an equal number of consecutive messages immediately after encryption starts. A peer SSH client/server would not be able to detect that messages were deleted. While cryptographically novel, the security impact of this attack is fortunately very limited as it only allows deletion of consecutive messages, and deleting most messages at this stage of the protocol prevents user user authentication from proceeding and results in a stuck connection. The most serious identified impact is that it lets a MITM to delete the SSH2_MSG_EXT_INFO message sent before authentication starts, allowing the attacker to disable a subset of the keystroke timing obfuscation features introduced in OpenSSH 9.5. There is no other discernable impact to session secrecy or session integrity. OpenSSH 9.6 addresses this protocol weakness through a new "strict KEX" protocol extension that will be automatically enabled when both the client and server support it. This extension makes two changes to the SSH transport protocol to improve the integrity of the initial key exchange. Firstly, it requires endpoints to terminate the connection if any unnecessary or unexpected message is received during key exchange (including messages that were previously legal but not strictly required like SSH2_MSG_DEBUG). This removes most malleability from the early protocol. Secondly, it resets the Message Authentication Code counter at the conclusion of each key exchange, preventing previously inserted messages from being able to make persistent changes to the sequence number across completion of a key exchange. Either of these changes should be sufficient to thwart the Terrapin Attack. More details of these changes are in the PROTOCOL file in the OpenSSH source distribition. * ssh-agent(1): when adding PKCS#11-hosted private keys while specifying destination constraints, if the PKCS#11 token returned multiple keys then only the first key had the constraints applied. Use of regular private keys, FIDO tokens and unconstrained keys are unaffected. * ssh(1): if an invalid user or hostname that contained shell metacharacters was passed to ssh(1), and a ProxyCommand, LocalCommand directive or "match exec" predicate referenced the user or hostname via %u, %h or similar expansion token, then an attacker who could supply arbitrary user/hostnames to ssh(1) could potentially perform command injection depending on what quoting was present in the user-supplied ssh_config(5) directive. This situation could arise in the case of git submodules, where a repository could contain a submodule with shell characters in its user/hostname. Git does not ban shell metacharacters in user or host names when checking out repositories from untrusted sources. Although we believe it is the user's responsibility to ensure validity of arguments passed to ssh(1), especially across a security boundary such as the git example above, OpenSSH 9.6 now bans most shell metacharacters from user and hostnames supplied via the command-line. This countermeasure is not guaranteed to be effective in all situations, as it is infeasible for ssh(1) to universally filter shell metacharacters potentially relevant to user-supplied commands. User/hostnames provided via ssh_config(5) are not subject to these restrictions, allowing configurations that use strange names to continue to be used, under the assumption that the user knows what they are doing in their own configuration files. Potentially incompatible changes * ssh(1), sshd(8): the RFC4254 connection/channels protocol provides a TCP-like window mechanism that limits the amount of data that can be sent without acceptance from the peer. In cases where this limit was exceeded by a non-conforming peer SSH
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Wed Dec 20 15:34:46 UTC 2023 Modified Files: src/sys/arch/sh3/dev: adc.c rtc.c shpcic.c wdog.c src/sys/arch/sh3/sh3: coff_exec.c interrupt.c sh3_machdep.c vm_machdep.c src/sys/arch/shark/isa: isadma_machdep.c src/sys/arch/shark/ofw: chipsfb_ofbus.c vga_ofbus.c src/sys/arch/shark/shark: autoconf.c src/sys/arch/vax/vax: autoconf.c ctu.c ka88.c sgmap.c src/sys/arch/vax/vsa: leds.c ncr.c vsbus_dma.c src/sys/arch/xen/xen: xenmem.c src/sys/arch/zaurus/dev: ztp.c src/sys/arch/zaurus/zaurus: autoconf.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sh3/dev/adc.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sh3/dev/rtc.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sh3/dev/shpcic.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sh3/dev/wdog.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sh3/sh3/coff_exec.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sh3/sh3/interrupt.c cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sh3/sh3/sh3_machdep.c cvs rdiff -u -r1.83 -r1.84 src/sys/arch/sh3/sh3/vm_machdep.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/shark/isa/isadma_machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/shark/ofw/chipsfb_ofbus.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/shark/ofw/vga_ofbus.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/shark/shark/autoconf.c cvs rdiff -u -r1.100 -r1.101 src/sys/arch/vax/vax/autoconf.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/vax/vax/ctu.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/vax/vax/ka88.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/vax/vax/sgmap.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/vsa/leds.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/vax/vsa/ncr.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/vsa/vsbus_dma.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/xen/xen/xenmem.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/zaurus/dev/ztp.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/zaurus/zaurus/autoconf.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/sh3/dev/adc.c diff -u src/sys/arch/sh3/dev/adc.c:1.15 src/sys/arch/sh3/dev/adc.c:1.16 --- src/sys/arch/sh3/dev/adc.c:1.15 Sat Aug 7 16:19:05 2021 +++ src/sys/arch/sh3/dev/adc.c Wed Dec 20 15:34:45 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: adc.c,v 1.15 2021/08/07 16:19:05 thorpej Exp $ */ +/* $NetBSD: adc.c,v 1.16 2023/12/20 15:34:45 thorpej Exp $ */ /* * Copyright (c) 2003 Valeriy E. Ushakov @@ -28,12 +28,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: adc.c,v 1.15 2021/08/07 16:19:05 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adc.c,v 1.16 2023/12/20 15:34:45 thorpej Exp $"); #include #include #include -#include #include #include Index: src/sys/arch/sh3/dev/rtc.c diff -u src/sys/arch/sh3/dev/rtc.c:1.10 src/sys/arch/sh3/dev/rtc.c:1.11 --- src/sys/arch/sh3/dev/rtc.c:1.10 Thu Nov 20 16:34:26 2014 +++ src/sys/arch/sh3/dev/rtc.c Wed Dec 20 15:34:45 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: rtc.c,v 1.10 2014/11/20 16:34:26 christos Exp $ */ +/* $NetBSD: rtc.c,v 1.11 2023/12/20 15:34:45 thorpej Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,12 +30,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.10 2014/11/20 16:34:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.11 2023/12/20 15:34:45 thorpej Exp $"); #include #include #include -#include #include #ifdef GPROF #include Index: src/sys/arch/sh3/dev/shpcic.c diff -u src/sys/arch/sh3/dev/shpcic.c:1.22 src/sys/arch/sh3/dev/shpcic.c:1.23 --- src/sys/arch/sh3/dev/shpcic.c:1.22 Sat Aug 7 16:19:05 2021 +++ src/sys/arch/sh3/dev/shpcic.c Wed Dec 20 15:34:45 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: shpcic.c,v 1.22 2021/08/07 16:19:05 thorpej Exp $ */ +/* $NetBSD: shpcic.c,v 1.23 2023/12/20 15:34:45 thorpej Exp $ */ /*- * Copyright (C) 2005 NONAKA Kimihiro @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1.22 2021/08/07 16:19:05 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1.23 2023/12/20 15:34:45 thorpej Exp $"); #include "opt_pci.h" @@ -34,7 +34,6 @@ __KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1 #include #include #include -#include #include #include Index: src/sys/arch/sh3/dev/wdog.c diff -u src/sys/arch/sh3/dev/wdog.c:1.18 src/sys/arch/sh3/dev/wdog.c:1.19 --- src/sys/arch/sh3/dev/wdog.c:1.18 Fri Jul 25 08:10:34 2014 +++ src/sys/arch/sh3/dev/wdog.c Wed Dec 20 15:34:45 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: wdog.c,v 1.18 2014/07/25 08:10:34 dholland Exp $ */ +/* $NetBSD: wdog.c,v 1.19 2023/12/20 15:34:45 thorpej Exp $ */ /*- * Copyright (C) 2000 SAITOH Masanobu. All rights reserved. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wdog.c,v 1.18 2014/07/25 08:10:34 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wdog.c,v 1.19 2023/12/20 15:34:45 thorpej Exp $"); #include #include @@ -37,7 +37,6
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Wed Dec 20 15:34:46 UTC 2023 Modified Files: src/sys/arch/sh3/dev: adc.c rtc.c shpcic.c wdog.c src/sys/arch/sh3/sh3: coff_exec.c interrupt.c sh3_machdep.c vm_machdep.c src/sys/arch/shark/isa: isadma_machdep.c src/sys/arch/shark/ofw: chipsfb_ofbus.c vga_ofbus.c src/sys/arch/shark/shark: autoconf.c src/sys/arch/vax/vax: autoconf.c ctu.c ka88.c sgmap.c src/sys/arch/vax/vsa: leds.c ncr.c vsbus_dma.c src/sys/arch/xen/xen: xenmem.c src/sys/arch/zaurus/dev: ztp.c src/sys/arch/zaurus/zaurus: autoconf.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sh3/dev/adc.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sh3/dev/rtc.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sh3/dev/shpcic.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sh3/dev/wdog.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sh3/sh3/coff_exec.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sh3/sh3/interrupt.c cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sh3/sh3/sh3_machdep.c cvs rdiff -u -r1.83 -r1.84 src/sys/arch/sh3/sh3/vm_machdep.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/shark/isa/isadma_machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/shark/ofw/chipsfb_ofbus.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/shark/ofw/vga_ofbus.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/shark/shark/autoconf.c cvs rdiff -u -r1.100 -r1.101 src/sys/arch/vax/vax/autoconf.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/vax/vax/ctu.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/vax/vax/ka88.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/vax/vax/sgmap.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/vsa/leds.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/vax/vsa/ncr.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/vsa/vsbus_dma.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/xen/xen/xenmem.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/zaurus/dev/ztp.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/zaurus/zaurus/autoconf.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
Module Name:src Committed By: thorpej Date: Wed Dec 20 15:29:08 UTC 2023 Modified Files: src/sys/arch/macppc/dev: deq.c esp.c gpio.c kauai.c mesh.c ofb.c smuiic.c smusat.c snapper.c videopll.c src/sys/arch/macppc/macppc: interrupts.c ipi_hammerhead.c src/sys/arch/mipsco/mipsco: bus_space.c interrupt.c src/sys/arch/mipsco/obio: asc.c src/sys/arch/mvme68k/dev: sbicvar.h src/sys/arch/mvmeppc/mvmeppc: machdep.c src/sys/arch/netwinder/netwinder: autoconf.c src/sys/arch/newsmips/dev: sc_wrap.c src/sys/arch/newsmips/newsmips: machdep.c src/sys/arch/playstation2/dev: wdc_spd.c src/sys/arch/playstation2/playstation2: interrupt.c src/sys/arch/powerpc/ibm4xx/dev: plb.c src/sys/arch/powerpc/ibm4xx/pci: pchb.c src/sys/arch/powerpc/powerpc: sig_machdep.c src/sys/arch/prep/pnpbus: mcclock_pnpbus.c wdc_pnpbus.c src/sys/arch/prep/prep: autoconf.c machdep.c platform.c src/sys/arch/rs6000/rs6000: autoconf.c machdep.c mainbus.c src/sys/arch/sandpoint/pci: pci_machdep.c src/sys/arch/sandpoint/sandpoint: machdep.c mainbus.c src/sys/arch/sandpoint/stand/altboot: brdsetup.c src/sys/arch/sbmips/sbmips: machdep.c src/sys/arch/sgimips/dev: crmfb.c scn.c src/sys/arch/sgimips/gio: pci_gio.c src/sys/arch/sgimips/hpc: if_sq.c src/sys/arch/sgimips/ioc: ioc.c src/sys/arch/sgimips/mace: if_mec.c mace.c pci_mace.c src/sys/arch/sgimips/sgimips: bus.c machdep.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/macppc/dev/deq.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/macppc/dev/esp.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/macppc/dev/gpio.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/macppc/dev/kauai.c cvs rdiff -u -r1.43 -r1.44 src/sys/arch/macppc/dev/mesh.c cvs rdiff -u -r1.72 -r1.73 src/sys/arch/macppc/dev/ofb.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/macppc/dev/smuiic.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/macppc/dev/smusat.c cvs rdiff -u -r1.66 -r1.67 src/sys/arch/macppc/dev/snapper.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/dev/videopll.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/macppc/macppc/interrupts.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/macppc/macppc/ipi_hammerhead.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mipsco/mipsco/bus_space.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mipsco/mipsco/interrupt.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mipsco/obio/asc.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mvme68k/dev/sbicvar.h cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mvmeppc/mvmeppc/machdep.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/netwinder/netwinder/autoconf.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/newsmips/dev/sc_wrap.c cvs rdiff -u -r1.121 -r1.122 src/sys/arch/newsmips/newsmips/machdep.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/playstation2/dev/wdc_spd.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/playstation2/playstation2/interrupt.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/ibm4xx/dev/plb.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/ibm4xx/pci/pchb.c cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/powerpc/sig_machdep.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/prep/pnpbus/mcclock_pnpbus.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/prep/pnpbus/wdc_pnpbus.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/prep/prep/autoconf.c cvs rdiff -u -r1.77 -r1.78 src/sys/arch/prep/prep/machdep.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/prep/prep/platform.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/rs6000/rs6000/autoconf.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/rs6000/rs6000/machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/rs6000/rs6000/mainbus.c cvs rdiff -u -r1.37 -r1.38 src/sys/arch/sandpoint/pci/pci_machdep.c cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sandpoint/sandpoint/machdep.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sandpoint/sandpoint/mainbus.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sandpoint/stand/altboot/brdsetup.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sbmips/sbmips/machdep.c cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sgimips/dev/crmfb.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/dev/scn.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sgimips/gio/pci_gio.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sgimips/hpc/if_sq.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sgimips/ioc/ioc.c cvs rdiff -u -r1.64 -r1.65 src/sys/arch/sgimips/mace/if_mec.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sgimips/mace/mace.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sgimips/mace/pci_mace.c cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sgimips/sgimips/bus.c cvs rdiff -u -r1.152 -r1.153 src/sys/arch/sgimips/sgimips/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/macppc/dev/deq.c diff -u src/sys/arch/macppc/dev/deq.c:1.20 src/sys/arch/macppc/dev/deq.c:1.21 ---
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Wed Dec 20 15:29:08 UTC 2023 Modified Files: src/sys/arch/macppc/dev: deq.c esp.c gpio.c kauai.c mesh.c ofb.c smuiic.c smusat.c snapper.c videopll.c src/sys/arch/macppc/macppc: interrupts.c ipi_hammerhead.c src/sys/arch/mipsco/mipsco: bus_space.c interrupt.c src/sys/arch/mipsco/obio: asc.c src/sys/arch/mvme68k/dev: sbicvar.h src/sys/arch/mvmeppc/mvmeppc: machdep.c src/sys/arch/netwinder/netwinder: autoconf.c src/sys/arch/newsmips/dev: sc_wrap.c src/sys/arch/newsmips/newsmips: machdep.c src/sys/arch/playstation2/dev: wdc_spd.c src/sys/arch/playstation2/playstation2: interrupt.c src/sys/arch/powerpc/ibm4xx/dev: plb.c src/sys/arch/powerpc/ibm4xx/pci: pchb.c src/sys/arch/powerpc/powerpc: sig_machdep.c src/sys/arch/prep/pnpbus: mcclock_pnpbus.c wdc_pnpbus.c src/sys/arch/prep/prep: autoconf.c machdep.c platform.c src/sys/arch/rs6000/rs6000: autoconf.c machdep.c mainbus.c src/sys/arch/sandpoint/pci: pci_machdep.c src/sys/arch/sandpoint/sandpoint: machdep.c mainbus.c src/sys/arch/sandpoint/stand/altboot: brdsetup.c src/sys/arch/sbmips/sbmips: machdep.c src/sys/arch/sgimips/dev: crmfb.c scn.c src/sys/arch/sgimips/gio: pci_gio.c src/sys/arch/sgimips/hpc: if_sq.c src/sys/arch/sgimips/ioc: ioc.c src/sys/arch/sgimips/mace: if_mec.c mace.c pci_mace.c src/sys/arch/sgimips/sgimips: bus.c machdep.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/macppc/dev/deq.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/macppc/dev/esp.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/macppc/dev/gpio.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/macppc/dev/kauai.c cvs rdiff -u -r1.43 -r1.44 src/sys/arch/macppc/dev/mesh.c cvs rdiff -u -r1.72 -r1.73 src/sys/arch/macppc/dev/ofb.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/macppc/dev/smuiic.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/macppc/dev/smusat.c cvs rdiff -u -r1.66 -r1.67 src/sys/arch/macppc/dev/snapper.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/dev/videopll.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/macppc/macppc/interrupts.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/macppc/macppc/ipi_hammerhead.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mipsco/mipsco/bus_space.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mipsco/mipsco/interrupt.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mipsco/obio/asc.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mvme68k/dev/sbicvar.h cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mvmeppc/mvmeppc/machdep.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/netwinder/netwinder/autoconf.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/newsmips/dev/sc_wrap.c cvs rdiff -u -r1.121 -r1.122 src/sys/arch/newsmips/newsmips/machdep.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/playstation2/dev/wdc_spd.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/playstation2/playstation2/interrupt.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/ibm4xx/dev/plb.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/ibm4xx/pci/pchb.c cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/powerpc/sig_machdep.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/prep/pnpbus/mcclock_pnpbus.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/prep/pnpbus/wdc_pnpbus.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/prep/prep/autoconf.c cvs rdiff -u -r1.77 -r1.78 src/sys/arch/prep/prep/machdep.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/prep/prep/platform.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/rs6000/rs6000/autoconf.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/rs6000/rs6000/machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/rs6000/rs6000/mainbus.c cvs rdiff -u -r1.37 -r1.38 src/sys/arch/sandpoint/pci/pci_machdep.c cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sandpoint/sandpoint/machdep.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sandpoint/sandpoint/mainbus.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sandpoint/stand/altboot/brdsetup.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sbmips/sbmips/machdep.c cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sgimips/dev/crmfb.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/dev/scn.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sgimips/gio/pci_gio.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sgimips/hpc/if_sq.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sgimips/ioc/ioc.c cvs rdiff -u -r1.64 -r1.65 src/sys/arch/sgimips/mace/if_mec.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sgimips/mace/mace.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sgimips/mace/pci_mace.c cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sgimips/sgimips/bus.c cvs rdiff -u -r1.152 -r1.153 src/sys/arch/sgimips/sgimips/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: tsutsui
Date: Wed Dec 20 15:07:16 UTC 2023
Modified Files:
src/usr.sbin/makefs: msdos.c
Log Message:
Return a proper exit status on failure on creating msdosfs.
No particular comment in PR bin/57752.
Should be pulled up to netbsd-10 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/makefs/msdos.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.sbin/makefs/msdos.c
diff -u src/usr.sbin/makefs/msdos.c:1.21 src/usr.sbin/makefs/msdos.c:1.22
--- src/usr.sbin/makefs/msdos.c:1.21 Sat Apr 9 10:05:35 2022
+++ src/usr.sbin/makefs/msdos.c Wed Dec 20 15:07:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msdos.c,v 1.21 2022/04/09 10:05:35 riastradh Exp $ */
+/* $NetBSD: msdos.c,v 1.22 2023/12/20 15:07:16 tsutsui Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: msdos.c,v 1.21 2022/04/09 10:05:35 riastradh Exp $");
+__RCSID("$NetBSD: msdos.c,v 1.22 2023/12/20 15:07:16 tsutsui Exp $");
#endif /* !__lint */
#include
@@ -177,7 +177,7 @@ msdos_makefs(const char *image, const ch
printf("Creating `%s'\n", image);
TIMER_START(start);
if (mkfs_msdos(image, NULL, _opt->options) == -1)
- return;
+ errx(1, "Image file `%s' not created.", image);
TIMER_RESULTS(start, "mkfs_msdos");
fsopts->fd = open(image, O_RDWR);
@@ -201,7 +201,7 @@ msdos_makefs(const char *image, const ch
printf("Populating `%s'\n", image);
TIMER_START(start);
if (msdos_populate_dir(dir, VTODE(), root, root, fsopts) == -1)
- errx(1, "Image file `%s' not created.", image);
+ errx(1, "Image file `%s' not populated.", image);
TIMER_RESULTS(start, "msdos_populate_dir");
if (debug & DEBUG_FS_MAKEFS)
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: tsutsui Date: Wed Dec 20 15:07:16 UTC 2023 Modified Files: src/usr.sbin/makefs: msdos.c Log Message: Return a proper exit status on failure on creating msdosfs. No particular comment in PR bin/57752. Should be pulled up to netbsd-10 and netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/makefs/msdos.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
Module Name:src Committed By: thorpej Date: Wed Dec 20 15:00:08 UTC 2023 Modified Files: src/sys/arch/i386/isa: cmos.c isapnp_machdep.c src/sys/arch/i386/pci: ali1543.c src/sys/arch/i386/pnpbios: pciide_pnpbios.c src/sys/arch/ia64/ia64: core_machdep.c sal.c src/sys/arch/ibmnws/ibmnws: machdep.c src/sys/arch/iyonix/iyonix: autoconf.c src/sys/arch/landisk/dev: btn_obio.c pwrsw_obio.c wdc_obio.c src/sys/arch/landisk/landisk: autoconf.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/isa/cmos.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/isa/isapnp_machdep.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/pci/ali1543.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/pnpbios/pciide_pnpbios.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/ia64/core_machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/ia64/sal.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/ibmnws/ibmnws/machdep.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/iyonix/iyonix/autoconf.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/landisk/dev/btn_obio.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/landisk/dev/pwrsw_obio.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/landisk/dev/wdc_obio.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/landisk/landisk/autoconf.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/i386/isa/cmos.c diff -u src/sys/arch/i386/isa/cmos.c:1.13 src/sys/arch/i386/isa/cmos.c:1.14 --- src/sys/arch/i386/isa/cmos.c:1.13 Tue Sep 21 14:36:34 2021 +++ src/sys/arch/i386/isa/cmos.c Wed Dec 20 15:00:07 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cmos.c,v 1.13 2021/09/21 14:36:34 christos Exp $ */ +/* $NetBSD: cmos.c,v 1.14 2023/12/20 15:00:07 thorpej Exp $ */ /* * Copyright (C) 2003 JONE System Co., Inc. @@ -59,12 +59,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.13 2021/09/21 14:36:34 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.14 2023/12/20 15:00:07 thorpej Exp $"); #include #include #include -#include #include #include #include Index: src/sys/arch/i386/isa/isapnp_machdep.c diff -u src/sys/arch/i386/isa/isapnp_machdep.c:1.17 src/sys/arch/i386/isa/isapnp_machdep.c:1.18 --- src/sys/arch/i386/isa/isapnp_machdep.c:1.17 Fri Jul 1 18:11:24 2011 +++ src/sys/arch/i386/isa/isapnp_machdep.c Wed Dec 20 15:00:07 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: isapnp_machdep.c,v 1.17 2011/07/01 18:11:24 dyoung Exp $ */ +/* $NetBSD: isapnp_machdep.c,v 1.18 2023/12/20 15:00:07 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -45,12 +45,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.17 2011/07/01 18:11:24 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.18 2023/12/20 15:00:07 thorpej Exp $"); #include #include #include -#include #include Index: src/sys/arch/i386/pci/ali1543.c diff -u src/sys/arch/i386/pci/ali1543.c:1.12 src/sys/arch/i386/pci/ali1543.c:1.13 --- src/sys/arch/i386/pci/ali1543.c:1.12 Fri Jul 1 17:37:26 2011 +++ src/sys/arch/i386/pci/ali1543.c Wed Dec 20 15:00:08 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ali1543.c,v 1.12 2011/07/01 17:37:26 dyoung Exp $ */ +/* $NetBSD: ali1543.c,v 1.13 2023/12/20 15:00:08 thorpej Exp $ */ /* * Copyright (c) 2001 @@ -84,13 +84,12 @@ /* HAYAKAWA Koichi wrote ALi 1543 PCI ICU code basing on VIA82C586 driver */ #include -__KERNEL_RCSID(0, "$NetBSD: ali1543.c,v 1.12 2011/07/01 17:37:26 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ali1543.c,v 1.13 2023/12/20 15:00:08 thorpej Exp $"); #include #include #include #include -#include #include #include Index: src/sys/arch/i386/pnpbios/pciide_pnpbios.c diff -u src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.34 src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.35 --- src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.34 Mon Aug 24 05:37:40 2020 +++ src/sys/arch/i386/pnpbios/pciide_pnpbios.c Wed Dec 20 15:00:08 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: pciide_pnpbios.c,v 1.34 2020/08/24 05:37:40 msaitoh Exp $ */ +/* $NetBSD: pciide_pnpbios.c,v 1.35 2023/12/20 15:00:08 thorpej Exp $ */ /* * Copyright (c) 1999 Soren S. Jorvang. All rights reserved. @@ -30,12 +30,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pciide_pnpbios.c,v 1.34 2020/08/24 05:37:40 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pciide_pnpbios.c,v 1.35 2023/12/20 15:00:08 thorpej Exp $"); #include #include #include -#include #include Index: src/sys/arch/ia64/ia64/core_machdep.c diff -u src/sys/arch/ia64/ia64/core_machdep.c:1.2 src/sys/arch/ia64/ia64/core_machdep.c:1.3 --- src/sys/arch/ia64/ia64/core_machdep.c:1.2 Tue Nov 22 22:53:09 2016 +++ src/sys/arch/ia64/ia64/core_machdep.c Wed Dec 20 15:00:08 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: core_machdep.c,v 1.2 2016/11/22 22:53:09 scole Exp $ */ +/* $NetBSD: core_machdep.c,v 1.3 2023/12/20 15:00:08 thorpej Exp $ */
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Wed Dec 20 15:00:08 UTC 2023 Modified Files: src/sys/arch/i386/isa: cmos.c isapnp_machdep.c src/sys/arch/i386/pci: ali1543.c src/sys/arch/i386/pnpbios: pciide_pnpbios.c src/sys/arch/ia64/ia64: core_machdep.c sal.c src/sys/arch/ibmnws/ibmnws: machdep.c src/sys/arch/iyonix/iyonix: autoconf.c src/sys/arch/landisk/dev: btn_obio.c pwrsw_obio.c wdc_obio.c src/sys/arch/landisk/landisk: autoconf.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/isa/cmos.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/isa/isapnp_machdep.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/pci/ali1543.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/pnpbios/pciide_pnpbios.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/ia64/core_machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/ia64/sal.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/ibmnws/ibmnws/machdep.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/iyonix/iyonix/autoconf.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/landisk/dev/btn_obio.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/landisk/dev/pwrsw_obio.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/landisk/dev/wdc_obio.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/landisk/landisk/autoconf.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
Module Name:src Committed By: thorpej Date: Wed Dec 20 14:50:03 UTC 2023 Modified Files: src/sys/arch/evbsh3/t_sh7706lan: scimci.c ssumci.c src/sys/arch/hpcarm/dev: ipaq_atmelgpio.c ipaq_pcic.c ipaq_saip.c j720pcic.c j720tp.c sacc_hpcarm.c uda1341.c wzero3_tp.c src/sys/arch/hpcarm/hpcarm: autoconf.c src/sys/arch/hpcmips/dev: mq200_pci.c plumpower.c src/sys/arch/hpcmips/hpcmips: bus_space.c interrupt.c src/sys/arch/hpcmips/vr: vr4181aiu.c vrecu.c src/sys/arch/hpcsh/dev: j6x0pwr.c j6x0tp.c psh3tp.c src/sys/arch/hpcsh/dev/hd64461: hd64461uart.c hd64461video.c src/sys/arch/hpcsh/dev/hd64465: hd64465uart.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbsh3/t_sh7706lan/scimci.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbsh3/t_sh7706lan/ssumci.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpcarm/dev/ipaq_pcic.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hpcarm/dev/ipaq_saip.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpcarm/dev/j720pcic.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hpcarm/dev/j720tp.c \ src/sys/arch/hpcarm/dev/sacc_hpcarm.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcarm/dev/uda1341.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hpcarm/dev/wzero3_tp.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpcarm/hpcarm/autoconf.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcmips/dev/mq200_pci.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hpcmips/dev/plumpower.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/hpcmips/hpcmips/bus_space.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcmips/hpcmips/interrupt.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hpcmips/vr/vr4181aiu.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hpcmips/vr/vrecu.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcsh/dev/j6x0pwr.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hpcsh/dev/j6x0tp.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcsh/dev/psh3tp.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/hpcsh/dev/hd64461/hd64461video.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcsh/dev/hd64465/hd64465uart.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/evbsh3/t_sh7706lan/scimci.c diff -u src/sys/arch/evbsh3/t_sh7706lan/scimci.c:1.4 src/sys/arch/evbsh3/t_sh7706lan/scimci.c:1.5 --- src/sys/arch/evbsh3/t_sh7706lan/scimci.c:1.4 Sat Aug 7 16:18:53 2021 +++ src/sys/arch/evbsh3/t_sh7706lan/scimci.c Wed Dec 20 14:50:01 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: scimci.c,v 1.4 2021/08/07 16:18:53 thorpej Exp $ */ +/* $NetBSD: scimci.c,v 1.5 2023/12/20 14:50:01 thorpej Exp $ */ /*- * Copyright (C) 2009 NONAKA Kimihiro @@ -30,12 +30,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: scimci.c,v 1.4 2021/08/07 16:18:53 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: scimci.c,v 1.5 2023/12/20 14:50:01 thorpej Exp $"); #include #include #include -#include #include #include #include Index: src/sys/arch/evbsh3/t_sh7706lan/ssumci.c diff -u src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.5 src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.6 --- src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.5 Sat Aug 7 16:18:53 2021 +++ src/sys/arch/evbsh3/t_sh7706lan/ssumci.c Wed Dec 20 14:50:01 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ssumci.c,v 1.5 2021/08/07 16:18:53 thorpej Exp $ */ +/* $NetBSD: ssumci.c,v 1.6 2023/12/20 14:50:01 thorpej Exp $ */ /*- * Copyright (C) 2010 NONAKA Kimihiro @@ -30,12 +30,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.5 2021/08/07 16:18:53 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.6 2023/12/20 14:50:01 thorpej Exp $"); #include #include #include -#include #include #include #include Index: src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c diff -u src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.18 src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.19 --- src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.18 Sat Aug 7 16:18:53 2021 +++ src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c Wed Dec 20 14:50:02 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ipaq_atmelgpio.c,v 1.18 2021/08/07 16:18:53 thorpej Exp $ */ +/* $NetBSD: ipaq_atmelgpio.c,v 1.19 2023/12/20 14:50:02 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. All rights reserved. @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ipaq_atmelgpio.c,v 1.18 2021/08/07 16:18:53 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipaq_atmelgpio.c,v 1.19 2023/12/20 14:50:02 thorpej Exp $"); #include #include @@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: ipaq_atmelgp #include #include #include -#include #include #include Index: src/sys/arch/hpcarm/dev/ipaq_pcic.c diff -u src/sys/arch/hpcarm/dev/ipaq_pcic.c:1.23 src/sys/arch/hpcarm/dev/ipaq_pcic.c:1.24 --- src/sys/arch/hpcarm/dev/ipaq_pcic.c:1.23 Sat Aug 7 16:18:53
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Wed Dec 20 14:50:03 UTC 2023 Modified Files: src/sys/arch/evbsh3/t_sh7706lan: scimci.c ssumci.c src/sys/arch/hpcarm/dev: ipaq_atmelgpio.c ipaq_pcic.c ipaq_saip.c j720pcic.c j720tp.c sacc_hpcarm.c uda1341.c wzero3_tp.c src/sys/arch/hpcarm/hpcarm: autoconf.c src/sys/arch/hpcmips/dev: mq200_pci.c plumpower.c src/sys/arch/hpcmips/hpcmips: bus_space.c interrupt.c src/sys/arch/hpcmips/vr: vr4181aiu.c vrecu.c src/sys/arch/hpcsh/dev: j6x0pwr.c j6x0tp.c psh3tp.c src/sys/arch/hpcsh/dev/hd64461: hd64461uart.c hd64461video.c src/sys/arch/hpcsh/dev/hd64465: hd64465uart.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbsh3/t_sh7706lan/scimci.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbsh3/t_sh7706lan/ssumci.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpcarm/dev/ipaq_pcic.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hpcarm/dev/ipaq_saip.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpcarm/dev/j720pcic.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hpcarm/dev/j720tp.c \ src/sys/arch/hpcarm/dev/sacc_hpcarm.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcarm/dev/uda1341.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hpcarm/dev/wzero3_tp.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpcarm/hpcarm/autoconf.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcmips/dev/mq200_pci.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hpcmips/dev/plumpower.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/hpcmips/hpcmips/bus_space.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcmips/hpcmips/interrupt.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hpcmips/vr/vr4181aiu.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hpcmips/vr/vrecu.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcsh/dev/j6x0pwr.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hpcsh/dev/j6x0tp.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcsh/dev/psh3tp.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/hpcsh/dev/hd64461/hd64461video.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcsh/dev/hd64465/hd64465uart.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/evbppc
Module Name:src Committed By: thorpej Date: Wed Dec 20 14:18:38 UTC 2023 Modified Files: src/sys/arch/evbppc/pmppc: machdep.c src/sys/arch/evbppc/pmppc/pci: pci_machdep.c src/sys/arch/evbppc/virtex: design_gsrd2.c machdep.c src/sys/arch/evbppc/virtex/dev: xcvbus.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/pmppc/machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/pmppc/pci/pci_machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/virtex/design_gsrd2.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbppc/virtex/machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/virtex/dev/xcvbus.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/evbppc/pmppc/machdep.c diff -u src/sys/arch/evbppc/pmppc/machdep.c:1.14 src/sys/arch/evbppc/pmppc/machdep.c:1.15 --- src/sys/arch/evbppc/pmppc/machdep.c:1.14 Sun Jul 15 05:16:42 2018 +++ src/sys/arch/evbppc/pmppc/machdep.c Wed Dec 20 14:18:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.14 2018/07/15 05:16:42 maxv Exp $ */ +/* $NetBSD: machdep.c,v 1.15 2023/12/20 14:18:37 thorpej Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2018/07/15 05:16:42 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2023/12/20 14:18:37 thorpej Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -81,7 +81,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v #include #include #include -#include #include #include #include Index: src/sys/arch/evbppc/pmppc/pci/pci_machdep.c diff -u src/sys/arch/evbppc/pmppc/pci/pci_machdep.c:1.6 src/sys/arch/evbppc/pmppc/pci/pci_machdep.c:1.7 --- src/sys/arch/evbppc/pmppc/pci/pci_machdep.c:1.6 Wed Oct 19 00:08:41 2016 +++ src/sys/arch/evbppc/pmppc/pci/pci_machdep.c Wed Dec 20 14:18:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.6 2016/10/19 00:08:41 nonaka Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.7 2023/12/20 14:18:37 thorpej Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -43,7 +43,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.6 2016/10/19 00:08:41 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.7 2023/12/20 14:18:37 thorpej Exp $"); #include #include @@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep. #include #include #include -#include #include #include #include Index: src/sys/arch/evbppc/virtex/design_gsrd2.c diff -u src/sys/arch/evbppc/virtex/design_gsrd2.c:1.8 src/sys/arch/evbppc/virtex/design_gsrd2.c:1.9 --- src/sys/arch/evbppc/virtex/design_gsrd2.c:1.8 Sat Aug 7 16:18:52 2021 +++ src/sys/arch/evbppc/virtex/design_gsrd2.c Wed Dec 20 14:18:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: design_gsrd2.c,v 1.8 2021/08/07 16:18:52 thorpej Exp $ */ +/* $NetBSD: design_gsrd2.c,v 1.9 2023/12/20 14:18:37 thorpej Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -32,13 +32,12 @@ #include "opt_virtex.h" #include -__KERNEL_RCSID(0, "$NetBSD: design_gsrd2.c,v 1.8 2021/08/07 16:18:52 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: design_gsrd2.c,v 1.9 2023/12/20 14:18:37 thorpej Exp $"); #include #include #include #include -#include #include #include #include Index: src/sys/arch/evbppc/virtex/machdep.c diff -u src/sys/arch/evbppc/virtex/machdep.c:1.30 src/sys/arch/evbppc/virtex/machdep.c:1.31 --- src/sys/arch/evbppc/virtex/machdep.c:1.30 Tue Aug 3 09:25:44 2021 +++ src/sys/arch/evbppc/virtex/machdep.c Wed Dec 20 14:18:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.30 2021/08/03 09:25:44 rin Exp $ */ +/* $NetBSD: machdep.c,v 1.31 2023/12/20 14:18:37 thorpej Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2021/08/03 09:25:44 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.31 2023/12/20 14:18:37 thorpej Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -47,7 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v #include #include #include -#include #include #include #include Index: src/sys/arch/evbppc/virtex/dev/xcvbus.c diff -u src/sys/arch/evbppc/virtex/dev/xcvbus.c:1.3 src/sys/arch/evbppc/virtex/dev/xcvbus.c:1.4 --- src/sys/arch/evbppc/virtex/dev/xcvbus.c:1.3 Fri Jul 1 19:03:50 2011 +++ src/sys/arch/evbppc/virtex/dev/xcvbus.c Wed Dec 20 14:18:38 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: xcvbus.c,v 1.3 2011/07/01 19:03:50 dyoung Exp $ */ +/* $NetBSD: xcvbus.c,v 1.4 2023/12/20 14:18:38 thorpej Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -30,14 +30,12 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: xcvbus.c,v 1.3 2011/07/01 19:03:50 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xcvbus.c,v 1.4 2023/12/20 14:18:38 thorpej Exp $"); #include #include #include
CVS commit: src/sys/arch/evbppc
Module Name:src Committed By: thorpej Date: Wed Dec 20 14:18:38 UTC 2023 Modified Files: src/sys/arch/evbppc/pmppc: machdep.c src/sys/arch/evbppc/pmppc/pci: pci_machdep.c src/sys/arch/evbppc/virtex: design_gsrd2.c machdep.c src/sys/arch/evbppc/virtex/dev: xcvbus.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/pmppc/machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/pmppc/pci/pci_machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/virtex/design_gsrd2.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbppc/virtex/machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/virtex/dev/xcvbus.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/evbmips
Module Name:src Committed By: thorpej Date: Wed Dec 20 14:12:26 UTC 2023 Modified Files: src/sys/arch/evbmips/alchemy: mach_intr.c src/sys/arch/evbmips/cavium: mach_intr.c src/sys/arch/evbmips/gdium: gdium_bus_mem.c gdium_genfb.c mainbus.c src/sys/arch/evbmips/loongson: mainbus.c src/sys/arch/evbmips/loongson/dev: stvii.c src/sys/arch/evbmips/malta/dev: mainbus.c src/sys/arch/evbmips/rmixl: machdep.c src/sys/arch/evbmips/sbmips: machdep.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/alchemy/mach_intr.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/cavium/mach_intr.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/gdium/gdium_bus_mem.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/gdium/gdium_genfb.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbmips/gdium/mainbus.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/loongson/mainbus.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/loongson/dev/stvii.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbmips/malta/dev/mainbus.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbmips/rmixl/machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/sbmips/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/evbmips/alchemy/mach_intr.c diff -u src/sys/arch/evbmips/alchemy/mach_intr.c:1.7 src/sys/arch/evbmips/alchemy/mach_intr.c:1.8 --- src/sys/arch/evbmips/alchemy/mach_intr.c:1.7 Fri Aug 26 15:45:47 2016 +++ src/sys/arch/evbmips/alchemy/mach_intr.c Wed Dec 20 14:12:25 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: mach_intr.c,v 1.7 2016/08/26 15:45:47 skrll Exp $ */ +/* $NetBSD: mach_intr.c,v 1.8 2023/12/20 14:12:25 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.7 2016/08/26 15:45:47 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.8 2023/12/20 14:12:25 thorpej Exp $"); #include "opt_ddb.h" @@ -47,7 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: mach_intr.c, #include #include #include -#include #include #include Index: src/sys/arch/evbmips/cavium/mach_intr.c diff -u src/sys/arch/evbmips/cavium/mach_intr.c:1.3 src/sys/arch/evbmips/cavium/mach_intr.c:1.4 --- src/sys/arch/evbmips/cavium/mach_intr.c:1.3 Fri Aug 26 15:45:47 2016 +++ src/sys/arch/evbmips/cavium/mach_intr.c Wed Dec 20 14:12:25 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: mach_intr.c,v 1.3 2016/08/26 15:45:47 skrll Exp $ */ +/* $NetBSD: mach_intr.c,v 1.4 2023/12/20 14:12:25 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.3 2016/08/26 15:45:47 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.4 2023/12/20 14:12:25 thorpej Exp $"); #include "opt_ddb.h" @@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: mach_intr.c, #include #include #include -#include #include #include Index: src/sys/arch/evbmips/gdium/gdium_bus_mem.c diff -u src/sys/arch/evbmips/gdium/gdium_bus_mem.c:1.2 src/sys/arch/evbmips/gdium/gdium_bus_mem.c:1.3 --- src/sys/arch/evbmips/gdium/gdium_bus_mem.c:1.2 Sun Jul 10 00:03:53 2011 +++ src/sys/arch/evbmips/gdium/gdium_bus_mem.c Wed Dec 20 14:12:25 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: gdium_bus_mem.c,v 1.2 2011/07/10 00:03:53 matt Exp $ */ +/* $NetBSD: gdium_bus_mem.c,v 1.3 2023/12/20 14:12:25 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,11 +34,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gdium_bus_mem.c,v 1.2 2011/07/10 00:03:53 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gdium_bus_mem.c,v 1.3 2023/12/20 14:12:25 thorpej Exp $"); #include #include -#include #include #include Index: src/sys/arch/evbmips/gdium/gdium_genfb.c diff -u src/sys/arch/evbmips/gdium/gdium_genfb.c:1.6 src/sys/arch/evbmips/gdium/gdium_genfb.c:1.7 --- src/sys/arch/evbmips/gdium/gdium_genfb.c:1.6 Sun Jul 10 00:03:53 2011 +++ src/sys/arch/evbmips/gdium/gdium_genfb.c Wed Dec 20 14:12:25 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: gdium_genfb.c,v 1.6 2011/07/10 00:03:53 matt Exp $ */ +/* $NetBSD: gdium_genfb.c,v 1.7 2023/12/20 14:12:25 thorpej Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gdium_genfb.c,v 1.6 2011/07/10 00:03:53 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gdium_genfb.c,v 1.7 2023/12/20 14:12:25 thorpej Exp $"); #include #include @@ -37,7 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: gdium_genfb. #include #include #include -#include #include #include Index: src/sys/arch/evbmips/gdium/mainbus.c diff -u src/sys/arch/evbmips/gdium/mainbus.c:1.9 src/sys/arch/evbmips/gdium/mainbus.c:1.10 --- src/sys/arch/evbmips/gdium/mainbus.c:1.9 Sat Aug 7 16:18:51 2021 +++ src/sys/arch/evbmips/gdium/mainbus.c Wed Dec 20 14:12:25
CVS commit: src/sys/arch/evbmips
Module Name:src Committed By: thorpej Date: Wed Dec 20 14:12:26 UTC 2023 Modified Files: src/sys/arch/evbmips/alchemy: mach_intr.c src/sys/arch/evbmips/cavium: mach_intr.c src/sys/arch/evbmips/gdium: gdium_bus_mem.c gdium_genfb.c mainbus.c src/sys/arch/evbmips/loongson: mainbus.c src/sys/arch/evbmips/loongson/dev: stvii.c src/sys/arch/evbmips/malta/dev: mainbus.c src/sys/arch/evbmips/rmixl: machdep.c src/sys/arch/evbmips/sbmips: machdep.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/alchemy/mach_intr.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/cavium/mach_intr.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/gdium/gdium_bus_mem.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/gdium/gdium_genfb.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbmips/gdium/mainbus.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/loongson/mainbus.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/loongson/dev/stvii.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbmips/malta/dev/mainbus.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbmips/rmixl/machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/sbmips/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/evbarm
Module Name:src Committed By: thorpej Date: Wed Dec 20 13:55:19 UTC 2023 Modified Files: src/sys/arch/evbarm/armadillo: armadillo9_com.c src/sys/arch/evbarm/g42xxeb: g42xxeb_kmkbd.c g42xxeb_lcd.c gb225_pcic.c src/sys/arch/evbarm/gumstix: gxlcd.c gxpcic.c src/sys/arch/evbarm/hdl_g: btn_obio.c src/sys/arch/evbarm/ifpga: ifpga_pci.c src/sys/arch/evbarm/integrator: int_bus_dma.c src/sys/arch/evbarm/iq31244: wdc_obio.c src/sys/arch/evbarm/ixm1200: ixpcom_ixm.c src/sys/arch/evbarm/iyonix: autoconf.c src/sys/arch/evbarm/lubbock: lubbock_lcd.c lubbock_pcic.c src/sys/arch/evbarm/mini2440: audio_mini2440.c mini2440_lcd.c src/sys/arch/evbarm/mpcsa: mpcsa_leds.c src/sys/arch/evbarm/smdk2xx0: smdk2410_lcd.c src/sys/arch/evbarm/tsarm: epcom_ts.c tspld.c wdc_ts.c src/sys/arch/evbarm/tsarm/isa: isa_io.c isa_machdep.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/armadillo/armadillo9_com.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/gumstix/gxlcd.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/gumstix/gxpcic.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/hdl_g/btn_obio.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/ifpga/ifpga_pci.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/integrator/int_bus_dma.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/iq31244/wdc_obio.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/iyonix/autoconf.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/lubbock/lubbock_lcd.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/lubbock/lubbock_pcic.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/mini2440/audio_mini2440.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/mini2440/mini2440_lcd.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/mpcsa/mpcsa_leds.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/tsarm/epcom_ts.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/tsarm/tspld.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/tsarm/wdc_ts.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/tsarm/isa/isa_io.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/tsarm/isa/isa_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/evbarm/armadillo/armadillo9_com.c diff -u src/sys/arch/evbarm/armadillo/armadillo9_com.c:1.6 src/sys/arch/evbarm/armadillo/armadillo9_com.c:1.7 --- src/sys/arch/evbarm/armadillo/armadillo9_com.c:1.6 Mon Nov 12 18:00:38 2012 +++ src/sys/arch/evbarm/armadillo/armadillo9_com.c Wed Dec 20 13:55:17 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: armadillo9_com.c,v 1.6 2012/11/12 18:00:38 skrll Exp $ */ +/* $NetBSD: armadillo9_com.c,v 1.7 2023/12/20 13:55:17 thorpej Exp $ */ /* * Copyright (c) 2002 * Ichiro FUKUHARA . @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: armadillo9_com.c,v 1.6 2012/11/12 18:00:38 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: armadillo9_com.c,v 1.7 2023/12/20 13:55:17 thorpej Exp $"); /* Front-end of epcom */ @@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: armadillo9_c #include #include #include -#include #include Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.16 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.17 --- src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.16 Sat Aug 7 16:18:49 2021 +++ src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c Wed Dec 20 13:55:17 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: g42xxeb_kmkbd.c,v 1.16 2021/08/07 16:18:49 thorpej Exp $ */ +/* $NetBSD: g42xxeb_kmkbd.c,v 1.17 2023/12/20 13:55:17 thorpej Exp $ */ /*- * Copyright (c) 2002, 2003, 2005 Genetec corp. @@ -37,12 +37,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkbd.c,v 1.16 2021/08/07 16:18:49 thorpej Exp $" ); +__KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkbd.c,v 1.17 2023/12/20 13:55:17 thorpej Exp $" ); #include #include #include -#include #include #include #include /* for hz */ Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.18 src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.19 --- src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.18 Sat Aug 7 16:18:49 2021 +++ src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c Wed Dec 20 13:55:17 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: g42xxeb_lcd.c,v 1.18 2021/08/07 16:18:49 thorpej Exp $ */ +/* $NetBSD: g42xxeb_lcd.c,v 1.19 2023/12/20 13:55:17 thorpej Exp $ */ /*- * Copyright (c) 2001, 2002, 2005 Genetec corp. @@ -37,7 +37,6 @@ #include #include #include -#include
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: thorpej Date: Wed Dec 20 13:55:19 UTC 2023 Modified Files: src/sys/arch/evbarm/armadillo: armadillo9_com.c src/sys/arch/evbarm/g42xxeb: g42xxeb_kmkbd.c g42xxeb_lcd.c gb225_pcic.c src/sys/arch/evbarm/gumstix: gxlcd.c gxpcic.c src/sys/arch/evbarm/hdl_g: btn_obio.c src/sys/arch/evbarm/ifpga: ifpga_pci.c src/sys/arch/evbarm/integrator: int_bus_dma.c src/sys/arch/evbarm/iq31244: wdc_obio.c src/sys/arch/evbarm/ixm1200: ixpcom_ixm.c src/sys/arch/evbarm/iyonix: autoconf.c src/sys/arch/evbarm/lubbock: lubbock_lcd.c lubbock_pcic.c src/sys/arch/evbarm/mini2440: audio_mini2440.c mini2440_lcd.c src/sys/arch/evbarm/mpcsa: mpcsa_leds.c src/sys/arch/evbarm/smdk2xx0: smdk2410_lcd.c src/sys/arch/evbarm/tsarm: epcom_ts.c tspld.c wdc_ts.c src/sys/arch/evbarm/tsarm/isa: isa_io.c isa_machdep.c Log Message: Remove unnecessary . To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/armadillo/armadillo9_com.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/gumstix/gxlcd.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/gumstix/gxpcic.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/hdl_g/btn_obio.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/ifpga/ifpga_pci.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/integrator/int_bus_dma.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/iq31244/wdc_obio.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/iyonix/autoconf.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/lubbock/lubbock_lcd.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/lubbock/lubbock_pcic.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/mini2440/audio_mini2440.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/mini2440/mini2440_lcd.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/mpcsa/mpcsa_leds.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/tsarm/epcom_ts.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/tsarm/tspld.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/tsarm/wdc_ts.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/tsarm/isa/isa_io.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/tsarm/isa/isa_machdep.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/make/unit-tests
Module Name:src Committed By: rillig Date: Wed Dec 20 09:46:00 UTC 2023 Modified Files: src/usr.bin/make/unit-tests: vardebug.exp vardebug.mk Log Message: tests/make: add the expected output to the test for variable debugging To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/usr.bin/make/unit-tests/vardebug.exp cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/vardebug.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Wed Dec 20 09:46:00 UTC 2023
Modified Files:
src/usr.bin/make/unit-tests: vardebug.exp vardebug.mk
Log Message:
tests/make: add the expected output to the test for variable debugging
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/make/unit-tests/vardebug.exp
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/vardebug.mk
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/make/unit-tests/vardebug.exp
diff -u src/usr.bin/make/unit-tests/vardebug.exp:1.33 src/usr.bin/make/unit-tests/vardebug.exp:1.34
--- src/usr.bin/make/unit-tests/vardebug.exp:1.33 Wed Dec 20 09:03:09 2023
+++ src/usr.bin/make/unit-tests/vardebug.exp Wed Dec 20 09:46:00 2023
@@ -54,11 +54,11 @@ Var_Parse: ${:Uvariable:unknown} (eval-d
Evaluating modifier ${:U...} on value "" (eval-defined, undefined)
Result of ${:Uvariable} is "variable" (eval-defined, defined)
Evaluating modifier ${:u...} on value "variable" (eval-defined, defined)
-make: "vardebug.mk" line 46: Unknown modifier "unknown"
+make: "vardebug.mk" line 63: Unknown modifier "unknown"
Result of ${:unknown} is error (eval-defined, defined)
-make: "vardebug.mk" line 46: Malformed conditional (${:Uvariable:unknown})
+make: "vardebug.mk" line 63: Malformed conditional (${:Uvariable:unknown})
Var_Parse: ${UNDEFINED} (eval-defined)
-make: "vardebug.mk" line 56: Malformed conditional (${UNDEFINED})
+make: "vardebug.mk" line 73: Malformed conditional (${UNDEFINED})
Global: ignoring delete '.SHELL' as it is not found
Command: .SHELL =
Command: ignoring '.SHELL = overwritten' as it is read-only
Index: src/usr.bin/make/unit-tests/vardebug.mk
diff -u src/usr.bin/make/unit-tests/vardebug.mk:1.8 src/usr.bin/make/unit-tests/vardebug.mk:1.9
--- src/usr.bin/make/unit-tests/vardebug.mk:1.8 Thu Jun 1 20:56:35 2023
+++ src/usr.bin/make/unit-tests/vardebug.mk Wed Dec 20 09:46:00 2023
@@ -1,32 +1,46 @@
-# $NetBSD: vardebug.mk,v 1.8 2023/06/01 20:56:35 rillig Exp $
+# $NetBSD: vardebug.mk,v 1.9 2023/12/20 09:46:00 rillig Exp $
#
# Demonstrates the debugging output for var.c.
.MAKEFLAGS: -dv FROM_CMDLINE=
+# expect: Global: VAR = added
VAR= added # VarAdd
+# expect: Global: VAR = overwritten
VAR= overwritten # Var_Set
-.undef VAR # Var_Delete (found)
-.undef VAR # Var_Delete (not found)
+# expect: Global: delete VAR
+.undef VAR
+# expect: Global: ignoring delete 'VAR' as it is not found
+.undef VAR
# The variable with the empty name cannot be set at all.
+# expect: Global: ignoring ' = empty name' as the variable name '${:U}' expands to empty
${:U}= empty name # Var_Set
+# expect: Global: ignoring ' += empty name' as the variable name '${:U}' expands to empty
${:U}+= empty name # Var_Append
FROM_CMDLINE= overwritten # Var_Set (ignored)
+# expect: Global: VAR = 1
VAR= 1
+# expect: Global: VAR = 1 2
VAR+= 2
+# expect: Global: VAR = 1 2 3
VAR+= 3
+# expect: Pattern for ':M' is "[2]"
+# expect: Result of ${VAR:M[2]} is "2"
.if ${VAR:M[2]} # ModifyWord_Match
.endif
-.if ${VAR:N[2]} # ModifyWord_NoMatch (no debug output)
+# expect: Pattern for ':N' is "[2]"
+# expect: Result of ${VAR:N[2]} is "1 3"
+.if ${VAR:N[2]} # ModifyWord_NoMatch
.endif
.if ${VAR:S,2,two,} # ParseModifierPart
.endif
+# expect: Result of ${VAR:Q} is "1\ 2\ 3"
.if ${VAR:Q} # VarQuote
.endif
@@ -34,13 +48,16 @@ VAR+= 3
.endif
# ApplyModifiers, "Got ..."
+# expect: Result of ${:Mvalu[e]} is "value" (eval-defined, defined)
.if ${:Uvalue:${:UM*e}:Mvalu[e]}
.endif
+# expect: Global: delete VAR
.undef ${:UVAR} # Var_Delete
# When ApplyModifiers results in an error, this appears in the debug log
# as "is error", without surrounding quotes.
+# expect: Result of ${:unknown} is error (eval-defined, defined)
# expect+2: Malformed conditional (${:Uvariable:unknown})
# expect+1: Unknown modifier "unknown"
.if ${:Uvariable:unknown}
@@ -59,9 +76,7 @@ VAR+= 3
# By default, .SHELL is not defined and thus can be set. As soon as it is
# accessed, it is initialized in the command line scope (during VarFind),
# where it is set to read-only. Assigning to it is ignored.
+# expect: Command: ignoring '.SHELL = overwritten' as it is read-only
.MAKEFLAGS: .SHELL=overwritten
.MAKEFLAGS: -d0
-
-all:
- @:
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Wed Dec 20 09:03:09 UTC 2023 Modified Files: src/usr.bin/make: var.c src/usr.bin/make/unit-tests: var-scope-local.exp var-scope-local.mk vardebug.exp varname-dot-shell.exp varname-dot-suffixes.exp varname-dot-suffixes.mk varname-empty.exp Log Message: make: use consistent debug messages style when ignoring variables When a variable is not modified or not deleted, clearly say so and state the reason. Use the same style of debug messages everywhere, putting the word 'ignoring' at the front. Previously, that word sticked out to the right, but only in some cases. To generate a diff of this commit: cvs rdiff -u -r1.1085 -r1.1086 src/usr.bin/make/var.c cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/var-scope-local.exp \ src/usr.bin/make/unit-tests/varname-dot-suffixes.exp cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/var-scope-local.mk cvs rdiff -u -r1.32 -r1.33 src/usr.bin/make/unit-tests/vardebug.exp cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/varname-dot-shell.exp cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varname-dot-suffixes.mk cvs rdiff -u -r1.21 -r1.22 src/usr.bin/make/unit-tests/varname-empty.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Wed Dec 20 09:03:09 UTC 2023
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: var-scope-local.exp var-scope-local.mk
vardebug.exp varname-dot-shell.exp varname-dot-suffixes.exp
varname-dot-suffixes.mk varname-empty.exp
Log Message:
make: use consistent debug messages style when ignoring variables
When a variable is not modified or not deleted, clearly say so and state
the reason. Use the same style of debug messages everywhere, putting
the word 'ignoring' at the front. Previously, that word sticked out to
the right, but only in some cases.
To generate a diff of this commit:
cvs rdiff -u -r1.1085 -r1.1086 src/usr.bin/make/var.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/var-scope-local.exp \
src/usr.bin/make/unit-tests/varname-dot-suffixes.exp
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/var-scope-local.mk
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/make/unit-tests/vardebug.exp
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/varname-dot-shell.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varname-dot-suffixes.mk
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/make/unit-tests/varname-empty.exp
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/make/var.c
diff -u src/usr.bin/make/var.c:1.1085 src/usr.bin/make/var.c:1.1086
--- src/usr.bin/make/var.c:1.1085 Wed Dec 20 08:50:10 2023
+++ src/usr.bin/make/var.c Wed Dec 20 09:03:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1085 2023/12/20 08:50:10 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1086 2023/12/20 09:03:08 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1085 2023/12/20 08:50:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1086 2023/12/20 09:03:08 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -929,15 +929,17 @@ Var_SetWithFlags(GNode *scope, const cha
assert(val != NULL);
if (name[0] == '\0') {
- DEBUG0(VAR, "SetVar: variable name is empty - ignored\n");
+ DEBUG3(VAR,
+ "%s: ignoring '%s = %s' as the variable name is empty\n",
+ scope->name, name, val);
return;
}
if (scope == SCOPE_GLOBAL && ExistsInCmdline(name)) {
DEBUG3(VAR,
- "%s: ignoring '%s' = '%s' "
+ "%s: ignoring '%s = %s' "
"due to a command line variable of the same name\n",
- SCOPE_GLOBAL->name, name, val);
+ scope->name, name, val);
return;
}
@@ -960,14 +962,16 @@ Var_SetWithFlags(GNode *scope, const cha
}
if (strcmp(name, ".SUFFIXES") == 0) {
/* special: treat as read-only */
- DEBUG3(VAR, "%s: %s = %s ignored (read-only)\n",
+ DEBUG3(VAR,
+ "%s: ignoring '%s = %s' as it is read-only\n",
scope->name, name, val);
return;
}
v = VarAdd(name, val, scope, flags);
} else {
if (v->readOnly && !(flags & VAR_SET_READONLY)) {
- DEBUG3(VAR, "%s: %s = %s ignored (read-only)\n",
+ DEBUG3(VAR,
+ "%s: ignoring '%s = %s' as it is read-only\n",
scope->name, name, val);
return;
}
@@ -1036,10 +1040,10 @@ Var_SetExpand(GNode *scope, const char *
Var_Expand(, scope, VARE_WANTRES);
if (varname.str[0] == '\0') {
- DEBUG2(VAR,
- "Var_SetExpand: variable name \"%s\" expands "
- "to empty string, with value \"%s\" - ignored\n",
- unexpanded_name, val);
+ DEBUG4(VAR,
+ "%s: ignoring '%s = %s' "
+ "as the variable name '%s' expands to empty\n",
+ scope->name, varname.str, val, unexpanded_name);
} else
Var_SetWithFlags(scope, varname.str, val, VAR_SET_NONE);
@@ -1080,8 +1084,8 @@ Var_Append(GNode *scope, const char *nam
if (v == NULL) {
Var_SetWithFlags(scope, name, val, VAR_SET_NONE);
} else if (v->readOnly) {
- DEBUG1(VAR, "Ignoring append to %s since it is read-only\n",
- name);
+ DEBUG3(VAR, "%s: ignoring '%s += %s' as it is read-only\n",
+ scope->name, name, val);
} else if (scope == SCOPE_CMDLINE || !v->fromCmd) {
Buf_AddByte(>val, ' ');
Buf_AddStr(>val, val);
@@ -1130,10 +1134,10 @@ Var_AppendExpand(GNode *scope, const cha
Var_Expand(, scope, VARE_WANTRES);
if (xname.str != name && xname.str[0] == '\0')
- DEBUG2(VAR,
- "Var_AppendExpand: variable name \"%s\" expands "
- "to empty string, with value \"%s\" - ignored\n",
- name, val);
+ DEBUG4(VAR,
+ "%s: ignoring '%s += %s' "
+ "as the variable name '%s' expands to empty\n",
+ scope->name, xname.str, val, name);
else
Var_Append(scope, xname.str, val);
Index: src/usr.bin/make/unit-tests/var-scope-local.exp
diff -u src/usr.bin/make/unit-tests/var-scope-local.exp:1.6 src/usr.bin/make/unit-tests/var-scope-local.exp:1.7
--- src/usr.bin/make/unit-tests/var-scope-local.exp:1.6 Sat Apr 29 10:16:24
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Wed Dec 20 08:50:10 UTC 2023 Modified Files: src/usr.bin/make: var.c src/usr.bin/make/unit-tests: deptgt-makeflags.exp var-readonly.exp vardebug.exp varname-dot-shell.exp varname-dot-suffixes.exp varname-dot-suffixes.mk varname-empty.exp Log Message: make: fix confusing debug logging when deleting a variable Be clear when deleting a variable is ignored and state the reason, instead of only providing a keyword as a hint for insiders. To generate a diff of this commit: cvs rdiff -u -r1.1084 -r1.1085 src/usr.bin/make/var.c cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/deptgt-makeflags.exp cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/var-readonly.exp cvs rdiff -u -r1.31 -r1.32 src/usr.bin/make/unit-tests/vardebug.exp cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/varname-dot-shell.exp cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/varname-dot-suffixes.exp cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varname-dot-suffixes.mk cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/unit-tests/varname-empty.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Wed Dec 20 08:50:10 UTC 2023
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: deptgt-makeflags.exp var-readonly.exp
vardebug.exp varname-dot-shell.exp varname-dot-suffixes.exp
varname-dot-suffixes.mk varname-empty.exp
Log Message:
make: fix confusing debug logging when deleting a variable
Be clear when deleting a variable is ignored and state the reason,
instead of only providing a keyword as a hint for insiders.
To generate a diff of this commit:
cvs rdiff -u -r1.1084 -r1.1085 src/usr.bin/make/var.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/deptgt-makeflags.exp
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/var-readonly.exp
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/make/unit-tests/vardebug.exp
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/varname-dot-shell.exp
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/varname-dot-suffixes.exp
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varname-dot-suffixes.mk
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/unit-tests/varname-empty.exp
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/make/var.c
diff -u src/usr.bin/make/var.c:1.1084 src/usr.bin/make/var.c:1.1085
--- src/usr.bin/make/var.c:1.1084 Tue Dec 19 19:33:39 2023
+++ src/usr.bin/make/var.c Wed Dec 20 08:50:10 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1084 2023/12/19 19:33:39 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1085 2023/12/20 08:50:10 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1084 2023/12/19 19:33:39 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1085 2023/12/20 08:50:10 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -503,15 +503,14 @@ Var_Delete(GNode *scope, const char *var
Var *v;
if (he == NULL) {
- DEBUG2(VAR, "%s: delete %s (not found)\n",
+ DEBUG2(VAR, "%s: ignoring delete '%s' as it is not found\n",
scope->name, varname);
return;
}
- DEBUG2(VAR, "%s: delete %s\n", scope->name, varname);
v = he->value;
if (v->readOnly) {
- DEBUG2(VAR, "%s: delete %s (readOnly)\n",
+ DEBUG2(VAR, "%s: ignoring delete '%s' as it is read-only\n",
scope->name, varname);
return;
}
@@ -522,6 +521,7 @@ Var_Delete(GNode *scope, const char *var
return;
}
+ DEBUG2(VAR, "%s: delete %s\n", scope->name, varname);
if (v->exported)
unsetenv(v->name.str);
if (strcmp(v->name.str, ".MAKE.EXPORTED") == 0)
Index: src/usr.bin/make/unit-tests/deptgt-makeflags.exp
diff -u src/usr.bin/make/unit-tests/deptgt-makeflags.exp:1.7 src/usr.bin/make/unit-tests/deptgt-makeflags.exp:1.8
--- src/usr.bin/make/unit-tests/deptgt-makeflags.exp:1.7 Sat Mar 26 14:17:46 2022
+++ src/usr.bin/make/unit-tests/deptgt-makeflags.exp Wed Dec 20 08:50:10 2023
@@ -1,4 +1,4 @@
-Global: delete DOLLAR (not found)
+Global: ignoring delete 'DOLLAR' as it is not found
Command: DOLLAR =
Global: .MAKEOVERRIDES = VAR DOLLAR
CondParser_Eval: ${DOLLAR} != "\$\$"
Index: src/usr.bin/make/unit-tests/var-readonly.exp
diff -u src/usr.bin/make/unit-tests/var-readonly.exp:1.2 src/usr.bin/make/unit-tests/var-readonly.exp:1.3
--- src/usr.bin/make/unit-tests/var-readonly.exp:1.2 Wed Dec 20 08:42:10 2023
+++ src/usr.bin/make/unit-tests/var-readonly.exp Wed Dec 20 08:50:10 2023
@@ -1,5 +1,4 @@
-Global: delete N
-Global: delete N (readOnly)
+Global: ignoring delete 'N' as it is read-only
Global: .MAKEFLAGS = -r -k -d v -d
Global: .MAKEFLAGS = -r -k -d v -d 0
exit status 0
Index: src/usr.bin/make/unit-tests/vardebug.exp
diff -u src/usr.bin/make/unit-tests/vardebug.exp:1.31 src/usr.bin/make/unit-tests/vardebug.exp:1.32
--- src/usr.bin/make/unit-tests/vardebug.exp:1.31 Sun Dec 10 20:17:23 2023
+++ src/usr.bin/make/unit-tests/vardebug.exp Wed Dec 20 08:50:10 2023
@@ -1,10 +1,10 @@
-Global: delete FROM_CMDLINE (not found)
+Global: ignoring delete 'FROM_CMDLINE' as it is not found
Command: FROM_CMDLINE = # (empty)
Global: .MAKEOVERRIDES = FROM_CMDLINE
Global: VAR = added
Global: VAR = overwritten
Global: delete VAR
-Global: delete VAR (not found)
+Global: ignoring delete 'VAR' as it is not found
Var_SetExpand: variable name "${:U}" expands to empty string, with value "empty name" - ignored
Var_AppendExpand: variable name "${:U}" expands to empty string, with value "empty name" - ignored
Global: ignoring 'FROM_CMDLINE' = 'overwritten' due to a command line variable of the same name
@@ -59,7 +59,7 @@ Result of ${:unknown} is error (eval-def
make: "vardebug.mk" line 46: Malformed conditional (${:Uvariable:unknown})
Var_Parse: ${UNDEFINED} (eval-defined)
make: "vardebug.mk" line 56: Malformed conditional (${UNDEFINED})
-Global: delete .SHELL (not found)
+Global: ignoring delete
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Wed Dec 20 08:42:10 UTC 2023 Modified Files: src/usr.bin/make/unit-tests: var-readonly.exp var-readonly.mk Log Message: tests/make: demonstrate confusing debug log for read-only variables The message 'delete %s' that occurs above the 'readOnly' looks as if the variable would indeed be deleted. The wording in the 'readOnly' line is unclear. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/var-readonly.exp cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/var-readonly.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Wed Dec 20 08:42:10 UTC 2023 Modified Files: src/usr.bin/make/unit-tests: var-readonly.exp var-readonly.mk Log Message: tests/make: demonstrate confusing debug log for read-only variables The message 'delete %s' that occurs above the 'readOnly' looks as if the variable would indeed be deleted. The wording in the 'readOnly' line is unclear. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/var-readonly.exp cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/var-readonly.mk 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/make/unit-tests/var-readonly.exp diff -u src/usr.bin/make/unit-tests/var-readonly.exp:1.1 src/usr.bin/make/unit-tests/var-readonly.exp:1.2 --- src/usr.bin/make/unit-tests/var-readonly.exp:1.1 Tue Jan 24 00:20:00 2023 +++ src/usr.bin/make/unit-tests/var-readonly.exp Wed Dec 20 08:42:10 2023 @@ -1 +1,5 @@ +Global: delete N +Global: delete N (readOnly) +Global: .MAKEFLAGS = -r -k -d v -d +Global: .MAKEFLAGS = -r -k -d v -d 0 exit status 0 Index: src/usr.bin/make/unit-tests/var-readonly.mk diff -u src/usr.bin/make/unit-tests/var-readonly.mk:1.3 src/usr.bin/make/unit-tests/var-readonly.mk:1.4 --- src/usr.bin/make/unit-tests/var-readonly.mk:1.3 Mon Jun 19 15:37:48 2023 +++ src/usr.bin/make/unit-tests/var-readonly.mk Wed Dec 20 08:42:10 2023 @@ -1,4 +1,4 @@ -# $NetBSD: var-readonly.mk,v 1.3 2023/06/19 15:37:48 sjg Exp $ +# $NetBSD: var-readonly.mk,v 1.4 2023/12/20 08:42:10 rillig Exp $ # the answer N = 42 @@ -10,10 +10,12 @@ N = 666 .endif # undef should fail +.MAKEFLAGS: -dv .undef N .ifndef N .error N should not be undef'd .endif +.MAKEFLAGS: -d0 .NOREADONLY: N # now we can change it
