summaryrefslogtreecommitdiff
path: root/libcurl
diff options
context:
space:
mode:
Diffstat (limited to 'libcurl')
-rw-r--r--libcurl/.gitignore1
-rw-r--r--libcurl/build/bootstrap.build8
-rw-r--r--libcurl/libcurl/buildfile4
-rw-r--r--libcurl/libcurl/curl_config.h83
-rw-r--r--libcurl/manifest2
5 files changed, 37 insertions, 61 deletions
diff --git a/libcurl/.gitignore b/libcurl/.gitignore
index 3dcc22f..d4a1da2 100644
--- a/libcurl/.gitignore
+++ b/libcurl/.gitignore
@@ -13,6 +13,7 @@
*.ifc
*.so
*.so.*
+*.dylib
*.dll
*.a
*.lib
diff --git a/libcurl/build/bootstrap.build b/libcurl/build/bootstrap.build
index 0675c6c..9704ab7 100644
--- a/libcurl/build/bootstrap.build
+++ b/libcurl/build/bootstrap.build
@@ -1,4 +1,4 @@
-# file : build/root.build
+# file : build/bootstrap.build
# license : curl License; see accompanying COPYING file
project = libcurl
@@ -17,14 +17,14 @@ using dist
# 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.se/libcurl/abi.html
#
-if ($version.major == 7 && $version.minor == 84 && $version.patch == 0)
+if ($version.major == 8 && $version.minor == 4 && $version.patch == 0)
{
abi_version_major = 4
abi_version = "$abi_version_major.8.0" # <current - age>.<age>.<revision>
diff --git a/libcurl/libcurl/buildfile b/libcurl/libcurl/buildfile
index cdae37c..62c8680 100644
--- a/libcurl/libcurl/buildfile
+++ b/libcurl/libcurl/buildfile
@@ -61,7 +61,7 @@ vsc{libcurl}: lib/in{libcurl}
# <stdatomic.h> for Clang versions prior to 7.0.
#
if ($c.id == 'clang' && $c.version.major < 7)
- lib/obj{easy version}: cc.reprocess = true
+ lib/obj{easy version hostip}: cc.reprocess = true
# Build options.
#
@@ -131,7 +131,7 @@ switch $tclass, $tsys
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 868a327..2ccc522 100644
--- a/libcurl/libcurl/curl_config.h
+++ b/libcurl/libcurl/curl_config.h
@@ -47,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
@@ -87,6 +85,14 @@
#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.
*/
@@ -99,8 +105,6 @@
#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_ARES
@@ -110,7 +114,6 @@
#undef USE_NGHTTP2
#undef USE_NGHTTP3
#undef USE_NGTCP2
-#undef USE_NSS
#undef USE_OPENLDAP
#undef USE_LIBRTMP
#undef USE_QUICHE
@@ -155,12 +158,14 @@
*/
#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.
@@ -177,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
@@ -225,15 +231,13 @@
# define USE_WIN32_LARGE_FILES 1
# define USE_WINDOWS_SSPI 1
-# define WANT_IDN_PROTOTYPES 1
-
-# define HAVE_PROCESS_H 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__FSEEKI64 1
# undef _UNICODE
# undef UNICODE
@@ -280,11 +284,9 @@
# 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
@@ -294,8 +296,7 @@
# define HAVE_OPENSSL_SRP 1
# define HAVE_FTRUNCATE 1
# define HAVE_SCHED_YIELD 1
-
-# define TIME_WITH_SYS_TIME 1
+# define HAVE_FSEEKO 1
#else
# define USE_THREADS_WIN32 1
# undef USE_THREADS_POSIX
@@ -305,19 +306,15 @@
/* 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_GETHOSTBYNAME 1
#define HAVE_GETHOSTNAME 1
#define HAVE_GETPEERNAME 1
#define HAVE_GETSOCKNAME 1
@@ -331,26 +328,19 @@
#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 HAVE_STRICMP 1
-
-/* <stdatomic.h>, _Atomic, atomic_*, etc
- *
- * @@ TMP Note that upstream's package version 7.84.0 fails to compile with
- * older versions of Clang with the 'unknown builtin' error (trying to
- * use __builtin_ia32_pause()). At the time of this writing this issue
- * is fixed but the fixed version is not released yet. When it is
- * released, drop the check and define HAVE_ATOMIC
- * unconditionally. Until then the curl_global_*() functions will be
- * thread-unsafe for Clang versions prior to 6.0 (as they are for
- * libcurl versions prior to 7.84.0).
+#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.
*/
-#if !defined(__STDC_NO_ATOMICS__) && \
- (!defined(__clang__) || __clang_major__ >= 6)
-# define HAVE_ATOMIC 1
-#endif
+#define HAVE_SSL_SET0_WBIO 1
#define STDC_HEADERS 1
@@ -365,17 +355,13 @@
#undef HAVE_IDN2_H
#undef HAVE_LIBIDN2
#undef HAVE_BROTLI
-#undef HAVE_STRUCT_POLLFD
#undef HAVE_DECL_GETPWUID_R_MISSING
#undef HAVE_GETPASS_R
#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_STRCMPI
#undef HAVE_STROPTS_H
#undef HAVE_TERMIO_H
@@ -393,26 +379,15 @@
#undef HAVE_EXTRA_STRDUP_H
#undef HAVE_EXTRA_STRICMP_H
#undef HAVE_SSL_GET_SHUTDOWN
-#undef RECVFROM_TYPE_ARG6_IS_VOID
-
-#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 NEED_MEMORY_H
+#undef HAVE_IOCTLSOCKET_CAMEL
+#undef HAVE_WOLFSSL_FULL_BIO
+
#undef NEED_REENTRANT
#undef NEED_THREAD_SAFE
-#undef USE_GSKIT
#undef USE_OS400CRYPTO
#undef BSD
-#undef EGD_SOCKET
#undef CURLDEBUG
#undef DEBUGBUILD
#undef ENABLE_QUIC
diff --git a/libcurl/manifest b/libcurl/manifest
index 8ae90ac..31fda3b 100644
--- a/libcurl/manifest
+++ b/libcurl/manifest
@@ -1,6 +1,6 @@
: 1
name: libcurl
-version: 7.84.0-a.0.z
+version: 8.4.0
project: curl
priority: security
summary: C library for transferring data with URLs
generated by cgit v1.1 at 2024-04-19 03:21:48 +0000