From cfbdc28ffe06de99d582ddff43f9f0be7dccc608 Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Wed, 14 Jul 2010 13:42:28 -0700 Subject: - (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass (line 77) should have been for no_x11_askpass. --- contrib/redhat/openssh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'contrib/redhat/openssh.spec') diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index c13cfe60d..a8637d954 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -74,7 +74,7 @@ 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} +%if ! %{no_x11_askpass} Source1: http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz %endif License: BSD @@ -407,6 +407,9 @@ fi %endif %changelog +* Wed Jul 14 2010 Tim Rice +- test for skip_x11_askpass (line 77) should have been for no_x11_askpass + * Mon Jun 2 2003 Damien Miller - Remove noip6 option. This may be controlled at run-time in client config file using new AddressFamily directive -- cgit v1.2.3 From 792010bafde7f901d339039b56f648912fd54b02 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 9 Aug 2010 02:32:05 +1000 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 | 5 ++--- contrib/redhat/openssh.spec | 2 +- contrib/suse/openssh.spec | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) (limited to 'contrib/redhat/openssh.spec') diff --git a/ChangeLog b/ChangeLog index 35144239a..3bb45baff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ - djm@cvs.openbsd.org 2010/08/08 16:26:42 [version.h] crank to 5.6 + - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Crank version numbers 20100805 - OpenBSD CVS Sync diff --git a/README b/README index a29f2007d..4eaa54588 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-5.5 for the release notes. +See http://www.openssh.com/txt/release-5.6 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.73 2010/03/21 19:11:55 djm Exp $ +$Id: README,v 1.74 2010/08/08 16:32:06 djm Exp $ diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 6bea9a40f..515fe334d 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -16,12 +16,11 @@ #old cvs stuff. please update before use. may be deprecated. %define use_stable 1 +%define version 5.6p1 %if %{use_stable} - %define version 5.5p1 %define cvs %{nil} %define release 1 %else - %define version 5.5p1 %define cvs cvs20050315 %define release 0r1 %endif @@ -360,4 +359,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.70 2010/03/21 19:11:58 djm Exp $ +$Id: openssh.spec,v 1.71 2010/08/08 16:32:09 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index a8637d954..77e66252e 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,4 +1,4 @@ -%define ver 5.5p1 +%define ver 5.6p1 %define rel 1 # OpenSSH privilege separation requires a user & group ID diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 52ed915dc..f099746f2 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.5p1 +Version: 5.6p1 URL: http://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz -- cgit v1.2.3