--- a/components/curl/Makefile	Thu Jan 21 09:20:28 2016 -0800
+++ b/components/curl/Makefile	Fri Jan 22 17:04:51 2016 -0800
@@ -18,21 +18,21 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME =        curl
-COMPONENT_VERSION=      7.40.0
+COMPONENT_VERSION=      7.45.0
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=  http://curl.haxx.se/
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:c2e0705a13e53f8f924d1eaeb2ab94f59a9e162007c489b9ab0c96238bddf84b
+    sha256:02c78c8060d587422e2826f622c729189b56084bba365140f13af3d402b6cb6b
 COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/curl
 
-TPNO=			21343
+TPNO=			25724
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -73,7 +73,7 @@
 CONFIGURE_OPTIONS += --with-ca-path=/etc/openssl/certs
 CONFIGURE_OPTIONS += --with-zlib=/usr --with-libidn=/usr
 CONFIGURE_OPTIONS += --with-pic
-CONFIGURE_OPTIONS += --without-libssh2
+CONFIGURE_OPTIONS += --with-libssh2
 CONFIGURE_OPTIONS += "curl_disallow_getifaddrs=yes"
 
 LINT_FLAGS += -I$(SOURCE_DIR)/include
@@ -81,12 +81,14 @@
 # The additional curl specific set of transforms to be applied to the
 # test results to try to normalize them.
 COMPONENT_TEST_TRANSFORMS += \
-    '-e "s|\(^$(CC)\).*|\\$$(CC)|" ' \
+	'-e "s|^.*$(CC).*$$|XXX_CC_XXX|g" ' \
+	'-e "s|^.*source=.*libtool=no.*$$|XXX_CC_XXX|g" ' \
+	'-e "s|^.*DEPDIR=.deps.*$$|XXX_CC_XXX|g" ' \
+	'-e "/^XXX_CC_XXX$$/d" ' \
 	'-e "s|\(^/bin/bash ../../libtool\).*|\1|" ' \
-	'-e "s|\(^libtool: compile:\).*|\1|" ' \
 	'-e "s|\(^libtool: link:\).*|\1|" ' \
 	'-e "s|remaining: ..:..|remaining: xx:xx|" ' \
-	'-e "s|\(^TESTDONE: 964 tests were considered during\).*|\1|" ' \
+	'-e "s|\(^TESTDONE: 994 tests were considered during\).*|\1|" ' \
 	'-e "s|\(^\* curl $(COMPONENT_VERSION)\).*|\1|" ' \
 	'-e "s|\(^\* Host:\).*|\1|" ' \
 	'-e "s|\(^\* System: SunOS\).*|\1|" ' \
@@ -109,6 +111,7 @@
 
 
 REQUIRED_PACKAGES += library/libidn
+REQUIRED_PACKAGES += library/libssh2
 REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib