--- 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

--- a/components/curl/curl.license	Thu Jan 21 09:20:28 2016 -0800
+++ b/components/curl/curl.license	Fri Jan 22 17:04:51 2016 -0800
@@ -1,6 +1,6 @@
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright (c) 1996 - 2014, Daniel Stenberg, <[email protected]>.
+Copyright (c) 1996 - 2015, Daniel Stenberg, <[email protected]>.
 
 All rights reserved.
 

--- a/components/curl/curl.p5m	Thu Jan 21 09:20:28 2016 -0800
+++ b/components/curl/curl.p5m	Fri Jan 22 17:04:51 2016 -0800
@@ -18,7 +18,7 @@
 #
 # 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.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/share/doc/curl/html/(.+)$ -> \
@@ -52,20 +52,14 @@
 file path=usr/include/curl/multi.h
 file path=usr/include/curl/stdcheaders.h
 file path=usr/include/curl/typecheck-gcc.h
-link path=usr/lib/$(MACH64)/libcurl.so target=libcurl.so.4.3.0
-link path=usr/lib/$(MACH64)/libcurl.so.3 target=libcurl.so.4.3.0
-link path=usr/lib/$(MACH64)/libcurl.so.4 target=libcurl.so.4.3.0
-# Leave old link in place until CR #19623514 is integrated.
-link path=usr/lib/$(MACH64)/libcurl.so.4.2.0 target=libcurl.so.4.3.0
-file path=usr/lib/$(MACH64)/libcurl.so.4.3.0
+link path=usr/lib/$(MACH64)/libcurl.so target=libcurl.so.4.4.0
+link path=usr/lib/$(MACH64)/libcurl.so.4 target=libcurl.so.4.4.0
+file path=usr/lib/$(MACH64)/libcurl.so.4.4.0
 file path=usr/lib/$(MACH64)/llib-lcurl.ln
 file path=usr/lib/$(MACH64)/pkgconfig/libcurl.pc
-link path=usr/lib/libcurl.so target=libcurl.so.4.3.0
-link path=usr/lib/libcurl.so.3 target=libcurl.so.4.3.0
-link path=usr/lib/libcurl.so.4 target=libcurl.so.4.3.0
-# Leave old link in place until CR #19623514 is integrated.
-link path=usr/lib/libcurl.so.4.2.0 target=libcurl.so.4.3.0
-file path=usr/lib/libcurl.so.4.3.0
+link path=usr/lib/libcurl.so target=libcurl.so.4.4.0
+link path=usr/lib/libcurl.so.4 target=libcurl.so.4.4.0
+file path=usr/lib/libcurl.so.4.4.0
 file path=usr/lib/llib-lcurl
 file path=usr/lib/llib-lcurl.ln
 file path=usr/lib/pkgconfig/libcurl.pc
@@ -127,8 +121,54 @@
 file path=usr/share/doc/libcurl/html/libcurl-errors.html
 file path=usr/share/doc/libcurl/html/libcurl-multi.html
 file path=usr/share/doc/libcurl/html/libcurl-share.html
+file path=usr/share/doc/libcurl/html/libcurl-symbols.html
+file path=usr/share/doc/libcurl/html/libcurl-thread.html
 file path=usr/share/doc/libcurl/html/libcurl-tutorial.html
 file path=usr/share/doc/libcurl/html/libcurl.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_ACTIVESOCKET.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_APPCONNECT_TIME.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_CERTINFO.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_CONDITION_UNMET.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_CONNECT_TIME.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_CONTENT_LENGTH_DOWNLOAD.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_CONTENT_LENGTH_UPLOAD.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_CONTENT_TYPE.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_COOKIELIST.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_EFFECTIVE_URL.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_FILETIME.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_FTP_ENTRY_PATH.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_HEADER_SIZE.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_HTTPAUTH_AVAIL.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_HTTP_CONNECTCODE.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_LASTSOCKET.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_LOCAL_IP.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_LOCAL_PORT.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_NAMELOOKUP_TIME.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_NUM_CONNECTS.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_OS_ERRNO.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_PRETRANSFER_TIME.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_PRIMARY_IP.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_PRIMARY_PORT.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_PRIVATE.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_PROXYAUTH_AVAIL.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_REDIRECT_COUNT.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_REDIRECT_TIME.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_REDIRECT_URL.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_REQUEST_SIZE.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_RESPONSE_CODE.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_RTSP_CLIENT_CSEQ.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_RTSP_CSEQ_RECV.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_RTSP_SERVER_CSEQ.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_RTSP_SESSION_ID.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_SIZE_DOWNLOAD.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_SIZE_UPLOAD.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_SPEED_DOWNLOAD.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_SPEED_UPLOAD.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_SSL_ENGINES.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_SSL_VERIFYRESULT.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_STARTTRANSFER_TIME.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_TLS_SESSION.html
