Merge pull request #5210 from heitbaum/ssh

openssh: update to 8.5p1
This commit is contained in:
Christian Hewitt 2021-03-08 15:56:29 +04:00 committed by GitHub
commit 57559b23e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions

View File

@ -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"

View File

@ -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;
}