mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-20 05:19:40 +08:00
Upgrade openssl version to 1.1.1s for IFW
Also remove unneeded android openssl scripts Task-number: QTIFW-2862 Change-Id: I34a400ab61c5320930ce8dceeb183b9e7f4eab1d Reviewed-by: Katja Marttila <katja.marttila@qt.io>
This commit is contained in:
Heikki Halmet
@@ -1,73 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2020 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script install OpenSSL from sources.
|
||||
# Requires GCC and Perl to be in PATH.
|
||||
set -ex
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
exports_file="/tmp/export.sh"
|
||||
# source previously made environmental variables.
|
||||
if uname -a |grep -q "Ubuntu"; then
|
||||
# shellcheck disable=SC1090
|
||||
grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file
|
||||
rm -rf "$exports_file"
|
||||
else
|
||||
# shellcheck disable=SC1090
|
||||
grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
|
||||
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"
|
||||
opensslHome="${HOME}/openssl/android/openssl-${version}"
|
||||
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
|
||||
mkdir -p "${HOME}/openssl/android/"
|
||||
tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
|
||||
|
||||
TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin
|
||||
cd "$opensslHome"
|
||||
PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
|
||||
PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
|
||||
|
||||
SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
|
||||
|
||||
echo "OpenSSL for Android = $version" >> ~/versions.txt
|
||||
@@ -41,12 +41,11 @@ os="$1"
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="1.1.1m"
|
||||
version="1.1.1s"
|
||||
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="39d424c4411e45f1570073d7a71b1830b96007ca"
|
||||
sha="d316e1523a609bbfc4ddd3abfa9861db99f17044"
|
||||
opensslHome="${HOME}/openssl-${version}"
|
||||
opensslSource="${opensslHome}-src"
|
||||
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
|
||||
|
||||
@@ -1,98 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2022 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see https://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at https://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 3 as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
## packaging of this file. Please review the following information to
|
||||
## ensure the GNU Lesser General Public License version 3 requirements
|
||||
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
##
|
||||
## GNU General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU
|
||||
## General Public License version 2.0 or (at your option) the GNU General
|
||||
## Public license version 3 or any later version approved by the KDE Free
|
||||
## Qt Foundation. The licenses are as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
## included in the packaging of this file. Please review the following
|
||||
## information to ensure the GNU General Public License requirements will
|
||||
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
## https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script install prebuilt OpenSSL which was built against Android NDK 21.
|
||||
# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
|
||||
|
||||
set -ex
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="1.1.1m"
|
||||
: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21
|
||||
# Source built requires GCC and Perl to be in PATH.
|
||||
exports_file="/tmp/export.sh"
|
||||
# source previously made environmental variables.
|
||||
if uname -a |grep -q "Ubuntu"; then
|
||||
# shellcheck disable=SC1090
|
||||
grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file
|
||||
rm -rf "$exports_file"
|
||||
else
|
||||
# shellcheck disable=SC1090
|
||||
grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
|
||||
rm -rf "$exports_file"
|
||||
fi
|
||||
|
||||
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="39d424c4411e45f1570073d7a71b1830b96007ca"
|
||||
opensslHome="${HOME}/openssl/android/openssl-${version}"
|
||||
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
|
||||
mkdir -p "${HOME}/openssl/android/"
|
||||
tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
|
||||
if uname -a |grep -q "Darwin"; then
|
||||
TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin
|
||||
else
|
||||
TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin
|
||||
fi
|
||||
cd "$opensslHome"
|
||||
PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
|
||||
PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
|
||||
'
|
||||
|
||||
if uname -a |grep -q "Darwin"; then
|
||||
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21_darwin.tar.gz"
|
||||
sha="d8c189f8a329263365c73bc471b6c9c68d117e3a"
|
||||
else
|
||||
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21.tar.gz"
|
||||
sha="db028f25ca4d000fe2317c3abfdfa0c234833549"
|
||||
fi
|
||||
targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
|
||||
DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
|
||||
tar -xzf "$targetFile" -C "${HOME}"
|
||||
|
||||
opensslHome="${HOME}/openssl/android/openssl-${version}"
|
||||
SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
|
||||
|
||||
echo "OpenSSL for Android = $version" >> ~/versions.txt
|
||||
@@ -1,102 +0,0 @@
|
||||
############################################################################
|
||||
##
|
||||
## Copyright (C) 2022 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# Requires: 7z, perl and msys
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
if (Is64BitWinHost) {
|
||||
$msys_bash = "C:\Utils\msys64\usr\bin\bash"
|
||||
} else {
|
||||
$msys_bash = "C:\Utils\msys32\usr\bin\bash"
|
||||
}
|
||||
|
||||
# OpenSSL need to be configured from sources for Android build in windows 7
|
||||
# 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.1m"
|
||||
$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
|
||||
$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-fixes-ndk_root-windows.zip")
|
||||
$sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
|
||||
$prebuilt_sha1 = "2bf5354b2264ed80e85fea3705ba434a38fe563e"
|
||||
$destination = "C:\Utils\openssl-android-master"
|
||||
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-fixes-ndk_root-windows.zip"
|
||||
|
||||
# msys unix style paths
|
||||
$ndkPath = "/c/Utils/Android/android-ndk-r20"
|
||||
$openssl_path = "/c/Utils/openssl-android-master"
|
||||
$cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
|
||||
|
||||
if ((Test-Path $prebuilt_url)) {
|
||||
Download $prebuilt_url $prebuilt_url $prebuilt_zip
|
||||
Verify-Checksum $prebuilt_zip $prebuilt_sha1
|
||||
Extract-7Zip $prebuilt_zip C:\Utils
|
||||
Remove $prebuilt_zip
|
||||
} else {
|
||||
# openssl-${version}_fixes-ndk_root.tar.gz package includes fixes from https://github.com/openssl/openssl/pull/17322 and string ANDROID_NDK_HOME is replaced with ANDROID_NDK_ROOT in Configurations/15-android.conf
|
||||
Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz $zip
|
||||
Verify-Checksum $zip $sha1
|
||||
Extract-7Zip $zip C:\Utils\tmp
|
||||
Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp
|
||||
Move-Item C:\Utils\tmp\openssl-${version} $destination
|
||||
Remove-Item -Path $zip
|
||||
|
||||
Write-Host "Configuring OpenSSL $version for Android..."
|
||||
Push-Location $destination
|
||||
# $ must be escaped in powershell...
|
||||
|
||||
function CheckExitCode {
|
||||
|
||||
param (
|
||||
$p
|
||||
)
|
||||
|
||||
if ($p.ExitCode) {
|
||||
Write-host "Process failed with exit code: $($p.ExitCode)"
|
||||
exit 1
|
||||
}
|
||||
}
|
||||
|
||||
$configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
|
||||
CheckExitCode $configure
|
||||
|
||||
$make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
|
||||
CheckExitCode $make
|
||||
|
||||
Pop-Location
|
||||
Remove-item C:\Utils\tmp -Recurse -Confirm:$false
|
||||
}
|
||||
|
||||
Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination"
|
||||
Write-Output "Android OpenSSL = $version" >> ~/versions.txt
|
||||
@@ -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_1m"
|
||||
$version = "1_1_1s"
|
||||
$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 = "16d83bd6d36be7b3ea85f822135352fa8f8d8134"
|
||||
$sha1 = "741bef779f3e88da4da0640d9372f576fe7902e8"
|
||||
|
||||
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 = "1d7146e56b201404ce67f1e636eab360211c175a"
|
||||
$sha1 = "a0cbe573244b4f9117e92abb27d8ceeadbd07c60"
|
||||
|
||||
Write-Host "Fetching from URL ..."
|
||||
Download $externalUrl $internalUrl $packagex86
|
||||
@@ -108,9 +108,8 @@ function InstallStaticOpenssl {
|
||||
Remove-Item -Path $static_openssl_package
|
||||
}
|
||||
|
||||
# opensslx86_static.7z is same package as opensslx86_static-1-1.1d
|
||||
InstallStaticOpenssl "opensslx86_static" "x86"
|
||||
InstallStaticOpenssl "opensslx64_static-1_1_1l_msvc2019" "x64"
|
||||
InstallStaticOpenssl "opensslx86_static-1_1_1s_msvc2015" "x86"
|
||||
InstallStaticOpenssl "opensslx64_static-1_1_1s_msvc2019" "x64"
|
||||
|
||||
|
||||
# Store version information to ~/versions.txt, which is used to print version information to provision log.
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set +e
|
||||
|
||||
# shellcheck disable=SC1091
|
||||
source /opt/rh/devtoolset-4/enable
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/openssl_for_android.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh"
|
||||
@@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/openssl_for_android.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\windows\android-openssl.ps1"
|
||||
Reference in New Issue
Block a user