diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-01 18:42:19 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-01 18:42:19 +0000 |
commit | 8d6b7f4c46de3feb66f704ab483e51ea1a3bb0e1 (patch) | |
tree | 41fe3dd71501bbec5b0393f1536c925eaee180e9 /contrib | |
parent | f045c69060bfdd5cf8759a5f29d7008d02e4de5b (diff) | |
parent | 58bfa257481a1c6938ada9bbd38801cc45633fb0 (diff) |
Debian release 3.6p1-1.
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/aix/README | 13 | ||||
-rwxr-xr-x | contrib/aix/buildbff.sh | 62 | ||||
-rwxr-xr-x | contrib/aix/inventory.sh | 4 | ||||
-rw-r--r-- | contrib/caldera/openssh.spec | 21 | ||||
-rw-r--r-- | contrib/cygwin/ssh-host-config | 11 | ||||
-rw-r--r-- | contrib/gnome-ssh-askpass2.c | 50 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 4 | ||||
-rwxr-xr-x | contrib/solaris/opensshd.in | 2 | ||||
-rw-r--r-- | contrib/ssh-copy-id | 7 | ||||
-rw-r--r-- | contrib/suse/openssh.spec | 2 |
10 files changed, 131 insertions, 45 deletions
diff --git a/contrib/aix/README b/contrib/aix/README index 033fd0a5d..82fd8be1b 100644 --- a/contrib/aix/README +++ b/contrib/aix/README | |||
@@ -6,9 +6,15 @@ installable) openssh package. | |||
6 | 6 | ||
7 | Directions: | 7 | Directions: |
8 | 8 | ||
9 | (optional) create config.local in your build dir | ||
9 | ./configure [options] | 10 | ./configure [options] |
10 | cd contrib/aix; ./buildbff.sh | 11 | contrib/aix/buildbff.sh |
11 | 12 | ||
13 | The file config.local or the environment is read to set the following options | ||
14 | (default first): | ||
15 | PERMIT_ROOT_LOGIN=[no|yes] | ||
16 | X11_FORWARDING=[no|yes] | ||
17 | AIX_SRC=[no|yes] | ||
12 | 18 | ||
13 | Acknowledgements: | 19 | Acknowledgements: |
14 | 20 | ||
@@ -19,6 +25,8 @@ Jim Abbey's (GPL'ed) lppbuild-2.1 was used to learn how to build .bff's | |||
19 | and for comparison with the output from this script, however no code | 25 | and for comparison with the output from this script, however no code |
20 | from lppbuild is included and it is not required for operation. | 26 | from lppbuild is included and it is not required for operation. |
21 | 27 | ||
28 | SRC support based on examples provided by Sandor Sklar and Maarten Kreuger. | ||
29 | |||
22 | 30 | ||
23 | Other notes: | 31 | Other notes: |
24 | 32 | ||
@@ -26,8 +34,7 @@ The script treats all packages as USR packages (not ROOT+USR when | |||
26 | appropriate). It seems to work, though...... | 34 | appropriate). It seems to work, though...... |
27 | 35 | ||
28 | If there are any patches to this that have not yet been integrated they | 36 | If there are any patches to this that have not yet been integrated they |
29 | may be found at http://www.zip.com.au/~dtucker/openssh/ or | 37 | may be found at http://www.zip.com.au/~dtucker/openssh/. |
30 | http://home.usf.advantra.com.au/~dtucker/openssh/. | ||
31 | 38 | ||
32 | 39 | ||
33 | Disclaimer: | 40 | Disclaimer: |
diff --git a/contrib/aix/buildbff.sh b/contrib/aix/buildbff.sh index 5c09c6b75..3b3699660 100755 --- a/contrib/aix/buildbff.sh +++ b/contrib/aix/buildbff.sh | |||
@@ -11,10 +11,12 @@ | |||
11 | 11 | ||
12 | # | 12 | # |
13 | # Tunable configuration settings | 13 | # Tunable configuration settings |
14 | # create a "config.local" in your build directory to override these. | 14 | # create a "config.local" in your build directory or set |
15 | # environment variables to override these. | ||
15 | # | 16 | # |
16 | PERMIT_ROOT_LOGIN=no | 17 | [ -z "$PERMIT_ROOT_LOGIN" ] || PERMIT_ROOT_LOGIN=no |
17 | X11_FORWARDING=no | 18 | [ -z "$X11_FORWARDING" ] || X11_FORWARDING=no |
19 | [ -z "$AIX_SRC" ] || AIX_SRC=no | ||
18 | 20 | ||
19 | umask 022 | 21 | umask 022 |
20 | 22 | ||
@@ -167,6 +169,18 @@ For the full text of the license, see /usr/lpp/openssh/LICENCE | |||
167 | EOD | 169 | EOD |
168 | 170 | ||
169 | # | 171 | # |
172 | # openssh.size file allows filesystem expansion as required | ||
173 | # generate list of directories containing files | ||
174 | # then calculate disk usage for each directory and store in openssh.size | ||
175 | # | ||
176 | files=`find . -type f -print` | ||
177 | dirs=`for file in $files; do dirname $file; done | sort -u` | ||
178 | for dir in $dirs | ||
179 | do | ||
180 | du $dir | ||
181 | done > ../openssh.size | ||
182 | |||
183 | # | ||
170 | # Create postinstall script | 184 | # Create postinstall script |
171 | # | 185 | # |
172 | cat <<EOF >>../openssh.post_i | 186 | cat <<EOF >>../openssh.post_i |
@@ -245,14 +259,42 @@ else | |||
245 | fi | 259 | fi |
246 | echo | 260 | echo |
247 | 261 | ||
248 | # Add to system startup if required | 262 | # Set startup command depending on SRC support |
249 | if grep $sbindir/sshd /etc/rc.tcpip >/dev/null | 263 | if [ "$AIX_SRC" = "yes" ] |
264 | then | ||
265 | echo Creating SRC sshd subsystem. | ||
266 | rmssys -s sshd 2>&1 >/dev/null | ||
267 | mkssys -s sshd -p "$sbindir/sshd" -a '-D' -u 0 -S -n 15 -f 9 -R -G tcpip | ||
268 | startupcmd="start $sbindir/sshd \\\"\\\$src_running\\\"" | ||
269 | oldstartcmd="$sbindir/sshd" | ||
270 | else | ||
271 | startupcmd="$sbindir/sshd" | ||
272 | oldstartcmd="start $sbindir/sshd \\\"$src_running\\\"" | ||
273 | fi | ||
274 | |||
275 | # If migrating to or from SRC, change previous startup command | ||
276 | # otherwise add to rc.tcpip | ||
277 | if egrep "^\$oldstartcmd" /etc/rc.tcpip >/dev/null | ||
250 | then | 278 | then |
251 | echo "sshd found in rc.tcpip, not adding." | 279 | if sed "s|^\$oldstartcmd|\$startupcmd|g" /etc/rc.tcpip >/etc/rc.tcpip.new |
280 | then | ||
281 | chmod 0755 /etc/rc.tcpip.new | ||
282 | mv /etc/rc.tcpip /etc/rc.tcpip.old && \ | ||
283 | mv /etc/rc.tcpip.new /etc/rc.tcpip | ||
284 | else | ||
285 | echo "Updating /etc/rc.tcpip failed, please check." | ||
286 | fi | ||
252 | else | 287 | else |
253 | echo >>/etc/rc.tcpip | 288 | # Add to system startup if required |
254 | echo "echo Starting sshd" >>/etc/rc.tcpip | 289 | if grep "^\$startupcmd" /etc/rc.tcpip >/dev/null |
255 | echo "$sbindir/sshd" >>/etc/rc.tcpip | 290 | then |
291 | echo "sshd found in rc.tcpip, not adding." | ||
292 | else | ||
293 | echo "Adding sshd to rc.tcpip" | ||
294 | echo >>/etc/rc.tcpip | ||
295 | echo "# Start sshd" >>/etc/rc.tcpip | ||
296 | echo "\$startupcmd" >>/etc/rc.tcpip | ||
297 | fi | ||
256 | fi | 298 | fi |
257 | EOF | 299 | EOF |
258 | 300 | ||
@@ -262,7 +304,7 @@ EOF | |||
262 | echo Creating liblpp.a | 304 | echo Creating liblpp.a |
263 | ( | 305 | ( |
264 | cd .. | 306 | cd .. |
265 | for i in openssh.al openssh.copyright openssh.inventory openssh.post_i LICENCE README* | 307 | for i in openssh.al openssh.copyright openssh.inventory openssh.post_i openssh.size LICENCE README* |
266 | do | 308 | do |
267 | ar -r liblpp.a $i | 309 | ar -r liblpp.a $i |
268 | rm $i | 310 | rm $i |
diff --git a/contrib/aix/inventory.sh b/contrib/aix/inventory.sh index 78df0d16e..619493ae2 100755 --- a/contrib/aix/inventory.sh +++ b/contrib/aix/inventory.sh | |||
@@ -2,9 +2,9 @@ | |||
2 | # | 2 | # |
3 | # inventory.sh | 3 | # inventory.sh |
4 | # | 4 | # |
5 | # Originall written by Ben Lindstrom, modified by Darren Tucker to use perl | 5 | # Originally written by Ben Lindstrom, modified by Darren Tucker to use perl |
6 | # | 6 | # |
7 | # This will produced and AIX package inventory file, which looks like: | 7 | # This will produce an AIX package inventory file, which looks like: |
8 | # | 8 | # |
9 | # /usr/local/bin: | 9 | # /usr/local/bin: |
10 | # class=apply,inventory,openssh | 10 | # class=apply,inventory,openssh |
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index b7de22e8b..e70ac8f37 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec | |||
@@ -17,7 +17,7 @@ | |||
17 | #old cvs stuff. please update before use. may be deprecated. | 17 | #old cvs stuff. please update before use. may be deprecated. |
18 | %define use_stable 1 | 18 | %define use_stable 1 |
19 | %if %{use_stable} | 19 | %if %{use_stable} |
20 | %define version 3.5p1 | 20 | %define version 3.6p1 |
21 | %define cvs %{nil} | 21 | %define cvs %{nil} |
22 | %define release 2 | 22 | %define release 2 |
23 | %else | 23 | %else |
@@ -198,7 +198,7 @@ xmkmf | |||
198 | %Install | 198 | %Install |
199 | [ %{buildroot} != "/" ] && rm -rf %{buildroot} | 199 | [ %{buildroot} != "/" ] && rm -rf %{buildroot} |
200 | 200 | ||
201 | %makeinstall | 201 | make install DESTDIR=%{buildroot} |
202 | %makeinstall -C %{askpass} \ | 202 | %makeinstall -C %{askpass} \ |
203 | BINDIR=%{_libexecdir} \ | 203 | BINDIR=%{_libexecdir} \ |
204 | MANPATH=%{_mandir} \ | 204 | MANPATH=%{_mandir} \ |
@@ -316,8 +316,16 @@ fi | |||
316 | %defattr(-,root,root) | 316 | %defattr(-,root,root) |
317 | %dir %{_sysconfdir} | 317 | %dir %{_sysconfdir} |
318 | %config %{_sysconfdir}/ssh_config | 318 | %config %{_sysconfdir}/ssh_config |
319 | %{_bindir}/* | 319 | %{_bindir}/scp |
320 | %{_bindir}/sftp | ||
321 | %{_bindir}/ssh | ||
322 | %{_bindir}/slogin | ||
323 | %{_bindir}/ssh-add | ||
324 | %attr(2755,root,nobody) %{_bindir}/ssh-agent | ||
325 | %{_bindir}/ssh-keygen | ||
326 | %{_bindir}/ssh-keyscan | ||
320 | %dir %{_libexecdir} | 327 | %dir %{_libexecdir} |
328 | %attr(4711,root,root) %{_libexecdir}/ssh-keysign | ||
321 | %{_sbindir}/ssh-host-keygen | 329 | %{_sbindir}/ssh-host-keygen |
322 | %dir %{_defaultdocdir}/%{name}-%{version} | 330 | %dir %{_defaultdocdir}/%{name}-%{version} |
323 | %{_defaultdocdir}/%{name}-%{version}/CREDITS | 331 | %{_defaultdocdir}/%{name}-%{version}/CREDITS |
@@ -328,10 +336,12 @@ fi | |||
328 | %{_defaultdocdir}/%{name}-%{version}/TODO | 336 | %{_defaultdocdir}/%{name}-%{version}/TODO |
329 | %{_defaultdocdir}/%{name}-%{version}/faq.html | 337 | %{_defaultdocdir}/%{name}-%{version}/faq.html |
330 | %{_mandir}/man1/* | 338 | %{_mandir}/man1/* |
339 | %{_mandir}/man8/ssh-keysign.8.gz | ||
340 | %{_mandir}/man5/ssh_config.5.gz | ||
331 | 341 | ||
332 | %Files server | 342 | %Files server |
333 | %defattr(-,root,root) | 343 | %defattr(-,root,root) |
334 | %dir %attr(0700,root,root) %{_var}/empty/sshd | 344 | %dir %{_var}/empty/sshd |
335 | %config %{SVIdir}/sshd | 345 | %config %{SVIdir}/sshd |
336 | %config /etc/pam.d/sshd | 346 | %config /etc/pam.d/sshd |
337 | %config %{_sysconfdir}/moduli | 347 | %config %{_sysconfdir}/moduli |
@@ -339,6 +349,7 @@ fi | |||
339 | %config %{SVIcdir}/sshd | 349 | %config %{SVIcdir}/sshd |
340 | %{_libexecdir}/sftp-server | 350 | %{_libexecdir}/sftp-server |
341 | %{_sbindir}/sshd | 351 | %{_sbindir}/sshd |
352 | %{_mandir}/man5/sshd_config.5.gz | ||
342 | %{_mandir}/man8/sftp-server.8.gz | 353 | %{_mandir}/man8/sftp-server.8.gz |
343 | %{_mandir}/man8/sshd.8.gz | 354 | %{_mandir}/man8/sshd.8.gz |
344 | 355 | ||
@@ -353,4 +364,4 @@ fi | |||
353 | * Mon Jan 01 1998 ... | 364 | * Mon Jan 01 1998 ... |
354 | Template Version: 1.31 | 365 | Template Version: 1.31 |
355 | 366 | ||
356 | $Id: openssh.spec,v 1.38 2002/10/03 01:56:59 djm Exp $ | 367 | $Id: openssh.spec,v 1.39.2.2 2003/03/21 04:52:56 tim Exp $ |
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index 4df5aa969..2c6db51e5 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config | |||
@@ -378,6 +378,8 @@ then | |||
378 | # This is the sshd server system-wide configuration file. See | 378 | # This is the sshd server system-wide configuration file. See |
379 | # sshd_config(5) for more information. | 379 | # sshd_config(5) for more information. |
380 | 380 | ||
381 | # This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin | ||
382 | |||
381 | # The strategy used for options in the default sshd_config shipped with | 383 | # The strategy used for options in the default sshd_config shipped with |
382 | # OpenSSH is to specify options with their default value where | 384 | # OpenSSH is to specify options with their default value where |
383 | # possible, but leave them commented. Uncommented options change a | 385 | # possible, but leave them commented. Uncommented options change a |
@@ -394,7 +396,7 @@ Port $port_number | |||
394 | #HostKey ${SYSCONFDIR}/ssh_host_rsa_key | 396 | #HostKey ${SYSCONFDIR}/ssh_host_rsa_key |
395 | #HostKey ${SYSCONFDIR}/ssh_host_dsa_key | 397 | #HostKey ${SYSCONFDIR}/ssh_host_dsa_key |
396 | 398 | ||
397 | # Lifetime and size of ephemeral version 1 server ke | 399 | # Lifetime and size of ephemeral version 1 server key |
398 | #KeyRegenerationInterval 3600 | 400 | #KeyRegenerationInterval 3600 |
399 | #ServerKeyBits 768 | 401 | #ServerKeyBits 768 |
400 | 402 | ||
@@ -405,7 +407,7 @@ Port $port_number | |||
405 | 407 | ||
406 | # Authentication: | 408 | # Authentication: |
407 | 409 | ||
408 | #LoginGraceTime 600 | 410 | #LoginGraceTime 120 |
409 | #PermitRootLogin yes | 411 | #PermitRootLogin yes |
410 | # The following setting overrides permission checks on host key files | 412 | # The following setting overrides permission checks on host key files |
411 | # and directories. For security reasons set this to "yes" when running | 413 | # and directories. For security reasons set this to "yes" when running |
@@ -414,11 +416,11 @@ StrictModes no | |||
414 | 416 | ||
415 | #RSAAuthentication yes | 417 | #RSAAuthentication yes |
416 | #PubkeyAuthentication yes | 418 | #PubkeyAuthentication yes |
417 | #AuthorizedKeysFile %h/.ssh/authorized_keys | 419 | #AuthorizedKeysFile .ssh/authorized_keys |
418 | 420 | ||
419 | # rhosts authentication should not be used | 421 | # rhosts authentication should not be used |
420 | #RhostsAuthentication no | 422 | #RhostsAuthentication no |
421 | # Don't read ~/.rhosts and ~/.shosts files | 423 | # Don't read the user's ~/.rhosts and ~/.shosts files |
422 | #IgnoreRhosts yes | 424 | #IgnoreRhosts yes |
423 | # For this to work you will also need host keys in ${SYSCONFDIR}/ssh_known_hosts | 425 | # For this to work you will also need host keys in ${SYSCONFDIR}/ssh_known_hosts |
424 | #RhostsRSAAuthentication no | 426 | #RhostsRSAAuthentication no |
@@ -443,6 +445,7 @@ StrictModes no | |||
443 | #KeepAlive yes | 445 | #KeepAlive yes |
444 | #UseLogin no | 446 | #UseLogin no |
445 | UsePrivilegeSeparation $privsep_used | 447 | UsePrivilegeSeparation $privsep_used |
448 | #PermitUserEnvironment no | ||
446 | #Compression yes | 449 | #Compression yes |
447 | 450 | ||
448 | #MaxStartups 10 | 451 | #MaxStartups 10 |
diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c index 89a412aa8..9e8eaf920 100644 --- a/contrib/gnome-ssh-askpass2.c +++ b/contrib/gnome-ssh-askpass2.c | |||
@@ -36,10 +36,13 @@ | |||
36 | * you don't trust your X server. We grab the keyboard always. | 36 | * you don't trust your X server. We grab the keyboard always. |
37 | */ | 37 | */ |
38 | 38 | ||
39 | #define GRAB_TRIES 16 | ||
40 | #define GRAB_WAIT 250 /* milliseconds */ | ||
41 | |||
39 | /* | 42 | /* |
40 | * Compile with: | 43 | * Compile with: |
41 | * | 44 | * |
42 | * cc `pkg-config --cflags gtk+-2.0` \ | 45 | * cc -Wall `pkg-config --cflags gtk+-2.0` \ |
43 | * gnome-ssh-askpass2.c -o gnome-ssh-askpass \ | 46 | * gnome-ssh-askpass2.c -o gnome-ssh-askpass \ |
44 | * `pkg-config --libs gtk+-2.0` | 47 | * `pkg-config --libs gtk+-2.0` |
45 | * | 48 | * |
@@ -48,6 +51,7 @@ | |||
48 | #include <stdlib.h> | 51 | #include <stdlib.h> |
49 | #include <stdio.h> | 52 | #include <stdio.h> |
50 | #include <string.h> | 53 | #include <string.h> |
54 | #include <unistd.h> | ||
51 | #include <X11/Xlib.h> | 55 | #include <X11/Xlib.h> |
52 | #include <gtk/gtk.h> | 56 | #include <gtk/gtk.h> |
53 | #include <gdk/gdkx.h> | 57 | #include <gdk/gdkx.h> |
@@ -84,13 +88,13 @@ passphrase_dialog(char *message) | |||
84 | { | 88 | { |
85 | const char *failed; | 89 | const char *failed; |
86 | char *passphrase, *local; | 90 | char *passphrase, *local; |
87 | char **messages; | 91 | int result, grab_tries, grab_server, grab_pointer; |
88 | int result, i, grab_server, grab_pointer; | 92 | GtkWidget *dialog, *entry; |
89 | GtkWidget *dialog, *entry, *label; | ||
90 | GdkGrabStatus status; | 93 | GdkGrabStatus status; |
91 | 94 | ||
92 | grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL); | 95 | grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL); |
93 | grab_pointer = (getenv("GNOME_SSH_ASKPASS_GRAB_POINTER") != NULL); | 96 | grab_pointer = (getenv("GNOME_SSH_ASKPASS_GRAB_POINTER") != NULL); |
97 | grab_tries = 0; | ||
94 | 98 | ||
95 | dialog = gtk_message_dialog_new(NULL, 0, | 99 | dialog = gtk_message_dialog_new(NULL, 0, |
96 | GTK_MESSAGE_QUESTION, | 100 | GTK_MESSAGE_QUESTION, |
@@ -117,23 +121,35 @@ passphrase_dialog(char *message) | |||
117 | 121 | ||
118 | /* Grab focus */ | 122 | /* Grab focus */ |
119 | gtk_widget_show_now(dialog); | 123 | gtk_widget_show_now(dialog); |
120 | if (grab_server) { | ||
121 | gdk_x11_grab_server(); | ||
122 | } | ||
123 | if (grab_pointer) { | 124 | if (grab_pointer) { |
124 | status = gdk_pointer_grab((GTK_WIDGET(dialog))->window, TRUE, | 125 | for(;;) { |
125 | 0, NULL, NULL, GDK_CURRENT_TIME); | 126 | status = gdk_pointer_grab( |
126 | if (status != GDK_GRAB_SUCCESS) { | 127 | (GTK_WIDGET(dialog))->window, TRUE, 0, NULL, |
127 | failed = "mouse"; | 128 | NULL, GDK_CURRENT_TIME); |
128 | goto nograb; | 129 | if (status == GDK_GRAB_SUCCESS) |
130 | break; | ||
131 | usleep(GRAB_WAIT * 1000); | ||
132 | if (++grab_tries > GRAB_TRIES) { | ||
133 | failed = "mouse"; | ||
134 | goto nograb; | ||
135 | } | ||
129 | } | 136 | } |
130 | } | 137 | } |
131 | status = gdk_keyboard_grab((GTK_WIDGET(dialog))->window, FALSE, | 138 | for(;;) { |
132 | GDK_CURRENT_TIME); | 139 | status = gdk_keyboard_grab((GTK_WIDGET(dialog))->window, |
133 | if (status != GDK_GRAB_SUCCESS) { | 140 | FALSE, GDK_CURRENT_TIME); |
134 | failed = "keyboard"; | 141 | if (status == GDK_GRAB_SUCCESS) |
135 | goto nograbkb; | 142 | break; |
143 | usleep(GRAB_WAIT * 1000); | ||
144 | if (++grab_tries > GRAB_TRIES) { | ||
145 | failed = "keyboard"; | ||
146 | goto nograbkb; | ||
147 | } | ||
136 | } | 148 | } |
149 | if (grab_server) { | ||
150 | gdk_x11_grab_server(); | ||
151 | } | ||
152 | |||
137 | result = gtk_dialog_run(GTK_DIALOG(dialog)); | 153 | result = gtk_dialog_run(GTK_DIALOG(dialog)); |
138 | 154 | ||
139 | /* Ungrab */ | 155 | /* Ungrab */ |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index e7005064d..f71c0b261 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,4 +1,4 @@ | |||
1 | %define ver 3.5p1 | 1 | %define ver 3.6p1 |
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 |
@@ -21,7 +21,7 @@ | |||
21 | %define scard 0 | 21 | %define scard 0 |
22 | 22 | ||
23 | # Use GTK2 instead of GNOME in gnome-ssh-askpass | 23 | # Use GTK2 instead of GNOME in gnome-ssh-askpass |
24 | %define gtk2 0 | 24 | %define gtk2 1 |
25 | 25 | ||
26 | # Is this build for RHL 6.x? | 26 | # Is this build for RHL 6.x? |
27 | %define build6x 0 | 27 | %define build6x 0 |
diff --git a/contrib/solaris/opensshd.in b/contrib/solaris/opensshd.in index e7ca2489f..48b6c5702 100755 --- a/contrib/solaris/opensshd.in +++ b/contrib/solaris/opensshd.in | |||
@@ -3,6 +3,8 @@ | |||
3 | # | 3 | # |
4 | # Stripped PRNGd out of it for the time being. | 4 | # Stripped PRNGd out of it for the time being. |
5 | 5 | ||
6 | umask 022 | ||
7 | |||
6 | CAT=/usr/bin/cat | 8 | CAT=/usr/bin/cat |
7 | KILL=/usr/bin/kill | 9 | KILL=/usr/bin/kill |
8 | 10 | ||
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index 2346761f7..a1ad34a8d 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id | |||
@@ -29,7 +29,12 @@ if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then | |||
29 | fi | 29 | fi |
30 | 30 | ||
31 | if [ -z "`eval $GET_ID`" ]; then | 31 | if [ -z "`eval $GET_ID`" ]; then |
32 | echo "$0: ERROR: No identities found" | 32 | echo "$0: ERROR: No identities found" >&2 |
33 | exit 1 | ||
34 | fi | ||
35 | |||
36 | if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then | ||
37 | echo "Usage: $0 [-i [identity_file]] [user@]machine" >&2 | ||
33 | exit 1 | 38 | exit 1 |
34 | fi | 39 | fi |
35 | 40 | ||
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 3ae1dfc80..55de013dc 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec | |||
@@ -1,6 +1,6 @@ | |||
1 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation | 1 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation |
2 | Name: openssh | 2 | Name: openssh |
3 | Version: 3.5p1 | 3 | Version: 3.6p1 |
4 | URL: http://www.openssh.com/ | 4 | URL: http://www.openssh.com/ |
5 | Release: 1 | 5 | Release: 1 |
6 | Source0: openssh-%{version}.tar.gz | 6 | Source0: openssh-%{version}.tar.gz |