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

2024-04-11 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Fri Apr 12 05:44:38 UTC 2024

Modified Files:
src/usr.bin/xlint/lint1: cksnprintb.c externs1.h tree.c

Log Message:
lint: clean up and speed up the check for snprintb


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/xlint/lint1/cksnprintb.c
cvs rdiff -u -r1.221 -r1.222 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.634 -r1.635 src/usr.bin/xlint/lint1/tree.c

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

Modified files:

Index: src/usr.bin/xlint/lint1/cksnprintb.c
diff -u src/usr.bin/xlint/lint1/cksnprintb.c:1.13 src/usr.bin/xlint/lint1/cksnprintb.c:1.14
--- src/usr.bin/xlint/lint1/cksnprintb.c:1.13	Fri Apr 12 05:17:48 2024
+++ src/usr.bin/xlint/lint1/cksnprintb.c	Fri Apr 12 05:44:38 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: cksnprintb.c,v 1.13 2024/04/12 05:17:48 rillig Exp $	*/
+/*	$NetBSD: cksnprintb.c,v 1.14 2024/04/12 05:44:38 rillig Exp $	*/
 
 /*-
  * Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: cksnprintb.c,v 1.13 2024/04/12 05:17:48 rillig Exp $");
+__RCSID("$NetBSD: cksnprintb.c,v 1.14 2024/04/12 05:44:38 rillig Exp $");
 #endif
 
 #include 
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: cksnprintb.c,v 1.13 20
 typedef struct {
 	bool new_style;
 	const buffer *fmt;
-	const tnode_t *value;
+	uint64_t possible_value_bits;
 
 	quoted_iterator it;
 	uint64_t field_width;
@@ -128,7 +128,7 @@ check_bit(checker *ck, uint64_t dir_lsb,
 		}
 	}
 
-	if (!(possible_bits(ck->value) & field_mask))
+	if (!(ck->possible_value_bits & field_mask))
 		/* conversion '%.*s' is unreachable by input value */
 		warning(378, len, start);
 }
@@ -265,9 +265,8 @@ check_conversion(checker *ck)
 }
 
 void
