From ea43742e77ca5a14b625ebf073ba696b75cd7330 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 2 Oct 2009 11:49:03 +1000 Subject: pull in 5.3 release changes from branch: 20090926 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] [contrib/suse/openssh.spec] Update for release - (djm) [README] update relnotes URL - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere - (djm) Release 5.3p1 --- contrib/caldera/openssh.spec | 6 +++--- contrib/redhat/openssh.spec | 2 +- contrib/suse/openssh.spec | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'contrib') diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 42dbcfeeb..9ced32faf 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -17,11 +17,11 @@ #old cvs stuff. please update before use. may be deprecated. %define use_stable 1 %if %{use_stable} - %define version 5.2p1 + %define version 5.3p1 %define cvs %{nil} %define release 1 %else - %define version 5.2p1 + %define version 5.3p1 %define cvs cvs20050315 %define release 0r1 %endif @@ -358,4 +358,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.66 2009/02/21 07:03:05 djm Exp $ +$Id: openssh.spec,v 1.67 2009/10/02 01:49:05 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 10bdc1989..680906cf3 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,4 +1,4 @@ -%define ver 5.2p1 +%define ver 5.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 62f43e137..12661eeae 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: 5.2p1 +Version: 5.3p1 URL: http://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz -- cgit v1.2.3 From 2191e04549839502631f3f97ededd301a1498cd0 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 18 Nov 2009 17:51:59 +1100 Subject: - (djm) [contrib/gnome-ssh-askpass2.c] Make askpass dialog desktop-modal. bz#1645, patch from jchadima AT redhat.com --- ChangeLog | 4 +++- contrib/gnome-ssh-askpass2.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index c2e6cadc6..566167053 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,9 @@ - (djm) [channels.c misc.c misc.h sshd.c] add missing setsockopt() to set IPV6_V6ONLY for local forwarding with GatwayPorts=yes. Unify setting IPV6_V6ONLY behind a new function misc.c:sock_set_v6only() - report and fix from jan.kratochvil AT redhat.com + bz#1648, report and fix from jan.kratochvil AT redhat.com + - (djm) [contrib/gnome-ssh-askpass2.c] Make askpass dialog desktop-modal. + bz#1645, patch from jchadima AT redhat.com 20091107 - (dtucker) [authfile.c] Fall back to 3DES for the encryption of private 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) g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(ok_dialog), dialog); + gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); + /* Grab focus */ gtk_widget_show_now(dialog); if (grab_pointer) { -- cgit v1.2.3 From d35e0ef61658aa3116eebb1606fcfe6f849fdcca Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 7 Dec 2009 11:32:36 +1100 Subject: - (dtucker) Bug #1677: add conditionals around the source for ssh-askpass. --- ChangeLog | 1 + contrib/redhat/openssh.spec | 2 ++ 2 files changed, 3 insertions(+) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index 1c3c93b63..53d89c905 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 20091207 - (dtucker) Bug #1160: use pkg-config for opensc config if it's available. Tested by Martin Paljak. + - (dtucker) Bug #1677: add conditionals around the source for ssh-askpass. 20091121 - (tim) [opensshd.init.in] If PidFile is set in sshd_config, use it. diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 680906cf3..1bdaf2d93 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -74,7 +74,9 @@ Release: %{rel} %endif URL: http://www.openssh.com/portable.html Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz +%if ! %{skip_x11_askpass} Source1: http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz +%endif License: BSD Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot -- cgit v1.2.3 From 880ab0d84e1c7d7957ff38d6506ff92868407a77 Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Sat, 26 Dec 2009 15:40:47 -0800 Subject: - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 Gzip all man pages. Patch from Corinna Vinschen. --- ChangeLog | 4 ++++ contrib/cygwin/Makefile | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index 677a6af1e..dec861245 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20091226 + - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 + Gzip all man pages. Patch from Corinna Vinschen. + 20091221 - (dtucker) [auth-krb5.c platform.{c,h} openbsd-compat/port-aix.{c,h}] Bug #1583: Use system's kerberos principal name on AIX if it's available. 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 @@ srcdir=../.. +copyidsrcdir=.. prefix=/usr exec_prefix=$(prefix) bindir=$(prefix)/bin datadir=$(prefix)/share +mandir=$(datadir)/man docdir=$(datadir)/doc sshdocdir=$(docdir)/openssh cygdocdir=$(docdir)/Cygwin @@ -59,5 +61,16 @@ install-scripts: ssh-host-config ssh-user-config $(INSTALL) -m 755 ssh-host-config $(DESTDIR)$(bindir)/ssh-host-config $(INSTALL) -m 755 ssh-user-config $(DESTDIR)$(bindir)/ssh-user-config -cygwin-postinstall: move-config-files remove-empty-dir install-inetd-config install-doc install-scripts +install-copy-id: $(copyidsrcdir)/ssh-copy-id $(copyidsrcdir)/ssh-copy-id.1 + $(INSTALL) -m 755 $(copyidsrcdir)/ssh-copy-id $(DESTDIR)$(bindir)/ssh-copy-id + $(INSTALL) -m 644 $(copyidsrcdir)/ssh-copy-id.1 $(DESTDIR)$(mandir)/man1/ssh-copy-id.1 + +gzip-man-pages: + rm $(DESTDIR)$(mandir)/man1/slogin.1 + gzip $(DESTDIR)$(mandir)/man1/*.1 + gzip $(DESTDIR)$(mandir)/man5/*.5 + gzip $(DESTDIR)$(mandir)/man8/*.8 + cd $(DESTDIR)$(mandir)/man1 && ln -s ssh.1.gz slogin.1.gz + +cygwin-postinstall: move-config-files remove-empty-dir install-inetd-config install-doc install-scripts install-copy-id gzip-man-pages @echo "Cygwin specific configuration finished." -- cgit v1.2.3 From d27d85d5320bb946d4bb734dcf45a8d20bad6020 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 24 Feb 2010 18:21:45 +1100 Subject: contrib/caldera/openssh.spec contrib/redhat/openssh.spec contrib/suse/openssh.spec --- ChangeLog | 2 ++ contrib/caldera/openssh.spec | 4 +++- contrib/redhat/openssh.spec | 2 ++ contrib/suse/openssh.spec | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index 761c1913a..10c074c26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,8 @@ [regress/agent-pkcs11.sh] test for PKCS#11 support (currently disabled) - (djm) [Makefile.in ssh-pkcs11-helper.8] Add manpage for PKCS#11 helper + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Add PKCS#11 helper binary and manpage 20100212 - (djm) OpenBSD CVS Sync diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 9ced32faf..e6c030c0d 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -319,6 +319,7 @@ fi %{_bindir}/ssh-keyscan %dir %{_libexecdir} %attr(4711,root,root) %{_libexecdir}/ssh-keysign +%{_libexecdir}/ssh-pkcs11-helper %{_sbindir}/ssh-host-keygen %dir %{_defaultdocdir}/%{name}-%{version} %{_defaultdocdir}/%{name}-%{version}/CREDITS @@ -330,6 +331,7 @@ fi %{_defaultdocdir}/%{name}-%{version}/faq.html %{_mandir}/man1/* %{_mandir}/man8/ssh-keysign.8.gz +%{_mandir}/man8/ssh-pkcs11-helper.8.gz %{_mandir}/man5/ssh_config.5.gz %Files server @@ -358,4 +360,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.67 2009/10/02 01:49:05 djm Exp $ +$Id: openssh.spec,v 1.68 2010/02/24 07:21:46 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 1bdaf2d93..a15afc7ee 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -345,7 +345,9 @@ fi %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* %attr(0755,root,root) %dir %{_libexecdir}/openssh %attr(4711,root,root) %{_libexecdir}/openssh/ssh-keysign +%attr(0755,root,root) %{_libexecdir}/openssh/ssh-pkcs11-helper %attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8* +%attr(0644,root,root) %{_mandir}/man8/ssh-pkcs11-helper.8* %endif %if %{scard} %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 %attr(0755,root,root) %dir %{_libdir}/ssh %attr(0755,root,root) %{_libdir}/ssh/sftp-server %attr(4711,root,root) %{_libdir}/ssh/ssh-keysign +%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* @@ -233,6 +234,7 @@ fi %attr(0644,root,root) %doc %{_mandir}/man5/sshd_config.5* %attr(0644,root,root) %doc %{_mandir}/man8/sftp-server.8* %attr(0644,root,root) %doc %{_mandir}/man8/ssh-keysign.8* +%attr(0644,root,root) %doc %{_mandir}/man8/ssh-pkcs11-helper.8* %attr(0644,root,root) %doc %{_mandir}/man8/sshd.8* %attr(0644,root,root) /var/adm/fillup-templates/sysconfig.ssh -- cgit v1.2.3 From 661ffc1fd6d7c2d1f99ee0ab6918b10e53fe4f82 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 4 Mar 2010 21:09:24 +1100 Subject: - (djm) [contrib/redhat/openssh.spec] Replace obsolete BuildPreReq on XFree86-devel with neutral /usr/include/X11/Xlib.h; imorgan AT nas.nasa.gov in bz#1731 --- ChangeLog | 3 +++ contrib/redhat/openssh.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index c5398522b..1e82d21b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 20100304 - (djm) [ssh-keygen.c] Use correct local variable, instead of maybe-undefined global "optarg" + - (djm) [contrib/redhat/openssh.spec] Replace obsolete BuildPreReq + on XFree86-devel with neutral /usr/include/X11/Xlib.h; + imorgan AT nas.nasa.gov in bz#1731 20100303 - (djm) [PROTOCOL.certkeys] Add RCS Ident diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index a15afc7ee..4bec90078 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -94,7 +94,7 @@ BuildPreReq: glibc-devel, pam BuildPreReq: /usr/include/security/pam_appl.h %endif %if ! %{no_x11_askpass} -BuildPreReq: XFree86-devel +BuildPreReq: /usr/include/X11/Xlib.h %endif %if ! %{no_gnome_askpass} BuildPreReq: pkgconfig -- cgit v1.2.3 From 6bf31786cfa4518f2c81088ddaa7c34de0b532bf Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 8 Mar 2010 09:41:02 +1100 Subject: - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] crank version numbers --- ChangeLog | 3 +++ README | 4 ++-- contrib/caldera/openssh.spec | 6 +++--- contrib/redhat/openssh.spec | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index 707be2dd6..ee1c3417f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ - djm@cvs.openbsd.org 2010/03/07 22:01:32 [version.h] openssh-5.4 + - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + crank version numbers + 20100307 - (dtucker) [auth.c] Bug #1710: call setauthdb on AIX before getpwuid so that diff --git a/README b/README index 16666518a..0ecb670b6 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-5.3 for the release notes. +See http://www.openssh.com/txt/release-5.4 for the release notes. - A Japanese translation of this document and of the OpenSSH FAQ is - available at http://www.unixuser.org/~haruyama/security/openssh/index.html @@ -62,4 +62,4 @@ References - [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [7] http://www.openssh.com/faq.html -$Id: README,v 1.71 2009/10/02 01:49:03 djm Exp $ +$Id: README,v 1.72 2010/03/07 22:41:02 djm Exp $ diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index e6c030c0d..7c291a0eb 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -17,11 +17,11 @@ #old cvs stuff. please update before use. may be deprecated. %define use_stable 1 %if %{use_stable} - %define version 5.3p1 + %define version 5.4p1 %define cvs %{nil} %define release 1 %else - %define version 5.3p1 + %define version 5.4p1 %define cvs cvs20050315 %define release 0r1 %endif @@ -360,4 +360,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.68 2010/02/24 07:21:46 djm Exp $ +$Id: openssh.spec,v 1.69 2010/03/07 22:41:03 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 4bec90078..de24f1c5d 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,4 +1,4 @@ -%define ver 5.3p1 +%define ver 5.4p1 %define rel 1 # OpenSSH privilege separation requires a user & group ID -- cgit v1.2.3