CVS commit: src

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Oct 26 03:44:12 UTC 2023

Modified Files:
src/share/man/man4: mcx.4
src/sys/dev/pci: if_mcx.c

Log Message:
mcx(4): Add Mellanox ConnectX-6 Lx from OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/mcx.4
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/if_mcx.c

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

Modified files:

Index: src/share/man/man4/mcx.4
diff -u src/share/man/man4/mcx.4:1.2 src/share/man/man4/mcx.4:1.3
--- src/share/man/man4/mcx.4:1.2	Mon Sep 23 18:26:52 2019
+++ src/share/man/man4/mcx.4	Thu Oct 26 03:44:12 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: mcx.4,v 1.2 2019/09/23 18:26:52 jmcneill Exp $
+.\" $NetBSD: mcx.4,v 1.3 2023/10/26 03:44:12 msaitoh Exp $
 .\"
 .\" Copyright (c) 2019 David Gwynne 
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd September 23, 2019
+.Dd October 26, 2023
 .Dt MCX 4
 .Os
 .Sh NAME
@@ -37,6 +37,10 @@ ConnectX-4 EN
 ConnectX-5 EN
 .It
 ConnectX-6 EN
+.It
+ConnectX-6 Dx EN
+.It
+ConnectX-6 Lx EN
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,

Index: src/sys/dev/pci/if_mcx.c
diff -u src/sys/dev/pci/if_mcx.c:1.25 src/sys/dev/pci/if_mcx.c:1.26
--- src/sys/dev/pci/if_mcx.c:1.25	Sun Aug 28 07:54:03 2022
+++ src/sys/dev/pci/if_mcx.c	Thu Oct 26 03:44:12 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mcx.c,v 1.25 2022/08/28 07:54:03 skrll Exp $ */
+/*	$NetBSD: if_mcx.c,v 1.26 2023/10/26 03:44:12 msaitoh Exp $ */
 /*	$OpenBSD: if_mcx.c,v 1.101 2021/06/02 19:16:11 patrick Exp $ */
 
 /*
@@ -23,7 +23,7 @@
 #endif
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.25 2022/08/28 07:54:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.26 2023/10/26 03:44:12 msaitoh Exp $");
 
 #include 
 #include 
@@ -2678,7 +2678,8 @@ static const struct {
 	{ PCI_VENDOR_MELLANOX,	PCI_PRODUCT_MELLANOX_MT28800 },
 	{ PCI_VENDOR_MELLANOX,	PCI_PRODUCT_MELLANOX_MT28800VF },
 	{ PCI_VENDOR_MELLANOX,	PCI_PRODUCT_MELLANOX_MT28908 },
-	{ PCI_VENDOR_MELLANOX,	PCI_PRODUCT_MELLANOX_MT2892  },
+	{ PCI_VENDOR_MELLANOX,	PCI_PRODUCT_MELLANOX_MT2892 },
+	{ PCI_VENDOR_MELLANOX,	PCI_PRODUCT_MELLANOX_MT2894 },
 };
 
 struct mcx_eth_proto_capability {

CVS commit: src

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Oct 26 03:44:12 UTC 2023

Modified Files:
src/share/man/man4: mcx.4
src/sys/dev/pci: if_mcx.c

Log Message:
mcx(4): Add Mellanox ConnectX-6 Lx from OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/mcx.4
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/if_mcx.c

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

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Oct 26 03:43:10 UTC 2023

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
pcidevs: regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1478 -r1.1479 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1477 -r1.1478 src/sys/dev/pci/pcidevs_data.h

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

Modified files:

Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1478 src/sys/dev/pci/pcidevs.h:1.1479
--- src/sys/dev/pci/pcidevs.h:1.1478	Wed Oct 11 14:55:25 2023
+++ src/sys/dev/pci/pcidevs.h	Thu Oct 26 03:43:09 2023
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.1478 2023/10/11 14:55:25 msaitoh Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.1479 2023/10/26 03:43:09 msaitoh Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1497 2023/10/11 14:54:58 msaitoh Exp
+ *	NetBSD: pcidevs,v 1.1498 2023/10/26 03:42:41 msaitoh Exp
  */
 
 /*
@@ -7674,6 +7674,7 @@
 #define	PCI_PRODUCT_MELLANOX_MT28908	0x101b		/* ConnectX-6 */
 #define	PCI_PRODUCT_MELLANOX_MT28908VF	0x101c		/* ConnectX-6 VF */
 #define	PCI_PRODUCT_MELLANOX_MT2892	0x101d		/* ConnectX-6 Dx */
+#define	PCI_PRODUCT_MELLANOX_MT2894	0x101f		/* ConnectX-6 Lx */
 #define	PCI_PRODUCT_MELLANOX_MT23108	0x5a44		/* InfiniHost (Tavor) */
 #define	PCI_PRODUCT_MELLANOX_MT23108_PCI	0x5a46		/* InfiniHost PCI Bridge (Tavor) */
 #define	PCI_PRODUCT_MELLANOX_MT25204_OLD	0x5e8c		/* InfiniHost III Lx (old Sinai) */

Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1477 src/sys/dev/pci/pcidevs_data.h:1.1478
--- src/sys/dev/pci/pcidevs_data.h:1.1477	Wed Oct 11 14:55:25 2023
+++ src/sys/dev/pci/pcidevs_data.h	Thu Oct 26 03:43:09 2023
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.1477 2023/10/11 14:55:25 msaitoh Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.1478 2023/10/26 03:43:09 msaitoh Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1497 2023/10/11 14:54:58 msaitoh Exp
+ *	NetBSD: pcidevs,v 1.1498 2023/10/26 03:42:41 msaitoh Exp
  */
 
 /*
@@ -13953,6 +13953,8 @@ static const uint32_t pci_products[] = {
 	32374, 15370, 0,
 	PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT2892, 
 	32374, 32385, 0,
+	PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT2894, 
+	32374, 32357, 0,
 	PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT23108, 
 	32388, 32399, 0,
 	PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT23108_PCI, 
@@ -22912,10 +22914,10 @@ static const char pci_words[] = { "." 
 	"G550\0" /* 1 refs @ 32335 */
 	"MQ200\0" /* 1 refs @ 32340 */
 	"ConnectX-4\0" /* 4 refs @ 32346 */
-	"Lx\0" /* 4 refs @ 32357 */
+	"Lx\0" /* 5 refs @ 32357 */
 	"ConnectX-5\0" /* 4 refs @ 32360 */
 	"Ex\0" /* 4 refs @ 32371 */
-	"ConnectX-6\0" /* 3 refs @ 32374 */
+	"ConnectX-6\0" /* 4 refs @ 32374 */
 	"Dx\0" /* 1 refs @ 32385 */
 	"InfiniHost\0" /* 6 refs @ 32388 */
 	"(Tavor)\0" /* 2 refs @ 32399 */

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Oct 26 03:43:10 UTC 2023

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
pcidevs: regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1478 -r1.1479 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1477 -r1.1478 src/sys/dev/pci/pcidevs_data.h

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

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Oct 26 03:42:41 UTC 2023

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
pcidevs: Add Mellanox ConnectX-6 Lx.


To generate a diff of this commit:
cvs rdiff -u -r1.1497 -r1.1498 src/sys/dev/pci/pcidevs

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1497 src/sys/dev/pci/pcidevs:1.1498
--- src/sys/dev/pci/pcidevs:1.1497	Wed Oct 11 14:54:58 2023
+++ src/sys/dev/pci/pcidevs	Thu Oct 26 03:42:41 2023
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1497 2023/10/11 14:54:58 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1498 2023/10/26 03:42:41 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -7667,6 +7667,7 @@ product MELLANOX MT28800VF	0x101a	Connec
 product MELLANOX MT28908	0x101b	ConnectX-6
 product MELLANOX MT28908VF	0x101c	ConnectX-6 VF
 product MELLANOX MT2892		0x101d	ConnectX-6 Dx
+product MELLANOX MT2894		0x101f	ConnectX-6 Lx
 product MELLANOX MT23108	0x5a44	InfiniHost (Tavor)
 product MELLANOX MT23108_PCI	0x5a46	InfiniHost PCI Bridge (Tavor)
 product MELLANOX MT25204_OLD	0x5e8c	InfiniHost III Lx (old Sinai)

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Oct 26 03:42:41 UTC 2023

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
pcidevs: Add Mellanox ConnectX-6 Lx.


To generate a diff of this commit:
cvs rdiff -u -r1.1497 -r1.1498 src/sys/dev/pci/pcidevs

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

CVS commit: src/sys/sys

[Jan Schaumann]

Module Name:src
Committed By:   jschauma
Date:   Thu Oct 26 00:59:16 UTC 2023

Modified Files:
src/sys/sys: clock.h

Log Message:
include stdint.h if not in kernel/standalone mode

This fixes problems with including sys/clock.h by itself and avoids
having to order headers counter to share/style.

ifdefs suggested by tnn@ on netbsd-users@.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/sys/clock.h

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

Modified files:

