From 8ff20ec95f4377021ed5e9b2331320f5c5a34cea Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 14 Mar 2016 09:24:03 +1100 Subject: Quote variables that may contain whitespace. The variable $L_TMP_ID_FILE needs to be surrounded by quotes in order to survive paths containing whitespace. bz#2551, from Corinna Vinschen via Philip Hands. --- contrib/ssh-copy-id | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'contrib') diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index afde8b170..bef5c95d9 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id @@ -233,17 +233,17 @@ populate_new_ids() { -o ControlPath=none \ -o LogLevel=INFO \ -o PreferredAuthentications=publickey \ - -o IdentitiesOnly=yes "$@" exit 2>$L_TMP_ID_FILE.stderr "$L_TMP_ID_FILE.stderr" $L_TMP_ID_FILE + : > "$L_TMP_ID_FILE" else - grep 'Permission denied' $L_TMP_ID_FILE.stderr >/dev/null || { - sed -e 's/^/ERROR: /' <$L_TMP_ID_FILE.stderr >$L_TMP_ID_FILE + grep 'Permission denied' "$L_TMP_ID_FILE.stderr" >/dev/null || { + sed -e 's/^/ERROR: /' <"$L_TMP_ID_FILE.stderr" >"$L_TMP_ID_FILE" cat >/dev/null #consume the other keys, causing loop to end } fi - cat $L_TMP_ID_FILE + cat "$L_TMP_ID_FILE" done } ) -- cgit v1.2.3 From cff26f373c58457a32cb263e212cfff53fca987b Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 15 Mar 2016 04:30:21 +1100 Subject: remove slogin from *.spec --- contrib/redhat/openssh.spec | 2 -- contrib/suse/openssh.spec | 2 -- 2 files changed, 4 deletions(-) (limited to 'contrib') diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 2a55f454e..b6240c7ca 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -358,8 +358,6 @@ fi %attr(0644,root,root) %{_mandir}/man1/ssh.1* %attr(0644,root,root) %{_mandir}/man5/ssh_config.5* %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config -%attr(-,root,root) %{_bindir}/slogin -%attr(-,root,root) %{_mandir}/man1/slogin.1* %if ! %{rescue} %attr(2755,root,nobody) %{_bindir}/ssh-agent %attr(0755,root,root) %{_bindir}/ssh-add diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 53264c1fb..047488f0d 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec @@ -202,7 +202,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{_bindir}/ssh-keygen %attr(0755,root,root) %{_bindir}/scp %attr(0755,root,root) %{_bindir}/ssh -%attr(-,root,root) %{_bindir}/slogin %attr(0755,root,root) %{_bindir}/ssh-agent %attr(0755,root,root) %{_bindir}/ssh-add %attr(0755,root,root) %{_bindir}/ssh-keyscan @@ -214,7 +213,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{_libdir}/ssh/ssh-pkcs11-helper %attr(0644,root,root) %doc %{_mandir}/man1/scp.1* %attr(0644,root,root) %doc %{_mandir}/man1/sftp.1* -%attr(-,root,root) %doc %{_mandir}/man1/slogin.1* %attr(0644,root,root) %doc %{_mandir}/man1/ssh.1* %attr(0644,root,root) %doc %{_mandir}/man1/ssh-add.1* %attr(0644,root,root) %doc %{_mandir}/man1/ssh-agent.1* -- cgit v1.2.3 From 18424200160ff5c923113e0a37ebe21ab7bcd17c Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 30 May 2016 19:35:28 +1000 Subject: Add missing ssh-host-config --name option Patch from vinschen@redhat.com. --- contrib/cygwin/README | 1 + 1 file changed, 1 insertion(+) (limited to 'contrib') diff --git a/contrib/cygwin/README b/contrib/cygwin/README index 1396d99cd..a73a0f657 100644 --- a/contrib/cygwin/README +++ b/contrib/cygwin/README @@ -25,6 +25,7 @@ Options: --yes -y Answer all questions with "yes" automatically. --no -n Answer all questions with "no" automatically. --cygwin -c Use "options" as value for CYGWIN environment var. + --name -N sshd windows service name. --port -p sshd listens on port n. --user -u privileged user for service, default 'cyg_server'. --pwd -w Use "pwd" as password for privileged user. -- cgit v1.2.3 From 80e766fb089de4f3c92b1600eb99e9495e37c992 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 24 Jul 2016 21:50:13 +1000 Subject: crank version numbers --- README | 2 +- contrib/redhat/openssh.spec | 2 +- contrib/suse/openssh.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib') diff --git a/README b/README index 0dd047af3..4b6c3423f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-7.2p1 for the release notes. +See http://www.openssh.com/txt/release-7.3p1 for the release notes. Please read http://www.openssh.com/report.html for bug reporting instructions and note that we do not use Github for bug reporting or diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index b6240c7ca..fd8678f12 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,4 +1,4 @@ -%define ver 7.2p1 +%define ver 7.3p1 %define rel 1 # OpenSSH privilege separation requires a user & group ID diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 047488f0d..d2b2728d5 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec @@ -13,7 +13,7 @@ Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation Name: openssh -Version: 7.2p1 +Version: 7.3p1 URL: http://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz -- cgit v1.2.3