commit 8f00d4bd3956eeeb199c7bf7415bb2cde4f08f91
Author: Kimmo Suominen <kimmo@suominen.com>
Date:   Sun Dec 24 17:56:39 2023 +0200

    OpenSSH 9.6 patch for netbsd-9
    
    Patch doc/3RDPARTY, update set lists for the new libssh version, and
    revert some OpenSSH changes from HEAD.  Use pollts for ppoll.

diff --git a/crypto/external/bsd/openssh/Makefile.inc b/crypto/external/bsd/openssh/Makefile.inc
index 331c5bf0daed..af048f55384d 100644
--- a/crypto/external/bsd/openssh/Makefile.inc
+++ b/crypto/external/bsd/openssh/Makefile.inc
@@ -47,3 +47,5 @@ CPPFLAGS+=-DX11BASE=\"/usr/X11R7\"
 
 CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
 CPPFLAGS+=-DLIBWRAP
+
+CPPFLAGS+=-Dppoll=pollts
diff --git a/crypto/external/bsd/openssh/bin/sshd/Makefile b/crypto/external/bsd/openssh/bin/sshd/Makefile
index 2ff8a0c08e43..0968f3d794ac 100644
--- a/crypto/external/bsd/openssh/bin/sshd/Makefile
+++ b/crypto/external/bsd/openssh/bin/sshd/Makefile
@@ -54,8 +54,8 @@ DPADD+= ${LIBKRB5_DPADD}
 
 .if (${USE_LDAP} != "no")
 SRCS+=	ldapauth.c
-LDADD+=	${LIBLDAP_LDADD}
-DPADD+=	${LIBLDAP_DPADD}
+LDADD+=	-lldap -lssl -llber
+DPADD+=	${LIBLDAP} ${LIBSSL} ${LIBLBER}
 .endif
 
 LDADD+=	-lcrypt -lutil
@@ -67,8 +67,8 @@ DPADD+=	${LIBWRAP}
 .ifdef CRUNCHEDPROG
 CPPFLAGS+=-DSMALL
 .else
-LDADD+=	-lblocklist
-DPADD+=	${LIBBLOCKLIST}
+LDADD+=	-lblacklist
+DPADD+=	${LIBBLACKLIST}
 .endif
 
 COPTS.sshlogin.c+=	${CC_WNO_STRINGOP_TRUNCATION}
diff --git a/crypto/external/bsd/openssh/dist/pfilter.c b/crypto/external/bsd/openssh/dist/pfilter.c
index 84531301893b..13dc3e18caef 100644
--- a/crypto/external/bsd/openssh/dist/pfilter.c
+++ b/crypto/external/bsd/openssh/dist/pfilter.c
@@ -5,10 +5,10 @@
 #include "packet.h"
 #include "log.h"
 #include "pfilter.h"
-#include <blocklist.h>
+#include <blacklist.h>
 
 #ifndef SMALL
-static struct blocklist *blstate;
+static struct blacklist *blstate;
 #endif
 
 #include "includes.h"
@@ -18,7 +18,7 @@ void
 pfilter_init()
 {
 #ifndef SMALL
-	blstate = blocklist_open();
+	blstate = blacklist_open();
 #endif
 }
 
@@ -38,9 +38,9 @@ pfilter_notify(int a)
 	// XXX: 3?
  	fd = ssh_packet_connection_is_on_socket(the_active_state) ?
 	    ssh_packet_get_connection_in(the_active_state) : 3;
-	(void)blocklist_r(blstate, a, fd, "ssh");
+	(void)blacklist_r(blstate, a, fd, "ssh");
 	if (a == 0) {
-		blocklist_close(blstate);
+		blacklist_close(blstate);
 		blstate = NULL;
 	}
 #else
diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi
index 0520db0aeca6..369000cb0759 100644
--- a/distrib/sets/lists/base/shl.mi
+++ b/distrib/sets/lists/base/shl.mi
@@ -845,8 +845,8 @@
 ./usr/lib/libsqlite3.so.1.4			base-sys-shlib		compatfile
 ./usr/lib/libss.so				base-obsolete		obsolete
 ./usr/lib/libssh.so				base-secsh-shlib	compatfile
-./usr/lib/libssh.so.34				base-secsh-shlib	compatfile
-./usr/lib/libssh.so.34.0			base-secsh-shlib	compatfile
+./usr/lib/libssh.so.46				base-secsh-shlib	compatfile
+./usr/lib/libssh.so.46.1			base-secsh-shlib	compatfile
 ./usr/lib/libssl.so				base-crypto-shlib	compatfile
 ./usr/lib/libssl.so.12				base-crypto-shlib	compatfile,openssl=10
 ./usr/lib/libssl.so.12.0			base-crypto-shlib	compatfile,openssl=10
diff --git a/distrib/sets/lists/debug/shl.mi b/distrib/sets/lists/debug/shl.mi
index c11859ed54b3..de3772f8e70a 100644
--- a/distrib/sets/lists/debug/shl.mi
+++ b/distrib/sets/lists/debug/shl.mi
@@ -288,7 +288,7 @@
 ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug		comp-sys-debug	debug,compatfile,skey
 ./usr/libdata/debug/usr/lib/libsl.so.6.0.debug			comp-krb5-debug	debug,compatfile,kerberos
 ./usr/libdata/debug/usr/lib/libsqlite3.so.1.4.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libssh.so.34.0.debug		comp-secsh-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libssh.so.46.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/libstdc++.so.8.1.debug		comp-sys-debug	debug,compatfile,gcc=6,cxx,libstdcxx
diff --git a/doc/3RDPARTY b/doc/3RDPARTY
index b2ef7dd38c9e..b32ad57a2614 100644
--- a/doc/3RDPARTY
+++ b/doc/3RDPARTY
@@ -1058,8 +1058,8 @@ Notes:
 Patch applied after OpenSSH import.
 
 Package:	OpenSSH
-Version:	8.0
-Current Vers:	8.0 / portable 8.0p1
+Version:	9.6
+Current Vers:	9.6 / portable 9.6p1
 Maintainer:	OpenSSH
 Archive Site:	http://www.openssh.com/ftp.html
 Home Page:	http://www.openssh.com/portable.html