diff options
Diffstat (limited to 'libcurl')
| -rw-r--r-- | libcurl/.gitignore | 6 | ||||
| -rw-r--r-- | libcurl/README | 6 | ||||
| -rw-r--r-- | libcurl/README-DEV | 8 | ||||
| -rw-r--r-- | libcurl/build/bootstrap.build | 17 | ||||
| -rw-r--r-- | libcurl/build/export.build | 2 | ||||
| -rw-r--r-- | libcurl/build/root.build | 2 | ||||
| -rw-r--r-- | libcurl/buildfile | 4 | ||||
| -rw-r--r-- | libcurl/libcurl/.gitattributes | 2 | ||||
| -rw-r--r-- | libcurl/libcurl/assert.c | 4 | ||||
| -rw-r--r-- | libcurl/libcurl/buildfile | 76 | ||||
| -rw-r--r-- | libcurl/libcurl/curl_config.h | 176 | ||||
| -rw-r--r-- | libcurl/libcurl/libcurl-symbols.expsym | 82 | ||||
| -rw-r--r-- | libcurl/manifest | 24 | ||||
| -rw-r--r-- | libcurl/tests/basic/buildfile | 2 | ||||
| -rw-r--r-- | libcurl/tests/basic/driver.c | 4 | ||||
| -rw-r--r-- | libcurl/tests/basic/testscript | 2 | ||||
| -rw-r--r-- | libcurl/tests/build/bootstrap.build | 2 | ||||
| -rw-r--r-- | libcurl/tests/build/root.build | 2 | ||||
| -rw-r--r-- | libcurl/tests/buildfile | 2 |
19 files changed, 204 insertions, 219 deletions
diff --git a/libcurl/.gitignore b/libcurl/.gitignore index 4c4fec7..d4a1da2 100644 --- a/libcurl/.gitignore +++ b/libcurl/.gitignore @@ -3,11 +3,17 @@ *.d *.t *.i +*.i.* *.ii +*.ii.* *.o *.obj +*.gcm +*.pcm +*.ifc *.so *.so.* +*.dylib *.dll *.a *.lib diff --git a/libcurl/README b/libcurl/README index e508068..34837e0 100644 --- a/libcurl/README +++ b/libcurl/README @@ -1,8 +1,8 @@ cURL is a client-side software for transferring data using URLs with the -libcurl C library providing the data transfer and URL manipulation APIs. -For more information see: +libcurl C library providing the data transfer and URL manipulation APIs. For +more information see: -https://curl.haxx.se/ +https://curl.se/ This package contains the original libcurl library source code overlaid with the build2-based build system and packaged for the build2 package manager diff --git a/libcurl/README-DEV b/libcurl/README-DEV index cea97e1..d4e099d 100644 --- a/libcurl/README-DEV +++ b/libcurl/README-DEV @@ -13,17 +13,13 @@ Some macro values cannot be easily determined at the preprocessing time. We define them based on the supported platform tests and add libcurl/assert.c, containing compile-time assertions for the macros in question. -Copy the upstream's libtool-generated for MacOS libcurl-symbols.expsym file -and comment out (with #) the _curl_jmpenv symbol in it since it causes the -'cannot export hidden symbol' linked warning on MacOS. - Note that re-creating libcurl/curl_config.h from scratch every time we upgrade to a new upstream version would be a real pain. Instead we can only (un)define the newly introduced macros, comparing the already defined and currently used -macro sets. For the comparison we can use config-win32.h and auto-generated on +macro sets. For the comparison we can use config-*.h and auto-generated on Linux upstream's curl_config.h: -$ for m in `cat <upstream-build-dir>/lib/curl_config.h libcurl/lib/config-win32.h | \ +$ for m in `cat <upstream-build-dir>/lib/curl_config.h libcurl/lib/config-*.h | \ sed -n 's/^.*#\s*\(define\|undef\)\s\{1,\}\([_A-Z0-9]\{1,\}\)\(\s.*\)\{0,1\}$/\2/p' | \ sort -u`; do if grep -q -e "\b$m\b" `find -L . ../curl -name '*.h' -a ! -name curl_config.h -a ! -name 'config-*.h' -o -name '*.c'`; then diff --git a/libcurl/build/bootstrap.build b/libcurl/build/bootstrap.build index f608fd0..9704ab7 100644 --- a/libcurl/build/bootstrap.build +++ b/libcurl/build/bootstrap.build @@ -1,5 +1,5 @@ -# file : build/root.build -# license : cURL License; see accompanying COPYING file +# file : build/bootstrap.build +# license : curl License; see accompanying COPYING file project = libcurl @@ -14,21 +14,20 @@ using dist # changes are made, the minor version when new features are added, and the # patch version is increased for bug fixes. See also: # -# https://curl.haxx.se/docs/versions.html +# https://curl.se/docs/versions.html # # The ABI version doesn't correlate with the release version and is assigned -# via the libtool's -version-info <current>:<revision>:<age> option -# (VERSIONINFO in lib/Makefile.am). As it follows from the comment in the +# via the libtool's -version-info <current>:<revision>:<age> option (VERSION* +# variables in lib/Makefile.soname). As it follows from the comment in the # makefile, the major version (current - age) is incremented for backwards- # incompatible ABI changes. See also: # -# https://curl.haxx.se/libcurl/abi.html +# https://curl.se/libcurl/abi.html # -if ($version.major == 7 && $version.minor == 67 && $version.patch == 0) +if ($version.major == 8 && $version.minor == 4 && $version.patch == 0) { - abi_version_major = 4 - abi_version = "$abi_version_major.6.0" # <current - age>.<age>.<revision> + abi_version = "$abi_version_major.8.0" # <current - age>.<age>.<revision> } else fail 'increment the ABI version?' diff --git a/libcurl/build/export.build b/libcurl/build/export.build index 77bc612..3ead5b4 100644 --- a/libcurl/build/export.build +++ b/libcurl/build/export.build @@ -1,5 +1,5 @@ # file : build/root.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file $out_root/ { diff --git a/libcurl/build/root.build b/libcurl/build/root.build index 042c9d3..2a2c784 100644 --- a/libcurl/build/root.build +++ b/libcurl/build/root.build @@ -1,5 +1,5 @@ # file : build/root.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file using in diff --git a/libcurl/buildfile b/libcurl/buildfile index da9bfb2..44df8d4 100644 --- a/libcurl/buildfile +++ b/libcurl/buildfile @@ -1,7 +1,7 @@ # file : buildfile -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file # -./: {*/ -build/} doc{COPYING INSTALL README} manifest +./: {*/ -build/} doc{INSTALL README} legal{COPYING} manifest # Don't install tests or the INSTALL file. # diff --git a/libcurl/libcurl/.gitattributes b/libcurl/libcurl/.gitattributes new file mode 100644 index 0000000..c58ac78 --- /dev/null +++ b/libcurl/libcurl/.gitattributes @@ -0,0 +1,2 @@ +include symlink=dir +lib symlink=dir diff --git a/libcurl/libcurl/assert.c b/libcurl/libcurl/assert.c index e5ceeb6..12160b2 100644 --- a/libcurl/libcurl/assert.c +++ b/libcurl/libcurl/assert.c @@ -1,11 +1,11 @@ /* file : libcurl/assert.c -*- C -*- - * license : cURL License; see accompanying COPYING file + * license : curl License; see accompanying COPYING file */ #include <curl_config.h> #ifdef _MSC_VER -# include <windows.h> // C_ASSERT() +# include <windows.h> /* C_ASSERT() */ #endif #include <time.h> diff --git a/libcurl/libcurl/buildfile b/libcurl/libcurl/buildfile index 583aaf9..62c8680 100644 --- a/libcurl/libcurl/buildfile +++ b/libcurl/libcurl/buildfile @@ -1,16 +1,11 @@ # file : libcurl/buildfile -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file # Version script. # define vsc: file vsc{*}: extension = vers -# Exported symbols. -# -define esm: file -esm{*}: extension = expsym - import imp_libs = libssl%lib{ssl} import imp_libs += libcrypto%lib{crypto} import imp_libs += libz%lib{z} @@ -25,8 +20,7 @@ bsd = ($tclass == 'bsd') macos = ($tclass == 'macos') windows = ($tclass == 'windows') -lib{curl}: vsc{libcurl}: include = ($linux || $bsd ? adhoc : false) -lib{curl}: esm{libcurl-symbols}: include = ($macos ? adhoc : false) +libs{curl}: vsc{libcurl}: include = ($linux || $bsd ? adhoc : false) vsc{libcurl}: lib/in{libcurl} { @@ -35,6 +29,40 @@ vsc{libcurl}: lib/in{libcurl} CURL_LT_SHLIB_VERSIONED_FLAVOUR = 'OPENSSL_' } +# It seems that for earlier versions of clang the __has_include_next() macro +# is broken in the -frewrite-includes mode. So, in particular, the following +# fragment of llvm-6.0's stdatomic.h: +# +# #if __STDC_HOSTED__ && __has_include_next(<stdatomic.h>) +# # include_next <stdatomic.h> +# #else +# ... +# typedef _Atomic(_Bool) atomic_bool; +# ... +# #endif +# +# expands into: +# +# #if __STDC_HOSTED__ && (1)/*__has_include_next(<stdatomic.h>)*/ +# #if 0 /* expanded by -frewrite-includes */ +# # include_next <stdatomic.h> +# #endif /* expanded by -frewrite-includes */ +# # 31 "/usr/lib/llvm-6.0/lib/clang/6.0.0/include/stdatomic.h" 3 +# # 32 "/usr/lib/llvm-6.0/lib/clang/6.0.0/include/stdatomic.h" 3 +# #else +# ... +# typedef _Atomic(_Bool) atomic_bool; +# ... +# #endif +# +# This ends up with no atomic_* types defined, etc. +# +# Thus, we enable reprocessing for the source files which (indirectly) include +# <stdatomic.h> for Clang versions prior to 7.0. +# +if ($c.id == 'clang' && $c.version.major < 7) + lib/obj{easy version hostip}: cc.reprocess = true + # Build options. # c.poptions += -DBUILDING_LIBCURL -DHAVE_CONFIG_H \ @@ -43,15 +71,8 @@ c.poptions += -DBUILDING_LIBCURL -DHAVE_CONFIG_H \ if! $windows c.poptions += -DCURL_HIDDEN_SYMBOLS -# Note that the upstream package uses the -pthread compiler/linker option on -# Linux and FreeBSD. The option is unsupported by build2 so we pass -# -D_REENTRANT and -lpthread preprocessor/linker options instead. -# switch $tclass, $tsys { - case 'linux' | 'bsd' - c.poptions += -D_REENTRANT - case 'windows', 'win32-msvc' c.poptions += -DWIN32 } @@ -63,22 +84,24 @@ obja{*}: c.poptions += -DCURL_STATICLIB if! $windows c.coptions += -fvisibility=hidden -switch $c.class, $tsys +switch $c.class { case 'gcc' { # Disable warnings that pop up with -Wall -Wextra. Upstream doesn't seem # to care about these and it is not easy to disable specific warnings in a # way that works across compilers/version (some -Wno-* options are only - # recognized in newer versions). + # recognized in newer versions). There are still some warnings left that + # appear for certain platforms/compilers. We pass them through but disable + # treating them as errors. # - c.coptions += -Wno-all -Wno-extra -Wno-deprecated-declarations + c.coptions += -Wno-all -Wno-extra -Wno-deprecated-declarations -Wno-error } case 'msvc' { # Disable warnings that pop up with /W3. # - c.coptions += /wd4996 + c.coptions += /wd4028 /wd4996 } } @@ -91,17 +114,24 @@ switch $tclass, $tsys c.loptions += -Wl,--no-undefined c.loptions += "-Wl,--version-script=$out_base/libcurl.vers" - c.libs += -lpthread + c.libs += -pthread } case 'macos' { - c.loptions += "-Wl,-exported_symbols_list,$src_base/libcurl-symbols.expsym" - c.libs += -framework CoreFoundation -framework Security + # Note that upstream generates the libcurl-symbols.expsym file on MacOS + # and passes it to linker via the -exported_symbols_list option. This + # looks redundant, since the __visibility__("default") attribute is also + # used for the API function declarations. Thus, we don't bother + # generating/passing the exported symbol list file. + # + c.libs += -framework CoreFoundation \ + -framework SystemConfiguration \ + -framework Security } case 'windows', 'mingw32' { c.loptions += -Wl,--enable-auto-image-base - c.libs += -lws2_32 -lcrypt32 + c.libs += -lws2_32 -lcrypt32 -lbcrypt } case 'windows' { diff --git a/libcurl/libcurl/curl_config.h b/libcurl/libcurl/curl_config.h index f41ca14..2ccc522 100644 --- a/libcurl/libcurl/curl_config.h +++ b/libcurl/libcurl/curl_config.h @@ -1,5 +1,5 @@ /* file : libcurl/curl_config.h -*- C -*- - * license : cURL License; see accompanying COPYING file + * license : curl License; see accompanying COPYING file */ #ifndef LIBCURL_CURL_CONFIG_H @@ -15,10 +15,12 @@ */ /* These macros are defined via the -D preprocessor option. Keep them listed - * (in this exact form) for the change tracking (see ../README-DEV). + * (in this exact form) for the change tracking. #define OS #define VERSION +#define BUILDING_LIBCURL +#define CURL_STATICLIB */ @@ -45,17 +47,15 @@ #define CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG 1 -#undef HAVE_BORINGSSL #undef USE_WOLFSSL /* Enabled features. */ -#define ENABLE_IPV6 1 -#define HAVE_ZLIB_H 1 -#define HAVE_LIBZ 1 +#define ENABLE_IPV6 1 +#define HAVE_LIBZ 1 +#define USE_WEBSOCKETS 1 #undef CURL_DISABLE_COOKIES -#undef CURL_DISABLE_CRYPTO_AUTH #undef CURL_DISABLE_DICT #undef CURL_DISABLE_DOH #undef CURL_DISABLE_FILE @@ -78,6 +78,21 @@ #undef CURL_DISABLE_TELNET #undef CURL_DISABLE_TFTP #undef CURL_DISABLE_VERBOSE_STRINGS +#undef CURL_DISABLE_ALTSVC +#undef CURL_DISABLE_GETOPTIONS +#undef CURL_DISABLE_MQTT +#undef CURL_DISABLE_SOCKETPAIR +#undef CURL_DISABLE_HEADERS_API +#undef CURL_DISABLE_HSTS +#undef CURL_DISABLE_NTLM +#undef CURL_DISABLE_AWS +#undef CURL_DISABLE_BASIC_AUTH +#undef CURL_DISABLE_BEARER_AUTH +#undef CURL_DISABLE_BINDLOCAL +#undef CURL_DISABLE_DIGEST_AUTH +#undef CURL_DISABLE_FORM_API +#undef CURL_DISABLE_KERBEROS_AUTH +#undef CURL_DISABLE_NEGOTIATE_AUTH /* Diabled features. */ @@ -88,29 +103,26 @@ #undef HAVE_LDAP_SSL #undef HAVE_LDAP_SSL_H #undef HAVE_LDAP_URL_PARSE - #undef USE_LIBSSH #undef USE_LIBSSH2 -#undef HAVE_LIBSSH2_H -#undef HAVE_LIBSSH_LIBSSH_H #undef USE_AMISSL #undef USE_GNUTLS -#undef USE_GNUTLS_NETTLE #undef USE_ARES -#undef USE_ESNI #undef USE_LIBPSL #undef USE_MANUAL #undef USE_MBEDTLS -#undef USE_MESALINK -#undef USE_METALINK #undef USE_NGHTTP2 #undef USE_NGHTTP3 #undef USE_NGTCP2 -#undef USE_NSS #undef USE_OPENLDAP -#undef USE_ALTSVC #undef USE_LIBRTMP #undef USE_QUICHE +#undef USE_BEARSSL +#undef USE_GSASL +#undef USE_HYPER +#undef USE_RUSTLS +#undef USE_WOLFSSH +#undef USE_MSH3 /* Specific for (non-) Linux. */ @@ -146,17 +158,21 @@ */ #if defined(__FreeBSD__) || defined(__APPLE__) # define HAVE_SYS_SOCKIO_H 1 +# define HAVE_ARC4RANDOM 1 #endif /* Specific for Linux and Mac OS. */ #if defined(__linux__) || defined(__APPLE__) -# define HAVE_FSETXATTR 1 +# define HAVE_FSETXATTR 1 +# define HAVE_CLOCK_GETTIME_MONOTONIC_RAW 1 #endif /* Specific for POSIX. */ #ifndef _WIN32 +# define USE_UNIX_SOCKETS 1 + # define HAVE_ARPA_INET_H 1 # define HAVE_IFADDRS_H 1 # define HAVE_NETDB_H 1 @@ -166,6 +182,7 @@ # define HAVE_POLL_H 1 # define HAVE_PWD_H 1 # define HAVE_ALARM 1 +# define HAVE_FCNTL 1 # define HAVE_FCNTL_O_NONBLOCK 1 # define HAVE_FNMATCH 1 # define HAVE_GETEUID 1 @@ -191,13 +208,17 @@ # define HAVE_SYS_WAIT_H 1 # define HAVE_TERMIOS_H 1 # define HAVE_UTIMES 1 -# define NTLM_WB_ENABLED 1 -# define USE_UNIX_SOCKETS 1 +# define HAVE_SUSECONDS_T 1 +# define HAVE_FCHMOD 1 +# define HAVE_NETINET_UDP_H 1 +# define HAVE_SENDMSG 1 # define CURL_SA_FAMILY_T sa_family_t # define GETHOSTNAME_TYPE_ARG2 size_t +# define NTLM_WB_ENABLED 1 # define NTLM_WB_FILE "/usr/bin/ntlm_auth" + # define RANDOM_FILE "/dev/urandom" # define CURL_EXTERN_SYMBOL __attribute__ ((__visibility__ ("default"))) @@ -205,19 +226,21 @@ /* Specific for Windows. */ #else -# define HAVE_PROCESS_H 1 # define USE_WIN32_CRYPTO 1 +# define USE_WIN32_IDN 1 +# define USE_WIN32_LARGE_FILES 1 +# define USE_WINDOWS_SSPI 1 + # define HAVE_CLOSESOCKET 1 # define HAVE_IOCTLSOCKET_FIONBIO 1 # define HAVE_IO_H 1 # define HAVE_SYS_UTIME_H 1 # define HAVE_WINDOWS_H 1 # define HAVE_WINSOCK2_H 1 -# define HAVE_WINSOCK_H 1 -# define USE_WIN32_IDN 1 -# define USE_WIN32_LARGE_FILES 1 -# define USE_WINDOWS_SSPI 1 -# define WANT_IDN_PROTOTYPES 1 +# define HAVE__FSEEKI64 1 + +# undef _UNICODE +# undef UNICODE # undef SOCKET # undef USE_LWIPSOCK @@ -233,6 +256,7 @@ # undef CURL_SA_FAMILY_T # undef GETHOSTNAME_TYPE_ARG2 # undef USE_WINSOCK +# undef WIN32_LEAN_AND_MEAN /* Unused on Windows (see include/curl/curl.h for details). */ @@ -251,56 +275,52 @@ /* Specific for (non-) VC. */ #ifndef _MSC_VER +# define USE_THREADS_POSIX 1 +# undef USE_THREADS_WIN32 + # define HAVE_BASENAME 1 # define HAVE_CLOCK_GETTIME_MONOTONIC 1 # define HAVE_INET_NTOP 1 # define HAVE_INET_PTON 1 # define HAVE_LIBGEN_H 1 # define HAVE_PTHREAD_H 1 -# define HAVE_SETJMP_H 1 # define HAVE_SIGNAL 1 # define HAVE_STRCASECMP 1 # define HAVE_STRINGS_H 1 -# define HAVE_STRING_H 1 # define HAVE_STRTOK_R 1 # define HAVE_SYS_PARAM_H 1 # define HAVE_SYS_TIME_H 1 # define HAVE_UNISTD_H 1 # define HAVE_UTIME_H 1 # define HAVE_VARIADIC_MACROS_GCC 1 -# define TIME_WITH_SYS_TIME 1 -# define USE_THREADS_POSIX 1 -# undef USE_THREADS_WIN32 +# define HAVE_OPENSSL_SRP 1 +# define HAVE_FTRUNCATE 1 +# define HAVE_SCHED_YIELD 1 +# define HAVE_FSEEKO 1 #else -# define NEED_MALLOC_H 1 # define USE_THREADS_WIN32 1 # undef USE_THREADS_POSIX + +# define NEED_MALLOC_H 1 #endif /* Common for all supported OSes/compilers. */ -#define HAVE_ASSERT_H 1 #define HAVE_STDBOOL_H 1 #define HAVE_BOOL_T 1 -#define HAVE_ERRNO_H 1 #define HAVE_FCNTL_H 1 #define HAVE_WS2TCPIP_H 1 -#define HAVE_SIGNAL_H 1 #define HAVE_LOCALE_H 1 #define HAVE_SETLOCALE 1 #define HAVE_GETADDRINFO 1 #define HAVE_FREEADDRINFO 1 #define HAVE_GETADDRINFO_THREADSAFE 1 -#define HAVE_FTRUNCATE 1 -#define HAVE_GETHOSTBYNAME 1 #define HAVE_GETHOSTNAME 1 #define HAVE_GETPEERNAME 1 #define HAVE_GETSOCKNAME 1 #define HAVE_LONGLONG 1 -#define HAVE_OPENSSL_VERSION 1 #define HAVE_SOCKET 1 #define HAVE_SELECT 1 -#define HAVE_SIG_ATOMIC_T 1 #define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1 #define HAVE_STRDUP 1 #define HAVE_STRTOLL 1 @@ -308,13 +328,26 @@ #define HAVE_STRUCT_TIMEVAL 1 #define HAVE_SYS_STAT_H 1 #define HAVE_SYS_TYPES_H 1 -#define HAVE_TIME_H 1 #define HAVE_UTIME 1 #define HAVE_VARIADIC_MACROS_C99 1 -#define STDC_HEADERS 1 +#define HAVE_STRICMP 1 +#define HAVE_SNPRINTF 1 +#define HAVE_STDATOMIC_H 1 +#define HAVE_ATOMIC 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_STDINT_H 1 + +/* SSL_set0_wbio() was added in OpenSSL 1.1.0 and we don't care about earlier + * versions. + */ +#define HAVE_SSL_SET0_WBIO 1 + +#define STDC_HEADERS 1 #undef _ALL_SOURCE #undef _LARGE_FILES +#undef _FILE_OFFSET_BITS + #undef HAVE_LBER_H #undef HAVE_NETINET_IN6_H #undef HAVE_GSSAPI_GSSAPI_GENERIC_H @@ -322,52 +355,42 @@ #undef HAVE_IDN2_H #undef HAVE_LIBIDN2 #undef HAVE_BROTLI -#undef EGD_SOCKET -#undef DEBUGBUILD -#undef HAVE_STRUCT_POLLFD #undef HAVE_DECL_GETPWUID_R_MISSING #undef HAVE_GETPASS_R -#undef HAVE_GNUTLS_ALPN_SET_PROTOCOLS -#undef HAVE_GNUTLS_CERTIFICATE_SET_X509_KEY_FILE2 -#undef HAVE_GNUTLS_OCSP_REQ_INIT #undef HAVE_GSSAPI #undef HAVE_GSSGNU #undef HAVE_IOCTLSOCKET_CAMEL_FIONBIO #undef HAVE_OLD_GSSMIT -#undef HAVE_PK11_CREATEMANAGEDGENERICOBJECT #undef HAVE_PROTO_BSDSOCKET_H -#undef HAVE_RAND_EGD -#undef HAVE_SETSOCKOPT_SO_NONBLOCK -#undef HAVE_SIG_ATOMIC_T_VOLATILE -#undef HAVE_SSLV2_CLIENT_METHOD #undef HAVE_STRCMPI #undef HAVE_STROPTS_H #undef HAVE_TERMIO_H #undef HAVE_TIME_T_UNSIGNED -#undef HAVE_WOLFSSLV3_CLIENT_METHOD #undef HAVE_WOLFSSL_GET_PEER_CERTIFICATE #undef HAVE_WOLFSSL_USEALPN #undef HAVE_WRITABLE_ARGV -#undef NEED_MEMORY_H +#undef HAVE_CLOSESOCKET_CAMEL +#undef HAVE_GLIBC_STRERROR_R +#undef HAVE_GNUTLS_SRP +#undef HAVE_QUICHE_CONN_SET_QLOG_FD +#undef HAVE_WOLFSSL_DES_ECB_ENCRYPT +#undef HAVE_ZSTD +#undef HAVE_CLOSE_S +#undef HAVE_EXTRA_STRDUP_H +#undef HAVE_EXTRA_STRICMP_H +#undef HAVE_SSL_GET_SHUTDOWN +#undef HAVE_IOCTLSOCKET_CAMEL +#undef HAVE_WOLFSSL_FULL_BIO + #undef NEED_REENTRANT #undef NEED_THREAD_SAFE +#undef USE_OS400CRYPTO + +#undef BSD #undef CURLDEBUG -#undef HAVE_GETNAMEINFO -#undef GETNAMEINFO_QUAL_ARG1 -#undef GETNAMEINFO_TYPE_ARG1 -#undef GETNAMEINFO_TYPE_ARG2 -#undef GETNAMEINFO_TYPE_ARG46 -#undef GETNAMEINFO_TYPE_ARG7 - -#undef HAVE_RECVFROM -#undef RECVFROM_TYPE_ARG1 -#undef RECVFROM_TYPE_ARG2 -#undef RECVFROM_TYPE_ARG3 -#undef RECVFROM_TYPE_ARG4 -#undef RECVFROM_TYPE_ARG5 -#undef RECVFROM_TYPE_ARG6 -#undef RECVFROM_TYPE_RETV +#undef DEBUGBUILD +#undef ENABLE_QUIC /* While upstream defines the macro for Clang, it fails to build for older * version of Clang on Mac OS. Thus, we never define it. @@ -455,17 +478,26 @@ */ #define SIZEOF_CURL_OFF_T 8 -#define RETSIGTYPE void #define SEND_QUAL_ARG2 const -/* We can probably assume that on platforms we build for, these keywords/types - * doesn't require definition. +/* We can probably assume that on platforms we build for, these keywords, + * types, and macros do not require definition. #undef const #undef inline #undef size_t #undef ssize_t -*/ +#undef EAGAIN +#undef ENOMEM +#undef ENOSPC + +#undef F_OK +#undef O_RDONLY + +#undef LONG_MAX +#undef LONG_MIN + + */ #endif /* LIBCURL_CURL_CONFIG_H */ diff --git a/libcurl/libcurl/libcurl-symbols.expsym b/libcurl/libcurl/libcurl-symbols.expsym deleted file mode 100644 index aada9a9..0000000 --- a/libcurl/libcurl/libcurl-symbols.expsym +++ /dev/null @@ -1,82 +0,0 @@ -_curl_easy_cleanup -_curl_easy_duphandle -_curl_easy_escape -_curl_easy_getinfo -_curl_easy_init -_curl_easy_pause -_curl_easy_perform -_curl_easy_recv -_curl_easy_reset -_curl_easy_send -_curl_easy_setopt -_curl_easy_strerror -_curl_easy_unescape -_curl_easy_upkeep -_curl_escape -_curl_formadd -_curl_formfree -_curl_formget -_curl_free -_curl_getdate -_curl_getenv -_curl_global_cleanup -_curl_global_init -_curl_global_init_mem -_curl_global_sslset -#_curl_jmpenv -_curl_maprintf -_curl_mfprintf -_curl_mime_addpart -_curl_mime_data -_curl_mime_data_cb -_curl_mime_encoder -_curl_mime_filedata -_curl_mime_filename -_curl_mime_free -_curl_mime_headers -_curl_mime_init -_curl_mime_name -_curl_mime_subparts -_curl_mime_type -_curl_mprintf -_curl_msnprintf -_curl_msprintf -_curl_multi_add_handle -_curl_multi_assign -_curl_multi_cleanup -_curl_multi_fdset -_curl_multi_info_read -_curl_multi_init -_curl_multi_perform -_curl_multi_poll -_curl_multi_remove_handle -_curl_multi_setopt -_curl_multi_socket -_curl_multi_socket_action -_curl_multi_socket_all -_curl_multi_strerror -_curl_multi_timeout -_curl_multi_wait -_curl_mvaprintf -_curl_mvfprintf -_curl_mvprintf -_curl_mvsnprintf -_curl_mvsprintf -_curl_pushheader_byname -_curl_pushheader_bynum -_curl_share_cleanup -_curl_share_init -_curl_share_setopt -_curl_share_strerror -_curl_slist_append -_curl_slist_free_all -_curl_strequal -_curl_strnequal -_curl_unescape -_curl_url -_curl_url_cleanup -_curl_url_dup -_curl_url_get -_curl_url_set -_curl_version -_curl_version_info diff --git a/libcurl/manifest b/libcurl/manifest index 83cb99f..31fda3b 100644 --- a/libcurl/manifest +++ b/libcurl/manifest @@ -1,21 +1,23 @@ : 1 name: libcurl -version: 7.67.0+8 +version: 8.4.0 project: curl +priority: security summary: C library for transferring data with URLs -license: cURL ; MIT/X derivate license. +license: curl ; MIT/X derivate license. topics: C, HTTP, FTP, URL, data transfer description-file: README -url: https://curl.haxx.se/ -doc-url: https://curl.haxx.se/libcurl/c/ +url: https://curl.se/ +doc-url: https://curl.se/libcurl/c/ src-url: https://git.build2.org/cgit/packaging/curl/curl/tree/libcurl/ package-url: https://git.build2.org/cgit/packaging/curl/ -email: curl-library@cool.haxx.se ; Mailing list. +email: curl-library@lists.haxx.se ; Mailing list. package-email: packaging@build2.org ; Mailing list. -build-email: builds@build2.org +build-error-email: builds@build2.org builds: all -depends: * build2 >= 0.12.0 -depends: * bpkg >= 0.12.0 -depends: libz >= 1.2.1100 -depends: libcrypto >= 1.1.1 -depends: libssl >= 1.1.1 +builds: -wasm +depends: * build2 >= 0.15.0 +depends: * bpkg >= 0.15.0 +depends: libz ^1.2.1100 +depends: libcrypto ^1.1.1 +depends: libssl ^1.1.1 diff --git a/libcurl/tests/basic/buildfile b/libcurl/tests/basic/buildfile index 9dd8436..2495559 100644 --- a/libcurl/tests/basic/buildfile +++ b/libcurl/tests/basic/buildfile @@ -1,5 +1,5 @@ # file : tests/basic/buildfile -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file import libs = libcurl%lib{curl} diff --git a/libcurl/tests/basic/driver.c b/libcurl/tests/basic/driver.c index 13b731c..9bd7354 100644 --- a/libcurl/tests/basic/driver.c +++ b/libcurl/tests/basic/driver.c @@ -1,5 +1,5 @@ /* file : tests/basic/driver.c - * license : cURL License; see accompanying COPYING file + * license : curl License; see accompanying COPYING file */ #include <stdio.h> #include <assert.h> @@ -53,7 +53,7 @@ main (int argc, char* argv[]) fprintf (stderr, "calling curl_easy_setopt()\n"); curl_easy_setopt (curl, CURLOPT_URL, url); - curl_easy_setopt (curl, CURLOPT_TIMEOUT, 600L); // 10 mins. + curl_easy_setopt (curl, CURLOPT_TIMEOUT, 600L); /* 10 mins. */ curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1L); char agent[] = "libcurl-test/" LIBCURL_VERSION; diff --git a/libcurl/tests/basic/testscript b/libcurl/tests/basic/testscript index 2294ba0..85a2cff 100644 --- a/libcurl/tests/basic/testscript +++ b/libcurl/tests/basic/testscript @@ -1,5 +1,5 @@ # file : tests/basic/testscript -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file : http : diff --git a/libcurl/tests/build/bootstrap.build b/libcurl/tests/build/bootstrap.build index a776805..d32cc53 100644 --- a/libcurl/tests/build/bootstrap.build +++ b/libcurl/tests/build/bootstrap.build @@ -1,5 +1,5 @@ # file : tests/build/bootstrap.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file project = # Unnamed subproject. diff --git a/libcurl/tests/build/root.build b/libcurl/tests/build/root.build index 60fd379..08770bf 100644 --- a/libcurl/tests/build/root.build +++ b/libcurl/tests/build/root.build @@ -1,5 +1,5 @@ # file : tests/build/root.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file using c diff --git a/libcurl/tests/buildfile b/libcurl/tests/buildfile index 8b91020..78efeea 100644 --- a/libcurl/tests/buildfile +++ b/libcurl/tests/buildfile @@ -1,4 +1,4 @@ # file : tests/buildfile -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file ./: {*/ -build/} |