CVS commit: src/sys/dev/raidframe

2022-08-27 Thread Greg Oster
Module Name:src
Committed By:   oster
Date:   Sun Aug 28 00:37:41 UTC 2022

Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
Simplify the check for what ioctls can be done in raidioctl() without
the device being initialized.


To generate a diff of this commit:
cvs rdiff -u -r1.409 -r1.410 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.409 src/sys/dev/raidframe/rf_netbsdkintf.c:1.410
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.409	Sun Aug 28 00:26:04 2022
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	Sun Aug 28 00:37:41 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.409 2022/08/28 00:26:04 oster Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.410 2022/08/28 00:37:41 oster Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  ***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.409 2022/08/28 00:26:04 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.410 2022/08/28 00:37:41 oster Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_raid_autoconfig.h"
@@ -1095,46 +1095,6 @@ raid_detach_unlocked(struct raid_softc *
 	return 0;
 }
 
-static bool
-rf_must_be_initialized(const struct raid_softc *rs, u_long cmd)
-{
-	switch (cmd) {
-	case RAIDFRAME_ADD_HOT_SPARE:
-	case RAIDFRAME_CHECK_COPYBACK_STATUS:
-	case RAIDFRAME_CHECK_COPYBACK_STATUS_EXT:
-	case RAIDFRAME_CHECK_PARITY:
-	case RAIDFRAME_CHECK_PARITYREWRITE_STATUS:
-	case RAIDFRAME_CHECK_PARITYREWRITE_STATUS_EXT:
-	case RAIDFRAME_CHECK_RECON_STATUS:
-	case RAIDFRAME_CHECK_RECON_STATUS_EXT:
-	case RAIDFRAME_COPYBACK:
-	case RAIDFRAME_DELETE_COMPONENT:
-	case RAIDFRAME_FAIL_DISK:
-	case RAIDFRAME_GET_ACCTOTALS:
-	case RAIDFRAME_GET_COMPONENT_LABEL:
-	case RAIDFRAME_GET_INFO:
-	case RAIDFRAME_GET_SIZE:
-	case RAIDFRAME_INCORPORATE_HOT_SPARE:
-	case RAIDFRAME_INIT_LABELS:
-	case RAIDFRAME_KEEP_ACCTOTALS:
-	case RAIDFRAME_PARITYMAP_GET_DISABLE:
-	case RAIDFRAME_PARITYMAP_SET_DISABLE:
-	case RAIDFRAME_PARITYMAP_SET_PARAMS:
-	case RAIDFRAME_PARITYMAP_STATUS:
-	case RAIDFRAME_REBUILD_IN_PLACE:
-	case RAIDFRAME_REMOVE_HOT_SPARE:
-	case RAIDFRAME_RESET_ACCTOTALS:
-	case RAIDFRAME_REWRITEPARITY:
-	case RAIDFRAME_SET_AUTOCONFIG:
-	case RAIDFRAME_SET_COMPONENT_LABEL:
-	case RAIDFRAME_SET_LAST_UNIT:
-	case RAIDFRAME_SET_ROOT:
-	case RAIDFRAME_SHUTDOWN:
-		return (rs->sc_flags & RAIDF_INITED) == 0;
-	}
-	return false;
-}
-
 int
 rf_fail_disk(RF_Raid_t *raidPtr, struct rf_recon_req *rr)
 {
@@ -1514,9 +1474,15 @@ raidioctl(dev_t dev, u_long cmd, void *d
 	db1_printf(("raidioctl: %d %d %d %lu\n", (int) dev,
 	(int) DISKPART(dev), (int) unit, cmd));
 
-	/* Must be initialized for these... */
-	if (rf_must_be_initialized(rs, cmd))
-		return ENXIO;
+	/* Only CONFIGURE and RESCAN can be done without the RAID being initialized. */
+	switch (cmd) {
+	case RAIDFRAME_CONFIGURE:
+	case RAIDFRAME_RESCAN:
+		break;
+	default:
+		if (!rf_inited(rs))
+			return ENXIO;
+	}
 
 	switch (cmd) {
 		/* configure the system */



CVS commit: src/sys/dev/raidframe

2022-08-27 Thread Greg Oster
Module Name:src
Committed By:   oster
Date:   Sun Aug 28 00:37:41 UTC 2022

Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
Simplify the check for what ioctls can be done in raidioctl() without
the device being initialized.


To generate a diff of this commit:
cvs rdiff -u -r1.409 -r1.410 src/sys/dev/raidframe/rf_netbsdkintf.c

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



CVS commit: src/sys/dev/raidframe

2022-08-27 Thread Greg Oster
Module Name:src
Committed By:   oster
Date:   Sun Aug 28 00:26:04 UTC 2022

Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
RAIDframe must be initialized for the RAIDFRAME_SET_LAST_UNIT
and RAIDFRAME_SHUTDOWN ioctls.

XXX Pullup-9

Reported-by: syzbot+1c20fcbe34d72cd7f...@syzkaller.appspotmail.com


To generate a diff of this commit:
cvs rdiff -u -r1.408 -r1.409 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.408 src/sys/dev/raidframe/rf_netbsdkintf.c:1.409
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.408	Wed Aug 10 01:16:38 2022
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	Sun Aug 28 00:26:04 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.408 2022/08/10 01:16:38 mrg Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.409 2022/08/28 00:26:04 oster Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  ***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.408 2022/08/10 01:16:38 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.409 2022/08/28 00:26:04 oster Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_raid_autoconfig.h"
@@ -1127,7 +1127,9 @@ rf_must_be_initialized(const struct raid
 	case RAIDFRAME_REWRITEPARITY:
 	case RAIDFRAME_SET_AUTOCONFIG:
 	case RAIDFRAME_SET_COMPONENT_LABEL:
+	case RAIDFRAME_SET_LAST_UNIT:
 	case RAIDFRAME_SET_ROOT:
+	case RAIDFRAME_SHUTDOWN:
 		return (rs->sc_flags & RAIDF_INITED) == 0;
 	}
 	return false;



CVS commit: src/sys/dev/raidframe

2022-08-27 Thread Greg Oster
Module Name:src
Committed By:   oster
Date:   Sun Aug 28 00:26:04 UTC 2022

Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
RAIDframe must be initialized for the RAIDFRAME_SET_LAST_UNIT
and RAIDFRAME_SHUTDOWN ioctls.

XXX Pullup-9

Reported-by: syzbot+1c20fcbe34d72cd7f...@syzkaller.appspotmail.com


To generate a diff of this commit:
cvs rdiff -u -r1.408 -r1.409 src/sys/dev/raidframe/rf_netbsdkintf.c

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



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

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 23:24:37 UTC 2022

Modified Files:
src/tests/usr.bin/xlint/lint1: gcc_attribute_aligned.c

Log Message:
tests/lint: add more information to test for __attribute__((aligned))

Declaring an array type having a negative dimension is the simplest way
to embed an integer into a lint diagnostic, thereby revealing what size
and alignment lint has calculated for a struct.

While here, move these "compile-time assertions" closer to their
corresponding struct, to make reading easier.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c

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

Modified files:

Index: src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c
diff -u src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c:1.4 src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c:1.5
--- src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c:1.4	Sat Aug 27 21:59:41 2022
+++ src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c	Sat Aug 27 23:24:37 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: gcc_attribute_aligned.c,v 1.4 2022/08/27 21:59:41 rillig Exp $	*/
+/*	$NetBSD: gcc_attribute_aligned.c,v 1.5 2022/08/27 23:24:37 rillig Exp $	*/
 # 3 "gcc_attribute_aligned.c"
 
 /*
@@ -20,11 +20,22 @@ union fp_addr {
 	} fa_32;
 } __attribute__((packed)) __attribute__((aligned(4)));
 
+/* Each variant of the union has size 8. */
+/* expect+1: error: negative array dimension (-8) [20] */
+typedef int sizeof_fp_addr[-(int)sizeof(union fp_addr)];
+
 struct fpacc87 {
 	uint64_t f87_mantissa;
 	uint16_t f87_exp_sign;
 } __attribute__((packed)) __attribute__((aligned(2)));
 
+/*
+ * Due to the 'packed', the uint64_t does not need to be aligned on an 8-byte
+ * boundary, which allows the struct to have the minimal required size of 10.
+ */
+/* expect+1: error: negative array dimension (-10) [20] */
+typedef int sizeof_fpacc87[-(int)sizeof(struct fpacc87)];
+
 struct save87 {
 	uint16_t s87_cw __attribute__((aligned(4)));
 	uint16_t s87_sw __attribute__((aligned(4)));
@@ -34,15 +45,9 @@ struct save87 {
 	struct fpacc87 s87_ac[8];
 };
 
-struct {
-	unsigned int sizeof_fp_addr: sizeof(union fp_addr) == 8 ? 1 : -1;
-
-	unsigned int sizeof_fpacc87: sizeof(struct fpacc87) == 10 ? 1 : -1;
-
-	/* FIXME: @4 2 + @4 2 + @4 2 + @4 8 + @4 8 + @2 (8 * 10) == 108 */
-	/* expect+1: error: illegal bit-field size: 255 [36] */
-	unsigned int sizeof_save87: sizeof(struct save87) == 108 ? 1 : -1;
-};
+/* FIXME: @4 2 + @4 2 + @4 2 + @4 8 + @4 8 + @2 (8 * 10) == 108 */
+/* expect+1: error: negative array dimension (-104) [20] */
+typedef int sizeof_save87[-(int)sizeof(struct save87)];
 
 
 void
@@ -53,7 +58,16 @@ aligned_struct_member(void)
 		int second __attribute__((__aligned__(16)));
 	};
 
-	/* TODO: should be -20 instead of -8. */
+	/*
+	 * Aligning 'second' to a 16-bytes boundary not only aligns the member
+	 * inside the structure, it also affects the alignment requirement of
+	 * the whole structure.  Due to this struct alignment, the size of the
+	 * structure gets rounded up to 32 instead of using the minimally
+	 * necessary storage of 20.
+	 *
+	 * https://gcc.gnu.org/onlinedocs/gcc/Common-Type-Attributes.html
+	 */
+	/* TODO: should be -32 instead of -8. */
 	/* expect+1: error: negative array dimension (-8) [20] */
 	typedef int ctassert[-(int)sizeof(struct aligned)];
 }



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

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 23:24:37 UTC 2022

Modified Files:
src/tests/usr.bin/xlint/lint1: gcc_attribute_aligned.c

Log Message:
tests/lint: add more information to test for __attribute__((aligned))

Declaring an array type having a negative dimension is the simplest way
to embed an integer into a lint diagnostic, thereby revealing what size
and alignment lint has calculated for a struct.

While here, move these "compile-time assertions" closer to their
corresponding struct, to make reading easier.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c

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



Re: CVS import: external/bsd/tradcpp/dist

2022-08-27 Thread David Holland
On Sat, Aug 27, 2022 at 09:44:10PM +, David A. Holland wrote:
 > Module Name: external
 > Committed By:dholland
 > Date:Sat Aug 27 21:44:10 UTC 2022
 > 
 > Update of /cvsroot/external/bsd/tradcpp/dist
 > In directory ivanova.netbsd.org:/tmp/cvs-serv4832
 > 
 > Log Message:
 > Import tradcpp 0.5.3

As you might have noticed, this one went in the wrong place. I've
asked admins to nuke it.

-- 
David A. Holland
dholl...@netbsd.org


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

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 21:59:41 UTC 2022

Modified Files:
src/tests/usr.bin/xlint/lint1: gcc_attribute_aligned.c

Log Message:
tests/lint: add another test for aligned struct member

In the kernel, several structs have this attribute, and running lint on
them runs into a compile-time assertion.  Typical error messages are:

* error: illegal bit-field size: 255 [36]
* error: integral constant expression expected [55]


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c

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

Modified files:

Index: src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c
diff -u src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c:1.3 src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c:1.4
--- src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c:1.3	Fri Jun 17 18:54:53 2022
+++ src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c	Sat Aug 27 21:59:41 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: gcc_attribute_aligned.c,v 1.3 2022/06/17 18:54:53 rillig Exp $	*/
+/*	$NetBSD: gcc_attribute_aligned.c,v 1.4 2022/08/27 21:59:41 rillig Exp $	*/
 # 3 "gcc_attribute_aligned.c"
 
 /*
@@ -43,3 +43,17 @@ struct {
 	/* expect+1: error: illegal bit-field size: 255 [36] */
 	unsigned int sizeof_save87: sizeof(struct save87) == 108 ? 1 : -1;
 };
+
+
+void
+aligned_struct_member(void)
+{
+	struct aligned {
+		int first;
+		int second __attribute__((__aligned__(16)));
+	};
+
+	/* TODO: should be -20 instead of -8. */
+	/* expect+1: error: negative array dimension (-8) [20] */
+	typedef int ctassert[-(int)sizeof(struct aligned)];
+}



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

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 21:59:41 UTC 2022

Modified Files:
src/tests/usr.bin/xlint/lint1: gcc_attribute_aligned.c

Log Message:
tests/lint: add another test for aligned struct member

In the kernel, several structs have this attribute, and running lint on
them runs into a compile-time assertion.  Typical error messages are:

* error: illegal bit-field size: 255 [36]
* error: integral constant expression expected [55]


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c

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



Re: CVS commit: src

2022-08-27 Thread Valery Ushakov
On Sat, Aug 27, 2022 at 21:53:39 +, David A. Holland wrote:

> Log Message:
> Attach tradcpp to the build.

Thanks!

-uwe


CVS commit: src

2022-08-27 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sat Aug 27 21:53:39 UTC 2022

Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/man: mi
src/doc: 3RDPARTY
src/external/bsd: Makefile
Added Files:
src/external/bsd/tradcpp: Makefile README
src/external/bsd/tradcpp/usr.bin: Makefile

Log Message:
Attach tradcpp to the build.


To generate a diff of this commit:
cvs rdiff -u -r1.1311 -r1.1312 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1753 -r1.1754 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1871 -r1.1872 src/doc/3RDPARTY
cvs rdiff -u -r1.75 -r1.76 src/external/bsd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/tradcpp/Makefile \
src/external/bsd/tradcpp/README
cvs rdiff -u -r0 -r1.1 src/external/bsd/tradcpp/usr.bin/Makefile

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/mi
diff -u src/distrib/sets/lists/base/mi:1.1311 src/distrib/sets/lists/base/mi:1.1312
--- src/distrib/sets/lists/base/mi:1.1311	Wed Aug 17 14:03:05 2022
+++ src/distrib/sets/lists/base/mi	Sat Aug 27 21:53:38 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1311 2022/08/17 14:03:05 kre Exp $
+# $NetBSD: mi,v 1.1312 2022/08/27 21:53:38 dholland Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -881,6 +881,7 @@
 ./usr/bin/tpm_versionbase-tpm-bin		tpm
 ./usr/bin/tput	base-util-bin
 ./usr/bin/tr	base-util-bin
+./usr/bin/tradcppbase-util-bin
 ./usr/bin/true	base-util-bin
 ./usr/bin/tset	base-util-bin
 ./usr/bin/tty	base-util-bin

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1753 src/distrib/sets/lists/man/mi:1.1754
--- src/distrib/sets/lists/man/mi:1.1753	Fri Aug 12 11:15:40 2022
+++ src/distrib/sets/lists/man/mi	Sat Aug 27 21:53:38 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1753 2022/08/12 11:15:40 riastradh Exp $
+# $NetBSD: mi,v 1.1754 2022/08/27 21:53:38 dholland Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -594,6 +594,7 @@
 ./usr/share/man/cat1/tpm_version.0		man-tpm-catman		tpm,.cat
 ./usr/share/man/cat1/tput.0			man-util-catman		.cat
 ./usr/share/man/cat1/tr.0			man-util-catman		.cat
+./usr/share/man/cat1/tradcpp.0			man-util-catman		.cat
 ./usr/share/man/cat1/true.0			man-util-catman		.cat
 ./usr/share/man/cat1/tset.0			man-util-catman		.cat
 ./usr/share/man/cat1/tty.0			man-util-catman		.cat
@@ -3920,6 +3921,7 @@
 ./usr/share/man/html1/tpm_version.html		man-tpm-htmlman		tpm,html
 ./usr/share/man/html1/tput.html			man-util-htmlman	html
 ./usr/share/man/html1/tr.html			man-util-htmlman	html
+./usr/share/man/html1/tradcpp.html		man-util-htmlman	html
 ./usr/share/man/html1/true.html			man-util-htmlman	html
 ./usr/share/man/html1/tset.html			man-util-htmlman	html
 ./usr/share/man/html1/tty.html			man-util-htmlman	html
@@ -6900,6 +6902,7 @@
 ./usr/share/man/man1/tpm_version.1		man-tpm-man		tpm,.man
 ./usr/share/man/man1/tput.1			man-util-man		.man
 ./usr/share/man/man1/tr.1			man-util-man		.man
+./usr/share/man/man1/tradcpp.1			man-util-man		.man
 ./usr/share/man/man1/true.1			man-util-man		.man
 ./usr/share/man/man1/tset.1			man-util-man		.man
 ./usr/share/man/man1/tty.1			man-util-man		.man

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1871 src/doc/3RDPARTY:1.1872
--- src/doc/3RDPARTY:1.1871	Sat Aug 27 14:07:26 2022
+++ src/doc/3RDPARTY	Sat Aug 27 21:53:38 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1871 2022/08/27 14:07:26 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1872 2022/08/27 21:53:38 dholland Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1409,6 +1409,18 @@ Location:	usr.sbin/traceroute
 Notes:
 Added changes from a5 -> a12 manually.
 
+Package:	tradcpp
+Version:	0.5.3
+Current Vers:	0.5.3
+Maintainer:	David A. Holland 
+Archive Site:	https://ftp.netbsd.org/pub/NetBSD/misc/dholland/
+Home Page:	https://www.netbsd.org/~dholland/tradcpp/
+Mailing List:	tech-toolchain
+Responsible:	dholland
+License:	BSD (2-clause)
+Location:	external/bsd/tradcpp
+Notes:
+
 Package:	tz
 Version:	tzcode2022c / tzdata2022bgtz (tzdata2022c)
 Current Vers:	tzcode2022c / tzdata2022c

Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.75 src/external/bsd/Makefile:1.76
--- src/external/bsd/Makefile:1.75	Mon Jun  6 10:56:28 2022
+++ src/external/bsd/Makefile	Sat Aug 27 21:53:38 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.75 2022/06/06 10:56:28 nia Exp $
+#	$NetBSD: Makefile,v 1.76 2022/08/27 21:53:38 dholland Exp $
 
 .include 
 
@@ -44,6 +44,6 @@ SUBDIR+= librtld_db
 SUBDIR+= unbound
 .endif
 
-SUBDIR+= blocklist pdisk nvi ppp libnv
+SUBDIR+= blocklist pdisk nvi ppp libnv tradcpp
 
 .include 

Added files:

Index: src/external/bsd/tradcpp/Makefile
diff -u /dev/null 

CVS commit: src

2022-08-27 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sat Aug 27 21:53:39 UTC 2022

Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/man: mi
src/doc: 3RDPARTY
src/external/bsd: Makefile
Added Files:
src/external/bsd/tradcpp: Makefile README
src/external/bsd/tradcpp/usr.bin: Makefile

Log Message:
Attach tradcpp to the build.


To generate a diff of this commit:
cvs rdiff -u -r1.1311 -r1.1312 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1753 -r1.1754 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1871 -r1.1872 src/doc/3RDPARTY
cvs rdiff -u -r1.75 -r1.76 src/external/bsd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/tradcpp/Makefile \
src/external/bsd/tradcpp/README
cvs rdiff -u -r0 -r1.1 src/external/bsd/tradcpp/usr.bin/Makefile

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



CVS commit: src/sys/conf

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 21:49:33 UTC 2022

Modified Files:
src/sys/conf: lint.mk

Log Message:
sys/conf/link.mk: clean up

The modifier ':C' did not need the modifier 'g', as there couldn't ever
be more than one match per word. Using the modifier ':from=to' is easier
to read.

Align the variable assignments. There was no point in having 3 different
alignment styles in the same file.

Remove underscore from .for iteration variable, as it is not needed.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/conf/lint.mk

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

Modified files:

Index: src/sys/conf/lint.mk
diff -u src/sys/conf/lint.mk:1.4 src/sys/conf/lint.mk:1.5
--- src/sys/conf/lint.mk:1.4	Sun May  2 20:11:43 2021
+++ src/sys/conf/lint.mk	Sat Aug 27 21:49:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: lint.mk,v 1.4 2021/05/02 20:11:43 rillig Exp $
+# $NetBSD: lint.mk,v 1.5 2022/08/27 21:49:33 rillig Exp $
 
 ##
 ## lint
@@ -7,22 +7,22 @@
 .if !target(lint)
 .PATH: $S
 ALLSFILES?=	${MD_SFILES} ${SFILES}
-LINTSTUBS?=	${ALLSFILES:T:R:C/^.*$/LintStub_&.c/g}
+LINTSTUBS?=	${ALLSFILES:T:R:%=LintStub_%.c}
 KERNLINTFLAGS?=	-bceghnxzFS
 NORMAL_LN?=	${LINT} ${KERNLINTFLAGS} ${CPPFLAGS:M-[IDU]*} -o $@ -i $<
 
-_lsrc=${CFILES} ${LINTSTUBS} ${MI_CFILES} ${MD_CFILES}
-LOBJS?= ${_lsrc:T:S/.c$/.ln/g} ${LIBKERNLN} ${SYSLIBCOMPATLN}
+_lsrc=		${CFILES} ${LINTSTUBS} ${MI_CFILES} ${MD_CFILES}
+LOBJS?=		${_lsrc:T:.c=.ln} ${LIBKERNLN} ${SYSLIBCOMPATLN}
 
-.for _sfile in ${ALLSFILES}
-LintStub_${_sfile:T:R}.c: ${_sfile} assym.h
+.for sfile in ${ALLSFILES}
+LintStub_${sfile:T:R}.c: ${sfile} assym.h
 	${_MKTARGET_COMPILE}
-	${CC} -E -C ${AFLAGS} ${CPPFLAGS} ${_sfile} | \
+	${CC} -E -C ${AFLAGS} ${CPPFLAGS} ${sfile} | \
 	  ${TOOL_AWK} -f $S/kern/genlintstub.awk >${.TARGET}
 .endfor
 
-.for _cfile in ${CFILES} ${LINTSTUBS} ${MI_CFILES} ${MD_CFILES}
-${_cfile:T:R}.ln: ${_cfile}
+.for cfile in ${CFILES} ${LINTSTUBS} ${MI_CFILES} ${MD_CFILES}
+${cfile:T:R}.ln: ${cfile}
 	${_MKTARGET_COMPILE}
 	${NORMAL_LN}
 .endfor



CVS commit: src/sys/conf

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 21:49:33 UTC 2022

Modified Files:
src/sys/conf: lint.mk

Log Message:
sys/conf/link.mk: clean up

The modifier ':C' did not need the modifier 'g', as there couldn't ever
be more than one match per word. Using the modifier ':from=to' is easier
to read.

Align the variable assignments. There was no point in having 3 different
alignment styles in the same file.

Remove underscore from .for iteration variable, as it is not needed.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/conf/lint.mk

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



CVS import: src/external/bsd/tradcpp/dist

2022-08-27 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sat Aug 27 21:46:47 UTC 2022

Update of /cvsroot/src/external/bsd/tradcpp/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24782

Log Message:
Import tradcpp 0.5.3

Status:

Vendor Tag: TRADCPP
Release Tags:   TRADCPP-0-5-3

N src/external/bsd/tradcpp/dist/.hg_archival.txt
N src/external/bsd/tradcpp/dist/.hgtags
N src/external/bsd/tradcpp/dist/CHANGES
N src/external/bsd/tradcpp/dist/Makefile
N src/external/bsd/tradcpp/dist/TODO
N src/external/bsd/tradcpp/dist/array.c
N src/external/bsd/tradcpp/dist/array.h
N src/external/bsd/tradcpp/dist/bool.h
N src/external/bsd/tradcpp/dist/config.h
N src/external/bsd/tradcpp/dist/directive.c
N src/external/bsd/tradcpp/dist/directive.h
N src/external/bsd/tradcpp/dist/eval.c
N src/external/bsd/tradcpp/dist/eval.h
N src/external/bsd/tradcpp/dist/files.c
N src/external/bsd/tradcpp/dist/files.h
N src/external/bsd/tradcpp/dist/inlinedefs.h
N src/external/bsd/tradcpp/dist/macro.c
N src/external/bsd/tradcpp/dist/macro.h
N src/external/bsd/tradcpp/dist/main.c
N src/external/bsd/tradcpp/dist/mode.h
N src/external/bsd/tradcpp/dist/output.c
N src/external/bsd/tradcpp/dist/output.h
N src/external/bsd/tradcpp/dist/place.c
N src/external/bsd/tradcpp/dist/place.h
N src/external/bsd/tradcpp/dist/tradcpp.1
N src/external/bsd/tradcpp/dist/union.h
N src/external/bsd/tradcpp/dist/utils.c
N src/external/bsd/tradcpp/dist/utils.h
N src/external/bsd/tradcpp/dist/version.h
N src/external/bsd/tradcpp/dist/tests/Makefile
N src/external/bsd/tradcpp/dist/tests/t01.c
N src/external/bsd/tradcpp/dist/tests/t01.good
N src/external/bsd/tradcpp/dist/tests/t02.c
N src/external/bsd/tradcpp/dist/tests/t02.good
N src/external/bsd/tradcpp/dist/tests/t03.c
N src/external/bsd/tradcpp/dist/tests/t03.good
N src/external/bsd/tradcpp/dist/tests/t04.c
N src/external/bsd/tradcpp/dist/tests/t04.good
N src/external/bsd/tradcpp/dist/tests/t05.c
N src/external/bsd/tradcpp/dist/tests/t05.good
N src/external/bsd/tradcpp/dist/tests/t06.c
N src/external/bsd/tradcpp/dist/tests/t06.good
N src/external/bsd/tradcpp/dist/tests/t07.c
N src/external/bsd/tradcpp/dist/tests/t07.good
N src/external/bsd/tradcpp/dist/tests/t08.c
N src/external/bsd/tradcpp/dist/tests/t08.good
N src/external/bsd/tradcpp/dist/tests/t09.c
N src/external/bsd/tradcpp/dist/tests/t09.good
N src/external/bsd/tradcpp/dist/tests/t10.c
N src/external/bsd/tradcpp/dist/tests/t10.good
N src/external/bsd/tradcpp/dist/tests/t11.c
N src/external/bsd/tradcpp/dist/tests/t11.good
N src/external/bsd/tradcpp/dist/tests/t12.c
N src/external/bsd/tradcpp/dist/tests/t12.good
N src/external/bsd/tradcpp/dist/tests/t13.c
N src/external/bsd/tradcpp/dist/tests/t13.good
N src/external/bsd/tradcpp/dist/tests/t14.c
N src/external/bsd/tradcpp/dist/tests/t14.good
N src/external/bsd/tradcpp/dist/tests/t15.c
N src/external/bsd/tradcpp/dist/tests/t15.good
N src/external/bsd/tradcpp/dist/tests/t16.c
N src/external/bsd/tradcpp/dist/tests/t16.good
N src/external/bsd/tradcpp/dist/tests/t17.c
N src/external/bsd/tradcpp/dist/tests/t17.good
N src/external/bsd/tradcpp/dist/tests/t18.c
N src/external/bsd/tradcpp/dist/tests/t18.good
N src/external/bsd/tradcpp/dist/tests/t19.c
N src/external/bsd/tradcpp/dist/tests/t19.good
N src/external/bsd/tradcpp/dist/tests/t20.c
N src/external/bsd/tradcpp/dist/tests/t20.good
N src/external/bsd/tradcpp/dist/tests/t21.c
N src/external/bsd/tradcpp/dist/tests/t21.good
N src/external/bsd/tradcpp/dist/tests/t22.c
N src/external/bsd/tradcpp/dist/tests/t22.good
N src/external/bsd/tradcpp/dist/tests/t23.c
N src/external/bsd/tradcpp/dist/tests/t23.good
N src/external/bsd/tradcpp/dist/tests/t24.c
N src/external/bsd/tradcpp/dist/tests/t24.good
N src/external/bsd/tradcpp/dist/tests/t25.c
N src/external/bsd/tradcpp/dist/tests/t25.good
N src/external/bsd/tradcpp/dist/tests/t26.c
N src/external/bsd/tradcpp/dist/tests/t26.good
N src/external/bsd/tradcpp/dist/tests/t27.c
N src/external/bsd/tradcpp/dist/tests/t27.good
N src/external/bsd/tradcpp/dist/tests/t28.c
N src/external/bsd/tradcpp/dist/tests/t28.good
N src/external/bsd/tradcpp/dist/tests/t29.c
N src/external/bsd/tradcpp/dist/tests/t29.good
N src/external/bsd/tradcpp/dist/tests/t30.c
N src/external/bsd/tradcpp/dist/tests/t30.good
N src/external/bsd/tradcpp/dist/tests/t31.c
N src/external/bsd/tradcpp/dist/tests/t31.good
N src/external/bsd/tradcpp/dist/tests/t32.c
N src/external/bsd/tradcpp/dist/tests/t32.good
N src/external/bsd/tradcpp/dist/tests/t33.c
N src/external/bsd/tradcpp/dist/tests/t33.good
N src/external/bsd/tradcpp/dist/tests/t34.c
N src/external/bsd/tradcpp/dist/tests/t34.good
N src/external/bsd/tradcpp/dist/tests/t35.c
N src/external/bsd/tradcpp/dist/tests/t35.good
N src/external/bsd/tradcpp/dist/tests/t36.c
N src/external/bsd/tradcpp/dist/tests/t36.good
N src/external/bsd/tradcpp/dist/tests/t37.c
N src/external/bsd/tradcpp/dist/tests/t37.good
N src/external/bsd/tradcpp/dist/tests/t38.c
N src/external/bsd/tradcpp/dist/tests/t38.good
N 

CVS import: src/external/bsd/tradcpp/dist

2022-08-27 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sat Aug 27 21:46:47 UTC 2022

Update of /cvsroot/src/external/bsd/tradcpp/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24782

Log Message:
Import tradcpp 0.5.3

Status:

Vendor Tag: TRADCPP
Release Tags:   TRADCPP-0-5-3

N src/external/bsd/tradcpp/dist/.hg_archival.txt
N src/external/bsd/tradcpp/dist/.hgtags
N src/external/bsd/tradcpp/dist/CHANGES
N src/external/bsd/tradcpp/dist/Makefile
N src/external/bsd/tradcpp/dist/TODO
N src/external/bsd/tradcpp/dist/array.c
N src/external/bsd/tradcpp/dist/array.h
N src/external/bsd/tradcpp/dist/bool.h
N src/external/bsd/tradcpp/dist/config.h
N src/external/bsd/tradcpp/dist/directive.c
N src/external/bsd/tradcpp/dist/directive.h
N src/external/bsd/tradcpp/dist/eval.c
N src/external/bsd/tradcpp/dist/eval.h
N src/external/bsd/tradcpp/dist/files.c
N src/external/bsd/tradcpp/dist/files.h
N src/external/bsd/tradcpp/dist/inlinedefs.h
N src/external/bsd/tradcpp/dist/macro.c
N src/external/bsd/tradcpp/dist/macro.h
N src/external/bsd/tradcpp/dist/main.c
N src/external/bsd/tradcpp/dist/mode.h
N src/external/bsd/tradcpp/dist/output.c
N src/external/bsd/tradcpp/dist/output.h
N src/external/bsd/tradcpp/dist/place.c
N src/external/bsd/tradcpp/dist/place.h
N src/external/bsd/tradcpp/dist/tradcpp.1
N src/external/bsd/tradcpp/dist/union.h
N src/external/bsd/tradcpp/dist/utils.c
N src/external/bsd/tradcpp/dist/utils.h
N src/external/bsd/tradcpp/dist/version.h
N src/external/bsd/tradcpp/dist/tests/Makefile
N src/external/bsd/tradcpp/dist/tests/t01.c
N src/external/bsd/tradcpp/dist/tests/t01.good
N src/external/bsd/tradcpp/dist/tests/t02.c
N src/external/bsd/tradcpp/dist/tests/t02.good
N src/external/bsd/tradcpp/dist/tests/t03.c
N src/external/bsd/tradcpp/dist/tests/t03.good
N src/external/bsd/tradcpp/dist/tests/t04.c
N src/external/bsd/tradcpp/dist/tests/t04.good
N src/external/bsd/tradcpp/dist/tests/t05.c
N src/external/bsd/tradcpp/dist/tests/t05.good
N src/external/bsd/tradcpp/dist/tests/t06.c
N src/external/bsd/tradcpp/dist/tests/t06.good
N src/external/bsd/tradcpp/dist/tests/t07.c
N src/external/bsd/tradcpp/dist/tests/t07.good
N src/external/bsd/tradcpp/dist/tests/t08.c
N src/external/bsd/tradcpp/dist/tests/t08.good
N src/external/bsd/tradcpp/dist/tests/t09.c
N src/external/bsd/tradcpp/dist/tests/t09.good
N src/external/bsd/tradcpp/dist/tests/t10.c
N src/external/bsd/tradcpp/dist/tests/t10.good
N src/external/bsd/tradcpp/dist/tests/t11.c
N src/external/bsd/tradcpp/dist/tests/t11.good
N src/external/bsd/tradcpp/dist/tests/t12.c
N src/external/bsd/tradcpp/dist/tests/t12.good
N src/external/bsd/tradcpp/dist/tests/t13.c
N src/external/bsd/tradcpp/dist/tests/t13.good
N src/external/bsd/tradcpp/dist/tests/t14.c
N src/external/bsd/tradcpp/dist/tests/t14.good
N src/external/bsd/tradcpp/dist/tests/t15.c
N src/external/bsd/tradcpp/dist/tests/t15.good
N src/external/bsd/tradcpp/dist/tests/t16.c
N src/external/bsd/tradcpp/dist/tests/t16.good
N src/external/bsd/tradcpp/dist/tests/t17.c
N src/external/bsd/tradcpp/dist/tests/t17.good
N src/external/bsd/tradcpp/dist/tests/t18.c
N src/external/bsd/tradcpp/dist/tests/t18.good
N src/external/bsd/tradcpp/dist/tests/t19.c
N src/external/bsd/tradcpp/dist/tests/t19.good
N src/external/bsd/tradcpp/dist/tests/t20.c
N src/external/bsd/tradcpp/dist/tests/t20.good
N src/external/bsd/tradcpp/dist/tests/t21.c
N src/external/bsd/tradcpp/dist/tests/t21.good
N src/external/bsd/tradcpp/dist/tests/t22.c
N src/external/bsd/tradcpp/dist/tests/t22.good
N src/external/bsd/tradcpp/dist/tests/t23.c
N src/external/bsd/tradcpp/dist/tests/t23.good
N src/external/bsd/tradcpp/dist/tests/t24.c
N src/external/bsd/tradcpp/dist/tests/t24.good
N src/external/bsd/tradcpp/dist/tests/t25.c
N src/external/bsd/tradcpp/dist/tests/t25.good
N src/external/bsd/tradcpp/dist/tests/t26.c
N src/external/bsd/tradcpp/dist/tests/t26.good
N src/external/bsd/tradcpp/dist/tests/t27.c
N src/external/bsd/tradcpp/dist/tests/t27.good
N src/external/bsd/tradcpp/dist/tests/t28.c
N src/external/bsd/tradcpp/dist/tests/t28.good
N src/external/bsd/tradcpp/dist/tests/t29.c
N src/external/bsd/tradcpp/dist/tests/t29.good
N src/external/bsd/tradcpp/dist/tests/t30.c
N src/external/bsd/tradcpp/dist/tests/t30.good
N src/external/bsd/tradcpp/dist/tests/t31.c
N src/external/bsd/tradcpp/dist/tests/t31.good
N src/external/bsd/tradcpp/dist/tests/t32.c
N src/external/bsd/tradcpp/dist/tests/t32.good
N src/external/bsd/tradcpp/dist/tests/t33.c
N src/external/bsd/tradcpp/dist/tests/t33.good
N src/external/bsd/tradcpp/dist/tests/t34.c
N src/external/bsd/tradcpp/dist/tests/t34.good
N src/external/bsd/tradcpp/dist/tests/t35.c
N src/external/bsd/tradcpp/dist/tests/t35.good
N src/external/bsd/tradcpp/dist/tests/t36.c
N src/external/bsd/tradcpp/dist/tests/t36.good
N src/external/bsd/tradcpp/dist/tests/t37.c
N src/external/bsd/tradcpp/dist/tests/t37.good
N src/external/bsd/tradcpp/dist/tests/t38.c
N src/external/bsd/tradcpp/dist/tests/t38.good
N 

CVS import: external/bsd/tradcpp/dist

2022-08-27 Thread David A. Holland
Module Name:external
Committed By:   dholland
Date:   Sat Aug 27 21:44:10 UTC 2022

Update of /cvsroot/external/bsd/tradcpp/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv4832

Log Message:
Import tradcpp 0.5.3

Status:

Vendor Tag: TRADCPP
Release Tags:   TRADCPP-0-5-3

N external/bsd/tradcpp/dist/.hg_archival.txt
N external/bsd/tradcpp/dist/.hgtags
N external/bsd/tradcpp/dist/CHANGES
N external/bsd/tradcpp/dist/Makefile
N external/bsd/tradcpp/dist/TODO
N external/bsd/tradcpp/dist/array.c
N external/bsd/tradcpp/dist/array.h
N external/bsd/tradcpp/dist/bool.h
N external/bsd/tradcpp/dist/config.h
N external/bsd/tradcpp/dist/directive.c
N external/bsd/tradcpp/dist/directive.h
N external/bsd/tradcpp/dist/eval.c
N external/bsd/tradcpp/dist/eval.h
N external/bsd/tradcpp/dist/files.c
N external/bsd/tradcpp/dist/files.h
N external/bsd/tradcpp/dist/inlinedefs.h
N external/bsd/tradcpp/dist/macro.c
N external/bsd/tradcpp/dist/macro.h
N external/bsd/tradcpp/dist/main.c
N external/bsd/tradcpp/dist/mode.h
N external/bsd/tradcpp/dist/output.c
N external/bsd/tradcpp/dist/output.h
N external/bsd/tradcpp/dist/place.c
N external/bsd/tradcpp/dist/place.h
N external/bsd/tradcpp/dist/tradcpp.1
N external/bsd/tradcpp/dist/union.h
N external/bsd/tradcpp/dist/utils.c
N external/bsd/tradcpp/dist/utils.h
N external/bsd/tradcpp/dist/version.h
N external/bsd/tradcpp/dist/tests/Makefile
N external/bsd/tradcpp/dist/tests/t01.c
N external/bsd/tradcpp/dist/tests/t01.good
N external/bsd/tradcpp/dist/tests/t02.c
N external/bsd/tradcpp/dist/tests/t02.good
N external/bsd/tradcpp/dist/tests/t03.c
N external/bsd/tradcpp/dist/tests/t03.good
N external/bsd/tradcpp/dist/tests/t04.c
N external/bsd/tradcpp/dist/tests/t04.good
N external/bsd/tradcpp/dist/tests/t05.c
N external/bsd/tradcpp/dist/tests/t05.good
N external/bsd/tradcpp/dist/tests/t06.c
N external/bsd/tradcpp/dist/tests/t06.good
N external/bsd/tradcpp/dist/tests/t07.c
N external/bsd/tradcpp/dist/tests/t07.good
N external/bsd/tradcpp/dist/tests/t08.c
N external/bsd/tradcpp/dist/tests/t08.good
N external/bsd/tradcpp/dist/tests/t09.c
N external/bsd/tradcpp/dist/tests/t09.good
N external/bsd/tradcpp/dist/tests/t10.c
N external/bsd/tradcpp/dist/tests/t10.good
N external/bsd/tradcpp/dist/tests/t11.c
N external/bsd/tradcpp/dist/tests/t11.good
N external/bsd/tradcpp/dist/tests/t12.c
N external/bsd/tradcpp/dist/tests/t12.good
N external/bsd/tradcpp/dist/tests/t13.c
N external/bsd/tradcpp/dist/tests/t13.good
N external/bsd/tradcpp/dist/tests/t14.c
N external/bsd/tradcpp/dist/tests/t14.good
N external/bsd/tradcpp/dist/tests/t15.c
N external/bsd/tradcpp/dist/tests/t15.good
N external/bsd/tradcpp/dist/tests/t16.c
N external/bsd/tradcpp/dist/tests/t16.good
N external/bsd/tradcpp/dist/tests/t17.c
N external/bsd/tradcpp/dist/tests/t17.good
N external/bsd/tradcpp/dist/tests/t18.c
N external/bsd/tradcpp/dist/tests/t18.good
N external/bsd/tradcpp/dist/tests/t19.c
N external/bsd/tradcpp/dist/tests/t19.good
N external/bsd/tradcpp/dist/tests/t20.c
N external/bsd/tradcpp/dist/tests/t20.good
N external/bsd/tradcpp/dist/tests/t21.c
N external/bsd/tradcpp/dist/tests/t21.good
N external/bsd/tradcpp/dist/tests/t22.c
N external/bsd/tradcpp/dist/tests/t22.good
N external/bsd/tradcpp/dist/tests/t23.c
N external/bsd/tradcpp/dist/tests/t23.good
N external/bsd/tradcpp/dist/tests/t24.c
N external/bsd/tradcpp/dist/tests/t24.good
N external/bsd/tradcpp/dist/tests/t25.c
N external/bsd/tradcpp/dist/tests/t25.good
N external/bsd/tradcpp/dist/tests/t26.c
N external/bsd/tradcpp/dist/tests/t26.good
N external/bsd/tradcpp/dist/tests/t27.c
N external/bsd/tradcpp/dist/tests/t27.good
N external/bsd/tradcpp/dist/tests/t28.c
N external/bsd/tradcpp/dist/tests/t28.good
N external/bsd/tradcpp/dist/tests/t29.c
N external/bsd/tradcpp/dist/tests/t29.good
N external/bsd/tradcpp/dist/tests/t30.c
N external/bsd/tradcpp/dist/tests/t30.good
N external/bsd/tradcpp/dist/tests/t31.c
N external/bsd/tradcpp/dist/tests/t31.good
N external/bsd/tradcpp/dist/tests/t32.c
N external/bsd/tradcpp/dist/tests/t32.good
N external/bsd/tradcpp/dist/tests/t33.c
N external/bsd/tradcpp/dist/tests/t33.good
N external/bsd/tradcpp/dist/tests/t34.c
N external/bsd/tradcpp/dist/tests/t34.good
N external/bsd/tradcpp/dist/tests/t35.c
N external/bsd/tradcpp/dist/tests/t35.good
N external/bsd/tradcpp/dist/tests/t36.c
N external/bsd/tradcpp/dist/tests/t36.good
N external/bsd/tradcpp/dist/tests/t37.c
N external/bsd/tradcpp/dist/tests/t37.good
N external/bsd/tradcpp/dist/tests/t38.c
N external/bsd/tradcpp/dist/tests/t38.good
N external/bsd/tradcpp/dist/tests/t39.c
N external/bsd/tradcpp/dist/tests/t39.good
N external/bsd/tradcpp/dist/tests/t40.c
N external/bsd/tradcpp/dist/tests/t40.good
N external/bsd/tradcpp/dist/tests/tradcpp.sh
N external/bsd/tradcpp/dist/tests/subdir/test.h

No conflicts created by this import



CVS import: external/bsd/tradcpp/dist

2022-08-27 Thread David A. Holland
Module Name:external
Committed By:   dholland
Date:   Sat Aug 27 21:44:10 UTC 2022

Update of /cvsroot/external/bsd/tradcpp/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv4832

Log Message:
Import tradcpp 0.5.3

Status:

Vendor Tag: TRADCPP
Release Tags:   TRADCPP-0-5-3

N external/bsd/tradcpp/dist/.hg_archival.txt
N external/bsd/tradcpp/dist/.hgtags
N external/bsd/tradcpp/dist/CHANGES
N external/bsd/tradcpp/dist/Makefile
N external/bsd/tradcpp/dist/TODO
N external/bsd/tradcpp/dist/array.c
N external/bsd/tradcpp/dist/array.h
N external/bsd/tradcpp/dist/bool.h
N external/bsd/tradcpp/dist/config.h
N external/bsd/tradcpp/dist/directive.c
N external/bsd/tradcpp/dist/directive.h
N external/bsd/tradcpp/dist/eval.c
N external/bsd/tradcpp/dist/eval.h
N external/bsd/tradcpp/dist/files.c
N external/bsd/tradcpp/dist/files.h
N external/bsd/tradcpp/dist/inlinedefs.h
N external/bsd/tradcpp/dist/macro.c
N external/bsd/tradcpp/dist/macro.h
N external/bsd/tradcpp/dist/main.c
N external/bsd/tradcpp/dist/mode.h
N external/bsd/tradcpp/dist/output.c
N external/bsd/tradcpp/dist/output.h
N external/bsd/tradcpp/dist/place.c
N external/bsd/tradcpp/dist/place.h
N external/bsd/tradcpp/dist/tradcpp.1
N external/bsd/tradcpp/dist/union.h
N external/bsd/tradcpp/dist/utils.c
N external/bsd/tradcpp/dist/utils.h
N external/bsd/tradcpp/dist/version.h
N external/bsd/tradcpp/dist/tests/Makefile
N external/bsd/tradcpp/dist/tests/t01.c
N external/bsd/tradcpp/dist/tests/t01.good
N external/bsd/tradcpp/dist/tests/t02.c
N external/bsd/tradcpp/dist/tests/t02.good
N external/bsd/tradcpp/dist/tests/t03.c
N external/bsd/tradcpp/dist/tests/t03.good
N external/bsd/tradcpp/dist/tests/t04.c
N external/bsd/tradcpp/dist/tests/t04.good
N external/bsd/tradcpp/dist/tests/t05.c
N external/bsd/tradcpp/dist/tests/t05.good
N external/bsd/tradcpp/dist/tests/t06.c
N external/bsd/tradcpp/dist/tests/t06.good
N external/bsd/tradcpp/dist/tests/t07.c
N external/bsd/tradcpp/dist/tests/t07.good
N external/bsd/tradcpp/dist/tests/t08.c
N external/bsd/tradcpp/dist/tests/t08.good
N external/bsd/tradcpp/dist/tests/t09.c
N external/bsd/tradcpp/dist/tests/t09.good
N external/bsd/tradcpp/dist/tests/t10.c
N external/bsd/tradcpp/dist/tests/t10.good
N external/bsd/tradcpp/dist/tests/t11.c
N external/bsd/tradcpp/dist/tests/t11.good
N external/bsd/tradcpp/dist/tests/t12.c
N external/bsd/tradcpp/dist/tests/t12.good
N external/bsd/tradcpp/dist/tests/t13.c
N external/bsd/tradcpp/dist/tests/t13.good
N external/bsd/tradcpp/dist/tests/t14.c
N external/bsd/tradcpp/dist/tests/t14.good
N external/bsd/tradcpp/dist/tests/t15.c
N external/bsd/tradcpp/dist/tests/t15.good
N external/bsd/tradcpp/dist/tests/t16.c
N external/bsd/tradcpp/dist/tests/t16.good
N external/bsd/tradcpp/dist/tests/t17.c
N external/bsd/tradcpp/dist/tests/t17.good
N external/bsd/tradcpp/dist/tests/t18.c
N external/bsd/tradcpp/dist/tests/t18.good
N external/bsd/tradcpp/dist/tests/t19.c
N external/bsd/tradcpp/dist/tests/t19.good
N external/bsd/tradcpp/dist/tests/t20.c
N external/bsd/tradcpp/dist/tests/t20.good
N external/bsd/tradcpp/dist/tests/t21.c
N external/bsd/tradcpp/dist/tests/t21.good
N external/bsd/tradcpp/dist/tests/t22.c
N external/bsd/tradcpp/dist/tests/t22.good
N external/bsd/tradcpp/dist/tests/t23.c
N external/bsd/tradcpp/dist/tests/t23.good
N external/bsd/tradcpp/dist/tests/t24.c
N external/bsd/tradcpp/dist/tests/t24.good
N external/bsd/tradcpp/dist/tests/t25.c
N external/bsd/tradcpp/dist/tests/t25.good
N external/bsd/tradcpp/dist/tests/t26.c
N external/bsd/tradcpp/dist/tests/t26.good
N external/bsd/tradcpp/dist/tests/t27.c
N external/bsd/tradcpp/dist/tests/t27.good
N external/bsd/tradcpp/dist/tests/t28.c
N external/bsd/tradcpp/dist/tests/t28.good
N external/bsd/tradcpp/dist/tests/t29.c
N external/bsd/tradcpp/dist/tests/t29.good
N external/bsd/tradcpp/dist/tests/t30.c
N external/bsd/tradcpp/dist/tests/t30.good
N external/bsd/tradcpp/dist/tests/t31.c
N external/bsd/tradcpp/dist/tests/t31.good
N external/bsd/tradcpp/dist/tests/t32.c
N external/bsd/tradcpp/dist/tests/t32.good
N external/bsd/tradcpp/dist/tests/t33.c
N external/bsd/tradcpp/dist/tests/t33.good
N external/bsd/tradcpp/dist/tests/t34.c
N external/bsd/tradcpp/dist/tests/t34.good
N external/bsd/tradcpp/dist/tests/t35.c
N external/bsd/tradcpp/dist/tests/t35.good
N external/bsd/tradcpp/dist/tests/t36.c
N external/bsd/tradcpp/dist/tests/t36.good
N external/bsd/tradcpp/dist/tests/t37.c
N external/bsd/tradcpp/dist/tests/t37.good
N external/bsd/tradcpp/dist/tests/t38.c
N external/bsd/tradcpp/dist/tests/t38.good
N external/bsd/tradcpp/dist/tests/t39.c
N external/bsd/tradcpp/dist/tests/t39.good
N external/bsd/tradcpp/dist/tests/t40.c
N external/bsd/tradcpp/dist/tests/t40.good
N external/bsd/tradcpp/dist/tests/tradcpp.sh
N external/bsd/tradcpp/dist/tests/subdir/test.h

No conflicts created by this import



CVS commit: src/sys/external/bsd/drm2/dist/drm

2022-08-27 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat Aug 27 21:24:15 UTC 2022

Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_ioctl.c

Log Message:
drm: Make sure ioctl buffer is aligned on stack.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.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/external/bsd/drm2/dist/drm/drm_ioctl.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.22 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.23
--- src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.22	Sun Dec 19 12:40:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c	Sat Aug 27 21:24:15 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_ioctl.c,v 1.22 2021/12/19 12:40:43 riastradh Exp $	*/
+/*	$NetBSD: drm_ioctl.c,v 1.23 2022/08/27 21:24:15 riastradh Exp $	*/
 
 /*
  * Created: Fri Jan  8 09:01:26 1999 by fa...@valinux.com
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.22 2021/12/19 12:40:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.23 2022/08/27 21:24:15 riastradh Exp $");
 
 #include 
 #include 
@@ -836,7 +836,7 @@ EXPORT_SYMBOL(drm_ioctl_kernel);
 int
 drm_ioctl(struct file *fp, unsigned long cmd, void *data)
 {
-	char stackbuf[128];
+	char stackbuf[128] __aligned(ALIGNBYTES + 1);
 	char *buf = stackbuf;
 	void *data0 = data;
 	struct drm_file *const file = fp->f_data;



CVS commit: src/sys/external/bsd/drm2/dist/drm

2022-08-27 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat Aug 27 21:24:15 UTC 2022

Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_ioctl.c

Log Message:
drm: Make sure ioctl buffer is aligned on stack.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c

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



CVS commit: src/bin/test

2022-08-27 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sat Aug 27 21:18:39 UTC 2022

Modified Files:
src/bin/test: test.c

Log Message:
PR 56983 Izumi Tsutsui: fix confusing message in test(1) with -DSMALL


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/bin/test/test.c

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

Modified files:

Index: src/bin/test/test.c
diff -u src/bin/test/test.c:1.44 src/bin/test/test.c:1.45
--- src/bin/test/test.c:1.44	Sun Dec  5 04:42:55 2021
+++ src/bin/test/test.c	Sat Aug 27 21:18:39 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: test.c,v 1.44 2021/12/05 04:42:55 msaitoh Exp $ */
+/* $NetBSD: test.c,v 1.45 2022/08/27 21:18:39 dholland Exp $ */
 
 /*
  * test(1); version 7-like  --  author Erik Baalbergen
@@ -12,7 +12,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: test.c,v 1.44 2021/12/05 04:42:55 msaitoh Exp $");
+__RCSID("$NetBSD: test.c,v 1.45 2022/08/27 21:18:39 dholland Exp $");
 #endif
 
 #include 
@@ -306,7 +306,7 @@ main(int argc, char *argv[])
 	 */
 
 #ifdef SMALL
-	error("SMALL test, no fallback usage");
+	error("unsupported expression when built with -DSMALL");
 #else
 
 	t_wp = [1];



CVS commit: src/bin/test

2022-08-27 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sat Aug 27 21:18:39 UTC 2022

Modified Files:
src/bin/test: test.c

Log Message:
PR 56983 Izumi Tsutsui: fix confusing message in test(1) with -DSMALL


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/bin/test/test.c

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



CVS commit: src/sys/conf

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 20:42:16 UTC 2022

Modified Files:
src/sys/conf: copts.mk

Log Message:
sys/conf: fix typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/conf/copts.mk

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

Modified files:

Index: src/sys/conf/copts.mk
diff -u src/sys/conf/copts.mk:1.6 src/sys/conf/copts.mk:1.7
--- src/sys/conf/copts.mk:1.6	Mon Apr 12 06:08:31 2021
+++ src/sys/conf/copts.mk	Sat Aug 27 20:42:16 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: copts.mk,v 1.6 2021/04/12 06:08:31 mrg Exp $
+#	$NetBSD: copts.mk,v 1.7 2022/08/27 20:42:16 rillig Exp $
 
 # MI per-file compiler options required.
 
@@ -24,7 +24,7 @@ COPTS.linux_machdep.c+=	-Wno-error=unuse
 COPTS.ath.c+=		-Wno-error=enum-conversion
 COPTS.dpt.c+=		${GCC_NO_ADDR_OF_PACKED_MEMBER}
 COPTS.ffs_appleufs.c+=	${GCC_NO_ADDR_OF_PACKED_MEMBER}
-# These are wrong. The code explicitly avoids this ase.
+# These are wrong. The code explicitly avoids this case.
 COPTS.in_pcb.c+=	${GCC_NO_RETURN_LOCAL_ADDR}
 COPTS.in6_pcb.c+=	${GCC_NO_RETURN_LOCAL_ADDR}
 # Also seems wrong.



CVS commit: src/sys/conf

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 20:42:16 UTC 2022

Modified Files:
src/sys/conf: copts.mk

Log Message:
sys/conf: fix typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/conf/copts.mk

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



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

2022-08-27 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat Aug 27 20:40:03 UTC 2022

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

Log Message:
x86/db_memrw.c: Mark db_read_bytes, db_write_bytes __noubsan.

These intentionally do loads and stores that may be misaligned, which
are fine on this x86-specific code.  Should avoid double-panic in
disassembler on panic with UBSan enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/x86/db_memrw.c

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

Modified files:

Index: src/sys/arch/x86/x86/db_memrw.c
diff -u src/sys/arch/x86/x86/db_memrw.c:1.15 src/sys/arch/x86/x86/db_memrw.c:1.16
--- src/sys/arch/x86/x86/db_memrw.c:1.15	Sat Aug 27 20:39:54 2022
+++ src/sys/arch/x86/x86/db_memrw.c	Sat Aug 27 20:40:03 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_memrw.c,v 1.15 2022/08/27 20:39:54 riastradh Exp $	*/
+/*	$NetBSD: db_memrw.c,v 1.16 2022/08/27 20:40:03 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.15 2022/08/27 20:39:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.16 2022/08/27 20:40:03 riastradh Exp $");
 
 #include 
 #include 
@@ -85,7 +85,7 @@ db_validate_address(vaddr_t addr)
 /*
  * Read bytes from kernel address space for debugger.
  */
-void
+void __noubsan
 db_read_bytes(vaddr_t addr, size_t size, char *data)
 {
 	char *src;
@@ -205,7 +205,7 @@ db_write_text(vaddr_t addr, size_t size,
 /*
  * Write bytes to kernel address space for debugger.
  */
-void
+void __noubsan
 db_write_bytes(vaddr_t addr, size_t size, const char *data)
 {
 	extern struct bootspace bootspace;



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

2022-08-27 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat Aug 27 20:40:03 UTC 2022

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

Log Message:
x86/db_memrw.c: Mark db_read_bytes, db_write_bytes __noubsan.

These intentionally do loads and stores that may be misaligned, which
are fine on this x86-specific code.  Should avoid double-panic in
disassembler on panic with UBSan enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/x86/db_memrw.c

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



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

2022-08-27 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat Aug 27 20:39:54 UTC 2022

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

Log Message:
x86/db_memrw.c: Use uint64_t, not long, for 8-byte r/w.

This is shared with amd64 and i386, and while long works on amd64,
not so much on i386.

While here, use uint32_t intead of int and uint16_t instead of short
for clarity.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/x86/db_memrw.c

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

Modified files:

Index: src/sys/arch/x86/x86/db_memrw.c
diff -u src/sys/arch/x86/x86/db_memrw.c:1.14 src/sys/arch/x86/x86/db_memrw.c:1.15
--- src/sys/arch/x86/x86/db_memrw.c:1.14	Sat Aug 20 23:48:51 2022
+++ src/sys/arch/x86/x86/db_memrw.c	Sat Aug 27 20:39:54 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_memrw.c,v 1.14 2022/08/20 23:48:51 riastradh Exp $	*/
+/*	$NetBSD: db_memrw.c,v 1.15 2022/08/27 20:39:54 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.14 2022/08/20 23:48:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.15 2022/08/27 20:39:54 riastradh Exp $");
 
 #include 
 #include 
@@ -100,17 +100,17 @@ db_read_bytes(vaddr_t addr, size_t size,
 	}
 
 	if (size == 8) {
-		*((long *)data) = *((long *)src);
+		*((uint64_t *)data) = *((uint64_t *)src);
 		return;
 	}
 
 	if (size == 4) {
-		*((int *)data) = *((int *)src);
+		*((uint32_t *)data) = *((uint32_t *)src);
 		return;
 	}
 
 	if (size == 2) {
-		*((short *)data) = *((short *)src);
+		*((uint16_t *)data) = *((uint16_t *)src);
 		return;
 	}
 
@@ -230,17 +230,17 @@ db_write_bytes(vaddr_t addr, size_t size
 	dst = (char *)addr;
 
 	if (size == 8) {
-		*((long *)dst) = *((const long *)data);
+		*((uint64_t *)dst) = *((const uint64_t *)data);
 		return;
 	}
 
 	if (size == 4) {
-		*((int *)dst) = *((const int *)data);
+		*((uint32_t *)dst) = *((const uint32_t *)data);
 		return;
 	}
 
 	if (size == 2) {
-		*((short *)dst) = *((const short *)data);
+		*((uint16_t *)dst) = *((const uint16_t *)data);
 		return;
 	}
 



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

2022-08-27 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat Aug 27 20:39:54 UTC 2022

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

Log Message:
x86/db_memrw.c: Use uint64_t, not long, for 8-byte r/w.

This is shared with amd64 and i386, and while long works on amd64,
not so much on i386.

While here, use uint32_t intead of int and uint16_t instead of short
for clarity.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/x86/db_memrw.c

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



CVS commit: src/sys/conf

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 20:37:49 UTC 2022

Modified Files:
src/sys/conf: Makefile.kern.inc

Log Message:
sys: document how to run lint on the kernel code (experimental)


To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 src/sys/conf/Makefile.kern.inc

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

Modified files:

Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.294 src/sys/conf/Makefile.kern.inc:1.295
--- src/sys/conf/Makefile.kern.inc:1.294	Wed Aug  3 09:37:37 2022
+++ src/sys/conf/Makefile.kern.inc	Sat Aug 27 20:37:49 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.kern.inc,v 1.294 2022/08/03 09:37:37 riastradh Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.295 2022/08/27 20:37:49 rillig Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -480,7 +480,7 @@ ${_v}.${_c:T}+=${OPT.${_c:T}:@.o.@${${_v
 all: .gdbinit
 .for k in ${KERNELS}
 all: .WAIT ${k}
-${k}: ${SYSTEM_DEP:O} swap${k}.o vers.o build_kernel
+${k}: ${SYSTEM_DEP:O} swap${k}.o vers.o build_kernel #${MKLINT:Myes:%=lint}
 .endfor
 
 .if !defined(COPY_SYMTAB)



CVS commit: src/sys/conf

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 20:37:49 UTC 2022

Modified Files:
src/sys/conf: Makefile.kern.inc

Log Message:
sys: document how to run lint on the kernel code (experimental)


To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 src/sys/conf/Makefile.kern.inc

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



CVS commit: src/sys/net

2022-08-27 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Aug 27 19:25:35 UTC 2022

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

Log Message:
Ensure that all queues passed to ifq_enqueue2() have a valid ifq_lock.


To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 src/sys/net/if_spppsubr.c

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

Modified files:

Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.263 src/sys/net/if_spppsubr.c:1.264
--- src/sys/net/if_spppsubr.c:1.263	Sat Aug 27 19:21:23 2022
+++ src/sys/net/if_spppsubr.c	Sat Aug 27 19:25:35 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_spppsubr.c,v 1.263 2022/08/27 19:21:23 thorpej Exp $	 */
+/*	$NetBSD: if_spppsubr.c,v 1.264 2022/08/27 19:25:35 thorpej Exp $	 */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.263 2022/08/27 19:21:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.264 2022/08/27 19:25:35 thorpej Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -1079,6 +1079,7 @@ sppp_attach(struct ifnet *ifp)
 	sp->pp_if.if_type = IFT_PPP;
 	sp->pp_if.if_output = sppp_output;
 	IFQ_SET_MAXLEN(>pp_fastq, 32);
+	IFQ_LOCK_INIT(>pp_fastq);
 	IFQ_SET_MAXLEN(>pp_cpq, 20);
 	sp->pp_loopcnt = 0;
 	sp->pp_alivecnt = 0;
@@ -1161,6 +1162,8 @@ sppp_detach(struct ifnet *ifp)
 	if (sp->myauth.secret) free(sp->myauth.secret, M_DEVBUF);
 	if (sp->hisauth.name) free(sp->hisauth.name, M_DEVBUF);
 	if (sp->hisauth.secret) free(sp->hisauth.secret, M_DEVBUF);
+
+	IFQ_LOCK_DESTROY(>pp_fastq);
 	rw_destroy(>pp_lock);
 }
 



CVS commit: src/sys/net

2022-08-27 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Aug 27 19:25:35 UTC 2022

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

Log Message:
Ensure that all queues passed to ifq_enqueue2() have a valid ifq_lock.


To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 src/sys/net/if_spppsubr.c

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



CVS commit: src/sys/net

2022-08-27 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Aug 27 19:21:23 UTC 2022

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

Log Message:
Use IFQ_SET_MAXLEN() rather than open-coding it.


To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 src/sys/net/if_spppsubr.c

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

Modified files:

Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.262 src/sys/net/if_spppsubr.c:1.263
--- src/sys/net/if_spppsubr.c:1.262	Mon Mar  7 04:06:20 2022
+++ src/sys/net/if_spppsubr.c	Sat Aug 27 19:21:23 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_spppsubr.c,v 1.262 2022/03/07 04:06:20 knakahara Exp $	 */
+/*	$NetBSD: if_spppsubr.c,v 1.263 2022/08/27 19:21:23 thorpej Exp $	 */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.262 2022/03/07 04:06:20 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.263 2022/08/27 19:21:23 thorpej Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -1078,8 +1078,8 @@ sppp_attach(struct ifnet *ifp)
 
 	sp->pp_if.if_type = IFT_PPP;
 	sp->pp_if.if_output = sppp_output;
-	sp->pp_fastq.ifq_maxlen = 32;
-	sp->pp_cpq.ifq_maxlen = 20;
+	IFQ_SET_MAXLEN(>pp_fastq, 32);
+	IFQ_SET_MAXLEN(>pp_cpq, 20);
 	sp->pp_loopcnt = 0;
 	sp->pp_alivecnt = 0;
 	sp->pp_alive_interval = SPPP_ALIVE_INTERVAL;



CVS commit: src/sys/net

2022-08-27 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Aug 27 19:21:23 UTC 2022

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

Log Message:
Use IFQ_SET_MAXLEN() rather than open-coding it.


To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 src/sys/net/if_spppsubr.c

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



CVS commit: src/sys/net

2022-08-27 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Aug 27 19:19:10 UTC 2022

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

Log Message:
Ensure that all queues passed to ifq_enqueue2() have a valid ifq_lock.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/net/if_sl.c

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

Modified files:

Index: src/sys/net/if_sl.c
diff -u src/sys/net/if_sl.c:1.133 src/sys/net/if_sl.c:1.134
--- src/sys/net/if_sl.c:1.133	Sat Aug 27 19:17:08 2022
+++ src/sys/net/if_sl.c	Sat Aug 27 19:19:10 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sl.c,v 1.133 2022/08/27 19:17:08 thorpej Exp $	*/
+/*	$NetBSD: if_sl.c,v 1.134 2022/08/27 19:19:10 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1987, 1989, 1992, 1993
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.133 2022/08/27 19:17:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.134 2022/08/27 19:19:10 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -270,6 +270,7 @@ sl_clone_create(struct if_clone *ifc, in
 	sc->sc_if.if_output = sloutput;
 	sc->sc_if.if_dlt = DLT_SLIP;
 	IFQ_SET_MAXLEN(>sc_fastq, 32);
+	IFQ_LOCK_INIT(>sc_fastq);
 	IFQ_SET_READY(>sc_if.if_snd);
 	if_attach(>sc_if);
 	if_alloc_sadl(>sc_if);
@@ -291,6 +292,8 @@ sl_clone_destroy(struct ifnet *ifp)
 	bpf_detach(ifp);
 	if_detach(ifp);
 
+	IFQ_LOCK_DESTROY(>sc_fastq);
+
 	free(sc, M_DEVBUF);
 	return 0;
 }



CVS commit: src/sys/net

2022-08-27 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Aug 27 19:19:10 UTC 2022

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

Log Message:
Ensure that all queues passed to ifq_enqueue2() have a valid ifq_lock.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/net/if_sl.c

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



CVS commit: src/sys/net

2022-08-27 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Aug 27 19:17:09 UTC 2022

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

Log Message:
Use IFQ_SET_MAXLEN() rather than open-coding it.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/net/if_sl.c

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

Modified files:

Index: src/sys/net/if_sl.c
diff -u src/sys/net/if_sl.c:1.132 src/sys/net/if_sl.c:1.133
--- src/sys/net/if_sl.c:1.132	Wed Jan 29 04:28:27 2020
+++ src/sys/net/if_sl.c	Sat Aug 27 19:17:08 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sl.c,v 1.132 2020/01/29 04:28:27 thorpej Exp $	*/
+/*	$NetBSD: if_sl.c,v 1.133 2022/08/27 19:17:08 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1987, 1989, 1992, 1993
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.132 2020/01/29 04:28:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.133 2022/08/27 19:17:08 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -269,7 +269,7 @@ sl_clone_create(struct if_clone *ifc, in
 	sc->sc_if.if_ioctl = slioctl;
 	sc->sc_if.if_output = sloutput;
 	sc->sc_if.if_dlt = DLT_SLIP;
-	sc->sc_fastq.ifq_maxlen = 32;
+	IFQ_SET_MAXLEN(>sc_fastq, 32);
 	IFQ_SET_READY(>sc_if.if_snd);
 	if_attach(>sc_if);
 	if_alloc_sadl(>sc_if);



CVS commit: src/sys/net

2022-08-27 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Aug 27 19:17:09 UTC 2022

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

Log Message:
Use IFQ_SET_MAXLEN() rather than open-coding it.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/net/if_sl.c

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



CVS commit: src/sys/net

2022-08-27 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Aug 27 19:15:00 UTC 2022

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

Log Message:
Ensure that all queues passed to ifq_enqueue2() have a valid ifq_lock.


To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/sys/net/if_ppp.c

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

Modified files:

Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.170 src/sys/net/if_ppp.c:1.171
--- src/sys/net/if_ppp.c:1.170	Sat Aug 27 19:04:43 2022
+++ src/sys/net/if_ppp.c	Sat Aug 27 19:15:00 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ppp.c,v 1.170 2022/08/27 19:04:43 thorpej Exp $	*/
+/*	$NetBSD: if_ppp.c,v 1.171 2022/08/27 19:15:00 thorpej Exp $	*/
 /*	Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp 	*/
 
 /*
@@ -102,7 +102,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.170 2022/08/27 19:04:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.171 2022/08/27 19:15:00 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "ppp.h"
@@ -323,6 +323,8 @@ ppp_create(const char *name, int unit)
 	IFQ_SET_MAXLEN(>sc_fastq, IFQ_MAXLEN);
 	IFQ_SET_MAXLEN(>sc_rawq, IFQ_MAXLEN);
 
+	IFQ_LOCK_INIT(>sc_fastq);
+
 	/* Ratio of 1:2 packets between the regular and the fast queue */
 	sc->sc_maxfastq = 2;
 	IFQ_SET_READY(>sc_if.if_snd);
@@ -353,6 +355,8 @@ ppp_clone_destroy(struct ifnet *ifp)
 	bpf_detach(ifp);
 	if_detach(ifp);
 
+	IFQ_LOCK_DESTROY(>sc_fastq);
+
 	free(sc, M_DEVBUF);
 	return 0;
 }



CVS commit: src/sys/net

2022-08-27 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Aug 27 19:15:00 UTC 2022

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

Log Message:
Ensure that all queues passed to ifq_enqueue2() have a valid ifq_lock.


To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/sys/net/if_ppp.c

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



CVS commit: src/sys/net

2022-08-27 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Aug 27 19:04:43 UTC 2022

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

Log Message:
Consistently use IFQ_SET_MAXLEN(), rather than open-coding it.  NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/sys/net/if_ppp.c

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



CVS commit: src/sys/net

2022-08-27 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Aug 27 19:04:43 UTC 2022

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

Log Message:
Consistently use IFQ_SET_MAXLEN(), rather than open-coding it.  NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/sys/net/if_ppp.c

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

Modified files:

Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.169 src/sys/net/if_ppp.c:1.170
--- src/sys/net/if_ppp.c:1.169	Wed Jul  6 08:07:23 2022
+++ src/sys/net/if_ppp.c	Sat Aug 27 19:04:43 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ppp.c,v 1.169 2022/07/06 08:07:23 riastradh Exp $	*/
+/*	$NetBSD: if_ppp.c,v 1.170 2022/08/27 19:04:43 thorpej Exp $	*/
 /*	Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp 	*/
 
 /*
@@ -102,7 +102,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.169 2022/07/06 08:07:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.170 2022/08/27 19:04:43 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "ppp.h"
@@ -319,9 +319,10 @@ ppp_create(const char *name, int unit)
 	sc->sc_if.if_start = ppp_ifstart;
 #endif
 	IFQ_SET_MAXLEN(>sc_if.if_snd, IFQ_MAXLEN);
-	sc->sc_inq.ifq_maxlen = IFQ_MAXLEN;
-	sc->sc_fastq.ifq_maxlen = IFQ_MAXLEN;
-	sc->sc_rawq.ifq_maxlen = IFQ_MAXLEN;
+	IFQ_SET_MAXLEN(>sc_inq, IFQ_MAXLEN);
+	IFQ_SET_MAXLEN(>sc_fastq, IFQ_MAXLEN);
+	IFQ_SET_MAXLEN(>sc_rawq, IFQ_MAXLEN);
+
 	/* Ratio of 1:2 packets between the regular and the fast queue */
 	sc->sc_maxfastq = 2;
 	IFQ_SET_READY(>sc_if.if_snd);



CVS commit: src/lib/libm/src

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 17:15:52 UTC 2022

Modified Files:
src/lib/libm/src: s_sincosl.c

Log Message:
tuck in k_sincosl.h include inside __HAVE_LONG_DOUBLE


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_sincosl.c

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/src/s_sincosl.c
diff -u src/lib/libm/src/s_sincosl.c:1.1 src/lib/libm/src/s_sincosl.c:1.2
--- src/lib/libm/src/s_sincosl.c:1.1	Sat Aug 27 04:31:59 2022
+++ src/lib/libm/src/s_sincosl.c	Sat Aug 27 13:15:52 2022
@@ -31,7 +31,7 @@
 __FBSDID("$FreeBSD: head/lib/msun/src/s_sincosl.c 319047 2017-05-28 06:13:38Z mmel $");
 #endif
 #if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_sincosl.c,v 1.1 2022/08/27 08:31:59 christos Exp $");
+__RCSID("$NetBSD: s_sincosl.c,v 1.2 2022/08/27 17:15:52 christos Exp $");
 #endif
 
 #include "namespace.h"
@@ -42,9 +42,11 @@ __RCSID("$NetBSD: s_sincosl.c,v 1.1 2022
 
 #include "math.h"
 #include "math_private.h"
-#include "k_sincosl.h"
 
 #ifdef __HAVE_LONG_DOUBLE
+
+#include "k_sincosl.h"
+
 #if LDBL_MANT_DIG == 64
 #include "../ld80/e_rem_pio2l.h"
 #elif LDBL_MANT_DIG == 113



CVS commit: src/lib/libm/src

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 17:15:52 UTC 2022

Modified Files:
src/lib/libm/src: s_sincosl.c

Log Message:
tuck in k_sincosl.h include inside __HAVE_LONG_DOUBLE


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_sincosl.c

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



CVS commit: src/doc

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 14:07:26 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new acpica


To generate a diff of this commit:
cvs rdiff -u -r1.1870 -r1.1871 src/doc/3RDPARTY
cvs rdiff -u -r1.2901 -r1.2902 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.1870 src/doc/3RDPARTY:1.1871
--- src/doc/3RDPARTY:1.1870	Fri Aug 19 17:37:12 2022
+++ src/doc/3RDPARTY	Sat Aug 27 10:07:26 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1870 2022/08/19 21:37:12 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1871 2022/08/27 14:07:26 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -41,12 +41,12 @@
 #
 
 Package:	acpica
-Version:	20211217
-Current Vers:	20211217
+Version:	20220331
+Current Vers:	20220331
 Maintainer:	Intel
 Archive Site:	http://www.acpica.org/downloads/
 Home Page:	http://www.acpica.org/
-Date:		2021-10-28
+Date:		2021-08-27
 Mailing List:	de...@acpica.org
 License:	BSD-like
 Responsible:	jruoho

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2901 src/doc/CHANGES:1.2902
--- src/doc/CHANGES:1.2901	Thu Aug 25 04:20:19 2022
+++ src/doc/CHANGES	Sat Aug 27 10:07:26 2022
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2901 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2902 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -661,3 +661,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 		tree.  [mlelstv 20220821]
 	evbarm: Add initial support for the Rockchip RK3588 SoC.
 		[ryo 20220823]
+	acpi(4): Updated ACPICA to 20220331. [christos 20220827]



CVS commit: src/doc

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 14:07:26 UTC 2022

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new acpica


To generate a diff of this commit:
cvs rdiff -u -r1.1870 -r1.1871 src/doc/3RDPARTY
cvs rdiff -u -r1.2901 -r1.2902 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/sys/external/bsd/acpica/dist

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 14:04:59 UTC 2022

Modified Files:
src/sys/external/bsd/acpica/dist/common: dmtables.c dmtbdump.c
dmtbinfo.c
src/sys/external/bsd/acpica/dist/compiler: aslanalyze.c aslcompile.c
aslcompiler.h aslcompiler.l aslerror.c aslfileio.c aslfiles.c
aslload.c asllookup.c aslmain.c aslopcodes.c aslopt.c asloptions.c
aslpredef.c aslprepkg.c aslsupport.l asltree.c aslutils.c
aslwalks.c aslxref.c dtcompile.c dtcompilerparser.y dtfield.c
dtparser.y dtsubtable.c dttable.c dtutils.c prparser.y prutils.c
src/sys/external/bsd/acpica/dist/debugger: dbcmds.c dbdisply.c dbexec.c
dbinput.c dbmethod.c dbnames.c dbtest.c dbutils.c
src/sys/external/bsd/acpica/dist/disassembler: dmbuffer.c dmcstyle.c
dmresrc.c dmresrcl.c dmresrcl2.c dmwalk.c
src/sys/external/bsd/acpica/dist/dispatcher: dscontrol.c dsopcode.c
dspkginit.c dsutils.c
src/sys/external/bsd/acpica/dist/events: evregion.c evrgnini.c
evxface.c
src/sys/external/bsd/acpica/dist/executer: exconfig.c exdebug.c
exdump.c
src/sys/external/bsd/acpica/dist/hardware: hwesleep.c hwregs.c
hwsleep.c hwxfsleep.c
src/sys/external/bsd/acpica/dist/include: acapps.h acdebug.h acdisasm.h
acexcep.h acglobal.h acinterp.h aclocal.h acmacros.h acnamesp.h
acoutput.h acpiosxf.h acpixf.h acresrc.h actables.h actbl1.h
actypes.h acutils.h amlresrc.h
src/sys/external/bsd/acpica/dist/include/platform: acgcc.h acnetbsd.h
src/sys/external/bsd/acpica/dist/namespace: nsaccess.c nsdump.c
nseval.c nsinit.c nsrepair2.c nsxfeval.c nsxfname.c
src/sys/external/bsd/acpica/dist/os_specific/service_layers:
oslinuxtbl.c
src/sys/external/bsd/acpica/dist/parser: psopcode.c psopinfo.c
src/sys/external/bsd/acpica/dist/resources: rsdump.c rsdumpinfo.c
rsutils.c rsxface.c
src/sys/external/bsd/acpica/dist/tables: tbdata.c tbfadt.c tbinstal.c
tbutils.c tbxface.c tbxfload.c tbxfroot.c
src/sys/external/bsd/acpica/dist/tools/acpidump: apfiles.c
src/sys/external/bsd/acpica/dist/tools/acpixtract: acpixtract.c
src/sys/external/bsd/acpica/dist/utilities: utcache.c utdebug.c
utdecode.c utdelete.c uteval.c utglobal.c utmisc.c utmutex.c
utnonansi.c utobject.c utosi.c utprint.c uttrack.c utuuid.c
utxferror.c

Log Message:
merge conflicts between acpica-20211217 and acpica-20220331


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/common/dmtables.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/acpica/dist/common/dmtbdump.c
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/acpica/dist/common/dmtbinfo.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c \
src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c \
src/sys/external/bsd/acpica/dist/compiler/aslwalks.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l \
src/sys/external/bsd/acpica/dist/compiler/dtfield.c \
src/sys/external/bsd/acpica/dist/compiler/dtutils.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/compiler/aslerror.c \
src/sys/external/bsd/acpica/dist/compiler/dtcompile.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/compiler/aslfileio.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/compiler/aslfiles.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/acpica/dist/compiler/aslload.c \
src/sys/external/bsd/acpica/dist/compiler/aslxref.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/compiler/asllookup.c \
src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c \
src/sys/external/bsd/acpica/dist/compiler/asloptions.c \
src/sys/external/bsd/acpica/dist/compiler/aslpredef.c \
src/sys/external/bsd/acpica/dist/compiler/prutils.c
cvs rdiff -u -r1.1.1.20 -r1.2 \
src/sys/external/bsd/acpica/dist/compiler/aslmain.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/acpica/dist/compiler/aslopt.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/compiler/aslsupport.l \
src/sys/external/bsd/acpica/dist/compiler/asltree.c \
src/sys/external/bsd/acpica/dist/compiler/dtparser.y \
src/sys/external/bsd/acpica/dist/compiler/dttable.c \
src/sys/external/bsd/acpica/dist/compiler/prparser.y
cvs rdiff -u -r1.31 -r1.32 \
src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y
cvs rdiff -u -r1.13 -r1.14 \

CVS commit: src/sys/external/bsd/acpica/dist

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 14:04:59 UTC 2022

Modified Files:
src/sys/external/bsd/acpica/dist/common: dmtables.c dmtbdump.c
dmtbinfo.c
src/sys/external/bsd/acpica/dist/compiler: aslanalyze.c aslcompile.c
aslcompiler.h aslcompiler.l aslerror.c aslfileio.c aslfiles.c
aslload.c asllookup.c aslmain.c aslopcodes.c aslopt.c asloptions.c
aslpredef.c aslprepkg.c aslsupport.l asltree.c aslutils.c
aslwalks.c aslxref.c dtcompile.c dtcompilerparser.y dtfield.c
dtparser.y dtsubtable.c dttable.c dtutils.c prparser.y prutils.c
src/sys/external/bsd/acpica/dist/debugger: dbcmds.c dbdisply.c dbexec.c
dbinput.c dbmethod.c dbnames.c dbtest.c dbutils.c
src/sys/external/bsd/acpica/dist/disassembler: dmbuffer.c dmcstyle.c
dmresrc.c dmresrcl.c dmresrcl2.c dmwalk.c
src/sys/external/bsd/acpica/dist/dispatcher: dscontrol.c dsopcode.c
dspkginit.c dsutils.c
src/sys/external/bsd/acpica/dist/events: evregion.c evrgnini.c
evxface.c
src/sys/external/bsd/acpica/dist/executer: exconfig.c exdebug.c
exdump.c
src/sys/external/bsd/acpica/dist/hardware: hwesleep.c hwregs.c
hwsleep.c hwxfsleep.c
src/sys/external/bsd/acpica/dist/include: acapps.h acdebug.h acdisasm.h
acexcep.h acglobal.h acinterp.h aclocal.h acmacros.h acnamesp.h
acoutput.h acpiosxf.h acpixf.h acresrc.h actables.h actbl1.h
actypes.h acutils.h amlresrc.h
src/sys/external/bsd/acpica/dist/include/platform: acgcc.h acnetbsd.h
src/sys/external/bsd/acpica/dist/namespace: nsaccess.c nsdump.c
nseval.c nsinit.c nsrepair2.c nsxfeval.c nsxfname.c
src/sys/external/bsd/acpica/dist/os_specific/service_layers:
oslinuxtbl.c
src/sys/external/bsd/acpica/dist/parser: psopcode.c psopinfo.c
src/sys/external/bsd/acpica/dist/resources: rsdump.c rsdumpinfo.c
rsutils.c rsxface.c
src/sys/external/bsd/acpica/dist/tables: tbdata.c tbfadt.c tbinstal.c
tbutils.c tbxface.c tbxfload.c tbxfroot.c
src/sys/external/bsd/acpica/dist/tools/acpidump: apfiles.c
src/sys/external/bsd/acpica/dist/tools/acpixtract: acpixtract.c
src/sys/external/bsd/acpica/dist/utilities: utcache.c utdebug.c
utdecode.c utdelete.c uteval.c utglobal.c utmisc.c utmutex.c
utnonansi.c utobject.c utosi.c utprint.c uttrack.c utuuid.c
utxferror.c

Log Message:
merge conflicts between acpica-20211217 and acpica-20220331


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/common/dmtables.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/acpica/dist/common/dmtbdump.c
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/acpica/dist/common/dmtbinfo.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c \
src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c \
src/sys/external/bsd/acpica/dist/compiler/aslwalks.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l \
src/sys/external/bsd/acpica/dist/compiler/dtfield.c \
src/sys/external/bsd/acpica/dist/compiler/dtutils.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/compiler/aslerror.c \
src/sys/external/bsd/acpica/dist/compiler/dtcompile.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/compiler/aslfileio.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/compiler/aslfiles.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/acpica/dist/compiler/aslload.c \
src/sys/external/bsd/acpica/dist/compiler/aslxref.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/compiler/asllookup.c \
src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c \
src/sys/external/bsd/acpica/dist/compiler/asloptions.c \
src/sys/external/bsd/acpica/dist/compiler/aslpredef.c \
src/sys/external/bsd/acpica/dist/compiler/prutils.c
cvs rdiff -u -r1.1.1.20 -r1.2 \
src/sys/external/bsd/acpica/dist/compiler/aslmain.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/acpica/dist/compiler/aslopt.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/compiler/aslsupport.l \
src/sys/external/bsd/acpica/dist/compiler/asltree.c \
src/sys/external/bsd/acpica/dist/compiler/dtparser.y \
src/sys/external/bsd/acpica/dist/compiler/dttable.c \
src/sys/external/bsd/acpica/dist/compiler/prparser.y
cvs rdiff -u -r1.31 -r1.32 \
src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y
cvs rdiff -u -r1.13 -r1.14 \

CVS import: src/sys/external/bsd/acpica/dist

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 14:02:11 UTC 2022

Update of /cvsroot/src/sys/external/bsd/acpica/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv13250

Log Message:
Import acpica-2022-03-31

31 March 2022. Summary of changes for version 20220331:

0) Global changes:

Update all copyright notices to the year 2022. This effects all source 
modules, as well as utility signons.


1) ACPICA kernel-resident subsystem:

For the ASL Sleep() operator, issue a warning if the sleep value is 
greater than 10 Milliseconds. Quick boottime is important, so warn about 
sleeps greater than 10 ms. Distribution Linux kernels reach initrd in 350 
ms, so excessive delays should be called out. 10 ms is chosen randomly, 
but three of such delays would already make up ten percent of the 
boottime.

Namespace: Avoid attempting to walk the Namespace if the Namespace does 
not exist.

AML interpreter/iASL compiler: Add new Acpi 6.4 semantics for the 
LoadTable and Load operators. DDB_HANDLE is gone, now loadtable returns a 
pass/fail integer. Now load returns a pass/fail integer, as well as 
storing the return value in an optional 2nd argument.

Headers: Use uintptr_t and offsetof() in Linux kernel builds. To avoid 
"performing pointer subtraction with a null pointer has undefined 
behavior" compiler warnings, use uintptr_t and offsetof() that are always 
available during Linux kernel builds to define ACPI_UINTPTR_T and the 
ACPI_TO_INTEGER() and ACPI_OFFSET() macros when building the ACPICA code 
in the Linux kernel.

Added support for the Windows 11 _OSI string ("Windows 2021"). Submitted 
by superm1.

executer/exsystem: Inform users about ACPI spec violation for the Stall() 
operator. Values greater than 100 microseconds violate the ACPI 
specification, so warn users about it. From the ACPI Specification 
version 6.2 Errata A, 19.6.128 *Stall (Stall for a Short Time)*:
> The implementation of Stall is OS-specific, but must not relinquish
> control of the processor. Because of this, delays longer than 100
> microseconds must use Sleep instead of Stall.


2) iASL Compiler/Disassembler and ACPICA tools:

