From: Joe Orton <jorton@apache.org>
Date: Wed, 6 Jul 2022 13:33:12 +0000 (+0000)
Subject: Merge r1895982, r1898965, r1900545, r1902482 from trunk: [under CTR for Travis changes]
X-Git-Tag: 2.4.55-rc1-candidate~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19973456bf4dcbe9dfac6e6dbb342ac139bc2a03;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1895982, r1898965, r1900545, r1902482 from trunk: [under CTR for Travis changes]

Add Travis job against OpenSSL 3 with -Werror but with deprecation
warnings disabled.
Be careful to remove the previous OpenSSL install prefix is rebuilding.

Update to test against OpenSSL 3.0.2.

Update to testing against OpenSSL 3.0.3.

Update to test with OpenSSL 3.0.5.

Submitted by: jorton


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

diff --git a/.travis.yml b/.travis.yml
index 6cc1bd53955..cbca7e8a7ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -268,14 +268,21 @@ jobs:
       if: *condition_not_24x
       env: APR_VERSION=trunk APR_CONFIG="--without-pgsql --without-mysql --without-odbc --with-crypto"
            CONFIG="--enable-mods-shared=ssl --with-mpm=event"
-           TEST_SSL=1 TEST_OPENSSL3=3.0.1
+           TEST_SSL=1 TEST_OPENSSL3=3.0.5
+    # -------------------------------------------------------------------------
+    - name: Linux Ubuntu, APR trunk, minimal module set, OpenSSL 3.x -Werror
+      if: *condition_not_24x
+      env: APR_VERSION=trunk APR_CONFIG="--without-pgsql --without-mysql --without-odbc --with-crypto"
+           CONFIG="--enable-mods-shared=ssl --with-mpm=event"
+           TEST_OPENSSL3=3.0.5 SKIP_TESTING=1
+           NOTEST_CFLAGS="-Werror -Wno-deprecated-declarations"
     # -------------------------------------------------------------------------
     - if: *condition_24x_only
       name: Linux Ubuntu, APR 1.7, minimal module set, OpenSSL 3.x
       env: APR_VERSION=1.7.0
            APU_VERSION=1.6.1 APU_CONFIG="--without-pgsql --without-mysql --without-odbc --with-crypto"
            CONFIG="--enable-mods-shared=ssl --with-mpm=event"
-           TEST_SSL=1 TEST_OPENSSL3=3.0.1
+           TEST_SSL=1 TEST_OPENSSL3=3.0.5
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, MPMs [event, worker], core + HTTP/2 test suite
       dist: focal
diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index 717464e5372..7f4f9b53b3c 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -115,6 +115,9 @@ if test -v TEST_OPENSSL3; then
     # Build the requested version of OpenSSL if it's not already
     # installed in the cached ~/root
     if ! test -f $HOME/root/openssl-is-${TEST_OPENSSL3}; then
+        # Remove any previous install.
+        rm -rf $HOME/root/openssl3
+
         mkdir -p build/openssl
         pushd build/openssl
            curl "https://www.openssl.org/source/openssl-${TEST_OPENSSL3}.tar.gz" |