summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--README4
-rw-r--r--contrib/caldera/openssh.spec4
-rw-r--r--contrib/redhat/openssh.spec2
-rw-r--r--contrib/suse/openssh.spec2
5 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e09a6835b..29578ef0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
120110905
2 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
3 [contrib/suse/openssh.spec] Update version numbers.
4
120110904 520110904
2 - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal 6 - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal
3 regress errors for the sandbox to warnings. ok tim dtucker 7 regress errors for the sandbox to warnings. ok tim dtucker
4 - (dtucker) [ssh-keygen.c ssh-pkcs11.c] Bug #1929: add null implementations 8 - (dtucker) [ssh-keygen.c ssh-pkcs11.c] Bug #1929: add null implementations
5 ofsh-pkcs11.cpkcs_init and pkcs_terminate for building without dlopen support. 9 ofsh-pkcs11.cpkcs_init and pkcs_terminate for building without dlopen
10 support.
6 11
720110829 1220110829
8 - (djm) [openbsd-compat/port-linux.c] Suppress logging when attempting 13 - (djm) [openbsd-compat/port-linux.c] Suppress logging when attempting
diff --git a/README b/README
index 0a772d2bc..093a3849a 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
1See http://www.openssh.com/txt/release-5.8p2 for the release notes. 1See http://www.openssh.com/txt/release-5.9p1 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.77 2011/06/03 00:35:26 dtucker Exp $ 65$Id: README,v 1.77.2.1 2011/09/05 00:27:58 djm Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index e6f5a9333..73d441d0c 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.8p2 19%define version 5.9p1
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 ...
364Template Version: 1.31 364Template Version: 1.31
365 365
366$Id: openssh.spec,v 1.75 2011/06/03 00:35:26 dtucker Exp $ 366$Id: openssh.spec,v 1.75.2.1 2011/09/05 00:28:11 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 2b927f177..be6de088c 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
1%define ver 5.8p2 1%define ver 5.9p1
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 4621f548c..3a4dfea37 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.8p2 16Version: 5.9p1
17URL: http://www.openssh.com/ 17URL: http://www.openssh.com/
18Release: 1 18Release: 1
19Source0: openssh-%{version}.tar.gz 19Source0: openssh-%{version}.tar.gz