CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sat Apr 20 13:32:22 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 LAST_MINUTE src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local src/sys/sys [netbsd-9]: param.h Log Message: Welcome to NetBSD 9.4 To generate a diff of this commit: cvs rdiff -u -r1.1.2.146 -r1.1.2.147 src/doc/CHANGES-9.4 cvs rdiff -u -r1.2.66.3 -r1.2.66.4 src/doc/LAST_MINUTE cvs rdiff -u -r1.5.6.11 -r1.5.6.12 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.599.2.13 -r1.599.2.14 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-9] src
Module Name:src Committed By: martin Date: Sat Apr 20 13:32:22 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 LAST_MINUTE src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local src/sys/sys [netbsd-9]: param.h Log Message: Welcome to NetBSD 9.4 To generate a diff of this commit: cvs rdiff -u -r1.1.2.146 -r1.1.2.147 src/doc/CHANGES-9.4 cvs rdiff -u -r1.2.66.3 -r1.2.66.4 src/doc/LAST_MINUTE cvs rdiff -u -r1.5.6.11 -r1.5.6.12 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.599.2.13 -r1.599.2.14 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/CHANGES-9.4 diff -u src/doc/CHANGES-9.4:1.1.2.146 src/doc/CHANGES-9.4:1.1.2.147 --- src/doc/CHANGES-9.4:1.1.2.146 Thu Apr 18 18:52:56 2024 +++ src/doc/CHANGES-9.4 Sat Apr 20 13:32:21 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.146 2024/04/18 18:52:56 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.147 2024/04/20 13:32:21 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -13612,4 +13612,9 @@ distrib/notes/common/main (edited manu Add dedication to Wayne Knowles. [martin] +doc/LAST_MINUTE (manually edited) +external/gpl2/groff/tmac/mdoc.local (manually edited) +sys/sys/param.h (manually edited) + Update version numbers - welcome to NetBSD 9.4! + [martin] Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.66.3 src/doc/LAST_MINUTE:1.2.66.4 --- src/doc/LAST_MINUTE:1.2.66.3 Thu Aug 4 15:30:36 2022 +++ src/doc/LAST_MINUTE Sat Apr 20 13:32:21 2024 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.66.3 2022/08/04 15:30:36 martin Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.66.4 2024/04/20 13:32:21 martin Exp $ -This file contains important information on the NetBSD 9.3 release that +This file contains important information on the NetBSD 9.4 release that did not make it into the main documentation. [all] Index: src/external/gpl2/groff/tmac/mdoc.local diff -u src/external/gpl2/groff/tmac/mdoc.local:1.5.6.11 src/external/gpl2/groff/tmac/mdoc.local:1.5.6.12 --- src/external/gpl2/groff/tmac/mdoc.local:1.5.6.11 Mon Aug 8 16:58:05 2022 +++ src/external/gpl2/groff/tmac/mdoc.local Sat Apr 20 13:32:22 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.5.6.11 2022/08/08 16:58:05 martin Exp $ +.\" $NetBSD: mdoc.local,v 1.5.6.12 2024/04/20 13:32:22 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.3_STABLE +.ds doc-operating-system NetBSD\~9.4 .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~9.3_STABLE +.ds doc-default-operating-system NetBSD\~9.4 .\" 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 @@ -67,6 +67,7 @@ .ds doc-operating-system-NetBSD-9.19.1 .ds doc-operating-system-NetBSD-9.29.2 .ds doc-operating-system-NetBSD-9.39.3 +.ds doc-operating-system-NetBSD-9.49.4 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-5.4 5.4 .ds doc-operating-system-FreeBSD-5.5 5.5 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.599.2.13 src/sys/sys/param.h:1.599.2.14 --- src/sys/sys/param.h:1.599.2.13 Mon Aug 8 16:51:35 2022 +++ src/sys/sys/param.h Sat Apr 20 13:32:21 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.599.2.13 2022/08/08 16:51:35 martin Exp $ */ +/* $NetBSD: param.h,v 1.599.2.14 2024/04/20 13:32:21 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 90300 /* NetBSD 9.3_STABLE */ +#define __NetBSD_Version__ 90400 /* NetBSD 9.4 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Thu Apr 18 18:52:56 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Note dedication of 9.4 To generate a diff of this commit: cvs rdiff -u -r1.1.2.145 -r1.1.2.146 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.145 src/doc/CHANGES-9.4:1.1.2.146 --- src/doc/CHANGES-9.4:1.1.2.145 Thu Apr 18 16:41:58 2024 +++ src/doc/CHANGES-9.4 Thu Apr 18 18:52:56 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.145 2024/04/18 16:41:58 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.146 2024/04/18 18:52:56 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -13607,3 +13607,9 @@ sys/arch/x86/x86/viac7temp.c 1.10 viac7temp(4): PR 58148: fix the kernel module. [andvar, ticket #1835] +distrib/notes/common/main (edited manually) + + Add dedication to Wayne Knowles. + [martin] + +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Thu Apr 18 18:52:56 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Note dedication of 9.4 To generate a diff of this commit: cvs rdiff -u -r1.1.2.145 -r1.1.2.146 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src
Committed By: martin
Date: Thu Apr 18 18:50:59 UTC 2024
Modified Files:
src/distrib/notes/common [netbsd-9]: main
Log Message:
Add dedication for the upcoming 9.4 release.
To generate a diff of this commit:
cvs rdiff -u -r1.551.2.12 -r1.551.2.13 src/distrib/notes/common/main
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.551.2.12 src/distrib/notes/common/main:1.551.2.13
--- src/distrib/notes/common/main:1.551.2.12 Tue Jun 14 10:37:05 2022
+++ src/distrib/notes/common/main Thu Apr 18 18:50:59 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.551.2.12 2022/06/14 10:37:05 martin Exp $
+.\" $NetBSD: main,v 1.551.2.13 2024/04/18 18:50:59 martin Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -509,28 +509,20 @@ possible,
would not exist.
.
.if \n[FOR_RELEASE] \{\
-.\" .Ss "Dedication"
-.\" .Pp
-.\" .
-.\" .Nx
-.\" 9.0 is dedicated to the memory of Matthias Drochner, who
-.\" passed away in August 2018 and Eric Schnoebelen, who
-.\" passed away in March 2019.
-.\" .Pp
-.\" Matthias' technical contributions are too many to list here in full.
-.\" He was a long term contributor and commited more than 3000 changes all
-.\" over the
-.\" .Nx
-.\" source tree and lately was especially active in keeping some of our most weird
-.\" ancient VME architectures in shape.
-.\" .Pp
-.\" Eric was a long term pkgsrc developer and well known community member.
-.\" .Pp
-.\" Beyond their technical contributions, Eric and Matthias were always
-.\" helpful and friendly.
-.\" Their example encouraged users to contribute to the project and share their
-.\" work with the community.
-.\" .Pp
+.Ss "Dedication"
+.Pp
+.
+.Nx
+9.4 is dedicated to the memory of Wayne Knowles, who
+passed away in December 2022.
+.Pp
+Wayne was a long term contributor, working mostly on low level Mips code.
+.Pp
+Beyond his technical contributions, Wayne was always
+helpful and friendly.
+His example encouraged users to contribute to the project and share their
+work with the community.
+.Pp
.\} \" \n[FOR_RELEASE]
.ie \n[RELEASE_BRANCH] .Ss Changes Between The NetBSD \n[oldvers] \
and \n[major] Releases
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src Committed By: martin Date: Thu Apr 18 18:50:59 UTC 2024 Modified Files: src/distrib/notes/common [netbsd-9]: main Log Message: Add dedication for the upcoming 9.4 release. To generate a diff of this commit: cvs rdiff -u -r1.551.2.12 -r1.551.2.13 src/distrib/notes/common/main 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
Module Name:src Committed By: martin Date: Thu Apr 18 16:41:58 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1827 - #1835 To generate a diff of this commit: cvs rdiff -u -r1.1.2.144 -r1.1.2.145 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.144 src/doc/CHANGES-9.4:1.1.2.145 --- src/doc/CHANGES-9.4:1.1.2.144 Wed Apr 17 18:06:32 2024 +++ src/doc/CHANGES-9.4 Thu Apr 18 16:41:58 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.144 2024/04/17 18:06:32 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.145 2024/04/18 16:41:58 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -13550,3 +13550,60 @@ share/mk/bsd.lib.mk1.398,1.399,1.152 bsd.x11.mk: PR 58104: use TOOL_AWK, not the build host's awk. [riastradh, ticket #1826] +share/mk/bsd.own.mk1.1365,1.1366 (patch) +sys/arch/aarch64/include/sljit_machdep.h 1.4 (patch) +sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c 1.5 (patch) +sys/modules/Makefile1.285 (patch) + + aarch64: PR 58103: enable SLJIT acceleration. + [riastradh, ticket #1827] + +sys/stand/efiboot/efiboot.c 1.23 + + efiboot: PR 58075: avoid invalid memory access with netboot. + [riastradh, ticket #1828] + +distrib/evbarm/instkernel/sshramdisk/Makefile 1.26 + + evbarm/sshramdisk: PR 58035: put firmware files in the right +place. + [riastradh, ticket #1829] + +share/man/man9/workqueue.9 1.15 (patch) +sys/kern/subr_workqueue.c 1.39-1.47 (patch) +tests/rump/kernspace/kernspace.h 1.9 (patch) +tests/rump/kernspace/workqueue.c 1.7-1.9 (patch) +tests/rump/rumpkern/Makefile 1.20 (patch) +tests/rump/rumpkern/t_workqueue.c 1.3,1.4 (patch) + + workqueue(9): PR 57574: fix use-after-free. + [riastradh, ticket #1830] + +external/bsd/am-utils/dist/amd/amq_subr.c 1.4,1.5 +external/bsd/am-utils/dist/amq/amq.c 1.4 +external/bsd/am-utils/dist/amq/amq_xdr.c 1.2 +external/bsd/am-utils/dist/include/amq_defs.h 1.2 + + amd(8): PR 56974: fix crash in amq -i. + [riastradh, ticket #1831] + +external/gpl2/grep/dist/src/grep.c 1.3 + + grep(1): PR 56584: don't read FIFOs with -D skip. + [riastradh, ticket #1832] + +usr.bin/who/utmpentry.c1.22 + + who(1): PR 56013: fix utmpentry counting. + [riastradh, ticket #1833] + +share/mk/bsd.own.mk1.1177 + + sparc64: PR 55937: enable building zfs by default. + [riastradh, ticket #1834] + +sys/arch/x86/x86/viac7temp.c 1.10 + + viac7temp(4): PR 58148: fix the kernel module. + [andvar, ticket #1835] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Thu Apr 18 16:41:58 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1827 - #1835 To generate a diff of this commit: cvs rdiff -u -r1.1.2.144 -r1.1.2.145 src/doc/CHANGES-9.4 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/arch/x86/x86
Module Name:src
Committed By: martin
Date: Thu Apr 18 16:40:17 UTC 2024
Modified Files:
src/sys/arch/x86/x86 [netbsd-9]: viac7temp.c
Log Message:
Pull up following revision(s) (requested by andvar in ticket #1835):
sys/arch/x86/x86/viac7temp.c: revision 1.10
viac7temp(4): define module metadata using MODULE() macro and implement
viac7temp_modcmd() to handle module load/unload events.
Fixes PR kern/58148. Look OK by mrg@.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.32.1 src/sys/arch/x86/x86/viac7temp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/viac7temp.c
diff -u src/sys/arch/x86/x86/viac7temp.c:1.8 src/sys/arch/x86/x86/viac7temp.c:1.8.32.1
--- src/sys/arch/x86/x86/viac7temp.c:1.8 Sun Aug 10 16:44:34 2014
+++ src/sys/arch/x86/x86/viac7temp.c Thu Apr 18 16:40:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: viac7temp.c,v 1.8 2014/08/10 16:44:34 tls Exp $ */
+/* $NetBSD: viac7temp.c,v 1.8.32.1 2024/04/18 16:40:17 martin Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill
@@ -27,11 +27,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: viac7temp.c,v 1.8 2014/08/10 16:44:34 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viac7temp.c,v 1.8.32.1 2024/04/18 16:40:17 martin Exp $");
#include
#include
#include
+#include
#include
#include
@@ -162,3 +163,32 @@ viac7temp_refresh_xcall(void *arg0, void
edata->value_cur += 27315;
edata->state = ENVSYS_SVALID;
}
+
+MODULE(MODULE_CLASS_DRIVER, viac7temp, NULL);
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+static int
+viac7temp_modcmd(modcmd_t cmd, void *arg __unused)
+{
+ int error = 0;
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+#ifdef _MODULE
+ error = config_init_component(cfdriver_ioconf_viac7temp,
+ cfattach_ioconf_viac7temp, cfdata_ioconf_viac7temp);
+#endif
+ return error;
+ case MODULE_CMD_FINI:
+#ifdef _MODULE
+ error = config_fini_component(cfdriver_ioconf_viac7temp,
+ cfattach_ioconf_viac7temp, cfdata_ioconf_viac7temp);
+#endif
+ return error;
+ default:
+ return ENOTTY;
+ }
+}
CVS commit: [netbsd-9] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Thu Apr 18 16:40:17 UTC 2024 Modified Files: src/sys/arch/x86/x86 [netbsd-9]: viac7temp.c Log Message: Pull up following revision(s) (requested by andvar in ticket #1835): sys/arch/x86/x86/viac7temp.c: revision 1.10 viac7temp(4): define module metadata using MODULE() macro and implement viac7temp_modcmd() to handle module load/unload events. Fixes PR kern/58148. Look OK by mrg@. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.32.1 src/sys/arch/x86/x86/viac7temp.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/share/mk
Module Name:src
Committed By: martin
Date: Thu Apr 18 16:12:31 UTC 2024
Modified Files:
src/share/mk [netbsd-9]: bsd.own.mk
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1834):
share/mk/bsd.own.mk: revision 1.1177
ZFS works fine on my v210, so let's enable it for sparc64
To generate a diff of this commit:
cvs rdiff -u -r1.1149.2.7 -r1.1149.2.8 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.1149.2.7 src/share/mk/bsd.own.mk:1.1149.2.8
--- src/share/mk/bsd.own.mk:1.1149.2.7 Thu Apr 18 15:24:20 2024
+++ src/share/mk/bsd.own.mk Thu Apr 18 16:12:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1149.2.7 2024/04/18 15:24:20 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1149.2.8 2024/04/18 16:12:31 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -998,9 +998,10 @@ SOFTFLOAT_BITS= 32
.endif
#
-# We want to build zfs only for amd64 and aarch64 by default for now.
+# We want to build zfs only for amd64, aarch64 and sparc64 by default for now.
#
-.if ${MACHINE} == "amd64" || ${MACHINE_ARCH} == "aarch64"
+.if ${MACHINE} == "amd64" || ${MACHINE_ARCH} == "aarch64" || \
+${MACHINE} == "sparc64"
MKZFS?= yes
.endif
CVS commit: [netbsd-9] src/share/mk
Module Name:src Committed By: martin Date: Thu Apr 18 16:12:31 UTC 2024 Modified Files: src/share/mk [netbsd-9]: bsd.own.mk Log Message: Pull up following revision(s) (requested by riastradh in ticket #1834): share/mk/bsd.own.mk: revision 1.1177 ZFS works fine on my v210, so let's enable it for sparc64 To generate a diff of this commit: cvs rdiff -u -r1.1149.2.7 -r1.1149.2.8 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: [netbsd-9] src/usr.bin/who
Module Name:src
Committed By: martin
Date: Thu Apr 18 16:09:09 UTC 2024
Modified Files:
src/usr.bin/who [netbsd-9]: utmpentry.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1833):
usr.bin/who/utmpentry.c: revision 1.22
PR/56013: Kouichi Hashikawa: Move setutent/setutxent right before the loops.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.18.1 src/usr.bin/who/utmpentry.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/who/utmpentry.c
diff -u src/usr.bin/who/utmpentry.c:1.18 src/usr.bin/who/utmpentry.c:1.18.18.1
--- src/usr.bin/who/utmpentry.c:1.18 Sat Nov 21 15:01:43 2015
+++ src/usr.bin/who/utmpentry.c Thu Apr 18 16:09:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: utmpentry.c,v 1.18 2015/11/21 15:01:43 christos Exp $ */
+/* $NetBSD: utmpentry.c,v 1.18.18.1 2024/04/18 16:09:09 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: utmpentry.c,v 1.18 2015/11/21 15:01:43 christos Exp $");
+__RCSID("$NetBSD: utmpentry.c,v 1.18.18.1 2024/04/18 16:09:09 martin Exp $");
#endif
#include
@@ -95,14 +95,7 @@ setup(const char *fname)
struct stat st;
const char *sfname;
- if (fname == NULL) {
-#ifdef SUPPORT_UTMPX
- setutxent();
-#endif
-#ifdef SUPPORT_UTMP
- setutent();
-#endif
- } else {
+ if (fname != NULL) {
size_t len = strlen(fname);
if (len == 0)
errx(1, "Filename cannot be 0 length.");
@@ -133,9 +126,9 @@ setup(const char *fname)
what &= ~1;
} else {
if (timespeccmp(_mtimespec, , >))
- utmpxtime = st.st_mtimespec;
+utmpxtime = st.st_mtimespec;
else
- what &= ~1;
+what &= ~1;
}
}
#endif
@@ -204,10 +197,11 @@ getutentries(const char *fname, struct u
#endif
#ifdef SUPPORT_UTMPX
+ setutxent();
while ((what & 1) && (utx = getutxent()) != NULL) {
if (fname == NULL && ((1 << utx->ut_type) & etype) == 0)
continue;
- if ((ep = calloc(1, sizeof(struct utmpentry))) == NULL) {
+ if ((ep = calloc(1, sizeof(*ep))) == NULL) {
warn(NULL);
return 0;
}
@@ -218,6 +212,7 @@ getutentries(const char *fname, struct u
#endif
#ifdef SUPPORT_UTMP
+ setutent();
if ((etype & (1 << USER_PROCESS)) != 0) {
while ((what & 2) && (ut = getutent()) != NULL) {
if (fname == NULL && (*ut->ut_name == '\0' ||
CVS commit: [netbsd-9] src/usr.bin/who
Module Name:src Committed By: martin Date: Thu Apr 18 16:09:09 UTC 2024 Modified Files: src/usr.bin/who [netbsd-9]: utmpentry.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1833): usr.bin/who/utmpentry.c: revision 1.22 PR/56013: Kouichi Hashikawa: Move setutent/setutxent right before the loops. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.18.1 src/usr.bin/who/utmpentry.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/external/gpl2/grep/dist/src
Module Name:src
Committed By: martin
Date: Thu Apr 18 16:05:24 UTC 2024
Modified Files:
src/external/gpl2/grep/dist/src [netbsd-9]: grep.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1832):
external/gpl2/grep/dist/src/grep.c: revision 1.3
PR/56584: Andreas Gustafsson: Skip FIFO's when -D
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.18.1 src/external/gpl2/grep/dist/src/grep.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/gpl2/grep/dist/src/grep.c
diff -u src/external/gpl2/grep/dist/src/grep.c:1.2 src/external/gpl2/grep/dist/src/grep.c:1.2.18.1
--- src/external/gpl2/grep/dist/src/grep.c:1.2 Sun Jan 10 22:16:40 2016
+++ src/external/gpl2/grep/dist/src/grep.c Thu Apr 18 16:05:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: grep.c,v 1.2 2016/01/10 22:16:40 christos Exp $ */
+/* $NetBSD: grep.c,v 1.2.18.1 2024/04/18 16:05:24 martin Exp $ */
/* grep.c - main driver file for grep.
Copyright 1992, 1997-1999, 2000 Free Software Foundation, Inc.
@@ -271,11 +271,15 @@ reset (int fd, char const *file, struct
}
if (directories == SKIP_DIRECTORIES && S_ISDIR (stats->stat.st_mode))
return 0;
-#ifndef DJGPP
- if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode) || S_ISSOCK(stats->stat.st_mode)))
-#else
- if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode)))
+ if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode)
+ || S_ISBLK(stats->stat.st_mode)
+#ifdef S_ISSOCK
+ || S_ISSOCK(stats->stat.st_mode)
+#endif
+#ifdef S_ISFIFO
+ || S_ISFIFO(stats->stat.st_mode)
#endif
+ ))
return 0;
if (S_ISREG (stats->stat.st_mode))
{
CVS commit: [netbsd-9] src/external/gpl2/grep/dist/src
Module Name:src Committed By: martin Date: Thu Apr 18 16:05:24 UTC 2024 Modified Files: src/external/gpl2/grep/dist/src [netbsd-9]: grep.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1832): external/gpl2/grep/dist/src/grep.c: revision 1.3 PR/56584: Andreas Gustafsson: Skip FIFO's when -D To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.18.1 src/external/gpl2/grep/dist/src/grep.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/external/bsd/am-utils/dist
Module Name:src Committed By: martin Date: Thu Apr 18 15:59:59 UTC 2024 Modified Files: src/external/bsd/am-utils/dist/amd [netbsd-9]: amq_subr.c src/external/bsd/am-utils/dist/amq [netbsd-9]: amq.c amq_xdr.c src/external/bsd/am-utils/dist/include [netbsd-9]: amq_defs.h Log Message: Pull up following revision(s) (requested by riastradh in ticket #1831): external/bsd/am-utils/dist/include/amq_defs.h: revision 1.2 external/bsd/am-utils/dist/amq/amq_xdr.c: revision 1.2 external/bsd/am-utils/dist/amq/amq.c: revision 1.4 external/bsd/am-utils/dist/amd/amq_subr.c: revision 1.4 external/bsd/am-utils/dist/amd/amq_subr.c: revision 1.5 fix pointer bug (thanks RVP) and change to use 64 bit times. Don't bother with backwards compatibility; too much work for little benefit. remove long cast (thanks RVP) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.18.1 src/external/bsd/am-utils/dist/amd/amq_subr.c cvs rdiff -u -r1.3 -r1.3.18.1 src/external/bsd/am-utils/dist/amq/amq.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.18.1 \ src/external/bsd/am-utils/dist/amq/amq_xdr.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.18.1 \ src/external/bsd/am-utils/dist/include/amq_defs.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/external/bsd/am-utils/dist
Module Name:src
Committed By: martin
Date: Thu Apr 18 15:59:59 UTC 2024
Modified Files:
src/external/bsd/am-utils/dist/amd [netbsd-9]: amq_subr.c
src/external/bsd/am-utils/dist/amq [netbsd-9]: amq.c amq_xdr.c
src/external/bsd/am-utils/dist/include [netbsd-9]: amq_defs.h
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1831):
external/bsd/am-utils/dist/include/amq_defs.h: revision 1.2
external/bsd/am-utils/dist/amq/amq_xdr.c: revision 1.2
external/bsd/am-utils/dist/amq/amq.c: revision 1.4
external/bsd/am-utils/dist/amd/amq_subr.c: revision 1.4
external/bsd/am-utils/dist/amd/amq_subr.c: revision 1.5
fix pointer bug (thanks RVP) and change to use 64 bit times. Don't bother
with backwards compatibility; too much work for little benefit.
remove long cast (thanks RVP)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.18.1 src/external/bsd/am-utils/dist/amd/amq_subr.c
cvs rdiff -u -r1.3 -r1.3.18.1 src/external/bsd/am-utils/dist/amq/amq.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.18.1 \
src/external/bsd/am-utils/dist/amq/amq_xdr.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.18.1 \
src/external/bsd/am-utils/dist/include/amq_defs.h
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/am-utils/dist/amd/amq_subr.c
diff -u src/external/bsd/am-utils/dist/amd/amq_subr.c:1.3 src/external/bsd/am-utils/dist/amd/amq_subr.c:1.3.18.1
--- src/external/bsd/am-utils/dist/amd/amq_subr.c:1.3 Sun Jan 18 16:27:36 2015
+++ src/external/bsd/am-utils/dist/amd/amq_subr.c Thu Apr 18 15:59:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: amq_subr.c,v 1.3 2015/01/18 16:27:36 christos Exp $ */
+/* $NetBSD: amq_subr.c,v 1.3.18.1 2024/04/18 15:59:59 martin Exp $ */
/*
* Copyright (c) 1997-2014 Erez Zadok
@@ -331,7 +331,7 @@ bool_t
xdr_amq_mount_tree_node(XDR *xdrs, amq_mount_tree *objp)
{
am_node *mp = (am_node *) objp;
- long mtime;
+ longlong_t mtime;
if (!xdr_amq_string(xdrs, >am_al->al_mnt->mf_info)) {
return (FALSE);
@@ -346,7 +346,7 @@ xdr_amq_mount_tree_node(XDR *xdrs, amq_m
return (FALSE);
}
mtime = mp->am_stats.s_mtime;
- if (!xdr_long(xdrs, )) {
+ if (!xdr_longlong_t(xdrs, )) {
return (FALSE);
}
if (!xdr_u_short(xdrs, >am_stats.s_uid)) {
@@ -530,7 +530,7 @@ xdr_amq_map_info_qelem(XDR *xdrs, qelem
u_int len = 0;
int x;
char *n;
- long modify;
+ longlong_t modify;
/*
* Compute length of list
@@ -555,8 +555,8 @@ xdr_amq_map_info_qelem(XDR *xdrs, qelem
return (FALSE);
}
-modify = (long)m->modify;
-if (!xdr_long(xdrs, )) {
+modify = m->modify;
+if (!xdr_longlong_t(xdrs, )) {
return (FALSE);
}
Index: src/external/bsd/am-utils/dist/amq/amq.c
diff -u src/external/bsd/am-utils/dist/amq/amq.c:1.3 src/external/bsd/am-utils/dist/amq/amq.c:1.3.18.1
--- src/external/bsd/am-utils/dist/amq/amq.c:1.3 Sun Jan 18 15:37:57 2015
+++ src/external/bsd/am-utils/dist/amq/amq.c Thu Apr 18 15:59:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: amq.c,v 1.3 2015/01/18 15:37:57 christos Exp $ */
+/* $NetBSD: amq.c,v 1.3.18.1 2024/04/18 15:59:59 martin Exp $ */
/*
* Copyright (c) 1997-2014 Erez Zadok
@@ -81,7 +81,7 @@ enum show_opt {
static void
time_print(time_type tt)
{
- time_t t = (time_t)*tt;
+ time_t t = (time_t)tt;
struct tm *tp = localtime();
printf("%02d/%02d/%04d %02d:%02d:%02d",
tp->tm_mon + 1, tp->tm_mday,
Index: src/external/bsd/am-utils/dist/amq/amq_xdr.c
diff -u src/external/bsd/am-utils/dist/amq/amq_xdr.c:1.1.1.3 src/external/bsd/am-utils/dist/amq/amq_xdr.c:1.1.1.3.18.1
--- src/external/bsd/am-utils/dist/amq/amq_xdr.c:1.1.1.3 Sat Jan 17 16:34:15 2015
+++ src/external/bsd/am-utils/dist/amq/amq_xdr.c Thu Apr 18 15:59:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: amq_xdr.c,v 1.1.1.3 2015/01/17 16:34:15 christos Exp $ */
+/* $NetBSD: amq_xdr.c,v 1.1.1.3.18.1 2024/04/18 15:59:59 martin Exp $ */
/*
* Copyright (c) 1997-2014 Erez Zadok
@@ -49,7 +49,7 @@
bool_t
xdr_time_type(XDR *xdrs, time_type *objp)
{
- if (!xdr_long(xdrs, (long *) objp)) {
+ if (!xdr_longlong_t(xdrs, (longlong_t *) objp)) {
return (FALSE);
}
return (TRUE);
Index: src/external/bsd/am-utils/dist/include/amq_defs.h
diff -u src/external/bsd/am-utils/dist/include/amq_defs.h:1.1.1.3 src/external/bsd/am-utils/dist/include/amq_defs.h:1.1.1.3.18.1
--- src/external/bsd/am-utils/dist/include/amq_defs.h:1.1.1.3 Sat Jan 17 16:34:18 2015
+++ src/external/bsd/am-utils/dist/include/amq_defs.h Thu Apr 18 15:59:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: amq_defs.h,v 1.1.1.3 2015/01/17 16:34:18 christos Exp $ */
+/* $NetBSD: amq_defs.h,v 1.1.1.3.18.1 2024/04/18 15:59:59 martin Exp $ */
/*
* Copyright (c) 1997-2014 Erez Zadok
@@ -68,7 +68,7 @@
/*
* TYPEDEFS
*/
-typedef long *time_type;
+typedef long long time_type;
typedef struct amq_mount_info amq_mount_info;
typedef
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Thu Apr 18 15:51:36 UTC 2024 Modified Files: src/share/man/man9 [netbsd-9]: workqueue.9 src/sys/kern [netbsd-9]: subr_workqueue.c src/tests/rump/kernspace [netbsd-9]: kernspace.h workqueue.c src/tests/rump/rumpkern [netbsd-9]: Makefile t_workqueue.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1830): sys/kern/subr_workqueue.c: revision 1.40 sys/kern/subr_workqueue.c: revision 1.41 sys/kern/subr_workqueue.c: revision 1.42 sys/kern/subr_workqueue.c: revision 1.43 sys/kern/subr_workqueue.c: revision 1.44 sys/kern/subr_workqueue.c: revision 1.45 sys/kern/subr_workqueue.c: revision 1.46 tests/rump/kernspace/workqueue.c: revision 1.7 sys/kern/subr_workqueue.c: revision 1.47 tests/rump/kernspace/workqueue.c: revision 1.8 tests/rump/kernspace/workqueue.c: revision 1.9 tests/rump/rumpkern/t_workqueue.c: revision 1.3 tests/rump/rumpkern/t_workqueue.c: revision 1.4 tests/rump/kernspace/kernspace.h: revision 1.9 tests/rump/rumpkern/Makefile: revision 1.20 sys/kern/subr_workqueue.c: revision 1.39 share/man/man9/workqueue.9: revision 1.15 (all via patch) workqueue: Lift unnecessary restriction on workqueue_wait. Allow multiple concurrent waits at a time, and allow enqueueing work at the same time (as long as it's not the work we're waiting for). This way multiple users can use a shared global workqueue and safely wait for individual work items concurrently, while the workqueue is still in use for other items (e.g., wg(4) peers). This has the side effect of taking away a diagnostic measure, but I think allowing the diagnostic's false positives instead of rejecting them is worth it. We could cheaply add it back with some false negatives if it's important. workqueue(9): workqueue_wait and workqueue_destroy may sleep. But might not, so assert sleepable up front. workqueue(9): Sprinkle dtrace probes. tests/rump/rumpkern: Use PROGDPLIBS, not explicit -L/-l. This way we relink the t_* test programs whenever changes under tests/rump/kernspace change libkernspace.a. workqueue(9) tests: Nix trailing whitespace. workqueue(9) tests: Destroy struct work immediately on entry. workqueue(9) tests: Add test for PR kern/57574. workqueue(9): Avoid touching running work items in workqueue_wait. As soon as the workqueue function has called, it is forbidden to touch the struct work passed to it -- the function might free or reuse the data structure it is embedded in. So workqueue_wait is forbidden to search the queue for the batch of running work items. Instead, use a generation number which is odd while the thread is processing a batch of work and even when not. There's still a small optimization available with the struct work pointer to wait for: if we find the work item in one of the per-CPU _pending_ queues, then after we wait for a batch of work to complete on that CPU, we don't need to wait for work on any other CPUs. PR kern/57574 workqueue(9): Sprinkle dtrace probes for workqueue_wait edge cases. Let's make it easy to find out whether these are hit. workqueue(9): Stop violating queue(3) internals. workqueue(9): Avoid unnecessary mutex_exit/enter cycle each loop. workqueue(9): Sort includes. No functional change intended. workqueue(9): Factor out wq->wq_flags & WQ_FPU in workqueue_worker. No functional change intended. Makes it clearer that s is initialized when used. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.6.1 src/share/man/man9/workqueue.9 cvs rdiff -u -r1.37 -r1.37.6.1 src/sys/kern/subr_workqueue.c cvs rdiff -u -r1.8 -r1.8.2.1 src/tests/rump/kernspace/kernspace.h cvs rdiff -u -r1.6 -r1.6.8.1 src/tests/rump/kernspace/workqueue.c cvs rdiff -u -r1.18 -r1.18.2.1 src/tests/rump/rumpkern/Makefile cvs rdiff -u -r1.2 -r1.2.8.1 src/tests/rump/rumpkern/t_workqueue.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/workqueue.9 diff -u src/share/man/man9/workqueue.9:1.12 src/share/man/man9/workqueue.9:1.12.6.1 --- src/share/man/man9/workqueue.9:1.12 Thu Dec 28 07:00:52 2017 +++ src/share/man/man9/workqueue.9 Thu Apr 18 15:51:36 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: workqueue.9,v 1.12 2017/12/28 07:00:52 ozaki-r Exp $ +.\" $NetBSD: workqueue.9,v 1.12.6.1 2024/04/18 15:51:36 martin Exp $ .\" .\" Copyright (c)2005 YAMAMOTO Takashi, .\" All rights reserved. @@ -128,11 +128,11 @@ waits for a specified work on the workqueue .Fa wq to finish. -The caller must ensure that no new work will be enqueued to the workqueue -beforehand. -Note that if the workqueue is -.Dv WQ_PERCPU , -the caller can enqueue a new work to another queue other than the waiting queue. +The caller must ensure that +.Fa wk +will not be enqueued to the workqueue
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Thu Apr 18 15:51:36 UTC 2024 Modified Files: src/share/man/man9 [netbsd-9]: workqueue.9 src/sys/kern [netbsd-9]: subr_workqueue.c src/tests/rump/kernspace [netbsd-9]: kernspace.h workqueue.c src/tests/rump/rumpkern [netbsd-9]: Makefile t_workqueue.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1830): sys/kern/subr_workqueue.c: revision 1.40 sys/kern/subr_workqueue.c: revision 1.41 sys/kern/subr_workqueue.c: revision 1.42 sys/kern/subr_workqueue.c: revision 1.43 sys/kern/subr_workqueue.c: revision 1.44 sys/kern/subr_workqueue.c: revision 1.45 sys/kern/subr_workqueue.c: revision 1.46 tests/rump/kernspace/workqueue.c: revision 1.7 sys/kern/subr_workqueue.c: revision 1.47 tests/rump/kernspace/workqueue.c: revision 1.8 tests/rump/kernspace/workqueue.c: revision 1.9 tests/rump/rumpkern/t_workqueue.c: revision 1.3 tests/rump/rumpkern/t_workqueue.c: revision 1.4 tests/rump/kernspace/kernspace.h: revision 1.9 tests/rump/rumpkern/Makefile: revision 1.20 sys/kern/subr_workqueue.c: revision 1.39 share/man/man9/workqueue.9: revision 1.15 (all via patch) workqueue: Lift unnecessary restriction on workqueue_wait. Allow multiple concurrent waits at a time, and allow enqueueing work at the same time (as long as it's not the work we're waiting for). This way multiple users can use a shared global workqueue and safely wait for individual work items concurrently, while the workqueue is still in use for other items (e.g., wg(4) peers). This has the side effect of taking away a diagnostic measure, but I think allowing the diagnostic's false positives instead of rejecting them is worth it. We could cheaply add it back with some false negatives if it's important. workqueue(9): workqueue_wait and workqueue_destroy may sleep. But might not, so assert sleepable up front. workqueue(9): Sprinkle dtrace probes. tests/rump/rumpkern: Use PROGDPLIBS, not explicit -L/-l. This way we relink the t_* test programs whenever changes under tests/rump/kernspace change libkernspace.a. workqueue(9) tests: Nix trailing whitespace. workqueue(9) tests: Destroy struct work immediately on entry. workqueue(9) tests: Add test for PR kern/57574. workqueue(9): Avoid touching running work items in workqueue_wait. As soon as the workqueue function has called, it is forbidden to touch the struct work passed to it -- the function might free or reuse the data structure it is embedded in. So workqueue_wait is forbidden to search the queue for the batch of running work items. Instead, use a generation number which is odd while the thread is processing a batch of work and even when not. There's still a small optimization available with the struct work pointer to wait for: if we find the work item in one of the per-CPU _pending_ queues, then after we wait for a batch of work to complete on that CPU, we don't need to wait for work on any other CPUs. PR kern/57574 workqueue(9): Sprinkle dtrace probes for workqueue_wait edge cases. Let's make it easy to find out whether these are hit. workqueue(9): Stop violating queue(3) internals. workqueue(9): Avoid unnecessary mutex_exit/enter cycle each loop. workqueue(9): Sort includes. No functional change intended. workqueue(9): Factor out wq->wq_flags & WQ_FPU in workqueue_worker. No functional change intended. Makes it clearer that s is initialized when used. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.6.1 src/share/man/man9/workqueue.9 cvs rdiff -u -r1.37 -r1.37.6.1 src/sys/kern/subr_workqueue.c cvs rdiff -u -r1.8 -r1.8.2.1 src/tests/rump/kernspace/kernspace.h cvs rdiff -u -r1.6 -r1.6.8.1 src/tests/rump/kernspace/workqueue.c cvs rdiff -u -r1.18 -r1.18.2.1 src/tests/rump/rumpkern/Makefile cvs rdiff -u -r1.2 -r1.2.8.1 src/tests/rump/rumpkern/t_workqueue.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/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: martin
Date: Thu Apr 18 15:41:13 UTC 2024
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1829):
distrib/evbarm/instkernel/sshramdisk/Makefile: revision 1.26
evbarm/instkernel/sshramdisk: Put firmware in the right paths.
Maybe this should also be wired up to `release' to put the ramdisk in
the releasedir so we detect destdir path leakage like this had.
PR port-evbarm/58035
To generate a diff of this commit:
cvs rdiff -u -r1.17.4.1 -r1.17.4.2 \
src/distrib/evbarm/instkernel/sshramdisk/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/evbarm/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.17.4.1 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.17.4.2
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.17.4.1 Fri Aug 23 04:22:49 2019
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Thu Apr 18 15:41:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17.4.1 2019/08/23 04:22:49 msaitoh Exp $
+# $NetBSD: Makefile,v 1.17.4.2 2024/04/18 15:41:13 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -29,7 +29,9 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/group \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
+IMAGEPREBUILD= \
+ (cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -w libdata/firmware) \
+ | (cd ${WORKDIR} && ${TOOL_PAX} -r -pp)
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
CVS commit: [netbsd-9] src/distrib/evbarm/instkernel/sshramdisk
Module Name:src Committed By: martin Date: Thu Apr 18 15:41:13 UTC 2024 Modified Files: src/distrib/evbarm/instkernel/sshramdisk [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by riastradh in ticket #1829): distrib/evbarm/instkernel/sshramdisk/Makefile: revision 1.26 evbarm/instkernel/sshramdisk: Put firmware in the right paths. Maybe this should also be wired up to `release' to put the ramdisk in the releasedir so we detect destdir path leakage like this had. PR port-evbarm/58035 To generate a diff of this commit: cvs rdiff -u -r1.17.4.1 -r1.17.4.2 \ src/distrib/evbarm/instkernel/sshramdisk/Makefile 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/stand/efiboot
Module Name:src Committed By: martin Date: Thu Apr 18 15:33:44 UTC 2024 Modified Files: src/sys/stand/efiboot [netbsd-9]: efiboot.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1828): sys/stand/efiboot/efiboot.c: revision 1.23 efiboot: Duplicate efi_bootdp before we clobber it in efi_net_probe. Patch from jakllsch@. Makes Socionext Synquacer boot considerably more reliably. PR kern/58075 To generate a diff of this commit: cvs rdiff -u -r1.16.4.1 -r1.16.4.2 src/sys/stand/efiboot/efiboot.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/stand/efiboot/efiboot.c diff -u src/sys/stand/efiboot/efiboot.c:1.16.4.1 src/sys/stand/efiboot/efiboot.c:1.16.4.2 --- src/sys/stand/efiboot/efiboot.c:1.16.4.1 Thu Sep 26 19:15:18 2019 +++ src/sys/stand/efiboot/efiboot.c Thu Apr 18 15:33:44 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: efiboot.c,v 1.16.4.1 2019/09/26 19:15:18 martin Exp $ */ +/* $NetBSD: efiboot.c,v 1.16.4.2 2024/04/18 15:33:44 martin Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -84,6 +84,8 @@ efi_main(EFI_HANDLE imageHandle, EFI_SYS status = uefi_call_wrapper(BS->HandleProtocol, 3, efi_li->DeviceHandle, , (void **)_bootdp); if (EFI_ERROR(status)) efi_bootdp = NULL; + else + efi_bootdp = DuplicateDevicePath(efi_bootdp); #ifdef EFIBOOT_DEBUG Print(L"Loaded image : 0x%" PRIxEFIPTR "\n", efi_li);
CVS commit: [netbsd-9] src/sys/stand/efiboot
Module Name:src Committed By: martin Date: Thu Apr 18 15:33:44 UTC 2024 Modified Files: src/sys/stand/efiboot [netbsd-9]: efiboot.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1828): sys/stand/efiboot/efiboot.c: revision 1.23 efiboot: Duplicate efi_bootdp before we clobber it in efi_net_probe. Patch from jakllsch@. Makes Socionext Synquacer boot considerably more reliably. PR kern/58075 To generate a diff of this commit: cvs rdiff -u -r1.16.4.1 -r1.16.4.2 src/sys/stand/efiboot/efiboot.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
Module Name:src
Committed By: martin
Date: Thu Apr 18 15:24:21 UTC 2024
Modified Files:
src/share/mk [netbsd-9]: bsd.own.mk
src/sys/arch/aarch64/include [netbsd-9]: sljit_machdep.h
src/sys/external/bsd/sljit/dist/sljit_src [netbsd-9]:
sljitNativeARM_64.c
src/sys/modules [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #655):
sys/modules/Makefile: revision 1.285
share/mk/bsd.own.mk: revision 1.1365
share/mk/bsd.own.mk: revision 1.1366
sys/arch/aarch64/include/sljit_machdep.h: revision 1.4
sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c: revision 1.5
(all via patch)
sljit: Pacify -Wsign-compare.
If these sizes are negative, we're probably in trouble anyway, so
assert nonnegative here.
Needed to resolve PR 58103.
bsd.own.mk: Enable MKLSJIT on aarch64.
Make sure there's only one copy of the conditional, in bsd.own.mk;
just make sys/modules/Makefile conditional on MKSLJIT so we don't
have to keep these in sync.
As a workaround for PR 58106, tweak the conditional definition of
SLJIT_CACHE_FLUSH to use cpu_icache_sync_range only in _HARDKERNEL,
and use __builtin___clear_cache in userland and in rump kernels.
PR 58103: bpfjit.kmod is not built on aarch64
bsd.own.mk: No need for MKSLJIT to be set differently from others.
- Use ?=, not =, so mk.conf setting wins.
- Write out per-architecture tabular settings, not a conditional.
- Add comments for the architectures that look like they should have
sljit but don't. (XXX Missing comments about powerpc and mips --
not sure why, is this because modules don't yet work on those
architectures, or what?)
Tidying for PR 58103: bpfjit.kmod is not built on aarch64.
To generate a diff of this commit:
cvs rdiff -u -r1.1149.2.6 -r1.1149.2.7 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.2 -r1.2.6.1 src/sys/arch/aarch64/include/sljit_machdep.h
cvs rdiff -u -r1.4 -r1.4.4.1 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c
cvs rdiff -u -r1.222.2.1 -r1.222.2.2 src/sys/modules/Makefile
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.1149.2.6 src/share/mk/bsd.own.mk:1.1149.2.7
--- src/share/mk/bsd.own.mk:1.1149.2.6 Thu Feb 4 19:05:00 2021
+++ src/share/mk/bsd.own.mk Thu Apr 18 15:24:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1149.2.6 2021/02/04 19:05:00 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1149.2.7 2024/04/18 15:24:20 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1169,6 +1169,25 @@ MKLLVMRT.i386= yes
MKLLVMRT.aarch64= yes
.endif
+# Just-in-time compiler for bpf, npf acceleration
+MKSLJIT.aarch64= yes
+MKSLJIT.i386= yes
+MKSLJIT.sparc= yes
+#MKSLJIT.sparc64= yes # not suppored in sljit (yet?)
+MKSLJIT.x86_64= yes
+#MKSLJIT.powerpc= yes # XXX
+#MKSLJIT.powerpc64= yes # XXX
+#MKSLJIT.mipsel= yes # XXX
+#MKSLJIT.mipseb= yes # XXX
+#MKSLJIT.mips64el= yes # XXX
+#MKSLJIT.mips64eb= yes # XXX
+#MKSLJIT.riscv32= yes # not until we update sljit
+#MKSLJIT.riscv64= yes # not until we update sljit
+
+# compat with old names
+MKDEBUGKERNEL?=${MKKDEBUG:Uno}
+MKDEBUGTOOLS?=${MKTOOLSDEBUG:Uno}
+
#
# MK* options which default to "no". Note that MKZFS has a different
# default for some platforms, see above. Please keep alphabetically
@@ -1198,12 +1217,6 @@ _MKVARS.no= \
${var}?= ${${var}.${MACHINE_ARCH}:U${${var}.${MACHINE}:Uno}}
.endfor
-.if ${MACHINE_ARCH} == "i386" || \
-${MACHINE_ARCH} == "x86_64" || \
-${MACHINE_ARCH} == "sparc"
-MKSLJIT= yes
-.endif
-
#
# Which platforms build the xorg-server drivers (as opposed
# to just Xnest and Xvfb.)
Index: src/sys/arch/aarch64/include/sljit_machdep.h
diff -u src/sys/arch/aarch64/include/sljit_machdep.h:1.2 src/sys/arch/aarch64/include/sljit_machdep.h:1.2.6.1
--- src/sys/arch/aarch64/include/sljit_machdep.h:1.2 Sun Dec 2 20:54:44 2018
+++ src/sys/arch/aarch64/include/sljit_machdep.h Thu Apr 18 15:24:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sljit_machdep.h,v 1.2 2018/12/02 20:54:44 alnsn Exp $ */
+/* $NetBSD: sljit_machdep.h,v 1.2.6.1 2024/04/18 15:24:20 martin Exp $ */
/*-
* Copyright (c) 2014 Alexander Nasonov.
@@ -42,7 +42,12 @@
#define SLJIT_CONFIG_ARM_64 1
-#ifdef _KERNEL
+#ifdef _HARDKERNEL
+/*
+ * XXX Currently sys/rump/include/machine/cpu.h doesn't have
+ * ci_cpufuncs for cpu_icache_sync_range, so we do this only for
+ * non-rump kernels for now.
+ */
#define SLJIT_CACHE_FLUSH(from, to) \
cpu_icache_sync_range((vaddr_t)(from), (vsize_t)((to) - (from)))
#else
Index: src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c
diff -u src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c:1.4 src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c:1.4.4.1
---
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Thu Apr 18 15:24:21 UTC 2024 Modified Files: src/share/mk [netbsd-9]: bsd.own.mk src/sys/arch/aarch64/include [netbsd-9]: sljit_machdep.h src/sys/external/bsd/sljit/dist/sljit_src [netbsd-9]: sljitNativeARM_64.c src/sys/modules [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by riastradh in ticket #655): sys/modules/Makefile: revision 1.285 share/mk/bsd.own.mk: revision 1.1365 share/mk/bsd.own.mk: revision 1.1366 sys/arch/aarch64/include/sljit_machdep.h: revision 1.4 sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c: revision 1.5 (all via patch) sljit: Pacify -Wsign-compare. If these sizes are negative, we're probably in trouble anyway, so assert nonnegative here. Needed to resolve PR 58103. bsd.own.mk: Enable MKLSJIT on aarch64. Make sure there's only one copy of the conditional, in bsd.own.mk; just make sys/modules/Makefile conditional on MKSLJIT so we don't have to keep these in sync. As a workaround for PR 58106, tweak the conditional definition of SLJIT_CACHE_FLUSH to use cpu_icache_sync_range only in _HARDKERNEL, and use __builtin___clear_cache in userland and in rump kernels. PR 58103: bpfjit.kmod is not built on aarch64 bsd.own.mk: No need for MKSLJIT to be set differently from others. - Use ?=, not =, so mk.conf setting wins. - Write out per-architecture tabular settings, not a conditional. - Add comments for the architectures that look like they should have sljit but don't. (XXX Missing comments about powerpc and mips -- not sure why, is this because modules don't yet work on those architectures, or what?) Tidying for PR 58103: bpfjit.kmod is not built on aarch64. To generate a diff of this commit: cvs rdiff -u -r1.1149.2.6 -r1.1149.2.7 src/share/mk/bsd.own.mk cvs rdiff -u -r1.2 -r1.2.6.1 src/sys/arch/aarch64/include/sljit_machdep.h cvs rdiff -u -r1.4 -r1.4.4.1 \ src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c cvs rdiff -u -r1.222.2.1 -r1.222.2.2 src/sys/modules/Makefile 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
Module Name:src Committed By: martin Date: Wed Apr 17 18:06:32 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1825 and #1826 To generate a diff of this commit: cvs rdiff -u -r1.1.2.143 -r1.1.2.144 src/doc/CHANGES-9.4 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
Module Name:src Committed By: martin Date: Wed Apr 17 18:06:32 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1825 and #1826 To generate a diff of this commit: cvs rdiff -u -r1.1.2.143 -r1.1.2.144 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.143 src/doc/CHANGES-9.4:1.1.2.144 --- src/doc/CHANGES-9.4:1.1.2.143 Tue Apr 16 19:07:22 2024 +++ src/doc/CHANGES-9.4 Wed Apr 17 18:06:32 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.143 2024/04/16 19:07:22 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.144 2024/04/17 18:06:32 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -13539,3 +13539,14 @@ etc/mtree/special1.172 Add /etc/sshd/ssh_host_ed25519_key* . [kim, ticket #1824] +sys/dev/pci/if_iwn.c1.100 + + iwn(4): PR 58105: use the correct firmware file on + Intel Centrino N 130. + [riastradh, ticket #1825] + +share/mk/bsd.lib.mk1.398,1.399,1.152 (via patch) + + bsd.x11.mk: PR 58104: use TOOL_AWK, not the build host's awk. + [riastradh, ticket #1826] +
CVS commit: [netbsd-9] src/share/mk
Module Name:src
Committed By: martin
Date: Wed Apr 17 18:04:57 UTC 2024
Modified Files:
src/share/mk [netbsd-9]: bsd.x11.mk
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1826):
share/mk/bsd.lib.mk: revision 1.398
share/mk/bsd.lib.mk: revision 1.399
share/mk/bsd.x11.mk: revision 1.152
(via patch)
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
Back-out unintented commit.
To generate a diff of this commit:
cvs rdiff -u -r1.132.2.2 -r1.132.2.3 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.132.2.2 src/share/mk/bsd.x11.mk:1.132.2.3
--- src/share/mk/bsd.x11.mk:1.132.2.2 Thu Aug 20 16:15:43 2020
+++ src/share/mk/bsd.x11.mk Wed Apr 17 18:04:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.132.2.2 2020/08/20 16:15:43 martin Exp $
+# $NetBSD: bsd.x11.mk,v 1.132.2.3 2024/04/17 18:04:57 martin Exp $
.include
@@ -146,7 +146,7 @@ XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIB
XORG_VERSION_CURRENT="(((${XORG_SERVER_MAJOR}) * 1000) + ((${XORG_SERVER_MINOR}) * 10) + ((${XORG_SERVER_TEENY}) * 1000) + 0)"
-PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
+PRINT_PACKAGE_VERSION= ${TOOL_AWK} '/^PACKAGE_VERSION=/ { \
match($$1, "([0-9]+\\.)+[0-9]+"); \
version = substr($$1, RSTART, RLENGTH); \
} END { print version }'
CVS commit: [netbsd-9] src/share/mk
Module Name:src
Committed By: martin
Date: Wed Apr 17 18:04:57 UTC 2024
Modified Files:
src/share/mk [netbsd-9]: bsd.x11.mk
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1826):
share/mk/bsd.lib.mk: revision 1.398
share/mk/bsd.lib.mk: revision 1.399
share/mk/bsd.x11.mk: revision 1.152
(via patch)
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
Back-out unintented commit.
To generate a diff of this commit:
cvs rdiff -u -r1.132.2.2 -r1.132.2.3 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Apr 17 16:24:26 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-9]: if_iwn.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1825): sys/dev/pci/if_iwn.c: revision 1.100 if_iwn.c: pick up proper firmware for Centrino Wireless-N 130 Both variants should use iwlwifi-6000g2b-6 not iwlwifi-6000g2a-6. (It seems only two specific product variants use iwlwifi-6000g2a-6. We could simplify by reversing the sense of the test, as OpenBSD does, but it doesn't seem to matter much, as what we now match seems to be the full gamut possible, so the simpler diff was chosen here.) Addresses PR kern/58105 from wandrien.dev%gmail.com@localhost, with the PCI_PRODUCT_INTEL_WIFI_LINK_130_1 match tested by the reporter. Code inspection of the FreeBSD driver indicates we should safely be able to match PCI_PRODUCT_INTEL_WIFI_LINK_130_2 also. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.91.4.1 src/sys/dev/pci/if_iwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_iwn.c diff -u src/sys/dev/pci/if_iwn.c:1.91 src/sys/dev/pci/if_iwn.c:1.91.4.1 --- src/sys/dev/pci/if_iwn.c:1.91 Fri Apr 19 19:37:31 2019 +++ src/sys/dev/pci/if_iwn.c Wed Apr 17 16:24:26 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwn.c,v 1.91 2019/04/19 19:37:31 gutteridge Exp $ */ +/* $NetBSD: if_iwn.c,v 1.91.4.1 2024/04/17 16:24:26 martin Exp $ */ /* $OpenBSD: if_iwn.c,v 1.135 2014/09/10 07:22:09 dcoppa Exp $ */ /*- @@ -22,7 +22,7 @@ * adapters. */ #include -__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.91 2019/04/19 19:37:31 gutteridge Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.91.4.1 2024/04/17 16:24:26 martin Exp $"); #define IWN_USE_RBUF /* Use local storage for RX */ #undef IWN_HWCRYPTO /* XXX does not even compile yet */ @@ -775,6 +775,8 @@ iwn5000_attach(struct iwn_softc *sc, pci /* Type 6030 cards return IWN_HW_REV_TYPE_6005 */ if (pid == PCI_PRODUCT_INTEL_WIFI_LINK_1030_1 || pid == PCI_PRODUCT_INTEL_WIFI_LINK_1030_2 || + pid == PCI_PRODUCT_INTEL_WIFI_LINK_130_1 || + pid == PCI_PRODUCT_INTEL_WIFI_LINK_130_2 || pid == PCI_PRODUCT_INTEL_WIFI_LINK_6230_1 || pid == PCI_PRODUCT_INTEL_WIFI_LINK_6230_2 || pid == PCI_PRODUCT_INTEL_WIFI_LINK_6235 ||
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Apr 17 16:24:26 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-9]: if_iwn.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1825): sys/dev/pci/if_iwn.c: revision 1.100 if_iwn.c: pick up proper firmware for Centrino Wireless-N 130 Both variants should use iwlwifi-6000g2b-6 not iwlwifi-6000g2a-6. (It seems only two specific product variants use iwlwifi-6000g2a-6. We could simplify by reversing the sense of the test, as OpenBSD does, but it doesn't seem to matter much, as what we now match seems to be the full gamut possible, so the simpler diff was chosen here.) Addresses PR kern/58105 from wandrien.dev%gmail.com@localhost, with the PCI_PRODUCT_INTEL_WIFI_LINK_130_1 match tested by the reporter. Code inspection of the FreeBSD driver indicates we should safely be able to match PCI_PRODUCT_INTEL_WIFI_LINK_130_2 also. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.91.4.1 src/sys/dev/pci/if_iwn.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
Module Name:src Committed By: martin Date: Tue Apr 16 19:07:22 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1824 To generate a diff of this commit: cvs rdiff -u -r1.1.2.142 -r1.1.2.143 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.142 src/doc/CHANGES-9.4:1.1.2.143 --- src/doc/CHANGES-9.4:1.1.2.142 Mon Mar 25 15:54:20 2024 +++ src/doc/CHANGES-9.4 Tue Apr 16 19:07:22 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.142 2024/03/25 15:54:20 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.143 2024/04/16 19:07:22 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -13534,3 +13534,8 @@ external/gpl2/groff/dist/tmac/doc.tmac correctly. [uwe, ticket #1823] +etc/mtree/special1.172 + + Add /etc/sshd/ssh_host_ed25519_key* . + [kim, ticket #1824] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Apr 16 19:07:22 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1824 To generate a diff of this commit: cvs rdiff -u -r1.1.2.142 -r1.1.2.143 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc/mtree
Module Name:src Committed By: martin Date: Tue Apr 16 19:06:07 UTC 2024 Modified Files: src/etc/mtree [netbsd-9]: special Log Message: Pull up following revision(s) (requested by kim in ticket #1824): etc/mtree/special: revision 1.172 Add /etc/sshd/ssh_host_ed25519_key* . To generate a diff of this commit: cvs rdiff -u -r1.167.2.1 -r1.167.2.2 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/special diff -u src/etc/mtree/special:1.167.2.1 src/etc/mtree/special:1.167.2.2 --- src/etc/mtree/special:1.167.2.1 Tue Jun 30 18:22:48 2020 +++ src/etc/mtree/special Tue Apr 16 19:06:07 2024 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.167.2.1 2020/06/30 18:22:48 martin Exp $ +# $NetBSD: special,v 1.167.2.2 2024/04/16 19:06:07 martin Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -337,6 +337,8 @@ ./etc/ssh/ssh_host_dsa_key.pub type=file mode=0644 optional ./etc/ssh/ssh_host_ecdsa_key type=file mode=0600 optional tags=nodiff ./etc/ssh/ssh_host_ecdsa_key.pub type=file mode=0644 optional +./etc/ssh/ssh_host_ed25519_key type=file mode=0600 optional tags=nodiff +./etc/ssh/ssh_host_ed25519_key.pub type=file mode=0644 optional ./etc/ssh/ssh_host_key type=file mode=0600 optional tags=nodiff tags=nodiff ./etc/ssh/ssh_host_key.pub type=file mode=0644 optional ./etc/ssh/ssh_host_rsa_key type=file mode=0600 optional tags=nodiff
CVS commit: [netbsd-9] src/etc/mtree
Module Name:src Committed By: martin Date: Tue Apr 16 19:06:07 UTC 2024 Modified Files: src/etc/mtree [netbsd-9]: special Log Message: Pull up following revision(s) (requested by kim in ticket #1824): etc/mtree/special: revision 1.172 Add /etc/sshd/ssh_host_ed25519_key* . To generate a diff of this commit: cvs rdiff -u -r1.167.2.1 -r1.167.2.2 src/etc/mtree/special 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
Module Name:src Committed By: martin Date: Mon Mar 25 15:54:20 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1819 - #1823 To generate a diff of this commit: cvs rdiff -u -r1.1.2.141 -r1.1.2.142 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.141 src/doc/CHANGES-9.4:1.1.2.142 --- src/doc/CHANGES-9.4:1.1.2.141 Tue Mar 12 12:45:42 2024 +++ src/doc/CHANGES-9.4 Mon Mar 25 15:54:20 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.141 2024/03/12 12:45:42 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.142 2024/03/25 15:54:20 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -13497,3 +13497,40 @@ usr.bin/audio/record/record.c - audiorecord manual gained useful examples [mrg, ticket #1818] +crypto/external/bsd/openssl/dist/include/crypto/sha.h 1.2 (patch) +crypto/external/bsd/openssl/dist/providers/implementations/digests/sha2_prov.c 1.2 (patch) + (applied to crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c) +crypto/external/bsd/openssl/lib/libcrypto/libc-sha2xx.c 1.4 (patch) +distrib/sets/lists/debug/mi 1.430 (patch) +distrib/sets/lists/tests/mi 1.1311 (patch) +tests/crypto/libcrypto/Makefile 1.16 (patch) +tests/crypto/libcrypto/t_sha512trunc.c 1.1,1.2 (patch) + + openssl: PR 58039: avoid buffer overrun in SHA512/256 and + SHA512/224 output. + [riastradh, ticket #1819] + +usr.bin/audio/common/wav.c 1.24 + + audioplay(1): avoid errors when a file has zero-length data. + [mrg, ticket #1821] + +distrib/amd64/ramdisks/common/Makefile.ramdisk 1.17 +distrib/i386/ramdisks/common/Makefile.ramdisk 1.16 +etc/etc.amd64/Makefile.inc 1.17 +etc/etc.i386/Makefile.inc 1.70 + + x86: PR 57534: release the zfs and cgd ramdisks too. + [riastradh, ticket #1820] + +sys/dev/qbus/if_qe.c1.82 + + vax/qe(4): PR 58068: fix crash on various ifconfig operations. + [riastradh, ticket #1822] + +external/gpl2/groff/dist/tmac/doc.tmac 1.3 + + doc.tmac: PR 58074: .Lk - handle punctuation without anchor-text + correctly. + [uwe, ticket #1823] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Mar 25 15:54:20 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1819 - #1823 To generate a diff of this commit: cvs rdiff -u -r1.1.2.141 -r1.1.2.142 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/external/gpl2/groff/dist/tmac
Module Name:src
Committed By: martin
Date: Mon Mar 25 15:51:47 UTC 2024
Modified Files:
src/external/gpl2/groff/dist/tmac [netbsd-9]: doc.tmac
Log Message:
Pull up following revision(s) (requested by uwe in ticket #1823):
external/gpl2/groff/dist/tmac/doc.tmac: revision 1.3
doc.tmac: .Lk - handle punctuation without anchor-text correctly
doc-get-arg-type expects that doc-width is set beforehand, so call
doc-get-width to make sure doc-get-arg-type detects the trailing
punctuation correctly.
PR bin/58074
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.18.1 src/external/gpl2/groff/dist/tmac/doc.tmac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/groff/dist/tmac/doc.tmac
diff -u src/external/gpl2/groff/dist/tmac/doc.tmac:1.2 src/external/gpl2/groff/dist/tmac/doc.tmac:1.2.18.1
--- src/external/gpl2/groff/dist/tmac/doc.tmac:1.2 Wed Jan 13 19:01:59 2016
+++ src/external/gpl2/groff/dist/tmac/doc.tmac Mon Mar 25 15:51:47 2024
@@ -6416,6 +6416,7 @@
. ds doc-str-Lk Sy \$@
.
. ie (\n[.$] > 1) \{\
+.doc-get-width \$2
.doc-get-arg-type \$2
.ie (\n[doc-arg-type] < 3) \{\
. Em \)\$2:
CVS commit: [netbsd-9] src/external/gpl2/groff/dist/tmac
Module Name:src Committed By: martin Date: Mon Mar 25 15:51:47 UTC 2024 Modified Files: src/external/gpl2/groff/dist/tmac [netbsd-9]: doc.tmac Log Message: Pull up following revision(s) (requested by uwe in ticket #1823): external/gpl2/groff/dist/tmac/doc.tmac: revision 1.3 doc.tmac: .Lk - handle punctuation without anchor-text correctly doc-get-arg-type expects that doc-width is set beforehand, so call doc-get-width to make sure doc-get-arg-type detects the trailing punctuation correctly. PR bin/58074 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.18.1 src/external/gpl2/groff/dist/tmac/doc.tmac 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/qbus
Module Name:src
Committed By: martin
Date: Mon Mar 25 15:35:50 UTC 2024
Modified Files:
src/sys/dev/qbus [netbsd-9]: if_qe.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1822):
sys/dev/qbus/if_qe.c: revision 1.82
vax/qe(4): supply an ipf->if_init() so that if_init() doesn't crash.
convert the existing qeinit() to one compatible with if_init.
should fix PR#58068.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.81.2.1 src/sys/dev/qbus/if_qe.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/qbus/if_qe.c
diff -u src/sys/dev/qbus/if_qe.c:1.81 src/sys/dev/qbus/if_qe.c:1.81.2.1
--- src/sys/dev/qbus/if_qe.c:1.81 Tue May 28 07:41:49 2019
+++ src/sys/dev/qbus/if_qe.c Mon Mar 25 15:35:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qe.c,v 1.81 2019/05/28 07:41:49 msaitoh Exp $ */
+/* $NetBSD: if_qe.c,v 1.81.2.1 2024/03/25 15:35:50 martin Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.81 2019/05/28 07:41:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.81.2.1 2024/03/25 15:35:50 martin Exp $");
#include "opt_inet.h"
@@ -97,7 +97,7 @@ struct qe_softc {
static int qematch(device_t, cfdata_t, void *);
static void qeattach(device_t, device_t, void *);
-static void qeinit(struct qe_softc *);
+static int qeinit(struct ifnet *);
static void qestart(struct ifnet *);
static void qeintr(void *);
static int qeioctl(struct ifnet *, u_long, void *);
@@ -341,6 +341,7 @@ qeattach(device_t parent, device_t self,
ifp->if_softc = sc;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_start = qestart;
+ ifp->if_init = qeinit;
ifp->if_ioctl = qeioctl;
ifp->if_watchdog = qetimeout;
IFQ_SET_READY(>if_snd);
@@ -381,10 +382,10 @@ qeattach(device_t parent, device_t self,
/*
* Initialization of interface.
*/
-void
-qeinit(struct qe_softc *sc)
+int
+qeinit(struct ifnet *ifp)
{
- struct ifnet *ifp = (struct ifnet *)>sc_if;
+ struct qe_softc *sc = ifp->if_softc;
struct qe_cdata *qc = sc->sc_qedata;
int i;
@@ -411,7 +412,6 @@ qeinit(struct qe_softc *sc)
qc->qc_xmit[i].qe_status1 = qc->qc_xmit[i].qe_flag = QE_NOTYET;
}
-
/*
* Init receive descriptors.
*/
@@ -436,6 +436,7 @@ qeinit(struct qe_softc *sc)
*/
qe_setup(sc);
+ return 0;
}
/*
@@ -651,7 +652,7 @@ qeioctl(struct ifnet *ifp, u_long cmd, v
switch (ifa->ifa_addr->sa_family) {
#ifdef INET
case AF_INET:
- qeinit(sc);
+ qeinit(ifp);
arp_ifinit(ifp, ifa);
break;
#endif
@@ -677,7 +678,7 @@ qeioctl(struct ifnet *ifp, u_long cmd, v
* If interface it marked up and it is stopped, then
* start it.
*/
- qeinit(sc);
+ qeinit(ifp);
break;
case IFF_UP | IFF_RUNNING:
/*
@@ -868,5 +869,5 @@ qetimeout(struct ifnet *ifp)
* Do a reset of interface, to get it going again.
* Will it work by just restart the transmit logic?
*/
- qeinit(sc);
+ qeinit(ifp);
}
CVS commit: [netbsd-9] src/sys/dev/qbus
Module Name:src Committed By: martin Date: Mon Mar 25 15:35:50 UTC 2024 Modified Files: src/sys/dev/qbus [netbsd-9]: if_qe.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1822): sys/dev/qbus/if_qe.c: revision 1.82 vax/qe(4): supply an ipf->if_init() so that if_init() doesn't crash. convert the existing qeinit() to one compatible with if_init. should fix PR#58068. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.81.2.1 src/sys/dev/qbus/if_qe.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
Module Name:src
Committed By: martin
Date: Mon Mar 25 15:19:44 UTC 2024
Modified Files:
src/distrib/amd64/ramdisks/common [netbsd-9]: Makefile.ramdisk
src/distrib/i386/ramdisks/common [netbsd-9]: Makefile.ramdisk
src/etc/etc.amd64 [netbsd-9]: Makefile.inc
src/etc/etc.i386 [netbsd-9]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1820):
etc/etc.amd64/Makefile.inc: revision 1.17
distrib/amd64/ramdisks/common/Makefile.ramdisk: revision 1.17
etc/etc.i386/Makefile.inc: revision 1.70
distrib/i386/ramdisks/common/Makefile.ramdisk: revision 1.16
x86: Release the ramdisks too.
This way we will get cgdroot.fs (and zfsroot.fs too) in the release.
PR misc/57534
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 \
src/distrib/amd64/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.13.4.1 -r1.13.4.2 \
src/distrib/i386/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.16 -r1.16.2.1 src/etc/etc.amd64/Makefile.inc
cvs rdiff -u -r1.69 -r1.69.2.1 src/etc/etc.i386/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14.2.1 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14.2.2
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14.2.1 Wed Apr 13 03:39:23 2022
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Mon Mar 25 15:19:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.14.2.1 2022/04/13 03:39:23 snj Exp $
+# $NetBSD: Makefile.ramdisk,v 1.14.2.2 2024/03/25 15:19:44 martin Exp $
NOSANITIZER= # defined
@@ -50,6 +50,8 @@ ${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
-release:
+release: ${IMAGE}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${IMAGE} \
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk/
.include
Index: src/distrib/i386/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.13.4.1 src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.13.4.2
--- src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.13.4.1 Thu Aug 29 16:48:44 2019
+++ src/distrib/i386/ramdisks/common/Makefile.ramdisk Mon Mar 25 15:19:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.13.4.1 2019/08/29 16:48:44 martin Exp $
+# $NetBSD: Makefile.ramdisk,v 1.13.4.2 2024/03/25 15:19:44 martin Exp $
NOSANITIZER= # defined
@@ -56,6 +56,8 @@ ${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
-release:
+release: ${IMAGE}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${IMAGE} \
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk/
.include
Index: src/etc/etc.amd64/Makefile.inc
diff -u src/etc/etc.amd64/Makefile.inc:1.16 src/etc/etc.amd64/Makefile.inc:1.16.2.1
--- src/etc/etc.amd64/Makefile.inc:1.16 Thu Aug 2 16:26:09 2018
+++ src/etc/etc.amd64/Makefile.inc Mon Mar 25 15:19:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2018/08/02 16:26:09 maxv Exp $
+# $NetBSD: Makefile.inc,v 1.16.2.1 2024/03/25 15:19:44 martin Exp $
#
# etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
#
@@ -16,9 +16,11 @@ BUILD_KERNELS= INSTALL INSTALL_XEN3_DOM
INSTALLATION_DIRS+= installation/cdrom
INSTALLATION_DIRS+= installation/misc
INSTALLATION_DIRS+= installation/miniroot
+INSTALLATION_DIRS+= installation/ramdisk
snap_md_post:
cd ${KERNSRCDIR}/arch/i386/stand/pxeboot && ${MAKE} release
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom '*.iso'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.*'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.*'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk '*.*'
Index: src/etc/etc.i386/Makefile.inc
diff -u src/etc/etc.i386/Makefile.inc:1.69 src/etc/etc.i386/Makefile.inc:1.69.2.1
--- src/etc/etc.i386/Makefile.inc:1.69 Thu Jul 26 16:22:49 2018
+++ src/etc/etc.i386/Makefile.inc Mon Mar 25 15:19:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.69 2018/07/26 16:22:49 maxv Exp $
+# $NetBSD: Makefile.inc,v 1.69.2.1 2024/03/25 15:19:44 martin Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
@@ -26,6 +26,7 @@ INSTALLATION_DIRS+= installation/misc
INSTALLATION_DIRS+= installation/cdrom
INSTALLATION_DIRS+= installation/floppy
INSTALLATION_DIRS+= installation/miniroot
+INSTALLATION_DIRS+= installation/ramdisk
# i386 specific distrib stuff
snap_md_post:
@@ -36,3 +37,4 @@ snap_md_post:
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy '*.fs'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.*'
${MAKESUMS} -t
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Mar 25 15:19:44 UTC 2024 Modified Files: src/distrib/amd64/ramdisks/common [netbsd-9]: Makefile.ramdisk src/distrib/i386/ramdisks/common [netbsd-9]: Makefile.ramdisk src/etc/etc.amd64 [netbsd-9]: Makefile.inc src/etc/etc.i386 [netbsd-9]: Makefile.inc Log Message: Pull up following revision(s) (requested by riastradh in ticket #1820): etc/etc.amd64/Makefile.inc: revision 1.17 distrib/amd64/ramdisks/common/Makefile.ramdisk: revision 1.17 etc/etc.i386/Makefile.inc: revision 1.70 distrib/i386/ramdisks/common/Makefile.ramdisk: revision 1.16 x86: Release the ramdisks too. This way we will get cgdroot.fs (and zfsroot.fs too) in the release. PR misc/57534 To generate a diff of this commit: cvs rdiff -u -r1.14.2.1 -r1.14.2.2 \ src/distrib/amd64/ramdisks/common/Makefile.ramdisk cvs rdiff -u -r1.13.4.1 -r1.13.4.2 \ src/distrib/i386/ramdisks/common/Makefile.ramdisk cvs rdiff -u -r1.16 -r1.16.2.1 src/etc/etc.amd64/Makefile.inc cvs rdiff -u -r1.69 -r1.69.2.1 src/etc/etc.i386/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/usr.bin/audio/common
Module Name:src
Committed By: martin
Date: Mon Mar 25 15:11:33 UTC 2024
Modified Files:
src/usr.bin/audio/common [netbsd-9]: wav.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1950):
usr.bin/audio/common/wav.c: revision 1.24
audio_wav_parse_hdr: handle zero-length data files again
the previous clean up turns zero-length data into no data and thus
an error, instead of simply doing nothing. noted by gson.
To generate a diff of this commit:
cvs rdiff -u -r1.14.6.1 -r1.14.6.2 src/usr.bin/audio/common/wav.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/audio/common/wav.c
diff -u src/usr.bin/audio/common/wav.c:1.14.6.1 src/usr.bin/audio/common/wav.c:1.14.6.2
--- src/usr.bin/audio/common/wav.c:1.14.6.1 Tue Mar 12 12:41:38 2024
+++ src/usr.bin/audio/common/wav.c Mon Mar 25 15:11:33 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: wav.c,v 1.14.6.1 2024/03/12 12:41:38 martin Exp $ */
+/* $NetBSD: wav.c,v 1.14.6.2 2024/03/25 15:11:33 martin Exp $ */
/*
* Copyright (c) 2002, 2009, 2013, 2015, 2019, 2024 Matthew R. Green
@@ -33,7 +33,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: wav.c,v 1.14.6.1 2024/03/12 12:41:38 martin Exp $");
+__RCSID("$NetBSD: wav.c,v 1.14.6.2 2024/03/25 15:11:33 martin Exp $");
#endif
@@ -99,7 +99,7 @@ find_riff_chunk(const char search[4], si
*partlen = 0;
#define ADJUST(l) do {\
- if (l >= *(remainp)) \
+ if (l > *(remainp)) \
return false; \
*(wherep) += (l); \
*(remainp) -= (l); \
@@ -158,7 +158,7 @@ audio_wav_parse_hdr(void *hdr, size_t sz
return (AUDIO_ENOENT);
#define ADJUST(l) do {\
- if (l >= remain) \
+ if ((l) > remain) \
return (AUDIO_ESHORTHDR); \
where += (l);\
remain -= (l);\
@@ -279,20 +279,17 @@ audio_wav_parse_hdr(void *hdr, size_t sz
if (!found)
return (AUDIO_EWAVNODATA);
- if (len) {
- if (channels)
- *channels = (u_int)getle16(fmt.channels);
- if (sample)
- *sample = getle32(fmt.sample_rate);
- if (enc)
- *enc = newenc;
- if (prec)
- *prec = newprec;
- if (datasize)
- *datasize = (off_t)len;
- return (where - (char *)hdr);
- }
- return (AUDIO_EWAVNODATA);
+ if (channels)
+ *channels = (u_int)getle16(fmt.channels);
+ if (sample)
+ *sample = getle32(fmt.sample_rate);
+ if (enc)
+ *enc = newenc;
+ if (prec)
+ *prec = newprec;
+ if (datasize)
+ *datasize = (off_t)len;
+ return (where - (char *)hdr);
#undef ADJUST
}
CVS commit: [netbsd-9] src/usr.bin/audio/common
Module Name:src Committed By: martin Date: Mon Mar 25 15:11:33 UTC 2024 Modified Files: src/usr.bin/audio/common [netbsd-9]: wav.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1950): usr.bin/audio/common/wav.c: revision 1.24 audio_wav_parse_hdr: handle zero-length data files again the previous clean up turns zero-length data into no data and thus an error, instead of simply doing nothing. noted by gson. To generate a diff of this commit: cvs rdiff -u -r1.14.6.1 -r1.14.6.2 src/usr.bin/audio/common/wav.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
Module Name:src Committed By: martin Date: Mon Mar 25 14:26:16 UTC 2024 Modified Files: src/crypto/external/bsd/openssl/dist/crypto/evp [netbsd-9]: m_sha1.c src/crypto/external/bsd/openssl/dist/include/crypto [netbsd-9]: sha.h src/crypto/external/bsd/openssl/lib/libcrypto [netbsd-9]: libc-sha2xx.c src/distrib/sets/lists/debug [netbsd-9]: mi src/distrib/sets/lists/tests [netbsd-9]: mi src/tests/crypto/libcrypto [netbsd-9]: Makefile Added Files: src/tests/crypto/libcrypto [netbsd-9]: t_sha512trunc.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1819): crypto/external/bsd/openssl/dist/providers/implementations/digests/sha2_prov.c: revision 1.2 (applied to crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c) tests/crypto/libcrypto/t_sha512trunc.c: revision 1.1 tests/crypto/libcrypto/t_sha512trunc.c: revision 1.2 tests/crypto/libcrypto/Makefile: revision 1.16 distrib/sets/lists/tests/mi: revision 1.1311 distrib/sets/lists/debug/mi: revision 1.430 crypto/external/bsd/openssl/dist/include/crypto/sha.h: revision 1.2 crypto/external/bsd/openssl/lib/libcrypto/libc-sha2xx.c: revision 1.4 (all via patch) libcrypto: Add some trivial tests for truncated SHA-512 variants. These should use more of the test vectors from https://csrc.nist.gov/Projects/Cryptographic-Algorithm-Validation-Program/Secure-Hashing#Testing but this will do for now to detect the buffer overrun rake we left lying around for ourselves. PR lib/58039 libcrypto: Fix buffer overrun in truncated SHA-512 functions. Further fallout from the libc/openssl sha2 symbol collision. PR lib/58039 To generate a diff of this commit: cvs rdiff -u -r1.11.2.1 -r1.11.2.2 \ src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c cvs rdiff -u -r1.1.1.1.4.2 -r1.1.1.1.4.3 \ src/crypto/external/bsd/openssl/dist/include/crypto/sha.h cvs rdiff -u -r1.1.6.1 -r1.1.6.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha2xx.c cvs rdiff -u -r1.285.2.6 -r1.285.2.7 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.818.2.4 -r1.818.2.5 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.14 -r1.14.2.1 src/tests/crypto/libcrypto/Makefile cvs rdiff -u -r0 -r1.2.4.2 src/tests/crypto/libcrypto/t_sha512trunc.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
Module Name:src
Committed By: martin
Date: Mon Mar 25 14:26:16 UTC 2024
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/evp [netbsd-9]: m_sha1.c
src/crypto/external/bsd/openssl/dist/include/crypto [netbsd-9]: sha.h
src/crypto/external/bsd/openssl/lib/libcrypto [netbsd-9]: libc-sha2xx.c
src/distrib/sets/lists/debug [netbsd-9]: mi
src/distrib/sets/lists/tests [netbsd-9]: mi
src/tests/crypto/libcrypto [netbsd-9]: Makefile
Added Files:
src/tests/crypto/libcrypto [netbsd-9]: t_sha512trunc.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1819):
crypto/external/bsd/openssl/dist/providers/implementations/digests/sha2_prov.c:
revision 1.2
(applied to crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c)
tests/crypto/libcrypto/t_sha512trunc.c: revision 1.1
tests/crypto/libcrypto/t_sha512trunc.c: revision 1.2
tests/crypto/libcrypto/Makefile: revision 1.16
distrib/sets/lists/tests/mi: revision 1.1311
distrib/sets/lists/debug/mi: revision 1.430
crypto/external/bsd/openssl/dist/include/crypto/sha.h: revision 1.2
crypto/external/bsd/openssl/lib/libcrypto/libc-sha2xx.c: revision 1.4
(all via patch)
libcrypto: Add some trivial tests for truncated SHA-512 variants.
These should use more of the test vectors from
https://csrc.nist.gov/Projects/Cryptographic-Algorithm-Validation-Program/Secure-Hashing#Testing
but this will do for now to detect the buffer overrun rake we left
lying around for ourselves.
PR lib/58039
libcrypto: Fix buffer overrun in truncated SHA-512 functions.
Further fallout from the libc/openssl sha2 symbol collision.
PR lib/58039
To generate a diff of this commit:
cvs rdiff -u -r1.11.2.1 -r1.11.2.2 \
src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c
cvs rdiff -u -r1.1.1.1.4.2 -r1.1.1.1.4.3 \
src/crypto/external/bsd/openssl/dist/include/crypto/sha.h
cvs rdiff -u -r1.1.6.1 -r1.1.6.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha2xx.c
cvs rdiff -u -r1.285.2.6 -r1.285.2.7 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.818.2.4 -r1.818.2.5 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.14 -r1.14.2.1 src/tests/crypto/libcrypto/Makefile
cvs rdiff -u -r0 -r1.2.4.2 src/tests/crypto/libcrypto/t_sha512trunc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c:1.11.2.1 src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c:1.11.2.2
--- src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c:1.11.2.1 Mon Apr 27 14:47:22 2020
+++ src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c Mon Mar 25 14:26:15 2024
@@ -179,11 +179,21 @@ static int init512_224(EVP_MD_CTX *ctx)
return sha512_224_init(EVP_MD_CTX_md_data(ctx));
}
+static int final512_224(EVP_MD_CTX *ctx, unsigned char *md)
+{
+return sha512_224_final(md, EVP_MD_CTX_md_data(ctx));
+}
+
static int init512_256(EVP_MD_CTX *ctx)
{
return sha512_256_init(EVP_MD_CTX_md_data(ctx));
}
+static int final512_256(EVP_MD_CTX *ctx, unsigned char *md)
+{
+return sha512_256_final(md, EVP_MD_CTX_md_data(ctx));
+}
+
static int init384(EVP_MD_CTX *ctx)
{
return SHA384_Init(EVP_MD_CTX_md_data(ctx));
@@ -222,7 +232,7 @@ static const EVP_MD sha512_224_md = {
EVP_MD_FLAG_DIGALGID_ABSENT,
init512_224,
update512,
-final512,
+final512_224,
NULL,
NULL,
SHA512_CBLOCK,
@@ -241,7 +251,7 @@ static const EVP_MD sha512_256_md = {
EVP_MD_FLAG_DIGALGID_ABSENT,
init512_256,
update512,
-final512,
+final512_256,
NULL,
NULL,
SHA512_CBLOCK,
Index: src/crypto/external/bsd/openssl/dist/include/crypto/sha.h
diff -u src/crypto/external/bsd/openssl/dist/include/crypto/sha.h:1.1.1.1.4.2 src/crypto/external/bsd/openssl/dist/include/crypto/sha.h:1.1.1.1.4.3
--- src/crypto/external/bsd/openssl/dist/include/crypto/sha.h:1.1.1.1.4.2 Mon Apr 27 14:47:32 2020
+++ src/crypto/external/bsd/openssl/dist/include/crypto/sha.h Mon Mar 25 14:26:15 2024
@@ -15,5 +15,7 @@
int sha512_224_init(SHA512_CTX *);
int sha512_256_init(SHA512_CTX *);
+int sha512_224_final(unsigned char *, SHA512_CTX *); /* XXX NetBSD libc sha2 */
+int sha512_256_final(unsigned char *, SHA512_CTX *); /* XXX NetBSD libc sha2 */
#endif
Index: src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha2xx.c
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha2xx.c:1.1.6.1 src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha2xx.c:1.1.6.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha2xx.c:1.1.6.1 Mon Apr 27 14:47:36 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha2xx.c Mon Mar 25 14:26:15 2024
@@ -46,6 +46,18 @@ sha512_224_init(SHA512_CTX *context)
}
int
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Mar 12 12:45:42 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1807 and #1818 To generate a diff of this commit: cvs rdiff -u -r1.1.2.140 -r1.1.2.141 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/usr.bin/audio
Module Name:src
Committed By: martin
Date: Tue Mar 12 12:41:39 UTC 2024
Modified Files:
src/usr.bin/audio/common [netbsd-9]: auconv.h audio.c decode.c
libaudio.h sun.c wav.c
src/usr.bin/audio/ctl [netbsd-9]: audioctl.1
src/usr.bin/audio/play [netbsd-9]: audioplay.1 play.c
src/usr.bin/audio/record [netbsd-9]: audiorecord.1 record.c
Log Message:
Pull up the following revisions, requested by mrg in ticket #1818:
usr.bin/audio/common/auconv.h up to 1.6
usr.bin/audio/common/audio.cup to 1.27
usr.bin/audio/common/decode.c up to 1.2
usr.bin/audio/common/libaudio.h up to 1.22
usr.bin/audio/common/sun.c up to 1.11
usr.bin/audio/common/wav.c up to 1.22
usr.bin/audio/ctl/audioctl.1up to 1.25
usr.bin/audio/play/audioplay.1 up to 1.34
usr.bin/audio/play/play.c up to 1.64
usr.bin/audio/record/audiorecord.1 up to 1.45
usr.bin/audio/record/record.c up to 1.58
- support for playing 32-bit and 64-bit IEEE FP .wav files
- support for recording 24 bit .wav files
- read-overflow fixes for .wav files, and other fixes for the
wav parser
- audioplay gains -n flag (no play, like make -n)
- audioctl manual spruced up
- audiorecord manual gained useful examples
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.64.1 src/usr.bin/audio/common/auconv.h
cvs rdiff -u -r1.25 -r1.25.18.1 src/usr.bin/audio/common/audio.c
cvs rdiff -u -r1.1 -r1.1.18.1 src/usr.bin/audio/common/decode.c
cvs rdiff -u -r1.20 -r1.20.18.1 src/usr.bin/audio/common/libaudio.h
cvs rdiff -u -r1.9 -r1.9.18.1 src/usr.bin/audio/common/sun.c
cvs rdiff -u -r1.14 -r1.14.6.1 src/usr.bin/audio/common/wav.c
cvs rdiff -u -r1.23 -r1.23.2.1 src/usr.bin/audio/ctl/audioctl.1
cvs rdiff -u -r1.26.28.1 -r1.26.28.2 src/usr.bin/audio/play/audioplay.1
cvs rdiff -u -r1.57 -r1.57.2.1 src/usr.bin/audio/play/play.c
cvs rdiff -u -r1.42 -r1.42.28.1 src/usr.bin/audio/record/audiorecord.1
cvs rdiff -u -r1.54 -r1.54.18.1 src/usr.bin/audio/record/record.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/audio/common/auconv.h
diff -u src/usr.bin/audio/common/auconv.h:1.5 src/usr.bin/audio/common/auconv.h:1.5.64.1
--- src/usr.bin/audio/common/auconv.h:1.5 Mon Apr 28 20:24:12 2008
+++ src/usr.bin/audio/common/auconv.h Tue Mar 12 12:41:38 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: auconv.h,v 1.5 2008/04/28 20:24:12 martin Exp $ */
+/* $NetBSD: auconv.h,v 1.5.64.1 2024/03/12 12:41:38 martin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -78,6 +78,24 @@ change_sign16_be(u_char *p, int cc)
}
static inline void
+change_sign24_le(u_char *p, int cc)
+{
+ while ((cc -= 3) >= 0) {
+ p[2] ^= 0x80;
+ p += 3;
+ }
+}
+
+static inline void
+change_sign24_be(u_char *p, int cc)
+{
+ while ((cc -= 3) >= 0) {
+ p[0] ^= 0x80;
+ p += 3;
+ }
+}
+
+static inline void
change_sign32_le(u_char *p, int cc)
{
while ((cc -= 4) >= 0) {
@@ -163,6 +181,44 @@ change_sign16_swap_bytes_be(u_char *p, i
}
static inline void
+swap_bytes_change_sign24_le(u_char *p, int cc)
+{
+ u_char t;
+
+ while ((cc -= 3) >= 0) {
+ t = p[2];
+ p[2] = p[0] ^ 0x80;
+ p[0] = t;
+ p += 3;
+ }
+}
+
+static inline void
+swap_bytes_change_sign24_be(u_char *p, int cc)
+{
+ u_char t;
+
+ while ((cc -= 3) >= 0) {
+ t = p[0];
+ p[0] = p[2] ^ 0x80;
+ p[2] = t;
+ p += 3;
+ }
+}
+
+static inline void
+change_sign24_swap_bytes_le(u_char *p, int cc)
+{
+ swap_bytes_change_sign24_be(p, cc);
+}
+
+static inline void
+change_sign24_swap_bytes_be(u_char *p, int cc)
+{
+ swap_bytes_change_sign24_le(p, cc);
+}
+
+static inline void
swap_bytes_change_sign32_le(u_char *p, int cc)
{
u_char t;
Index: src/usr.bin/audio/common/audio.c
diff -u src/usr.bin/audio/common/audio.c:1.25 src/usr.bin/audio/common/audio.c:1.25.18.1
--- src/usr.bin/audio/common/audio.c:1.25 Wed Aug 5 06:54:39 2015
+++ src/usr.bin/audio/common/audio.c Tue Mar 12 12:41:38 2024
@@ -1,7 +1,7 @@
-/* $NetBSD: audio.c,v 1.25 2015/08/05 06:54:39 mrg Exp $ */
+/* $NetBSD: audio.c,v 1.25.18.1 2024/03/12 12:41:38 martin Exp $ */
/*
- * Copyright (c) 1999 Matthew R. Green
+ * Copyright (c) 1999, 2013, 2015, 2019 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: audio.c,v 1.25 2015/08/05 06:54:39 mrg Exp $");
+__RCSID("$NetBSD: audio.c,v 1.25.18.1 2024/03/12 12:41:38 martin Exp $");
#endif
@@ -110,6 +110,8 @@ static const struct {
{ AudioEmpeg_l2_packets,AUDIO_ENCODING_MPEG_L2_PACKETS },
{ AudioEmpeg_l2_system, AUDIO_ENCODING_MPEG_L2_SYSTEM },
{ AudioEac3,
CVS commit: [netbsd-9] src/usr.bin/audio
Module Name:src Committed By: martin Date: Tue Mar 12 12:41:39 UTC 2024 Modified Files: src/usr.bin/audio/common [netbsd-9]: auconv.h audio.c decode.c libaudio.h sun.c wav.c src/usr.bin/audio/ctl [netbsd-9]: audioctl.1 src/usr.bin/audio/play [netbsd-9]: audioplay.1 play.c src/usr.bin/audio/record [netbsd-9]: audiorecord.1 record.c Log Message: Pull up the following revisions, requested by mrg in ticket #1818: usr.bin/audio/common/auconv.h up to 1.6 usr.bin/audio/common/audio.cup to 1.27 usr.bin/audio/common/decode.c up to 1.2 usr.bin/audio/common/libaudio.h up to 1.22 usr.bin/audio/common/sun.c up to 1.11 usr.bin/audio/common/wav.c up to 1.22 usr.bin/audio/ctl/audioctl.1up to 1.25 usr.bin/audio/play/audioplay.1 up to 1.34 usr.bin/audio/play/play.c up to 1.64 usr.bin/audio/record/audiorecord.1 up to 1.45 usr.bin/audio/record/record.c up to 1.58 - support for playing 32-bit and 64-bit IEEE FP .wav files - support for recording 24 bit .wav files - read-overflow fixes for .wav files, and other fixes for the wav parser - audioplay gains -n flag (no play, like make -n) - audioctl manual spruced up - audiorecord manual gained useful examples To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.64.1 src/usr.bin/audio/common/auconv.h cvs rdiff -u -r1.25 -r1.25.18.1 src/usr.bin/audio/common/audio.c cvs rdiff -u -r1.1 -r1.1.18.1 src/usr.bin/audio/common/decode.c cvs rdiff -u -r1.20 -r1.20.18.1 src/usr.bin/audio/common/libaudio.h cvs rdiff -u -r1.9 -r1.9.18.1 src/usr.bin/audio/common/sun.c cvs rdiff -u -r1.14 -r1.14.6.1 src/usr.bin/audio/common/wav.c cvs rdiff -u -r1.23 -r1.23.2.1 src/usr.bin/audio/ctl/audioctl.1 cvs rdiff -u -r1.26.28.1 -r1.26.28.2 src/usr.bin/audio/play/audioplay.1 cvs rdiff -u -r1.57 -r1.57.2.1 src/usr.bin/audio/play/play.c cvs rdiff -u -r1.42 -r1.42.28.1 src/usr.bin/audio/record/audiorecord.1 cvs rdiff -u -r1.54 -r1.54.18.1 src/usr.bin/audio/record/record.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/dev/usb
Module Name:src
Committed By: martin
Date: Tue Mar 12 12:34:50 UTC 2024
Modified Files:
src/sys/dev/usb [netbsd-9]: usbdi.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1807):
sys/dev/usb/usbdi.c: revision 1.248
usbdi(9): Avoid calling ubm_softint with lock held and polling on.
PR kern/57783
To generate a diff of this commit:
cvs rdiff -u -r1.182.4.5 -r1.182.4.6 src/sys/dev/usb/usbdi.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/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.182.4.5 src/sys/dev/usb/usbdi.c:1.182.4.6
--- src/sys/dev/usb/usbdi.c:1.182.4.5 Sat Jul 18 15:09:28 2020
+++ src/sys/dev/usb/usbdi.c Tue Mar 12 12:34:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.182.4.5 2020/07/18 15:09:28 martin Exp $ */
+/* $NetBSD: usbdi.c,v 1.182.4.6 2024/03/12 12:34:50 martin Exp $ */
/*
* Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.182.4.5 2020/07/18 15:09:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.182.4.6 2024/03/12 12:34:50 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1229,14 +1229,34 @@ usbd_dopoll(struct usbd_interface *iface
void
usbd_set_polling(struct usbd_device *dev, int on)
{
- if (on)
- dev->ud_bus->ub_usepolling++;
- else
- dev->ud_bus->ub_usepolling--;
- /* Kick the host controller when switching modes */
mutex_enter(dev->ud_bus->ub_lock);
- dev->ud_bus->ub_methods->ubm_softint(dev->ud_bus);
+ if (on) {
+ /*
+ * Enabling polling. If we're enabling for the first
+ * time, call the softint routine on transition while
+ * we hold the lock and polling is still disabled, and
+ * then enable polling -- once polling is enabled, we
+ * must not hold the lock when we call the softint
+ * routine.
+ */
+ KASSERT(dev->ud_bus->ub_usepolling < __type_max(char));
+ if (dev->ud_bus->ub_usepolling == 0)
+ dev->ud_bus->ub_methods->ubm_softint(dev->ud_bus);
+ dev->ud_bus->ub_usepolling++;
+ } else {
+ /*
+ * Disabling polling. If we're disabling polling for
+ * the last time, disable polling first and then call
+ * the softint routine while we hold the lock -- until
+ * polling is disabled, we must not hold the lock when
+ * we call the softint routine.
+ */
+ KASSERT(dev->ud_bus->ub_usepolling > 0);
+ dev->ud_bus->ub_usepolling--;
+ if (dev->ud_bus->ub_usepolling == 0)
+ dev->ud_bus->ub_methods->ubm_softint(dev->ud_bus);
+ }
mutex_exit(dev->ud_bus->ub_lock);
}
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src Committed By: martin Date: Tue Mar 12 12:34:50 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-9]: usbdi.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1807): sys/dev/usb/usbdi.c: revision 1.248 usbdi(9): Avoid calling ubm_softint with lock held and polling on. PR kern/57783 To generate a diff of this commit: cvs rdiff -u -r1.182.4.5 -r1.182.4.6 src/sys/dev/usb/usbdi.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
Module Name:src Committed By: martin Date: Tue Mar 12 10:15:04 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1817 To generate a diff of this commit: cvs rdiff -u -r1.1.2.139 -r1.1.2.140 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.139 src/doc/CHANGES-9.4:1.1.2.140 --- src/doc/CHANGES-9.4:1.1.2.139 Mon Mar 11 20:04:38 2024 +++ src/doc/CHANGES-9.4 Tue Mar 12 10:15:04 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.139 2024/03/11 20:04:38 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.140 2024/03/12 10:15:04 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -13464,3 +13464,8 @@ lib/libc/gen/getcap.c1.58 libc: fix memory leak in getent(). [ozaki-r, ticket #1816] +sys/dev/ic/nvme.c1.69 + + nvme(4): PR 58025: fix nvmectl(8) after suspend/resume cycle. + [riastradh, ticket #1817] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Mar 12 10:15:04 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1817 To generate a diff of this commit: cvs rdiff -u -r1.1.2.139 -r1.1.2.140 src/doc/CHANGES-9.4 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/ic
Module Name:src
Committed By: martin
Date: Tue Mar 12 09:59:31 UTC 2024
Modified Files:
src/sys/dev/ic [netbsd-9]: nvme.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1817):
sys/dev/ic/nvme.c: revision 1.69
nvme(4): Disestablish admin q interrupt while suspended.
And re-establish on resume. Fixes nvmectl(8) after a suspend/resume
cycle on some systems.
Adapted from a patch by mrg@.
PR kern/58025
To generate a diff of this commit:
cvs rdiff -u -r1.44.2.6 -r1.44.2.7 src/sys/dev/ic/nvme.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/nvme.c
diff -u src/sys/dev/ic/nvme.c:1.44.2.6 src/sys/dev/ic/nvme.c:1.44.2.7
--- src/sys/dev/ic/nvme.c:1.44.2.6 Mon Jun 21 17:25:48 2021
+++ src/sys/dev/ic/nvme.c Tue Mar 12 09:59:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: nvme.c,v 1.44.2.6 2021/06/21 17:25:48 martin Exp $ */
+/* $NetBSD: nvme.c,v 1.44.2.7 2024/03/12 09:59:31 martin Exp $ */
/* $OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.44.2.6 2021/06/21 17:25:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.44.2.7 2024/03/12 09:59:31 martin Exp $");
#include
#include
@@ -552,7 +552,6 @@ nvme_detach(struct nvme_softc *sc, int f
return error;
/* from now on we are committed to detach, following will never fail */
- sc->sc_intr_disestablish(sc, NVME_ADMIN_Q);
for (i = 0; i < sc->sc_nq; i++)
nvme_q_free(sc, sc->sc_q[i]);
kmem_free(sc->sc_q, sizeof(*sc->sc_q) * sc->sc_nq);
@@ -582,6 +581,11 @@ nvme_resume(struct nvme_softc *sc)
}
nvme_q_reset(sc, sc->sc_admin_q);
+ if (sc->sc_intr_establish(sc, NVME_ADMIN_Q, sc->sc_admin_q)) {
+ error = EIO;
+ device_printf(sc->sc_dev, "unable to establish admin q\n");
+ goto disable;
+ }
error = nvme_enable(sc, ffs(sc->sc_mps) - 1);
if (error) {
@@ -643,6 +647,8 @@ nvme_shutdown(struct nvme_softc *sc)
if (disabled)
goto disable;
+ sc->sc_intr_disestablish(sc, NVME_ADMIN_Q);
+
cc = nvme_read4(sc, NVME_CC);
CLR(cc, NVME_CC_SHN_MASK);
SET(cc, NVME_CC_SHN(NVME_CC_SHN_NORMAL));
CVS commit: [netbsd-9] src/sys/dev/ic
Module Name:src Committed By: martin Date: Tue Mar 12 09:59:31 UTC 2024 Modified Files: src/sys/dev/ic [netbsd-9]: nvme.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1817): sys/dev/ic/nvme.c: revision 1.69 nvme(4): Disestablish admin q interrupt while suspended. And re-establish on resume. Fixes nvmectl(8) after a suspend/resume cycle on some systems. Adapted from a patch by mrg@. PR kern/58025 To generate a diff of this commit: cvs rdiff -u -r1.44.2.6 -r1.44.2.7 src/sys/dev/ic/nvme.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
Module Name:src Committed By: martin Date: Mon Mar 11 20:04:39 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1813 - #1816 To generate a diff of this commit: cvs rdiff -u -r1.1.2.138 -r1.1.2.139 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.138 src/doc/CHANGES-9.4:1.1.2.139 --- src/doc/CHANGES-9.4:1.1.2.138 Sun Mar 10 19:22:08 2024 +++ src/doc/CHANGES-9.4 Mon Mar 11 20:04:38 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.138 2024/03/10 19:22:08 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.139 2024/03/11 20:04:38 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -13438,3 +13438,29 @@ sys/netinet6/in6.c1.292 a router advertisement processed by dhcpcd. [riastradh, ticket #1812] +etc/named.conf 1.11 +external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h 1.11 +usr.sbin/postinstall/postinstall.in 1.59 + + named(8): fix bus errors on alignement critical architectures. + Update the default named.conf for the new version. + postinstall(8): add support to upgrade the named(8) configuration. + [christos, ticket #1813] + +sys/kern/sysv_shm.c1.142 + + sysv_shm: PR 57979: avoid arithmetic overflow when computing + kern.ipc.shmmax. + [riastradh, ticket #1814] + +sys/net/if_tun.c1.175 + + tun(4): PR 58013: allow IPv6 packets with TUNSLMODE configured, + rather than hard-coding tun(4) as IPv4-only. + [riastradh, ticket #1815] + +lib/libc/gen/getcap.c1.58 + + libc: fix memory leak in getent(). + [ozaki-r, ticket #1816] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Mar 11 20:04:39 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1813 - #1816 To generate a diff of this commit: cvs rdiff -u -r1.1.2.138 -r1.1.2.139 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/lib/libc/gen
Module Name:src Committed By: martin Date: Mon Mar 11 20:02:12 UTC 2024 Modified Files: src/lib/libc/gen [netbsd-9]: getcap.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #1816): lib/libc/gen/getcap.c: revision 1.58 Fix memory leak in getent() Memory was not freed if record was not found To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.57.8.1 src/lib/libc/gen/getcap.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/lib/libc/gen
Module Name:src
Committed By: martin
Date: Mon Mar 11 20:02:12 UTC 2024
Modified Files:
src/lib/libc/gen [netbsd-9]: getcap.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1816):
lib/libc/gen/getcap.c: revision 1.58
Fix memory leak in getent()
Memory was not freed if record was not found
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.57.8.1 src/lib/libc/gen/getcap.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/getcap.c
diff -u src/lib/libc/gen/getcap.c:1.57 src/lib/libc/gen/getcap.c:1.57.8.1
--- src/lib/libc/gen/getcap.c:1.57 Sun Jun 18 03:56:39 2017
+++ src/lib/libc/gen/getcap.c Mon Mar 11 20:02:12 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: getcap.c,v 1.57 2017/06/18 03:56:39 manu Exp $ */
+/* $NetBSD: getcap.c,v 1.57.8.1 2024/03/11 20:02:12 martin Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)getcap.c 8.3 (Berkeley) 3/25/94";
#else
-__RCSID("$NetBSD: getcap.c,v 1.57 2017/06/18 03:56:39 manu Exp $");
+__RCSID("$NetBSD: getcap.c,v 1.57.8.1 2024/03/11 20:02:12 martin Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -502,8 +502,10 @@ getent(char **cap, size_t *len, const ch
break;
}
- if (!foundit)
+ if (!foundit) {
+ free(record);
return -1;
+ }
/*
* Got the capability record, but now we have to expand all tc=name
CVS commit: [netbsd-9] src/sys/net
Module Name:src
Committed By: martin
Date: Mon Mar 11 19:30:06 UTC 2024
Modified Files:
src/sys/net [netbsd-9]: if_tun.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1815):
sys/net/if_tun.c: revision 1.175
tun(4): Allow IPv6 packets with TUNSLMODE configured.
PR kern/58013
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.156.2.1 src/sys/net/if_tun.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.156 src/sys/net/if_tun.c:1.156.2.1
--- src/sys/net/if_tun.c:1.156 Fri Apr 26 08:38:25 2019
+++ src/sys/net/if_tun.c Mon Mar 11 19:30:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.156 2019/04/26 08:38:25 pgoyette Exp $ */
+/* $NetBSD: if_tun.c,v 1.156.2.1 2024/03/11 19:30:06 martin Exp $ */
/*
* Copyright (c) 1988, Julian Onions
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.156 2019/04/26 08:38:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.156.2.1 2024/03/11 19:30:06 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -586,9 +586,7 @@ tun_output(struct ifnet *ifp, struct mbu
goto out;
}
memcpy(mtod(m0, char *), dst, dst->sa_len);
- }
-
- if (tp->tun_flags & TUN_IFHEAD) {
+ } else if (tp->tun_flags & TUN_IFHEAD) {
/* Prepend the address family */
M_PREPEND(m0, sizeof(*af), M_DONTWAIT);
if (m0 == NULL) {
CVS commit: [netbsd-9] src/sys/net
Module Name:src Committed By: martin Date: Mon Mar 11 19:30:06 UTC 2024 Modified Files: src/sys/net [netbsd-9]: if_tun.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1815): sys/net/if_tun.c: revision 1.175 tun(4): Allow IPv6 packets with TUNSLMODE configured. PR kern/58013 To generate a diff of this commit: cvs rdiff -u -r1.156 -r1.156.2.1 src/sys/net/if_tun.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/kern
Module Name:src Committed By: martin Date: Mon Mar 11 18:01:48 UTC 2024 Modified Files: src/sys/kern [netbsd-9]: sysv_shm.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1814): sys/kern/sysv_shm.c: revision 1.142 Avoid overflow when computing kern.ipc.shmmax. Keep shmmax (bytes) and shmall (pages) values aligned and use arithmetic everywhere instead of shifts. Should fix PR 57979 To generate a diff of this commit: cvs rdiff -u -r1.135.2.4 -r1.135.2.5 src/sys/kern/sysv_shm.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/kern
Module Name:src
Committed By: martin
Date: Mon Mar 11 18:01:48 UTC 2024
Modified Files:
src/sys/kern [netbsd-9]: sysv_shm.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1814):
sys/kern/sysv_shm.c: revision 1.142
Avoid overflow when computing kern.ipc.shmmax. Keep shmmax (bytes) and
shmall (pages) values aligned and use arithmetic everywhere instead
of shifts.
Should fix PR 57979
To generate a diff of this commit:
cvs rdiff -u -r1.135.2.4 -r1.135.2.5 src/sys/kern/sysv_shm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sysv_shm.c
diff -u src/sys/kern/sysv_shm.c:1.135.2.4 src/sys/kern/sysv_shm.c:1.135.2.5
--- src/sys/kern/sysv_shm.c:1.135.2.4 Thu Oct 10 17:23:45 2019
+++ src/sys/kern/sysv_shm.c Mon Mar 11 18:01:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_shm.c,v 1.135.2.4 2019/10/10 17:23:45 martin Exp $ */
+/* $NetBSD: sysv_shm.c,v 1.135.2.5 2024/03/11 18:01:48 martin Exp $ */
/*-
* Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.135.2.4 2019/10/10 17:23:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.135.2.5 2024/03/11 18:01:48 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -961,10 +961,10 @@ shminit(struct sysctllog **clog)
ALIGN(shminfo.shmmni * sizeof(struct shmid_ds)));
if (shminfo.shmmax == 0)
- shminfo.shmmax = uimax(physmem / 4, 1024) * PAGE_SIZE;
+ shminfo.shmall = uimax(physmem / 4, 1024);
else
- shminfo.shmmax *= PAGE_SIZE;
- shminfo.shmall = shminfo.shmmax / PAGE_SIZE;
+ shminfo.shmall = shminfo.shmmax / PAGE_SIZE;
+ shminfo.shmmax = (uint64_t)shminfo.shmall * PAGE_SIZE;
for (i = 0; i < shminfo.shmmni; i++) {
cv_init(_cv[i], "shmwait");
@@ -1087,7 +1087,7 @@ sysctl_ipc_shmmax(SYSCTLFN_ARGS)
return EINVAL;
shminfo.shmmax = round_page(newsize);
- shminfo.shmall = shminfo.shmmax >> PAGE_SHIFT;
+ shminfo.shmall = shminfo.shmmax / PAGE_SIZE;
return 0;
}
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Mon Mar 11 17:37:43 UTC 2024
Modified Files:
src/etc [netbsd-9]: named.conf
src/external/mpl/bind/dist/lib/isc/netmgr [netbsd-9]: netmgr-int.h
src/usr.sbin/postinstall [netbsd-9]: postinstall.in
Log Message:
Pull up following revision(s) (requested by christos in ticket #1813):
etc/named.conf: revision 1.11
usr.sbin/postinstall/postinstall.in: revision 1.59
external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h: revision 1.11
Make sure that the extra field is maximally aligned since it is used for
other struct storage.
- fix named.conf (remove dnssec-enable option)
- use proper local variables instead of adding _ or other prefixes.
- centralize rm use
- use grep -q instead of > /dev/null
- reduce constant duplication
remove obsolete option "dnssec-enable"
To generate a diff of this commit:
cvs rdiff -u -r1.7.32.1 -r1.7.32.2 src/etc/named.conf
cvs rdiff -u -r1.10.2.2 -r1.10.2.3 \
src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h
cvs rdiff -u -r1.5.2.5 -r1.5.2.6 src/usr.sbin/postinstall/postinstall.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/named.conf
diff -u src/etc/named.conf:1.7.32.1 src/etc/named.conf:1.7.32.2
--- src/etc/named.conf:1.7.32.1 Fri Mar 27 08:43:42 2020
+++ src/etc/named.conf Mon Mar 11 17:37:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: named.conf,v 1.7.32.1 2020/03/27 08:43:42 sborrill Exp $
+# $NetBSD: named.conf,v 1.7.32.2 2024/03/11 17:37:42 martin Exp $
# boot file for secondary name server
# Note that there should be one primary entry for each SOA record.
@@ -10,7 +10,6 @@
options {
directory "/etc/namedb";
- dnssec-enable yes;
dnssec-validation auto;
managed-keys-directory "keys";
bindkeys-file "bind.keys";
Index: src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h
diff -u src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.10.2.2 src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.10.2.3
--- src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.10.2.2 Thu Feb 29 12:35:14 2024
+++ src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h Mon Mar 11 17:37:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: netmgr-int.h,v 1.10.2.2 2024/02/29 12:35:14 martin Exp $ */
+/* $NetBSD: netmgr-int.h,v 1.10.2.3 2024/03/11 17:37:43 martin Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -276,7 +276,7 @@ struct isc_nmhandle {
LINK(isc_nmhandle_t) active_link;
#endif
void *opaque;
- char extra[];
+ max_align_t extra[];
};
typedef enum isc__netievent_type {
Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.5.2.5 src/usr.sbin/postinstall/postinstall.in:1.5.2.6
--- src/usr.sbin/postinstall/postinstall.in:1.5.2.5 Tue Jul 7 20:02:27 2020
+++ src/usr.sbin/postinstall/postinstall.in Mon Mar 11 17:37:42 2024
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.5.2.5 2020/07/07 20:02:27 martin Exp $
+# $NetBSD: postinstall.in,v 1.5.2.6 2024/03/11 17:37:42 martin Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1299,15 +1299,47 @@ do_mtree()
#
# named
#
+handle_named_conf()
+{
+ local op="$1"
+ local option="dnssec-enable"
+ local failed=0
+ local conf
+
+ shift
+
+ for conf; do
+ local c=$(readlink -f "${conf}")
+ if ! ${GREP} -qs "${option}" "${c}"
+ then
+ continue
+ fi
+
+ if [ "${op}" = "fix" ]; then
+ ${SED} -e "/${option}/d" "${c}" > "${c}.new"
+ failed=$(( ${failed} + $? ))
+ mv "${c}.new" "${c}"
+ failed=$(( ${failed} + $? ))
+ msg "Removed obsolete '${option}' in ${c}"
+ else
+ msg "'${option}' option in ${c} should be removed"
+ failed=$(( ${failed} + 1 ))
+ fi
+ done
+
+ return ${failed}
+}
+
additem named "named configuration update"
do_named()
{
+ local oldconf="${DEST_DIR}/etc/namedb/named.conf"
+ local conf="${DEST_DIR}/etc/named.conf"
[ -n "$1" ] || err 3 "USAGE: do_named fix|check"
- op="$1"
+ local op="$1"
- move_file "${op}" \
- "${DEST_DIR}/etc/namedb/named.conf" \
- "${DEST_DIR}/etc/named.conf"
+ move_file "${op}" "${oldconf}" "${conf}"
+ handle_named_conf "${op}" "${oldconf}" "${conf}"
compare_dir "${op}" "${SRC_DIR}/etc/namedb" "${DEST_DIR}/etc/namedb" \
644 \
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Mar 11 17:37:43 UTC 2024 Modified Files: src/etc [netbsd-9]: named.conf src/external/mpl/bind/dist/lib/isc/netmgr [netbsd-9]: netmgr-int.h src/usr.sbin/postinstall [netbsd-9]: postinstall.in Log Message: Pull up following revision(s) (requested by christos in ticket #1813): etc/named.conf: revision 1.11 usr.sbin/postinstall/postinstall.in: revision 1.59 external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h: revision 1.11 Make sure that the extra field is maximally aligned since it is used for other struct storage. - fix named.conf (remove dnssec-enable option) - use proper local variables instead of adding _ or other prefixes. - centralize rm use - use grep -q instead of > /dev/null - reduce constant duplication remove obsolete option "dnssec-enable" To generate a diff of this commit: cvs rdiff -u -r1.7.32.1 -r1.7.32.2 src/etc/named.conf cvs rdiff -u -r1.10.2.2 -r1.10.2.3 \ src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h cvs rdiff -u -r1.5.2.5 -r1.5.2.6 src/usr.sbin/postinstall/postinstall.in 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
Module Name:src Committed By: martin Date: Sun Mar 10 19:22:09 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1806, #1808 - #1812 To generate a diff of this commit: cvs rdiff -u -r1.1.2.137 -r1.1.2.138 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.137 src/doc/CHANGES-9.4:1.1.2.138 --- src/doc/CHANGES-9.4:1.1.2.137 Sun Mar 3 07:13:06 2024 +++ src/doc/CHANGES-9.4 Sun Mar 10 19:22:08 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.137 2024/03/03 07:13:06 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.138 2024/03/10 19:22:08 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -13400,3 +13400,41 @@ doc/3RDPARTY (manually edited) Import libuv 1.44.2. Adjust nsd, unbound and bind to the netbsd-9 branch. [christos, ticket #1805] + +lib/libc/net/getnameinfo.c 1.60 + + getnameinfo(3): PR 57609: fix socket address length checks. + [riastradh, ticket #1806] + +lib/libc/net/getnameinfo.3 1.43 + + getnameinfo(3): PR 57832_ document NI_NUMERICSCOPE. + [riastradh, ticket #1808] + +sys/netinet6/icmp6.c1.256 (patch) +sys/netinet6/raw_ip6.c1.184 (patch) + + PR 57955: deliver timestamps also to raw sockets. + [riastradh, ticket #1809] + +sys/dev/usb/if_urtwn.c1.109 (patch) + + urtwn(4): PR 57965: avoid deadlock on command ring overflow. + [riastradh, ticket #1810] + +usr.bin/getconf/getconf.1 1.14 +usr.bin/getconf/getconf.c 1.37 + + getconf(1): PR 57875: accept variable names with or without + leading underscore. This matches FreeBSD and makes it more + portable to GNU getconf(1), which currently _requires_ a leading + underscore while ours currently _refuses_ a leading underscore. + [riastradh, ticket #1811] + +sys/netinet6/in6.c1.292 + + netinet6: PR 53922: avoid NPD on certain inet6 addr configs. + This can be provoked by anyone on the local network by issuing + a router advertisement processed by dhcpcd. + [riastradh, ticket #1812] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Mar 10 19:22:09 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1806, #1808 - #1812 To generate a diff of this commit: cvs rdiff -u -r1.1.2.137 -r1.1.2.138 src/doc/CHANGES-9.4 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
Module Name:src Committed By: martin Date: Sun Mar 10 19:12:05 UTC 2024 Modified Files: src/sys/netinet6 [netbsd-9]: in6.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1812): sys/netinet6/in6.c: revision 1.292 netinet6: Avoid NPD on `ifconfig ifN inet6 ... pltime 0 vltime 0'. PR kern/53922 To generate a diff of this commit: cvs rdiff -u -r1.275.2.2 -r1.275.2.3 src/sys/netinet6/in6.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/in6.c diff -u src/sys/netinet6/in6.c:1.275.2.2 src/sys/netinet6/in6.c:1.275.2.3 --- src/sys/netinet6/in6.c:1.275.2.2 Fri Aug 4 14:29:44 2023 +++ src/sys/netinet6/in6.c Sun Mar 10 19:12:05 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: in6.c,v 1.275.2.2 2023/08/04 14:29:44 martin Exp $ */ +/* $NetBSD: in6.c,v 1.275.2.3 2024/03/10 19:12:05 martin Exp $ */ /* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.275.2.2 2023/08/04 14:29:44 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.275.2.3 2024/03/10 19:12:05 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -707,7 +707,14 @@ in6_control1(struct socket *so, u_long c int s = splsoftnet(); error = in6_update_ifa1(ifp, ifra, , , 0); splx(s); - if (error) + /* + * in6_update_ifa1 doesn't create the address if its + * valid lifetime (vltime) is zero, since we would just + * delete the address immediately in that case anyway. + * So it may succeed but return null ia. In that case, + * nothing left to do. + */ + if (error || ia == NULL) break; pfil_run_addrhooks(if_pfil, cmd, >ia_ifa); break;
CVS commit: [netbsd-9] src/sys/netinet6
Module Name:src Committed By: martin Date: Sun Mar 10 19:12:05 UTC 2024 Modified Files: src/sys/netinet6 [netbsd-9]: in6.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1812): sys/netinet6/in6.c: revision 1.292 netinet6: Avoid NPD on `ifconfig ifN inet6 ... pltime 0 vltime 0'. PR kern/53922 To generate a diff of this commit: cvs rdiff -u -r1.275.2.2 -r1.275.2.3 src/sys/netinet6/in6.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/usr.bin/getconf
Module Name:src
Committed By: martin
Date: Sun Mar 10 19:04:39 UTC 2024
Modified Files:
src/usr.bin/getconf [netbsd-9]: getconf.1 getconf.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1811):
usr.bin/getconf/getconf.c: revision 1.37
usr.bin/getconf/getconf.1: revision 1.14
PR/57875: Jason Bacon: Try again without an _ for portability.
getconf.1: Note that leading underscores in configuration
variable names are ignored by getconf(1).
While here, add a section with examples, and make the synopsis
more concise.
PR bin/57875
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.26.1 src/usr.bin/getconf/getconf.1
cvs rdiff -u -r1.35 -r1.35.28.1 src/usr.bin/getconf/getconf.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/getconf/getconf.1
diff -u src/usr.bin/getconf/getconf.1:1.13 src/usr.bin/getconf/getconf.1:1.13.26.1
--- src/usr.bin/getconf/getconf.1:1.13 Sun Apr 13 01:45:34 2014
+++ src/usr.bin/getconf/getconf.1 Sun Mar 10 19:04:39 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: getconf.1,v 1.13 2014/04/13 01:45:34 snj Exp $
+.\" $NetBSD: getconf.1,v 1.13.26.1 2024/03/10 19:04:39 martin Exp $
.\"
.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd August 9, 2011
+.Dd February 18, 2024
.Dt GETCONF 1
.Os
.Sh NAME
@@ -37,13 +37,10 @@
.Nm
.Ar system_var
.Nm
-.Fl a
-.Nm
.Ar path_var
.Ar pathname
.Nm
-.Fl a
-.Ar pathname
+.Fl a Op Ar pathname
.Sh DESCRIPTION
The
.Nm
@@ -80,8 +77,28 @@ standard output, in the format
=
.Va value
.Dc .
+.Pp
+For compatibility with other operating systems,
+.Nm
+will ignore leading underscores in the names specified in the
+.Ar system_var
+and
+.Ar path_var
+arguments.
.Sh EXIT STATUS
.Ex -std
+.Sh EXAMPLES
+To retrieve the number of configured processors, use:
+.Bd -literal -offset indent
+$ getconf NPROCESSORS_CONF
+.Ed
+.Pp
+To retrieve the maximum number of bytes (excluding the trailing
+.Dv NUL )
+for a filename in the current directory, use:
+.Bd -literal -offset indent
+$ getconf NAME_MAX .
+.Ed
.Sh SEE ALSO
.Xr pathconf 2 ,
.Xr confstr 3 ,
Index: src/usr.bin/getconf/getconf.c
diff -u src/usr.bin/getconf/getconf.c:1.35 src/usr.bin/getconf/getconf.c:1.35.28.1
--- src/usr.bin/getconf/getconf.c:1.35 Thu Dec 19 19:11:50 2013
+++ src/usr.bin/getconf/getconf.c Sun Mar 10 19:04:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: getconf.c,v 1.35 2013/12/19 19:11:50 rmind Exp $ */
+/* $NetBSD: getconf.c,v 1.35.28.1 2024/03/10 19:04:39 martin Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: getconf.c,v 1.35 2013/12/19 19:11:50 rmind Exp $");
+__RCSID("$NetBSD: getconf.c,v 1.35.28.1 2024/03/10 19:04:39 martin Exp $");
#endif /* not lint */
#include
@@ -193,7 +193,7 @@ main(int argc, char **argv)
{
int ch;
const struct conf_variable *cp;
- const char *varname, *pathname;
+ const char *varname, *pathname, *vn;
int found;
setprogname(argv[0]);
@@ -226,8 +226,10 @@ main(int argc, char **argv)
pathname = argv[0]; /* may be NULL */
found = 0;
+ vn = varname;
+again:
for (cp = conf_table; cp->name != NULL; cp++) {
- if (a_flag || strcmp(varname, cp->name) == 0) {
+ if (a_flag || strcmp(vn, cp->name) == 0) {
/*LINTED weird expression*/
if ((cp->type == PATHCONF) == (pathname != NULL)) {
printvar(cp, pathname);
@@ -238,8 +240,11 @@ main(int argc, char **argv)
}
}
- if (!a_flag && !found)
+ if (!a_flag && !found) {
+ if (*vn++ == '_')
+ goto again;
errx(EXIT_FAILURE, "%s: unknown variable", varname);
+ }
(void)fflush(stdout);
return ferror(stdout) ? EXIT_FAILURE : EXIT_SUCCESS;
CVS commit: [netbsd-9] src/usr.bin/getconf
Module Name:src Committed By: martin Date: Sun Mar 10 19:04:39 UTC 2024 Modified Files: src/usr.bin/getconf [netbsd-9]: getconf.1 getconf.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1811): usr.bin/getconf/getconf.c: revision 1.37 usr.bin/getconf/getconf.1: revision 1.14 PR/57875: Jason Bacon: Try again without an _ for portability. getconf.1: Note that leading underscores in configuration variable names are ignored by getconf(1). While here, add a section with examples, and make the synopsis more concise. PR bin/57875 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.26.1 src/usr.bin/getconf/getconf.1 cvs rdiff -u -r1.35 -r1.35.28.1 src/usr.bin/getconf/getconf.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/dev/usb
Module Name:src
Committed By: martin
Date: Sun Mar 10 18:59:19 UTC 2024
Modified Files:
src/sys/dev/usb [netbsd-9]: if_urtwn.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1810):
sys/dev/usb/if_urtwn.c: revision 1.109 (patch)
urtwn(4): Ditch old queued commands on overflow.
Don't increment ring->queued past what the task will decrement.
This is a stop-gap measure; really, we should just have one task for
each operation that is deferred to the task thread.
PR kern/57965
To generate a diff of this commit:
cvs rdiff -u -r1.71.2.6 -r1.71.2.7 src/sys/dev/usb/if_urtwn.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/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.71.2.6 src/sys/dev/usb/if_urtwn.c:1.71.2.7
--- src/sys/dev/usb/if_urtwn.c:1.71.2.6 Sat Oct 23 11:21:54 2021
+++ src/sys/dev/usb/if_urtwn.c Sun Mar 10 18:59:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.71.2.6 2021/10/23 11:21:54 martin Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.71.2.7 2024/03/10 18:59:19 martin Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.71.2.6 2021/10/23 11:21:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.71.2.7 2024/03/10 18:59:19 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -833,6 +833,24 @@ urtwn_tx_beacon(struct urtwn_softc *sc,
}
static void
+urtwn_cmdq_invariants(struct urtwn_softc *sc)
+{
+ struct urtwn_host_cmd_ring *const ring __diagused = >cmdq;
+
+ KASSERT(mutex_owned(>sc_task_mtx));
+ KASSERTMSG((ring->cur >= 0 && ring->cur < URTWN_HOST_CMD_RING_COUNT),
+ "%s: cur=%d next=%d queued=%d",
+ device_xname(sc->sc_dev), ring->cur, ring->next, ring->queued);
+ KASSERTMSG((ring->next >= 0 && ring->next < URTWN_HOST_CMD_RING_COUNT),
+ "%s: cur=%d next=%d queued=%d",
+ device_xname(sc->sc_dev), ring->cur, ring->next, ring->queued);
+ KASSERTMSG((ring->queued >= 0 &&
+ ring->queued <= URTWN_HOST_CMD_RING_COUNT),
+ "%s: %d commands queued",
+ device_xname(sc->sc_dev), ring->queued);
+}
+
+static void
urtwn_task(void *arg)
{
struct urtwn_softc *sc = arg;
@@ -865,7 +883,11 @@ urtwn_task(void *arg)
/* Process host commands. */
s = splusb();
mutex_spin_enter(>sc_task_mtx);
+ urtwn_cmdq_invariants(sc);
while (ring->next != ring->cur) {
+ KASSERTMSG(ring->queued > 0, "%s: cur=%d next=%d queued=%d",
+ device_xname(sc->sc_dev),
+ ring->cur, ring->next, ring->queued);
cmd = >cmd[ring->next];
mutex_spin_exit(>sc_task_mtx);
splx(s);
@@ -873,6 +895,10 @@ urtwn_task(void *arg)
cmd->cb(sc, cmd->data);
s = splusb();
mutex_spin_enter(>sc_task_mtx);
+ urtwn_cmdq_invariants(sc);
+ KASSERTMSG(ring->queued > 0, "%s: cur=%d next=%d queued=%d",
+ device_xname(sc->sc_dev),
+ ring->cur, ring->next, ring->queued);
ring->queued--;
ring->next = (ring->next + 1) % URTWN_HOST_CMD_RING_COUNT;
}
@@ -887,6 +913,7 @@ urtwn_do_async(struct urtwn_softc *sc, v
{
struct urtwn_host_cmd_ring *ring = >cmdq;
struct urtwn_host_cmd *cmd;
+ bool schedtask = false;
int s;
DPRINTFN(DBG_FN, ("%s: %s: cb=%p, arg=%p, len=%d\n",
@@ -894,19 +921,27 @@ urtwn_do_async(struct urtwn_softc *sc, v
s = splusb();
mutex_spin_enter(>sc_task_mtx);
+ urtwn_cmdq_invariants(sc);
cmd = >cmd[ring->cur];
cmd->cb = cb;
KASSERT(len <= sizeof(cmd->data));
memcpy(cmd->data, arg, len);
ring->cur = (ring->cur + 1) % URTWN_HOST_CMD_RING_COUNT;
- /* If there is no pending command already, schedule a task. */
- if (!sc->sc_dying && ++ring->queued == 1) {
- mutex_spin_exit(>sc_task_mtx);
- usb_add_task(sc->sc_udev, >sc_task, USB_TASKQ_DRIVER);
- } else
- mutex_spin_exit(>sc_task_mtx);
+ /*
+ * Schedule a task to process the command if need be.
+ */
+ if (!sc->sc_dying) {
+ if (ring->queued == URTWN_HOST_CMD_RING_COUNT)
+ device_printf(sc->sc_dev, "command queue overflow\n");
+ else if (ring->queued++ == 0)
+ schedtask = true;
+ }
+ mutex_spin_exit(>sc_task_mtx);
splx(s);
+
+ if (schedtask)
+ usb_add_task(sc->sc_udev, >sc_task, USB_TASKQ_DRIVER);
}
static void
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sun Mar 10 18:59:19 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-9]: if_urtwn.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1810): sys/dev/usb/if_urtwn.c: revision 1.109 (patch) urtwn(4): Ditch old queued commands on overflow. Don't increment ring->queued past what the task will decrement. This is a stop-gap measure; really, we should just have one task for each operation that is deferred to the task thread. PR kern/57965 To generate a diff of this commit: cvs rdiff -u -r1.71.2.6 -r1.71.2.7 src/sys/dev/usb/if_urtwn.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
Module Name:src Committed By: martin Date: Sun Mar 10 18:54:41 UTC 2024 Modified Files: src/sys/netinet6 [netbsd-9]: icmp6.c raw_ip6.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1809): sys/netinet6/raw_ip6.c: revision 1.184 (patch) sys/netinet6/icmp6.c: revision 1.256 (patch) Deliver timestamps also to raw sockets. Fixes PR 57955 To generate a diff of this commit: cvs rdiff -u -r1.242 -r1.242.4.1 src/sys/netinet6/icmp6.c cvs rdiff -u -r1.175.4.1 -r1.175.4.2 src/sys/netinet6/raw_ip6.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
Module Name:src
Committed By: martin
Date: Sun Mar 10 18:54:41 UTC 2024
Modified Files:
src/sys/netinet6 [netbsd-9]: icmp6.c raw_ip6.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1809):
sys/netinet6/raw_ip6.c: revision 1.184 (patch)
sys/netinet6/icmp6.c: revision 1.256 (patch)
Deliver timestamps also to raw sockets.
Fixes PR 57955
To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.242.4.1 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.175.4.1 -r1.175.4.2 src/sys/netinet6/raw_ip6.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/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.242 src/sys/netinet6/icmp6.c:1.242.4.1
--- src/sys/netinet6/icmp6.c:1.242 Sat Dec 22 14:07:54 2018
+++ src/sys/netinet6/icmp6.c Sun Mar 10 18:54:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.242 2018/12/22 14:07:54 maxv Exp $ */
+/* $NetBSD: icmp6.c,v 1.242.4.1 2024/03/10 18:54:41 martin Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.242 2018/12/22 14:07:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.242.4.1 2024/03/10 18:54:41 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1965,7 +1965,8 @@ icmp6_rip6_input(struct mbuf **mp, int o
}
#endif
else if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) {
- if (last->in6p_flags & IN6P_CONTROLOPTS)
+ if (last->in6p_flags & IN6P_CONTROLOPTS ||
+ SOOPT_TIMESTAMP(last->in6p_socket->so_options))
ip6_savecontrol(last, , ip6, n);
/* strip intermediate headers */
m_adj(n, off);
@@ -1992,7 +1993,8 @@ icmp6_rip6_input(struct mbuf **mp, int o
} else
#endif
if (last) {
- if (last->in6p_flags & IN6P_CONTROLOPTS)
+ if (last->in6p_flags & IN6P_CONTROLOPTS ||
+ SOOPT_TIMESTAMP(last->in6p_socket->so_options))
ip6_savecontrol(last, , ip6, m);
/* strip intermediate headers */
m_adj(m, off);
Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.175.4.1 src/sys/netinet6/raw_ip6.c:1.175.4.2
--- src/sys/netinet6/raw_ip6.c:1.175.4.1 Thu Mar 23 12:06:49 2023
+++ src/sys/netinet6/raw_ip6.c Sun Mar 10 18:54:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip6.c,v 1.175.4.1 2023/03/23 12:06:49 martin Exp $ */
+/* $NetBSD: raw_ip6.c,v 1.175.4.2 2024/03/10 18:54:41 martin Exp $ */
/* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.175.4.1 2023/03/23 12:06:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.175.4.2 2024/03/10 18:54:41 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -140,7 +140,8 @@ rip6_sbappendaddr(struct in6pcb *last, s
{
struct mbuf *opts = NULL;
- if (last->in6p_flags & IN6P_CONTROLOPTS)
+ if (last->in6p_flags & IN6P_CONTROLOPTS ||
+ SOOPT_TIMESTAMP(last->in6p_socket->so_options))
ip6_savecontrol(last, , ip6, n);
m_adj(n, hlen);
CVS commit: [netbsd-9] src/lib/libc/net
Module Name:src Committed By: martin Date: Sun Mar 10 18:44:37 UTC 2024 Modified Files: src/lib/libc/net [netbsd-9]: getnameinfo.3 Log Message: Pull up following revision(s) (requested by riastradh in ticket #1808): lib/libc/net/getnameinfo.3: revision 1.43 Document the NI_NUMERICSCOPE flag. PR lib/57832 To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.42.8.1 src/lib/libc/net/getnameinfo.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/net/getnameinfo.3 diff -u src/lib/libc/net/getnameinfo.3:1.42 src/lib/libc/net/getnameinfo.3:1.42.8.1 --- src/lib/libc/net/getnameinfo.3:1.42 Mon Jul 3 21:32:49 2017 +++ src/lib/libc/net/getnameinfo.3 Sun Mar 10 18:44:37 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: getnameinfo.3,v 1.42 2017/07/03 21:32:49 wiz Exp $ +.\" $NetBSD: getnameinfo.3,v 1.42.8.1 2024/03/10 18:44:37 martin Exp $ .\" $KAME: getnameinfo.3,v 1.37 2005/01/05 03:23:05 itojun Exp $ .\" $OpenBSD: getnameinfo.3,v 1.36 2004/12/21 09:48:20 jmc Exp $ .\" @@ -17,7 +17,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.Dd August 18, 2013 +.Dd February 15, 2024 .Dt GETNAMEINFO 3 .Os .Sh NAME @@ -106,6 +106,10 @@ If the host name cannot be found in DNS a non-zero error code is returned. If the host name is not found and the flag is not set, the address is returned in numeric form. +.It NI_NUMERICSCOPE +For IPv6 addresses the numeric form of the IPv6 scope identifier is +returned. +This flag is ignored for non-IPv6 addresses. .It NI_NUMERICSERV The service name is returned as a digit string representing the port number. .It NI_DGRAM
CVS commit: [netbsd-9] src/lib/libc/net
Module Name:src Committed By: martin Date: Sun Mar 10 18:44:37 UTC 2024 Modified Files: src/lib/libc/net [netbsd-9]: getnameinfo.3 Log Message: Pull up following revision(s) (requested by riastradh in ticket #1808): lib/libc/net/getnameinfo.3: revision 1.43 Document the NI_NUMERICSCOPE flag. PR lib/57832 To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.42.8.1 src/lib/libc/net/getnameinfo.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/lib/libc/net
Module Name:src Committed By: martin Date: Sun Mar 10 13:46:04 UTC 2024 Modified Files: src/lib/libc/net [netbsd-9]: getnameinfo.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1806): lib/libc/net/getnameinfo.c: revision 1.60 PR/57609: Carl Engvall: Add salen checks but accept larger sizes (upto sockaddr_storage) To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.59.18.1 src/lib/libc/net/getnameinfo.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/lib/libc/net
Module Name:src
Committed By: martin
Date: Sun Mar 10 13:46:04 UTC 2024
Modified Files:
src/lib/libc/net [netbsd-9]: getnameinfo.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1806):
lib/libc/net/getnameinfo.c: revision 1.60
PR/57609: Carl Engvall: Add salen checks but accept larger sizes
(upto sockaddr_storage)
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.18.1 src/lib/libc/net/getnameinfo.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/net/getnameinfo.c
diff -u src/lib/libc/net/getnameinfo.c:1.59 src/lib/libc/net/getnameinfo.c:1.59.18.1
--- src/lib/libc/net/getnameinfo.c:1.59 Tue Sep 22 16:15:08 2015
+++ src/lib/libc/net/getnameinfo.c Sun Mar 10 13:46:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: getnameinfo.c,v 1.59 2015/09/22 16:15:08 christos Exp $ */
+/* $NetBSD: getnameinfo.c,v 1.59.18.1 2024/03/10 13:46:04 martin Exp $ */
/* $KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $ */
/*
@@ -47,7 +47,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getnameinfo.c,v 1.59 2015/09/22 16:15:08 christos Exp $");
+__RCSID("$NetBSD: getnameinfo.c,v 1.59.18.1 2024/03/10 13:46:04 martin Exp $");
#endif /* LIBC_SCCS and not lint */
#ifndef RUMP_ACTION
@@ -128,6 +128,13 @@ getnameinfo(const struct sockaddr *sa, s
int flags)
{
+ /*
+ * getnameinfo() accepts an salen of sizeof(struct sockaddr_storage)
+ * at maximum as shown in RFC 4038 Sec.6.2.3.
+ */
+ if (salen > sizeof(struct sockaddr_storage))
+ return EAI_FAMILY;
+
switch (sa->sa_family) {
case AF_APPLETALK:
return getnameinfo_atalk(sa, salen, host, hostlen,
@@ -220,6 +227,9 @@ getnameinfo_local(const struct sockaddr
const struct sockaddr_un *sun =
(const struct sockaddr_un *)(const void *)sa;
+if (salen <= sizeof(*sun) - sizeof(sun->sun_path))
+ return EAI_FAMILY;
+
if (serv != NULL && servlen > 0)
serv[0] = '\0';
@@ -266,8 +276,8 @@ getnameinfo_inet(const struct sockaddr *
return EAI_FAMILY;
found:
- if (salen != afd->a_socklen)
- return EAI_FAIL;
+ if (salen < afd->a_socklen)
+ return EAI_FAMILY;
/* network byte order */
port = ((const struct sockinet *)(const void *)sa)->si_port;
@@ -544,6 +554,9 @@ getnameinfo_link(const struct sockaddr *
const struct ieee1394_hwaddr *iha;
int n;
+if (salen <= sizeof(*sdl) - sizeof(sdl->sdl_data))
+ return EAI_FAMILY;
+
if (serv != NULL && servlen > 0)
*serv = '\0';
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Mar 3 07:13:06 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Amend ticket #1805 for additional pullups To generate a diff of this commit: cvs rdiff -u -r1.1.2.136 -r1.1.2.137 src/doc/CHANGES-9.4 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
Module Name:src Committed By: martin Date: Sun Mar 3 07:13:06 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Amend ticket #1805 for additional pullups To generate a diff of this commit: cvs rdiff -u -r1.1.2.136 -r1.1.2.137 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.136 src/doc/CHANGES-9.4:1.1.2.137 --- src/doc/CHANGES-9.4:1.1.2.136 Fri Mar 1 14:29:40 2024 +++ src/doc/CHANGES-9.4 Sun Mar 3 07:13:06 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.136 2024/03/01 14:29:40 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.137 2024/03/03 07:13:06 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -13391,6 +13391,8 @@ external/mpl/bind/dist/lib/ns/pfilter.c external/mpl/bind/include/config.h (apply patch) external/mpl/bind/lib/libdns/Makefile (apply patch) external/mpl/bind/lib/libisc/Makefile (apply patch) +distrib/sets/lists/base/mi (manually edited) +distrib/sets/lists/debug/mi (manually edited) lib/Makefile (apply patch) share/mk/bsd.lib.mk1.383 (adapted),1.391 via patch doc/3RDPARTY (manually edited)
CVS commit: [netbsd-9] src/distrib/sets/lists
Module Name:src Committed By: martin Date: Sun Mar 3 07:11:43 UTC 2024 Modified Files: src/distrib/sets/lists/base [netbsd-9]: mi src/distrib/sets/lists/debug [netbsd-9]: mi Log Message: Fix entry for /usr/libdata/debug/usr/lib/named (fallout from ticket #1805) To generate a diff of this commit: cvs rdiff -u -r1.1209.2.12 -r1.1209.2.13 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.285.2.5 -r1.285.2.6 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/base/mi diff -u src/distrib/sets/lists/base/mi:1.1209.2.12 src/distrib/sets/lists/base/mi:1.1209.2.13 --- src/distrib/sets/lists/base/mi:1.1209.2.12 Fri Mar 1 14:28:51 2024 +++ src/distrib/sets/lists/base/mi Sun Mar 3 07:11:42 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1209.2.12 2024/03/01 14:28:51 martin Exp $ +# $NetBSD: mi,v 1.1209.2.13 2024/03/03 07:11:42 martin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1337,6 +1337,7 @@ ./usr/libdata/debug/usr/games base-sys-usr ./usr/libdata/debug/usr/lib base-sys-usr compatdir ./usr/libdata/debug/usr/lib/i18n base-i18n-root compatfile +./usr/libdata/debug/usr/lib/named base-sys-usr ./usr/libdata/debug/usr/lib/npf base-obsolete obsolete ./usr/libdata/debug/usr/libexec base-sys-usr ./usr/libdata/debug/usr/libexec/ching base-sys-usr Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.285.2.5 src/distrib/sets/lists/debug/mi:1.285.2.6 --- src/distrib/sets/lists/debug/mi:1.285.2.5 Fri Mar 1 14:28:52 2024 +++ src/distrib/sets/lists/debug/mi Sun Mar 3 07:11:43 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.285.2.5 2024/03/01 14:28:52 martin Exp $ +# $NetBSD: mi,v 1.285.2.6 2024/03/03 07:11:43 martin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -921,7 +921,6 @@ ./usr/libdata/debug/usr/games/worm.debug comp-games-debug debug ./usr/libdata/debug/usr/games/worms.debug comp-games-debug debug ./usr/libdata/debug/usr/games/wump.debug comp-games-debug debug -./usr/libdata/debug/usr/lib/named comp-sys-usr debug ./usr/libdata/debug/usr/libexec/atf-check.debug comp-atf-debug atf,debug ./usr/libdata/debug/usr/libexec/atf-cleanup.debug comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/atf-exec.debug comp-obsolete obsolete
CVS commit: [netbsd-9] src/distrib/sets/lists
Module Name:src Committed By: martin Date: Sun Mar 3 07:11:43 UTC 2024 Modified Files: src/distrib/sets/lists/base [netbsd-9]: mi src/distrib/sets/lists/debug [netbsd-9]: mi Log Message: Fix entry for /usr/libdata/debug/usr/lib/named (fallout from ticket #1805) To generate a diff of this commit: cvs rdiff -u -r1.1209.2.12 -r1.1209.2.13 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.285.2.5 -r1.285.2.6 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: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Mar 1 14:29:40 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ammend ticket #1804 for additional changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.135 -r1.1.2.136 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.135 src/doc/CHANGES-9.4:1.1.2.136 --- src/doc/CHANGES-9.4:1.1.2.135 Fri Mar 1 11:45:29 2024 +++ src/doc/CHANGES-9.4 Fri Mar 1 14:29:40 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.135 2024/03/01 11:45:29 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.136 2024/03/01 14:29:40 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -12913,6 +12913,7 @@ distrib/sets/lists/comp/mi 1.2454 (pat distrib/sets/lists/debug/mi 1.427,1.429 (patch) distrib/sets/lists/debug/shl.mi 1.338 (patch) distrib/sets/lists/man/mi 1.1769,1.1771 (patch) +distrib/sets/lists/misc/mi (apply patch) doc/3RDPARTY (manually edited) share/mk/bsd.prog.mk(apply patch) share/mk/bsd.sys.mk1.316
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Mar 1 14:29:40 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ammend ticket #1804 for additional changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.135 -r1.1.2.136 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/distrib/sets/lists
Module Name:src Committed By: martin Date: Fri Mar 1 14:28:53 UTC 2024 Modified Files: src/distrib/sets/lists/base [netbsd-9]: mi shl.mi src/distrib/sets/lists/debug [netbsd-9]: mi shl.mi src/distrib/sets/lists/man [netbsd-9]: mi src/distrib/sets/lists/misc [netbsd-9]: mi Log Message: Apply patch, requested by christos, to fix set lists issues from ticket #1804 distrib/sets/lists/base/mi (apply patch) distrib/sets/lists/base/shl.mi (apply patch) distrib/sets/lists/debug/mi (apply patch) distrib/sets/lists/debug/shl.mi (apply patch) distrib/sets/lists/man/mi (apply patch) distrib/sets/lists/misc/mi (apply patch) Fix set lists. To generate a diff of this commit: cvs rdiff -u -r1.1209.2.11 -r1.1209.2.12 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.866.2.7 -r1.866.2.8 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.285.2.4 -r1.285.2.5 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.225.2.7 -r1.225.2.8 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.1649.2.12 -r1.1649.2.13 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.215.2.1 -r1.215.2.2 src/distrib/sets/lists/misc/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1209.2.11 src/distrib/sets/lists/base/mi:1.1209.2.12 --- src/distrib/sets/lists/base/mi:1.1209.2.11 Thu Feb 29 12:36:06 2024 +++ src/distrib/sets/lists/base/mi Fri Mar 1 14:28:51 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1209.2.11 2024/02/29 12:36:06 martin Exp $ +# $NetBSD: mi,v 1.1209.2.12 2024/03/01 14:28:51 martin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1292,6 +1292,7 @@ ./usr/lib/lua base-sys-usr compatfile ./usr/lib/lua/5.1base-obsolete obsolete ./usr/lib/lua/5.3base-sys-usr compatfile +./usr/lib/named base-sys-usr ./usr/lib/npf base-obsolete obsolete ./usr/lib/postfixbase-postfix-usr ./usr/lib/runemodulebase-obsolete obsolete Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.866.2.7 src/distrib/sets/lists/base/shl.mi:1.866.2.8 --- src/distrib/sets/lists/base/shl.mi:1.866.2.7 Thu Feb 29 12:36:06 2024 +++ src/distrib/sets/lists/base/shl.mi Fri Mar 1 14:28:51 2024 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.866.2.7 2024/02/29 12:36:06 martin Exp $ +# $NetBSD: shl.mi,v 1.866.2.8 2024/03/01 14:28:51 martin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -927,6 +927,7 @@ ./usr/lib/lua/5.3/netpgp.so base-sys-shlib compatfile ./usr/lib/lua/5.3/sqlite.so base-sys-shlib compatfile ./usr/lib/lua/5.3/syslog.so base-sys-shlib compatfile +./usr/lib/named/filter-.so.0 base-sys-shlib ./usr/lib/npf/ext_log.so base-obsolete obsolete ./usr/lib/npf/ext_log.so.0 base-obsolete obsolete ./usr/lib/npf/ext_log.so.0.0 base-obsolete obsolete Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.285.2.4 src/distrib/sets/lists/debug/mi:1.285.2.5 --- src/distrib/sets/lists/debug/mi:1.285.2.4 Thu Feb 29 12:36:08 2024 +++ src/distrib/sets/lists/debug/mi Fri Mar 1 14:28:52 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.285.2.4 2024/02/29 12:36:08 martin Exp $ +# $NetBSD: mi,v 1.285.2.5 2024/03/01 14:28:52 martin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -921,6 +921,7 @@ ./usr/libdata/debug/usr/games/worm.debug comp-games-debug debug ./usr/libdata/debug/usr/games/worms.debug comp-games-debug debug ./usr/libdata/debug/usr/games/wump.debug comp-games-debug debug +./usr/libdata/debug/usr/lib/named comp-sys-usr debug ./usr/libdata/debug/usr/libexec/atf-check.debug comp-atf-debug atf,debug ./usr/libdata/debug/usr/libexec/atf-cleanup.debug comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/atf-exec.debug comp-obsolete obsolete Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.225.2.7 src/distrib/sets/lists/debug/shl.mi:1.225.2.8 --- src/distrib/sets/lists/debug/shl.mi:1.225.2.7 Thu Feb 29 12:36:08 2024 +++ src/distrib/sets/lists/debug/shl.mi Fri Mar 1 14:28:52 2024 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.225.2.7 2024/02/29 12:36:08 martin Exp $ +# $NetBSD: shl.mi,v 1.225.2.8 2024/03/01 14:28:52 martin Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/lib/libgcc_eh_g.acomp-c-debuglib debuglib,compatfile,gcc ./usr/lib/libgcc_s_g.acomp-c-debuglib debuglib,compatfile,gcc @@ -98,7 +98,7 @@ ./usr/libdata/debug/usr/lib/libdes.so.14.0.debug
CVS commit: [netbsd-9] src/distrib/sets/lists
Module Name:src Committed By: martin Date: Fri Mar 1 14:28:53 UTC 2024 Modified Files: src/distrib/sets/lists/base [netbsd-9]: mi shl.mi src/distrib/sets/lists/debug [netbsd-9]: mi shl.mi src/distrib/sets/lists/man [netbsd-9]: mi src/distrib/sets/lists/misc [netbsd-9]: mi Log Message: Apply patch, requested by christos, to fix set lists issues from ticket #1804 distrib/sets/lists/base/mi (apply patch) distrib/sets/lists/base/shl.mi (apply patch) distrib/sets/lists/debug/mi (apply patch) distrib/sets/lists/debug/shl.mi (apply patch) distrib/sets/lists/man/mi (apply patch) distrib/sets/lists/misc/mi (apply patch) Fix set lists. To generate a diff of this commit: cvs rdiff -u -r1.1209.2.11 -r1.1209.2.12 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.866.2.7 -r1.866.2.8 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.285.2.4 -r1.285.2.5 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.225.2.7 -r1.225.2.8 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.1649.2.12 -r1.1649.2.13 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.215.2.1 -r1.215.2.2 src/distrib/sets/lists/misc/mi 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
Module Name:src Committed By: martin Date: Fri Mar 1 11:45:29 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1805 To generate a diff of this commit: cvs rdiff -u -r1.1.2.134 -r1.1.2.135 src/doc/CHANGES-9.4 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
Module Name:src Committed By: martin Date: Fri Mar 1 11:45:29 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1805 To generate a diff of this commit: cvs rdiff -u -r1.1.2.134 -r1.1.2.135 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.134 src/doc/CHANGES-9.4:1.1.2.135 --- src/doc/CHANGES-9.4:1.1.2.134 Thu Feb 29 13:00:58 2024 +++ src/doc/CHANGES-9.4 Fri Mar 1 11:45:29 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.134 2024/02/29 13:00:58 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.135 2024/03/01 11:45:29 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -12921,3 +12921,479 @@ share/mk/bsd.sys.mk1.316 CVE and is a long term supported version. [christos, ticket #1804] +external/mit/libuv/dist/.github/workflows/CI-sample.yml up to 1.1.1.1 +external/mit/libuv/dist/.github/workflows/CI-unix.yml up to 1.1.1.1 +external/mit/libuv/dist/.github/workflows/CI-win.yml up to 1.1.1.1 +external/mit/libuv/dist/.github/workflows/sanitizer.yml up to 1.1.1.1 +external/mit/libuv/dist/.github/ISSUE_TEMPLATE.md up to 1.1.1.2 +external/mit/libuv/dist/.github/stale.yml up to 1.1.1.2 +external/mit/libuv/dist/.mailmapup to 1.1.1.2 +external/mit/libuv/dist/AUTHORS up to 1.1.1.2 +external/mit/libuv/dist/CMakeLists.txt up to 1.1.1.2 +external/mit/libuv/dist/CONTRIBUTING.md up to 1.1.1.2 +external/mit/libuv/dist/ChangeLog up to 1.1.1.2 +external/mit/libuv/dist/LICENSE up to 1.1.1.2 +external/mit/libuv/dist/LICENSE-docsup to 1.1.1.1 +external/mit/libuv/dist/MAINTAINERS.md up to 1.1.1.2 +external/mit/libuv/dist/Makefile.am up to 1.1.1.2 +external/mit/libuv/dist/README.md up to 1.1.1.2 +external/mit/libuv/dist/SUPPORTED_PLATFORMS.md up to 1.1.1.2 +external/mit/libuv/dist/autogen.sh up to 1.1.1.2 +external/mit/libuv/dist/configure.acup to 1.1.1.2 +external/mit/libuv/dist/libuv.pc.in up to 1.1.1.1 +external/mit/libuv/dist/uv_win_longpath.manifest up to 1.1.1.1 +external/mit/libuv/dist/docs/code/cgi/main.cup to 1.1.1.2 +external/mit/libuv/dist/docs/code/cgi/tick.cup to 1.1.1.1 +external/mit/libuv/dist/docs/code/detach/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/dns/main.cup to 1.1.1.2 +external/mit/libuv/dist/docs/code/helloworld/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/idle-basic/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/idle-compute/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/interfaces/main.c up to 1.1.1.2 +external/mit/libuv/dist/docs/code/locks/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/multi-echo-server/hammer.js up to 1.1.1.1 +external/mit/libuv/dist/docs/code/multi-echo-server/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/multi-echo-server/worker.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/onchange/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/pipe-echo-server/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/plugin/hello.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/plugin/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/plugin/plugin.h up to 1.1.1.1 +external/mit/libuv/dist/docs/code/proc-streams/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/proc-streams/test.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/progress/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/queue-cancel/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/queue-work/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/ref-timer/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/signal/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/spawn/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/tcp-echo-server/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/thread-create/main.c up to 1.1.1.2 +external/mit/libuv/dist/docs/code/tty/main.cup to 1.1.1.1 +external/mit/libuv/dist/docs/code/tty-gravity/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/udp-dhcp/main.c up to 1.1.1.2 +external/mit/libuv/dist/docs/code/uvcat/main.c up to 1.1.1.2 +external/mit/libuv/dist/docs/code/uvstop/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/uvtee/main.c up to 1.1.1.2 +external/mit/libuv/dist/docs/code/uvwget/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/default-loop/main.c up to 1.1.1.1 +external/mit/libuv/dist/docs/code/CMakeLists.txt up to 1.1.1.1 +external/mit/libuv/dist/docs/code/Makefile up to 1.1.1.1 +external/mit/libuv/dist/docs/Makefile up to 1.1.1.1 +external/mit/libuv/dist/docs/make.bat up to 1.1.1.1 +external/mit/libuv/dist/docs/src/guide/about.rst up to 1.1.1.1
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Fri Mar 1 11:44:12 UTC 2024 Modified Files: src/doc [netbsd-9]: 3RDPARTY src/etc/mtree [netbsd-9]: NetBSD.dist.base src/external/bsd/nsd/include [netbsd-9]: config.h src/external/bsd/unbound/include [netbsd-9]: config.h src/external/mpl/bind [netbsd-9]: Makefile Makefile.inc src/external/mpl/bind/dist/lib/ns [netbsd-9]: pfilter.c src/external/mpl/bind/include [netbsd-9]: config.h src/external/mpl/bind/lib/libdns [netbsd-9]: Makefile src/external/mpl/bind/lib/libisc [netbsd-9]: Makefile src/lib [netbsd-9]: Makefile src/share/mk [netbsd-9]: bsd.lib.mk Added Files: src/external/mit/libuv [netbsd-9]: Makefile mkpc pkgconfig.mk src/external/mit/libuv/dist [netbsd-9]: .mailmap .readthedocs.yaml AUTHORS CMakeLists.txt CONTRIBUTING.md ChangeLog LICENSE LICENSE-docs LINKS.md MAINTAINERS.md Makefile.am README.md SUPPORTED_PLATFORMS.md autogen.sh configure.ac libuv-static.pc.in libuv.pc.in uv_win_longpath.manifest src/external/mit/libuv/dist/.github [netbsd-9]: ISSUE_TEMPLATE.md stale.yml src/external/mit/libuv/dist/.github/workflows [netbsd-9]: CI-sample.yml CI-unix.yml CI-win.yml sanitizer.yml src/external/mit/libuv/dist/docs [netbsd-9]: Makefile make.bat requirements.txt src/external/mit/libuv/dist/docs/code [netbsd-9]: CMakeLists.txt Makefile src/external/mit/libuv/dist/docs/code/cgi [netbsd-9]: main.c tick.c src/external/mit/libuv/dist/docs/code/default-loop [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/detach [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/dns [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/helloworld [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/idle-basic [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/idle-compute [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/interfaces [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/locks [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/multi-echo-server [netbsd-9]: hammer.js main.c worker.c src/external/mit/libuv/dist/docs/code/onchange [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/pipe-echo-server [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/plugin [netbsd-9]: hello.c main.c plugin.h src/external/mit/libuv/dist/docs/code/proc-streams [netbsd-9]: main.c test.c src/external/mit/libuv/dist/docs/code/progress [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/queue-cancel [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/queue-work [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/ref-timer [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/signal [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/spawn [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/tcp-echo-server [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/thread-create [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/tty [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/tty-gravity [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/udp-dhcp [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/uvcat [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/uvstop [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/uvtee [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/uvwget [netbsd-9]: main.c src/external/mit/libuv/dist/docs/src [netbsd-9]: api.rst async.rst check.rst conf.py design.rst dll.rst dns.rst errors.rst fs.rst fs_event.rst fs_poll.rst guide.rst handle.rst idle.rst index.rst loop.rst metrics.rst migration_010_100.rst misc.rst pipe.rst poll.rst prepare.rst process.rst request.rst signal.rst stream.rst tcp.rst threading.rst threadpool.rst timer.rst tty.rst udp.rst upgrading.rst version.rst src/external/mit/libuv/dist/docs/src/guide [netbsd-9]: about.rst basics.rst eventloops.rst filesystem.rst introduction.rst networking.rst processes.rst threads.rst utilities.rst src/external/mit/libuv/dist/docs/src/sphinx-plugins [netbsd-9]: manpage.py src/external/mit/libuv/dist/docs/src/static [netbsd-9]: architecture.png favicon.ico logo.png loop_iteration.png src/external/mit/libuv/dist/docs/src/static/diagrams.key [netbsd-9]: Index.zip preview-micro.jpg preview-web.jpg preview.jpg src/external/mit/libuv/dist/docs/src/static/diagrams.key/Data [netbsd-9]:
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Fri Mar 1 11:44:12 UTC 2024 Modified Files: src/doc [netbsd-9]: 3RDPARTY src/etc/mtree [netbsd-9]: NetBSD.dist.base src/external/bsd/nsd/include [netbsd-9]: config.h src/external/bsd/unbound/include [netbsd-9]: config.h src/external/mpl/bind [netbsd-9]: Makefile Makefile.inc src/external/mpl/bind/dist/lib/ns [netbsd-9]: pfilter.c src/external/mpl/bind/include [netbsd-9]: config.h src/external/mpl/bind/lib/libdns [netbsd-9]: Makefile src/external/mpl/bind/lib/libisc [netbsd-9]: Makefile src/lib [netbsd-9]: Makefile src/share/mk [netbsd-9]: bsd.lib.mk Added Files: src/external/mit/libuv [netbsd-9]: Makefile mkpc pkgconfig.mk src/external/mit/libuv/dist [netbsd-9]: .mailmap .readthedocs.yaml AUTHORS CMakeLists.txt CONTRIBUTING.md ChangeLog LICENSE LICENSE-docs LINKS.md MAINTAINERS.md Makefile.am README.md SUPPORTED_PLATFORMS.md autogen.sh configure.ac libuv-static.pc.in libuv.pc.in uv_win_longpath.manifest src/external/mit/libuv/dist/.github [netbsd-9]: ISSUE_TEMPLATE.md stale.yml src/external/mit/libuv/dist/.github/workflows [netbsd-9]: CI-sample.yml CI-unix.yml CI-win.yml sanitizer.yml src/external/mit/libuv/dist/docs [netbsd-9]: Makefile make.bat requirements.txt src/external/mit/libuv/dist/docs/code [netbsd-9]: CMakeLists.txt Makefile src/external/mit/libuv/dist/docs/code/cgi [netbsd-9]: main.c tick.c src/external/mit/libuv/dist/docs/code/default-loop [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/detach [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/dns [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/helloworld [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/idle-basic [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/idle-compute [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/interfaces [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/locks [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/multi-echo-server [netbsd-9]: hammer.js main.c worker.c src/external/mit/libuv/dist/docs/code/onchange [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/pipe-echo-server [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/plugin [netbsd-9]: hello.c main.c plugin.h src/external/mit/libuv/dist/docs/code/proc-streams [netbsd-9]: main.c test.c src/external/mit/libuv/dist/docs/code/progress [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/queue-cancel [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/queue-work [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/ref-timer [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/signal [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/spawn [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/tcp-echo-server [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/thread-create [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/tty [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/tty-gravity [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/udp-dhcp [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/uvcat [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/uvstop [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/uvtee [netbsd-9]: main.c src/external/mit/libuv/dist/docs/code/uvwget [netbsd-9]: main.c src/external/mit/libuv/dist/docs/src [netbsd-9]: api.rst async.rst check.rst conf.py design.rst dll.rst dns.rst errors.rst fs.rst fs_event.rst fs_poll.rst guide.rst handle.rst idle.rst index.rst loop.rst metrics.rst migration_010_100.rst misc.rst pipe.rst poll.rst prepare.rst process.rst request.rst signal.rst stream.rst tcp.rst threading.rst threadpool.rst timer.rst tty.rst udp.rst upgrading.rst version.rst src/external/mit/libuv/dist/docs/src/guide [netbsd-9]: about.rst basics.rst eventloops.rst filesystem.rst introduction.rst networking.rst processes.rst threads.rst utilities.rst src/external/mit/libuv/dist/docs/src/sphinx-plugins [netbsd-9]: manpage.py src/external/mit/libuv/dist/docs/src/static [netbsd-9]: architecture.png favicon.ico logo.png loop_iteration.png src/external/mit/libuv/dist/docs/src/static/diagrams.key [netbsd-9]: Index.zip preview-micro.jpg preview-web.jpg preview.jpg src/external/mit/libuv/dist/docs/src/static/diagrams.key/Data [netbsd-9]:
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Thu Feb 29 13:00:58 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Fix entry for ticket #1804 To generate a diff of this commit: cvs rdiff -u -r1.1.2.133 -r1.1.2.134 src/doc/CHANGES-9.4 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
Module Name:src Committed By: martin Date: Thu Feb 29 13:00:58 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Fix entry for ticket #1804 To generate a diff of this commit: cvs rdiff -u -r1.1.2.133 -r1.1.2.134 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.133 src/doc/CHANGES-9.4:1.1.2.134 --- src/doc/CHANGES-9.4:1.1.2.133 Thu Feb 29 12:44:34 2024 +++ src/doc/CHANGES-9.4 Thu Feb 29 13:00:58 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.133 2024/02/29 12:44:34 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.134 2024/02/29 13:00:58 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -12914,6 +12914,7 @@ distrib/sets/lists/debug/mi 1.427,1.42 distrib/sets/lists/debug/shl.mi 1.338 (patch) distrib/sets/lists/man/mi 1.1769,1.1771 (patch) doc/3RDPARTY (manually edited) +share/mk/bsd.prog.mk(apply patch) share/mk/bsd.sys.mk1.316 named(8): update to bind 9.18.24, which fixes several
CVS commit: [netbsd-9] src/share/mk
Module Name:src
Committed By: martin
Date: Thu Feb 29 13:00:14 UTC 2024
Modified Files:
src/share/mk [netbsd-9]: bsd.prog.mk bsd.sys.mk
Log Message:
Part of ticket #1804 accidently not commited
To generate a diff of this commit:
cvs rdiff -u -r1.319.2.3 -r1.319.2.4 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.292.2.1 -r1.292.2.2 src/share/mk/bsd.sys.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.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.319.2.3 src/share/mk/bsd.prog.mk:1.319.2.4
--- src/share/mk/bsd.prog.mk:1.319.2.3 Sun Sep 1 10:44:22 2019
+++ src/share/mk/bsd.prog.mk Thu Feb 29 13:00:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.319.2.3 2019/09/01 10:44:22 martin Exp $
+# $NetBSD: bsd.prog.mk,v 1.319.2.4 2024/02/29 13:00:14 martin Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -434,6 +434,10 @@ DPADD+= ${PROGDO.${_lib}}/lib${_lib}.a
.endif
.endfor
.endif # }
+
+LDADD+=${LDADD_AFTER}
+DPADD+=${DPADD_AFTER}
+
#
# Per-program definitions and targets.
#
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.292.2.1 src/share/mk/bsd.sys.mk:1.292.2.2
--- src/share/mk/bsd.sys.mk:1.292.2.1 Tue Dec 24 17:32:20 2019
+++ src/share/mk/bsd.sys.mk Thu Feb 29 13:00:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.292.2.1 2019/12/24 17:32:20 martin Exp $
+# $NetBSD: bsd.sys.mk,v 1.292.2.2 2024/02/29 13:00:14 martin Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -53,7 +53,7 @@ CXXFLAGS+= ${REPROFLAGS}
# NetBSD sources use C99 style, with some GCC extensions.
# Coverity does not like -std=gnu99
-.if !defined(COVERITY_TOP_CONFIG)
+.if !defined(COVERITY_TOP_CONFIG) && empty(CFLAGS:M*-std=*)
CFLAGS+= ${${ACTIVE_CC} == "clang":? -std=gnu99 :}
CFLAGS+= ${${ACTIVE_CC} == "gcc":? -std=gnu99 :}
CFLAGS+= ${${ACTIVE_CC} == "pcc":? -std=gnu99 :}
CVS commit: [netbsd-9] src/share/mk
Module Name:src Committed By: martin Date: Thu Feb 29 13:00:14 UTC 2024 Modified Files: src/share/mk [netbsd-9]: bsd.prog.mk bsd.sys.mk Log Message: Part of ticket #1804 accidently not commited To generate a diff of this commit: cvs rdiff -u -r1.319.2.3 -r1.319.2.4 src/share/mk/bsd.prog.mk cvs rdiff -u -r1.292.2.1 -r1.292.2.2 src/share/mk/bsd.sys.mk 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
Module Name:src Committed By: martin Date: Thu Feb 29 12:44:34 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #18003 and #1804 To generate a diff of this commit: cvs rdiff -u -r1.1.2.132 -r1.1.2.133 src/doc/CHANGES-9.4 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
Module Name:src Committed By: martin Date: Fri Feb 23 19:47:59 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1801 and #1802 To generate a diff of this commit: cvs rdiff -u -r1.1.2.131 -r1.1.2.132 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.131 src/doc/CHANGES-9.4:1.1.2.132 --- src/doc/CHANGES-9.4:1.1.2.131 Mon Feb 19 09:03:14 2024 +++ src/doc/CHANGES-9.4 Fri Feb 23 19:47:58 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.131 2024/02/19 09:03:14 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.132 2024/02/23 19:47:58 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -4174,3 +4174,20 @@ sys/arch/vax/vsa/vsbus.c 1.69 (patch) on netboot. [tsutsui, ticket #1800] +lib/libm/arch/x86_64/fenv.c 1.11 +tests/lib/libm/t_fenv.c1.14,1.15 + + libm: PR 57949: fix spurious side effects in fetestexcept. + [riastradh, ticket #1801] + +sys/dev/pci/if_wm.c 1.794-1.798 via patch +sys/dev/pci/if_wmreg.h 1.131 + +- Add RQDPC(Receive Queue Drop Packet Count) to iqdrops. +- Drop frames if the RX descriptor ring has no room on multiqueue + system. +- Improve dmesg output. + - Print RX packet buffer size. + - Fix the upper 16bit of Image Unique ID(EtrackID). + [msaitoh, ticket #1802] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Feb 23 19:47:59 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1801 and #1802 To generate a diff of this commit: cvs rdiff -u -r1.1.2.131 -r1.1.2.132 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