+file path=usr/share/doc/libcurl/html/opts/CURLINFO_TOTAL_TIME.html
 file path=usr/share/doc/libcurl/html/opts/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.html
 file path=usr/share/doc/libcurl/html/opts/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.html
 file path=usr/share/doc/libcurl/html/opts/CURLMOPT_MAXCONNECTS.html
@@ -138,6 +178,8 @@
 file path=usr/share/doc/libcurl/html/opts/CURLMOPT_PIPELINING.html
 file path=usr/share/doc/libcurl/html/opts/CURLMOPT_PIPELINING_SERVER_BL.html
 file path=usr/share/doc/libcurl/html/opts/CURLMOPT_PIPELINING_SITE_BL.html
+file path=usr/share/doc/libcurl/html/opts/CURLMOPT_PUSHDATA.html
+file path=usr/share/doc/libcurl/html/opts/CURLMOPT_PUSHFUNCTION.html
 file path=usr/share/doc/libcurl/html/opts/CURLMOPT_SOCKETDATA.html
 file path=usr/share/doc/libcurl/html/opts/CURLMOPT_SOCKETFUNCTION.html
 file path=usr/share/doc/libcurl/html/opts/CURLMOPT_TIMERDATA.html
@@ -173,6 +215,7 @@
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_CUSTOMREQUEST.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_DEBUGDATA.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_DEBUGFUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_DEFAULT_PROTOCOL.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_DIRLISTONLY.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_DNS_CACHE_TIMEOUT.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_DNS_INTERFACE.html
@@ -253,6 +296,9 @@
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_OPENSOCKETDATA.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_OPENSOCKETFUNCTION.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_PASSWORD.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PATH_AS_IS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PINNEDPUBLICKEY.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PIPEWAIT.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_PORT.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_POST.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_POSTFIELDS.html
@@ -273,6 +319,7 @@
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_PROXYTYPE.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_PROXYUSERNAME.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_PROXYUSERPWD.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PROXY_SERVICE_NAME.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_PROXY_TRANSFER_MODE.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_PUT.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_QUOTE.html
@@ -294,6 +341,7 @@
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_SASL_IR.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_SEEKDATA.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_SEEKFUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SERVICE_NAME.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_SHARE.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_SOCKOPTDATA.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_SOCKOPTFUNCTION.html
@@ -318,10 +366,12 @@
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSL_CTX_FUNCTION.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSL_ENABLE_ALPN.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSL_ENABLE_NPN.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSL_FALSESTART.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSL_OPTIONS.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSL_SESSIONID_CACHE.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSL_VERIFYHOST.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSL_VERIFYPEER.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSL_VERIFYSTATUS.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_STDERR.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_TCP_KEEPALIVE.html
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_TCP_KEEPIDLE.html
@@ -355,6 +405,50 @@
 file path=usr/share/doc/libcurl/html/opts/CURLOPT_XOAUTH2_BEARER.html
 file path=usr/share/man/man1/curl-config.1
 file path=usr/share/man/man1/curl.1