Data Table Compiler/Disassembler: Add support for the APMT table - ARM 
Performance Monitoring Unit table. Submitted by @bwicaksononv.

Data Table Compiler/Disassembler: For MADT, add support for the OEM-
defined subtables (Types 0x80-0x7F).

Data Table Compiler: Fixed a problem with support for the SDEV table, 
where a subtable Length was not computed correctly.

Data Table Compiler/Disassembler: Add/fix the CFMWS subtable to the CEDT 
Acpi table support.

Data Table Compiler/Disassembler: Fix a compile issue with the CEDT and 
add template. Submitted by MasterDrogo.

Data Table Compiler/Disassembler: NHLT Changes provided by Piotr Maziarz:
iASL/NHLT: Rename linux specific structures to DeviceInfo to improve 
readability of the code.
iASL/NHLT: Fix parsing undocumented bytes at the end of Endpoint. 
Undocumented bytes at the end of Endpoint Descriptor can be present 
independently of Linux-specific structures. Their size can also vary.
iASL/NHLT: Treat TableTerminator as SpecificConfig. SpecificConfig has 4 
bytes of size and then an amount of bytes specified by size. All of the 
terminators that I've seen had a size equal to 4, but theoretically it 
can vary.

iASL/AcpiExec: Use _exit instead of exit in signal handers (ctrl-C).

iASL: Remove a remark due to excessive output. Removed a remark for 
duplicate Offset() operators, due to a user complaint.


Status:

Vendor Tag: intel
Release Tags:   acpica-20220331

U src/sys/external/bsd/acpica/dist/changes.txt
U src/sys/external/bsd/acpica/dist/Makefile
U src/sys/external/bsd/acpica/dist/generate/lint/files.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/lint.bat
U src/sys/external/bsd/acpica/dist/generate/lint/lset.bat
U src/sys/external/bsd/acpica/dist/generate/lint/options.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/readme.txt
U src/sys/external/bsd/acpica/dist/generate/lint/std16.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/std32.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/std64.lnt
U src/sys/external/bsd/acpica/dist/generate/release/build.sh
U src/sys/external/bsd/acpica/dist/generate/release/release.sh
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.common
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.config
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.rules
U src/sys/external/bsd/acpica/dist/generate/unix/readme.txt
U src/sys/external/bsd/acpica/dist/generate/unix/acpibin/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpidump/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpiexamples/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpiexec/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpihelp/Makefile
U 

CVS import: src/sys/external/bsd/acpica/dist

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 14:02:11 UTC 2022

Update of /cvsroot/src/sys/external/bsd/acpica/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv13250

Log Message:
Import acpica-2022-03-31

