diff options
author | Colin Watson <cjwatson@debian.org> | 2016-08-06 10:49:58 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-08-06 10:49:58 +0100 |
commit | a8ed8d256b2e2c05b0c15565a7938028c5192277 (patch) | |
tree | 87abbdc914a38b43e4e5bb9581ad1f46eabbf88e /contrib | |
parent | f0329aac23c61e1a5197d6d57349a63f459bccb0 (diff) | |
parent | 99522ba7ec6963a05c04a156bf20e3ba3605987c (diff) |
Import openssh_7.3p1.orig.tar.gz
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/cygwin/README | 1 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 4 | ||||
-rw-r--r-- | contrib/ssh-copy-id | 10 | ||||
-rw-r--r-- | contrib/suse/openssh.spec | 4 |
4 files changed, 8 insertions, 11 deletions
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: | |||
25 | --yes -y Answer all questions with "yes" automatically. | 25 | --yes -y Answer all questions with "yes" automatically. |
26 | --no -n Answer all questions with "no" automatically. | 26 | --no -n Answer all questions with "no" automatically. |
27 | --cygwin -c <options> Use "options" as value for CYGWIN environment var. | 27 | --cygwin -c <options> Use "options" as value for CYGWIN environment var. |
28 | --name -N <name> sshd windows service name. | ||
28 | --port -p <n> sshd listens on port n. | 29 | --port -p <n> sshd listens on port n. |
29 | --user -u <account> privileged user for service, default 'cyg_server'. | 30 | --user -u <account> privileged user for service, default 'cyg_server'. |
30 | --pwd -w <passwd> Use "pwd" as password for privileged user. | 31 | --pwd -w <passwd> Use "pwd" as password for privileged user. |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index eefe82df0..fd8678f12 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,4 +1,4 @@ | |||
1 | %define ver 7.2p2 | 1 | %define ver 7.3p1 |
2 | %define rel 1 | 2 | %define rel 1 |
3 | 3 | ||
4 | # OpenSSH privilege separation requires a user & group ID | 4 | # OpenSSH privilege separation requires a user & group ID |
@@ -358,8 +358,6 @@ fi | |||
358 | %attr(0644,root,root) %{_mandir}/man1/ssh.1* | 358 | %attr(0644,root,root) %{_mandir}/man1/ssh.1* |
359 | %attr(0644,root,root) %{_mandir}/man5/ssh_config.5* | 359 | %attr(0644,root,root) %{_mandir}/man5/ssh_config.5* |
360 | %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config | 360 | %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config |
361 | %attr(-,root,root) %{_bindir}/slogin | ||
362 | %attr(-,root,root) %{_mandir}/man1/slogin.1* | ||
363 | %if ! %{rescue} | 361 | %if ! %{rescue} |
364 | %attr(2755,root,nobody) %{_bindir}/ssh-agent | 362 | %attr(2755,root,nobody) %{_bindir}/ssh-agent |
365 | %attr(0755,root,root) %{_bindir}/ssh-add | 363 | %attr(0755,root,root) %{_bindir}/ssh-add |
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() { | |||
233 | -o ControlPath=none \ | 233 | -o ControlPath=none \ |
234 | -o LogLevel=INFO \ | 234 | -o LogLevel=INFO \ |
235 | -o PreferredAuthentications=publickey \ | 235 | -o PreferredAuthentications=publickey \ |
236 | -o IdentitiesOnly=yes "$@" exit 2>$L_TMP_ID_FILE.stderr </dev/null | 236 | -o IdentitiesOnly=yes "$@" exit 2>"$L_TMP_ID_FILE.stderr" </dev/null |
237 | if [ "$?" = "$L_SUCCESS" ] ; then | 237 | if [ "$?" = "$L_SUCCESS" ] ; then |
238 | : > $L_TMP_ID_FILE | 238 | : > "$L_TMP_ID_FILE" |
239 | else | 239 | else |
240 | grep 'Permission denied' $L_TMP_ID_FILE.stderr >/dev/null || { | 240 | grep 'Permission denied' "$L_TMP_ID_FILE.stderr" >/dev/null || { |
241 | sed -e 's/^/ERROR: /' <$L_TMP_ID_FILE.stderr >$L_TMP_ID_FILE | 241 | sed -e 's/^/ERROR: /' <"$L_TMP_ID_FILE.stderr" >"$L_TMP_ID_FILE" |
242 | cat >/dev/null #consume the other keys, causing loop to end | 242 | cat >/dev/null #consume the other keys, causing loop to end |
243 | } | 243 | } |
244 | fi | 244 | fi |
245 | 245 | ||
246 | cat $L_TMP_ID_FILE | 246 | cat "$L_TMP_ID_FILE" |
247 | done | 247 | done |
248 | } | 248 | } |
249 | ) | 249 | ) |
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index f20a78656..d2b2728d5 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec | |||
@@ -13,7 +13,7 @@ | |||
13 | 13 | ||
14 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation | 14 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation |
15 | Name: openssh | 15 | Name: openssh |
16 | Version: 7.2p2 | 16 | Version: 7.3p1 |
17 | URL: http://www.openssh.com/ | 17 | URL: http://www.openssh.com/ |
18 | Release: 1 | 18 | Release: 1 |
19 | Source0: openssh-%{version}.tar.gz | 19 | Source0: openssh-%{version}.tar.gz |
@@ -202,7 +202,6 @@ rm -rf $RPM_BUILD_ROOT | |||
202 | %attr(0755,root,root) %{_bindir}/ssh-keygen | 202 | %attr(0755,root,root) %{_bindir}/ssh-keygen |
203 | %attr(0755,root,root) %{_bindir}/scp | 203 | %attr(0755,root,root) %{_bindir}/scp |
204 | %attr(0755,root,root) %{_bindir}/ssh | 204 | %attr(0755,root,root) %{_bindir}/ssh |
205 | %attr(-,root,root) %{_bindir}/slogin | ||
206 | %attr(0755,root,root) %{_bindir}/ssh-agent | 205 | %attr(0755,root,root) %{_bindir}/ssh-agent |
207 | %attr(0755,root,root) %{_bindir}/ssh-add | 206 | %attr(0755,root,root) %{_bindir}/ssh-add |
208 | %attr(0755,root,root) %{_bindir}/ssh-keyscan | 207 | %attr(0755,root,root) %{_bindir}/ssh-keyscan |
@@ -214,7 +213,6 @@ rm -rf $RPM_BUILD_ROOT | |||
214 | %attr(0755,root,root) %{_libdir}/ssh/ssh-pkcs11-helper | 213 | %attr(0755,root,root) %{_libdir}/ssh/ssh-pkcs11-helper |
215 | %attr(0644,root,root) %doc %{_mandir}/man1/scp.1* | 214 | %attr(0644,root,root) %doc %{_mandir}/man1/scp.1* |
216 | %attr(0644,root,root) %doc %{_mandir}/man1/sftp.1* | 215 | %attr(0644,root,root) %doc %{_mandir}/man1/sftp.1* |
217 | %attr(-,root,root) %doc %{_mandir}/man1/slogin.1* | ||
218 | %attr(0644,root,root) %doc %{_mandir}/man1/ssh.1* | 216 | %attr(0644,root,root) %doc %{_mandir}/man1/ssh.1* |
219 | %attr(0644,root,root) %doc %{_mandir}/man1/ssh-add.1* | 217 | %attr(0644,root,root) %doc %{_mandir}/man1/ssh-add.1* |
220 | %attr(0644,root,root) %doc %{_mandir}/man1/ssh-agent.1* | 218 | %attr(0644,root,root) %doc %{_mandir}/man1/ssh-agent.1* |