+file path=usr/share/man/man3/CURLINFO_ACTIVESOCKET.3
+file path=usr/share/man/man3/CURLINFO_APPCONNECT_TIME.3
+file path=usr/share/man/man3/CURLINFO_CERTINFO.3
+file path=usr/share/man/man3/CURLINFO_CONDITION_UNMET.3
+file path=usr/share/man/man3/CURLINFO_CONNECT_TIME.3
+file path=usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3
+file path=usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3
+file path=usr/share/man/man3/CURLINFO_CONTENT_TYPE.3
+file path=usr/share/man/man3/CURLINFO_COOKIELIST.3
+file path=usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3
+file path=usr/share/man/man3/CURLINFO_FILETIME.3
+file path=usr/share/man/man3/CURLINFO_FTP_ENTRY_PATH.3
+file path=usr/share/man/man3/CURLINFO_HEADER_SIZE.3
+file path=usr/share/man/man3/CURLINFO_HTTPAUTH_AVAIL.3
+file path=usr/share/man/man3/CURLINFO_HTTP_CONNECTCODE.3
+file path=usr/share/man/man3/CURLINFO_LASTSOCKET.3
+file path=usr/share/man/man3/CURLINFO_LOCAL_IP.3
+file path=usr/share/man/man3/CURLINFO_LOCAL_PORT.3
+file path=usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME.3
+file path=usr/share/man/man3/CURLINFO_NUM_CONNECTS.3
+file path=usr/share/man/man3/CURLINFO_OS_ERRNO.3
+file path=usr/share/man/man3/CURLINFO_PRETRANSFER_TIME.3
+file path=usr/share/man/man3/CURLINFO_PRIMARY_IP.3
+file path=usr/share/man/man3/CURLINFO_PRIMARY_PORT.3
+file path=usr/share/man/man3/CURLINFO_PRIVATE.3
+file path=usr/share/man/man3/CURLINFO_PROXYAUTH_AVAIL.3
+file path=usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3
+file path=usr/share/man/man3/CURLINFO_REDIRECT_TIME.3
+file path=usr/share/man/man3/CURLINFO_REDIRECT_URL.3
+file path=usr/share/man/man3/CURLINFO_REQUEST_SIZE.3
+file path=usr/share/man/man3/CURLINFO_RESPONSE_CODE.3
+file path=usr/share/man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3
+file path=usr/share/man/man3/CURLINFO_RTSP_CSEQ_RECV.3
+file path=usr/share/man/man3/CURLINFO_RTSP_SERVER_CSEQ.3
+file path=usr/share/man/man3/CURLINFO_RTSP_SESSION_ID.3
+file path=usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD.3
+file path=usr/share/man/man3/CURLINFO_SIZE_UPLOAD.3
+file path=usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD.3
+file path=usr/share/man/man3/CURLINFO_SPEED_UPLOAD.3
+file path=usr/share/man/man3/CURLINFO_SSL_ENGINES.3
+file path=usr/share/man/man3/CURLINFO_SSL_VERIFYRESULT.3
+file path=usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME.3
+file path=usr/share/man/man3/CURLINFO_TLS_SESSION.3
+file path=usr/share/man/man3/CURLINFO_TOTAL_TIME.3
 file path=usr/share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
 file path=usr/share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
 file path=usr/share/man/man3/CURLMOPT_MAXCONNECTS.3
@@ -364,6 +458,8 @@
 file path=usr/share/man/man3/CURLMOPT_PIPELINING.3
 file path=usr/share/man/man3/CURLMOPT_PIPELINING_SERVER_BL.3
 file path=usr/share/man/man3/CURLMOPT_PIPELINING_SITE_BL.3
+file path=usr/share/man/man3/CURLMOPT_PUSHDATA.3
+file path=usr/share/man/man3/CURLMOPT_PUSHFUNCTION.3
 file path=usr/share/man/man3/CURLMOPT_SOCKETDATA.3
 file path=usr/share/man/man3/CURLMOPT_SOCKETFUNCTION.3
 file path=usr/share/man/man3/CURLMOPT_TIMERDATA.3
@@ -399,6 +495,7 @@
 file path=usr/share/man/man3/CURLOPT_CUSTOMREQUEST.3
 file path=usr/share/man/man3/CURLOPT_DEBUGDATA.3
 file path=usr/share/man/man3/CURLOPT_DEBUGFUNCTION.3
+file path=usr/share/man/man3/CURLOPT_DEFAULT_PROTOCOL.3
 file path=usr/share/man/man3/CURLOPT_DIRLISTONLY.3
 file path=usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3
 file path=usr/share/man/man3/CURLOPT_DNS_INTERFACE.3
@@ -479,6 +576,9 @@
 file path=usr/share/man/man3/CURLOPT_OPENSOCKETDATA.3
 file path=usr/share/man/man3/CURLOPT_OPENSOCKETFUNCTION.3
 file path=usr/share/man/man3/CURLOPT_PASSWORD.3
+file path=usr/share/man/man3/CURLOPT_PATH_AS_IS.3
+file path=usr/share/man/man3/CURLOPT_PINNEDPUBLICKEY.3
+file path=usr/share/man/man3/CURLOPT_PIPEWAIT.3
 file path=usr/share/man/man3/CURLOPT_PORT.3
 file path=usr/share/man/man3/CURLOPT_POST.3
 file path=usr/share/man/man3/CURLOPT_POSTFIELDS.3
@@ -499,6 +599,7 @@
 file path=usr/share/man/man3/CURLOPT_PROXYTYPE.3
 file path=usr/share/man/man3/CURLOPT_PROXYUSERNAME.3
 file path=usr/share/man/man3/CURLOPT_PROXYUSERPWD.3
