PSARC 2014/332 curl version 7.38.0
authorRich Burridge <rich.burridge@oracle.com>
Tue, 14 Oct 2014 13:50:20 -0700
changeset 2151 8977d970976a
parent 2150 1acc968ac0d9
child 2152 1cea7a430dd7
PSARC 2014/332 curl version 7.38.0 19603826 Update curl / libcurl to the latest version.
components/curl/Makefile
components/curl/curl.p5m
components/curl/patches/000-configure.patch
components/curl/patches/002-curlbuild.h.patch
components/curl/patches/003-Makefile.in.patch
components/curl/patches/004-Makefile.in.patch
components/curl/patches/005-libcurl.pc.in.patch
components/curl/patches/006-CVE-2013-0249.patch
components/curl/patches/007-CVE-2013-1944.patch
components/curl/patches/008-CVE-2013-2174.patch
components/curl/patches/009-runtests.pl.patch
components/curl/patches/010-CVE-2013-4545.patch
components/curl/patches/010-fix-tests.patch
components/curl/patches/011-gtls.c.patch
components/curl/patches/012-CVE-2014-0015.patch
components/curl/patches/013-OpenSSL-deselect-weak-ciphers-by-default.patch
components/curl/patches/014-CVE-2014-3613-part1.patch
components/curl/patches/014-CVE-2014-3613-part2.patch
components/curl/patches/015-test172.patch
--- a/components/curl/Makefile	Tue Oct 14 13:47:57 2014 -0700
+++ b/components/curl/Makefile	Tue Oct 14 13:50:20 2014 -0700
@@ -23,16 +23,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME =        curl
-COMPONENT_VERSION=      7.26.0
+COMPONENT_VERSION=      7.38.0
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=  http://curl.haxx.se/
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:79ccce9edb8aee17d20ad4d75e1f83a789f8c2e71e68f468e1bf8abf8933193f
+    sha256:5661028aa6532882fa228cd23c99ddbb8b87643dbb1a7ea55c068d34a943dff1
 COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/curl
 
-TPNO=			8339
+TPNO=			19173
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/curl/curl.p5m	Tue Oct 14 13:47:57 2014 -0700
+++ b/components/curl/curl.p5m	Tue Oct 14 13:50:20 2014 -0700
@@ -22,31 +22,29 @@
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/share/doc/curl/html/(.+)$ -> \
-	set action.hash curl-7.26.0/docs/%<\1> >
+    set action.hash curl-7.38.0/docs/%<\1> >
 <transform file path=usr/share/doc/libcurl/html/(.+)$ -> \
-	set action.hash curl-7.26.0/docs/libcurl/%<\1> >
-
+    set action.hash curl-7.38.0/docs/libcurl/%<\1> >
 set name=pkg.fmri value=pkg:/web/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The CURL Network Utility and Library"
-set name=pkg.description value="A command-line tool and library for transforming data with URL syntax"
-set name=com.oracle.info.description value="the CURL Network Utility and Library"
+set name=pkg.description \
+    value="A command-line tool and library for transforming data with URL syntax"
+set name=com.oracle.info.description \
+    value="the CURL Network Utility and Library"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2007/165 \
-    value=PSARC/2012/252 \
-    value=PSARC/2013/303
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2007/165 value=PSARC/2012/252 \
+    value=PSARC/2013/303 value=PSARC/2014/332
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-#
-#
+file path=usr/bin/$(MACH64)/curl
+file path=usr/bin/$(MACH64)/curl-config
 file usr/bin/$(MACH64)/curl path=usr/bin/curl
 file path=usr/bin/curl-config
-file path=usr/bin/$(MACH64)/curl
-file path=usr/bin/$(MACH64)/curl-config
+file path=usr/include/curl/curl.h
 file path=usr/include/curl/curlbuild.h
-file path=usr/include/curl/curl.h
 file path=usr/include/curl/curlrules.h
 file path=usr/include/curl/curlver.h
 file path=usr/include/curl/easy.h
@@ -54,16 +52,28 @@
 file path=usr/include/curl/multi.h
 file path=usr/include/curl/stdcheaders.h
 file path=usr/include/curl/typecheck-gcc.h
-file path=usr/lib/libcurl.so.4.2.0
-file path=usr/lib/$(MACH64)/libcurl.so.4.2.0
+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
+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
 file path=usr/lib/llib-lcurl
 file path=usr/lib/llib-lcurl.ln
-file path=usr/lib/$(MACH64)/llib-lcurl.ln
 file path=usr/lib/pkgconfig/libcurl.pc
-file path=usr/lib/$(MACH64)/pkgconfig/libcurl.pc
+file path=usr/share/aclocal/libcurl.m4
+file path=usr/share/doc/curl/html/curl-config.html
+file path=usr/share/doc/curl/html/curl.html
 file path=usr/share/doc/curl/html/index.html
-file path=usr/share/doc/curl/html/curl.html
-file path=usr/share/doc/curl/html/curl-config.html
+file path=usr/share/doc/curl/html/mk-ca-bundle.html
 file path=usr/share/doc/libcurl/html/curl_easy_cleanup.html
 file path=usr/share/doc/libcurl/html/curl_easy_duphandle.html
 file path=usr/share/doc/libcurl/html/curl_easy_escape.html
@@ -97,10 +107,11 @@
 file path=usr/share/doc/libcurl/html/curl_multi_perform.html
 file path=usr/share/doc/libcurl/html/curl_multi_remove_handle.html
 file path=usr/share/doc/libcurl/html/curl_multi_setopt.html
+file path=usr/share/doc/libcurl/html/curl_multi_socket.html
 file path=usr/share/doc/libcurl/html/curl_multi_socket_action.html
-file path=usr/share/doc/libcurl/html/curl_multi_socket.html
 file path=usr/share/doc/libcurl/html/curl_multi_strerror.html
 file path=usr/share/doc/libcurl/html/curl_multi_timeout.html
+file path=usr/share/doc/libcurl/html/curl_multi_wait.html
 file path=usr/share/doc/libcurl/html/curl_share_cleanup.html
 file path=usr/share/doc/libcurl/html/curl_share_init.html
 file path=usr/share/doc/libcurl/html/curl_share_setopt.html
@@ -118,9 +129,428 @@
 file path=usr/share/doc/libcurl/html/libcurl-share.html
 file path=usr/share/doc/libcurl/html/libcurl-tutorial.html
 file path=usr/share/doc/libcurl/html/libcurl.html
