diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2021-05-03 11:15:21 +0000 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2021-05-03 11:15:21 +0000 |
commit | eb25e0b28c9643cc6ec489936ad157d8b1f150e4 (patch) | |
tree | 13f8fd60958bbe26d4aa40ebf44771d799412534 | |
parent | 2056c2a87c924a75ef1045de1cc60fede14902dc (diff) | |
parent | 306b5e224bf5692af10f3514a4cef1bef5da4e9e (diff) |
Merge branch 6.0 into pyside6.0
Change-Id: I13f8fd60958bbe26d4aa40ebf44771d799412534
-rwxr-xr-x | coin/provisioning/common/linux/openssl_for_android_linux.sh | 4 | ||||
-rwxr-xr-x | coin/provisioning/common/unix/install-openssl.sh | 6 | ||||
-rw-r--r-- | coin/provisioning/common/windows/android-openssl.ps1 | 6 | ||||
-rw-r--r-- | coin/provisioning/common/windows/openssl.ps1 | 8 | ||||
-rw-r--r-- | coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-install-gcc-toolset.sh (renamed from coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh) | 0 |
5 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 65e3b022..29ed82f8 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -41,6 +41,7 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +version="1.1.1k" exports_file="/tmp/export.sh" # source previously made environmental variables. if uname -a |grep -q "Ubuntu"; then @@ -53,11 +54,10 @@ else rm -rf "$exports_file" fi -version="1.1.1g" 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="b213a293f2127ec3e323fb3cfc0c9807664fd997" +sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b" opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" mkdir -p "${HOME}/openssl/android/" diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index 75b7edbc..df82beeb 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.1.1g" +version="1.1.1k" 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="b213a293f2127ec3e323fb3cfc0c9807664fd997" +sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b" opensslHome="${HOME}/openssl-${version}" opensslSource="${opensslHome}-src" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 14d9af28..d2fa74f2 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -45,11 +45,11 @@ if (Is64BitWinHost) { # 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.1.1g" +$version = "1.1.1k" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") $prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip") -$sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997" -$prebuilt_sha1 = "d799f54e402c00eaa2633d54df1e8295bfac3d7b" +$sha1 = "bad9dc4ae6dcc1855085463099b5dacb0ec6130b" +$prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945" $destination = "C:\Utils\openssl-android-master" $prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip" diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 08f7d60f..b7abf11c 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -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_1_1g" +$version = "1_1_1k" $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" @@ -47,7 +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 = "7643561c372720f55de51454a707ede334db086e" + $sha1 = "ab5367a1f46a3779a870fe2c1a99e03f8ffa3041" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -74,7 +74,7 @@ if (Is64BitWinHost) { $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "c7d4b096c2413d1af819ccb291214fa3c4cece07" +$sha1 = "49f5b7fe01d686f706071c9a00d19bd69f2e7371" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-install-gcc-toolset.sh index 54b9d774..54b9d774 100644 --- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-install-gcc-toolset.sh |