From fb43e427f54c335ea18a62c816e2bf177354ecd6 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sat, 16 Nov 2013 21:43:00 +0100
Subject: [PATCH] openssh: update to 6.4p1

---
 openssh/build.sh                          |  4 ++--
 openssh/meta/ChangeLog                    |  3 +++
 openssh/src/openssh-6.4p1-inet_ntop.patch | 28 +++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 openssh/src/openssh-6.4p1-inet_ntop.patch

diff --git a/openssh/build.sh b/openssh/build.sh
index 9c6bdf5..a0a1022 100755
--- a/openssh/build.sh
+++ b/openssh/build.sh
@@ -6,11 +6,11 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=openssh
-version=5.9p1
+version=6.4p1
 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]=
+patch[0]=openssh-6.4p1-inet_ntop.patch
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
diff --git a/openssh/meta/ChangeLog b/openssh/meta/ChangeLog
index 5d897f4..9e9caf1 100644
--- a/openssh/meta/ChangeLog
+++ b/openssh/meta/ChangeLog
@@ -1,5 +1,8 @@
 CHANGELOG
 ---------
+* Sat Nov 16 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 6.4p1-1
+- Update to 6.4p1
+
 * Sun Sep 18 2011 Tom G. Christensen <swpkg@jupiterrise.com> - 5.9p1-1
 - Update to 5.9p1
 
diff --git a/openssh/src/openssh-6.4p1-inet_ntop.patch b/openssh/src/openssh-6.4p1-inet_ntop.patch
new file mode 100644
index 0000000..264b7ec
--- /dev/null
+++ b/openssh/src/openssh-6.4p1-inet_ntop.patch
@@ -0,0 +1,28 @@
+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)],
+ 		[