rpms/openssh
7
0
Fork 1
Code Issues Pull Requests Releases Activity

ssh-copy-id: tcsh doesnt work with multiline strings so we will make it uggly one-line

Browse Source
This commit is contained in:
Jakub Jelen 2015-05-18 15:09:51 +02:00
parent 775e1b20e6
commit 3e3570ad64
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openssh-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch → openssh-6.8p1-fix-ssh-copy-id-on-non-sh-shell.patch
View File

@ -2,15 +2,14 @@ diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 8e1091c..4bba5d6 100644 index 8e1091c..4bba5d6 100644
--- a/contrib/ssh-copy-id --- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id
@@ -274,9 +274,9 @@ case "$REMOTE_VERSION" in @@ -274,9 +274,7 @@ case "$REMOTE_VERSION" in
populate_new_ids 0 populate_new_ids 0
fi fi
[ "$DRY_RUN" ] || printf '%s\n' "$NEW_IDS" | ssh "$@" " [ "$DRY_RUN" ] || printf '%s\n' "$NEW_IDS" | ssh "$@" "
- umask 077 ; - umask 077 ;
+ exec sh -c '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'" \
mkdir -p .ssh && cat >> .ssh/authorized_keys || exit 1 ; - 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" \
+ if type restorecon >/dev/null 2>&1 ; then restorecon -F .ssh .ssh/authorized_keys ; fi'" \
|| exit 1 || exit 1
ADDED=$(printf '%s\n' "$NEW_IDS" | wc -l) ADDED=$(printf '%s\n' "$NEW_IDS" | wc -l)
;; ;;

2
openssh.spec
View File

@ -208,7 +208,7 @@ Patch921: openssh-6.7p1-debian-restore-tcp-wrappers.patch
# apply upstream patch and make sshd -T more consistent (#1187521) # apply upstream patch and make sshd -T more consistent (#1187521)
Patch922: openssh-6.7p1-sshdT-output.patch Patch922: openssh-6.7p1-sshdT-output.patch
# fix ssh-copy-id on non-sh shells (#1045191) # fix ssh-copy-id on non-sh shells (#1045191)
Patch923: openssh-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch Patch923: openssh-6.8p1-fix-ssh-copy-id-on-non-sh-shell.patch
# AArch64 has seccomp support since 3.19 kernel (#1195065) # AArch64 has seccomp support since 3.19 kernel (#1195065)
Patch924: openssh-6.7p1-seccomp-aarch64.patch Patch924: openssh-6.7p1-seccomp-aarch64.patch
# Solve issue with ssh-copy-id and keys without trailing newline (#1093168) # Solve issue with ssh-copy-id and keys without trailing newline (#1093168)