-check_snprintb(const tnode_t *expr)
+check_snprintb(const function_call *call)
 {
-	const function_call *call = expr->u.call;
 	const char *name;
 	const buffer *fmt;
 	const tnode_t *value;
@@ -287,7 +286,7 @@ check_snprintb(const tnode_t *expr)
 
 	checker ck = {
 		.fmt = fmt,
-		.value = value,
+		.possible_value_bits = possible_bits(value),
 		.field_width = 64,
 	};
 

Index: src/usr.bin/xlint/lint1/externs1.h
diff -u src/usr.bin/xlint/lint1/externs1.h:1.221 src/usr.bin/xlint/lint1/externs1.h:1.222
--- src/usr.bin/xlint/lint1/externs1.h:1.221	Fri Mar 29 08:35:32 2024
+++ src/usr.bin/xlint/lint1/externs1.h	Fri Apr 12 05:44:38 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: externs1.h,v 1.221 2024/03/29 08:35:32 rillig Exp $	*/
+/*	$NetBSD: externs1.h,v 1.222 2024/04/12 05:44:38 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -422,4 +422,4 @@ void check_getopt_end_switch(void);
 void check_getopt_end_while(void);
 
 /* cksnprintb.c */
-void check_snprintb(const tnode_t *);
+void check_snprintb(const function_call *);

Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.634 src/usr.bin/xlint/lint1/tree.c:1.635
--- src/usr.bin/xlint/lint1/tree.c:1.634	Sun Mar 31 20:28:45 2024
+++ src/usr.bin/xlint/lint1/tree.c	Fri Apr 12 05:44:38 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: tree.c,v 1.634 2024/03/31 20:28:45 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.635 2024/04/12 05:44:38 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: tree.c,v 1.634 2024/03/31 20:28:45 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.635 2024/04/12 05:44:38 rillig Exp $");
 #endif
 
 #include 
@@ -4507,7 +4507,10 @@ check_expr_call(const tnode_t *tn, const
 	lint_assert(ln->u.ops.left->tn_op == NAME);
 	if (!szof && !is_compiler_builtin(ln->u.ops.left->u.sym->s_name))
 		outcall(tn, vctx || cond, retval_discarded);
-	check_snprintb(tn);
+
+	const function_call *call = tn->u.call;
+	if (call->args_len == 4 || call->args_len == 5)
+		check_snprintb(call);
 }
 
 static void



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

2024-04-11 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Fri Apr 12 05:44:38 UTC 2024

Modified Files:
src/usr.bin/xlint/lint1: cksnprintb.c externs1.h tree.c

Log Message:
lint: clean up and speed up the check for snprintb


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/xlint/lint1/cksnprintb.c
cvs rdiff -u -r1.221 -r1.222 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.634 -r1.635 src/usr.bin/xlint/lint1/tree.c

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



CVS commit: src

2024-04-11 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Fri Apr 12 05:17:48 UTC 2024

Modified Files:
src/tests/usr.bin/xlint/lint1: msg_363.c msg_371.c msg_376.c
src/usr.bin/xlint/lint1: cksnprintb.c err.c

Log Message:
lint: in snprintb, warn about all escaped characters in descriptions


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_363.c
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/msg_371.c
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_376.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/xlint/lint1/cksnprintb.c
cvs rdiff -u -r1.239 -r1.240 src/usr.bin/xlint/lint1/err.c

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



CVS commit: src

2024-04-11 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Fri Apr 12 05:17:48 UTC 2024

Modified Files:
src/tests/usr.bin/xlint/lint1: msg_363.c msg_371.c msg_376.c
src/usr.bin/xlint/lint1: cksnprintb.c err.c

Log Message:
lint: in snprintb, warn about all escaped characters in descriptions


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_363.c
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/msg_371.c
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_376.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/xlint/lint1/cksnprintb.c
cvs rdiff -u -r1.239 -r1.240 src/usr.bin/xlint/lint1/err.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/msg_363.c
diff -u src/tests/usr.bin/xlint/lint1/msg_363.c:1.4 src/tests/usr.bin/xlint/lint1/msg_363.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_363.c:1.4	Sun Mar  3 16:09:01 2024
+++ src/tests/usr.bin/xlint/lint1/msg_363.c	Fri Apr 12 05:17:48 2024
@@ -1,12 +1,13 @@
-/*	$NetBSD: msg_363.c,v 1.4 2024/03/03 16:09:01 rillig Exp $	*/
+/*	$NetBSD: msg_363.c,v 1.5 2024/04/12 05:17:48 rillig Exp $	*/
 # 3 "msg_363.c"
 
-// Test for message: non-printing character '%.*s' in description '%.*s' [363]
+// Test for message: escaped character '%.*s' in description of conversion '%.*s' [363]
 
 /*
  * The purpose of snprintb is to produce a printable, visible representation
- * of a binary number, therefore the description should consist of visible
- * characters only.
+ * of a binary number, therefore the description should consist of simple
+ * characters only, and these should not need to be escaped.  If they are,
+ * it's often due to a typo, such as a missing terminating '\0'.
  */
 
 /* lint1-extra-flags: -X 351 */
@@ -22,17 +23,17 @@ old_style_description(unsigned u32)
 	char buf[64];
 
 	/* expect+6: warning: bit position '\t' in '\tprint' should be escaped as octal or hex [369] */
-	/* expect+5: warning: non-printing character '\377' in description 'able\377' [363] */
+	/* expect+5: warning: escaped character '\377' in description of conversion '\nable\377' [363] */
 	/* expect+4: warning: bit position '\n' in '\nable\377' should be escaped as octal or hex [369] */
 	snprintb(buf, sizeof(buf),
 	"\020"
 	"\001non\tprint\nable\377",
 	u32);
 
-	/* expect+10: warning: non-printing character '\177' in description '\177' [363] */
-	/* expect+9: warning: non-printing character '\177' in description 'aa\177' [363] */
-	/* expect+8: warning: non-printing character '\177' in description 'bb""\177' [363] */
-	/* expect+7: warning: non-printing character '\177' in description 'cc\177' [363] */
+	/* expect+10: warning: escaped character '\177' in description of conversion '\002""\177' [363] */
+	/* expect+9: warning: escaped character '\177' in description of conversion '\003aa\177' [363] */
+	/* expect+8: warning: escaped character '\177' in description of conversion '\004""bb""\177' [363] */
+	/* expect+7: warning: escaped character '\177' in description of conversion '\005cc\177' [363] */
 	snprintb(buf, sizeof(buf),
 	"\020"
 	"\002""\177"

Index: src/tests/usr.bin/xlint/lint1/msg_371.c
diff -u src/tests/usr.bin/xlint/lint1/msg_371.c:1.1 src/tests/usr.bin/xlint/lint1/msg_371.c:1.2
--- src/tests/usr.bin/xlint/lint1/msg_371.c:1.1	Fri Mar  1 19:39:29 2024
+++ src/tests/usr.bin/xlint/lint1/msg_371.c	Fri Apr 12 05:17:48 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg_371.c,v 1.1 2024/03/01 19:39:29 rillig Exp $	*/
+/*	$NetBSD: msg_371.c,v 1.2 2024/04/12 05:17:48 rillig Exp $	*/
 # 3 "msg_371.c"
 
 // Test for message: bit position '%.*s' (%ju) in '%.*s' out of range %u..%u [371]
@@ -21,9 +21,10 @@ example(unsigned u32, uint64_t u64)
 {
 	char buf[64];
 
-	/* expect+11: warning: bit position '\000' (0) in '\000zero' out of range 1..32 [371] */
-	/* expect+10: warning: non-printing character '\177' in description 'bit32""\041bit33""\177' [363] */
-	/* expect+9: warning: non-printing character '\377' in description 'bit32""\041bit33""\177bit127""\377' [363] */
+	/* expect+12: warning: bit position '\000' (0) in '\000zero' out of range 1..32 [371] */
+	/* expect+11: warning: escaped character '\041' in description of conversion '\040bit32""\041' [363] */
+	/* expect+10: warning: escaped character '\177' in description of conversion '\040bit32""\041bit33""\177' [363] */
+	/* expect+9: warning: escaped character '\377' in description of conversion '\040bit32""\041bit33""\177bit127""\377' [363] */
 	snprintb(buf, sizeof(buf),
 	"\020"
 	"\000zero"

Index: src/tests/usr.bin/xlint/lint1/msg_376.c
diff -u src/tests/usr.bin/xlint/lint1/msg_376.c:1.2 src/tests/usr.bin/xlint/lint1/msg_376.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_376.c:1.2	Sun Mar  3 00:50:41 2024
+++ src/tests/usr.bin/xlint/lint1/msg_376.c	Fri Apr 12 05:17:48 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg_376.c,v 1.2 2024/03/03 

CVS commit: src/sys/dev

2024-04-11 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 12 05:04:02 UTC 2024

Modified Files:
src/sys/dev: ccd.c

Log Message:
Repair handling of ccd sysctls to not use newp as an index.

This is a work-around for kern/58051.  It is not a complete fix.


To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/dev/ccd.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/ccd.c
diff -u src/sys/dev/ccd.c:1.190 src/sys/dev/ccd.c:1.191
--- src/sys/dev/ccd.c:1.190	Sun Mar 31 14:56:41 2024
+++ src/sys/dev/ccd.c	Fri Apr 12 05:04:02 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: ccd.c,v 1.190 2024/03/31 14:56:41 hannken Exp $	*/
+/*	$NetBSD: ccd.c,v 1.191 2024/04/12 05:04:02 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.190 2024/03/31 14:56:41 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.191 2024/04/12 05:04:02 pgoyette Exp $");
 
 #include 
 #include 
@@ -1774,13 +1774,14 @@ ccd_info_sysctl(SYSCTLFN_ARGS)
 	struct sysctlnode node;
 	struct ccddiskinfo ccd;
 	struct ccd_softc *sc;
-	int unit;
+	int unit, error;
 
 	if (newp == NULL || newlen != sizeof(int))
 		return EINVAL;
 
-	unit = *(const int *)newp;
-	newp = NULL;
+	error = sysctl_copyin(l, newp, , sizeof unit);
+	if (error)
+		return error;
 	newlen = 0;
 	ccd.ccd_ndisks = ~0;
 	mutex_enter(_lock);
@@ -1818,8 +1819,9 @@ ccd_components_sysctl(SYSCTLFN_ARGS)
 		return EINVAL;
 
 	size = 0;
-	unit = *(const int *)newp;
-	newp = NULL;
+	error = sysctl_copyin(l, newp, , sizeof unit);
+	if (error)
+		return error;
 	newlen = 0;
 	mutex_enter(_lock);
 	LIST_FOREACH(sc, , sc_link)



CVS commit: src/sys/dev

2024-04-11 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 12 05:04:02 UTC 2024

Modified Files:
src/sys/dev: ccd.c

Log Message:
Repair handling of ccd sysctls to not use newp as an index.

This is a work-around for kern/58051.  It is not a complete fix.


To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/dev/ccd.c

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



CVS commit: src/share/mk

2024-04-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Apr 11 19:12:11 UTC 2024

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

Log Message:
fix previous. Doing assignmnents of conditionals does not work for being
used as conditionals (thanks rillig@)


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

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



CVS commit: src/share/mk

2024-04-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Apr 11 19:12:11 UTC 2024

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

Log Message:
fix previous. Doing assignmnents of conditionals does not work for being
used as conditionals (thanks rillig@)


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

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

Modified files:

Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.401 src/share/mk/bsd.lib.mk:1.402
--- src/share/mk/bsd.lib.mk:1.401	Tue Apr  9 18:37:23 2024
+++ src/share/mk/bsd.lib.mk	Thu Apr 11 15:12:11 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.401 2024/04/09 22:37:23 christos Exp $
+#	$NetBSD: bsd.lib.mk,v 1.402 2024/04/11 19:12:11 christos Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include 
@@ -425,11 +425,15 @@ _DEST.LINT:=${DESTDIR}${LINTLIBDIR}
 _DEST.DEBUG:=${DESTDIR}${DEBUGDIR}${LIBDIR}
 _DEST.ODEBUG:=${DESTDIR}${DEBUGDIR}${_LIBSODIR}
 
-_BUILDSTATICLIB= ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
+.if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
 || ${MAKELINKLIB} != "no" || ${MAKESTATICLIB} != "no"
+_BUILDSTATICLIB=yes
+.else
+_BUILDSTATICLIB=no
+.endif
 
 .if defined(LIB)			# {
-.if ${_BUILDSTATICLIB}
+.if ${_BUILDSTATICLIB} != "no"
 _LIBS=${_LIB.a}
 .else
 _LIBS=
@@ -484,7 +488,7 @@ _LIBS+=${_LIB.ln}
 .endif
 
 ALLOBJS=
-.if ${_BUILDSTATICLIB}
+.if ${_BUILDSTATICLIB} != "no"
 ALLOBJS+=${STOBJS}
 .endif
 ALLOBJS+=${POBJS} ${SOBJS}



CVS commit: src/lib/libc/rpc

2024-04-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Apr 11 18:41:03 UTC 2024

Modified Files:
src/lib/libc/rpc: xdr_float.c

Log Message:
avoid lint warning on the vax


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/rpc/xdr_float.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/libc/rpc/xdr_float.c
diff -u src/lib/libc/rpc/xdr_float.c:1.41 src/lib/libc/rpc/xdr_float.c:1.42
--- src/lib/libc/rpc/xdr_float.c:1.41	Mon Feb 15 06:07:48 2016
+++ src/lib/libc/rpc/xdr_float.c	Thu Apr 11 14:41:03 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: xdr_float.c,v 1.41 2016/02/15 11:07:48 martin Exp $	*/
+/*	$NetBSD: xdr_float.c,v 1.42 2024/04/11 18:41:03 christos Exp $	*/
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -37,7 +37,7 @@
 static char *sccsid = "@(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)xdr_float.c	2.1 88/07/29 4.0 RPCSRC";
 #else
-__RCSID("$NetBSD: xdr_float.c,v 1.41 2016/02/15 11:07:48 martin Exp $");
+__RCSID("$NetBSD: xdr_float.c,v 1.42 2024/04/11 18:41:03 christos Exp $");
 #endif
 #endif
 
@@ -254,6 +254,7 @@ xdr_double(XDR *xdrs, double *dp)
 goto shipit;
 			}
 		}
+		/*LINTED: possible overflow*/
 		id.exp = vd.exp - VAX_DBL_BIAS + IEEE_DBL_BIAS;
 		id.mantissa1 = (vd.mantissa1 << 13) |
 			((unsigned int)vd.mantissa2 >> 3);
@@ -296,6 +297,7 @@ xdr_double(XDR *xdrs, double *dp)
 goto doneit;
 			}
 		}
