From 8e77b50954426fe92e3f2b20fa9abe583b7477a6 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 25 Jun 2020 16:23:02 -0700
Subject: [PATCH] openssh: update to 8.3p1

Removed outdated options.

Small bashism fix in the init script.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 net/openssh/Makefile        | 11 +++--------
 net/openssh/files/sshd.init |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 36f47e72a..20a4e1b3c 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
-PKG_VERSION:=8.2p1
-PKG_RELEASE:=4
+PKG_VERSION:=8.3p1
+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:=43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671
+PKG_HASH:=f2befbe0472fe7eb75d23340eb17531cb6b3aac24075e2066b41f814e12387b2
 
 PKG_LICENSE:=BSD ISC
 PKG_LICENSE_FILES:=LICENCE
@@ -150,13 +150,9 @@ define Package/openssh-sftp-avahi-service/conffiles
 endef
 
 CONFIGURE_ARGS += \
-	$(DISABLE_NLS) \
 	--sysconfdir=/etc/ssh \
 	--with-privsep-user=sshd \
 	--with-privsep-path=/var/empty \
-	--enable-shared \
-	--disable-static \
-	--disable-debug \
 	--disable-strip \
 	--disable-etc-default-login \
 	--disable-lastlog \
@@ -166,7 +162,6 @@ CONFIGURE_ARGS += \
 	--disable-wtmpx \
 	--without-bsd-auth \
 	--without-kerberos5 \
-	--without-x \
 	--with-stackprotect \
 	--with$(if $(CONFIG_OPENSSL_ENGINE),,out)-ssl-engine
 
diff --git a/net/openssh/files/sshd.init b/net/openssh/files/sshd.init
index c8aa1aeb0..e7735364d 100644
--- a/net/openssh/files/sshd.init
+++ b/net/openssh/files/sshd.init
@@ -38,7 +38,7 @@ shutdown() {
 	# kill active clients
 	for pid in $(pidof sshd)
 	do
-		[ "$pid" == "$$" ] && continue
+		[ "$pid" = "$$" ] && continue
 		[ -e "/proc/$pid/stat" ] && kill $pid
 	done
 }