diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /contrib | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/caldera/openssh.spec | 8 | ||||
-rw-r--r-- | contrib/cygwin/Makefile | 15 | ||||
-rw-r--r-- | contrib/gnome-ssh-askpass2.c | 2 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 8 | ||||
-rw-r--r-- | contrib/suse/openssh.spec | 2 |
5 files changed, 29 insertions, 6 deletions
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 37e1b9411..7c291a0eb 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec | |||
@@ -17,11 +17,11 @@ | |||
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 5.3p1 | 20 | %define version 5.4p1 |
21 | %define cvs %{nil} | 21 | %define cvs %{nil} |
22 | %define release 1 | 22 | %define release 1 |
23 | %else | 23 | %else |
24 | %define version 5.3p1 | 24 | %define version 5.4p1 |
25 | %define cvs cvs20050315 | 25 | %define cvs cvs20050315 |
26 | %define release 0r1 | 26 | %define release 0r1 |
27 | %endif | 27 | %endif |
@@ -319,6 +319,7 @@ fi | |||
319 | %{_bindir}/ssh-keyscan | 319 | %{_bindir}/ssh-keyscan |
320 | %dir %{_libexecdir} | 320 | %dir %{_libexecdir} |
321 | %attr(4711,root,root) %{_libexecdir}/ssh-keysign | 321 | %attr(4711,root,root) %{_libexecdir}/ssh-keysign |
322 | %{_libexecdir}/ssh-pkcs11-helper | ||
322 | %{_sbindir}/ssh-host-keygen | 323 | %{_sbindir}/ssh-host-keygen |
323 | %dir %{_defaultdocdir}/%{name}-%{version} | 324 | %dir %{_defaultdocdir}/%{name}-%{version} |
324 | %{_defaultdocdir}/%{name}-%{version}/CREDITS | 325 | %{_defaultdocdir}/%{name}-%{version}/CREDITS |
@@ -330,6 +331,7 @@ fi | |||
330 | %{_defaultdocdir}/%{name}-%{version}/faq.html | 331 | %{_defaultdocdir}/%{name}-%{version}/faq.html |
331 | %{_mandir}/man1/* | 332 | %{_mandir}/man1/* |
332 | %{_mandir}/man8/ssh-keysign.8.gz | 333 | %{_mandir}/man8/ssh-keysign.8.gz |
334 | %{_mandir}/man8/ssh-pkcs11-helper.8.gz | ||
333 | %{_mandir}/man5/ssh_config.5.gz | 335 | %{_mandir}/man5/ssh_config.5.gz |
334 | 336 | ||
335 | %Files server | 337 | %Files server |
@@ -358,4 +360,4 @@ fi | |||
358 | * Mon Jan 01 1998 ... | 360 | * Mon Jan 01 1998 ... |
359 | Template Version: 1.31 | 361 | Template Version: 1.31 |
360 | 362 | ||
361 | $Id: openssh.spec,v 1.66.4.1 2009/09/26 04:09:35 djm Exp $ | 363 | $Id: openssh.spec,v 1.69 2010/03/07 22:41:03 djm Exp $ |
diff --git a/contrib/cygwin/Makefile b/contrib/cygwin/Makefile index 2ebd143dc..9f680c16c 100644 --- a/contrib/cygwin/Makefile +++ b/contrib/cygwin/Makefile | |||
@@ -1,8 +1,10 @@ | |||
1 | srcdir=../.. | 1 | srcdir=../.. |
2 | copyidsrcdir=.. | ||
2 | prefix=/usr | 3 | prefix=/usr |
3 | exec_prefix=$(prefix) | 4 | exec_prefix=$(prefix) |
4 | bindir=$(prefix)/bin | 5 | bindir=$(prefix)/bin |
5 | datadir=$(prefix)/share | 6 | datadir=$(prefix)/share |
7 | mandir=$(datadir)/man | ||
6 | docdir=$(datadir)/doc | 8 | docdir=$(datadir)/doc |
7 | sshdocdir=$(docdir)/openssh | 9 | sshdocdir=$(docdir)/openssh |
8 | cygdocdir=$(docdir)/Cygwin | 10 | cygdocdir=$(docdir)/Cygwin |
@@ -59,5 +61,16 @@ install-scripts: ssh-host-config ssh-user-config | |||
59 | $(INSTALL) -m 755 ssh-host-config $(DESTDIR)$(bindir)/ssh-host-config | 61 | $(INSTALL) -m 755 ssh-host-config $(DESTDIR)$(bindir)/ssh-host-config |
60 | $(INSTALL) -m 755 ssh-user-config $(DESTDIR)$(bindir)/ssh-user-config | 62 | $(INSTALL) -m 755 ssh-user-config $(DESTDIR)$(bindir)/ssh-user-config |
61 | 63 | ||
62 | cygwin-postinstall: move-config-files remove-empty-dir install-inetd-config install-doc install-scripts | 64 | install-copy-id: $(copyidsrcdir)/ssh-copy-id $(copyidsrcdir)/ssh-copy-id.1 |
65 | $(INSTALL) -m 755 $(copyidsrcdir)/ssh-copy-id $(DESTDIR)$(bindir)/ssh-copy-id | ||
66 | $(INSTALL) -m 644 $(copyidsrcdir)/ssh-copy-id.1 $(DESTDIR)$(mandir)/man1/ssh-copy-id.1 | ||
67 | |||
68 | gzip-man-pages: | ||
69 | rm $(DESTDIR)$(mandir)/man1/slogin.1 | ||
70 | gzip $(DESTDIR)$(mandir)/man1/*.1 | ||
71 | gzip $(DESTDIR)$(mandir)/man5/*.5 | ||
72 | gzip $(DESTDIR)$(mandir)/man8/*.8 | ||
73 | cd $(DESTDIR)$(mandir)/man1 && ln -s ssh.1.gz slogin.1.gz | ||
74 | |||
75 | cygwin-postinstall: move-config-files remove-empty-dir install-inetd-config install-doc install-scripts install-copy-id gzip-man-pages | ||
63 | @echo "Cygwin specific configuration finished." | 76 | @echo "Cygwin specific configuration finished." |
diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c index 901176dbb..9d97c30c0 100644 --- a/contrib/gnome-ssh-askpass2.c +++ b/contrib/gnome-ssh-askpass2.c | |||
@@ -120,6 +120,8 @@ passphrase_dialog(char *message) | |||
120 | g_signal_connect(G_OBJECT(entry), "activate", | 120 | g_signal_connect(G_OBJECT(entry), "activate", |
121 | G_CALLBACK(ok_dialog), dialog); | 121 | G_CALLBACK(ok_dialog), dialog); |
122 | 122 | ||
123 | gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); | ||
124 | |||
123 | /* Grab focus */ | 125 | /* Grab focus */ |
124 | gtk_widget_show_now(dialog); | 126 | gtk_widget_show_now(dialog); |
125 | if (grab_pointer) { | 127 | if (grab_pointer) { |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 680906cf3..de24f1c5d 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,4 +1,4 @@ | |||
1 | %define ver 5.3p1 | 1 | %define ver 5.4p1 |
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 |
@@ -74,7 +74,9 @@ Release: %{rel} | |||
74 | %endif | 74 | %endif |
75 | URL: http://www.openssh.com/portable.html | 75 | URL: http://www.openssh.com/portable.html |
76 | Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz | 76 | Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz |
77 | %if ! %{skip_x11_askpass} | ||
77 | Source1: http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz | 78 | Source1: http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz |
79 | %endif | ||
78 | License: BSD | 80 | License: BSD |
79 | Group: Applications/Internet | 81 | Group: Applications/Internet |
80 | BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot | 82 | BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot |
@@ -92,7 +94,7 @@ BuildPreReq: glibc-devel, pam | |||
92 | BuildPreReq: /usr/include/security/pam_appl.h | 94 | BuildPreReq: /usr/include/security/pam_appl.h |
93 | %endif | 95 | %endif |
94 | %if ! %{no_x11_askpass} | 96 | %if ! %{no_x11_askpass} |
95 | BuildPreReq: XFree86-devel | 97 | BuildPreReq: /usr/include/X11/Xlib.h |
96 | %endif | 98 | %endif |
97 | %if ! %{no_gnome_askpass} | 99 | %if ! %{no_gnome_askpass} |
98 | BuildPreReq: pkgconfig | 100 | BuildPreReq: pkgconfig |
@@ -343,7 +345,9 @@ fi | |||
343 | %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* | 345 | %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* |
344 | %attr(0755,root,root) %dir %{_libexecdir}/openssh | 346 | %attr(0755,root,root) %dir %{_libexecdir}/openssh |
345 | %attr(4711,root,root) %{_libexecdir}/openssh/ssh-keysign | 347 | %attr(4711,root,root) %{_libexecdir}/openssh/ssh-keysign |
348 | %attr(0755,root,root) %{_libexecdir}/openssh/ssh-pkcs11-helper | ||
346 | %attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8* | 349 | %attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8* |
350 | %attr(0644,root,root) %{_mandir}/man8/ssh-pkcs11-helper.8* | ||
347 | %endif | 351 | %endif |
348 | %if %{scard} | 352 | %if %{scard} |
349 | %attr(0755,root,root) %dir %{_datadir}/openssh | 353 | %attr(0755,root,root) %dir %{_datadir}/openssh |
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 12661eeae..c09246d1f 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec | |||
@@ -220,6 +220,7 @@ fi | |||
220 | %attr(0755,root,root) %dir %{_libdir}/ssh | 220 | %attr(0755,root,root) %dir %{_libdir}/ssh |
221 | %attr(0755,root,root) %{_libdir}/ssh/sftp-server | 221 | %attr(0755,root,root) %{_libdir}/ssh/sftp-server |
222 | %attr(4711,root,root) %{_libdir}/ssh/ssh-keysign | 222 | %attr(4711,root,root) %{_libdir}/ssh/ssh-keysign |
223 | %attr(0755,root,root) %{_libdir}/ssh/ssh-pkcs11-helper | ||
223 | %attr(0644,root,root) %doc %{_mandir}/man1/scp.1* | 224 | %attr(0644,root,root) %doc %{_mandir}/man1/scp.1* |
224 | %attr(0644,root,root) %doc %{_mandir}/man1/sftp.1* | 225 | %attr(0644,root,root) %doc %{_mandir}/man1/sftp.1* |
225 | %attr(-,root,root) %doc %{_mandir}/man1/slogin.1* | 226 | %attr(-,root,root) %doc %{_mandir}/man1/slogin.1* |
@@ -233,6 +234,7 @@ fi | |||
233 | %attr(0644,root,root) %doc %{_mandir}/man5/sshd_config.5* | 234 | %attr(0644,root,root) %doc %{_mandir}/man5/sshd_config.5* |
234 | %attr(0644,root,root) %doc %{_mandir}/man8/sftp-server.8* | 235 | %attr(0644,root,root) %doc %{_mandir}/man8/sftp-server.8* |
235 | %attr(0644,root,root) %doc %{_mandir}/man8/ssh-keysign.8* | 236 | %attr(0644,root,root) %doc %{_mandir}/man8/ssh-keysign.8* |
237 | %attr(0644,root,root) %doc %{_mandir}/man8/ssh-pkcs11-helper.8* | ||
236 | %attr(0644,root,root) %doc %{_mandir}/man8/sshd.8* | 238 | %attr(0644,root,root) %doc %{_mandir}/man8/sshd.8* |
237 | %attr(0644,root,root) /var/adm/fillup-templates/sysconfig.ssh | 239 | %attr(0644,root,root) /var/adm/fillup-templates/sysconfig.ssh |
238 | 240 | ||