Index: src/sys/sys/clock.h
diff -u src/sys/sys/clock.h:1.4 src/sys/sys/clock.h:1.5
--- src/sys/sys/clock.h:1.4	Thu Apr 19 21:19:07 2018
+++ src/sys/sys/clock.h	Thu Oct 26 00:59:16 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.h,v 1.4 2018/04/19 21:19:07 christos Exp $	*/
+/*	$NetBSD: clock.h,v 1.5 2023/10/26 00:59:16 jschauma Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -32,6 +32,10 @@
 #ifndef _SYS_CLOCK_H_
 #define _SYS_CLOCK_H_
 
+#if !defined(_KERNEL) && !defined(_STANDALONE)
+#include 
+#endif
+
 /* Some handy constants. */
 #define SECS_PER_MINUTE		60
 #define SECS_PER_HOUR		3600

CVS commit: src/sys/sys

[Jan Schaumann]

Module Name:src
Committed By:   jschauma
Date:   Thu Oct 26 00:59:16 UTC 2023

Modified Files:
src/sys/sys: clock.h

Log Message:
include stdint.h if not in kernel/standalone mode

This fixes problems with including sys/clock.h by itself and avoids
having to order headers counter to share/style.

ifdefs suggested by tnn@ on netbsd-users@.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/sys/clock.h

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

CVS commit: src/usr.bin/xlint/xlint

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Wed Oct 25 23:05:15 UTC 2023

Modified Files:
src/usr.bin/xlint/xlint: xlint.c

Log Message:
lint: make variable names more expressive, remove redundant comments

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/usr.bin/xlint/xlint/xlint.c

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

Modified files:

Index: src/usr.bin/xlint/xlint/xlint.c
diff -u src/usr.bin/xlint/xlint/xlint.c:1.114 src/usr.bin/xlint/xlint/xlint.c:1.115
--- src/usr.bin/xlint/xlint/xlint.c:1.114	Thu Jul 13 08:40:38 2023
+++ src/usr.bin/xlint/xlint/xlint.c	Wed Oct 25 23:05:14 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: xlint.c,v 1.114 2023/07/13 08:40:38 rillig Exp $ */
+/* $NetBSD: xlint.c,v 1.115 2023/10/25 23:05:14 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: xlint.c,v 1.114 2023/07/13 08:40:38 rillig Exp $");
+__RCSID("$NetBSD: xlint.c,v 1.115 2023/10/25 23:05:14 rillig Exp $");
 #endif
 
 #include 
@@ -90,31 +90,14 @@ static struct {
 	char	*outlib;	/* output library that will be created */
 } lint2;
 
-/* directory for temporary files */
-static	const char *tmpdir;
-
-/* default libraries */
-static	list	deflibs;
-
-/* additional libraries */
-static	list	libs;
-
-/* search path for libraries */
-static	list	libsrchpath;
-
+static const char *tmpdir;
+static list default_libraries;
+static list additional_libraries;
+static list library_search_path;
 static const char *libexec_dir;
-
-/* flags */
-static	bool	iflag, oflag, Cflag, sflag, tflag, Fflag, dflag;
-
-/* print the commands executed to run the stages of compilation */
-static	bool	Vflag;
-
-/* filename for oflag */
-static	char	*outputfn;
-
-/* reset after first .c source has been processed */
-static	bool	first = true;
+static bool Cflag, dflag, Fflag, iflag, oflag, sflag, tflag, Vflag;
+static char *outputfn;		/* filename for oflag */
+static bool seen_c_source;
 
 /*
  * name of a file which is currently written by a child and should
@@ -204,7 +187,7 @@ set_tmpdir(void)
 }
 
 /* Clean up after a signal or at the regular end. */
-static void __attribute__((__noreturn__))
+__dead static void
 terminate(int signo)
 {
 
@@ -235,7 +218,7 @@ terminate(int signo)
 	exit(signo != 0 ? 1 : 0);
 }
 
