diff options
author | Liang Qi <liang.qi@qt.io> | 2019-11-06 14:19:45 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-11-06 14:19:45 +0100 |
commit | 68189ab965784b5f83729e08de5f54965dc7cd32 (patch) | |
tree | 5a9bfe72da0ee5b1ae5abca6c4854503efc06840 /coin/provisioning/common/linux/openssl_for_android_linux.sh | |
parent | 98cb5fa96506837f417d6c2cfdb9c6abe3223d52 (diff) | |
parent | d690f84fd40beebcb9891df8bb656973daf55b22 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08
Diffstat (limited to 'coin/provisioning/common/linux/openssl_for_android_linux.sh')
-rwxr-xr-x | coin/provisioning/common/linux/openssl_for_android_linux.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index d833975f..4860c01f 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -53,11 +53,11 @@ else rm -rf "$exports_file" fi -version="1.1.1b" +version="1.1.1d" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -sha="e9710abf5e95c48ebf47991b10cbb48c09dae102" +sha="056057782325134b76d1931c48f2c7e6595d7ef4" opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" mkdir -p "${HOME}/openssl/android/" |