From 37a151ef1a820761eae4ab4a62a051098cdd1025 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Mon, 20 Jan 2014 19:41:27 +0100
Subject: [PATCH] use tty allocation for a remote scp

---
 openssh-6.2p2-fromto-remote.patch | 16 ++++++++++++++++
 openssh.spec                      |  3 +++
 2 files changed, 19 insertions(+)
 create mode 100644 openssh-6.2p2-fromto-remote.patch

diff --git a/openssh-6.2p2-fromto-remote.patch b/openssh-6.2p2-fromto-remote.patch
new file mode 100644
index 0000000..4a7d849
--- /dev/null
+++ b/openssh-6.2p2-fromto-remote.patch
@@ -0,0 +1,16 @@
+diff --git a/scp.c b/scp.c
+index d98fa67..25d347b 100644
+--- a/scp.c
++++ b/scp.c
+@@ -638,7 +638,10 @@ toremote(char *targ, int argc, char **argv)
+ 			addargs(&alist, "%s", ssh_program);
+ 			addargs(&alist, "-x");
+ 			addargs(&alist, "-oClearAllForwardings=yes");
+-			addargs(&alist, "-n");
++			if (isatty(fileno(stdin)))
++				addargs(&alist, "-t");
++			else
++				addargs(&alist, "-n");
+ 			for (j = 0; j < remote_remote_args.num; j++) {
+ 				addargs(&alist, "%s",
+ 				    remote_remote_args.list[j]);
diff --git a/openssh.spec b/openssh.spec
index adc281d..c15b31c 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -191,6 +191,8 @@ Patch910: openssh-6.2p2-increase-size-of-DF-groups.patch
 # Run ssh-copy-id in the legacy mode when SSH_COPY_ID_LEGACY variable is set
 # http://bugzilla.mindrot.org/show_bug.cgi?id=2110
 Patch911: openssh-6.2p2-legacy-ssh-copy-id.patch
+# Use tty allocation for a remote scp (#985650)
+Patch912: openssh-6.2p2-fromto-remote.patch
 
 
 License: BSD
@@ -415,6 +417,7 @@ popd
 %patch909 -p1 -b .ssh_gai_strerror
 %patch910 -p1 -b .dh
 %patch911 -p1 -b .legacy-ssh-copy-id
+%patch912 -p1 -b .fromto-remote
 
 %if 0
 # Nothing here yet