CVS commit: src/external/bsd/nvi/dist/docs/vi.man

2024-04-28 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Mon Apr 29 00:50:43 UTC 2024

Modified Files:
src/external/bsd/nvi/dist/docs/vi.man: vi.1

Log Message:
Remove documentation for long removed -F option

Suggested by Robert Whitlock in PR bin/58177

I've sent this patch to the nvi maintainers but the response suggested
patching this downstream, as there would be no further releases of nvi.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/nvi/dist/docs/vi.man/vi.1

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

Modified files:

Index: src/external/bsd/nvi/dist/docs/vi.man/vi.1
diff -u src/external/bsd/nvi/dist/docs/vi.man/vi.1:1.7 src/external/bsd/nvi/dist/docs/vi.man/vi.1:1.8
--- src/external/bsd/nvi/dist/docs/vi.man/vi.1:1.7	Fri Sep 14 13:19:15 2018
+++ src/external/bsd/nvi/dist/docs/vi.man/vi.1	Mon Apr 29 00:50:42 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: vi.1,v 1.7 2018/09/14 13:19:15 rin Exp $
+.\"	$NetBSD: vi.1,v 1.8 2024/04/29 00:50:42 maya Exp $
 .\"
 .\" Copyright (c) 1994
 .\" The Regents of the University of California.  All rights reserved.
@@ -12,14 +12,14 @@
 .\"
 .\" Id: vi.1,v 8.53 2001/01/28 13:20:06 skimo Exp  (Berkeley) Date: 2001/01/28 13:20:06 
 .\"
