openssh: fix killing of active sessions on shutdown

Starting with OpenSSH 9.8 sessions are handled by a separate binary
called sshd-session

Signed-off-by: Erik Karlsson <erik.karlsson@iopsys.eu>

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index b49f85ae3fbb6d79163b299c88d32f56594553a5..2bc2f0a0ea13c80339ec6fe9e6561d7f6a22206a 100644 (file)
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openssh
 PKG_REALVERSION:=9.9p1
 PKG_VERSION:=9.9_p1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_REALVERSION).tar.gz
 PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -184,7 +184,7 @@ CONFIGURE_ARGS += \
        --with$(if $(CONFIG_OPENSSL_ENGINE),,out)-ssl-engine \
        --with$(if $(CONFIG_OPENSSH_LIBFIDO2),,out)-security-key-builtin \
        --with-cflags-after=-fzero-call-used-regs=skip
-       
+
 ifeq ($(BUILD_VARIANT),with-pam)
 CONFIGURE_ARGS += \
        --with-pam

diff --git a/net/openssh/files/sshd.init b/net/openssh/files/sshd.init
index 0b859e146e03e492786dd1b3c8baaf90422af742..8dce2a1e6c1cbcdf35ee71168914432cd159e4b0 100644 (file)
--- a/net/openssh/files/sshd.init
+++ b/net/openssh/files/sshd.init
@@ -41,7 +41,7 @@ shutdown() {
        stop
 
        # kill active clients
-       for pid in $(pidof sshd)
+       for pid in $(pidof sshd-session)
        do
                [ "$pid" = "$$" ] && continue
                [ -e "/proc/$pid/stat" ] && kill $pid