From 2cba7fd4e2b45c289c0571e988131e12f80aaaa2 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Fri, 21 Nov 2025 08:55:45 +0000
Subject: [PATCH 1/4] CI: Try to fix ab failures during OpenSSL ech job, set
 RPATH via LDFLAGS

---
 test/travis_run_linux.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 1e0a5b20315..f98bbbcb21a 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -61,10 +61,9 @@ fi
 
 if test -v TEST_OPENSSL3; then
     CONFIG="$CONFIG --with-ssl=$HOME/root/openssl3"
-    # Temporarily set LD_RUN_PATH so that httpd/mod_ssl binaries pick
-    # up the custom OpenSSL build
-    export LD_RUN_PATH=$HOME/root/openssl3/lib:$HOME/root/openssl3/lib64
     export PATH=$HOME/root/openssl3/bin:$PATH
+    # Force everything built to hard-code an RPATH
+    export LDFLAGS="-Wl,-rpath,$HOME/root/openssl3/lib -Wl,-rpath,$HOME/root/openssl3/lib64"
     openssl version
 fi
 

From 738b21e01e2d5698cf77f755bc26cdb55225d72e Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Fri, 21 Nov 2025 09:21:11 +0000
Subject: [PATCH 2/4] CI: For OpenSSL branch builds, always build a fresh
 version of the OpenSSL branch and cache the commit hash to allow checking for
 freshness. Also clone with --depth=1 to save time+bandwidth.

---
 test/travis_before_linux.sh | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index b163e759f0f..39502189865 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -163,9 +163,21 @@ if test -v TEST_SSL; then
     popd
 fi
 
+# Build the requested version of OpenSSL if it's not already installed
+# in the cached ~/root
 if test -v TEST_OPENSSL3; then
-    # Build the requested version of OpenSSL if it's not already
-    # installed in the cached ~/root
+    # For a branch, rebuild if the remote branch has updated.
+    if test -v TEST_OPENSSL3_BRANCH -a -f $HOME/root/openssl-is-${TEST_OPENSSL3}; then
+        latest=`git ls-remote -b $TEST_OPENSSL3_BRANCH https://github.com/openssl/openssl refs/heads/${TEST_OPENSSL3_BRANCH} | cut -f1`
+        : Got branch latest commit ${latest}
+        if grep -q ^${latest} $HOME/root/openssl-is-${TEST_OPENSSL3}; then
+            : Cached repos already at ${latest}
+        else
+            : Forcing rebuild
+            rm -f $HOME/root/openssl-is-${TEST_OPENSSL3}
+        fi
+    fi
+
     if ! test -f $HOME/root/openssl-is-${TEST_OPENSSL3}; then
         # Remove any previous install.
         rm -rf $HOME/root/openssl3
@@ -173,7 +185,7 @@ if test -v TEST_OPENSSL3; then
         mkdir -p build/openssl
         pushd build/openssl
            if test -v TEST_OPENSSL3_BRANCH; then
-               git clone -b $TEST_OPENSSL3_BRANCH -q https://github.com/openssl/openssl openssl-${TEST_OPENSSL3}
+               git clone --depth=1 -b $TEST_OPENSSL3_BRANCH -q https://github.com/openssl/openssl openssl-${TEST_OPENSSL3}
            else
                curl -L "https://github.com/openssl/openssl/releases/download/openssl-${TEST_OPENSSL3}/openssl-${TEST_OPENSSL3}.tar.gz" |
                    tar -xzf -
@@ -185,7 +197,11 @@ if test -v TEST_OPENSSL3; then
                        '-Wl,-rpath=$(LIBRPATH)'
            make $MFLAGS
            make install_sw
-           touch $HOME/root/openssl-is-${TEST_OPENSSL3}
+           if test -d .git; then
+               git rev-parse HEAD > $HOME/root/openssl-is-${TEST_OPENSSL3}
+           else
+               touch $HOME/root/openssl-is-${TEST_OPENSSL3}
+           fi
        popd
     fi
 

From af7530881e80483d70053fa65ac2f90cffe43a15 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Fri, 21 Nov 2025 09:23:44 +0000
Subject: [PATCH 3/4] fixup

---
 test/travis_before_linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index 39502189865..289cb800af7 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -168,7 +168,7 @@ fi
 if test -v TEST_OPENSSL3; then
     # For a branch, rebuild if the remote branch has updated.
     if test -v TEST_OPENSSL3_BRANCH -a -f $HOME/root/openssl-is-${TEST_OPENSSL3}; then
-        latest=`git ls-remote -b $TEST_OPENSSL3_BRANCH https://github.com/openssl/openssl refs/heads/${TEST_OPENSSL3_BRANCH} | cut -f1`
+        latest=`git ls-remote https://github.com/openssl/openssl refs/heads/${TEST_OPENSSL3_BRANCH} | cut -f1`
         : Got branch latest commit ${latest}
         if grep -q ^${latest} $HOME/root/openssl-is-${TEST_OPENSSL3}; then
             : Cached repos already at ${latest}

From dfabc63b701bb52c326656eeb5161c0088c292c1 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Fri, 21 Nov 2025 09:37:16 +0000
Subject: [PATCH 4/4] fixup [skip ci]

---
 test/travis_before_linux.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index 289cb800af7..0b7892cea83 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -198,7 +198,8 @@ if test -v TEST_OPENSSL3; then
            make $MFLAGS
            make install_sw
            if test -d .git; then
-               git rev-parse HEAD > $HOME/root/openssl-is-${TEST_OPENSSL3}
+               : Caching git commit hash:
+               git rev-parse HEAD | tee $HOME/root/openssl-is-${TEST_OPENSSL3}
            else
                touch $HOME/root/openssl-is-${TEST_OPENSSL3}
            fi