+file path=usr/share/man/man3/CURLOPT_PROXY_SERVICE_NAME.3
 file path=usr/share/man/man3/CURLOPT_PROXY_TRANSFER_MODE.3
 file path=usr/share/man/man3/CURLOPT_PUT.3
 file path=usr/share/man/man3/CURLOPT_QUOTE.3
@@ -520,6 +621,7 @@
 file path=usr/share/man/man3/CURLOPT_SASL_IR.3
 file path=usr/share/man/man3/CURLOPT_SEEKDATA.3
 file path=usr/share/man/man3/CURLOPT_SEEKFUNCTION.3
+file path=usr/share/man/man3/CURLOPT_SERVICE_NAME.3
 file path=usr/share/man/man3/CURLOPT_SHARE.3
 file path=usr/share/man/man3/CURLOPT_SOCKOPTDATA.3
 file path=usr/share/man/man3/CURLOPT_SOCKOPTFUNCTION.3
@@ -544,10 +646,12 @@
 file path=usr/share/man/man3/CURLOPT_SSL_CTX_FUNCTION.3
 file path=usr/share/man/man3/CURLOPT_SSL_ENABLE_ALPN.3
 file path=usr/share/man/man3/CURLOPT_SSL_ENABLE_NPN.3
+file path=usr/share/man/man3/CURLOPT_SSL_FALSESTART.3
 file path=usr/share/man/man3/CURLOPT_SSL_OPTIONS.3
 file path=usr/share/man/man3/CURLOPT_SSL_SESSIONID_CACHE.3
 file path=usr/share/man/man3/CURLOPT_SSL_VERIFYHOST.3
 file path=usr/share/man/man3/CURLOPT_SSL_VERIFYPEER.3
+file path=usr/share/man/man3/CURLOPT_SSL_VERIFYSTATUS.3
 file path=usr/share/man/man3/CURLOPT_STDERR.3
 file path=usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3
 file path=usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3
@@ -631,6 +735,8 @@
 file path=usr/share/man/man3/libcurl-errors.3
 file path=usr/share/man/man3/libcurl-multi.3
 file path=usr/share/man/man3/libcurl-share.3
+file path=usr/share/man/man3/libcurl-symbols.3
+file path=usr/share/man/man3/libcurl-thread.3
 file path=usr/share/man/man3/libcurl-tutorial.3
 file path=usr/share/man/man3/libcurl.3
 license curl.license license=CURL

--- a/components/curl/patches/010-fix-tests.patch	Thu Jan 21 09:20:28 2016 -0800
+++ b/components/curl/patches/010-fix-tests.patch	Fri Jan 22 17:04:51 2016 -0800
@@ -14,28 +14,3 @@
      f.close()
  
  server = PipelineServer(('0.0.0.0', args.port), PipelineRequestHandler)
-
-
-# ----------------------------------------------------------------------------
-Tests #530 and #584 fail with curl version 7.40.0. This is discussed at:
-
-  http://curl.haxx.se/mail/lib-2014-08/0161.html
-
-with the patch at:
-
-http://curl.haxx.se/mail/lib-2014-06/att-0139/0001-Delay-Curl_addHandleToPipeline-by-a-milisecond.patch
-
-addressing the problem.
-
-Upstream is already aware of this issue.
-
---- lib/url.c.orig	2015-01-26 13:49:21.041657976 -0800
-+++ lib//url.c	2015-01-26 13:50:45.391515086 -0800
-@@ -2748,6 +2748,7 @@
- {
-   if(!Curl_llist_insert_next(pipeline, pipeline->tail, data))
-     return CURLE_OUT_OF_MEMORY;
-+  Curl_wait_ms(1);
-   return CURLE_OK;
- }
- 

--- a/components/curl/patches/013-curl_sasl_gssapi.c.patch	Thu Jan 21 09:20:28 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-From: https://www.mail-archive.com/[email protected]/msg21757.html
-Quanah Gibson-Mount Thu, 15 Jan 2015 12:27:13 -0800
-Unfortunately, it appears that curl is still not tested against Heimdal
-Kerberos.
-
-This problem has been reported upstream.
-
---- lib/curl_sasl_gssapi.c.orig	2015-01-26 08:22:32.369117065 -0800
-+++ lib/curl_sasl_gssapi.c	2015-01-26 08:36:35.452740440 -0800
-@@ -31,6 +31,10 @@
- #define NCOMPAT 1
- #endif
- 
-+#ifdef HAVE_GSSHEIMDAL
-+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
-+#endif
-+
- #define GSSAUTH_P_NONE      1
- #define GSSAUTH_P_INTEGRITY 2
- #define GSSAUTH_P_PRIVACY   4