+		/*LINTED: can overflow */
 		vd.exp = id.exp - IEEE_DBL_BIAS + VAX_DBL_BIAS;
 		vd.mantissa1 = ((unsigned int)id.mantissa1 >> 13);
 		vd.mantissa2 = ((id.mantissa1 & MASK(13)) << 3) |



CVS commit: src/lib/libc/rpc

2024-04-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Apr 11 18:41:03 UTC 2024

Modified Files:
src/lib/libc/rpc: xdr_float.c

Log Message:
avoid lint warning on the vax


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/rpc/xdr_float.c

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



CVS commit: src/distrib/sets/lists

2024-04-11 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Thu Apr 11 15:29:16 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: md.amd64
src/distrib/sets/lists/debug32: md.amd64

Log Message:
add libc++ files to *32 sets


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/base32/md.amd64
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug32/md.amd64

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



CVS commit: src/distrib/sets/lists

2024-04-11 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Thu Apr 11 15:29:16 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: md.amd64
src/distrib/sets/lists/debug32: md.amd64

Log Message:
add libc++ files to *32 sets


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/base32/md.amd64
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug32/md.amd64

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

Modified files:

Index: src/distrib/sets/lists/base32/md.amd64
diff -u src/distrib/sets/lists/base32/md.amd64:1.1 src/distrib/sets/lists/base32/md.amd64:1.2
--- src/distrib/sets/lists/base32/md.amd64:1.1	Tue Apr  9 15:17:23 2024
+++ src/distrib/sets/lists/base32/md.amd64	Thu Apr 11 15:29:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.1 2024/04/09 15:17:23 nia Exp $
+# $NetBSD: md.amd64,v 1.2 2024/04/11 15:29:16 wiz Exp $
 ./lib/i386	base-compat-shlib	compat
 ./lib/i386/npf	base-compat-shlib	compat,npf
 ./lib/i386/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -122,6 +122,9 @@
 ./usr/lib/i386/libbz2.so			base-compat-shlib	compat
 ./usr/lib/i386/libbz2.so.1			base-compat-shlib	compat
 ./usr/lib/i386/libbz2.so.1.1			base-compat-shlib	compat
