From f65a498b3b17ece0c394ba32293930f41536071b Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@apache.org>
Date: Thu, 29 Feb 2024 15:33:38 +0000
Subject: [PATCH] CI: Add OpenSSL 3.1 builds, including a no-engine build.
 (attempt to use 3.2 failed, unsure why) - add OpenSSL build binaries to $PATH

Github: closes #415


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916058 13f79535-47bb-0310-9956-ffa450edef68
---
 .github/workflows/linux.yml | 23 +++++++++++++++++++++++
 test/travis_before_linux.sh |  2 +-
 test/travis_run_linux.sh    |  2 ++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 0f4065253f6..4c9abf8c4c2 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -266,6 +266,29 @@ jobs:
           #     APR_VERSION=1.7.0
           #     APU_VERSION=1.6.3
           # APU_CONFIG="--with-crypto --with-ldap"
+          - name: OpenSSL 3.1 build
+            config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
+            env: |
+              TEST_OPENSSL3=3.1.5
+              APR_VERSION=1.7.4
+              APU_VERSION=1.6.3
+              APU_CONFIG="--without-crypto"
+          - name: OpenSSL 3.1 -Werror build
+            config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
+            notest-cflags: -Werror -O2 -Wno-deprecated-declarations
+            env: |
+              TEST_OPENSSL3=3.1.5
+              APR_VERSION=1.7.4
+              APU_VERSION=1.6.3
+              APU_CONFIG="--without-crypto"
+          - name: OpenSSL 3.1 no-engine build
+            config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
+            env: |
+              TEST_OPENSSL3=3.1.5
+              OPENSSL_CONFIG=no-engine
+              APR_VERSION=1.7.4
+              APU_VERSION=1.6.3
+              APU_CONFIG="--without-crypto"
     runs-on: ubuntu-latest
     timeout-minutes: 30
     env:
diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index 58c1337b380..e67931847ba 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -115,7 +115,7 @@ if test -v TEST_OPENSSL3; then
            curl "https://www.openssl.org/source/openssl-${TEST_OPENSSL3}.tar.gz" |
               tar -xzf -
            cd openssl-${TEST_OPENSSL3}
-           ./Configure --prefix=$HOME/root/openssl3 shared no-tests
+           ./Configure --prefix=$HOME/root/openssl3 shared no-tests ${OPENSSL_CONFIG}
            make $MFLAGS
            make install_sw
            touch $HOME/root/openssl-is-${TEST_OPENSSL3}
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 19ccb601b15..1b90879ea65 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -62,6 +62,8 @@ fi
 if test -v TEST_OPENSSL3; then
     CONFIG="$CONFIG --with-ssl=$HOME/root/openssl3"
     export LD_LIBRARY_PATH=$HOME/root/openssl3/lib:$HOME/root/openssl3/lib64
+    export PATH=$HOME/root/openssl3/bin:$PATH
+    openssl version
 fi
 
 srcdir=$PWD