31 March 2022. Summary of changes for version 20220331:

0) Global changes:

Update all copyright notices to the year 2022. This effects all source 
modules, as well as utility signons.


1) ACPICA kernel-resident subsystem:

For the ASL Sleep() operator, issue a warning if the sleep value is 
greater than 10 Milliseconds. Quick boottime is important, so warn about 
sleeps greater than 10 ms. Distribution Linux kernels reach initrd in 350 
ms, so excessive delays should be called out. 10 ms is chosen randomly, 
but three of such delays would already make up ten percent of the 
boottime.

Namespace: Avoid attempting to walk the Namespace if the Namespace does 
not exist.

AML interpreter/iASL compiler: Add new Acpi 6.4 semantics for the 
LoadTable and Load operators. DDB_HANDLE is gone, now loadtable returns a 
pass/fail integer. Now load returns a pass/fail integer, as well as 
storing the return value in an optional 2nd argument.

Headers: Use uintptr_t and offsetof() in Linux kernel builds. To avoid 
"performing pointer subtraction with a null pointer has undefined 
behavior" compiler warnings, use uintptr_t and offsetof() that are always 
available during Linux kernel builds to define ACPI_UINTPTR_T and the 
ACPI_TO_INTEGER() and ACPI_OFFSET() macros when building the ACPICA code 
in the Linux kernel.

