summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--README4
-rw-r--r--contrib/caldera/openssh.spec5
-rw-r--r--contrib/redhat/openssh.spec2
-rw-r--r--contrib/suse/openssh.spec2
5 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 35144239a..3bb45baff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
3 - djm@cvs.openbsd.org 2010/08/08 16:26:42 3 - djm@cvs.openbsd.org 2010/08/08 16:26:42
4 [version.h] 4 [version.h]
5 crank to 5.6 5 crank to 5.6
6 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
7 [contrib/suse/openssh.spec] Crank version numbers
6 8
720100805 920100805
8 - OpenBSD CVS Sync 10 - OpenBSD CVS Sync
diff --git a/README b/README
index a29f2007d..4eaa54588 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
1See http://www.openssh.com/txt/release-5.5 for the release notes. 1See http://www.openssh.com/txt/release-5.6 for the release notes.
2 2
3- A Japanese translation of this document and of the OpenSSH FAQ is 3- A Japanese translation of this document and of the OpenSSH FAQ is
4- available at http://www.unixuser.org/~haruyama/security/openssh/index.html 4- available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@ References -
62[6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 62[6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
63[7] http://www.openssh.com/faq.html 63[7] http://www.openssh.com/faq.html
64 64
65$Id: README,v 1.73 2010/03/21 19:11:55 djm Exp $ 65$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 @@
16 16
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%define version 5.6p1
19%if %{use_stable} 20%if %{use_stable}
20 %define version 5.5p1
21 %define cvs %{nil} 21 %define cvs %{nil}
22 %define release 1 22 %define release 1
23%else 23%else
24 %define version 5.5p1
25 %define cvs cvs20050315 24 %define cvs cvs20050315
26 %define release 0r1 25 %define release 0r1
27%endif 26%endif
@@ -360,4 +359,4 @@ fi
360* Mon Jan 01 1998 ... 359* Mon Jan 01 1998 ...
361Template Version: 1.31 360Template Version: 1.31
362 361
363$Id: openssh.spec,v 1.70 2010/03/21 19:11:58 djm Exp $ 362$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 @@
1%define ver 5.5p1 1%define ver 5.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
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 @@
13 13
14Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation 14Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
15Name: openssh 15Name: openssh
16Version: 5.5p1 16Version: 5.6p1
17URL: http://www.openssh.com/ 17URL: http://www.openssh.com/
18Release: 1 18Release: 1
19Source0: openssh-%{version}.tar.gz 19Source0: openssh-%{version}.tar.gz