--- a/components/libssh2/Makefile	Tue Apr 19 15:03:17 2016 -0700
+++ b/components/libssh2/Makefile	Tue Apr 19 15:25:27 2016 -0700
@@ -26,14 +26,14 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		libssh2
-COMPONENT_VERSION=	1.4.2
+COMPONENT_VERSION=	1.7.0
 COMPONENT_PROJECT_URL=	http://www.libssh2.org/
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:418c09061fb9c3c26fec391a35a062780b21b3199885e3b27054619582469bd3
+	sha256:e4561fd43a50539a8c2ceb37841691baf03ecb7daf043766da1b112e4280d584
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/libssh2
 
-TPNO=			11357
+TPNO=			27245
 
 SYSTEM_TEST_TARGET= configure $(SYSTEM_TEST_32_and_64)
 include $(WS_MAKE_RULES)/common.mk
@@ -48,6 +48,14 @@
         $(GSED) -i -e 's|3|3ssh2|g' \
 		$(PROTOUSRSHAREMAN3DIR)/libssh2_sftp_fstatvfs.3;
 
+# Needed for "gmake test" to work successfully.
+# If SHELLOPTS is exported (as it is by the userland makefiles),
+# then all shell options get exported to child invocations of bash,
+# which results in test failures due to nounset and xtrace being
+# set unexpectedly, and errors such as "$1: unbound variable" and
+# diffs failing due to script tracing in output files.
+unexport SHELLOPTS 
+
 # Master test results are the same for both 32-bit and 64-bit, so override
 # here, rather than create multiple identical master files.
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master

--- a/components/libssh2/libssh2.license	Tue Apr 19 15:03:17 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/* Copyright (c) 2004-2007 Sara Golemon <[email protected]>
- * Copyright (c) 2005,2006 Mikhail Gusarov <[email protected]>
- * Copyright (c) 2006-2007 The Written Word, Inc.
- * Copyright (c) 2007 Eli Fant <[email protected]>
- * Copyright (c) 2009 Daniel Stenberg
- * Copyright (C) 2008, 2009 Simon Josefsson
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
- *
- *   Redistributions of source code must retain the above
- *   copyright notice, this list of conditions and the
- *   following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials
- *   provided with the distribution.
- *
- *   Neither the name of the copyright holder nor the names
- *   of any other contributors may be used to endorse or
- *   promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- */

--- a/components/libssh2/libssh2.p5m	Tue Apr 19 15:03:17 2016 -0700
+++ b/components/libssh2/libssh2.p5m	Tue Apr 19 15:25:27 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -134,6 +134,7 @@
 file path=usr/share/man/man3ssh2/libssh2_publickey_remove_ex.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_publickey_shutdown.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_scp_recv.3ssh2
+file path=usr/share/man/man3ssh2/libssh2_scp_recv2.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_scp_send.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_scp_send64.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_scp_send_ex.3ssh2
@@ -148,6 +149,7 @@
 file path=usr/share/man/man3ssh2/libssh2_session_free.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_session_get_blocking.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_session_get_timeout.3ssh2
+file path=usr/share/man/man3ssh2/libssh2_session_handshake.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_session_hostkey.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_session_init.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_session_init_ex.3ssh2
@@ -156,6 +158,7 @@
 file path=usr/share/man/man3ssh2/libssh2_session_method_pref.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_session_methods.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_session_set_blocking.3ssh2
+file path=usr/share/man/man3ssh2/libssh2_session_set_last_error.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_session_set_timeout.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_session_startup.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_session_supported_algs.3ssh2
@@ -166,6 +169,7 @@
 file path=usr/share/man/man3ssh2/libssh2_sftp_fstat.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_sftp_fstat_ex.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_sftp_fstatvfs.3ssh2
+file path=usr/share/man/man3ssh2/libssh2_sftp_fsync.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_sftp_get_channel.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_sftp_init.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_sftp_last_error.3ssh2
@@ -212,5 +216,6 @@
 file path=usr/share/man/man3ssh2/libssh2_userauth_publickey.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_userauth_publickey_fromfile.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_userauth_publickey_fromfile_ex.3ssh2
+file path=usr/share/man/man3ssh2/libssh2_userauth_publickey_frommemory.3ssh2
 file path=usr/share/man/man3ssh2/libssh2_version.3ssh2
-license libssh2.license license=BSD
+license COPYING license=BSD

--- a/components/libssh2/test/results-all.master	Tue Apr 19 15:03:17 2016 -0700
+++ b/components/libssh2/test/results-all.master	Tue Apr 19 15:25:27 2016 -0700
@@ -1,10 +1,15 @@
+  CC       simple.o
+  CCLD     simple
 PASS: simple
-usage:	man [-] [-adFlprt] [-M path] [-T macro-package ] [ -s section ] name ...
-	man [-M path] [-s section] -k keyword ...
-	man [-M path] -f file ... 
-	man [-M path] [-s section] -K keyword ...
-SKIP: mansyntax.sh
-======================
-All 1 tests passed
-(1 tests were not run)
-======================
+PASS: mansyntax.sh
+============================================================================
+Testsuite summary for libssh2 -
+============================================================================
+# TOTAL: 2
+# PASS:  2
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+============================================================================