From 6df422d5440a3b115d7b680ffc25835e8e060e92 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Wed, 18 Feb 2015 16:01:02 +0100
Subject: [PATCH] Fix ssh-copy-id on non-sh shells (#1045191)

---
 ...h-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch | 16 ++++++++++++++++
 openssh.spec                                     |  3 +++
 2 files changed, 19 insertions(+)
 create mode 100644 openssh-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch

diff --git a/openssh-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch b/openssh-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch
new file mode 100644
index 0000000..f6997a2
--- /dev/null
+++ b/openssh-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch
@@ -0,0 +1,16 @@
+diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
+index 8e1091c..4bba5d6 100644
+--- a/contrib/ssh-copy-id
++++ b/contrib/ssh-copy-id
+@@ -274,9 +274,9 @@ case "$REMOTE_VERSION" in
+       populate_new_ids 0
+     fi
+     [ "$DRY_RUN" ] || printf '%s\n' "$NEW_IDS" | ssh "$@" "
+-		umask 077 ;
++		exec sh -c 'umask 077 ;
+ 		mkdir -p .ssh && cat >> .ssh/authorized_keys || exit 1 ;
+-		if type restorecon >/dev/null 2>&1 ; then restorecon -F .ssh .ssh/authorized_keys ; fi" \
++		if type restorecon >/dev/null 2>&1 ; then restorecon -F .ssh .ssh/authorized_keys ; fi'" \
+       || exit 1
+     ADDED=$(printf '%s\n' "$NEW_IDS" | wc -l)
+     ;;
diff --git a/openssh.spec b/openssh.spec
index 4d726cb..5df67b7 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -228,6 +228,8 @@ Patch920: openssh-6.6.1p1-ip-port-config-parser.patch
 Patch921: openssh-6.7p1-debian-restore-tcp-wrappers.patch
 # apply upstream patch and make sshd -T more consistent (#1187521)
 Patch922: openssh-6.7p1-sshdT-output.patch
+# fix ssh-copy-id on non-sh shells (#1045191)
+Patch923: openssh-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch
 
 
 License: BSD
@@ -437,6 +439,7 @@ popd
 %patch802 -p1 -b .GSSAPIEnablek5users
 %patch921 -p1 -b .tcp_wrappers
 %patch922 -p1 -b .sshdt
+%patch923 -p1 -b .ssh-copy-id
 
 %patch200 -p1 -b .audit
 %patch700 -p1 -b .fips