Added support for the Windows 11 _OSI string ("Windows 2021"). Submitted 
by superm1.

executer/exsystem: Inform users about ACPI spec violation for the Stall() 
operator. Values greater than 100 microseconds violate the ACPI 
specification, so warn users about it. From the ACPI Specification 
version 6.2 Errata A, 19.6.128 *Stall (Stall for a Short Time)*:
> The implementation of Stall is OS-specific, but must not relinquish
> control of the processor. Because of this, delays longer than 100
> microseconds must use Sleep instead of Stall.


2) iASL Compiler/Disassembler and ACPICA tools:

Data Table Compiler/Disassembler: Add support for the APMT table - ARM 
Performance Monitoring Unit table. Submitted by @bwicaksononv.

Data Table Compiler/Disassembler: For MADT, add support for the OEM-
defined subtables (Types 0x80-0x7F).

Data Table Compiler: Fixed a problem with support for the SDEV table, 
where a subtable Length was not computed correctly.

Data Table Compiler/Disassembler: Add/fix the CFMWS subtable to the CEDT 
Acpi table support.

Data Table Compiler/Disassembler: Fix a compile issue with the CEDT and 
add template. Submitted by MasterDrogo.

Data Table Compiler/Disassembler: NHLT Changes provided by Piotr Maziarz:
iASL/NHLT: Rename linux specific structures to DeviceInfo to improve 
readability of the code.
iASL/NHLT: Fix parsing undocumented bytes at the end of Endpoint. 
Undocumented bytes at the end of Endpoint Descriptor can be present 
independently of Linux-specific structures. Their size can also vary.
iASL/NHLT: Treat TableTerminator as SpecificConfig. SpecificConfig has 4 
bytes of size and then an amount of bytes specified by size. All of the 
terminators that I've seen had a size equal to 4, but theoretically it 
can vary.