-.TH VI 1 "September 14, 2018"
+.TH VI 1 "April 28, 2024"
 .UC
 .SH NAME
 ex, vi, view \- text editors
 .SH SYNOPSIS
 .B ex
 [\c
-.B -eFGRrSsv\c
+.B -eGRrSsv\c
 ] [\c
 .BI -c " cmd"\c
 ] [\c
@@ -30,7 +30,7 @@ ex, vi, view \- text editors
 .br
 .B vi
 [\c
-.B -eFlRrSv\c
+.B -elRrSv\c
 ] [\c
 .BI -c " cmd"\c
 ] [\c
@@ -41,7 +41,7 @@ ex, vi, view \- text editors
 .br
 .B view
 [\c
-.B -eFGRrSv\c
+.B -eGRrSv\c
 ] [\c
 .BI -c " cmd"\c
 ] [\c
@@ -115,11 +115,6 @@ supports both the old and new syntax.
 Start editing in ex mode, as if the command name were
 .IR \&ex .
 .TP
-.B \-F
-Don't copy the entire file when first starting to edit.
-(The default is to make a copy in case someone else modifies
-the file during your edit session.)
-.TP
 .B \-G
 Start editing in gtags mode, as if the gtagsmode option was set.
 .TP



CVS commit: src/external/bsd/nvi/dist/docs/vi.man

2024-04-28 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Mon Apr 29 00:50:43 UTC 2024

Modified Files:
src/external/bsd/nvi/dist/docs/vi.man: vi.1

Log Message:
Remove documentation for long removed -F option

Suggested by Robert Whitlock in PR bin/58177

I've sent this patch to the nvi maintainers but the response suggested
patching this downstream, as there would be no further releases of nvi.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/nvi/dist/docs/vi.man/vi.1

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



CVS commit: src/sbin/cgdconfig

2024-04-28 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Mon Apr 29 00:28:18 UTC 2024

Modified Files:
src/sbin/cgdconfig: cgdconfig.c

Log Message:
cgdconfig(8): KNF in cgdconfig.c.

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sbin/cgdconfig/cgdconfig.c

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

Modified files:

Index: src/sbin/cgdconfig/cgdconfig.c
diff -u src/sbin/cgdconfig/cgdconfig.c:1.61 src/sbin/cgdconfig/cgdconfig.c:1.62
--- src/sbin/cgdconfig/cgdconfig.c:1.61	Thu Nov 17 06:40:38 2022
+++ src/sbin/cgdconfig/cgdconfig.c	Mon Apr 29 00:28:18 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.61 2022/11/17 06:40:38 chs Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.62 2024/04/29 00:28:18 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 2002, 2003\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: cgdconfig.c,v 1.61 2022/11/17 06:40:38 chs Exp $");
+__RCSID("$NetBSD: cgdconfig.c,v 1.62 2024/04/29 00:28:18 riastradh Exp $");
 #endif
 
 #ifdef HAVE_ARGON2
@@ -1507,7 +1507,8 @@ iv_method(int mode)
 
 
 static void
-show(const char *dev) {
+show(const char *dev)
+{
 	char path[64];
 	struct cgd_user cgu;
 	int fd;
@@ -1532,11 +1533,13 @@ show(const char *dev) {
 	}
 
 	dev = devname(cgu.cgu_dev, S_IFBLK);
-	if (dev != NULL)
+	if (dev != NULL) {
 		printf("%s ", dev);
-	else
-		printf("dev %llu,%llu ", (unsigned long long)major(cgu.cgu_dev),
+	} else {
+		printf("dev %llu,%llu ",
+		(unsigned long long)major(cgu.cgu_dev),
 		(unsigned long long)minor(cgu.cgu_dev));
+	}
 
 	if (verbose)
 		printf("%s ", cgu.cgu_alg);



CVS commit: src/sbin/cgdconfig

2024-04-28 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Mon Apr 29 00:28:18 UTC 2024

Modified Files:
src/sbin/cgdconfig: cgdconfig.c

Log Message:
cgdconfig(8): KNF in cgdconfig.c.

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sbin/cgdconfig/cgdconfig.c

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



CVS commit: src/lib/libc/sys

2024-04-28 Thread Valery Ushakov
Module Name:src
Committed By:   uwe
Date:   Sun Apr 28 23:10:26 UTC 2024

Modified Files:
src/lib/libc/sys: execve.2

Log Message:
execve(2): brush up markup


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/lib/libc/sys/execve.2

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/sys/execve.2
diff -u src/lib/libc/sys/execve.2:1.46 src/lib/libc/sys/execve.2:1.47
--- src/lib/libc/sys/execve.2:1.46	Sun Apr 28 22:21:21 2024
+++ src/lib/libc/sys/execve.2	Sun Apr 28 23:10:26 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: execve.2,v 1.46 2024/04/28 22:21:21 rillig Exp $
+.\"	$NetBSD: execve.2,v 1.47 2024/04/28 23:10:26 uwe Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -75,35 +75,32 @@ and
 .Xr a.out 5 .
 .Pp
 An interpreter file begins with a line of the form:
-.Pp
-.Bd -ragged -offset indent -compact
-.Sy \&#!
-.Em interpreter
-.Bq Em arg
+.Bd -ragged -offset indent
+.Ic \&#! Ns Ar interpreter Op Ar arg
 .Ed
 .Pp
 When an interpreter file is
-.Sy execve Ap d ,
+.Nm Ap d ,
 the system actually
-.Sy execve Ap s
+.Nm Ap s
 the specified
-.Em interpreter .
+.Ar interpreter .
 If the optional
-.Em arg
+.Ar arg
 is specified, it becomes the first argument to the
-.Em interpreter ,
+.Ar interpreter ,
 and the name of the originally
-.Sy execve Ap d
+.Nm Ap d
 file becomes the second argument;
 otherwise, the name of the originally
-.Sy execve Ap d
+.Nm Ap d
 file becomes the first argument.
 The original arguments are shifted over to become the subsequent arguments.
 The zeroth argument, normally the name of the
-.Fn execve Ns d
+.Nm Ap d
 file, is left unchanged.
 The interpreter named by
-.Em interpreter
+.Ar interpreter
 must not itself be an interpreter file.
 (See
 .Xr script 7
@@ -127,8 +124,8 @@ character pointers to null-terminated st
 A pointer to this array is normally stored in the global variable
 .Va environ .
 These strings pass information to the
-new process that is not directly an argument to the command (see
-.Xr environ 7 ) .
+new process that is not directly an argument to the command
+.Pq see Xr environ 7 .
 .Pp
 File descriptors open in the calling process image remain open in
 the new process image, except for those for which the close-on-exec
@@ -140,12 +137,18 @@ Descriptors that remain open are unaffec
 .Fn execve .
 .Pp
 In the case of a new setuid or setgid executable being executed, if
-file descriptors 0, 1, or 2 (representing stdin, stdout, and stderr)
+file descriptors 0, 1, or 2
+.Po
+representing
+.Em stdin , stdout ,
+and
+.Em stderr
+.Pc
 are currently unallocated, these descriptors will be opened to point to
 some system file like
 .Pa /dev/null .
 The intent is to ensure these descriptors are not unallocated, since
-many libraries make assumptions about the use of these 3 file descriptors.
+many libraries make assumptions about the use of these three file descriptors.
 .Pp
 Signals set to be ignored in the calling process are set to be ignored in
 the new process.
@@ -157,8 +160,7 @@ The signal stack is reset to be undefine
 for more information).
 .Pp
 If the set-user-ID mode bit of the new process image file is set
-(see
-.Xr chmod 2 ) ,
+.Pq see Xr chmod 2 ,
 the effective user ID of the new process image is set to the owner ID
 of the new process image file.
 If the set-group-ID mode bit of the new process image file is set,
@@ -171,8 +173,8 @@ process image.
 After any set-user-ID and set-group-ID processing,
 the effective user ID is recorded as the saved set-user-ID,
 and the effective group ID is recorded as the saved set-group-ID.
-These values may be used in changing the effective IDs later (see
-.Xr setuid 2 ) .
+These values may be used in changing the effective IDs later
+.Pq see Xr setuid 2 .
 The set-ID bits are not honored if the respective file system has the
 .Cm nosuid
 option enabled or if the new process file is an interpreter file.
@@ -182,20 +184,19 @@ tracing is disabled if effective IDs are
 The new process also inherits the following attributes from
 the calling process:
 .Pp
-.Bl -column parent_process_ID -offset indent -compact
-.It process ID Ta see Xr getpid 2
+.Bl -column "parent process ID" -offset indent -compact
+.It process IDTa see Xr getpid 2
 .It parent process ID Ta see Xr getppid 2
-.It process group ID Ta see Xr getpgrp 2
-.It access groups Ta see Xr getgroups 2
+.It process group ID  Ta see Xr getpgrp 2
+.It access groups Ta see Xr getgroups 2
 .It working directory Ta see Xr chdir 2
-.It root directory Ta see Xr chroot 2
-.It control terminal Ta see Xr termios 4
-.It resource usages Ta see Xr getrusage 2
-.It interval timers Ta see Xr getitimer 2
-.It resource limits Ta see Xr getrlimit 2
-.It file mode mask Ta see Xr umask 2
-.It signal mask Ta see Xr sigaction 2 ,
-.Xr sigprocmask 2
+.It root directoryTa see Xr chroot 2
+.It

CVS commit: src/lib/libc/sys

2024-04-28 Thread Valery Ushakov
Module Name:src
Committed By:   uwe
Date:   Sun Apr 28 23:10:26 UTC 2024

Modified Files:
src/lib/libc/sys: execve.2

Log Message:
execve(2): brush up markup


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/lib/libc/sys/execve.2

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



CVS commit: src/lib/libc/gen

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 22:57:16 UTC 2024

Modified Files:
src/lib/libc/gen: time.3

Log Message:
time.3: clarify that *tloc is always set if tloc != NULL


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/gen/time.3

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/gen/time.3
diff -u src/lib/libc/gen/time.3:1.16 src/lib/libc/gen/time.3:1.17
--- src/lib/libc/gen/time.3:1.16	Sat Nov  5 18:17:29 2011
+++ src/lib/libc/gen/time.3	Sun Apr 28 22:57:16 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: time.3,v 1.16 2011/11/05 18:17:29 christos Exp $
+.\"	$NetBSD: time.3,v 1.17 2024/04/28 22:57:16 rillig Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\" @(#)time.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd November 5, 2011
+.Dd April 29, 2024
 .Dt TIME 3
 .Os
 .Sh NAME
@@ -52,21 +52,17 @@ function
 returns the value of time in seconds since 0 hours, 0 minutes,
 0 seconds, January 1, 1970, Coordinated Universal Time.
 .Pp
-A copy of the time value may be saved to the area indicated by the
-pointer
-.Fa tloc .
 If
 .Fa tloc
-is a
-.Dv NULL
-pointer, no value is stored.
+is not a null pointer, a copy of the time value is saved in
+.Fa *tloc .
 .Pp
 Upon successful completion,
 .Fn time
 returns the value of time.
 Otherwise a value of
 .Po
-.Po Fa time_t Pc \-1
+.Po Fa time_t Pc Ns \-1
 .Pc
 is returned and the global variable
 .Va errno



CVS commit: src/lib/libc/gen

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 22:57:16 UTC 2024

Modified Files:
src/lib/libc/gen: time.3

Log Message:
time.3: clarify that *tloc is always set if tloc != NULL


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/gen/time.3

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



CVS commit: src/lib/libc/gen

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 22:43:30 UTC 2024

Modified Files:
src/lib/libc/gen: setmode.3

Log Message:
setmode.3: fix typos


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/lib/libc/gen/setmode.3

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/gen/setmode.3
diff -u src/lib/libc/gen/setmode.3:1.23 src/lib/libc/gen/setmode.3:1.24
--- src/lib/libc/gen/setmode.3:1.23	Sat Mar 12 17:31:39 2022
+++ src/lib/libc/gen/setmode.3	Sun Apr 28 22:43:30 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: setmode.3,v 1.23 2022/03/12 17:31:39 christos Exp $
+.\"	$NetBSD: setmode.3,v 1.24 2024/04/28 22:43:30 rillig Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -51,16 +51,15 @@ function accepts a string representation
 compiles it to binary form, and returns an abstract representation
 that may be passed to
 .Fn getmode .
-The string may be an numeric (octal) or symbolic string of the form
+The string may be a numeric (octal) or symbolic string of the form
 accepted by
 .Xr chmod 1 ,
 and may represent either an exact mode to set or a change to make to
-the existing mode.
+an existing mode.
 .Pp
 The
 .Fn getmode
-function
-adjusts the file permission bits given by
+function adjusts the file permission bits given by
 .Fa mode
 according to the compiled change representation
 .Fa set ,
@@ -116,7 +115,7 @@ or
 .Xr strtol 3 .
 In addition,
 .Fn setmode
-will fail and set
+may fail and set
 .Va errno
 to:
 .Bl -tag -width Er



CVS commit: src/lib/libc/gen

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 22:43:30 UTC 2024

Modified Files:
src/lib/libc/gen: setmode.3

Log Message:
setmode.3: fix typos


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/lib/libc/gen/setmode.3

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



CVS commit: src/lib/libc/sys

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 22:21:21 UTC 2024

Modified Files:
src/lib/libc/sys: execve.2

Log Message:
execve.2: fix typo in markup


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/lib/libc/sys/execve.2

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/sys/execve.2
diff -u src/lib/libc/sys/execve.2:1.45 src/lib/libc/sys/execve.2:1.46
--- src/lib/libc/sys/execve.2:1.45	Wed Sep 18 04:57:53 2019
+++ src/lib/libc/sys/execve.2	Sun Apr 28 22:21:21 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: execve.2,v 1.45 2019/09/18 04:57:53 wiz Exp $
+.\"	$NetBSD: execve.2,v 1.46 2024/04/28 22:21:21 rillig Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -83,7 +83,7 @@ An interpreter file begins with a line o
 .Ed
 .Pp
 When an interpreter file is
-.Sy execve Ar d ,
+.Sy execve Ap d ,
 the system actually
 .Sy execve Ap s
 the specified



CVS commit: src/lib/libc/sys

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 22:21:21 UTC 2024

Modified Files:
src/lib/libc/sys: execve.2

Log Message:
execve.2: fix typo in markup


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/lib/libc/sys/execve.2

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



Re: CVS commit: src/sys/dev/acpi

2024-04-28 Thread Taylor R Campbell
> Module Name:src
> Committed By:   christos
> Date:   Fri Apr 26 18:19:18 UTC 2024
> 
> Modified Files:
> src/sys/dev/acpi: acpi_bat.c
> 
> Log Message:
> PR/58201: Malte Dehling: re-order sysmon initialization before acpi
> registration, to avoid needing to call to acpi_deregister_notify on sysmon
> failure.

This isn't really a bug: the detach function calls
acpi_deregister_notify.  Now, with this change, it will call
acpi_deregister_notify even if acpi_register_notify was never called.

Fortunately, that's mostly harmless in the current implementation --
just as it was harmless to leave the notifier there; it doesn't use
any memory that would be leaked.

(Really, if there's any bug here, it's that sysmon_envsys_register can
fail at all.  This creates vast swaths of never-tested error branches
that waste maintainer and auditor time.)


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

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 18:55:04 UTC 2024

Modified Files:
src/distrib/sets/lists/debug: mi

Log Message:
tests/cd9660: add debug info to the file list


To generate a diff of this commit:
cvs rdiff -u -r1.433 -r1.434 src/distrib/sets/lists/debug/mi

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

Modified files:

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.433 src/distrib/sets/lists/debug/mi:1.434
--- src/distrib/sets/lists/debug/mi:1.433	Sun Apr 28 01:21:26 2024
+++ src/distrib/sets/lists/debug/mi	Sun Apr 28 18:55:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.433 2024/04/28 01:21:26 riastradh Exp $
+# $NetBSD: mi,v 1.434 2024/04/28 18:55:04 rillig Exp $
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib	comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib
@@ -1681,6 +1681,7 @@
 ./usr/libdata/debug/usr/tests/dev/scsipi/t_cd.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/dev/sysmon/t_swwdog.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/dev/usb/t_hid.debug			tests-fs-debug		debug,atf,rump
+./usr/libdata/debug/usr/tests/fs/cd9660/h_hexdump_r.debug		tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/ffs/h_ffs_server.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/ffs/h_quota2_server.debug		tests-obsolete		obsolete,compattestfile
 ./usr/libdata/debug/usr/tests/fs/ffs/h_quota2_tests.debug		tests-fs-debug		debug,atf,rump



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

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 18:55:04 UTC 2024

Modified Files:
src/distrib/sets/lists/debug: mi

Log Message:
tests/cd9660: add debug info to the file list


To generate a diff of this commit:
cvs rdiff -u -r1.433 -r1.434 src/distrib/sets/lists/debug/mi

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



CVS commit: src/libexec/httpd

2024-04-28 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Sun Apr 28 17:12:30 UTC 2024

Modified Files:
src/libexec/httpd: CHANGES bozohttpd.8 bozohttpd.c

Log Message:
Bump bozohttpd version to today for mobile-friendly directory listing


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.96 -r1.97 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.146 -r1.147 src/libexec/httpd/bozohttpd.c

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

Modified files:

Index: src/libexec/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.55 src/libexec/httpd/CHANGES:1.56
--- src/libexec/httpd/CHANGES:1.55	Fri Jan 26 23:19:44 2024
+++ src/libexec/httpd/CHANGES	Sun Apr 28 17:12:30 2024
@@ -1,4 +1,7 @@
-$NetBSD: CHANGES,v 1.55 2024/01/26 23:19:44 mrg Exp $
+$NetBSD: CHANGES,v 1.56 2024/04/28 17:12:30 maya Exp $
+
+changes in bozohttpd 20240428:
+	o  make directory listings mobile friendly. from D. Bohdan.
 
 changes in bozohttpd 20240126:
 	o  add some more default mime types.

Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.96 src/libexec/httpd/bozohttpd.8:1.97
--- src/libexec/httpd/bozohttpd.8:1.96	Sun Feb  4 05:54:20 2024
+++ src/libexec/httpd/bozohttpd.8	Sun Apr 28 17:12:30 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: bozohttpd.8,v 1.96 2024/02/04 05:54:20 mrg Exp $
+.\"	$NetBSD: bozohttpd.8,v 1.97 2024/04/28 17:12:30 maya Exp $
 .\"
 .\"	$eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\"
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd Jan 26, 2024
+.Dd Apr 28, 2024
 .Dt BOZOHTTPD 8
 .Os
 .Sh NAME
@@ -664,7 +664,7 @@ The focus has always been simplicity and
 and regular code audits.
 This manual documents
 .Nm
-version 20240126.
+version 20240428.
 .Sh AUTHORS
 .An -nosplit
 .Nm

Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.146 src/libexec/httpd/bozohttpd.c:1.147
--- src/libexec/httpd/bozohttpd.c:1.146	Fri Jan 26 23:19:44 2024
+++ src/libexec/httpd/bozohttpd.c	Sun Apr 28 17:12:30 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: bozohttpd.c,v 1.146 2024/01/26 23:19:44 mrg Exp $	*/
+/*	$NetBSD: bozohttpd.c,v 1.147 2024/04/28 17:12:30 maya Exp $	*/
 
 /*	$eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -108,7 +108,7 @@
 #define INDEX_HTML		"index.html"
 #endif
 #ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE		"bozohttpd/20240126"
+#define SERVER_SOFTWARE		"bozohttpd/20240428"
 #endif
 #ifndef PUBLIC_HTML
 #define PUBLIC_HTML		"public_html"



CVS commit: src/libexec/httpd

2024-04-28 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Sun Apr 28 17:12:30 UTC 2024

Modified Files:
src/libexec/httpd: CHANGES bozohttpd.8 bozohttpd.c

Log Message:
Bump bozohttpd version to today for mobile-friendly directory listing


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.96 -r1.97 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.146 -r1.147 src/libexec/httpd/bozohttpd.c

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/drm2/linux

2024-04-28 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Apr 28 15:35:39 UTC 2024

Modified Files:
src/sys/external/bsd/drm2/linux: linux_sync_file.c

Log Message:
linux_sync_file: Fix missing init/fini steps.

Noted by rjs@.

PR kern/58210


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/linux/linux_sync_file.c

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/drm2/linux

2024-04-28 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Apr 28 15:35:39 UTC 2024

Modified Files:
src/sys/external/bsd/drm2/linux: linux_sync_file.c

Log Message:
linux_sync_file: Fix missing init/fini steps.

Noted by rjs@.

PR kern/58210


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/linux/linux_sync_file.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/linux/linux_sync_file.c
diff -u src/sys/external/bsd/drm2/linux/linux_sync_file.c:1.2 src/sys/external/bsd/drm2/linux/linux_sync_file.c:1.3
--- src/sys/external/bsd/drm2/linux/linux_sync_file.c:1.2	Sat Feb 12 15:51:29 2022
+++ src/sys/external/bsd/drm2/linux/linux_sync_file.c	Sun Apr 28 15:35:39 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_sync_file.c,v 1.2 2022/02/12 15:51:29 thorpej Exp $	*/
+/*	$NetBSD: linux_sync_file.c,v 1.3 2024/04/28 15:35:39 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: linux_sync_file.c,v 1.2 2022/02/12 15:51:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sync_file.c,v 1.3 2024/04/28 15:35:39 riastradh Exp $");
 
 #include 
 #include 
@@ -51,15 +51,17 @@ sync_file_create(struct dma_fence *fence
 
 	sf = kmem_zalloc(sizeof(*sf), KM_SLEEP);
 	sf->file = fp;
-	sf->sf_fence = dma_fence_get(fence);
+
 	mutex_init(&sf->sf_lock, MUTEX_DEFAULT, IPL_VM);
 	selinit(&sf->sf_selq);
 	sf->sf_polling = false;
 	sf->sf_signalled = false;
+	sf->sf_fence = dma_fence_get(fence);
 
 	fp->f_type = DTYPE_MISC;
 	fp->f_flag = FREAD | FWRITE;
 	fp->f_ops = &sync_file_ops;
+	fp->f_data = sf;
 
 	return sf;
 }
@@ -73,6 +75,8 @@ sync_file_close(struct file *fp)
 		dma_fence_remove_callback(sf->sf_fence, &sf->sf_fcb);
 	dma_fence_put(sf->sf_fence);
 	sf->sf_fence = NULL;
+	seldestroy(&sf->sf_selq);
+	mutex_destroy(&sf->sf_lock);
 
 	kmem_free(sf, sizeof(*sf));
 



CVS commit: src/usr.bin/make

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 15:10:19 UTC 2024

Modified Files:
src/usr.bin/make: buf.c buf.h var.c

Log Message:
make: don't reallocate memory after evaluating an expression

When an expression is evaluated, the resulting text is short-lived in
almost all cases.  In particular, the compaction neither affects the
target names nor the global variable values, which are the prime
candidates for permanent memory usage.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/make/buf.c
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/make/buf.h
cvs rdiff -u -r1.1107 -r1.1108 src/usr.bin/make/var.c

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



CVS commit: src/usr.bin/make

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 15:10:19 UTC 2024

Modified Files:
src/usr.bin/make: buf.c buf.h var.c

Log Message:
make: don't reallocate memory after evaluating an expression

When an expression is evaluated, the resulting text is short-lived in
almost all cases.  In particular, the compaction neither affects the
target names nor the global variable values, which are the prime
candidates for permanent memory usage.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/make/buf.c
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/make/buf.h
cvs rdiff -u -r1.1107 -r1.1108 src/usr.bin/make/var.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/make/buf.c
diff -u src/usr.bin/make/buf.c:1.57 src/usr.bin/make/buf.c:1.58
--- src/usr.bin/make/buf.c:1.57	Tue Dec 19 19:33:39 2023
+++ src/usr.bin/make/buf.c	Sun Apr 28 15:10:19 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: buf.c,v 1.57 2023/12/19 19:33:39 rillig Exp $	*/
+/*	$NetBSD: buf.c,v 1.58 2024/04/28 15:10:19 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -75,7 +75,7 @@
 #include "make.h"
 
 /*	"@(#)buf.c	8.1 (Berkeley) 6/6/93"	*/
-MAKE_RCSID("$NetBSD: buf.c,v 1.57 2023/12/19 19:33:39 rillig Exp $");
+MAKE_RCSID("$NetBSD: buf.c,v 1.58 2024/04/28 15:10:19 rillig Exp $");
 
 /* Make space in the buffer for adding at least 16 more bytes. */
 void
@@ -187,30 +187,3 @@ Buf_DoneData(Buffer *buf)
 
 	return data;
 }
-
-#ifndef BUF_COMPACT_LIMIT
-# define BUF_COMPACT_LIMIT 128	/* worthwhile saving */
-#endif
-
-/*
- * Return the data from the buffer.
- * Leave the buffer itself in an indeterminate state.
- *
- * If the buffer size is much greater than its content,
- * a new buffer will be allocated and the old one freed.
- */
-char *
-Buf_DoneDataCompact(Buffer *buf)
-{
-#if BUF_COMPACT_LIMIT > 0
-	if (buf->cap - buf->len >= BUF_COMPACT_LIMIT) {
-		/* We trust realloc to be smart */
-		char *data = bmake_realloc(buf->data, buf->len + 1);
-		buf->data = NULL;
-		data[buf->len] = '\0';	/* XXX: unnecessary */
-		Buf_Done(buf);
-		return data;
-	}
-#endif
-	return Buf_DoneData(buf);
-}

Index: src/usr.bin/make/buf.h
diff -u src/usr.bin/make/buf.h:1.49 src/usr.bin/make/buf.h:1.50
--- src/usr.bin/make/buf.h:1.49	Tue Dec 19 19:33:39 2023
+++ src/usr.bin/make/buf.h	Sun Apr 28 15:10:19 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: buf.h,v 1.49 2023/12/19 19:33:39 rillig Exp $	*/
+/*	$NetBSD: buf.h,v 1.50 2024/04/28 15:10:19 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -124,6 +124,5 @@ void Buf_Init(Buffer *);
 void Buf_InitSize(Buffer *, size_t);
 void Buf_Done(Buffer *);
 char *Buf_DoneData(Buffer *) MAKE_ATTR_USE;
-char *Buf_DoneDataCompact(Buffer *) MAKE_ATTR_USE;
 
 #endif

Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1107 src/usr.bin/make/var.c:1.1108
--- src/usr.bin/make/var.c:1.1107	Sat Apr 27 21:26:23 2024
+++ src/usr.bin/make/var.c	Sun Apr 28 15:10:19 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.1107 2024/04/27 21:26:23 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.1108 2024/04/28 15:10:19 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -132,7 +132,7 @@
 #include "metachar.h"
 
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1107 2024/04/27 21:26:23 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1108 2024/04/28 15:10:19 rillig Exp $");
 
 /*
  * Variables are defined using one of the VAR=value assignments.  Their
@@ -4731,7 +4731,7 @@ Var_Subst(const char *str, GNode *scope,
 			VarSubstPlain(&p, &res);
 	}
 
-	return Buf_DoneDataCompact(&res);
+	return Buf_DoneData(&res);
 }
 
 void



CVS commit: src

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 14:39:22 UTC 2024

Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/fs/cd9660: Makefile t_high_ino_big_file.sh
Added Files:
src/tests/fs/cd9660: h_hexdump_r.c pr_48787.image.hex
Removed Files:
src/tests/fs/cd9660: pr_48787.image.bz2.uue

Log Message:
tests/cd9660: replace compressed blob with readable hexdump

This test is skipped in most circumstances because it creates a file
whose apparent size is 4.5 GB.  It's an ISO 9660 image though,
containing mostly null bytes.  Nevertheless, tmpfs doesn't allow such a
big file to be created, so this test is skipped in settings where /tmp
is on a tmpfs.

If the test is run, the ISO image is uncompressed, which takes several
minutes.  Replace bzip2 with direct file creation from a hex dump of
that disk image, which is easier to inspect manually and also faster by
about 3 magnitudes.


To generate a diff of this commit:
cvs rdiff -u -r1.1313 -r1.1314 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.204 -r1.205 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/cd9660/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/cd9660/h_hexdump_r.c \
src/tests/fs/cd9660/pr_48787.image.hex
cvs rdiff -u -r1.1 -r0 src/tests/fs/cd9660/pr_48787.image.bz2.uue
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/cd9660/t_high_ino_big_file.sh

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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1313 src/distrib/sets/lists/tests/mi:1.1314
--- src/distrib/sets/lists/tests/mi:1.1313	Sun Apr 28 01:21:26 2024
+++ src/distrib/sets/lists/tests/mi	Sun Apr 28 14:39:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1313 2024/04/28 01:21:26 riastradh Exp $
+# $NetBSD: mi,v 1.1314 2024/04/28 14:39:22 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -35,6 +35,7 @@
 ./usr/libdata/debug/usr/tests/dev/sysmon		tests-fs-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/dev/usb			tests-fs-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/fs			tests-fs-debug		compattestfile,atf
+./usr/libdata/debug/usr/tests/fs/cd9660			tests-fs-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/fs/ffs			tests-fs-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/fs/fifofs			tests-fs-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/fs/hfs			tests-fs-debug		compattestfile,atf
@@ -1564,7 +1565,9 @@
 ./usr/tests/fs/cd9660	tests-fs-tests		compattestfile,atf
 ./usr/tests/fs/cd9660/Atffiletests-fs-tests		atf,rump
 ./usr/tests/fs/cd9660/Kyuafiletests-fs-tests		atf,rump,kyua
-./usr/tests/fs/cd9660/pr_48787.image.bz2		tests-fs-tests		atf,rump
+./usr/tests/fs/cd9660/h_hexdump_r			tests-fs-tests		atf,rump
+./usr/tests/fs/cd9660/pr_48787.image.bz2		tests-obsolete		obsolete
+./usr/tests/fs/cd9660/pr_48787.image.hex		tests-fs-tests		atf,rump
 ./usr/tests/fs/cd9660/t_high_ino_big_file		tests-fs-tests		atf,rump
 ./usr/tests/fs/ffs	tests-fs-tests		compattestfile,atf
 ./usr/tests/fs/ffs/Atffiletests-fs-tests		atf,rump

Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.204 src/etc/mtree/NetBSD.dist.tests:1.205
--- src/etc/mtree/NetBSD.dist.tests:1.204	Sun Apr 28 01:21:27 2024
+++ src/etc/mtree/NetBSD.dist.tests	Sun Apr 28 14:39:22 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.tests,v 1.204 2024/04/28 01:21:27 riastradh Exp $
+#	$NetBSD: NetBSD.dist.tests,v 1.205 2024/04/28 14:39:22 rillig Exp $
 
 ./usr/libdata/debug/usr/tests
 ./usr/libdata/debug/usr/tests/atf
@@ -26,6 +26,7 @@
 ./usr/libdata/debug/usr/tests/dev/sysmon
 ./usr/libdata/debug/usr/tests/dev/usb
 ./usr/libdata/debug/usr/tests/fs
+./usr/libdata/debug/usr/tests/fs/cd9660
 ./usr/libdata/debug/usr/tests/fs/ffs
 ./usr/libdata/debug/usr/tests/fs/fifofs
 ./usr/libdata/debug/usr/tests/fs/hfs

Index: src/tests/fs/cd9660/Makefile
diff -u src/tests/fs/cd9660/Makefile:1.1 src/tests/fs/cd9660/Makefile:1.2
--- src/tests/fs/cd9660/Makefile:1.1	Sat May 10 14:15:25 2014
+++ src/tests/fs/cd9660/Makefile	Sun Apr 28 14:39:22 2024
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2014/05/10 14:15:25 martin Exp $
+# $NetBSD: Makefile,v 1.2 2024/04/28 14:39:22 rillig Exp $
 
-TESTSDIR=	${TESTSBASE}/fs/cd9660
-WARNS=		4
-FILESDIR=	${TESTSDIR}
+TESTSDIR=		${TESTSBASE}/fs/cd9660
+FILESDIR=		${TESTSDIR}
 
-TESTS_SH=	t_high_ino_big_file
-FILES=		pr_48787.image.bz2
-UUDECODE_FILES= pr_48787.image.bz2
+TESTS_SH=		t_high_ino_big_file
+PROGS=			h_hexdump_r
+MAN.h_hexdump_r=	# none
+BINDIR.h_hexdump_r=	${TESTSDIR}
+FILES=			pr_48787.image.hex
 
 .include 

Index: src/tests/fs/cd9660/t_high_ino_big_file.sh
diff -u src/tests/fs/cd9660/t_high_ino_big_file.sh:1.5 src/tests/fs/cd9660/t_high_ino_big_file.sh:1.6
--- src/tests/fs/cd9660/t_high_ino_big_file.sh:1.5	Sat Dec 30 13:09:24 2023
+++ s

CVS commit: src

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 14:39:22 UTC 2024

Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/fs/cd9660: Makefile t_high_ino_big_file.sh
Added Files:
src/tests/fs/cd9660: h_hexdump_r.c pr_48787.image.hex
Removed Files:
src/tests/fs/cd9660: pr_48787.image.bz2.uue

Log Message:
tests/cd9660: replace compressed blob with readable hexdump

This test is skipped in most circumstances because it creates a file
whose apparent size is 4.5 GB.  It's an ISO 9660 image though,
containing mostly null bytes.  Nevertheless, tmpfs doesn't allow such a
big file to be created, so this test is skipped in settings where /tmp
is on a tmpfs.

If the test is run, the ISO image is uncompressed, which takes several
minutes.  Replace bzip2 with direct file creation from a hex dump of
that disk image, which is easier to inspect manually and also faster by
about 3 magnitudes.


To generate a diff of this commit:
cvs rdiff -u -r1.1313 -r1.1314 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.204 -r1.205 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/cd9660/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/cd9660/h_hexdump_r.c \
src/tests/fs/cd9660/pr_48787.image.hex
cvs rdiff -u -r1.1 -r0 src/tests/fs/cd9660/pr_48787.image.bz2.uue
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/cd9660/t_high_ino_big_file.sh

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



CVS commit: [netbsd-10] src/doc

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:43:59 UTC 2024

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

Log Message:
Tickets #672 - #681


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/doc/CHANGES-10.1

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

Modified files:

Index: src/doc/CHANGES-10.1
diff -u src/doc/CHANGES-10.1:1.1.2.6 src/doc/CHANGES-10.1:1.1.2.7
--- src/doc/CHANGES-10.1:1.1.2.6	Sat Apr 20 13:27:04 2024
+++ src/doc/CHANGES-10.1	Sun Apr 28 13:43:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-10.1,v 1.1.2.6 2024/04/20 13:27:04 martin Exp $
+# $NetBSD: CHANGES-10.1,v 1.1.2.7 2024/04/28 13:43:59 martin Exp $
 
 A complete list of changes from the NetBSD 10.0 release on 2024-03-28
 until the 10.1 release:
@@ -151,3 +151,74 @@ sys/uvm/pmap/pmap.h1.27
 	PR 58006: fix kernel hang in pmap_page_clear_attributes().
 	[skrll, ticket #671]
 
+distrib/sets/lists/xbase/mi			1.175
+external/mit/xorg/bin/xsetwallpaper/Makefile	1.6
+
+	PR 58172: install xsetwallpaper(1) manual page.
+	[jakllsch, ticket #672]
+
+sys/netinet6/frag6.c1.78
+
+	inet6: fix calculation of fragment length.
+	[ozaki-r, ticket #673]
+
+sbin/raidctl/raidctl.81.80
+sbin/raidctl/raidctl.c1.79
+sys/dev/raidframe/raidframeio.h			1.12
+sys/dev/raidframe/rf_diskqueue.c		1.64
+sys/dev/raidframe/rf_diskqueue.h		1.30
+sys/dev/raidframe/rf_disks.c			1.94
+sys/dev/raidframe/rf_disks.h			1.15
+sys/dev/raidframe/rf_driver.c			1.141
+sys/dev/raidframe/rf_netbsdkintf.c		1.414
+sys/dev/raidframe/rf_raid.h			1.52
+sys/dev/raidframe/rf_reconstruct.c		1.129
+
+	raid(4): implement hot removal of spares and components.
+	[oster, ticket #674]
+
+sbin/raidctl/raidctl.81.81
+sbin/raidctl/raidctl.c1.80
+
+	raidctl(8): implement single command-line configuration of simple
+	RAID sets.
+	[oster, ticket #675]
+
+sys/dev/usb/uftdi.c1.79
+
+	uftdi(4): add a match quirk to prevent matching any interface
+	on SiPEED FPGA development boards (e.g. Tang Nano 9K).
+	The FT2232s on these boards are wired up only for JTAG.
+	[thorpej, ticket #676]
+
+external/gpl3/gcc.old/dist/gcc/cp/cfns.h	1.12
+(applied to external/gpl3/gcc/dist/gcc/cp/cfns.h)
+usr.sbin/mtree/create.c1.78
+
+	Fix tool build on FreeBSD 14 (and possibly other systems).
+	[hgutch, ticket #677]
+
+lib/libc/gen/usleep.31.20,1.21
+lib/libc/gen/usleep.c1.21
+
+	usleep(3): PR 58184: allow calls with useconds >= 100.
+	[jdolecek, ticket #678]
+
+sys/dev/usb/uftdi.c1.78
+sys/dev/usb/usbdevs1.815
+sys/dev/usb/usbdevs.h(regen)
+sys/dev/usb/usbdevs_data.h			(regen)
+
+	uftdi(4): PR 58127: add some USB serial adapters.
+	[maya, ticket #679]
+
+libexec/httpd/dir-index-bozo.c			1.37
+
+	httpd(8): PR 57962: create mobile-friendly directory listings.
+	[maya, ticket #680]
+
+etc/Makefile	1.470
+
+	PR/58200: change "makeobsolete" to use the tool version of sed.
+	[christos, ticket #681]
+



CVS commit: [netbsd-10] src/doc

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:43:59 UTC 2024

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

Log Message:
Tickets #672 - #681


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/doc/CHANGES-10.1

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



CVS commit: [netbsd-10] src/etc

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:42:44 UTC 2024

Modified Files:
src/etc [netbsd-10]: Makefile

Log Message:
Pull up following revision(s) (requested by christos in ticket #681):

etc/Makefile: revision 1.470

PR/58200: Kouichi Hashikawa: ./makeobsolete uses platform's sed


To generate a diff of this commit:
cvs rdiff -u -r1.466.2.1 -r1.466.2.2 src/etc/Makefile

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

Modified files:

Index: src/etc/Makefile
diff -u src/etc/Makefile:1.466.2.1 src/etc/Makefile:1.466.2.2
--- src/etc/Makefile:1.466.2.1	Mon Sep  4 17:33:28 2023
+++ src/etc/Makefile	Sun Apr 28 13:42:44 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.466.2.1 2023/09/04 17:33:28 martin Exp $
+#	$NetBSD: Makefile,v 1.466.2.2 2024/04/28 13:42:44 martin Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -393,10 +393,10 @@ install-obsolete-lists: .PHONY .MAKE
 	mkdir -p ${OBSOLETE.dir}
 .if ${MKX11} != "no"
 	(cd ${NETBSDSRCDIR}/distrib/sets && \
-	AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -b -t ${OBSOLETE.dir})
+	AWK=${TOOL_AWK:Q} SED=${TOOL_SED:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -b -t ${OBSOLETE.dir})
 .else
 	(cd ${NETBSDSRCDIR}/distrib/sets && \
-	AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -t ${OBSOLETE.dir})
+	AWK=${TOOL_AWK:Q} SED=${TOOL_SED:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -t ${OBSOLETE.dir})
 .endif
 .for file in ${OBSOLETE.files}
 	${_MKMSG_INSTALL} ${DESTDIR}/var/db/obsolete/${file}



CVS commit: [netbsd-10] src/etc

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:42:44 UTC 2024

Modified Files:
src/etc [netbsd-10]: Makefile

Log Message:
Pull up following revision(s) (requested by christos in ticket #681):

etc/Makefile: revision 1.470

PR/58200: Kouichi Hashikawa: ./makeobsolete uses platform's sed


To generate a diff of this commit:
cvs rdiff -u -r1.466.2.1 -r1.466.2.2 src/etc/Makefile

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



CVS commit: [netbsd-10] src/libexec/httpd

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:33:52 UTC 2024

Modified Files:
src/libexec/httpd [netbsd-10]: dir-index-bozo.c

Log Message:
Pull up following revision(s) (requested by maya in ticket #680):

libexec/httpd/dir-index-bozo.c: revision 1.37

Create mobile-friendly directory listings

A typical mobile browser on a smartphone assumes a page without a "viewport"
 tag is designed for desktop browsers. It displays the page in a
virtual window that simulates a wider screen and does not adjust it for
the phone's pixel density. The usual result is that the content on the page
looks small, and interacting with the page comfortably and precisely requires
zoom. This is currently the case with bozohttpd directory listing pages.
from D. Bohdan in PR bin/57962


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.2.1 src/libexec/httpd/dir-index-bozo.c

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

Modified files:

Index: src/libexec/httpd/dir-index-bozo.c
diff -u src/libexec/httpd/dir-index-bozo.c:1.36 src/libexec/httpd/dir-index-bozo.c:1.36.2.1
--- src/libexec/httpd/dir-index-bozo.c:1.36	Wed May 18 00:37:11 2022
+++ src/libexec/httpd/dir-index-bozo.c	Sun Apr 28 13:33:52 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: dir-index-bozo.c,v 1.36 2022/05/18 00:37:11 mrg Exp $	*/
+/*	$NetBSD: dir-index-bozo.c,v 1.36.2.1 2024/04/28 13:33:52 martin Exp $	*/
 
 /*	$eterna: dir-index-bozo.c,v 1.20 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -123,6 +123,7 @@ bozo_dir_index(bozo_httpreq_t *request, 
 	bozo_printf(httpd,
 		"\r\n"
 		"\r\n"
+		"\r\n"
 		"

CVS commit: [netbsd-10] src/libexec/httpd

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:33:52 UTC 2024

Modified Files:
src/libexec/httpd [netbsd-10]: dir-index-bozo.c

Log Message:
Pull up following revision(s) (requested by maya in ticket #680):

libexec/httpd/dir-index-bozo.c: revision 1.37

Create mobile-friendly directory listings

A typical mobile browser on a smartphone assumes a page without a "viewport"
 tag is designed for desktop browsers. It displays the page in a
virtual window that simulates a wider screen and does not adjust it for
the phone's pixel density. The usual result is that the content on the page
looks small, and interacting with the page comfortably and precisely requires
zoom. This is currently the case with bozohttpd directory listing pages.
from D. Bohdan in PR bin/57962


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.2.1 src/libexec/httpd/dir-index-bozo.c

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



CVS commit: [netbsd-9] src/doc

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:32:07 UTC 2024

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

Log Message:
Tickets #1836 and #1837


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-9.5

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

Modified files:

Index: src/doc/CHANGES-9.5
diff -u src/doc/CHANGES-9.5:1.1.2.1 src/doc/CHANGES-9.5:1.1.2.2
--- src/doc/CHANGES-9.5:1.1.2.1	Sun Apr 28 10:11:21 2024
+++ src/doc/CHANGES-9.5	Sun Apr 28 13:32:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.5,v 1.1.2.1 2024/04/28 10:11:21 martin Exp $
+# $NetBSD: CHANGES-9.5,v 1.1.2.2 2024/04/28 13:32:07 martin Exp $
 
 A complete list of changes from the NetBSD 9.4 release to the NetBSD 9.5
 release:
@@ -11,4 +11,16 @@ doc/CHANGES-9.5 added
 	Welcome to 9.4_STABLE.
 	[martin]
 
+sys/netinet6/frag6.c1.78
+
+	inet6: fix calculation of fragment length.
+	[ozaki-r, ticket #1836]
+
+sys/dev/usb/uftdi.c1.78
+sys/dev/usb/usbdevs1.815
+sys/dev/usb/usbdevs.h(regen)
+sys/dev/usb/usbdevs_data.h			(regen)
+
+	uftdi(4): PR 58127: add some USB serial adapters.
+	[maya, ticket #1837]
 



CVS commit: [netbsd-9] src/doc

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:32:07 UTC 2024

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

Log Message:
Tickets #1836 and #1837


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-9.5

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



CVS commit: [netbsd-9] src/sys/dev/usb

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:30:11 UTC 2024

Modified Files:
src/sys/dev/usb [netbsd-9]: usbdevs.h usbdevs_data.h

Log Message:
Regen for ticket #1837


To generate a diff of this commit:
cvs rdiff -u -r1.760.4.13 -r1.760.4.14 src/sys/dev/usb/usbdevs.h \
src/sys/dev/usb/usbdevs_data.h

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



CVS commit: [netbsd-9] src/sys/dev/usb

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:29:40 UTC 2024

Modified Files:
src/sys/dev/usb [netbsd-9]: uftdi.c usbdevs

Log Message:
Pull up following revision(s) (requested by maya in ticket #1837):

sys/dev/usb/uftdi.c: revision 1.78
sys/dev/usb/usbdevs: revision 1.815

Add some USB serial adapters
>From Cameron Williams in PR kern/58127

Add support for a range of USB serial adapters
>From Cameron Williams in PR kern/58127


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.70.2.1 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.770.4.13 -r1.770.4.14 src/sys/dev/usb/usbdevs

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/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.70 src/sys/dev/usb/uftdi.c:1.70.2.1
--- src/sys/dev/usb/uftdi.c:1.70	Thu May  9 02:43:35 2019
+++ src/sys/dev/usb/uftdi.c	Sun Apr 28 13:29:40 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: uftdi.c,v 1.70 2019/05/09 02:43:35 mrg Exp $	*/
+/*	$NetBSD: uftdi.c,v 1.70.2.1 2024/04/28 13:29:40 martin Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.70 2019/05/09 02:43:35 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.70.2.1 2024/04/28 13:29:40 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -122,6 +122,25 @@ struct ucom_methods uftdi_methods = {
  */
 static const struct usb_devno uftdi_devs[] = {
 	{ USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US101 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US159 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US235 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US257 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_12 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_34 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_56 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_78 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US313 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US320 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US324 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_12 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_34 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_12 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_34 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_12 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_34 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_56 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_78 },
 	{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST },
 	{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_230X },

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.770.4.13 src/sys/dev/usb/usbdevs:1.770.4.14
--- src/sys/dev/usb/usbdevs:1.770.4.13	Fri Feb 17 17:40:28 2023
+++ src/sys/dev/usb/usbdevs	Sun Apr 28 13:29:40 2024
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.770.4.13 2023/02/17 17:40:28 martin Exp $
+$NetBSD: usbdevs,v 1.770.4.14 2024/04/28 13:29:40 martin Exp $
 
 /*-
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1110,6 +1110,27 @@ product BILLIONTON USBEL100	0x0988	USB10
 product BILLIONTON USBE100	0x8511	USBE100
 product BILLIONTON USB2AR	0x90ff	USB2AR Ethernet
 
+/* Brainboxes Limited products */
+product BRAINBOXES US101	0x1011	US-101 USB2Serial 1xRS232
+product BRAINBOXES US159	0x1021	US-159 USB2Serial 1xRS232
+product BRAINBOXES US235	0x1017	US-235 USB2Serial 1xRS232
+product BRAINBOXES US257	0x5001	US-257 USB2Serial 2xRS232
+product BRAINBOXES US279_12	0x2021	US-279 USB2Serial 8xRS232 (Port 1 and 2)
+product BRAINBOXES US279_34	0x2022	US-279 USB2Serial 8xRS232 (Port 3 and 4)
+product BRAINBOXES US279_56	0x2023	US-279 USB2Serial 8xRS232 (Port 5 and 6)
+product BRAINBOXES US279_78	0x2024	US-279 USB2Serial 8xRS232 (Port 7 and 8)
+product BRAINBOXES US313	0x6001	US-313 USB2Serial 2xRS422/485
+product BRAINBOXES US320	0x1019	US-320 USB2Serial 1xRS422/485
+product BRAINBOXES US324	0x1013	US-324 USB2Serial 1xRS422/485
+product BRAINBOXES US346_12	0x3011	US-346 USB2Serial 4xRS422/485 (Port 1 and 2)
+product BRAINBOXES US346_34	0x3012	US-346 USB2Serial 4xRS422/485 (Port 3 and 4)
+product BRAINBOXES US701_12	0x2011	US-701 USB2Serial 4xRS232 (Port 1 and 2)
+product BRAINBOXES US701_34	0x2012	US-701 USB2Serial 4xRS232 (Port 3 and 4)
+product BRAINBOXES US842_12	0x8001	US-842 USB2Serial 8xRS422/485 (Port 1 and 2)
+product BRAINBOXES US842_34	0x8002	US-842 USB2Serial 8xRS422/485 (Port 3 and 4)
+product BRAINBOXES US842_56	0x8003	US-842 USB2Serial 8xRS422/485 (Port 5 and 6)
+product BRAINBOXES US842_78	0x8004	US-842 USB2Serial 8xRS422/485 (Port 7 and 8)
+
 /* Broadcom products */
 product BROADCOM BCMFW		0x0bdc	BCMFW
 product BROADCOM B

CVS commit: [netbsd-9] src/sys/dev/usb

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:29:40 UTC 2024

Modified Files:
src/sys/dev/usb [netbsd-9]: uftdi.c usbdevs

Log Message:
Pull up following revision(s) (requested by maya in ticket #1837):

sys/dev/usb/uftdi.c: revision 1.78
sys/dev/usb/usbdevs: revision 1.815

Add some USB serial adapters
>From Cameron Williams in PR kern/58127

Add support for a range of USB serial adapters
>From Cameron Williams in PR kern/58127


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.70.2.1 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.770.4.13 -r1.770.4.14 src/sys/dev/usb/usbdevs

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



CVS commit: [netbsd-10] src/sys/dev/usb

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:27:17 UTC 2024

Modified Files:
src/sys/dev/usb [netbsd-10]: usbdevs.h usbdevs_data.h

Log Message:
Regen for ticket #679


To generate a diff of this commit:
cvs rdiff -u -r1.798.4.2 -r1.798.4.3 src/sys/dev/usb/usbdevs.h \
src/sys/dev/usb/usbdevs_data.h

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



CVS commit: [netbsd-10] src/sys/dev/usb

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:26:36 UTC 2024

Modified Files:
src/sys/dev/usb [netbsd-10]: uftdi.c usbdevs

Log Message:
Pull up following revision(s) (requested by maya in ticket #679):

sys/dev/usb/uftdi.c: revision 1.78
sys/dev/usb/usbdevs: revision 1.815

Add some USB serial adapters
>From Cameron Williams in PR kern/58127

Add support for a range of USB serial adapters
>From Cameron Williams in PR kern/58127


To generate a diff of this commit:
cvs rdiff -u -r1.76.6.2 -r1.76.6.3 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.806.4.2 -r1.806.4.3 src/sys/dev/usb/usbdevs

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/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.76.6.2 src/sys/dev/usb/uftdi.c:1.76.6.3
--- src/sys/dev/usb/uftdi.c:1.76.6.2	Sun Apr 28 13:07:17 2024
+++ src/sys/dev/usb/uftdi.c	Sun Apr 28 13:26:36 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: uftdi.c,v 1.76.6.2 2024/04/28 13:07:17 martin Exp $	*/
+/*	$NetBSD: uftdi.c,v 1.76.6.3 2024/04/28 13:26:36 martin Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.76.6.2 2024/04/28 13:07:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.76.6.3 2024/04/28 13:26:36 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -126,6 +126,25 @@ static const struct ucom_methods uftdi_m
  */
 static const struct usb_devno uftdi_devs[] = {
 	{ USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US101 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US159 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US235 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US257 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_12 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_34 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_56 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_78 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US313 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US320 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US324 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_12 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_34 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_12 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_34 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_12 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_34 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_56 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_78 },
 	{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST },
 	{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_230X },

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.806.4.2 src/sys/dev/usb/usbdevs:1.806.4.3
--- src/sys/dev/usb/usbdevs:1.806.4.2	Sun Jan 14 15:51:05 2024
+++ src/sys/dev/usb/usbdevs	Sun Apr 28 13:26:36 2024
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.806.4.2 2024/01/14 15:51:05 martin Exp $
+$NetBSD: usbdevs,v 1.806.4.3 2024/04/28 13:26:36 martin Exp $
 
 /*-
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1116,6 +1116,27 @@ product BILLIONTON USBEL100	0x0988	USB10
 product BILLIONTON USBE100	0x8511	USBE100
 product BILLIONTON USB2AR	0x90ff	USB2AR Ethernet
 
+/* Brainboxes Limited products */
+product BRAINBOXES US101	0x1011	US-101 USB2Serial 1xRS232
+product BRAINBOXES US159	0x1021	US-159 USB2Serial 1xRS232
+product BRAINBOXES US235	0x1017	US-235 USB2Serial 1xRS232
+product BRAINBOXES US257	0x5001	US-257 USB2Serial 2xRS232
+product BRAINBOXES US279_12	0x2021	US-279 USB2Serial 8xRS232 (Port 1 and 2)
+product BRAINBOXES US279_34	0x2022	US-279 USB2Serial 8xRS232 (Port 3 and 4)
+product BRAINBOXES US279_56	0x2023	US-279 USB2Serial 8xRS232 (Port 5 and 6)
+product BRAINBOXES US279_78	0x2024	US-279 USB2Serial 8xRS232 (Port 7 and 8)
+product BRAINBOXES US313	0x6001	US-313 USB2Serial 2xRS422/485
+product BRAINBOXES US320	0x1019	US-320 USB2Serial 1xRS422/485
+product BRAINBOXES US324	0x1013	US-324 USB2Serial 1xRS422/485
+product BRAINBOXES US346_12	0x3011	US-346 USB2Serial 4xRS422/485 (Port 1 and 2)
+product BRAINBOXES US346_34	0x3012	US-346 USB2Serial 4xRS422/485 (Port 3 and 4)
+product BRAINBOXES US701_12	0x2011	US-701 USB2Serial 4xRS232 (Port 1 and 2)
+product BRAINBOXES US701_34	0x2012	US-701 USB2Serial 4xRS232 (Port 3 and 4)
+product BRAINBOXES US842_12	0x8001	US-842 USB2Serial 8xRS422/485 (Port 1 and 2)
+product BRAINBOXES US842_34	0x8002	US-842 USB2Serial 8xRS422/485 (Port 3 and 4)
+product BRAINBOXES US842_56	0x8003	US-842 USB2Serial 8xRS422/485 (Port 5 and 6)
+product BRAINBOXES US842_78	0x8004	US-842 USB2Serial 8xRS422/485 (Port 7 and 8)
+
 /* Broadcom products */
 product BROADCOM BCMFW		0x0bdc	BCM

CVS commit: [netbsd-10] src/sys/dev/usb

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:26:36 UTC 2024

Modified Files:
src/sys/dev/usb [netbsd-10]: uftdi.c usbdevs

Log Message:
Pull up following revision(s) (requested by maya in ticket #679):

sys/dev/usb/uftdi.c: revision 1.78
sys/dev/usb/usbdevs: revision 1.815

Add some USB serial adapters
>From Cameron Williams in PR kern/58127

Add support for a range of USB serial adapters
>From Cameron Williams in PR kern/58127


To generate a diff of this commit:
cvs rdiff -u -r1.76.6.2 -r1.76.6.3 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.806.4.2 -r1.806.4.3 src/sys/dev/usb/usbdevs

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



CVS commit: [netbsd-10] src/lib/libc/gen

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:23:20 UTC 2024

Modified Files:
src/lib/libc/gen [netbsd-10]: usleep.3 usleep.c

Log Message:
Pull up following revision(s) (requested by jdolecek in ticket #678):

lib/libc/gen/usleep.c: revision 1.21
lib/libc/gen/usleep.3: revision 1.20
lib/libc/gen/usleep.3: revision 1.21

allow usleep(3) with useconds >= 100

update manpage to mention this interface is obsolete, remove
EINVAL from the ERRORS and mention EINTR instead.

PR lib/58184 by Taylor R Campbell

it's nanosleep(2), not nanosleep(3)


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.56.1 src/lib/libc/gen/usleep.3
cvs rdiff -u -r1.20 -r1.20.42.1 src/lib/libc/gen/usleep.c

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



CVS commit: [netbsd-10] src/lib/libc/gen

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:23:20 UTC 2024

Modified Files:
src/lib/libc/gen [netbsd-10]: usleep.3 usleep.c

Log Message:
Pull up following revision(s) (requested by jdolecek in ticket #678):

lib/libc/gen/usleep.c: revision 1.21
lib/libc/gen/usleep.3: revision 1.20
lib/libc/gen/usleep.3: revision 1.21

allow usleep(3) with useconds >= 100

update manpage to mention this interface is obsolete, remove
EINVAL from the ERRORS and mention EINTR instead.

PR lib/58184 by Taylor R Campbell

it's nanosleep(2), not nanosleep(3)


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.56.1 src/lib/libc/gen/usleep.3
cvs rdiff -u -r1.20 -r1.20.42.1 src/lib/libc/gen/usleep.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/gen/usleep.3
diff -u src/lib/libc/gen/usleep.3:1.19 src/lib/libc/gen/usleep.3:1.19.56.1
--- src/lib/libc/gen/usleep.3:1.19	Thu Apr 29 17:29:56 2010
+++ src/lib/libc/gen/usleep.3	Sun Apr 28 13:23:20 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: usleep.3,v 1.19 2010/04/29 17:29:56 jruoho Exp $
+.\"	$NetBSD: usleep.3,v 1.19.56.1 2024/04/28 13:23:20 martin Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\" @(#)usleep.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd April 29, 2010
+.Dd April 22, 2024
 .Dt USLEEP 3
 .Os
 .Sh NAME
@@ -42,6 +42,11 @@
 .Ft int
 .Fn usleep "useconds_t microseconds"
 .Sh DESCRIPTION
+.Bf -symbolic
+This interface is obsoleted by
+.Xr nanosleep 2 .
+.Ef
+.Pp
 The
 .Fn usleep
 function
@@ -53,13 +58,6 @@ action is to invoke a signal catching fu
 process.
 The suspension time may be longer than requested due to the
 scheduling of other activity by the system.
-.Pp
-The
-.Fa microseconds
-argument must be less than 1,000,000.
-If the value of
-.Fa microseconds
-is 0, then the call has no effect.
 .Sh RETURN VALUES
 On successful completion,
 .Fn usleep
@@ -72,10 +70,9 @@ The
 .Fn usleep
 function may fail if:
 .Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa microseconds
-interval specified 1,000,000 or more microseconds.
+.It Bq Er EINTR
+.Nm
+was interrupted by the delivery of a signal.
 .El
 .Sh SEE ALSO
 .Xr nanosleep 2 ,

Index: src/lib/libc/gen/usleep.c
diff -u src/lib/libc/gen/usleep.c:1.20 src/lib/libc/gen/usleep.c:1.20.42.1
--- src/lib/libc/gen/usleep.c:1.20	Mon Jun 25 22:32:44 2012
+++ src/lib/libc/gen/usleep.c	Sun Apr 28 13:23:20 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: usleep.c,v 1.20 2012/06/25 22:32:44 abs Exp $	*/
+/*	$NetBSD: usleep.c,v 1.20.42.1 2024/04/28 13:23:20 martin Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: usleep.c,v 1.20 2012/06/25 22:32:44 abs Exp $");
+__RCSID("$NetBSD: usleep.c,v 1.20.42.1 2024/04/28 13:23:20 martin Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -51,13 +51,8 @@ usleep(useconds_t useconds)
 	if (useconds == 0)
 		return (0);
 
-	if (useconds >= 100) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	ts.tv_sec  = 0;
-	ts.tv_nsec = useconds * 1000;
+	ts.tv_sec  = (useconds / 100);
+	ts.tv_nsec = (useconds % 100) * 1000;
 
 	nanosleep(&ts, NULL);
 



CVS commit: [netbsd-10] src

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:19:21 UTC 2024

Modified Files:
src/external/gpl3/gcc/dist/gcc/cp [netbsd-10]: cfns.h
src/usr.sbin/mtree [netbsd-10]: create.c

Log Message:
Pull up following revision(s) (requested by hgutch in ticket #677):

usr.sbin/mtree/create.c: revision 1.78
external/gpl3/gcc.old/dist/gcc/cp/cfns.h: revision 1.12
(applied to external/gpl3/gcc/dist/gcc/cp/cfns.h)

For the NetBSD tools build we provide our own fts.h not FreeBSD's so the
comparator should have the NetBSD signature.

Fix gcc build on FreeBSD 14 (and possibly other systems using clang >= 16).
Pointed out by Eirik �verby.
OK mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.6.1 src/external/gpl3/gcc/dist/gcc/cp/cfns.h
cvs rdiff -u -r1.76 -r1.76.10.1 src/usr.sbin/mtree/create.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/gcc/cp/cfns.h
diff -u src/external/gpl3/gcc/dist/gcc/cp/cfns.h:1.7 src/external/gpl3/gcc/dist/gcc/cp/cfns.h:1.7.6.1
--- src/external/gpl3/gcc/dist/gcc/cp/cfns.h:1.7	Sun Apr 11 00:02:15 2021
+++ src/external/gpl3/gcc/dist/gcc/cp/cfns.h	Sun Apr 28 13:19:21 2024
@@ -60,7 +60,7 @@ public:
 };
 
 inline unsigned int
-libc_name::hash (register const char *str, register unsigned int len)
+libc_name::hash (const char *str, unsigned int len)
 {
   static const unsigned short asso_values[] =
 {
@@ -91,7 +91,7 @@ libc_name::hash (register const char *st
   1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488,
   1488, 1488, 1488, 1488, 1488, 1488, 1488
 };
-  register int hval = len;
+  int hval = len;
 
   switch (hval)
 {
@@ -118,7 +118,7 @@ libc_name::hash (register const char *st
 }
 
 const struct libc_name_struct *
-libc_name::libc_name_p (register const char *str, register unsigned int len)
+libc_name::libc_name_p (const char *str, unsigned int len)
 {
   enum
 {
@@ -1116,15 +1116,15 @@ libc_name::libc_name_p (register const c
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
 {
-  register int key = hash (str, len);
+  int key = hash (str, len);
 
   if (key <= MAX_HASH_VALUE && key >= 0)
 {
-  register int index = lookup[key];
+  int index = lookup[key];
 
   if (index >= 0)
 {
-  register const char *s = wordlist[index].name;
+  const char *s = wordlist[index].name;
 
   if (*str == *s && !strcmp (str + 1, s + 1))
 return &wordlist[index];

Index: src/usr.sbin/mtree/create.c
diff -u src/usr.sbin/mtree/create.c:1.76 src/usr.sbin/mtree/create.c:1.76.10.1
--- src/usr.sbin/mtree/create.c:1.76	Sun Nov 18 23:03:36 2018
+++ src/usr.sbin/mtree/create.c	Sun Apr 28 13:19:21 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: create.c,v 1.76 2018/11/18 23:03:36 sevan Exp $	*/
+/*	$NetBSD: create.c,v 1.76.10.1 2024/04/28 13:19:21 martin Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: create.c,v 1.76 2018/11/18 23:03:36 sevan Exp $");
+__RCSID("$NetBSD: create.c,v 1.76.10.1 2024/04/28 13:19:21 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -84,7 +84,7 @@ static uid_t uid;
 static mode_t mode;
 static u_long flags;
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && !defined(HAVE_NBTOOL_CONFIG_H)
 #define	FTS_CONST const
 #else
 #define	FTS_CONST



CVS commit: [netbsd-10] src

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:19:21 UTC 2024

Modified Files:
src/external/gpl3/gcc/dist/gcc/cp [netbsd-10]: cfns.h
src/usr.sbin/mtree [netbsd-10]: create.c

Log Message:
Pull up following revision(s) (requested by hgutch in ticket #677):

usr.sbin/mtree/create.c: revision 1.78
external/gpl3/gcc.old/dist/gcc/cp/cfns.h: revision 1.12
(applied to external/gpl3/gcc/dist/gcc/cp/cfns.h)

For the NetBSD tools build we provide our own fts.h not FreeBSD's so the
comparator should have the NetBSD signature.

Fix gcc build on FreeBSD 14 (and possibly other systems using clang >= 16).
Pointed out by Eirik �verby.
OK mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.6.1 src/external/gpl3/gcc/dist/gcc/cp/cfns.h
cvs rdiff -u -r1.76 -r1.76.10.1 src/usr.sbin/mtree/create.c

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



CVS commit: [netbsd-10] src/sys/dev/usb

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:07:17 UTC 2024

Modified Files:
src/sys/dev/usb [netbsd-10]: uftdi.c

Log Message:
Pull up following revision(s) (requested by thorpej in ticket #676):

sys/dev/usb/uftdi.c: revision 1.79

Add a match quirk to prevent matching any interface on SiPEED FPGA
development boards (e.g. Tang Nano 9K).  The FT2232s on these boards
are wired up only for JTAG.


To generate a diff of this commit:
cvs rdiff -u -r1.76.6.1 -r1.76.6.2 src/sys/dev/usb/uftdi.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/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.76.6.1 src/sys/dev/usb/uftdi.c:1.76.6.2
--- src/sys/dev/usb/uftdi.c:1.76.6.1	Tue Apr 16 18:45:39 2024
+++ src/sys/dev/usb/uftdi.c	Sun Apr 28 13:07:17 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: uftdi.c,v 1.76.6.1 2024/04/16 18:45:39 martin Exp $	*/
+/*	$NetBSD: uftdi.c,v 1.76.6.2 2024/04/28 13:07:17 martin Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.76.6.1 2024/04/16 18:45:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.76.6.2 2024/04/28 13:07:17 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -210,7 +210,19 @@ static const struct uftdi_match_quirk_en
 	  .vendor_str	= "SecuringHardware.com",
 	  .product_str	= "Tigard V1.1",
 	  .match_ret	= UMATCH_NONE,
-	}
+	},
+	/*
+	 * The SiPEED Tang Nano 9K (and other SiPEED Tang FPGA development
+	 * boards) have an FT2232 on-board, wired up only for JTAG.
+	 */
+	{
+	  .vendor_id	= USB_VENDOR_FTDI,
+	  .product_id	= USB_PRODUCT_FTDI_SERIAL_2232C,
+	  .iface_no	= -1,
+	  .vendor_str	= "SIPEED",
+	  .product_str	= "JTAG Debugger",
+	  .match_ret	= UMATCH_NONE,
+	},
 };
 
 static int
@@ -224,7 +236,7 @@ uftdi_quirk_match(struct usbif_attach_ar
 		q = &uftdi_match_quirks[i];
 		if (uiaa->uiaa_vendor != q->vendor_id ||
 		uiaa->uiaa_product != q->product_id ||
-		uiaa->uiaa_ifaceno != q->iface_no) {
+		(q->iface_no != -1 && uiaa->uiaa_ifaceno != q->iface_no)) {
 			continue;
 		}
 		if (q->vendor_str != NULL &&



CVS commit: [netbsd-10] src/sys/dev/usb

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 13:07:17 UTC 2024

Modified Files:
src/sys/dev/usb [netbsd-10]: uftdi.c

Log Message:
Pull up following revision(s) (requested by thorpej in ticket #676):

sys/dev/usb/uftdi.c: revision 1.79

Add a match quirk to prevent matching any interface on SiPEED FPGA
development boards (e.g. Tang Nano 9K).  The FT2232s on these boards
are wired up only for JTAG.


To generate a diff of this commit:
cvs rdiff -u -r1.76.6.1 -r1.76.6.2 src/sys/dev/usb/uftdi.c

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



CVS commit: src/tests/lib

2024-04-28 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Apr 28 12:49:08 UTC 2024

Modified Files:
src/tests/lib: Makefile

Log Message:
tests/lib/Makefile: Hook up libstdc++.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/tests/lib/Makefile

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

Modified files:

Index: src/tests/lib/Makefile
diff -u src/tests/lib/Makefile:1.35 src/tests/lib/Makefile:1.36
--- src/tests/lib/Makefile:1.35	Mon Nov 21 22:01:33 2022
+++ src/tests/lib/Makefile	Sun Apr 28 12:49:08 2024
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.35 2022/11/21 22:01:33 christos Exp $
+# $NetBSD: Makefile,v 1.36 2024/04/28 12:49:08 riastradh Exp $
 
 .include 
 
 TESTS_SUBDIRS=	csu libarchive libbluetooth libc libcrypt libcurses \
 		libexecinfo libi386 libm libnvmm libobjc libposix libppath \
-		libprop libpthread librefuse librt libtre libusbhid libutil \
-		libossaudio lua semaphore
+		libprop libpthread librefuse librt libstdc++ libtre libusbhid \
+		libutil libossaudio lua semaphore
 
 TESTS_SUBDIR_INSTALL_ONLY=	libevent
 



CVS commit: src/tests/lib

2024-04-28 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Apr 28 12:49:08 UTC 2024

Modified Files:
src/tests/lib: Makefile

Log Message:
tests/lib/Makefile: Hook up libstdc++.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/tests/lib/Makefile

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



CVS commit: [netbsd-10] src/sbin/raidctl

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 12:12:00 UTC 2024

Modified Files:
src/sbin/raidctl [netbsd-10]: raidctl.8 raidctl.c

Log Message:
Pull up following revision(s) (requested by oster in ticket #675):

sbin/raidctl/raidctl.8: revision 1.81
sbin/raidctl/raidctl.c: revision 1.80

Implement command-line configuration of simple RAID sets with raidctl
based on the usage pattern:

 raidctl  create...

For example,

 raidctl raid0 create mirror absent /dev/wd1e

will create a RAID level 1 (mirror) set with an absent first component
and /dev/wd1e as the second component. The resulting RAID device will
be marked as auto-configurable, will have a serial number set (based
on the current time), and parity will be initialized. Reasonable
performance values are automatically used by default for other parameters
normally specified in the configuration file.

Also: Only print out Autoconfig status if being verbose.


To generate a diff of this commit:
cvs rdiff -u -r1.79.2.1 -r1.79.2.2 src/sbin/raidctl/raidctl.8
cvs rdiff -u -r1.78.2.1 -r1.78.2.2 src/sbin/raidctl/raidctl.c

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

Modified files:

Index: src/sbin/raidctl/raidctl.8
diff -u src/sbin/raidctl/raidctl.8:1.79.2.1 src/sbin/raidctl/raidctl.8:1.79.2.2
--- src/sbin/raidctl/raidctl.8:1.79.2.1	Sun Apr 28 12:09:08 2024
+++ src/sbin/raidctl/raidctl.8	Sun Apr 28 12:12:00 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: raidctl.8,v 1.79.2.1 2024/04/28 12:09:08 martin Exp $
+.\" $NetBSD: raidctl.8,v 1.79.2.2 2024/04/28 12:12:00 martin Exp $
 .\"
 .\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -53,7 +53,7 @@
 .\" any improvements or extensions that they make and grant Carnegie the
 .\" rights to redistribute these changes.
 .\"
-.Dd September 16, 2023
+.Dd September 20, 2023
 .Dt RAIDCTL 8
 .Os
 .Sh NAME
@@ -61,6 +61,10 @@
 .Nd configuration utility for the RAIDframe disk driver
 .Sh SYNOPSIS
 .Nm
+.Ar dev
+.Ar command
+.Op Ar arg Op ...
+.Nm
 .Op Fl v
 .Fl A Op yes | no | forceroot | softroot
 .Ar dev
@@ -148,7 +152,27 @@ For more information about the RAIDframe
 This document assumes the reader has at least rudimentary knowledge of
 RAID and RAID concepts.
 .Pp
-The command-line options for
+The simplified command-line options for
+.Nm
+are as follows:
+.Bl -tag -width indent
+.It Ic create Ar level Ar component1 Ar component2 Ar ...
+where
+.Ar level
+specifies the RAID level and is one of
+.Ar 0
+,
+.Ar 1 
+(or
+.Ar mirror
+), or
+.Ar 5
+and each of
+.Ar componentN
+specify the devices to be configured into the RAID set.
+.El
+.Pp
+The advanced command-line options for
 .Nm
 are as follows:
 .Bl -tag -width indent
@@ -370,6 +394,38 @@ for many others, or just simply
 .Pa /dev/rraid0[cd] ) .
 It is recommended that the partitions used to represent the
 RAID device are not used for file systems.
+.Ss Simple RAID configuration
+For simple RAID configurations using RAID levels 0 (simple striping),
+1 (mirroring), or 5 (striping with distributed parity)
+.Nm
+supports command-line configuration of RAID setups without
+the use of a configuration file.  For example,
+.Bd -literal -offset indent
+raidctl raid0 create 0 /dev/wd0e /dev/wd1e /dev/wd2e
+.Ed
+.Pp
+will create a RAID level 0 set on the device named
+.Pa raid0
+using the components
+.Pa /dev/wd0e ,
+.Pa /dev/wd1e ,
+and
+.Pa /dev/wd2e .
+Similarly,
+.Bd -literal -offset indent
+raidctl raid0 create mirror absent /dev/wd1e
+.Ed
+.Pp
+will create a RAID level 1 (mirror) set with an absent first component
+and
+.Pa /dev/wd1e
+as the second component.  In all cases the resulting RAID device will
+be marked as auto-configurable, will have a serial number set (based
+on the current time), and parity will be initialized (if the RAID level
+has parity and sufficent components are present).  Reasonable
+performance values are automatically used by default for other
+parameters normally specified in the configuration file.
+.Pp
 .Ss Configuration file
 The format of the configuration file is complex, and
 only an abbreviated treatment is given here.
@@ -540,6 +596,10 @@ for a more complete configuration file e
 device special files.
 .El
 .Sh EXAMPLES
+The examples given in this section are for more complex
+setups than can be configured with the simplified command-line
+configuration option described early.
+.Pp
 It is highly recommended that before using the RAID driver for real
 file systems that the system administrator(s) become quite familiar
 with the use of

Index: src/sbin/raidctl/raidctl.c
diff -u src/sbin/raidctl/raidctl.c:1.78.2.1 src/sbin/raidctl/raidctl.c:1.78.2.2
--- src/sbin/raidctl/raidctl.c:1.78.2.1	Sun Apr 28 12:09:08 2024
+++ src/sbin/raidctl/raidctl.c	Sun Apr 28 12:12:00 2024
@@ -1,4 +1,4 @@
-/*  $NetBSD: raidctl.c,v 1.78.2.1 2024/04/28 12:09:08 martin Exp $   */
+/*  $NetBSD: raidctl.c,v 1.78.2.2 202

CVS commit: [netbsd-10] src/sbin/raidctl

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 12:12:00 UTC 2024

Modified Files:
src/sbin/raidctl [netbsd-10]: raidctl.8 raidctl.c

Log Message:
Pull up following revision(s) (requested by oster in ticket #675):

sbin/raidctl/raidctl.8: revision 1.81
sbin/raidctl/raidctl.c: revision 1.80

Implement command-line configuration of simple RAID sets with raidctl
based on the usage pattern:

 raidctl  create...

For example,

 raidctl raid0 create mirror absent /dev/wd1e

will create a RAID level 1 (mirror) set with an absent first component
and /dev/wd1e as the second component. The resulting RAID device will
be marked as auto-configurable, will have a serial number set (based
on the current time), and parity will be initialized. Reasonable
performance values are automatically used by default for other parameters
normally specified in the configuration file.

Also: Only print out Autoconfig status if being verbose.


To generate a diff of this commit:
cvs rdiff -u -r1.79.2.1 -r1.79.2.2 src/sbin/raidctl/raidctl.8
cvs rdiff -u -r1.78.2.1 -r1.78.2.2 src/sbin/raidctl/raidctl.c

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



CVS commit: [netbsd-10] src

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 12:09:09 UTC 2024

Modified Files:
src/sbin/raidctl [netbsd-10]: raidctl.8 raidctl.c
src/sys/dev/raidframe [netbsd-10]: raidframeio.h rf_diskqueue.c
rf_diskqueue.h rf_disks.c rf_disks.h rf_driver.c rf_netbsdkintf.c
rf_raid.h rf_reconstruct.c

Log Message:
Pull up following revision(s) (requested by oster in ticket #674):

sys/dev/raidframe/rf_raid.h: revision 1.52
sbin/raidctl/raidctl.8: revision 1.80
sys/dev/raidframe/rf_driver.c: revision 1.141
sys/dev/raidframe/rf_disks.c: revision 1.94
sys/dev/raidframe/rf_diskqueue.c: revision 1.64
sys/dev/raidframe/rf_diskqueue.h: revision 1.30
sys/dev/raidframe/rf_disks.h: revision 1.15
sys/dev/raidframe/rf_netbsdkintf.c: revision 1.414
sys/dev/raidframe/rf_reconstruct.c: revision 1.129
sys/dev/raidframe/raidframeio.h: revision 1.12
sbin/raidctl/raidctl.c: revision 1.79

Implement hot removal of spares and components. From manu@.

Implement a long desired feature of automatically incorporating
a used spare into the array after a reconstruct.

Given the configuration:

Components:
 /dev/wd0e: failed
 /dev/wd1e: optimal
 /dev/wd2e: optimal
Spares:
 /dev/wd3e: spare

Running 'raidctl -F /dev/wd0e raid0' will now result in the
following configuration after a successful rebuild:

Components:
 /dev/wd3e: optimal
 /dev/wd1e: optimal
 /dev/wd2e: optimal
No spares.

Thanks to manu@ for the development of the initial set of changes
which allowed the changes to automatically incorporate a used spare
to come to fruition. Thanks also to manu@ for useful discussions
about and additional testing of these changes.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.79.2.1 src/sbin/raidctl/raidctl.8
cvs rdiff -u -r1.78 -r1.78.2.1 src/sbin/raidctl/raidctl.c
cvs rdiff -u -r1.11 -r1.11.6.1 src/sys/dev/raidframe/raidframeio.h
cvs rdiff -u -r1.63 -r1.63.4.1 src/sys/dev/raidframe/rf_diskqueue.c
cvs rdiff -u -r1.29 -r1.29.10.1 src/sys/dev/raidframe/rf_diskqueue.h
cvs rdiff -u -r1.93 -r1.93.4.1 src/sys/dev/raidframe/rf_disks.c
cvs rdiff -u -r1.14 -r1.14.196.1 src/sys/dev/raidframe/rf_disks.h
cvs rdiff -u -r1.140 -r1.140.4.1 src/sys/dev/raidframe/rf_driver.c
cvs rdiff -u -r1.410.4.3 -r1.410.4.4 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.51 -r1.51.6.1 src/sys/dev/raidframe/rf_raid.h
cvs rdiff -u -r1.127.10.1 -r1.127.10.2 src/sys/dev/raidframe/rf_reconstruct.c

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

Modified files:

Index: src/sbin/raidctl/raidctl.8
diff -u src/sbin/raidctl/raidctl.8:1.79 src/sbin/raidctl/raidctl.8:1.79.2.1
--- src/sbin/raidctl/raidctl.8:1.79	Tue Jun 14 08:06:18 2022
+++ src/sbin/raidctl/raidctl.8	Sun Apr 28 12:09:08 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: raidctl.8,v 1.79 2022/06/14 08:06:18 kre Exp $
+.\" $NetBSD: raidctl.8,v 1.79.2.1 2024/04/28 12:09:08 martin Exp $
 .\"
 .\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -53,7 +53,7 @@
 .\" any improvements or extensions that they make and grant Carnegie the
 .\" rights to redistribute these changes.
 .\"
-.Dd June 13, 2022
+.Dd September 16, 2023
 .Dt RAIDCTL 8
 .Os
 .Sh NAME
@@ -322,9 +322,10 @@ if necessary, and immediately begins a r
 This is useful for reconstructing back onto a component after
 it has been replaced following a failure.
 .It Fl r Ar component Ar dev
-Remove the spare disk specified by
+Remove the specified
 .Ar component
-from the set of available spare components.
+from the RAID. The component must be in the failed, spare, or spared state
+in order to be removed.
 .It Fl S Ar dev
 Check the status of parity re-writing, component reconstruction, and
 component copyback.
@@ -1005,10 +1006,9 @@ option will show:
 .Bd -literal -offset indent
 Components:
/dev/sd1e: optimal
-   /dev/sd2e: spared
+   /dev/sd4e: optimal
/dev/sd3e: optimal
-Spares:
-   /dev/sd4e: used_spare
+No spares.
 [...]
 Parity status: clean
 Reconstruction is 100% complete.
@@ -1016,62 +1016,10 @@ Parity Re-write is 100% complete.
 Copyback is 100% complete.
 .Ed
 .Pp
-At this point there are at least two options.
-First, if
-.Pa /dev/sd2e
-is known to be good (i.e., the failure was either caused by
-.Fl f
-or
-.Fl F ,
-or the failed disk was replaced), then a copyback of the data can
-be initiated with the
-.Fl B
-option.
-In this example, this would copy the entire contents of
-.Pa /dev/sd4e
-to
-.Pa /dev/sd2e .
-Once the copyback procedure is complete, the
-status of the device would be (in part):
-.Bd -literal -offset indent
-Components:
-   /dev/sd1e: optimal
-   /dev/sd2e: optimal
-   /dev/sd3e: optimal
-Spares:
-   /dev/sd4e: spare
-.Ed
-.Pp
-and the system is back to normal operation.
-.Pp
-The second option after the recon

CVS commit: [netbsd-10] src

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 12:09:09 UTC 2024

Modified Files:
src/sbin/raidctl [netbsd-10]: raidctl.8 raidctl.c
src/sys/dev/raidframe [netbsd-10]: raidframeio.h rf_diskqueue.c
rf_diskqueue.h rf_disks.c rf_disks.h rf_driver.c rf_netbsdkintf.c
rf_raid.h rf_reconstruct.c

Log Message:
Pull up following revision(s) (requested by oster in ticket #674):

sys/dev/raidframe/rf_raid.h: revision 1.52
sbin/raidctl/raidctl.8: revision 1.80
sys/dev/raidframe/rf_driver.c: revision 1.141
sys/dev/raidframe/rf_disks.c: revision 1.94
sys/dev/raidframe/rf_diskqueue.c: revision 1.64
sys/dev/raidframe/rf_diskqueue.h: revision 1.30
sys/dev/raidframe/rf_disks.h: revision 1.15
sys/dev/raidframe/rf_netbsdkintf.c: revision 1.414
sys/dev/raidframe/rf_reconstruct.c: revision 1.129
sys/dev/raidframe/raidframeio.h: revision 1.12
sbin/raidctl/raidctl.c: revision 1.79

Implement hot removal of spares and components. From manu@.

Implement a long desired feature of automatically incorporating
a used spare into the array after a reconstruct.

Given the configuration:

Components:
 /dev/wd0e: failed
 /dev/wd1e: optimal
 /dev/wd2e: optimal
Spares:
 /dev/wd3e: spare

Running 'raidctl -F /dev/wd0e raid0' will now result in the
following configuration after a successful rebuild:

Components:
 /dev/wd3e: optimal
 /dev/wd1e: optimal
 /dev/wd2e: optimal
No spares.

Thanks to manu@ for the development of the initial set of changes
which allowed the changes to automatically incorporate a used spare
to come to fruition. Thanks also to manu@ for useful discussions
about and additional testing of these changes.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.79.2.1 src/sbin/raidctl/raidctl.8
cvs rdiff -u -r1.78 -r1.78.2.1 src/sbin/raidctl/raidctl.c
cvs rdiff -u -r1.11 -r1.11.6.1 src/sys/dev/raidframe/raidframeio.h
cvs rdiff -u -r1.63 -r1.63.4.1 src/sys/dev/raidframe/rf_diskqueue.c
cvs rdiff -u -r1.29 -r1.29.10.1 src/sys/dev/raidframe/rf_diskqueue.h
cvs rdiff -u -r1.93 -r1.93.4.1 src/sys/dev/raidframe/rf_disks.c
cvs rdiff -u -r1.14 -r1.14.196.1 src/sys/dev/raidframe/rf_disks.h
cvs rdiff -u -r1.140 -r1.140.4.1 src/sys/dev/raidframe/rf_driver.c
cvs rdiff -u -r1.410.4.3 -r1.410.4.4 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.51 -r1.51.6.1 src/sys/dev/raidframe/rf_raid.h
cvs rdiff -u -r1.127.10.1 -r1.127.10.2 src/sys/dev/raidframe/rf_reconstruct.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/hppa/include

2024-04-28 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Apr 28 10:57:34 UTC 2024

Modified Files:
src/sys/arch/hppa/include: types.h

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hppa/include/types.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/arch/hppa/include/types.h
diff -u src/sys/arch/hppa/include/types.h:1.32 src/sys/arch/hppa/include/types.h:1.33
--- src/sys/arch/hppa/include/types.h:1.32	Sun Jul 23 10:09:36 2023
+++ src/sys/arch/hppa/include/types.h	Sun Apr 28 10:57:34 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.32 2023/07/23 10:09:36 skrll Exp $	*/
+/*	$NetBSD: types.h,v 1.33 2024/04/28 10:57:34 skrll Exp $	*/
 
 /*	$OpenBSD: types.h,v 1.6 2001/08/11 01:58:34 art Exp $	*/
 
@@ -80,8 +80,8 @@ typedef struct {
 typedef int			__register_t;
 
 
-#define	__SIMPLELOCK_LOCKED	{ { 0, 0, 0, 0} }
-#define	__SIMPLELOCK_UNLOCKED	{ { 1, 1, 1, 1} }
+#define	__SIMPLELOCK_LOCKED	{ { 0, 0, 0, 0 } }
+#define	__SIMPLELOCK_UNLOCKED	{ { 1, 1, 1, 1 } }
 
 #define	__MACHINE_STACK_GROWS_UP	/* stack grows to higher addresses */
 #define	__HAVE_FUNCTION_DESCRIPTORS	/* function ptrs may be descriptors */



CVS commit: src/sys/arch/hppa/include

2024-04-28 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Apr 28 10:57:34 UTC 2024

Modified Files:
src/sys/arch/hppa/include: types.h

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hppa/include/types.h

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



CVS commit: [netbsd-8] src/doc

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 10:17:03 UTC 2024

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

Log Message:
Ticket #1960


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

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

Modified files:

Index: src/doc/CHANGES-8.3
diff -u src/doc/CHANGES-8.3:1.1.2.228 src/doc/CHANGES-8.3:1.1.2.229
--- src/doc/CHANGES-8.3:1.1.2.228	Thu Apr 18 16:45:55 2024
+++ src/doc/CHANGES-8.3	Sun Apr 28 10:17:03 2024
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-8.3,v 1.1.2.228 2024/04/18 16:45:55 martin Exp $
+$NetBSD: CHANGES-8.3,v 1.1.2.229 2024/04/28 10:17:03 martin Exp $
 
 A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
 release:
@@ -4430,3 +4430,8 @@ sys/arch/x86/x86/viac7temp.c			1.10
 	viac7temp(4): PR 58148: fix the kernel module.
 	[andvar, ticket #1959]
 
+sys/netinet6/frag6.c1.78
+
+	inet6: fix calculation of fragment length.
+	[ozaki-r, ticket #1960]
+



CVS commit: [netbsd-8] src/doc

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 10:17:03 UTC 2024

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

Log Message:
Ticket #1960


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

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



CVS commit: [netbsd-8] src/sys/netinet6

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 10:15:20 UTC 2024

Modified Files:
src/sys/netinet6 [netbsd-8]: frag6.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1960):

sys/netinet6/frag6.c: revision 1.78

frag6: fix calculation of fragment length

Because of the miscalculation, 32 bytes fragmented IPv6 packets
have been wrongly dropped.

See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html
for more details.

Patch from Yasuyuki KOZAKAI (with minor tweaks)


To generate a diff of this commit:
cvs rdiff -u -r1.60.6.6 -r1.60.6.7 src/sys/netinet6/frag6.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/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.60.6.6 src/sys/netinet6/frag6.c:1.60.6.7
--- src/sys/netinet6/frag6.c:1.60.6.6	Thu Oct 27 16:08:50 2022
+++ src/sys/netinet6/frag6.c	Sun Apr 28 10:15:20 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: frag6.c,v 1.60.6.6 2022/10/27 16:08:50 martin Exp $	*/
+/*	$NetBSD: frag6.c,v 1.60.6.7 2024/04/28 10:15:20 martin Exp $	*/
 /*	$KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.60.6.6 2022/10/27 16:08:50 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.60.6.7 2024/04/28 10:15:20 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -158,9 +158,10 @@ frag6_input(struct mbuf **mp, int *offp,
 	 * sizeof(struct ip6_frag) == 8
 	 * sizeof(struct ip6_hdr) = 40
 	 */
-	if ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) &&
-	(((ntohs(ip6->ip6_plen) - offset) == 0) ||
-	 ((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
+	frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset
+	- sizeof(struct ip6_frag);
+	if ((frgpartlen == 0) ||
+	((ip6f->ip6f_offlg & IP6F_MORE_FRAG) && (frgpartlen & 0x7) != 0)) {
 		icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER,
 		offsetof(struct ip6_hdr, ip6_plen));
 		in6_ifstat_inc(dstifp, ifs6_reass_fail);
@@ -269,7 +270,6 @@ frag6_input(struct mbuf **mp, int *offp,
 	 * in size.
 	 * If it would exceed, discard the fragment and return an ICMP error.
 	 */
-	frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset;
 	if (q6->ip6q_unfrglen >= 0) {
 		/* The 1st fragment has already arrived. */
 		if (q6->ip6q_unfrglen + fragoff + frgpartlen > IPV6_MAXPACKET) {



CVS commit: [netbsd-8] src/sys/netinet6

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 10:15:20 UTC 2024

Modified Files:
src/sys/netinet6 [netbsd-8]: frag6.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1960):

sys/netinet6/frag6.c: revision 1.78

frag6: fix calculation of fragment length

Because of the miscalculation, 32 bytes fragmented IPv6 packets
have been wrongly dropped.

See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html
for more details.

Patch from Yasuyuki KOZAKAI (with minor tweaks)


To generate a diff of this commit:
cvs rdiff -u -r1.60.6.6 -r1.60.6.7 src/sys/netinet6/frag6.c

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



CVS commit: [netbsd-9] src/sys/netinet6

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 10:14:18 UTC 2024

Modified Files:
src/sys/netinet6 [netbsd-9]: frag6.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1836):

sys/netinet6/frag6.c: revision 1.78

frag6: fix calculation of fragment length

Because of the miscalculation, 32 bytes fragmented IPv6 packets
have been wrongly dropped.

See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html
for more details.

Patch from Yasuyuki KOZAKAI (with minor tweaks)


To generate a diff of this commit:
cvs rdiff -u -r1.74.6.1 -r1.74.6.2 src/sys/netinet6/frag6.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/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.74.6.1 src/sys/netinet6/frag6.c:1.74.6.2
--- src/sys/netinet6/frag6.c:1.74.6.1	Thu Oct 27 16:06:24 2022
+++ src/sys/netinet6/frag6.c	Sun Apr 28 10:14:18 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: frag6.c,v 1.74.6.1 2022/10/27 16:06:24 martin Exp $	*/
+/*	$NetBSD: frag6.c,v 1.74.6.2 2024/04/28 10:14:18 martin Exp $	*/
 /*	$KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.74.6.1 2022/10/27 16:06:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.74.6.2 2024/04/28 10:14:18 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -197,9 +197,10 @@ frag6_input(struct mbuf **mp, int *offp,
 	 * sizeof(struct ip6_frag) == 8
 	 * sizeof(struct ip6_hdr) = 40
 	 */
-	if ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) &&
-	(((ntohs(ip6->ip6_plen) - offset) == 0) ||
-	 ((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
+	frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset
+	- sizeof(struct ip6_frag);
+	if ((frgpartlen == 0) ||
+	((ip6f->ip6f_offlg & IP6F_MORE_FRAG) && (frgpartlen & 0x7) != 0)) {
 		icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER,
 		offsetof(struct ip6_hdr, ip6_plen));
 		in6_ifstat_inc(dstifp, ifs6_reass_fail);
@@ -307,7 +308,6 @@ frag6_input(struct mbuf **mp, int *offp,
 	 * in size. If it would exceed, discard the fragment and return an
 	 * ICMP error.
 	 */
-	frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset;
 	if (q6->ip6q_unfrglen >= 0) {
 		/* The 1st fragment has already arrived. */
 		if (q6->ip6q_unfrglen + fragoff + frgpartlen > IPV6_MAXPACKET) {



CVS commit: [netbsd-9] src/sys/netinet6

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 10:14:18 UTC 2024

Modified Files:
src/sys/netinet6 [netbsd-9]: frag6.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1836):

sys/netinet6/frag6.c: revision 1.78

frag6: fix calculation of fragment length

Because of the miscalculation, 32 bytes fragmented IPv6 packets
have been wrongly dropped.

See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html
for more details.

Patch from Yasuyuki KOZAKAI (with minor tweaks)


To generate a diff of this commit:
cvs rdiff -u -r1.74.6.1 -r1.74.6.2 src/sys/netinet6/frag6.c

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



CVS commit: [netbsd-9] src

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 10:11:21 UTC 2024

Modified Files:
src/doc [netbsd-9]: README.files
src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local
src/sys/sys [netbsd-9]: param.h
Added Files:
src/doc [netbsd-9]: CHANGES-9.5

Log Message:
Welcome to 9.4_STABLE


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-9.5
cvs rdiff -u -r1.5.26.2 -r1.5.26.3 src/doc/README.files
cvs rdiff -u -r1.5.6.12 -r1.5.6.13 src/external/gpl2/groff/tmac/mdoc.local
cvs rdiff -u -r1.599.2.14 -r1.599.2.15 src/sys/sys/param.h

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

Modified files:

Index: src/doc/README.files
diff -u src/doc/README.files:1.5.26.2 src/doc/README.files:1.5.26.3
--- src/doc/README.files:1.5.26.2	Mon Aug  8 16:58:05 2022
+++ src/doc/README.files	Sun Apr 28 10:11:21 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: README.files,v 1.5.26.2 2022/08/08 16:58:05 martin Exp $
+#	$NetBSD: README.files,v 1.5.26.3 2024/04/28 10:11:21 martin Exp $
 
 What's in this directory:
 
@@ -10,6 +10,7 @@ CHANGES-9.1	Changes between the the 9.0 
 CHANGES-9.2	Changes between the the 9.1 release and the 9.2 release.
 CHANGES-9.3	Changes between the the 9.2 release and the 9.3 release.
 CHANGES-9.4	Changes between the the 9.3 release and the 9.4 release.
+CHANGES-9.5	Changes between the the 9.4 release and the 9.5 release.
 
 CHANGES.prev	Changes in previous NetBSD releases.
 

Index: src/external/gpl2/groff/tmac/mdoc.local
diff -u src/external/gpl2/groff/tmac/mdoc.local:1.5.6.12 src/external/gpl2/groff/tmac/mdoc.local:1.5.6.13
--- src/external/gpl2/groff/tmac/mdoc.local:1.5.6.12	Sat Apr 20 13:32:22 2024
+++ src/external/gpl2/groff/tmac/mdoc.local	Sun Apr 28 10:11:21 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: mdoc.local,v 1.5.6.12 2024/04/20 13:32:22 martin Exp $
+.\" $NetBSD: mdoc.local,v 1.5.6.13 2024/04/28 10:11:21 martin Exp $
 .\"
 .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -44,9 +44,9 @@
 .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq])
 .
 .\" Default .Os value
-.ds doc-operating-system NetBSD\~9.4
+.ds doc-operating-system NetBSD\~9.4_STABLE
 .\" Default footer operating system value
-.ds doc-default-operating-system NetBSD\~9.4
+.ds doc-default-operating-system NetBSD\~9.4_STABLE
 .\" Other known versions, not yet in groff distribution
 .ds doc-operating-system-NetBSD-1.3.3  1.3.3
 .ds doc-operating-system-NetBSD-1.6.3  1.6.3

Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.599.2.14 src/sys/sys/param.h:1.599.2.15
--- src/sys/sys/param.h:1.599.2.14	Sat Apr 20 13:32:21 2024
+++ src/sys/sys/param.h	Sun Apr 28 10:11:21 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.599.2.14 2024/04/20 13:32:21 martin Exp $	*/
+/*	$NetBSD: param.h,v 1.599.2.15 2024/04/28 10:11:21 martin Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	90400	/* NetBSD 9.4 */
+#define	__NetBSD_Version__	90400	/* NetBSD 9.4_STABLE */
 
 #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
 (m) * 100) + (p) * 100) <= __NetBSD_Version__)

Added files:

Index: src/doc/CHANGES-9.5
diff -u /dev/null src/doc/CHANGES-9.5:1.1.2.1
--- /dev/null	Sun Apr 28 10:11:21 2024
+++ src/doc/CHANGES-9.5	Sun Apr 28 10:11:21 2024
@@ -0,0 +1,14 @@
+# $NetBSD: CHANGES-9.5,v 1.1.2.1 2024/04/28 10:11:21 martin Exp $
+
+A complete list of changes from the NetBSD 9.4 release to the NetBSD 9.5
+release:
+
+external/gpl2/groff/tmac/mdoc.local		patched by hand
+sys/sys/param.h patched by hand
+doc/README.filespatched by hand
+doc/CHANGES-9.5 added
+
+	Welcome to 9.4_STABLE.
+	[martin]
+
+



CVS commit: [netbsd-9] src

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 10:11:21 UTC 2024

Modified Files:
src/doc [netbsd-9]: README.files
src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local
src/sys/sys [netbsd-9]: param.h
Added Files:
src/doc [netbsd-9]: CHANGES-9.5

Log Message:
Welcome to 9.4_STABLE


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-9.5
cvs rdiff -u -r1.5.26.2 -r1.5.26.3 src/doc/README.files
cvs rdiff -u -r1.5.6.12 -r1.5.6.13 src/external/gpl2/groff/tmac/mdoc.local
cvs rdiff -u -r1.599.2.14 -r1.599.2.15 src/sys/sys/param.h

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



CVS commit: [netbsd-10] src/sys/netinet6

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 10:07:03 UTC 2024

Modified Files:
src/sys/netinet6 [netbsd-10]: frag6.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #673):

sys/netinet6/frag6.c: revision 1.78

frag6: fix calculation of fragment length

Because of the miscalculation, 32 bytes fragmented IPv6 packets
have been wrongly dropped.

See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html
for more details.

Patch from Yasuyuki KOZAKAI (with minor tweaks)


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.76.2.1 src/sys/netinet6/frag6.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/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.76 src/sys/netinet6/frag6.c:1.76.2.1
--- src/sys/netinet6/frag6.c:1.76	Fri Oct 21 09:21:17 2022
+++ src/sys/netinet6/frag6.c	Sun Apr 28 10:07:03 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: frag6.c,v 1.76 2022/10/21 09:21:17 ozaki-r Exp $	*/
+/*	$NetBSD: frag6.c,v 1.76.2.1 2024/04/28 10:07:03 martin Exp $	*/
 /*	$KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.76 2022/10/21 09:21:17 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.76.2.1 2024/04/28 10:07:03 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -197,9 +197,10 @@ frag6_input(struct mbuf **mp, int *offp,
 	 * sizeof(struct ip6_frag) == 8
 	 * sizeof(struct ip6_hdr) = 40
 	 */
-	if ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) &&
-	(((ntohs(ip6->ip6_plen) - offset) == 0) ||
-	 ((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
+	frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset
+	- sizeof(struct ip6_frag);
+	if ((frgpartlen == 0) ||
+	((ip6f->ip6f_offlg & IP6F_MORE_FRAG) && (frgpartlen & 0x7) != 0)) {
 		icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER,
 		offsetof(struct ip6_hdr, ip6_plen));
 		in6_ifstat_inc(dstifp, ifs6_reass_fail);
@@ -307,7 +308,6 @@ frag6_input(struct mbuf **mp, int *offp,
 	 * in size. If it would exceed, discard the fragment and return an
 	 * ICMP error.
 	 */
-	frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset;
 	if (q6->ip6q_unfrglen >= 0) {
 		/* The 1st fragment has already arrived. */
 		if (q6->ip6q_unfrglen + fragoff + frgpartlen > IPV6_MAXPACKET) {



CVS commit: [netbsd-10] src/sys/netinet6

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 10:07:03 UTC 2024

Modified Files:
src/sys/netinet6 [netbsd-10]: frag6.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #673):

sys/netinet6/frag6.c: revision 1.78

frag6: fix calculation of fragment length

Because of the miscalculation, 32 bytes fragmented IPv6 packets
have been wrongly dropped.

See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html
for more details.

Patch from Yasuyuki KOZAKAI (with minor tweaks)


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.76.2.1 src/sys/netinet6/frag6.c

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



CVS commit: [netbsd-10] src

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 10:02:51 UTC 2024

Modified Files:
src/distrib/sets/lists/xbase [netbsd-10]: mi
src/external/mit/xorg/bin/xsetwallpaper [netbsd-10]: Makefile

Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #672):

distrib/sets/lists/xbase/mi: revision 1.175
external/mit/xorg/bin/xsetwallpaper/Makefile: revision 1.6

Install xsetwallpaper(1) manual page
Should fix PR 58172.


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.172.2.1 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.5 -r1.5.2.1 src/external/mit/xorg/bin/xsetwallpaper/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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.172 src/distrib/sets/lists/xbase/mi:1.172.2.1
--- src/distrib/sets/lists/xbase/mi:1.172	Mon Oct 17 07:40:22 2022
+++ src/distrib/sets/lists/xbase/mi	Sun Apr 28 10:02:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.172 2022/10/17 07:40:22 mrg Exp $
+# $NetBSD: mi,v 1.172.2.1 2024/04/28 10:02:51 martin Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1394,6 +1394,7 @@
 ./usr/X11R7/man/cat1/xsetmode.0xbase-xsetmode-catman	.cat,xorg
 ./usr/X11R7/man/cat1/xsetpointer.0			xbase-xsetpointer-catman	.cat,xorg
 ./usr/X11R7/man/cat1/xsetroot.0xbase-xsetroot-catman	.cat,xorg
+./usr/X11R7/man/cat1/xsetwallpaper.0			xbase-xsetwallpaper-catman	.cat,xorg
 ./usr/X11R7/man/cat1/xsm.0xbase-xsm-catman	.cat,xorg
 ./usr/X11R7/man/cat1/xstdcmap.0xbase-xstdcmap-catman	.cat,xorg
 ./usr/X11R7/man/cat1/xterm.0xbase-xterm-catman	.cat,xorg
@@ -1546,6 +1547,7 @@
 ./usr/X11R7/man/html1/xsetmode.html			xbase-xsetmode-htmlman	html,xorg
 ./usr/X11R7/man/html1/xsetpointer.html			xbase-xsetpointer-htmlman	html,xorg
 ./usr/X11R7/man/html1/xsetroot.html			xbase-xsetroot-htmlman	html,xorg
+./usr/X11R7/man/html1/xsetwallpaper.html		xbase-xsetwallpaper-htmlman	html,xorg
 ./usr/X11R7/man/html1/xsm.htmlxbase-xsm-htmlman	html,xorg
 ./usr/X11R7/man/html1/xstdcmap.html			xbase-xstdcmap-htmlman	html,xorg
 ./usr/X11R7/man/html1/xterm.html			xbase-xterm-htmlman	html,xorg
@@ -1699,6 +1701,7 @@
 ./usr/X11R7/man/man1/xsetmode.1xbase-xsetmode-man	.man,xorg
 ./usr/X11R7/man/man1/xsetpointer.1			xbase-xsetpointer-man	.man,xorg
 ./usr/X11R7/man/man1/xsetroot.1xbase-xsetroot-man	.man,xorg
+./usr/X11R7/man/man1/xsetwallpaper.1			xbase-xsetwallpaper-man	.man,xorg
 ./usr/X11R7/man/man1/xsm.1xbase-xsm-man	.man,xorg
 ./usr/X11R7/man/man1/xstdcmap.1xbase-xstdcmap-man	.man,xorg
 ./usr/X11R7/man/man1/xterm.1xbase-xterm-man	.man,xorg

Index: src/external/mit/xorg/bin/xsetwallpaper/Makefile
diff -u src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.5 src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.5.2.1
--- src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.5	Fri Feb 11 01:36:02 2022
+++ src/external/mit/xorg/bin/xsetwallpaper/Makefile	Sun Apr 28 10:02:51 2024
@@ -1,6 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2022/02/11 01:36:02 uwe Exp $
-
-NOMAN=		# defined
+#	$NetBSD: Makefile,v 1.5.2.1 2024/04/28 10:02:51 martin Exp $
 
 .include 
 



CVS commit: [netbsd-10] src

2024-04-28 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Apr 28 10:02:51 UTC 2024

Modified Files:
src/distrib/sets/lists/xbase [netbsd-10]: mi
src/external/mit/xorg/bin/xsetwallpaper [netbsd-10]: Makefile

Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #672):

distrib/sets/lists/xbase/mi: revision 1.175
external/mit/xorg/bin/xsetwallpaper/Makefile: revision 1.6

Install xsetwallpaper(1) manual page
Should fix PR 58172.


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.172.2.1 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.5 -r1.5.2.1 src/external/mit/xorg/bin/xsetwallpaper/Makefile

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



CVS commit: src/sys/dev/usb

2024-04-28 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Apr 28 08:55:03 UTC 2024

Modified Files:
src/sys/dev/usb: ohci.c

Log Message:
Fix some usb_syncmem calls and add some missing ones.


To generate a diff of this commit:
cvs rdiff -u -r1.327 -r1.328 src/sys/dev/usb/ohci.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/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.327 src/sys/dev/usb/ohci.c:1.328
--- src/sys/dev/usb/ohci.c:1.327	Sun Apr 28 07:52:52 2024
+++ src/sys/dev/usb/ohci.c	Sun Apr 28 08:55:03 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: ohci.c,v 1.327 2024/04/28 07:52:52 skrll Exp $	*/
+/*	$NetBSD: ohci.c,v 1.328 2024/04/28 08:55:03 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2005, 2012, 2016, 2020 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.327 2024/04/28 07:52:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.328 2024/04/28 08:55:03 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -844,6 +844,9 @@ ohci_init(ohci_softc_t *sc)
 		goto bad1;
 	}
 	sc->sc_ctrl_head->ed.ed_flags |= HTOO32(OHCI_ED_SKIP);
+	usb_syncmem(&sc->sc_ctrl_head->dma, sc->sc_ctrl_head->offs,
+	sizeof(sc->sc_ctrl_head->ed),
+	BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 
 	/* Allocate dummy ED that starts the bulk list. */
 	sc->sc_bulk_head = ohci_alloc_sed(sc);
@@ -1609,6 +1612,10 @@ ohci_softintr(void *v)
 			for (i = 0, sitd = xfer->ux_hcpriv;;
 			sitd = next) {
 next = sitd->nextitd;
+
+usb_syncmem(&sitd->dma, sitd->offs, sizeof(sitd->itd),
+BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
+
 if (OHCI_ITD_GET_CC(O32TOH(sitd->
 itd.itd_flags)) != OHCI_CC_NO_ERROR)
 	xfer->ux_status = USBD_IOERROR;
@@ -2259,8 +2266,7 @@ ohci_abortx(struct usbd_xfer *xfer)
 	 * waiting for the next start of frame (OHCI_SF)
 	 */
 	DPRINTFN(1, "stop ed=%#jx", (uintptr_t)sed, 0, 0, 0);
-	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
-	sizeof(sed->ed.ed_flags),
+	usb_syncmem(&sed->dma, sed->offs, sizeof(sed->ed),
 	BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	if (!(sed->ed.ed_flags & OHCI_HALTED)) {
 		/* force hardware skip */
@@ -2337,6 +2343,9 @@ ohci_abortx(struct usbd_xfer *xfer)
 		hit |= headp == p->physaddr;
 		n = p->nexttd;
 
+		usb_syncmem(&p->dma, p->offs + offsetof(ohci_td_t, td_flags),
+		sizeof(p->td.td_flags),
+		BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 		int cc = OHCI_TD_GET_CC(O32TOH(p->td.td_flags));
 		if (!OHCI_CC_ACCESSED_P(cc)) {
 			ohci_hash_rem_td(sc, p);
@@ -2951,8 +2960,17 @@ ohci_device_clear_toggle(struct usbd_pip
 {
 	struct ohci_pipe *opipe = OHCI_PIPE2OPIPE(pipe);
 	ohci_softc_t *sc = OHCI_PIPE2SC(pipe);
+	ohci_soft_ed_t *sed = opipe->sed;
+
+	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_headp),
+	sizeof(sed->ed.ed_headp),
+	BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 
 	opipe->sed->ed.ed_headp &= HTOO32(~OHCI_TOGGLECARRY);
+
+	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_headp),
+	sizeof(sed->ed.ed_headp),
+	BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 }
 
 Static void
@@ -3403,17 +3421,21 @@ ohci_device_setintr(ohci_softc_t *sc, st
 	mutex_enter(&sc->sc_lock);
 	hsed = sc->sc_eds[best];
 	sed->next = hsed->next;
-	usb_syncmem(&hsed->dma, hsed->offs + offsetof(ohci_ed_t, ed_flags),
-	sizeof(hsed->ed.ed_flags),
+	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_nexted),
+	sizeof(sed->ed.ed_nexted),
 	BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	sed->ed.ed_nexted = hsed->ed.ed_nexted;
-	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
-	sizeof(sed->ed.ed_flags),
+	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_nexted),
+	sizeof(sed->ed.ed_nexted),
 	BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+
 	hsed->next = sed;
+	usb_syncmem(&hsed->dma, hsed->offs + offsetof(ohci_ed_t, ed_nexted),
+	sizeof(hsed->ed.ed_nexted),
+	BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	hsed->ed.ed_nexted = HTOO32(sed->physaddr);
-	usb_syncmem(&hsed->dma, hsed->offs + offsetof(ohci_ed_t, ed_flags),
-	sizeof(hsed->ed.ed_flags),
+	usb_syncmem(&hsed->dma, hsed->offs + offsetof(ohci_ed_t, ed_nexted),
+	sizeof(hsed->ed.ed_nexted),
 	BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	mutex_exit(&sc->sc_lock);
 
@@ -3685,8 +3707,7 @@ ohci_device_isoc_enter(struct usbd_xfer 
 	BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	sed->ed.ed_tailp = HTOO32(tail->physaddr);
 	sed->ed.ed_flags &= HTOO32(~OHCI_ED_SKIP);
-	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
-	sizeof(sed->ed.ed_flags),
+	usb_syncmem(&sed->dma, sed->offs, sizeof(sed->ed),
 	BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 }
 



CVS commit: src/sys/dev/usb

2024-04-28 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Apr 28 08:55:03 UTC 2024

Modified Files:
src/sys/dev/usb: ohci.c

Log Message:
Fix some usb_syncmem calls and add some missing ones.


To generate a diff of this commit:
cvs rdiff -u -r1.327 -r1.328 src/sys/dev/usb/ohci.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/i386/conf

2024-04-28 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Sun Apr 28 08:12:44 UTC 2024

Modified Files:
src/sys/arch/i386/conf: LEGACY

Log Message:
i386: disable DRMKMS drivers in LEGACY kernel (this is for ISA)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/conf/LEGACY

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



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

2024-04-28 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Sun Apr 28 08:12:44 UTC 2024

Modified Files:
src/sys/arch/i386/conf: LEGACY

Log Message:
i386: disable DRMKMS drivers in LEGACY kernel (this is for ISA)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/conf/LEGACY

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

Modified files:

Index: src/sys/arch/i386/conf/LEGACY
diff -u src/sys/arch/i386/conf/LEGACY:1.2 src/sys/arch/i386/conf/LEGACY:1.3
--- src/sys/arch/i386/conf/LEGACY:1.2	Mon Jul 17 21:12:29 2023
+++ src/sys/arch/i386/conf/LEGACY	Sun Apr 28 08:12:44 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: LEGACY,v 1.2 2023/07/17 21:12:29 riastradh Exp $
+#	$NetBSD: LEGACY,v 1.3 2024/04/28 08:12:44 nia Exp $
 
 # LEGACY kernel -- includes vga@isa and pcdisplay@isa for pre-PCI
 # systems, due to significant pain making them fail to attach when
@@ -15,3 +15,12 @@ options 	ATA_DOWNGRADE_MODE
 
 # XXX we could turn off all sorts of other modern features in this
 # configuration, but that is left for future work.
+
+no i915drmkms*		at pci?
+no intelfb*		at intelfbbus?  
+
+no radeon*		at pci?
+no radeondrmkmsfb*	at radeonfbbus?
+
+no nouveau*		at pci?
+no nouveaufb*		at nouveaufbbus?



CVS commit: src/share/mk

2024-04-28 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Sun Apr 28 08:01:04 UTC 2024

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

Log Message:
Turn off MKAMDGPUFIRMWARE on i386

It's too big for the i386 install media and not useful on either
pre-2012 hardware or the kinds of embedded systems where i386 still
thrived after 2012.

(The build of the kernel parts of amdgpu on i386 is nevertheless useful
for finding obscure bugs.)

"go for it" riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.1372 -r1.1373 src/share/mk/bsd.own.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.own.mk
diff -u src/share/mk/bsd.own.mk:1.1372 src/share/mk/bsd.own.mk:1.1373
--- src/share/mk/bsd.own.mk:1.1372	Wed Apr 24 20:38:24 2024
+++ src/share/mk/bsd.own.mk	Sun Apr 28 08:01:04 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1372 2024/04/24 20:38:24 martin Exp $
+#	$NetBSD: bsd.own.mk,v 1.1373 2024/04/28 08:01:04 nia Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1301,7 +1301,6 @@ MKRADEONFIRMWARE.x86_64=	yes
 MKRADEONFIRMWARE.i386=		yes
 MKRADEONFIRMWARE.aarch64=	yes
 MKAMDGPUFIRMWARE.x86_64=	yes
-MKAMDGPUFIRMWARE.i386=		yes
 
 # Only install the tegra firmware on evbarm.
 MKTEGRAFIRMWARE.evbarm=		yes



CVS commit: src/share/mk

2024-04-28 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Sun Apr 28 08:01:04 UTC 2024

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

Log Message:
Turn off MKAMDGPUFIRMWARE on i386

It's too big for the i386 install media and not useful on either
pre-2012 hardware or the kinds of embedded systems where i386 still
thrived after 2012.

(The build of the kernel parts of amdgpu on i386 is nevertheless useful
for finding obscure bugs.)

"go for it" riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.1372 -r1.1373 src/share/mk/bsd.own.mk

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



CVS commit: src/sys/dev/usb

2024-04-28 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Apr 28 07:52:52 UTC 2024

Modified Files:
src/sys/dev/usb: ohci.c

Log Message:
Whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.326 -r1.327 src/sys/dev/usb/ohci.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/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.326 src/sys/dev/usb/ohci.c:1.327
--- src/sys/dev/usb/ohci.c:1.326	Fri Apr  5 18:57:10 2024
+++ src/sys/dev/usb/ohci.c	Sun Apr 28 07:52:52 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: ohci.c,v 1.326 2024/04/05 18:57:10 riastradh Exp $	*/
+/*	$NetBSD: ohci.c,v 1.327 2024/04/28 07:52:52 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2005, 2012, 2016, 2020 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.326 2024/04/05 18:57:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.327 2024/04/28 07:52:52 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -826,8 +826,8 @@ ohci_init(ohci_softc_t *sc)
 
 	/* XXX determine alignment by R/W */
 	/* Allocate the HCCA area. */
-	err = usb_allocmem(sc->sc_bus.ub_dmatag, OHCI_HCCA_SIZE,	OHCI_HCCA_ALIGN,
-	USBMALLOC_COHERENT, &sc->sc_hccadma);
+	err = usb_allocmem(sc->sc_bus.ub_dmatag, OHCI_HCCA_SIZE,
+	OHCI_HCCA_ALIGN, USBMALLOC_COHERENT, &sc->sc_hccadma);
 	if (err) {
 		sc->sc_hcca = NULL;
 		return err;



CVS commit: src/sys/dev/usb

2024-04-28 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Apr 28 07:52:52 UTC 2024

Modified Files:
src/sys/dev/usb: ohci.c

Log Message:
Whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.326 -r1.327 src/sys/dev/usb/ohci.c

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



CVS commit: src/tests

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 07:27:43 UTC 2024

Modified Files:
src/tests/bin/df: t_df.sh
src/tests/bin/pax: t_pax.sh
src/tests/bin/sh: t_ulimit.sh t_varquote.sh
src/tests/bin/tar: t_tar.sh
src/tests/crypto/libcrypto: t_libcrypto.sh
src/tests/fs/psshfs: t_psshfs.sh
src/tests/fs/tmpfs: h_funcs.subr t_create.sh t_devices.sh t_dots.sh
t_exec.sh t_link.sh t_mkdir.sh t_mknod.sh t_mount.sh t_pipes.sh
t_read_write.sh t_readdir.sh t_remove.sh t_rename.sh t_rmdir.sh
t_setattr.sh t_sizes.sh t_sockets.sh t_symlink.sh t_times.sh
t_trail_slash.sh t_vnd.sh t_vnode_leak.sh
src/tests/games: t_factor.sh
src/tests/lib/librumphijack: t_tcpip.sh
src/tests/modules: t_abi_uvm.sh t_klua_pr_52864.sh t_modload.sh
t_threadpool.sh
src/tests/sbin/newfs_msdos: t_create.sh
src/tests/sys/rc: t_rc_d_cli.sh
src/tests/usr.bin/config: t_config.sh
src/tests/usr.bin/id: t_groups.sh t_id.sh t_whoami.sh
src/tests/usr.bin/mtree: t_sets.sh
src/tests/usr.bin/netpgpverify: Testspec t_netpgpverify.sh
src/tests/usr.bin/sdiff: t_sdiff.sh

Log Message:
tests: replace deprecated '-s eq:...' with '-s exit:...'


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/bin/df/t_df.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/pax/t_pax.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/bin/sh/t_ulimit.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/bin/sh/t_varquote.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/bin/tar/t_tar.sh
cvs rdiff -u -r1.9 -r1.10 src/tests/crypto/libcrypto/t_libcrypto.sh
cvs rdiff -u -r1.9 -r1.10 src/tests/fs/psshfs/t_psshfs.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/tmpfs/h_funcs.subr \
src/tests/fs/tmpfs/t_devices.sh src/tests/fs/tmpfs/t_dots.sh \
src/tests/fs/tmpfs/t_exec.sh src/tests/fs/tmpfs/t_mknod.sh \
src/tests/fs/tmpfs/t_pipes.sh src/tests/fs/tmpfs/t_read_write.sh \
src/tests/fs/tmpfs/t_readdir.sh src/tests/fs/tmpfs/t_remove.sh \
src/tests/fs/tmpfs/t_rename.sh src/tests/fs/tmpfs/t_rmdir.sh \
src/tests/fs/tmpfs/t_setattr.sh src/tests/fs/tmpfs/t_sockets.sh \
src/tests/fs/tmpfs/t_symlink.sh src/tests/fs/tmpfs/t_trail_slash.sh
cvs rdiff -u -r1.8 -r1.9 src/tests/fs/tmpfs/t_create.sh \
src/tests/fs/tmpfs/t_mkdir.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/tmpfs/t_link.sh \
src/tests/fs/tmpfs/t_mount.sh src/tests/fs/tmpfs/t_sizes.sh
cvs rdiff -u -r1.7 -r1.8 src/tests/fs/tmpfs/t_times.sh \
src/tests/fs/tmpfs/t_vnode_leak.sh
cvs rdiff -u -r1.13 -r1.14 src/tests/fs/tmpfs/t_vnd.sh
cvs rdiff -u -r1.11 -r1.12 src/tests/games/t_factor.sh
cvs rdiff -u -r1.23 -r1.24 src/tests/lib/librumphijack/t_tcpip.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/modules/t_abi_uvm.sh \
src/tests/modules/t_klua_pr_52864.sh
cvs rdiff -u -r1.13 -r1.14 src/tests/modules/t_modload.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/modules/t_threadpool.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/sbin/newfs_msdos/t_create.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/sys/rc/t_rc_d_cli.sh
cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/config/t_config.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/id/t_groups.sh \
src/tests/usr.bin/id/t_id.sh src/tests/usr.bin/id/t_whoami.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/mtree/t_sets.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/netpgpverify/Testspec
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/netpgpverify/t_netpgpverify.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/sdiff/t_sdiff.sh

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



CVS commit: src/tests

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 07:27:43 UTC 2024

Modified Files:
src/tests/bin/df: t_df.sh
src/tests/bin/pax: t_pax.sh
src/tests/bin/sh: t_ulimit.sh t_varquote.sh
src/tests/bin/tar: t_tar.sh
src/tests/crypto/libcrypto: t_libcrypto.sh
src/tests/fs/psshfs: t_psshfs.sh
src/tests/fs/tmpfs: h_funcs.subr t_create.sh t_devices.sh t_dots.sh
t_exec.sh t_link.sh t_mkdir.sh t_mknod.sh t_mount.sh t_pipes.sh
t_read_write.sh t_readdir.sh t_remove.sh t_rename.sh t_rmdir.sh
t_setattr.sh t_sizes.sh t_sockets.sh t_symlink.sh t_times.sh
t_trail_slash.sh t_vnd.sh t_vnode_leak.sh
src/tests/games: t_factor.sh
src/tests/lib/librumphijack: t_tcpip.sh
src/tests/modules: t_abi_uvm.sh t_klua_pr_52864.sh t_modload.sh
t_threadpool.sh
src/tests/sbin/newfs_msdos: t_create.sh
src/tests/sys/rc: t_rc_d_cli.sh
src/tests/usr.bin/config: t_config.sh
src/tests/usr.bin/id: t_groups.sh t_id.sh t_whoami.sh
src/tests/usr.bin/mtree: t_sets.sh
src/tests/usr.bin/netpgpverify: Testspec t_netpgpverify.sh
src/tests/usr.bin/sdiff: t_sdiff.sh

Log Message:
tests: replace deprecated '-s eq:...' with '-s exit:...'


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/bin/df/t_df.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/pax/t_pax.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/bin/sh/t_ulimit.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/bin/sh/t_varquote.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/bin/tar/t_tar.sh
cvs rdiff -u -r1.9 -r1.10 src/tests/crypto/libcrypto/t_libcrypto.sh
cvs rdiff -u -r1.9 -r1.10 src/tests/fs/psshfs/t_psshfs.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/tmpfs/h_funcs.subr \
src/tests/fs/tmpfs/t_devices.sh src/tests/fs/tmpfs/t_dots.sh \
src/tests/fs/tmpfs/t_exec.sh src/tests/fs/tmpfs/t_mknod.sh \
src/tests/fs/tmpfs/t_pipes.sh src/tests/fs/tmpfs/t_read_write.sh \
src/tests/fs/tmpfs/t_readdir.sh src/tests/fs/tmpfs/t_remove.sh \
src/tests/fs/tmpfs/t_rename.sh src/tests/fs/tmpfs/t_rmdir.sh \
src/tests/fs/tmpfs/t_setattr.sh src/tests/fs/tmpfs/t_sockets.sh \
src/tests/fs/tmpfs/t_symlink.sh src/tests/fs/tmpfs/t_trail_slash.sh
cvs rdiff -u -r1.8 -r1.9 src/tests/fs/tmpfs/t_create.sh \
src/tests/fs/tmpfs/t_mkdir.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/tmpfs/t_link.sh \
src/tests/fs/tmpfs/t_mount.sh src/tests/fs/tmpfs/t_sizes.sh
cvs rdiff -u -r1.7 -r1.8 src/tests/fs/tmpfs/t_times.sh \
src/tests/fs/tmpfs/t_vnode_leak.sh
cvs rdiff -u -r1.13 -r1.14 src/tests/fs/tmpfs/t_vnd.sh
cvs rdiff -u -r1.11 -r1.12 src/tests/games/t_factor.sh
cvs rdiff -u -r1.23 -r1.24 src/tests/lib/librumphijack/t_tcpip.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/modules/t_abi_uvm.sh \
src/tests/modules/t_klua_pr_52864.sh
cvs rdiff -u -r1.13 -r1.14 src/tests/modules/t_modload.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/modules/t_threadpool.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/sbin/newfs_msdos/t_create.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/sys/rc/t_rc_d_cli.sh
cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/config/t_config.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/id/t_groups.sh \
src/tests/usr.bin/id/t_id.sh src/tests/usr.bin/id/t_whoami.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/mtree/t_sets.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/netpgpverify/Testspec
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/netpgpverify/t_netpgpverify.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/sdiff/t_sdiff.sh

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

Modified files:

Index: src/tests/bin/df/t_df.sh
diff -u src/tests/bin/df/t_df.sh:1.2 src/tests/bin/df/t_df.sh:1.3
--- src/tests/bin/df/t_df.sh:1.2	Sun Aug 23 15:51:30 2020
+++ src/tests/bin/df/t_df.sh	Sun Apr 28 07:27:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_df.sh,v 1.2 2020/08/23 15:51:30 ryo Exp $
+# $NetBSD: t_df.sh,v 1.3 2024/04/28 07:27:40 rillig Exp $
 #
 # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -79,7 +79,7 @@ filer:/1202716672   1202716672  
 /dev/strpct   21474836476  10737418240  10737418236  50% /strpct
 /dev/wd0e10485688  2859932  7625756  27% /mount/windows/C
 EOF
-	atf_check -s eq:0 -o file:expout -e empty \
+	atf_check -s exit:0 -o file:expout -e empty \
 	-x "BLOCKSIZE=1k $(atf_get_srcdir)/h_df -n"
 }
 
@@ -137,7 +137,7 @@ filer:/1.1T   1.1T  -172G 117% /
 /dev/strpct 20T10T10T  50% /strpct
 /dev/wd0e   10G   2.7G   7.3G  27% /mount/windows/C
 EOF
-	atf_check -s eq:0 -o file:expout -e empty \
+	atf_check -s exit:0 -o file:expout -e empty \
 	-x "BLOCKSIZE=1k $(atf_get_srcdir)/h_df -hn"
 }
 

Index: src/tests/bin/pax/t_pax.sh
diff -u src/tests/bin/pax/t_pax.sh:1.1 src/tests/bin/pax/t_pax.sh:1.2
--- src/tests/bin/pax/t_pax.sh:1.1	Sat Mar 17 16:33:11 2012
+++ src/tests/bin/pax/t_pax.sh	Sun Apr 28 07:27:40 202