diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | README | 4 | ||||
-rw-r--r-- | contrib/caldera/openssh.spec | 4 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 2 | ||||
-rw-r--r-- | contrib/suse/openssh.spec | 2 | ||||
-rw-r--r-- | version.h | 2 |
6 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20110603 | ||
2 | - (dtucker) [README version.h contrib/caldera/openssh.spec | ||
3 | contrib/redhat/openssh.spec contrib/suse/openssh.spec] Pull the version | ||
4 | bumps from the 5.8p2 branch into HEAD. ok djm. | ||
5 | |||
1 | 20110529 | 6 | 20110529 |
2 | - (djm) OpenBSD CVS Sync | 7 | - (djm) OpenBSD CVS Sync |
3 | - djm@cvs.openbsd.org 2011/05/23 03:30:07 | 8 | - djm@cvs.openbsd.org 2011/05/23 03:30:07 |
@@ -1,4 +1,4 @@ | |||
1 | See http://www.openssh.com/txt/release-5.8 for the release notes. | 1 | See http://www.openssh.com/txt/release-5.8p2 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.76 2011/02/04 01:43:39 djm Exp $ | 65 | $Id: README,v 1.77 2011/06/03 00:35:26 dtucker Exp $ |
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 9fc553ed3..e6f5a9333 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec | |||
@@ -16,7 +16,7 @@ | |||
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.8p1 | 19 | %define version 5.8p2 |
20 | %if %{use_stable} | 20 | %if %{use_stable} |
21 | %define cvs %{nil} | 21 | %define cvs %{nil} |
22 | %define release 1 | 22 | %define release 1 |
@@ -363,4 +363,4 @@ fi | |||
363 | * Mon Jan 01 1998 ... | 363 | * Mon Jan 01 1998 ... |
364 | Template Version: 1.31 | 364 | Template Version: 1.31 |
365 | 365 | ||
366 | $Id: openssh.spec,v 1.74 2011/02/04 01:43:44 djm Exp $ | 366 | $Id: openssh.spec,v 1.75 2011/06/03 00:35:26 dtucker Exp $ |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index e99e33d0f..23657eacd 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,4 +1,4 @@ | |||
1 | %define ver 5.8p1 | 1 | %define ver 5.8p2 |
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 6afdcc4b4..db0c127bd 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec | |||
@@ -13,7 +13,7 @@ | |||
13 | 13 | ||
14 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation | 14 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation |
15 | Name: openssh | 15 | Name: openssh |
16 | Version: 5.8p1 | 16 | Version: 5.8p2 |
17 | URL: http://www.openssh.com/ | 17 | URL: http://www.openssh.com/ |
18 | Release: 1 | 18 | Release: 1 |
19 | Source0: openssh-%{version}.tar.gz | 19 | Source0: openssh-%{version}.tar.gz |
@@ -2,5 +2,5 @@ | |||
2 | 2 | ||
3 | #define SSH_VERSION "OpenSSH_5.8" | 3 | #define SSH_VERSION "OpenSSH_5.8" |
4 | 4 | ||
5 | #define SSH_PORTABLE "p1" | 5 | #define SSH_PORTABLE "p2" |
6 | #define SSH_RELEASE SSH_VERSION SSH_PORTABLE | 6 | #define SSH_RELEASE SSH_VERSION SSH_PORTABLE |