+./usr/lib/i386/libc++.so			base-compat-shlib	compat
+./usr/lib/i386/libc++.so.1			base-compat-shlib	compat
+./usr/lib/i386/libc++.so.1.0			base-compat-shlib	compat
 ./usr/lib/i386/libc.sobase-compat-shlib	compat
 ./usr/lib/i386/libc.so.12			base-compat-shlib	compat
 ./usr/lib/i386/libc.so.12.221			base-compat-shlib	compat

Index: src/distrib/sets/lists/debug32/md.amd64
diff -u src/distrib/sets/lists/debug32/md.amd64:1.3 src/distrib/sets/lists/debug32/md.amd64:1.4
--- src/distrib/sets/lists/debug32/md.amd64:1.3	Thu Apr 11 08:19:30 2024
+++ src/distrib/sets/lists/debug32/md.amd64	Thu Apr 11 15:29:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.3 2024/04/11 08:19:30 nia Exp $
+# $NetBSD: md.amd64,v 1.4 2024/04/11 15:29:16 wiz Exp $
 ./usr/lib/i386/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -36,6 +36,7 @@
 ./usr/lib/i386/libbozohttpd_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libbsdmalloc_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libbz2_g.a			comp-c-debuglib	debuglib,compat
+./usr/lib/i386/libc++_g.a		comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libc_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libcbor_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libcom_err_g.a			comp-c-debuglib	debuglib,compat
@@ -204,6 +205,7 @@
 ./usr/libdata/debug/usr/lib/i386/libbozohttpd.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libbsdmalloc.so.0.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libbz2.so.1.1.debug	comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/i386/libc++.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libc.so.12.221.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libcbor.so.0.5.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libcom_err.so.8.0.debug	comp-sys-debug	debug,compat,kerberos



mtree [was Re: CVS commit: src]

2024-04-11 Thread Mouse
> And also slightly related: we need a way to mark directories as
> optional in the mtree files (or have a way to provide several
> alternative options).  Typical issue: /var/shm is a symlink on most
> of my smaller machines, but it is impossible to make such setups pass
> the mtree tests.

Maybe a way to mark an entry as, effectively, "use stat() instead of
lstat() when checking this entry"?

/~\ The ASCII Mouse
\ / Ribbon Campaign
 X  Against HTMLmo...@rodents-montreal.org
/ \ Email!   7D C8 61 52 5D E7 2D 39  4E F1 31 3E E8 B3 27 4B


Re: CVS commit: src

2024-04-11 Thread Martin Husemann
On Thu, Apr 11, 2024 at 01:06:10PM +, Taylor R Campbell wrote:
> I agree, this is related to the subject of, and could probably use the
> same mechanism as, PR 57581: set lists should have a way to obsolete
> shlibs in DESTDIR but not in postinstall.
> 
> https://gnats.NetBSD.org/57581

And also slightly related: we need a way to mark directories as optional
in the mtree files (or have a way to provide several alternative options).
Typical issue: /var/shm is a symlink on most of my smaller machines,
but it is impossible to make such setups pass the mtree tests.

Martin


CVS commit: src/sys/kern

2024-04-11 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Thu Apr 11 13:51:36 UTC 2024

Modified Files:
src/sys/kern: sys_futex.c

Log Message:
sys_futex.c: Fix illustration of futex(2).

In this illustration, we need to _set_ bit 1 to claim ownership, not
_clear_ bit 1 to claim ownership.

No functional change intended -- comment only.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/kern/sys_futex.c

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



CVS commit: src/sys/kern

2024-04-11 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Thu Apr 11 13:51:36 UTC 2024

Modified Files:
src/sys/kern: sys_futex.c

Log Message:
sys_futex.c: Fix illustration of futex(2).

In this illustration, we need to _set_ bit 1 to claim ownership, not
_clear_ bit 1 to claim ownership.

No functional change intended -- comment only.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/kern/sys_futex.c

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

Modified files:

