From: Stefan Eissing <icing@apache.org>
Date: Mon, 16 May 2022 11:38:37 +0000 (+0000)
Subject: Merge /httpd/httpd/trunk:r1900875
X-Git-Tag: 2.4.54-rc1-candidate~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cc9f1d560ee8654a3b34debd332f68aa40735ee;p=thirdparty%2Fapache%2Fhttpd.git

Merge /httpd/httpd/trunk:r1900875

  *) test: switch rustls-ffi to v0.9.0 which gets
     rid of the cbindgen dependency.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900952 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 877a4732cfd..fd13385e7ce 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -55,21 +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.
-    RUSTC_VERSION=`rustc --version`
-    CBINDGEN_INSTALLED_VERSION=`cbindgen --version`
-    cargo install --force cbindgen
-    CBINDGEN_LOCAL_VERSION=`"${HOME}"/.cargo/bin/cbindgen --version`
-    echo "building rustls-ffi: RUSTC='${RUSTC_VERSION}', "\
-        "SYSTEM CBINDGEN='${CBINDGEN_INSTALLED_VERSION}'"\
-        "LOCAL CBINDGEN='${CBINDGEN_LOCAL_VERSION}'"
-    PATH="${HOME}/.cargo/bin:${PATH}" make install DESTDIR="$PREFIX"
+    make install DESTDIR="$PREFIX"
   popd
   CONFIG="$CONFIG --with-tls --with-rustls=$PREFIX"
 fi