-file path=usr/share/man/man1/curl.1
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_ACCEPTTIMEOUT_MS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_ACCEPT_ENCODING.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_ADDRESS_SCOPE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_APPEND.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_AUTOREFERER.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_BUFFERSIZE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CAINFO.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CAPATH.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CERTINFO.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CHUNK_BGN_FUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CHUNK_DATA.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CHUNK_END_FUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CLOSESOCKETDATA.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CLOSESOCKETFUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CONNECTTIMEOUT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CONNECTTIMEOUT_MS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CONNECT_ONLY.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CONV_FROM_NETWORK_FUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CONV_FROM_UTF8_FUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CONV_TO_NETWORK_FUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_COOKIE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_COOKIEFILE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_COOKIEJAR.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_COOKIELIST.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_COOKIESESSION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_COPYPOSTFIELDS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CRLF.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_CRLFILE.html
+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_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
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_DNS_LOCAL_IP4.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_DNS_LOCAL_IP6.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_DNS_SERVERS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_DNS_USE_GLOBAL_CACHE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_EGDSOCKET.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_ERRORBUFFER.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_EXPECT_100_TIMEOUT_MS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FAILONERROR.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FILETIME.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FNMATCH_DATA.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FNMATCH_FUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FOLLOWLOCATION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FORBID_REUSE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FRESH_CONNECT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FTPPORT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FTPSSLAUTH.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FTP_ACCOUNT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FTP_ALTERNATIVE_TO_USER.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FTP_CREATE_MISSING_DIRS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FTP_FILEMETHOD.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FTP_RESPONSE_TIMEOUT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FTP_SKIP_PASV_IP.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FTP_SSL_CCC.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FTP_USE_EPRT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FTP_USE_EPSV.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_FTP_USE_PRET.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_GSSAPI_DELEGATION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_HEADER.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_HEADERDATA.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_HEADERFUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_HEADEROPT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_HTTP200ALIASES.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_HTTPAUTH.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_HTTPGET.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_HTTPHEADER.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_HTTPPOST.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_HTTPPROXYTUNNEL.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_HTTP_CONTENT_DECODING.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_HTTP_TRANSFER_DECODING.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_HTTP_VERSION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_IGNORE_CONTENT_LENGTH.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_INFILESIZE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_INFILESIZE_LARGE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_INTERFACE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_INTERLEAVEDATA.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_INTERLEAVEFUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_IOCTLDATA.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_IOCTLFUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_IPRESOLVE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_ISSUERCERT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_KEYPASSWD.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_KRBLEVEL.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_LOCALPORT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_LOCALPORTRANGE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_LOGIN_OPTIONS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_LOW_SPEED_LIMIT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_LOW_SPEED_TIME.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_MAIL_AUTH.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_MAIL_FROM.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_MAIL_RCPT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_MAXCONNECTS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_MAXFILESIZE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_MAXFILESIZE_LARGE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_MAXREDIRS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_MAX_RECV_SPEED_LARGE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_MAX_SEND_SPEED_LARGE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_NETRC.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_NETRC_FILE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_NEW_DIRECTORY_PERMS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_NEW_FILE_PERMS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_NOBODY.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_NOPROGRESS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_NOPROXY.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_NOSIGNAL.html
+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_PORT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_POST.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_POSTFIELDS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_POSTFIELDSIZE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_POSTFIELDSIZE_LARGE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_POSTQUOTE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_POSTREDIR.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PREQUOTE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PRIVATE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PROGRESSDATA.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PROGRESSFUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PROTOCOLS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PROXY.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PROXYAUTH.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PROXYHEADER.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PROXYPASSWORD.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_PROXYPORT.html
+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_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
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_RANDOM_FILE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_RANGE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_READDATA.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_READFUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_REDIR_PROTOCOLS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_REFERER.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_RESOLVE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_RESUME_FROM.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_RESUME_FROM_LARGE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_RTSP_CLIENT_CSEQ.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_RTSP_REQUEST.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_RTSP_SERVER_CSEQ.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_RTSP_SESSION_ID.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_RTSP_STREAM_URI.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_RTSP_TRANSPORT.html
+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_SHARE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SOCKOPTDATA.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SOCKOPTFUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SOCKS5_GSSAPI_NEC.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SOCKS5_GSSAPI_SERVICE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSH_AUTH_TYPES.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSH_KEYDATA.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSH_KEYFUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSH_KNOWNHOSTS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSH_PRIVATE_KEYFILE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSH_PUBLIC_KEYFILE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSLCERT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSLCERTTYPE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSLENGINE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSLENGINE_DEFAULT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSLKEY.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSLKEYTYPE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSLVERSION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSL_CIPHER_LIST.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_SSL_CTX_DATA.html
+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_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_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
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_TCP_KEEPINTVL.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_TCP_NODELAY.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_TELNETOPTIONS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_TFTP_BLKSIZE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_TIMECONDITION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_TIMEOUT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_TIMEOUT_MS.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_TIMEVALUE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_TLSAUTH_PASSWORD.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_TLSAUTH_TYPE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_TLSAUTH_USERNAME.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_TRANSFERTEXT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_TRANSFER_ENCODING.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_UNRESTRICTED_AUTH.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_UPLOAD.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_URL.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_USERAGENT.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_USERNAME.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_USERPWD.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_USE_SSL.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_VERBOSE.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_WILDCARDMATCH.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_WRITEDATA.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_WRITEFUNCTION.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_XFERINFODATA.html
+file path=usr/share/doc/libcurl/html/opts/CURLOPT_XFERINFOFUNCTION.html
+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/mk-ca-bundle.1
+file path=usr/share/man/man1/curl.1
+file path=usr/share/man/man3/CURLOPT_ACCEPTTIMEOUT_MS.3
+file path=usr/share/man/man3/CURLOPT_ACCEPT_ENCODING.3
+file path=usr/share/man/man3/CURLOPT_ADDRESS_SCOPE.3
+file path=usr/share/man/man3/CURLOPT_APPEND.3
+file path=usr/share/man/man3/CURLOPT_AUTOREFERER.3
+file path=usr/share/man/man3/CURLOPT_BUFFERSIZE.3
+file path=usr/share/man/man3/CURLOPT_CAINFO.3
+file path=usr/share/man/man3/CURLOPT_CAPATH.3
+file path=usr/share/man/man3/CURLOPT_CERTINFO.3
+file path=usr/share/man/man3/CURLOPT_CHUNK_BGN_FUNCTION.3
+file path=usr/share/man/man3/CURLOPT_CHUNK_DATA.3
+file path=usr/share/man/man3/CURLOPT_CHUNK_END_FUNCTION.3
+file path=usr/share/man/man3/CURLOPT_CLOSESOCKETDATA.3
+file path=usr/share/man/man3/CURLOPT_CLOSESOCKETFUNCTION.3
+file path=usr/share/man/man3/CURLOPT_CONNECTTIMEOUT.3
+file path=usr/share/man/man3/CURLOPT_CONNECTTIMEOUT_MS.3
+file path=usr/share/man/man3/CURLOPT_CONNECT_ONLY.3
+file path=usr/share/man/man3/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3
+file path=usr/share/man/man3/CURLOPT_CONV_FROM_UTF8_FUNCTION.3
+file path=usr/share/man/man3/CURLOPT_CONV_TO_NETWORK_FUNCTION.3
+file path=usr/share/man/man3/CURLOPT_COOKIE.3
+file path=usr/share/man/man3/CURLOPT_COOKIEFILE.3
+file path=usr/share/man/man3/CURLOPT_COOKIEJAR.3
+file path=usr/share/man/man3/CURLOPT_COOKIELIST.3
+file path=usr/share/man/man3/CURLOPT_COOKIESESSION.3
+file path=usr/share/man/man3/CURLOPT_COPYPOSTFIELDS.3
+file path=usr/share/man/man3/CURLOPT_CRLF.3
+file path=usr/share/man/man3/CURLOPT_CRLFILE.3
+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_DIRLISTONLY.3
+file path=usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3
+file path=usr/share/man/man3/CURLOPT_DNS_INTERFACE.3
+file path=usr/share/man/man3/CURLOPT_DNS_LOCAL_IP4.3
+file path=usr/share/man/man3/CURLOPT_DNS_LOCAL_IP6.3
+file path=usr/share/man/man3/CURLOPT_DNS_SERVERS.3
+file path=usr/share/man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3
+file path=usr/share/man/man3/CURLOPT_EGDSOCKET.3
+file path=usr/share/man/man3/CURLOPT_ERRORBUFFER.3
+file path=usr/share/man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3
+file path=usr/share/man/man3/CURLOPT_FAILONERROR.3
+file path=usr/share/man/man3/CURLOPT_FILETIME.3
+file path=usr/share/man/man3/CURLOPT_FNMATCH_DATA.3
+file path=usr/share/man/man3/CURLOPT_FNMATCH_FUNCTION.3
+file path=usr/share/man/man3/CURLOPT_FOLLOWLOCATION.3
+file path=usr/share/man/man3/CURLOPT_FORBID_REUSE.3
+file path=usr/share/man/man3/CURLOPT_FRESH_CONNECT.3
+file path=usr/share/man/man3/CURLOPT_FTPPORT.3
+file path=usr/share/man/man3/CURLOPT_FTPSSLAUTH.3
+file path=usr/share/man/man3/CURLOPT_FTP_ACCOUNT.3
+file path=usr/share/man/man3/CURLOPT_FTP_ALTERNATIVE_TO_USER.3
+file path=usr/share/man/man3/CURLOPT_FTP_CREATE_MISSING_DIRS.3
+file path=usr/share/man/man3/CURLOPT_FTP_FILEMETHOD.3
+file path=usr/share/man/man3/CURLOPT_FTP_RESPONSE_TIMEOUT.3
+file path=usr/share/man/man3/CURLOPT_FTP_SKIP_PASV_IP.3
+file path=usr/share/man/man3/CURLOPT_FTP_SSL_CCC.3
+file path=usr/share/man/man3/CURLOPT_FTP_USE_EPRT.3
+file path=usr/share/man/man3/CURLOPT_FTP_USE_EPSV.3
+file path=usr/share/man/man3/CURLOPT_FTP_USE_PRET.3
+file path=usr/share/man/man3/CURLOPT_GSSAPI_DELEGATION.3
+file path=usr/share/man/man3/CURLOPT_HEADER.3
+file path=usr/share/man/man3/CURLOPT_HEADERDATA.3
+file path=usr/share/man/man3/CURLOPT_HEADERFUNCTION.3
+file path=usr/share/man/man3/CURLOPT_HEADEROPT.3
+file path=usr/share/man/man3/CURLOPT_HTTP200ALIASES.3
+file path=usr/share/man/man3/CURLOPT_HTTPAUTH.3
+file path=usr/share/man/man3/CURLOPT_HTTPGET.3
+file path=usr/share/man/man3/CURLOPT_HTTPHEADER.3
+file path=usr/share/man/man3/CURLOPT_HTTPPOST.3
+file path=usr/share/man/man3/CURLOPT_HTTPPROXYTUNNEL.3
+file path=usr/share/man/man3/CURLOPT_HTTP_CONTENT_DECODING.3
+file path=usr/share/man/man3/CURLOPT_HTTP_TRANSFER_DECODING.3
+file path=usr/share/man/man3/CURLOPT_HTTP_VERSION.3
+file path=usr/share/man/man3/CURLOPT_IGNORE_CONTENT_LENGTH.3
+file path=usr/share/man/man3/CURLOPT_INFILESIZE.3
+file path=usr/share/man/man3/CURLOPT_INFILESIZE_LARGE.3
+file path=usr/share/man/man3/CURLOPT_INTERFACE.3
+file path=usr/share/man/man3/CURLOPT_INTERLEAVEDATA.3
+file path=usr/share/man/man3/CURLOPT_INTERLEAVEFUNCTION.3
+file path=usr/share/man/man3/CURLOPT_IOCTLDATA.3
+file path=usr/share/man/man3/CURLOPT_IOCTLFUNCTION.3
+file path=usr/share/man/man3/CURLOPT_IPRESOLVE.3
+file path=usr/share/man/man3/CURLOPT_ISSUERCERT.3
+file path=usr/share/man/man3/CURLOPT_KEYPASSWD.3
+file path=usr/share/man/man3/CURLOPT_KRBLEVEL.3
+file path=usr/share/man/man3/CURLOPT_LOCALPORT.3
+file path=usr/share/man/man3/CURLOPT_LOCALPORTRANGE.3
+file path=usr/share/man/man3/CURLOPT_LOGIN_OPTIONS.3
+file path=usr/share/man/man3/CURLOPT_LOW_SPEED_LIMIT.3
+file path=usr/share/man/man3/CURLOPT_LOW_SPEED_TIME.3
+file path=usr/share/man/man3/CURLOPT_MAIL_AUTH.3
+file path=usr/share/man/man3/CURLOPT_MAIL_FROM.3
+file path=usr/share/man/man3/CURLOPT_MAIL_RCPT.3
+file path=usr/share/man/man3/CURLOPT_MAXCONNECTS.3
+file path=usr/share/man/man3/CURLOPT_MAXFILESIZE.3
+file path=usr/share/man/man3/CURLOPT_MAXFILESIZE_LARGE.3
+file path=usr/share/man/man3/CURLOPT_MAXREDIRS.3
+file path=usr/share/man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3
+file path=usr/share/man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3
+file path=usr/share/man/man3/CURLOPT_NETRC.3
+file path=usr/share/man/man3/CURLOPT_NETRC_FILE.3
+file path=usr/share/man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3
+file path=usr/share/man/man3/CURLOPT_NEW_FILE_PERMS.3
+file path=usr/share/man/man3/CURLOPT_NOBODY.3
+file path=usr/share/man/man3/CURLOPT_NOPROGRESS.3
+file path=usr/share/man/man3/CURLOPT_NOPROXY.3
+file path=usr/share/man/man3/CURLOPT_NOSIGNAL.3
+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_PORT.3
+file path=usr/share/man/man3/CURLOPT_POST.3
+file path=usr/share/man/man3/CURLOPT_POSTFIELDS.3
+file path=usr/share/man/man3/CURLOPT_POSTFIELDSIZE.3
+file path=usr/share/man/man3/CURLOPT_POSTFIELDSIZE_LARGE.3
+file path=usr/share/man/man3/CURLOPT_POSTQUOTE.3
+file path=usr/share/man/man3/CURLOPT_POSTREDIR.3
+file path=usr/share/man/man3/CURLOPT_PREQUOTE.3
+file path=usr/share/man/man3/CURLOPT_PRIVATE.3
+file path=usr/share/man/man3/CURLOPT_PROGRESSDATA.3
+file path=usr/share/man/man3/CURLOPT_PROGRESSFUNCTION.3
+file path=usr/share/man/man3/CURLOPT_PROTOCOLS.3
+file path=usr/share/man/man3/CURLOPT_PROXY.3
+file path=usr/share/man/man3/CURLOPT_PROXYAUTH.3
+file path=usr/share/man/man3/CURLOPT_PROXYHEADER.3
+file path=usr/share/man/man3/CURLOPT_PROXYPASSWORD.3
+file path=usr/share/man/man3/CURLOPT_PROXYPORT.3
+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_TRANSFER_MODE.3
+file path=usr/share/man/man3/CURLOPT_PUT.3
+file path=usr/share/man/man3/CURLOPT_QUOTE.3
+file path=usr/share/man/man3/CURLOPT_RANDOM_FILE.3
+file path=usr/share/man/man3/CURLOPT_RANGE.3
+file path=usr/share/man/man3/CURLOPT_READDATA.3
+file path=usr/share/man/man3/CURLOPT_READFUNCTION.3
+file path=usr/share/man/man3/CURLOPT_REDIR_PROTOCOLS.3
+file path=usr/share/man/man3/CURLOPT_REFERER.3
+file path=usr/share/man/man3/CURLOPT_RESOLVE.3
+file path=usr/share/man/man3/CURLOPT_RESUME_FROM.3
+file path=usr/share/man/man3/CURLOPT_RESUME_FROM_LARGE.3
+file path=usr/share/man/man3/CURLOPT_RTSP_CLIENT_CSEQ.3
+file path=usr/share/man/man3/CURLOPT_RTSP_REQUEST.3
+file path=usr/share/man/man3/CURLOPT_RTSP_SERVER_CSEQ.3
+file path=usr/share/man/man3/CURLOPT_RTSP_SESSION_ID.3
+file path=usr/share/man/man3/CURLOPT_RTSP_STREAM_URI.3
+file path=usr/share/man/man3/CURLOPT_RTSP_TRANSPORT.3
+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_SHARE.3
+file path=usr/share/man/man3/CURLOPT_SOCKOPTDATA.3
+file path=usr/share/man/man3/CURLOPT_SOCKOPTFUNCTION.3
+file path=usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3
+file path=usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3
+file path=usr/share/man/man3/CURLOPT_SSH_AUTH_TYPES.3
+file path=usr/share/man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3
+file path=usr/share/man/man3/CURLOPT_SSH_KEYDATA.3
+file path=usr/share/man/man3/CURLOPT_SSH_KEYFUNCTION.3
+file path=usr/share/man/man3/CURLOPT_SSH_KNOWNHOSTS.3
+file path=usr/share/man/man3/CURLOPT_SSH_PRIVATE_KEYFILE.3
+file path=usr/share/man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3
+file path=usr/share/man/man3/CURLOPT_SSLCERT.3
+file path=usr/share/man/man3/CURLOPT_SSLCERTTYPE.3
+file path=usr/share/man/man3/CURLOPT_SSLENGINE.3
+file path=usr/share/man/man3/CURLOPT_SSLENGINE_DEFAULT.3
+file path=usr/share/man/man3/CURLOPT_SSLKEY.3
+file path=usr/share/man/man3/CURLOPT_SSLKEYTYPE.3
+file path=usr/share/man/man3/CURLOPT_SSLVERSION.3
+file path=usr/share/man/man3/CURLOPT_SSL_CIPHER_LIST.3
+file path=usr/share/man/man3/CURLOPT_SSL_CTX_DATA.3
+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_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_STDERR.3
+file path=usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3
+file path=usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3
+file path=usr/share/man/man3/CURLOPT_TCP_KEEPINTVL.3
+file path=usr/share/man/man3/CURLOPT_TCP_NODELAY.3
+file path=usr/share/man/man3/CURLOPT_TELNETOPTIONS.3
+file path=usr/share/man/man3/CURLOPT_TFTP_BLKSIZE.3
+file path=usr/share/man/man3/CURLOPT_TIMECONDITION.3
+file path=usr/share/man/man3/CURLOPT_TIMEOUT.3
+file path=usr/share/man/man3/CURLOPT_TIMEOUT_MS.3
+file path=usr/share/man/man3/CURLOPT_TIMEVALUE.3
+file path=usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3
+file path=usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3
+file path=usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3
+file path=usr/share/man/man3/CURLOPT_TRANSFERTEXT.3
+file path=usr/share/man/man3/CURLOPT_TRANSFER_ENCODING.3
+file path=usr/share/man/man3/CURLOPT_UNRESTRICTED_AUTH.3
+file path=usr/share/man/man3/CURLOPT_UPLOAD.3
+file path=usr/share/man/man3/CURLOPT_URL.3
+file path=usr/share/man/man3/CURLOPT_USERAGENT.3
+file path=usr/share/man/man3/CURLOPT_USERNAME.3
+file path=usr/share/man/man3/CURLOPT_USERPWD.3
+file path=usr/share/man/man3/CURLOPT_USE_SSL.3
+file path=usr/share/man/man3/CURLOPT_VERBOSE.3
+file path=usr/share/man/man3/CURLOPT_WILDCARDMATCH.3
+file path=usr/share/man/man3/CURLOPT_WRITEDATA.3
+file path=usr/share/man/man3/CURLOPT_WRITEFUNCTION.3
+file path=usr/share/man/man3/CURLOPT_XFERINFODATA.3
+file path=usr/share/man/man3/CURLOPT_XFERINFOFUNCTION.3
+file path=usr/share/man/man3/CURLOPT_XOAUTH2_BEARER.3
 file path=usr/share/man/man3/curl_easy_cleanup.3
 file path=usr/share/man/man3/curl_easy_duphandle.3
 file path=usr/share/man/man3/curl_easy_escape.3
