You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2022/07/06 13:33:12 UTC
svn commit: r1902507 - in /httpd/httpd/branches/2.4.x: ./ .travis.yml test/travis_before_linux.sh
Author: jorton
Date: Wed Jul 6 13:33:12 2022
New Revision: 1902507
URL: http://svn.apache.org/viewvc?rev=1902507&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/.travis.yml
httpd/httpd/branches/2.4.x/test/travis_before_linux.sh
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1895982,1898965,1900545,1902482
Modified: httpd/httpd/branches/2.4.x/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/.travis.yml?rev=1902507&r1=1902506&r2=1902507&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/.travis.yml (original)
+++ httpd/httpd/branches/2.4.x/.travis.yml Wed Jul 6 13:33:12 2022
@@ -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
Modified: httpd/httpd/branches/2.4.x/test/travis_before_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/travis_before_linux.sh?rev=1902507&r1=1902506&r2=1902507&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/travis_before_linux.sh (original)
+++ httpd/httpd/branches/2.4.x/test/travis_before_linux.sh Wed Jul 6 13:33:12 2022
@@ -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" |