diff options
author | Juha Karjalainen <juha.karjalainen@qt.io> | 2018-10-19 11:01:36 +0300 |
---|---|---|
committer | Juha Karjalainen <juha.karjalainen@qt.io> | 2018-11-01 10:10:39 +0000 |
commit | 271d91eaf20639c081c1228ef56abc02f55c7520 (patch) | |
tree | 1194e2db6f18431cde13ee40a3d357a4ebd1cede | |
parent | 12f43cab3532f77213ff1a772fdec38816b097d8 (diff) |
Provisioning: Update openssl to version 1.0.2p
Task-number: QTQAINFRA-2266
Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 3b4ca5d6c0b44e64efd3776327b4f6714d0d8969)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
4 files changed, 12 insertions, 12 deletions
diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 30022c39..90651802 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -36,15 +36,17 @@ # This script install OpenSSL from sources. # Requires GCC and Perl to be in PATH. +# shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.0.2g" +version="1.0.2p" 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" installFolder="/home/qt/" -sha="36af23887402a5ea4ebef91df8e61654906f58f2" +sha="f34b5322e92415755c7d58bf5d0d5cf37666382c" # Until every VM doing Linux Android builds have provisioned the env variable # OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin. # QTQAINFRA-1436 @@ -54,9 +56,8 @@ DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" tar -xzf "$targetFile" -C "$installFolder" # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) -mv "${opensslHome}g" "${opensslHome}" +mv "${opensslHome}p" "${opensslHome}" pushd "$opensslHome" - echo "Running configure" perl Configure shared android diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index b0363c4c..bf9a2d2d 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -39,9 +39,9 @@ # Msys need to be installed to target machine # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html -$version = "1.0.2j" +$version = "1.0.2p" $zip = "c:\users\qt\downloads\openssl-$version.tar.gz" -$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f" +$sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c" $destination = "C:\Utils\openssl-android-master" Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index c884dd94..1495f665 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -36,7 +36,7 @@ # This script installs OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "1_0_2j" +$version = "1_0_2p" $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" @@ -47,8 +47,7 @@ if (Is64BitWinHost) { $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44" - + $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 Verify-Checksum $packagex64 $sha1 @@ -74,7 +73,7 @@ if (Is64BitWinHost) { $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3" +$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index a68704f9..f836cf1d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -opensslVersion="1.0.2k" +opensslVersion="1.0.2p" opensslFile="openssl-$opensslVersion.tar.gz" opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" -opensslSha1="5f26a624479c51847ebd2f22bb9f84b3b44dcb44" +opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c" # Below target location has been hard coded into Coin. # QTQAINFRA-1195 |