iASL/AcpiExec: Use _exit instead of exit in signal handers (ctrl-C).

iASL: Remove a remark due to excessive output. Removed a remark for 
duplicate Offset() operators, due to a user complaint.


Status:

Vendor Tag: intel
Release Tags:   acpica-20220331

U src/sys/external/bsd/acpica/dist/changes.txt
U src/sys/external/bsd/acpica/dist/Makefile
U src/sys/external/bsd/acpica/dist/generate/lint/files.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/lint.bat
U src/sys/external/bsd/acpica/dist/generate/lint/lset.bat
U src/sys/external/bsd/acpica/dist/generate/lint/options.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/readme.txt
U src/sys/external/bsd/acpica/dist/generate/lint/std16.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/std32.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/std64.lnt
U src/sys/external/bsd/acpica/dist/generate/release/build.sh
U src/sys/external/bsd/acpica/dist/generate/release/release.sh
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.common
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.config
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.rules
U src/sys/external/bsd/acpica/dist/generate/unix/readme.txt
U src/sys/external/bsd/acpica/dist/generate/unix/acpibin/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpidump/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpiexamples/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpiexec/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpihelp/Makefile
U 

CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 12:55:34 UTC 2022

Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: netpgp.lua

Log Message:
netpgp: fix indentation in Lua binding example program


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua

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

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.7 src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.8
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.7	Sat Aug 27 08:57:23 2022
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua	Sat Aug 27 12:55:34 2022
@@ -73,7 +73,7 @@ if options.homedir then
 	netpgp.homedir(pgp, options.homedir)
 end
 if options.decrypt or options.sign then
-netpgp.setvar(pgp, "need seckey", 1)
+	netpgp.setvar(pgp, "need seckey", 1)
 end
 
 -- initialise everything



CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 12:55:34 UTC 2022

Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: netpgp.lua

Log Message:
netpgp: fix indentation in Lua binding example program


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua

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

2022-08-27 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Aug 27 10:04:45 UTC 2022

Modified Files:
src/crypto/external/bsd/openssh/dist: channels.c readconf.c ssh.c
sshbuf.h

Log Message:
Adopt TCP window handling from current HPN patch at

https://github.com/rapier1/openssh-portable


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/channels.c
cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/readconf.c
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/sshbuf.h

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

Modified files:

Index: src/crypto/external/bsd/openssh/dist/channels.c
diff -u src/crypto/external/bsd/openssh/dist/channels.c:1.36 src/crypto/external/bsd/openssh/dist/channels.c:1.37
--- src/crypto/external/bsd/openssh/dist/channels.c:1.36	Fri Apr 15 14:00:06 2022
+++ src/crypto/external/bsd/openssh/dist/channels.c	Sat Aug 27 10:04:45 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: channels.c,v 1.36 2022/04/15 14:00:06 christos Exp $	*/
+/*	$NetBSD: channels.c,v 1.37 2022/08/27 10:04:45 mlelstv Exp $	*/
 /* $OpenBSD: channels.c,v 1.415 2022/03/30 21:10:25 djm Exp $ */
 /*
  * Author: Tatu Ylonen 
@@ -41,7 +41,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: channels.c,v 1.36 2022/04/15 14:00:06 christos Exp $");
+__RCSID("$NetBSD: channels.c,v 1.37 2022/08/27 10:04:45 mlelstv Exp $");
 #include 
 #include 
 #include 
@@ -1117,9 +1117,9 @@ channel_tcpwinsz(struct ssh *ssh)
 	return(128*1024);
 	ret = getsockopt(ssh_packet_get_connection_in(ssh),
 			 SOL_SOCKET, SO_RCVBUF, , );
-	/* return no more than 64MB */
-	if ((ret == 0) && tcpwinsz > BUFFER_MAX_LEN_HPN)
-	tcpwinsz = BUFFER_MAX_LEN_HPN;
+	/* return no more than SSHBUF_SIZE_MAX (currently 256MB) */
+	if ((ret == 0) && tcpwinsz > SSHBUF_SIZE_MAX)
+	tcpwinsz = SSHBUF_SIZE_MAX;
 	debug2("tcpwinsz: %d for connection: %d", tcpwinsz, 
 	   ssh_packet_get_connection_in(ssh));
 	return(tcpwinsz);
