Update curl to version 7.70.0

Issue #3773
This commit is contained in:
Christian Helmuth
2020-06-03 13:57:52 +02:00
committed by Norman Feske
parent 190b4784c5
commit 954f03257d
14 changed files with 1589 additions and 1063 deletions

View File

@ -1,13 +1,4 @@
ARCH = $(filter 32bit 64bit,$(SPECS))
INC_DIR += $(call select_from_repositories,src/lib/curl)/spec/$(ARCH)
INC_DIR += $(call select_from_ports,curl)/include
ifeq ($(filter-out $(SPECS),32bit),)
TARGET_CPUARCH=32bit
else ifeq ($(filter-out $(SPECS),64bit),)
TARGET_CPUARCH=64bit
endif
# include architecture specific curlbuild.h
REP_INC_DIR += src/lib/curl/spec/$(TARGET_CPUARCH)
REP_INC_DIR += src/lib/curl/spec/$(TARGET_CPUARCH)/curl
REP_INC_DIR += src/lib/curl

View File

@ -1,32 +1,162 @@
CURL_PORT_DIR = $(call select_from_ports,curl)
CURL_PORT_DIR := $(call select_from_ports,curl)
LIB_SRC_DIR := $(CURL_PORT_DIR)/src/lib/curl/lib
SRC_C = \
file.c timeval.c base64.c hostip.c progress.c formdata.c \
cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \
ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c \
netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c \
curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c \
memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c \
content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c \
http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c \
hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c \
select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c \
qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c \
curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c \
pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c \
curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c \
idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c \
asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \
curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.c \
curl_multibyte.c curl_darwinssl.c hostcheck.c \
bundles.c conncache.c
altsvc.c \
amigaos.c \
asyn-ares.c \
asyn-thread.c \
base64.c \
conncache.c \
connect.c \
content_encoding.c \
cookie.c \
curl_addrinfo.c \
curl_ctype.c \
curl_des.c \
curl_endian.c \
curl_fnmatch.c \
curl_get_line.c \
curl_gethostname.c \
curl_gssapi.c \
curl_memrchr.c \
curl_multibyte.c \
curl_ntlm_core.c \
curl_ntlm_wb.c \
curl_path.c \
curl_range.c \
curl_rtmp.c \
curl_sasl.c \
curl_sspi.c \
curl_threads.c \
dict.c \
doh.c \
dotdot.c \
easy.c \
escape.c \
file.c \
fileinfo.c \
formdata.c \
ftp.c \
ftplistparser.c \
getenv.c \
getinfo.c \
gopher.c \
hash.c \
hmac.c \
hostasyn.c \
hostcheck.c \
hostip.c \
hostip4.c \
hostip6.c \
hostsyn.c \
http.c \
http2.c \
http_chunks.c \
http_digest.c \
http_negotiate.c \
http_ntlm.c \
http_proxy.c \
idn_win32.c \
if2ip.c \
imap.c \
inet_ntop.c \
inet_pton.c \
krb5.c \
ldap.c \
llist.c \
md4.c \
md5.c \
memdebug.c \
mime.c \
mprintf.c \
mqtt.c \
multi.c \
netrc.c \
non-ascii.c \
nonblock.c \
openldap.c \
parsedate.c \
pingpong.c \
pop3.c \
progress.c \
psl.c \
rand.c \
rename.c \
rtsp.c \
security.c \
select.c \
sendf.c \
setopt.c \
sha256.c \
share.c \
slist.c \
smb.c \
smtp.c \
socketpair.c \
socks.c \
socks_gssapi.c \
socks_sspi.c \
speedcheck.c \
splay.c \
strcase.c \
strdup.c \
strerror.c \
strtok.c \
strtoofft.c \
system_win32.c \
telnet.c \
tftp.c \
timeval.c \
transfer.c \
url.c \
urlapi.c \
vauth/cleartext.c \
vauth/cram.c \
vauth/digest.c \
vauth/digest_sspi.c \
vauth/krb5_gssapi.c \
vauth/krb5_sspi.c \
vauth/ntlm.c \
vauth/ntlm_sspi.c \
vauth/oauth2.c \
vauth/spnego_gssapi.c \
vauth/spnego_sspi.c \
vauth/vauth.c \
version.c \
vquic/ngtcp2.c \
vquic/quiche.c \
vssh/libssh.c \
vssh/libssh2.c \
vssh/wolfssh.c \
vtls/bearssl.c \
vtls/gskit.c \
vtls/gtls.c \
vtls/mbedtls.c \
vtls/mbedtls_threadlock.c \
vtls/mesalink.c \
vtls/nss.c \
vtls/openssl.c \
vtls/schannel.c \
vtls/schannel_verify.c \
vtls/sectransp.c \
vtls/vtls.c \
vtls/wolfssl.c \
warnless.c \
wildcard.c \
x509asn1.c \
# end of SRC_C
CC_OPT += -DHAVE_CONFIG_H
CC_OPT += -DHAVE_CONFIG_H -DBUILDING_LIBCURL=1
LIBS += libc zlib libssh libssl
LIBS += libc zlib libssl libssh
include $(call select_from_repositories,lib/import/import-curl.mk)
INC_DIR += $(LIB_SRC_DIR)
SHARED_LIB = yes
vpath %.c $(CURL_PORT_DIR)/src/lib/curl/lib
vpath %.c $(LIB_SRC_DIR)
# vi: set ft=make :

