From 6d73aa0cafb27a5efdb1a421ee7b2b0f7115dcff Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Fri, 20 May 2011 18:30:12 +0000
Subject: [PATCH] Update to openssh 5.8p2

---
 openssh/build.sh                 | 2 +-
 openssh/meta/ChangeLog           | 3 +++
 openssh/meta/postinstall.openssh | 2 +-
 openssh/src/sshd.init            | 8 +++++++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/openssh/build.sh b/openssh/build.sh
index 05d9faf..56f2518 100755
--- a/openssh/build.sh
+++ b/openssh/build.sh
@@ -7,7 +7,7 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=openssh
-version=5.6p1
+version=5.8p2
 pkgver=1
 source[0]=ftp://ftp.sunet.se/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz
 # If there are no patches, simply comment this
diff --git a/openssh/meta/ChangeLog b/openssh/meta/ChangeLog
index 4e180de..93e2115 100644
--- a/openssh/meta/ChangeLog
+++ b/openssh/meta/ChangeLog
@@ -1,5 +1,8 @@
 CHANGELOG
 ---------
+* Fri May 20 2011 Tom G. Christensen <swpkg@jupiterrise.com> - 5.8p2-1
+- Update to 5.8p2
+
 * Sep Sun 12 2010 Tom G. Christensen <swpkg@jupiterrise.com> - 5.6p1-1
 - Update to 5.6p1
 
diff --git a/openssh/meta/postinstall.openssh b/openssh/meta/postinstall.openssh
index 9d9a92e..a217c07 100644
--- a/openssh/meta/postinstall.openssh
+++ b/openssh/meta/postinstall.openssh
@@ -55,7 +55,7 @@ fi
 
 # We will try to preserve any existing keys from an old setup
 # Note that new keygen is done in the init script
-for keyfile in ssh_host_key ssh_host_dsa_key ssh_host_rsa_key; do
+for keyfile in ssh_host_key ssh_host_dsa_key ssh_host_rsa_key ssh_host_ecdsa_key; do
     if [ ! -f "${CONFDIR}/$keyfile" ] ; then
 	# Check and see if we might find it in $OLDCONFDIR
 	if [ -f "${OLDCONFDIR}/$keyfile" ]; then
diff --git a/openssh/src/sshd.init b/openssh/src/sshd.init
index 0c73838..b446e0e 100755
--- a/openssh/src/sshd.init
+++ b/openssh/src/sshd.init
@@ -8,6 +8,7 @@ KEYGEN=/usr/tgcware/bin/ssh-keygen
 RSA1_KEY=/usr/tgcware/etc/ssh/ssh_host_key
 RSA_KEY=/usr/tgcware/etc/ssh/ssh_host_rsa_key
 DSA_KEY=/usr/tgcware/etc/ssh/ssh_host_dsa_key
+ECDSA_KEY=/usr/tgcware/etc/ssh/ssh_host_ecdsa_key
 ECHO=/usr/bin/echo
 
 pidfile=/var/run/sshd.pid
@@ -36,7 +37,12 @@ do_hostkeygen()
         if [ ! -s $DSA_KEY ]; then
                 $ECHO "Generating $DSA_KEY:\c"
                 $KEYGEN -q -t dsa -f $DSA_KEY -N '' > /dev/null 2>&1
-		$ECHO "."
+                $ECHO "."
+        fi
+        if [ ! -s $ECDSA_KEY ]; then
+                $ECHO "Generating $ECDSA_KEY:\c"
+                $KEYGEN -q -t ecdsa -f $ECDSA_KEY -N '' > /dev/null 2>&1
+                $ECHO "."
         fi
 }