openssh: update to 6.5p1

openssh/build.sh

@@ -6,11 +6,11 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=openssh
-version=6.4p1
+version=6.5p1
 pkgver=1
 source[0]=ftp://ftp.sunet.se/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz
 # If there are no patches, simply comment this
-patch[0]=openssh-6.4p1-inet_ntop.patch
+#patch[0]=
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions

openssh/meta/ChangeLog

@@ -1,5 +1,8 @@
 CHANGELOG
 ---------
+* Sat Feb 01 2014 Tom G. Christensen <swpkg@jupiterrise.com> - 6.5p1-1
+- Update to 6.5p1
+
 * Sat Nov 16 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 6.4p1-1
 - Update to 6.4p1
 

openssh/src/openssh-6.4p1-inet_ntop.patch

@@ -1,28 +0,0 @@
-diff -urN openssh-6.4p1.pristine/configure openssh-6.4p1/configure
---- openssh-6.4p1.pristine/configure	2013-11-08 02:41:15.000000000 +0100
-+++ openssh-6.4p1/configure	2013-11-16 21:18:31.256018000 +0100
-@@ -7288,6 +7288,10 @@
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	fi
-+	if test "$sol2ver" -ge 6; then
-+	    # inet_ntop is in libresolv
-+	    LIBS="$LIBS -lresolv"
-+	fi
- 
- # Check whether --with-solaris-contracts was given.
- if test "${with_solaris_contracts+set}" = set; then :
-diff -urN openssh-6.4p1.pristine/configure.ac openssh-6.4p1/configure.ac
---- openssh-6.4p1.pristine/configure.ac	2013-08-04 13:48:41.000000000 +0200
-+++ openssh-6.4p1/configure.ac	2013-11-16 21:10:36.603563000 +0100
-@@ -794,6 +794,10 @@
- 	else
- 		AC_MSG_RESULT([no])
- 	fi
-+	if test "$sol2ver" -ge 6; then
-+	    # inet_ntop is in libresolv
-+	    LIBS="$LIBS -lresolv"
-+	fi
- 	AC_ARG_WITH([solaris-contracts],
- 		[  --with-solaris-contracts Enable Solaris process contracts (experimental)],
- 		[

openssh/src/sshd.init

@@ -9,6 +9,7 @@ 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
+ED25519_KEY=/usr/tgcware/etc/ssh/ssh_host_ed25519_key
 ECHO=/usr/bin/echo
 
 pidfile=/var/run/sshd.pid
@@ -44,6 +45,11 @@ do_hostkeygen()
                 $KEYGEN -q -t ecdsa -f $ECDSA_KEY -N '' > /dev/null 2>&1
                 $ECHO "."
         fi
+        if [ ! -s $ED25519_KEY ]; then
+                $ECHO "Generating $ED25519_KEY:\c"
+                $KEYGEN -q -t ed25519 -f $ED25519_KEY -N '' > /dev/null 2>&1
+                $ECHO "."
+        fi
 }
 
 kill_sshd()