Bump curl

This commit is contained in:
Mihai Maruseac 2021-06-03 08:04:04 -07:00
parent 91e3307896
commit 05ad84fae7
2 changed files with 134 additions and 47 deletions

View File

@ -502,12 +502,12 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
tf_http_archive( tf_http_archive(
name = "curl", name = "curl",
build_file = clean_dep("//third_party:curl.BUILD"), build_file = clean_dep("//third_party:curl.BUILD"),
sha256 = "01ae0c123dee45b01bbaef94c0bc00ed2aec89cb2ee0fd598e0d302a6b5e0a98", sha256 = "3b4378156ba09e224008e81dcce854b7ce4d182b1f9cfb97fe5ed9e9c18c6bd3",
strip_prefix = "curl-7.69.1", strip_prefix = "curl-7.76.0",
system_build_file = clean_dep("//third_party/systemlibs:curl.BUILD"), system_build_file = clean_dep("//third_party/systemlibs:curl.BUILD"),
urls = [ urls = [
"https://storage.googleapis.com/mirror.tensorflow.org/curl.haxx.se/download/curl-7.69.1.tar.gz", "https://storage.googleapis.com/mirror.tensorflow.org/curl.haxx.se/download/curl-7.76.0.tar.gz",
"https://curl.haxx.se/download/curl-7.69.1.tar.gz", "https://curl.haxx.se/download/curl-7.76.0.tar.gz",
], ],
) )

173
third_party/curl.BUILD vendored
View File

