merge 5.9p1 (respun)

4 files changed, 12 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index f75aa5637..ee6460d4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+20110906
+ - (djm) [README version.h] Correct version
+ - (djm) [contrib/redhat/openssh.spec] Correct restorcon => restorecon
+ - (djm) Respin OpenSSH-5.9p1 release
+
 20110905
  - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
    [contrib/suse/openssh.spec] Update version numbers.
- - (djm) Release OpenSSH-5.9
 
 20110904
  - (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 @@
-See http://www.openssh.com/txt/release-5.9p1 for the release notes.
+See http://www.openssh.com/txt/release-5.9 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.77.2.1 2011/09/05 00:27:58 djm Exp $
+$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()
         # Create keys if necessary
         /usr/bin/ssh-keygen -A
         if [ -x /sbin/restorecon ]; then
-                /sbin/restorcon /etc/ssh/ssh_host_key.pub
-                /sbin/restorcon /etc/ssh/ssh_host_rsa_key.pub
-                /sbin/restorcon /etc/ssh/ssh_host_dsa_key.pub
-                /sbin/restorcon /etc/ssh/ssh_host_ecdsa_key.pub
+                /sbin/restorecon /etc/ssh/ssh_host_key.pub
+                /sbin/restorecon /etc/ssh/ssh_host_rsa_key.pub
+                /sbin/restorecon /etc/ssh/ssh_host_dsa_key.pub
+                /sbin/restorecon /etc/ssh/ssh_host_ecdsa_key.pub
         fi
 
         echo -n $"Starting $prog:"
diff --git a/version.h b/version.h
index d3d57eab0..6a1acb3b6 100644
--- a/version.h
+++ b/version.h
@@ -2,5 +2,5 @@
 
 #define SSH_VERSION     "OpenSSH_5.9"
 
-#define SSH_PORTABLE    "p2"
+#define SSH_PORTABLE    "p1"
 #define SSH_RELEASE     SSH_VERSION SSH_PORTABLE