Skip to content

Harden build process by replacing insecure commands #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Harden build process by replacing insecure commands #541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions test/travis_before_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ if grep ip6-localhost /etc/hosts; then
cat /etc/hosts
fi

# Use a rudimental retry workflow as workaround to svn export hanging
# Use a rudimental retry workflow as workaround to git clone hanging
# for minutes or failing randomly. Travis automatically kills a build
# if one step takes more than 10 minutes without reporting any
# progress.
function run_svn_export() {
function run_git_clone() {
local url=$1
local revision=$2
local dest_dir=$3
Expand All @@ -36,7 +36,7 @@ function run_svn_export() {

for i in $(seq 1 $max_tries)
do
timeout 60 svn export -r ${revision} --force -q $url $dest_dir
timeout 60 git clone --depth 1 --branch ${revision} $url $dest_dir
if [ $? -eq 0 ]; then
break
else
Expand Down Expand Up @@ -143,7 +143,7 @@ if ! test -v SKIP_TESTING -o -v NO_TEST_FRAMEWORK; then
# use a checkout of trunk until there is an updated CPAN release
# with that revision.
if test -v TEST_OPENSSL3; then
run_svn_export https://svn.apache.org/repos/asf/perl/Apache-Test/trunk HEAD test/perl-framework/Apache-Test 5
run_git_clone https://github.com/apache/httpd-tests.git trunk test/perl-framework/Apache-Test 5
fi
fi

Expand Down Expand Up @@ -172,7 +172,7 @@ if test -v TEST_OPENSSL3; then

mkdir -p build/openssl
pushd build/openssl
curl -L "https://github.com/openssl/openssl/releases/download/openssl-${TEST_OPENSSL3}/openssl-${TEST_OPENSSL3}.tar.gz" |
wget -qO- "https://github.com/openssl/openssl/releases/download/openssl-${TEST_OPENSSL3}/openssl-${TEST_OPENSSL3}.tar.gz" |
tar -xzf -
cd openssl-${TEST_OPENSSL3}
# Build with RPATH so ./bin/openssl doesn't require $LD_LIBRARY_PATH
Expand Down