@@ -158,6 +588,7 @@
 file path=usr/share/man/man3/curl_multi_socket_action.3
 file path=usr/share/man/man3/curl_multi_strerror.3
 file path=usr/share/man/man3/curl_multi_timeout.3
+file path=usr/share/man/man3/curl_multi_wait.3
 file path=usr/share/man/man3/curl_share_cleanup.3
 file path=usr/share/man/man3/curl_share_init.3
 file path=usr/share/man/man3/curl_share_setopt.3
@@ -174,12 +605,4 @@
 file path=usr/share/man/man3/libcurl-share.3
 file path=usr/share/man/man3/libcurl-tutorial.3
 file path=usr/share/man/man3/libcurl.3
-#
-link path=usr/lib/libcurl.so.3 target=libcurl.so.4.2.0
-link path=usr/lib/libcurl.so.4 target=libcurl.so.4.2.0
-link path=usr/lib/libcurl.so target=libcurl.so.4.2.0
-link path=usr/lib/$(MACH64)/libcurl.so.3 target=libcurl.so.4.2.0
-link path=usr/lib/$(MACH64)/libcurl.so.4 target=libcurl.so.4.2.0
-link path=usr/lib/$(MACH64)/libcurl.so target=libcurl.so.4.2.0
-#
-license curl.license license="CURL"
+license curl.license license=CURL
--- a/components/curl/patches/000-configure.patch	Tue Oct 14 13:47:57 2014 -0700
+++ b/components/curl/patches/000-configure.patch	Tue Oct 14 13:50:20 2014 -0700
@@ -1,15 +1,21 @@
---- configure.orig	2012-05-29 06:47:27.467999971 -0700
-+++ configure	2012-05-29 06:59:52.994079022 -0700
[email protected]@ -2708,7 +2708,7 @@
+Solaris specific changes needed for how we configure curl.
+
+These changes need to be sent upstream, but before that can be done,
+they need to be reworked. They also need to apply to configure.ac,
+not configure.
+
+--- configure.orig	2014-09-10 11:57:00.611789155 -0700
++++ configure	2014-09-10 13:24:14.999402937 -0700
[email protected]@ -2975,7 +2975,7 @@
  
  
  
 -ac_config_headers="$ac_config_headers lib/curl_config.h include/curl/curlbuild.h"
 +ac_config_headers="$ac_config_headers lib/curl_config.h"
  
