- (djm) Respin OpenSSH-5.9p1 release

[contrib/suse/openssh.spec] Update version numbers.

ChangeLog

@@ -1,8 +1,18 @@
+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.
+
 20110904
  - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal
    regress errors for the sandbox to warnings. ok tim dtucker
  - (dtucker) [ssh-keygen.c ssh-pkcs11.c] Bug #1929: add null implementations
-   ofsh-pkcs11.cpkcs_init and pkcs_terminate for building without dlopen support.
+   ofsh-pkcs11.cpkcs_init and pkcs_terminate for building without dlopen
+   support.
 
 20110829
  - (djm) [openbsd-compat/port-linux.c] Suppress logging when attempting

README

@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-5.8p2 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 2011/06/03 00:35:26 dtucker Exp $
+$Id: README,v 1.77.2.2 2011/09/06 23:11:20 djm Exp $

contrib/caldera/openssh.spec

@@ -16,7 +16,7 @@
 
 #old cvs stuff.  please update before use.  may be deprecated.
 %define use_stable	1
-%define version 	5.8p2
+%define version 	5.9p1
 %if %{use_stable}
   %define cvs		%{nil}
   %define release 	1
@@ -363,4 +363,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.75 2011/06/03 00:35:26 dtucker Exp $
+$Id: openssh.spec,v 1.75.2.1 2011/09/05 00:28:11 djm Exp $

contrib/redhat/openssh.spec

@@ -1,4 +1,4 @@
-%define ver 5.8p2
+%define ver 5.9p1
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID

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:"

contrib/suse/openssh.spec

@@ -13,7 +13,7 @@
 
 Summary:	OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name:		openssh
-Version:	5.8p2
+Version:	5.9p1
 URL:		http://www.openssh.com/
 Release:	1
 Source0:	openssh-%{version}.tar.gz

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