From fa233ba73bdef475c2a509a914e352d544373d07 Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Wed, 10 Mar 2010 16:12:02 -0800 Subject: - (tim) [contrib/suse/openssh.spec] crank version number here too. report by imorgan AT nas.nasa.gov --- contrib/suse/openssh.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index c09246d1f..90de767d3 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.3p1 +Version: 5.4p1 URL: http://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz -- cgit v1.2.3 From 4e0cea82dd75199c4a4f59165b1971d0d7c45919 Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Thu, 11 Mar 2010 22:35:19 -0800 Subject: - (tim) [contrib/cygwin/Makefile] Fix list of documentation files to install on a Cygwin installation. Patch from Corinna Vinschen. --- ChangeLog | 2 ++ contrib/cygwin/Makefile | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index 533d2ec3f..c6a3fe893 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ - (tim) [Makefile.in] Now that scard is gone, no need to make $(datadir) - (tim) [Makefile.in] Add missing $(EXEEXT) to install targets. Patch from Corinna Vinschen. + - (tim) [contrib/cygwin/Makefile] Fix list of documentation files to install + on a Cygwin installation. Patch from Corinna Vinschen. 20100311 - (tim) [contrib/suse/openssh.spec] crank version number here too. diff --git a/contrib/cygwin/Makefile b/contrib/cygwin/Makefile index 9f680c16c..fe3ae0bbd 100644 --- a/contrib/cygwin/Makefile +++ b/contrib/cygwin/Makefile @@ -42,11 +42,13 @@ install-sshdoc: $(INSTALL) -m 644 $(srcdir)/OVERVIEW $(DESTDIR)$(sshdocdir)/OVERVIEW $(INSTALL) -m 644 $(srcdir)/PROTOCOL $(DESTDIR)$(sshdocdir)/PROTOCOL $(INSTALL) -m 644 $(srcdir)/PROTOCOL.agent $(DESTDIR)$(sshdocdir)/PROTOCOL.agent + $(INSTALL) -m 644 $(srcdir)/PROTOCOL.certkeys $(DESTDIR)$(sshdocdir)/PROTOCOL.agent + $(INSTALL) -m 644 $(srcdir)/PROTOCOL.mux $(DESTDIR)$(sshdocdir)/PROTOCOL.agent $(INSTALL) -m 644 $(srcdir)/README $(DESTDIR)$(sshdocdir)/README $(INSTALL) -m 644 $(srcdir)/README.dns $(DESTDIR)$(sshdocdir)/README.dns $(INSTALL) -m 644 $(srcdir)/README.platform $(DESTDIR)$(sshdocdir)/README.platform $(INSTALL) -m 644 $(srcdir)/README.privsep $(DESTDIR)$(sshdocdir)/README.privsep - $(INSTALL) -m 644 $(srcdir)/README.smartcard $(DESTDIR)$(sshdocdir)/README.smartcard + $(INSTALL) -m 644 $(srcdir)/README.tun $(DESTDIR)$(sshdocdir)/README.privsep $(INSTALL) -m 644 $(srcdir)/TODO $(DESTDIR)$(sshdocdir)/TODO $(INSTALL) -m 644 $(srcdir)/WARNING.RNG $(DESTDIR)$(sshdocdir)/WARNING.RNG -- cgit v1.2.3 From b086d4ac70d4a46cd74f66b86b809992bfc0ecb8 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 22 Mar 2010 06:11:55 +1100 Subject: - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] [contrib/suse/openssh.spec] Crank version numbers --- ChangeLog | 2 ++ README | 4 ++-- contrib/caldera/openssh.spec | 6 +++--- contrib/redhat/openssh.spec | 2 +- contrib/suse/openssh.spec | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index 6490359bd..d4acdc414 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,8 @@ [version.h] crank version to openssh-5.5 since we have a few fixes since 5.4; requested deraadt@ kettenis@ + - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Crank version numbers 20100314 - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix diff --git a/README b/README index 0ecb670b6..a29f2007d 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-5.4 for the release notes. +See http://www.openssh.com/txt/release-5.5 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.72 2010/03/07 22:41:02 djm Exp $ +$Id: README,v 1.73 2010/03/21 19:11:55 djm Exp $ diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 7c291a0eb..6bea9a40f 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.4p1 + %define version 5.5p1 %define cvs %{nil} %define release 1 %else - %define version 5.4p1 + %define version 5.5p1 %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.69 2010/03/07 22:41:03 djm Exp $ +$Id: openssh.spec,v 1.70 2010/03/21 19:11:58 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index de24f1c5d..c13cfe60d 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,4 +1,4 @@ -%define ver 5.4p1 +%define ver 5.5p1 %define rel 1 # OpenSSH privilege separation requires a user & group ID diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 90de767d3..52ed915dc 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.4p1 +Version: 5.5p1 URL: http://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz -- cgit v1.2.3 From 62131dc6e2aa875b26a4deac097f256a382d816a Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 24 Mar 2010 13:03:32 +1100 Subject: - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory containing the services file explicitely case-insensitive. This allows to tweak the Windows services file reliably. Patch from vinschen at redhat. --- ChangeLog | 5 +++++ contrib/cygwin/ssh-host-config | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index d4acdc414..d94247ab7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +20100324 + - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory + containing the services file explicitely case-insensitive. This allows to + tweak the Windows services file reliably. Patch from vinschen at redhat. + 20100321 - (djm) OpenBSD CVS Sync - jmc@cvs.openbsd.org 2010/03/08 09:41:27 diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index b6f9511e2..d968d4619 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config @@ -90,7 +90,7 @@ update_services_file() { fi _serv_tmp="${_my_etcdir}/srv.out.$$" - mount -o text -f "${_win_etcdir}" "${_my_etcdir}" + mount -o text,posix=0,noacl -f "${_win_etcdir}" "${_my_etcdir}" # Depends on the above mount _wservices=`cygpath -w "${_services}"` -- cgit v1.2.3 From ffd1eaadb0b97c1f172ed0ec9eda51fd368617ae Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 26 Mar 2010 11:16:39 +1100 Subject: - (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using pkg-config, patch from Colin Watson. Needed for newer linkers (ie gold). --- ChangeLog | 2 ++ contrib/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index f217bd831..0243ef42f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,8 @@ Coker via Colin watson; bz#1726 ok dtucker@ - (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721 ok dtucker@ + - (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using + pkg-config, patch from Colin Watson. Needed for newer linkers (ie gold). 20100324 - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory diff --git a/contrib/Makefile b/contrib/Makefile index 2cef46f6c..8b34eb221 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -9,7 +9,7 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c gnome-ssh-askpass2: gnome-ssh-askpass2.c $(CC) `pkg-config --cflags gtk+-2.0` \ gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \ - `pkg-config --libs gtk+-2.0` + `pkg-config --libs gtk+-2.0 x11` clean: rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass -- cgit v1.2.3 From df08341060fe956ec07514c75b93e7140d2ebda0 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 26 Mar 2010 11:18:27 +1100 Subject: - (djm) [contrib/ssh-copy-id] Don't blow up when the agent has no keys; bz#1723 patch from Adeodato Simó via Colin Watson; ok dtucker@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 2 ++ contrib/ssh-copy-id | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index 0243ef42f..cc6cd5c56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ ok dtucker@ - (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using pkg-config, patch from Colin Watson. Needed for newer linkers (ie gold). + - (djm) [contrib/ssh-copy-id] Don't blow up when the agent has no keys; + bz#1723 patch from Adeodato Simóvia Colin Watson; ok dtucker@ 20100324 - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index df74d25c8..65c0a8cd8 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id @@ -19,7 +19,7 @@ if [ "-i" = "$1" ]; then shift # and this should leave $1 as the target name fi else - if [ x$SSH_AUTH_SOCK != x ] ; then + if [ x$SSH_AUTH_SOCK != x ] && ssh-add -L >/dev/null 2>&1; then GET_ID="$GET_ID ssh-add -L" fi fi -- cgit v1.2.3 From 537d4dcfa0289e60ab6b964f12b4ede24f633e2e Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 9 Apr 2010 13:35:23 +1000 Subject: - (dtucker) [contrib/cygwin/Makefile] Don't overwrite files with the wrong ones. Based on a patch from Roumen Petrov. --- ChangeLog | 4 ++++ contrib/cygwin/Makefile | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index 7e662faab..12842f785 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20100409 + - (dtucker) [contrib/cygwin/Makefile] Don't overwrite files with the wrong + ones. Based on a patch from Roumen Petrov. + 20100326 - (djm) [openbsd-compat/bsd-arc4random.c] Fix preprocessor detection for arc4random_buf() and arc4random_uniform(); from Josh Gilkerson diff --git a/contrib/cygwin/Makefile b/contrib/cygwin/Makefile index fe3ae0bbd..dc857f2ed 100644 --- a/contrib/cygwin/Makefile +++ b/contrib/cygwin/Makefile @@ -42,13 +42,13 @@ install-sshdoc: $(INSTALL) -m 644 $(srcdir)/OVERVIEW $(DESTDIR)$(sshdocdir)/OVERVIEW $(INSTALL) -m 644 $(srcdir)/PROTOCOL $(DESTDIR)$(sshdocdir)/PROTOCOL $(INSTALL) -m 644 $(srcdir)/PROTOCOL.agent $(DESTDIR)$(sshdocdir)/PROTOCOL.agent - $(INSTALL) -m 644 $(srcdir)/PROTOCOL.certkeys $(DESTDIR)$(sshdocdir)/PROTOCOL.agent - $(INSTALL) -m 644 $(srcdir)/PROTOCOL.mux $(DESTDIR)$(sshdocdir)/PROTOCOL.agent + $(INSTALL) -m 644 $(srcdir)/PROTOCOL.certkeys $(DESTDIR)$(sshdocdir)/PROTOCOL.certkeys + $(INSTALL) -m 644 $(srcdir)/PROTOCOL.mux $(DESTDIR)$(sshdocdir)/PROTOCOL.mux $(INSTALL) -m 644 $(srcdir)/README $(DESTDIR)$(sshdocdir)/README $(INSTALL) -m 644 $(srcdir)/README.dns $(DESTDIR)$(sshdocdir)/README.dns $(INSTALL) -m 644 $(srcdir)/README.platform $(DESTDIR)$(sshdocdir)/README.platform $(INSTALL) -m 644 $(srcdir)/README.privsep $(DESTDIR)$(sshdocdir)/README.privsep - $(INSTALL) -m 644 $(srcdir)/README.tun $(DESTDIR)$(sshdocdir)/README.privsep + $(INSTALL) -m 644 $(srcdir)/README.tun $(DESTDIR)$(sshdocdir)/README.tun $(INSTALL) -m 644 $(srcdir)/TODO $(DESTDIR)$(sshdocdir)/TODO $(INSTALL) -m 644 $(srcdir)/WARNING.RNG $(DESTDIR)$(sshdocdir)/WARNING.RNG -- cgit v1.2.3