From c3c35d5f25733ce7924ce1d649eb931a57a14efd Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Tue, 28 Jan 2014 17:14:30 +0100
Subject: [PATCH] fix ssh-copy-id (#1058792)

---
 openssh-6.4p1-legacy-ssh-copy-id.patch | 53 +++++++++++++-------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/openssh-6.4p1-legacy-ssh-copy-id.patch b/openssh-6.4p1-legacy-ssh-copy-id.patch
index 72e2854..ba8d949 100644
--- a/openssh-6.4p1-legacy-ssh-copy-id.patch
+++ b/openssh-6.4p1-legacy-ssh-copy-id.patch
@@ -1,7 +1,29 @@
-diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
-index ae88e99..8e1091c 100644
---- a/contrib/ssh-copy-id
-+++ b/contrib/ssh-copy-id
+diff -up openssh-6.4p1/contrib/ssh-copy-id.1.legacy-ssh-copy-id openssh-6.4p1/contrib/ssh-copy-id.1
+--- openssh-6.4p1/contrib/ssh-copy-id.1.legacy-ssh-copy-id	2013-03-22 00:17:37.000000000 +0100
++++ openssh-6.4p1/contrib/ssh-copy-id.1	2014-01-28 17:12:49.197542425 +0100
+@@ -180,6 +180,19 @@ should prove enlightening (N.B. the mode
+ .Fl W
+ option, rather than
+ .Xr nc 1 ) .
++.Sh ENVIRONMENT
++.Bl -tag -width Ds
++.Pp
++.It Pa SSH_COPY_ID_LEGACY
++If the 
++.Cm SSH_COPY_ID_LEGACY
++environment variable is set, the
++.Nm
++is run in a legacy mode. In this mode, the 
++.Nm
++doesn't check an existence of a private key and doesn't do remote checks
++of the remote server versions or if public keys are already installed.
++.El
+ .Sh "SEE ALSO"
+ .Xr ssh 1 ,
+ .Xr ssh-agent 1 ,
+diff -up openssh-6.4p1/contrib/ssh-copy-id.legacy-ssh-copy-id openssh-6.4p1/contrib/ssh-copy-id
+--- openssh-6.4p1/contrib/ssh-copy-id.legacy-ssh-copy-id	2013-06-05 14:48:45.000000000 +0200
++++ openssh-6.4p1/contrib/ssh-copy-id	2014-01-28 17:11:51.538833032 +0100
 @@ -77,7 +77,7 @@ use_id_file() {
      PUB_ID_FILE="$L_ID_FILE.pub"
    fi
@@ -33,26 +55,3 @@ index ae88e99..8e1091c 100644
      [ "$DRY_RUN" ] || printf '%s\n' "$NEW_IDS" | ssh "$@" "
  		umask 077 ;
  		mkdir -p .ssh && cat >> .ssh/authorized_keys || exit 1 ;
-diff --git a/contrib/ssh-copy-id.1 b/contrib/ssh-copy-id.1
-index 67a59e4..df7ce16 100644
---- a/contrib/ssh-copy-id.1
-+++ b/contrib/ssh-copy-id.1
-@@ -180,6 +180,18 @@ should prove enlightening (N.B. the modern approach is to use the
- .Fl W
- option, rather than
- .Xr nc 1 ) .
-+.Sh ENVIRONMENT
-+.Bl -tag -width Ds
-+.Pp
-+.It Pa SSH_COPY_ID_LEGACY
-+If the 
-+.Cm SSH_COPY_ID_LEGACY
-+environment variable is set, the
-+.Nm
-+is run in a legacy mode. In this mode, the 
-+.Nm
-+doesn't check an existence of a private key and doesn't do remote checks
-+of the remote server versions or if public keys are already installed.
- .Sh "SEE ALSO"
- .Xr ssh 1 ,
- .Xr ssh-agent 1 ,