commit 91804f6

openssh: Update to 10.3p1

 1@@ -84,6 +84,7 @@
 2 #define HAVE_ASPRINTF 1
 3 /* #undef HAVE_ATTRIBUTE__BOUNDED__ */
 4 #define HAVE_ATTRIBUTE__NONNULL__ 1
 5+#define HAVE_ATTRIBUTE__NONSTRING__ 1
 6 /* #undef HAVE_ATTRIBUTE__SENTINEL__ */
 7 /* #undef HAVE_AUG_GET_MACHINE */
 8 /* #undef HAVE_AUTH_HOSTOK */
 9@@ -131,6 +132,7 @@
10 #define HAVE_DECL_HOWMANY 1
11 #define HAVE_DECL_HTOLE64 1
12 #define HAVE_DECL_H_ERRNO 1
13+#define HAVE_DECL_INFINITY 1
14 #define HAVE_DECL_LE32TOH 1
15 #define HAVE_DECL_LE64TOH 1
16 /* #undef HAVE_DECL_LOGINFAILED */
17@@ -149,6 +151,7 @@
18 #define HAVE_DECL_WRITEV 1
19 #define HAVE_DECL__GETLONG 0
20 #define HAVE_DECL__GETSHORT 0
21+/* #undef HAVE_DECL___BUILTIN_INFF */
22 /* #undef HAVE_DEV_PTMX */
23 /* #undef HAVE_DEV_PTS_AND_PTC */
24 #define HAVE_DIRENT_H 1
25@@ -192,6 +195,7 @@
26 #define HAVE_FREEZERO 1
27 #define HAVE_FSBLKCNT_T 1
28 #define HAVE_FSFILCNT_T 1
29+#define HAVE_FSTATAT 1
30 #define HAVE_FSTATFS 1
31 #define HAVE_FSTATVFS 1
32 #define HAVE_FUTIMES 1
33@@ -303,6 +307,7 @@
34 #define HAVE_MEMMOVE 1
35 /* #undef HAVE_MEMSET_S */
36 #define HAVE_MKDTEMP 1
37+#define HAVE_MMAP 1
38 #define HAVE_MODE_T 1
39 #define HAVE_NANOSLEEP 1
40 /* #undef HAVE_NDIR_H */
41@@ -313,6 +318,8 @@
42 /* #undef HAVE_NEXT */
43 #define HAVE_NFDS_T 1
44 /* #undef HAVE_NGETADDRINFO */
45+/* #undef HAVE_NLIST */
46+/* #undef HAVE_NLIST_H */
47 #define HAVE_NL_LANGINFO 1
48 /* #undef HAVE_NSLEEP */
49 /* #undef HAVE_OGETADDRINFO */
50@@ -427,6 +434,7 @@
51 #define HAVE_STRTOUL 1
52 #define HAVE_STRTOULL 1
53 #define HAVE_STRUCT_ADDRINFO 1
54+#define HAVE_STRUCT_DIRENT_D_TYPE 1
55 #define HAVE_STRUCT_IN6_ADDR 1
56 /* #undef HAVE_STRUCT_PASSWD_PW_CHANGE */
57 /* #undef HAVE_STRUCT_PASSWD_PW_CLASS */
58@@ -500,8 +508,10 @@
59 #define HAVE_UINTMAX_T 1
60 #define HAVE_UINTXX_T 1
61 #define HAVE_UNISTD_H 1
62+#define HAVE_UNLINKAT 1
63 #define HAVE_UNSETENV 1
64 #define HAVE_UNSIGNED_LONG_LONG 1
65+#define HAVE_UNVEIL 1
66 #define HAVE_UPDWTMP 1
67 #define HAVE_UPDWTMPX 1
68 /* #undef HAVE_USERSEC_H */
69@@ -571,6 +581,8 @@
70 #define PAM_TTY_KLUDGE 1
71 /* #undef PASSWD_NEEDS_USERNAME */
72 /* #undef PLATFORM_SYS_DIR_UID */
73+#define PLEDGE_EXTRA_INET /**/
74+/* #undef POLL_NFDS_T_ULONG */
75 /* #undef PTY_ZEROREAD */
76 /* #undef SANDBOX_CAPSICUM */
77 /* #undef SANDBOX_DARWIN */
78@@ -592,7 +604,6 @@
79 #define SPT_TYPE SPT_REUSEARGV
80 /* #undef SSHD_ACQUIRES_CTTY */
81 /* #undef SSHD_PAM_SERVICE */
82-/* #undef SSHPAM_CHAUTHTOK_NEEDS_RUID */
83 /* #undef SSH_AUDIT_EVENTS */
84 /* #undef SSH_IOBUFSZ */
85 #define SSH_PRIVSEP_USER "sshd"

 1@@ -10,12 +10,12 @@ cflags{
 2 	archflags[arch] or '-D SANDBOX_RLIMIT=1',
 3 	'-I $outdir',
 4 	'-I $srcdir',
 5+	'-I $dir/include',
 6 	'-isystem $basedir/pkg/openbsd/include',
 7 	'-isystem $builddir/pkg/bearssl/include',
 8 	'-isystem $builddir/pkg/libfido2/include',
 9 	'-isystem $builddir/pkg/linux-headers/include',
10 	'-isystem $builddir/pkg/zlib/include',
11-	'-idirafter $srcdir/openbsd-compat',
12 }
13 
14 pkg.deps = {
15@@ -64,14 +64,6 @@ lib('libssh.a', [[
16 	krl.c
17 	bitmap.c
18 
19-	ssh-xmss.c
20-	sshkey-xmss.c
21-	xmss_commons.c
22-	xmss_fast.c
23-	xmss_hash.c
24-	xmss_hash_address.c
25-	xmss_wots.c
26-
27 	authfd.c authfile.c
28 	canohost.c channels.c cipher.c cipher-aes.c cipher-aesctr.c
29 	cleanup.c
30@@ -81,17 +73,18 @@ lib('libssh.a', [[
31 	atomicio.c dispatch.c mac.c misc.c utf8.c
32 	monitor_fdpass.c rijndael.c ssh-ecdsa.c ssh-ecdsa-sk.c
33 	ssh-ed25519-sk.c ssh-rsa.c dh.c
34-	msg.c progressmeter.c dns.c entropy.c gss-genr.c umac.c umac128.c
35-	ssh-pkcs11.c smult_curve25519_ref.c
36+	msg.c dns.c entropy.c gss-genr.c umac.c umac128.c
37+	smult_curve25519_ref.c
38 	poly1305.c chacha.c cipher-chachapoly.c cipher-chachapoly-bearssl.c
39 	ssh-ed25519.c digest-bearssl.c digest-libc.c
40-	hmac.c ed25519.c hash.c
41+	hmac.c ed25519.c
42 	kex.c kex-names.c kexdh.c kexgex.c kexecdh.c kexc25519.c
43 	kexgexc.c kexgexs.c
44 	kexsntrup761x25519.c kexmlkem768x25519.c sntrup761.c kexgen.c
45 	sftp-realpath.c platform-pledge.c platform-tracing.c platform-misc.c
46-	sshbuf-io.c
47+	sshbuf-io.c misc-agent.c ssherr-libcrypto.c
48 
49+	ssh-pkcs11-client.c
50 	ssh-sk-client.c
51 
52 	libopenbsd-compat.a
53@@ -104,6 +97,8 @@ lib('sftp-client.a', [[
54 	sftp-common.c
55 	sftp-client.c
56 	sftp-glob.c
57+
58+	progressmeter.c
59 ]])
60 
61 lib('sftp-server.a', [[
62@@ -166,7 +161,7 @@ file('bin/scp', '755', '$outdir/scp')
63 exe('ssh-add', {'ssh-add.c', 'libssh.a.d'})
64 file('bin/ssh-add', '755', '$outdir/ssh-add')
65 
66-exe('ssh-agent', {'ssh-agent.c', 'ssh-pkcs11-client.c', 'libssh.a.d'})
67+exe('ssh-agent', {'ssh-agent.c', 'libssh.a.d'})
68 file('bin/ssh-agent', '755', '$outdir/ssh-agent')
69 
70 exe('ssh-keygen', {'ssh-keygen.c', 'sshsig.c', 'libssh.a.d'})

1@@ -0,0 +1 @@
2+#include "openbsd-compat/glob.h"

1@@ -0,0 +1 @@
2+#include "openbsd-compat/sys-queue.h"

1@@ -0,0 +1 @@
2+#include "openbsd-compat/sys-tree.h"

1@@ -1 +1 @@
2-Subproject commit a4978283269f6c5fa269687ca41e02c9bbe6afbe
3+Subproject commit b81d72c2c1a30fd29629849114b47b1ed61c3527

1@@ -1 +1 @@
2-10.0p2 r0
3+10.3p1 r0