From a09b66e0f2e84843e1f6b58dc349f0c40dd18fd3 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Fri, 20 Sep 2024 14:16:03 -0700
Subject: [PATCH] Update to 8.10.1 (#573)

* Update to 8.10.1

* Disable rustls windows cross-compile test

Rustls no longer works for cross-compiling due to switching to aws-lc
(from ring). It seems to want to run `.bat` files for some NASM-related
stuff.

We could, in the future, expose `ring` as a rustls backend as a feature
if someone wants to continue using that.

* Don't try rustls on i686-pc-windows-msvc

It requires nasm to be installed, and I don't want to hassle with that
right now.
---
 ci/run.sh           | 13 ++++++++++++-
 curl-sys/Cargo.toml |  4 ++--
 curl-sys/build.rs   |  2 +-
 curl-sys/curl       |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ci/run.sh b/ci/run.sh
index 6c2dae399..5276c2d9d 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -6,7 +6,18 @@ cargo test --target $TARGET --no-run
 # First test with no extra protocols enabled.
 cargo test --target $TARGET --no-run --features static-curl
 # Then with rustls TLS backend.
-cargo test --target $TARGET --no-run --features rustls,static-curl
+#
+# Note: Cross-compiling rustls on windows doesn't work due to requiring some
+# NASM build stuff in aws_lc_rs, which may soon be fixed by
+# https://github.com/aws/aws-lc-rs/pull/528.
+#
+# Compiling on i686-windows requires nasm to be installed (other platforms
+# have pre-compiled object files), which is just slightly too much
+# inconvenience for me.
+if [ "$TARGET" != "x86_64-pc-windows-gnu" ] && [ "$TARGET" != "i686-pc-windows-msvc" ]
+then
+    cargo test --target $TARGET --no-run --features rustls,static-curl
+fi
 # Then with all extra protocols enabled.
 cargo test --target $TARGET --no-run --features static-curl,protocol-ftp,ntlm
 if [ -z "$NO_RUN" ]; then
diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml
index e31bd44bb..51e30028d 100644
--- a/curl-sys/Cargo.toml
+++ b/curl-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "curl-sys"
-version = "0.4.75+curl-8.10.0"
+version = "0.4.76+curl-8.10.1"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 links = "curl"
 build = "build.rs"
@@ -22,7 +22,7 @@ libc = "0.2.2"
 libnghttp2-sys = { optional = true, version = "0.1.3" }
 
 [dependencies.rustls-ffi]
-version = "0.13"
+version = "0.14"
 optional = true
 features = ["no_log_capture"]
 
diff --git a/curl-sys/build.rs b/curl-sys/build.rs
index 677cad29c..9eefa8e72 100644
--- a/curl-sys/build.rs
+++ b/curl-sys/build.rs
@@ -108,7 +108,7 @@ fn main() {
             .replace("@LIBCURL_LIBS@", "")
             .replace("@SUPPORT_FEATURES@", "")
             .replace("@SUPPORT_PROTOCOLS@", "")
-            .replace("@CURLVERSION@", "8.10.0"),
+            .replace("@CURLVERSION@", "8.10.1"),
     )
     .unwrap();
 
diff --git a/curl-sys/curl b/curl-sys/curl
index a3bd1dda1..7eb8c0484 160000
--- a/curl-sys/curl
+++ b/curl-sys/curl
@@ -1 +1 @@
-Subproject commit a3bd1dda12ec79cd63e0d81df4ec4b1fbbbcfa1b
+Subproject commit 7eb8c048470ed2cc14dca75be9c1cdae7ac8498b