@@ -1128,10 +1128,6 @@ channel_tcpwinsz(struct ssh *ssh)
 static void
 channel_pre_open(struct ssh *ssh, Channel *c)
 {
-/* check buffer limits */
-	if ((!c->tcpwinsz) || (c->dynamic_window > 0))
-	c->tcpwinsz = channel_tcpwinsz(ssh);
-	
 	c->io_want = 0;
 	if (c->istate == CHAN_INPUT_OPEN &&
 	c->remote_window > 0 &&
@@ -2170,17 +2166,17 @@ channel_check_window(struct ssh *ssh, Ch
 	c->local_window < c->local_window_max/2) &&
 	c->local_consumed > 0) {
 		u_int addition = 0;
-
-		if (!c->have_remote_id)
-			fatal_f("channel %d: no remote id", c->self);
-
+		u_int32_t tcpwinsz = channel_tcpwinsz(ssh);
 		/* adjust max window size if we are in a dynamic environment */
-		if (c->dynamic_window && (c->tcpwinsz > c->local_window_max)) {
+		if (c->dynamic_window && (tcpwinsz > c->local_window_max)) {
 			/* grow the window somewhat aggressively to maintain 
 			 * pressure */
-			addition = 1.5*(c->tcpwinsz - c->local_window_max);
+			addition = 1.5*(tcpwinsz - c->local_window_max);
 			c->local_window_max += addition;
+			debug("Channel: Window growth to %d by %d bytes", c->local_window_max, addition);
 		}
+		if (!c->have_remote_id)
+			fatal_f("channel %d: no remote id", c->self);
 		if ((r = sshpkt_start(ssh,
 		SSH2_MSG_CHANNEL_WINDOW_ADJUST)) != 0 ||
 		(r = sshpkt_put_u32(ssh, c->remote_id)) != 0 ||
@@ -2189,7 +2185,8 @@ channel_check_window(struct ssh *ssh, Ch
 			fatal_fr(r, "channel %i", c->self);
 		}
 		debug2("channel %d: window %d sent adjust %d", c->self,
-		c->local_window, c->local_consumed);
+		c->local_window,
+		c->local_consumed + addition);
 		c->local_window += c->local_consumed + addition;
 		c->local_consumed = 0;
 	}

Index: src/crypto/external/bsd/openssh/dist/readconf.c
diff -u src/crypto/external/bsd/openssh/dist/readconf.c:1.38 src/crypto/external/bsd/openssh/dist/readconf.c:1.39
--- src/crypto/external/bsd/openssh/dist/readconf.c:1.38	Wed Feb 23 19:07:20 2022
+++ src/crypto/external/bsd/openssh/dist/readconf.c	Sat Aug 27 10:04:45 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: readconf.c,v 1.38 2022/02/23 19:07:20 christos Exp $	*/
+/*	$NetBSD: readconf.c,v 1.39 2022/08/27 10:04:45 mlelstv Exp $	*/
 /* $OpenBSD: readconf.c,v 1.366 2022/02/08 08:59:12 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen 
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: readconf.c,v 1.38 2022/02/23 19:07:20 christos Exp $");
+__RCSID("$NetBSD: readconf.c,v 1.39 2022/08/27 10:04:45 mlelstv Exp $");
 #include 
 #include 
 #include 
@@ -42,6 +42,7 @@ __RCSID("$NetBSD: readconf.c,v 1.38 2022
 
 #include "xmalloc.h"
 #include "ssh.h"
+#include "sshbuf.h"
 #include "ssherr.h"
 #include "compat.h"
 #include "cipher.h"
@@ -2711,13 +2712,14 @@ fill_default_options(Options * options)
 	{
 	  /* if a user tries to set the size to 0 set it to 1KB */
 		if 

CVS commit: src/crypto/external/bsd/openssh/dist

2022-08-27 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Aug 27 10:04:45 UTC 2022

Modified Files:
src/crypto/external/bsd/openssh/dist: channels.c readconf.c ssh.c
sshbuf.h

Log Message:
Adopt TCP window handling from current HPN patch at

https://github.com/rapier1/openssh-portable


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/channels.c
cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/readconf.c
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/sshbuf.h

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



CVS commit: src/lib/libm

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 09:56:22 UTC 2022

Modified Files:
src/lib/libm: Makefile
src/lib/libm/noieee_src: n_sincos.c
Added Files:
src/lib/libm/noieee_src: n_sincos1.c

Log Message:
Fix vax build.


To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 src/lib/libm/Makefile
cvs rdiff -u -r1.8 -r1.9 src/lib/libm/noieee_src/n_sincos.c
cvs rdiff -u -r0 -r1.1 src/lib/libm/noieee_src/n_sincos1.c

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.217 src/lib/libm/Makefile:1.218
--- src/lib/libm/Makefile:1.217	Sat Aug 27 04:31:58 2022
+++ src/lib/libm/Makefile	Sat Aug 27 05:56:21 2022
@@ -1,4 +1,4 @@
-#  $NetBSD: Makefile,v 1.217 2022/08/27 08:31:58 christos Exp $
+#  $NetBSD: Makefile,v 1.218 2022/08/27 09:56:21 christos Exp $
 #
 #  @(#)Makefile 5.1beta 93/09/24
 #
@@ -313,7 +313,7 @@ NOIEEE_SRCS = n_asincos.c n_acosh.c n_as
 	n_fmod.c n_gamma.c n_ilogb.c \
 	n_lgamma.c n_j0.c n_j1.c n_jn.c n_log.c n_log10.c n_log1p.c \
 	n_log2.c n_log__L.c n_pow.c n_sinh.c n_tanh.c \
-	n_sincos.c n_tan.c \
+	n_sincos.c n_sincos1.c n_tan.c \
 	n_round.c n_roundf.c n_lround.c n_lroundf.c \
 	n_fmax.c n_fmaxf.c n_fmin.c n_fminf.c
 #	n_sqrt.c n_argred.c n_infnan.c n_atan2.c n_cabs.c n_cbrt.c n_support.c

Index: src/lib/libm/noieee_src/n_sincos.c
diff -u src/lib/libm/noieee_src/n_sincos.c:1.8 src/lib/libm/noieee_src/n_sincos.c:1.9
--- src/lib/libm/noieee_src/n_sincos.c:1.8	Sat Aug 27 04:31:59 2022
+++ src/lib/libm/noieee_src/n_sincos.c	Sat Aug 27 05:56:21 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: n_sincos.c,v 1.8 2022/08/27 08:31:59 christos Exp $	*/
+/*	$NetBSD: n_sincos.c,v 1.9 2022/08/27 09:56:21 christos Exp $	*/
 /*
  * Copyright (c) 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -41,7 +41,6 @@ static char sccsid[] = "@(#)sincos.c	8.1
 #ifdef __weak_alias
 __weak_alias(_sinl, sin);
 __weak_alias(_cosl, cos);
-__weak_alias(_sincosl, sincos);
 #endif
 
 double

Added files:

Index: src/lib/libm/noieee_src/n_sincos1.c
diff -u /dev/null src/lib/libm/noieee_src/n_sincos1.c:1.1
--- /dev/null	Sat Aug 27 05:56:22 2022
+++ src/lib/libm/noieee_src/n_sincos1.c	Sat Aug 27 05:56:21 2022
@@ -0,0 +1,52 @@
+/*	$NetBSD: n_sincos1.c,v 1.1 2022/08/27 09:56:21 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2022 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include 
+__RCSID("$NetBSD: n_sincos1.c,v 1.1 2022/08/27 09:56:21 christos Exp $");
+
+#include 
+
+#ifdef __weak_alias
+__weak_alias(_sincosl, sincos)
+#endif
+
+void
+sincos(double x, double *s, double *c)
+{
+	*s = sin(x);
+	*c = cos(x);
+}
+
+void
+sincosf(float x, float *s, float *c)
+{
+	*s = sinf(x);
+	*c = cosf(x);
+}



CVS commit: src/lib/libm

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 09:56:22 UTC 2022

Modified Files:
src/lib/libm: Makefile
src/lib/libm/noieee_src: n_sincos.c
Added Files:
src/lib/libm/noieee_src: n_sincos1.c

Log Message:
Fix vax build.


To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 src/lib/libm/Makefile
cvs rdiff -u -r1.8 -r1.9 src/lib/libm/noieee_src/n_sincos.c
cvs rdiff -u -r0 -r1.1 src/lib/libm/noieee_src/n_sincos1.c

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

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 08:58:32 UTC 2022

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c netpgp.c
src/crypto/external/bsd/netpgp/dist/src/libmj: mj.c
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: rsa.c
src/crypto/external/bsd/netpgp/lib/verify: Makefile

Log Message:
netpgp: fix or suppress a few lint warnings

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.57 -r1.58 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
cvs rdiff -u -r1.105 -r1.106 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/netpgp/lib/verify/Makefile

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

Modified files:

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.18 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.19
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.18	Sun Oct 13 07:28:04 2019
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Sat Aug 27 08:58:31 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2019/10/13 07:28:04 mrg Exp $
+#	$NetBSD: Makefile,v 1.19 2022/08/27 08:58:31 rillig Exp $
 
 PROG=netpgpverify
 BINDIR=		/usr/bin
@@ -19,6 +19,10 @@ CPPFLAGS+=-g -O0
 LDFLAGS+=-g -O0
 .endif
 
+LINTFLAGS.bzlib.c+=	-X 161	# constant in conditional context
+LINTFLAGS.bzlib.c+=	-X 220	# fallthrough on case statement
+LINTFLAGS.zlib.c+=	-X 220	# fallthrough on case statement
+
 MAN=	netpgpverify.1
 WARNS=	5
 

Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.57 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.58
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.57	Wed Oct 14 05:19:41 2020
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c	Sat Aug 27 08:58:32 2022
@@ -57,7 +57,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: keyring.c,v 1.57 2020/10/14 05:19:41 jhigh Exp $");
+__RCSID("$NetBSD: keyring.c,v 1.58 2022/08/27 08:58:32 rillig Exp $");
 #endif
 
 #ifdef HAVE_FCNTL_H
@@ -837,11 +837,8 @@ pgp_keyring_filewrite(pgp_keyring_t *key
 	unsigned	 	res = 1;
 	pgp_key_t		*key;
 	unsigned	 	n;
-	unsigned	 	keyc = (keyring != NULL) ? keyring->keyc : 0;
-	char 			*cp;
 	pgp_content_enum	type;
 	pgp_armor_type_t	atype;
-	char			keyid[PGP_KEY_ID_SIZE * 3];
 
 	fd = pgp_setup_file_write(, filename, 1);
 	if (fd < 0) {

Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.105 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.106
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.105	Sat Aug 27 08:35:01 2022
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c	Sat Aug 27 08:58:32 2022
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.105 2022/08/27 08:35:01 rillig Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.106 2022/08/27 08:58:32 rillig Exp $");
 #endif
 
 #include 
@@ -471,7 +471,7 @@ get_duration(char *s)
 {
 	uint64_t	 now;
 	int64_t	 	 t;
-	char		*mult;
+	const char	*mult;
 
 	if (s == NULL) {
 		return 0;
@@ -584,8 +584,6 @@ p(FILE *fp, const char *s, ...)
 static void
 pobj(FILE *fp, mj_t *obj, int depth)
 {
-	unsigned	 i;
-	char		*s;
 
 	if (obj == NULL) {
 		(void) fprintf(stderr, "No object found\n");

Index: src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c:1.6 src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c:1.7
--- src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c:1.6	Tue Nov 13 14:52:30 2018
+++ src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c	Sat Aug 27 08:58:32 2022
@@ -299,7 +299,6 @@ mj_snprint(char *buf, size_t size, mj_t 
 			*bp = 0x0;
 			return bp - buf;
 		}
-		break;
 	case MJ_ARRAY:
 		cc = snprintf(buf, size, "[ ");
 		for (i = 0 ; i < atom->c ; i++) {

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c:1.4 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c:1.5
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c:1.4	Mon May  4 00:18:34 2020
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c	Sat Aug 27 08:58:32 2022
@@ -502,7 +502,7 @@ 

CVS commit: src/crypto/external/bsd/netpgp

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 08:58:32 UTC 2022

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c netpgp.c
src/crypto/external/bsd/netpgp/dist/src/libmj: mj.c
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: rsa.c
src/crypto/external/bsd/netpgp/lib/verify: Makefile

Log Message:
netpgp: fix or suppress a few lint warnings

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.57 -r1.58 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
cvs rdiff -u -r1.105 -r1.106 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/netpgp/lib/verify/Makefile

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/netpgp/dist/bindings/lua

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 08:57:23 UTC 2022

Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: netpgp.lua

Log Message:
netpgp: fail if the shared library cannot be loaded


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua

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

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.6 src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.7
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.6	Mon Apr 30 22:17:46 2018
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua	Sat Aug 27 08:57:23 2022
@@ -50,7 +50,7 @@ if f then
 	extension = ".dylib"
 	io.close(f)
 end
-glupkg = package.loadlib("libluanetpgp" .. extension, "luaopen_netpgp")
+glupkg = assert(package.loadlib("libluanetpgp" .. extension, "luaopen_netpgp"))
 netpgp = glupkg()
 
 -- initialise
@@ -79,7 +79,6 @@ end
 -- initialise everything
 netpgp.init(pgp)
 
-local i
 for i = 1, #args do
 	if options.encrypt then
 		-- encrypt a file



CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 08:57:23 UTC 2022

Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: netpgp.lua

Log Message:
netpgp: fail if the shared library cannot be loaded


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua

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



CVS commit: src/sys/net

2022-08-27 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Aug 27 08:36:41 UTC 2022

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

Log Message:
Add a little const. NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.255 -r1.256 src/sys/net/rtsock.c

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

Modified files:

Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.255 src/sys/net/rtsock.c:1.256
--- src/sys/net/rtsock.c:1.255	Mon Mar  9 21:20:55 2020
+++ src/sys/net/rtsock.c	Sat Aug 27 08:36:41 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock.c,v 1.255 2020/03/09 21:20:55 roy Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.256 2022/08/27 08:36:41 skrll Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.255 2020/03/09 21:20:55 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.256 2022/08/27 08:36:41 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -403,7 +403,7 @@ sysctl_rtable(SYSCTLFN_ARGS)
 {
 	void 	*where = oldp;
 	size_t	*given = oldlenp;
-	int	i, s, error = EINVAL;
+	int	i, error = EINVAL;
 	u_char  af;
 	struct	rt_walkarg w;
 
@@ -432,7 +432,7 @@ again:
 	w.w_where = where;
 
 	KERNEL_LOCK_UNLESS_NET_MPSAFE();
-	s = splsoftnet();
+	const int s = splsoftnet();
 	switch (w.w_op) {
 
 	case NET_RT_DUMP:



CVS commit: src/sys/net

2022-08-27 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Aug 27 08:36:41 UTC 2022

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

Log Message:
Add a little const. NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.255 -r1.256 src/sys/net/rtsock.c

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/netpgp/dist/src/lib

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 08:35:01 UTC 2022

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c

Log Message:
netpgp: fix use after free when writing keyring

Same pattern as in the previous commit.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c

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

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.104 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.105
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.104	Sat Aug 27 08:30:06 2022
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c	Sat Aug 27 08:35:01 2022
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.104 2022/08/27 08:30:06 rillig Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.105 2022/08/27 08:35:01 rillig Exp $");
 #endif
 
 #include 
@@ -317,8 +317,8 @@ writekeyring(netpgp_t *netpgp, const cha
 
 	filename = keyringfile(netpgp, name);
 	if (!pgp_keyring_filewrite(keyring, noarmor, filename, passphrase)) {
-		free(filename);
 		(void) fprintf(stderr, "Can't write %s %s\n", name, filename);
+		free(filename);
 		return 0;
 	}
 	netpgp_setvar(netpgp, name, filename);



CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 08:35:01 UTC 2022

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c

Log Message:
netpgp: fix use after free when writing keyring

Same pattern as in the previous commit.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c

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



CVS commit: src

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 08:31:59 UTC 2022

Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/include: math.h
src/lib/libm: Makefile
src/lib/libm/noieee_src: n_sincos.c
src/lib/libm/src: math_private.h namespace.h
src/tests/lib/libm: Makefile
Added Files:
src/lib/libm/ld128: e_rem_pio2l.h
src/lib/libm/ld80: e_rem_pio2l.h
src/lib/libm/man: sincos.3
src/lib/libm/src: e_rem_pio2f.h e_rem_pio2l.h k_sincos.h k_sincosf.h
k_sincosl.h s_sincos.c s_sincosf.c s_sincosl.c
src/tests/lib/libm: t_sincos.c

Log Message:
Add sincos{,f,l} from FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.2417 -r1.2418 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.387 -r1.388 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1219 -r1.1220 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.66 -r1.67 src/include/math.h
cvs rdiff -u -r1.216 -r1.217 src/lib/libm/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libm/ld128/e_rem_pio2l.h
cvs rdiff -u -r0 -r1.1 src/lib/libm/ld80/e_rem_pio2l.h
cvs rdiff -u -r0 -r1.1 src/lib/libm/man/sincos.3
cvs rdiff -u -r1.7 -r1.8 src/lib/libm/noieee_src/n_sincos.c
cvs rdiff -u -r0 -r1.1 src/lib/libm/src/e_rem_pio2f.h \
src/lib/libm/src/e_rem_pio2l.h src/lib/libm/src/k_sincos.h \
src/lib/libm/src/k_sincosf.h src/lib/libm/src/k_sincosl.h \
src/lib/libm/src/s_sincos.c src/lib/libm/src/s_sincosf.c \
src/lib/libm/src/s_sincosl.c
cvs rdiff -u -r1.25 -r1.26 src/lib/libm/src/math_private.h
cvs rdiff -u -r1.15 -r1.16 src/lib/libm/src/namespace.h
cvs rdiff -u -r1.47 -r1.48 src/tests/lib/libm/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libm/t_sincos.c

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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2417 src/distrib/sets/lists/comp/mi:1.2418
--- src/distrib/sets/lists/comp/mi:1.2417	Fri Jul 22 11:43:36 2022
+++ src/distrib/sets/lists/comp/mi	Sat Aug 27 04:31:58 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2417 2022/07/22 15:43:36 wiz Exp $
+#	$NetBSD: mi,v 1.2418 2022/08/27 08:31:58 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -10280,6 +10280,7 @@
 ./usr/share/man/cat3/simpleq_next.0		comp-obsolete		obsolete
 ./usr/share/man/cat3/simpleq_remove_head.0	comp-obsolete		obsolete
 ./usr/share/man/cat3/sin.0			comp-c-catman		.cat
+./usr/share/man/cat3/sincos.0			comp-c-catman		.cat
 ./usr/share/man/cat3/sinf.0			comp-c-catman		.cat
 ./usr/share/man/cat3/sinh.0			comp-c-catman		.cat
 ./usr/share/man/cat3/sinhf.0			comp-c-catman		.cat
@@ -18562,6 +18563,7 @@
 ./usr/share/man/html3/sigsetops.html		comp-c-htmlman		html
 ./usr/share/man/html3/sigvec.html		comp-c-htmlman		html
 ./usr/share/man/html3/sin.html			comp-c-htmlman		html
+./usr/share/man/html3/sincos.html		comp-c-htmlman		html
 ./usr/share/man/html3/sinf.html			comp-c-htmlman		html
 ./usr/share/man/html3/sinh.html			comp-c-htmlman		html
 ./usr/share/man/html3/sinhf.html		comp-c-htmlman		html
@@ -26878,6 +26880,7 @@
 ./usr/share/man/man3/simpleq_next.3		comp-obsolete		obsolete
 ./usr/share/man/man3/simpleq_remove_head.3	comp-obsolete		obsolete
 ./usr/share/man/man3/sin.3			comp-c-man		.man
+./usr/share/man/man3/sincos.3			comp-c-man		.man
 ./usr/share/man/man3/sinf.3			comp-c-man		.man
 ./usr/share/man/man3/sinh.3			comp-c-man		.man
 ./usr/share/man/man3/sinhf.3			comp-c-man		.man

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.387 src/distrib/sets/lists/debug/mi:1.388
--- src/distrib/sets/lists/debug/mi:1.387	Mon Jun  6 06:56:27 2022
+++ src/distrib/sets/lists/debug/mi	Sat Aug 27 04:31:58 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.387 2022/06/06 10:56:27 nia Exp $
+# $NetBSD: mi,v 1.388 2022/08/27 08:31:58 christos Exp $
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib	comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -2311,6 +2311,7 @@
 ./usr/libdata/debug/usr/tests/lib/libm/t_round.debug			tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libm/t_scalbn.debug			tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libm/t_sin.debug			tests-lib-debug		debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/lib/libm/t_sincos.debug			tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libm/t_sinh.debug			tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libm/t_sqrt.debug			tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libm/t_tan.debug			tests-lib-debug		debug,atf,compattestfile

Index: src/distrib/sets/lists/tests/mi
diff -u 

CVS commit: src

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 08:31:59 UTC 2022

Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/include: math.h
src/lib/libm: Makefile
src/lib/libm/noieee_src: n_sincos.c
src/lib/libm/src: math_private.h namespace.h
src/tests/lib/libm: Makefile
Added Files:
src/lib/libm/ld128: e_rem_pio2l.h
src/lib/libm/ld80: e_rem_pio2l.h
src/lib/libm/man: sincos.3
src/lib/libm/src: e_rem_pio2f.h e_rem_pio2l.h k_sincos.h k_sincosf.h
k_sincosl.h s_sincos.c s_sincosf.c s_sincosl.c
src/tests/lib/libm: t_sincos.c

Log Message:
Add sincos{,f,l} from FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.2417 -r1.2418 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.387 -r1.388 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1219 -r1.1220 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.66 -r1.67 src/include/math.h
cvs rdiff -u -r1.216 -r1.217 src/lib/libm/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libm/ld128/e_rem_pio2l.h
cvs rdiff -u -r0 -r1.1 src/lib/libm/ld80/e_rem_pio2l.h
cvs rdiff -u -r0 -r1.1 src/lib/libm/man/sincos.3
cvs rdiff -u -r1.7 -r1.8 src/lib/libm/noieee_src/n_sincos.c
cvs rdiff -u -r0 -r1.1 src/lib/libm/src/e_rem_pio2f.h \
src/lib/libm/src/e_rem_pio2l.h src/lib/libm/src/k_sincos.h \
src/lib/libm/src/k_sincosf.h src/lib/libm/src/k_sincosl.h \
src/lib/libm/src/s_sincos.c src/lib/libm/src/s_sincosf.c \
src/lib/libm/src/s_sincosl.c
cvs rdiff -u -r1.25 -r1.26 src/lib/libm/src/math_private.h
cvs rdiff -u -r1.15 -r1.16 src/lib/libm/src/namespace.h
cvs rdiff -u -r1.47 -r1.48 src/tests/lib/libm/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libm/t_sincos.c

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/netpgp/dist/src/lib

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 08:30:06 UTC 2022

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c

Log Message:
netpgp: fix use after free when reading pubkey

To reproduce:
srcdir=...
objdir=...
cd "$srcdir"/crypto/external/bsd/netpgp/dist/bindings/lua
cp "$objdir"/crypto/external/bsd/netpgp/bindings/lua/netpgp.so \
./libluanetpgp.so
LD_LIBRARY_PATH="." MALLOC_CONF=junk:true lua netpgp.lua

> $HOME/.gnupg/pubring.gpg: No such file or directory
> Can't read pubring 


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c

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

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.103 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.104
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.103	Sat Mar 21 01:07:21 2020
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c	Sat Aug 27 08:30:06 2022
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.103 2020/03/21 01:07:21 jhigh Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.104 2022/08/27 08:30:06 rillig Exp $");
 #endif
 
 #include 
@@ -297,9 +297,9 @@ readkeyring(netpgp_t *netpgp, const char
 
 	filename = keyringfile(netpgp, name);
 	if (!pgp_keyring_fileread(keyring, noarmor, filename)) {
+		(void) fprintf(stderr, "Can't read %s %s\n", name, filename);
 		free(filename);
 		free(keyring);
-		(void) fprintf(stderr, "Can't read %s %s\n", name, filename);
 		return NULL;
 	}
 	netpgp_setvar(netpgp, name, filename);



CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

2022-08-27 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Aug 27 08:30:06 UTC 2022

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c

Log Message:
netpgp: fix use after free when reading pubkey

To reproduce:
srcdir=...
objdir=...
cd "$srcdir"/crypto/external/bsd/netpgp/dist/bindings/lua
cp "$objdir"/crypto/external/bsd/netpgp/bindings/lua/netpgp.so \
./libluanetpgp.so
LD_LIBRARY_PATH="." MALLOC_CONF=junk:true lua netpgp.lua

> $HOME/.gnupg/pubring.gpg: No such file or directory
> Can't read pubring 


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c

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



CVS commit: src/external/gpl3/gcc/dist/libiberty

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 08:30:04 UTC 2022

Modified Files:
src/external/gpl3/gcc/dist/libiberty: floatformat.c

Log Message:
pass lint on vax (avoid zerodivide)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/libiberty/floatformat.c

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

Modified files:

Index: src/external/gpl3/gcc/dist/libiberty/floatformat.c
diff -u src/external/gpl3/gcc/dist/libiberty/floatformat.c:1.9 src/external/gpl3/gcc/dist/libiberty/floatformat.c:1.10
--- src/external/gpl3/gcc/dist/libiberty/floatformat.c:1.9	Sat Apr 10 20:02:20 2021
+++ src/external/gpl3/gcc/dist/libiberty/floatformat.c	Sat Aug 27 04:30:04 2022
@@ -53,9 +53,14 @@ Foundation, Inc., 51 Franklin Street - F
 #ifdef DBL_QNAN
 #define NAN DBL_QNAN
 #else
+#ifdef __lint__
+static double zero = 0.0;
+#define NAN (0.0 / zero)
+#else
 #define NAN (0.0 / 0.0)
 #endif
 #endif
+#endif
 
 static int mant_bits_set (const struct floatformat *, const unsigned char *);
 static unsigned long get_field (const unsigned char *,



CVS commit: src/external/gpl3/gcc/dist/libiberty

2022-08-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Aug 27 08:30:04 UTC 2022

Modified Files:
src/external/gpl3/gcc/dist/libiberty: floatformat.c

Log Message:
pass lint on vax (avoid zerodivide)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/libiberty/floatformat.c

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



CVS commit: src/sys/dev/pci

2022-08-27 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Aug 27 06:32:54 UTC 2022

Modified Files:
src/sys/dev/pci: if_bge.c if_bgevar.h

Log Message:
Convert bge_pending_rxintr_change to a bool (from int)


To generate a diff of this commit:
cvs rdiff -u -r1.383 -r1.384 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/if_bgevar.h

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/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.383 src/sys/dev/pci/if_bge.c:1.384
--- src/sys/dev/pci/if_bge.c:1.383	Sat Aug 27 06:12:14 2022
+++ src/sys/dev/pci/if_bge.c	Sat Aug 27 06:32:53 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bge.c,v 1.383 2022/08/27 06:12:14 skrll Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.384 2022/08/27 06:32:53 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.383 2022/08/27 06:12:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.384 2022/08/27 06:32:53 skrll Exp $");
 
 #include 
 #include 
@@ -1263,7 +1263,7 @@ bge_set_thresh(struct ifnet *ifp, int lv
 	mutex_enter(sc->sc_core_lock);
 	sc->bge_rx_coal_ticks = bge_rx_threshes[lvl].rx_ticks;
 	sc->bge_rx_max_coal_bds = bge_rx_threshes[lvl].rx_max_bds;
-	sc->bge_pending_rxintr_change = 1;
+	sc->bge_pending_rxintr_change = true;
 	mutex_exit(sc->sc_core_lock);
 }
 
@@ -4773,7 +4773,7 @@ bge_intr(void *xsc)
 		DELAY(10);
 		(void)CSR_READ_4(sc, BGE_HCC_RX_MAX_COAL_BDS);
 
-		sc->bge_pending_rxintr_change = 0;
+		sc->bge_pending_rxintr_change = false;
 	}
 	bge_handle_events(sc);
 

Index: src/sys/dev/pci/if_bgevar.h
diff -u src/sys/dev/pci/if_bgevar.h:1.37 src/sys/dev/pci/if_bgevar.h:1.38
--- src/sys/dev/pci/if_bgevar.h:1.37	Fri Aug 26 07:22:45 2022
+++ src/sys/dev/pci/if_bgevar.h	Sat Aug 27 06:32:53 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bgevar.h,v 1.37 2022/08/26 07:22:45 skrll Exp $	*/
+/*	$NetBSD: if_bgevar.h,v 1.38 2022/08/27 06:32:53 skrll Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2001
@@ -346,7 +346,7 @@ struct bge_softc {
 	uint64_t		bge_if_collisions;
 	int			bge_txcnt;
 	struct callout		bge_timeout;
-	int			bge_pending_rxintr_change;
+	bool			bge_pending_rxintr_change;
 	bool			bge_detaching;
 	SLIST_HEAD(, txdmamap_pool_entry) txdma_list;
 	struct txdmamap_pool_entry *txdma[BGE_TX_RING_CNT];



CVS commit: src/sys/dev/pci

2022-08-27 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Aug 27 06:32:54 UTC 2022

Modified Files:
src/sys/dev/pci: if_bge.c if_bgevar.h

Log Message:
Convert bge_pending_rxintr_change to a bool (from int)


To generate a diff of this commit:
cvs rdiff -u -r1.383 -r1.384 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/if_bgevar.h

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



CVS commit: src/sys/dev/pci

2022-08-27 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Aug 27 06:12:14 UTC 2022

Modified Files:
src/sys/dev/pci: if_bge.c

Log Message:
Include headers once (and don't pretend this compiles without INET)


To generate a diff of this commit:
cvs rdiff -u -r1.382 -r1.383 src/sys/dev/pci/if_bge.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/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.382 src/sys/dev/pci/if_bge.c:1.383
--- src/sys/dev/pci/if_bge.c:1.382	Sat Aug 27 05:35:17 2022
+++ src/sys/dev/pci/if_bge.c	Sat Aug 27 06:12:14 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bge.c,v 1.382 2022/08/27 05:35:17 skrll Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.383 2022/08/27 06:12:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.382 2022/08/27 05:35:17 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.383 2022/08/27 06:12:14 skrll Exp $");
 
 #include 
 #include 
@@ -101,13 +101,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1
 #include 
 #include 
 
-#ifdef INET
-#include 
-#include 
-#include 
-#include 
-#endif
-
 /* Headers for TCP Segmentation Offload (TSO) */
 #include 		/* n_time for ... */
 #include 			/* ip_{src,dst}, for  */



CVS commit: src/sys/dev/pci

2022-08-27 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Aug 27 06:12:14 UTC 2022

Modified Files:
src/sys/dev/pci: if_bge.c

Log Message:
Include headers once (and don't pretend this compiles without INET)


To generate a diff of this commit:
cvs rdiff -u -r1.382 -r1.383 src/sys/dev/pci/if_bge.c

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