mirror of
git://code.qt.io/qt/qt5.git
synced 2026-09-23 17:06:53 +08:00
coin: Bump the vcpkg OpenSSL override to 3.5.4
The manifest has pinned openssl to 3.0.7 port-version 2 sincea5a63931(Nov 2023), which was the version manual provisioning shipped at the time. Support for the OpenSSL 3.0 line ended on 2026-09-07, and manual provisioning has since moved to 3.5.4. qtgrpc is the only module that opts into vcpkg today, and it does link the vcpkg copy: the qtgrpc_standalone_tests configure reports OpenSSL 3.0.7 out of installed/<triplet> on Linux, Windows and macOS, and grpc_testserver, tst_grpc_client_end2end and tst_grpc_client_interceptors link it. So the stale pin is live, not dormant. Pin 3.5.4 port-version 0 rather than dropping the override: it matches install-openssl.sh and openssl.ps1 exactly, and 3.5 is an LTS release whereas the registry baseline 3.6.3 is not. The port exists at the registry tag we already pin, so vcpkg_version.txt stays untouched. Request the "tools" feature at the same time. 3.0.7 installed the openssl executable unconditionally; 3.5.4 puts it behind that feature, which is not enabled by default. qtgrpc's test_server does find_program(openssl) to regenerate its TLS test certificates and only warns when the executable is missing, leaving the TLS tests to fail later on absent key.pem and cert.pem. Building the tool alongside the libraries keeps the CLI and the linked library at the same version and drops a hidden dependency on manually provisioned OpenSSL being on PATH, which is what we want to retire. The feature is scoped to non-Android, because vcpkg puts the target triplet's tools directory on CMAKE_PROGRAM_PATH. A cross-built openssl there would be picked up by find_program and fail to run on the host, which is the same trap as QTBUG-145933 for protoc. Android keeps the plain port; the certificates are generated by the host tool anyway. Task-number: QTBUG-115715 Change-Id: I3b36677837fae3080e9362526bd35012e31fc04e Reviewed-by: Alexandru Croitor <[email protected]> (cherry picked from commitf1632a6b40) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
This commit is contained in:
committed by
Qt Cherry-pick Bot
parent
2813c524e1
commit
886d5aa1a0
@@ -2,14 +2,19 @@
|
||||
"overrides": [
|
||||
{
|
||||
"name": "openssl",
|
||||
"version": "3.0.7",
|
||||
"port-version": 2
|
||||
"version": "3.5.4",
|
||||
"port-version": 0
|
||||
}
|
||||
],
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "openssl",
|
||||
"platform": "!ohos"
|
||||
"platform": "!ohos & !android",
|
||||
"features": [ "tools" ]
|
||||
},
|
||||
{
|
||||
"name": "openssl",
|
||||
"platform": "android"
|
||||
},
|
||||
{
|
||||
"name": "protobuf",
|
||||
|
||||
Reference in New Issue
Block a user