From 2dbdbd23f3a43c706280881acafd4ef0f9be464a Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Fri, 10 Sep 2021 16:19:48 -0400
Subject: [PATCH] openssh: add scpa wrapper (#7492)

---
 packages/openssh/build.sh          | 3 ++-
 packages/openssh/scp-with-agent.sh | 4 ++++
 packages/openssh/ssh-with-agent.sh | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 packages/openssh/scp-with-agent.sh

diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh
index a1a2da8dd..2c65675d8 100644
--- a/packages/openssh/build.sh
+++ b/packages/openssh/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=8.6p1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=c3e6e4da1621762c850d03b47eed1e48dff4cc9608ddeb547202a234df8ed7ae
 TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, termux-auth, krb5, zlib"
@@ -74,6 +74,7 @@ termux_step_post_make_install() {
 	install -Dm700 $TERMUX_PKG_BUILDER_DIR/source-ssh-agent.sh $TERMUX_PREFIX/bin/source-ssh-agent
 	install -Dm700 $TERMUX_PKG_BUILDER_DIR/ssh-with-agent.sh $TERMUX_PREFIX/bin/ssha
 	install -Dm700 $TERMUX_PKG_BUILDER_DIR/sftp-with-agent.sh $TERMUX_PREFIX/bin/sftpa
+	install -Dm700 $TERMUX_PKG_BUILDER_DIR/scp-with-agent.sh $TERMUX_PREFIX/bin/scpa
 
 	# Install ssh-copy-id:
 	sed -e "s|@TERMUX_PREFIX@|${TERMUX_PREFIX}|g" \
diff --git a/packages/openssh/scp-with-agent.sh b/packages/openssh/scp-with-agent.sh
new file mode 100644
index 000000000..bf4e950c0
--- /dev/null
+++ b/packages/openssh/scp-with-agent.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+. source-ssh-agent
+scp "$@"
diff --git a/packages/openssh/ssh-with-agent.sh b/packages/openssh/ssh-with-agent.sh
index 7839f6ca8..8653e6fa4 100644
--- a/packages/openssh/ssh-with-agent.sh
+++ b/packages/openssh/ssh-with-agent.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 . source-ssh-agent
-ssh $@
+ssh "$@"