From fed280dc50e2a046b0914fa2d1faa0d2cabdfe95 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Sat, 17 Oct 2020 22:15:12 +0200
Subject: [PATCH] openssh: update to 8.4p1

---
 packages/openssh/build.sh          |  5 ++---
 packages/openssh/ssh-agent.c.patch | 15 +++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh
index 0f4011a28..0489adade 100644
--- a/packages/openssh/build.sh
+++ b/packages/openssh/build.sh
@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://www.openssh.com/
 TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
 TERMUX_PKG_LICENSE="BSD"
-TERMUX_PKG_VERSION=8.3p1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=8.4p1
 TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=f2befbe0472fe7eb75d23340eb17531cb6b3aac24075e2066b41f814e12387b2
+TERMUX_PKG_SHA256=5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24
 TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, termux-auth, krb5, zlib"
 TERMUX_PKG_CONFLICTS="dropbear"
 # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries:
diff --git a/packages/openssh/ssh-agent.c.patch b/packages/openssh/ssh-agent.c.patch
index 28f423325..b3e364de4 100644
--- a/packages/openssh/ssh-agent.c.patch
+++ b/packages/openssh/ssh-agent.c.patch
@@ -1,16 +1,15 @@
-diff -u -r ../openssh-8.2p1/ssh-agent.c ./ssh-agent.c
---- ../openssh-8.2p1/ssh-agent.c	2020-02-14 00:40:54.000000000 +0000
-+++ ./ssh-agent.c	2020-02-15 22:01:29.025352000 +0000
-@@ -93,7 +93,7 @@
+--- ./ssh-agent.c.orig	2020-09-27 09:25:01.000000000 +0200
++++ ./ssh-agent.c	2020-10-17 22:11:56.636611859 +0200
+@@ -94,7 +94,7 @@
  #include "sk-api.h"
  
- #ifndef DEFAULT_PROVIDER_WHITELIST
--# define DEFAULT_PROVIDER_WHITELIST "/usr/lib*/*,/usr/local/lib*/*"
-+# define DEFAULT_PROVIDER_WHITELIST "@TERMUX_PREFIX@/lib*/*,@TERMUX_PREFIX@/local/lib*/*"
+ #ifndef DEFAULT_ALLOWED_PROVIDERS
+-# define DEFAULT_ALLOWED_PROVIDERS "/usr/lib*/*,/usr/local/lib*/*"
++# define DEFAULT_ALLOWED_PROVIDERS "@TERMUX_PREFIX@/lib*/*,@TERMUX_PREFIX@/local/lib*/*"
  #endif
  
  /* Maximum accepted message length */
-@@ -1199,9 +1199,11 @@
+@@ -1292,9 +1292,11 @@
  	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
  	sanitise_stdfd();