From 74abe2d0643d480c6260c1bc3a58e17f0c632f8b Mon Sep 17 00:00:00 2001
From: uniqfreq <uniqfreq@gmail.com>
Date: Fri, 7 Feb 2025 10:48:01 +0800
Subject: [PATCH] openssh: update to 9.9p1

---
 net/openssh/Makefile                          |  6 +++--
 ...-construct_utmp-when-USE_BTMP-is-set.patch | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 net/openssh/patches/0001-build-construct_utmp-when-USE_BTMP-is-set.patch

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index d87e9b44..513e6f4c 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
-PKG_VERSION:=9.3p1
+PKG_VERSION:=9.9p1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
 		https://ftp.spline.de/pub/OpenBSD/OpenSSH/portable/
-PKG_HASH:=e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8
+PKG_HASH:=b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02
 
 PKG_LICENSE:=BSD ISC
 PKG_LICENSE_FILES:=LICENCE
@@ -229,6 +229,8 @@ define Package/openssh-server/install
 	$(INSTALL_BIN) ./files/sshd.failsafe $(1)/lib/preinit/99_10_failsafe_sshd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/sshd-session $(1)/usr/lib/
 endef
 
 define Package/openssh-server-pam/install
diff --git a/net/openssh/patches/0001-build-construct_utmp-when-USE_BTMP-is-set.patch b/net/openssh/patches/0001-build-construct_utmp-when-USE_BTMP-is-set.patch
new file mode 100644
index 00000000..3b16c15c
--- /dev/null
+++ b/net/openssh/patches/0001-build-construct_utmp-when-USE_BTMP-is-set.patch
@@ -0,0 +1,22 @@
+diff --git a/loginrec.c b/loginrec.c
+index 45f13dee8b1f..7b1818b86753 100644
+--- a/loginrec.c
++++ b/loginrec.c
+@@ -614,7 +614,7 @@ line_abbrevname(char *dst, const char *src, int dstsize)
+  ** into account.
+  **/
+
+-#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN)
++#if defined(USE_BTMP) || defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN)
+
+ /* build the utmp structure */
+ void
+@@ -698,7 +698,7 @@ construct_utmp(struct logininfo *li,
+ 	}
+ # endif
+ }
+-#endif /* USE_UTMP || USE_WTMP || USE_LOGIN */
++#endif /* USE_BTMP || USE_UTMP || USE_WTMP || USE_LOGIN */
+
+ /**
+  ** utmpx utility functions