summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--README4
-rwxr-xr-xcontrib/redhat/sshd.init8
-rw-r--r--debian/patches/package-versioning.patch2
-rw-r--r--version.h2
5 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index f75aa5637..ee6460d4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
120110906
2 - (djm) [README version.h] Correct version
3 - (djm) [contrib/redhat/openssh.spec] Correct restorcon => restorecon
4 - (djm) Respin OpenSSH-5.9p1 release
5
120110905 620110905
2 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] 7 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
3 [contrib/suse/openssh.spec] Update version numbers. 8 [contrib/suse/openssh.spec] Update version numbers.
4 - (djm) Release OpenSSH-5.9
5 9
620110904 1020110904
7 - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal 11 - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal
diff --git a/README b/README
index 093a3849a..e26654b2f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
1See http://www.openssh.com/txt/release-5.9p1 for the release notes. 1See http://www.openssh.com/txt/release-5.9 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.2.1 2011/09/05 00:27:58 djm Exp $ 65$Id: README,v 1.77.2.2 2011/09/06 23:11:20 djm Exp $
diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init
index 2334d8142..e9a751796 100755
--- a/contrib/redhat/sshd.init
+++ b/contrib/redhat/sshd.init
@@ -40,10 +40,10 @@ start()
40 # Create keys if necessary 40 # Create keys if necessary
41 /usr/bin/ssh-keygen -A 41 /usr/bin/ssh-keygen -A
42 if [ -x /sbin/restorecon ]; then 42 if [ -x /sbin/restorecon ]; then
43 /sbin/restorcon /etc/ssh/ssh_host_key.pub 43 /sbin/restorecon /etc/ssh/ssh_host_key.pub
44 /sbin/restorcon /etc/ssh/ssh_host_rsa_key.pub 44 /sbin/restorecon /etc/ssh/ssh_host_rsa_key.pub
45 /sbin/restorcon /etc/ssh/ssh_host_dsa_key.pub 45 /sbin/restorecon /etc/ssh/ssh_host_dsa_key.pub
46 /sbin/restorcon /etc/ssh/ssh_host_ecdsa_key.pub 46 /sbin/restorecon /etc/ssh/ssh_host_ecdsa_key.pub
47 fi 47 fi
48 48
49 echo -n $"Starting $prog:" 49 echo -n $"Starting $prog:"
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch
index 6dd0cf78d..95444cbd4 100644
--- a/debian/patches/package-versioning.patch
+++ b/debian/patches/package-versioning.patch
@@ -40,7 +40,7 @@ Index: b/version.h
40@@ -3,4 +3,9 @@ 40@@ -3,4 +3,9 @@
41 #define SSH_VERSION "OpenSSH_5.9" 41 #define SSH_VERSION "OpenSSH_5.9"
42 42
43 #define SSH_PORTABLE "p2" 43 #define SSH_PORTABLE "p1"
44-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE 44-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
45+#define SSH_RELEASE_MINIMUM SSH_VERSION SSH_PORTABLE 45+#define SSH_RELEASE_MINIMUM SSH_VERSION SSH_PORTABLE
46+#ifdef SSH_EXTRAVERSION 46+#ifdef SSH_EXTRAVERSION
diff --git a/version.h b/version.h
index 577684554..b731237f9 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
2 2
3#define SSH_VERSION "OpenSSH_5.9" 3#define SSH_VERSION "OpenSSH_5.9"
4 4
5#define SSH_PORTABLE "p2" 5#define SSH_PORTABLE "p1"
6#define SSH_RELEASE_MINIMUM SSH_VERSION SSH_PORTABLE 6#define SSH_RELEASE_MINIMUM SSH_VERSION SSH_PORTABLE
7#ifdef SSH_EXTRAVERSION 7#ifdef SSH_EXTRAVERSION
8#define SSH_RELEASE SSH_RELEASE_MINIMUM " " SSH_EXTRAVERSION 8#define SSH_RELEASE SSH_RELEASE_MINIMUM " " SSH_EXTRAVERSION