summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README-DEV44
-rw-r--r--TODO6
-rw-r--r--curl/.gitignore5
-rw-r--r--curl/README-DEV6
-rw-r--r--curl/curl/.gitattributes2
-rw-r--r--curl/curl/buildfile9
l---------curl/curl/curl_ctype.c1
-rw-r--r--curl/curl/tool_hugehelp.c3
-rw-r--r--curl/curl/tool_main.c60
-rw-r--r--curl/manifest10
-rw-r--r--libcurl/.gitignore5
-rw-r--r--libcurl/build/bootstrap.build10
-rw-r--r--libcurl/libcurl/.gitattributes2
-rw-r--r--libcurl/libcurl/buildfile53
-rw-r--r--libcurl/libcurl/curl_config.h76
-rw-r--r--libcurl/manifest12
m---------upstream0
17 files changed, 166 insertions, 138 deletions
diff --git a/README-DEV b/README-DEV
index bf242fe..2c75418 100644
--- a/README-DEV
+++ b/README-DEV
@@ -28,14 +28,11 @@ Debian and Fedora distributions. The configuration options defining these sets
are specified in the Debian's rules and Fedora's RPM .spec files. These files
can be obtained as follows:
-$ wget http://deb.debian.org/debian/pool/main/c/curl/curl_7.74.0-1.1.debian.tar.xz
-$ tar xf curl_7.74.0-1.1.debian.tar.xz debian/rules
+$wget http://deb.debian.org/debian/pool/main/c/curl/curl_7.88.1-6.debian.tar.xz
+$ tar xf curl_7.88.1-6.debian.tar.xz
-Note that at the time of upgrade curl 7.76.0 is not available for the Debian
-distribution, so we take the latest available version.
-
-$ wget https://kojipkgs.fedoraproject.org/packages/curl/7.76.0/1.fc35/src/curl-7.76.0-1.fc35.src.rpm
-$ rpm2cpio curl-7.76.0-1.fc35.src.rpm | cpio -civ '*.spec'
+$ wget https://kojipkgs.fedoraproject.org/packages/curl/7.88.1/1.fc39/src/curl-7.88.1-1.fc39.src.rpm
+$ rpm2cpio curl-7.88.1-1.fc39.src.rpm | cpio -civ '*.spec'
As a side note, on Debian and Fedora the source, library, headers, and tools
are packaged as follows:
@@ -55,6 +52,7 @@ Debian:
--enable-threaded-resolver --with-lber-lib=lber
--with-gssapi=/usr --with-libssh2 --with-nghttp2
--with-zsh-functions-dir=/usr/share/zsh/vendor-completions
+ --with-openssl
--with-ca-path=/etc/ssl/certs
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
@@ -64,30 +62,38 @@ Fedora:
--enable-threaded-resolver --with-gssapi --with-nghttp2 --with-ssl
--with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt
--enable-ldap --enable-ldaps --enable-manual --with-brotli --with-libidn2
- --with-libmetalink --with-libpsl --with-libssh
+ --with-libpsl --with-libssh
+ --enable-hsts --without-zstd --enable-dict --enable-gopher --enable-imap
+ --enable-mqtt --enable-ntlm --enable-ntlm-wb --enable-pop3 --enable-rtsp
+ --enable-smb --enable-smtp --enable-telnet --enable-tftp --enable-tls-srp
The union of these feature sets translates into the following options:
--enable-symbol-hiding --enable-versioned-symbols
--enable-threaded-resolver --with-lber-lib=lber --with-gssapi --with-libssh2
--with-nghttp2 --with-zsh-functions-dir=<path> --with-ca-path=<path>
- --with-ca-bundle=<path> --enable-ipv6 --with-ssl --enable-ldap
+ --with-ca-bundle=<path> --enable-ipv6 --with-openssl --enable-ldap
--enable-ldaps --enable-manual --with-brotli --with-libidn2
- --with-libmetalink --with-libpsl --with-libssh
+ --with-libpsl --with-libssh
+ --enable-hsts --enable-dict --enable-gopher --enable-imap
+ --enable-mqtt --enable-ntlm --enable-ntlm-wb --enable-pop3 --enable-rtsp
+ --enable-smb --enable-smtp --enable-telnet --enable-tftp --enable-tls-srp
We, however, drop the external dependencies that are not packaged for build2,
disable default CA bundle/directory and use --with-ca-fallback instead,
explicitly request to use zlib and end up with the following options:
--enable-symbol-hiding --enable-versioned-symbols --enable-threaded-resolve
- --enable-ipv6 --with-ssl --with-zlib --disable-ldap --disable-ldaps
+ --enable-ipv6 --with-openssl --with-zlib --disable-ldap --disable-ldaps
--disable-ares --disable-esni --disable-manual --without-lber-lib
--without-gssapi --without-libssh --without-libssh2 --without-nghttp2
--without-zsh-functions-dir --without-brotli --without-libidn2
- --without-libmetalink --without-libpsl
- --without-bearssl --without-libgsasl --disable-hsts --without-hyper
+ --without-libpsl --without-bearssl --without-libgsasl --without-hyper
--without-rustls --without-wolfssh
--without-ca-bundle --without-ca-path --with-ca-fallback
+ --enable-hsts --enable-dict --enable-gopher --enable-imap
+ --enable-mqtt --enable-ntlm --enable-ntlm-wb --enable-pop3 --enable-rtsp
+ --enable-smb --enable-smtp --enable-telnet --enable-tftp --enable-tls-srp
See the configuration options description at the "Install from source" page
(https://curl.se/docs/install.html).
@@ -134,14 +140,18 @@ $ autoreconf -fi
$ mkdir build
$ cd build
$ ../configure --enable-symbol-hiding --enable-versioned-symbols \
- --enable-threaded-resolve --enable-ipv6 --with-ssl --with-zlib \
+ --enable-threaded-resolve --enable-ipv6 --with-openssl --with-zlib \
--disable-ldap --disable-ldaps --disable-ares --disable-esni \
--disable-manual --without-lber-lib --without-gssapi --without-libssh \
--without-libssh2 --without-nghttp2 --without-zsh-functions-dir \
- --without-brotli --without-libidn2 --without-libmetalink --without-libpsl \
- --without-bearssl --without-libgsasl --disable-hsts --without-hyper \
+ --without-brotli --without-libidn2 --without-libpsl \
+ --without-bearssl --without-libgsasl --without-hyper \
--without-rustls --without-wolfssh \
- --without-ca-bundle --without-ca-path --with-ca-fallback >build.log 2>&1
+ --without-ca-bundle --without-ca-path --with-ca-fallback \
+ --enable-hsts --enable-dict --enable-gopher --enable-imap \
+ --enable-mqtt --enable-ntlm --enable-ntlm-wb --enable-pop3 --enable-rtsp \
+ --enable-smb --enable-smtp --enable-telnet --enable-tftp --enable-tls-srp \
+ >build.log 2>&1
$ make V=1 >>build.log 2>&1
For MSVC:
diff --git a/TODO b/TODO
index abba7e5..4d343a7 100644
--- a/TODO
+++ b/TODO
@@ -4,3 +4,9 @@ On the release:
Note that here we record items that require bumping build2 version
requirement to the latest released version of the toolchain.
+
+Additional (permanent) notes:
+
+- Review '@@ TMP' notes.
+
+- Add/remove 'priority: security' manifest value, if required.
diff --git a/curl/.gitignore b/curl/.gitignore
index 4c4fec7..3dcc22f 100644
--- a/curl/.gitignore
+++ b/curl/.gitignore
@@ -3,9 +3,14 @@
*.d
*.t
*.i
+*.i.*
*.ii
+*.ii.*
*.o
*.obj
+*.gcm
+*.pcm
+*.ifc
*.so
*.so.*
*.dll
diff --git a/curl/README-DEV b/curl/README-DEV
index df275f1..760e273 100644
--- a/curl/README-DEV
+++ b/curl/README-DEV
@@ -5,13 +5,9 @@ understanding will be useful when upgrading to a new upstream version. See
Symlink the required upstream directories into curl/:
$ ln -s ../../upstream/{src,lib} curl
-$ ln -s lib/{strtoofft,nonblock,warnless,curl_ctype,dynbuf,version_win32,curl_multibyte}.c curl
+$ ln -s lib/{strtoofft,nonblock,warnless,dynbuf,version_win32,curl_multibyte}.c curl
$ ln -s ../../libcurl/libcurl/curl_config.h curl
-$ cp curl/src/tool_hugehelp.c.cvs curl/tool_hugehelp.c
-
-Edit tool_hugehelp.c to make hugehelp() be empty.
-
Patch curl to use CA certificate bundle provided by the
libca-certificates-curl package by default:
diff --git a/curl/curl/.gitattributes b/curl/curl/.gitattributes
new file mode 100644
index 0000000..a6bfc4e
--- /dev/null
+++ b/curl/curl/.gitattributes
@@ -0,0 +1,2 @@
+lib symlink=dir
+src symlink=dir
diff --git a/curl/curl/buildfile b/curl/curl/buildfile
index f458c0e..9780540 100644
--- a/curl/curl/buildfile
+++ b/curl/curl/buildfile
@@ -13,15 +13,8 @@ tsys = $c.target.system
#
c.poptions += -DHAVE_CONFIG_H
-# 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
}
@@ -50,7 +43,7 @@ switch $c.class
switch $tclass, $tsys
{
case 'linux' | 'bsd'
- c.libs += -lpthread
+ c.libs += -pthread
case 'windows', 'mingw32'
c.libs+= -lws2_32
diff --git a/curl/curl/curl_ctype.c b/curl/curl/curl_ctype.c
deleted file mode 120000
index 23515cd..0000000
--- a/curl/curl/curl_ctype.c
+++ /dev/null
@@ -1 +0,0 @@
-lib/curl_ctype.c \ No newline at end of file
diff --git a/curl/curl/tool_hugehelp.c b/curl/curl/tool_hugehelp.c
deleted file mode 100644
index bc33e2f..0000000
--- a/curl/curl/tool_hugehelp.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* built-in manual is disabled, blank function */
-#include "tool_hugehelp.h"
-void hugehelp(void) {}
diff --git a/curl/curl/tool_main.c b/curl/curl/tool_main.c
index 913f8d6..0eb4e6d 100644
--- a/curl/curl/tool_main.c
+++ b/curl/curl/tool_main.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -18,6 +18,8 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
+ * SPDX-License-Identifier: curl
+ *
***************************************************************************/
#include "tool_setup.h"
@@ -31,6 +33,10 @@
#include <signal.h>
#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
#ifdef USE_NSS
#include <nspr.h>
#include <plarenas.h>
@@ -45,11 +51,9 @@
#include "curlx.h"
#include "tool_cfgable.h"
-#include "tool_convert.h"
#include "tool_doswin.h"
#include "tool_msgs.h"
#include "tool_operate.h"
-#include "tool_panykey.h"
#include "tool_vms.h"
#include "tool_main.h"
#include "tool_libinfo.h"
@@ -83,29 +87,30 @@ int _CRT_glob = 0;
/* if we build a static library for unit tests, there is no main() function */
#ifndef UNITTESTS
+#if defined(HAVE_PIPE) && defined(HAVE_FCNTL)
/*
* Ensure that file descriptors 0, 1 and 2 (stdin, stdout, stderr) are
* open before starting to run. Otherwise, the first three network
* sockets opened by curl could be used for input sources, downloaded data
* or error logs as they will effectively be stdin, stdout and/or stderr.
+ *
+ * fcntl's F_GETFD instruction returns -1 if the file descriptor is closed,
+ * otherwise it returns "the file descriptor flags (which typically can only
+ * be FD_CLOEXEC, which is not set here).
*/
-static void main_checkfds(void)
+static int main_checkfds(void)
{
-#ifdef HAVE_PIPE
- int fd[2] = { STDIN_FILENO, STDIN_FILENO };
- while(fd[0] == STDIN_FILENO ||
- fd[0] == STDOUT_FILENO ||
- fd[0] == STDERR_FILENO ||
- fd[1] == STDIN_FILENO ||
- fd[1] == STDOUT_FILENO ||
- fd[1] == STDERR_FILENO)
- if(pipe(fd) < 0)
- return; /* Out of handles. This isn't really a big problem now, but
- will be when we try to create a socket later. */
- close(fd[0]);
- close(fd[1]);
-#endif
+ int fd[2];
+ while((fcntl(STDIN_FILENO, F_GETFD) == -1) ||
+ (fcntl(STDOUT_FILENO, F_GETFD) == -1) ||
+ (fcntl(STDERR_FILENO, F_GETFD) == -1))
+ if(pipe(fd))
+ return 1;
+ return 0;
}
+#else
+#define main_checkfds() 0
+#endif
#ifdef CURLDEBUG
static void memory_tracking_init(void)
@@ -122,7 +127,7 @@ static void memory_tracking_init(void)
curl_free(env);
curl_dbg_memdebug(fname);
/* this weird stuff here is to make curl_free() get called before
- curl_gdb_memdebug() as otherwise memory tracking will log a free()
+ curl_dbg_memdebug() as otherwise memory tracking will log a free()
without an alloc! */
}
/* if CURL_MEMLIMIT is set, this enables fail-on-alloc-number-N feature */
@@ -189,7 +194,7 @@ static CURLcode main_init(struct GlobalConfig *config)
#endif
/* Initialise the global config */
- config->showerror = -1; /* Will show errors */
+ config->showerror = FALSE; /* show errors when silent */
config->errors = stderr; /* Default errors to stderr */
config->styled_output = TRUE; /* enable detection */
config->parallel_max = PARALLEL_DEFAULT;
@@ -250,11 +255,9 @@ static void main_free(struct GlobalConfig *config)
/* Cleanup the easy handle */
/* Main cleanup */
curl_global_cleanup();
- convert_cleanup();
- metalink_cleanup();
#ifdef USE_NSS
if(PR_Initialized()) {
- /* prevent valgrind from reporting still reachable mem from NSRP arenas */
+ /* prevent valgrind from reporting still reachable mem from NSPR arenas */
PL_ArenaFinish();
/* prevent valgrind from reporting possibly lost memory (fd cache, ...) */
PR_Cleanup();
@@ -299,7 +302,10 @@ int main(int argc, char *argv[])
}
#endif
- main_checkfds();
+ if(main_checkfds()) {
+ fprintf(stderr, "curl: out of file descriptors\n");
+ return CURLE_FAILED_INIT;
+ }
#if defined(HAVE_SIGNAL) && defined(SIGPIPE)
(void)signal(SIGPIPE, SIG_IGN);
@@ -319,9 +325,9 @@ int main(int argc, char *argv[])
main_free(&global);
}
-#ifdef __NOVELL_LIBC__
- if(getenv("_IN_NETWARE_BASH_") == NULL)
- tool_pressanykey();
+#ifdef WIN32
+ /* Flush buffers of all streams opened in write or update mode */
+ fflush(NULL);
#endif
#ifdef __VMS
diff --git a/curl/manifest b/curl/manifest
index 5bbce4a..31f1348 100644
--- a/curl/manifest
+++ b/curl/manifest
@@ -1,6 +1,7 @@
: 1
name: curl
-version: 7.76.0
+version: 7.88.1-a.0.z
+priority: security
summary: Command line tool for transferring data with URLs
license: curl ; MIT/X derivate license.
topics: HTTP, FTP, URL, data transfer
@@ -9,11 +10,12 @@ url: https://curl.se/
doc-url: https://curl.se/docs/manpage.html
src-url: https://git.build2.org/cgit/packaging/curl/curl/tree/curl/
package-url: https://git.build2.org/cgit/packaging/curl/
-email: curl-users@cool.haxx.se ; Mailing list.
+email: curl-users@lists.haxx.se ; Mailing list.
package-email: packaging@build2.org ; Mailing list.
build-warning-email: builds@build2.org
builds: all
-depends: * build2 >= 0.13.0
-depends: * bpkg >= 0.13.0
+builds: -wasm
+depends: * build2 >= 0.15.0
+depends: * bpkg >= 0.15.0
depends: libcurl == $
depends: libca-certificates-curl ^1.0.0
diff --git a/libcurl/.gitignore b/libcurl/.gitignore
index 4c4fec7..3dcc22f 100644
--- a/libcurl/.gitignore
+++ b/libcurl/.gitignore
@@ -3,9 +3,14 @@
*.d
*.t
*.i
+*.i.*
*.ii
+*.ii.*
*.o
*.obj
+*.gcm
+*.pcm
+*.ifc
*.so
*.so.*
*.dll
diff --git a/libcurl/build/bootstrap.build b/libcurl/build/bootstrap.build
index a84b3e7..29c04ff 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,17 +17,17 @@ 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 == 76 && $version.patch == 0)
+if ($version.major == 7 && $version.minor == 88 && $version.patch == 1)
{
abi_version_major = 4
- abi_version = "$abi_version_major.7.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/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/buildfile b/libcurl/libcurl/buildfile
index d44293f..5f783c1 100644
--- a/libcurl/libcurl/buildfile
+++ b/libcurl/libcurl/buildfile
@@ -29,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}: cc.reprocess = true
+
# Build options.
#
c.poptions += -DBUILDING_LIBCURL -DHAVE_CONFIG_H \
@@ -37,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
}
@@ -64,9 +91,11 @@ switch $c.class
# 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'
{
@@ -85,7 +114,7 @@ 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'
{
@@ -95,7 +124,9 @@ switch $tclass, $tsys
# used for the API function declarations. Thus, we don't bother
# generating/passing the exported symbol list file.
#
- c.libs += -framework CoreFoundation -framework Security
+ c.libs += -framework CoreFoundation \
+ -framework SystemConfiguration \
+ -framework Security
}
case 'windows', 'mingw32'
{
diff --git a/libcurl/libcurl/curl_config.h b/libcurl/libcurl/curl_config.h
index 3bebb85..8458725 100644
--- a/libcurl/libcurl/curl_config.h
+++ b/libcurl/libcurl/curl_config.h
@@ -53,7 +53,6 @@
/* Enabled features.
*/
#define ENABLE_IPV6 1
-#define HAVE_ZLIB_H 1
#define HAVE_LIBZ 1
#undef CURL_DISABLE_COOKIES
@@ -84,6 +83,9 @@
#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
/* Diabled features.
*/
@@ -96,16 +98,12 @@
#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
#undef USE_LIBPSL
#undef USE_MANUAL
#undef USE_MBEDTLS
-#undef USE_MESALINK
-#undef USE_METALINK
#undef USE_NGHTTP2
#undef USE_NGHTTP3
#undef USE_NGTCP2
@@ -115,10 +113,11 @@
#undef USE_QUICHE
#undef USE_BEARSSL
#undef USE_GSASL
-#undef USE_HSTS
#undef USE_HYPER
#undef USE_RUSTLS
#undef USE_WOLFSSH
+#undef USE_MSH3
+#undef USE_WEBSOCKETS
/* Specific for (non-) Linux.
*/
@@ -176,6 +175,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
@@ -202,6 +202,9 @@
# define HAVE_TERMIOS_H 1
# define HAVE_UTIMES 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
@@ -221,16 +224,12 @@
# 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_WINSOCK_H 1
# undef _UNICODE
# undef UNICODE
@@ -290,8 +289,7 @@
# define HAVE_VARIADIC_MACROS_GCC 1
# define HAVE_OPENSSL_SRP 1
# define HAVE_FTRUNCATE 1
-
-# define TIME_WITH_SYS_TIME 1
+# define HAVE_SCHED_YIELD 1
#else
# define USE_THREADS_WIN32 1
# undef USE_THREADS_POSIX
@@ -301,10 +299,8 @@
/* 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
@@ -313,15 +309,12 @@
#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
#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
@@ -329,11 +322,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
+#define HAVE_SNPRINTF 1
+#define HAVE_STDATOMIC_H 1
+#define HAVE_ATOMIC 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
+#define STDC_HEADERS 1
#undef _ALL_SOURCE
#undef _LARGE_FILES
@@ -346,7 +347,6 @@
#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
@@ -356,14 +356,10 @@
#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
@@ -376,31 +372,10 @@
#undef HAVE_CLOSE_S
#undef HAVE_EXTRA_STRDUP_H
#undef HAVE_EXTRA_STRICMP_H
-#undef HAVE_LIBSSH2_VERSION
#undef HAVE_SSL_GET_SHUTDOWN
-#undef HAVE_VXWORKS_STRERROR_R
-#undef RECVFROM_TYPE_ARG6_IS_VOID
-
-#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 HAVE_ICONV
-#undef CURL_ICONV_CODESET_OF_HOST
-
-#undef NEED_MEMORY_H
+#undef HAVE_IOCTLSOCKET_CAMEL
+#undef HAVE_WOLFSSL_FULL_BIO
+
#undef NEED_REENTRANT
#undef NEED_THREAD_SAFE
@@ -412,8 +387,6 @@
#undef CURLDEBUG
#undef DEBUGBUILD
#undef ENABLE_QUIC
-#undef OPEN_NEEDS_ARG3
-#undef CURL_DOES_CONVERSIONS
/* While upstream defines the macro for Clang, it fails to build for older
* version of Clang on Mac OS. Thus, we never define it.
@@ -501,7 +474,6 @@
*/
#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,
@@ -522,6 +494,6 @@
#undef LONG_MAX
#undef LONG_MIN
-*/
+ */
#endif /* LIBCURL_CURL_CONFIG_H */
diff --git a/libcurl/manifest b/libcurl/manifest
index 34e6ca5..c7bd8d9 100644
--- a/libcurl/manifest
+++ b/libcurl/manifest
@@ -1,7 +1,8 @@
: 1
name: libcurl
-version: 7.76.0
+version: 7.88.1-a.0.z
project: curl
+priority: security
summary: C library for transferring data with URLs
license: curl ; MIT/X derivate license.
topics: C, HTTP, FTP, URL, data transfer
@@ -10,12 +11,13 @@ 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-warning-email: builds@build2.org
+build-error-email: builds@build2.org
builds: all
-depends: * build2 >= 0.13.0
-depends: * bpkg >= 0.13.0
+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/upstream b/upstream
-Subproject 3266b35bbe21c68dea0dc7ccd991eb028e6d360
+Subproject 046209e561b7e9b5aab1aef7daebf29ee6e6e8c