@ -25,20 +25,33 @@ CURL_WIN_SRCS = [
"lib/asyn-thread.c", "lib/asyn-thread.c",
"lib/inet_ntop.c", "lib/inet_ntop.c",
"lib/system_win32.c", "lib/system_win32.c",
"lib/vtls/schannel.c", "lib/setup-win32.h",
"lib/idn_win32.c",
] ]
cc_library( cc_library(
name = "curl", name = "curl",
srcs = [ srcs = [
"include/curl_config.h", "include/curl_config.h",
"lib/altsvc.c",
"lib/altsvc.h",
"lib/amigaos.c",
"lib/amigaos.h", "lib/amigaos.h",
"lib/arpa_telnet.h", "lib/arpa_telnet.h",
"lib/asyn.h",
"lib/asyn-ares.c", "lib/asyn-ares.c",
"lib/asyn.h",
"lib/base64.c", "lib/base64.c",
"lib/c-hyper.c",
"lib/c-hyper.h",
"lib/config-amigaos.h",
"lib/config-dos.h",
"lib/config-mac.h",
"lib/config-os400.h",
"lib/config-plan9.h",
"lib/config-riscos.h",
"lib/config-tpf.h",
"lib/config-vxworks.h",
"lib/config-win32.h", "lib/config-win32.h",
"lib/config-win32ce.h",
"lib/conncache.c", "lib/conncache.c",
"lib/conncache.h", "lib/conncache.h",
"lib/connect.c", "lib/connect.c",
@ -52,14 +65,20 @@ cc_library(
"lib/curl_base64.h", "lib/curl_base64.h",
"lib/curl_ctype.c", "lib/curl_ctype.c",
"lib/curl_ctype.h", "lib/curl_ctype.h",
"lib/curl_des.c",
"lib/curl_des.h", "lib/curl_des.h",
"lib/curl_endian.c",
"lib/curl_endian.h", "lib/curl_endian.h",
"lib/curl_fnmatch.c", "lib/curl_fnmatch.c",
"lib/curl_fnmatch.h", "lib/curl_fnmatch.h",
"lib/curl_get_line.c",
"lib/curl_get_line.h",
"lib/curl_gethostname.c", "lib/curl_gethostname.c",
"lib/curl_gethostname.h", "lib/curl_gethostname.h",
"lib/curl_gssapi.c",
"lib/curl_gssapi.h", "lib/curl_gssapi.h",
"lib/curl_hmac.h", "lib/curl_hmac.h",
"lib/curl_krb5.h",
"lib/curl_ldap.h", "lib/curl_ldap.h",
"lib/curl_md4.h", "lib/curl_md4.h",
"lib/curl_md5.h", "lib/curl_md5.h",
@ -68,14 +87,19 @@ cc_library(
"lib/curl_memrchr.h", "lib/curl_memrchr.h",
"lib/curl_multibyte.c", "lib/curl_multibyte.c",
"lib/curl_multibyte.h", "lib/curl_multibyte.h",
"lib/curl_ntlm_core.c",
"lib/curl_ntlm_core.h", "lib/curl_ntlm_core.h",
"lib/curl_ntlm_wb.c",
"lib/curl_ntlm_wb.h", "lib/curl_ntlm_wb.h",
"lib/curl_path.c",
"lib/curl_path.h",
"lib/curl_printf.h", "lib/curl_printf.h",
"lib/curl_range.c",
"lib/curl_range.h",
"lib/curl_rtmp.c", "lib/curl_rtmp.c",
"lib/curl_rtmp.h", "lib/curl_rtmp.h",
"lib/curl_sasl.c", "lib/curl_sasl.c",
"lib/curl_sasl.h", "lib/curl_sasl.h",
"lib/curl_sec.h",
"lib/curl_setup.h", "lib/curl_setup.h",
"lib/curl_setup_once.h", "lib/curl_setup_once.h",
"lib/curl_sha256.h", "lib/curl_sha256.h",
@ -84,23 +108,35 @@ cc_library(
"lib/curl_threads.c", "lib/curl_threads.c",
"lib/curl_threads.h", "lib/curl_threads.h",
"lib/curlx.h", "lib/curlx.h",
"lib/dict.c",
"lib/dict.h", "lib/dict.h",
"lib/doh.c",
"lib/doh.h",
"lib/dotdot.c", "lib/dotdot.c",
"lib/dotdot.h", "lib/dotdot.h",
"lib/dynbuf.c",
"lib/dynbuf.h",
"lib/easy.c", "lib/easy.c",
"lib/easygetopt.c",
"lib/easyif.h", "lib/easyif.h",
"lib/easyoptions.c",
"lib/easyoptions.h",
"lib/escape.c", "lib/escape.c",
"lib/escape.h", "lib/escape.h",
"lib/file.c",
"lib/file.h", "lib/file.h",
"lib/fileinfo.c", "lib/fileinfo.c",
"lib/fileinfo.h", "lib/fileinfo.h",
"lib/formdata.c", "lib/formdata.c",
"lib/formdata.h", "lib/formdata.h",
"lib/ftp.c",
"lib/ftp.h", "lib/ftp.h",
"lib/ftplistparser.c",
"lib/ftplistparser.h", "lib/ftplistparser.h",
"lib/getenv.c", "lib/getenv.c",
"lib/getinfo.c", "lib/getinfo.c",
"lib/getinfo.h", "lib/getinfo.h",
"lib/gopher.c",
"lib/gopher.h", "lib/gopher.h",
"lib/hash.c", "lib/hash.c",
"lib/hash.h", "lib/hash.h",
@ -113,6 +149,8 @@ cc_library(
"lib/hostip4.c", "lib/hostip4.c",
"lib/hostip6.c", "lib/hostip6.c",
"lib/hostsyn.c", "lib/hostsyn.c",
"lib/hsts.c",
"lib/hsts.h",
"lib/http.c", "lib/http.c",
"lib/http.h", "lib/http.h",
"lib/http2.c", "lib/http2.c",
@ -121,17 +159,24 @@ cc_library(
"lib/http_chunks.h", "lib/http_chunks.h",
"lib/http_digest.c", "lib/http_digest.c",
"lib/http_digest.h", "lib/http_digest.h",
"lib/http_negotiate.c",
"lib/http_negotiate.h", "lib/http_negotiate.h",
"lib/http_ntlm.c",
"lib/http_ntlm.h", "lib/http_ntlm.h",
"lib/http_proxy.c", "lib/http_proxy.c",
"lib/http_proxy.h", "lib/http_proxy.h",
"lib/http_aws_sigv4.c",
"lib/http_aws_sigv4.h",
"lib/idn_win32.c",
"lib/if2ip.c", "lib/if2ip.c",
"lib/if2ip.h", "lib/if2ip.h",
"lib/imap.c",
"lib/imap.h", "lib/imap.h",
"lib/inet_ntop.h", "lib/inet_ntop.h",
"lib/inet_pton.c", "lib/inet_pton.c",
"lib/inet_pton.h", "lib/inet_pton.h",
"lib/krb5.c", "lib/krb5.c",
"lib/ldap.c",
"lib/llist.c", "lib/llist.c",
"lib/llist.h", "lib/llist.h",
"lib/md4.c", "lib/md4.c",
@ -141,38 +186,43 @@ cc_library(
"lib/mime.c", "lib/mime.c",
"lib/mime.h", "lib/mime.h",
"lib/mprintf.c", "lib/mprintf.c",
"lib/mqtt.c",
"lib/mqtt.h",
"lib/multi.c", "lib/multi.c",
"lib/multihandle.h", "lib/multihandle.h",
"lib/multiif.h", "lib/multiif.h",
"lib/netrc.c", "lib/netrc.c",
"lib/netrc.h", "lib/netrc.h",
"lib/non-ascii.c",
"lib/non-ascii.h", "lib/non-ascii.h",
"lib/nonblock.c", "lib/nonblock.c",
"lib/nonblock.h", "lib/nonblock.h",
"lib/nwlib.c", #"lib/nwlib.c",
"lib/nwos.c", #"lib/nwos.c",
"lib/openldap.c",
"lib/parsedate.c", "lib/parsedate.c",
"lib/parsedate.h", "lib/parsedate.h",
"lib/pingpong.h",
"lib/pingpong.c", "lib/pingpong.c",
"lib/pingpong.h",
"lib/pop3.c",
"lib/pop3.h", "lib/pop3.h",
"lib/progress.c", "lib/progress.c",
"lib/progress.h", "lib/progress.h",
"lib/psl.c",
"lib/psl.h",
"lib/quic.h", "lib/quic.h",
"lib/rand.c", "lib/rand.c",
"lib/rand.h", "lib/rand.h",
"lib/rename.h",
"lib/rename.c", "lib/rename.c",
"lib/rename.h",
"lib/rtsp.c", "lib/rtsp.c",
"lib/rtsp.h", "lib/rtsp.h",
"lib/security.c",
"lib/select.c", "lib/select.c",
"lib/select.h", "lib/select.h",
"lib/sendf.c", "lib/sendf.c",
"lib/sendf.h", "lib/sendf.h",
"lib/setopt.c", "lib/setopt.c",
"lib/setopt.h", "lib/setopt.h",
"lib/setup-os400.h",
"lib/setup-vms.h", "lib/setup-vms.h",
"lib/sha256.c", "lib/sha256.c",
"lib/share.c", "lib/share.c",
@ -180,13 +230,17 @@ cc_library(
"lib/sigpipe.h", "lib/sigpipe.h",
"lib/slist.c", "lib/slist.c",
"lib/slist.h", "lib/slist.h",
"lib/smb.c",
"lib/smb.h", "lib/smb.h",
"lib/smtp.c",
"lib/smtp.h", "lib/smtp.h",
"lib/sockaddr.h", "lib/sockaddr.h",
"lib/socketpair.h",
"lib/socketpair.c", "lib/socketpair.c",
"lib/socketpair.h",
"lib/socks.c", "lib/socks.c",
"lib/socks.h", "lib/socks.h",
"lib/socks_gssapi.c",
"lib/socks_sspi.c",
"lib/speedcheck.c", "lib/speedcheck.c",
"lib/speedcheck.h", "lib/speedcheck.h",
"lib/splay.c", "lib/splay.c",
@ -202,7 +256,9 @@ cc_library(
"lib/strtoofft.c", "lib/strtoofft.c",
"lib/strtoofft.h", "lib/strtoofft.h",
"lib/system_win32.h", "lib/system_win32.h",
"lib/telnet.c",
"lib/telnet.h", "lib/telnet.h",
"lib/tftp.c",
"lib/tftp.h", "lib/tftp.h",
"lib/timeval.c", "lib/timeval.c",
"lib/timeval.h", "lib/timeval.h",
@ -211,44 +267,69 @@ cc_library(
"lib/url.c", "lib/url.c",
"lib/url.h", "lib/url.h",
"lib/urldata.h", "lib/urldata.h",
"lib/vauth/cleartext.c", "lib/urlapi-int.h",
"lib/vauth/cram.c", "lib/urlapi.c",
"lib/vauth/digest.c",
"lib/vauth/digest.h",
"lib/vauth/ntlm.h",
"lib/vauth/oauth2.c",
"lib/vauth/vauth.c",
"lib/vauth/vauth.h",
"lib/version.c", "lib/version.c",
"lib/vssh/ssh.h", "lib/version_win32.c",
"lib/vtls/bearssl.h", "lib/version_win32.h",
"lib/vtls/gskit.h",
"lib/vtls/gtls.h",
"lib/vtls/mbedtls.h",
"lib/vtls/nssg.h",
"lib/vtls/openssl.h",
"lib/vtls/schannel.h",
"lib/vtls/vtls.c",
"lib/vtls/vtls.h",
"lib/vtls/wolfssl.h",
"lib/warnless.c", "lib/warnless.c",
"lib/warnless.h", "lib/warnless.h",
"lib/wildcard.c", "lib/wildcard.c",
"lib/wildcard.h", "lib/wildcard.h",
"lib/x509asn1.c",
"lib/x509asn1.h", "lib/x509asn1.h",
"lib/psl.h", "lib/vauth/cleartext.c",
"lib/psl.c", "lib/vauth/cram.c",
"lib/vtls/sectransp.h", "lib/vauth/digest.c",
"lib/vtls/mesalink.h", "lib/vauth/digest.h",
"lib/vauth/digest_sspi.c",
"lib/vauth/krb5_gssapi.c",
"lib/vauth/krb5_sspi.c",
"lib/vauth/ntlm.c",
"lib/vauth/ntlm.h",
"lib/vauth/ntlm_sspi.c",
"lib/vauth/oauth2.c",
"lib/vauth/spnego_sspi.c",
"lib/vauth/vauth.c",
"lib/vauth/vauth.h",
"lib/vquic/ngtcp2.c",
"lib/vquic/ngtcp2.h",
"lib/vquic/quiche.c",
"lib/vquic/quiche.h",
"lib/vquic/vquic.c",
"lib/vquic/vquic.h",
"lib/vssh/libssh.c",
"lib/vssh/libssh2.c",
"lib/vssh/ssh.h",
"lib/vssh/wolfssh.c",
"lib/vtls/bearssl.c",
"lib/vtls/bearssl.h",
"lib/vtls/gskit.c",
"lib/vtls/gskit.h",
"lib/vtls/gtls.c",
"lib/vtls/gtls.h",
"lib/vtls/keylog.c",
"lib/vtls/keylog.h",
"lib/vtls/mbedtls.c",
"lib/vtls/mbedtls.h",
"lib/vtls/mbedtls_threadlock.c",
"lib/vtls/mbedtls_threadlock.h",
"lib/vtls/mesalink.c", "lib/vtls/mesalink.c",
"lib/curl_get_line.h", "lib/vtls/mesalink.h",
"lib/curl_get_line.c", "lib/vtls/nss.c",
"lib/urlapi-int.h", "lib/vtls/nssg.h",
"lib/urlapi.c", "lib/vtls/openssl.c",
"lib/altsvc.h", "lib/vtls/openssl.h",
"lib/altsvc.c", "lib/vtls/rustls.c",
"lib/doh.h", "lib/vtls/rustls.h",
"lib/doh.c", "lib/vtls/schannel.c",
"lib/vtls/schannel.h",
"lib/vtls/schannel_verify.c",
"lib/vtls/sectransp.h",
"lib/vtls/vtls.c",
"lib/vtls/vtls.h",
"lib/vtls/wolfssl.c",
"lib/vtls/wolfssl.h",
] + select({ ] + select({
"@org_tensorflow//tensorflow:macos": [ "@org_tensorflow//tensorflow:macos": [
"lib/vtls/sectransp.c", "lib/vtls/sectransp.c",
@ -258,7 +339,6 @@ cc_library(
], ],
"@org_tensorflow//tensorflow:windows": CURL_WIN_SRCS, "@org_tensorflow//tensorflow:windows": CURL_WIN_SRCS,
"//conditions:default": [ "//conditions:default": [
"lib/vtls/openssl.c",
], ],
}), }),
hdrs = [ hdrs = [
@ -267,6 +347,7 @@ cc_library(
"include/curl/easy.h", "include/curl/easy.h",
"include/curl/mprintf.h", "include/curl/mprintf.h",
"include/curl/multi.h", "include/curl/multi.h",
"include/curl/options.h",
"include/curl/stdcheaders.h", "include/curl/stdcheaders.h",
"include/curl/system.h", "include/curl/system.h",
"include/curl/typecheck-gcc.h", "include/curl/typecheck-gcc.h",
@ -370,6 +451,8 @@ cc_binary(
"src/tool_doswin.h", "src/tool_doswin.h",
"src/tool_easysrc.c", "src/tool_easysrc.c",
"src/tool_easysrc.h", "src/tool_easysrc.h",
"src/tool_filetime.c",
"src/tool_filetime.h",
"src/tool_formparse.c", "src/tool_formparse.c",
"src/tool_formparse.h", "src/tool_formparse.h",
"src/tool_getparam.c", "src/tool_getparam.c",
@ -404,6 +487,8 @@ cc_binary(
"src/tool_paramhlp.h", "src/tool_paramhlp.h",
"src/tool_parsecfg.c", "src/tool_parsecfg.c",
"src/tool_parsecfg.h", "src/tool_parsecfg.h",
"src/tool_progress.c",
"src/tool_progress.h",
"src/tool_sdecls.h", "src/tool_sdecls.h",
"src/tool_setopt.c", "src/tool_setopt.c",
"src/tool_setopt.h", "src/tool_setopt.h",
@ -423,6 +508,8 @@ cc_binary(
"src/tool_writeenv.h", "src/tool_writeenv.h",
"src/tool_writeout.c", "src/tool_writeout.c",
"src/tool_writeout.h", "src/tool_writeout.h",
"src/tool_writeout_json.c",
"src/tool_writeout_json.h",
"src/tool_xattr.c", "src/tool_xattr.c",
"src/tool_xattr.h", "src/tool_xattr.h",
], ],