Index: src/sys/kern/sys_futex.c
diff -u src/sys/kern/sys_futex.c:1.19 src/sys/kern/sys_futex.c:1.20
--- src/sys/kern/sys_futex.c:1.19	Fri Feb 24 11:02:27 2023
+++ src/sys/kern/sys_futex.c	Thu Apr 11 13:51:36 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_futex.c,v 1.19 2023/02/24 11:02:27 riastradh Exp $	*/
+/*	$NetBSD: sys_futex.c,v 1.20 2024/04/11 13:51:36 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2018, 2019, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.19 2023/02/24 11:02:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.20 2024/04/11 13:51:36 riastradh Exp $");
 
 /*
  * Futexes
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: sys_futex.c,
  *futex(FUTEX_WAIT, , v | 2, NULL, NULL, 0);
  *continue;
  *			}
- *		} while (atomic_cas_uint(, v, v & ~1) != v);
+ *		} while (atomic_cas_uint(, v, v | 1) != v);
  *		membar_acquire();
  *
  *		...



CVS commit: src/share/man/man4/man4.amiga

2024-04-11 Thread Jukka Andberg
Module Name:src
Committed By:   jandberg
Date:   Thu Apr 11 13:06:29 UTC 2024

Modified Files:
src/share/man/man4/man4.amiga: amidisplaycc.4

Log Message:
Mention the 16-color screenmode.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/share/man/man4/man4.amiga/amidisplaycc.4

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

Modified files:

Index: src/share/man/man4/man4.amiga/amidisplaycc.4
diff -u src/share/man/man4/man4.amiga/amidisplaycc.4:1.16 src/share/man/man4/man4.amiga/amidisplaycc.4:1.17
--- src/share/man/man4/man4.amiga/amidisplaycc.4:1.16	Sat Aug 13 17:06:38 2022
+++ src/share/man/man4/man4.amiga/amidisplaycc.4	Thu Apr 11 13:06:29 2024
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $NetBSD: amidisplaycc.4,v 1.16 2022/08/13 17:06:38 wiz Exp $
+.\" $NetBSD: amidisplaycc.4,v 1.17 2024/04/11 13:06:29 jandberg Exp $
 .Dd November 12, 2003
 .Dt AMIDISPLAYCC 4 amiga
 .Os
@@ -88,7 +88,7 @@ utility runtime.
 The X11 server works using the
 .Xr wsfb 4
 driver.
-The driver supports 256 color and monochrome modes.
+The driver supports 256 and 16 color modes.
 .Sh SEE ALSO
 .Xr wscons 4 ,
 .Xr wsdisplay 4 ,



CVS commit: src/share/man/man4/man4.amiga

2024-04-11 Thread Jukka Andberg
Module Name:src
Committed By:   jandberg
Date:   Thu Apr 11 13:06:29 UTC 2024

Modified Files:
src/share/man/man4/man4.amiga: amidisplaycc.4

Log Message:
Mention the 16-color screenmode.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/share/man/man4/man4.amiga/amidisplaycc.4

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



Re: CVS commit: src

2024-04-11 Thread Taylor R Campbell
> Date: Thu, 11 Apr 2024 11:19:38 +0700
> From: Robert Elz 
> 
> This is why I'd like to add a new keyword in the sets lists, like
> "obsolete" is - probably "optional" to mark files that aren't installed
> by the build, but might exist, and should simply be ignored if
> found - it isn't an error for them to exist, but nor is it an error
> for them to be absent.   Such files don't go in any of the constructed
> sets files (whether they happen to exist or not).

I agree, this is related to the subject of, and could probably use the
same mechanism as, PR 57581: set lists should have a way to obsolete
shlibs in DESTDIR but not in postinstall.

https://gnats.NetBSD.org/57581


CVS commit: src/sys/dev/pci

2024-04-11 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Thu Apr 11 10:42:42 UTC 2024

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

Log Message:
mcx(4): enforce full-duplex mark in mcx_media_status(), when link is up.

LACP protocol requires full-duplex to be enabled for lagg(4) to work,
however mcx(4) was not setting this capability making it to fail.

Fixes PR kern/58124.  OK'd by msaitoh@


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/if_mcx.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

2024-04-11 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Thu Apr 11 10:42:42 UTC 2024

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

Log Message:
mcx(4): enforce full-duplex mark in mcx_media_status(), when link is up.

LACP protocol requires full-duplex to be enabled for lagg(4) to work,
however mcx(4) was not setting this capability making it to fail.

Fixes PR kern/58124.  OK'd by msaitoh@


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/if_mcx.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_mcx.c
diff -u src/sys/dev/pci/if_mcx.c:1.26 src/sys/dev/pci/if_mcx.c:1.27
--- src/sys/dev/pci/if_mcx.c:1.26	Thu Oct 26 03:44:12 2023
+++ src/sys/dev/pci/if_mcx.c	Thu Apr 11 10:42:42 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mcx.c,v 1.26 2023/10/26 03:44:12 msaitoh Exp $ */
+/*	$NetBSD: if_mcx.c,v 1.27 2024/04/11 10:42:42 andvar Exp $ */
 /*	$OpenBSD: if_mcx.c,v 1.101 2021/06/02 19:16:11 patrick Exp $ */
 
 /*
@@ -23,7 +23,7 @@
 #endif
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.26 2023/10/26 03:44:12 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.27 2024/04/11 10:42:42 andvar Exp $");
 
 #include 
 #include 
@@ -8072,7 +8072,7 @@ mcx_media_status(struct ifnet *ifp, stru
 	ifmr->ifm_status = IFM_AVALID;
 	if (proto_oper != 0) {
 		ifmr->ifm_status |= IFM_ACTIVE;
-		ifmr->ifm_active = IFM_ETHER | IFM_AUTO | media_oper;
+		ifmr->ifm_active = IFM_ETHER | IFM_FDX | IFM_AUTO | media_oper;
 		/* txpause, rxpause, duplex? */
 	}
 }



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

2024-04-11 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Thu Apr 11 08:19:31 UTC 2024

Modified Files:
src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el
ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
md.sparc64

