curl: update to 8.6.0

mesonbuild · Feb 1, 2024 · 5566099 · 5566099
1 parent ed51026
commit 5566099
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 26 deletions.
diff --git a/releases.json b/releases.json
@@ -469,6 +469,7 @@
       "libcurl"
     ],
     "versions": [
+      "8.6.0-1",
       "8.5.0-2",
       "8.5.0-1",
       "8.4.0-2",

diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
@@ -1,9 +1,9 @@
 [wrap-file]
-directory = curl-8.5.0
-source_url = https://github.com/curl/curl/releases/download/curl-8_5_0/curl-8.5.0.tar.xz
-source_fallback_url = https://curl.se/download/curl-8.5.0.tar.xz
-source_filename = curl-8.5.0.tar.xz
-source_hash = 42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb
+directory = curl-8.6.0
+source_url = https://github.com/curl/curl/releases/download/curl-8_6_0/curl-8.6.0.tar.xz
+source_fallback_url = https://curl.se/download/curl-8.6.0.tar.xz
+source_filename = curl-8.6.0.tar.xz
+source_hash = 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15
 patch_directory = curl
 
 [provide]

diff --git a/subprojects/packagefiles/curl/lib/meson.build b/subprojects/packagefiles/curl/lib/meson.build
@@ -27,7 +27,9 @@ curl_lib_src = files(
   'vauth/vauth.c',
   'vquic/curl_msh3.c',
   'vquic/curl_ngtcp2.c',
+  'vquic/curl_osslq.c',
   'vquic/curl_quiche.c',
+  'vquic/vquic-tls.c',
   'vquic/vquic.c',
   'vssh/libssh.c',
   'vssh/libssh2.c',

diff --git a/subprojects/packagefiles/curl/meson.build b/subprojects/packagefiles/curl/meson.build
@@ -3,7 +3,7 @@
 project(
   'curl',
   'c',
-  version: '8.5.0',
+  version: '8.6.0',
   # Version gated use of `test(…, verbose: true)` needs `0.62.0`.
   meson_version: meson.version().version_compare('>=0.62.0') ? '>=0.62.0' : '>=0.60.0',
 )
@@ -708,6 +708,7 @@ else
 endif
 
 multissl_opt = ssl_backends.length() > 1 ? ENABLED_OPT : DISABLED_OPT
+cdata.set('CURL_WITH_MULTI_SSL', multissl_opt.allowed())
 
 # }}}
 
@@ -812,13 +813,20 @@ http2_opt = http2_opt.require(lib_deps[-1].found())
 cdata.set('USE_NGHTTP2', http2_opt.allowed())
 
 # HTTP3.
-http3_opt = DISABLED_OPT
+http3_opt = DISABLED_OPT.require(
+  multissl_opt.disabled(),
+  error_message: 'MultiSSL and HTTP/3 supports are exclusive',
+)
 
 # HTTPS proxy.
 https_proxy_opt = ssl_opt.allowed() ? proxy_opt : DISABLED_OPT
 
 # }}}
 
+# IPFS / IPNS.
+ipfs_opt = http_opt
+ipns_opt = http_opt
+
 # LDAP. {{{
 
 ldap_opt = get_option('ldap')
@@ -1644,6 +1652,8 @@ foreach _section, _optlist : {
     ['HTTPS'],
     ['IMAP'],
     ['IMAPS'],
+    ['IPFS'],
+    ['IPNS'],
     ['LDAP', ldap_provider != '' ? ldap_provider : false],
     ['LDAPS'],
     ['MQTT'],
@@ -1714,8 +1724,6 @@ endforeach
 
 # Other. {{{
 
-cdata.set('CURL_WITH_MULTI_SSL', enabled_ssl_backends.length() > 1)
-
 if fs.exists('/dev/urandom')
   cdata.set_quoted('RANDOM_FILE', '/dev/urandom')
 endif

diff --git a/subprojects/packagefiles/curl/meson/curl_config.h.meson b/subprojects/packagefiles/curl/meson/curl_config.h.meson
@@ -610,12 +610,6 @@
 /* Define to 1 if you have the <utime.h> header file. */
 #mesondefine HAVE_UTIME_H
 
-/* Define to 1 if you have the windows.h header file. */
-#mesondefine HAVE_WINDOWS_H
-
-/* Define to 1 if you have the winsock2.h header file. */
-#mesondefine HAVE_WINSOCK2_H
-
 /* if you have wolfSSL_DES_ecb_encrypt */
 #mesondefine HAVE_WOLFSSL_DES_ECB_ENCRYPT
 
@@ -631,9 +625,6 @@
 /* Define this symbol if your OS supports changing the contents of argv */
 #mesondefine HAVE_WRITABLE_ARGV
 
-/* Define to 1 if you have the ws2tcpip.h header file. */
-#mesondefine HAVE_WS2TCPIP_H
-
 /* if libzstd is in use */
 #mesondefine HAVE_ZSTD
 
@@ -717,9 +708,6 @@
 /* if libSSH2 is in use */
 #mesondefine USE_LIBSSH2
 
-/* If you want to build curl with the built-in manual */
-#mesondefine USE_MANUAL
-
 /* if mbedTLS is enabled */
 #mesondefine USE_MBEDTLS
 

diff --git a/subprojects/packagefiles/curl/tests/meson.build b/subprojects/packagefiles/curl/tests/meson.build
@@ -51,14 +51,14 @@ endif
 _disabled_tests = []
 # Do not run flaky tests.
 _disabled_tests += '!flaky'
+# We don't build the doc.
+_disabled_tests += '!1177'
+# We don't build man pages either.
+_disabled_tests += ['!1139', '!1140', '!1173']
 if not fs.exists('errorcodes.pl')
-  # Missing in source distribution.
+  # Missing in git checkout.
   _disabled_tests += '!1477'
 endif
-if not fs.exists('../docs/curl.1')
-  # Not available in git checkout (and we don't build it).
-  _disabled_tests += '!1139'
-endif
 if host_machine.system() == 'darwin'
   # Some preprocessor issue prevent those 2
   # source analysis tests from succeeding.