-static void __attribute__((__noreturn__, __format__(__printf__, 1, 2)))
+__dead __printflike(1, 2) static void
 usage(const char *fmt, ...)
 {
 	va_list ap;
@@ -313,7 +296,6 @@ needs_quoting:
 static void
 run_child(const char *path, list *args, const char *crfn, int fdout)
 {
-	int status, rv, signo;
 
 	if (Vflag) {
 		print_sh_quoted(args->items[0]);
@@ -350,7 +332,9 @@ run_child(const char *path, list *args, 
 		/* NOTREACHED */
 	}
 
-	while ((rv = wait()) == -1 && errno == EINTR) ;
+	int status, rv, signo;
+	while ((rv = wait()) == -1 && errno == EINTR)
+		continue;
 	if (rv == -1) {
 		warn("wait");
 		terminate(-1);
@@ -432,13 +416,9 @@ run_lint1(const char *out_fname)
 static void
 handle_filename(const char *name)
 {
-	const char *bn, *suff;
-	char *ofn;
-	size_t len;
-	int fd;
 
-	bn = lbasename(name, '/');
-	suff = lbasename(bn, '.');
+	const char *base = lbasename(name, '/');
+	const char *suff = lbasename(base, '.');
 
 	if (strcmp(suff, "ln") == 0) {
 		/* only for lint2 */
@@ -448,25 +428,28 @@ handle_filename(const char *name)
 	}
 
 	if (strcmp(suff, "c") != 0 &&
-	(strncmp(bn, "llib-l", 6) != 0 || bn != suff)) {
+	(strncmp(base, "llib-l", 6) != 0 || base != suff)) {
 		warnx("unknown file type: %s", name);
 		return;
 	}
 
-	if (!iflag || !first)
-		(void)printf("%s:\n", Fflag ? name : bn);
+	if (!iflag || seen_c_source)
+		(void)printf("%s:\n", Fflag ? name : base);
 
 	/* build the name of the output file of lint1 */
+	char *ofn;
 	if (oflag) {
 		ofn = outputfn;
 		outputfn = NULL;
 		oflag = false;
 	} else if (iflag) {
-		len = bn == suff ? strlen(bn) : (size_t)((suff - 1) - bn);
-		ofn = xasprintf("%.*s.ln", (int)len, bn);
+		size_t len = base == suff
+		? strlen(base)
+		: (size_t)((suff - 1) - base);
+		ofn = xasprintf("%.*s.ln", (int)len, base);
 	} else {
 		ofn = xasprintf("%slint1.XX", tmpdir);
-		fd = mkstemp(ofn);
+		int fd = mkstemp(ofn);
 		if (fd == -1) {
 			warn("can't make temp");
 			terminate(-1);
@@ -488,13 +471,9 @@ file_is_readable(const char *path)
 {
 	struct stat sbuf;
 
-	if (stat(path, ) == -1)
-		return false;
-	if (!S_ISREG(sbuf.st_mode))
-		return false;
-	if (access(path, R_OK) == -1)
-		return false;
-	return true;
+	return stat(path, ) == 0
+	&& S_ISREG(sbuf.st_mode)
+	&& access(path, R_OK) == 0;
 }
 
 static void
@@ -502,8 +481,8 @@ find_lib(const char *lib)
 {
 	char *lfn;
 
-	for (size_t i = 0; i < libsrchpath.len; i++) {
-		const char *dir = libsrchpath.items[i];
+	for (size_t i = 0; i < library_search_path.len; i++) {

CVS commit: src/usr.bin/xlint/xlint

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Wed Oct 25 23:05:15 UTC 2023

Modified Files:
src/usr.bin/xlint/xlint: xlint.c

Log Message:
lint: make variable names more expressive, remove redundant comments

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/usr.bin/xlint/xlint/xlint.c

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

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 25 20:23:26 UTC 2023

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new OpenSSH


To generate a diff of this commit:
cvs rdiff -u -r1.1961 -r1.1962 src/doc/3RDPARTY
cvs rdiff -u -r1.3012 -r1.3013 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1961 src/doc/3RDPARTY:1.1962
--- src/doc/3RDPARTY:1.1961	Wed Oct 25 13:18:53 2023
+++ src/doc/3RDPARTY	Wed Oct 25 16:23:26 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1961 2023/10/25 17:18:53 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1962 2023/10/25 20:23:26 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1076,7 +1076,7 @@ Notes:
 Patch applied after OpenSSH import.
 
 Package:	OpenSSH
-Version:	9.3
+Version:	9.5
 Current Vers:	9.5 / portable 9.5p1
 Maintainer:	OpenSSH
 Archive Site:	http://www.openssh.com/ftp.html

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.3012 src/doc/CHANGES:1.3013
--- src/doc/CHANGES:1.3012	Wed Oct 25 13:18:53 2023
+++ src/doc/CHANGES	Wed Oct 25 16:23:26 2023
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3012 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3013 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -253,3 +253,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0:
 		[msaitoh 20231019]
 	top(1): Add network in & out bytes to the top display. [mrg 20231021]
 	OpenSSL: Imported 3.0.12. [christos 20231025]
+	OpenSSH: Import 9.5. [christos 20231025]

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 25 20:23:26 UTC 2023

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new OpenSSH


To generate a diff of this commit:
cvs rdiff -u -r1.1961 -r1.1962 src/doc/3RDPARTY
cvs rdiff -u -r1.3012 -r1.3013 src/doc/CHANGES

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

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 25 20:22:00 UTC 2023

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi

Log Message:
bump libssh


To generate a diff of this commit:
cvs rdiff -u -r1.971 -r1.972 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.332 -r1.333 src/distrib/sets/lists/debug/shl.mi

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

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.971 src/distrib/sets/lists/base/shl.mi:1.972
--- src/distrib/sets/lists/base/shl.mi:1.971	Wed Sep  6 08:44:45 2023
+++ src/distrib/sets/lists/base/shl.mi	Wed Oct 25 16:22:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.971 2023/09/06 12:44:45 riastradh Exp $
+# $NetBSD: shl.mi,v 1.972 2023/10/25 20:22:00 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -877,7 +877,8 @@
 ./usr/lib/libss.sobase-obsolete		obsolete
 ./usr/lib/libssh.sobase-secsh-shlib	compatfile
 ./usr/lib/libssh.so.45base-secsh-shlib	compatfile
-./usr/lib/libssh.so.45.0			base-secsh-shlib	compatfile
+./usr/lib/libssh.so.45.0			base-obsolete		obsolete
+./usr/lib/libssh.so.45.1			base-secsh-shlib	compatfile
 ./usr/lib/libssl.sobase-crypto-shlib	compatfile
 ./usr/lib/libssl.so.12base-crypto-shlib	compatfile,openssl=10
 ./usr/lib/libssl.so.12.0			base-crypto-shlib	compatfile,openssl=10

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.332 src/distrib/sets/lists/debug/shl.mi:1.333
--- src/distrib/sets/lists/debug/shl.mi:1.332	Wed Sep  6 08:44:45 2023
+++ src/distrib/sets/lists/debug/shl.mi	Wed Oct 25 16:22:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.332 2023/09/06 12:44:45 riastradh Exp $
+# $NetBSD: shl.mi,v 1.333 2023/10/25 20:22:00 christos Exp $
 ./usr/lib/libbfd_g.a		comp-c-debuglib	debuglib,compatfile,binutils
 ./usr/libdata/debug/lib		base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libavl.so.0.0.debug			comp-zfs-debug	debug,dynamicroot,zfs
@@ -288,7 +288,8 @@
 ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug		comp-sys-debug	debug,compatfile,skey
 ./usr/libdata/debug/usr/lib/libsl.so.7.0.debug			comp-krb5-debug	debug,compatfile,kerberos
 ./usr/libdata/debug/usr/lib/libsqlite3.so.1.5.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libssh.so.45.0.debug		comp-secsh-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libssh.so.45.0.debug		comp-obsolete		obsolete
+./usr/libdata/debug/usr/lib/libssh.so.45.1.debug		comp-secsh-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug		comp-crypto-debug	debug,compatfile,openssl=10
 ./usr/libdata/debug/usr/lib/libssl.so.14.0.debug		comp-crypto-debug	debug,compatfile,openssl=11
 ./usr/libdata/debug/usr/lib/libssl.so.15.0.debug		comp-crypto-debug	debug,compatfile,openssl=30

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 25 20:22:00 UTC 2023

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi

Log Message:
bump libssh


To generate a diff of this commit:
cvs rdiff -u -r1.971 -r1.972 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.332 -r1.333 src/distrib/sets/lists/debug/shl.mi

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

CVS commit: src/crypto/external/bsd/openssh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 25 20:19:58 UTC 2023

Modified Files:
src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent addr.c
auth-options.c auth-pam.c auth-pam.h auth2-gss.c auth2-pubkey.c
auth2.c canohost.c chacha.c channels.c channels.h
cipher-chachapoly-libcrypto.c cipher-chachapoly.c clientloop.c
kex.c kex.h kexgexs.c krl.c krl.h match.c misc.c misc.h moduli.5
monitor.c monitor_wrap.c mux.c packet.c packet.h poly1305.c
progressmeter.c readconf.c readconf.h scp.c servconf.c servconf.h
serverloop.c session.c sftp-client.c sftp-client.h sftp-common.c
sftp-glob.c sftp-server.c sftp-usergroup.c sftp.c sk-usbhid.c
ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c
ssh-keyscan.c ssh-pkcs11-client.c ssh-pkcs11.c ssh-sk.c ssh.1 ssh.c
ssh2.h ssh_config ssh_config.5 sshconnect2.c sshd.8 sshd_config.5
sshkey.c sshkey.h sshsig.c version.h
src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048
moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192
src/crypto/external/bsd/openssh/lib: shlib_version
Removed Files:
src/crypto/external/bsd/openssh/dist: moduli

Log Message:
Merge conflicts between 9.3 and 9.5


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/PROTOCOL
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \
src/crypto/external/bsd/openssh/dist/sftp-common.c \
src/crypto/external/bsd/openssh/dist/ssh2.h
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/addr.c \
src/crypto/external/bsd/openssh/dist/chacha.c \
src/crypto/external/bsd/openssh/dist/krl.h \
src/crypto/external/bsd/openssh/dist/moduli.5 \
src/crypto/external/bsd/openssh/dist/poly1305.c
cvs rdiff -u -r1.28 -r1.29 \
src/crypto/external/bsd/openssh/dist/auth-options.c \
src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/auth-pam.c
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/auth-pam.h
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/auth2-gss.c
cvs rdiff -u -r1.33 -r1.34 \
src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
src/crypto/external/bsd/openssh/dist/misc.c \
src/crypto/external/bsd/openssh/dist/mux.c \
src/crypto/external/bsd/openssh/dist/sftp-client.c \
src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/auth2.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/canohost.c \
src/crypto/external/bsd/openssh/dist/match.c \
src/crypto/external/bsd/openssh/dist/ssh_config
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/channels.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/channels.h \
src/crypto/external/bsd/openssh/dist/packet.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssh/dist/cipher-chachapoly-libcrypto.c \
src/crypto/external/bsd/openssh/dist/sftp-usergroup.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssh/dist/cipher-chachapoly.c
cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/openssh/dist/clientloop.c \
src/crypto/external/bsd/openssh/dist/session.c \
src/crypto/external/bsd/openssh/dist/ssh_config.5
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/kex.c \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/kex.h \
src/crypto/external/bsd/openssh/dist/kexgexs.c \
src/crypto/external/bsd/openssh/dist/krl.c
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/misc.h \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c
cvs rdiff -u -r1.8 -r0 src/crypto/external/bsd/openssh/dist/moduli
cvs rdiff -u -r1.42 -r1.43 src/crypto/external/bsd/openssh/dist/monitor.c \
src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.48 -r1.49 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssh/dist/progressmeter.c \
src/crypto/external/bsd/openssh/dist/sftp-glob.c
cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/readconf.c \
src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/readconf.h \
src/crypto/external/bsd/openssh/dist/ssh-keyscan.c
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/scp.c
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/servconf.h \
src/crypto/external/bsd/openssh/dist/sftp-server.c
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/serverloop.c
cvs rdiff -u -r1.17 -r1.18 

CVS commit: src/crypto/external/bsd/openssh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 25 20:19:58 UTC 2023

Modified Files:
src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent addr.c
auth-options.c auth-pam.c auth-pam.h auth2-gss.c auth2-pubkey.c
auth2.c canohost.c chacha.c channels.c channels.h
cipher-chachapoly-libcrypto.c cipher-chachapoly.c clientloop.c
kex.c kex.h kexgexs.c krl.c krl.h match.c misc.c misc.h moduli.5
monitor.c monitor_wrap.c mux.c packet.c packet.h poly1305.c
progressmeter.c readconf.c readconf.h scp.c servconf.c servconf.h
serverloop.c session.c sftp-client.c sftp-client.h sftp-common.c
sftp-glob.c sftp-server.c sftp-usergroup.c sftp.c sk-usbhid.c
ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c
ssh-keyscan.c ssh-pkcs11-client.c ssh-pkcs11.c ssh-sk.c ssh.1 ssh.c
ssh2.h ssh_config ssh_config.5 sshconnect2.c sshd.8 sshd_config.5
sshkey.c sshkey.h sshsig.c version.h
src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048
moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192
src/crypto/external/bsd/openssh/lib: shlib_version
Removed Files:
src/crypto/external/bsd/openssh/dist: moduli

Log Message:
Merge conflicts between 9.3 and 9.5


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/PROTOCOL
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \
src/crypto/external/bsd/openssh/dist/sftp-common.c \
src/crypto/external/bsd/openssh/dist/ssh2.h
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/addr.c \
src/crypto/external/bsd/openssh/dist/chacha.c \
src/crypto/external/bsd/openssh/dist/krl.h \
src/crypto/external/bsd/openssh/dist/moduli.5 \
src/crypto/external/bsd/openssh/dist/poly1305.c
cvs rdiff -u -r1.28 -r1.29 \
src/crypto/external/bsd/openssh/dist/auth-options.c \
src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/auth-pam.c
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/auth-pam.h
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/auth2-gss.c
cvs rdiff -u -r1.33 -r1.34 \
src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
src/crypto/external/bsd/openssh/dist/misc.c \
src/crypto/external/bsd/openssh/dist/mux.c \
src/crypto/external/bsd/openssh/dist/sftp-client.c \
src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/auth2.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/canohost.c \
src/crypto/external/bsd/openssh/dist/match.c \
src/crypto/external/bsd/openssh/dist/ssh_config
cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/channels.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/channels.h \
src/crypto/external/bsd/openssh/dist/packet.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssh/dist/cipher-chachapoly-libcrypto.c \
src/crypto/external/bsd/openssh/dist/sftp-usergroup.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssh/dist/cipher-chachapoly.c
cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/openssh/dist/clientloop.c \
src/crypto/external/bsd/openssh/dist/session.c \
src/crypto/external/bsd/openssh/dist/ssh_config.5
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/kex.c \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/kex.h \
src/crypto/external/bsd/openssh/dist/kexgexs.c \
src/crypto/external/bsd/openssh/dist/krl.c
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/misc.h \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c
cvs rdiff -u -r1.8 -r0 src/crypto/external/bsd/openssh/dist/moduli
cvs rdiff -u -r1.42 -r1.43 src/crypto/external/bsd/openssh/dist/monitor.c \
src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.48 -r1.49 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssh/dist/progressmeter.c \
src/crypto/external/bsd/openssh/dist/sftp-glob.c
cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/readconf.c \
src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/readconf.h \
src/crypto/external/bsd/openssh/dist/ssh-keyscan.c
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/scp.c
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/servconf.h \
src/crypto/external/bsd/openssh/dist/sftp-server.c
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/serverloop.c
cvs rdiff -u -r1.17 -r1.18 

CVS import: src/crypto/external/bsd/openssh/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 25 20:14:36 UTC 2023

Update of /cvsroot/src/crypto/external/bsd/openssh/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5266

Log Message:
Import OpenSSH 9.5 (Last was OpenSSH 9.3)

OpenSSH 9.5/9.5p1 (2023-10-04)
OpenSSH 9.5 was released on 2023-10-04. It is available from the
mirrors listed at https://www.openssh.com/.
OpenSSH is a 100% complete SSH protocol 2.0 implementation and
includes sftp client and server support.

Once again, we would like to thank the OpenSSH community for their
continued support of the project, especially those who contributed
code or patches, reported bugs, tested snapshots or donated to the
project. More information on donations may be found at:
https://www.openssh.com/donations.html

Changes since OpenSSH 9.4
=

This release fixes a number of bugs and adds some small features.

Potentially incompatible changes


 * ssh-keygen(1): generate Ed25519 keys by default. Ed25519 public keys
   are very convenient due to their small size. Ed25519 keys are
   specified in RFC 8709 and OpenSSH has supported them since version 6.5
   (January 2014).

 * sshd(8): the Subsystem directive now accurately preserves quoting of
   subsystem commands and arguments. This may change behaviour for exotic
   configurations, but the most common subsystem configuration
   (sftp-server) is unlikely to be affected.

New features


 * ssh(1): add keystroke timing obfuscation to the client. This attempts
   to hide inter-keystroke timings by sending interactive traffic at
   fixed intervals (default: every 20ms) when there is only a small
   amount of data being sent. It also sends fake "chaff" keystrokes for
   a random interval after the last real keystroke. These are
   controlled by a new ssh_config ObscureKeystrokeTiming keyword.

 * ssh(1), sshd(8): Introduce a transport-level ping facility. This adds
   a pair of SSH transport protocol messages SSH2_MSG_PING/PONG to
   implement a ping capability. These messages use numbers in the "local
   extensions" number space and are advertised using a "p...@openssh.com"
   ext-info message with a string version number of "0".

 * sshd(8): allow override of Subsystem directives in sshd Match blocks.

Bugfixes


 * scp(1): fix scp in SFTP mode recursive upload and download of
   directories that contain symlinks to other directories. In scp mode,
   the links would be followed, but in SFTP mode they were not. bz3611

 * ssh-keygen(1): handle cr+lf (instead of just cr) line endings in
   sshsig signature files.

 * ssh(1): interactive mode for ControlPersist sessions if they
   originally requested a tty.

 * sshd(8): make PerSourceMaxStartups first-match-wins

 * sshd(8): limit artificial login delay to a reasonable maximum (5s)
   and don't delay at all for the "none" authentication mechanism.cw
bz3602

 * sshd(8): Log errors in kex_exchange_identification() with level
   verbose instead of error to reduce preauth log spam. All of those
   get logged with a more generic error message by sshpkt_fatal().

 * sshd(8): correct math for ClientAliveInterval that caused the probes
to be sent less frequently than configured.

 * ssh(1): fix regression in OpenSSH 9.4 (mux.c r1.99) that caused
   multiplexed sessions to ignore SIGINT under some circumstances.

Portability
---

 * Avoid clang zero-call-used-regs=all bug on Apple compilers, which
   for some reason have version numbers that do not match the upstream
   clang version numbers. bz#3584

 * Fix configure test for zlib 1.3 and later/development versions. bz3604

Checksums:
==

 - SHA1 (openssh-9.5.tar.gz) = 8a0bd3a91fac338d97d91817af58df731f6509a3
 - SHA256 (openssh-9.5.tar.gz) = sVMxeM3d6g65qBMktJIofxmK4Ipg9dblKif0VnhPeO0=

 - SHA1 (openssh-9.5p1.tar.gz) = 35c16dcc6e7d0a9465faa241476ef24f76b196cc
 - SHA256 (openssh-9.5p1.tar.gz) = 8Cbnt5un+1QPdRgq+W3IqPHbOV+SK7yfbKYDZyaGCGs=

Please note that the SHA256 signatures are base64 encoded and not
hexadecimal (which is the default for most checksum tools). The PGP
key used to sign the releases is available from the mirror sites:
https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/RELEASE_KEY.asc

Reporting Bugs:
===

- Please read https://www.openssh.com/report.html
  Security bugs should be reported directly to open...@openssh.com
OpenSSH 9.4/9.4p1 (2023-08-10)
OpenSSH 9.4 was released on 2023-08-10. It is available from the
mirrors listed at https://www.openssh.com/.
OpenSSH is a 100% complete SSH protocol 2.0 implementation and
includes sftp client and server support.

Once again, we would like to thank the OpenSSH community for their
continued support of the project, especially those who contributed
code or patches, reported bugs, tested snapshots or donated to the
project. More information on donations may be found at:

CVS import: src/crypto/external/bsd/openssh/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 25 20:14:36 UTC 2023

Update of /cvsroot/src/crypto/external/bsd/openssh/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5266

Log Message:
Import OpenSSH 9.5 (Last was OpenSSH 9.3)

OpenSSH 9.5/9.5p1 (2023-10-04)
OpenSSH 9.5 was released on 2023-10-04. It is available from the
mirrors listed at https://www.openssh.com/.
OpenSSH is a 100% complete SSH protocol 2.0 implementation and
includes sftp client and server support.

Once again, we would like to thank the OpenSSH community for their
continued support of the project, especially those who contributed
code or patches, reported bugs, tested snapshots or donated to the
project. More information on donations may be found at:
https://www.openssh.com/donations.html

Changes since OpenSSH 9.4
=

This release fixes a number of bugs and adds some small features.

Potentially incompatible changes


 * ssh-keygen(1): generate Ed25519 keys by default. Ed25519 public keys
   are very convenient due to their small size. Ed25519 keys are
   specified in RFC 8709 and OpenSSH has supported them since version 6.5
   (January 2014).

 * sshd(8): the Subsystem directive now accurately preserves quoting of
   subsystem commands and arguments. This may change behaviour for exotic
   configurations, but the most common subsystem configuration
   (sftp-server) is unlikely to be affected.

New features


 * ssh(1): add keystroke timing obfuscation to the client. This attempts
   to hide inter-keystroke timings by sending interactive traffic at
   fixed intervals (default: every 20ms) when there is only a small
   amount of data being sent. It also sends fake "chaff" keystrokes for
   a random interval after the last real keystroke. These are
   controlled by a new ssh_config ObscureKeystrokeTiming keyword.

 * ssh(1), sshd(8): Introduce a transport-level ping facility. This adds
   a pair of SSH transport protocol messages SSH2_MSG_PING/PONG to
   implement a ping capability. These messages use numbers in the "local
   extensions" number space and are advertised using a "p...@openssh.com"
   ext-info message with a string version number of "0".

 * sshd(8): allow override of Subsystem directives in sshd Match blocks.

Bugfixes


 * scp(1): fix scp in SFTP mode recursive upload and download of
   directories that contain symlinks to other directories. In scp mode,
   the links would be followed, but in SFTP mode they were not. bz3611

 * ssh-keygen(1): handle cr+lf (instead of just cr) line endings in
   sshsig signature files.

 * ssh(1): interactive mode for ControlPersist sessions if they
   originally requested a tty.

 * sshd(8): make PerSourceMaxStartups first-match-wins

 * sshd(8): limit artificial login delay to a reasonable maximum (5s)
   and don't delay at all for the "none" authentication mechanism.cw
bz3602

 * sshd(8): Log errors in kex_exchange_identification() with level
   verbose instead of error to reduce preauth log spam. All of those
   get logged with a more generic error message by sshpkt_fatal().

 * sshd(8): correct math for ClientAliveInterval that caused the probes
to be sent less frequently than configured.

 * ssh(1): fix regression in OpenSSH 9.4 (mux.c r1.99) that caused
   multiplexed sessions to ignore SIGINT under some circumstances.

Portability
---

 * Avoid clang zero-call-used-regs=all bug on Apple compilers, which
   for some reason have version numbers that do not match the upstream
   clang version numbers. bz#3584

 * Fix configure test for zlib 1.3 and later/development versions. bz3604

Checksums:
==

 - SHA1 (openssh-9.5.tar.gz) = 8a0bd3a91fac338d97d91817af58df731f6509a3
 - SHA256 (openssh-9.5.tar.gz) = sVMxeM3d6g65qBMktJIofxmK4Ipg9dblKif0VnhPeO0=

 - SHA1 (openssh-9.5p1.tar.gz) = 35c16dcc6e7d0a9465faa241476ef24f76b196cc
 - SHA256 (openssh-9.5p1.tar.gz) = 8Cbnt5un+1QPdRgq+W3IqPHbOV+SK7yfbKYDZyaGCGs=

Please note that the SHA256 signatures are base64 encoded and not
hexadecimal (which is the default for most checksum tools). The PGP
key used to sign the releases is available from the mirror sites:
https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/RELEASE_KEY.asc

Reporting Bugs:
===

- Please read https://www.openssh.com/report.html
  Security bugs should be reported directly to open...@openssh.com
OpenSSH 9.4/9.4p1 (2023-08-10)
OpenSSH 9.4 was released on 2023-08-10. It is available from the
mirrors listed at https://www.openssh.com/.
OpenSSH is a 100% complete SSH protocol 2.0 implementation and
includes sftp client and server support.

Once again, we would like to thank the OpenSSH community for their
continued support of the project, especially those who contributed
code or patches, reported bugs, tested snapshots or donated to the
project. More information on donations may be found at:

CVS commit: src/lib/libc/sys

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Oct 25 18:23:10 UTC 2023

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

Log Message:
mremap(2): Use .Lk for links in text.

.%U is only for links in reference sections.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/sys/mremap.2

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

CVS commit: src/lib/libc/sys

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Oct 25 18:23:10 UTC 2023

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

Log Message:
mremap(2): Use .Lk for links in text.

.%U is only for links in reference sections.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/sys/mremap.2

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

Modified files:

Index: src/lib/libc/sys/mremap.2
diff -u src/lib/libc/sys/mremap.2:1.9 src/lib/libc/sys/mremap.2:1.10
--- src/lib/libc/sys/mremap.2:1.9	Fri Mar  3 12:53:04 2023
+++ src/lib/libc/sys/mremap.2	Wed Oct 25 18:23:10 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mremap.2,v 1.9 2023/03/03 12:53:04 riastradh Exp $
+.\"	$NetBSD: mremap.2,v 1.10 2023/10/25 18:23:10 riastradh Exp $
 .\"
 .\" Copyright (c) 2007 Thomas Klausner and Joerg Sonnenberger
 .\" All rights reserved.
@@ -262,5 +262,5 @@ use
 .El
 .Pp
 See
-.%U https://gnats.NetBSD.org/55177
+.Lk https://gnats.NetBSD.org/55177 "PR lib/55177"
 for details.

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 25 17:18:53 UTC 2023

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new OpenSSL


To generate a diff of this commit:
cvs rdiff -u -r1.1960 -r1.1961 src/doc/3RDPARTY
cvs rdiff -u -r1.3011 -r1.3012 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1960 src/doc/3RDPARTY:1.1961
--- src/doc/3RDPARTY:1.1960	Wed Oct 25 02:15:32 2023
+++ src/doc/3RDPARTY	Wed Oct 25 13:18:53 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1960 2023/10/25 06:15:32 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1961 2023/10/25 17:18:53 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1121,7 +1121,7 @@ markus is very cooperative about it):
 - blocklistd additions
 
 Package:	OpenSSL
-Version:	1.0.2o/1.1.1t/3.0.9
+Version:	1.0.2o/1.1.1t/3.0.12
 Current Vers:	1.0.2zd/1.1.1u/3.0.12/3.1.4
 Maintainer:	The OpenSSL Project
 Archive Site:	ftp://ftp.openssl.org/source/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.3011 src/doc/CHANGES:1.3012
--- src/doc/CHANGES:1.3011	Sat Oct 21 05:57:40 2023
+++ src/doc/CHANGES	Wed Oct 25 13:18:53 2023
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3011 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3012 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -252,3 +252,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0:
 	eqos(4): Add support for Intel Elkhart Lake internal Ethernet devices.
 		[msaitoh 20231019]
 	top(1): Add network in & out bytes to the top display. [mrg 20231021]
+	OpenSSL: Imported 3.0.12. [christos 20231025]

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 25 17:18:53 UTC 2023

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new OpenSSL


To generate a diff of this commit:
cvs rdiff -u -r1.1960 -r1.1961 src/doc/3RDPARTY
cvs rdiff -u -r1.3011 -r1.3012 src/doc/CHANGES

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

CVS commit: src/crypto/external/bsd/openssl

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 25 17:17:57 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/dist: Configure
src/crypto/external/bsd/openssl/dist/apps: ca.c cmp.c req.c s_client.c
s_server.c speed.c
src/crypto/external/bsd/openssl/dist/apps/lib: apps.c
src/crypto/external/bsd/openssl/dist/crypto: arm_arch.h ex_data.c mem.c
threads_pthread.c
src/crypto/external/bsd/openssl/dist/crypto/asn1: asn_mime.c
src/crypto/external/bsd/openssl/dist/crypto/dh: dh_lib.c
src/crypto/external/bsd/openssl/dist/crypto/dsa: dsa_lib.c
src/crypto/external/bsd/openssl/dist/crypto/engine: eng_lib.c
src/crypto/external/bsd/openssl/dist/crypto/evp: evp_enc.c
src/crypto/external/bsd/openssl/dist/crypto/lhash: lhash.c
src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_lib.c
src/crypto/external/bsd/openssl/dist/ssl: ssl_lib.c ssl_sess.c t1_lib.c
src/crypto/external/bsd/openssl/dist/test: dhtest.c evp_extra_test.c
evp_test.c rsa_test.c
src/crypto/external/bsd/openssl/dist/test/testutil: main.c provider.c
src/crypto/external/bsd/openssl/include/openssl: opensslv.h
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: Makefile
aesv8-armx.S ghashv8-armx.S poly1305-armv8.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: bsaes-armv7.S
poly1305-armv8.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto/man: ADMISSIONS.3
ASN1_EXTERN_FUNCS.3 ASN1_INTEGER_get_int64.3 ASN1_INTEGER_new.3
ASN1_ITEM_lookup.3 ASN1_OBJECT_new.3 ASN1_STRING_TABLE_add.3
ASN1_STRING_length.3 ASN1_STRING_new.3 ASN1_STRING_print_ex.3
ASN1_TIME_set.3 ASN1_TYPE_get.3 ASN1_aux_cb.3 ASN1_generate_nconf.3
ASN1_item_d2i_bio.3 ASN1_item_new.3 ASN1_item_sign.3
ASYNC_WAIT_CTX_new.3 ASYNC_start_job.3 BF_encrypt.3 BIO_ADDR.3
BIO_ADDRINFO.3 BIO_connect.3 BIO_ctrl.3 BIO_f_base64.3
BIO_f_buffer.3 BIO_f_cipher.3 BIO_f_md.3 BIO_f_null.3
BIO_f_prefix.3 BIO_f_readbuffer.3 BIO_f_ssl.3 BIO_find_type.3
BIO_get_data.3 BIO_get_ex_new_index.3 BIO_meth_new.3 BIO_new.3
BIO_new_CMS.3 BIO_parse_hostserv.3 BIO_printf.3 BIO_push.3
BIO_read.3 BIO_s_accept.3 BIO_s_bio.3 BIO_s_connect.3 BIO_s_core.3
BIO_s_datagram.3 BIO_s_fd.3 BIO_s_file.3 BIO_s_mem.3 BIO_s_null.3
BIO_s_socket.3 BIO_set_callback.3 BIO_should_retry.3
BIO_socket_wait.3 BN_BLINDING_new.3 BN_CTX_new.3 BN_CTX_start.3
BN_add.3 BN_add_word.3 BN_bn2bin.3 BN_cmp.3 BN_copy.3
BN_generate_prime.3 BN_mod_exp_mont.3 BN_mod_inverse.3
BN_mod_mul_montgomery.3 BN_mod_mul_reciprocal.3 BN_new.3
BN_num_bytes.3 BN_rand.3 BN_security_bits.3 BN_set_bit.3 BN_swap.3
BN_zero.3 BUF_MEM_new.3 CMS_EncryptedData_decrypt.3
CMS_EncryptedData_encrypt.3 CMS_EnvelopedData_create.3
CMS_add0_cert.3 CMS_add1_recipient_cert.3 CMS_add1_signer.3
CMS_compress.3 CMS_data_create.3 CMS_decrypt.3 CMS_digest_create.3
CMS_encrypt.3 CMS_final.3 CMS_get0_RecipientInfos.3
CMS_get0_SignerInfos.3 CMS_get0_type.3 CMS_get1_ReceiptRequest.3
CMS_sign.3 CMS_sign_receipt.3 CMS_uncompress.3 CMS_verify.3
CMS_verify_receipt.3 CONF_modules_free.3 CONF_modules_load_file.3
CRYPTO_THREAD_run_once.3 CRYPTO_get_ex_new_index.3 CRYPTO_memcmp.3
CTLOG_STORE_get0_log_by_id.3 CTLOG_STORE_new.3 CTLOG_new.3
CT_POLICY_EVAL_CTX_new.3 DEFINE_STACK_OF.3 DES_random_key.3
DH_generate_key.3 DH_generate_parameters.3 DH_get0_pqg.3
DH_get_1024_160.3 DH_meth_new.3 DH_new.3 DH_new_by_nid.3
DH_set_method.3 DH_size.3 DSA_SIG_new.3 DSA_do_sign.3 DSA_dup_DH.3
DSA_generate_key.3 DSA_generate_parameters.3 DSA_get0_pqg.3
DSA_meth_new.3 DSA_new.3 DSA_set_method.3 DSA_sign.3 DSA_size.3
DTLS_get_data_mtu.3 DTLS_set_timer_cb.3 DTLSv1_listen.3
ECDSA_SIG_new.3 ECDSA_sign.3 ECPKParameters_print.3
EC_GFp_simple_method.3 EC_GROUP_copy.3 EC_GROUP_new.3
EC_KEY_get_enc_flags.3 EC_KEY_new.3 EC_POINT_add.3 EC_POINT_new.3
ENGINE_add.3 ERR_GET_LIB.3 ERR_clear_error.3 ERR_error_string.3
ERR_get_error.3 ERR_load_crypto_strings.3 ERR_load_strings.3
ERR_new.3 ERR_print_errors.3 ERR_put_error.3 ERR_remove_state.3
ERR_set_mark.3 EVP_ASYM_CIPHER-RSA.7 EVP_ASYM_CIPHER-SM2.7
EVP_ASYM_CIPHER_free.3 EVP_BytesToKey.3 EVP_CIPHER-AES.7
EVP_CIPHER-ARIA.7 EVP_CIPHER-BLOWFISH.7 EVP_CIPHER-CAMELLIA.7
EVP_CIPHER-CAST.7 EVP_CIPHER-CHACHA.7 EVP_CIPHER-DES.7
EVP_CIPHER-IDEA.7 

CVS commit: src/sys/arch/newsmips/dev

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Wed Oct 25 12:59:09 UTC 2023

Modified Files:
src/sys/arch/newsmips/dev: zs_hb.c

Log Message:
Don't use aprint_error(9) for a normal attach message.

Found on testing NetBSD/newsmips 9.3 on NWS-3260 sent from
ryo@'s belongings.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/newsmips/dev/zs_hb.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/newsmips/dev/zs_hb.c
diff -u src/sys/arch/newsmips/dev/zs_hb.c:1.29 src/sys/arch/newsmips/dev/zs_hb.c:1.30
--- src/sys/arch/newsmips/dev/zs_hb.c:1.29	Sat Aug  7 16:19:01 2021
+++ src/sys/arch/newsmips/dev/zs_hb.c	Wed Oct 25 12:59:09 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs_hb.c,v 1.29 2021/08/07 16:19:01 thorpej Exp $	*/
+/*	$NetBSD: zs_hb.c,v 1.30 2023/10/25 12:59:09 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: zs_hb.c,v 1.29 2021/08/07 16:19:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_hb.c,v 1.30 2023/10/25 12:59:09 tsutsui Exp $");
 
 #include 
 #include 
@@ -214,7 +214,7 @@ zs_hb_attach(device_t parent, device_t s
 #endif
 	}
 
-	aprint_error(" level %d\n", intlevel);
+	aprint_normal(" level %d\n", intlevel);
 
 	zs_delay = zs_hb_delay;
 

CVS commit: src/sys/arch/newsmips/dev

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Wed Oct 25 12:59:09 UTC 2023

Modified Files:
src/sys/arch/newsmips/dev: zs_hb.c

Log Message:
Don't use aprint_error(9) for a normal attach message.

Found on testing NetBSD/newsmips 9.3 on NWS-3260 sent from
ryo@'s belongings.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/newsmips/dev/zs_hb.c

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

CVS commit: src/sys/sys

[Simon Burge]

Module Name:src
Committed By:   simonb
Date:   Wed Oct 25 08:22:25 UTC 2023

Modified Files:
src/sys/sys: unistd.h

Log Message:
Align sysconf numbers.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/sys/unistd.h

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

Modified files:

Index: src/sys/sys/unistd.h
diff -u src/sys/sys/unistd.h:1.64 src/sys/sys/unistd.h:1.65
--- src/sys/sys/unistd.h:1.64	Wed Oct 25 08:19:34 2023
+++ src/sys/sys/unistd.h	Wed Oct 25 08:22:25 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: unistd.h,v 1.64 2023/10/25 08:19:34 simonb Exp $	*/
+/*	$NetBSD: unistd.h,v 1.65 2023/10/25 08:22:25 simonb Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -227,121 +227,121 @@
  * XXX The value of _SC_CLK_TCK is embedded in .
  * XXX The value of _SC_PAGESIZE is embedded in .
  */
-#define	_SC_ARG_MAX		 1
-#define	_SC_CHILD_MAX		 2
-#define	_O_SC_CLK_TCK		 3 /* Old version, always 100 */
-#define	_SC_NGROUPS_MAX		 4
-#define	_SC_OPEN_MAX		 5
-#define	_SC_JOB_CONTROL		 6
-#define	_SC_SAVED_IDS		 7
-#define	_SC_VERSION		 8
-#define	_SC_BC_BASE_MAX		 9
-#define	_SC_BC_DIM_MAX		10
-#define	_SC_BC_SCALE_MAX	11
-#define	_SC_BC_STRING_MAX	12
-#define	_SC_COLL_WEIGHTS_MAX	13
-#define	_SC_EXPR_NEST_MAX	14
-#define	_SC_LINE_MAX		15
-#define	_SC_RE_DUP_MAX		16
-#define	_SC_2_VERSION		17
-#define	_SC_2_C_BIND		18
-#define	_SC_2_C_DEV		19
-#define	_SC_2_CHAR_TERM		20
-#define	_SC_2_FORT_DEV		21
-#define	_SC_2_FORT_RUN		22
-#define	_SC_2_LOCALEDEF		23
-#define	_SC_2_SW_DEV		24
-#define	_SC_2_UPE		25
-#define	_SC_STREAM_MAX		26
-#define	_SC_TZNAME_MAX		27
-#define	_SC_PAGESIZE		28
-#define	_SC_PAGE_SIZE		_SC_PAGESIZE	/* 1170 compatibility */
-#define	_SC_FSYNC		29
-#define	_SC_XOPEN_SHM		30
-#define	_SC_SYNCHRONIZED_IO	31
-#define	_SC_IOV_MAX		32
-#define	_SC_MAPPED_FILES	33
-#define	_SC_MEMLOCK		34
-#define	_SC_MEMLOCK_RANGE	35
-#define	_SC_MEMORY_PROTECTION	36
-#define	_SC_LOGIN_NAME_MAX	37
-#define	_SC_MONOTONIC_CLOCK	38
-#define	_SC_CLK_TCK		39 /* New, variable version */
-#define	_SC_ATEXIT_MAX		40
-#define	_SC_THREADS		41
-#define	_SC_SEMAPHORES		42
-#define	_SC_BARRIERS		43
-#define	_SC_TIMERS		44
-#define	_SC_SPIN_LOCKS		45
-#define	_SC_READER_WRITER_LOCKS	46
-#define	_SC_GETGR_R_SIZE_MAX	47
-#define	_SC_GETPW_R_SIZE_MAX	48
-#define	_SC_CLOCK_SELECTION	49
-#define	_SC_ASYNCHRONOUS_IO	50
-#define	_SC_AIO_LISTIO_MAX	51
-#define	_SC_AIO_MAX		52
-#define	_SC_MESSAGE_PASSING	53
-#define	_SC_MQ_OPEN_MAX		54
-#define	_SC_MQ_PRIO_MAX		55
-#define	_SC_PRIORITY_SCHEDULING	56
-#define	_SC_THREAD_DESTRUCTOR_ITERATIONS 57
-#define	_SC_THREAD_KEYS_MAX		58
-#define	_SC_THREAD_STACK_MIN		59
-#define	_SC_THREAD_THREADS_MAX		60
-#define	_SC_THREAD_ATTR_STACKADDR	61
-#define	_SC_THREAD_ATTR_STACKSIZE 	62
-#define	_SC_THREAD_PRIORITY_SCHEDULING	63
-#define	_SC_THREAD_PRIO_INHERIT 	64
-#define	_SC_THREAD_PRIO_PROTECT		65
-#define	_SC_THREAD_PROCESS_SHARED	66
-#define	_SC_THREAD_SAFE_FUNCTIONS	67
-#define	_SC_TTY_NAME_MAX		68
-#define	_SC_HOST_NAME_MAX		69
-#define	_SC_PASS_MAX			70
-#define	_SC_REGEXP			71
-#define	_SC_SHELL			72
-#define	_SC_SYMLOOP_MAX			73
+#define	_SC_ARG_MAX			   1
+#define	_SC_CHILD_MAX			   2
+#define	_O_SC_CLK_TCK			   3 /* Old version, always 100 */
+#define	_SC_NGROUPS_MAX			   4
+#define	_SC_OPEN_MAX			   5
+#define	_SC_JOB_CONTROL			   6
+#define	_SC_SAVED_IDS			   7
+#define	_SC_VERSION			   8
+#define	_SC_BC_BASE_MAX			   9
+#define	_SC_BC_DIM_MAX			  10
+#define	_SC_BC_SCALE_MAX		  11
+#define	_SC_BC_STRING_MAX		  12
+#define	_SC_COLL_WEIGHTS_MAX		  13
+#define	_SC_EXPR_NEST_MAX		  14
+#define	_SC_LINE_MAX			  15
+#define	_SC_RE_DUP_MAX			  16
+#define	_SC_2_VERSION			  17
+#define	_SC_2_C_BIND			  18
+#define	_SC_2_C_DEV			  19
+#define	_SC_2_CHAR_TERM			  20
+#define	_SC_2_FORT_DEV			  21
+#define	_SC_2_FORT_RUN			  22
+#define	_SC_2_LOCALEDEF			  23
+#define	_SC_2_SW_DEV			  24
+#define	_SC_2_UPE			  25
+#define	_SC_STREAM_MAX			  26
+#define	_SC_TZNAME_MAX			  27
+#define	_SC_PAGESIZE			  28
+#define	_SC_PAGE_SIZE			  _SC_PAGESIZE	/* 1170 compatibility */
+#define	_SC_FSYNC			  29
+#define	_SC_XOPEN_SHM			  30
+#define	_SC_SYNCHRONIZED_IO		  31
+#define	_SC_IOV_MAX			  32
+#define	_SC_MAPPED_FILES		  33
+#define	_SC_MEMLOCK			  34
+#define	_SC_MEMLOCK_RANGE		  35
+#define	_SC_MEMORY_PROTECTION		  36
+#define	_SC_LOGIN_NAME_MAX		  37
+#define	_SC_MONOTONIC_CLOCK		  38
+#define	_SC_CLK_TCK			  39 /* New, variable version */
+#define	_SC_ATEXIT_MAX			  40
+#define	_SC_THREADS			  41
+#define	_SC_SEMAPHORES			  42
+#define	_SC_BARRIERS			  43
+#define	_SC_TIMERS			  44
+#define	_SC_SPIN_LOCKS			  45
+#define	_SC_READER_WRITER_LOCKS		  46
+#define	_SC_GETGR_R_SIZE_MAX		  47
+#define	_SC_GETPW_R_SIZE_MAX		  48
+#define	_SC_CLOCK_SELECTION		  49
+#define	_SC_ASYNCHRONOUS_IO		  50
+#define	_SC_AIO_LISTIO_MAX		  51
+#define	_SC_AIO_MAX			  52
+#define	_SC_MESSAGE_PASSING		  53
+#define	_SC_MQ_OPEN_MAX			  54

CVS commit: src/sys/sys

[Simon Burge]

Module Name:src
Committed By:   simonb
Date:   Wed Oct 25 08:22:25 UTC 2023

Modified Files:
src/sys/sys: unistd.h

Log Message:
Align sysconf numbers.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/sys/unistd.h

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

CVS commit: src

[Simon Burge]

Module Name:src
Committed By:   simonb
Date:   Wed Oct 25 08:19:34 UTC 2023

Modified Files:
src/lib/libc/gen: sysconf.3 sysconf.c
src/sys/sys: unistd.h
src/usr.bin/getconf: getconf.c

Log Message:
Add _SC_AVPHYS_PAGES.
getconf(1) add this and SC_PHYS_PAGES.
libc: Use vm.uvmexp2 over vm.meter is it's twice as fast on my setup.
getconf.3: Tidy up wording for SC_PHYS_PAGES.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/lib/libc/gen/sysconf.3
cvs rdiff -u -r1.43 -r1.44 src/lib/libc/gen/sysconf.c
cvs rdiff -u -r1.63 -r1.64 src/sys/sys/unistd.h
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/getconf/getconf.c

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

Modified files:

Index: src/lib/libc/gen/sysconf.3
diff -u src/lib/libc/gen/sysconf.3:1.51 src/lib/libc/gen/sysconf.3:1.52
--- src/lib/libc/gen/sysconf.3:1.51	Wed Aug  3 12:40:42 2016
+++ src/lib/libc/gen/sysconf.3	Wed Oct 25 08:19:34 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sysconf.3,v 1.51 2016/08/03 12:40:42 ryoon Exp $
+.\"	$NetBSD: sysconf.3,v 1.52 2023/10/25 08:19:34 simonb Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)sysconf.3	8.3 (Berkeley) 4/19/94
 .\"
-.Dd August 3, 2016
+.Dd October 25, 2023
 .Dt SYSCONF 3
 .Os
 .Sh NAME
@@ -291,9 +291,15 @@ The number of processors configured.
 .It Li _SC_NPROCESSORS_ONLN
 The number of processors online (capable of running processes).
 .It Li _SC_PHYS_PAGES
-The amount of physical memory on the system in
+The total number of pages of physical memory.
+See
 .Li _SC_PAGESIZE
-bytes.
+for the system page size.
+.It Li _SC_AVPHYS_PAGES
+The number of available pages of physical memory.
+See
+.Li _SC_PAGESIZE
+for the system page size.
 .It Li _SC_TIMER_MAX
 The number of timers available for
 .Xr timer_create 2 .

Index: src/lib/libc/gen/sysconf.c
diff -u src/lib/libc/gen/sysconf.c:1.43 src/lib/libc/gen/sysconf.c:1.44
--- src/lib/libc/gen/sysconf.c:1.43	Sun Dec 15 20:25:25 2019
+++ src/lib/libc/gen/sysconf.c	Wed Oct 25 08:19:34 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysconf.c,v 1.43 2019/12/15 20:25:25 joerg Exp $	*/
+/*	$NetBSD: sysconf.c,v 1.44 2023/10/25 08:19:34 simonb Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)sysconf.c	8.2 (Berkeley) 3/20/94";
 #else
-__RCSID("$NetBSD: sysconf.c,v 1.43 2019/12/15 20:25:25 joerg Exp $");
+__RCSID("$NetBSD: sysconf.c,v 1.44 2023/10/25 08:19:34 simonb Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -46,6 +46,7 @@ __RCSID("$NetBSD: sysconf.c,v 1.43 2019/
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -79,6 +80,7 @@ sysconf(int name)
 	int mib[CTL_MAXNAME], value;
 	unsigned int mib_len;
 	struct clockinfo tmpclock;
+	struct uvmexp_sysctl uvmexp;
 	static int clk_tck;
 
 	len = sizeof(value);
@@ -380,6 +382,13 @@ yesno:		if (sysctl(mib, mib_len, ,
 		return sysctl(mib, 2, , , NULL, 0) == -1 ? -1 : 
 		(long)(mem / _getpagesize()); 
 
+	case _SC_AVPHYS_PAGES:
+		len = sizeof(uvmexp);
+		mib[0] = CTL_VM;
+		mib[1] = VM_UVMEXP2;
+		return sysctl(mib, 2, , , NULL, 0) == -1 ? -1 : 
+		(long)(uvmexp.free);
+
 /* Native */
 	case _SC_SCHED_RT_TS:
 		if (sysctlgetmibinfo("kern.sched.rtts", [0], _len,

Index: src/sys/sys/unistd.h
diff -u src/sys/sys/unistd.h:1.63 src/sys/sys/unistd.h:1.64
--- src/sys/sys/unistd.h:1.63	Sat May 16 18:31:53 2020
+++ src/sys/sys/unistd.h	Wed Oct 25 08:19:34 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: unistd.h,v 1.63 2020/05/16 18:31:53 christos Exp $	*/
+/*	$NetBSD: unistd.h,v 1.64 2023/10/25 08:19:34 simonb Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -328,7 +328,8 @@
 #define	_SC_RTSIG_MAX			95
 
 /* Extensions found in Solaris and Linux. */
-#define	_SC_PHYS_PAGES		121
+#define	_SC_PHYS_PAGES			121
+#define	_SC_AVPHYS_PAGES		122
 
 #ifdef _NETBSD_SOURCE
 /* Commonly provided sysconf() extensions */

Index: src/usr.bin/getconf/getconf.c
diff -u src/usr.bin/getconf/getconf.c:1.35 src/usr.bin/getconf/getconf.c:1.36
--- src/usr.bin/getconf/getconf.c:1.35	Thu Dec 19 19:11:50 2013
+++ src/usr.bin/getconf/getconf.c	Wed Oct 25 08:19:34 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: getconf.c,v 1.35 2013/12/19 19:11:50 rmind Exp $	*/
+/*	$NetBSD: getconf.c,v 1.36 2023/10/25 08:19:34 simonb Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: getconf.c,v 1.35 2013/12/19 19:11:50 rmind Exp $");
+__RCSID("$NetBSD: getconf.c,v 1.36 2023/10/25 08:19:34 simonb Exp $");
 #endif /* not lint */
 
 #include 
@@ -177,6 +177,10 @@ static const struct conf_variable conf_t
   { "GETGR_R_SIZE_MAX",		SYSCONF,	_SC_GETGR_R_SIZE_MAX	},
   { "GETPW_R_SIZE_MAX",		SYSCONF,	_SC_GETPW_R_SIZE_MAX	},
 
+  /* Extensions found in Solaris and Linux. */
+  { "SC_PHYS_PAGES",		SYSCONF,	_SC_PHYS_PAGES		},
+  { "SC_AVPHYS_PAGES",		SYSCONF,	

CVS commit: src

[Simon Burge]

Module Name:src
Committed By:   simonb
Date:   Wed Oct 25 08:19:34 UTC 2023

Modified Files:
src/lib/libc/gen: sysconf.3 sysconf.c
src/sys/sys: unistd.h
src/usr.bin/getconf: getconf.c

Log Message:
Add _SC_AVPHYS_PAGES.
getconf(1) add this and SC_PHYS_PAGES.
libc: Use vm.uvmexp2 over vm.meter is it's twice as fast on my setup.
getconf.3: Tidy up wording for SC_PHYS_PAGES.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/lib/libc/gen/sysconf.3
cvs rdiff -u -r1.43 -r1.44 src/lib/libc/gen/sysconf.c
cvs rdiff -u -r1.63 -r1.64 src/sys/sys/unistd.h
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/getconf/getconf.c

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

Re: CVS commit: src/sys/arch/mips/mips

[Andrius V]

Thank you, I should pay attention to that.

On Wed, Oct 25, 2023 at 9:02 AM Nick Hudson  wrote:
>
> Module Name:src
> Committed By:   skrll
> Date:   Wed Oct 25 06:02:14 UTC 2023
>
> Modified Files:
> src/sys/arch/mips/mips: kgdb_machdep.c
>
> Log Message:
>  -> 
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mips/mips/kgdb_machdep.c
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
>

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Oct 25 06:15:32 UTC 2023

Modified Files:
src/doc: 3RDPARTY

Log Message:
doc: new openssls out


To generate a diff of this commit:
cvs rdiff -u -r1.1959 -r1.1960 src/doc/3RDPARTY

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1959 src/doc/3RDPARTY:1.1960
--- src/doc/3RDPARTY:1.1959	Thu Oct 19 12:32:13 2023
+++ src/doc/3RDPARTY	Wed Oct 25 06:15:32 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1959 2023/10/19 12:32:13 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1960 2023/10/25 06:15:32 wiz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1122,11 +1122,11 @@ markus is very cooperative about it):
 
 Package:	OpenSSL
 Version:	1.0.2o/1.1.1t/3.0.9
-Current Vers:	1.0.2zd/1.1.1u/3.0.9
+Current Vers:	1.0.2zd/1.1.1u/3.0.12/3.1.4
 Maintainer:	The OpenSSL Project
 Archive Site:	ftp://ftp.openssl.org/source/
 Home Page:	http://www.openssl.org/
-Date:		2023-05-31
+Date:		2023-10-24
 Mailing List:	openssl-annou...@openssl.org
 Responsible:	christos, mjf, tls, riastradh, spz
 License:	OpenSSL and SSLeay license (both BSD-like)

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Oct 25 06:15:32 UTC 2023

Modified Files:
src/doc: 3RDPARTY

Log Message:
doc: new openssls out


To generate a diff of this commit:
cvs rdiff -u -r1.1959 -r1.1960 src/doc/3RDPARTY

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

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Oct 25 06:02:14 UTC 2023

Modified Files:
src/sys/arch/mips/mips: kgdb_machdep.c

Log Message:
 -> 


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mips/mips/kgdb_machdep.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/mips/mips/kgdb_machdep.c
diff -u src/sys/arch/mips/mips/kgdb_machdep.c:1.21 src/sys/arch/mips/mips/kgdb_machdep.c:1.22
--- src/sys/arch/mips/mips/kgdb_machdep.c:1.21	Wed Oct 25 06:01:29 2023
+++ src/sys/arch/mips/mips/kgdb_machdep.c	Wed Oct 25 06:02:14 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: kgdb_machdep.c,v 1.21 2023/10/25 06:01:29 skrll Exp $	*/
+/*	$NetBSD: kgdb_machdep.c,v 1.22 2023/10/25 06:02:14 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.21 2023/10/25 06:01:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.22 2023/10/25 06:02:14 skrll Exp $");
 
 #include "opt_ddb.h"
 
@@ -186,14 +186,14 @@ kgdb_getregs(db_regs_t *regs, kgdb_reg_t
 	gdb_regs[ 6] = regs->r_regs[_R_A2];	/* A2 */
 	gdb_regs[ 7] = regs->r_regs[_R_A3];	/* A3 */
 #if defined(__mips_n32) || defined(__mips_n64)
-gdb_regs[ 8] = regs->r_regs[_R_A4]; /* A4 */
-gdb_regs[ 9] = regs->r_regs[_R_A5]; /* A5 */
-gdb_regs[10] = regs->r_regs[_R_A6]; /* A6 */
-gdb_regs[11] = regs->r_regs[_R_A7]; /* A7 */
-gdb_regs[12] = regs->r_regs[_R_T0]; /* T0 */
-gdb_regs[13] = regs->r_regs[_R_T1]; /* T1 */
-gdb_regs[14] = regs->r_regs[_R_T2]; /* T2 */
-gdb_regs[15] = regs->r_regs[_R_T3]; /* T3 */
+	gdb_regs[ 8] = regs->r_regs[_R_A4];	/* A4 */
+	gdb_regs[ 9] = regs->r_regs[_R_A5];	/* A5 */
+	gdb_regs[10] = regs->r_regs[_R_A6];	/* A6 */
+	gdb_regs[11] = regs->r_regs[_R_A7];	/* A7 */
+	gdb_regs[12] = regs->r_regs[_R_T0];	/* T0 */
+	gdb_regs[13] = regs->r_regs[_R_T1];	/* T1 */
+	gdb_regs[14] = regs->r_regs[_R_T2];	/* T2 */
+	gdb_regs[15] = regs->r_regs[_R_T3];	/* T3 */
 #else
 	gdb_regs[ 8] = regs->r_regs[_R_T0];	/* T0 */
 	gdb_regs[ 9] = regs->r_regs[_R_T1];	/* T1 */

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Oct 25 06:02:14 UTC 2023

Modified Files:
src/sys/arch/mips/mips: kgdb_machdep.c

Log Message:
 -> 


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mips/mips/kgdb_machdep.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/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Oct 25 06:01:29 UTC 2023

Modified Files:
src/sys/arch/mips/mips: kgdb_machdep.c

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mips/mips/kgdb_machdep.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/mips/mips/kgdb_machdep.c
diff -u src/sys/arch/mips/mips/kgdb_machdep.c:1.20 src/sys/arch/mips/mips/kgdb_machdep.c:1.21
--- src/sys/arch/mips/mips/kgdb_machdep.c:1.20	Tue Oct 24 22:04:24 2023
+++ src/sys/arch/mips/mips/kgdb_machdep.c	Wed Oct 25 06:01:29 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: kgdb_machdep.c,v 1.20 2023/10/24 22:04:24 andvar Exp $	*/
+/*	$NetBSD: kgdb_machdep.c,v 1.21 2023/10/25 06:01:29 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.20 2023/10/24 22:04:24 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.21 2023/10/25 06:01:29 skrll Exp $");
 
 #include "opt_ddb.h"
 
@@ -100,7 +100,7 @@ kvacc(vaddr_t kva)
 {
 	if (pmap_md_direct_mapped_vaddr_p(kva))
 		return 1;
-	
+
 	if (kva < VM_MIN_KERNEL_ADDRESS || kva >= VM_MAX_KERNEL_ADDRESS)
 		return 0;
 
@@ -132,7 +132,7 @@ kgdb_acc(vaddr_t va, size_t len)
  * Translate a trap number into a unix compatible signal value.
  * (gdb only understands unix signal numbers).
  */
-int 
+int
 kgdb_signal(int type)
 {
 	switch (type) {
@@ -162,7 +162,7 @@ kgdb_signal(int type)
 	case T_FPE+T_USER:
 	case T_OVFLOW+T_USER:
 		return (SIGFPE);
-		
+
 	default:
 		return (SIGEMT);
 	}
@@ -233,7 +233,7 @@ void
 kgdb_setregs(db_regs_t *regs, kgdb_reg_t *gdb_regs)
 {
 	regs->r_regs[_R_PC] = gdb_regs[37];   /* PC */
-}	
+}
 
 /*
  * Trap into kgdb to wait for debugger to connect,

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Oct 25 06:01:29 UTC 2023

Modified Files:
src/sys/arch/mips/mips: kgdb_machdep.c

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mips/mips/kgdb_machdep.c

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