CVS commit: src/sys/fs/cd9660
Module Name:src Committed By: tsutsui Date: Sat May 25 06:27:57 UTC 2024 Modified Files: src/sys/fs/cd9660: cd9660_util.c Log Message: Appease warnings on building tools/installboot on Cygwin. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/fs/cd9660/cd9660_util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/cd9660
Module Name:src Committed By: tsutsui Date: Sat May 25 06:27:57 UTC 2024 Modified Files: src/sys/fs/cd9660: cd9660_util.c Log Message: Appease warnings on building tools/installboot on Cygwin. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/fs/cd9660/cd9660_util.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/fs/cd9660/cd9660_util.c diff -u src/sys/fs/cd9660/cd9660_util.c:1.15 src/sys/fs/cd9660/cd9660_util.c:1.16 --- src/sys/fs/cd9660/cd9660_util.c:1.15 Sun May 19 15:41:53 2024 +++ src/sys/fs/cd9660/cd9660_util.c Sat May 25 06:27:57 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_util.c,v 1.15 2024/05/19 15:41:53 tsutsui Exp $ */ +/* $NetBSD: cd9660_util.c,v 1.16 2024/05/25 06:27:57 tsutsui Exp $ */ /*- * Copyright (c) 1994 @@ -38,7 +38,7 @@ #include #ifdef _KERNEL -__KERNEL_RCSID(0, "$NetBSD: cd9660_util.c,v 1.15 2024/05/19 15:41:53 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd9660_util.c,v 1.16 2024/05/25 06:27:57 tsutsui Exp $"); #else /* used by macppc_installboot */ #if HAVE_NBTOOL_CONFIG_H @@ -63,6 +63,10 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_util. #include #include #define KASSERT(x) assert(x) /* XXX for */ + +#if !HAVE_NBTOOL_CONFIG_H || HAVE_SYS_ENDIAN_H +#include /* for le16dec(9) etc. in iso.h */ +#endif #endif #include
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat May 25 00:00:25 UTC 2024
Modified Files:
src/usr.bin/make: cond.c dir.c for.c make.c make.h parse.c targ.c
test-variants.mk var.c
Log Message:
make: fix a few more memory leaks
To generate a diff of this commit:
cvs rdiff -u -r1.363 -r1.364 src/usr.bin/make/cond.c
cvs rdiff -u -r1.291 -r1.292 src/usr.bin/make/dir.c
cvs rdiff -u -r1.179 -r1.180 src/usr.bin/make/for.c
cvs rdiff -u -r1.262 -r1.263 src/usr.bin/make/make.c
cvs rdiff -u -r1.333 -r1.334 src/usr.bin/make/make.h
cvs rdiff -u -r1.723 -r1.724 src/usr.bin/make/parse.c
cvs rdiff -u -r1.181 -r1.182 src/usr.bin/make/targ.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/test-variants.mk
cvs rdiff -u -r1.1110 -r1. src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.363 src/usr.bin/make/cond.c:1.364
--- src/usr.bin/make/cond.c:1.363 Tue Apr 23 22:51:28 2024
+++ src/usr.bin/make/cond.c Sat May 25 00:00:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.363 2024/04/23 22:51:28 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.364 2024/05/25 00:00:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -91,7 +91,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.363 2024/04/23 22:51:28 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.364 2024/05/25 00:00:25 rillig Exp $");
/*
* Conditional expressions conform to this grammar:
@@ -736,8 +736,10 @@ CondParser_ComparisonOrLeaf(CondParser *
arg = ParseWord(&p, doEval);
assert(arg[0] != '\0');
- if (*p == '=' || *p == '!' || *p == '<' || *p == '>')
+ if (*p == '=' || *p == '!' || *p == '<' || *p == '>') {
+ free(arg);
return CondParser_Comparison(par, doEval);
+ }
par->p = p;
/*
Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.291 src/usr.bin/make/dir.c:1.292
--- src/usr.bin/make/dir.c:1.291 Fri May 24 22:52:24 2024
+++ src/usr.bin/make/dir.c Sat May 25 00:00:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.291 2024/05/24 22:52:24 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.292 2024/05/25 00:00:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -132,7 +132,7 @@
#include "job.h"
/* "@(#)dir.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: dir.c,v 1.291 2024/05/24 22:52:24 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.292 2024/05/25 00:00:25 rillig Exp $");
/*
* A search path is a list of CachedDir structures. A CachedDir has in it the
@@ -501,6 +501,18 @@ Dir_InitDot(void)
Dir_SetPATH(); /* initialize */
}
+#ifdef CLEANUP
+static void
+FreeCachedTable(HashTable *tbl)
+{
+ HashIter hi;
+ HashIter_Init(&hi, tbl);
+ while (HashIter_Next(&hi) != NULL)
+ free(hi.entry->value);
+ HashTable_Done(tbl);
+}
+#endif
+
/* Clean up the directories module. */
void
Dir_End(void)
@@ -511,8 +523,8 @@ Dir_End(void)
CachedDir_Assign(&dotLast, NULL);
SearchPath_Clear(&dirSearchPath);
OpenDirs_Done(&openDirs);
- HashTable_Done(&mtimes);
- HashTable_Done(&lmtimes);
+ FreeCachedTable(&mtimes);
+ FreeCachedTable(&lmtimes);
#endif
}
Index: src/usr.bin/make/for.c
diff -u src/usr.bin/make/for.c:1.179 src/usr.bin/make/for.c:1.180
--- src/usr.bin/make/for.c:1.179 Mon Apr 1 12:33:27 2024
+++ src/usr.bin/make/for.c Sat May 25 00:00:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.179 2024/04/01 12:33:27 rillig Exp $ */
+/* $NetBSD: for.c,v 1.180 2024/05/25 00:00:25 rillig Exp $ */
/*
* Copyright (c) 1992, The Regents of the University of California.
@@ -58,7 +58,7 @@
#include "make.h"
/* "@(#)for.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: for.c,v 1.179 2024/04/01 12:33:27 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.180 2024/05/25 00:00:25 rillig Exp $");
typedef struct ForLoop {
@@ -156,7 +156,8 @@ ForLoop_ParseVarnames(ForLoop *f, const
cpp_skip_whitespace(&p);
if (*p == '\0') {
Parse_Error(PARSE_FATAL, "missing `in' in for");
- f->vars.len = 0;
+ while (f->vars.len > 0)
+free(*(char **)Vector_Pop(&f->vars));
return;
}
@@ -166,7 +167,8 @@ ForLoop_ParseVarnames(ForLoop *f, const
"invalid character '%c' "
"in .for loop variable name",
p[len]);
-f->vars.len = 0;
+while (f->vars.len > 0)
+ free(*(char **)Vector_Pop(&f->vars));
return;
}
}
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.262 src/usr.bin/make/make.c:1.263
--- src/usr.bin/make/make.c:1.262 Fri Jan 5 23:22:06 2024
+++ src/usr.bin/make/make.c Sat May 25 00:00:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.262 2024/01/05 23:22:06 rillig Exp $ */
+/* $NetBSD: make.c,v 1.263 2024/05/25 00:00:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -104,7 +104,7 @@
#include "job.h"
/* "@(#)make.c 8.1 (Ber
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sat May 25 00:00:25 UTC 2024 Modified Files: src/usr.bin/make: cond.c dir.c for.c make.c make.h parse.c targ.c test-variants.mk var.c Log Message: make: fix a few more memory leaks To generate a diff of this commit: cvs rdiff -u -r1.363 -r1.364 src/usr.bin/make/cond.c cvs rdiff -u -r1.291 -r1.292 src/usr.bin/make/dir.c cvs rdiff -u -r1.179 -r1.180 src/usr.bin/make/for.c cvs rdiff -u -r1.262 -r1.263 src/usr.bin/make/make.c cvs rdiff -u -r1.333 -r1.334 src/usr.bin/make/make.h cvs rdiff -u -r1.723 -r1.724 src/usr.bin/make/parse.c cvs rdiff -u -r1.181 -r1.182 src/usr.bin/make/targ.c cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/test-variants.mk cvs rdiff -u -r1.1110 -r1. src/usr.bin/make/var.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Fri May 24 23:02:46 UTC 2024 Modified Files: src/usr.bin/make: main.c test-variants.mk var.c src/usr.bin/make/unit-tests: Makefile Log Message: make: in -DCLEANUP mode, free variables and their values The variables in the 3 scopes must be freed before the scopes themselves are freed by Targ_End. The test opt-m-include-dir creates a directory of the form '*.tmp', thus it must be removed before attempting to only remove regular files of this name. POSIX requires setenv to copy the passed name and value, so there is no need to keep that memory allocated any longer. To generate a diff of this commit: cvs rdiff -u -r1.616 -r1.617 src/usr.bin/make/main.c cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/test-variants.mk cvs rdiff -u -r1.1109 -r1.1110 src/usr.bin/make/var.c cvs rdiff -u -r1.344 -r1.345 src/usr.bin/make/unit-tests/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Fri May 24 23:02:46 UTC 2024
Modified Files:
src/usr.bin/make: main.c test-variants.mk var.c
src/usr.bin/make/unit-tests: Makefile
Log Message:
make: in -DCLEANUP mode, free variables and their values
The variables in the 3 scopes must be freed before the scopes themselves
are freed by Targ_End.
The test opt-m-include-dir creates a directory of the form '*.tmp', thus
it must be removed before attempting to only remove regular files of
this name.
POSIX requires setenv to copy the passed name and value, so there is no
need to keep that memory allocated any longer.
To generate a diff of this commit:
cvs rdiff -u -r1.616 -r1.617 src/usr.bin/make/main.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/test-variants.mk
cvs rdiff -u -r1.1109 -r1.1110 src/usr.bin/make/var.c
cvs rdiff -u -r1.344 -r1.345 src/usr.bin/make/unit-tests/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.616 src/usr.bin/make/main.c:1.617
--- src/usr.bin/make/main.c:1.616 Sun May 19 17:55:54 2024
+++ src/usr.bin/make/main.c Fri May 24 23:02:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.616 2024/05/19 17:55:54 sjg Exp $ */
+/* $NetBSD: main.c,v 1.617 2024/05/24 23:02:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.616 2024/05/19 17:55:54 sjg Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.617 2024/05/24 23:02:46 rillig Exp $");
#if defined(MAKE_NATIVE)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1583,9 +1583,9 @@ main_CleanUp(void)
meta_finish();
#endif
Suff_End();
+ Var_End();
Targ_End();
Arch_End();
- Var_End();
Parse_End();
Dir_End();
Job_End();
@@ -2119,6 +2119,7 @@ Main_ExportMAKEFLAGS(bool first)
/* TODO: handle errors */
if (flags[0] != '\0')
setenv("MAKEFLAGS", flags, 1);
+ free(flags);
}
char *
Index: src/usr.bin/make/test-variants.mk
diff -u src/usr.bin/make/test-variants.mk:1.6 src/usr.bin/make/test-variants.mk:1.7
--- src/usr.bin/make/test-variants.mk:1.6 Fri Mar 1 17:47:05 2024
+++ src/usr.bin/make/test-variants.mk Fri May 24 23:02:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: test-variants.mk,v 1.6 2024/03/01 17:47:05 rillig Exp $
+# $NetBSD: test-variants.mk,v 1.7 2024/05/24 23:02:46 rillig Exp $
#
# Build several variants of make and run the tests on them.
#
@@ -20,6 +20,11 @@ TESTS+= default
#SKIP.default= yes
#SKIP_TESTS.default= varmod-subst
+TESTS+= sanitize
+ENV.sanitize= MKSANITIZER=yes LIMIT_RESOURCES=:
+CPPFLAGS.sanitize= -DCLEANUP
+CFLAGS.sanitize= -O2 -ggdb
+
# Try a different compiler, with slightly different warnings and error
# messages. Clang has a few stricter checks than GCC, concerning enums
# and non-literal format strings.
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1109 src/usr.bin/make/var.c:1.1110
--- src/usr.bin/make/var.c:1.1109 Tue May 7 18:26:22 2024
+++ src/usr.bin/make/var.c Fri May 24 23:02:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1109 2024/05/07 18:26:22 sjg Exp $ */
+/* $NetBSD: var.c,v 1.1110 2024/05/24 23:02:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -132,7 +132,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1109 2024/05/07 18:26:22 sjg Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1110 2024/05/24 23:02:46 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -4753,11 +4753,32 @@ Var_Init(void)
SCOPE_CMDLINE = GNode_New("Command");
}
+#ifdef CLEANUP
+static void
+Var_DeleteAll(GNode *scope)
+{
+ for (;;) {
+ HashIter hi;
+ HashIter_Init(&hi, &scope->vars);
+ if (!HashIter_Next(&hi))
+ return;
+ ((Var *)hi.entry->value)->readOnly = false;
+ Var_Delete(scope, hi.entry->key);
+ }
+}
+
+#endif
+
/* Clean up the variables module. */
void
Var_End(void)
{
Var_Stats();
+#ifdef CLEANUP
+ Var_DeleteAll(SCOPE_CMDLINE);
+ Var_DeleteAll(SCOPE_GLOBAL);
+ Var_DeleteAll(SCOPE_INTERNAL);
+#endif
}
void
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.344 src/usr.bin/make/unit-tests/Makefile:1.345
--- src/usr.bin/make/unit-tests/Makefile:1.344 Tue Apr 30 16:41:32 2024
+++ src/usr.bin/make/unit-tests/Makefile Fri May 24 23:02:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.344 2024/04/30 16:41:32 sjg Exp $
+# $NetBSD: Makefile,v 1.345 2024/05/24 23:02:46 rillig Exp $
#
# Unit tests for make(1)
#
@@ -678,11 +678,11 @@ all: ${OUTFILES}
CLEANFILES= *.rawout *.out *.status *.tmp *.core *.tmp
CLEANFILES+= obj*.[och] lib*.a # posix1.mk
CLEANFILES+= issue* .[ab]* # suffixes.mk
-CLEANDIRS= dir dummy # posix1.mk
+CLEANDIRS= dir dummy *.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Fri May 24 22:54:07 UTC 2024 Modified Files: src/usr.bin/make: hash.c Log Message: make: remove dead code from HashTable_DeleteEntry To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/usr.bin/make/hash.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Fri May 24 22:52:25 UTC 2024 Modified Files: src/usr.bin/make: dir.c Log Message: make: remove trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.290 -r1.291 src/usr.bin/make/dir.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Fri May 24 22:52:25 UTC 2024
Modified Files:
src/usr.bin/make: dir.c
Log Message:
make: remove trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.290 -r1.291 src/usr.bin/make/dir.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.290 src/usr.bin/make/dir.c:1.291
--- src/usr.bin/make/dir.c:1.290 Mon May 20 19:14:12 2024
+++ src/usr.bin/make/dir.c Fri May 24 22:52:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.290 2024/05/20 19:14:12 sjg Exp $ */
+/* $NetBSD: dir.c,v 1.291 2024/05/24 22:52:24 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -132,7 +132,7 @@
#include "job.h"
/* "@(#)dir.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: dir.c,v 1.290 2024/05/20 19:14:12 sjg Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.291 2024/05/24 22:52:24 rillig Exp $");
/*
* A search path is a list of CachedDir structures. A CachedDir has in it the
@@ -568,7 +568,7 @@ Dir_SetSYSPATH(void)
CachedDirListNode *ln;
SearchPath *path = Lst_IsEmpty(&sysIncPath->dirs)
? defSysIncPath : sysIncPath;
-
+
Var_ReadOnly(".SYSPATH", false);
Global_Delete(".SYSPATH");
for (ln = path->dirs.first; ln != NULL; ln = ln->next) {
CVS commit: src/usr.sbin/inetd
Module Name:src Committed By: andvar Date: Fri May 24 21:55:13 UTC 2024 Modified Files: src/usr.sbin/inetd: inetd.8 Log Message: s/SO_ACCEPTFITLER/SO_ACCEPTFILTER/. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/usr.sbin/inetd/inetd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/inetd/inetd.8 diff -u src/usr.sbin/inetd/inetd.8:1.67 src/usr.sbin/inetd/inetd.8:1.68 --- src/usr.sbin/inetd/inetd.8:1.67 Tue Oct 12 22:47:18 2021 +++ src/usr.sbin/inetd/inetd.8 Fri May 24 21:55:13 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: inetd.8,v 1.67 2021/10/12 22:47:18 rillig Exp $ +.\" $NetBSD: inetd.8,v 1.68 2024/05/24 21:55:13 andvar Exp $ .\" .\" Copyright (c) 1998 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -481,7 +481,7 @@ An accept filter, equivalent to in positional notation (see .Xr accept_filter 9 and -.Dv SO_ACCEPTFITLER +.Dv SO_ACCEPTFILTER in .Xr setsockopt 2 ) . .It Sy protocol
CVS commit: src/usr.sbin/inetd
Module Name:src Committed By: andvar Date: Fri May 24 21:55:13 UTC 2024 Modified Files: src/usr.sbin/inetd: inetd.8 Log Message: s/SO_ACCEPTFITLER/SO_ACCEPTFILTER/. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/usr.sbin/inetd/inetd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/algor/algor
Module Name:src Committed By: andvar Date: Fri May 24 20:13:37 UTC 2024 Modified Files: src/sys/arch/algor/algor: algor_p4032reg.h Log Message: s/onbord/onboard/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/algor/algor/algor_p4032reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/algor/algor_p4032reg.h diff -u src/sys/arch/algor/algor/algor_p4032reg.h:1.3 src/sys/arch/algor/algor/algor_p4032reg.h:1.4 --- src/sys/arch/algor/algor/algor_p4032reg.h:1.3 Mon Apr 28 20:23:10 2008 +++ src/sys/arch/algor/algor/algor_p4032reg.h Fri May 24 20:13:37 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p4032reg.h,v 1.3 2008/04/28 20:23:10 martin Exp $ */ +/* $NetBSD: algor_p4032reg.h,v 1.4 2024/05/24 20:13:37 andvar Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ * Memory map and register definitions for the Algorithmics P-4032. */ -#define P4032_MEMORY 0xUL /* onbord DRAM memory */ +#define P4032_MEMORY 0xUL /* onboard DRAM memory */ /* 256 MB */ #define P4032_ISAMEM 0x1000UL /* ISA window of PCI memory */ /* 8MB */
CVS commit: src/sys/arch/algor/algor
Module Name:src Committed By: andvar Date: Fri May 24 20:13:37 UTC 2024 Modified Files: src/sys/arch/algor/algor: algor_p4032reg.h Log Message: s/onbord/onboard/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/algor/algor/algor_p4032reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/playstation2/dev
Module Name:src Committed By: andvar Date: Fri May 24 20:09:10 UTC 2024 Modified Files: src/sys/arch/playstation2/dev: emac3.c Log Message: s/boradcast/broadcast/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/playstation2/dev/emac3.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/playstation2/dev/emac3.c diff -u src/sys/arch/playstation2/dev/emac3.c:1.15 src/sys/arch/playstation2/dev/emac3.c:1.16 --- src/sys/arch/playstation2/dev/emac3.c:1.15 Fri Feb 11 23:49:19 2022 +++ src/sys/arch/playstation2/dev/emac3.c Fri May 24 20:09:09 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: emac3.c,v 1.15 2022/02/11 23:49:19 riastradh Exp $ */ +/* $NetBSD: emac3.c,v 1.16 2024/05/24 20:09:09 andvar Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: emac3.c,v 1.15 2022/02/11 23:49:19 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: emac3.c,v 1.16 2024/05/24 20:09:09 andvar Exp $"); #include "debug_playstation2.h" @@ -292,7 +292,7 @@ emac3_config(const u_int8_t *eaddr) RMR_SP | /* strip padding */ RMR_SFCS | /* strip FCS */ RMR_IAE | /* individual address enable */ - RMR_BAE); /* boradcast address enable */ + RMR_BAE); /* broadcast address enable */ /* TX mode */ _emac3_reg_write_4(EMAC3_TMR1,
CVS commit: src/sys/arch/playstation2/dev
Module Name:src Committed By: andvar Date: Fri May 24 20:09:10 UTC 2024 Modified Files: src/sys/arch/playstation2/dev: emac3.c Log Message: s/boradcast/broadcast/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/playstation2/dev/emac3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: andvar
Date: Fri May 24 20:06:55 UTC 2024
Modified Files:
src/sys/arch/evbmips/alchemy: omsal400.c
src/sys/arch/x68k/dev: ms.c
src/sys/dev/ic: advlib.c
Log Message:
s/borad/board/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbmips/alchemy/omsal400.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/x68k/dev/ms.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/advlib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/alchemy/omsal400.c
diff -u src/sys/arch/evbmips/alchemy/omsal400.c:1.11 src/sys/arch/evbmips/alchemy/omsal400.c:1.12
--- src/sys/arch/evbmips/alchemy/omsal400.c:1.11 Mon Aug 17 07:50:41 2020
+++ src/sys/arch/evbmips/alchemy/omsal400.c Fri May 24 20:06:55 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: omsal400.c,v 1.11 2020/08/17 07:50:41 simonb Exp $ */
+/* $NetBSD: omsal400.c,v 1.12 2024/05/24 20:06:55 andvar Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -36,7 +36,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: omsal400.c,v 1.11 2020/08/17 07:50:41 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omsal400.c,v 1.12 2024/05/24 20:06:55 andvar Exp $");
#include
#include
@@ -111,7 +111,7 @@ omsal400_init(void)
if (MIPS_PRID_COPTS(mips_options.mips_cpu_id) != MIPS_AU1550)
panic("omsal400: CPU not Au1550");
-#if 0 /* XXX: TODO borad identification */
+#if 0 /* XXX: TODO board identification */
/* check the whoami register for a match */
whoami = GET16(DBAU1550_WHOAMI);
Index: src/sys/arch/x68k/dev/ms.c
diff -u src/sys/arch/x68k/dev/ms.c:1.41 src/sys/arch/x68k/dev/ms.c:1.42
--- src/sys/arch/x68k/dev/ms.c:1.41 Sun Jan 7 07:58:33 2024
+++ src/sys/arch/x68k/dev/ms.c Fri May 24 20:06:55 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ms.c,v 1.41 2024/01/07 07:58:33 isaki Exp $ */
+/* $NetBSD: ms.c,v 1.42 2024/05/24 20:06:55 andvar Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.41 2024/01/07 07:58:33 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.42 2024/05/24 20:06:55 andvar Exp $");
#include
#include
@@ -650,7 +650,7 @@ ms_trigger(struct zs_chanstate *cs, int
cs->cs_creg[5] = cs->cs_preg[5];
zs_write_reg(cs, 5, cs->cs_preg[5]);
- /* for keyborad connected one */
+ /* for keyboard connected one */
mfp_send_usart(onoff | 0x40);
}
Index: src/sys/dev/ic/advlib.c
diff -u src/sys/dev/ic/advlib.c:1.30 src/sys/dev/ic/advlib.c:1.31
--- src/sys/dev/ic/advlib.c:1.30 Sun Sep 25 18:43:32 2022
+++ src/sys/dev/ic/advlib.c Fri May 24 20:06:55 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: advlib.c,v 1.30 2022/09/25 18:43:32 thorpej Exp $*/
+/* $NetBSD: advlib.c,v 1.31 2024/05/24 20:06:55 andvar Exp $*/
/*
* Low level routines for the Advanced Systems Inc. SCSI controllers chips
@@ -46,7 +46,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.30 2022/09/25 18:43:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.31 2024/05/24 20:06:55 andvar Exp $");
#include
#include
@@ -203,7 +203,7 @@ static int AscRiscHaltedAbortTIX(ASC_SOF
/* Error Handling routines */
static int AscSetLibErrorCode(ASC_SOFTC *, u_int16_t);
-/* Handle bugged borads routines */
+/* Handle bugged boards routines */
static int AscTagQueuingSafe(ASC_SCSI_INQUIRY *);
static void AscAsyncFix(ASC_SOFTC *, u_int8_t, ASC_SCSI_INQUIRY *);
@@ -228,7 +228,7 @@ static void DvcDelayNanoSecond(u_int32_t
* This function perform the following steps:
* - initialize ASC_SOFTC structure with defaults values.
* - inquire board registers to know what kind of board it is.
- * - keep track of bugged borads.
+ * - keep track of bugged boards.
*/
void
AscInitASC_SOFTC(ASC_SOFTC *sc)
@@ -3002,7 +3002,7 @@ AscSetLibErrorCode(ASC_SOFTC *sc, u_int1
/**/
-/*Handle bugged borads routines */
+/*Handle bugged boards routines */
/**/
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Fri May 24 20:06:55 UTC 2024 Modified Files: src/sys/arch/evbmips/alchemy: omsal400.c src/sys/arch/x68k/dev: ms.c src/sys/dev/ic: advlib.c Log Message: s/borad/board/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbmips/alchemy/omsal400.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/x68k/dev/ms.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/advlib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/pmax/pmax
Module Name:src Committed By: rillig Date: Fri May 24 19:00:28 UTC 2024 Modified Files: src/sys/arch/pmax/pmax: kn230.h Log Message: pmax/kn230.h: fix typos and spacing in comments To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/pmax/pmax/kn230.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/pmax/pmax/kn230.h diff -u src/sys/arch/pmax/pmax/kn230.h:1.4 src/sys/arch/pmax/pmax/kn230.h:1.5 --- src/sys/arch/pmax/pmax/kn230.h:1.4 Thu May 23 08:52:06 2024 +++ src/sys/arch/pmax/pmax/kn230.h Fri May 24 19:00:27 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: kn230.h,v 1.4 2024/05/23 08:52:06 andvar Exp $ */ +/* $NetBSD: kn230.h,v 1.5 2024/05/24 19:00:27 rillig Exp $ */ /* * Copyright (c) 1997,1998 Jonathan Stone. @@ -35,17 +35,17 @@ /* * Physical addresses of baseboard devices and registers on the - * the DECstation 5100 motherboard (also known as the kn230). + * DECstation 5100 motherboard (also known as the kn230). * * The only options on the kn230 are two slots for daughterboards. * Each slot can contain an extra four-port dc708x DZ11 clone chip. - * Most baseborad chips are the same hardware and at the same - * address as the DECstation 3100 (kn01), except: + * Most baseboard chips are the same hardware and at the same + * address as the DECstation 3100 (kn01), except: * * The kn230 has more devices than the 3100, so instead * of hardwiring each device to a CPU interrupt line, - * the kn230 provides an interrupt-request register (ICSR). - * Devices are mapped onto CPU interrupt lines as below: + * the kn230 provides an interrupt-request register (ICSR). + * Devices are mapped onto CPU interrupt lines as below: * hardint 5: fpu * hardint 4: reset switch * hardint 3: memory error (write to nonexistent memory) @@ -75,7 +75,7 @@ /* * Interrupt-request bitmasks in the low-order 16 bits of the CSR. - * If a bit is set, the corresponding device has an interrupt condition. + * If a bit is set, the corresponding device has an interrupt condition. * There is no equivalent per-device interrupt masking register. * (note: these were LED control bits in the kn01). */ @@ -88,7 +88,7 @@ #define KN230_CSR_INTR_DZ0 0x0100 /* baseboard DZ */ /* - * kn230 LED control register. + * kn230 LED control register. * Writing a 1 bit to any bit turns off the corresponding LED. * low bits are or'ed to control registers which have side effects. * @@ -156,7 +156,7 @@ /* * NVRAM state definitions. - * Used under Ultrix for PrestoServe. + * Used under Ultrix for PrestoServe. */ #define KN230_SYS_NVRAM_DIAG 0x1f000300 /* NVRAM diagnostic register */ #define KN230_NVRAM_PRESENT 0x0001 @@ -169,7 +169,7 @@ /* * NVRAM has separate control and status registers for each of * the two motherboard SIMM banks (even and odd), - * located at offsets from the value at value at SYS_NVRAM_ADDR. + * located at offsets from the value at SYS_NVRAM_ADDR. */ # define KN230_SYS_NVRAM_EVENBNK_STATUS_OFFSET (0x20) # define KN230_SYS_NVRAM_ODDBNK_STATUS_OFFSET (0x20 +4) @@ -180,8 +180,8 @@ #define KN230_NVRAM_BATFAIL 0x0001 /* battery failure */ #define KN230_NVRAM_BATKILL 0x0002 /* battery kill */ /* - * To enable the battery, write 0x00 to each nvram control reg. + * To enable the battery, write 0x00 to each nvram control reg. * To disable the battery, write the sequence - *0x01, 0x01, 0x00, 0x00, 0x01 + *0x01, 0x01, 0x00, 0x00, 0x01 * to both per-bank control registers (do banks in parallel, not in sequence). */
CVS commit: src/sys/arch/pmax/pmax
Module Name:src Committed By: rillig Date: Fri May 24 19:00:28 UTC 2024 Modified Files: src/sys/arch/pmax/pmax: kn230.h Log Message: pmax/kn230.h: fix typos and spacing in comments To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/pmax/pmax/kn230.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri May 24 16:10:21 UTC 2024 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: dhcpcd-10.0.8 To generate a diff of this commit: cvs rdiff -u -r1.2005 -r1.2006 src/doc/3RDPARTY cvs rdiff -u -r1.3059 -r1.3060 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.2005 src/doc/3RDPARTY:1.2006 --- src/doc/3RDPARTY:1.2005 Fri May 24 11:33:04 2024 +++ src/doc/3RDPARTY Fri May 24 16:10:21 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.2005 2024/05/24 11:33:04 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.2006 2024/05/24 16:10:21 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -354,8 +354,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 10.0.7 -Current Vers: 10.0.7 +Version: 10.0.8 +Current Vers: 10.0.8 Maintainer: roy Archive Site: https://github.com/NetworkConfiguration/dhcpcd/releases Home Page: https://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.3059 src/doc/CHANGES:1.3060 --- src/doc/CHANGES:1.3059 Fri May 24 11:33:04 2024 +++ src/doc/CHANGES Fri May 24 16:10:21 2024 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3059 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3060 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -411,5 +411,5 @@ Changes from NetBSD 10.0 to NetBSD 11.0: functions. [uwe 20240517] hp300: Installation CD ISO image is now bootable. [tsutsui 20240519] tic(1): Honour the user's umask (from RVP). [christos 20240520] - dhcpcd: Import version 10.0.7. [roy 20240524] + dhcpcd: Import version 10.0.8. [roy 20240524]
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri May 24 16:10:21 UTC 2024 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: dhcpcd-10.0.8 To generate a diff of this commit: cvs rdiff -u -r1.2005 -r1.2006 src/doc/3RDPARTY cvs rdiff -u -r1.3059 -r1.3060 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/dhcpcd/dist/src
Module Name:src
Committed By: roy
Date: Fri May 24 16:09:09 UTC 2024
Modified Files:
src/external/bsd/dhcpcd/dist/src: dhcp6.c dhcpcd.c
Log Message:
Sync with dhcpcd-10.0.8
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/external/bsd/dhcpcd/dist/src/dhcp6.c
cvs rdiff -u -r1.55 -r1.56 src/external/bsd/dhcpcd/dist/src/dhcpcd.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/bsd/dhcpcd/dist/src/dhcp6.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp6.c:1.33 src/external/bsd/dhcpcd/dist/src/dhcp6.c:1.34
--- src/external/bsd/dhcpcd/dist/src/dhcp6.c:1.33 Fri May 24 11:30:29 2024
+++ src/external/bsd/dhcpcd/dist/src/dhcp6.c Fri May 24 16:09:09 2024
@@ -3494,7 +3494,7 @@ dhcp6_recvif(struct interface *ifp, cons
* To keep the same behaviour we won't do anything with
* this. In the future we should make a lists of
* ADVERTS and pick the "best" one. */
- logdebugx("%s: discarding ADVERTISMENT from %s",
+ logdebugx("%s: discarding ADVERTISEMENT from %s",
ifp->name, sfrom);
return;
}
Index: src/external/bsd/dhcpcd/dist/src/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.55 src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.56
--- src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.55 Fri May 24 11:30:29 2024
+++ src/external/bsd/dhcpcd/dist/src/dhcpcd.c Fri May 24 16:09:09 2024
@@ -423,8 +423,8 @@ dhcpcd_drop_af(struct interface *ifp, in
#endif
#ifdef ARP
arp_drop(ifp);
- }
#endif
+ }
#if !defined(DHCP6) && !defined(DHCP)
UNUSED(stop);
CVS commit: src/external/bsd/dhcpcd/dist/src
Module Name:src Committed By: roy Date: Fri May 24 16:09:09 UTC 2024 Modified Files: src/external/bsd/dhcpcd/dist/src: dhcp6.c dhcpcd.c Log Message: Sync with dhcpcd-10.0.8 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/external/bsd/dhcpcd/dist/src/dhcp6.c cvs rdiff -u -r1.55 -r1.56 src/external/bsd/dhcpcd/dist/src/dhcpcd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri May 24 16:08:09 UTC 2024 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6739 Log Message: Update to dhcpcd-10.0.8 with the following fixes: * Fixed compile without ARP * Fixed spelling of ADVERTISEMENT Status: Vendor Tag: ROY Release Tags: dhcpcd-10_0_8 U src/external/bsd/dhcpcd/dist/LICENSE U src/external/bsd/dhcpcd/dist/README.md U src/external/bsd/dhcpcd/dist/src/defs.h U src/external/bsd/dhcpcd/dist/src/common.c U src/external/bsd/dhcpcd/dist/src/control.c C src/external/bsd/dhcpcd/dist/src/dhcpcd.c U src/external/bsd/dhcpcd/dist/src/duid.c U src/external/bsd/dhcpcd/dist/src/eloop.c U src/external/bsd/dhcpcd/dist/src/logerr.c U src/external/bsd/dhcpcd/dist/src/if.c U src/external/bsd/dhcpcd/dist/src/if-options.c U src/external/bsd/dhcpcd/dist/src/sa.c U src/external/bsd/dhcpcd/dist/src/route.c U src/external/bsd/dhcpcd/dist/src/dhcp-common.c U src/external/bsd/dhcpcd/dist/src/script.c U src/external/bsd/dhcpcd/dist/src/auth.c U src/external/bsd/dhcpcd/dist/src/if-bsd.c U src/external/bsd/dhcpcd/dist/src/dhcp.c U src/external/bsd/dhcpcd/dist/src/ipv4.c U src/external/bsd/dhcpcd/dist/src/bpf.c U src/external/bsd/dhcpcd/dist/src/arp.c U src/external/bsd/dhcpcd/dist/src/ipv4ll.c U src/external/bsd/dhcpcd/dist/src/ipv6.c U src/external/bsd/dhcpcd/dist/src/ipv6nd.c C src/external/bsd/dhcpcd/dist/src/dhcp6.c U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c U src/external/bsd/dhcpcd/dist/src/privsep.c U src/external/bsd/dhcpcd/dist/src/privsep-root.c U src/external/bsd/dhcpcd/dist/src/privsep-control.c U src/external/bsd/dhcpcd/dist/src/privsep-inet.c U src/external/bsd/dhcpcd/dist/src/privsep-bpf.c U src/external/bsd/dhcpcd/dist/src/privsep-bsd.c U src/external/bsd/dhcpcd/dist/src/common.h U src/external/bsd/dhcpcd/dist/src/control.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.h U src/external/bsd/dhcpcd/dist/src/duid.h U src/external/bsd/dhcpcd/dist/src/eloop.h U src/external/bsd/dhcpcd/dist/src/logerr.h U src/external/bsd/dhcpcd/dist/src/if.h U src/external/bsd/dhcpcd/dist/src/if-options.h U src/external/bsd/dhcpcd/dist/src/sa.h U src/external/bsd/dhcpcd/dist/src/route.h U src/external/bsd/dhcpcd/dist/src/dhcp-common.h U src/external/bsd/dhcpcd/dist/src/script.h U src/external/bsd/dhcpcd/dist/src/auth.h U src/external/bsd/dhcpcd/dist/src/dhcp.h U src/external/bsd/dhcpcd/dist/src/ipv4.h U src/external/bsd/dhcpcd/dist/src/bpf.h U src/external/bsd/dhcpcd/dist/src/arp.h U src/external/bsd/dhcpcd/dist/src/ipv4ll.h U src/external/bsd/dhcpcd/dist/src/ipv6.h U src/external/bsd/dhcpcd/dist/src/ipv6nd.h U src/external/bsd/dhcpcd/dist/src/dhcp6.h U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/src/privsep.h U src/external/bsd/dhcpcd/dist/src/privsep-root.h U src/external/bsd/dhcpcd/dist/src/privsep-control.h U src/external/bsd/dhcpcd/dist/src/privsep-inet.h U src/external/bsd/dhcpcd/dist/src/privsep-bpf.h U src/external/bsd/dhcpcd/dist/src/dev.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5 U src/external/bsd/dhcpcd/dist/src/dhcpcd.8 U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8 U src/external/bsd/dhcpcd/dist/hooks/01-test U src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/hooks/30-hostname U src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/hooks/15-timezone U src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/hooks/50-ypbind 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jROY:yesterday -jROY src/external/bsd/dhcpcd/dist
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri May 24 16:08:09 UTC 2024 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6739 Log Message: Update to dhcpcd-10.0.8 with the following fixes: * Fixed compile without ARP * Fixed spelling of ADVERTISEMENT Status: Vendor Tag: ROY Release Tags: dhcpcd-10_0_8 U src/external/bsd/dhcpcd/dist/LICENSE U src/external/bsd/dhcpcd/dist/README.md U src/external/bsd/dhcpcd/dist/src/defs.h U src/external/bsd/dhcpcd/dist/src/common.c U src/external/bsd/dhcpcd/dist/src/control.c C src/external/bsd/dhcpcd/dist/src/dhcpcd.c U src/external/bsd/dhcpcd/dist/src/duid.c U src/external/bsd/dhcpcd/dist/src/eloop.c U src/external/bsd/dhcpcd/dist/src/logerr.c U src/external/bsd/dhcpcd/dist/src/if.c U src/external/bsd/dhcpcd/dist/src/if-options.c U src/external/bsd/dhcpcd/dist/src/sa.c U src/external/bsd/dhcpcd/dist/src/route.c U src/external/bsd/dhcpcd/dist/src/dhcp-common.c U src/external/bsd/dhcpcd/dist/src/script.c U src/external/bsd/dhcpcd/dist/src/auth.c U src/external/bsd/dhcpcd/dist/src/if-bsd.c U src/external/bsd/dhcpcd/dist/src/dhcp.c U src/external/bsd/dhcpcd/dist/src/ipv4.c U src/external/bsd/dhcpcd/dist/src/bpf.c U src/external/bsd/dhcpcd/dist/src/arp.c U src/external/bsd/dhcpcd/dist/src/ipv4ll.c U src/external/bsd/dhcpcd/dist/src/ipv6.c U src/external/bsd/dhcpcd/dist/src/ipv6nd.c C src/external/bsd/dhcpcd/dist/src/dhcp6.c U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c U src/external/bsd/dhcpcd/dist/src/privsep.c U src/external/bsd/dhcpcd/dist/src/privsep-root.c U src/external/bsd/dhcpcd/dist/src/privsep-control.c U src/external/bsd/dhcpcd/dist/src/privsep-inet.c U src/external/bsd/dhcpcd/dist/src/privsep-bpf.c U src/external/bsd/dhcpcd/dist/src/privsep-bsd.c U src/external/bsd/dhcpcd/dist/src/common.h U src/external/bsd/dhcpcd/dist/src/control.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.h U src/external/bsd/dhcpcd/dist/src/duid.h U src/external/bsd/dhcpcd/dist/src/eloop.h U src/external/bsd/dhcpcd/dist/src/logerr.h U src/external/bsd/dhcpcd/dist/src/if.h U src/external/bsd/dhcpcd/dist/src/if-options.h U src/external/bsd/dhcpcd/dist/src/sa.h U src/external/bsd/dhcpcd/dist/src/route.h U src/external/bsd/dhcpcd/dist/src/dhcp-common.h U src/external/bsd/dhcpcd/dist/src/script.h U src/external/bsd/dhcpcd/dist/src/auth.h U src/external/bsd/dhcpcd/dist/src/dhcp.h U src/external/bsd/dhcpcd/dist/src/ipv4.h U src/external/bsd/dhcpcd/dist/src/bpf.h U src/external/bsd/dhcpcd/dist/src/arp.h U src/external/bsd/dhcpcd/dist/src/ipv4ll.h U src/external/bsd/dhcpcd/dist/src/ipv6.h U src/external/bsd/dhcpcd/dist/src/ipv6nd.h U src/external/bsd/dhcpcd/dist/src/dhcp6.h U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/src/privsep.h U src/external/bsd/dhcpcd/dist/src/privsep-root.h U src/external/bsd/dhcpcd/dist/src/privsep-control.h U src/external/bsd/dhcpcd/dist/src/privsep-inet.h U src/external/bsd/dhcpcd/dist/src/privsep-bpf.h U src/external/bsd/dhcpcd/dist/src/dev.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5 U src/external/bsd/dhcpcd/dist/src/dhcpcd.8 U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8 U src/external/bsd/dhcpcd/dist/hooks/01-test U src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/hooks/30-hostname U src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/hooks/15-timezone U src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/hooks/50-ypbind 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jROY:yesterday -jROY src/external/bsd/dhcpcd/dist
CVS commit: src/sys/sys
Module Name:src Committed By: ryoon Date: Fri May 24 13:50:30 UTC 2024 Modified Files: src/sys/sys: ucontext.h Log Message: Move __UCONTEXT_SIZE inside _KERNEL like before Fix pkgsrc/lang/rust runtime SIGILL error during pkgsrc/www/firefox build. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/sys/ucontext.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src
Committed By: ryoon
Date: Fri May 24 13:50:30 UTC 2024
Modified Files:
src/sys/sys: ucontext.h
Log Message:
Move __UCONTEXT_SIZE inside _KERNEL like before
Fix pkgsrc/lang/rust runtime SIGILL error during pkgsrc/www/firefox build.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/sys/ucontext.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/ucontext.h
diff -u src/sys/sys/ucontext.h:1.22 src/sys/sys/ucontext.h:1.23
--- src/sys/sys/ucontext.h:1.22 Sat May 18 01:21:42 2024
+++ src/sys/sys/ucontext.h Fri May 24 13:50:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ucontext.h,v 1.22 2024/05/18 01:21:42 thorpej Exp $ */
+/* $NetBSD: ucontext.h,v 1.23 2024/05/24 13:50:30 ryoon Exp $ */
/*-
* Copyright (c) 1999, 2003, 2024 The NetBSD Foundation, Inc.
@@ -82,12 +82,6 @@ struct __ucontext {
#define _UC_UCONTEXT_ALIGN (~0)
#endif
-#ifdef __UCONTEXT_SIZE
-__CTASSERT(sizeof(ucontext_t) == __UCONTEXT_SIZE);
-#else
-#define __UCONTEXT_SIZE sizeof(ucontext_t)
-#endif
-
#ifndef _UC_TLSBASE
#error _UC_TLSBASE not defined.
#endif
@@ -108,6 +102,12 @@ int setucontext(struct lwp *, const ucon
void cpu_getmcontext(struct lwp *, mcontext_t *, unsigned int *);
int cpu_setmcontext(struct lwp *, const mcontext_t *, unsigned int);
int cpu_mcontext_validate(struct lwp *, const mcontext_t *);
+
+#ifdef __UCONTEXT_SIZE
+__CTASSERT(sizeof(ucontext_t) == __UCONTEXT_SIZE);
+#else
+#define __UCONTEXT_SIZE sizeof(ucontext_t)
+#endif
#endif /* _KERNEL */
#endif /* !_SYS_UCONTEXT_H_ */
CVS commit: src/distrib/emips
Module Name:src Committed By: tsutsui Date: Fri May 24 13:26:36 UTC 2024 Modified Files: src/distrib/emips/cdroms/installcd: Makefile src/distrib/emips/instkernel: Makefile src/distrib/emips/miniroot: Makefile.inc Log Message: Remove installboot(8) calls against emips install media. XXX: maybe we should also remove blindly copied bootxx binaries. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/emips/cdroms/installcd/Makefile cvs rdiff -u -r1.5 -r1.6 src/distrib/emips/instkernel/Makefile cvs rdiff -u -r1.4 -r1.5 src/distrib/emips/miniroot/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/emips
Module Name:src
Committed By: tsutsui
Date: Fri May 24 13:26:36 UTC 2024
Modified Files:
src/distrib/emips/cdroms/installcd: Makefile
src/distrib/emips/instkernel: Makefile
src/distrib/emips/miniroot: Makefile.inc
Log Message:
Remove installboot(8) calls against emips install media.
XXX: maybe we should also remove blindly copied bootxx binaries.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/emips/cdroms/installcd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/distrib/emips/instkernel/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/emips/miniroot/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/emips/cdroms/installcd/Makefile
diff -u src/distrib/emips/cdroms/installcd/Makefile:1.4 src/distrib/emips/cdroms/installcd/Makefile:1.5
--- src/distrib/emips/cdroms/installcd/Makefile:1.4 Mon Sep 23 13:42:31 2019
+++ src/distrib/emips/cdroms/installcd/Makefile Fri May 24 13:26:35 2024
@@ -1,12 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2019/09/23 13:42:31 christos Exp $
+# $NetBSD: Makefile,v 1.5 2024/05/24 13:26:35 tsutsui Exp $
CDBASE= emipscd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDKERNELS= netbsd-INSTALL.gz netbsd
CDINSTKERNEL= ../../instkernel
-#make the CD bootable
-image_md_post:
- ${TOOL_INSTALLBOOT} -m${MACHINE} ${CDIMAGE} bootxx.${MACHINE}
-
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/emips/instkernel/Makefile
diff -u src/distrib/emips/instkernel/Makefile:1.5 src/distrib/emips/instkernel/Makefile:1.6
--- src/distrib/emips/instkernel/Makefile:1.5 Fri Jun 14 16:34:31 2019
+++ src/distrib/emips/instkernel/Makefile Fri May 24 13:26:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/06/14 16:34:31 martin Exp $
+# $NetBSD: Makefile,v 1.6 2024/05/24 13:26:35 tsutsui Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -10,9 +10,7 @@ IMAGESIZE= 2600k
LISTS= ${.CURDIR}/list
MTREECONF= ${DISTRIBDIR}/common/mtree.dot
IMAGEENDIAN= be
-PRIMARYBOOT= ${DESTDIR}/usr/mdec/bootxx_ffs
-IMAGEDEPENDS= netbsd-INSTALL.gz ${DESTDIR}/usr/mdec/boot.emips ${PRIMARYBOOT}
-IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} ${PRIMARYBOOT}
+IMAGEDEPENDS= netbsd-INSTALL.gz ${DESTDIR}/usr/mdec/boot.emips
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
Index: src/distrib/emips/miniroot/Makefile.inc
diff -u src/distrib/emips/miniroot/Makefile.inc:1.4 src/distrib/emips/miniroot/Makefile.inc:1.5
--- src/distrib/emips/miniroot/Makefile.inc:1.4 Tue Jan 24 18:04:01 2017
+++ src/distrib/emips/miniroot/Makefile.inc Fri May 24 13:26:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2017/01/24 18:04:01 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2024/05/24 13:26:35 tsutsui Exp $
DBG= -Os
@@ -12,5 +12,3 @@ IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \
${DESTDIR}/.profile ${DESTDIR}/boot.emips \
${DESTDIR}/etc/disktab \
${KERNOBJDIR}/GENERIC/netbsd
-
-IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} ${DESTDIR}/usr/mdec/bootxx_ffs
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri May 24 11:33:04 UTC 2024 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-10.0.7 To generate a diff of this commit: cvs rdiff -u -r1.2004 -r1.2005 src/doc/3RDPARTY cvs rdiff -u -r1.3058 -r1.3059 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri May 24 11:33:04 UTC 2024 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-10.0.7 To generate a diff of this commit: cvs rdiff -u -r1.2004 -r1.2005 src/doc/3RDPARTY cvs rdiff -u -r1.3058 -r1.3059 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.2004 src/doc/3RDPARTY:1.2005 --- src/doc/3RDPARTY:1.2004 Wed May 8 09:52:07 2024 +++ src/doc/3RDPARTY Fri May 24 11:33:04 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.2004 2024/05/08 09:52:07 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.2005 2024/05/24 11:33:04 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -354,13 +354,13 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 10.0.6 -Current Vers: 10.0.6 +Version: 10.0.7 +Current Vers: 10.0.7 Maintainer: roy Archive Site: https://github.com/NetworkConfiguration/dhcpcd/releases Home Page: https://roy.marples.name/projects/dhcpcd/ Home Page: https://github.com/NetworkConfiguration/dhcpcd -Date: 2023-12-18 +Date: 2024-05-24 License: BSD (2-clause) Location: external/bsd/dhcpcd/dist Notes: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.3058 src/doc/CHANGES:1.3059 --- src/doc/CHANGES:1.3058 Tue May 21 15:35:18 2024 +++ src/doc/CHANGES Fri May 24 11:33:04 2024 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3058 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3059 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -411,3 +411,5 @@ Changes from NetBSD 10.0 to NetBSD 11.0: functions. [uwe 20240517] hp300: Installation CD ISO image is now bootable. [tsutsui 20240519] tic(1): Honour the user's umask (from RVP). [christos 20240520] + dhcpcd: Import version 10.0.7. [roy 20240524] +
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src
Committed By: roy
Date: Fri May 24 11:30:29 UTC 2024
Modified Files:
src/external/bsd/dhcpcd/dist/hooks: 30-hostname
src/external/bsd/dhcpcd/dist/src: dhcp.c dhcp6.c dhcpcd.c if-bsd.c
if-options.c ipv6.c ipv6nd.c logerr.c privsep.c
Log Message:
Sync with dhcpcd-10.0.7
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/hooks/30-hostname
cvs rdiff -u -r1.50 -r1.51 src/external/bsd/dhcpcd/dist/src/dhcp.c
cvs rdiff -u -r1.32 -r1.33 src/external/bsd/dhcpcd/dist/src/dhcp6.c
cvs rdiff -u -r1.54 -r1.55 src/external/bsd/dhcpcd/dist/src/dhcpcd.c
cvs rdiff -u -r1.30 -r1.31 src/external/bsd/dhcpcd/dist/src/if-bsd.c \
src/external/bsd/dhcpcd/dist/src/ipv6nd.c
cvs rdiff -u -r1.36 -r1.37 src/external/bsd/dhcpcd/dist/src/if-options.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/dhcpcd/dist/src/ipv6.c \
src/external/bsd/dhcpcd/dist/src/privsep.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/dhcpcd/dist/src/logerr.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/bsd/dhcpcd/dist/hooks/30-hostname
diff -u src/external/bsd/dhcpcd/dist/hooks/30-hostname:1.6 src/external/bsd/dhcpcd/dist/hooks/30-hostname:1.7
--- src/external/bsd/dhcpcd/dist/hooks/30-hostname:1.6 Fri Apr 21 16:54:26 2023
+++ src/external/bsd/dhcpcd/dist/hooks/30-hostname Fri May 24 11:30:29 2024
@@ -118,7 +118,7 @@ set_hostname()
*) hshort=true;;
esac
- need_hostname || return
+ need_hostname || return 0
if [ -n "$new_fqdn" ]; then
if ${hfqdn} || ! ${hshort}; then
Index: src/external/bsd/dhcpcd/dist/src/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp.c:1.50 src/external/bsd/dhcpcd/dist/src/dhcp.c:1.51
--- src/external/bsd/dhcpcd/dist/src/dhcp.c:1.50 Mon Dec 18 15:51:28 2023
+++ src/external/bsd/dhcpcd/dist/src/dhcp.c Fri May 24 11:30:29 2024
@@ -1877,13 +1877,13 @@ dhcp_discover(void *arg)
dhcp_new_xid(ifp);
eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
if (!(state->added & STATE_EXPIRED)) {
- if (ifo->fallback)
+ if (ifo->fallback && ifo->fallback_time)
eloop_timeout_add_sec(ifp->ctx->eloop,
- ifo->reboot, dhcp_fallback, ifp);
+ ifo->fallback_time, dhcp_fallback, ifp);
#ifdef IPV4LL
else if (ifo->options & DHCPCD_IPV4LL)
eloop_timeout_add_sec(ifp->ctx->eloop,
- ifo->reboot, ipv4ll_start, ifp);
+ ifo->ipv4ll_time, ipv4ll_start, ifp);
#endif
}
if (ifo->options & DHCPCD_REQUEST)
@@ -1914,11 +1914,13 @@ dhcp_request(void *arg)
{
struct interface *ifp = arg;
struct dhcp_state *state = D_STATE(ifp);
+ struct if_options *ifo = ifp->options;
state->state = DHS_REQUEST;
// Handle the server being silent to our request.
- eloop_timeout_add_sec(ifp->ctx->eloop, ifp->options->reboot,
- dhcp_requestfailed, ifp);
+ if (ifo->request_time != 0)
+ eloop_timeout_add_sec(ifp->ctx->eloop, ifo->request_time,
+ dhcp_requestfailed, ifp);
send_request(ifp);
}
@@ -1944,7 +1946,11 @@ dhcp_expire(void *arg)
static void
dhcp_decline(struct interface *ifp)
{
+ struct dhcp_state *state = D_STATE(ifp);
+ // Set the expired state so we send over BPF as this could be
+ // an address defence failure.
+ state->added |= STATE_EXPIRED;
send_message(ifp, DHCP_DECLINE, NULL);
}
#endif
@@ -2098,8 +2104,12 @@ static void
dhcp_arp_defend_failed(struct arp_state *astate)
{
struct interface *ifp = astate->iface;
+ struct dhcp_state *state = D_STATE(ifp);
+ if (!(ifp->options->options & (DHCPCD_INFORM | DHCPCD_STATIC)))
+ dhcp_decline(ifp);
dhcp_drop(ifp, "EXPIRED");
+ dhcp_unlink(ifp->ctx, state->leasefile);
dhcp_start1(ifp);
}
#endif
@@ -2740,7 +2750,7 @@ dhcp_reboot(struct interface *ifp)
/* Need to add this before dhcp_expire and friends. */
if (!ifo->fallback && ifo->options & DHCPCD_IPV4LL)
eloop_timeout_add_sec(ifp->ctx->eloop,
- ifo->reboot, ipv4ll_start, ifp);
+ ifo->ipv4ll_time, ipv4ll_start, ifp);
#endif
if (ifo->options & DHCPCD_LASTLEASE && state->lease.frominfo)
@@ -3199,8 +3209,8 @@ dhcp_handledhcp(struct interface *ifp, s
if (has_option_mask(ifo->requestmask, DHO_IPV6_PREFERRED_ONLY)) {
if (get_option_uint32(ifp->ctx, &v6only_time, bootp, bootp_len,
- DHO_IPV6_PREFERRED_ONLY) == 0 &&
- (state->state == DHS_DISCOVER || state->state == DHS_REBOOT))
+ DHO_IPV6_PREFERRED_ONLY) == 0 && (state->state == DHS_DISCOVER ||
+ state->state == DHS_REBOOT || state->state == DHS_NONE))
{
char v6msg[128];
@@ -3524,12 +3534,6 @@ dhcp_handlebootp(struct interface *ifp,
{
size_t v;
- if (len < offsetof(struct bootp, vend)) {
- logerrx("%s: truncated packet (%zu) from %s",
- ifp->name, len, inet_ntoa(*from));
- return;
- }
-
/* Unlikely, but appeases sanitizers. */
if (len > FRAMELEN_MAX) {
logerrx("%s: packet exceeded frame length (%zu) from %s",
@@ -3662,6 +3666,13 @@ dhcp_recvmsg(struct dhcpcd_ctx *ctx,
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri May 24 11:30:29 UTC 2024 Modified Files: src/external/bsd/dhcpcd/dist/hooks: 30-hostname src/external/bsd/dhcpcd/dist/src: dhcp.c dhcp6.c dhcpcd.c if-bsd.c if-options.c ipv6.c ipv6nd.c logerr.c privsep.c Log Message: Sync with dhcpcd-10.0.7 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/hooks/30-hostname cvs rdiff -u -r1.50 -r1.51 src/external/bsd/dhcpcd/dist/src/dhcp.c cvs rdiff -u -r1.32 -r1.33 src/external/bsd/dhcpcd/dist/src/dhcp6.c cvs rdiff -u -r1.54 -r1.55 src/external/bsd/dhcpcd/dist/src/dhcpcd.c cvs rdiff -u -r1.30 -r1.31 src/external/bsd/dhcpcd/dist/src/if-bsd.c \ src/external/bsd/dhcpcd/dist/src/ipv6nd.c cvs rdiff -u -r1.36 -r1.37 src/external/bsd/dhcpcd/dist/src/if-options.c cvs rdiff -u -r1.18 -r1.19 src/external/bsd/dhcpcd/dist/src/ipv6.c \ src/external/bsd/dhcpcd/dist/src/privsep.c cvs rdiff -u -r1.13 -r1.14 src/external/bsd/dhcpcd/dist/src/logerr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri May 24 11:28:32 UTC 2024 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23810 Log Message: Update to dhcpcd-10.0.7 with the following changes: * DHCP: use request_time, fallback_time and ipv4ll_time rather than reboot timeout * DHCP6: Wait for IRT to elapse before requesting advertisments * DHCPv6: Don't re-INFORM if the RA changes * privsep: Reduce fd use * dhcpcd: Add support for arp persist defence * Move dhcp(v4) packet size check earlier * Define the Azure Endpoint and other site-specific options * add RFC4191 support by @goertzenator in #297 * dhcpcd: Respect IPV6_PREFERRED_ONLY flag regardless of state * Fix time_offset to be int to match RFC-2132 * hooks/30-hostname: Exit with 0 if setting hostname is not needed Status: Vendor Tag: ROY Release Tags: dhcpcd-10_0_7 U src/external/bsd/dhcpcd/dist/LICENSE U src/external/bsd/dhcpcd/dist/README.md U src/external/bsd/dhcpcd/dist/src/defs.h U src/external/bsd/dhcpcd/dist/src/common.c U src/external/bsd/dhcpcd/dist/src/control.c C src/external/bsd/dhcpcd/dist/src/dhcpcd.c U src/external/bsd/dhcpcd/dist/src/duid.c U src/external/bsd/dhcpcd/dist/src/eloop.c C src/external/bsd/dhcpcd/dist/src/logerr.c U src/external/bsd/dhcpcd/dist/src/if.c C src/external/bsd/dhcpcd/dist/src/if-options.c U src/external/bsd/dhcpcd/dist/src/sa.c U src/external/bsd/dhcpcd/dist/src/route.c U src/external/bsd/dhcpcd/dist/src/dhcp-common.c U src/external/bsd/dhcpcd/dist/src/script.c U src/external/bsd/dhcpcd/dist/src/auth.c C src/external/bsd/dhcpcd/dist/src/if-bsd.c C src/external/bsd/dhcpcd/dist/src/dhcp.c U src/external/bsd/dhcpcd/dist/src/ipv4.c U src/external/bsd/dhcpcd/dist/src/bpf.c U src/external/bsd/dhcpcd/dist/src/arp.c U src/external/bsd/dhcpcd/dist/src/ipv4ll.c C src/external/bsd/dhcpcd/dist/src/ipv6.c C src/external/bsd/dhcpcd/dist/src/ipv6nd.c C src/external/bsd/dhcpcd/dist/src/dhcp6.c U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c C src/external/bsd/dhcpcd/dist/src/privsep.c U src/external/bsd/dhcpcd/dist/src/privsep-root.c U src/external/bsd/dhcpcd/dist/src/privsep-control.c U src/external/bsd/dhcpcd/dist/src/privsep-inet.c U src/external/bsd/dhcpcd/dist/src/privsep-bpf.c U src/external/bsd/dhcpcd/dist/src/privsep-bsd.c U src/external/bsd/dhcpcd/dist/src/common.h U src/external/bsd/dhcpcd/dist/src/control.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.h U src/external/bsd/dhcpcd/dist/src/duid.h U src/external/bsd/dhcpcd/dist/src/eloop.h U src/external/bsd/dhcpcd/dist/src/logerr.h U src/external/bsd/dhcpcd/dist/src/if.h U src/external/bsd/dhcpcd/dist/src/if-options.h U src/external/bsd/dhcpcd/dist/src/sa.h U src/external/bsd/dhcpcd/dist/src/route.h U src/external/bsd/dhcpcd/dist/src/dhcp-common.h U src/external/bsd/dhcpcd/dist/src/script.h U src/external/bsd/dhcpcd/dist/src/auth.h U src/external/bsd/dhcpcd/dist/src/dhcp.h U src/external/bsd/dhcpcd/dist/src/ipv4.h U src/external/bsd/dhcpcd/dist/src/bpf.h U src/external/bsd/dhcpcd/dist/src/arp.h U src/external/bsd/dhcpcd/dist/src/ipv4ll.h U src/external/bsd/dhcpcd/dist/src/ipv6.h U src/external/bsd/dhcpcd/dist/src/ipv6nd.h U src/external/bsd/dhcpcd/dist/src/dhcp6.h U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/src/privsep.h U src/external/bsd/dhcpcd/dist/src/privsep-root.h U src/external/bsd/dhcpcd/dist/src/privsep-control.h U src/external/bsd/dhcpcd/dist/src/privsep-inet.h U src/external/bsd/dhcpcd/dist/src/privsep-bpf.h U src/external/bsd/dhcpcd/dist/src/dev.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5 U src/external/bsd/dhcpcd/dist/src/dhcpcd.8 U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8 U src/external/bsd/dhcpcd/dist/hooks/01-test U src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf C src/external/bsd/dhcpcd/dist/hooks/30-hostname U src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/hooks/15-timezone U src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/hooks/50-ypbind 10 conflicts created by this import. Use the following command to help the merge: cvs checkout -jROY:yesterday -jROY src/external/bsd/dhcpcd/dist
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri May 24 11:28:32 UTC 2024 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23810 Log Message: Update to dhcpcd-10.0.7 with the following changes: * DHCP: use request_time, fallback_time and ipv4ll_time rather than reboot timeout * DHCP6: Wait for IRT to elapse before requesting advertisments * DHCPv6: Don't re-INFORM if the RA changes * privsep: Reduce fd use * dhcpcd: Add support for arp persist defence * Move dhcp(v4) packet size check earlier * Define the Azure Endpoint and other site-specific options * add RFC4191 support by @goertzenator in #297 * dhcpcd: Respect IPV6_PREFERRED_ONLY flag regardless of state * Fix time_offset to be int to match RFC-2132 * hooks/30-hostname: Exit with 0 if setting hostname is not needed Status: Vendor Tag: ROY Release Tags: dhcpcd-10_0_7 U src/external/bsd/dhcpcd/dist/LICENSE U src/external/bsd/dhcpcd/dist/README.md U src/external/bsd/dhcpcd/dist/src/defs.h U src/external/bsd/dhcpcd/dist/src/common.c U src/external/bsd/dhcpcd/dist/src/control.c C src/external/bsd/dhcpcd/dist/src/dhcpcd.c U src/external/bsd/dhcpcd/dist/src/duid.c U src/external/bsd/dhcpcd/dist/src/eloop.c C src/external/bsd/dhcpcd/dist/src/logerr.c U src/external/bsd/dhcpcd/dist/src/if.c C src/external/bsd/dhcpcd/dist/src/if-options.c U src/external/bsd/dhcpcd/dist/src/sa.c U src/external/bsd/dhcpcd/dist/src/route.c U src/external/bsd/dhcpcd/dist/src/dhcp-common.c U src/external/bsd/dhcpcd/dist/src/script.c U src/external/bsd/dhcpcd/dist/src/auth.c C src/external/bsd/dhcpcd/dist/src/if-bsd.c C src/external/bsd/dhcpcd/dist/src/dhcp.c U src/external/bsd/dhcpcd/dist/src/ipv4.c U src/external/bsd/dhcpcd/dist/src/bpf.c U src/external/bsd/dhcpcd/dist/src/arp.c U src/external/bsd/dhcpcd/dist/src/ipv4ll.c C src/external/bsd/dhcpcd/dist/src/ipv6.c C src/external/bsd/dhcpcd/dist/src/ipv6nd.c C src/external/bsd/dhcpcd/dist/src/dhcp6.c U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c C src/external/bsd/dhcpcd/dist/src/privsep.c U src/external/bsd/dhcpcd/dist/src/privsep-root.c U src/external/bsd/dhcpcd/dist/src/privsep-control.c U src/external/bsd/dhcpcd/dist/src/privsep-inet.c U src/external/bsd/dhcpcd/dist/src/privsep-bpf.c U src/external/bsd/dhcpcd/dist/src/privsep-bsd.c U src/external/bsd/dhcpcd/dist/src/common.h U src/external/bsd/dhcpcd/dist/src/control.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.h U src/external/bsd/dhcpcd/dist/src/duid.h U src/external/bsd/dhcpcd/dist/src/eloop.h U src/external/bsd/dhcpcd/dist/src/logerr.h U src/external/bsd/dhcpcd/dist/src/if.h U src/external/bsd/dhcpcd/dist/src/if-options.h U src/external/bsd/dhcpcd/dist/src/sa.h U src/external/bsd/dhcpcd/dist/src/route.h U src/external/bsd/dhcpcd/dist/src/dhcp-common.h U src/external/bsd/dhcpcd/dist/src/script.h U src/external/bsd/dhcpcd/dist/src/auth.h U src/external/bsd/dhcpcd/dist/src/dhcp.h U src/external/bsd/dhcpcd/dist/src/ipv4.h U src/external/bsd/dhcpcd/dist/src/bpf.h U src/external/bsd/dhcpcd/dist/src/arp.h U src/external/bsd/dhcpcd/dist/src/ipv4ll.h U src/external/bsd/dhcpcd/dist/src/ipv6.h U src/external/bsd/dhcpcd/dist/src/ipv6nd.h U src/external/bsd/dhcpcd/dist/src/dhcp6.h U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/src/privsep.h U src/external/bsd/dhcpcd/dist/src/privsep-root.h U src/external/bsd/dhcpcd/dist/src/privsep-control.h U src/external/bsd/dhcpcd/dist/src/privsep-inet.h U src/external/bsd/dhcpcd/dist/src/privsep-bpf.h U src/external/bsd/dhcpcd/dist/src/dev.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5 U src/external/bsd/dhcpcd/dist/src/dhcpcd.8 U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8 U src/external/bsd/dhcpcd/dist/hooks/01-test U src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf C src/external/bsd/dhcpcd/dist/hooks/30-hostname U src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/hooks/15-timezone U src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/hooks/50-ypbind 10 conflicts created by this import. Use the following command to help the merge: cvs checkout -jROY:yesterday -jROY src/external/bsd/dhcpcd/dist
CVS commit: src/distrib/cdrom/macppc_installboot
Module Name:src Committed By: tsutsui Date: Fri May 24 10:13:44 UTC 2024 Modified Files: src/distrib/cdrom/macppc_installboot: Makefile Removed Files: src/distrib/cdrom/macppc_installboot: cd9660.c Log Message: Pull sharable src/usr.sbin/installboot/cd9660.c. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/distrib/cdrom/macppc_installboot/Makefile cvs rdiff -u -r1.6 -r0 src/distrib/cdrom/macppc_installboot/cd9660.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/cdrom/macppc_installboot
Module Name:src
Committed By: tsutsui
Date: Fri May 24 10:13:44 UTC 2024
Modified Files:
src/distrib/cdrom/macppc_installboot: Makefile
Removed Files:
src/distrib/cdrom/macppc_installboot: cd9660.c
Log Message:
Pull sharable src/usr.sbin/installboot/cd9660.c.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/cdrom/macppc_installboot/Makefile
cvs rdiff -u -r1.6 -r0 src/distrib/cdrom/macppc_installboot/cd9660.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cdrom/macppc_installboot/Makefile
diff -u src/distrib/cdrom/macppc_installboot/Makefile:1.12 src/distrib/cdrom/macppc_installboot/Makefile:1.13
--- src/distrib/cdrom/macppc_installboot/Makefile:1.12 Sun May 19 15:51:30 2024
+++ src/distrib/cdrom/macppc_installboot/Makefile Fri May 24 10:13:44 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2024/05/19 15:51:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.13 2024/05/24 10:13:44 tsutsui Exp $
.include
HOSTPROG= macppc_installboot
SRCS= installboot.c cd9660.c cd9660_util.c
-.PATH.c: ${NETBSDSRCDIR}/sys/fs/cd9660
+.PATH.c: ${NETBSDSRCDIR}/usr.sbin/installboot ${NETBSDSRCDIR}/sys/fs/cd9660
HOST_CPPFLAGS+= -I. -I${.CURDIR}
#HOST_CPPFLAGS+= -DDEBUG
CVS commit: src/usr.sbin/installboot
Module Name:src
Committed By: tsutsui
Date: Fri May 24 09:59:42 UTC 2024
Modified Files:
src/usr.sbin/installboot: cd9660.c
Log Message:
Fix tools build errors on Cygwin.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/installboot/cd9660.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/installboot/cd9660.c
diff -u src/usr.sbin/installboot/cd9660.c:1.1 src/usr.sbin/installboot/cd9660.c:1.2
--- src/usr.sbin/installboot/cd9660.c:1.1 Sun May 19 15:48:57 2024
+++ src/usr.sbin/installboot/cd9660.c Fri May 24 09:59:42 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660.c,v 1.1 2024/05/19 15:48:57 tsutsui Exp $ */
+/* $NetBSD: cd9660.c,v 1.2 2024/05/24 09:59:42 tsutsui Exp $ */
/*-
* Copyright (c) 2005 Izumi Tsutsui. All rights reserved.
@@ -30,7 +30,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660.c,v 1.1 2024/05/19 15:48:57 tsutsui Exp $");
+__RCSID("$NetBSD: cd9660.c,v 1.2 2024/05/24 09:59:42 tsutsui Exp $");
#endif /* !__lint */
#include
@@ -38,6 +38,9 @@ __RCSID("$NetBSD: cd9660.c,v 1.1 2024/05
#if !HAVE_NBTOOL_CONFIG_H
#include
#endif
+#if !HAVE_NBTOOL_CONFIG_H || HAVE_SYS_ENDIAN_H
+#include
+#endif
#include
#include
CVS commit: src/usr.sbin/installboot
Module Name:src Committed By: tsutsui Date: Fri May 24 09:59:42 UTC 2024 Modified Files: src/usr.sbin/installboot: cd9660.c Log Message: Fix tools build errors on Cygwin. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/installboot/cd9660.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tre/dist/src
Module Name:src Committed By: andvar Date: Fri May 24 07:52:46 UTC 2024 Modified Files: src/external/bsd/tre/dist/src: agrep.c Log Message: agrep(1): remove duplicated and obsolete imports. dirent import is the only one which stays in the odd location. Part of PR bin/53513. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tre/dist/src/agrep.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/bsd/tre/dist/src/agrep.c diff -u src/external/bsd/tre/dist/src/agrep.c:1.5 src/external/bsd/tre/dist/src/agrep.c:1.6 --- src/external/bsd/tre/dist/src/agrep.c:1.5 Thu May 23 22:07:16 2024 +++ src/external/bsd/tre/dist/src/agrep.c Fri May 24 07:52:45 2024 @@ -320,10 +320,6 @@ tre_agrep_get_next_record(int fd, const } } -#include -#include -#include - #include static int tre_agrep_handle_file(const char */*filename*/);
CVS commit: src/external/bsd/tre/dist/src
Module Name:src Committed By: andvar Date: Fri May 24 07:52:46 UTC 2024 Modified Files: src/external/bsd/tre/dist/src: agrep.c Log Message: agrep(1): remove duplicated and obsolete imports. dirent import is the only one which stays in the odd location. Part of PR bin/53513. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tre/dist/src/agrep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
