From e6ea0cf6a5196899c96e77c59b2bbce3cf768e82 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Thu, 4 Mar 2021 10:31:02 +0000
Subject: [PATCH] openssh: update to 8.5p1

update 8.4p1 (2020-09-27) to 8.5p1 (2021-03-03)
release notes: http://www.openssh.com/txt/release-8.5

update patches - reverting openssh-portable patch:
- https://github.com/openssh/openssh-portable/commit/acadbb3402b70f72f14d9a6930ad41be97c2f9dc
---
 packages/network/openssh/package.mk                        | 4 ++--
 .../patches/openssh-silence-missing-identity-error.patch   | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/network/openssh/package.mk b/packages/network/openssh/package.mk
index 2bc77c3282..ec1bcbf8e9 100644
--- a/packages/network/openssh/package.mk
+++ b/packages/network/openssh/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="openssh"
-PKG_VERSION="8.4p1"
-PKG_SHA256="5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24"
+PKG_VERSION="8.5p1"
+PKG_SHA256="f52f3f41d429aa9918e38cf200af225ccdd8e66f052da572870c89737646ec25"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.openssh.com/"
 PKG_URL="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${PKG_NAME}-${PKG_VERSION}.tar.gz"
diff --git a/packages/network/openssh/patches/openssh-silence-missing-identity-error.patch b/packages/network/openssh/patches/openssh-silence-missing-identity-error.patch
index bd02a2634b..e7b01daf6a 100644
--- a/packages/network/openssh/patches/openssh-silence-missing-identity-error.patch
+++ b/packages/network/openssh/patches/openssh-silence-missing-identity-error.patch
@@ -2,12 +2,13 @@ diff --git a/sshconnect2.c b/sshconnect2.c
 index d6af0b9..22c0aa6 100644
 --- a/sshconnect2.c
 +++ b/sshconnect2.c
-@@ -1320,8 +1320,7 @@ load_identity_file(char *filename, int userprovided)
+@@ -1524,9 +1524,7 @@
  	struct stat st;
  
  	if (stat(id->filename, &st) == -1) {
--		(id->userprovided ? logit : debug3)("no such identity: %s: %s",
--		    id->filename, strerror(errno));
+-		do_log2(id->userprovided ?
+-		    SYSLOG_LEVEL_INFO : SYSLOG_LEVEL_DEBUG3,
+-		    "no such identity: %s: %s", id->filename, strerror(errno));
 +		debug3("no such identity: %s", id->filename);
  		return NULL;
  	}