CVS commit: src/usr.sbin/installboot
Module Name:src Committed By: mrg Date: Tue Dec 26 06:00:35 UTC 2023 Modified Files: src/usr.sbin/installboot: installboot.8 Log Message: document how to use installboot on netbsd/vax. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/usr.sbin/installboot/installboot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/installboot/installboot.8 diff -u src/usr.sbin/installboot/installboot.8:1.107 src/usr.sbin/installboot/installboot.8:1.108 --- src/usr.sbin/installboot/installboot.8:1.107 Wed May 17 01:35:00 2023 +++ src/usr.sbin/installboot/installboot.8 Tue Dec 26 06:00:35 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: installboot.8,v 1.107 2023/05/17 01:35:00 uwe Exp $ +.\" $NetBSD: installboot.8,v 1.108 2023/12/26 06:00:35 mrg Exp $ .\" .\" Copyright (c) 2002-2023 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -32,7 +32,7 @@ .\" Usage: \*(UB .ds UB U\(hyBoot . -.Dd May 16, 2023 +.Dd December 25, 2023 .Dt INSTALLBOOT 8 .Os .Sh NAME @@ -1125,6 +1125,18 @@ already present: .Pp .Dl installboot /dev/rsd0c /usr/mdec/bootxx /boot . +.Ss NetBSD/vax +Install the Berkeley Fast File System primary bootstrap on to disk +.Ql ra0 : +.Pp +.Dl installboot /dev/rra0c /usr/mdec/raboot +.Pp +The primary bootstrap works with FFSv1 and FFSv2 file systems. +The secondary +.Nx Ns /vax +bootstrap is located in +.Pa /usr/mdec/boot . +. .Sh DIAGNOSTIC .Ex -std .
CVS commit: src/usr.sbin/installboot
Module Name:src Committed By: mrg Date: Tue Dec 26 06:00:35 UTC 2023 Modified Files: src/usr.sbin/installboot: installboot.8 Log Message: document how to use installboot on netbsd/vax. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/usr.sbin/installboot/installboot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: snj Date: Tue Dec 26 05:59:01 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: tickets 511 and 512 To generate a diff of this commit: cvs rdiff -u -r1.1.2.177 -r1.1.2.178 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: snj Date: Tue Dec 26 05:59:01 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: tickets 511 and 512 To generate a diff of this commit: cvs rdiff -u -r1.1.2.177 -r1.1.2.178 src/doc/CHANGES-10.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-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.177 src/doc/CHANGES-10.0:1.1.2.178 --- src/doc/CHANGES-10.0:1.1.2.177 Mon Dec 25 12:48:47 2023 +++ src/doc/CHANGES-10.0 Tue Dec 26 05:59:00 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.177 2023/12/25 12:48:47 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.178 2023/12/26 05:59:00 snj Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -14942,4 +14942,26 @@ doc/3RDPARTY (apply patch) postfix(1): update to 3.8.4. [kim, #517] +usr.sbin/sysinst/configmenu.c 1.18 +usr.sbin/sysinst/defs.h1.90 +usr.sbin/sysinst/main.c1.32 +usr.sbin/sysinst/menus.entropy 1.3 +usr.sbin/sysinst/menus.mi 1.29 +usr.sbin/sysinst/net.c1.45 + + Add a https transfer method (sharing all host details with the + http transfer). Make this method the default for all downloads. + + Try to make sure the binary pkg installation can make use of SSL + verification. + [martin, ticket #511] + +usr.sbin/sysinst/arch/evbarm/msg.md.de 1.2 +usr.sbin/sysinst/arch/evbarm/msg.md.en 1.3 +usr.sbin/sysinst/arch/evbarm/msg.md.es 1.2 +usr.sbin/sysinst/arch/evbarm/msg.md.fr 1.2 +usr.sbin/sysinst/arch/evbarm/msg.md.pl 1.2 + + Fix kernel set names. + [martin, ticket #512]
CVS commit: [netbsd-10] src/usr.sbin/sysinst/arch/evbarm
Module Name:src
Committed By: snj
Date: Tue Dec 26 05:58:02 UTC 2023
Modified Files:
src/usr.sbin/sysinst/arch/evbarm [netbsd-10]: msg.md.de msg.md.en
msg.md.es msg.md.fr msg.md.pl
Log Message:
Pull up following revision(s) (requested by martin in ticket #512):
usr.sbin/sysinst/arch/evbarm/msg.md.de: revision 1.2
usr.sbin/sysinst/arch/evbarm/msg.md.en: revision 1.3
usr.sbin/sysinst/arch/evbarm/msg.md.es: revision 1.2
usr.sbin/sysinst/arch/evbarm/msg.md.fr: revision 1.2
usr.sbin/sysinst/arch/evbarm/msg.md.pl: revision 1.2
Fix kernel set names (the code has been changed to only offer GENERIC
or GENERIC64 kernel sets, but the UI messages and translations have not
been adapted back then)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.38.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.de \
src/usr.sbin/sysinst/arch/evbarm/msg.md.es \
src/usr.sbin/sysinst/arch/evbarm/msg.md.fr \
src/usr.sbin/sysinst/arch/evbarm/msg.md.pl
cvs rdiff -u -r1.2 -r1.2.6.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.en
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/arch/evbarm/msg.md.de
diff -u src/usr.sbin/sysinst/arch/evbarm/msg.md.de:1.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.de:1.1.38.1
--- src/usr.sbin/sysinst/arch/evbarm/msg.md.de:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/msg.md.de Tue Dec 26 05:58:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.1 2014/07/26 19:30:45 dholland Exp $ */
+/* $NetBSD: msg.md.de,v 1.1.38.1 2023/12/26 05:58:02 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -73,23 +73,7 @@ message arm32fspart
}
message set_kernel_1
-{Kernel (ADI_BRH)}
-message set_kernel_2
-{Kernel (INTERGRATOR)}
-message set_kernel_3
-{Kernel (IQ80310)}
-message set_kernel_4
-{Kernel (IQ80321)}
-message set_kernel_5
-{Kernel (MINI2440)}
-message set_kernel_6
-{Kernel (TEAMASA_NPWR)}
-message set_kernel_7
-{Kernel (TS7200)}
-message set_kernel_8
-{Kernel (RPI)}
-message set_kernel_9
-{Kernel (KUROBOX_PRO)}
+{Kernel}
message nomsdospart
{There is no MSDOS boot partition in the MBR partition table.}
Index: src/usr.sbin/sysinst/arch/evbarm/msg.md.es
diff -u src/usr.sbin/sysinst/arch/evbarm/msg.md.es:1.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.es:1.1.38.1
--- src/usr.sbin/sysinst/arch/evbarm/msg.md.es:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/msg.md.es Tue Dec 26 05:58:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.1 2014/07/26 19:30:45 dholland Exp $ */
+/* $NetBSD: msg.md.es,v 1.1.38.1 2023/12/26 05:58:02 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -72,23 +72,7 @@ Compensación en %s):
}
message set_kernel_1
-{Núcleo (ADI_BRH)}
-message set_kernel_2
-{Núcleo (INTERGRATOR)}
-message set_kernel_3
-{Núcleo (IQ80310)}
-message set_kernel_4
-{Núcleo (IQ80321)}
-message set_kernel_5
-{Núcleo (MINI2440)}
-message set_kernel_6
-{Núcleo (TEAMASA_NPWR)}
-message set_kernel_7
-{Núcleo (TS7200)}
-message set_kernel_8
-{N\xfacleo (RPI)}
-message set_kernel_9
-{Núcleo (KUROBOX_PRO)}
+{Núcleo}
message nomsdospart
{There is no MSDOS boot partition in the MBR partition table.}
Index: src/usr.sbin/sysinst/arch/evbarm/msg.md.fr
diff -u src/usr.sbin/sysinst/arch/evbarm/msg.md.fr:1.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.fr:1.1.38.1
--- src/usr.sbin/sysinst/arch/evbarm/msg.md.fr:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/msg.md.fr Tue Dec 26 05:58:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.1 2014/07/26 19:30:45 dholland Exp $ */
+/* $NetBSD: msg.md.fr,v 1.1.38.1 2023/12/26 05:58:02 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -72,23 +72,7 @@ message arm32fspart
}
message set_kernel_1
-{Kernel (ADI_BRH)}
-message set_kernel_2
-{Kernel (INTERGRATOR)}
-message set_kernel_3
-{Kernel (IQ80310)}
-message set_kernel_4
-{Kernel (IQ80321)}
-message set_kernel_5
-{Kernel (MINI2440)}
-message set_kernel_6
-{Kernel (TEAMASA_NPWR)}
-message set_kernel_7
-{Kernel (TS7200)}
-message set_kernel_8
-{Kernel (RPI)}
-message set_kernel_9
-{Kernel (KUROBOX_PRO)}
+{Kernel}
message nomsdospart
{There is no MSDOS boot partition in the MBR partition table.}
Index: src/usr.sbin/sysinst/arch/evbarm/msg.md.pl
diff -u src/usr.sbin/sysinst/arch/evbarm/msg.md.pl:1.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.pl:1.1.38.1
--- src/usr.sbin/sysinst/arch/evbarm/msg.md.pl:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/msg.md.pl Tue Dec 26 05:58:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.1 2014/07/26 19:30:45 dholland Exp $ */
+/* $NetBSD: msg.md.pl,v 1.1.38.1 2023/12/26 05:58:02 snj Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.2 2002/04/02 17:02:54 thorpej Exp */
@@ -71,23 +71,7 @@ message arm32fspart
}
message set_kernel_1
-{Kernel (ADI_BRH)}
CVS commit: [netbsd-10] src/usr.sbin/sysinst/arch/evbarm
Module Name:src Committed By: snj Date: Tue Dec 26 05:58:02 UTC 2023 Modified Files: src/usr.sbin/sysinst/arch/evbarm [netbsd-10]: msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl Log Message: Pull up following revision(s) (requested by martin in ticket #512): usr.sbin/sysinst/arch/evbarm/msg.md.de: revision 1.2 usr.sbin/sysinst/arch/evbarm/msg.md.en: revision 1.3 usr.sbin/sysinst/arch/evbarm/msg.md.es: revision 1.2 usr.sbin/sysinst/arch/evbarm/msg.md.fr: revision 1.2 usr.sbin/sysinst/arch/evbarm/msg.md.pl: revision 1.2 Fix kernel set names (the code has been changed to only offer GENERIC or GENERIC64 kernel sets, but the UI messages and translations have not been adapted back then) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.38.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.de \ src/usr.sbin/sysinst/arch/evbarm/msg.md.es \ src/usr.sbin/sysinst/arch/evbarm/msg.md.fr \ src/usr.sbin/sysinst/arch/evbarm/msg.md.pl cvs rdiff -u -r1.2 -r1.2.6.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.en Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: snj
Date: Tue Dec 26 05:54:16 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: configmenu.c defs.h main.c
menus.entropy menus.mi net.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #511):
usr.sbin/sysinst/configmenu.c: revision 1.18
usr.sbin/sysinst/defs.h: revision 1.90
usr.sbin/sysinst/main.c: revision 1.32
usr.sbin/sysinst/menus.entropy: revision 1.3
usr.sbin/sysinst/menus.mi: revision 1.29
usr.sbin/sysinst/net.c: revision 1.45
Add a https transfer method (sharing all host details with the http
transfer). Make this method the default for all downloads.
Try to make sure the binary pkg installation (which runs in a chroot
in the already installed system) can make use of SSL verification.
This does NOT fix the missing SSL verification in most install media
even if using https (due to not fully populated /etc/openssl/certs).
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.2.1 src/usr.sbin/sysinst/configmenu.c
cvs rdiff -u -r1.88 -r1.88.2.1 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/usr.sbin/sysinst/main.c
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/menus.entropy
cvs rdiff -u -r1.27.2.1 -r1.27.2.2 src/usr.sbin/sysinst/menus.mi
cvs rdiff -u -r1.43.2.1 -r1.43.2.2 src/usr.sbin/sysinst/net.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/configmenu.c
diff -u src/usr.sbin/sysinst/configmenu.c:1.17 src/usr.sbin/sysinst/configmenu.c:1.17.2.1
--- src/usr.sbin/sysinst/configmenu.c:1.17 Wed May 18 16:39:03 2022
+++ src/usr.sbin/sysinst/configmenu.c Tue Dec 26 05:54:15 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.17 2022/05/18 16:39:03 martin Exp $ */
+/* $NetBSD: configmenu.c,v 1.17.2.1 2023/12/26 05:54:15 snj Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -324,6 +324,9 @@ set_binpkg(struct menudesc *menu, void *
int allok = 0;
arg_rv parm;
+ if (config_network(0))
+ mnt_net_config();
+
do {
parm.rv = -1;
parm.arg = additional_pkgs;
@@ -333,7 +336,16 @@ set_binpkg(struct menudesc *menu, void *
return 0;
}
- make_url(pkgpath, &pkg, pkg_dir);
+ /*
+ * Make sure we have the TLS certs in a usable state
+ * (if target is a new installation)
+ */
+ if (pkg.xfer == XFER_HTTPS) {
+ run_program(RUN_CHROOT | RUN_SILENT,
+ "/bin/sh /etc/rc.d/certctl_init onestart");
+ make_url(pkgpath, &pkg, pkg_dir);
+ }
+
if (run_program(RUN_DISPLAY | RUN_PROGRESS | RUN_CHROOT,
"pkg_add %s/pkgin", pkgpath) == 0) {
allok = 1;
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.88 src/usr.sbin/sysinst/defs.h:1.88.2.1
--- src/usr.sbin/sysinst/defs.h:1.88 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/defs.h Tue Dec 26 05:54:15 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.88 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: defs.h,v 1.88.2.1 2023/12/26 05:54:15 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -599,10 +599,13 @@ extern const char *ushell;
#define XFER_FTP 0
#define XFER_HTTP 1
-#define XFER_MAX XFER_HTTP
+#define XFER_HTTPS 2
+#define XFER_MAX XFER_HTTPS
+#define XFER_HOST_MAX XFER_HTTP /* http and https share a server name */
+#define XFER_HOST(XFER) ((XFER) == XFER_FTP ? 0 : 1)
struct ftpinfo {
- char xfer_host[XFER_MAX+1][STRSIZE];
+ char xfer_host[XFER_HOST_MAX+1][STRSIZE];
char dir[STRSIZE] ;
char user[SSTRSIZE];
char pass[STRSIZE];
Index: src/usr.sbin/sysinst/main.c
diff -u src/usr.sbin/sysinst/main.c:1.30.2.1 src/usr.sbin/sysinst/main.c:1.30.2.2
--- src/usr.sbin/sysinst/main.c:1.30.2.1 Fri Jun 23 05:40:02 2023
+++ src/usr.sbin/sysinst/main.c Tue Dec 26 05:54:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.30.2.1 2023/06/23 05:40:02 msaitoh Exp $ */
+/* $NetBSD: main.c,v 1.30.2.2 2023/12/26 05:54:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -132,8 +132,8 @@ static const struct f_arg fflagopts[] =
{"xfer dir", "/usr/INSTALL", xfer_dir, sizeof xfer_dir},
{"ext dir", "", ext_dir_bin, sizeof ext_dir_bin},
{"ext src dir", "", ext_dir_src, sizeof ext_dir_src},
- {"ftp host", SYSINST_FTP_HOST, ftp.xfer_host[XFER_FTP], sizeof ftp.xfer_host[XFER_FTP]},
- {"http host", SYSINST_HTTP_HOST, ftp.xfer_host[XFER_HTTP], sizeof ftp.xfer_host[XFER_HTTP]},
+ {"ftp host", SYSINST_FTP_HOST, ftp.xfer_host[XFER_HOST(XFER_FTP)], sizeof ftp.xfer_host[XFER_HOST(XFER_FTP)]},
+ {"http host", SYSINST_HTTP_HOST, ftp.xfer_host[XFER_HOST(XFER_HTTP)], sizeof ftp.xfer_host[XFER_HOST(XFER_HTTP)]},
{"ftp dir", SYSINST_FTP_DIR, ftp.dir, sizeof ftp.dir},
{"ftp prefix", "/" ARCH_SUBDIR "/binary/sets", set_dir_bin, sizeof set_dir_bin},
{"ftp src prefix", "/source/sets", set_dir_src, sizeof set_dir_src},
@@ -150,15 +150,15 @@ static const struct f_arg fflagopts[] =
{"t
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: snj Date: Tue Dec 26 05:54:16 UTC 2023 Modified Files: src/usr.sbin/sysinst [netbsd-10]: configmenu.c defs.h main.c menus.entropy menus.mi net.c Log Message: Pull up following revision(s) (requested by martin in ticket #511): usr.sbin/sysinst/configmenu.c: revision 1.18 usr.sbin/sysinst/defs.h: revision 1.90 usr.sbin/sysinst/main.c: revision 1.32 usr.sbin/sysinst/menus.entropy: revision 1.3 usr.sbin/sysinst/menus.mi: revision 1.29 usr.sbin/sysinst/net.c: revision 1.45 Add a https transfer method (sharing all host details with the http transfer). Make this method the default for all downloads. Try to make sure the binary pkg installation (which runs in a chroot in the already installed system) can make use of SSL verification. This does NOT fix the missing SSL verification in most install media even if using https (due to not fully populated /etc/openssl/certs). To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.2.1 src/usr.sbin/sysinst/configmenu.c cvs rdiff -u -r1.88 -r1.88.2.1 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/usr.sbin/sysinst/main.c cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/menus.entropy cvs rdiff -u -r1.27.2.1 -r1.27.2.2 src/usr.sbin/sysinst/menus.mi cvs rdiff -u -r1.43.2.1 -r1.43.2.2 src/usr.sbin/sysinst/net.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
Module Name:src Committed By: thorpej Date: Tue Dec 26 02:38:28 UTC 2023 Modified Files: src/sys/arch/amiga/amiga: locore.s src/sys/arch/atari/atari: locore.s src/sys/arch/cesfic/cesfic: locore.s src/sys/arch/hp300/hp300: locore.s src/sys/arch/luna68k/luna68k: locore.s src/sys/arch/mvme68k/mvme68k: locore.s src/sys/arch/news68k/news68k: locore.s src/sys/arch/next68k/next68k: locore.s src/sys/arch/x68k/x68k: locore.s Log Message: G/C unused ploadw(). To generate a diff of this commit: cvs rdiff -u -r1.163 -r1.164 src/sys/arch/amiga/amiga/locore.s cvs rdiff -u -r1.119 -r1.120 src/sys/arch/atari/atari/locore.s cvs rdiff -u -r1.35 -r1.36 src/sys/arch/cesfic/cesfic/locore.s cvs rdiff -u -r1.175 -r1.176 src/sys/arch/hp300/hp300/locore.s cvs rdiff -u -r1.69 -r1.70 src/sys/arch/luna68k/luna68k/locore.s cvs rdiff -u -r1.119 -r1.120 src/sys/arch/mvme68k/mvme68k/locore.s cvs rdiff -u -r1.72 -r1.73 src/sys/arch/news68k/news68k/locore.s cvs rdiff -u -r1.74 -r1.75 src/sys/arch/next68k/next68k/locore.s cvs rdiff -u -r1.123 -r1.124 src/sys/arch/x68k/x68k/locore.s 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/amiga/amiga/locore.s diff -u src/sys/arch/amiga/amiga/locore.s:1.163 src/sys/arch/amiga/amiga/locore.s:1.164 --- src/sys/arch/amiga/amiga/locore.s:1.163 Tue Dec 26 02:31:57 2023 +++ src/sys/arch/amiga/amiga/locore.s Tue Dec 26 02:38:26 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.163 2023/12/26 02:31:57 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.164 2023/12/26 02:38:26 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -1148,14 +1148,6 @@ Lldustp040: .word 0x4e7b,0x0806 | movec d0,URP rts -ENTRY(ploadw) - movl %sp@(4),%a0 | address to load - cmpl #MMU_68040,_C_LABEL(mmutype) - jeq Lploadw040 - ploadw #1,%a0@| pre-load translation -Lploadw040: | should 68040 do a ptest? - rts - /* * Handle the nitty-gritty of rebooting the machine. * Index: src/sys/arch/atari/atari/locore.s diff -u src/sys/arch/atari/atari/locore.s:1.119 src/sys/arch/atari/atari/locore.s:1.120 --- src/sys/arch/atari/atari/locore.s:1.119 Tue Dec 26 02:31:57 2023 +++ src/sys/arch/atari/atari/locore.s Tue Dec 26 02:38:27 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.119 2023/12/26 02:31:57 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.120 2023/12/26 02:38:27 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -1165,14 +1165,6 @@ Lldustp040: .word 0x4e7b,0x0806 | movec d0,URP rts -ENTRY(ploadw) - movl %sp@(4),%a0 | address to load - cmpl #MMU_68040,_C_LABEL(mmutype) - jeq Lploadw040 - ploadw #1,%a0@ | pre-load translation -Lploadw040:| should 68040 do a ptest? - rts - /* * Set processor priority level calls. Most are implemented with * inline asm expansions. However, spl0 requires special handling Index: src/sys/arch/cesfic/cesfic/locore.s diff -u src/sys/arch/cesfic/cesfic/locore.s:1.35 src/sys/arch/cesfic/cesfic/locore.s:1.36 --- src/sys/arch/cesfic/cesfic/locore.s:1.35 Mon Dec 25 21:32:56 2023 +++ src/sys/arch/cesfic/cesfic/locore.s Tue Dec 26 02:38:27 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.35 2023/12/25 21:32:56 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.36 2023/12/26 02:38:27 thorpej Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -839,22 +839,6 @@ Lhpmmu9: #endif rts -ENTRY(ploadw) -#if defined(M68K_MMU_MOTOROLA) - movl %sp@(4),%a0 | address to load -#if defined(M68K_MMU_HP) - tstl _C_LABEL(mmutype) | HP MMU? - jeq Lploadwskp | yes, skip -#endif -#if defined(M68040) - cmpl #MMU_68040,_C_LABEL(mmutype) | 68040? - jeq Lploadwskp | yes, skip -#endif - ploadw #1,%a0@ | pre-load translation -Lploadwskp: -#endif - rts - /* * Set processor priority level calls. Most are implemented with * inline asm expansions. However, spl0 requires special handling Index: src/sys/arch/hp300/hp300/locore.s diff -u src/sys/arch/hp300/hp300/locore.s:1.175 src/sys/arch/hp300/hp300/locore.s:1.176 --- src/sys/arch/hp300/hp300/locore.s:1.175 Mon Dec 25 21:32:57 2023 +++ src/sys/arch/hp300/hp300/locore.s Tue Dec 26 02:38:27 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.175 2023/12/25 21:32:57 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.176 2023/12/26 02:38:27 thorpej Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -1121,22 +1121,6 @@ Lhpmmu9: #endif rts -ENTRY(ploadw) -#if defined(M68K_MMU_MOTOROLA) - movl %sp@(4),%a0 | address to load -#if defined(M68K_MMU_HP) - tstl _C_LABEL(mmutype) | HP MMU? - jeq Lploadwskp | yes, skip -#endif -#if defined(M68040) - cmpl #MMU_68040,_C_LABEL(mmutype) | 68040? - jeq Lploadwskp | yes, skip -#endif - ploadw #1,%a0@ | pre-load translation -Lploadwskp: -#endif - rts - /* * _delay(u_int N) * Index: src/sys/arch/luna68k/luna68k/locore.s diff -u src/sys/arch/luna68k/luna68k/locore.s:1.69 src/sys/arch/luna68k/luna68k/locore.s
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Tue Dec 26 02:38:28 UTC 2023 Modified Files: src/sys/arch/amiga/amiga: locore.s src/sys/arch/atari/atari: locore.s src/sys/arch/cesfic/cesfic: locore.s src/sys/arch/hp300/hp300: locore.s src/sys/arch/luna68k/luna68k: locore.s src/sys/arch/mvme68k/mvme68k: locore.s src/sys/arch/news68k/news68k: locore.s src/sys/arch/next68k/next68k: locore.s src/sys/arch/x68k/x68k: locore.s Log Message: G/C unused ploadw(). To generate a diff of this commit: cvs rdiff -u -r1.163 -r1.164 src/sys/arch/amiga/amiga/locore.s cvs rdiff -u -r1.119 -r1.120 src/sys/arch/atari/atari/locore.s cvs rdiff -u -r1.35 -r1.36 src/sys/arch/cesfic/cesfic/locore.s cvs rdiff -u -r1.175 -r1.176 src/sys/arch/hp300/hp300/locore.s cvs rdiff -u -r1.69 -r1.70 src/sys/arch/luna68k/luna68k/locore.s cvs rdiff -u -r1.119 -r1.120 src/sys/arch/mvme68k/mvme68k/locore.s cvs rdiff -u -r1.72 -r1.73 src/sys/arch/news68k/news68k/locore.s cvs rdiff -u -r1.74 -r1.75 src/sys/arch/next68k/next68k/locore.s cvs rdiff -u -r1.123 -r1.124 src/sys/arch/x68k/x68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Tue Dec 26 02:31:58 UTC 2023 Modified Files: src/sys/arch/amiga/amiga: locore.s src/sys/arch/atari/atari: locore.s Log Message: G/C unused flushustp(). To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.163 src/sys/arch/amiga/amiga/locore.s cvs rdiff -u -r1.118 -r1.119 src/sys/arch/atari/atari/locore.s 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/amiga/amiga/locore.s diff -u src/sys/arch/amiga/amiga/locore.s:1.162 src/sys/arch/amiga/amiga/locore.s:1.163 --- src/sys/arch/amiga/amiga/locore.s:1.162 Mon Dec 25 21:32:56 2023 +++ src/sys/arch/amiga/amiga/locore.s Tue Dec 26 02:31:57 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.162 2023/12/25 21:32:56 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.163 2023/12/26 02:31:57 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -1148,36 +1148,6 @@ Lldustp040: .word 0x4e7b,0x0806 | movec d0,URP rts -/* - * Flush any hardware context associated with given USTP. - * Only does something for HP330 where we must flush RPT - * and ATC entries in PMMU. - */ -ENTRY(flushustp) -#ifdef M68060 - cmpl #CPU_68060,_C_LABEL(cputype) - jeq Lflustp060 -#endif - cmpl #MMU_68040,_C_LABEL(mmutype) - jeq Lnot68851 - tstl _C_LABEL(mmutype) | 68851 PMMU? - jle Lnot68851 | no, nothing to do - movl %sp@(4),%d0 | get USTP to flush - moveq #PGSHIFT,%d1 - lsll %d1,%d0| convert to address - movl %d0,_C_LABEL(protorp)+4 | stash USTP - pflushr _C_LABEL(protorp) | flush RPT/TLB entries -Lnot68851: - rts -#ifdef M68060 -Lflustp060: - movc %cacr,%d1 - orl #IC60_CUBC,%d1 | clear user btc entries - movc %d1,%cacr - rts -#endif - - ENTRY(ploadw) movl %sp@(4),%a0 | address to load cmpl #MMU_68040,_C_LABEL(mmutype) Index: src/sys/arch/atari/atari/locore.s diff -u src/sys/arch/atari/atari/locore.s:1.118 src/sys/arch/atari/atari/locore.s:1.119 --- src/sys/arch/atari/atari/locore.s:1.118 Mon Dec 25 21:32:56 2023 +++ src/sys/arch/atari/atari/locore.s Tue Dec 26 02:31:57 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.118 2023/12/25 21:32:56 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.119 2023/12/26 02:31:57 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -1165,35 +1165,6 @@ Lldustp040: .word 0x4e7b,0x0806 | movec d0,URP rts -/* - * Flush any hardware context associated with given USTP. - * Only does something for HP330 where we must flush RPT - * and ATC entries in PMMU. - */ -ENTRY(flushustp) -#if defined(M68060) - cmpl #CPU_68060,_C_LABEL(cputype) - jeq Lflustp060 | A 060 needs special treatment -#endif - cmpl #MMU_68040,_C_LABEL(mmutype) - jeq Lnot68851 - tstl _C_LABEL(mmutype) | 68851 PMMU? - jle Lnot68851 | no, nothing to do - movl %sp@(4),%d0 | get USTP to flush - moveq #PGSHIFT,%d1 - lsll %d1,%d0 | convert to address - movl %d0,_C_LABEL(protorp)+4 | stash USTP - pflushr _C_LABEL(protorp) | flush RPT/TLB entries -Lnot68851: - rts -#if defined(M68060) -Lflustp060: - movc %cacr,%d1 - orl IC60_CUBC,%d1 | clear user branch cache entries - movc %d1,%cacr - rts -#endif - ENTRY(ploadw) movl %sp@(4),%a0 | address to load cmpl #MMU_68040,_C_LABEL(mmutype)
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Tue Dec 26 02:31:58 UTC 2023 Modified Files: src/sys/arch/amiga/amiga: locore.s src/sys/arch/atari/atari: locore.s Log Message: G/C unused flushustp(). To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.163 src/sys/arch/amiga/amiga/locore.s cvs rdiff -u -r1.118 -r1.119 src/sys/arch/atari/atari/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Mon Dec 25 21:32:58 UTC 2023 Modified Files: src/sys/arch/amiga/amiga: locore.s src/sys/arch/atari/atari: locore.s src/sys/arch/cesfic/cesfic: locore.s src/sys/arch/hp300/hp300: locore.s src/sys/arch/luna68k/luna68k: locore.s src/sys/arch/m68k/include: pmap_motorola.h src/sys/arch/mac68k/mac68k: locore.s src/sys/arch/mvme68k/mvme68k: locore.s src/sys/arch/news68k/news68k: locore.s src/sys/arch/next68k/next68k: locore.s src/sys/arch/x68k/x68k: locore.s Log Message: loadustp(): Optimize for the overwhelmingly common case of "not the HP MMU". Rather than converting the level 1 table address to a page number before calling loadustp() only to have loadustp() convert it back to an address for the '851, '030, '040, and '060, instead pass the address and convert to a page number only in the case of the HP MMU. This is a wash on HP MMU machines (9000/320 and 9000/350), and saves at least 4 instructions (2x moveq + 2x lsXl) on every context switch on everything else. To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/sys/arch/amiga/amiga/locore.s cvs rdiff -u -r1.117 -r1.118 src/sys/arch/atari/atari/locore.s cvs rdiff -u -r1.34 -r1.35 src/sys/arch/cesfic/cesfic/locore.s cvs rdiff -u -r1.174 -r1.175 src/sys/arch/hp300/hp300/locore.s cvs rdiff -u -r1.68 -r1.69 src/sys/arch/luna68k/luna68k/locore.s cvs rdiff -u -r1.38 -r1.39 src/sys/arch/m68k/include/pmap_motorola.h cvs rdiff -u -r1.175 -r1.176 src/sys/arch/mac68k/mac68k/locore.s cvs rdiff -u -r1.118 -r1.119 src/sys/arch/mvme68k/mvme68k/locore.s cvs rdiff -u -r1.71 -r1.72 src/sys/arch/news68k/news68k/locore.s cvs rdiff -u -r1.73 -r1.74 src/sys/arch/next68k/next68k/locore.s cvs rdiff -u -r1.122 -r1.123 src/sys/arch/x68k/x68k/locore.s 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/amiga/amiga/locore.s diff -u src/sys/arch/amiga/amiga/locore.s:1.161 src/sys/arch/amiga/amiga/locore.s:1.162 --- src/sys/arch/amiga/amiga/locore.s:1.161 Mon May 30 09:56:02 2022 +++ src/sys/arch/amiga/amiga/locore.s Mon Dec 25 21:32:56 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.161 2022/05/30 09:56:02 andvar Exp $ */ +/* $NetBSD: locore.s,v 1.162 2023/12/25 21:32:56 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -1124,8 +1124,6 @@ ENTRY(probeva) */ ENTRY(loadustp) movl %sp@(4),%d0 | new USTP - moveq #PGSHIFT,%d1 - lsll %d1,%d0| convert to addr #ifdef M68060 cmpl #CPU_68060,_C_LABEL(cputype) | 68060? jeq Lldustp060 | yes, skip Index: src/sys/arch/atari/atari/locore.s diff -u src/sys/arch/atari/atari/locore.s:1.117 src/sys/arch/atari/atari/locore.s:1.118 --- src/sys/arch/atari/atari/locore.s:1.117 Fri Jan 6 10:28:27 2023 +++ src/sys/arch/atari/atari/locore.s Mon Dec 25 21:32:56 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.117 2023/01/06 10:28:27 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.118 2023/12/25 21:32:56 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -1141,8 +1141,6 @@ ENTRY(probeva) */ ENTRY(loadustp) movl %sp@(4),%d0 | new USTP - moveq #PGSHIFT,%d1 - lsll %d1,%d0| convert to addr #if defined(M68060) cmpl #CPU_68060,_C_LABEL(cputype) | 68060? jeq Lldustp060 | yes, skip Index: src/sys/arch/cesfic/cesfic/locore.s diff -u src/sys/arch/cesfic/cesfic/locore.s:1.34 src/sys/arch/cesfic/cesfic/locore.s:1.35 --- src/sys/arch/cesfic/cesfic/locore.s:1.34 Mon May 30 09:56:03 2022 +++ src/sys/arch/cesfic/cesfic/locore.s Mon Dec 25 21:32:56 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.34 2022/05/30 09:56:03 andvar Exp $ */ +/* $NetBSD: locore.s,v 1.35 2023/12/25 21:32:56 thorpej Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -805,8 +805,6 @@ ENTRY(loadustp) tstl _C_LABEL(mmutype) | HP MMU? jeq Lhpmmu9 | yes, skip movl %sp@(4),%d0 | new USTP - moveq #PGSHIFT,%d1 - lsll %d1,%d0 | convert to addr #if defined(M68040) cmpl #MMU_68040,_C_LABEL(mmutype) | 68040? jne LmotommuC | no, skip @@ -834,7 +832,10 @@ Lhpmmu9: andl #~MMU_CEN,%a0@(MMUCMD) | toggle cache enable orl #MMU_CEN,%a0@(MMUCMD) | to clear data cache 1: - movl %sp@(4),%a0@(MMUUSTP) | load a new USTP + movl %sp@(4),%d0 + moveq #PGSHIFT,%d1 + lsrl %d1,%d0 | convert to page frame + movl %d0,%a0@(MMUUSTP) | load a new USTP #endif rts Index: src/sys/arch/hp300/hp300/locore.s diff -u src/sys/arch/hp300/hp300/locore.s:1.174 src/sys/arch/hp300/hp300/locore.s:1.175 --- src/sys/arch/hp300/hp300/locore.s:1.174 Sat Oct 14 15:31:36 2023 +++ src/sys/arch/hp300/hp300/locore.s Mon Dec 25 21:32:57 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.174 2023/10/14 15:31:36 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.175 2023/12/25 21:32:57 thorpej Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -1087,8 +1087,6 @@ ENTRY(loadustp) tstl _C_LABEL(mmutype) | HP MMU? jeq Lh
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Mon Dec 25 21:32:58 UTC 2023 Modified Files: src/sys/arch/amiga/amiga: locore.s src/sys/arch/atari/atari: locore.s src/sys/arch/cesfic/cesfic: locore.s src/sys/arch/hp300/hp300: locore.s src/sys/arch/luna68k/luna68k: locore.s src/sys/arch/m68k/include: pmap_motorola.h src/sys/arch/mac68k/mac68k: locore.s src/sys/arch/mvme68k/mvme68k: locore.s src/sys/arch/news68k/news68k: locore.s src/sys/arch/next68k/next68k: locore.s src/sys/arch/x68k/x68k: locore.s Log Message: loadustp(): Optimize for the overwhelmingly common case of "not the HP MMU". Rather than converting the level 1 table address to a page number before calling loadustp() only to have loadustp() convert it back to an address for the '851, '030, '040, and '060, instead pass the address and convert to a page number only in the case of the HP MMU. This is a wash on HP MMU machines (9000/320 and 9000/350), and saves at least 4 instructions (2x moveq + 2x lsXl) on every context switch on everything else. To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/sys/arch/amiga/amiga/locore.s cvs rdiff -u -r1.117 -r1.118 src/sys/arch/atari/atari/locore.s cvs rdiff -u -r1.34 -r1.35 src/sys/arch/cesfic/cesfic/locore.s cvs rdiff -u -r1.174 -r1.175 src/sys/arch/hp300/hp300/locore.s cvs rdiff -u -r1.68 -r1.69 src/sys/arch/luna68k/luna68k/locore.s cvs rdiff -u -r1.38 -r1.39 src/sys/arch/m68k/include/pmap_motorola.h cvs rdiff -u -r1.175 -r1.176 src/sys/arch/mac68k/mac68k/locore.s cvs rdiff -u -r1.118 -r1.119 src/sys/arch/mvme68k/mvme68k/locore.s cvs rdiff -u -r1.71 -r1.72 src/sys/arch/news68k/news68k/locore.s cvs rdiff -u -r1.73 -r1.74 src/sys/arch/next68k/next68k/locore.s cvs rdiff -u -r1.122 -r1.123 src/sys/arch/x68k/x68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/external/bsd/blocklist/bin
Module Name:src
Committed By: martin
Date: Mon Dec 25 18:59:46 UTC 2023
Modified Files:
src/external/bsd/blocklist/bin [netbsd-10]: blocklistd.c
Log Message:
Pull up following revision(s) (requested by kim in ticket #519):
external/bsd/blocklist/bin/blocklistd.c: revision 1.4
PR/57767: Yoshitaka Tokugawa: When restoring, do so from a readonly copy
of the database and update the read-write copy with the new firewall ids.
Before we did not update the state file so it contained the old firewall ids.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 src/external/bsd/blocklist/bin/blocklistd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/blocklist/bin/blocklistd.c
diff -u src/external/bsd/blocklist/bin/blocklistd.c:1.3 src/external/bsd/blocklist/bin/blocklistd.c:1.3.2.1
--- src/external/bsd/blocklist/bin/blocklistd.c:1.3 Wed Oct 12 18:36:02 2022
+++ src/external/bsd/blocklist/bin/blocklistd.c Mon Dec 25 18:59:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: blocklistd.c,v 1.3 2022/10/12 18:36:02 christos Exp $ */
+/* $NetBSD: blocklistd.c,v 1.3.2.1 2023/12/25 18:59:46 martin Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "config.h"
#endif
#include
-__RCSID("$NetBSD: blocklistd.c,v 1.3 2022/10/12 18:36:02 christos Exp $");
+__RCSID("$NetBSD: blocklistd.c,v 1.3.2.1 2023/12/25 18:59:46 martin Exp $");
#include
#include
@@ -395,15 +395,25 @@ rules_flush(void)
static void
rules_restore(void)
{
+ DB *db;
struct conf c;
struct dbinfo dbi;
unsigned int f;
- for (f = 1; state_iterate(state, &c, &dbi, f) == 1; f = 0) {
+ db = state_open(dbfile, O_RDONLY, 0);
+ if (db == NULL) {
+ (*lfun)(LOG_ERR, "Can't open `%s' to restore state (%m)",
+ dbfile);
+ return;
+ }
+ for (f = 1; state_iterate(db, &c, &dbi, f) == 1; f = 0) {
if (dbi.id[0] == '\0')
continue;
(void)run_change("add", &c, dbi.id, sizeof(dbi.id));
+ state_put(state, &c, &dbi);
}
+ state_close(db);
+ state_sync(state);
}
int
CVS commit: [netbsd-10] src/external/bsd/blocklist/bin
Module Name:src Committed By: martin Date: Mon Dec 25 18:59:46 UTC 2023 Modified Files: src/external/bsd/blocklist/bin [netbsd-10]: blocklistd.c Log Message: Pull up following revision(s) (requested by kim in ticket #519): external/bsd/blocklist/bin/blocklistd.c: revision 1.4 PR/57767: Yoshitaka Tokugawa: When restoring, do so from a readonly copy of the database and update the read-write copy with the new firewall ids. Before we did not update the state file so it contained the old firewall ids. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.2.1 src/external/bsd/blocklist/bin/blocklistd.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/riscv/include
Module Name:src Committed By: skrll Date: Mon Dec 25 13:31:01 UTC 2023 Modified Files: src/sys/arch/riscv/include: sysreg.h Log Message: G/C ununsed and incorrect SIE_IM To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/riscv/include/sysreg.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/riscv/include/sysreg.h diff -u src/sys/arch/riscv/include/sysreg.h:1.29 src/sys/arch/riscv/include/sysreg.h:1.30 --- src/sys/arch/riscv/include/sysreg.h:1.29 Sun May 7 12:41:48 2023 +++ src/sys/arch/riscv/include/sysreg.h Mon Dec 25 13:31:00 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: sysreg.h,v 1.29 2023/05/07 12:41:48 skrll Exp $ */ +/* $NetBSD: sysreg.h,v 1.30 2023/12/25 13:31:00 skrll Exp $ */ /* * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -230,9 +230,6 @@ RISCVREG_READ_SET_CLEAR_INLINE(sie) // #define SIE_SSIE __BIT(1) // S-mode software interrupt enable /* Bit 0 is WIRI */ -/* Mask for all interrupts */ -#define SIE_IM (SIE_SEI | SIE_STIE | SIE_SSIE) /* XXX unused? */ - // U-mode sstatus values #ifdef _LP64 #define SR_USER64 (SR_SPIE | __SHIFTIN(SR_UXL_64, SR_UXL))
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: skrll Date: Mon Dec 25 13:31:01 UTC 2023 Modified Files: src/sys/arch/riscv/include: sysreg.h Log Message: G/C ununsed and incorrect SIE_IM To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/riscv/include/sysreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv
Module Name:src
Committed By: skrll
Date: Mon Dec 25 13:21:30 UTC 2023
Modified Files:
src/sys/arch/riscv/fdt: intc_fdt.c
src/sys/arch/riscv/include: cpu.h
Log Message:
Count interrupts across harts and their local interrupt controllers
correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/fdt/intc_fdt.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/riscv/include/cpu.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/riscv/fdt/intc_fdt.c
diff -u src/sys/arch/riscv/fdt/intc_fdt.c:1.2 src/sys/arch/riscv/fdt/intc_fdt.c:1.3
--- src/sys/arch/riscv/fdt/intc_fdt.c:1.2 Mon Jun 12 19:04:13 2023
+++ src/sys/arch/riscv/fdt/intc_fdt.c Mon Dec 25 13:21:30 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: intc_fdt.c,v 1.2 2023/06/12 19:04:13 skrll Exp $ */
+/* $NetBSD: intc_fdt.c,v 1.3 2023/12/25 13:21:30 skrll Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: intc_fdt.c,v 1.2 2023/06/12 19:04:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intc_fdt.c,v 1.3 2023/12/25 13:21:30 skrll Exp $");
#include
@@ -90,13 +90,36 @@ struct intc_fdt_softc {
struct intc_irq *sc_irq[IRQ_NSOURCES];
- struct evcnt *sc_evs[IRQ_NSOURCES];
+ struct evcnt sc_evs[IRQ_NSOURCES];
struct cpu_info *sc_ci;
cpuid_t sc_hartid;
};
-static struct intc_fdt_softc *intc_sc;
+static const char * const intc_sources[IRQ_NSOURCES] = {
+ /* Software interrupts */
+ "(reserved)",
+ "Supervisor software",
+ "Virtual Supervisor software",
+ "Machine software",
+
+ /* Timer interrupts */
+ "(reserved)",
+ "Supervisor timer",
+ "Virtual Supervisor timer",
+ "Machine timer",
+
+ /* External interrupts */
+ "(reserved)",
+ "Supervisor external",
+ "Virtual Supervisor external",
+ "Machine external",
+
+ "(reserved)",
+ "Supervisor guest external.",
+ "(reserved)",
+ "(reserved)"
+};
static void *
@@ -118,6 +141,9 @@ intc_intr_establish(struct intc_fdt_soft
irq->intr_source = source;
TAILQ_INIT(&irq->intr_handlers);
sc->sc_irq[source] = irq;
+
+ evcnt_attach_dynamic(&sc->sc_evs[source], EVCNT_TYPE_INTR, NULL,
+ device_xname(sc->sc_dev), intc_sources[source]);
} else {
if (irq->intr_arg == NULL || arg == NULL) {
device_printf(dev,
@@ -185,31 +211,6 @@ intc_fdt_disestablish(device_t dev, void
}
-static const char * const intc_sources[IRQ_NSOURCES] = {
- /* Software interrupts */
- "(reserved)",
- "Supervisor software",
- "Virtual Supervisor software",
- "Machine software",
-
- /* Timer interrupts */
- "(reserved)",
- "Supervisor timer",
- "Virtual Supervisor timer",
- "Machine timer",
-
- /* External interrupts */
- "(reserved)",
- "Supervisor external",
- "Virtual Supervisor external",
- "Machine external",
-
- "(reserved)",
- "Supervisor guest external.",
- "(reserved)",
- "(reserved)"
-};
-
static bool
intc_fdt_intrstr(device_t dev, u_int *specifier, char *buf, size_t buflen)
{
@@ -246,7 +247,7 @@ intc_intr_handler(struct trapframe *tf,
KASSERT(CAUSE_INTERRUPT_P(cause));
- struct intc_fdt_softc * const sc = intc_sc;
+ struct intc_fdt_softc * const sc = ci->ci_intcsoftc;
ci->ci_intr_depth++;
ci->ci_data.cpu_nintr++;
@@ -259,6 +260,8 @@ intc_intr_handler(struct trapframe *tf,
int source = ffs(pending) - 1;
struct intc_irq *irq = sc->sc_irq[source];
+ sc->sc_evs[source].ev_count++;
+
KASSERTMSG(irq != NULL, "source %d\n", source);
if (irq) {
@@ -326,13 +329,13 @@ intc_attach(device_t parent, device_t se
aprint_normal(": local interrupt controller\n");
struct intc_fdt_softc * const sc = device_private(self);
- intc_sc = sc;
riscv_intr_set_handler(intc_intr_handler);
sc->sc_dev = self;
sc->sc_ci = ci;
sc->sc_hartid = ci->ci_cpuid;
+ ci->ci_intcsoftc = sc;
intc_intr_establish(sc, IRQ_SUPERVISOR_TIMER, IPL_SCHED, IST_MPSAFE,
riscv_timer_intr, NULL, "clock");
Index: src/sys/arch/riscv/include/cpu.h
diff -u src/sys/arch/riscv/include/cpu.h:1.14 src/sys/arch/riscv/include/cpu.h:1.15
--- src/sys/arch/riscv/include/cpu.h:1.14 Sun Sep 3 08:48:20 2023
+++ src/sys/arch/riscv/include/cpu.h Mon Dec 25 13:21:30 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.14 2023/09/03 08:48:20 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.15 2023/12/25 13:21:30 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -92,6 +92,7 @@ struct cpu_info {
#define CPUF_RUNNING __BIT(2) /* CPU is running */
#define CPUF_PAUSED __BIT(3) /* CPU is paused */
+ void *ci_intcsoftc;
volatile u_long ci_request_ipis;
/* bitmask of IPIs requested */
u_long ci_active_ipis; /* bitmask of IPIs being serviced */
CVS commit: src/sys/arch/riscv
Module Name:src Committed By: skrll Date: Mon Dec 25 13:21:30 UTC 2023 Modified Files: src/sys/arch/riscv/fdt: intc_fdt.c src/sys/arch/riscv/include: cpu.h Log Message: Count interrupts across harts and their local interrupt controllers correctly. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/fdt/intc_fdt.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/riscv/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv/dev
Module Name:src Committed By: skrll Date: Mon Dec 25 13:01:59 UTC 2023 Modified Files: src/sys/arch/riscv/dev: plic.c Log Message: Deliver plic interrupts to the cpu^Whart establishing the interrupt handler. At least this is known to be a valid hart, but it might share some interrupts around too. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/dev/plic.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/riscv/dev/plic.c diff -u src/sys/arch/riscv/dev/plic.c:1.3 src/sys/arch/riscv/dev/plic.c:1.4 --- src/sys/arch/riscv/dev/plic.c:1.3 Sat Dec 16 18:02:02 2023 +++ src/sys/arch/riscv/dev/plic.c Mon Dec 25 13:01:59 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: plic.c,v 1.3 2023/12/16 18:02:02 skrll Exp $ */ +/* $NetBSD: plic.c,v 1.4 2023/12/25 13:01:59 skrll Exp $ */ /*- * Copyright (c) 2022 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include "opt_multiprocessor.h" #include -__KERNEL_RCSID(0, "$NetBSD: plic.c,v 1.3 2023/12/16 18:02:02 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plic.c,v 1.4 2023/12/25 13:01:59 skrll Exp $"); #include @@ -73,10 +73,10 @@ plic_intr_establish_xname(u_int irq, int struct plic_intrhand *ih; /* - * Choose hart 0. + * Choose calling hart. * XXX need a better hart selection method */ - u_int hartid = 0; + u_int hartid = curcpu()->ci_cpuid; evcnt_attach_dynamic(&sc->sc_intrevs[irq], EVCNT_TYPE_INTR, NULL, "plic", xname);
CVS commit: src/sys/arch/riscv/dev
Module Name:src Committed By: skrll Date: Mon Dec 25 13:01:59 UTC 2023 Modified Files: src/sys/arch/riscv/dev: plic.c Log Message: Deliver plic interrupts to the cpu^Whart establishing the interrupt handler. At least this is known to be a valid hart, but it might share some interrupts around too. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/dev/plic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Dec 25 12:58:57 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1779 and #1780 To generate a diff of this commit: cvs rdiff -u -r1.1.2.121 -r1.1.2.122 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.4 diff -u src/doc/CHANGES-9.4:1.1.2.121 src/doc/CHANGES-9.4:1.1.2.122 --- src/doc/CHANGES-9.4:1.1.2.121 Mon Dec 11 12:35:51 2023 +++ src/doc/CHANGES-9.4 Mon Dec 25 12:58:57 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.121 2023/12/11 12:35:51 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.122 2023/12/25 12:58:57 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -2497,3 +2497,1493 @@ sys/nfs/nfs_vnops.c1.325 READDIR and READDIRPLUS cookie verifiers. [schmonz, ticket #1778] +crypto/external/bsd/openssh/Makefile.incup to 1.15 (+patch) +crypto/external/bsd/openssh/bin/Makefile.incup to 1.4 +crypto/external/bsd/openssh/bin/scp/Makefileup to 1.6 +crypto/external/bsd/openssh/bin/sftp/Makefile up to 1.11 +crypto/external/bsd/openssh/bin/sftp-server/Makefile up to 1.4 +crypto/external/bsd/openssh/bin/ssh/Makefileup to 1.20 +crypto/external/bsd/openssh/bin/ssh-add/Makefile up to 1.3 +crypto/external/bsd/openssh/bin/ssh-agent/Makefile up to 1.7 +crypto/external/bsd/openssh/bin/ssh-keygen/Makefile up to 1.10 +crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile up to 1.6 +crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile up to 1.4 +crypto/external/bsd/openssh/bin/sshd/Makefile up to 1.27 (+patch) +crypto/external/bsd/openssh/dist/PROTOCOL.sshsig up to 1.1.1.2 +crypto/external/bsd/openssh/dist/srclimit.c up to 1.3 +crypto/external/bsd/openssh/dist/sftp-realpath.c up to 1.3 +crypto/external/bsd/openssh/dist/sntrup761.cup to 1.3 +crypto/external/bsd/openssh/dist/sntrup761.sh up to 1.1.1.2 +crypto/external/bsd/openssh/dist/sshsig.c up to 1.12 +crypto/external/bsd/openssh/dist/sshsig.h up to 1.1.1.5 +crypto/external/bsd/openssh/dist/addr.c up to 1.6 +crypto/external/bsd/openssh/dist/PROTOCOL.u2f up to 1.1.1.3 +crypto/external/bsd/openssh/dist/sk-api.h up to 1.1.1.6 +crypto/external/bsd/openssh/dist/sk-usbhid.cup to 1.9 +crypto/external/bsd/openssh/dist/ssh-ecdsa-sk.c up to 1.4 +crypto/external/bsd/openssh/dist/ssh-ed25519-sk.c up to 1.5 +crypto/external/bsd/openssh/dist/ssh-sk-client.c up to 1.6 +crypto/external/bsd/openssh/dist/ssh-sk-helper.8 up to 1.1.1.2 +crypto/external/bsd/openssh/dist/ssh-sk-helper.c up to 1.7 +crypto/external/bsd/openssh/dist/ssh-sk.c up to 1.8 +crypto/external/bsd/openssh/dist/ssh-sk.h up to 1.1.1.2 +crypto/external/bsd/openssh/dist/sshbuf-io.cup to 1.2 +crypto/external/bsd/openssh/dist/addr.h up to 1.1.1.2 +crypto/external/bsd/openssh/dist/kexsntrup761x25519.c up to 1.3 +crypto/external/bsd/openssh/dist/cipher-chachapoly-libcrypto.c up to 1.3 +crypto/external/bsd/openssh/dist/srclimit.h up to 1.1.1.1 +crypto/external/bsd/openssh/dist/auth2-pubkeyfile.c up to 1.3 +crypto/external/bsd/openssh/dist/sftp-usergroup.c up to 1.3 +crypto/external/bsd/openssh/dist/sftp-usergroup.h up to 1.1.1.1 +crypto/external/bsd/openssh/dist/ed25519.sh up to 1.1.1.1 +crypto/external/bsd/openssh/dist/crc32.cdelete +crypto/external/bsd/openssh/dist/crc32.hdelete +crypto/external/bsd/openssh/dist/fe25519.c delete +crypto/external/bsd/openssh/dist/fe25519.h delete +crypto/external/bsd/openssh/dist/ge25519.c delete +crypto/external/bsd/openssh/dist/ge25519.h delete +crypto/external/bsd/openssh/dist/ge25519_base.data delete +crypto/external/bsd/openssh/dist/kexsntrup4591761x25519.c delete +crypto/external/bsd/openssh/dist/sc25519.c delete +crypto/external/bsd/openssh/dist/sc25519.h delete +crypto/external/bsd/openssh/dist/sntrup4591761.c delete +crypto/external/bsd/openssh/dist/sntrup4591761.sh delete +crypto/external/bsd/openssh/dist/uuencode.c delete +crypto/external/bsd/openssh/dist/uuencode.h delete +crypto/external/bsd/openssh/dist/verify.c delete +crypto/external/bsd/openssh/dist/LICENCEup to 1.7 +crypto/external/bsd/openssh/dist/PROTOCOL up to 1.23 +crypto/external/bsd/openssh/dist/PROTOCOL.agent up to 1.15 +crypto/external/bsd/openssh/dist/PROTOCOL.certkeys up to 1.13 +crypto/external/bsd/openssh/dist/PROTOCOL.chacha20poly1305 up to 1.1.1.4 +crypto/external/bsd/openssh/dist/PROTOCOL.key up to 1.1.1.3 +crypto/external/bsd/openssh/dist/PROTOCOL.krl up to 1.1.1.5 +crypto/external/bsd/openssh/dist/PROTOCOL.mux up to 1.12 +crypto/external/bsd/openssh/dist/addrmatch.cup to 1.15 +crypto/external/bsd/openssh/dist/auth-krb5.cup to 1.16 +crypto/external/bsd/openssh/dist/auth-options.c up to 1.29 +crypto/external/bsd/openssh/dist/auth-options.h up
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Dec 25 12:58:57 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1779 and #1780 To generate a diff of this commit: cvs rdiff -u -r1.1.2.121 -r1.1.2.122 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Mon Dec 25 12:48:47 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #516 and #517 To generate a diff of this commit: cvs rdiff -u -r1.1.2.176 -r1.1.2.177 src/doc/CHANGES-10.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-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.176 src/doc/CHANGES-10.0:1.1.2.177 --- src/doc/CHANGES-10.0:1.1.2.176 Sat Dec 23 13:09:53 2023 +++ src/doc/CHANGES-10.0 Mon Dec 25 12:48:47 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.176 2023/12/23 13:09:53 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.177 2023/12/25 12:48:47 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -14445,3 +14445,501 @@ sys/arch/vax/vax/pmap.c1.199 vax: fix locking botches. [mrg, ticket #516] +crypto/external/bsd/openssh/bin/Makefile.incup to 1.4 +crypto/external/bsd/openssh/bin/sftp/Makefile up to 1.11 (+patch) +crypto/external/bsd/openssh/bin/ssh/Makefileup to 1.20 (+patch) +crypto/external/bsd/openssh/bin/ssh-agent/Makefile up to 1.7 (+patch) +crypto/external/bsd/openssh/bin/ssh-keygen/Makefile up to 1.10 (+patch) +crypto/external/bsd/openssh/bin/sshd/Makefile up to 1.27 (+patch) +crypto/external/bsd/openssh/dist/PROTOCOL up to 1.23 +crypto/external/bsd/openssh/dist/PROTOCOL.agent up to 1.15 +crypto/external/bsd/openssh/dist/auth2.cup to 1.29 +crypto/external/bsd/openssh/dist/authfd.c up to 1.27 +crypto/external/bsd/openssh/dist/authfd.h up to 1.17 +crypto/external/bsd/openssh/dist/channels.c up to 1.42 +crypto/external/bsd/openssh/dist/channels.h up to 1.26 +crypto/external/bsd/openssh/dist/cipher.c up to 1.21 +crypto/external/bsd/openssh/dist/cipher.h up to 1.17 +crypto/external/bsd/openssh/dist/clientloop.c up to 1.39 +crypto/external/bsd/openssh/dist/kex.c up to 1.34 +crypto/external/bsd/openssh/dist/kex.h up to 1.24 +crypto/external/bsd/openssh/dist/log.c up to 1.27 +crypto/external/bsd/openssh/dist/misc.c up to 1.35 +crypto/external/bsd/openssh/dist/misc.h up to 1.27 +crypto/external/bsd/openssh/dist/monitor_wrap.c up to 1.34 +crypto/external/bsd/openssh/dist/mux.c up to 1.35 +crypto/external/bsd/openssh/dist/packet.c up to 1.50 +crypto/external/bsd/openssh/dist/packet.h up to 1.26 +crypto/external/bsd/openssh/dist/readconf.c up to 1.44 +crypto/external/bsd/openssh/dist/readconf.h up to 1.34 +crypto/external/bsd/openssh/dist/scp.1 up to 1.31 +crypto/external/bsd/openssh/dist/scp.c up to 1.41 +crypto/external/bsd/openssh/dist/servconf.c up to 1.44 +crypto/external/bsd/openssh/dist/sftp-client.c up to 1.35 +crypto/external/bsd/openssh/dist/sftp.1 up to 1.30 +crypto/external/bsd/openssh/dist/ssh-add.1 up to 1.18 +crypto/external/bsd/openssh/dist/ssh-add.c up to 1.30 +crypto/external/bsd/openssh/dist/ssh-agent.cup to 1.37 +crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c up to 1.19 +crypto/external/bsd/openssh/dist/ssh-pkcs11.h up to 1.9 +crypto/external/bsd/openssh/dist/ssh.1 up to 1.39 +crypto/external/bsd/openssh/dist/ssh.c up to 1.45 +crypto/external/bsd/openssh/dist/ssh2.h up to 1.15 +crypto/external/bsd/openssh/dist/ssh_config.5 up to 1.40 +crypto/external/bsd/openssh/dist/sshconnect.c up to 1.37 +crypto/external/bsd/openssh/dist/sshconnect.h up to 1.17 +crypto/external/bsd/openssh/dist/sshconnect2.c up to 1.46 +crypto/external/bsd/openssh/dist/sshd.c up to 1.50 +crypto/external/bsd/openssh/dist/sshkey.c up to 1.32 +crypto/external/bsd/openssh/dist/sshsig.c up to 1.12 +crypto/external/bsd/openssh/dist/version.h up to 1.44 +crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 up to 1.16 +crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072 up to 1.18 +crypto/external/bsd/openssh/dist/moduli-gen/moduli.4096 up to 1.18 +crypto/external/bsd/openssh/dist/moduli-gen/moduli.6144 up to 1.18 +crypto/external/bsd/openssh/dist/moduli-gen/moduli.7680 up to 1.18 +crypto/external/bsd/openssh/dist/moduli-gen/moduli.8192 up to 1.18 +crypto/external/bsd/openssh/lib/Makefileup to 1.38 (+patch) +crypto/external/bsd/openssh/lib/shlib_version up to 1.36 +distrib/sets/lists/base/shl.mi (apply patch) +distrib/sets/lists/debug/shl.mi (apply patch) +doc/3RDPARTY (apply patch) + + openssh: update to 9.6. + [kim, #517] + +external/ibm-public/postfix/dist/html/postfix-doc.css up to 1.1.1.1 +external/ibm-public/postfix/dist/mantools/check-double-history up to 1.1.1.1 +external/ibm-public/postfix/dist/mantools/check-spell-history up to 1.1.1.1 +external/ibm-public/postfix/dist/mantools/check-table-proto up to 1.1.1.1 +external/ibm-public/postfix/dist/proto/stop.double-history up to 1.1
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Mon Dec 25 12:48:47 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #516 and #517 To generate a diff of this commit: cvs rdiff -u -r1.1.2.176 -r1.1.2.177 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Mon Dec 25 12:43:39 UTC 2023 Modified Files: src/doc [netbsd-10]: 3RDPARTY src/external/ibm-public/postfix/dist [netbsd-10]: HISTORY INSTALL Makefile.in RELEASE_NOTES WISHLIST makedefs postfix-env.sh src/external/ibm-public/postfix/dist/README_FILES [netbsd-10]: ADDRESS_CLASS_README BASIC_CONFIGURATION_README DEBUG_README FORWARD_SECRECY_README INSTALL IPV6_README MAILLOG_README MILTER_README MYSQL_README PGSQL_README QSHAPE_README RELEASE_NOTES SASL_README SMTPD_POLICY_README SMTPD_PROXY_README SQLITE_README STANDARD_CONFIGURATION_README TLS_README src/external/ibm-public/postfix/dist/conf [netbsd-10]: aliases main.cf master.cf postfix-files postfix-script postfix-tls-script virtual src/external/ibm-public/postfix/dist/html [netbsd-10]: ADDRESS_CLASS_README.html ADDRESS_REWRITING_README.html ADDRESS_VERIFICATION_README.html BACKSCATTER_README.html BASIC_CONFIGURATION_README.html BDAT_README.html BUILTIN_FILTER_README.html CDB_README.html COMPATIBILITY_README.html CONNECTION_CACHE_README.html CONTENT_INSPECTION_README.html DATABASE_README.html DB_README.html DEBUG_README.html DSN_README.html ETRN_README.html FILTER_README.html FORWARD_SECRECY_README.html INSTALL.html IPV6_README.html LDAP_README.html LINUX_README.html LMDB_README.html LOCAL_RECIPIENT_README.html MAILDROP_README.html MAILLOG_README.html MEMCACHE_README.html MILTER_README.html MULTI_INSTANCE_README.html MYSQL_README.html NFS_README.html OVERVIEW.html PACKAGE_README.html PCRE_README.html PGSQL_README.html POSTSCREEN_3_5_README.html POSTSCREEN_README.html QSHAPE_README.html RESTRICTION_CLASS_README.html SASL_README.html SCHEDULER_README.html SMTPD_ACCESS_README.html SMTPD_POLICY_README.html SMTPD_PROXY_README.html SMTPUTF8_README.html SOHO_README.html SQLITE_README.html STANDARD_CONFIGURATION_README.html STRESS_README.html TLS_LEGACY_README.html TLS_README.html TUNING_README.html UUCP_README.html VERP_README.html VIRTUAL_README.html XCLIENT_README.html XFORWARD_README.html access.5.html aliases.5.html anvil.8.html bounce.5.html bounce.8.html canonical.5.html cidr_table.5.html cleanup.8.html defer.8.html discard.8.html dnsblog.8.html error.8.html flush.8.html generic.5.html header_checks.5.html index.html ldap_table.5.html lmdb_table.5.html lmtp.8.html local.8.html mailq.1.html makedefs.1.html master.5.html master.8.html memcache_table.5.html mysql_table.5.html newaliases.1.html nisplus_table.5.html oqmgr.8.html pcre_table.5.html pgsql_table.5.html pickup.8.html pipe.8.html postalias.1.html postcat.1.html postconf.1.html postconf.5.html postdrop.1.html postfix-manuals.html postfix-tls.1.html postfix-wrapper.5.html postfix.1.html postkick.1.html postlock.1.html postlog.1.html postlogd.8.html postmap.1.html postmulti.1.html postqueue.1.html postscreen.8.html postsuper.1.html posttls-finger.1.html proxymap.8.html qmgr.8.html qmqp-sink.1.html qmqp-source.1.html qmqpd.8.html qshape.1.html regexp_table.5.html relocated.5.html scache.8.html sendmail.1.html showq.8.html smtp-sink.1.html smtp-source.1.html smtp.8.html smtpd.8.html socketmap_table.5.html spawn.8.html sqlite_table.5.html tcp_table.5.html tlsmgr.8.html tlsproxy.8.html trace.8.html transport.5.html trivial-rewrite.8.html verify.8.html virtual.5.html virtual.8.html src/external/ibm-public/postfix/dist/man/man1 [netbsd-10]: postfix-tls.1 postfix.1 postlog.1 postqueue.1 posttls-finger.1 src/external/ibm-public/postfix/dist/man/man5 [netbsd-10]: aliases.5 cidr_table.5 ldap_table.5 mysql_table.5 pcre_table.5 pgsql_table.5 postconf.5 regexp_table.5 virtual.5 src/external/ibm-public/postfix/dist/man/man8 [netbsd-10]: postscreen.8 smtp.8 smtpd.8 tlsproxy.8 src/external/ibm-public/postfix/dist/mantools [netbsd-10]: check-double-cc check-double-install-proto-text check-double-proto-html check-postfix-files check-postlink check-spell-cc check-spell-install-proto-text check-spell-proto-html make_soho_readme makemanidx man2html manlint manspell missing-proxy-read-maps postlink spell src/external/ibm-public/postfix/dist/proto [netbsd-10]: ADDRESS_CLASS_README.html ADDRESS_REWRITING_README.html ADDRESS_VERIFICATION_README.html BACKSCATTER_README.html
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Mon Dec 25 12:43:39 UTC 2023 Modified Files: src/doc [netbsd-10]: 3RDPARTY src/external/ibm-public/postfix/dist [netbsd-10]: HISTORY INSTALL Makefile.in RELEASE_NOTES WISHLIST makedefs postfix-env.sh src/external/ibm-public/postfix/dist/README_FILES [netbsd-10]: ADDRESS_CLASS_README BASIC_CONFIGURATION_README DEBUG_README FORWARD_SECRECY_README INSTALL IPV6_README MAILLOG_README MILTER_README MYSQL_README PGSQL_README QSHAPE_README RELEASE_NOTES SASL_README SMTPD_POLICY_README SMTPD_PROXY_README SQLITE_README STANDARD_CONFIGURATION_README TLS_README src/external/ibm-public/postfix/dist/conf [netbsd-10]: aliases main.cf master.cf postfix-files postfix-script postfix-tls-script virtual src/external/ibm-public/postfix/dist/html [netbsd-10]: ADDRESS_CLASS_README.html ADDRESS_REWRITING_README.html ADDRESS_VERIFICATION_README.html BACKSCATTER_README.html BASIC_CONFIGURATION_README.html BDAT_README.html BUILTIN_FILTER_README.html CDB_README.html COMPATIBILITY_README.html CONNECTION_CACHE_README.html CONTENT_INSPECTION_README.html DATABASE_README.html DB_README.html DEBUG_README.html DSN_README.html ETRN_README.html FILTER_README.html FORWARD_SECRECY_README.html INSTALL.html IPV6_README.html LDAP_README.html LINUX_README.html LMDB_README.html LOCAL_RECIPIENT_README.html MAILDROP_README.html MAILLOG_README.html MEMCACHE_README.html MILTER_README.html MULTI_INSTANCE_README.html MYSQL_README.html NFS_README.html OVERVIEW.html PACKAGE_README.html PCRE_README.html PGSQL_README.html POSTSCREEN_3_5_README.html POSTSCREEN_README.html QSHAPE_README.html RESTRICTION_CLASS_README.html SASL_README.html SCHEDULER_README.html SMTPD_ACCESS_README.html SMTPD_POLICY_README.html SMTPD_PROXY_README.html SMTPUTF8_README.html SOHO_README.html SQLITE_README.html STANDARD_CONFIGURATION_README.html STRESS_README.html TLS_LEGACY_README.html TLS_README.html TUNING_README.html UUCP_README.html VERP_README.html VIRTUAL_README.html XCLIENT_README.html XFORWARD_README.html access.5.html aliases.5.html anvil.8.html bounce.5.html bounce.8.html canonical.5.html cidr_table.5.html cleanup.8.html defer.8.html discard.8.html dnsblog.8.html error.8.html flush.8.html generic.5.html header_checks.5.html index.html ldap_table.5.html lmdb_table.5.html lmtp.8.html local.8.html mailq.1.html makedefs.1.html master.5.html master.8.html memcache_table.5.html mysql_table.5.html newaliases.1.html nisplus_table.5.html oqmgr.8.html pcre_table.5.html pgsql_table.5.html pickup.8.html pipe.8.html postalias.1.html postcat.1.html postconf.1.html postconf.5.html postdrop.1.html postfix-manuals.html postfix-tls.1.html postfix-wrapper.5.html postfix.1.html postkick.1.html postlock.1.html postlog.1.html postlogd.8.html postmap.1.html postmulti.1.html postqueue.1.html postscreen.8.html postsuper.1.html posttls-finger.1.html proxymap.8.html qmgr.8.html qmqp-sink.1.html qmqp-source.1.html qmqpd.8.html qshape.1.html regexp_table.5.html relocated.5.html scache.8.html sendmail.1.html showq.8.html smtp-sink.1.html smtp-source.1.html smtp.8.html smtpd.8.html socketmap_table.5.html spawn.8.html sqlite_table.5.html tcp_table.5.html tlsmgr.8.html tlsproxy.8.html trace.8.html transport.5.html trivial-rewrite.8.html verify.8.html virtual.5.html virtual.8.html src/external/ibm-public/postfix/dist/man/man1 [netbsd-10]: postfix-tls.1 postfix.1 postlog.1 postqueue.1 posttls-finger.1 src/external/ibm-public/postfix/dist/man/man5 [netbsd-10]: aliases.5 cidr_table.5 ldap_table.5 mysql_table.5 pcre_table.5 pgsql_table.5 postconf.5 regexp_table.5 virtual.5 src/external/ibm-public/postfix/dist/man/man8 [netbsd-10]: postscreen.8 smtp.8 smtpd.8 tlsproxy.8 src/external/ibm-public/postfix/dist/mantools [netbsd-10]: check-double-cc check-double-install-proto-text check-double-proto-html check-postfix-files check-postlink check-spell-cc check-spell-install-proto-text check-spell-proto-html make_soho_readme makemanidx man2html manlint manspell missing-proxy-read-maps postlink spell src/external/ibm-public/postfix/dist/proto [netbsd-10]: ADDRESS_CLASS_README.html ADDRESS_REWRITING_README.html ADDRESS_VERIFICATION_README.html BACKSCATTER_README.html
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Dec 25 12:31:12 UTC 2023 Modified Files: src/crypto/external/bsd/openssh [netbsd-9]: Makefile.inc openssh2netbsd src/crypto/external/bsd/openssh/bin [netbsd-9]: Makefile.inc src/crypto/external/bsd/openssh/bin/scp [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/sftp [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/sftp-server [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/ssh [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/ssh-add [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/ssh-agent [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/ssh-keygen [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/ssh-keyscan [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/sshd [netbsd-9]: Makefile src/crypto/external/bsd/openssh/dist [netbsd-9]: LICENCE PROTOCOL PROTOCOL.agent PROTOCOL.certkeys PROTOCOL.chacha20poly1305 PROTOCOL.key PROTOCOL.krl PROTOCOL.mux addrmatch.c auth-krb5.c auth-options.c auth-options.h auth-pam.c auth-passwd.c auth-rhosts.c auth.c auth.h auth2-chall.c auth2-gss.c auth2-hostbased.c auth2-kbdint.c auth2-krb5.c auth2-none.c auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c authfile.h canohost.c chacha.c chacha.h channels.c channels.h cipher-chachapoly.c cipher-chachapoly.h cipher.c cipher.h clientloop.c clientloop.h compat.c compat.h crypto_api.h dh.c dh.h digest-libc.c digest-openssl.c dispatch.c dns.c dns.h ed25519.c fatal.c getrrsetbyname.c gss-genr.c gss-serv.c hash.c hmac.c hostfile.c hostfile.h includes.h kex.c kex.h kexdh.c kexgen.c kexgexc.c kexgexs.c krl.c krl.h ldapauth.c ldapauth.h log.c log.h mac.c match.c match.h misc.c misc.h moduli moduli.c monitor.c monitor.h monitor_fdpass.c monitor_wrap.c monitor_wrap.h msg.c mux.c myproposal.h namespace.h nchan.c packet.c packet.h pathnames.h pfilter.c poly1305.c progressmeter.c readconf.c readconf.h readpass.c rijndael.h sandbox-pledge.c sandbox-rlimit.c scp.1 scp.c servconf.c servconf.h serverloop.c session.c session.h sftp-client.c sftp-client.h sftp-common.c sftp-common.h sftp-glob.c sftp-server-main.c sftp-server.8 sftp-server.c sftp.1 sftp.c ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c ssh-gss.h ssh-keygen.1 ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 ssh-keysign.c ssh-pkcs11-client.c ssh-pkcs11-helper.8 ssh-pkcs11-helper.c ssh-pkcs11.c ssh-pkcs11.h ssh-rsa.c ssh-xmss.c ssh.1 ssh.c ssh.h ssh2.h ssh_api.c ssh_config ssh_config.5 sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c sshbuf.h sshconnect.c sshconnect.h sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5 ssherr.c ssherr.h sshkey-xmss.c sshkey-xmss.h sshkey.c sshkey.h sshlogin.c sshpty.c ttymodes.c uidswap.c umac.c umac.h utf8.c utf8.h version.h xmalloc.c xmalloc.h xmss_hash.c src/crypto/external/bsd/openssh/dist/moduli-gen [netbsd-9]: Makefile moduli-gen.sh moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib [netbsd-9]: Makefile shlib_version src/distrib/sets/lists/base [netbsd-9]: shl.mi src/distrib/sets/lists/debug [netbsd-9]: shl.mi src/doc [netbsd-9]: 3RDPARTY src/lib/libpam/modules/pam_ssh [netbsd-9]: Makefile pam_ssh.c Added Files: src/crypto/external/bsd/openssh/dist [netbsd-9]: PROTOCOL.sshsig PROTOCOL.u2f addr.c addr.h auth2-pubkeyfile.c cipher-chachapoly-libcrypto.c ed25519.sh kexsntrup761x25519.c sftp-realpath.c sftp-usergroup.c sftp-usergroup.h sk-api.h sk-usbhid.c sntrup761.c sntrup761.sh srclimit.c srclimit.h ssh-ecdsa-sk.c ssh-ed25519-sk.c ssh-sk-client.c ssh-sk-helper.8 ssh-sk-helper.c ssh-sk.c ssh-sk.h sshbuf-io.c sshsig.c sshsig.h Removed Files: src/crypto/external/bsd/openssh/dist [netbsd-9]: crc32.c crc32.h fe25519.c fe25519.h ge25519.c ge25519.h ge25519_base.data kexsntrup4591761x25519.c sc25519.c sc25519.h sntrup4591761.c sntrup4591761.sh uuencode.c uuencode.h verify.c Log Message: Pull up the following, requested by kim in ticket #1780: crypto/external/bsd/openssh/Makefile.incup to 1.15 (+patch) crypto/external/bsd/openssh/bin/Makefile.incup to 1.4 crypto/external/bsd/openssh/bin/scp/Makefileup to 1
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Dec 25 12:31:12 UTC 2023 Modified Files: src/crypto/external/bsd/openssh [netbsd-9]: Makefile.inc openssh2netbsd src/crypto/external/bsd/openssh/bin [netbsd-9]: Makefile.inc src/crypto/external/bsd/openssh/bin/scp [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/sftp [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/sftp-server [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/ssh [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/ssh-add [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/ssh-agent [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/ssh-keygen [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/ssh-keyscan [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper [netbsd-9]: Makefile src/crypto/external/bsd/openssh/bin/sshd [netbsd-9]: Makefile src/crypto/external/bsd/openssh/dist [netbsd-9]: LICENCE PROTOCOL PROTOCOL.agent PROTOCOL.certkeys PROTOCOL.chacha20poly1305 PROTOCOL.key PROTOCOL.krl PROTOCOL.mux addrmatch.c auth-krb5.c auth-options.c auth-options.h auth-pam.c auth-passwd.c auth-rhosts.c auth.c auth.h auth2-chall.c auth2-gss.c auth2-hostbased.c auth2-kbdint.c auth2-krb5.c auth2-none.c auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c authfile.h canohost.c chacha.c chacha.h channels.c channels.h cipher-chachapoly.c cipher-chachapoly.h cipher.c cipher.h clientloop.c clientloop.h compat.c compat.h crypto_api.h dh.c dh.h digest-libc.c digest-openssl.c dispatch.c dns.c dns.h ed25519.c fatal.c getrrsetbyname.c gss-genr.c gss-serv.c hash.c hmac.c hostfile.c hostfile.h includes.h kex.c kex.h kexdh.c kexgen.c kexgexc.c kexgexs.c krl.c krl.h ldapauth.c ldapauth.h log.c log.h mac.c match.c match.h misc.c misc.h moduli moduli.c monitor.c monitor.h monitor_fdpass.c monitor_wrap.c monitor_wrap.h msg.c mux.c myproposal.h namespace.h nchan.c packet.c packet.h pathnames.h pfilter.c poly1305.c progressmeter.c readconf.c readconf.h readpass.c rijndael.h sandbox-pledge.c sandbox-rlimit.c scp.1 scp.c servconf.c servconf.h serverloop.c session.c session.h sftp-client.c sftp-client.h sftp-common.c sftp-common.h sftp-glob.c sftp-server-main.c sftp-server.8 sftp-server.c sftp.1 sftp.c ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c ssh-gss.h ssh-keygen.1 ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 ssh-keysign.c ssh-pkcs11-client.c ssh-pkcs11-helper.8 ssh-pkcs11-helper.c ssh-pkcs11.c ssh-pkcs11.h ssh-rsa.c ssh-xmss.c ssh.1 ssh.c ssh.h ssh2.h ssh_api.c ssh_config ssh_config.5 sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c sshbuf.h sshconnect.c sshconnect.h sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5 ssherr.c ssherr.h sshkey-xmss.c sshkey-xmss.h sshkey.c sshkey.h sshlogin.c sshpty.c ttymodes.c uidswap.c umac.c umac.h utf8.c utf8.h version.h xmalloc.c xmalloc.h xmss_hash.c src/crypto/external/bsd/openssh/dist/moduli-gen [netbsd-9]: Makefile moduli-gen.sh moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib [netbsd-9]: Makefile shlib_version src/distrib/sets/lists/base [netbsd-9]: shl.mi src/distrib/sets/lists/debug [netbsd-9]: shl.mi src/doc [netbsd-9]: 3RDPARTY src/lib/libpam/modules/pam_ssh [netbsd-9]: Makefile pam_ssh.c Added Files: src/crypto/external/bsd/openssh/dist [netbsd-9]: PROTOCOL.sshsig PROTOCOL.u2f addr.c addr.h auth2-pubkeyfile.c cipher-chachapoly-libcrypto.c ed25519.sh kexsntrup761x25519.c sftp-realpath.c sftp-usergroup.c sftp-usergroup.h sk-api.h sk-usbhid.c sntrup761.c sntrup761.sh srclimit.c srclimit.h ssh-ecdsa-sk.c ssh-ed25519-sk.c ssh-sk-client.c ssh-sk-helper.8 ssh-sk-helper.c ssh-sk.c ssh-sk.h sshbuf-io.c sshsig.c sshsig.h Removed Files: src/crypto/external/bsd/openssh/dist [netbsd-9]: crc32.c crc32.h fe25519.c fe25519.h ge25519.c ge25519.h ge25519_base.data kexsntrup4591761x25519.c sc25519.c sc25519.h sntrup4591761.c sntrup4591761.sh uuencode.c uuencode.h verify.c Log Message: Pull up the following, requested by kim in ticket #1780: crypto/external/bsd/openssh/Makefile.incup to 1.15 (+patch) crypto/external/bsd/openssh/bin/Makefile.incup to 1.4 crypto/external/bsd/openssh/bin/scp/Makefileup to 1
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Mon Dec 25 12:22:58 UTC 2023 Modified Files: src/crypto/external/bsd/openssh/bin [netbsd-10]: Makefile.inc src/crypto/external/bsd/openssh/bin/sftp [netbsd-10]: Makefile src/crypto/external/bsd/openssh/bin/ssh [netbsd-10]: Makefile src/crypto/external/bsd/openssh/bin/ssh-agent [netbsd-10]: Makefile src/crypto/external/bsd/openssh/bin/ssh-keygen [netbsd-10]: Makefile src/crypto/external/bsd/openssh/bin/sshd [netbsd-10]: Makefile src/crypto/external/bsd/openssh/dist [netbsd-10]: PROTOCOL PROTOCOL.agent auth2.c authfd.c authfd.h channels.c channels.h cipher.c cipher.h clientloop.c kex.c kex.h log.c misc.c misc.h monitor_wrap.c mux.c packet.c packet.h readconf.c readconf.h scp.1 scp.c servconf.c sftp-client.c sftp.1 ssh-add.1 ssh-add.c ssh-agent.c ssh-pkcs11-client.c ssh-pkcs11.h ssh.1 ssh.c ssh2.h ssh_config.5 sshconnect.c sshconnect.h sshconnect2.c sshd.c sshkey.c sshsig.c version.h src/crypto/external/bsd/openssh/dist/moduli-gen [netbsd-10]: moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib [netbsd-10]: Makefile shlib_version src/distrib/sets/lists/base [netbsd-10]: shl.mi src/distrib/sets/lists/debug [netbsd-10]: shl.mi src/doc [netbsd-10]: 3RDPARTY Log Message: Pullup the following, requested by kim in ticket #517: crypto/external/bsd/openssh/bin/Makefile.incup to 1.4 crypto/external/bsd/openssh/bin/sftp/Makefile up to 1.11 (+patch) crypto/external/bsd/openssh/bin/ssh/Makefileup to 1.20 (+patch) crypto/external/bsd/openssh/bin/ssh-agent/Makefile up to 1.7 (+patch) crypto/external/bsd/openssh/bin/ssh-keygen/Makefile up to 1.10 (+patch) crypto/external/bsd/openssh/bin/sshd/Makefile up to 1.27 (+patch) crypto/external/bsd/openssh/dist/PROTOCOL up to 1.23 crypto/external/bsd/openssh/dist/PROTOCOL.agent up to 1.15 crypto/external/bsd/openssh/dist/auth2.cup to 1.29 crypto/external/bsd/openssh/dist/authfd.c up to 1.27 crypto/external/bsd/openssh/dist/authfd.h up to 1.17 crypto/external/bsd/openssh/dist/channels.c up to 1.42 crypto/external/bsd/openssh/dist/channels.h up to 1.26 crypto/external/bsd/openssh/dist/cipher.c up to 1.21 crypto/external/bsd/openssh/dist/cipher.h up to 1.17 crypto/external/bsd/openssh/dist/clientloop.c up to 1.39 crypto/external/bsd/openssh/dist/kex.c up to 1.34 crypto/external/bsd/openssh/dist/kex.h up to 1.24 crypto/external/bsd/openssh/dist/log.c up to 1.27 crypto/external/bsd/openssh/dist/misc.c up to 1.35 crypto/external/bsd/openssh/dist/misc.h up to 1.27 crypto/external/bsd/openssh/dist/monitor_wrap.c up to 1.34 crypto/external/bsd/openssh/dist/mux.c up to 1.35 crypto/external/bsd/openssh/dist/packet.c up to 1.50 crypto/external/bsd/openssh/dist/packet.h up to 1.26 crypto/external/bsd/openssh/dist/readconf.c up to 1.44 crypto/external/bsd/openssh/dist/readconf.h up to 1.34 crypto/external/bsd/openssh/dist/scp.1 up to 1.31 crypto/external/bsd/openssh/dist/scp.c up to 1.41 crypto/external/bsd/openssh/dist/servconf.c up to 1.44 crypto/external/bsd/openssh/dist/sftp-client.c up to 1.35 crypto/external/bsd/openssh/dist/sftp.1 up to 1.30 crypto/external/bsd/openssh/dist/ssh-add.1 up to 1.18 crypto/external/bsd/openssh/dist/ssh-add.c up to 1.30 crypto/external/bsd/openssh/dist/ssh-agent.cup to 1.37 crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c up to 1.19 crypto/external/bsd/openssh/dist/ssh-pkcs11.h up to 1.9 crypto/external/bsd/openssh/dist/ssh.1 up to 1.39 crypto/external/bsd/openssh/dist/ssh.c up to 1.45 crypto/external/bsd/openssh/dist/ssh2.h up to 1.15 crypto/external/bsd/openssh/dist/ssh_config.5 up to 1.40 crypto/external/bsd/openssh/dist/sshconnect.c up to 1.37 crypto/external/bsd/openssh/dist/sshconnect.h up to 1.17 crypto/external/bsd/openssh/dist/sshconnect2.c up to 1.46 crypto/external/bsd/openssh/dist/sshd.c up to 1.50 crypto/external/bsd/openssh/dist/sshkey.c up to 1.32 crypto/external/bsd/openssh/dist/sshsig.c up to 1.12 crypto/external/bsd/openssh/dist/version.h up to 1.44 crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 up to 1.16 crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072 up to 1.18 crypto/exte
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Mon Dec 25 12:22:58 UTC 2023 Modified Files: src/crypto/external/bsd/openssh/bin [netbsd-10]: Makefile.inc src/crypto/external/bsd/openssh/bin/sftp [netbsd-10]: Makefile src/crypto/external/bsd/openssh/bin/ssh [netbsd-10]: Makefile src/crypto/external/bsd/openssh/bin/ssh-agent [netbsd-10]: Makefile src/crypto/external/bsd/openssh/bin/ssh-keygen [netbsd-10]: Makefile src/crypto/external/bsd/openssh/bin/sshd [netbsd-10]: Makefile src/crypto/external/bsd/openssh/dist [netbsd-10]: PROTOCOL PROTOCOL.agent auth2.c authfd.c authfd.h channels.c channels.h cipher.c cipher.h clientloop.c kex.c kex.h log.c misc.c misc.h monitor_wrap.c mux.c packet.c packet.h readconf.c readconf.h scp.1 scp.c servconf.c sftp-client.c sftp.1 ssh-add.1 ssh-add.c ssh-agent.c ssh-pkcs11-client.c ssh-pkcs11.h ssh.1 ssh.c ssh2.h ssh_config.5 sshconnect.c sshconnect.h sshconnect2.c sshd.c sshkey.c sshsig.c version.h src/crypto/external/bsd/openssh/dist/moduli-gen [netbsd-10]: moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib [netbsd-10]: Makefile shlib_version src/distrib/sets/lists/base [netbsd-10]: shl.mi src/distrib/sets/lists/debug [netbsd-10]: shl.mi src/doc [netbsd-10]: 3RDPARTY Log Message: Pullup the following, requested by kim in ticket #517: crypto/external/bsd/openssh/bin/Makefile.incup to 1.4 crypto/external/bsd/openssh/bin/sftp/Makefile up to 1.11 (+patch) crypto/external/bsd/openssh/bin/ssh/Makefileup to 1.20 (+patch) crypto/external/bsd/openssh/bin/ssh-agent/Makefile up to 1.7 (+patch) crypto/external/bsd/openssh/bin/ssh-keygen/Makefile up to 1.10 (+patch) crypto/external/bsd/openssh/bin/sshd/Makefile up to 1.27 (+patch) crypto/external/bsd/openssh/dist/PROTOCOL up to 1.23 crypto/external/bsd/openssh/dist/PROTOCOL.agent up to 1.15 crypto/external/bsd/openssh/dist/auth2.cup to 1.29 crypto/external/bsd/openssh/dist/authfd.c up to 1.27 crypto/external/bsd/openssh/dist/authfd.h up to 1.17 crypto/external/bsd/openssh/dist/channels.c up to 1.42 crypto/external/bsd/openssh/dist/channels.h up to 1.26 crypto/external/bsd/openssh/dist/cipher.c up to 1.21 crypto/external/bsd/openssh/dist/cipher.h up to 1.17 crypto/external/bsd/openssh/dist/clientloop.c up to 1.39 crypto/external/bsd/openssh/dist/kex.c up to 1.34 crypto/external/bsd/openssh/dist/kex.h up to 1.24 crypto/external/bsd/openssh/dist/log.c up to 1.27 crypto/external/bsd/openssh/dist/misc.c up to 1.35 crypto/external/bsd/openssh/dist/misc.h up to 1.27 crypto/external/bsd/openssh/dist/monitor_wrap.c up to 1.34 crypto/external/bsd/openssh/dist/mux.c up to 1.35 crypto/external/bsd/openssh/dist/packet.c up to 1.50 crypto/external/bsd/openssh/dist/packet.h up to 1.26 crypto/external/bsd/openssh/dist/readconf.c up to 1.44 crypto/external/bsd/openssh/dist/readconf.h up to 1.34 crypto/external/bsd/openssh/dist/scp.1 up to 1.31 crypto/external/bsd/openssh/dist/scp.c up to 1.41 crypto/external/bsd/openssh/dist/servconf.c up to 1.44 crypto/external/bsd/openssh/dist/sftp-client.c up to 1.35 crypto/external/bsd/openssh/dist/sftp.1 up to 1.30 crypto/external/bsd/openssh/dist/ssh-add.1 up to 1.18 crypto/external/bsd/openssh/dist/ssh-add.c up to 1.30 crypto/external/bsd/openssh/dist/ssh-agent.cup to 1.37 crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c up to 1.19 crypto/external/bsd/openssh/dist/ssh-pkcs11.h up to 1.9 crypto/external/bsd/openssh/dist/ssh.1 up to 1.39 crypto/external/bsd/openssh/dist/ssh.c up to 1.45 crypto/external/bsd/openssh/dist/ssh2.h up to 1.15 crypto/external/bsd/openssh/dist/ssh_config.5 up to 1.40 crypto/external/bsd/openssh/dist/sshconnect.c up to 1.37 crypto/external/bsd/openssh/dist/sshconnect.h up to 1.17 crypto/external/bsd/openssh/dist/sshconnect2.c up to 1.46 crypto/external/bsd/openssh/dist/sshd.c up to 1.50 crypto/external/bsd/openssh/dist/sshkey.c up to 1.32 crypto/external/bsd/openssh/dist/sshsig.c up to 1.12 crypto/external/bsd/openssh/dist/version.h up to 1.44 crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 up to 1.16 crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072 up to 1.18 crypto/exte
CVS commit: src/etc/rc.d
Module Name:src
Committed By: kre
Date: Mon Dec 25 08:38:32 UTC 2023
Modified Files:
src/etc/rc.d: sysdb
Log Message:
Stop using the obsolete test(1) -o operator, use sh || instead.
Prefer sh ! over test's ! (though that one is not completely obsolete).
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/etc/rc.d/sysdb
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/sysdb
diff -u src/etc/rc.d/sysdb:1.25 src/etc/rc.d/sysdb:1.26
--- src/etc/rc.d/sysdb:1.25 Sat Apr 23 21:24:31 2016
+++ src/etc/rc.d/sysdb Mon Dec 25 08:38:32 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: sysdb,v 1.25 2016/04/23 21:24:31 dholland Exp $
+# $NetBSD: sysdb,v 1.26 2023/12/25 08:38:32 kre Exp $
#
# PROVIDE: sysdb
@@ -40,10 +40,10 @@ check_file()
local db="$2"
shift 2
- if [ ! -e "$src" ]; then
+ if ! [ -e "$src" ]; then
return
fi
- if [ \( ! -f "$db" \) -o \( "$src" -nt "$db" \) ]; then
+ if ! [ -f "$db" ] || [ "$src" -nt "$db" ]; then
$echo -n "$comma${src##*/}"
comma=", "
"$@"
@@ -81,7 +81,7 @@ build_utmp()
#
local i
for i in "" x; do
- if [ ! -f /var/run/utmp$i ]; then
+ if ! [ -f /var/run/utmp$i ]; then
$echo -n "${comma}utmp$i"
comma=", "
install -c -m 664 -g utmp /dev/null /var/run/utmp$i
CVS commit: src/etc/rc.d
Module Name:src Committed By: kre Date: Mon Dec 25 08:38:32 UTC 2023 Modified Files: src/etc/rc.d: sysdb Log Message: Stop using the obsolete test(1) -o operator, use sh || instead. Prefer sh ! over test's ! (though that one is not completely obsolete). To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/etc/rc.d/sysdb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src
Committed By: kre
Date: Mon Dec 25 08:37:09 UTC 2023
Modified Files:
src/etc/rc.d: postfix
Log Message:
Do away with the obsolete text(1) -a operator, use sh && instead.
Prefer sh ! operator over test's ! (less question what it means).
A few minor formatting changes.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/etc/rc.d/postfix
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/postfix
diff -u src/etc/rc.d/postfix:1.19 src/etc/rc.d/postfix:1.20
--- src/etc/rc.d/postfix:1.19 Fri Aug 9 10:05:44 2019
+++ src/etc/rc.d/postfix Mon Dec 25 08:37:08 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postfix,v 1.19 2019/08/09 10:05:44 rin Exp $
+# $NetBSD: postfix,v 1.20 2023/12/25 08:37:08 kre Exp $
#
# PROVIDE: mail
@@ -53,7 +53,7 @@ postfix_precmd()
case "$1" in
hash)
if [ -f "$2.db" ]; then
-if [ ! "$2" -ot "$2.db" ]; then
+if ! [ "$2" -ot "$2.db" ]; then
_rebuild "$2" "out of date"
fi
else
@@ -85,8 +85,8 @@ check_use_postfix()
echo YES
else
echo "WARNING: default postfix not used as not selected in mailer.conf" >&2
- if [ "${_mta_path}" = "${_sendmail_path}" -a \
- ! -x "${_mta_path}" ]; then
+ if [ "${_mta_path}" = "${_sendmail_path}" ] &&
+ ! [ -x "${_mta_path}" ]; then
echo "WARNING: mailer.conf points to the removed sendmail" >&2
echo "update /etc/mailer.conf to get a working mailer configuration" >&2
fi
CVS commit: src/etc/rc.d
Module Name:src Committed By: kre Date: Mon Dec 25 08:37:09 UTC 2023 Modified Files: src/etc/rc.d: postfix Log Message: Do away with the obsolete text(1) -a operator, use sh && instead. Prefer sh ! operator over test's ! (less question what it means). A few minor formatting changes. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/etc/rc.d/postfix Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src
Committed By: kre
Date: Mon Dec 25 08:35:07 UTC 2023
Modified Files:
src/etc/rc.d: named
Log Message:
Clean up obsolete test(1) usage - use sh's || instead of test's obsolete -o,
and sh's && instead of test's obsolete -a.
Minor formatting cleanups, including removing unneeded \ line continuations.
The somewhat bizarre way that named_migrate() was made to work in a
subshell (which of itself is fine, and looks needed) has been made more
rational. Because of that, the need to use local vars is no longer there,
(subshells can't affect the parent) and "local" in that func could be deleted
(but hasn't been).
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/etc/rc.d/named
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/named
diff -u src/etc/rc.d/named:1.27 src/etc/rc.d/named:1.28
--- src/etc/rc.d/named:1.27 Wed Mar 31 04:57:25 2021
+++ src/etc/rc.d/named Mon Dec 25 08:35:07 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: named,v 1.27 2021/03/31 04:57:25 christos Exp $
+# $NetBSD: named,v 1.28 2023/12/25 08:35:07 kre Exp $
#
# PROVIDE: named
@@ -19,11 +19,10 @@ extra_commands="reload"
required_dirs="$named_chrootdir" # if it is set, it must exist
named_migrate()
-{
+(
local src="$1"
local dst="$2$1"
echo "Migrating $src to $dst"
-(
diff=false
cd "$src"
mkdir -p "$dst"
@@ -59,15 +58,14 @@ named_migrate()
ln -s "$dst" "$src"
fi
)
-}
copy_if_newer()
{
local chrootdir="$1"
local dir="$2"
local file="$3"
- if [ ! -x "${chrootdir}${dir}/${file}" -o \
- "${chrootdir}${dir}/${file}" -ot "${dir}/${file}" ]; then
+ if ! [ -x "${chrootdir}${dir}/${file}" ] ||
+ [ "${chrootdir}${dir}/${file}" -ot "${dir}/${file}" ]; then
rm -f "${chrootdir}${dir}/${file}"
cp -p "${dir}/${file}" "${chrootdir}${dir}/${file}"
fi
@@ -75,13 +73,13 @@ copy_if_newer()
named_precmd()
{
- if [ ! -e "/etc/rndc.key" ]; then
+ if ! [ -e "/etc/rndc.key" ]; then
echo "Generating rndc.key"
/usr/sbin/rndc-confgen -a
fi
if [ -z "$named_chrootdir" ]; then
- if [ ! -d "/etc/namedb/keys" ]; then
+ if ! [ -d "/etc/namedb/keys" ]; then
mkdir -m 775 "/etc/namedb/keys"
chown named:named "/etc/namedb/keys"
fi
@@ -100,7 +98,7 @@ named_precmd()
case "$($command -v)" in
BIND*) # 9 no group, named-xfer, or ndc
named_plugindir="/usr/libexec/named"
- if [ ! -d "${named_chrootdir}${named_plugindir}" ]; then
+ if ! [ -d "${named_chrootdir}${named_plugindir}" ]; then
mkdir -p -m 755 "${named_chrootdir}${named_plugindir}"
chown root:wheel "${named_chrootdir}${named_plugindir}"
fi
@@ -117,32 +115,34 @@ named_precmd()
esac
for i in null random urandom; do
- if [ ! -c "${named_chrootdir}/dev/$i" ]; then
+ if ! [ -c "${named_chrootdir}/dev/$i" ]; then
rm -f "${named_chrootdir}/dev/$i"
- (cd /dev &&
- /bin/pax -rw -pe "$i" "${named_chrootdir}/dev")
+ ( cd /dev &&
+ /bin/pax -rw -pe "$i" "${named_chrootdir}/dev" )
fi
done
- if [ ! -h /etc/namedb ]; then
- named_migrate /etc/namedb ${named_chrootdir}
+ if ! [ -h /etc/namedb ]; then
+ named_migrate /etc/namedb "${named_chrootdir}"
fi
for i in named.conf rndc.key; do
- if [ \( -r "/etc/$i" \) -a \( ! -h "/etc/$i" \) -a \
- \( ! -r "${named_chrootdir}/etc/$i" \) ]; then
+ if [ -r "/etc/$i" ] && ! [ -h "/etc/$i" ] &&
+ ! [ -r "${named_chrootdir}/etc/$i" ]
+ then
mv "/etc/$i" "${named_chrootdir}/etc/$i"
ln -s "${named_chrootdir}/etc/$i" "/etc/$i"
fi
done
- if [ \( ! -r ${named_chrootdir}/etc/named.conf \) -a \
- \( -r ${named_chrootdir}/etc/namedb/named.conf \) ]; then
- ln -s namedb/named.conf ${named_chrootdir}/etc
+ if ! [ -r ${named_chrootdir}/etc/named.conf ] &&
+ [ -r ${named_chrootdir}/etc/namedb/named.conf ]
+ then
+ ln -s namedb/named.conf "${named_chrootdir}/etc"
fi
if [ -f /etc/localtime ]; then
- cmp -s /etc/localtime "${named_chrootdir}/etc/localtime" || \
+ cmp -s /etc/localtime "${named_chrootdir}/etc/localtime" ||
cp -p /etc/localtime "${named_chrootdir}/etc/localtime"
fi
CVS commit: src/etc/rc.d
Module Name:src Committed By: kre Date: Mon Dec 25 08:35:07 UTC 2023 Modified Files: src/etc/rc.d: named Log Message: Clean up obsolete test(1) usage - use sh's || instead of test's obsolete -o, and sh's && instead of test's obsolete -a. Minor formatting cleanups, including removing unneeded \ line continuations. The somewhat bizarre way that named_migrate() was made to work in a subshell (which of itself is fine, and looks needed) has been made more rational. Because of that, the need to use local vars is no longer there, (subshells can't affect the parent) and "local" in that func could be deleted (but hasn't been). To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/etc/rc.d/named Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src
Committed By: kre
Date: Mon Dec 25 08:29:05 UTC 2023
Modified Files:
src/etc/rc.d: iscsid_volumes
Log Message:
Clean up obsolere test(1) -a option/operator - use sh && instead.
Take the opportunity to do a little sh formatting cleanups, the \
line continuation can ususually be avoided by placing sh operators at
the appropriate places.
Note the [ x"$var" = x"$other" ] usage no longer needs the 'x',
avoiding that kind of nonsense is partly why test was much more
precisely specified, and a lot of the unnecessary stuff made obsolete.
Those however I did not remove (they're harmless).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/etc/rc.d/iscsid_volumes
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/iscsid_volumes
diff -u src/etc/rc.d/iscsid_volumes:1.4 src/etc/rc.d/iscsid_volumes:1.5
--- src/etc/rc.d/iscsid_volumes:1.4 Sat Jul 22 10:31:35 2023
+++ src/etc/rc.d/iscsid_volumes Mon Dec 25 08:29:05 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: iscsid_volumes,v 1.4 2023/07/22 10:31:35 mlelstv Exp $
+# $NetBSD: iscsid_volumes,v 1.5 2023/12/25 08:29:05 kre Exp $
#
# PROVIDE: iscsid_volumes
@@ -98,17 +98,19 @@ iscsid_volumes_stop()
*)
echo "Remove target ${alias:-$target}"
- /sbin/iscsictl list_sessions \
- | while read key1 num key2 sesstarget; do
-if [ x"$key1" = x"Session" -a \
- x"$key2" = x"Target" -a \
- x"$sesstarget" = x"$target" ]; then
- /sbin/iscsictl logout -I "$num" | grep -v '^OK$'
+ /sbin/iscsictl list_sessions |
+ while read key1 num key2 sesstarget; do
+if [ x"$key1" = x"Session" ] &&
+ [ x"$key2" = x"Target" ] &&
+ [ x"$sesstarget" = x"$target" ]
+then
+ /sbin/iscsictl logout -I "$num" |
+ grep -v '^OK$'
fi
done
- /sbin/iscsictl list_targets \
- | while read num talias ttarget; do
+ /sbin/iscsictl list_targets |
+ while read num talias ttarget; do
if [ x"$ttarget" = x"$target" ]; then
/sbin/iscsictl remove_target -I "$num"
fi
CVS commit: src/etc/rc.d
Module Name:src Committed By: kre Date: Mon Dec 25 08:29:05 UTC 2023 Modified Files: src/etc/rc.d: iscsid_volumes Log Message: Clean up obsolere test(1) -a option/operator - use sh && instead. Take the opportunity to do a little sh formatting cleanups, the \ line continuation can ususually be avoided by placing sh operators at the appropriate places. Note the [ x"$var" = x"$other" ] usage no longer needs the 'x', avoiding that kind of nonsense is partly why test was much more precisely specified, and a lot of the unnecessary stuff made obsolete. Those however I did not remove (they're harmless). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/etc/rc.d/iscsid_volumes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src
Committed By: kre
Date: Mon Dec 25 08:24:58 UTC 2023
Modified Files:
src/etc/rc.d: ipfs
Log Message:
Clean up obsolete test(1) usage, use sh && rather than test's old -a
(and while here prefer sh's ! operator over test's - it simplifies
things for test).
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/etc/rc.d/ipfs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ipfs
diff -u src/etc/rc.d/ipfs:1.8 src/etc/rc.d/ipfs:1.9
--- src/etc/rc.d/ipfs:1.8 Sun Sep 23 07:24:19 2018
+++ src/etc/rc.d/ipfs Mon Dec 25 08:24:58 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ipfs,v 1.8 2018/09/23 07:24:19 maxv Exp $
+# $NetBSD: ipfs,v 1.9 2023/12/25 08:24:58 kre Exp $
#
# PROVIDE: ipfs
@@ -17,7 +17,8 @@ stop_cmd="ipfs_stop"
ipfs_start()
{
- if [ -r /var/db/ipf/ipstate.ipf -a -r /var/db/ipf/ipnat.ipf ]; then
+ if [ -r /var/db/ipf/ipstate.ipf ] && [ -r /var/db/ipf/ipnat.ipf ]
+ then
/usr/sbin/ipfs -R ${rc_flags}
rm -f /var/db/ipf/ipstate.ipf /var/db/ipf/ipnat.ipf
fi
@@ -25,7 +26,7 @@ ipfs_start()
ipfs_stop()
{
- if [ ! -d /var/db/ipf ]; then
+ if ! [ -d /var/db/ipf ]; then
mkdir /var/db/ipf
chmod 700 /var/db/ipf
chown root:wheel /var/db/ipf
CVS commit: src/etc/rc.d
Module Name:src Committed By: kre Date: Mon Dec 25 08:24:58 UTC 2023 Modified Files: src/etc/rc.d: ipfs Log Message: Clean up obsolete test(1) usage, use sh && rather than test's old -a (and while here prefer sh's ! operator over test's - it simplifies things for test). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/etc/rc.d/ipfs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src
Committed By: kre
Date: Mon Dec 25 08:23:36 UTC 2023
Modified Files:
src/etc/rc.d: bluetooth
Log Message:
Clean up obsolete test(1) usage - don't use -o, use sh || instead.
This one was particularly bad:
if [ -z ${dev} -o ${junk} ]; then
was supposed to be validating an entry read from a config file,
dev should be not empty, and junk should be empty (ie: correct
number of fields present). If that test succeeds, the line is
bad, and we error out.
But if dev was empty, and junk was also empty, that turned into
if [ -z -o ]; then
which tests if "-o" is the empty string, which it isn't, so instead
of succeeding, and considering the entry invalid (no dev specified)
the code would just carry on as if all was good.
Because of this, a bunch of quoting fixes were also made (there might
perhaps be more needed).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/bluetooth
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src
Committed By: kre
Date: Mon Dec 25 08:23:36 UTC 2023
Modified Files:
src/etc/rc.d: bluetooth
Log Message:
Clean up obsolete test(1) usage - don't use -o, use sh || instead.
This one was particularly bad:
if [ -z ${dev} -o ${junk} ]; then
was supposed to be validating an entry read from a config file,
dev should be not empty, and junk should be empty (ie: correct
number of fields present). If that test succeeds, the line is
bad, and we error out.
But if dev was empty, and junk was also empty, that turned into
if [ -z -o ]; then
which tests if "-o" is the empty string, which it isn't, so instead
of succeeding, and considering the entry invalid (no dev specified)
the code would just carry on as if all was good.
Because of this, a bunch of quoting fixes were also made (there might
perhaps be more needed).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/bluetooth
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/bluetooth
diff -u src/etc/rc.d/bluetooth:1.2 src/etc/rc.d/bluetooth:1.3
--- src/etc/rc.d/bluetooth:1.2 Fri Nov 26 12:51:24 2021
+++ src/etc/rc.d/bluetooth Mon Dec 25 08:23:35 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: bluetooth,v 1.2 2021/11/26 12:51:24 sborrill Exp $
+# $NetBSD: bluetooth,v 1.3 2023/12/25 08:23:35 kre Exp $
#
# PROVIDE: bluetooth
@@ -85,13 +85,13 @@ bluetooth_start()
;;
esac
- if [ -z ${dev} -o ${junk} ]; then
+ if [ -z "${dev}" ] || [ -n "${junk}" ]; then
echo "${name}: invalid entry"
return 1
fi
echo "attaching Bluetooth ${service} service from \"${addr}\""
- ${btdevctl_cmd} -A -a ${addr} -d ${dev} -s ${service}
+ ${btdevctl_cmd} -A -a "${addr}" -d "${dev}" -s "${service}"
done < ${btdevctl_conf}
#
@@ -111,7 +111,7 @@ bluetooth_stop()
echo -n "disabling Bluetooth controllers:"
for dev in ${btconfig_devices:-$(${btconfig_cmd} -l)}; do
echo -n " ${dev}"
- ${btconfig_cmd} ${dev} disable
+ ${btconfig_cmd} "${dev}" disable
done
echo "."