Log Message:
sync categories with main debug set - somehow missed in test build...


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/debug32/ad.aarch64 \
src/distrib/sets/lists/debug32/ad.mips64eb \
src/distrib/sets/lists/debug32/ad.mips64el \
src/distrib/sets/lists/debug32/ad.mipsn64eb \
src/distrib/sets/lists/debug32/ad.mipsn64el \
src/distrib/sets/lists/debug32/ad.powerpc64 \
src/distrib/sets/lists/debug32/ad.riscv64 \
src/distrib/sets/lists/debug32/md.amd64 \
src/distrib/sets/lists/debug32/md.sparc64

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/debug32/ad.aarch64
diff -u src/distrib/sets/lists/debug32/ad.aarch64:1.2 src/distrib/sets/lists/debug32/ad.aarch64:1.3
--- src/distrib/sets/lists/debug32/ad.aarch64:1.2	Wed Apr 10 16:14:26 2024
+++ src/distrib/sets/lists/debug32/ad.aarch64	Thu Apr 11 08:19:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.2 2024/04/10 16:14:26 nia Exp $
+# $NetBSD: ad.aarch64,v 1.3 2024/04/11 08:19:30 nia Exp $
 ./usr/lib/eabi/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -29,7 +29,7 @@
 ./usr/lib/eabi/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/eabi/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/eabi/libavl_g.a			comp-c-debuglib	debuglib,compat,zfs
-./usr/lib/eabi/libbfd_g.a	comp-sys-debug		debug,compat
+./usr/lib/eabi/libbfd_g.a			comp-sys-debug	debug,compat,binutils
 ./usr/lib/eabi/libbind9_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/libblocklist_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/libbluetooth_g.a			comp-c-debuglib	debuglib,compat
@@ -62,9 +62,9 @@
 ./usr/lib/eabi/libfido2_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/libfl_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/libform_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/eabi/libgcc_eh_g.a 			comp-sys-debug	debug,compat,gcc
+./usr/lib/eabi/libgcc_eh_g.a 			comp-c-debuglib	debuglib,compat,gcc
 ./usr/lib/eabi/libgcc_g.a			comp-c-debuglib	debuglib,compat,gcc
-./usr/lib/eabi/libgcc_s_g.a			comp-sys-debug	debug,compat,gcc
+./usr/lib/eabi/libgcc_s_g.a			comp-c-debuglib	debuglib,compat,gcc
 ./usr/lib/eabi/libgcov_g.a			comp-c-debuglib	debuglib,compat,gcc
 ./usr/lib/eabi/libgnuctf_g.a			comp-c-debuglib	debuglib,compat,binutils
 ./usr/lib/eabi/libgnumalloc_g.a			comp-c-debuglib	debuglib,compat
@@ -225,9 +225,9 @@
 ./usr/lib/eabihf/libfido2_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabihf/libfl_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabihf/libform_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/eabihf/libgcc_eh_g.a 			comp-sys-debug	debug,compat,gcc
+./usr/lib/eabihf/libgcc_eh_g.a 			comp-c-debuglib	debuglib,compat,gcc
 ./usr/lib/eabihf/libgcc_g.a			comp-c-debuglib	debuglib,compat,gcc
-./usr/lib/eabihf/libgcc_s_g.a			comp-sys-debug	debug,compat,gcc
+./usr/lib/eabihf/libgcc_s_g.a			comp-c-debuglib	debuglib,compat,gcc
 ./usr/lib/eabihf/libgcov_g.a			comp-c-debuglib	debuglib,compat,gcc
 ./usr/lib/eabihf/libgnuctf_g.a			comp-c-debuglib	debuglib,compat,binutils
 ./usr/lib/eabihf/libgnumalloc_g.a			comp-c-debuglib	debuglib,compat
Index: src/distrib/sets/lists/debug32/ad.mips64eb
diff -u src/distrib/sets/lists/debug32/ad.mips64eb:1.2 src/distrib/sets/lists/debug32/ad.mips64eb:1.3
--- src/distrib/sets/lists/debug32/ad.mips64eb:1.2	Wed Apr 10 16:14:26 2024
+++ src/distrib/sets/lists/debug32/ad.mips64eb	Thu Apr 11 08:19:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.2 2024/04/10 16:14:26 nia Exp $
+# $NetBSD: ad.mips64eb,v 1.3 2024/04/11 08:19:30 nia Exp $
 ./usr/lib/64/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -29,7 +29,7 @@
 ./usr/lib/64/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/64/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/64/libavl_g.a			comp-c-debuglib	debuglib,compat,zfs
-./usr/lib/64/libbfd_g.a	comp-sys-debug		debug,compat
+./usr/lib/64/libbfd_g.acomp-c-debuglib	debuglib,compat,binutils
 ./usr/lib/64/libbind9_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/libblocklist_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/libbluetooth_g.a			comp-c-debuglib	debuglib,compat
@@ -62,9 +62,9 @@
 ./usr/lib/64/libfido2_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/libfl_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/libform_g.a			comp-c-debuglib	

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

2024-04-11 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Thu Apr 11 08:19:31 UTC 2024

Modified Files:
src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el
ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
md.sparc64

Log Message:
sync categories with main debug set - somehow missed in test build...


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/debug32/ad.aarch64 \
src/distrib/sets/lists/debug32/ad.mips64eb \
src/distrib/sets/lists/debug32/ad.mips64el \
src/distrib/sets/lists/debug32/ad.mipsn64eb \
src/distrib/sets/lists/debug32/ad.mipsn64el \
src/distrib/sets/lists/debug32/ad.powerpc64 \
src/distrib/sets/lists/debug32/ad.riscv64 \
src/distrib/sets/lists/debug32/md.amd64 \
src/distrib/sets/lists/debug32/md.sparc64

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



CVS commit: src/sys

2024-04-11 Thread Kengo NAKAHARA
Module Name:src
Committed By:   knakahara
Date:   Thu Apr 11 07:34:37 UTC 2024

Modified Files:
src/sys/netinet: sctp_asconf.c
src/sys/netinet6: in6_ifattach.c nd6.c

Log Message:
Fix invalid IPv6 route when ipsecif(4) is deleted tunnel.  Pointed out by 
ohishi@IIJ.

The pointed bug is fixed by modification in nd6_need_cache().
Others are similar bugs.