- :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
[email protected]@ -3207,12 +3207,6 @@
+ 
+ 
[email protected]@ -3501,12 +3501,6 @@
  fi
  
  
@@ -20,28 +26,27 @@
 -fi
 -
  CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curlver.h`
- am__api_version="1.9"
- ac_aux_dir=
[email protected]@ -20377,15 +20371,15 @@
-            LIBS="$LIBS $gss_libs"
-         elif test "$GSSAPI_ROOT" != "yes"; then
-            LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
--           LIBS="$LIBS -lgssapi"
-+           LIBS="$LIBS -lgss"
-         else
--           LIBS="$LIBS -lgssapi"
-+           LIBS="$LIBS -lgss"
-         fi
+ 
+   xc_prog_cc_prev_IFS=$IFS
[email protected]@ -21192,7 +21186,7 @@
+               gss_libname="gss"
+               ;;
+            *)
+-              gss_libname="gssapi"
++              gss_libname="gss"
+               ;;
+            esac
+ 
[email protected]@ -21212,7 +21206,7 @@
+         LIBS="-lgss $LIBS"
+         ;;
+      *)
+-        LIBS="-lgssapi $LIBS"
++        LIBS="-lgss $LIBS"
          ;;
       esac
-   else
-      LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
--     LIBS="$LIBS -lgssapi"
-+     LIBS="$LIBS -lgss"
    fi
- else
-   CPPFLAGS="$save_CPPFLAGS"
[email protected]@ -20411,7 +20405,7 @@
[email protected]@ -21311,7 +21305,7 @@
          if test x$cross_compiling != xyes; then
              PKGTEST="yes"
      fi
@@ -50,7 +55,7 @@
      LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
      ;;
    off)
[email protected]@ -25375,20 +25369,13 @@
[email protected]@ -26982,21 +26976,14 @@
  
  
  
@@ -66,6 +71,7 @@
  
  
          #
+     #
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_socklen_t data type" >&5
  $as_echo_n "checking for curl_socklen_t data type... " >&6; }
 -  curl_typeof_curl_socklen_t="unknown"
@@ -73,7 +79,7 @@
    for arg1 in int SOCKET; do
      for arg2 in 'struct sockaddr' void; do
        for t in socklen_t int size_t 'unsigned int' long 'unsigned long' void; do
[email protected]@ -39129,7 +39116,6 @@
[email protected]@ -40418,7 +40405,6 @@
  do
    case $ac_config_target in
      "lib/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/curl_config.h" ;;
--- a/components/curl/patches/002-curlbuild.h.patch	Tue Oct 14 13:47:57 2014 -0700
+++ b/components/curl/patches/002-curlbuild.h.patch	Tue Oct 14 13:50:20 2014 -0700
@@ -1,10 +1,14 @@
---- include/curl/curlbuild.h	2010-10-12 15:04:32.000000000 -0700
-+++ include/curl/curlbuild.h	2010-12-02 10:18:42.364070201 -0800
+Various curl build definitions for Solaris for both Studio and Gnu compilers.
+
+These changes need to be sent upsteam.
+
+--- include/curl/curlbuild.h.orig	2014-09-10 12:10:14.624818524 -0700
++++ include/curl/curlbuild.h	2014-09-10 12:10:08.344835020 -0700
 @@ -496,6 +496,45 @@
  #  define CURL_SIZEOF_CURL_SOCKLEN_T 4
  
  /* ===================================== */
-+/*    Sun Studio Compilers		 */
++/*    Sun Studio Compilers               */
 +/* ===================================== */
 +
 +#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
@@ -84,10 +88,10 @@
 +#     endif
 +#  endif
 +#  else /* !((sun) || (__sun) || (__sun__)) */
- #  if defined(__i386__) || defined(__ppc__)
+ #  if defined(__ILP32__) || \
+       defined(__i386__) || defined(__ppc__) || defined(__arm__) || defined(__sparc__)
  #    define CURL_SIZEOF_LONG           4
- #    define CURL_TYPEOF_CURL_OFF_T     long long
[email protected]@ -550,6 +623,7 @@
[email protected]@ -552,6 +625,7 @@
  #  define CURL_SIZEOF_CURL_SOCKLEN_T 4
  #  define CURL_PULL_SYS_TYPES_H      1
  #  define CURL_PULL_SYS_SOCKET_H     1
--- a/components/curl/patches/003-Makefile.in.patch	Tue Oct 14 13:47:57 2014 -0700
+++ b/components/curl/patches/003-Makefile.in.patch	Tue Oct 14 13:50:20 2014 -0700
@@ -1,11 +1,19 @@
---- tests/server/Makefile.in	2010-10-01 13:49:21.000000000 -0700
-+++ tests/server/Makefile.in	2010-10-18 08:05:49.792499927 -0700
[email protected]@ -209,7 +209,7 @@
- LDFLAGS = @[email protected]
- LIBCURL_LIBS = @[email protected]
+Adjusted to include all the libraries needed to successfully link on Solaris.
+
+Note that on S11, the LIBS line will need to be:
+LIBS = $(BLANK_AT_MAKETIME) -lsocket -lresolv -lnsl -lgen
+as -lsocket and -lnsl have not yet been subsumed into libc.
+
+This patch needs to be sent upstream, but needs to be reworked first.
+
+--- tests/server/Makefile.in.orig	2014-09-10 12:16:40.748828978 -0700
++++ tests/server/Makefile.in	2014-09-10 12:17:11.065886554 -0700
[email protected]@ -377,7 +377,7 @@
  LIBOBJS = @[email protected]
--LIBS = @[email protected]
-+LIBS = @[email protected] -lsocket -lresolv -lnsl -lgen
+ 
+ # Prevent LIBS from being used for all link targets
+-LIBS = $(BLANK_AT_MAKETIME)
++LIBS = $(BLANK_AT_MAKETIME) -lresolv -lgen
  LIBTOOL = @[email protected]
  LIPO = @[email protected]
  LN_S = @[email protected]
--- a/components/curl/patches/004-Makefile.in.patch	Tue Oct 14 13:47:57 2014 -0700
+++ b/components/curl/patches/004-Makefile.in.patch	Tue Oct 14 13:50:20 2014 -0700
@@ -1,22 +1,20 @@
---- include/curl/Makefile.in.orig	2012-05-29 07:03:55.726717894 -0700
-+++ include/curl/Makefile.in	2012-05-29 07:05:20.365485875 -0700
[email protected]@ -349,18 +349,8 @@
- $(ACLOCAL_M4): @[email protected] $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+Adjust how the stamp-h2: Makefile target works.
+
+I'm not sure why this is here. It comes from the previous curl maintainer.
+It needs to be further investigated and either removed or reworked into
+something that can be passed upstream.
+
+--- include/curl/Makefile.in.orig	2014-09-10 12:19:40.843896341 -0700
++++ include/curl/Makefile.in	2014-09-10 12:20:56.618505665 -0700
[email protected]@ -441,9 +441,9 @@
+ 	@test -f [email protected] || rm -f stamp-h2
+ 	@test -f [email protected] || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
  
--curlbuild.h: stamp-h2
--	@if test ! -f [email protected]; then \
--	  rm -f stamp-h2; \
--	  $(MAKE) stamp-h2; \
--	else :; fi
--
 -stamp-h2: $(srcdir)/curlbuild.h.in $(top_builddir)/config.status
 +stamp-h2:
  	@rm -f stamp-h2
 -	cd $(top_builddir) && $(SHELL) ./config.status include/curl/curlbuild.h
--$(srcdir)/curlbuild.h.in: @[email protected] $(am__configure_deps) 
--	cd $(top_srcdir) && $(AUTOHEADER)
--	rm -f stamp-h2
- 	touch [email protected]
++	touch [email protected]
  
  distclean-hdr:
+ 	-rm -f curlbuild.h stamp-h2
--- a/components/curl/patches/005-libcurl.pc.in.patch	Tue Oct 14 13:47:57 2014 -0700
+++ b/components/curl/patches/005-libcurl.pc.in.patch	Tue Oct 14 13:50:20 2014 -0700
@@ -1,5 +1,10 @@
---- libcurl.pc.in	2010-09-18 14:00:22.000000000 -0700
-+++ libcurl.pc.in	2011-03-31 15:39:42.953234906 -0700
+Provide the correct Solaris curl include directory.
+
+This patch should be send upstream, but needs to be reworked into something
+that they will accept.
+
+--- libcurl.pc.in.orig	2014-09-10 12:23:52.455848654 -0700
++++ libcurl.pc.in	2014-09-10 12:24:13.252589181 -0700
 @@ -26,7 +26,7 @@
  [email protected]@
  [email protected][email protected]
--- a/components/curl/patches/006-CVE-2013-0249.patch	Tue Oct 14 13:47:57 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-From ee45a34907ffeb5fd95b0513040d8491d565b663 Mon Sep 17 00:00:00 2001
-From: Eldar Zaitov <[email protected]>
-Date: Wed, 30 Jan 2013 23:22:27 +0100
-Subject: [PATCH] Curl_sasl_create_digest_md5_message: fix buffer overflow
-
-When negotiating SASL DIGEST-MD5 authentication, the function
-Curl_sasl_create_digest_md5_message() uses the data provided from the
-server without doing the proper length checks and that data is then
-appended to a local fixed-size buffer on the stack.
-
-This vulnerability can be exploited by someone who is in control of a
-server that a libcurl based program is accessing with POP3, SMTP or
-IMAP. For applications that accept user provided URLs, it is also
-thinkable that a malicious user would feed an application with a URL to
-a server hosting code targetting this flaw.
-
-Bug: http://curl.haxx.se/docs/adv_20130206.html
-
-(Note that these changes need to be applied to similar code in 
- .../lib/smtp.c for curl version 7.26.0)
-
---- lib/smtp.c.orig	2013-02-05 08:06:03.823585006 -0800
-+++ lib/smtp.c	2013-02-05 08:12:38.007595100 -0800
[email protected]@ -879,7 +879,7 @@
-   char cnonce[]     = "12345678"; /* will be changed */
-   char method[]     = "AUTHENTICATE";
-   char qop[]        = "auth";
--  char uri[128]     = "smtp/";
-+  char uri[128];
-   char response[512];
- 
-   (void)instate; /* no use for this yet */
[email protected]@ -963,8 +963,8 @@
-   for(i = 0; i < MD5_DIGEST_LEN; i++)
-     snprintf(&HA1_hex[2 * i], 3, "%02x", digest[i]);
- 
--  /* Orepare URL string, append realm to the protocol */
--  strcat(uri, realm);
-+  /* Prepare URL string, append realm to the protocol */
-+  snprintf(uri, sizeof(uri), "smtp/%s", realm);
- 
-   /* Calculate H(A2) */
-   ctxt = Curl_MD5_init(Curl_DIGEST_MD5);
[email protected]@ -1008,20 +1008,11 @@
-   for(i = 0; i < MD5_DIGEST_LEN; i++)
-     snprintf(&resp_hash_hex[2 * i], 3, "%02x", digest[i]);
- 
--  strcpy(response, "username=\"");
--  strcat(response, conn->user);
--  strcat(response, "\",realm=\"");
--  strcat(response, realm);
--  strcat(response, "\",nonce=\"");
--  strcat(response, nonce);
--  strcat(response, "\",cnonce=\"");
--  strcat(response, cnonce);
--  strcat(response, "\",nc=");
--  strcat(response, nonceCount);
--  strcat(response, ",digest-uri=\"");
--  strcat(response, uri);
--  strcat(response, "\",response=");
--  strcat(response, resp_hash_hex);
-+  snprintf(response, sizeof(response),
-+           "username=\"%s\",realm=\"%s\",nonce=\"%s\","
-+           "cnonce=\"%s\",nc=\"%s\",digest-uri=\"%s\",response=%s",
-+           conn->user, realm, nonce,
-+           cnonce, nonceCount, uri, resp_hash_hex);
- 
-   /* Encode it to base64 and send it */
-   result = Curl_base64_encode(data, response, 0, &rplyb64, &len);
--- a/components/curl/patches/007-CVE-2013-1944.patch	Tue Oct 14 13:47:57 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-From 3604fde3d3c9b0d0e389e079aecf470d123ba180 Mon Sep 17 00:00:00 2001
-From: YAMADA Yasuharu <[email protected]>
-Date: Thu, 11 Apr 2013 00:17:15 +0200
-Subject: [PATCH] cookie: fix tailmatching to prevent cross-domain leakage
-
-Cookies set for 'example.com' could accidentaly also be sent by libcurl
-to the 'bexample.com' (ie with a prefix to the first domain name).
-
-This is a security vulnerabilty, CVE-2013-1944.
-
-Bug: http://curl.haxx.se/docs/adv_20130412.html
-
---- lib/cookie.c	2013-04-12 13:42:43.099608542 -0700
-+++ lib/cookie.c	2013-04-12 13:51:27.701845050 -0700
[email protected]@ -118,15 +118,29 @@
-   free(co);
- }
- 
--static bool tailmatch(const char *little, const char *bigone)
-+static bool tailmatch(const char *cooke_domain, const char *hostname)
- {
--  size_t littlelen = strlen(little);
--  size_t biglen = strlen(bigone);
-+  size_t cookie_domain_len = strlen(cooke_domain);
-+  size_t hostname_len = strlen(hostname);
- 
--  if(littlelen > biglen)
-+  if(hostname_len < cookie_domain_len)
-     return FALSE;
- 
--  return Curl_raw_equal(little, bigone+biglen-littlelen) ? TRUE : FALSE;
-+  if(!Curl_raw_equal(cooke_domain, hostname+hostname_len-cookie_domain_len))
-+    return FALSE;
-+
-+  /* A lead char of cookie_domain is not '.'.
-+     RFC6265 4.1.2.3. The Domain Attribute says:
-+       For example, if the value of the Domain attribute is
-+       "example.com", the user agent will include the cookie in the Cookie
-+       header when making HTTP requests to example.com, www.example.com, and
-+       www.corp.example.com.
-+   */
-+  if(hostname_len == cookie_domain_len)
-+    return TRUE;
-+  if('.' == *(hostname + hostname_len - cookie_domain_len - 1))
-+    return TRUE;
-+  return FALSE;
- }
- 
- /*
--- a/components/curl/patches/008-CVE-2013-2174.patch	Tue Oct 14 13:47:57 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-CVE-2013-2174: Heap-based buffer overflow in the curl_easy_unescape function
-in lib/escape.c in cURL and libcurl 7.7 through 7.30.0 allows remote
-attackers to cause a denial of service (application crash) or possibly
-execute arbitrary code via a crafted string ending in a "%" (percent)
-character.
-
-CVE webpage for this problem:
-http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-2174
-
-Relevant upstream patch at:
-https://github.com/bagder/curl/commit/192c4f788d48f82c03e9cef40013f34370e90737
-
---- lib/escape.c.orig	2013-08-20 17:09:51.197431224 -0700
-+++ lib/escape.c	2013-08-20 17:10:43.746809478 -0700
[email protected]@ -5,7 +5,7 @@
-  *                            | (__| |_| |  _ <| |___
-  *                             \___|\___/|_| \_\_____|
-  *
-- * Copyright (C) 1998 - 2011, Daniel Stenberg, <[email protected]>, et al.
-+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <[email protected]>, et al.
-  *
-  * This software is licensed as described in the file COPYING, which
-  * you should have received as part of this distribution. The terms
[email protected]@ -159,7 +159,8 @@
- 
-   while(--alloc > 0) {
-     in = *string;
--    if(('%' == in) && ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
-+    if(('%' == in) && (alloc > 2) &&
-+       ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
-       /* this is two hexadecimal digits following a '%' */
-       char hexstr[3];
-       char *ptr;
--- a/components/curl/patches/009-runtests.pl.patch	Tue Oct 14 13:47:57 2014 -0700
+++ b/components/curl/patches/009-runtests.pl.patch	Tue Oct 14 13:50:20 2014 -0700
@@ -7,9 +7,9 @@
 
 As this is Solaris specific, this patch will not be pushed upstream.
 
---- tests/runtests.pl.orig	2013-10-09 04:16:23.150958416 -0700
-+++ tests/runtests.pl	2013-10-09 04:17:42.710320616 -0700
[email protected]@ -2830,6 +2830,12 @@
+--- tests/runtests.pl.orig	2014-09-10 12:26:52.624143266 -0700
++++ tests/runtests.pl	2014-09-10 16:51:13.663390869 -0700
[email protected]@ -3060,6 +3060,12 @@
                              # print "Skipping LD_PRELOAD due to no release shared build\n";
                              next;
                          }
--- a/components/curl/patches/010-CVE-2013-4545.patch	Tue Oct 14 13:47:57 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-CVE-2013-4545: Setting only CURLOPT_SSL_VERIFYHOST without 
-CURLOPT_SSL_VERIFYPEER set should still verify that the host 
-name fields in the server certificate is fine or return failure.
-
-Bug: http://curl.haxx.se/mail/lib-2013-10/0002.html
-Reported-by: Ishan SinghLevett
-
-Relevant upstream patch at:
-https://github.com/bagder/curl/commit/3c3622b6
-
---- lib/ssluse.c.orig	2013-11-14 15:22:45.714764527 -0800
-+++ lib/ssluse.c	2013-11-14 15:25:10.416516780 -0800
[email protected]@ -2471,7 +2471,7 @@
-    * operations.
-    */
- 
--  if(!data->set.ssl.verifypeer)
-+  if(!data->set.ssl.verifypeer && !data->set.ssl.verifyhost)
-     (void)servercert(conn, connssl, FALSE);
-   else
-     retcode = servercert(conn, connssl, TRUE);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/curl/patches/010-fix-tests.patch	Tue Oct 14 13:50:20 2014 -0700
@@ -0,0 +1,16 @@
+Adjust the Python http_pipe.py script to work with our default version of
+Python.
+
+This change will be sent back up stream for consideration.
+
+--- tests/http_pipe.py.orig	2014-09-10 15:59:26.498743943 -0700
++++ tests/http_pipe.py	2014-09-10 15:58:59.502589711 -0700
[email protected]@ -435,7 +435,7 @@
+ if args.pidfile:
+     pid = os.getpid()
+     f = open(args.pidfile, 'w')
+-    f.write('{}'.format(pid))
++    f.write('{0}'.format(pid))
+     f.close()
+ 
+ server = PipelineServer(('0.0.0.0', args.port), PipelineRequestHandler)
--- a/components/curl/patches/011-gtls.c.patch	Tue Oct 14 13:47:57 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-From 71c9842a710787145ff31603f100e4269dd676c1 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <[email protected]>
-Date: Fri, 29 Nov 2013 22:46:05 +0100
-Subject: [PATCH] gtls: respect *VERIFYHOST independently of *VERIFYPEER
-
-This is basically the same fix that 3c3622b6 brought to the OpenSSL
-backend and that resulted in CVE-2013-4545.
-
-This version of the problem was independently introduced to the GnuTLS
-backend with commit 59cf93cc, present in the code since the libcurl
-7.21.4 release.
-
-Bug: http://curl.haxx.se/mail/lib-2013-11/0214.html
-Reported-by: Marc Deslauriers
----
- lib/gtls.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
---- lib/gtls.c.orig	2013-12-03 16:28:01.281292080 -0800
-+++ lib/gtls.c	2013-12-03 16:28:09.281423499 -0800
[email protected]@ -5,7 +5,7 @@
-  *                            | (__| |_| |  _ <| |___
-  *                             \___|\___/|_| \_\_____|
-  *
-- * Copyright (C) 1998 - 2012, Daniel Stenberg, <[email protected]>, et al.
-+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <[email protected]>, et al.
-  *
-  * This software is licensed as described in the file COPYING, which
-  * you should have received as part of this distribution. The terms
[email protected]@ -609,10 +609,8 @@
-     else
-       infof(data, "\t server certificate verification OK\n");
-   }
--  else {
-+  else
-     infof(data, "\t server certificate verification SKIPPED\n");
--    goto after_server_cert_verification;
--  }
- 
-   /* initialize an X.509 certificate structure. */
-   gnutls_x509_crt_init(&x509_cert);
[email protected]@ -742,8 +740,6 @@
- 
-   gnutls_x509_crt_deinit(x509_cert);
- 
--after_server_cert_verification:
--
-   /* compression algorithm (if any) */
-   ptr = gnutls_compression_get_name(gnutls_compression_get(session));
-   /* the *_get_name() says "NULL" if GNUTLS_COMP_NULL is returned */
--- a/components/curl/patches/012-CVE-2014-0015.patch	Tue Oct 14 13:47:57 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-CVE-2014-0015: libcurl can in some circumstances re-use the wrong
-connection when asked to do an NTLM-authenticated HTTP or HTTPS request.
-
-More information at:
-http://curl.haxx.se/docs/adv_20140129.html
-
-Relevant upstream patch at:
-http://curl.haxx.se/CVE-2014-0015-7-27.patch
-
---- lib/url.c.orig	2014-02-04 12:20:53.704898398 -0800
-+++ lib/url.c	2014-02-04 12:28:14.698044886 -0800
[email protected]@ -3103,8 +3103,8 @@
-         }
-         if((needle->handler->protocol & CURLPROTO_FTP) ||
-            ((needle->handler->protocol & CURLPROTO_HTTP) &&
--            ((data->state.authhost.want==CURLAUTH_NTLM) ||
--             (data->state.authhost.want==CURLAUTH_NTLM_WB)))) {
-+            ((data->state.authhost.want & CURLAUTH_NTLM) ||
-+             (data->state.authhost.want & CURLAUTH_NTLM_WB)))) {
-           /* This is FTP or HTTP+NTLM, verify that we're using the same name
-              and password as well */
-           if(!strequal(needle->user, check->user) ||
--- a/components/curl/patches/013-OpenSSL-deselect-weak-ciphers-by-default.patch	Tue Oct 14 13:47:57 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-From 30e24c74774ef642f6d34638bb2b701877c7ce93 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <[email protected]>
-Date: Sat, 11 Jan 2014 00:05:19 +0100
-Subject: [PATCH] OpenSSL: deselect weak ciphers by default
-
-By default even recent versions of OpenSSL supports and accepts both
-"export strength" ciphers, small-bitsize ciphers as well as downright
-deprecated ones.
-
-This change sets a default cipher selection that tries to avoid the
-worst ones, and subsequently it makes https://www.howsmyssl.com/a/check
-no longer grade curl/OpenSSL connects as 'Bad'.
-
-Bug: http://curl.haxx.se/bug/view.cgi?id=1323
-Reported-by: Jeff Hodges
-
-(Note that we have an older version of curl, and the required changes need
-to be made to .../lib/ssluse.[c,h] not .../lib/vtls/openssl.[c,h].)
-
---- lib/ssluse.c.orig	2014-07-02 05:55:41.737906072 -0700
-+++ lib/ssluse.c	2014-07-02 06:01:36.893672485 -0700
[email protected]@ -1439,6 +1439,7 @@
- {
-   CURLcode retcode = CURLE_OK;
- 
-+  char *ciphers;
-   struct SessionHandle *data = conn->data;
-   SSL_METHOD_QUAL SSL_METHOD *req_method=NULL;
-   void *ssl_sessionid=NULL;
[email protected]@ -1614,12 +1615,12 @@
-     }
-   }
- 
--  if(data->set.str[STRING_SSL_CIPHER_LIST]) {
--    if(!SSL_CTX_set_cipher_list(connssl->ctx,
--                                data->set.str[STRING_SSL_CIPHER_LIST])) {
--      failf(data, "failed setting cipher list");
--      return CURLE_SSL_CIPHER;
--    }
-+  ciphers = data->set.str[STRING_SSL_CIPHER_LIST];
-+  if(!ciphers)
-+    ciphers = (char *)DEFAULT_CIPHER_SELECTION;
-+  if(!SSL_CTX_set_cipher_list(connssl->ctx, ciphers)) {
-+    failf(data, "failed setting cipher list: %s", ciphers);
-+    return CURLE_SSL_CIPHER;
-   }
- 
- #ifdef USE_TLS_SRP
---- lib/ssluse.h.orig	2014-07-02 06:01:57.665442588 -0700
-+++ lib/ssluse.h	2014-07-02 06:03:19.437812328 -0700
[email protected]@ -7,7 +7,7 @@
-  *                            | (__| |_| |  _ <| |___
-  *                             \___|\___/|_| \_\_____|
-  *
-- * Copyright (C) 1998 - 2010, Daniel Stenberg, <[email protected]>, et al.
-+ * Copyright (C) 1998 - 2014, Daniel Stenberg, <[email protected]>, et al.
-  *
-  * This software is licensed as described in the file COPYING, which
-  * you should have received as part of this distribution. The terms
[email protected]@ -83,5 +83,7 @@
- #define curlssl_check_cxn Curl_ossl_check_cxn
- #define curlssl_data_pending(x,y) Curl_ossl_data_pending(x,y)
- 
-+#define DEFAULT_CIPHER_SELECTION "ALL!EXPORT!EXPORT40!EXPORT56!aNULL!LOW!RC4"
-+
- #endif /* USE_SSLEAY */
- #endif /* HEADER_CURL_SSLUSE_H */
--- a/components/curl/patches/014-CVE-2014-3613-part1.patch	Tue Oct 14 13:47:57 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,301 +0,0 @@
-From eac573ea9c368f5e3c07de4d5ec5c5d0f84a021a Mon Sep 17 00:00:00 2001
-From: Tim Ruehsen <[email protected]>
-Date: Tue, 19 Aug 2014 21:01:28 +0200
-Subject: [PATCH 1/2] cookies: only use full host matches for hosts used as IP
- address
-
-By not detecting and rejecting domain names for partial literal IP
-addresses properly when parsing received HTTP cookies, libcurl can be
-fooled to both send cookies to wrong sites and to allow arbitrary sites
-to set cookies for others.
-
-Bug: http://curl.haxx.se/docs/adv_20140910.html
----
- lib/cookie.c        | 50 ++++++++++++++++++++++++++++++++++++++----------
- tests/data/test1105 |  3 +--
- tests/data/test31   | 55 +++++++++++++++++++++++++++--------------------------
- tests/data/test8    |  3 ++-
- 4 files changed, 71 insertions(+), 40 deletions(-)
-
-This problem has been fixed upstream in curl version 7.38.0
-
---- lib/cookie.c.orig	2014-09-02 16:10:55.940825864 -0700
-+++ lib/cookie.c	2014-09-02 16:32:39.899617696 -0700
[email protected]@ -94,6 +94,7 @@
- #include "strtoofft.h"
- #include "rawstr.h"
- #include "curl_memrchr.h"
-+#include "inet_pton.h"
- 
- /* The last #include file should be: */
- #include "memdebug.h"
[email protected]@ -178,6 +179,28 @@
- }
- 
- 
-+/*
-+ * Return true if the given string is an IP(v4|v6) address.
-+ */
-+static bool isip(const char *domain)
-+{
-+  struct in_addr addr;
-+#ifdef ENABLE_IPV6
-+  struct in6_addr addr6;
-+#endif
-+
-+  if(Curl_inet_pton(AF_INET, domain, &addr)
-+#ifdef ENABLE_IPV6
-+     || Curl_inet_pton(AF_INET6, domain, &addr6)
-+#endif
-+    ) {
-+    /* domain name given as IP address */
-+    return TRUE;
-+  }
-+
-+  return FALSE;
-+}
-+
- /****************************************************************************
-  *
-  * Curl_cookie_add()
[email protected]@ -290,6 +313,8 @@
-           }
-         }
-         else if(Curl_raw_equal("domain", name)) {
-+          bool is_ip;
-+
-           /* note that this name may or may not have a preceding dot, but
-              we don't care about that, we treat the names the same anyway */
- 
[email protected]@ -333,18 +358,19 @@
-             if('.' == whatptr[0])
-               whatptr++; /* ignore preceding dot */
- 
--            if(!domain || tailmatch(whatptr, domain)) {
--              const char *tailptr=whatptr;
--              if(tailptr[0] == '.')
--                tailptr++;
--              strstore(&co->domain, tailptr); /* don't prefix w/dots
--                                                 internally */
-+            is_ip = isip(domain ? domain : whatptr);
-+
-+            if(!domain
-+               || (is_ip && !strcmp(whatptr, domain))
-+               || (!is_ip && tailmatch(whatptr, domain))) {
-+              strstore(&co->domain, whatptr);
-               if(!co->domain) {
-                 badcookie = TRUE;
-                 break;
-               }
--              co->tailmatch=TRUE; /* we always do that if the domain name was
--                                     given */
-+              if(!is_ip)
-+                co->tailmatch=TRUE; /* we always do that if the domain name was
-+                                       given */
-             }
-             else {
-               /* we did not get a tailmatch and then the attempted set domain
[email protected]@ -819,10 +845,14 @@
-   time_t now = time(NULL);
-   struct Cookie *mainco=NULL;
-   size_t matches = 0;
-+  bool is_ip;
- 
-   if(!c || !c->cookies)
-     return NULL; /* no cookie struct or no cookies in the struct */
- 
-+  /* check if host is an IP(v4|v6) address */
-+  is_ip = isip(host);
-+
-   co = c->cookies;
- 
-   while(co) {
[email protected]@ -834,8 +864,8 @@
- 
-       /* now check if the domain is correct */
-       if(!co->domain ||
--         (co->tailmatch && tailmatch(co->domain, host)) ||
--         (!co->tailmatch && Curl_raw_equal(host, co->domain)) ) {
-+         (co->tailmatch && !is_ip && tailmatch(co->domain, host)) ||
-+         ((!co->tailmatch || is_ip) && Curl_raw_equal(host, co->domain)) ) {
-         /* the right part of the host matches the domain stuff in the
-            cookie data */
- 
---- tests/data/test1105.orig	2014-09-02 16:11:45.732615643 -0700
-+++ tests/data/test1105	2014-09-02 16:33:42.523906352 -0700
[email protected]@ -56,8 +56,7 @@
- # This file was generated by libcurl! Edit at your own risk.
- 
- 127.0.0.1	FALSE	/we/want/	FALSE	0	foobar	name
--.127.0.0.1	TRUE	"/silly/"	FALSE	0	mismatch	this
--.0.0.1	TRUE	/	FALSE	0	partmatch	present
-+127.0.0.1	FALSE	"/silly/"	FALSE	0	mismatch	this
- </file>
- </verify>
- </testcase>
---- tests/data/test31.orig	2014-09-02 16:11:56.912528200 -0700
-+++ tests/data/test31	2014-09-04 06:13:16.741533782 -0700
[email protected]@ -18,27 +18,29 @@
- Funny-head: yesyes
- Set-Cookie: foobar=name; domain=anything.com; path=/ ; secure
- Set-Cookie:ismatch=this  ; domain=127.0.0.1; path=/silly/
-+Set-Cookie: overwrite=this  ; domain=127.0.0.1; path=/overwrite/
-+Set-Cookie: overwrite=this2  ; domain=127.0.0.1; path=/overwrite
- Set-Cookie: sec1value=secure1  ; domain=127.0.0.1; path=/secure1/ ; secure
- Set-Cookie: sec2value=secure2  ; domain=127.0.0.1; path=/secure2/ ; secure=
- Set-Cookie: sec3value=secure3  ; domain=127.0.0.1; path=/secure3/ ; secure=
--Set-Cookie: sec4value=secure4  ; secure=; domain=127.0.0.1; path=/secure4/ ; 
--Set-Cookie: sec5value=secure5  ; secure; domain=127.0.0.1; path=/secure5/ ; 
--Set-Cookie: sec6value=secure6  ; secure ; domain=127.0.0.1; path=/secure6/ ; 
--Set-Cookie: sec7value=secure7  ; secure   ; domain=127.0.0.1; path=/secure7/ ; 
--Set-Cookie: sec8value=secure8  ; secure= ; domain=127.0.0.1; path=/secure8/ ; 
--Set-Cookie: secure=very1  ; secure=; domain=127.0.0.1; path=/secure9/; 
--Set-Cookie: httpo1=value1  ; domain=127.0.0.1; path=/p1/; httponly
--Set-Cookie: httpo2=value2  ; domain=127.0.0.1; path=/p2/; httponly=
--Set-Cookie: httpo3=value3  ; httponly; domain=127.0.0.1; path=/p3/;
--Set-Cookie: httpo4=value4  ; httponly=; domain=127.0.0.1; path=/p4/; 
--Set-Cookie: httponly=myvalue1  ; domain=127.0.0.1; path=/p4/; httponly
--Set-Cookie: httpandsec=myvalue2  ; domain=127.0.0.1; path=/p4/; httponly; secure
--Set-Cookie: httpandsec2=myvalue3; domain=127.0.0.1; path=/p4/; httponly=; secure
--Set-Cookie: httpandsec3=myvalue4  ; domain=127.0.0.1; path=/p4/; httponly; secure=
--Set-Cookie: httpandsec4=myvalue5  ; domain=127.0.0.1; path=/p4/; httponly=; secure=
--Set-Cookie: httpandsec5=myvalue6  ; domain=127.0.0.1; path=/p4/; secure; httponly=
--Set-Cookie: httpandsec6=myvalue7  ; domain=127.0.0.1; path=/p4/; secure=; httponly=
--Set-Cookie: httpandsec7=myvalue8  ; domain=127.0.0.1; path=/p4/; secure; httponly
-+Set-Cookie: sec4value=secure4  ; secure=; domain=127.0.0.1; path=/secure4/ ; 
-+Set-Cookie: sec5value=secure5  ; secure; domain=127.0.0.1; path=/secure5/ ; 
-+Set-Cookie: sec6value=secure6  ; secure ; domain=127.0.0.1; path=/secure6/ ; 
-+Set-Cookie: sec7value=secure7  ; secure   ; domain=127.0.0.1; path=/secure7/ ; 
-+Set-Cookie: sec8value=secure8  ; secure= ; domain=127.0.0.1; path=/secure8/ ; 
-+Set-Cookie: secure=very1  ; secure=; domain=127.0.0.1; path=/secure9/; 
-+Set-Cookie: httpo1=value1  ; domain=127.0.0.1; path=/p1/; httponly
-+Set-Cookie: httpo2=value2  ; domain=127.0.0.1; path=/p2/; httponly=
-+Set-Cookie: httpo3=value3  ; httponly; domain=127.0.0.1; path=/p3/;
-+Set-Cookie: httpo4=value4  ; httponly=; domain=127.0.0.1; path=/p4/; 
-+Set-Cookie: httponly=myvalue1  ; domain=127.0.0.1; path=/p4/; httponly
-+Set-Cookie: httpandsec=myvalue2  ; domain=127.0.0.1; path=/p4/; httponly; secure
-+Set-Cookie: httpandsec2=myvalue3; domain=127.0.0.1; path=/p4/; httponly=; secure
-+Set-Cookie: httpandsec3=myvalue4  ; domain=127.0.0.1; path=/p4/; httponly; secure=
-+Set-Cookie: httpandsec4=myvalue5  ; domain=127.0.0.1; path=/p4/; httponly=; secure=
-+Set-Cookie: httpandsec5=myvalue6  ; domain=127.0.0.1; path=/p4/; secure; httponly=
-+Set-Cookie: httpandsec6=myvalue7  ; domain=127.0.0.1; path=/p4/; secure=; httponly=
-+Set-Cookie: httpandsec7=myvalue8  ; domain=127.0.0.1; path=/p4/; secure; httponly
- Set-Cookie: httpandsec8=myvalue9; domain=127.0.0.1; path=/p4/; secure=; httponly
- Set-Cookie: partmatch=present; domain=127.0.0.1 ; path=/;
- Set-Cookie:eat=this; domain=moo.foo.moo;
[email protected]@ -49,7 +51,8 @@
- Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030
- Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2030
- Set-Cookie: magic=yessir; path=/silly/; HttpOnly
--Set-Cookie: blexp=yesyes; domain=.0.0.1; domain=.0.0.1; expiry=totally bad;
-+Set-Cookie: blexp=yesyes; domain=127.0.0.1; domain=127.0.0.1; expiry=totally bad;
-+Set-Cookie: partialip=nono; domain=.0.0.1;
- 
- boo
- </data>
[email protected]@ -72,6 +75,9 @@
-  <command>
- http://%HOSTIP:%HTTPPORT/we/want/31 -b none -c log/jar31.txt
- </command>
-+<precheck>
-+perl -e 'if ("%HOSTIP" !~ /127\.0\.0\.1$/) {print "Test only works for HOSTIP 127.0.0.1"; exit(1)}'
-+</precheck>
- </client>
- 
- # Verify data after the test has been "shot"
[email protected]@ -90,33 +96,35 @@
- # http://curl.haxx.se/rfc/cookie_spec.html
- # This file was generated by libcurl! Edit at your own risk.
- 
--.127.0.0.1	TRUE	/silly/	FALSE	0	ismatch	this
--.127.0.0.1	TRUE	/secure1/	TRUE	0	sec1value	secure1
--.127.0.0.1	TRUE	/secure2/	TRUE	0	sec2value	secure2
--.127.0.0.1	TRUE	/secure3/	TRUE	0	sec3value	secure3
--.127.0.0.1	TRUE	/secure4/	TRUE	0	sec4value	secure4
--.127.0.0.1	TRUE	/secure5/	TRUE	0	sec5value	secure5
--.127.0.0.1	TRUE	/secure6/	TRUE	0	sec6value	secure6
--.127.0.0.1	TRUE	/secure7/	TRUE	0	sec7value	secure7
--.127.0.0.1	TRUE	/secure8/	TRUE	0	sec8value	secure8
--.127.0.0.1	TRUE	/secure9/	TRUE	0	secure	very1
--#HttpOnly_.127.0.0.1	TRUE	/p1/	FALSE	0	httpo1	value1
--#HttpOnly_.127.0.0.1	TRUE	/p2/	FALSE	0	httpo2	value2
--#HttpOnly_.127.0.0.1	TRUE	/p3/	FALSE	0	httpo3	value3
--#HttpOnly_.127.0.0.1	TRUE	/p4/	FALSE	0	httpo4	value4
--#HttpOnly_.127.0.0.1	TRUE	/p4/	FALSE	0	httponly	myvalue1
--#HttpOnly_.127.0.0.1	TRUE	/p4/	TRUE	0	httpandsec	myvalue2
--#HttpOnly_.127.0.0.1	TRUE	/p4/	TRUE	0	httpandsec2	myvalue3
--#HttpOnly_.127.0.0.1	TRUE	/p4/	TRUE	0	httpandsec3	myvalue4
--#HttpOnly_.127.0.0.1	TRUE	/p4/	TRUE	0	httpandsec4	myvalue5
--#HttpOnly_.127.0.0.1	TRUE	/p4/	TRUE	0	httpandsec5	myvalue6
--#HttpOnly_.127.0.0.1	TRUE	/p4/	TRUE	0	httpandsec6	myvalue7
--#HttpOnly_.127.0.0.1	TRUE	/p4/	TRUE	0	httpandsec7	myvalue8
--#HttpOnly_.127.0.0.1	TRUE	/p4/	TRUE	0	httpandsec8	myvalue9
--.127.0.0.1	TRUE	/	FALSE	0	partmatch	present
-+127.0.0.1	FALSE	/silly/	FALSE	0	ismatch	this
-+127.0.0.1	FALSE	/overwrite/	FALSE	0	overwrite	this
-+127.0.0.1	FALSE	/overwrite	FALSE	0	overwrite	this2
-+127.0.0.1	FALSE	/secure1/	TRUE	0	sec1value	secure1
-+127.0.0.1	FALSE	/secure2/	TRUE	0	sec2value	secure2
-+127.0.0.1	FALSE	/secure3/	TRUE	0	sec3value	secure3
-+127.0.0.1	FALSE	/secure4/	TRUE	0	sec4value	secure4
-+127.0.0.1	FALSE	/secure5/	TRUE	0	sec5value	secure5
-+127.0.0.1	FALSE	/secure6/	TRUE	0	sec6value	secure6
-+127.0.0.1	FALSE	/secure7/	TRUE	0	sec7value	secure7
-+127.0.0.1	FALSE	/secure8/	TRUE	0	sec8value	secure8
-+127.0.0.1	FALSE	/secure9/	TRUE	0	secure	very1
-+#HttpOnly_127.0.0.1	FALSE	/p1/	FALSE	0	httpo1	value1
-+#HttpOnly_127.0.0.1	FALSE	/p2/	FALSE	0	httpo2	value2
-+#HttpOnly_127.0.0.1	FALSE	/p3/	FALSE	0	httpo3	value3
-+#HttpOnly_127.0.0.1	FALSE	/p4/	FALSE	0	httpo4	value4
-+#HttpOnly_127.0.0.1	FALSE	/p4/	FALSE	0	httponly	myvalue1
-+#HttpOnly_127.0.0.1	FALSE	/p4/	TRUE	0	httpandsec	myvalue2
-+#HttpOnly_127.0.0.1	FALSE	/p4/	TRUE	0	httpandsec2	myvalue3
-+#HttpOnly_127.0.0.1	FALSE	/p4/	TRUE	0	httpandsec3	myvalue4
-+#HttpOnly_127.0.0.1	FALSE	/p4/	TRUE	0	httpandsec4	myvalue5
-+#HttpOnly_127.0.0.1	FALSE	/p4/	TRUE	0	httpandsec5	myvalue6
-+#HttpOnly_127.0.0.1	FALSE	/p4/	TRUE	0	httpandsec6	myvalue7
-+#HttpOnly_127.0.0.1	FALSE	/p4/	TRUE	0	httpandsec7	myvalue8
-+#HttpOnly_127.0.0.1	FALSE	/p4/	TRUE	0	httpandsec8	myvalue9
-+127.0.0.1	FALSE	/	FALSE	0	partmatch	present
- 127.0.0.1	FALSE	/we/want/	FALSE	2054030187	nodomain	value
- #HttpOnly_127.0.0.1	FALSE	/silly/	FALSE	0	magic	yessir
--.0.0.1	TRUE	/we/want/	FALSE	0	blexp	yesyes
-+127.0.0.1	FALSE	/we/want/	FALSE	0	blexp	yesyes
- </file>
- </verify>
- </testcase>
---- tests/data/test8.orig	2014-09-02 16:13:07.812626284 -0700
-+++ tests/data/test8	2014-09-02 17:24:33.131678950 -0700
[email protected]@ -35,16 +35,20 @@
- Server: test-server/fake
- Content-Type: text/html
- Funny-head: yesyes
--Set-Cookie: foobar=name; domain=127.0.0.1; path=/;
--Set-Cookie: mismatch=this; domain=127.0.0.1; path="/silly/";
-+Set-Cookie: foobar=name; domain=%HOSTIP; path=/;
-+Set-Cookie: mismatch=this; domain=%HOSTIP; path="/silly/";
- Set-Cookie: partmatch=present; domain=.0.0.1; path=/w;
- Set-Cookie: duplicate=test; domain=.0.0.1; domain=.0.0.1; path=/donkey;
- Set-Cookie: cookie=yes; path=/we;
- Set-Cookie: cookie=perhaps; path=/we/want;
- Set-Cookie: nocookie=yes; path=/WE;
--Set-Cookie: blexp=yesyes; domain=.0.0.1; domain=.0.0.1; expiry=totally bad;
-+Set-Cookie: blexp=yesyes; domain=%HOSTIP; domain=%HOSTIP; expiry=totally bad;
-+Set-Cookie: partialip=nono; domain=.0.0.1;
- 
- </file>
-+<precheck>
-+perl -e 'if ("%HOSTIP" !~ /\.0\.0\.1$/) {print "Test only works for HOSTIPs ending with .0.0.1"; exit(1)}'
-+</precheck>
- </client>
- 
- # Verify data after the test has been "shot"
[email protected]@ -56,7 +60,7 @@
- GET /we/want/8 HTTP/1.1
- Host: %HOSTIP:%HTTPPORT
- Accept: */*
--Cookie: cookie=perhaps; cookie=yes; partmatch=present; foobar=name; blexp=yesyes
-+Cookie: cookie=perhaps; cookie=yes; foobar=name; blexp=yesyes
- 
- </protocol>
- </verify>
--- a/components/curl/patches/014-CVE-2014-3613-part2.patch	Tue Oct 14 13:47:57 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-From ceab2ea8f0c0fc4c4be219240ccf99ddc2de7b22 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <[email protected]>
-Date: Tue, 19 Aug 2014 21:11:20 +0200
-Subject: [PATCH 2/2] cookies: reject incoming cookies set for TLDs
-
-Test 61 was modified to verify this.
-
-Reported-by: Tim Ruehsen
----
- lib/cookie.c      | 6 ++++++
- tests/data/test61 | 1 +
- 2 files changed, 7 insertions(+)
-
-This problem has been fixed upstream in curl version 7.38.0
-
---- lib/cookie.c.orig	2014-09-02 16:45:06.782110349 -0700
-+++ lib/cookie.c	2014-09-02 16:46:23.252037990 -0700
[email protected]@ -314,6 +314,7 @@
-         }
-         else if(Curl_raw_equal("domain", name)) {
-           bool is_ip;
-+          const char *dotp;
- 
-           /* note that this name may or may not have a preceding dot, but
-              we don't care about that, we treat the names the same anyway */
[email protected]@ -360,6 +361,11 @@
- 
-             is_ip = isip(domain ? domain : whatptr);
- 
-+            /* check for more dots */
-+            dotp = strchr(whatptr, '.');
-+            if(!dotp)
-+              domain=":";
-+
-             if(!domain
-                || (is_ip && !strcmp(whatptr, domain))
-                || (!is_ip && tailmatch(whatptr, domain))) {
---- tests/data/test61.orig	2014-09-02 16:22:41.267624972 -0700
-+++ tests/data/test61	2014-09-02 16:47:10.419615833 -0700
[email protected]@ -23,6 +23,7 @@
- Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure
- Set-Cookie: test5=name; domain=anything.com; path=/ ; secure
- Set-Cookie: fake=fooledyou; domain=..com; path=/;
-+Set-Cookie: supercookie=fooledyou; domain=.com; path=/;
- Content-Length: 4
- 
- boo
--- a/components/curl/patches/015-test172.patch	Tue Oct 14 13:47:57 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-Changes to curl test 172 to make it work okay.
-This simply uses the latest version of the test at:
-https://raw.githubusercontent.com/bagder/curl/master/tests/data/test172
-
-This change will not be sent upstream and this patch can be removed when
-we upgrade to the latest version of curl.
-
---- tests/data/test172.orig	2014-09-09 08:41:51.039292198 -0700
-+++ tests/data/test172	2014-09-09 08:41:50.918034165 -0700
[email protected]@ -31,12 +31,12 @@
- </command>
- <file name="log/jar172.txt">
- # Netscape HTTP Cookie File
--# http://curl.haxx.se/rfc/cookie_spec.html
-+# http://curl.haxx.se/docs/http-cookies.html
- # This file was generated by libcurl! Edit at your own risk.
- 
- .%HOSTIP	TRUE	/silly/	FALSE	0	ismatch	this
- .%HOSTIP	TRUE	/	FALSE	0	partmatch	present
--%HOSTIP	FALSE	/we/want/	FALSE	1391252187	nodomain	value
-+%HOSTIP	FALSE	/we/want/	FALSE	2139150993	nodomain	value
- </file>
- </client>
-