diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/import/TARGETS.curl | 152 | ||||
| -rw-r--r-- | etc/import/lib/TARGETS.curl | 271 | ||||
| -rw-r--r-- | etc/import/src/TARGETS.curl | 17 | ||||
| -rw-r--r-- | etc/repos.json | 10 |
4 files changed, 285 insertions, 165 deletions
diff --git a/etc/import/TARGETS.curl b/etc/import/TARGETS.curl index 32ebc274..0dfd5797 100644 --- a/etc/import/TARGETS.curl +++ b/etc/import/TARGETS.curl @@ -23,6 +23,7 @@ , "ENABLE_THREADED_RESOLVER" , "CURL_DISABLE_DICT" , "CURL_DISABLE_FILE" + , "CURL_DISABLE_FORM_API" , "CURL_DISABLE_FTP" , "CURL_DISABLE_GOPHER" , "CURL_DISABLE_IMAP" @@ -37,11 +38,19 @@ , "CURL_DISABLE_TFTP" , "HTTP_ONLY" , "CURL_DISABLE_ALTSVC" + , "CURL_DISABLE_SRP" , "CURL_DISABLE_COOKIES" - , "CURL_DISABLE_CRYPTO_AUTH" + , "CURL_DISABLE_BASIC_AUTH" + , "CURL_DISABLE_BEARER_AUTH" + , "CURL_DISABLE_DIGEST_AUTH" + , "CURL_DISABLE_KERBEROS_AUTH" + , "CURL_DISABLE_NEGOTIATE_AUTH" + , "CURL_DISABLE_AWS" , "CURL_DISABLE_NTLM" , "CURL_DISABLE_DOH" , "CURL_DISABLE_GETOPTIONS" + , "CURL_DISABLE_HEADERS_API" + , "CURL_DISABLE_BINDLOCAL" , "CURL_DISABLE_HSTS" , "CURL_DISABLE_MIME" , "CURL_DISABLE_NETRC" @@ -58,7 +67,7 @@ , "USE_MSH3" , "USE_LIBIDN2" , "USE_BROTLI" - , "USE_ZSTD" + , "CURL_ZSTD" , "CURL_USE_LIBPSL" , "CURL_USE_LIBSSH2" , "CURL_USE_LIBSSH" @@ -68,12 +77,12 @@ , "CURL_CA_PATH" , "CURL_CA_FALLBACK" , "USE_GNU_STRERROR_R" - , "HAVE_RAND_EGD" , "HAVE_BORINGSSL" , "HAVE_AWSLC" + , "HAVE_SSL_SET0_WBIO" + , "HAVE_OPENSSL_SRP" , "HAVE_SSL_CTX_SET_QUIC_METHOD" , "HAVE_QUICHE_CONN_SET_QLOG_FD" - , "HAVE_ZSTD_CREATEDSTREAM" , "PKG_CONFIG_ARGS" ] , "config_doc": @@ -95,6 +104,8 @@ ] , "CURL_DISABLE_DICT": ["Boolean. Disable DICT."] , "CURL_DISABLE_FILE": ["Boolean. Disable FILE."] + , "CURL_DISABLE_FORM_API": + ["Boolean. Disable form API, if ~CURL_DISABLE_MIME==false~"] , "CURL_DISABLE_FTP": ["Boolean. Disable FTP."] , "CURL_DISABLE_GOPHER": ["Boolean. Disable GOPHER."] , "CURL_DISABLE_IMAP": ["Boolean. Disable IMAP."] @@ -115,12 +126,21 @@ , "Currently these are unsupported." ] , "CURL_DISABLE_ALTSVC": ["Boolean. Disable alt-svc."] + , "CURL_DISABLE_SRP": ["Boolean. Disable TLS-SRP support."] , "CURL_DISABLE_COOKIES": ["Boolean. Disable cookies."] - , "CURL_DISABLE_CRYPTO_AUTH": - ["Boolean. Disable cryptographic authentication."] + , "CURL_DISABLE_BASIC_AUTH": ["Boolean. Disable Basic authentication."] + , "CURL_DISABLE_BEARER_AUTH": ["Boolean. Disable Bearer authentication."] + , "CURL_DISABLE_DIGEST_AUTH": ["Boolean. Disable Digest authentication."] + , "CURL_DISABLE_KERBEROS_AUTH": + ["Boolean. Disable Kerberos authentication."] + , "CURL_DISABLE_NEGOTIATE_AUTH": + ["Boolean. Disable negotiate authentication."] + , "CURL_DISABLE_AWS": ["Boolean. Disable AWS-SIG4."] , "CURL_DISABLE_NTLM": ["Boolean. Disable NTLM support."] , "CURL_DISABLE_DOH": ["Boolean. Disable DNS-over-HTTPS."] , "CURL_DISABLE_GETOPTIONS": ["Boolean. Disable curl-easy-options API."] + , "CURL_DISABLE_HEADERS_API": ["Boolean. Disable headers-api support."] + , "CURL_DISABLE_BINDLOCAL": ["Boolean. Disable local binding support."] , "CURL_DISABLE_HSTS": ["Boolean. Disable HSTS support."] , "CURL_DISABLE_MIME": ["Boolean. Disable MIME support."] , "CURL_DISABLE_NETRC": ["Boolean. Disable netrc parser."] @@ -158,7 +178,7 @@ , "or against normaliz (system or open name) if ~OS==\"windows\"~." ] , "USE_BROTLI": ["Boolean. Link against brotli (system or open name)."] - , "USE_ZSTD": ["Boolean. Link against zstd (system or open name)."] + , "CURL_ZSTD": ["Boolean. Link against zstd (system or open name)."] , "CURL_USE_LIBPSL": [ "Boolean. Default value: true. Link against libpsl (system or open name)." ] @@ -194,10 +214,6 @@ [ "Boolean. Manually set whether to use GNU or POSIX version of ~strerror_r~ function." , "Only safe to set if _GNU_SOURCE is set no _POSIX_SOURCE overwrite exists." ] - , "HAVE_RAND_EGD": - [ "Boolean. `RAND_egd` present in OpenSSL." - , "If true, corresponding symbol detection logic is skipped." - ] , "HAVE_BORINGSSL": [ "Boolean. OpenSSL is BoringSSL." , "If true, corresponding symbol detection logic is skipped." @@ -206,6 +222,11 @@ [ "Boolean. OpenSSL is AWSLC." , "If true, corresponding symbol detection logic is skipped." ] + , "HAVE_SSL_SET0_WBIO": + ["Boolean. Set if ~SSL_set0_wbio~ present in OpenSSL/wolfSSL."] + , "HAVE_OPENSSL_SRP": + [ "Boolean. Set if ~SSL_CTX_set_srp_username~ present in OpenSSL/wolfSSL." + ] , "HAVE_SSL_CTX_SET_QUIC_METHOD": [ "Boolean. `SSL_CTX_set_quic_method` present in OpenSSL." , "If true, corresponding symbol detection logic is skipped." @@ -214,10 +235,6 @@ [ "Boolean. `quiche_conn_set_qlog_fd` present in QUICHE." , "If true, corresponding symbol detection logic is skipped." ] - , "HAVE_ZSTD_CREATEDSTREAM": - [ "Boolean. `ZSTD_createDStream` present in Zstd." - , "If true, corresponding symbol detection logic is skipped." - ] } } , "curl_config": @@ -233,6 +250,7 @@ , "ENABLE_THREADED_RESOLVER" , "CURL_DISABLE_DICT" , "CURL_DISABLE_FILE" + , "CURL_DISABLE_FORM_API" , "CURL_DISABLE_FTP" , "CURL_DISABLE_GOPHER" , "CURL_DISABLE_IMAP" @@ -247,11 +265,19 @@ , "CURL_DISABLE_TFTP" , "HTTP_ONLY" , "CURL_DISABLE_ALTSVC" + , "CURL_DISABLE_SRP" , "CURL_DISABLE_COOKIES" - , "CURL_DISABLE_CRYPTO_AUTH" + , "CURL_DISABLE_BASIC_AUTH" + , "CURL_DISABLE_BEARER_AUTH" + , "CURL_DISABLE_DIGEST_AUTH" + , "CURL_DISABLE_KERBEROS_AUTH" + , "CURL_DISABLE_NEGOTIATE_AUTH" + , "CURL_DISABLE_AWS" , "CURL_DISABLE_NTLM" , "CURL_DISABLE_DOH" , "CURL_DISABLE_GETOPTIONS" + , "CURL_DISABLE_HEADERS_API" + , "CURL_DISABLE_BINDLOCAL" , "CURL_DISABLE_HSTS" , "CURL_DISABLE_MIME" , "CURL_DISABLE_NETRC" @@ -268,7 +294,7 @@ , "USE_MSH3" , "USE_LIBIDN2" , "USE_BROTLI" - , "USE_ZSTD" + , "CURL_ZSTD" , "CURL_USE_LIBPSL" , "CURL_USE_LIBSSH2" , "CURL_USE_LIBSSH" @@ -278,12 +304,12 @@ , "CURL_CA_PATH" , "CURL_CA_FALLBACK" , "USE_GNU_STRERROR_R" - , "HAVE_RAND_EGD" , "HAVE_BORINGSSL" , "HAVE_AWSLC" + , "HAVE_SSL_SET0_WBIO" + , "HAVE_OPENSSL_SRP" , "HAVE_SSL_CTX_SET_QUIC_METHOD" , "HAVE_QUICHE_CONN_SET_QLOG_FD" - , "HAVE_ZSTD_CREATEDSTREAM" ] , "target": ["./", "lib", "libcurl"] , "config": @@ -315,13 +341,13 @@ , {"type": "var", "name": "ENABLE_ARES", "default": false} ] , [ "ENABLE_THREADED_RESOLVER" - , { "type": "var" - , "name": "ENABLE_THREADED_RESOLVER" - , "default": - { "type": "if" - , "cond": {"type": "var", "name": "ENABLE_ARES"} - , "then": false - , "else": true + , { "type": "if" + , "cond": {"type": "var", "name": "ENABLE_ARES"} + , "then": false + , "else": + { "type": "var" + , "name": "ENABLE_THREADED_RESOLVER" + , "default": true } } ] @@ -331,6 +357,14 @@ , [ "CURL_DISABLE_FILE" , {"type": "var", "name": "CURL_DISABLE_FILE", "default": false} ] + , [ "CURL_DISABLE_FORM_API" + , { "type": "if" + , "cond": {"type": "var", "name": "CURL_DISABLE_MIME"} + , "then": true + , "else": + {"type": "var", "name": "CURL_DISABLE_FORM_API", "default": false} + } + ] , [ "CURL_DISABLE_FTP" , {"type": "var", "name": "CURL_DISABLE_FTP", "default": false} ] @@ -371,11 +405,35 @@ , [ "CURL_DISABLE_ALTSVC" , {"type": "var", "name": "CURL_DISABLE_ALTSVC", "default": false} ] + , [ "CURL_DISABLE_SRP" + , {"type": "var", "name": "CURL_DISABLE_SRP", "default": false} + ] , [ "CURL_DISABLE_COOKIES" , {"type": "var", "name": "CURL_DISABLE_COOKIES", "default": false} ] - , [ "CURL_DISABLE_CRYPTO_AUTH" - , {"type": "var", "name": "CURL_DISABLE_CRYPTO_AUTH", "default": false} + , [ "CURL_DISABLE_BASIC_AUTH" + , {"type": "var", "name": "CURL_DISABLE_BASIC_AUTH", "default": false} + ] + , [ "CURL_DISABLE_BEARER_AUTH" + , {"type": "var", "name": "CURL_DISABLE_BEARER_AUTH", "default": false} + ] + , [ "CURL_DISABLE_DIGEST_AUTH" + , {"type": "var", "name": "CURL_DISABLE_DIGEST_AUTH", "default": false} + ] + , [ "CURL_DISABLE_KERBEROS_AUTH" + , { "type": "var" + , "name": "CURL_DISABLE_KERBEROS_AUTH" + , "default": false + } + ] + , [ "CURL_DISABLE_NEGOTIATE_AUTH" + , { "type": "var" + , "name": "CURL_DISABLE_NEGOTIATE_AUTH" + , "default": false + } + ] + , [ "CURL_DISABLE_AWS" + , {"type": "var", "name": "CURL_DISABLE_AWS", "default": false} ] , [ "CURL_DISABLE_NTLM" , {"type": "var", "name": "CURL_DISABLE_NTLM", "default": false} @@ -386,6 +444,12 @@ , [ "CURL_DISABLE_GETOPTIONS" , {"type": "var", "name": "CURL_DISABLE_GETOPTIONS", "default": false} ] + , [ "CURL_DISABLE_HEADERS_API" + , {"type": "var", "name": "CURL_DISABLE_HEADERS_API", "default": false} + ] + , [ "CURL_DISABLE_BINDLOCAL" + , {"type": "var", "name": "CURL_DISABLE_BINDLOCAL", "default": false} + ] , [ "CURL_DISABLE_HSTS" , {"type": "var", "name": "CURL_DISABLE_HSTS", "default": false} ] @@ -432,7 +496,7 @@ , {"type": "var", "name": "USE_LIBIDN2", "default": false} ] , ["USE_BROTLI", {"type": "var", "name": "USE_BROTLI", "default": false}] - , ["USE_ZSTD", {"type": "var", "name": "USE_ZSTD", "default": false}] + , ["CURL_ZSTD", {"type": "var", "name": "CURL_ZSTD", "default": false}] , [ "CURL_USE_LIBPSL" , {"type": "var", "name": "CURL_USE_LIBPSL", "default": true} ] @@ -485,13 +549,16 @@ , [ "USE_GNU_STRERROR_R" , {"type": "var", "name": "USE_GNU_STRERROR_R", "default": false} ] - , [ "HAVE_RAND_EGD" - , {"type": "var", "name": "HAVE_RAND_EGD", "default": false} - ] , [ "HAVE_BORINGSSL" , {"type": "var", "name": "HAVE_BORINGSSL", "default": false} ] , ["HAVE_AWSLC", {"type": "var", "name": "HAVE_AWSLC", "default": false}] + , [ "HAVE_SSL_SET0_WBIO" + , {"type": "var", "name": "HAVE_SSL_SET0_WBIO", "default": false} + ] + , [ "HAVE_OPENSSL_SRP" + , {"type": "var", "name": "HAVE_OPENSSL_SRP", "default": false} + ] , [ "HAVE_SSL_CTX_SET_QUIC_METHOD" , { "type": "var" , "name": "HAVE_SSL_CTX_SET_QUIC_METHOD" @@ -504,9 +571,6 @@ , "default": false } ] - , [ "HAVE_ZSTD_CREATEDSTREAM" - , {"type": "var", "name": "HAVE_ZSTD_CREATEDSTREAM", "default": false} - ] ] , "body": { "type": "env" @@ -517,6 +581,7 @@ , "ENABLE_THREADED_RESOLVER" , "CURL_DISABLE_DICT" , "CURL_DISABLE_FILE" + , "CURL_DISABLE_FORM_API" , "CURL_DISABLE_FTP" , "CURL_DISABLE_GOPHER" , "CURL_DISABLE_IMAP" @@ -531,10 +596,19 @@ , "CURL_DISABLE_TFTP" , "HTTP_ONLY" , "CURL_DISABLE_ALTSVC" + , "CURL_DISABLE_SRP" , "CURL_DISABLE_COOKIES" - , "CURL_DISABLE_CRYPTO_AUTH" + , "CURL_DISABLE_BASIC_AUTH" + , "CURL_DISABLE_BEARER_AUTH" + , "CURL_DISABLE_DIGEST_AUTH" + , "CURL_DISABLE_KERBEROS_AUTH" + , "CURL_DISABLE_NEGOTIATE_AUTH" + , "CURL_DISABLE_AWS" , "CURL_DISABLE_NTLM" , "CURL_DISABLE_DOH" + , "CURL_DISABLE_GETOPTIONS" + , "CURL_DISABLE_HEADERS_API" + , "CURL_DISABLE_BINDLOCAL" , "CURL_DISABLE_HSTS" , "CURL_DISABLE_MIME" , "CURL_DISABLE_NETRC" @@ -551,7 +625,7 @@ , "USE_MSH3" , "USE_LIBIDN2" , "USE_BROTLI" - , "USE_ZSTD" + , "CURL_ZSTD" , "CURL_USE_LIBPSL" , "CURL_USE_LIBSSH2" , "CURL_USE_LIBSSH" @@ -561,12 +635,12 @@ , "CURL_CA_PATH" , "CURL_CA_FALLBACK" , "USE_GNU_STRERROR_R" - , "HAVE_RAND_EGD" , "HAVE_BORINGSSL" , "HAVE_AWSLC" + , "HAVE_SSL_SET0_WBIO" + , "HAVE_OPENSSL_SRP" , "HAVE_SSL_CTX_SET_QUIC_METHOD" , "HAVE_QUICHE_CONN_SET_QLOG_FD" - , "HAVE_ZSTD_CREATEDSTREAM" ] } } diff --git a/etc/import/lib/TARGETS.curl b/etc/import/lib/TARGETS.curl index 4d41afe1..9f203696 100644 --- a/etc/import/lib/TARGETS.curl +++ b/etc/import/lib/TARGETS.curl @@ -10,6 +10,7 @@ , "ENABLE_THREADED_RESOLVER" , "CURL_DISABLE_DICT" , "CURL_DISABLE_FILE" + , "CURL_DISABLE_FORM_API" , "CURL_DISABLE_FTP" , "CURL_DISABLE_GOPHER" , "CURL_DISABLE_IMAP" @@ -24,10 +25,19 @@ , "CURL_DISABLE_TFTP" , "HTTP_ONLY" , "CURL_DISABLE_ALTSVC" + , "CURL_DISABLE_SRP" , "CURL_DISABLE_COOKIES" - , "CURL_DISABLE_CRYPTO_AUTH" + , "CURL_DISABLE_BASIC_AUTH" + , "CURL_DISABLE_BEARER_AUTH" + , "CURL_DISABLE_DIGEST_AUTH" + , "CURL_DISABLE_KERBEROS_AUTH" + , "CURL_DISABLE_NEGOTIATE_AUTH" + , "CURL_DISABLE_AWS" , "CURL_DISABLE_NTLM" , "CURL_DISABLE_DOH" + , "CURL_DISABLE_GETOPTIONS" + , "CURL_DISABLE_HEADERS_API" + , "CURL_DISABLE_BINDLOCAL" , "CURL_DISABLE_HSTS" , "CURL_DISABLE_MIME" , "CURL_DISABLE_NETRC" @@ -44,7 +54,7 @@ , "USE_MSH3" , "USE_LIBIDN2" , "USE_BROTLI" - , "USE_ZSTD" + , "CURL_ZSTD" , "CURL_USE_LIBPSL" , "CURL_USE_LIBSSH2" , "CURL_USE_LIBSSH" @@ -54,12 +64,12 @@ , "CURL_CA_PATH" , "CURL_CA_FALLBACK" , "USE_GNU_STRERROR_R" - , "HAVE_RAND_EGD" , "HAVE_BORINGSSL" , "HAVE_AWSLC" + , "HAVE_SSL_SET0_WBIO" + , "HAVE_OPENSSL_SRP" , "HAVE_SSL_CTX_SET_QUIC_METHOD" , "HAVE_QUICHE_CONN_SET_QLOG_FD" - , "HAVE_ZSTD_CREATEDSTREAM" ] , "target": "config_header" , "config": @@ -76,72 +86,86 @@ } ] , [ "sys_hdrs" - , [ "windows.h" - , "ws2tcpip.h" - , "winsock2.h" - , "wincrypt.h" - , "inttypes.h" - , "sys/filio.h" - , "sys/ioctl.h" - , "sys/param.h" - , "sys/poll.h" - , "sys/resource.h" - , "sys/select.h" - , "sys/socket.h" - , "sys/sockio.h" - , "sys/stat.h" - , "sys/time.h" - , "sys/types.h" - , "sys/un.h" - , "sys/utime.h" - , "sys/xattr.h" - , "arpa/inet.h" - , "arpa/tftp.h" - , "assert.h" - , "errno.h" - , "fcntl.h" - , "idn2.h" - , "ifaddrs.h" - , "io.h" - , "libgen.h" - , "locale.h" - , "net/if.h" - , "netdb.h" - , "netinet/in.h" - , "netinet/tcp.h" - , "linux/tcp.h" - , "poll.h" - , "pwd.h" - , "setjmp.h" - , "signal.h" - , "ssl.h" - , "stdatomic.h" - , "stdbool.h" - , "stdint.h" - , "stdlib.h" - , "string.h" - , "strings.h" - , "stropts.h" - , "termio.h" - , "termios.h" - , "time.h" - , "unistd.h" - , "utime.h" - , "process.h" - , "stddef.h" - , "stdint.h" - , "sys/utsname.h" - , "gssapi/gssapi.h" - , "gssapi/gssapi_generic.h" - , "gssapi/gssapi_krb5.h" - ] + , { "type": "++" + , "$1": + [ { "type": "if" + , "cond": + { "type": "==" + , "$1": {"type": "var", "name": "OS"} + , "$2": "windows" + } + , "then": ["windows.h", "ws2tcpip.h", "winsock2.h"] + } + , [ "sys/filio.h" + , "sys/wait.h" + , "sys/ioctl.h" + , "sys/param.h" + , "sys/poll.h" + , "sys/resource.h" + , "sys/select.h" + , "sys/socket.h" + , "sys/sockio.h" + , "sys/stat.h" + , "sys/time.h" + , "sys/types.h" + , "sys/un.h" + , "sys/utime.h" + , "sys/xattr.h" + , "arpa/inet.h" + , "assert.h" + , "errno.h" + , "fcntl.h" + , "fnmatch.h" + , "idn2.h" + , "ifaddrs.h" + , "io.h" + , "libgen.h" + , "locale.h" + , "net/if.h" + , "netdb.h" + , "netinet/in.h" + , "netinet/tcp.h" + , "netinet/udp.h" + , "linux/tcp.h" + , "poll.h" + , "pwd.h" + , "setjmp.h" + , "sched.h" + , "signal.h" + , "signal.h" + , "ssl.h" + , "signal.h" + , "ssl.h" + , "stdatomic.h" + , "stdbool.h" + , "stdint.h" + , "stdlib.h" + , "string.h" + , "strings.h" + , "stropts.h" + , "termio.h" + , "termios.h" + , "time.h" + , "unistd.h" + , "utime.h" + , "process.h" + ] + , { "type": "if" + , "cond": {"type": "var", "name": "CURL_USE_GSSAPI"} + , "then": + [ "gssapi/gssapi.h" + , "gssapi/gssapi_generic.h" + , "gssapi/gssapi_krb5.h" + ] + } + ] + } ] , [ "defines1" , { "type": "++" , "$1": [ [ ["BUILDING_LIBCURL", 1] , ["HAVE_BOOL_T", 1] - , ["HAVE_GETADDRINFO_THREADSAFE", 1] , ["HAVE_RECV", 1] , ["HAVE_SEND", 1] , ["HAVE_STRUCT_TIMEVAL", 1] @@ -250,9 +274,6 @@ , [ "CURL_DISABLE_COOKIES" , {"type": "var", "name": "CURL_DISABLE_COOKIES"} ] - , [ "CURL_DISABLE_CRYPTO_AUTH" - , {"type": "var", "name": "CURL_DISABLE_CRYPTO_AUTH"} - ] , [ "CURL_DISABLE_NTLM" , {"type": "var", "name": "CURL_DISABLE_NTLM"} ] @@ -292,22 +313,14 @@ , ["USE_NGHTTP2", {"type": "var", "name": "USE_NGHTTP2"}] , ["HAVE_LIBIDN2", {"type": "var", "name": "USE_LIBIDN2"}] , ["HAVE_BROTLI", {"type": "var", "name": "USE_BROTLI"}] - , ["HAVE_ZSTD", {"type": "var", "name": "USE_ZSTD"}] - , [ "HAVE_ZSTD_CREATEDSTREAM" - , { "type": "and" - , "$1": - [ {"type": "var", "name": "USE_ZSTD"} - , {"type": "var", "name": "HAVE_ZSTD_CREATEDSTREAM"} - ] - } - ] + , ["HAVE_ZSTD", {"type": "var", "name": "CURL_ZSTD"}] , [ "CURL_CA_FALLBACK" , {"type": "var", "name": "CURL_CA_FALLBACK"} ] ] , { "type": "if" , "cond": {"type": "var", "name": "CURL_ENABLE_SSL"} - , "then": [["USE_OPENSSL", 1], ["HAVE_LIBSSL", 1]] + , "then": [["USE_OPENSSL", 1], ["SSL_ENABLED", 1]] } , { "type": "if" , "cond": {"type": "var", "name": "USE_NGTCP2"} @@ -359,6 +372,15 @@ , "else": [["USE_MSH3", 1]] } } + , { "type": "if" + , "cond": {"type": "var", "name": "CURL_DISABLE_SRP"} + , "then": [] + , "else": + { "type": "if" + , "cond": {"type": "var", "name": "HAVE_OPENSSL_SRP"} + , "then": [["USE_TLS_SRP", 1]] + } + } , [ ["USE_LIBPSL", {"type": "var", "name": "CURL_USE_LIBPSL"}] , ["USE_LIBSSH2", {"type": "var", "name": "CURL_USE_LIBSSH2"}] ] @@ -418,27 +440,15 @@ ] } } + , [["HAVE_SA_FAMILY_T", 1]] ] } ] , [ "have_cfile" , { "type": "++" , "$1": - [ { "type": "if" - , "cond": - { "type": "==" - , "$1": {"type": "var", "name": "OS"} - , "$2": "windows" - } - , "then": - [ ["HAVE_WINDOWS_H", "windows.h"] - , ["HAVE_WS2TCPIP_H", "ws2tcpip.h"] - , ["HAVE_WINSOCK2_H", "winsock2.h"] - , ["HAVE_WINCRYPT_H", "wincrypt.h"] - ] - } - , [ ["HAVE_INTTYPES_H", "inttypes.h"] - , ["HAVE_SYS_FILIO_H", "sys/filio.h"] + [ [ ["HAVE_SYS_FILIO_H", "sys/filio.h"] + , ["HAVE_SYS_WAIT_H", "sys/wait.h"] , ["HAVE_SYS_IOCTL_H", "sys/ioctl.h"] , ["HAVE_SYS_PARAM_H", "sys/param.h"] , ["HAVE_SYS_POLL_H", "sys/poll.h"] @@ -453,7 +463,6 @@ , ["HAVE_SYS_UTIME_H", "sys/utime.h"] , ["HAVE_SYS_XATTR_H", "sys/xattr.h"] , ["HAVE_ARPA_INET_H", "arpa/inet.h"] - , ["HAVE_ARPA_TFTP_H", "arpa/tftp.h"] , ["HAVE_FCNTL_H", "fcntl.h"] , ["HAVE_IDN2_H", "idn2.h"] , ["HAVE_IFADDRS_H", "ifaddrs.h"] @@ -464,25 +473,18 @@ , ["HAVE_NETDB_H", "netdb.h"] , ["HAVE_NETINET_IN_H", "netinet/in.h"] , ["HAVE_NETINET_TCP_H", "netinet/tcp.h"] + , ["HAVE_NETINET_UDP_H", "netinet/udp.h"] , ["HAVE_LINUX_TCP_H", "linux/tcp.h"] , ["HAVE_POLL_H", "poll.h"] , ["HAVE_PWD_H", "pwd.h"] - , ["HAVE_SETJMP_H", "setjmp.h"] - , ["HAVE_SIGNAL_H", "signal.h"] - , ["HAVE_SSL_H", "ssl.h"] , ["HAVE_STDATOMIC_H", "stdatomic.h"] , ["HAVE_STDBOOL_H", "stdbool.h"] - , ["HAVE_STDLIB_H", "stdlib.h"] - , ["HAVE_STRING_H", "string.h"] , ["HAVE_STRINGS_H", "strings.h"] , ["HAVE_STROPTS_H", "stropts.h"] , ["HAVE_TERMIO_H", "termio.h"] , ["HAVE_TERMIOS_H", "termios.h"] - , ["HAVE_TIME_H", "time.h"] , ["HAVE_UNISTD_H", "unistd.h"] , ["HAVE_UTIME_H", "utime.h"] - , ["HAVE_STDDEF_H", "stddef.h"] - , ["HAVE_SYS_UTSNAME_H", "sys/utsname.h"] , ["HAVE_ATOMIC", "stdatomic.h"] ] , { "type": "if" @@ -580,14 +582,21 @@ } } , { "type": "if" - , "cond": {"type": "var", "name": "USE_ZSTD"} - , "then": + , "cond": {"type": "var", "name": "HAVE_SSL_SET0_WBIO"} + , "then": [] + , "else": + [["HAVE_SSL_SET0_WBIO", ["SSL_set0_wbio", ["openssl/ssl.h"]]]] + } + , { "type": "if" + , "cond": {"type": "var", "name": "HAVE_OPENSSL_SRP"} + , "then": [] + , "else": { "type": "if" - , "cond": {"type": "var", "name": "HAVE_ZSTD_CREATEDSTREAM"} + , "cond": {"type": "var", "name": "CURL_DISABLE_SRP"} , "then": [] , "else": - [ [ "HAVE_ZSTD_CREATEDSTREAM" - , ["ZSTD_createDStream", ["zstd.h"]] + [ [ "HAVE_OPENSSL_SRP" + , ["SSL_CTX_set_srp_username", ["openssl/ssl.h"]] ] ] } @@ -628,8 +637,8 @@ ] ] } - , [ [ "HAVE_FCHMOD" - , ["fchmod", {"type": "var", "name": "sys_hdrs"}] + , [ [ "HAVE_FNMATCH" + , ["fnmatch", {"type": "var", "name": "sys_hdrs"}] ] , [ "HAVE_BASENAME" , ["basename", {"type": "var", "name": "sys_hdrs"}] @@ -637,6 +646,9 @@ , [ "HAVE_SOCKET" , ["socket", {"type": "var", "name": "sys_hdrs"}] ] + , [ "HAVE_SCHED_YIELD" + , ["sched_yield", {"type": "var", "name": "sys_hdrs"}] + ] , [ "HAVE_SELECT" , ["select", {"type": "var", "name": "sys_hdrs"}] ] @@ -655,7 +667,14 @@ , [ "HAVE_STRCMPI" , ["strccmp", {"type": "var", "name": "sys_hdrs"}] ] + , [ "HAVE_MEMRCHR" + , ["memrchr", {"type": "var", "name": "sys_hdrs"}] + ] , ["HAVE_ALARM", ["alarm", {"type": "var", "name": "sys_hdrs"}]] + , [ "HAVE_ARC4RANDOM" + , ["arc4random", {"type": "var", "name": "sys_hdrs"}] + ] + , ["HAVE_FCNTL", ["fcntl", {"type": "var", "name": "sys_hdrs"}]] , [ "HAVE_GETPPID" , ["getppid", {"type": "var", "name": "sys_hdrs"}] ] @@ -705,6 +724,9 @@ , [ "HAVE_GETADDRINFO" , ["getaddrinfo", {"type": "var", "name": "sys_hdrs"}] ] + , [ "HAVE_GETIFADDRS" + , ["getifaddrs", {"type": "var", "name": "sys_hdrs"}] + ] , [ "HAVE_FREEADDRINFO" , ["freeaddrinfo", {"type": "var", "name": "sys_hdrs"}] ] @@ -712,6 +734,15 @@ , [ "HAVE_FTRUNCATE" , ["ftruncate", {"type": "var", "name": "sys_hdrs"}] ] + , [ "HAVE_FSEEKO" + , ["fseeko", {"type": "var", "name": "sys_hdrs"}] + ] + , [ "HAVE_DECL_FSEEKO" + , ["fseeko", {"type": "var", "name": "sys_hdrs"}] + ] + , [ "HAVE__FSEEKI64" + , ["_fseeki64", {"type": "var", "name": "sys_hdrs"}] + ] , [ "HAVE_GETPEERNAME" , ["getpeername", {"type": "var", "name": "sys_hdrs"}] ] @@ -839,12 +870,16 @@ } ] , ["have_ctype", [["HAVE_LONGLONG", "long long"]]] + , ["have_ctype", [["HAVE_SUSECONDS_T", "suseconds_t"]]] , [ "size_ctype" - , [ ["SIZEOF_INT", ["int", [1, 2, 4, 8, 16]]] + , [ ["SIZEOF_SIZE_T", ["size_t", [1, 2, 4, 8, 16]]] + , ["SIZEOF_SSIZE_T", ["ssize_t", [1, 2, 4, 8, 16]]] + , ["SIZEOF_LONG_LONG", ["long long", [1, 2, 4, 8, 16]]] , ["SIZEOF_LONG", ["long", [1, 2, 4, 8, 16]]] - , ["SIZEOF_OFF_T", ["off_t", [1, 2, 4, 8, 16]]] - , ["SIZEOF_SIZE_T", ["size_t", [1, 2, 4, 8, 16]]] + , ["SIZEOF_INT", ["int", [1, 2, 4, 8, 16]]] , ["SIZEOF_TIME_T", ["time_t", [1, 2, 4, 8, 16]]] + , ["SIZEOF_SUSECONDS_T", ["suseconds_t", [1, 2, 4, 8, 16]]] + , ["SIZEOF_OFF_T", ["off_t", [1, 2, 4, 8, 16]]] ] ] , [ "defines" @@ -1018,7 +1053,8 @@ } } , [["SIZEOF_CURL_OFF_T", "8"]] - , [["SIZEOF_CURL_SOCKET_T", "8"]] + , [["SIZEOF_CURL_SOCKET_T", "4"]] + , [["SIZEOF_SA_FAMILY_T", "2"]] ] } ] @@ -1091,13 +1127,11 @@ { "type": ["@", "rules", "data", "staged"] , "srcs": [ "vtls/bearssl.c" - , "vtls/gskit.c" , "vtls/gtls.c" , "vtls/hostcheck.c" , "vtls/keylog.c" , "vtls/mbedtls.c" , "vtls/mbedtls_threadlock.c" - , "vtls/nss.c" , "vtls/openssl.c" , "vtls/rustls.c" , "vtls/schannel.c" @@ -1112,16 +1146,15 @@ { "type": ["@", "rules", "data", "staged"] , "srcs": [ "vtls/bearssl.h" - , "vtls/gskit.h" , "vtls/gtls.h" , "vtls/hostcheck.h" , "vtls/keylog.h" , "vtls/mbedtls.h" , "vtls/mbedtls_threadlock.h" - , "vtls/nssg.h" , "vtls/openssl.h" , "vtls/rustls.h" , "vtls/schannel.h" + , "vtls/schannel_int.h" , "vtls/sectransp.h" , "vtls/vtls.h" , "vtls/vtls_int.h" @@ -1134,8 +1167,10 @@ , "srcs": [ "vquic/curl_msh3.c" , "vquic/curl_ngtcp2.c" + , "vquic/curl_osslq.c" , "vquic/curl_quiche.c" , "vquic/vquic.c" + , "vquic/vquic-tls.c" ] } , "curl_vquic_hfiles": @@ -1143,9 +1178,11 @@ , "srcs": [ "vquic/curl_msh3.h" , "vquic/curl_ngtcp2.h" + , "vquic/curl_osslq.h" , "vquic/curl_quiche.h" - , "vquic/vquic_int.h" , "vquic/vquic.h" + , "vquic/vquic_int.h" + , "vquic/vquic-tls.h" ] } , "curl_vssh_cfiles": diff --git a/etc/import/src/TARGETS.curl b/etc/import/src/TARGETS.curl index 60164c0e..fa5869ad 100644 --- a/etc/import/src/TARGETS.curl +++ b/etc/import/src/TARGETS.curl @@ -43,7 +43,16 @@ { "type": "case*" , "expr": {"type": "var", "name": "OS"} , "case": - [["darwin", ["-framework", "SystemConfiguration", "CoreFoundations"]]] + [ [ "darwin" + , [ "-framework" + , "SystemConfiguration" + , "-framework" + , "CoreFoundation" + , "-framework" + , "CoreServices" + ] + ] + ] } } } @@ -283,11 +292,11 @@ } , "curl_zstd": { "type": ["@", "rules", "CC", "library"] - , "arguments_config": ["USE_SYSTEM_LIBS", "USE_ZSTD"] + , "arguments_config": ["USE_SYSTEM_LIBS", "CURL_ZSTD"] , "name": ["curl_zstd"] , "private-ldflags": { "type": "if" - , "cond": {"type": "var", "name": "USE_ZSTD"} + , "cond": {"type": "var", "name": "CURL_ZSTD"} , "then": { "type": "if" , "cond": {"type": "var", "name": "USE_SYSTEM_LIBS"} @@ -296,7 +305,7 @@ } , "deps": { "type": "if" - , "cond": {"type": "var", "name": "USE_ZSTD"} + , "cond": {"type": "var", "name": "CURL_ZSTD"} , "then": { "type": "if" , "cond": {"type": "var", "name": "USE_SYSTEM_LIBS"} diff --git a/etc/repos.json b/etc/repos.json index 90dd3681..b761b312 100644 --- a/etc/repos.json +++ b/etc/repos.json @@ -443,11 +443,11 @@ , "com_github_curl_curl": { "repository": { "type": "archive" - , "content": "23e33f9883e014ced35cc09f66b6b79a0b24e18d" - , "fetch": "https://github.com/curl/curl/releases/download/curl-8_2_1/curl-8.2.1.tar.gz" - , "sha256": "f98bdb06c0f52bdd19e63c4a77b5eb19b243bcbbd0f5b002b9f3cba7295a3a42" - , "sha512": "d0a906f4dff4c485e6dae930d9a7530147f4c0a0cbb46a83cb9be9d7bd6b9c320386c8be5bcdd3749f2d468b0daf39d06e8c581bab1fa792fd26da409a575cbd" - , "subdir": "curl-8.2.1" + , "content": "7b7ace4d7cc7d4059163bbd789ef7071e5d326e5" + , "fetch": "https://github.com/curl/curl/releases/download/curl-8_6_0/curl-8.6.0.tar.gz" + , "sha256": "9c6db808160015f30f3c656c0dec125feb9dc00753596bf858a272b5dd8dc398" + , "sha512": "43fdb6b81b394f3382d353d5f57673b2b3d26cfe34b25d08a526bc0597f508d5298e5a7088d0736d1f139cad19cd922affa51533c3a5a4bb5f2de68891c2958d" + , "subdir": "curl-8.6.0" } , "target_root": "import targets" , "target_file_name": "TARGETS.curl" |