CVS commit: src
Module Name:src Committed By: maxv Date: Wed Dec 18 07:37:19 UTC 2019 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi src/etc: MAKEDEV.tmpl src/etc/mtree: NetBSD.dist.base src/share/man/man4: Makefile src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL src/sys/conf: files majors src/sys/dev: Makefile src/sys/modules: Makefile src/usr.bin/make: Makefile compat.c make.1 meta.c src/usr.sbin/makemandb: nostem.txt Removed Files: src/share/man/man4: filemon.4 src/sys/dev/filemon: Makefile filemon.c filemon.h filemon_wrapper.c mknod-sh src/sys/modules/filemon: Makefile filemon.ioconf Log Message: Retire filemon, discussed on tech-kern@. To generate a diff of this commit: cvs rdiff -u -r1.1222 -r1.1223 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.2297 -r1.2298 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1665 -r1.1666 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.210 -r1.211 src/etc/MAKEDEV.tmpl cvs rdiff -u -r1.205 -r1.206 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.690 -r1.691 src/share/man/man4/Makefile cvs rdiff -u -r1.19 -r0 src/share/man/man4/filemon.4 cvs rdiff -u -r1.132 -r1.133 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.476 -r1.477 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1245 -r1.1246 src/sys/conf/files cvs rdiff -u -r1.90 -r1.91 src/sys/conf/majors cvs rdiff -u -r1.41 -r1.42 src/sys/dev/Makefile cvs rdiff -u -r1.1 -r0 src/sys/dev/filemon/Makefile \ src/sys/dev/filemon/mknod-sh cvs rdiff -u -r1.31 -r0 src/sys/dev/filemon/filemon.c cvs rdiff -u -r1.9 -r0 src/sys/dev/filemon/filemon.h cvs rdiff -u -r1.12 -r0 src/sys/dev/filemon/filemon_wrapper.c cvs rdiff -u -r1.231 -r1.232 src/sys/modules/Makefile cvs rdiff -u -r1.4 -r0 src/sys/modules/filemon/Makefile cvs rdiff -u -r1.1 -r0 src/sys/modules/filemon/filemon.ioconf cvs rdiff -u -r1.63 -r1.64 src/usr.bin/make/Makefile cvs rdiff -u -r1.107 -r1.108 src/usr.bin/make/compat.c cvs rdiff -u -r1.274 -r1.275 src/usr.bin/make/make.1 cvs rdiff -u -r1.70 -r1.71 src/usr.bin/make/meta.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/makemandb/nostem.txt 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.1222 src/distrib/sets/lists/base/mi:1.1223 --- src/distrib/sets/lists/base/mi:1.1222 Sun Dec 15 03:55:56 2019 +++ src/distrib/sets/lists/base/mi Wed Dec 18 07:37:17 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1222 2019/12/15 03:55:56 christos Exp $ +# $NetBSD: mi,v 1.1223 2019/12/18 07:37:17 maxv Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1114,7 +1114,7 @@ ./usr/include/dev/dmover base-c-usr ./usr/include/dev/dtvbase-c-usr ./usr/include/dev/eisabase-obsolete obsolete -./usr/include/dev/filemon base-c-usr +./usr/include/dev/filemon base-obsolete obsolete ./usr/include/dev/hdaudio base-c-usr ./usr/include/dev/hdmicec base-c-usr ./usr/include/dev/hidbase-c-usr Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2297 src/distrib/sets/lists/comp/mi:1.2298 --- src/distrib/sets/lists/comp/mi:1.2297 Sat Dec 14 15:30:37 2019 +++ src/distrib/sets/lists/comp/mi Wed Dec 18 07:37:17 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2297 2019/12/14 15:30:37 ad Exp $ +# $NetBSD: mi,v 1.2298 2019/12/18 07:37:17 maxv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -411,7 +411,7 @@ ./usr/include/dev/eisa/eisadevs_data.h comp-obsolete obsolete ./usr/include/dev/eisa/eisareg.h comp-obsolete obsolete ./usr/include/dev/eisa/eisavar.h comp-obsolete obsolete -./usr/include/dev/filemon/filemon.h comp-c-include +./usr/include/dev/filemon/filemon.h comp-obsolete obsolete ./usr/include/dev/fssvar.h comp-c-include ./usr/include/dev/hdaudio/hdaudioio.h comp-c-include ./usr/include/dev/hdaudio/hdaudioreg.h comp-c-include Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1665 src/distrib/sets/lists/man/mi:1.1666 --- src/distrib/sets/lists/man/mi:1.1665 Sun Dec 15 03:55:56 2019 +++ src/distrib/sets/lists/man/mi Wed Dec 18 07:37:17 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1665 2019/12/15 03:55:56 christos Exp $ +# $NetBSD: mi,v 1.1666 2019/12/18 07:37:17 maxv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1104,7 +1104,7 @@ ./usr/share/man/cat4/fast_ipsec.0 man-obsolete obsolete ./usr/share/man/cat4/fd.0 man-sys-catman .cat ./usr/share/man/cat4/fea.0 man-sys-catman .cat -./usr/share/man/cat4/filemon.0 man-sys-catman .cat +./usr/share/man/cat4/filemon.0 man-obsolete obsolete ./usr/share/man/cat4/finsio.0
CVS commit: src
Module Name:src Committed By: maxv Date: Wed Dec 18 07:37:19 UTC 2019 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi src/etc: MAKEDEV.tmpl src/etc/mtree: NetBSD.dist.base src/share/man/man4: Makefile src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL src/sys/conf: files majors src/sys/dev: Makefile src/sys/modules: Makefile src/usr.bin/make: Makefile compat.c make.1 meta.c src/usr.sbin/makemandb: nostem.txt Removed Files: src/share/man/man4: filemon.4 src/sys/dev/filemon: Makefile filemon.c filemon.h filemon_wrapper.c mknod-sh src/sys/modules/filemon: Makefile filemon.ioconf Log Message: Retire filemon, discussed on tech-kern@. To generate a diff of this commit: cvs rdiff -u -r1.1222 -r1.1223 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.2297 -r1.2298 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1665 -r1.1666 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.210 -r1.211 src/etc/MAKEDEV.tmpl cvs rdiff -u -r1.205 -r1.206 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.690 -r1.691 src/share/man/man4/Makefile cvs rdiff -u -r1.19 -r0 src/share/man/man4/filemon.4 cvs rdiff -u -r1.132 -r1.133 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.476 -r1.477 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1245 -r1.1246 src/sys/conf/files cvs rdiff -u -r1.90 -r1.91 src/sys/conf/majors cvs rdiff -u -r1.41 -r1.42 src/sys/dev/Makefile cvs rdiff -u -r1.1 -r0 src/sys/dev/filemon/Makefile \ src/sys/dev/filemon/mknod-sh cvs rdiff -u -r1.31 -r0 src/sys/dev/filemon/filemon.c cvs rdiff -u -r1.9 -r0 src/sys/dev/filemon/filemon.h cvs rdiff -u -r1.12 -r0 src/sys/dev/filemon/filemon_wrapper.c cvs rdiff -u -r1.231 -r1.232 src/sys/modules/Makefile cvs rdiff -u -r1.4 -r0 src/sys/modules/filemon/Makefile cvs rdiff -u -r1.1 -r0 src/sys/modules/filemon/filemon.ioconf cvs rdiff -u -r1.63 -r1.64 src/usr.bin/make/Makefile cvs rdiff -u -r1.107 -r1.108 src/usr.bin/make/compat.c cvs rdiff -u -r1.274 -r1.275 src/usr.bin/make/make.1 cvs rdiff -u -r1.70 -r1.71 src/usr.bin/make/meta.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/makemandb/nostem.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib
Module Name:src Committed By: christos Date: Wed Dec 18 02:46:21 UTC 2019 Modified Files: src/lib: Makefile Log Message: move file/lib after xz To generate a diff of this commit: cvs rdiff -u -r1.273 -r1.274 src/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib
Module Name:src
Committed By: christos
Date: Wed Dec 18 02:46:21 UTC 2019
Modified Files:
src/lib: Makefile
Log Message:
move file/lib after xz
To generate a diff of this commit:
cvs rdiff -u -r1.273 -r1.274 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.273 src/lib/Makefile:1.274
--- src/lib/Makefile:1.273 Mon Nov 11 17:45:27 2019
+++ src/lib/Makefile Tue Dec 17 21:46:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.273 2019/11/11 22:45:27 joerg Exp $
+# $NetBSD: Makefile,v 1.274 2019/12/18 02:46:21 christos Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -142,7 +142,6 @@ SUBDIR+= libnpf # depends on libnv
.endif
SUBDIR+= ../crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib # depends on libcrypt
-SUBDIR+= ../external/bsd/file/lib # depends on libz
.if (${MKISCSI} != "no")
SUBDIR+= ../external/bsd/iscsi/lib # depends on libpthread
@@ -191,6 +190,8 @@ SUBDIR+= ../external/apache2/llvm/librt
SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz
+SUBDIR+= ../external/bsd/file/lib # depends on libz, libbz2, libxz
+
.if (${MKNPF} != "no")
SUBDIR+= npf # depends on libnpf
.endif
CVS commit: src/distrib/sun2/miniroot
Module Name:src Committed By: christos Date: Wed Dec 18 02:35:59 UTC 2019 Modified Files: src/distrib/sun2/miniroot: Makefile Log Message: bump To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/distrib/sun2/miniroot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sun2/miniroot
Module Name:src
Committed By: christos
Date: Wed Dec 18 02:35:59 UTC 2019
Modified Files:
src/distrib/sun2/miniroot: Makefile
Log Message:
bump
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/sun2/miniroot/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/sun2/miniroot/Makefile
diff -u src/distrib/sun2/miniroot/Makefile:1.36 src/distrib/sun2/miniroot/Makefile:1.37
--- src/distrib/sun2/miniroot/Makefile:1.36 Tue Jan 24 13:04:05 2017
+++ src/distrib/sun2/miniroot/Makefile Tue Dec 17 21:35:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2017/01/24 18:04:05 christos Exp $
+# $NetBSD: Makefile,v 1.37 2019/12/18 02:35:59 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,7 +6,7 @@
.include
IMAGE= miniroot.fs
-IMAGESIZE= 4m
+IMAGESIZE= 4200k
MAKEFS_FLAGS+= -o density=8k
KERNEL= ${KERNOBJDIR}/INSTALL/netbsd
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: riastradh
Date: Wed Dec 18 02:26:48 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sun8i_crypto.c
Log Message:
Reduce entropy estimate for sun8icrypto TRNG.
NIST's SP800-90B entropy estimation tools put it at no more than .08
bits of entropy per byte of data(!), so estimate 100 bits of data per
bit of entropy. This is probably not conservative enough -- the NIST
tools were written without knowledge of how this alleged TRNG works!
Knowledge of the physics of how the TRNG is supposed to work could
probably enable a better job at predicting the outputs.
While here, bump the size of data we can sample directly with sysctl
to 4096 bytes.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/sunxi/sun8i_crypto.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/arm/sunxi/sun8i_crypto.c
diff -u src/sys/arch/arm/sunxi/sun8i_crypto.c:1.8 src/sys/arch/arm/sunxi/sun8i_crypto.c:1.9
--- src/sys/arch/arm/sunxi/sun8i_crypto.c:1.8 Sun Dec 15 01:16:33 2019
+++ src/sys/arch/arm/sunxi/sun8i_crypto.c Wed Dec 18 02:26:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i_crypto.c,v 1.8 2019/12/15 01:16:33 riastradh Exp $ */
+/* $NetBSD: sun8i_crypto.c,v 1.9 2019/12/18 02:26:48 riastradh Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: sun8i_crypto.c,v 1.8 2019/12/15 01:16:33 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun8i_crypto.c,v 1.9 2019/12/18 02:26:48 riastradh Exp $");
#include
#include
@@ -65,9 +65,8 @@ __KERNEL_RCSID(1, "$NetBSD: sun8i_crypto
#include
#define SUN8I_CRYPTO_TIMEOUT hz
-#define SUN8I_CRYPTO_RNGENTROPY 8 /* estimated bits per bit of entropy */
-#define SUN8I_CRYPTO_RNGBYTES \
- (SUN8I_CRYPTO_RNGENTROPY*howmany(RND_POOLBITS, NBBY))
+#define SUN8I_CRYPTO_RNGENTROPY 100 /* estimated bits per bit of entropy */
+#define SUN8I_CRYPTO_RNGBYTES PAGE_SIZE
struct sun8i_crypto_task;
@@ -964,8 +963,8 @@ sun8i_crypto_rng_done(struct sun8i_crypt
* This TRNG has quite low entropy at best. But if it fails a
* repeated output test, then assume it's busted.
*/
- CTASSERT((SUN8I_CRYPTO_RNGBYTES % SUN8I_CRYPTO_RNGENTROPY) == 0);
- entropybits = NBBY * (SUN8I_CRYPTO_RNGBYTES/SUN8I_CRYPTO_RNGENTROPY);
+ CTASSERT(SUN8I_CRYPTO_RNGBYTES <= UINT32_MAX/NBBY);
+ entropybits = (NBBY*SUN8I_CRYPTO_RNGBYTES)/SUN8I_CRYPTO_RNGENTROPY;
if (consttime_memequal(buf, buf + SUN8I_CRYPTO_RNGBYTES/2,
SUN8I_CRYPTO_RNGBYTES/2)) {
device_printf(sc->sc_dev, "failed repeated output test\n");
@@ -1171,10 +1170,10 @@ sun8i_crypto_sysctl_attach(struct sun8i_
return;
}
- /* hw.sun8icryptoN.rng (`struct', 1024-byte array) */
+ /* hw.sun8icryptoN.rng (`struct', 4096-byte array) */
sysctl_createv(>cy_log, 0, >cy_root_node, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READONLY|CTLFLAG_PRIVATE, CTLTYPE_STRUCT,
- "rng", SYSCTL_DESCR("Read up to 1024 bytes out of the TRNG"),
+ "rng", SYSCTL_DESCR("Read up to 4096 bytes out of the TRNG"),
_crypto_sysctl_rng, 0, sc, 0, CTL_CREATE, CTL_EOL);
if (error) {
aprint_error_dev(sc->sc_dev,
@@ -1195,13 +1194,13 @@ sun8i_crypto_sysctl_rng(SYSCTLFN_ARGS)
/* If oldp == NULL, the caller wants to learn the size. */
if (oldp == NULL) {
- *oldlenp = 1024;
+ *oldlenp = 4096;
return 0;
}
/* Verify the output buffer size is reasonable. */
size = *oldlenp;
- if (size > 1024) /* size_t, so never negative */
+ if (size > 4096) /* size_t, so never negative */
return E2BIG;
if (size == 0)
return 0; /* nothing to do */
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: riastradh Date: Wed Dec 18 02:26:48 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sun8i_crypto.c Log Message: Reduce entropy estimate for sun8icrypto TRNG. NIST's SP800-90B entropy estimation tools put it at no more than .08 bits of entropy per byte of data(!), so estimate 100 bits of data per bit of entropy. This is probably not conservative enough -- the NIST tools were written without knowledge of how this alleged TRNG works! Knowledge of the physics of how the TRNG is supposed to work could probably enable a better job at predicting the outputs. While here, bump the size of data we can sample directly with sysctl to 4096 bytes. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/sunxi/sun8i_crypto.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/crunch/crunchgen
Module Name:src
Committed By: christos
Date: Wed Dec 18 02:16:04 UTC 2019
Modified Files:
src/usr.bin/crunch/crunchgen: crunchgen.1 crunchgen.c
Log Message:
Also disable ssp and fortify by default.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/crunch/crunchgen/crunchgen.1
cvs rdiff -u -r1.92 -r1.93 src/usr.bin/crunch/crunchgen/crunchgen.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/crunch/crunchgen/crunchgen.1
diff -u src/usr.bin/crunch/crunchgen/crunchgen.1:1.37 src/usr.bin/crunch/crunchgen/crunchgen.1:1.38
--- src/usr.bin/crunch/crunchgen/crunchgen.1:1.37 Thu Jul 26 04:57:26 2018
+++ src/usr.bin/crunch/crunchgen/crunchgen.1 Tue Dec 17 21:16:04 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: crunchgen.1,v 1.37 2018/07/26 08:57:26 wiz Exp $
+.\" $NetBSD: crunchgen.1,v 1.38 2019/12/18 02:16:04 christos Exp $
.\"
.\" Copyright (c) 1994 University of Maryland
.\" All Rights Reserved.
@@ -32,7 +32,7 @@
.Nd generates build environment for a crunched binary
.Sh SYNOPSIS
.Nm
-.Op Fl fOopqSs
+.Op Fl FfOoPpqSs
.Op Fl c Ar c-file-name
.Op Fl D Ar src-root
.Op Fl d Ar build-options
@@ -101,6 +101,8 @@ Set crunched binary executable file name
.Ar exec-file-name .
The default name is
.Dq Aq Mt conf-name .
+.It Fl F
+Enable fortify.
.It Fl f
Flush cache.
Forces the recalculation of cached parameters.
@@ -124,6 +126,8 @@ the program objects into a single reloca
Use existing object files.
Rather than rebuilding object files via reach-over
makefiles, instead search for and use existing object files.
+.It Fl P
+Enable stack protector.
.It Fl p
Produce static pie (position independent executables).
.It Fl q
Index: src/usr.bin/crunch/crunchgen/crunchgen.c
diff -u src/usr.bin/crunch/crunchgen/crunchgen.c:1.92 src/usr.bin/crunch/crunchgen/crunchgen.c:1.93
--- src/usr.bin/crunch/crunchgen/crunchgen.c:1.92 Thu Feb 14 07:22:06 2019
+++ src/usr.bin/crunch/crunchgen/crunchgen.c Tue Dec 17 21:16:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: crunchgen.c,v 1.92 2019/02/14 12:22:06 mrg Exp $ */
+/* $NetBSD: crunchgen.c,v 1.93 2019/12/18 02:16:04 christos Exp $ */
/*
* Copyright (c) 1994 University of Maryland
* All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if !defined(lint)
-__RCSID("$NetBSD: crunchgen.c,v 1.92 2019/02/14 12:22:06 mrg Exp $");
+__RCSID("$NetBSD: crunchgen.c,v 1.93 2019/12/18 02:16:04 christos Exp $");
#endif
#include
@@ -104,6 +104,7 @@ static const char *pname = "crunchgen";
/* options */
static int verbose, readcache, useobjs, oneobj, pie, libcsanitizer, sanitizer;
+static int ssp, fortify;
static int reading_cache;
static char *machine;
@@ -159,10 +160,12 @@ main(int argc, char **argv)
if (argc > 0)
pname = argv[0];
-while ((optc = getopt(argc, argv, "m:c:d:e:fopqsD:L:Ov:")) != -1) {
+while ((optc = getopt(argc, argv, "m:c:d:e:FfopPqsD:L:Ov:")) != -1) {
switch(optc) {
case 'f': readcache = 0; break;
+ case 'F': fortify = 1; break;
case 'p': pie = 1; break;
+ case 'P': ssp = 1; break;
case 'q': verbose = 0; break;
case 'O': oneobj = 0; break;
case 'o': useobjs = 1, oneobj = 0; break;
@@ -225,7 +228,7 @@ void
usage(void)
{
fprintf(stderr,
- "%s [-fOopqSs] [-c c-file-name] [-D src-root] [-d build-options]\n"
+ "%s [-FfOoPpqSs] [-c c-file-name] [-D src-root] [-d build-options]\n"
"\t [-e exec-file-name] [-L lib-dir] [-m makefile-name]\n"
"\t [-v var-spec] conf-file\n", pname);
exit(1);
@@ -557,7 +560,7 @@ static void gen_output_cfile(void);
static void fillin_program_objs(prog_t *p, char *path);
static void top_makefile_rules(FILE *outmk);
static void bottom_makefile_rules(FILE *outmk);
-static void prog_makefile_rules(FILE *outmk, prog_t *p);
+static void prog_makefile_rules(FILE *outmk, prog_t *p, const char *);
static void output_strlst(FILE *outf, strlst_t *lst);
static char *genident(char *str);
static char *dir_search(char *progname);
@@ -804,10 +807,36 @@ gen_specials_cache(void)
static void
+addno(char *str, size_t len, const char *stem)
+{
+ char buf[128];
+ snprintf(buf, sizeof(buf), "NO%s=\n", stem);
+ strlcat(str, buf, len);
+}
+
+
+static void
gen_output_makefile(void)
{
prog_t *p;
FILE *outmk;
+char noes[1024], *ptr;
+
+noes[0] = '\0';
+
+if (!pie)
+ addno(noes, sizeof(noes), "PIE");
+if (!ssp)
+ addno(noes, sizeof(noes), "SSP");
+if (!fortify)
+ addno(noes, sizeof(noes), "FORT");
+if (!libcsanitizer)
+ addno(noes, sizeof(noes), "LIBCSANITIZER");
+if (!sanitizer)
+ addno(noes, sizeof(noes), "SANITIZER");
+
+addno(noes, sizeof(noes), "MAN");
+
(void)snprintf(line, sizeof(line), "generating %s", outmkname);
status(line);
@@ -821,10 +850,14 @@ gen_output_makefile(void)
fprintf(outmk, "# %s - generated from %s by crunchgen %s\n\n",
outmkname, infilename, CRUNCH_VERSION);
+
CVS commit: src/usr.bin/crunch/crunchgen
Module Name:src Committed By: christos Date: Wed Dec 18 02:16:04 UTC 2019 Modified Files: src/usr.bin/crunch/crunchgen: crunchgen.1 crunchgen.c Log Message: Also disable ssp and fortify by default. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/usr.bin/crunch/crunchgen/crunchgen.1 cvs rdiff -u -r1.92 -r1.93 src/usr.bin/crunch/crunchgen/crunchgen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Dec 18 01:15:33 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1380 -r1.1381 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1379 -r1.1380 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Dec 18 01:15:33 UTC 2019
Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.1380 -r1.1381 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1379 -r1.1380 src/sys/dev/pci/pcidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1380 src/sys/dev/pci/pcidevs.h:1.1381
--- src/sys/dev/pci/pcidevs.h:1.1380 Wed Nov 27 03:47:05 2019
+++ src/sys/dev/pci/pcidevs.h Wed Dec 18 01:15:32 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1380 2019/11/27 03:47:05 msaitoh Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1381 2019/12/18 01:15:32 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1392 2019/11/27 03:45:54 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1393 2019/12/18 01:13:55 msaitoh Exp
*/
/*
@@ -1037,6 +1037,11 @@
#define PCI_PRODUCT_AMD_F17_7X_RESV_SPP 0x1485 /* Family17h/7xh Reserved SPP */
#define PCI_PRODUCT_AMD_F17_7X_USB3 0x149c /* Family17h/7xh USB 3.0 Host Controller */
#define PCI_PRODUCT_AMD_F14_RC 0x1510 /* Family14h Root Complex */
+#define PCI_PRODUCT_AMD_F14_PCIE_1 0x1512 /* Family14h PCIe */
+#define PCI_PRODUCT_AMD_F14_PCIE_2 0x1513 /* Family14h PCIe */
+#define PCI_PRODUCT_AMD_F14_PCIE_3 0x1514 /* Family14h PCIe */
+#define PCI_PRODUCT_AMD_F14_PCIE_4 0x1515 /* Family14h PCIe */
+#define PCI_PRODUCT_AMD_F14_PCIE_5 0x1516 /* Family14h PCIe */
#define PCI_PRODUCT_AMD_F16_HT 0x1530 /* Family16h HyperTransport Configuration */
#define PCI_PRODUCT_AMD_F16_ADDR 0x1531 /* Family16h Address Map Configuration */
#define PCI_PRODUCT_AMD_F16_DRAM 0x1532 /* Family16h DRAM Configuration */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1379 src/sys/dev/pci/pcidevs_data.h:1.1380
--- src/sys/dev/pci/pcidevs_data.h:1.1379 Wed Nov 27 03:47:05 2019
+++ src/sys/dev/pci/pcidevs_data.h Wed Dec 18 01:15:32 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1379 2019/11/27 03:47:05 msaitoh Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1380 2019/12/18 01:15:32 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1392 2019/11/27 03:45:54 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1393 2019/12/18 01:13:55 msaitoh Exp
*/
/*
@@ -1249,6 +1249,16 @@ static const uint16_t pci_products[] = {
8157, 6896, 8184, 6904, 6406, 0,
PCI_VENDOR_AMD, PCI_PRODUCT_AMD_F14_RC,
8188, 8076, 8081, 0,
+ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_F14_PCIE_1,
+ 8188, 8124, 0,
+ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_F14_PCIE_2,
+ 8188, 8124, 0,
+ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_F14_PCIE_3,
+ 8188, 8124, 0,
+ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_F14_PCIE_4,
+ 8188, 8124, 0,
+ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_F14_PCIE_5,
+ 8188, 8124, 0,
PCI_VENDOR_AMD, PCI_PRODUCT_AMD_F16_HT,
8100, 7956, 7971, 0,
PCI_VENDOR_AMD, PCI_PRODUCT_AMD_F16_ADDR,
@@ -15090,7 +15100,7 @@ static const char pci_words[] = { "."
"Family16h\0" /* 19 refs @ 8100 */
"GPP\0" /* 19 refs @ 8110 */
"Family17h\0" /* 20 refs @ 8114 */
- "PCIe\0" /* 401 refs @ 8124 */
+ "PCIe\0" /* 406 refs @ 8124 */
"Crypto\0" /* 3 refs @ 8129 */
"HD\0" /* 201 refs @ 8136 */
"Dummy\0" /* 1 refs @ 8139 */
@@ -15100,7 +15110,7 @@ static const char pci_words[] = { "."
"Reserved\0" /* 7 refs @ 8171 */
"SPP\0" /* 1 refs @ 8180 */
"3.0\0" /* 7 refs @ 8184 */
- "Family14h\0" /* 1 refs @ 8188 */
+ "Family14h\0" /* 6 refs @ 8188 */
"North\0" /* 13 refs @ 8198 */
"C-state\0" /* 3 refs @ 8204 */
"Cryptographic\0" /* 2 refs @ 8212 */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Dec 18 01:13:55 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add AMD Family14h PCIe. To generate a diff of this commit: cvs rdiff -u -r1.1392 -r1.1393 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1392 src/sys/dev/pci/pcidevs:1.1393 --- src/sys/dev/pci/pcidevs:1.1392 Wed Nov 27 03:45:54 2019 +++ src/sys/dev/pci/pcidevs Wed Dec 18 01:13:55 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1392 2019/11/27 03:45:54 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1393 2019/12/18 01:13:55 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1030,6 +1030,11 @@ product AMD F17_7X_IOMMU 0x1481 Family17 product AMD F17_7X_RESV_SPP 0x1485 Family17h/7xh Reserved SPP product AMD F17_7X_USB3 0x149c Family17h/7xh USB 3.0 Host Controller product AMD F14_RC 0x1510 Family14h Root Complex +product AMD F14_PCIE_1 0x1512 Family14h PCIe +product AMD F14_PCIE_2 0x1513 Family14h PCIe +product AMD F14_PCIE_3 0x1514 Family14h PCIe +product AMD F14_PCIE_4 0x1515 Family14h PCIe +product AMD F14_PCIE_5 0x1516 Family14h PCIe product AMD F16_HT 0x1530 Family16h HyperTransport Configuration product AMD F16_ADDR 0x1531 Family16h Address Map Configuration product AMD F16_DRAM 0x1532 Family16h DRAM Configuration
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Dec 18 01:13:55 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add AMD Family14h PCIe. To generate a diff of this commit: cvs rdiff -u -r1.1392 -r1.1393 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: roy Date: Wed Dec 18 00:49:16 UTC 2019 Modified Files: src/sys/netinet: in.c in.h Log Message: inet: Add support for IPv4 /31 prefixes, as described in RFC 3021. To run a /31 network, participating hosts MUST drop support for directed broadcasts, and treat the first and last addresses on subnet as unicast. The broadcast address for the prefix should be the link local broadcast address, INADDR_BROADCAST. Taken from FreeBSD, r226402. Fixes PR kern/51388. To generate a diff of this commit: cvs rdiff -u -r1.235 -r1.236 src/sys/netinet/in.c cvs rdiff -u -r1.108 -r1.109 src/sys/netinet/in.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src
Committed By: roy
Date: Wed Dec 18 00:49:16 UTC 2019
Modified Files:
src/sys/netinet: in.c in.h
Log Message:
inet: Add support for IPv4 /31 prefixes, as described in RFC 3021.
To run a /31 network, participating hosts MUST drop support
for directed broadcasts, and treat the first and last addresses
on subnet as unicast. The broadcast address for the prefix
should be the link local broadcast address, INADDR_BROADCAST.
Taken from FreeBSD, r226402.
Fixes PR kern/51388.
To generate a diff of this commit:
cvs rdiff -u -r1.235 -r1.236 src/sys/netinet/in.c
cvs rdiff -u -r1.108 -r1.109 src/sys/netinet/in.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/netinet/in.c
diff -u src/sys/netinet/in.c:1.235 src/sys/netinet/in.c:1.236
--- src/sys/netinet/in.c:1.235 Wed Sep 25 09:53:38 2019
+++ src/sys/netinet/in.c Wed Dec 18 00:49:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.235 2019/09/25 09:53:38 ozaki-r Exp $ */
+/* $NetBSD: in.c,v 1.236 2019/12/18 00:49:15 roy Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.235 2019/09/25 09:53:38 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.236 2019/12/18 00:49:15 roy Exp $");
#include "arp.h"
@@ -1219,10 +1219,15 @@ in_ifinit(struct ifnet *ifp, struct in_i
ia->ia_ifa.ifa_metric = ifp->if_metric;
if (ifp->if_flags & IFF_BROADCAST) {
- ia->ia_broadaddr.sin_addr.s_addr =
- ia->ia_subnet | ~ia->ia_subnetmask;
- ia->ia_netbroadcast.s_addr =
- ia->ia_net | ~ia->ia_netmask;
+ if (ia->ia_subnetmask == IN_RFC3021_MASK) {
+ ia->ia_broadaddr.sin_addr.s_addr = INADDR_BROADCAST;
+ ia->ia_netbroadcast.s_addr = INADDR_BROADCAST;
+ } else {
+ ia->ia_broadaddr.sin_addr.s_addr =
+ia->ia_subnet | ~ia->ia_subnetmask;
+ ia->ia_netbroadcast.s_addr =
+ia->ia_net | ~ia->ia_netmask;
+ }
} else if (ifp->if_flags & IFF_LOOPBACK) {
ia->ia_dstaddr = ia->ia_addr;
flags |= RTF_HOST;
@@ -1426,8 +1431,10 @@ in_broadcast(struct in_addr in, struct i
in_hosteq(in, ia->ia_netbroadcast) ||
(hostzeroisbroadcast &&
/*
- * Check for old-style (host 0) broadcast.
+ * Check for old-style (host 0) broadcast, but
+ * taking into account that RFC 3021 obsoletes it.
*/
+ ia->ia_subnetmask != IN_RFC3021_MASK &&
(in.s_addr == ia->ia_subnet ||
in.s_addr == ia->ia_net {
pserialize_read_exit(s);
Index: src/sys/netinet/in.h
diff -u src/sys/netinet/in.h:1.108 src/sys/netinet/in.h:1.109
--- src/sys/netinet/in.h:1.108 Fri Nov 9 11:46:28 2018
+++ src/sys/netinet/in.h Wed Dec 18 00:49:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: in.h,v 1.108 2018/11/09 11:46:28 maya Exp $ */
+/* $NetBSD: in.h,v 1.109 2019/12/18 00:49:16 roy Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -235,6 +235,8 @@ struct in_addr {
#define IN_LOOPBACKNET 127 /* official! */
+#define IN_RFC3021_MASK __IPADDR(0xfffe)
+
/*
* Socket address, internet style.
*/
CVS commit: src/usr.bin/mail
Module Name:src Committed By: christos Date: Tue Dec 17 19:12:50 UTC 2019 Modified Files: src/usr.bin/mail: Makefile Log Message: fix sun2 To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/usr.bin/mail/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/mail
Module Name:src
Committed By: christos
Date: Tue Dec 17 19:12:50 UTC 2019
Modified Files:
src/usr.bin/mail: Makefile
Log Message:
fix sun2
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/mail/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/mail/Makefile
diff -u src/usr.bin/mail/Makefile:1.39 src/usr.bin/mail/Makefile:1.40
--- src/usr.bin/mail/Makefile:1.39 Sun Oct 13 03:28:15 2019
+++ src/usr.bin/mail/Makefile Tue Dec 17 14:12:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/10/13 07:28:15 mrg Exp $
+# $NetBSD: Makefile,v 1.40 2019/12/17 19:12:50 christos Exp $
# @(#)Makefile 8.3 (Berkeley) 4/20/95
.include
@@ -52,8 +52,8 @@ CPPFLAGS+= -DMIME_SUPPORT
CPPFLAGS+= -DCHARSET_SUPPORT
.endif
-LDADD+= -lmagic -lz
-DPADD+= ${LIBMAGIC} ${LIBZ}
+LDADD+= -lmagic -llzma -lbz2 -lz
+DPADD+= ${LIBMAGIC} ${LIBLZMA} ${LIBBZ2} ${LIBZ}
.endif
.endif
CVS commit: src/external/bsd/file
Module Name:src
Committed By: christos
Date: Tue Dec 17 18:59:39 UTC 2019
Modified Files:
src/external/bsd/file: Makefile.inc
src/external/bsd/file/bin: Makefile
src/external/bsd/file/lib: Makefile
Log Message:
Fix sun2 (static linking)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/bin/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/file/Makefile.inc
diff -u src/external/bsd/file/Makefile.inc:1.6 src/external/bsd/file/Makefile.inc:1.7
--- src/external/bsd/file/Makefile.inc:1.6 Wed Feb 22 07:34:49 2017
+++ src/external/bsd/file/Makefile.inc Tue Dec 17 13:59:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2017/02/22 12:34:49 maya Exp $
+# $NetBSD: Makefile.inc,v 1.7 2019/12/17 18:59:39 christos Exp $
WARNS=4
DIST=${NETBSDSRCDIR}/external/bsd/file/dist
@@ -21,3 +21,8 @@ CPPFLAGS+= -DMAGIC='"${MAGIC}"' -DHAVE_C
CPPFLAGS+= -I${.CURDIR}/../include -I${DIST}/src
.PATH: ${DIST}/src ${DIST}/doc
+
+DPLIBS+= lzma${NETBSDSRCDIR}/external/public-domain/xz/lib
+DPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
+DPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+
Index: src/external/bsd/file/bin/Makefile
diff -u src/external/bsd/file/bin/Makefile:1.3 src/external/bsd/file/bin/Makefile:1.4
--- src/external/bsd/file/bin/Makefile:1.3 Wed Jan 15 20:15:33 2014
+++ src/external/bsd/file/bin/Makefile Tue Dec 17 13:59:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/01/16 01:15:33 christos Exp $
+# $NetBSD: Makefile,v 1.4 2019/12/17 18:59:39 christos Exp $
.include
@@ -10,8 +10,9 @@ FILES= ${MFILES}
.endif
PROG= file
-LDADD+= -lmagic -lz
-DPADD+= ${LIBMAGIC} ${LIBZ}
+LDADD+= -lmagic
+DPADD+= ${LIBMAGIC}
+PROGDPLIBS += ${DPLIBS}
MAN= file.1 magic.5
CLEANFILES+= magic.mgc
Index: src/external/bsd/file/lib/Makefile
diff -u src/external/bsd/file/lib/Makefile:1.14 src/external/bsd/file/lib/Makefile:1.15
--- src/external/bsd/file/lib/Makefile:1.14 Tue Dec 17 08:35:43 2019
+++ src/external/bsd/file/lib/Makefile Tue Dec 17 13:59:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/12/17 13:35:43 christos Exp $
+# $NetBSD: Makefile,v 1.15 2019/12/17 18:59:39 christos Exp $
#
USE_FORT?= yes # data driven bugs?
@@ -8,9 +8,7 @@ USE_FORT?= yes # data driven bugs?
.include "../Makefile.inc"
LIB= magic
-LIBDPLIBS+= lzma ${NETBSDSRCDIR}/external/public-domain/xz/lib
-LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
-LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+LIBDPLIBS+= ${DPLIBS}
CPPFLAGS+=-I.
.if ${MACHINE_ARCH} == "i386"
CVS commit: src/external/bsd/file
Module Name:src Committed By: christos Date: Tue Dec 17 18:59:39 UTC 2019 Modified Files: src/external/bsd/file: Makefile.inc src/external/bsd/file/bin: Makefile src/external/bsd/file/lib: Makefile Log Message: Fix sun2 (static linking) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/Makefile.inc cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/bin/Makefile cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/historical/nawk/bin
Module Name:src Committed By: christos Date: Tue Dec 17 18:35:57 UTC 2019 Modified Files: src/external/historical/nawk/bin: awk.1 Log Message: Sync with upstream. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/historical/nawk/bin/awk.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/historical/nawk/bin
Module Name:src
Committed By: christos
Date: Tue Dec 17 18:35:57 UTC 2019
Modified Files:
src/external/historical/nawk/bin: awk.1
Log Message:
Sync with upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/historical/nawk/bin/awk.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/historical/nawk/bin/awk.1
diff -u src/external/historical/nawk/bin/awk.1:1.5 src/external/historical/nawk/bin/awk.1:1.6
--- src/external/historical/nawk/bin/awk.1:1.5 Tue May 23 10:11:08 2017
+++ src/external/historical/nawk/bin/awk.1 Tue Dec 17 13:35:57 2019
@@ -1,28 +1,5 @@
-.\" $NetBSD: awk.1,v 1.5 2017/05/23 14:11:08 abhinav Exp $
-.\"
-.\" Copyright (C) Lucent Technologies 1997
-.\" All Rights Reserved
-.\"
-.\" Permission to use, copy, modify, and distribute this software and
-.\" its documentation for any purpose and without fee is hereby
-.\" granted, provided that the above copyright notice appear in all
-.\" copies and that both that the copyright notice and this
-.\" permission notice and warranty disclaimer appear in supporting
-.\" documentation, and that the name Lucent Technologies or any of
-.\" its entities not be used in advertising or publicity pertaining
-.\" to distribution of the software without specific, written prior
-.\" permission.
-.\"
-.\" LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-.\" INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-.\" IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-.\" SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-.\" ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-.\" THIS SOFTWARE.
-.\"
-.Dd May 18, 2017
+.\" $NetBSD: awk.1,v 1.6 2019/12/17 18:35:57 christos Exp $
+.Dd December 19, 2019
.Dt AWK 1
.Os
.Sh NAME
@@ -34,7 +11,7 @@
.Op Fl v Ar var=value
.Op Fl safe
.Op Fl d Ns Op Ar N
-.Op Ar prog | Fl f Ar filename
+.Op Ar prog | Fl f Ar progfile
.Ar
.Nm
.Fl version
@@ -53,7 +30,7 @@ for lines that match any of a set of pat
.Ar prog
or in one or more files
specified as
-.Fl f Ar filename .
+.Fl f Ar progfile .
With each pattern
there can be an associated action that will be performed
when a line of a
@@ -71,6 +48,19 @@ of the form
.Ar var=value
is treated as an assignment, not a filename,
and is executed at the time it would have been opened if it were a filename.
+The option
+.Fl v
+followed by
+.Ar var=value
+is an assignment to be done before
+.Ar prog
+is executed; any number of
+.Fl v
+options may be present.
+The
+.Fl F Ar fs
+option defines the input field separator to be the regular expression
+.Ar fs .
.Pp
The options are as follows:
.Bl -tag -width indent
@@ -223,7 +213,7 @@ Assignment and Operator-Assignment
.Ss Control Statements
The control statements are as follows:
.Pp
-.Bl -hang -offset indent -width indent -compact
+.Bl -tag -width indent
.It Ic if \&( Ar expression Ic \&) Ar statement Bq Ic else Ar statement
.It Ic while \&( Ar expression Ic \&) Ar statement
.It Ic for \&( Ar expression Ic \&; Ar expression Ic \&; \
@@ -232,12 +222,21 @@ Ar expression Ic \&) Ar statement
.It Ic do Ar statement Ic while \&( Ar expression Ic \&)
.It Ic break
.It Ic continue
+.It Ic \&{ Ar [ statement ... ] Ic \&}
+.It Ic Ar expression
+Commonly var = expression
+.It Ic return Bq Ar expression
+.It Ic next
+Skip remaining patterns on this input line
+.It Ic nextfile
+Skip rest of this file, open next, start at top
.It Ic delete Va array Bq Ar expression
+Delete an array element
.It Ic delete Va array
+Delete all elements of an array
.It Ic exit Bq Ar expression
+Exit immediately; status is
.Ar expression
-.It Ic return Bq Ar expression
-.It Ic \&{ Ar [ statement ... ] Ic \&}
.El
.Ss I/O Statements
The input/output statements are as follows:
@@ -280,10 +279,6 @@ each call of
.Ic getline
returns the next line of output from
.Ar expr .
-.It Ic next
-Skip remaining patterns on this input line.
-.It Ic nextfile
-Skip rest of this file, open next, start at top.
.It Ic print Bo Ar expr-list Bc Bq Ic \*[Gt] Ar file
The
.Ic print
@@ -743,3 +738,5 @@ to force it to be treated as a string co
.Pp
The scope rules for variables in functions are a botch;
the syntax is worse.
+.Pp
+Only eight-bit characters sets are handled correctly.
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jakllsch Date: Tue Dec 17 18:30:51 UTC 2019 Modified Files: src/sys/arch/arm/rockchip: rk_vop.c Log Message: rkvop: set stride using virtual framebuffer width instead of display mode To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/rockchip/rk_vop.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/arm/rockchip/rk_vop.c diff -u src/sys/arch/arm/rockchip/rk_vop.c:1.4 src/sys/arch/arm/rockchip/rk_vop.c:1.5 --- src/sys/arch/arm/rockchip/rk_vop.c:1.4 Tue Dec 17 18:26:36 2019 +++ src/sys/arch/arm/rockchip/rk_vop.c Tue Dec 17 18:30:51 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rk_vop.c,v 1.4 2019/12/17 18:26:36 jakllsch Exp $ */ +/* $NetBSD: rk_vop.c,v 1.5 2019/12/17 18:30:51 jakllsch Exp $ */ /*- * Copyright (c) 2019 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.4 2019/12/17 18:26:36 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.5 2019/12/17 18:30:51 jakllsch Exp $"); #include #include @@ -236,8 +236,15 @@ rk_vop_mode_do_set_base(struct drm_crtc uint64_t paddr = (uint64_t)sfb->obj->dmamap->dm_segs[0].ds_addr; + paddr += y * sfb->base.pitches[0]; + paddr += x * drm_format_plane_cpp(sfb->base.pixel_format, 0); + KASSERT((paddr & ~0x) == 0); + const uint32_t vir = __SHIFTIN(sfb->base.pitches[0] / 4, + WIN0_VIR_STRIDE); + WR4(sc, VOP_WIN0_VIR, vir); + /* Framebuffer start address */ WR4(sc, VOP_WIN0_YRGB_MST, (uint32_t)paddr); @@ -309,9 +316,6 @@ rk_vop_mode_set(struct drm_crtc *crtc, s WR4(sc, VOP_WIN0_COLOR_KEY, 0); - val = __SHIFTIN(hactive, WIN0_VIR_STRIDE); - WR4(sc, VOP_WIN0_VIR, val); - if (adjusted_mode->hdisplay > 2560) lb_mode = WIN0_LB_MODE_RGB_3840X2; else if (adjusted_mode->hdisplay > 1920)
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jakllsch Date: Tue Dec 17 18:30:51 UTC 2019 Modified Files: src/sys/arch/arm/rockchip: rk_vop.c Log Message: rkvop: set stride using virtual framebuffer width instead of display mode To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/rockchip/rk_vop.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/arm/rockchip
Module Name:src
Committed By: jakllsch
Date: Tue Dec 17 18:26:36 UTC 2019
Modified Files:
src/sys/arch/arm/rockchip: rk_dwhdmi.c rk_vop.c
Log Message:
Move drm_encoder from rkvop(4) to the SoC-layer output pipe drivers (rk_dwhdmi).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/rockchip/rk_dwhdmi.c \
src/sys/arch/arm/rockchip/rk_vop.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/arm/rockchip/rk_dwhdmi.c
diff -u src/sys/arch/arm/rockchip/rk_dwhdmi.c:1.3 src/sys/arch/arm/rockchip/rk_dwhdmi.c:1.4
--- src/sys/arch/arm/rockchip/rk_dwhdmi.c:1.3 Sat Nov 16 13:25:33 2019
+++ src/sys/arch/arm/rockchip/rk_dwhdmi.c Tue Dec 17 18:26:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_dwhdmi.c,v 1.3 2019/11/16 13:25:33 jmcneill Exp $ */
+/* $NetBSD: rk_dwhdmi.c,v 1.4 2019/12/17 18:26:36 jakllsch Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rk_dwhdmi.c,v 1.3 2019/11/16 13:25:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_dwhdmi.c,v 1.4 2019/12/17 18:26:36 jakllsch Exp $");
#include
#include
@@ -38,6 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: rk_dwhdmi.c,
#include
#include
+#include
#include
#include
@@ -85,12 +86,14 @@ struct rk_dwhdmi_softc {
struct fdt_device_ports sc_ports;
struct drm_display_mode sc_curmode;
+ struct drm_encoder sc_encoder;
struct syscon *sc_grf;
bool sc_activated;
};
#define to_rk_dwhdmi_softc(x) container_of(x, struct rk_dwhdmi_softc, sc_base)
+#define to_rk_dwhdmi_encoder(x) container_of(x, struct rk_dwhdmi_softc, sc_encoder)
static void
rk_dwhdmi_select_input(struct rk_dwhdmi_softc *sc, u_int crtc_index)
@@ -103,16 +106,69 @@ rk_dwhdmi_select_input(struct rk_dwhdmi_
syscon_unlock(sc->sc_grf);
}
+static bool
+rk_dwhdmi_encoder_mode_fixup(struct drm_encoder *encoder,
+const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode)
+{
+ return true;
+}
+
+static void
+rk_dwhdmi_encoder_mode_set(struct drm_encoder *encoder,
+struct drm_display_mode *mode, struct drm_display_mode *adjusted)
+{
+}
+
+static void
+rk_dwhdmi_encoder_enable(struct drm_encoder *encoder)
+{
+}
+
+static void
+rk_dwhdmi_encoder_disable(struct drm_encoder *encoder)
+{
+}
+
+static void
+rk_dwhdmi_encoder_prepare(struct drm_encoder *encoder)
+{
+ struct rk_dwhdmi_softc * const sc = to_rk_dwhdmi_encoder(encoder);
+ const u_int crtc_index = drm_crtc_index(encoder->crtc);
+
+ rk_dwhdmi_select_input(sc, crtc_index);
+}
+
+static void
+rk_dwhdmi_encoder_commit(struct drm_encoder *encoder)
+{
+}
+
+static const struct drm_encoder_funcs rk_dwhdmi_encoder_funcs = {
+ .destroy = drm_encoder_cleanup,
+};
+
+static const struct drm_encoder_helper_funcs rk_dwhdmi_encoder_helper_funcs = {
+ .prepare = rk_dwhdmi_encoder_prepare,
+ .mode_fixup = rk_dwhdmi_encoder_mode_fixup,
+ .mode_set = rk_dwhdmi_encoder_mode_set,
+ .enable = rk_dwhdmi_encoder_enable,
+ .disable = rk_dwhdmi_encoder_disable,
+ .commit = rk_dwhdmi_encoder_commit,
+};
+
static int
rk_dwhdmi_ep_activate(device_t dev, struct fdt_endpoint *ep, bool activate)
{
struct rk_dwhdmi_softc * const sc = device_private(dev);
struct fdt_endpoint *in_ep = fdt_endpoint_remote(ep);
struct fdt_endpoint *out_ep, *out_rep;
- struct drm_encoder *encoder;
- struct drm_bridge *bridge;
+ struct drm_crtc *crtc;
int error;
+ if (sc->sc_activated != false) {
+ return 0;
+ }
+
if (!activate)
return EINVAL;
@@ -120,27 +176,27 @@ rk_dwhdmi_ep_activate(device_t dev, stru
return EINVAL;
switch (fdt_endpoint_type(in_ep)) {
- case EP_DRM_ENCODER:
- encoder = fdt_endpoint_get_data(in_ep);
- break;
- case EP_DRM_BRIDGE:
- bridge = fdt_endpoint_get_data(in_ep);
- encoder = bridge->encoder;
+ case EP_DRM_CRTC:
+ crtc = fdt_endpoint_get_data(in_ep);
break;
default:
- encoder = NULL;
+ crtc = NULL;
break;
}
- if (encoder == NULL)
+ if (crtc == NULL)
return EINVAL;
- if (sc->sc_activated == false) {
- error = dwhdmi_bind(>sc_base, encoder);
- if (error != 0)
- return error;
- sc->sc_activated = true;
- }
+ sc->sc_encoder.possible_crtcs = 3; // 1U << drm_crtc_index(crtc); /* XXX */
+ drm_encoder_init(crtc->dev, >sc_encoder, _dwhdmi_encoder_funcs,
+ DRM_MODE_ENCODER_TMDS);
+ drm_encoder_helper_add(>sc_encoder, _dwhdmi_encoder_helper_funcs);
+
+ sc->sc_base.sc_connector.base.connector_type = DRM_MODE_CONNECTOR_HDMIA;
+ error = dwhdmi_bind(>sc_base, >sc_encoder);
+ if (error != 0)
+ return error;
+ sc->sc_activated = true;
out_ep = fdt_endpoint_get_from_index(>sc_ports, DWHDMI_PORT_OUTPUT, 0);
if (out_ep != NULL) {
@@ -162,17 +218,12 @@ rk_dwhdmi_ep_get_data(device_t dev, stru
{
struct rk_dwhdmi_softc * const sc = device_private(dev);
- return >sc_base.sc_bridge;
+ return >sc_encoder;
}
static void
rk_dwhdmi_enable(struct dwhdmi_softc *dsc)
{
-
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jakllsch Date: Tue Dec 17 18:26:36 UTC 2019 Modified Files: src/sys/arch/arm/rockchip: rk_dwhdmi.c rk_vop.c Log Message: Move drm_encoder from rkvop(4) to the SoC-layer output pipe drivers (rk_dwhdmi). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/rockchip/rk_dwhdmi.c \ src/sys/arch/arm/rockchip/rk_vop.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Tue Dec 17 18:16:05 UTC 2019 Modified Files: src/sys/kern: uipc_sem.c Log Message: ksem_sysinit(): more lossage. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/kern/uipc_sem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: ad
Date: Tue Dec 17 18:16:05 UTC 2019
Modified Files:
src/sys/kern: uipc_sem.c
Log Message:
ksem_sysinit(): more lossage.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/kern/uipc_sem.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/uipc_sem.c
diff -u src/sys/kern/uipc_sem.c:1.57 src/sys/kern/uipc_sem.c:1.58
--- src/sys/kern/uipc_sem.c:1.57 Tue Dec 17 18:10:36 2019
+++ src/sys/kern/uipc_sem.c Tue Dec 17 18:16:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_sem.c,v 1.57 2019/12/17 18:10:36 ad Exp $ */
+/* $NetBSD: uipc_sem.c,v 1.58 2019/12/17 18:16:05 ad Exp $ */
/*-
* Copyright (c) 2011, 2019 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.57 2019/12/17 18:10:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.58 2019/12/17 18:16:05 ad Exp $");
#include
#include
@@ -204,11 +204,6 @@ ksem_sysinit(void)
true, _pshared_hashmask);
KASSERT(ksem_pshared_hashtab != NULL);
- error = syscall_establish(NULL, ksem_syscalls);
- if (error) {
- (void)ksem_sysfini(false);
- }
-
ksem_listener = kauth_listen_scope(KAUTH_SCOPE_SYSTEM,
ksem_listener_cb, NULL);
@@ -235,6 +230,11 @@ ksem_sysinit(void)
NULL, 0, , 0,
CTL_CREATE, CTL_EOL);
+ error = syscall_establish(NULL, ksem_syscalls);
+ if (error) {
+ (void)ksem_sysfini(false);
+ }
+
return error;
}
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Tue Dec 17 18:10:36 UTC 2019 Modified Files: src/sys/kern: uipc_sem.c Log Message: Set ksem_max before installing the syscall package. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/kern/uipc_sem.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/uipc_sem.c diff -u src/sys/kern/uipc_sem.c:1.56 src/sys/kern/uipc_sem.c:1.57 --- src/sys/kern/uipc_sem.c:1.56 Sun Dec 15 20:25:25 2019 +++ src/sys/kern/uipc_sem.c Tue Dec 17 18:10:36 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_sem.c,v 1.56 2019/12/15 20:25:25 joerg Exp $ */ +/* $NetBSD: uipc_sem.c,v 1.57 2019/12/17 18:10:36 ad Exp $ */ /*- * Copyright (c) 2011, 2019 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.56 2019/12/15 20:25:25 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.57 2019/12/17 18:10:36 ad Exp $"); #include #include @@ -143,7 +143,7 @@ static const struct syscall_package ksem }; struct sysctllog *ksem_clog; -int ksem_max; +int ksem_max = KSEM_MAX; static int name_copyin(const char *uname, char **name) @@ -214,7 +214,6 @@ ksem_sysinit(void) /* Define module-specific sysctl tree */ - ksem_max = KSEM_MAX; ksem_clog = NULL; sysctl_createv(_clog, 0, NULL, ,
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Tue Dec 17 18:10:36 UTC 2019 Modified Files: src/sys/kern: uipc_sem.c Log Message: Set ksem_max before installing the syscall package. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/kern/uipc_sem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Tue Dec 17 18:08:15 UTC 2019 Modified Files: src/sys/kern: kern_sleepq.c Log Message: Fix LOCKDEBUG panic on mutex_init(). Reported-by: syzbot+5a77339dc0a55e8d8...@syzkaller.appspotmail.com To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/kern/kern_sleepq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: ad
Date: Tue Dec 17 18:08:15 UTC 2019
Modified Files:
src/sys/kern: kern_sleepq.c
Log Message:
Fix LOCKDEBUG panic on mutex_init().
Reported-by: syzbot+5a77339dc0a55e8d8...@syzkaller.appspotmail.com
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/kern/kern_sleepq.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/kern_sleepq.c
diff -u src/sys/kern/kern_sleepq.c:1.55 src/sys/kern/kern_sleepq.c:1.56
--- src/sys/kern/kern_sleepq.c:1.55 Mon Dec 16 19:43:36 2019
+++ src/sys/kern/kern_sleepq.c Tue Dec 17 18:08:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sleepq.c,v 1.55 2019/12/16 19:43:36 ad Exp $ */
+/* $NetBSD: kern_sleepq.c,v 1.56 2019/12/17 18:08:15 ad Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.55 2019/12/16 19:43:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.56 2019/12/17 18:08:15 ad Exp $");
#include
#include
@@ -76,12 +76,17 @@ sleepqlock_t sleepq_locks[SLEEPTAB_HASH_
void
sleeptab_init(sleeptab_t *st)
{
+ static bool again;
int i;
for (i = 0; i < SLEEPTAB_HASH_SIZE; i++) {
- mutex_init(_locks[i].lock, MUTEX_DEFAULT, IPL_SCHED);
+ if (!again) {
+ mutex_init(_locks[i].lock, MUTEX_DEFAULT,
+ IPL_SCHED);
+ }
sleepq_init(>st_queue[i]);
}
+ again = true;
}
/*
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jakllsch Date: Tue Dec 17 17:51:12 UTC 2019 Modified Files: src/sys/arch/arm/rockchip: rk3399_cru.c Log Message: rk3399_cru: implement dclk_vop0_frac and dclk_vop1_frac To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/rockchip/rk3399_cru.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/arm/rockchip
Module Name:src Committed By: jakllsch Date: Tue Dec 17 17:51:12 UTC 2019 Modified Files: src/sys/arch/arm/rockchip: rk3399_cru.c Log Message: rk3399_cru: implement dclk_vop0_frac and dclk_vop1_frac To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/rockchip/rk3399_cru.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/arm/rockchip/rk3399_cru.c diff -u src/sys/arch/arm/rockchip/rk3399_cru.c:1.16 src/sys/arch/arm/rockchip/rk3399_cru.c:1.17 --- src/sys/arch/arm/rockchip/rk3399_cru.c:1.16 Fri Nov 29 15:24:21 2019 +++ src/sys/arch/arm/rockchip/rk3399_cru.c Tue Dec 17 17:51:12 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rk3399_cru.c,v 1.16 2019/11/29 15:24:21 jakllsch Exp $ */ +/* $NetBSD: rk3399_cru.c,v 1.17 2019/12/17 17:51:12 jakllsch Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -28,7 +28,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: rk3399_cru.c,v 1.16 2019/11/29 15:24:21 jakllsch Exp $"); +__KERNEL_RCSID(1, "$NetBSD: rk3399_cru.c,v 1.17 2019/12/17 17:51:12 jakllsch Exp $"); #include #include @@ -879,6 +879,9 @@ static struct rk_cru_clk rk3399_cru_clks RK_COMPOSITE_SET_RATE_PARENT), RK_GATE(RK3399_ACLK_VOP0, "aclk_vop0", "aclk_vop0_pre", CLKGATE_CON(28), 3), RK_GATE(RK3399_HCLK_VOP0, "hclk_vop0", "hclk_vop0_pre", CLKGATE_CON(28), 2), + RK_COMPOSITE_FRAC(RK3399_DCLK_VOP0_FRAC, "dclk_vop0_frac", "dclk_vop0_div", + CLKSEL_CON(106), /* frac_reg */ + 0), RK_MUX(RK3399_DCLK_VOP0, "dclk_vop0", mux_dclk_vop0_parents, CLKSEL_CON(49), __BIT(11)), /* VOP1 */ @@ -904,6 +907,9 @@ static struct rk_cru_clk rk3399_cru_clks RK_COMPOSITE_SET_RATE_PARENT), RK_GATE(RK3399_ACLK_VOP1, "aclk_vop1", "aclk_vop1_pre", CLKGATE_CON(28), 7), RK_GATE(RK3399_HCLK_VOP1, "hclk_vop1", "hclk_vop1_pre", CLKGATE_CON(28), 6), + RK_COMPOSITE_FRAC(RK3399_DCLK_VOP1_FRAC, "dclk_vop1_frac", "dclk_vop1_div", + CLKSEL_CON(107), /* frac_reg */ + 0), RK_MUX(RK3399_DCLK_VOP1, "dclk_vop1", mux_dclk_vop1_parents, CLKSEL_CON(50), __BIT(11)), /* VIO */
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 16:35:52 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ticket #1718 To generate a diff of this commit: cvs rdiff -u -r1.1.2.157 -r1.1.2.158 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.157 src/doc/CHANGES-7.0.3:1.1.2.158 --- src/doc/CHANGES-7.0.3:1.1.2.157 Sun Dec 8 10:27:54 2019 +++ src/doc/CHANGES-7.0.3 Tue Dec 17 16:35:52 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.157 2019/12/08 10:27:54 martin Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.158 2019/12/17 16:35:52 martin Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -5931,3 +5931,8 @@ sys/dev/cons.c 1.76,1.77 Fix reference count leak in cons(4). [riastradh, ticket #1717] +sys/dev/ic/ath.c1.129 + + Protect network ioctls from non-authorized users. + [christos, ticket #1718] +
CVS commit: [netbsd-7-0] src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Tue Dec 17 16:35:28 UTC 2019
Modified Files:
src/sys/dev/ic [netbsd-7-0]: ath.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1718):
sys/dev/ic/ath.c: revision 1.129
Protect network ioctls from non-authorized users. (Ilja Van Sprundel)
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.116.6.1 src/sys/dev/ic/ath.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/ath.c
diff -u src/sys/dev/ic/ath.c:1.116 src/sys/dev/ic/ath.c:1.116.6.1
--- src/sys/dev/ic/ath.c:1.116 Thu Sep 12 12:17:53 2013
+++ src/sys/dev/ic/ath.c Tue Dec 17 16:35:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.116 2013/09/12 12:17:53 martin Exp $ */
+/* $NetBSD: ath.c,v 1.116.6.1 2019/12/17 16:35:28 martin Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.116 2013/09/12 12:17:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.116.6.1 2019/12/17 16:35:28 martin Exp $");
#endif
/*
@@ -69,6 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.11
#include
#include
#include
+#include
#include
#include
@@ -5362,6 +5363,12 @@ ath_ioctl(struct ifnet *ifp, u_long cmd,
return copyout(>sc_stats,
ifr->ifr_data, sizeof (sc->sc_stats));
case SIOCGATHDIAG:
+ error = kauth_authorize_network(curlwp->l_cred,
+ KAUTH_NETWORK_INTERFACE,
+ KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, KAUTH_ARG(cmd),
+ NULL);
+ if (error)
+ break;
error = ath_ioctl_diag(sc, (struct ath_diag *) ifr);
break;
default:
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 16:35:52 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ticket #1718 To generate a diff of this commit: cvs rdiff -u -r1.1.2.157 -r1.1.2.158 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-0] src/sys/dev/ic
Module Name:src Committed By: martin Date: Tue Dec 17 16:35:28 UTC 2019 Modified Files: src/sys/dev/ic [netbsd-7-0]: ath.c Log Message: Pull up following revision(s) (requested by christos in ticket #1718): sys/dev/ic/ath.c: revision 1.129 Protect network ioctls from non-authorized users. (Ilja Van Sprundel) To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.116.6.1 src/sys/dev/ic/ath.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 16:34:54 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Ticket #1718 To generate a diff of this commit: cvs rdiff -u -r1.1.2.64 -r1.1.2.65 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-1] src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Tue Dec 17 16:34:26 UTC 2019
Modified Files:
src/sys/dev/ic [netbsd-7-1]: ath.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1718):
sys/dev/ic/ath.c: revision 1.129
Protect network ioctls from non-authorized users. (Ilja Van Sprundel)
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.116.10.1 src/sys/dev/ic/ath.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/ath.c
diff -u src/sys/dev/ic/ath.c:1.116 src/sys/dev/ic/ath.c:1.116.10.1
--- src/sys/dev/ic/ath.c:1.116 Thu Sep 12 12:17:53 2013
+++ src/sys/dev/ic/ath.c Tue Dec 17 16:34:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.116 2013/09/12 12:17:53 martin Exp $ */
+/* $NetBSD: ath.c,v 1.116.10.1 2019/12/17 16:34:26 martin Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.116 2013/09/12 12:17:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.116.10.1 2019/12/17 16:34:26 martin Exp $");
#endif
/*
@@ -69,6 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.11
#include
#include
#include
+#include
#include
#include
@@ -5362,6 +5363,12 @@ ath_ioctl(struct ifnet *ifp, u_long cmd,
return copyout(>sc_stats,
ifr->ifr_data, sizeof (sc->sc_stats));
case SIOCGATHDIAG:
+ error = kauth_authorize_network(curlwp->l_cred,
+ KAUTH_NETWORK_INTERFACE,
+ KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, KAUTH_ARG(cmd),
+ NULL);
+ if (error)
+ break;
error = ath_ioctl_diag(sc, (struct ath_diag *) ifr);
break;
default:
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 16:34:54 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Ticket #1718 To generate a diff of this commit: cvs rdiff -u -r1.1.2.64 -r1.1.2.65 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1.3 diff -u src/doc/CHANGES-7.1.3:1.1.2.64 src/doc/CHANGES-7.1.3:1.1.2.65 --- src/doc/CHANGES-7.1.3:1.1.2.64 Sun Dec 8 10:27:05 2019 +++ src/doc/CHANGES-7.1.3 Tue Dec 17 16:34:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1.3,v 1.1.2.64 2019/12/08 10:27:05 martin Exp $ +# $NetBSD: CHANGES-7.1.3,v 1.1.2.65 2019/12/17 16:34:54 martin Exp $ A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3 release: @@ -623,3 +623,8 @@ sys/dev/cons.c 1.76,1.77 Fix reference count leak in cons(4). [riastradh, ticket #1717] +sys/dev/ic/ath.c1.129 + + Protect network ioctls from non-authorized users. + [christos, ticket #1718] +
CVS commit: [netbsd-7-1] src/sys/dev/ic
Module Name:src Committed By: martin Date: Tue Dec 17 16:34:26 UTC 2019 Modified Files: src/sys/dev/ic [netbsd-7-1]: ath.c Log Message: Pull up following revision(s) (requested by christos in ticket #1718): sys/dev/ic/ath.c: revision 1.129 Protect network ioctls from non-authorized users. (Ilja Van Sprundel) To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.116.10.1 src/sys/dev/ic/ath.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 16:33:57 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1718 To generate a diff of this commit: cvs rdiff -u -r1.1.2.72 -r1.1.2.73 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.72 src/doc/CHANGES-7.3:1.1.2.73 --- src/doc/CHANGES-7.3:1.1.2.72 Sun Dec 8 10:26:08 2019 +++ src/doc/CHANGES-7.3 Tue Dec 17 16:33:57 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.72 2019/12/08 10:26:08 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.73 2019/12/17 16:33:57 martin Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -749,3 +749,8 @@ sys/dev/cons.c 1.76,1.77 Fix reference count leak in cons(4). [riastradh, ticket #1717] +sys/dev/ic/ath.c1.129 + + Protect network ioctls from non-authorized users. + [christos, ticket #1718] +
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 16:33:57 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1718 To generate a diff of this commit: cvs rdiff -u -r1.1.2.72 -r1.1.2.73 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Tue Dec 17 16:32:51 UTC 2019
Modified Files:
src/sys/dev/ic [netbsd-7]: ath.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1718):
sys/dev/ic/ath.c: revision 1.129
Protect network ioctls from non-authorized users. (Ilja Van Sprundel)
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.116.4.1 src/sys/dev/ic/ath.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/ath.c
diff -u src/sys/dev/ic/ath.c:1.116 src/sys/dev/ic/ath.c:1.116.4.1
--- src/sys/dev/ic/ath.c:1.116 Thu Sep 12 12:17:53 2013
+++ src/sys/dev/ic/ath.c Tue Dec 17 16:32:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.116 2013/09/12 12:17:53 martin Exp $ */
+/* $NetBSD: ath.c,v 1.116.4.1 2019/12/17 16:32:51 martin Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.116 2013/09/12 12:17:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.116.4.1 2019/12/17 16:32:51 martin Exp $");
#endif
/*
@@ -69,6 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.11
#include
#include
#include
+#include
#include
#include
@@ -5362,6 +5363,12 @@ ath_ioctl(struct ifnet *ifp, u_long cmd,
return copyout(>sc_stats,
ifr->ifr_data, sizeof (sc->sc_stats));
case SIOCGATHDIAG:
+ error = kauth_authorize_network(curlwp->l_cred,
+ KAUTH_NETWORK_INTERFACE,
+ KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, KAUTH_ARG(cmd),
+ NULL);
+ if (error)
+ break;
error = ath_ioctl_diag(sc, (struct ath_diag *) ifr);
break;
default:
CVS commit: [netbsd-7] src/sys/dev/ic
Module Name:src Committed By: martin Date: Tue Dec 17 16:32:51 UTC 2019 Modified Files: src/sys/dev/ic [netbsd-7]: ath.c Log Message: Pull up following revision(s) (requested by christos in ticket #1718): sys/dev/ic/ath.c: revision 1.129 Protect network ioctls from non-authorized users. (Ilja Van Sprundel) To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.116.4.1 src/sys/dev/ic/ath.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 16:20:28 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1475 To generate a diff of this commit: cvs rdiff -u -r1.1.2.81 -r1.1.2.82 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.81 src/doc/CHANGES-8.2:1.1.2.82 --- src/doc/CHANGES-8.2:1.1.2.81 Tue Dec 17 12:22:23 2019 +++ src/doc/CHANGES-8.2 Tue Dec 17 16:20:28 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.81 2019/12/17 12:22:23 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.82 2019/12/17 16:20:28 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -1808,3 +1808,8 @@ sys/arch/i386/stand/lib/biosdisk.c 1.54 Do not use NAME=label syntax when label are empty. [manu, ticket #1474] +sys/dev/ic/ath.c1.129 + + Protect network ioctls from non-authorized users. + [christos, ticket #1475] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 16:20:28 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1475 To generate a diff of this commit: cvs rdiff -u -r1.1.2.81 -r1.1.2.82 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/ic
Module Name:src Committed By: martin Date: Tue Dec 17 16:18:50 UTC 2019 Modified Files: src/sys/dev/ic [netbsd-8]: ath.c Log Message: Pull up following revision(s) (requested by christos in ticket #1475): sys/dev/ic/ath.c: revision 1.129 Protect network ioctls from non-authorized users. (Ilja Van Sprundel) To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.123.6.1 src/sys/dev/ic/ath.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Tue Dec 17 16:18:50 UTC 2019
Modified Files:
src/sys/dev/ic [netbsd-8]: ath.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1475):
sys/dev/ic/ath.c: revision 1.129
Protect network ioctls from non-authorized users. (Ilja Van Sprundel)
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.123.6.1 src/sys/dev/ic/ath.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/ath.c
diff -u src/sys/dev/ic/ath.c:1.123 src/sys/dev/ic/ath.c:1.123.6.1
--- src/sys/dev/ic/ath.c:1.123 Thu Feb 2 10:05:35 2017
+++ src/sys/dev/ic/ath.c Tue Dec 17 16:18:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.123 2017/02/02 10:05:35 nonaka Exp $ */
+/* $NetBSD: ath.c,v 1.123.6.1 2019/12/17 16:18:50 martin Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.123 2017/02/02 10:05:35 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.123.6.1 2019/12/17 16:18:50 martin Exp $");
#endif
/*
@@ -69,6 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.12
#include
#include
#include
+#include
#include
#include
@@ -5435,6 +5436,12 @@ ath_ioctl(struct ifnet *ifp, u_long cmd,
return copyout(>sc_stats,
ifr->ifr_data, sizeof (sc->sc_stats));
case SIOCGATHDIAG:
+ error = kauth_authorize_network(curlwp->l_cred,
+ KAUTH_NETWORK_INTERFACE,
+ KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, KAUTH_ARG(cmd),
+ NULL);
+ if (error)
+ break;
error = ath_ioctl_diag(sc, (struct ath_diag *) ifr);
break;
default:
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 16:14:26 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #569 To generate a diff of this commit: cvs rdiff -u -r1.1.2.143 -r1.1.2.144 src/doc/CHANGES-9.0 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.0 diff -u src/doc/CHANGES-9.0:1.1.2.143 src/doc/CHANGES-9.0:1.1.2.144 --- src/doc/CHANGES-9.0:1.1.2.143 Tue Dec 17 13:03:05 2019 +++ src/doc/CHANGES-9.0 Tue Dec 17 16:14:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.143 2019/12/17 13:03:05 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.144 2019/12/17 16:14:25 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -7184,3 +7184,10 @@ sys/arch/i386/stand/lib/biosdisk.c 1.54 Do not use NAME=label syntax when label are empty. [manu, ticket #568] +sys/dev/ic/ath.c1.129 +sys/dev/usb/if_umb.c1.10 +sys/net/if.c 1.466 + + Protect network ioctls from non-authorized users. + [christos, ticket #569] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 16:14:26 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #569 To generate a diff of this commit: cvs rdiff -u -r1.1.2.143 -r1.1.2.144 src/doc/CHANGES-9.0 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
Module Name:src
Committed By: martin
Date: Tue Dec 17 16:12:54 UTC 2019
Modified Files:
src/sys/dev/ic [netbsd-9]: ath.c
src/sys/dev/usb [netbsd-9]: if_umb.c
src/sys/net [netbsd-9]: if.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #569):
sys/dev/usb/if_umb.c: revision 1.10
sys/net/if.c: revision 1.466
sys/dev/ic/ath.c: revision 1.129
Protect network ioctls from non-authorized users. (Ilja Van Sprundel)
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.127.2.1 src/sys/dev/ic/ath.c
cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/dev/usb/if_umb.c
cvs rdiff -u -r1.457.2.2 -r1.457.2.3 src/sys/net/if.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/ath.c
diff -u src/sys/dev/ic/ath.c:1.127 src/sys/dev/ic/ath.c:1.127.2.1
--- src/sys/dev/ic/ath.c:1.127 Tue May 28 07:41:48 2019
+++ src/sys/dev/ic/ath.c Tue Dec 17 16:12:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.127 2019/05/28 07:41:48 msaitoh Exp $ */
+/* $NetBSD: ath.c,v 1.127.2.1 2019/12/17 16:12:54 martin Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.127 2019/05/28 07:41:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.127.2.1 2019/12/17 16:12:54 martin Exp $");
#endif
/*
@@ -69,6 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.12
#include
#include
#include
+#include
#include
#include
@@ -5441,6 +5442,12 @@ ath_ioctl(struct ifnet *ifp, u_long cmd,
return copyout(>sc_stats,
ifr->ifr_data, sizeof (sc->sc_stats));
case SIOCGATHDIAG:
+ error = kauth_authorize_network(curlwp->l_cred,
+ KAUTH_NETWORK_INTERFACE,
+ KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, KAUTH_ARG(cmd),
+ NULL);
+ if (error)
+ break;
error = ath_ioctl_diag(sc, (struct ath_diag *) ifr);
break;
default:
Index: src/sys/dev/usb/if_umb.c
diff -u src/sys/dev/usb/if_umb.c:1.9 src/sys/dev/usb/if_umb.c:1.9.2.1
--- src/sys/dev/usb/if_umb.c:1.9 Wed Jun 26 22:58:58 2019
+++ src/sys/dev/usb/if_umb.c Tue Dec 17 16:12:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_umb.c,v 1.9 2019/06/26 22:58:58 khorben Exp $ */
+/* $NetBSD: if_umb.c,v 1.9.2.1 2019/12/17 16:12:53 martin Exp $ */
/* $OpenBSD: if_umb.c,v 1.20 2018/09/10 17:00:45 gerhard Exp $ */
/*
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_umb.c,v 1.9 2019/06/26 22:58:58 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_umb.c,v 1.9.2.1 2019/12/17 16:12:53 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -779,6 +779,12 @@ umb_ioctl(struct ifnet *ifp, u_long cmd,
usb_add_task(sc->sc_udev, >sc_umb_task, USB_TASKQ_DRIVER);
break;
case SIOCGUMBINFO:
+ error = kauth_authorize_network(curlwp->l_cred,
+ KAUTH_NETWORK_INTERFACE,
+ KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, KAUTH_ARG(cmd),
+ NULL);
+ if (error)
+ break;
error = copyout(>sc_info, ifr->ifr_data,
sizeof(sc->sc_info));
break;
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.457.2.2 src/sys/net/if.c:1.457.2.3
--- src/sys/net/if.c:1.457.2.2 Tue Sep 24 03:10:35 2019
+++ src/sys/net/if.c Tue Dec 17 16:12:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.457.2.2 2019/09/24 03:10:35 martin Exp $ */
+/* $NetBSD: if.c,v 1.457.2.3 2019/12/17 16:12:54 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.457.2.2 2019/09/24 03:10:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.457.2.3 2019/12/17 16:12:54 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -2971,7 +2971,9 @@ ifioctl_common(struct ifnet *ifp, u_long
struct ifreq *ifr;
struct ifcapreq *ifcr;
struct ifdatareq *ifdr;
-
+ char *descr;
+ int error;
+
switch (cmd) {
case SIOCSIFCAP:
ifcr = data;
@@ -3120,55 +3122,53 @@ ifioctl_common(struct ifnet *ifp, u_long
#endif
return ENETRESET;
case SIOCSIFDESCR:
- {
- char *descrbuf;
+ error = kauth_authorize_network(curlwp->l_cred,
+ KAUTH_NETWORK_INTERFACE,
+ KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, KAUTH_ARG(cmd),
+ NULL);
+ if (error)
+ return error;
- ifr = data;
+ ifr = data;
- if (ifr->ifr_buflen > IFDESCRSIZE)
-return ENAMETOOLONG;
+ if (ifr->ifr_buflen > IFDESCRSIZE)
+ return ENAMETOOLONG;
- if (ifr->ifr_buf == NULL || ifr->ifr_buflen == 0) {
-/* unset description */
-descrbuf = NULL;
- } else {
-int error;
-
- descrbuf = kmem_zalloc(IFDESCRSIZE, KM_SLEEP);
-/* copy (IFDESCRSIZE - 1) bytes to ensure terminating nul */
-error = copyin(ifr->ifr_buf, descrbuf, IFDESCRSIZE - 1);
-if (error) {
- kmem_free(descrbuf, IFDESCRSIZE);
- return error;
-
CVS commit: [netbsd-9] src/sys
Module Name:src Committed By: martin Date: Tue Dec 17 16:12:54 UTC 2019 Modified Files: src/sys/dev/ic [netbsd-9]: ath.c src/sys/dev/usb [netbsd-9]: if_umb.c src/sys/net [netbsd-9]: if.c Log Message: Pull up following revision(s) (requested by christos in ticket #569): sys/dev/usb/if_umb.c: revision 1.10 sys/net/if.c: revision 1.466 sys/dev/ic/ath.c: revision 1.129 Protect network ioctls from non-authorized users. (Ilja Van Sprundel) To generate a diff of this commit: cvs rdiff -u -r1.127 -r1.127.2.1 src/sys/dev/ic/ath.c cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/dev/usb/if_umb.c cvs rdiff -u -r1.457.2.2 -r1.457.2.3 src/sys/net/if.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/file/lib
Module Name:src
Committed By: christos
Date: Tue Dec 17 13:35:43 UTC 2019
Modified Files:
src/external/bsd/file/lib: Makefile
Log Message:
Add more libraries
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/file/lib/Makefile
diff -u src/external/bsd/file/lib/Makefile:1.13 src/external/bsd/file/lib/Makefile:1.14
--- src/external/bsd/file/lib/Makefile:1.13 Mon Dec 16 21:31:06 2019
+++ src/external/bsd/file/lib/Makefile Tue Dec 17 08:35:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/12/17 02:31:06 christos Exp $
+# $NetBSD: Makefile,v 1.14 2019/12/17 13:35:43 christos Exp $
#
USE_FORT?= yes # data driven bugs?
@@ -8,6 +8,8 @@ USE_FORT?= yes # data driven bugs?
.include "../Makefile.inc"
LIB= magic
+LIBDPLIBS+= lzma ${NETBSDSRCDIR}/external/public-domain/xz/lib
+LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
CPPFLAGS+=-I.
CVS commit: src/external/bsd/file/lib
Module Name:src Committed By: christos Date: Tue Dec 17 13:35:43 UTC 2019 Modified Files: src/external/bsd/file/lib: Makefile Log Message: Add more libraries To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm/pmap
Module Name:src Committed By: skrll Date: Tue Dec 17 13:25:50 UTC 2019 Modified Files: src/sys/uvm/pmap: pmap_tlb.c Log Message: Fix a UVMHIST_LOG format To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/uvm/pmap/pmap_tlb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm/pmap
Module Name:src Committed By: skrll Date: Tue Dec 17 13:25:50 UTC 2019 Modified Files: src/sys/uvm/pmap: pmap_tlb.c Log Message: Fix a UVMHIST_LOG format To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/uvm/pmap/pmap_tlb.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/uvm/pmap/pmap_tlb.c diff -u src/sys/uvm/pmap/pmap_tlb.c:1.28 src/sys/uvm/pmap/pmap_tlb.c:1.29 --- src/sys/uvm/pmap/pmap_tlb.c:1.28 Sun Feb 25 21:43:03 2018 +++ src/sys/uvm/pmap/pmap_tlb.c Tue Dec 17 13:25:50 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_tlb.c,v 1.28 2018/02/25 21:43:03 jdolecek Exp $ */ +/* $NetBSD: pmap_tlb.c,v 1.29 2019/12/17 13:25:50 skrll Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.28 2018/02/25 21:43:03 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.29 2019/12/17 13:25:50 skrll Exp $"); /* * Manages address spaces in a TLB. @@ -734,7 +734,7 @@ pmap_tlb_update_addr(pmap_t pm, vaddr_t UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist); UVMHIST_LOG(maphist, - " (pm=%#jx va=%#j, pte=%#jx flags=%#jx)", + " (pm=%#jx va=%#jx, pte=%#jx flags=%#jx)", (uintptr_t)pm, va, pte_value(pte), flags); KASSERT(kpreempt_disabled());
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 13:03:05 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #562 - #568 To generate a diff of this commit: cvs rdiff -u -r1.1.2.142 -r1.1.2.143 src/doc/CHANGES-9.0 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 Dec 17 13:03:05 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #562 - #568 To generate a diff of this commit: cvs rdiff -u -r1.1.2.142 -r1.1.2.143 src/doc/CHANGES-9.0 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.0 diff -u src/doc/CHANGES-9.0:1.1.2.142 src/doc/CHANGES-9.0:1.1.2.143 --- src/doc/CHANGES-9.0:1.1.2.142 Tue Dec 17 12:38:16 2019 +++ src/doc/CHANGES-9.0 Tue Dec 17 13:03:05 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.142 2019/12/17 12:38:16 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.143 2019/12/17 13:03:05 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -7143,3 +7143,44 @@ sys/arch/arm/arm/efi_runtime.h 1.3 Enable FP access for EFI RT and improve error handling. [jmcneill, ticket #558] +sys/arch/arm/sunxi/sunxi_drm.c 1.11 + + Make sure memory stolen from simplefb is page aligned. + [jmcneill, ticket #562] + +sbin/rndctl/Makefile1.4 (adapted) +sbin/rndctl/namespace.h1.1 +sbin/rndctl/rndctl.81.23 +sbin/rndctl/rndctl.c1.31 + + Teach `rndctl -L' to update the seed file, not just delete it. + [riastradh, ticket #563] + +external/cddl/osnet/sys/sys/opentypes.h 1.5 + + Avoid redefining uint_t if compat_defs.h already defines them. + [riastradh, ticket #564] + +sys/dev/usb/usbnet.c1.31-1.33 + + Fix null pointer dereferences in usbnet detach logic. + [riastradh, ticket #565] + +sys/arch/x86/x86/bus_space.c 1.42,1.43 + + Use LFENCE/SFENCE/MFENCE in x86 bus_space_barrier. + [riastradh, ticket #566] + +sys/arch/i386/stand/boot/devopen.c 1.10 +sys/arch/i386/stand/efiboot/devopen.c 1.9 +sys/arch/i386/stand/lib/biosdisk.c 1.53 + + In-RAID partitions with no name can be candidate for booting. + [manu, ticket #567] + +sys/arch/i386/stand/efiboot/efidisk.c 1.9 +sys/arch/i386/stand/lib/biosdisk.c 1.54 + + Do not use NAME=label syntax when label are empty. + [manu, ticket #568] +
CVS commit: [netbsd-9] src/sys/arch/i386/stand
Module Name:src
Committed By: martin
Date: Tue Dec 17 13:01:39 UTC 2019
Modified Files:
src/sys/arch/i386/stand/efiboot [netbsd-9]: efidisk.c
src/sys/arch/i386/stand/lib [netbsd-9]: biosdisk.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #568):
sys/arch/i386/stand/lib/biosdisk.c: revision 1.54
sys/arch/i386/stand/efiboot/efidisk.c: revision 1.9
Do not use NAME=label syntax when label are empty
When booting sysinst from UEFI, it defaults to a GPT installation
where partition have no labels. Bootstrap used the NAME=label partition
anyway, with the result that both EFI and FFS root partition had
the same name "NAME=" and could not be distinguished. The first matching
partition for the name was used, and bootstrap looked for the kernel
in the EFI partition.
We fix that by not using NAME=label names for partition when label
is empty. In that case we revert to old syntax such as hd0b
To generate a diff of this commit:
cvs rdiff -u -r1.7.4.1 -r1.7.4.2 src/sys/arch/i386/stand/efiboot/efidisk.c
cvs rdiff -u -r1.49.6.3 -r1.49.6.4 src/sys/arch/i386/stand/lib/biosdisk.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/i386/stand/efiboot/efidisk.c
diff -u src/sys/arch/i386/stand/efiboot/efidisk.c:1.7.4.1 src/sys/arch/i386/stand/efiboot/efidisk.c:1.7.4.2
--- src/sys/arch/i386/stand/efiboot/efidisk.c:1.7.4.1 Fri Sep 13 07:00:13 2019
+++ src/sys/arch/i386/stand/efiboot/efidisk.c Tue Dec 17 13:01:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efidisk.c,v 1.7.4.1 2019/09/13 07:00:13 martin Exp $ */
+/* $NetBSD: efidisk.c,v 1.7.4.2 2019/12/17 13:01:39 martin Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -253,7 +253,7 @@ efi_disk_show(void)
printf(" ");
first = false;
}
- if (part[i].part_name != NULL)
+ if (part[i].part_name && part[i].part_name[0])
printf(" NAME=%s(", part[i].part_name);
else
printf(" hd%d%c(", edi->dev & 0x7f, i + 'a');
@@ -308,7 +308,7 @@ efi_disk_show(void)
printf(" ");
first = 0;
}
- if (part[j].part_name != NULL)
+ if (part[j].part_name && part[j].part_name[0])
printf(" NAME=%s(", part[j].part_name);
else
printf(" raid%d%c(",
Index: src/sys/arch/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.49.6.3 src/sys/arch/i386/stand/lib/biosdisk.c:1.49.6.4
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.49.6.3 Tue Dec 17 12:59:52 2019
+++ src/sys/arch/i386/stand/lib/biosdisk.c Tue Dec 17 13:01:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.c,v 1.49.6.3 2019/12/17 12:59:52 martin Exp $ */
+/* $NetBSD: biosdisk.c,v 1.49.6.4 2019/12/17 13:01:39 martin Exp $ */
/*
* Copyright (c) 1996, 1998
@@ -908,7 +908,8 @@ biosdisk_probe(void)
first = 0;
}
#ifndef NO_GPT
- if (d->part[part].part_name != NULL)
+ if (d->part[part].part_name &&
+ d->part[part].part_name[0])
printf(" NAME=%s(", d->part[part].part_name);
else
#endif
@@ -987,7 +988,8 @@ next_disk:
first = 0;
}
#ifndef NO_GPT
- if (d->part[part].part_name != NULL)
+ if (d->part[part].part_name &&
+ d->part[part].part_name[0])
printf(" NAME=%s(", d->part[part].part_name);
else
#endif
@@ -1095,7 +1097,9 @@ biosdisk_findpartition(int biosdev, dadd
*partition = boot_part;
#ifndef NO_GPT
- if (part_name && d->part[boot_part].part_name) {
+ if (part_name &&
+ d->part[boot_part].part_name &&
+ d->part[boot_part].part_name[0]) {
strlcpy(namebuf, d->part[boot_part].part_name,
BIOSDISK_PART_NAME_LEN);
*part_name = namebuf;
CVS commit: [netbsd-9] src/sys/arch/i386/stand
Module Name:src Committed By: martin Date: Tue Dec 17 13:01:39 UTC 2019 Modified Files: src/sys/arch/i386/stand/efiboot [netbsd-9]: efidisk.c src/sys/arch/i386/stand/lib [netbsd-9]: biosdisk.c Log Message: Pull up following revision(s) (requested by manu in ticket #568): sys/arch/i386/stand/lib/biosdisk.c: revision 1.54 sys/arch/i386/stand/efiboot/efidisk.c: revision 1.9 Do not use NAME=label syntax when label are empty When booting sysinst from UEFI, it defaults to a GPT installation where partition have no labels. Bootstrap used the NAME=label partition anyway, with the result that both EFI and FFS root partition had the same name "NAME=" and could not be distinguished. The first matching partition for the name was used, and bootstrap looked for the kernel in the EFI partition. We fix that by not using NAME=label names for partition when label is empty. In that case we revert to old syntax such as hd0b To generate a diff of this commit: cvs rdiff -u -r1.7.4.1 -r1.7.4.2 src/sys/arch/i386/stand/efiboot/efidisk.c cvs rdiff -u -r1.49.6.3 -r1.49.6.4 src/sys/arch/i386/stand/lib/biosdisk.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/arch/i386/stand
Module Name:src
Committed By: martin
Date: Tue Dec 17 12:59:53 UTC 2019
Modified Files:
src/sys/arch/i386/stand/boot [netbsd-9]: devopen.c
src/sys/arch/i386/stand/efiboot [netbsd-9]: devopen.c
src/sys/arch/i386/stand/lib [netbsd-9]: biosdisk.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #567):
sys/arch/i386/stand/lib/biosdisk.c: revision 1.53
sys/arch/i386/stand/efiboot/devopen.c: revision 1.9
sys/arch/i386/stand/boot/devopen.c: revision 1.10
In-RAID partitions with no name can be candidate for booting
The code to select boot partition in RAID assumed thet had a name,
which is true when there is a GPT inside the RAID, but not when there
is a disklabel inside the RAID. This caused a regression from behavior
of NetBSD 8.1.
We fix this by allowing nameless partition to be boot candidates.
This fixes misc/54748
While there, let raid device be used in the boot specification, like
raid0a:/netbsd.
To generate a diff of this commit:
cvs rdiff -u -r1.8.64.1 -r1.8.64.2 src/sys/arch/i386/stand/boot/devopen.c
cvs rdiff -u -r1.5.6.2 -r1.5.6.3 src/sys/arch/i386/stand/efiboot/devopen.c
cvs rdiff -u -r1.49.6.2 -r1.49.6.3 src/sys/arch/i386/stand/lib/biosdisk.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/i386/stand/boot/devopen.c
diff -u src/sys/arch/i386/stand/boot/devopen.c:1.8.64.1 src/sys/arch/i386/stand/boot/devopen.c:1.8.64.2
--- src/sys/arch/i386/stand/boot/devopen.c:1.8.64.1 Fri Sep 13 07:00:13 2019
+++ src/sys/arch/i386/stand/boot/devopen.c Tue Dec 17 12:59:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.8.64.1 2019/09/13 07:00:13 martin Exp $ */
+/* $NetBSD: devopen.c,v 1.8.64.2 2019/12/17 12:59:52 martin Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -156,7 +156,7 @@ devopen(struct open_file *f, const char
if (strstr(devname, "raid") == devname) {
f->f_dev = [0]; /* must be biosdisk */
- return biosdisk_open_name(f, devname);
+ return biosdisk_open_name(f, fname);
}
#endif
Index: src/sys/arch/i386/stand/efiboot/devopen.c
diff -u src/sys/arch/i386/stand/efiboot/devopen.c:1.5.6.2 src/sys/arch/i386/stand/efiboot/devopen.c:1.5.6.3
--- src/sys/arch/i386/stand/efiboot/devopen.c:1.5.6.2 Fri Sep 27 09:32:22 2019
+++ src/sys/arch/i386/stand/efiboot/devopen.c Tue Dec 17 12:59:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.5.6.2 2019/09/27 09:32:22 martin Exp $ */
+/* $NetBSD: devopen.c,v 1.5.6.3 2019/12/17 12:59:52 martin Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -151,6 +151,7 @@ int
devopen(struct open_file *f, const char *fname, char **file)
{
char *fsname, *devname;
+ const char *xname = NULL;
int unit, partition;
int biosdev;
int i, error;
@@ -172,8 +173,12 @@ devopen(struct open_file *f, const char
nfsys = nfsys_disk;
/* Search by GPT label or raidframe name */
- if ((strstr(devname, "NAME=") == devname) ||
- (strstr(devname, "raid") == devname)) {
+ if (strstr(devname, "NAME=") == devname)
+ xname = devname;
+ if (strstr(devname, "raid") == devname)
+ xname = fname;
+
+ if (xname != NULL) {
f->f_dev = [0]; /* must be biosdisk */
if (!kernel_loaded) {
@@ -181,7 +186,7 @@ devopen(struct open_file *f, const char
BI_ADD(, BTINFO_BOOTPATH, sizeof(bibp));
}
- error = biosdisk_open_name(f, devname);
+ error = biosdisk_open_name(f, xname);
return error;
}
Index: src/sys/arch/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.49.6.2 src/sys/arch/i386/stand/lib/biosdisk.c:1.49.6.3
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.49.6.2 Tue Sep 17 19:31:59 2019
+++ src/sys/arch/i386/stand/lib/biosdisk.c Tue Dec 17 12:59:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.c,v 1.49.6.2 2019/09/17 19:31:59 martin Exp $ */
+/* $NetBSD: biosdisk.c,v 1.49.6.3 2019/12/17 12:59:52 martin Exp $ */
/*
* Copyright (c) 1996, 1998
@@ -1401,9 +1401,9 @@ next_disk:
continue;
if (d->part[part].fstype == FS_UNUSED)
continue;
- if (d->part[part].part_name == NULL)
-continue;
- if (strcmp(d->part[part].part_name, name) == 0) {
+
+ if (d->part[part].part_name != NULL &&
+ strcmp(d->part[part].part_name, name) == 0) {
*biosdev = raidframe[i].biosdev;
*offset = raidframe[i].offset
+ RF_PROTECTED_SECTORS
CVS commit: [netbsd-9] src/sys/arch/i386/stand
Module Name:src Committed By: martin Date: Tue Dec 17 12:59:53 UTC 2019 Modified Files: src/sys/arch/i386/stand/boot [netbsd-9]: devopen.c src/sys/arch/i386/stand/efiboot [netbsd-9]: devopen.c src/sys/arch/i386/stand/lib [netbsd-9]: biosdisk.c Log Message: Pull up following revision(s) (requested by manu in ticket #567): sys/arch/i386/stand/lib/biosdisk.c: revision 1.53 sys/arch/i386/stand/efiboot/devopen.c: revision 1.9 sys/arch/i386/stand/boot/devopen.c: revision 1.10 In-RAID partitions with no name can be candidate for booting The code to select boot partition in RAID assumed thet had a name, which is true when there is a GPT inside the RAID, but not when there is a disklabel inside the RAID. This caused a regression from behavior of NetBSD 8.1. We fix this by allowing nameless partition to be boot candidates. This fixes misc/54748 While there, let raid device be used in the boot specification, like raid0a:/netbsd. To generate a diff of this commit: cvs rdiff -u -r1.8.64.1 -r1.8.64.2 src/sys/arch/i386/stand/boot/devopen.c cvs rdiff -u -r1.5.6.2 -r1.5.6.3 src/sys/arch/i386/stand/efiboot/devopen.c cvs rdiff -u -r1.49.6.2 -r1.49.6.3 src/sys/arch/i386/stand/lib/biosdisk.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/arch/x86/x86
Module Name:src Committed By: martin Date: Tue Dec 17 12:56:45 UTC 2019 Modified Files: src/sys/arch/x86/x86 [netbsd-9]: bus_space.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #566): sys/arch/x86/x86/bus_space.c: revision 1.42 sys/arch/x86/x86/bus_space.c: revision 1.43 Use LFENCE/SFENCE/MFENCE in x86 bus_space_barrier. These are needed for BUS_SPACE_MAP_PREFETCHABLE mappings. On x86, these are WC-type memory regions, which means -- unlike normal WB-type memory regions -- loads can be reordered with loads, requiring LFENCE, and stores can be reordered with stores, requiring SFENCE. Reference: AMD64 Architecture Programmer's Manual, Volume 2: System Programming, Sec. 7.4.1 `Memory Barrier Interaction with Memory Types', Table 7-3 `Memory Access Ordering Rules'. Skip fences in bus_space_barrier on I/O space. I/O operations are issued in program order. Not that I/O operations are usually a performance bottleneck anyway, but maybe it is slightly cheaper to avoid stalling on store buffers or pending loads, and there's very little cost to the skipping criterion here. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.41.4.1 src/sys/arch/x86/x86/bus_space.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/arch/x86/x86
Module Name:src
Committed By: martin
Date: Tue Dec 17 12:56:45 UTC 2019
Modified Files:
src/sys/arch/x86/x86 [netbsd-9]: bus_space.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #566):
sys/arch/x86/x86/bus_space.c: revision 1.42
sys/arch/x86/x86/bus_space.c: revision 1.43
Use LFENCE/SFENCE/MFENCE in x86 bus_space_barrier.
These are needed for BUS_SPACE_MAP_PREFETCHABLE mappings. On x86,
these are WC-type memory regions, which means -- unlike normal
WB-type memory regions -- loads can be reordered with loads,
requiring LFENCE, and stores can be reordered with stores, requiring
SFENCE.
Reference: AMD64 Architecture Programmer's Manual, Volume 2: System
Programming, Sec. 7.4.1 `Memory Barrier Interaction with Memory
Types', Table 7-3 `Memory Access Ordering Rules'.
Skip fences in bus_space_barrier on I/O space.
I/O operations are issued in program order. Not that I/O operations
are usually a performance bottleneck anyway, but maybe it is slightly
cheaper to avoid stalling on store buffers or pending loads, and
there's very little cost to the skipping criterion here.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.4.1 src/sys/arch/x86/x86/bus_space.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/bus_space.c
diff -u src/sys/arch/x86/x86/bus_space.c:1.41 src/sys/arch/x86/x86/bus_space.c:1.41.4.1
--- src/sys/arch/x86/x86/bus_space.c:1.41 Mon Feb 11 14:59:33 2019
+++ src/sys/arch/x86/x86/bus_space.c Tue Dec 17 12:56:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.41 2019/02/11 14:59:33 cherry Exp $ */
+/* $NetBSD: bus_space.c,v 1.41.4.1 2019/12/17 12:56:45 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.41 2019/02/11 14:59:33 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.41.4.1 2019/12/17 12:56:45 martin Exp $");
#include
#include
@@ -878,7 +878,43 @@ bus_space_barrier(bus_space_tag_t tag, b
bus_size_t offset, bus_size_t len, int flags)
{
- /* Function call is enough to prevent reordering of loads. */
+ /* I/O instructions always happen in program order. */
+ if (x86_bus_space_is_io(tag))
+ return;
+
+ /*
+ * For default mappings, which are mapped with UC-type memory
+ * regions, all loads and stores are issued in program order.
+ *
+ * For BUS_SPACE_MAP_PREFETCHABLE mappings, which are mapped
+ * with WC-type memory regions, loads and stores may be issued
+ * out of order, potentially requiring any of the three x86
+ * fences -- LFENCE, SFENCE, MFENCE.
+ *
+ * For BUS_SPACE_MAP_CACHEABLE mappings, which are mapped with
+ * WB-type memory regions (like normal memory), store/load may
+ * be reordered to load/store, potentially requiring MFENCE.
+ *
+ * We can't easily tell here how the region was mapped (without
+ * consulting the page tables), so just issue the fence
+ * unconditionally. Chances are either it's necessary or the
+ * cost is small in comparison to device register I/O.
+ */
+ switch (flags) {
+ case 0:
+ break;
+ case BUS_SPACE_BARRIER_READ:
+ x86_lfence();
+ break;
+ case BUS_SPACE_BARRIER_WRITE:
+ x86_sfence();
+ break;
+ case BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE:
+ x86_mfence();
+ break;
+ default:
+ panic("unknown bus space barrier: 0x%x", (unsigned)flags);
+ }
}
void *
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Tue Dec 17 12:55:10 UTC 2019
Modified Files:
src/sys/dev/usb [netbsd-9]: usbnet.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #565):
sys/dev/usb/usbnet.c: revision 1.31
sys/dev/usb/usbnet.c: revision 1.32
sys/dev/usb/usbnet.c: revision 1.33
Fix order of nulling un->un_pri->unp_ec.ec_mii.
Can't null it until after if_detach prevents further use.
While here, fix conditionals in usbnet_tick_task to use the unp_dying
flag, not the nullness of mii (or of ifp, which never null because
it's an embedded member).
Fix inequality for refcnt drain: -1 here means all refs gone.
Don't assume mii is not null here. Some drivers like urndis don't use
mii, so they always have mii == NULL.
ok riastradh. fixes PR kern/54762
To generate a diff of this commit:
cvs rdiff -u -r1.25.2.3 -r1.25.2.4 src/sys/dev/usb/usbnet.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/usbnet.c
diff -u src/sys/dev/usb/usbnet.c:1.25.2.3 src/sys/dev/usb/usbnet.c:1.25.2.4
--- src/sys/dev/usb/usbnet.c:1.25.2.3 Fri Sep 13 06:51:58 2019
+++ src/sys/dev/usb/usbnet.c Tue Dec 17 12:55:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.25.2.3 2019/09/13 06:51:58 martin Exp $ */
+/* $NetBSD: usbnet.c,v 1.25.2.4 2019/12/17 12:55:10 martin Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.25.2.3 2019/09/13 06:51:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.25.2.4 2019/12/17 12:55:10 martin Exp $");
#include
#include
@@ -1185,16 +1185,17 @@ usbnet_tick_task(void *arg)
struct ifnet * const ifp = usbnet_ifp(un);
struct mii_data * const mii = usbnet_mii(un);
+ KASSERT(ifp != NULL); /* embedded member */
+
unp->unp_refcnt++;
mutex_exit(>unp_lock);
- if (ifp && unp->unp_timer != 0 && --unp->unp_timer == 0)
+ if (unp->unp_timer != 0 && --unp->unp_timer == 0)
usbnet_watchdog(ifp);
- if (mii && ifp) {
- DPRINTFN(8, "mii %jx ifp %jx", (uintptr_t)mii, (uintptr_t)ifp, 0, 0);
+ DPRINTFN(8, "mii %jx ifp %jx", (uintptr_t)mii, (uintptr_t)ifp, 0, 0);
+ if (mii) {
mii_tick(mii);
-
if (!unp->unp_link)
(*mii->mii_statchg)(ifp);
}
@@ -1517,7 +1518,7 @@ usbnet_detach(device_t self, int flags)
mutex_enter(>unp_lock);
unp->unp_refcnt--;
- while (unp->unp_refcnt > 0) {
+ while (unp->unp_refcnt >= 0) {
/* Wait for processes to go away */
cv_wait(>unp_detachcv, >unp_lock);
}
@@ -1532,7 +1533,6 @@ usbnet_detach(device_t self, int flags)
if (mii) {
mii_detach(mii, MII_PHY_ANY, MII_OFFSET_ANY);
ifmedia_delete_instance(>mii_media, IFM_INST_ANY);
- usbnet_ec(un)->ec_mii = NULL;
}
if (ifp->if_softc) {
if (!usbnet_empty_eaddr(un))
@@ -1541,6 +1541,7 @@ usbnet_detach(device_t self, int flags)
bpf_detach(ifp);
if_detach(ifp);
}
+ usbnet_ec(un)->ec_mii = NULL;
cv_destroy(>unp_detachcv);
mutex_destroy(>unp_lock);
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src Committed By: martin Date: Tue Dec 17 12:55:10 UTC 2019 Modified Files: src/sys/dev/usb [netbsd-9]: usbnet.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #565): sys/dev/usb/usbnet.c: revision 1.31 sys/dev/usb/usbnet.c: revision 1.32 sys/dev/usb/usbnet.c: revision 1.33 Fix order of nulling un->un_pri->unp_ec.ec_mii. Can't null it until after if_detach prevents further use. While here, fix conditionals in usbnet_tick_task to use the unp_dying flag, not the nullness of mii (or of ifp, which never null because it's an embedded member). Fix inequality for refcnt drain: -1 here means all refs gone. Don't assume mii is not null here. Some drivers like urndis don't use mii, so they always have mii == NULL. ok riastradh. fixes PR kern/54762 To generate a diff of this commit: cvs rdiff -u -r1.25.2.3 -r1.25.2.4 src/sys/dev/usb/usbnet.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/cddl/osnet/sys/sys
Module Name:src Committed By: martin Date: Tue Dec 17 12:52:23 UTC 2019 Modified Files: src/external/cddl/osnet/sys/sys [netbsd-9]: opentypes.h Log Message: Pull up following revision(s) (requested by riastradh in ticket #564): external/cddl/osnet/sys/sys/opentypes.h: revision 1.5 Avoid redefining uint_t if compat_defs.h already defines them. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.2.1 src/external/cddl/osnet/sys/sys/opentypes.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/cddl/osnet/sys/sys
Module Name:src Committed By: martin Date: Tue Dec 17 12:52:23 UTC 2019 Modified Files: src/external/cddl/osnet/sys/sys [netbsd-9]: opentypes.h Log Message: Pull up following revision(s) (requested by riastradh in ticket #564): external/cddl/osnet/sys/sys/opentypes.h: revision 1.5 Avoid redefining uint_t if compat_defs.h already defines them. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.2.1 src/external/cddl/osnet/sys/sys/opentypes.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/cddl/osnet/sys/sys/opentypes.h diff -u src/external/cddl/osnet/sys/sys/opentypes.h:1.4 src/external/cddl/osnet/sys/sys/opentypes.h:1.4.2.1 --- src/external/cddl/osnet/sys/sys/opentypes.h:1.4 Thu Sep 6 00:44:43 2018 +++ src/external/cddl/osnet/sys/sys/opentypes.h Tue Dec 17 12:52:23 2019 @@ -21,10 +21,12 @@ typedef struct timespec timestruc_t; #define __defined_ts_t typedef struct timespec timespec_t; #endif +#ifndef HAVE_NBTOOL_CONFIG_H typedef unsigned int uint_t; typedef unsigned char uchar_t; typedef unsigned short ushort_t; typedef unsigned long ulong_t; +#endif typedef off_t off64_t; typedef id_t taskid_t; typedef id_t projid_t;
CVS commit: [netbsd-9] src/sbin/rndctl
Module Name:src
Committed By: martin
Date: Tue Dec 17 12:45:30 UTC 2019
Modified Files:
src/sbin/rndctl [netbsd-9]: Makefile rndctl.8 rndctl.c
Added Files:
src/sbin/rndctl [netbsd-9]: namespace.h
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #563):
sbin/rndctl/rndctl.c: revision 1.31
sbin/rndctl/rndctl.8: revision 1.23
sbin/rndctl/Makefile: revision 1.4 (adapted)
sbin/rndctl/namespace.h: revision 1.1
Teach `rndctl -L' to update the seed file, not just delete it.
The seed file is updated by entering the old seed into the system and
then hashing the old seed together with data from /dev/urandom, and
writing it atomically with write-to-temporary/rename-to-permanent.
This way, interruption by crash or power loss does not obliterate
your persistent entropy (unless it causes file system corruption).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.114.1 src/sbin/rndctl/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/sbin/rndctl/namespace.h
cvs rdiff -u -r1.22 -r1.22.26.1 src/sbin/rndctl/rndctl.8
cvs rdiff -u -r1.30 -r1.30.18.1 src/sbin/rndctl/rndctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/rndctl/Makefile
diff -u src/sbin/rndctl/Makefile:1.2 src/sbin/rndctl/Makefile:1.2.114.1
--- src/sbin/rndctl/Makefile:1.2 Mon Oct 13 14:16:16 1997
+++ src/sbin/rndctl/Makefile Tue Dec 17 12:45:30 2019
@@ -1,6 +1,17 @@
-# $NetBSD: Makefile,v 1.2 1997/10/13 14:16:16 mycroft Exp $
+# $NetBSD: Makefile,v 1.2.114.1 2019/12/17 12:45:30 martin Exp $
PROG= rndctl
MAN= rndctl.8
+SRCS+= rndctl.c
+
+# Hack: libc does not export public SHA-3 symbols, so we'll just copy
+# them here statically.
+.PATH: ${NETBSDSRCDIR}/common/lib/libc/hash/sha3
+
+# Hack for namespace.h in sha3.c.
+CPPFLAGS+= -I${.CURDIR}
+
+SRCS+= sha3.c
+SRCS+= keccak.c
.include
Index: src/sbin/rndctl/rndctl.8
diff -u src/sbin/rndctl/rndctl.8:1.22 src/sbin/rndctl/rndctl.8:1.22.26.1
--- src/sbin/rndctl/rndctl.8:1.22 Sun Aug 10 17:13:02 2014
+++ src/sbin/rndctl/rndctl.8 Tue Dec 17 12:45:30 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: rndctl.8,v 1.22 2014/08/10 17:13:02 wiz Exp $
+.\" $NetBSD: rndctl.8,v 1.22.26.1 2019/12/17 12:45:30 martin Exp $
.\"
.\" Copyright (c) 1997 Michael Graff
.\" All rights reserved.
@@ -78,9 +78,13 @@ Enable entropy estimation using the coll
for the given device name or device type.
.It Fl L
Load saved entropy from file
-.Ar save-file ,
-which will be overwritten and deleted before the entropy is loaded into
-the kernel.
+.Ar save-file
+and overwrite it with a seed derived by hashing it together with output
+from
+.Pa /dev/urandom
+so that the new seed has at least as much entropy as either the old
+seed had or the system already has.
+If interrupted, either the old seed or the new seed will be in place.
.It Fl l
List all sources, or, if the
.Fl t
Index: src/sbin/rndctl/rndctl.c
diff -u src/sbin/rndctl/rndctl.c:1.30 src/sbin/rndctl/rndctl.c:1.30.18.1
--- src/sbin/rndctl/rndctl.c:1.30 Mon Apr 13 22:18:50 2015
+++ src/sbin/rndctl/rndctl.c Tue Dec 17 12:45:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rndctl.c,v 1.30 2015/04/13 22:18:50 riastradh Exp $ */
+/* $NetBSD: rndctl.c,v 1.30.18.1 2019/12/17 12:45:30 martin Exp $ */
/*-
* Copyright (c) 1997 Michael Graff.
@@ -33,7 +33,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: rndctl.c,v 1.30 2015/04/13 22:18:50 riastradh Exp $");
+__RCSID("$NetBSD: rndctl.c,v 1.30.18.1 2019/12/17 12:45:30 martin Exp $");
#endif
@@ -41,6 +41,7 @@ __RCSID("$NetBSD: rndctl.c,v 1.30 2015/0
#include
#include
#include
+#include
#include
#include
@@ -127,111 +128,227 @@ find_name(u_int32_t type)
}
static void
-do_save(const char *const filename)
+do_save(const char *filename, const void *extra, size_t nextra,
+uint32_t extraentropy)
{
- int est1, est2;
- rndpoolstat_t rp;
+ char tmp[PATH_MAX];
+ uint32_t systementropy;
+ uint8_t buf[32];
+ SHAKE128_CTX shake128;
rndsave_t rs;
SHA1_CTX s;
-
+ ssize_t nread, nwrit;
int fd;
- fd = open(_PATH_URANDOM, O_RDONLY, 0644);
- if (fd < 0) {
- err(1, "device open");
- }
-
- if (ioctl(fd, RNDGETPOOLSTAT, ) < 0) {
- err(1, "ioctl(RNDGETPOOLSTAT)");
- }
+ /* Paranoia: Avoid stack memory disclosure. */
+ memset(, 0, sizeof rs);
- est1 = rp.curentropy;
+ /* Format the temporary file name. */
+ if (snprintf(tmp, sizeof tmp, "%s.tmp", filename) >= PATH_MAX)
+ errx(1, "path too long");
- if (read(fd, rs.data, sizeof(rs.data)) != sizeof(rs.data)) {
- err(1, "entropy read");
- }
+ /* Open /dev/urandom. */
+ if ((fd = open(_PATH_URANDOM, O_RDONLY)) == -1)
+ err(1, "device open");
- if (ioctl(fd, RNDGETPOOLSTAT, ) < 0) {
- err(1, "ioctl(RNDGETPOOLSTAT)");
- }
+ /* Find how much entropy is in the pool. */
+ if (ioctl(fd, RNDGETENTCNT, ) == -1)
+ err(1, "ioctl(RNDGETENTCNT)");
+
+ /* Read some data from /dev/urandom. */
+ if
CVS commit: [netbsd-9] src/sbin/rndctl
Module Name:src Committed By: martin Date: Tue Dec 17 12:45:30 UTC 2019 Modified Files: src/sbin/rndctl [netbsd-9]: Makefile rndctl.8 rndctl.c Added Files: src/sbin/rndctl [netbsd-9]: namespace.h Log Message: Pull up following revision(s) (requested by riastradh in ticket #563): sbin/rndctl/rndctl.c: revision 1.31 sbin/rndctl/rndctl.8: revision 1.23 sbin/rndctl/Makefile: revision 1.4 (adapted) sbin/rndctl/namespace.h: revision 1.1 Teach `rndctl -L' to update the seed file, not just delete it. The seed file is updated by entering the old seed into the system and then hashing the old seed together with data from /dev/urandom, and writing it atomically with write-to-temporary/rename-to-permanent. This way, interruption by crash or power loss does not obliterate your persistent entropy (unless it causes file system corruption). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.114.1 src/sbin/rndctl/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/sbin/rndctl/namespace.h cvs rdiff -u -r1.22 -r1.22.26.1 src/sbin/rndctl/rndctl.8 cvs rdiff -u -r1.30 -r1.30.18.1 src/sbin/rndctl/rndctl.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/arch/arm/sunxi
Module Name:src
Committed By: martin
Date: Tue Dec 17 12:39:33 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi [netbsd-9]: sunxi_drm.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #562):
sys/arch/arm/sunxi/sunxi_drm.c: revision 1.11
Make sure memory stolen from simplefb is page aligned.
To generate a diff of this commit:
cvs rdiff -u -r1.7.6.3 -r1.7.6.4 src/sys/arch/arm/sunxi/sunxi_drm.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/arm/sunxi/sunxi_drm.c
diff -u src/sys/arch/arm/sunxi/sunxi_drm.c:1.7.6.3 src/sys/arch/arm/sunxi/sunxi_drm.c:1.7.6.4
--- src/sys/arch/arm/sunxi/sunxi_drm.c:1.7.6.3 Tue Dec 17 12:35:12 2019
+++ src/sys/arch/arm/sunxi/sunxi_drm.c Tue Dec 17 12:39:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_drm.c,v 1.7.6.3 2019/12/17 12:35:12 martin Exp $ */
+/* $NetBSD: sunxi_drm.c,v 1.7.6.4 2019/12/17 12:39:33 martin Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.7.6.3 2019/12/17 12:35:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.7.6.4 2019/12/17 12:39:33 martin Exp $");
#include
#include
@@ -53,6 +53,14 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,
#define SUNXI_DRM_MAX_WIDTH 3840
#define SUNXI_DRM_MAX_HEIGHT 2160
+/*
+ * The DRM headers break trunc_page/round_page macros with a redefinition
+ * of PAGE_MASK. Use our own macros instead.
+ */
+#define SUNXI_PAGE_MASK (PAGE_SIZE - 1)
+#define SUNXI_TRUNC_PAGE(x) ((x) & ~SUNXI_PAGE_MASK)
+#define SUNXI_ROUND_PAGE(x) (((x) + SUNXI_PAGE_MASK) & ~SUNXI_PAGE_MASK)
+
static TAILQ_HEAD(, sunxi_drm_endpoint) sunxi_drm_endpoints =
TAILQ_HEAD_INITIALIZER(sunxi_drm_endpoints);
@@ -299,7 +307,8 @@ static int
sunxi_drm_simplefb_lookup(bus_addr_t *paddr, bus_size_t *psize)
{
static const char * compat[] = { "simple-framebuffer", NULL };
- int chosen, child;
+ int chosen, child, error;
+ bus_addr_t addr_end;
chosen = OF_finddevice("/chosen");
if (chosen == -1)
@@ -310,7 +319,15 @@ sunxi_drm_simplefb_lookup(bus_addr_t *pa
continue;
if (!of_match_compatible(child, compat))
continue;
- return fdtbus_get_reg(child, 0, paddr, psize);
+ error = fdtbus_get_reg(child, 0, paddr, psize);
+ if (error != 0)
+ return error;
+
+ /* Reclaim entire pages used by the simplefb */
+ addr_end = *paddr + *psize;
+ *paddr = SUNXI_TRUNC_PAGE(*paddr);
+ *psize = SUNXI_ROUND_PAGE(addr_end - *paddr);
+ return 0;
}
return ENOENT;
CVS commit: [netbsd-9] src/sys/arch/arm/sunxi
Module Name:src Committed By: martin Date: Tue Dec 17 12:39:33 UTC 2019 Modified Files: src/sys/arch/arm/sunxi [netbsd-9]: sunxi_drm.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #562): sys/arch/arm/sunxi/sunxi_drm.c: revision 1.11 Make sure memory stolen from simplefb is page aligned. To generate a diff of this commit: cvs rdiff -u -r1.7.6.3 -r1.7.6.4 src/sys/arch/arm/sunxi/sunxi_drm.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 Dec 17 12:38:17 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #555 - #558 To generate a diff of this commit: cvs rdiff -u -r1.1.2.141 -r1.1.2.142 src/doc/CHANGES-9.0 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.0 diff -u src/doc/CHANGES-9.0:1.1.2.141 src/doc/CHANGES-9.0:1.1.2.142 --- src/doc/CHANGES-9.0:1.1.2.141 Tue Dec 17 10:25:42 2019 +++ src/doc/CHANGES-9.0 Tue Dec 17 12:38:16 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.141 2019/12/17 10:25:42 msaitoh Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.142 2019/12/17 12:38:16 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -7114,3 +7114,32 @@ usr.sbin/sysinst/Makefile.inc 1.31 Fix the pattern creating the relative path for distribution sets on branches: we missed the potential numbers in suffixes, like _RC1. [martin, ticket #561] + +usr.bin/mail/complete.c1.21 +usr.bin/mail/mail.11.68 +usr.bin/mail/mime_child.c 1.10 + + PR/54766: broken mime-hooks handling in mail(1) + PR/54765: fix truncated description for -F in the mail(1) man page. + PR/54764: incorrect '+file' filename completion in mail(1). + [christos, ticket #555] + +sys/arch/arm/rockchip/rk_vop.c 1.3 + + Avoid gcc warnings. + [mrg, ticket #556] + +sys/arch/arm/rockchip/rk_drm.c 1.3 +sys/arch/arm/sunxi/sunxi_drm.c 1.10 +sys/arch/arm/ti/ti_lcdc.c 1.4 + + Ensure to call drm_mode_config_cleanup() when erroring. + [mrg, ticket #557] + +sys/arch/aarch64/aarch64/efi_machdep.c 1.5 +sys/arch/arm/arm/efi_runtime.c 1.3 +sys/arch/arm/arm/efi_runtime.h 1.3 + + Enable FP access for EFI RT and improve error handling. + [jmcneill, ticket #558] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 12:38:17 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #555 - #558 To generate a diff of this commit: cvs rdiff -u -r1.1.2.141 -r1.1.2.142 src/doc/CHANGES-9.0 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
Module Name:src Committed By: martin Date: Tue Dec 17 12:36:38 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64 [netbsd-9]: efi_machdep.c src/sys/arch/arm/arm [netbsd-9]: efi_runtime.c efi_runtime.h Log Message: Pull up following revision(s) (requested by jmcneill in ticket #558): sys/arch/aarch64/aarch64/efi_machdep.c: revision 1.5 sys/arch/arm/arm/efi_runtime.h: revision 1.3 sys/arch/arm/arm/efi_runtime.c: revision 1.3 Enable FP access for EFI RT and improve error handling. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/aarch64/aarch64/efi_machdep.c cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/arch/arm/arm/efi_runtime.c cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/arm/arm/efi_runtime.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch
Module Name:src
Committed By: martin
Date: Tue Dec 17 12:36:38 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64 [netbsd-9]: efi_machdep.c
src/sys/arch/arm/arm [netbsd-9]: efi_runtime.c efi_runtime.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #558):
sys/arch/aarch64/aarch64/efi_machdep.c: revision 1.5
sys/arch/arm/arm/efi_runtime.h: revision 1.3
sys/arch/arm/arm/efi_runtime.c: revision 1.3
Enable FP access for EFI RT and improve error handling.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/aarch64/aarch64/efi_machdep.c
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/arch/arm/arm/efi_runtime.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/arm/arm/efi_runtime.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/aarch64/aarch64/efi_machdep.c
diff -u src/sys/arch/aarch64/aarch64/efi_machdep.c:1.3 src/sys/arch/aarch64/aarch64/efi_machdep.c:1.3.8.1
--- src/sys/arch/aarch64/aarch64/efi_machdep.c:1.3 Wed Oct 31 14:15:12 2018
+++ src/sys/arch/aarch64/aarch64/efi_machdep.c Tue Dec 17 12:36:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_machdep.c,v 1.3 2018/10/31 14:15:12 jmcneill Exp $ */
+/* $NetBSD: efi_machdep.c,v 1.3.8.1 2019/12/17 12:36:38 martin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.3 2018/10/31 14:15:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.3.8.1 2019/12/17 12:36:38 martin Exp $");
#include
#include
@@ -38,6 +38,13 @@ __KERNEL_RCSID(0, "$NetBSD: efi_machdep.
#include
+#include
+
+static struct {
+ struct faultbuf faultbuf;
+ bool fpu_used;
+} arm_efirt_state;
+
void
arm_efirt_md_map_range(vaddr_t va, paddr_t pa, size_t sz, enum arm_efirt_mem_type type)
{
@@ -70,3 +77,41 @@ arm_efirt_md_map_range(vaddr_t va, paddr
sz -= PAGE_SIZE;
}
}
+
+int
+arm_efirt_md_enter(void)
+{
+ struct lwp *l = curlwp;
+
+ /* Save FPU state */
+ arm_efirt_state.fpu_used = fpu_used_p(l) != 0;
+ if (arm_efirt_state.fpu_used)
+ fpu_save(l);
+
+ /* Enable FP access (AArch64 UEFI calling convention) */
+ reg_cpacr_el1_write(CPACR_FPEN_ALL);
+ __asm __volatile ("isb");
+
+ /*
+ * Install custom fault handler. EFI lock is held across calls so
+ * shared faultbuf is safe here.
+ */
+ return cpu_set_onfault(_efirt_state.faultbuf);
+}
+
+void
+arm_efirt_md_exit(void)
+{
+ struct lwp *l = curlwp;
+
+ /* Disable FP access */
+ reg_cpacr_el1_write(CPACR_FPEN_NONE);
+ __asm __volatile ("isb");
+
+ /* Restore FPU state */
+ if (arm_efirt_state.fpu_used)
+ fpu_load(l);
+
+ /* Remove custom fault handler */
+ cpu_unset_onfault();
+}
Index: src/sys/arch/arm/arm/efi_runtime.c
diff -u src/sys/arch/arm/arm/efi_runtime.c:1.2 src/sys/arch/arm/arm/efi_runtime.c:1.2.2.1
--- src/sys/arch/arm/arm/efi_runtime.c:1.2 Thu Jul 25 02:00:40 2019
+++ src/sys/arch/arm/arm/efi_runtime.c Tue Dec 17 12:36:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_runtime.c,v 1.2 2019/07/25 02:00:40 jmcneill Exp $ */
+/* $NetBSD: efi_runtime.c,v 1.2.2.1 2019/12/17 12:36:38 martin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.2 2019/07/25 02:00:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.2.2.1 2019/12/17 12:36:38 martin Exp $");
#include
#include
@@ -79,42 +79,46 @@ arm_efirt_init(paddr_t efi_system_table)
int
arm_efirt_gettime(struct efi_tm *tm)
{
- efi_status status;
+ int error;
if (RT == NULL || RT->rt_gettime == NULL)
return ENXIO;
mutex_enter(_lock);
- status = RT->rt_gettime(tm, NULL);
+ if ((error = arm_efirt_md_enter()) == 0) {
+ if (RT->rt_gettime(tm, NULL) != 0)
+ error = EIO;
+ }
+ arm_efirt_md_exit();
mutex_exit(_lock);
- if (status)
- return EIO;
- return 0;
+ return error;
}
int
arm_efirt_settime(struct efi_tm *tm)
{
- efi_status status;
+ int error;
if (RT == NULL || RT->rt_settime == NULL)
return ENXIO;
mutex_enter(_lock);
- status = RT->rt_settime(tm);
+ if ((error = arm_efirt_md_enter()) == 0) {
+ if (RT->rt_settime(tm) != 0)
+ error = EIO;
+ }
+ arm_efirt_md_exit();
mutex_exit(_lock);
- if (status)
- return EIO;
- return 0;
+ return error;
}
int
arm_efirt_reset(enum efi_reset type)
{
static int reset_called = false;
- efi_status status;
+ int error;
if (RT == NULL || RT->rt_reset == NULL)
return ENXIO;
@@ -122,13 +126,15 @@ arm_efirt_reset(enum efi_reset type)
mutex_enter(_lock);
if (reset_called == false) {
reset_called = true;
- status = RT->rt_reset(type, 0, 0, NULL);
+ if ((error = arm_efirt_md_enter()) == 0) {
+ if (RT->rt_reset(type, 0, 0, NULL) != 0)
+error = EIO;
+ }
+ arm_efirt_md_exit();
} else {
- status = 1;
+ error = EPERM;
}
mutex_exit(_lock);
- if (status)
-
CVS commit: [netbsd-9] src/sys/arch/arm
Module Name:src Committed By: martin Date: Tue Dec 17 12:35:12 UTC 2019 Modified Files: src/sys/arch/arm/rockchip [netbsd-9]: rk_drm.c src/sys/arch/arm/sunxi [netbsd-9]: sunxi_drm.c src/sys/arch/arm/ti [netbsd-9]: ti_lcdc.c Log Message: Pull up following revision(s) (requested by mrg in ticket #557): sys/arch/arm/rockchip/rk_drm.c: revision 1.3 sys/arch/arm/ti/ti_lcdc.c: revision 1.4 sys/arch/arm/sunxi/sunxi_drm.c: revision 1.10 ensure to call drm_mode_config_cleanup() when erroring. tripped up 'active lock in free' checks, and perhaps lead to other lock corruption. (crash with un-init lock in arpresolve that does not make sense now seems to not occur either.) To generate a diff of this commit: cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/arm/rockchip/rk_drm.c cvs rdiff -u -r1.7.6.2 -r1.7.6.3 src/sys/arch/arm/sunxi/sunxi_drm.c cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/arch/arm/ti/ti_lcdc.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/arch/arm
Module Name:src
Committed By: martin
Date: Tue Dec 17 12:35:12 UTC 2019
Modified Files:
src/sys/arch/arm/rockchip [netbsd-9]: rk_drm.c
src/sys/arch/arm/sunxi [netbsd-9]: sunxi_drm.c
src/sys/arch/arm/ti [netbsd-9]: ti_lcdc.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #557):
sys/arch/arm/rockchip/rk_drm.c: revision 1.3
sys/arch/arm/ti/ti_lcdc.c: revision 1.4
sys/arch/arm/sunxi/sunxi_drm.c: revision 1.10
ensure to call drm_mode_config_cleanup() when erroring.
tripped up 'active lock in free' checks, and perhaps
lead to other lock corruption. (crash with un-init lock
in arpresolve that does not make sense now seems to not
occur either.)
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/arm/rockchip/rk_drm.c
cvs rdiff -u -r1.7.6.2 -r1.7.6.3 src/sys/arch/arm/sunxi/sunxi_drm.c
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/arch/arm/ti/ti_lcdc.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/arm/rockchip/rk_drm.c
diff -u src/sys/arch/arm/rockchip/rk_drm.c:1.2.2.2 src/sys/arch/arm/rockchip/rk_drm.c:1.2.2.3
--- src/sys/arch/arm/rockchip/rk_drm.c:1.2.2.2 Sat Nov 16 16:48:25 2019
+++ src/sys/arch/arm/rockchip/rk_drm.c Tue Dec 17 12:35:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_drm.c,v 1.2.2.2 2019/11/16 16:48:25 martin Exp $ */
+/* $NetBSD: rk_drm.c,v 1.2.2.3 2019/12/17 12:35:11 martin Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.2.2.2 2019/11/16 16:48:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.2.2.3 2019/12/17 12:35:11 martin Exp $");
#include
#include
@@ -401,7 +401,8 @@ rk_drm_load(struct drm_device *ddev, uns
if (num_crtc == 0) {
aprint_error_dev(sc->sc_dev, "no display interface ports configured\n");
- return ENXIO;
+ error = ENXIO;
+ goto drmerr;
}
fbdev = kmem_zalloc(sizeof(*fbdev), KM_SLEEP);
@@ -410,7 +411,7 @@ rk_drm_load(struct drm_device *ddev, uns
error = drm_fb_helper_init(ddev, >helper, num_crtc, num_crtc);
if (error)
- goto drmerr;
+ goto allocerr;
fbdev->helper.fb = kmem_zalloc(sizeof(struct rk_drm_framebuffer), KM_SLEEP);
@@ -426,9 +427,10 @@ rk_drm_load(struct drm_device *ddev, uns
return 0;
+allocerr:
+ kmem_free(fbdev, sizeof(*fbdev));
drmerr:
drm_mode_config_cleanup(ddev);
- kmem_free(fbdev, sizeof(*fbdev));
return error;
}
Index: src/sys/arch/arm/sunxi/sunxi_drm.c
diff -u src/sys/arch/arm/sunxi/sunxi_drm.c:1.7.6.2 src/sys/arch/arm/sunxi/sunxi_drm.c:1.7.6.3
--- src/sys/arch/arm/sunxi/sunxi_drm.c:1.7.6.2 Mon Nov 25 16:20:41 2019
+++ src/sys/arch/arm/sunxi/sunxi_drm.c Tue Dec 17 12:35:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_drm.c,v 1.7.6.2 2019/11/25 16:20:41 martin Exp $ */
+/* $NetBSD: sunxi_drm.c,v 1.7.6.3 2019/12/17 12:35:12 martin Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.7.6.2 2019/11/25 16:20:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.7.6.3 2019/12/17 12:35:12 martin Exp $");
#include
#include
@@ -440,7 +440,8 @@ sunxi_drm_load(struct drm_device *ddev,
if (num_crtc == 0) {
aprint_error_dev(sc->sc_dev, "no pipelines configured\n");
- return ENXIO;
+ error = ENXIO;
+ goto drmerr;
}
fbdev = kmem_zalloc(sizeof(*fbdev), KM_SLEEP);
@@ -449,7 +450,7 @@ sunxi_drm_load(struct drm_device *ddev,
error = drm_fb_helper_init(ddev, >helper, num_crtc, num_crtc);
if (error)
- goto drmerr;
+ goto allocerr;
fbdev->helper.fb = kmem_zalloc(sizeof(struct sunxi_drm_framebuffer), KM_SLEEP);
@@ -465,9 +466,10 @@ sunxi_drm_load(struct drm_device *ddev,
return 0;
+allocerr:
+ kmem_free(fbdev, sizeof(*fbdev));
drmerr:
drm_mode_config_cleanup(ddev);
- kmem_free(fbdev, sizeof(*fbdev));
return error;
}
Index: src/sys/arch/arm/ti/ti_lcdc.c
diff -u src/sys/arch/arm/ti/ti_lcdc.c:1.3.2.2 src/sys/arch/arm/ti/ti_lcdc.c:1.3.2.3
--- src/sys/arch/arm/ti/ti_lcdc.c:1.3.2.2 Wed Nov 27 13:46:44 2019
+++ src/sys/arch/arm/ti/ti_lcdc.c Tue Dec 17 12:35:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_lcdc.c,v 1.3.2.2 2019/11/27 13:46:44 martin Exp $ */
+/* $NetBSD: ti_lcdc.c,v 1.3.2.3 2019/12/17 12:35:12 martin Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ti_lcdc.c,v 1.3.2.2 2019/11/27 13:46:44 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_lcdc.c,v 1.3.2.3 2019/12/17 12:35:12 martin Exp $");
#include
#include
@@ -622,12 +622,14 @@ tilcdc_load(struct drm_device *ddev, uns
ep = fdt_endpoint_get_from_index(>sc_ports, TILCDC_PORT_OUTPUT, 0);
if (ep == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't find endpoint\n");
- return ENXIO;
+ error = ENXIO;
+ goto drmerr;
}
error = fdt_endpoint_activate_direct(ep,
CVS commit: [netbsd-9] src/sys/arch/arm/rockchip
Module Name:src
Committed By: martin
Date: Tue Dec 17 12:32:52 UTC 2019
Modified Files:
src/sys/arch/arm/rockchip [netbsd-9]: rk_vop.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #556):
sys/arch/arm/rockchip/rk_vop.c: revision 1.3
rework slightly to avoid stupid gcc warnings.
ok jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/arm/rockchip/rk_vop.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/arm/rockchip/rk_vop.c
diff -u src/sys/arch/arm/rockchip/rk_vop.c:1.2.2.2 src/sys/arch/arm/rockchip/rk_vop.c:1.2.2.3
--- src/sys/arch/arm/rockchip/rk_vop.c:1.2.2.2 Sat Nov 16 16:48:25 2019
+++ src/sys/arch/arm/rockchip/rk_vop.c Tue Dec 17 12:32:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_vop.c,v 1.2.2.2 2019/11/16 16:48:25 martin Exp $ */
+/* $NetBSD: rk_vop.c,v 1.2.2.3 2019/12/17 12:32:52 martin Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.2.2.2 2019/11/16 16:48:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.2.2.3 2019/12/17 12:32:52 martin Exp $");
#include
#include
@@ -542,11 +542,6 @@ rk_vop_ep_activate(device_t dev, struct
}
const u_int ep_index = fdt_endpoint_index(ep);
- if (ep_index >= VOP_NEP) {
- DRM_ERROR("endpoint index %d out of range\n", ep_index);
- return ENXIO;
- }
-
switch (ep_index) {
case VOP_EP_MIPI:
case VOP_EP_MIPI1:
@@ -557,6 +552,9 @@ rk_vop_ep_activate(device_t dev, struct
case VOP_EP_DP:
encoder_type = DRM_MODE_ENCODER_TMDS;
break;
+ default:
+ DRM_ERROR("endpoint index %d out of range\n", ep_index);
+ return ENXIO;
}
sc->sc_encoder[ep_index].sc = sc;
CVS commit: [netbsd-9] src/sys/arch/arm/rockchip
Module Name:src Committed By: martin Date: Tue Dec 17 12:32:52 UTC 2019 Modified Files: src/sys/arch/arm/rockchip [netbsd-9]: rk_vop.c Log Message: Pull up following revision(s) (requested by mrg in ticket #556): sys/arch/arm/rockchip/rk_vop.c: revision 1.3 rework slightly to avoid stupid gcc warnings. ok jmcneill. To generate a diff of this commit: cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/arm/rockchip/rk_vop.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/mail
Module Name:src Committed By: martin Date: Tue Dec 17 12:30:36 UTC 2019 Modified Files: src/usr.bin/mail [netbsd-9]: complete.c mail.1 mime_child.c Log Message: Pull up following revision(s) (requested by christos in ticket #555): usr.bin/mail/mime_child.c: revision 1.10 usr.bin/mail/mail.1: revision 1.68 usr.bin/mail/complete.c: revision 1.21 PR/54766: elo: Broken mime-hooks handling in mail(1) pullup-9. PR/54765: elo: Minor error in the mail(1) man page (-F description truncated) pullup-9 PR/54764: elo: Incorrect '+file' filename completion in mail(1) Add propel completion stem so that file completion works. pullup-9 To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.48.1 src/usr.bin/mail/complete.c cvs rdiff -u -r1.65.2.1 -r1.65.2.2 src/usr.bin/mail/mail.1 cvs rdiff -u -r1.9 -r1.9.6.1 src/usr.bin/mail/mime_child.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/mail
Module Name:src
Committed By: martin
Date: Tue Dec 17 12:30:36 UTC 2019
Modified Files:
src/usr.bin/mail [netbsd-9]: complete.c mail.1 mime_child.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #555):
usr.bin/mail/mime_child.c: revision 1.10
usr.bin/mail/mail.1: revision 1.68
usr.bin/mail/complete.c: revision 1.21
PR/54766: elo: Broken mime-hooks handling in mail(1)
pullup-9.
PR/54765: elo: Minor error in the mail(1) man page (-F description truncated)
pullup-9
PR/54764: elo: Incorrect '+file' filename completion in mail(1)
Add propel completion stem so that file completion works.
pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.48.1 src/usr.bin/mail/complete.c
cvs rdiff -u -r1.65.2.1 -r1.65.2.2 src/usr.bin/mail/mail.1
cvs rdiff -u -r1.9 -r1.9.6.1 src/usr.bin/mail/mime_child.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/mail/complete.c
diff -u src/usr.bin/mail/complete.c:1.20 src/usr.bin/mail/complete.c:1.20.48.1
--- src/usr.bin/mail/complete.c:1.20 Tue Jan 12 14:44:24 2010
+++ src/usr.bin/mail/complete.c Tue Dec 17 12:30:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: complete.c,v 1.20 2010/01/12 14:44:24 christos Exp $ */
+/* $NetBSD: complete.c,v 1.20.48.1 2019/12/17 12:30:36 martin Exp $ */
/*-
* Copyright (c) 1997-2000,2005,2006 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: complete.c,v 1.20 2010/01/12 14:44:24 christos Exp $");
+__RCSID("$NetBSD: complete.c,v 1.20.48.1 2019/12/17 12:30:36 martin Exp $");
#endif /* not lint */
/*
@@ -332,16 +332,27 @@ complete_filename(EditLine *el, char *wo
{
StringList *words;
char dir[MAXPATHLEN];
- char *fname;
+ char *fname, *mf;
DIR *dd;
struct dirent *dp;
unsigned char rv;
size_t len;
if ((fname = strrchr(word, '/')) == NULL) {
- dir[0] = '.';
- dir[1] = '\0';
- fname = word;
+ if (word[0] == '+' && (mf = value(ENAME_FOLDER)) != NULL) {
+ if (mf[0] == '/') {
+(void)estrlcpy(dir, mf, sizeof(dir));
+ } else {
+dir[0] = '~';
+dir[1] = '/';
+(void)estrlcpy(dir + 2, mf, sizeof(dir) - 2);
+ }
+ fname = word + 1;
+ } else {
+ dir[0] = '.';
+ dir[1] = '\0';
+ fname = word;
+ }
} else {
if (fname == word) {
dir[0] = '/';
Index: src/usr.bin/mail/mail.1
diff -u src/usr.bin/mail/mail.1:1.65.2.1 src/usr.bin/mail/mail.1:1.65.2.2
--- src/usr.bin/mail/mail.1:1.65.2.1 Thu Sep 5 08:19:41 2019
+++ src/usr.bin/mail/mail.1 Tue Dec 17 12:30:36 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: mail.1,v 1.65.2.1 2019/09/05 08:19:41 martin Exp $
+.\" $NetBSD: mail.1,v 1.65.2.2 2019/12/17 12:30:36 martin Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)mail.1 8.8 (Berkeley) 4/28/95
.\"
-.Dd September 1, 2019
+.Dd December 14, 2019
.Dt MAIL 1
.Os
.Sh NAME
@@ -1328,7 +1328,7 @@ Message headers currently being ignored
or
.Ic retain
command) are not included.
-.It Ic \&~
+.It Ic \&~F Ns Ar messages
Identical to
.Ic \&~f ,
except all message headers are included.
Index: src/usr.bin/mail/mime_child.c
diff -u src/usr.bin/mail/mime_child.c:1.9 src/usr.bin/mail/mime_child.c:1.9.6.1
--- src/usr.bin/mail/mime_child.c:1.9 Thu Nov 9 20:27:50 2017
+++ src/usr.bin/mail/mime_child.c Tue Dec 17 12:30:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mime_child.c,v 1.9 2017/11/09 20:27:50 christos Exp $ */
+/* $NetBSD: mime_child.c,v 1.9.6.1 2019/12/17 12:30:36 martin Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include
#ifndef __lint__
-__RCSID("$NetBSD: mime_child.c,v 1.9 2017/11/09 20:27:50 christos Exp $");
+__RCSID("$NetBSD: mime_child.c,v 1.9.6.1 2019/12/17 12:30:36 martin Exp $");
#endif /* not __lint__ */
#include
@@ -159,7 +159,7 @@ mime_run_command(const char *cmd, FILE *
default: /* parent */
(void)close(p[READ]);
- nfo = fdopen(p[WRITE], "wef");
+ nfo = fdopen(p[WRITE], "we");
if (nfo == NULL) {
warn("mime_run_command: fdopen");
(void)close(p[WRITE]);
@@ -203,7 +203,7 @@ mime_run_function(void (*fn)(FILE *, FIL
default: /* parent */
(void)close(p[READ]);
- nfo = fdopen(p[WRITE], "wef");
+ nfo = fdopen(p[WRITE], "we");
if (nfo == NULL) {
warn("run_function: fdopen");
(void)close(p[WRITE]);
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 12:22:23 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1473 and #1474 To generate a diff of this commit: cvs rdiff -u -r1.1.2.80 -r1.1.2.81 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.80 src/doc/CHANGES-8.2:1.1.2.81 --- src/doc/CHANGES-8.2:1.1.2.80 Sat Dec 14 12:34:19 2019 +++ src/doc/CHANGES-8.2 Tue Dec 17 12:22:23 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.80 2019/12/14 12:34:19 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.81 2019/12/17 12:22:23 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -1795,3 +1795,16 @@ sys/dev/usb/if_urtwn.c1.76 PR kern/54728: reset MCU ready status before resetting the MCU. [mlelstv, ticket #1472] +sys/arch/i386/stand/boot/devopen.c 1.10 +sys/arch/i386/stand/efiboot/devopen.c 1.9 +sys/arch/i386/stand/lib/biosdisk.c 1.53 + + In-RAID partitions with no name can be candidate for booting. + [manu, ticket #1473] + +sys/arch/i386/stand/efiboot/efidisk.c 1.9 +sys/arch/i386/stand/lib/biosdisk.c 1.54 + + Do not use NAME=label syntax when label are empty. + [manu, ticket #1474] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Dec 17 12:22:23 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1473 and #1474 To generate a diff of this commit: cvs rdiff -u -r1.1.2.80 -r1.1.2.81 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch/i386/stand
Module Name:src
Committed By: martin
Date: Tue Dec 17 12:21:34 UTC 2019
Modified Files:
src/sys/arch/i386/stand/efiboot [netbsd-8]: efidisk.c
src/sys/arch/i386/stand/lib [netbsd-8]: biosdisk.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #1474):
sys/arch/i386/stand/lib/biosdisk.c: revision 1.54
sys/arch/i386/stand/efiboot/efidisk.c: revision 1.9
Do not use NAME=label syntax when label are empty
When booting sysinst from UEFI, it defaults to a GPT installation
where partition have no labels. Bootstrap used the NAME=label partition
anyway, with the result that both EFI and FFS root partition had
the same name "NAME=" and could not be distinguished. The first matching
partition for the name was used, and bootstrap looked for the kernel
in the EFI partition.
We fix that by not using NAME=label names for partition when label
is empty. In that case we revert to old syntax such as hd0b
To generate a diff of this commit:
cvs rdiff -u -r1.1.12.7 -r1.1.12.8 src/sys/arch/i386/stand/efiboot/efidisk.c
cvs rdiff -u -r1.46.6.6 -r1.46.6.7 src/sys/arch/i386/stand/lib/biosdisk.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/i386/stand/efiboot/efidisk.c
diff -u src/sys/arch/i386/stand/efiboot/efidisk.c:1.1.12.7 src/sys/arch/i386/stand/efiboot/efidisk.c:1.1.12.8
--- src/sys/arch/i386/stand/efiboot/efidisk.c:1.1.12.7 Tue Sep 17 18:26:53 2019
+++ src/sys/arch/i386/stand/efiboot/efidisk.c Tue Dec 17 12:21:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efidisk.c,v 1.1.12.7 2019/09/17 18:26:53 martin Exp $ */
+/* $NetBSD: efidisk.c,v 1.1.12.8 2019/12/17 12:21:34 martin Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -253,7 +253,7 @@ efi_disk_show(void)
printf(" ");
first = false;
}
- if (part[i].part_name != NULL)
+ if (part[i].part_name && part[i].part_name[0])
printf(" NAME=%s(", part[i].part_name);
else
printf(" hd%d%c(", edi->dev & 0x7f, i + 'a');
@@ -308,7 +308,7 @@ efi_disk_show(void)
printf(" ");
first = 0;
}
- if (part[j].part_name != NULL)
+ if (part[j].part_name && part[j].part_name[0])
printf(" NAME=%s(", part[j].part_name);
else
printf(" raid%d%c(",
Index: src/sys/arch/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.46.6.6 src/sys/arch/i386/stand/lib/biosdisk.c:1.46.6.7
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.46.6.6 Tue Dec 17 12:19:49 2019
+++ src/sys/arch/i386/stand/lib/biosdisk.c Tue Dec 17 12:21:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.c,v 1.46.6.6 2019/12/17 12:19:49 martin Exp $ */
+/* $NetBSD: biosdisk.c,v 1.46.6.7 2019/12/17 12:21:34 martin Exp $ */
/*
* Copyright (c) 1996, 1998
@@ -908,7 +908,8 @@ biosdisk_probe(void)
first = 0;
}
#ifndef NO_GPT
- if (d->part[part].part_name != NULL)
+ if (d->part[part].part_name &&
+ d->part[part].part_name[0])
printf(" NAME=%s(", d->part[part].part_name);
else
#endif
@@ -987,7 +988,8 @@ next_disk:
first = 0;
}
#ifndef NO_GPT
- if (d->part[part].part_name != NULL)
+ if (d->part[part].part_name &&
+ d->part[part].part_name[0])
printf(" NAME=%s(", d->part[part].part_name);
else
#endif
@@ -1095,7 +1097,9 @@ biosdisk_findpartition(int biosdev, dadd
*partition = boot_part;
#ifndef NO_GPT
- if (part_name && d->part[boot_part].part_name) {
+ if (part_name &&
+ d->part[boot_part].part_name &&
+ d->part[boot_part].part_name[0]) {
strlcpy(namebuf, d->part[boot_part].part_name,
BIOSDISK_PART_NAME_LEN);
*part_name = namebuf;
CVS commit: [netbsd-8] src/sys/arch/i386/stand
Module Name:src Committed By: martin Date: Tue Dec 17 12:21:34 UTC 2019 Modified Files: src/sys/arch/i386/stand/efiboot [netbsd-8]: efidisk.c src/sys/arch/i386/stand/lib [netbsd-8]: biosdisk.c Log Message: Pull up following revision(s) (requested by manu in ticket #1474): sys/arch/i386/stand/lib/biosdisk.c: revision 1.54 sys/arch/i386/stand/efiboot/efidisk.c: revision 1.9 Do not use NAME=label syntax when label are empty When booting sysinst from UEFI, it defaults to a GPT installation where partition have no labels. Bootstrap used the NAME=label partition anyway, with the result that both EFI and FFS root partition had the same name "NAME=" and could not be distinguished. The first matching partition for the name was used, and bootstrap looked for the kernel in the EFI partition. We fix that by not using NAME=label names for partition when label is empty. In that case we revert to old syntax such as hd0b To generate a diff of this commit: cvs rdiff -u -r1.1.12.7 -r1.1.12.8 src/sys/arch/i386/stand/efiboot/efidisk.c cvs rdiff -u -r1.46.6.6 -r1.46.6.7 src/sys/arch/i386/stand/lib/biosdisk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch/i386/stand
Module Name:src Committed By: martin Date: Tue Dec 17 12:19:49 UTC 2019 Modified Files: src/sys/arch/i386/stand/boot [netbsd-8]: devopen.c src/sys/arch/i386/stand/efiboot [netbsd-8]: devopen.c src/sys/arch/i386/stand/lib [netbsd-8]: biosdisk.c Log Message: Pull up following revision(s) (requested by manu in ticket #1473): sys/arch/i386/stand/lib/biosdisk.c: revision 1.53 sys/arch/i386/stand/efiboot/devopen.c: revision 1.9 sys/arch/i386/stand/boot/devopen.c: revision 1.10 In-RAID partitions with no name can be candidate for booting The code to select boot partition in RAID assumed thet had a name, which is true when there is a GPT inside the RAID, but not when there is a disklabel inside the RAID. This caused a regression from behavior of NetBSD 8.1. We fix this by allowing nameless partition to be boot candidates. This fixes PR misc/54748 While there, let raid device be used in the boot specification, like raid0a:/netbsd. To generate a diff of this commit: cvs rdiff -u -r1.8.52.1 -r1.8.52.2 src/sys/arch/i386/stand/boot/devopen.c cvs rdiff -u -r1.1.12.6 -r1.1.12.7 src/sys/arch/i386/stand/efiboot/devopen.c cvs rdiff -u -r1.46.6.5 -r1.46.6.6 src/sys/arch/i386/stand/lib/biosdisk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch/i386/stand
Module Name:src
Committed By: martin
Date: Tue Dec 17 12:19:49 UTC 2019
Modified Files:
src/sys/arch/i386/stand/boot [netbsd-8]: devopen.c
src/sys/arch/i386/stand/efiboot [netbsd-8]: devopen.c
src/sys/arch/i386/stand/lib [netbsd-8]: biosdisk.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #1473):
sys/arch/i386/stand/lib/biosdisk.c: revision 1.53
sys/arch/i386/stand/efiboot/devopen.c: revision 1.9
sys/arch/i386/stand/boot/devopen.c: revision 1.10
In-RAID partitions with no name can be candidate for booting
The code to select boot partition in RAID assumed thet had a name,
which is true when there is a GPT inside the RAID, but not when there
is a disklabel inside the RAID. This caused a regression from behavior
of NetBSD 8.1.
We fix this by allowing nameless partition to be boot candidates.
This fixes PR misc/54748
While there, let raid device be used in the boot specification, like
raid0a:/netbsd.
To generate a diff of this commit:
cvs rdiff -u -r1.8.52.1 -r1.8.52.2 src/sys/arch/i386/stand/boot/devopen.c
cvs rdiff -u -r1.1.12.6 -r1.1.12.7 src/sys/arch/i386/stand/efiboot/devopen.c
cvs rdiff -u -r1.46.6.5 -r1.46.6.6 src/sys/arch/i386/stand/lib/biosdisk.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/i386/stand/boot/devopen.c
diff -u src/sys/arch/i386/stand/boot/devopen.c:1.8.52.1 src/sys/arch/i386/stand/boot/devopen.c:1.8.52.2
--- src/sys/arch/i386/stand/boot/devopen.c:1.8.52.1 Tue Sep 17 18:26:53 2019
+++ src/sys/arch/i386/stand/boot/devopen.c Tue Dec 17 12:19:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.8.52.1 2019/09/17 18:26:53 martin Exp $ */
+/* $NetBSD: devopen.c,v 1.8.52.2 2019/12/17 12:19:49 martin Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -156,7 +156,7 @@ devopen(struct open_file *f, const char
if (strstr(devname, "raid") == devname) {
f->f_dev = [0]; /* must be biosdisk */
- return biosdisk_open_name(f, devname);
+ return biosdisk_open_name(f, fname);
}
#endif
Index: src/sys/arch/i386/stand/efiboot/devopen.c
diff -u src/sys/arch/i386/stand/efiboot/devopen.c:1.1.12.6 src/sys/arch/i386/stand/efiboot/devopen.c:1.1.12.7
--- src/sys/arch/i386/stand/efiboot/devopen.c:1.1.12.6 Fri Sep 27 09:40:08 2019
+++ src/sys/arch/i386/stand/efiboot/devopen.c Tue Dec 17 12:19:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.1.12.6 2019/09/27 09:40:08 martin Exp $ */
+/* $NetBSD: devopen.c,v 1.1.12.7 2019/12/17 12:19:49 martin Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -151,6 +151,7 @@ int
devopen(struct open_file *f, const char *fname, char **file)
{
char *fsname, *devname;
+ const char *xname = NULL;
int unit, partition;
int biosdev;
int i, error;
@@ -172,8 +173,12 @@ devopen(struct open_file *f, const char
nfsys = nfsys_disk;
/* Search by GPT label or raidframe name */
- if ((strstr(devname, "NAME=") == devname) ||
- (strstr(devname, "raid") == devname)) {
+ if (strstr(devname, "NAME=") == devname)
+ xname = devname;
+ if (strstr(devname, "raid") == devname)
+ xname = fname;
+
+ if (xname != NULL) {
f->f_dev = [0]; /* must be biosdisk */
if (!kernel_loaded) {
@@ -181,7 +186,7 @@ devopen(struct open_file *f, const char
BI_ADD(, BTINFO_BOOTPATH, sizeof(bibp));
}
- error = biosdisk_open_name(f, devname);
+ error = biosdisk_open_name(f, xname);
return error;
}
Index: src/sys/arch/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.46.6.5 src/sys/arch/i386/stand/lib/biosdisk.c:1.46.6.6
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.46.6.5 Wed Sep 18 17:30:05 2019
+++ src/sys/arch/i386/stand/lib/biosdisk.c Tue Dec 17 12:19:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.c,v 1.46.6.5 2019/09/18 17:30:05 martin Exp $ */
+/* $NetBSD: biosdisk.c,v 1.46.6.6 2019/12/17 12:19:49 martin Exp $ */
/*
* Copyright (c) 1996, 1998
@@ -1401,9 +1401,9 @@ next_disk:
continue;
if (d->part[part].fstype == FS_UNUSED)
continue;
- if (d->part[part].part_name == NULL)
-continue;
- if (strcmp(d->part[part].part_name, name) == 0) {
+
+ if (d->part[part].part_name != NULL &&
+ strcmp(d->part[part].part_name, name) == 0) {
*biosdev = raidframe[i].biosdev;
*offset = raidframe[i].offset
+ RF_PROTECTED_SECTORS
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: msaitoh
Date: Tue Dec 17 10:42:07 UTC 2019
Modified Files:
src/sys/dev/ic: rtl8169.c rtl81x9reg.h
Log Message:
Improve some chip revisions support:
- Add 8168FP, 8411, 8168G, 8401E, 8105E, 8105E_SPIN1, 8106E and 8402 from
{Free,Open}BSD.
- Renumber RTK_HWREV_8103E from 0x24C0 to 0x34c0. 0x24C0 is newly
used as RTK_HWREV_8102EL_SPIN1. Same as {Free,Open}BSD.
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/ic/rtl81x9reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/rtl8169.c
diff -u src/sys/dev/ic/rtl8169.c:1.160 src/sys/dev/ic/rtl8169.c:1.161
--- src/sys/dev/ic/rtl8169.c:1.160 Sun Sep 22 16:41:19 2019
+++ src/sys/dev/ic/rtl8169.c Tue Dec 17 10:42:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.160 2019/09/22 16:41:19 ryo Exp $ */
+/* $NetBSD: rtl8169.c,v 1.161 2019/12/17 10:42:06 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.160 2019/09/22 16:41:19 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.161 2019/12/17 10:42:06 msaitoh Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
@@ -613,15 +613,18 @@ re_attach(struct rtk_softc *sc)
RTKQ_NOJUMBO;
break;
case RTK_HWREV_8168H:
+ case RTK_HWREV_8168FP:
sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD |
RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_PHYWAKE_PM |
RTKQ_NOJUMBO | RTKQ_RXDV_GATED | RTKQ_TXRXEN_LATER;
break;
case RTK_HWREV_8168E_VL:
case RTK_HWREV_8168F:
+ case RTK_HWREV_8411:
sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD |
RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_NOJUMBO;
break;
+ case RTK_HWREV_8168EP:
case RTK_HWREV_8168G:
case RTK_HWREV_8168G_SPIN1:
case RTK_HWREV_8168G_SPIN2:
@@ -637,10 +640,27 @@ re_attach(struct rtk_softc *sc)
break;
case RTK_HWREV_8102E:
case RTK_HWREV_8102EL:
- case RTK_HWREV_8103E:
+ case RTK_HWREV_8102EL_SPIN1:
sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD |
RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_NOJUMBO;
break;
+ case RTK_HWREV_8103E:
+ sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD |
+ RTKQ_MACSTAT | RTKQ_CMDSTOP;
+ break;
+ case RTK_HWREV_8401E:
+ case RTK_HWREV_8105E:
+ case RTK_HWREV_8105E_SPIN1:
+ case RTK_HWREV_8106E:
+ sc->sc_quirk |= RTKQ_PHYWAKE_PM |
+ RTKQ_DESCV2 | RTKQ_NOEECMD | RTKQ_MACSTAT |
+ RTKQ_CMDSTOP;
+ break;
+ case RTK_HWREV_8402:
+ sc->sc_quirk |= RTKQ_PHYWAKE_PM |
+ RTKQ_DESCV2 | RTKQ_NOEECMD | RTKQ_MACSTAT |
+ RTKQ_CMDSTOP; /* CMDSTOP_WAIT_TXQ */
+ break;
default:
aprint_normal_dev(sc->sc_dev,
"Unknown revision (0x%08x)\n", hwrev);
Index: src/sys/dev/ic/rtl81x9reg.h
diff -u src/sys/dev/ic/rtl81x9reg.h:1.51 src/sys/dev/ic/rtl81x9reg.h:1.52
--- src/sys/dev/ic/rtl81x9reg.h:1.51 Fri Nov 15 13:25:53 2019
+++ src/sys/dev/ic/rtl81x9reg.h Tue Dec 17 10:42:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9reg.h,v 1.51 2019/11/15 13:25:53 msaitoh Exp $ */
+/* $NetBSD: rtl81x9reg.h,v 1.52 2019/12/17 10:42:06 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -159,8 +159,9 @@
#define RTK_HWREV_8169S 0x0400
#define RTK_HWREV_8169_8110SB 0x1000
#define RTK_HWREV_8169_8110SC 0x1800
+#define RTK_HWREV_8401E 0x2400
#define RTK_HWREV_8102EL 0x2480
-#define RTK_HWREV_8103E 0x24C0
+#define RTK_HWREV_8102EL_SPIN1 0x24C0
#define RTK_HWREV_8168D 0x2800
#define RTK_HWREV_8168DP 0x2880
#define RTK_HWREV_8168E 0x2C00
@@ -169,19 +170,27 @@
#define RTK_HWREV_8100E 0x3080
#define RTK_HWREV_8101E 0x3400
#define RTK_HWREV_8102E 0x3480
+#define RTK_HWREV_8103E 0x34c0
#define RTK_HWREV_8168_SPIN2 0x3800
#define RTK_HWREV_8168_SPIN3 0x3840
#define RTK_HWREV_8100E_SPIN2 0x3880
#define RTK_HWREV_8168C 0x3C00
#define RTK_HWREV_8168C_SPIN2 0x3C40
#define RTK_HWREV_8168CP 0x3C80
+#define RTK_HWREV_8105E 0x4080
+#define RTK_HWREV_8105E_SPIN1 0x40C0
+#define RTK_HWREV_8402 0x4400
+#define RTK_HWREV_8106E 0x4480
#define RTK_HWREV_8168F 0x4800
+#define RTK_HWREV_8411 0x4880
#define RTK_HWREV_8168G 0x4c00
#define RTK_HWREV_8168G_SPIN1 0x4c10
+#define RTK_HWREV_8168EP 0x5000
#define RTK_HWREV_8168GU 0x5080
#define RTK_HWREV_8168G_SPIN2 0x5090
#define RTK_HWREV_8168H 0x5400
#define RTK_HWREV_8168H_SPIN1 0x5410
+#define RTK_HWREV_8168FP 0x5480
#define RTK_HWREV_8168G_SPIN4 0x5c80
#define RTK_HWREV_8139 0x6000
#define RTK_HWREV_8139A 0x7000
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: msaitoh
Date: Tue Dec 17 10:42:07 UTC 2019
Modified Files:
src/sys/dev/ic: rtl8169.c rtl81x9reg.h
Log Message:
Improve some chip revisions support:
- Add 8168FP, 8411, 8168G, 8401E, 8105E, 8105E_SPIN1, 8106E and 8402 from
{Free,Open}BSD.
- Renumber RTK_HWREV_8103E from 0x24C0 to 0x34c0. 0x24C0 is newly
used as RTK_HWREV_8102EL_SPIN1. Same as {Free,Open}BSD.
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/ic/rtl81x9reg.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/doc
Module Name:src Committed By: msaitoh Date: Tue Dec 17 10:25:42 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Fix typos. To generate a diff of this commit: cvs rdiff -u -r1.1.2.140 -r1.1.2.141 src/doc/CHANGES-9.0 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: msaitoh Date: Tue Dec 17 10:25:42 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Fix typos. To generate a diff of this commit: cvs rdiff -u -r1.1.2.140 -r1.1.2.141 src/doc/CHANGES-9.0 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.0 diff -u src/doc/CHANGES-9.0:1.1.2.140 src/doc/CHANGES-9.0:1.1.2.141 --- src/doc/CHANGES-9.0:1.1.2.140 Tue Dec 17 09:49:52 2019 +++ src/doc/CHANGES-9.0 Tue Dec 17 10:25:42 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.140 2019/12/17 09:49:52 msaitoh Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.141 2019/12/17 10:25:42 msaitoh Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -2482,7 +2482,7 @@ sys/modules/usbnet/Makefile 1.1 and includes locking clean up, detach safety when being used or not, separate rx/tx locks to improve performance, porting to NET_MPSAFE, many edge/error case bugs in - drivers fixed, as well as resovling PRs 54303 and 54308. + drivers fixed, as well as resolving PRs 54303 and 54308. These drivers are converted: axe(4), axen(4), aue(4), cdce(4), cue(4), kue(4), mue(4), smsc(4), udav(4), upl(4), ure(4), url(4), and urndis(4). @@ -2666,7 +2666,7 @@ usr.sbin/puffs/rump_lfs/rump_lfs.c 1.19 Use getdiskrawname to find the device name. Teach getdiskrawname and getdiskcookedname about zvols. Also supply rope for rump based tests and use that to make the - lfs cleaner work properly in the test envrionment. + lfs cleaner work properly in the test environment. [brad, ticket #110] share/man/man1/man1.atari/edahdi.1 1.12 @@ -2783,7 +2783,7 @@ sys/netinet/if_arp.c1.287 sbin/route/route.c1.163 - route(8): Show addres for RTM_LOSING. + route(8): Show address for RTM_LOSING. [roy, ticket #172] tests/net/arp/t_arp.sh1.39 @@ -4246,7 +4246,7 @@ sys/dev/i2c/axppmic.c1.26 sys/arch/i386/stand/pxeboot/Makefile 1.28 sys/arch/i386/stand/pxeboot/start_pxe.S 1.7 - Incrase pxeboot code size limit from 64k to 128k. + Increase pxeboot code size limit from 64k to 128k. [manu, ticket #277] external/bsd/jemalloc/dist/src/jemalloc.c 1.8 @@ -5552,7 +5552,7 @@ usr.sbin/postinstall/postinstall.in 1.8 Various fixes in NVMM (requires updating kernel, modules, userland and qemu). Add a nvmm group to allow better configuration of access rights - to controll guests. + to control guests. Add nvmmctl(8). [maxv, ticket #405] @@ -5606,7 +5606,7 @@ sys/sys/signalvar.h1.98,1.99 Convert the sendsig_sigcontext_16 and the coredump_vec function pointers to use the new compat_hook mechanism. This breaks the kernel/module ABI; kernel and modules should - be updated together. No practical problems expected in commmon + be updated together. No practical problems expected in common setups. [pgoyette, ticket #413] @@ -5639,7 +5639,7 @@ usr.sbin/rtadvd/rtadvd.h 1.20 sys/external/bsd/ipf/netinet/ip_fil.h 1.8 - ipf(8): fix binary compatibility (accidently broken in rev. 1.7). + ipf(8): fix binary compatibility (accidentally broken in rev. 1.7). [chs, ticket #418] sys/arch/x86/include/specialreg.h 1.157 @@ -5651,7 +5651,7 @@ sys/arch/x86/x86/spectre.c 1.31 sys/net/if_vlan.c1.148 tests/net/if_vlan/t_vlan.sh 1.16 - Fix a bug that vlan(4) fragments IPv6 packets unecessarily. + Fix a bug that vlan(4) fragments IPv6 packets unnecessarily. Add a test case for this. [yamaguchi, ticket #420] @@ -5667,7 +5667,7 @@ sys/dev/pci/ixgbe/ixv.c1.140 sys/netipsec/key.c1.268,1.269 - Fix SA can be expaired wrongly when there are many SPs. + Fix SA can be expired wrongly when there are many SPs. Reduce load for IKE negotiations when the system has many IPv6 addresses. [knakahara, ticket #423] @@ -6836,7 +6836,7 @@ distrib/notes/common/macros sys/external/bsd/dwc2/dwc2.c 1.60-1.66 - PR/54696: calulate the right lenght for isoc transfer and the + PR/54696: calculate the right length for isoc transfer and the usb_syncmem. [skrll, ticket #524] @@ -6930,7 +6930,7 @@ usr.sbin/sysinst/disklabel.c 1.16, 1.1 usr.sbin/sysinst/bsddisklabel.c 1.32 - PR install/54745: fix confusion about absolut and NetBSD-partition + PR install/54745: fix confusion about absolute and NetBSD-partition relative offsets. [martin, ticket #538] @@ -6959,7 +6959,7 @@ bin/sh/trap.c 1.53 sys/dev/mii/files.mii1.54 - Make kernels with ipgphy(4) but wihtout ukphy(4) buildable. + Make kernels with ipgphy(4) but without ukphy(4) buildable. [msaitoh, ticket #543] sys/dev/usb/ugen.c1.148 @@ -7055,7 +7055,7 @@ sys/dev/usb/ohci.c1.292 sys/arch/pmax/pmax/disksubr.c 1.56 Disable (pretty useless and obscure) message when checking for Ultrix - comaptible labels. + compatible labels. [martin, ticket #559]
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: msaitoh Date: Tue Dec 17 09:49:53 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #559-#561. To generate a diff of this commit: cvs rdiff -u -r1.1.2.139 -r1.1.2.140 src/doc/CHANGES-9.0 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: msaitoh Date: Tue Dec 17 09:49:53 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #559-#561. To generate a diff of this commit: cvs rdiff -u -r1.1.2.139 -r1.1.2.140 src/doc/CHANGES-9.0 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.0 diff -u src/doc/CHANGES-9.0:1.1.2.139 src/doc/CHANGES-9.0:1.1.2.140 --- src/doc/CHANGES-9.0:1.1.2.139 Sat Dec 14 12:36:33 2019 +++ src/doc/CHANGES-9.0 Tue Dec 17 09:49:52 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.139 2019/12/14 12:36:33 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.140 2019/12/17 09:49:52 msaitoh Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -7052,3 +7052,65 @@ sys/dev/usb/ohci.c1.292 Descriptor in ohci_abort_xfer(). [gson, ticket #554] +sys/arch/pmax/pmax/disksubr.c 1.56 + + Disable (pretty useless and obscure) message when checking for Ultrix + comaptible labels. + [martin, ticket #559] + +usr.sbin/sysinst/arch/alpha/md.c 1.7 +usr.sbin/sysinst/arch/amiga/md.h 1.5 +usr.sbin/sysinst/arch/arc/md.c 1.10 +usr.sbin/sysinst/arch/cobalt/md.c 1.10 +usr.sbin/sysinst/arch/cobalt/md.h 1.5 +usr.sbin/sysinst/arch/emips/md.c 1.8 +usr.sbin/sysinst/arch/evbarm/md.c 1.10 +usr.sbin/sysinst/arch/evbarm/menus.md.en 1.2 +usr.sbin/sysinst/arch/evbarm/menus.md.es 1.2 +usr.sbin/sysinst/arch/evbarm/menus.md.fr 1.2 +usr.sbin/sysinst/arch/evbarm/menus.md.pl 1.2 +usr.sbin/sysinst/arch/ews4800mips/md.c 1.5 +usr.sbin/sysinst/arch/hp300/md.c 1.9 +usr.sbin/sysinst/arch/i386/md.c 1.27 +usr.sbin/sysinst/arch/mipsco/md.c 1.7 +usr.sbin/sysinst/arch/mvme68k/md.c 1.9 +usr.sbin/sysinst/arch/pmax/md.c 1.7 +usr.sbin/sysinst/arch/prep/md.c 1.10 +usr.sbin/sysinst/arch/x68k/md.c 1.9 +usr.sbin/sysinst/arch/x68k/md.h 1.4 +usr.sbin/sysinst/bsddisklabel.c 1.33 +usr.sbin/sysinst/defs.h1.49 +usr.sbin/sysinst/disklabel.c 1.18-1.27 +usr.sbin/sysinst/disks.c 1.58 +usr.sbin/sysinst/gpt.c1.13 +usr.sbin/sysinst/label.c 1.15-1.17 +usr.sbin/sysinst/main.c1.19 +usr.sbin/sysinst/mbr.c1.23 +usr.sbin/sysinst/msg.mi.de 1.19 +usr.sbin/sysinst/msg.mi.en 1.26 +usr.sbin/sysinst/msg.mi.es 1.20 +usr.sbin/sysinst/msg.mi.fr 1.24 +usr.sbin/sysinst/msg.mi.pl 1.27 +usr.sbin/sysinst/partitions.c 1.6-1.8 +usr.sbin/sysinst/partitions.h 1.9-1.11 +usr.sbin/sysinst/partman.c 1.45 +usr.sbin/sysinst/wskbd.c 1.4 + + Various sysinst fixes: + - On some architectures allow kernel based magic to map foreign + partitioning schemes to disklabel. + - Allow using old (compat) versions of ext2fs for old boot loaders and + default to that on cobalt. + - Do not offer to switch the keyboard layout when using a serial + console (or network). + - Fix EFI installations on x86. + - Fix disklabel partition alignment. + - Fix overlapping partitions error display. + - Fix screen corruption. + [martin, ticket #560] + +usr.sbin/sysinst/Makefile.inc 1.31 + + Fix the pattern creating the relative path for distribution sets + on branches: we missed the potential numbers in suffixes, like _RC1. + [martin, ticket #561]
CVS commit: [netbsd-9] src/usr.sbin/sysinst
Module Name:src
Committed By: msaitoh
Date: Tue Dec 17 09:48:30 UTC 2019
Modified Files:
src/usr.sbin/sysinst [netbsd-9]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by martin in ticket #561):
usr.sbin/sysinst/Makefile.inc: revision 1.31
Fix the pattern creating the relative path for distribution sets
on branches: we missed the potential numbers in suffixes, like _RC1.
To generate a diff of this commit:
cvs rdiff -u -r1.22.2.1 -r1.22.2.2 src/usr.sbin/sysinst/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/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.22.2.1 src/usr.sbin/sysinst/Makefile.inc:1.22.2.2
--- src/usr.sbin/sysinst/Makefile.inc:1.22.2.1 Sun Nov 17 13:45:26 2019
+++ src/usr.sbin/sysinst/Makefile.inc Tue Dec 17 09:48:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22.2.1 2019/11/17 13:45:26 msaitoh Exp $
+# $NetBSD: Makefile.inc,v 1.22.2.2 2019/12/17 09:48:30 msaitoh Exp $
#
# Makefile for sysinst
@@ -98,10 +98,10 @@ CPPFLAGS+= -DSYSINST_HTTP_HOST=\"nycdn.N
CPPFLAGS+= -DREL_PATH=\"HEAD\"
CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/\.99\.[0-9]*[_A-Z]*$//}.0\""
.elif (${DISTRIBVER:M*.[0-9].[0-9]*})
-CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*$//:S/./-/}\"
+CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*[0-9]*$//:S/./-/}\"
CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/_.*$//}\""
.elif (${DISTRIBVER:M*.[0-9]*})
-CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*$//}\"
+CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*[0-9]*$//}\"
CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/_.*$//}\""
.endif
.endif
CVS commit: [netbsd-9] src/usr.sbin/sysinst
Module Name:src Committed By: msaitoh Date: Tue Dec 17 09:48:30 UTC 2019 Modified Files: src/usr.sbin/sysinst [netbsd-9]: Makefile.inc Log Message: Pull up following revision(s) (requested by martin in ticket #561): usr.sbin/sysinst/Makefile.inc: revision 1.31 Fix the pattern creating the relative path for distribution sets on branches: we missed the potential numbers in suffixes, like _RC1. To generate a diff of this commit: cvs rdiff -u -r1.22.2.1 -r1.22.2.2 src/usr.sbin/sysinst/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.sbin/sysinst
Module Name:src Committed By: msaitoh Date: Tue Dec 17 09:44:52 UTC 2019 Modified Files: src/usr.sbin/sysinst [netbsd-9]: bsddisklabel.c defs.h disklabel.c disks.c gpt.c label.c main.c mbr.c msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl partitions.c partitions.h partman.c wskbd.c src/usr.sbin/sysinst/arch/alpha [netbsd-9]: md.c src/usr.sbin/sysinst/arch/amiga [netbsd-9]: md.h src/usr.sbin/sysinst/arch/arc [netbsd-9]: md.c src/usr.sbin/sysinst/arch/cobalt [netbsd-9]: md.c md.h src/usr.sbin/sysinst/arch/emips [netbsd-9]: md.c src/usr.sbin/sysinst/arch/evbarm [netbsd-9]: md.c menus.md.en menus.md.es menus.md.fr menus.md.pl src/usr.sbin/sysinst/arch/ews4800mips [netbsd-9]: md.c src/usr.sbin/sysinst/arch/hp300 [netbsd-9]: md.c src/usr.sbin/sysinst/arch/i386 [netbsd-9]: md.c src/usr.sbin/sysinst/arch/mipsco [netbsd-9]: md.c src/usr.sbin/sysinst/arch/mvme68k [netbsd-9]: md.c src/usr.sbin/sysinst/arch/pmax [netbsd-9]: md.c src/usr.sbin/sysinst/arch/prep [netbsd-9]: md.c src/usr.sbin/sysinst/arch/x68k [netbsd-9]: md.c md.h Log Message: Pull up following revision(s) (requested by martin in ticket #560): usr.sbin/sysinst/partitions.h: revision 1.11 usr.sbin/sysinst/defs.h: revision 1.49 usr.sbin/sysinst/mbr.c: revision 1.23 usr.sbin/sysinst/msg.mi.en: revision 1.26 usr.sbin/sysinst/disks.c: revision 1.58 usr.sbin/sysinst/arch/evbarm/menus.md.pl: revision 1.2 usr.sbin/sysinst/msg.mi.es: revision 1.20 usr.sbin/sysinst/arch/mvme68k/md.c: revision 1.9 usr.sbin/sysinst/gpt.c: revision 1.13 usr.sbin/sysinst/arch/evbarm/md.c: revision 1.10 usr.sbin/sysinst/arch/arc/md.c: revision 1.10 usr.sbin/sysinst/disklabel.c: revision 1.18 usr.sbin/sysinst/bsddisklabel.c: revision 1.33 usr.sbin/sysinst/disklabel.c: revision 1.19 usr.sbin/sysinst/main.c: revision 1.19 usr.sbin/sysinst/partman.c: revision 1.45 usr.sbin/sysinst/arch/alpha/md.c: revision 1.7 usr.sbin/sysinst/msg.mi.de: revision 1.19 usr.sbin/sysinst/arch/evbarm/menus.md.en: revision 1.2 usr.sbin/sysinst/arch/x68k/md.h: revision 1.4 usr.sbin/sysinst/arch/x68k/md.c: revision 1.9 usr.sbin/sysinst/arch/evbarm/menus.md.es: revision 1.2 usr.sbin/sysinst/wskbd.c: revision 1.4 usr.sbin/sysinst/label.c: revision 1.15 usr.sbin/sysinst/arch/amiga/md.h: revision 1.5 usr.sbin/sysinst/label.c: revision 1.16 usr.sbin/sysinst/arch/hp300/md.c: revision 1.9 usr.sbin/sysinst/arch/emips/md.c: revision 1.8 usr.sbin/sysinst/label.c: revision 1.17 usr.sbin/sysinst/arch/pmax/md.c: revision 1.7 usr.sbin/sysinst/partitions.c: revision 1.6 usr.sbin/sysinst/arch/prep/md.c: revision 1.10 usr.sbin/sysinst/arch/mipsco/md.c: revision 1.7 usr.sbin/sysinst/partitions.c: revision 1.7 usr.sbin/sysinst/partitions.c: revision 1.8 usr.sbin/sysinst/arch/ews4800mips/md.c: revision 1.5 usr.sbin/sysinst/disklabel.c: revision 1.20 usr.sbin/sysinst/arch/evbarm/menus.md.fr: revision 1.2 usr.sbin/sysinst/msg.mi.fr: revision 1.24 usr.sbin/sysinst/disklabel.c: revision 1.21 usr.sbin/sysinst/partitions.h: revision 1.9 usr.sbin/sysinst/msg.mi.pl: revision 1.27 usr.sbin/sysinst/disklabel.c: revision 1.22 usr.sbin/sysinst/disklabel.c: revision 1.23 usr.sbin/sysinst/arch/i386/md.c: revision 1.27 usr.sbin/sysinst/disklabel.c: revision 1.24 usr.sbin/sysinst/disklabel.c: revision 1.25 usr.sbin/sysinst/arch/cobalt/md.h: revision 1.5 usr.sbin/sysinst/disklabel.c: revision 1.26 usr.sbin/sysinst/disklabel.c: revision 1.27 usr.sbin/sysinst/partitions.h: revision 1.10 usr.sbin/sysinst/arch/cobalt/md.c: revision 1.10 PR install/54582: allow MD code to disable on-disk presence verification of "real" disklabels. Auto-enable this (at run time) when there is no other partitioning scheme but disklabel configured. Hard-coded enable this for x68k to allow using kernel based translations for native Human68k partitions. Get rid of the evbarm preliminary menu: do not bother to ask the user whether this is a RPi - query the FDT instead. PR 54065: add optional "old compat" variant of ext2fs in file system type selection and use that as default for the cobalt boot file system. For now rely on the kernel mapping native RDB partitions. Fix detection of existing disklabels in the case when we only have the disklabel partitioning scheme available. Fix DISKLABEL_NO_ONDISK_VERIFY (accidently disabled in previous) Fix inverted comparison Do not try to change the keyboard layout if we are not running on the console. When trying to tell a fictious but empty label from a
CVS commit: [netbsd-9] src/usr.sbin/sysinst
Module Name:src Committed By: msaitoh Date: Tue Dec 17 09:44:52 UTC 2019 Modified Files: src/usr.sbin/sysinst [netbsd-9]: bsddisklabel.c defs.h disklabel.c disks.c gpt.c label.c main.c mbr.c msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl partitions.c partitions.h partman.c wskbd.c src/usr.sbin/sysinst/arch/alpha [netbsd-9]: md.c src/usr.sbin/sysinst/arch/amiga [netbsd-9]: md.h src/usr.sbin/sysinst/arch/arc [netbsd-9]: md.c src/usr.sbin/sysinst/arch/cobalt [netbsd-9]: md.c md.h src/usr.sbin/sysinst/arch/emips [netbsd-9]: md.c src/usr.sbin/sysinst/arch/evbarm [netbsd-9]: md.c menus.md.en menus.md.es menus.md.fr menus.md.pl src/usr.sbin/sysinst/arch/ews4800mips [netbsd-9]: md.c src/usr.sbin/sysinst/arch/hp300 [netbsd-9]: md.c src/usr.sbin/sysinst/arch/i386 [netbsd-9]: md.c src/usr.sbin/sysinst/arch/mipsco [netbsd-9]: md.c src/usr.sbin/sysinst/arch/mvme68k [netbsd-9]: md.c src/usr.sbin/sysinst/arch/pmax [netbsd-9]: md.c src/usr.sbin/sysinst/arch/prep [netbsd-9]: md.c src/usr.sbin/sysinst/arch/x68k [netbsd-9]: md.c md.h Log Message: Pull up following revision(s) (requested by martin in ticket #560): usr.sbin/sysinst/partitions.h: revision 1.11 usr.sbin/sysinst/defs.h: revision 1.49 usr.sbin/sysinst/mbr.c: revision 1.23 usr.sbin/sysinst/msg.mi.en: revision 1.26 usr.sbin/sysinst/disks.c: revision 1.58 usr.sbin/sysinst/arch/evbarm/menus.md.pl: revision 1.2 usr.sbin/sysinst/msg.mi.es: revision 1.20 usr.sbin/sysinst/arch/mvme68k/md.c: revision 1.9 usr.sbin/sysinst/gpt.c: revision 1.13 usr.sbin/sysinst/arch/evbarm/md.c: revision 1.10 usr.sbin/sysinst/arch/arc/md.c: revision 1.10 usr.sbin/sysinst/disklabel.c: revision 1.18 usr.sbin/sysinst/bsddisklabel.c: revision 1.33 usr.sbin/sysinst/disklabel.c: revision 1.19 usr.sbin/sysinst/main.c: revision 1.19 usr.sbin/sysinst/partman.c: revision 1.45 usr.sbin/sysinst/arch/alpha/md.c: revision 1.7 usr.sbin/sysinst/msg.mi.de: revision 1.19 usr.sbin/sysinst/arch/evbarm/menus.md.en: revision 1.2 usr.sbin/sysinst/arch/x68k/md.h: revision 1.4 usr.sbin/sysinst/arch/x68k/md.c: revision 1.9 usr.sbin/sysinst/arch/evbarm/menus.md.es: revision 1.2 usr.sbin/sysinst/wskbd.c: revision 1.4 usr.sbin/sysinst/label.c: revision 1.15 usr.sbin/sysinst/arch/amiga/md.h: revision 1.5 usr.sbin/sysinst/label.c: revision 1.16 usr.sbin/sysinst/arch/hp300/md.c: revision 1.9 usr.sbin/sysinst/arch/emips/md.c: revision 1.8 usr.sbin/sysinst/label.c: revision 1.17 usr.sbin/sysinst/arch/pmax/md.c: revision 1.7 usr.sbin/sysinst/partitions.c: revision 1.6 usr.sbin/sysinst/arch/prep/md.c: revision 1.10 usr.sbin/sysinst/arch/mipsco/md.c: revision 1.7 usr.sbin/sysinst/partitions.c: revision 1.7 usr.sbin/sysinst/partitions.c: revision 1.8 usr.sbin/sysinst/arch/ews4800mips/md.c: revision 1.5 usr.sbin/sysinst/disklabel.c: revision 1.20 usr.sbin/sysinst/arch/evbarm/menus.md.fr: revision 1.2 usr.sbin/sysinst/msg.mi.fr: revision 1.24 usr.sbin/sysinst/disklabel.c: revision 1.21 usr.sbin/sysinst/partitions.h: revision 1.9 usr.sbin/sysinst/msg.mi.pl: revision 1.27 usr.sbin/sysinst/disklabel.c: revision 1.22 usr.sbin/sysinst/disklabel.c: revision 1.23 usr.sbin/sysinst/arch/i386/md.c: revision 1.27 usr.sbin/sysinst/disklabel.c: revision 1.24 usr.sbin/sysinst/disklabel.c: revision 1.25 usr.sbin/sysinst/arch/cobalt/md.h: revision 1.5 usr.sbin/sysinst/disklabel.c: revision 1.26 usr.sbin/sysinst/disklabel.c: revision 1.27 usr.sbin/sysinst/partitions.h: revision 1.10 usr.sbin/sysinst/arch/cobalt/md.c: revision 1.10 PR install/54582: allow MD code to disable on-disk presence verification of "real" disklabels. Auto-enable this (at run time) when there is no other partitioning scheme but disklabel configured. Hard-coded enable this for x68k to allow using kernel based translations for native Human68k partitions. Get rid of the evbarm preliminary menu: do not bother to ask the user whether this is a RPi - query the FDT instead. PR 54065: add optional "old compat" variant of ext2fs in file system type selection and use that as default for the cobalt boot file system. For now rely on the kernel mapping native RDB partitions. Fix detection of existing disklabels in the case when we only have the disklabel partitioning scheme available. Fix DISKLABEL_NO_ONDISK_VERIFY (accidently disabled in previous) Fix inverted comparison Do not try to change the keyboard layout if we are not running on the console. When trying to tell a fictious but empty label from a