View File

@ -1,309 +1,3 @@
Curl_DIGEST_MD5 D 32
Curl_FormBoundary T
Curl_FormInit T
Curl_FormReader T
Curl_GetFTPResponse T
Curl_HMAC_MD5 D 40
Curl_HMAC_final T
Curl_HMAC_init T
Curl_HMAC_update T
Curl_MD5_final T
Curl_MD5_init T
Curl_MD5_update T
Curl_SOCKS4 T
Curl_SOCKS5 T
Curl_addHandleToPipeline T
Curl_add_buffer T
Curl_add_buffer_init T
Curl_add_buffer_send T
Curl_add_bufferf T
Curl_add_custom_headers T
Curl_add_timecondition T
Curl_base64_decode T
Curl_base64_encode T
Curl_blockread_all T
Curl_bundle_add_conn T
Curl_bundle_create T
Curl_bundle_destroy T
Curl_bundle_remove_conn T
Curl_cache_addr T
Curl_ccalloc D 8
Curl_cert_hostcheck T
Curl_cfree D 8
Curl_checkheaders T
Curl_client_write T
Curl_clone_ssl_config T
Curl_close T
Curl_closesocket T
Curl_cmalloc D 8
Curl_compareheader T
Curl_conncache_add_conn T
Curl_conncache_destroy T
Curl_conncache_find_bundle T
Curl_conncache_find_first_connection T
Curl_conncache_foreach T
Curl_conncache_init T
Curl_conncache_remove_conn T
Curl_connect T
Curl_connected_proxy T
Curl_connecthost T
Curl_cookie_add T
Curl_cookie_cleanup T
Curl_cookie_clearall T
Curl_cookie_clearsess T
Curl_cookie_freelist T
Curl_cookie_getlist T
Curl_cookie_init T
Curl_cookie_list T
Curl_cookie_loadfiles T
Curl_crealloc D 8
Curl_cstrdup D 8
Curl_debug T
Curl_digest_cleanup T
Curl_disconnect T
Curl_do T
Curl_do_more T
Curl_doing_getsock T
Curl_done T
Curl_dupset T
Curl_easy_addmulti T
Curl_easy_initHandleData T
Curl_expire T
Curl_failf T
Curl_fileinfo_alloc T
Curl_fileinfo_dtor T
Curl_fillreadbuffer T
Curl_flush_cookies T
Curl_fnmatch T
Curl_follow T
Curl_formclean T
Curl_formpostheader T
Curl_free_ssl_config T
Curl_freeaddrinfo T
Curl_freeset T
Curl_ftp_parselist T
Curl_ftp_parselist_data_alloc T
Curl_ftp_parselist_data_free T
Curl_ftp_parselist_geterror T
Curl_ftpsendf T
Curl_getaddrinfo T
Curl_getaddrinfo_ex T
Curl_getconnectinfo T
Curl_getformdata T
Curl_gethostname T
Curl_getinfo T
Curl_getoff_all_pipelines T
Curl_global_host_cache_dtor T
Curl_global_host_cache_init T
Curl_gmtime T
Curl_handler_dict D 128
Curl_handler_file D 128
Curl_handler_ftp D 128
Curl_handler_ftps D 128
Curl_handler_gopher D 128
Curl_handler_http D 128
Curl_handler_https D 128
Curl_handler_imap D 128
Curl_handler_imaps D 128
Curl_handler_pop3 D 128
Curl_handler_pop3s D 128
Curl_handler_rtsp D 128
Curl_handler_smtp D 128
Curl_handler_smtps D 128
Curl_handler_telnet D 128
Curl_handler_tftp D 128
Curl_hash_add T
Curl_hash_alloc T
Curl_hash_clean T
Curl_hash_clean_with_criterium T
Curl_hash_delete T
Curl_hash_destroy T
Curl_hash_init T
Curl_hash_next_element T
Curl_hash_pick T
Curl_hash_start_iterate T
Curl_hash_str T
Curl_he2ai T
Curl_hostcache_clean T
Curl_hostcache_destroy T
Curl_hostcache_prune T
Curl_http T
Curl_http_auth_act T
Curl_http_connect T
Curl_http_done T
Curl_http_input_auth T
Curl_http_ntlm_cleanup T
Curl_http_output_auth T
Curl_http_readwrite_headers T
Curl_httpchunk_init T
Curl_httpchunk_read T
Curl_if2ip T
Curl_if_is_interface_name T
Curl_infof T
Curl_init_userdefined T
Curl_initinfo T
Curl_input_digest T
Curl_input_ntlm T
Curl_ip2addr T
Curl_ipv4_resolve_r T
Curl_ipvalid T
Curl_isPipeliningEnabled T
Curl_is_connected T
Curl_llist_alloc T
Curl_llist_count T
Curl_llist_destroy T
Curl_llist_insert_next T
Curl_llist_move T
Curl_llist_remove T
Curl_loadhostpairs T
Curl_md5it T
Curl_meets_timecondition T
Curl_mk_dnscache T
Curl_month D 96
Curl_multi_canPipeline T
Curl_multi_handlePipeBreak T
Curl_ntlm_core_lm_resp T
Curl_ntlm_core_mk_lm_hash T
Curl_ntlm_core_mk_nt_hash T
Curl_ntlm_create_type1_message T
Curl_ntlm_create_type3_message T
Curl_ntlm_decode_type2_message T
Curl_num_addresses T
Curl_open T
Curl_ossl_check_cxn T
Curl_ossl_cleanup T
Curl_ossl_close T
Curl_ossl_close_all T
Curl_ossl_connect T
Curl_ossl_connect_nonblocking T
Curl_ossl_data_pending T
Curl_ossl_engines_list T
Curl_ossl_init T
Curl_ossl_md5sum T
Curl_ossl_random T
Curl_ossl_seed T
Curl_ossl_session_free T
Curl_ossl_set_engine T
Curl_ossl_set_engine_default T
Curl_ossl_shutdown T
Curl_ossl_version T
Curl_output_digest T
Curl_output_ntlm T
Curl_parsenetrc T
Curl_persistconninfo T
Curl_pgrsDone T
Curl_pgrsResetTimesSizes T
Curl_pgrsSetDownloadCounter T
Curl_pgrsSetDownloadSize T
Curl_pgrsSetUploadCounter T
Curl_pgrsSetUploadSize T
Curl_pgrsStartNow T
Curl_pgrsTime T
Curl_pgrsUpdate T
Curl_poll T
Curl_pop3_write T
Curl_posttransfer T
Curl_pp_disconnect T
Curl_pp_easy_statemach T
Curl_pp_flushsend T
Curl_pp_getsock T
Curl_pp_init T
Curl_pp_multi_statemach T
Curl_pp_readresp T
Curl_pp_sendf T
Curl_pp_state_timeout T
Curl_pp_vsendf T
Curl_pretransfer T
Curl_printable_address T
Curl_protocol_connect T
Curl_protocol_connecting T
Curl_protocol_doing T
Curl_protocol_getsock T
Curl_proxyCONNECT T
Curl_proxy_connect T
Curl_rand T
Curl_raw_equal T
Curl_raw_nequal T
Curl_raw_toupper T
Curl_read T
Curl_read_plain T
Curl_readrewind T
Curl_readwrite T
Curl_reconnect_request T
Curl_recv_plain T
Curl_removeHandleFromPipeline T
Curl_reset_reqproto T
Curl_resolv T
Curl_resolv_timeout T
Curl_resolv_unlock T
Curl_retry_request T
Curl_rtsp_connisdead T
Curl_rtsp_parseheader T
Curl_sasl_cleanup T
Curl_sasl_create_cram_md5_message T
Curl_sasl_create_digest_md5_message T
Curl_sasl_create_login_message T
Curl_sasl_create_ntlm_type1_message T
Curl_sasl_create_ntlm_type3_message T
Curl_sasl_create_plain_message T
Curl_send_plain T
Curl_sendf T
Curl_set_dns_servers T
Curl_setopt T
Curl_setup_conn T
Curl_setup_transfer T
Curl_share_lock T
Curl_share_unlock T
Curl_single_getsock T
Curl_sleep_time T
Curl_slist_duplicate T
Curl_smtp_escape_eob T
Curl_socket T
Curl_socket_check T
Curl_speedcheck T
Curl_speedinit T
Curl_splay T
Curl_splaygetbest T
Curl_splayinsert T
Curl_splayremovebyaddr T
Curl_srand T
Curl_ssl_addsessionid T
Curl_ssl_check_cxn T
Curl_ssl_cleanup T
Curl_ssl_close T
Curl_ssl_close_all T
Curl_ssl_config_matches T
Curl_ssl_connect T
Curl_ssl_connect_nonblocking T
Curl_ssl_data_pending T
Curl_ssl_delsessionid T
Curl_ssl_engines_list T
Curl_ssl_free_certinfo T
Curl_ssl_getsessionid T
Curl_ssl_init T
Curl_ssl_initsessions T
Curl_ssl_kill_session T
Curl_ssl_md5sum T
Curl_ssl_random T
Curl_ssl_set_engine T
Curl_ssl_set_engine_default T
Curl_ssl_shutdown T
Curl_ssl_version T
Curl_str2addr T
Curl_str_key_compare T
Curl_strerror T
Curl_strntoupper T
Curl_timeleft T
Curl_tvlong T
Curl_updateconninfo T
Curl_urldecode T
Curl_verboseconnect T
Curl_wait_ms T
Curl_wildcard_dtor T
Curl_wildcard_init T
Curl_wkday D 56
Curl_write T
Curl_write_plain T
curl_easy_cleanup T
curl_easy_duphandle T
curl_easy_escape T
@ -317,6 +11,7 @@ curl_easy_send T
curl_easy_setopt T
curl_easy_strerror T
curl_easy_unescape T
curl_easy_upkeep T
curl_escape T
curl_formadd T
curl_formfree T
@ -327,8 +22,21 @@ curl_getenv T
curl_global_cleanup T
curl_global_init T
curl_global_init_mem T
curl_global_sslset T
curl_maprintf T
curl_mfprintf T
curl_mime_addpart T
curl_mime_data T
curl_mime_data_cb T
curl_mime_encoder T
curl_mime_filedata T
curl_mime_filename T
curl_mime_free T
curl_mime_headers T
curl_mime_init T
curl_mime_name T
curl_mime_subparts T
curl_mime_type T
curl_mprintf T
curl_msnprintf T
curl_msprintf T
@ -339,6 +47,7 @@ curl_multi_fdset T
curl_multi_info_read T
curl_multi_init T
curl_multi_perform T
curl_multi_poll T
curl_multi_remove_handle T
curl_multi_setopt T
curl_multi_socket T
@ -347,11 +56,14 @@ curl_multi_socket_all T
curl_multi_strerror T
curl_multi_timeout T
curl_multi_wait T
curl_multi_wakeup T
curl_mvaprintf T
curl_mvfprintf T
curl_mvprintf T
curl_mvsnprintf T
curl_mvsprintf T
curl_pushheader_byname T
curl_pushheader_bynum T
curl_share_cleanup T
curl_share_init T
curl_share_setopt T
@ -361,22 +73,10 @@ curl_slist_free_all T
curl_strequal T
curl_strnequal T
curl_unescape T
curl_url T
curl_url_cleanup T
curl_url_dup T
curl_url_get T
curl_url_set T
curl_version T
curl_version_info T
curlx_nonblock T
curlx_sitouz T
curlx_sltosi T
curlx_sltoui T
curlx_sltous T
curlx_sotouz T
curlx_sztosi T
curlx_tvdiff T
curlx_tvdiff_secs T
curlx_tvnow T
curlx_ultosi T
curlx_ultouc T
curlx_ultous T
curlx_uztosi T
curlx_uztosz T
curlx_uztoui T
curlx_uztoul T