jjelen pushed to openssh (f21). "Solve issue with ssh-copy-id and keys without trailing newline (#1093168)"

[notifications at fedoraproject.org]

>From 00050d05ad7f578df39eaf4b49fa8b1f04119c74 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen at redhat.com>
Date: Wed, 25 Feb 2015 10:45:30 +0100
Subject: Solve issue with ssh-copy-id and keys without trailing newline
 (#1093168)


diff --git a/openssh-6.7p1-ssh-copy-id-truncated-keys.patch b/openssh-6.7p1-ssh-copy-id-truncated-keys.patch
new file mode 100644
index 0000000..f4c91a4
--- /dev/null
+++ b/openssh-6.7p1-ssh-copy-id-truncated-keys.patch
@@ -0,0 +1,13 @@
+diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
+index 4bba5d6..ed1208e 100644
+--- a/contrib/ssh-copy-id
++++ b/contrib/ssh-copy-id
+@@ -207,7 +207,7 @@ populate_new_ids() {
+   printf '%s: INFO: attempting to log in with the new key(s), to filter out any that are already installed\n' "$0" >&2
+   NEW_IDS=$(
+     eval $GET_ID | {
+-      while read ID ; do
++      while read ID || [[ -n $ID ]]; do
+         printf '%s\n' "$ID" > $L_TMP_ID_FILE
+ 
+         # the next line assumes $PRIV_ID_FILE only set if using a single id file - this
diff --git a/openssh.spec b/openssh.spec
index a991fcb..48d0983 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -224,6 +224,8 @@ Patch919: openssh-6.6.1p1-scp-non-existing-directory.patch
 Patch920: openssh-6.6.1p1-ip-port-config-parser.patch
 # fix ssh-copy-id on non-sh shells (#1045191)
 Patch921: openssh-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch
+# Solve issue with ssh-copy-id and keys without trailing newline (#1093168)
+Patch922: openssh-6.7p1-ssh-copy-id-truncated-keys.patch
 
 License: BSD
 Group: Applications/Internet
@@ -438,6 +440,7 @@ popd
 %patch920 -p1 -b .config
 %patch802 -p1 -b .GSSAPIEnablek5users
 %patch921 -p1 -b .ssh-copy-id
+%patch922 -p1 -b .newline
 
 %patch200 -p1 -b .audit
 %patch201 -p1 -b .audit-fps
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openssh.git/commit/?h=f21&id=00050d05ad7f578df39eaf4b49fa8b1f04119c74