Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Roll curl to 7.56.1 

Fixes #285

Change-Id: I3cda80974e8cc66f11763c41c36d832565077374
This commit is contained in:
KongQun Yang 2017-11-30 11:53:42 -08:00
parent 7097270f13
commit 9631ec71de
5 changed files with 156 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -39,7 +39,7 @@ deps = {
Var("github") + "/google/boringssl@fc9c67599d9bdeb2e0467085133b81a8e28f77a4", Var("github") + "/google/boringssl@fc9c67599d9bdeb2e0467085133b81a8e28f77a4",
"src/packager/third_party/curl/source": "src/packager/third_party/curl/source":
Var("github") + "/curl/curl@79e63a53bb9598af863b0afe49ad662795faeef4", #7.50.0 Var("github") + "/curl/curl@c514af5a4f5ac3ce724065cc6a8e009373436f78", #7.56.1
"src/packager/third_party/gflags/src": "src/packager/third_party/gflags/src":
Var("chromium_git") + "/external/github.com/gflags/gflags@03bebcb065c83beff83d50ae025a55a4bf94dfca", Var("chromium_git") + "/external/github.com/gflags/gflags@03bebcb065c83beff83d50ae025a55a4bf94dfca",

18
packager/third_party/curl/README.packager vendored
View File

@ -26,10 +26,20 @@ Description of source tree.
A dummy manual required to build curl command line tool. A dummy manual required to build curl command line tool.
config/linux/curl_config.h config/linux/curl_config.h
An *auto-generated* configuration file by running "source/configure An *auto-generated* configuration file by running bash commands:
--with-ssl --without-ca-bundle --without-ca-path --without-zlib
--without-libidn --without-librtmp" on linux platform, with a few cd source
features disabled to build correctly on a fresh linux box. ./buildconf
cd ..
source/configure --with-ssl --without-ca-bundle --without-ca-path \
--without-zlib --without-libidn --without-librtmp
cp lib/curl_config.h config/linux/curl_config.h
on linux platform, with a few features disabled to build correctly on a
fresh linux box.
config/mac/curl_config.h
Similar as above, but run in Mac instead.
config/linux/find_curl_ca_bundle.sh config/linux/find_curl_ca_bundle.sh
A script used to find the path to curl_ca_bundle in the target system. A script used to find the path to curl_ca_bundle in the target system.

129
packager/third_party/curl/config/linux/curl_config.h vendored
View File

@ -4,9 +4,15 @@
/* Location of default ca bundle */ /* Location of default ca bundle */
/* #undef CURL_CA_BUNDLE */ /* #undef CURL_CA_BUNDLE */
/* define "1" to use built in CA store of SSL library */
/* #undef CURL_CA_FALLBACK */
/* Location of default ca path */ /* Location of default ca path */
/* #undef CURL_CA_PATH */ /* #undef CURL_CA_PATH */
/* Default SSL backend */
/* #undef CURL_DEFAULT_SSL_BACKEND */
/* to disable cookies support */ /* to disable cookies support */
/* #undef CURL_DISABLE_COOKIES */ /* #undef CURL_DISABLE_COOKIES */
@ -70,6 +76,9 @@
/* Definition to make a library symbol externally visible. */ /* Definition to make a library symbol externally visible. */
#define CURL_EXTERN_SYMBOL __attribute__ ((__visibility__ ("default"))) #define CURL_EXTERN_SYMBOL __attribute__ ((__visibility__ ("default")))
/* built with multiple SSL backends */
/* #undef CURL_WITH_MULTI_SSL */
/* your Entropy Gathering Daemon socket pathname */ /* your Entropy Gathering Daemon socket pathname */
/* #undef EGD_SOCKET */ /* #undef EGD_SOCKET */
@ -124,6 +133,11 @@
/* Define to 1 if using BoringSSL. */ /* Define to 1 if using BoringSSL. */
/* packager uses BORINGSSL. */ /* packager uses BORINGSSL. */
#define HAVE_BORINGSSL 1 #define HAVE_BORINGSSL 1
/* Uses RSA_flags which does not exist in boringssl */
#define OPENSSL_NO_RSA 1
/* Define to 1 if you have the __builtin_available function. */
/* #undef HAVE_BUILTIN_AVAILABLE */
/* Define to 1 if you have the clock_gettime function and monotonic timer. */ /* Define to 1 if you have the clock_gettime function and monotonic timer. */
/* Disabled for packager. */ /* Disabled for packager. */
@ -138,21 +152,21 @@
/* Define to 1 if you have the connect function. */ /* Define to 1 if you have the connect function. */
#define HAVE_CONNECT 1 #define HAVE_CONNECT 1
/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */
#define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1
/* Define to 1 if you have the <crypto.h> header file. */ /* Define to 1 if you have the <crypto.h> header file. */
/* #undef HAVE_CRYPTO_H */ /* #undef HAVE_CRYPTO_H */
/* Define to 1 if you have the `CyaSSL_CTX_UseSupportedCurve' function. */
/* #undef HAVE_CYASSL_CTX_USESUPPORTEDCURVE */
/* Define to 1 if you have the <cyassl/error-ssl.h> header file. */ /* Define to 1 if you have the <cyassl/error-ssl.h> header file. */
/* #undef HAVE_CYASSL_ERROR_SSL_H */ /* #undef HAVE_CYASSL_ERROR_SSL_H */
/* Define to 1 if you have the `CyaSSL_get_peer_certificate' function. */
/* #undef HAVE_CYASSL_GET_PEER_CERTIFICATE */
/* Define to 1 if you have the <cyassl/options.h> header file. */ /* Define to 1 if you have the <cyassl/options.h> header file. */
/* #undef HAVE_CYASSL_OPTIONS_H */ /* #undef HAVE_CYASSL_OPTIONS_H */
/* Define to 1 if you have the `DES_set_odd_parity' function. */
#define HAVE_DES_SET_ODD_PARITY 1
/* Define to 1 if you have the <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1 #define HAVE_DLFCN_H 1
@ -184,9 +198,6 @@
/* Define to 1 if you have the fdopen function. */ /* Define to 1 if you have the fdopen function. */
#define HAVE_FDOPEN 1 #define HAVE_FDOPEN 1
/* Define to 1 if you have the `fork' function. */
#define HAVE_FORK 1
/* Define to 1 if you have the freeaddrinfo function. */ /* Define to 1 if you have the freeaddrinfo function. */
#define HAVE_FREEADDRINFO 1 #define HAVE_FREEADDRINFO 1
@ -262,9 +273,6 @@
/* Define to 1 if you have the `getppid' function. */ /* Define to 1 if you have the `getppid' function. */
#define HAVE_GETPPID 1 #define HAVE_GETPPID 1
/* Define to 1 if you have the `getprotobyname' function. */
#define HAVE_GETPROTOBYNAME 1
/* Define to 1 if you have the `getpwuid' function. */ /* Define to 1 if you have the `getpwuid' function. */
#define HAVE_GETPWUID 1 #define HAVE_GETPWUID 1
@ -287,6 +295,16 @@
/* Define to 1 if you have a working gmtime_r function. */ /* Define to 1 if you have a working gmtime_r function. */
#define HAVE_GMTIME_R 1 #define HAVE_GMTIME_R 1
/* Define to 1 if you have the `gnutls_alpn_set_protocols' function. */
/* #undef HAVE_GNUTLS_ALPN_SET_PROTOCOLS */
/* Define to 1 if you have the `gnutls_certificate_set_x509_key_file2'
function. */
/* #undef HAVE_GNUTLS_CERTIFICATE_SET_X509_KEY_FILE2 */
/* Define to 1 if you have the `gnutls_ocsp_req_init' function. */
/* #undef HAVE_GNUTLS_OCSP_REQ_INIT */
/* if you have the function gnutls_srp_verifier */ /* if you have the function gnutls_srp_verifier */
/* #undef HAVE_GNUTLS_SRP */ /* #undef HAVE_GNUTLS_SRP */
@ -311,14 +329,8 @@
/* if you have MIT Kerberos */ /* if you have MIT Kerberos */
/* #undef HAVE_GSSMIT */ /* #undef HAVE_GSSMIT */
/* Define to 1 if you have the `idna_strerror' function. */ /* Define to 1 if you have the <idn2.h> header file. */
/* #undef HAVE_IDNA_STRERROR */ /* #undef HAVE_IDN2_H */
/* Define to 1 if you have the `idn_free' function. */
/* #undef HAVE_IDN_FREE */
/* Define to 1 if you have the <idn-free.h> header file. */
/* #undef HAVE_IDN_FREE_H */
/* Define to 1 if you have the <ifaddrs.h> header file. */ /* Define to 1 if you have the <ifaddrs.h> header file. */
#define HAVE_IFADDRS_H 1 #define HAVE_IFADDRS_H 1
@ -327,9 +339,6 @@
/* Disabled for packager. Not verified yet. */ /* Disabled for packager. Not verified yet. */
/* #undef HAVE_IF_NAMETOINDEX */ /* #undef HAVE_IF_NAMETOINDEX */
/* Define to 1 if you have the `inet_addr' function. */
#define HAVE_INET_ADDR 1
/* Define to 1 if you have the inet_ntoa_r function. */ /* Define to 1 if you have the inet_ntoa_r function. */
/* #undef HAVE_INET_NTOA_R */ /* #undef HAVE_INET_NTOA_R */
@ -397,11 +406,8 @@
/* Define to 1 if you have the <libgen.h> header file. */ /* Define to 1 if you have the <libgen.h> header file. */
#define HAVE_LIBGEN_H 1 #define HAVE_LIBGEN_H 1
/* Define to 1 if you have the `idn' library (-lidn). */ /* Define to 1 if you have the `idn2' library (-lidn2). */
/* #undef HAVE_LIBIDN */ /* #undef HAVE_LIBIDN2 */
/* Define to 1 if you have the `resolve' library (-lresolve). */
/* #undef HAVE_LIBRESOLVE */
/* Define to 1 if using libressl. */ /* Define to 1 if using libressl. */
/* #undef HAVE_LIBRESSL */ /* #undef HAVE_LIBRESSL */
@ -484,9 +490,6 @@
/* Define to 1 if you have the <openssl/pem.h> header file. */ /* Define to 1 if you have the <openssl/pem.h> header file. */
#define HAVE_OPENSSL_PEM_H 1 #define HAVE_OPENSSL_PEM_H 1
/* Define to 1 if you have the <openssl/pkcs12.h> header file. */
#define HAVE_OPENSSL_PKCS12_H 1
/* Define to 1 if you have the <openssl/rsa.h> header file. */ /* Define to 1 if you have the <openssl/rsa.h> header file. */
#define HAVE_OPENSSL_RSA_H 1 #define HAVE_OPENSSL_RSA_H 1
@ -502,9 +505,6 @@
/* Define to 1 if you have the <pem.h> header file. */ /* Define to 1 if you have the <pem.h> header file. */
/* #undef HAVE_PEM_H */ /* #undef HAVE_PEM_H */
/* Define to 1 if you have the `perror' function. */
#define HAVE_PERROR 1
/* Define to 1 if you have the `pipe' function. */ /* Define to 1 if you have the `pipe' function. */
#define HAVE_PIPE 1 #define HAVE_PIPE 1
@ -521,7 +521,7 @@
#define HAVE_POSIX_STRERROR_R 1 #define HAVE_POSIX_STRERROR_R 1
/* if you have <pthread.h> */ /* if you have <pthread.h> */
/* #undef HAVE_PTHREAD_H */ #define HAVE_PTHREAD_H 1
/* Define to 1 if you have the <pwd.h> header file. */ /* Define to 1 if you have the <pwd.h> header file. */
#define HAVE_PWD_H 1 #define HAVE_PWD_H 1
@ -529,12 +529,6 @@
/* Define to 1 if you have the `RAND_egd' function. */ /* Define to 1 if you have the `RAND_egd' function. */
#define HAVE_RAND_EGD 1 #define HAVE_RAND_EGD 1
/* Define to 1 if you have the `RAND_screen' function. */
/* #undef HAVE_RAND_SCREEN */
/* Define to 1 if you have the `RAND_status' function. */
#define HAVE_RAND_STATUS 1
/* Define to 1 if you have the recv function. */ /* Define to 1 if you have the recv function. */
#define HAVE_RECV 1 #define HAVE_RECV 1
@ -653,7 +647,7 @@
/* #undef HAVE_STRNICMP */ /* #undef HAVE_STRNICMP */
/* Define to 1 if you have the <stropts.h> header file. */ /* Define to 1 if you have the <stropts.h> header file. */
/* #undef HAVE_STROPTS_H */ #define HAVE_STROPTS_H 1
/* Define to 1 if you have the strstr function. */ /* Define to 1 if you have the strstr function. */
#define HAVE_STRSTR 1 #define HAVE_STRSTR 1
@ -727,21 +721,15 @@
/* Define to 1 if you have the <time.h> header file. */ /* Define to 1 if you have the <time.h> header file. */
#define HAVE_TIME_H 1 #define HAVE_TIME_H 1
/* Define to 1 if you have the <tld.h> header file. */
/* #undef HAVE_TLD_H */
/* Define to 1 if you have the `tld_strerror' function. */
/* #undef HAVE_TLD_STRERROR */
/* Define to 1 if you have the `uname' function. */
#define HAVE_UNAME 1
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
/* Define to 1 if you have the `utime' function. */ /* Define to 1 if you have the `utime' function. */
#define HAVE_UTIME 1 #define HAVE_UTIME 1
/* Define to 1 if you have the `utimes' function. */
#define HAVE_UTIMES 1
/* Define to 1 if you have the <utime.h> header file. */ /* Define to 1 if you have the <utime.h> header file. */
#define HAVE_UTIME_H 1 #define HAVE_UTIME_H 1
@ -766,6 +754,18 @@
/* Define to 1 if you have the winsock.h header file. */ /* Define to 1 if you have the winsock.h header file. */
/* #undef HAVE_WINSOCK_H */ /* #undef HAVE_WINSOCK_H */
/* Define to 1 if you have the `wolfSSLv3_client_method' function. */
/* #undef HAVE_WOLFSSLV3_CLIENT_METHOD */
/* Define to 1 if you have the `wolfSSL_CTX_UseSupportedCurve' function. */
/* #undef HAVE_WOLFSSL_CTX_USESUPPORTEDCURVE */
/* Define to 1 if you have the `wolfSSL_get_peer_certificate' function. */
/* #undef HAVE_WOLFSSL_GET_PEER_CERTIFICATE */
/* Define to 1 if you have the `wolfSSL_UseALPN' function. */
/* #undef HAVE_WOLFSSL_USEALPN */
/* Define this symbol if your OS supports changing the contents of argv */ /* Define this symbol if your OS supports changing the contents of argv */
#define HAVE_WRITABLE_ARGV 1 #define HAVE_WRITABLE_ARGV 1
@ -813,7 +813,8 @@
#define PACKAGE "curl" #define PACKAGE "curl"
/* Define to the address where bug reports for this package should be sent. */ /* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "a suitable curl mailing list: http://curl.haxx.se/mail/" #define PACKAGE_BUGREPORT \
"a suitable curl mailing list: https://curl.haxx.se/mail/"
/* Define to the full name of this package. */ /* Define to the full name of this package. */
#define PACKAGE_NAME "curl" #define PACKAGE_NAME "curl"
@ -884,6 +885,9 @@
/* Define to the function return type for send. */ /* Define to the function return type for send. */
#define SEND_TYPE_RETV ssize_t #define SEND_TYPE_RETV ssize_t
/* The size of `curl_off_t', as computed by sizeof. */
#define SIZEOF_CURL_OFF_T 8
/* The size of `int', as computed by sizeof. */ /* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4 #define SIZEOF_INT 4
@ -905,9 +909,6 @@
/* The size of `time_t', as computed by sizeof. */ /* The size of `time_t', as computed by sizeof. */
#define SIZEOF_TIME_T 8 #define SIZEOF_TIME_T 8
/* The size of `void*', as computed by sizeof. */
#define SIZEOF_VOIDP 8
/* Define to 1 if you have the ANSI C header files. */ /* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1 #define STDC_HEADERS 1
@ -923,10 +924,10 @@
/* if axTLS is enabled */ /* if axTLS is enabled */
/* #undef USE_AXTLS */ /* #undef USE_AXTLS */
/* if CyaSSL is enabled */ /* if CyaSSL/WolfSSL is enabled */
/* #undef USE_CYASSL */ /* #undef USE_CYASSL */
/* to enable iOS/Mac OS X native SSL/TLS support */ /* to enable Apple OS native SSL/TLS support */
/* #undef USE_DARWINSSL */ /* #undef USE_DARWINSSL */
/* if GnuTLS is enabled */ /* if GnuTLS is enabled */
@ -935,6 +936,9 @@
/* if GnuTLS uses nettle as crypto backend */ /* if GnuTLS uses nettle as crypto backend */
/* #undef USE_GNUTLS_NETTLE */ /* #undef USE_GNUTLS_NETTLE */
/* PSL support enabled */
/* #undef USE_LIBPSL */
/* if librtmp is in use */ /* if librtmp is in use */
/* #undef USE_LIBRTMP */ /* #undef USE_LIBRTMP */
@ -944,6 +948,9 @@
/* If you want to build curl with the built-in manual */ /* If you want to build curl with the built-in manual */
#define USE_MANUAL 1 #define USE_MANUAL 1
/* if mbedTLS is enabled */
/* #undef USE_MBEDTLS */
/* Define to enable metalink support */ /* Define to enable metalink support */
/* #undef USE_METALINK */ /* #undef USE_METALINK */
@ -966,7 +973,10 @@
/* #undef USE_SCHANNEL */ /* #undef USE_SCHANNEL */
/* if you want POSIX threaded DNS lookup */ /* if you want POSIX threaded DNS lookup */
/* #undef USE_THREADS_POSIX */ #define USE_THREADS_POSIX 1
/* if you want Win32 threaded DNS lookup */
/* #undef USE_THREADS_WIN32 */
/* Use TLS-SRP authentication */ /* Use TLS-SRP authentication */
#ifndef HAVE_BORINGSSL #ifndef HAVE_BORINGSSL
@ -999,9 +1009,6 @@
/* Define to 1 to provide own prototypes. */ /* Define to 1 to provide own prototypes. */
/* #undef WANT_IDN_PROTOTYPES */ /* #undef WANT_IDN_PROTOTYPES */
/* Define to avoid automatic inclusion of winsock.h */
/* #undef WIN32_LEAN_AND_MEAN */
/* Define to 1 if OS is AIX. */ /* Define to 1 if OS is AIX. */
#ifndef _ALL_SOURCE #ifndef _ALL_SOURCE
/* # undef _ALL_SOURCE */ /* # undef _ALL_SOURCE */

127
packager/third_party/curl/config/mac/curl_config.h vendored
View File

@ -4,9 +4,15 @@
/* Location of default ca bundle */ /* Location of default ca bundle */
/* #undef CURL_CA_BUNDLE */ /* #undef CURL_CA_BUNDLE */
/* define "1" to use built in CA store of SSL library */
/* #undef CURL_CA_FALLBACK */
/* Location of default ca path */ /* Location of default ca path */
/* #undef CURL_CA_PATH */ /* #undef CURL_CA_PATH */
/* Default SSL backend */
/* #undef CURL_DEFAULT_SSL_BACKEND */
/* to disable cookies support */ /* to disable cookies support */
/* #undef CURL_DISABLE_COOKIES */ /* #undef CURL_DISABLE_COOKIES */
@ -70,6 +76,9 @@
/* Definition to make a library symbol externally visible. */ /* Definition to make a library symbol externally visible. */
#define CURL_EXTERN_SYMBOL __attribute__ ((__visibility__ ("default"))) #define CURL_EXTERN_SYMBOL __attribute__ ((__visibility__ ("default")))
/* built with multiple SSL backends */
/* #undef CURL_WITH_MULTI_SSL */
/* your Entropy Gathering Daemon socket pathname */ /* your Entropy Gathering Daemon socket pathname */
/* #undef EGD_SOCKET */ /* #undef EGD_SOCKET */
@ -124,6 +133,11 @@
/* Define to 1 if using BoringSSL. */ /* Define to 1 if using BoringSSL. */
/* packager uses BORINGSSL. */ /* packager uses BORINGSSL. */
#define HAVE_BORINGSSL 1 #define HAVE_BORINGSSL 1
/* Uses RSA_flags which does not exist in boringssl */
#define OPENSSL_NO_RSA 1
/* Define to 1 if you have the __builtin_available function. */
/* #undef HAVE_BUILTIN_AVAILABLE */
/* Define to 1 if you have the clock_gettime function and monotonic timer. */ /* Define to 1 if you have the clock_gettime function and monotonic timer. */
/* Disabled for packager. */ /* Disabled for packager. */
@ -138,21 +152,21 @@
/* Define to 1 if you have the connect function. */ /* Define to 1 if you have the connect function. */
#define HAVE_CONNECT 1 #define HAVE_CONNECT 1
/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */
#define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1
/* Define to 1 if you have the <crypto.h> header file. */ /* Define to 1 if you have the <crypto.h> header file. */
/* #undef HAVE_CRYPTO_H */ /* #undef HAVE_CRYPTO_H */
/* Define to 1 if you have the `CyaSSL_CTX_UseSupportedCurve' function. */
/* #undef HAVE_CYASSL_CTX_USESUPPORTEDCURVE */
/* Define to 1 if you have the <cyassl/error-ssl.h> header file. */ /* Define to 1 if you have the <cyassl/error-ssl.h> header file. */
/* #undef HAVE_CYASSL_ERROR_SSL_H */ /* #undef HAVE_CYASSL_ERROR_SSL_H */
/* Define to 1 if you have the `CyaSSL_get_peer_certificate' function. */
/* #undef HAVE_CYASSL_GET_PEER_CERTIFICATE */
/* Define to 1 if you have the <cyassl/options.h> header file. */ /* Define to 1 if you have the <cyassl/options.h> header file. */
/* #undef HAVE_CYASSL_OPTIONS_H */ /* #undef HAVE_CYASSL_OPTIONS_H */
/* Define to 1 if you have the `DES_set_odd_parity' function. */
#define HAVE_DES_SET_ODD_PARITY 1
/* Define to 1 if you have the <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1 #define HAVE_DLFCN_H 1
@ -184,9 +198,6 @@
/* Define to 1 if you have the fdopen function. */ /* Define to 1 if you have the fdopen function. */
#define HAVE_FDOPEN 1 #define HAVE_FDOPEN 1
/* Define to 1 if you have the `fork' function. */
#define HAVE_FORK 1
/* Define to 1 if you have the freeaddrinfo function. */ /* Define to 1 if you have the freeaddrinfo function. */
#define HAVE_FREEADDRINFO 1 #define HAVE_FREEADDRINFO 1
@ -262,9 +273,6 @@
/* Define to 1 if you have the `getppid' function. */ /* Define to 1 if you have the `getppid' function. */
#define HAVE_GETPPID 1 #define HAVE_GETPPID 1
/* Define to 1 if you have the `getprotobyname' function. */
#define HAVE_GETPROTOBYNAME 1
/* Define to 1 if you have the `getpwuid' function. */ /* Define to 1 if you have the `getpwuid' function. */
#define HAVE_GETPWUID 1 #define HAVE_GETPWUID 1
@ -287,6 +295,16 @@
/* Define to 1 if you have a working gmtime_r function. */ /* Define to 1 if you have a working gmtime_r function. */
#define HAVE_GMTIME_R 1 #define HAVE_GMTIME_R 1
/* Define to 1 if you have the `gnutls_alpn_set_protocols' function. */
/* #undef HAVE_GNUTLS_ALPN_SET_PROTOCOLS */
/* Define to 1 if you have the `gnutls_certificate_set_x509_key_file2'
function. */
/* #undef HAVE_GNUTLS_CERTIFICATE_SET_X509_KEY_FILE2 */
/* Define to 1 if you have the `gnutls_ocsp_req_init' function. */
/* #undef HAVE_GNUTLS_OCSP_REQ_INIT */
/* if you have the function gnutls_srp_verifier */ /* if you have the function gnutls_srp_verifier */
/* #undef HAVE_GNUTLS_SRP */ /* #undef HAVE_GNUTLS_SRP */
@ -311,14 +329,8 @@
/* if you have MIT Kerberos */ /* if you have MIT Kerberos */
/* #undef HAVE_GSSMIT */ /* #undef HAVE_GSSMIT */
/* Define to 1 if you have the `idna_strerror' function. */ /* Define to 1 if you have the <idn2.h> header file. */
/* #undef HAVE_IDNA_STRERROR */ /* #undef HAVE_IDN2_H */
/* Define to 1 if you have the `idn_free' function. */
/* #undef HAVE_IDN_FREE */
/* Define to 1 if you have the <idn-free.h> header file. */
/* #undef HAVE_IDN_FREE_H */
/* Define to 1 if you have the <ifaddrs.h> header file. */ /* Define to 1 if you have the <ifaddrs.h> header file. */
#define HAVE_IFADDRS_H 1 #define HAVE_IFADDRS_H 1
@ -327,9 +339,6 @@
/* Disabled for packager. Not verified yet. */ /* Disabled for packager. Not verified yet. */
/* #undef HAVE_IF_NAMETOINDEX */ /* #undef HAVE_IF_NAMETOINDEX */
/* Define to 1 if you have the `inet_addr' function. */
#define HAVE_INET_ADDR 1
/* Define to 1 if you have the inet_ntoa_r function. */ /* Define to 1 if you have the inet_ntoa_r function. */
/* #undef HAVE_INET_NTOA_R */ /* #undef HAVE_INET_NTOA_R */
@ -397,11 +406,8 @@
/* Define to 1 if you have the <libgen.h> header file. */ /* Define to 1 if you have the <libgen.h> header file. */
#define HAVE_LIBGEN_H 1 #define HAVE_LIBGEN_H 1
/* Define to 1 if you have the `idn' library (-lidn). */ /* Define to 1 if you have the `idn2' library (-lidn2). */
/* #undef HAVE_LIBIDN */ /* #undef HAVE_LIBIDN2 */
/* Define to 1 if you have the `resolve' library (-lresolve). */
/* #undef HAVE_LIBRESOLVE */
/* Define to 1 if using libressl. */ /* Define to 1 if using libressl. */
/* #undef HAVE_LIBRESSL */ /* #undef HAVE_LIBRESSL */
@ -484,9 +490,6 @@
/* Define to 1 if you have the <openssl/pem.h> header file. */ /* Define to 1 if you have the <openssl/pem.h> header file. */
#define HAVE_OPENSSL_PEM_H 1 #define HAVE_OPENSSL_PEM_H 1
/* Define to 1 if you have the <openssl/pkcs12.h> header file. */
#define HAVE_OPENSSL_PKCS12_H 1
/* Define to 1 if you have the <openssl/rsa.h> header file. */ /* Define to 1 if you have the <openssl/rsa.h> header file. */
#define HAVE_OPENSSL_RSA_H 1 #define HAVE_OPENSSL_RSA_H 1
@ -502,9 +505,6 @@
/* Define to 1 if you have the <pem.h> header file. */ /* Define to 1 if you have the <pem.h> header file. */
/* #undef HAVE_PEM_H */ /* #undef HAVE_PEM_H */
/* Define to 1 if you have the `perror' function. */
#define HAVE_PERROR 1
/* Define to 1 if you have the `pipe' function. */ /* Define to 1 if you have the `pipe' function. */
#define HAVE_PIPE 1 #define HAVE_PIPE 1
@ -521,7 +521,7 @@
#define HAVE_POSIX_STRERROR_R 1 #define HAVE_POSIX_STRERROR_R 1
/* if you have <pthread.h> */ /* if you have <pthread.h> */
/* #undef HAVE_PTHREAD_H */ #define HAVE_PTHREAD_H 1
/* Define to 1 if you have the <pwd.h> header file. */ /* Define to 1 if you have the <pwd.h> header file. */
#define HAVE_PWD_H 1 #define HAVE_PWD_H 1
@ -529,12 +529,6 @@
/* Define to 1 if you have the `RAND_egd' function. */ /* Define to 1 if you have the `RAND_egd' function. */
#define HAVE_RAND_EGD 1 #define HAVE_RAND_EGD 1
/* Define to 1 if you have the `RAND_screen' function. */
/* #undef HAVE_RAND_SCREEN */
/* Define to 1 if you have the `RAND_status' function. */
#define HAVE_RAND_STATUS 1
/* Define to 1 if you have the recv function. */ /* Define to 1 if you have the recv function. */
#define HAVE_RECV 1 #define HAVE_RECV 1
@ -727,21 +721,15 @@
/* Define to 1 if you have the <time.h> header file. */ /* Define to 1 if you have the <time.h> header file. */
#define HAVE_TIME_H 1 #define HAVE_TIME_H 1
/* Define to 1 if you have the <tld.h> header file. */
#define HAVE_TLD_H 1
/* Define to 1 if you have the `tld_strerror' function. */
#define HAVE_TLD_STRERROR 1
/* Define to 1 if you have the `uname' function. */
#define HAVE_UNAME 1
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
/* Define to 1 if you have the `utime' function. */ /* Define to 1 if you have the `utime' function. */
#define HAVE_UTIME 1 #define HAVE_UTIME 1
/* Define to 1 if you have the `utimes' function. */
#define HAVE_UTIMES 1
/* Define to 1 if you have the <utime.h> header file. */ /* Define to 1 if you have the <utime.h> header file. */
#define HAVE_UTIME_H 1 #define HAVE_UTIME_H 1
@ -766,6 +754,18 @@
/* Define to 1 if you have the winsock.h header file. */ /* Define to 1 if you have the winsock.h header file. */
/* #undef HAVE_WINSOCK_H */ /* #undef HAVE_WINSOCK_H */
/* Define to 1 if you have the `wolfSSLv3_client_method' function. */
/* #undef HAVE_WOLFSSLV3_CLIENT_METHOD */
/* Define to 1 if you have the `wolfSSL_CTX_UseSupportedCurve' function. */
/* #undef HAVE_WOLFSSL_CTX_USESUPPORTEDCURVE */
/* Define to 1 if you have the `wolfSSL_get_peer_certificate' function. */
/* #undef HAVE_WOLFSSL_GET_PEER_CERTIFICATE */
/* Define to 1 if you have the `wolfSSL_UseALPN' function. */
/* #undef HAVE_WOLFSSL_USEALPN */
/* Define this symbol if your OS supports changing the contents of argv */ /* Define this symbol if your OS supports changing the contents of argv */
#define HAVE_WRITABLE_ARGV 1 #define HAVE_WRITABLE_ARGV 1
@ -812,7 +812,8 @@
#define PACKAGE "curl" #define PACKAGE "curl"
/* Define to the address where bug reports for this package should be sent. */ /* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "a suitable curl mailing list: http://curl.haxx.se/mail/" #define PACKAGE_BUGREPORT \
"a suitable curl mailing list: https://curl.haxx.se/mail/"
/* Define to the full name of this package. */ /* Define to the full name of this package. */
#define PACKAGE_NAME "curl" #define PACKAGE_NAME "curl"
@ -883,6 +884,9 @@
/* Define to the function return type for send. */ /* Define to the function return type for send. */
#define SEND_TYPE_RETV ssize_t #define SEND_TYPE_RETV ssize_t
/* The size of `curl_off_t', as computed by sizeof. */
#define SIZEOF_CURL_OFF_T 8
/* The size of `int', as computed by sizeof. */ /* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4 #define SIZEOF_INT 4
@ -904,9 +908,6 @@
/* The size of `time_t', as computed by sizeof. */ /* The size of `time_t', as computed by sizeof. */
#define SIZEOF_TIME_T 8 #define SIZEOF_TIME_T 8
/* The size of `void*', as computed by sizeof. */
#define SIZEOF_VOIDP 8
/* Define to 1 if you have the ANSI C header files. */ /* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1 #define STDC_HEADERS 1
@ -922,10 +923,10 @@
/* if axTLS is enabled */ /* if axTLS is enabled */
/* #undef USE_AXTLS */ /* #undef USE_AXTLS */
/* if CyaSSL is enabled */ /* if CyaSSL/WolfSSL is enabled */
/* #undef USE_CYASSL */ /* #undef USE_CYASSL */
/* to enable iOS/Mac OS X native SSL/TLS support */ /* to enable Apple OS native SSL/TLS support */
/* #undef USE_DARWINSSL */ /* #undef USE_DARWINSSL */
/* if GnuTLS is enabled */ /* if GnuTLS is enabled */
@ -934,6 +935,9 @@
/* if GnuTLS uses nettle as crypto backend */ /* if GnuTLS uses nettle as crypto backend */
/* #undef USE_GNUTLS_NETTLE */ /* #undef USE_GNUTLS_NETTLE */
/* PSL support enabled */
/* #undef USE_LIBPSL */
/* if librtmp is in use */ /* if librtmp is in use */
/* #undef USE_LIBRTMP */ /* #undef USE_LIBRTMP */
@ -943,6 +947,9 @@
/* If you want to build curl with the built-in manual */ /* If you want to build curl with the built-in manual */
#define USE_MANUAL 1 #define USE_MANUAL 1
/* if mbedTLS is enabled */
/* #undef USE_MBEDTLS */
/* Define to enable metalink support */ /* Define to enable metalink support */
/* #undef USE_METALINK */ /* #undef USE_METALINK */
@ -965,7 +972,10 @@
/* #undef USE_SCHANNEL */ /* #undef USE_SCHANNEL */
/* if you want POSIX threaded DNS lookup */ /* if you want POSIX threaded DNS lookup */
/* #undef USE_THREADS_POSIX */ #define USE_THREADS_POSIX 1
/* if you want Win32 threaded DNS lookup */
/* #undef USE_THREADS_WIN32 */
/* Use TLS-SRP authentication */ /* Use TLS-SRP authentication */
#ifndef HAVE_BORINGSSL #ifndef HAVE_BORINGSSL
@ -998,9 +1008,6 @@
/* Define to 1 to provide own prototypes. */ /* Define to 1 to provide own prototypes. */
/* #undef WANT_IDN_PROTOTYPES */ /* #undef WANT_IDN_PROTOTYPES */
/* Define to avoid automatic inclusion of winsock.h */
/* #undef WIN32_LEAN_AND_MEAN */
/* Define to 1 if OS is AIX. */ /* Define to 1 if OS is AIX. */
#ifndef _ALL_SOURCE #ifndef _ALL_SOURCE
/* # undef _ALL_SOURCE */ /* # undef _ALL_SOURCE */

11
packager/third_party/curl/curl.gyp vendored
View File

@ -91,12 +91,12 @@
'source/lib/system_win32.c', 'source/lib/system_win32.c',
'source/lib/system_win32.h', 'source/lib/system_win32.h',
], ],
'defines': [
'BUILDING_LIBCURL',
],
'msvs_disabled_warnings': [ 4267, ], 'msvs_disabled_warnings': [ 4267, ],
}], }],
], ],
'defines': [
'BUILDING_LIBCURL',
],
'variables': { 'variables': {
'clang_warning_flags': [ 'clang_warning_flags': [
# TODO(kqyang): Fix curl bug. # TODO(kqyang): Fix curl bug.
@ -184,6 +184,7 @@
'source/lib/md4.c', 'source/lib/md4.c',
'source/lib/md5.c', 'source/lib/md5.c',
'source/lib/memdebug.c', 'source/lib/memdebug.c',
'source/lib/mime.c',
'source/lib/mprintf.c', 'source/lib/mprintf.c',
'source/lib/multi.c', 'source/lib/multi.c',
'source/lib/netrc.c', 'source/lib/netrc.c',
@ -197,7 +198,7 @@
'source/lib/pipeline.c', 'source/lib/pipeline.c',
'source/lib/pop3.c', 'source/lib/pop3.c',
'source/lib/progress.c', 'source/lib/progress.c',
'source/lib/rawstr.c', 'source/lib/rand.c',
'source/lib/rtsp.c', 'source/lib/rtsp.c',
'source/lib/security.c', 'source/lib/security.c',
'source/lib/select.c', 'source/lib/select.c',
@ -212,8 +213,8 @@
'source/lib/speedcheck.c', 'source/lib/speedcheck.c',
'source/lib/splay.c', 'source/lib/splay.c',
'source/lib/ssh.c', 'source/lib/ssh.c',
'source/lib/strcase.c',
'source/lib/strdup.c', 'source/lib/strdup.c',
'source/lib/strequal.c',
'source/lib/strerror.c', 'source/lib/strerror.c',
'source/lib/strtok.c', 'source/lib/strtok.c',
'source/lib/strtoofft.c', 'source/lib/strtoofft.c',