zuul: use the new rustls directory name

Follow-up to 6d972c8b1cbb3 which missed updating this directory name.

Also no longer call it crustls in the docs and bump to rusttls-ffi 0.7.1

Closes #7311

diff --git a/docs/RUSTLS.md b/docs/RUSTLS.md
index b04f008cabbbed38249b925916cf410417853ef1..ecce430046eba5b28fe89f58d4039f7111aff53f 100644 (file)
--- a/docs/RUSTLS.md
+++ b/docs/RUSTLS.md
@@ -3,24 +3,24 @@
 [Rustls is a TLS backend written in Rust.](https://docs.rs/rustls/). Curl can
 be built to use it as an alternative to OpenSSL or other TLS backends. We use
 the [rustls-ffi C bindings](https://github.com/rustls/rustls-ffi/). This
-version of curl depends on version v0.7.0 of crustls.
+version of curl depends on version v0.7.0 of rustls-ffi.
 
 # Building with rustls
 
 First, [install Rust](https://rustup.rs/).
 
-Next, check out, build, and install the appropriate version of crustls:
+Next, check out, build, and install the appropriate version of rustls-ffi:
 
     % cargo install cbindgen
     % git clone https://github.com/rustls/rustls-ffi -b v0.7.0
-    % cd crustls
+    % cd rustls-ffi
     % make
-    % make DESTDIR=${HOME}/crustls-built/ install
+    % make DESTDIR=${HOME}/rustls-ffi-built/ install
 
 Now configure and build curl with rustls:
 
     % git clone https://github.com/curl/curl
     % cd curl
     % ./buildconf
-    % ./configure --with-rustls=${HOME}/crustls-built
+    % ./configure --with-rustls=${HOME}/rustls-ffi-built
     % make

diff --git a/scripts/zuul/before_script.sh b/scripts/zuul/before_script.sh
index e5d9061a99ee577ec179dd63274adac01872dffc..7a03e453a24eab369cd632d52dee1fb34c91cc4d 100755 (executable)
--- a/scripts/zuul/before_script.sh
+++ b/scripts/zuul/before_script.sh
@@ -123,7 +123,7 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$RUSTLS_VERSION" ]; then
   curl https://sh.rustup.rs -sSf | sh -s -- -y
   source $HOME/.cargo/env
   cargo install cbindgen
-  cd $HOME/crustls
+  cd $HOME/rustls-ffi
   make
   make DESTDIR=$HOME/crust install
 fi

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 9962c0e1958e01f68ac5d34976929f1814f55cb8..61cc03c84e2bf31e6e0011cbe383b15635fcdc9c 100644 (file)
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -130,7 +130,7 @@
         - libzstd-dev
       curl_env:
         T: debug-rustls
-        RUSTLS_VERSION: v0.7.0
+        RUSTLS_VERSION: v0.7.1
         C: >-
           --with-rustls={{ ansible_user_dir }}/crust