curl: update to 8.7.1

mesonbuild · Mar 28, 2024 · c897935 · c897935
1 parent 3194321
commit c897935
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 42 deletions.
diff --git a/releases.json b/releases.json
@@ -476,6 +476,7 @@
       "libcurl"
     ],
     "versions": [
+      "8.7.1-1",
       "8.6.0-1",
       "8.5.0-2",
       "8.5.0-1",

diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
@@ -1,9 +1,9 @@
 [wrap-file]
-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
+directory = curl-8.7.1
+source_url = https://github.com/curl/curl/releases/download/curl-8_7_1/curl-8.7.1.tar.xz
+source_fallback_url = https://curl.se/download/curl-8.7.1.tar.xz
+source_filename = curl-8.7.1.tar.xz
+source_hash = 6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd
 patch_directory = curl
 
 [provide]

diff --git a/subprojects/packagefiles/curl/lib/meson.build b/subprojects/packagefiles/curl/lib/meson.build
@@ -81,9 +81,11 @@ curl_lib_src = files(
   'curl_range.c',
   'curl_rtmp.c',
   'curl_sasl.c',
+  'curl_sha512_256.c',
   'curl_sspi.c',
   'curl_threads.c',
   'curl_trc.c',
+  'cw-out.c',
   'dict.c',
   'doh.c',
   'dynbuf.c',
@@ -146,6 +148,7 @@ curl_lib_src = files(
   'psl.c',
   'rand.c',
   'rename.c',
+  'request.c',
   'rtsp.c',
   'select.c',
   'sendf.c',

diff --git a/subprojects/packagefiles/curl/meson.build b/subprojects/packagefiles/curl/meson.build
@@ -3,7 +3,7 @@
 project(
   'curl',
   'c',
-  version: '8.6.0',
+  version: '8.7.1',
   # 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',
 )
@@ -597,33 +597,6 @@ ssl_backends += schannel_opt.allowed() ? 'schannel' : []
 
 # }}}
 
-# Secure transport (macOS). {{{
-
-secure_transport_opt = get_option(
-  'secure-transport',
-).disable_auto_if(
-  ssl_backends.length() > 0,
-).require(
-  ssl_opt.allowed(),
-  error_message: SSL_DISABLED_ERROR,
-).require(
-  host_machine.system() == 'darwin',
-  error_message: MACOS_ONLY_ERROR,
-)
-
-lib_deps += dependency(
-  'appleframeworks',
-  modules: 'Security',
-  required: secure_transport_opt,
-)
-secure_transport_opt.require(lib_deps[-1].found())
-
-cdata.set('USE_SECTRANSP', secure_transport_opt.allowed())
-
-ssl_backends += secure_transport_opt.allowed() ? 'secure-transport' : []
-
-# }}}
-
 # OpenSSL. {{{
 
 openssl_opt = get_option(
@@ -684,6 +657,37 @@ cdata.set(
 
 # }}}
 
+# Secure transport (macOS). {{{
+
+secure_transport_opt = get_option(
+  'secure-transport',
+).disable_auto_if(
+  ssl_backends.length() > 0,
+).require(
+  ssl_opt.allowed(),
+  error_message: SSL_DISABLED_ERROR,
+).require(
+  host_machine.system() == 'darwin',
+  error_message: MACOS_ONLY_ERROR,
+)
+
+lib_deps += dependency(
+  'appleframeworks',
+  modules: 'Security',
+  required: secure_transport_opt,
+)
+secure_transport_opt.require(lib_deps[-1].found())
+
+cdata.set('USE_SECTRANSP', secure_transport_opt.allowed())
+
+ssl_backends += secure_transport_opt.allowed() ? 'secure-transport' : []
+
+if secure_transport_opt.allowed()
+  warning('TLS library does not support TLS 1.3: secure-transport')
+endif
+
+# }}}
+
 ssl_opt = ssl_opt.require(
   ssl_backends.length() > 0,
   error_message: 'no supported backend',

diff --git a/subprojects/packagefiles/curl/meson/curl_config.h.meson b/subprojects/packagefiles/curl/meson/curl_config.h.meson
@@ -168,18 +168,12 @@
 /* Define to 1 if you have _Atomic support. */
 #mesondefine HAVE_ATOMIC
 
-/* Define to 1 if using AWS-LC. */
-#mesondefine HAVE_AWSLC
-
 /* Define to 1 if you have the basename function. */
 #mesondefine HAVE_BASENAME
 
 /* Define to 1 if bool is an available type. */
 #mesondefine HAVE_BOOL_T
 
-/* Define to 1 if using BoringSSL. */
-#mesondefine HAVE_BORINGSSL
-
 /* if BROTLI is in use */
 #mesondefine HAVE_BROTLI
 
@@ -202,6 +196,9 @@
 /* Define to 1 if you have the <crypto.h> header file. */
 #mesondefine HAVE_CRYPTO_H
 
+/* Define to 1 if you have the fseeko declaration. */
+#mesondefine HAVE_DECL_FSEEKO
+
 /* "Set if getpwuid_r() declaration is missing" */
 #mesondefine HAVE_DECL_GETPWUID_R_MISSING
 
@@ -223,9 +220,6 @@
 /* Define to 1 if you have the `fseeko' function. */
 #mesondefine HAVE_FSEEKO
 
-/* Define to 1 if you have the fseeko declaration. */
-#mesondefine HAVE_DECL_FSEEKO
-
 /* Define to 1 if you have the fsetxattr function. */
 #mesondefine HAVE_FSETXATTR
 
@@ -729,6 +723,9 @@
 /* if OpenSSL is in use */
 #mesondefine USE_OPENSSL
 
+/* if openssl QUIC is in use */
+#mesondefine USE_OPENSSL_QUIC
+
 /* if quiche is in use */
 #mesondefine USE_QUICHE