From: Stefan Eissing <icing@apache.org>
Date: Sat, 14 May 2022 09:09:01 +0000 (+0000)
Subject:   * test: upgrade rustls-ffi version to 0.9.0 which
X-Git-Tag: 2.5.0-alpha2-ci-test-only~339
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e27ffd880d8d1c3ea894cc5d6919eb5d517f0e0;p=thirdparty%2Fapache%2Fhttpd.git

  * test: upgrade rustls-ffi version to 0.9.0 which
    gets rid of the dependency on cbindgen.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1900875 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 409077944bc..692e5f82bac 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -55,15 +55,13 @@ fi
 # build the version we want from source
 if test -v TEST_MOD_TLS; then
   RUSTLS_HOME="$HOME/build/rustls-ffi"
-  RUSTLS_VERSION="v0.8.2"
+  RUSTLS_VERSION="v0.9.0"
   git clone https://github.com/rustls/rustls-ffi.git "$RUSTLS_HOME"
   pushd "$RUSTLS_HOME"
+    # since v0.9.0, there is no longer a dependency on cbindgen
     git fetch origin
     git checkout tags/$RUSTLS_VERSION
-    # force an update to cbindgen as focal seems to deliver v0.12.1
-    # always something changes with rust/cargo every few weeks, sigh.
-    cargo install --force cbindgen
-    PATH="${HOME}/.cargo/bin:${PATH}" make install DESTDIR="$PREFIX"
+    make install DESTDIR="$PREFIX"
   popd
   CONFIG="$CONFIG --with-tls --with-rustls=$PREFIX"
 fi