From 3277881762ebf0a0e2c0070a4d1dbc7cb2c6c7e7 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 1 Mar 2024 09:36:45 +0000 Subject: [PATCH 1/2] Retry OpenSSL 3.2 testing after r1916067. --- .github/workflows/linux.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a8500d2d9e0..57b981387a5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -275,19 +275,19 @@ jobs: APU_VERSION=1.6.3 APU_CONFIG="--without-crypto" # ------------------------------------------------------------------------- - - name: OpenSSL 3.1 -Werror build + - name: OpenSSL 3.2 -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 + TEST_OPENSSL3=3.2.1 APR_VERSION=1.7.4 APU_VERSION=1.6.3 APU_CONFIG="--without-crypto" # ------------------------------------------------------------------------- - - name: OpenSSL 3.1 no-engine build + - name: OpenSSL 3.2 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 + TEST_OPENSSL3=3.2.1 OPENSSL_CONFIG=no-engine APR_VERSION=1.7.4 APU_VERSION=1.6.3 From a316bed43b0c75a2c280cf43f97a82c0ca352ab3 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 1 Mar 2024 10:00:41 +0000 Subject: [PATCH 2/2] Force use of trunk Apache::Test for testing OpenSSL 3. --- test/travis_before_linux.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh index e67931847ba..32fbbb8b909 100755 --- a/test/travis_before_linux.sh +++ b/test/travis_before_linux.sh @@ -85,6 +85,13 @@ if ! test -v SKIP_TESTING -o -v NO_TEST_FRAMEWORK; then # Make a shallow clone of httpd-tests git repo. git clone -q --depth=1 https://github.com/apache/httpd-tests.git test/perl-framework + + # For OpenSSL 3.2+ testing, Apache::Test r1916067 is required, so + # use a checkout of trunk until there is an updated CPAN release + # with that revision. + if test -v TEST_OPENSSL3; then + svn co -q https://svn.apache.org/repos/asf/perl/Apache-Test/trunk test/perl-framework/Apache-Test + fi fi # For LDAP testing, run slapd listening on port 8389 and populate the