XXX pullup-9, 10


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/netinet/sctp_asconf.c
cvs rdiff -u -r1.121 -r1.122 src/sys/netinet6/in6_ifattach.c
cvs rdiff -u -r1.281 -r1.282 src/sys/netinet6/nd6.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/netinet/sctp_asconf.c
diff -u src/sys/netinet/sctp_asconf.c:1.13 src/sys/netinet/sctp_asconf.c:1.14
--- src/sys/netinet/sctp_asconf.c:1.13	Fri Feb  9 22:08:37 2024
+++ src/sys/netinet/sctp_asconf.c	Thu Apr 11 07:34:37 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: sctp_asconf.c,v 1.13 2024/02/09 22:08:37 andvar Exp $ */
+/*	$NetBSD: sctp_asconf.c,v 1.14 2024/04/11 07:34:37 knakahara Exp $ */
 /*	$KAME: sctp_asconf.c,v 1.25 2005/06/16 20:44:24 jinmei Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.13 2024/02/09 22:08:37 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.14 2024/04/11 07:34:37 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -1540,6 +1540,7 @@ sctp_is_desired_interface_type(struct if
 	case IFT_XETHER:
 	case IFT_SLIP:
 	case IFT_GIF:
+	case IFT_IPSEC:
 		result = 1;
 		break;
 	default:

Index: src/sys/netinet6/in6_ifattach.c
diff -u src/sys/netinet6/in6_ifattach.c:1.121 src/sys/netinet6/in6_ifattach.c:1.122
--- src/sys/netinet6/in6_ifattach.c:1.121	Thu Dec 22 02:52:35 2022
+++ src/sys/netinet6/in6_ifattach.c	Thu Apr 11 07:34:37 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_ifattach.c,v 1.121 2022/12/22 02:52:35 msaitoh Exp $	*/
+/*	$NetBSD: in6_ifattach.c,v 1.122 2024/04/11 07:34:37 knakahara Exp $	*/
 /*	$KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.121 2022/12/22 02:52:35 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.122 2024/04/11 07:34:37 knakahara Exp $");
 
 #include 
 #include 
@@ -262,6 +262,7 @@ in6_get_hw_ifid(struct ifnet *ifp, struc
 		break;
 
 	case IFT_GIF:
+	case IFT_IPSEC:
 #ifdef IFT_STF
 	case IFT_STF:
 #endif

Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.281 src/sys/netinet6/nd6.c:1.282
--- src/sys/netinet6/nd6.c:1.281	Sat Dec  9 15:21:02 2023
+++ src/sys/netinet6/nd6.c	Thu Apr 11 07:34:37 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6.c,v 1.281 2023/12/09 15:21:02 pgoyette Exp $	*/
+/*	$NetBSD: nd6.c,v 1.282 2024/04/11 07:34:37 knakahara Exp $	*/
 /*	$KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.281 2023/12/09 15:21:02 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.282 2024/04/11 07:34:37 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1655,6 +1655,7 @@ nd6_need_cache(struct ifnet *ifp)
 	case IFT_IEEE1394:
 	case IFT_CARP:
 	case IFT_GIF:		/* XXX need more cases? */
+	case IFT_IPSEC:
 	case IFT_PPP:
 	case IFT_TUNNEL:
 		return 1;



CVS commit: src/sys

2024-04-11 Thread Kengo NAKAHARA
Module Name:src
Committed By:   knakahara
Date:   Thu Apr 11 07:34:37 UTC 2024

Modified Files:
src/sys/netinet: sctp_asconf.c
src/sys/netinet6: in6_ifattach.c nd6.c

Log Message:
Fix invalid IPv6 route when ipsecif(4) is deleted tunnel.  Pointed out by 
ohishi@IIJ.

The pointed bug is fixed by modification in nd6_need_cache().
Others are similar bugs.

XXX pullup-9, 10


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/netinet/sctp_asconf.c
cvs rdiff -u -r1.121 -r1.122 src/sys/netinet6/in6_ifattach.c
cvs rdiff -u -r1.281 -r1.282 src/sys/netinet6/nd6.c

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



CVS commit: src/usr.sbin/sysinst

2024-04-11 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Thu Apr 11 06:42:18 UTC 2024

Modified Files:
src/usr.sbin/sysinst: mbr.c

Log Message:
fix typo in method name: part_attr_fornat_str -> part_attr_format_str.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/sysinst/mbr.c

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

Modified files:

Index: src/usr.sbin/sysinst/mbr.c
diff -u src/usr.sbin/sysinst/mbr.c:1.47 src/usr.sbin/sysinst/mbr.c:1.48
--- src/usr.sbin/sysinst/mbr.c:1.47	Thu Feb  8 20:51:24 2024
+++ src/usr.sbin/sysinst/mbr.c	Thu Apr 11 06:42:18 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbr.c,v 1.47 2024/02/08 20:51:24 andvar Exp $ */
+/*	$NetBSD: mbr.c,v 1.48 2024/04/11 06:42:18 andvar Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -2829,7 +2829,7 @@ struct part_attr_set_data {
 };
 
 static bool
-part_attr_fornat_str(const struct disk_partitions *arg, part_id id,
+part_attr_format_str(const struct disk_partitions *arg, part_id id,
 const mbr_info_t *mb, int i, bool primary,
 const struct mbr_partition *mp, void *cookie)
 {
@@ -2942,7 +2942,7 @@ mbr_custom_attribute_format(const struct
 	data.parts = parts;
 	data.info = info;
 
-	return mbr_part_apply(arg, id, part_attr_fornat_str, );
+	return mbr_part_apply(arg, id, part_attr_format_str, );
 }
 
 static bool



CVS commit: src/usr.sbin/sysinst

2024-04-11 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Thu Apr 11 06:42:18 UTC 2024

Modified Files:
src/usr.sbin/sysinst: mbr.c

Log Message:
fix typo in method name: part_attr_fornat_str -> part_attr_format_str.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/sysinst/mbr.c

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



Re: CVS commit: src

2024-04-11 Thread Rin Okuyama

Hi,

Periodic snapshot build fails for (probably) all platforms with
MKCOMPAT enabled:

http://releng.netbsd.org/builds/HEAD/202404101150Z/

Please take a look. And more importantly, careful tests are
always appreciated before commit. To be fair, there are tons of
combinations of mk.conf variables, although ;)

Thanks,
rin

On 2024/04/10 0:17, Nia Alarie wrote:

Module Name:src
Committed By:   nia
Date:   Tue Apr  9 15:17:25 UTC 2024

Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
src/distrib/sets: maketars regpkgset sets.subr
src/distrib/sets/lists/base: ad.aarch64 ad.arm ad.mips ad.powerpc
md.amd64 md.sparc64 mi shl.mi
src/distrib/sets/lists/debug: ad.aarch64 md.amd64 md.sparc64 mi shl.mi
src/distrib/sets/lists/etc: mi
src/distrib/sets/lists/man: mi
src/distrib/utils/embedded: mkimage
src/usr.sbin/sysinst: Makefile.inc defs.h msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl util.c
src/usr.sbin/sysinst/arch/amd64: md.h
src/usr.sbin/sysinst/arch/evbarm: md.h
Added Files:
src/distrib/sets/lists/base32: ad.aarch64 ad.mips64eb ad.mips64el
ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
md.sparc64 mi
src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el
ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
md.sparc64 mi
src/distrib/sets/lists/manhtml: mi

Log Message:
Add new sets: base32, debug32, manhtml

- base32 contains (when MKCOMPAT=yes) shared libraries for 32-bit
   compatibility, previously included in base

- debug32 contains (when MKCOMPAT=yes) debug symbols and static libraries
   containing debug symbols for 32-bit compatiblity, previously included
   in debug

- manhtml contains (when MKHTML=yes) the HTML files previously included
   in 'man', which are of limited utility without third-party software.

The motivation for this change is to be able to easily exclude sets
from CD-ROM images that go over the size limit without xz compression
(which many NetBSD platforms struggle to extract at acceptable speeds).


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/maketars
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/regpkgset
cvs rdiff -u -r1.204 -r1.205 src/distrib/sets/sets.subr
cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/base/ad.powerpc
cvs rdiff -u -r1.296 -r1.297 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.262 -r1.263 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.1341 -r1.1342 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.978 -r1.979 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/base32/ad.aarch64 \
 src/distrib/sets/lists/base32/ad.mips64eb \
 src/distrib/sets/lists/base32/ad.mips64el \
 src/distrib/sets/lists/base32/ad.mipsn64eb \
 src/distrib/sets/lists/base32/ad.mipsn64el \
 src/distrib/sets/lists/base32/ad.powerpc64 \
 src/distrib/sets/lists/base32/ad.riscv64 \
 src/distrib/sets/lists/base32/md.amd64 \
 src/distrib/sets/lists/base32/md.sparc64 src/distrib/sets/lists/base32/mi
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/debug/ad.aarch64
cvs rdiff -u -r1.123 -r1.124 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/lists/debug/md.sparc64
cvs rdiff -u -r1.430 -r1.431 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.339 -r1.340 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/debug32/ad.aarch64 \
 src/distrib/sets/lists/debug32/ad.mips64eb \
 src/distrib/sets/lists/debug32/ad.mips64el \
 src/distrib/sets/lists/debug32/ad.mipsn64eb \
 src/distrib/sets/lists/debug32/ad.mipsn64el \
 src/distrib/sets/lists/debug32/ad.powerpc64 \
 src/distrib/sets/lists/debug32/ad.riscv64 \
 src/distrib/sets/lists/debug32/md.amd64 \
 src/distrib/sets/lists/debug32/md.sparc64 \
 src/distrib/sets/lists/debug32/mi
cvs rdiff -u -r1.273 -r1.274 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1771 -r1.1772 src/distrib/sets/lists/man/mi
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/manhtml/mi
cvs rdiff -u -r1.81 -r1.82 src/distrib/utils/embedded/mkimage
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.90 -r1.91 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.45 -r1.46 src/usr.sbin/sysinst/msg.mi.de \
 src/usr.sbin/sysinst/msg.mi.fr
cvs rdiff -u -r1.48 -r1.49 src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/sysinst/msg.mi.pl
cvs rdiff -u -r1.74 -r1.75 src/usr.sbin/sysinst/util.c
cvs rdiff -u 

CVS commit: src

2024-04-11 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Thu Apr 11 06:20:29 UTC 2024

Modified Files:
src: UPDATING

Log Message:
UPDATING: note new sets


To generate a diff of this commit:
cvs rdiff -u -r1.346 -r1.347 src/UPDATING

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

Modified files:

Index: src/UPDATING
diff -u src/UPDATING:1.346 src/UPDATING:1.347
--- src/UPDATING:1.346	Thu Apr 11 02:15:39 2024
+++ src/UPDATING	Thu Apr 11 06:20:29 2024
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.346 2024/04/11 02:15:39 riastradh Exp $
+$NetBSD: UPDATING,v 1.347 2024/04/11 06:20:29 nia Exp $
 
 This file (UPDATING) is intended to be a brief reference to recent
 changes that might cause problems in the build process, and a guide for
@@ -24,6 +24,10 @@ Recent changes:
 	$DESTDIR/var/run/named (and, potentially,
 	$DESTDIR/var/run/lwresd) in order to avoid checkflist failure.
 
+20240409:
+	32-bit compatibility libraries were moved into the base32
+	and debug32 sets.  HTML man pages were moved into the manhtml set.
+
 20230828:
 	If:
 - you updated to current and ran postinstall between 20230826



CVS commit: src

2024-04-11 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Thu Apr 11 06:20:29 UTC 2024

Modified Files:
src: UPDATING

Log Message:
UPDATING: note new sets


To generate a diff of this commit:
cvs rdiff -u -r1.346 -r1.347 src/UPDATING

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