From b49da2c52c936e777759db6e1636db214d54365c Mon Sep 17 00:00:00 2001 From: Alex Seaton Date: Thu, 4 Jun 2026 14:40:53 +0100 Subject: [PATCH 1/2] Upgrade aws-sdk-cpp 1.11.474 -> 1.11.820 Bump the AWS SDK and its CRT dependency stack to the latest versions resolvable from vcpkg. This advances the vcpkg submodule and builtin-baseline together (bb14c5ab24 -> cea592f477) because vcpkg resolves dependency versions against the commit named by builtin-baseline, not the submodule working tree; the override versions for aws-crt-cpp and the aws-c-* libraries only exist in the newer version database. Overrides updated to the CRT set that aws-sdk-cpp 1.11.820 bundles as submodules (crt-cpp 0.39.1, aws-c-common 0.13.1, aws-c-io 0.26.3, aws-c-s3 0.12.4, aws-c-http 0.11.0, aws-c-auth 0.10.3, aws-c-cal 0.9.14, aws-c-mqtt 0.15.2, aws-c-event-stream 0.7.1, aws-c-sdkutils 0.2.4, aws-checksums 0.2.10), keeping our pins aligned with the versions AWS tested together. The overlay vcpkg.json was regenerated from the 1.11.820 source (435 service features, up from 414) and the portfile SHA512 updated to the 1.11.820 tarball (verified against the upstream vcpkg port hash and a direct download). Patch changes ------------- Removed fix-refresh.patch. It changed RefreshIfExpired() in STSProfileCredentialsProvider.cpp from "||" to "&&" so a non-expired credential would not be refreshed merely because the reload interval had elapsed. Upstream has since adopted exactly this logic and gone further: 1.11.820 reads "!IsTimeToRefresh(...) && !m_credentials.IsEmpty() && !m_credentials.ExpiresSoon(...)". The fix is upstream, and the patch's context lines no longer exist, so it would fail to apply. Removed fix-win-https-conn.patch (Windows only). It dropped the "&& m_verifySSL" guard in WinHttpSyncHttpClient::OpenRequest so HTTPS requests always set WINHTTP_FLAG_SECURE regardless of verifySSL. 1.11.820 already sets the flag unconditionally for HTTPS ("if (scheme == HTTPS) requestFlags |= WINHTTP_FLAG_SECURE;"), so the patch is redundant and, again, no longer applies to the refactored code. Added configure-binary-dir.patch (symlinked from the upstream vcpkg port, aws/aws-sdk-cpp#3459). 1.11.820 generates VersionConfig.h and SDKConfig.h into the source tree during configure; the patch redirects them to the binary dir and reads the version from the VERSION file. This is part of upstream's own patch list for 1.11.820 and is required to build against a read-only source tree. The >=1.11.486 default data-integrity (checksum) behaviour change that previously blocked this upgrade is already neutralised in s3_storage.hpp::configure_s3_checksum_validation, which forces when_required unless the user opts in; the override note is updated to record this. Other dependencies without explicit overrides move to the new baseline (e.g. boost 1.91.0, curl 8.20.0). vcpkg dry-run confirms the full plan resolves and selects aws-sdk-cpp 1.11.820 with [s3, identity-management, sts, cognito-identity, core]. --- .../aws-sdk-cpp/configure-binary-dir.patch | 1 + .../aws-sdk-cpp/fix-refresh.patch | 20 --- .../aws-sdk-cpp/fix-win-https-conn.patch | 13 -- .../vcpkg_overlays/aws-sdk-cpp/portfile.cmake | 5 +- .../vcpkg_overlays/aws-sdk-cpp/vcpkg.in.json | 2 +- .../vcpkg_overlays/aws-sdk-cpp/vcpkg.json | 165 ++++++++++++------ cpp/vcpkg | 2 +- cpp/vcpkg.json | 28 +-- 8 files changed, 133 insertions(+), 103 deletions(-) create mode 120000 cpp/third_party/vcpkg_overlays/aws-sdk-cpp/configure-binary-dir.patch delete mode 100644 cpp/third_party/vcpkg_overlays/aws-sdk-cpp/fix-refresh.patch delete mode 100644 cpp/third_party/vcpkg_overlays/aws-sdk-cpp/fix-win-https-conn.patch diff --git a/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/configure-binary-dir.patch b/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/configure-binary-dir.patch new file mode 120000 index 00000000000..ac1c8348678 --- /dev/null +++ b/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/configure-binary-dir.patch @@ -0,0 +1 @@ +../../../vcpkg/ports/aws-sdk-cpp/configure-binary-dir.patch \ No newline at end of file diff --git a/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/fix-refresh.patch b/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/fix-refresh.patch deleted file mode 100644 index 7e6f1cf298f..00000000000 --- a/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/fix-refresh.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/aws-cpp-sdk-identity-management/source/auth/STSProfileCredentialsProvider.cpp b/src/aws-cpp-sdk-identity-management/source/auth/STSProfileCredentialsProvider.cpp -index fd82b678fba..9fd0537e217 100644 ---- a/src/aws-cpp-sdk-identity-management/source/auth/STSProfileCredentialsProvider.cpp -+++ b/src/aws-cpp-sdk-identity-management/source/auth/STSProfileCredentialsProvider.cpp -@@ -45,13 +45,13 @@ AWSCredentials STSProfileCredentialsProvider::GetAWSCredentials() - void STSProfileCredentialsProvider::RefreshIfExpired() - { - Utils::Threading::ReaderLockGuard guard(m_reloadLock); -- if (!IsTimeToRefresh(static_cast(m_reloadFrequency.count())) || !m_credentials.IsExpiredOrEmpty()) -+ if (!IsTimeToRefresh(static_cast(m_reloadFrequency.count())) && !m_credentials.IsExpiredOrEmpty()) - { - return; - } - - guard.UpgradeToWriterLock(); -- if (!IsTimeToRefresh(static_cast(m_reloadFrequency.count())) || !m_credentials.IsExpiredOrEmpty()) // double-checked lock to avoid refreshing twice -+ if (!IsTimeToRefresh(static_cast(m_reloadFrequency.count())) && !m_credentials.IsExpiredOrEmpty()) // double-checked lock to avoid refreshing twice - { - return; - } diff --git a/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/fix-win-https-conn.patch b/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/fix-win-https-conn.patch deleted file mode 100644 index b282d28abab..00000000000 --- a/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/fix-win-https-conn.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp b/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp -index 9c82caa6811..2d91cc0da32 100644 ---- a/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp -+++ b/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp -@@ -533,7 +533,7 @@ void* WinHttpSyncHttpClient::OpenRequest(const std::shared_ptr& req - { - LPCWSTR accept[2] = { nullptr, nullptr }; - -- DWORD requestFlags = request->GetUri().GetScheme() == Scheme::HTTPS && m_verifySSL ? WINHTTP_FLAG_SECURE : 0; -+ DWORD requestFlags = request->GetUri().GetScheme() == Scheme::HTTPS ? WINHTTP_FLAG_SECURE : 0; - if (m_usingProxy) { - // Avoid force adding "Cache-Control: no-cache" header. - requestFlags |= WINHTTP_FLAG_REFRESH; diff --git a/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/portfile.cmake b/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/portfile.cmake index 1f6543d389d..fd5f624935f 100644 --- a/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/portfile.cmake +++ b/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/portfile.cmake @@ -4,14 +4,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp REF "${VERSION}" - SHA512 f81b0afd9c3bb6e8181c6edc04de9b83af8a17e5bdf993e68fc00abc07980fadbe9e6b98635632cb96ed62c9b2753771f9cf6d91088d6ab42f409eec5d136faa + SHA512 976cf53e9b15d555656474de8d58429b17bd8083ace1003f2f056fdc21732f6fd0a309ff6b3498b5f3675d011e447575387f1e00a05a0ae3487d8f7ad26e5bba PATCHES fix-aws-root.patch lock-curl-http-and-tls-settings.patch fix_find_curl.patch find-dependency.patch - fix-refresh.patch - fix-win-https-conn.patch + configure-binary-dir.patch # https://github.com/aws/aws-sdk-cpp/pull/3459 ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) diff --git a/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/vcpkg.in.json b/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/vcpkg.in.json index e62791117ad..dd584a01ccd 100644 --- a/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/vcpkg.in.json +++ b/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/vcpkg.in.json @@ -1,6 +1,6 @@ { "name": "aws-sdk-cpp", - "version": "1.11.474", + "version": "1.11.820", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", diff --git a/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/vcpkg.json b/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/vcpkg.json index 2ca1eff1d6e..7eebf88bc06 100644 --- a/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/vcpkg.json +++ b/cpp/third_party/vcpkg_overlays/aws-sdk-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$note": "Automatically generated by generateFeatures.ps1 from vcpkg.in.json, do not edit manually", "name": "aws-sdk-cpp", - "version": "1.11.474", + "version": "1.11.820", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", @@ -60,6 +60,9 @@ "acm-pca": { "description": "C++ SDK for the AWS acm-pca service" }, + "aiops": { + "description": "C++ SDK for the AWS aiops service" + }, "amp": { "description": "C++ SDK for the AWS amp service" }, @@ -120,8 +123,8 @@ "appsync": { "description": "C++ SDK for the AWS appsync service" }, - "apptest": { - "description": "C++ SDK for the AWS apptest service" + "arc-region-switch": { + "description": "C++ SDK for the AWS arc-region-switch service" }, "arc-zonal-shift": { "description": "C++ SDK for the AWS arc-zonal-shift service" @@ -162,12 +165,18 @@ "batch": { "description": "C++ SDK for the AWS batch service" }, + "bcm-dashboards": { + "description": "C++ SDK for the AWS bcm-dashboards service" + }, "bcm-data-exports": { "description": "C++ SDK for the AWS bcm-data-exports service" }, "bcm-pricing-calculator": { "description": "C++ SDK for the AWS bcm-pricing-calculator service" }, + "bcm-recommended-actions": { + "description": "C++ SDK for the AWS bcm-recommended-actions service" + }, "bedrock": { "description": "C++ SDK for the AWS bedrock service" }, @@ -177,6 +186,12 @@ "bedrock-agent-runtime": { "description": "C++ SDK for the AWS bedrock-agent-runtime service" }, + "bedrock-agentcore": { + "description": "C++ SDK for the AWS bedrock-agentcore service" + }, + "bedrock-agentcore-control": { + "description": "C++ SDK for the AWS bedrock-agentcore-control service" + }, "bedrock-data-automation": { "description": "C++ SDK for the AWS bedrock-data-automation service" }, @@ -318,6 +333,9 @@ "compute-optimizer": { "description": "C++ SDK for the AWS compute-optimizer service" }, + "compute-optimizer-automation": { + "description": "C++ SDK for the AWS compute-optimizer-automation service" + }, "config": { "description": "C++ SDK for the AWS config service" }, @@ -336,6 +354,9 @@ "connectcases": { "description": "C++ SDK for the AWS connectcases service" }, + "connecthealth": { + "description": "C++ SDK for the AWS connecthealth service" + }, "connectparticipant": { "description": "C++ SDK for the AWS connectparticipant service" }, @@ -381,6 +402,9 @@ "devicefarm": { "description": "C++ SDK for the AWS devicefarm service" }, + "devops-agent": { + "description": "C++ SDK for the AWS devops-agent service" + }, "devops-guru": { "description": "C++ SDK for the AWS devops-guru service" }, @@ -444,9 +468,6 @@ "eks-auth": { "description": "C++ SDK for the AWS eks-auth service" }, - "elastic-inference": { - "description": "C++ SDK for the AWS elastic-inference service" - }, "elasticache": { "description": "C++ SDK for the AWS elasticache service" }, @@ -465,8 +486,8 @@ "elasticmapreduce": { "description": "C++ SDK for the AWS elasticmapreduce service" }, - "elastictranscoder": { - "description": "C++ SDK for the AWS elastictranscoder service" + "elementalinference": { + "description": "C++ SDK for the AWS elementalinference service" }, "email": { "description": "C++ SDK for the AWS email service" @@ -489,8 +510,8 @@ "events": { "description": "C++ SDK for the AWS events service" }, - "evidently": { - "description": "C++ SDK for the AWS evidently service" + "evs": { + "description": "C++ SDK for the AWS evs service" }, "finspace": { "description": "C++ SDK for the AWS finspace service" @@ -525,6 +546,9 @@ "gamelift": { "description": "C++ SDK for the AWS gamelift service" }, + "gameliftstreams": { + "description": "C++ SDK for the AWS gameliftstreams service" + }, "geo-maps": { "description": "C++ SDK for the AWS geo-maps service" }, @@ -598,6 +622,9 @@ "inspector2": { "description": "C++ SDK for the AWS inspector2 service" }, + "interconnect": { + "description": "C++ SDK for the AWS interconnect service" + }, "internetmonitor": { "description": "C++ SDK for the AWS internetmonitor service" }, @@ -613,14 +640,8 @@ "iot-jobs-data": { "description": "C++ SDK for the AWS iot-jobs-data service" }, - "iot1click-devices": { - "description": "C++ SDK for the AWS iot1click-devices service" - }, - "iot1click-projects": { - "description": "C++ SDK for the AWS iot1click-projects service" - }, - "iotanalytics": { - "description": "C++ SDK for the AWS iotanalytics service" + "iot-managed-integrations": { + "description": "C++ SDK for the AWS iot-managed-integrations service" }, "iotdeviceadvisor": { "description": "C++ SDK for the AWS iotdeviceadvisor service" @@ -631,9 +652,6 @@ "iotevents-data": { "description": "C++ SDK for the AWS iotevents-data service" }, - "iotfleethub": { - "description": "C++ SDK for the AWS iotfleethub service" - }, "iotfleetwise": { "description": "C++ SDK for the AWS iotfleetwise service" }, @@ -676,6 +694,9 @@ "keyspaces": { "description": "C++ SDK for the AWS keyspaces service" }, + "keyspacesstreams": { + "description": "C++ SDK for the AWS keyspacesstreams service" + }, "kinesis": { "description": "C++ SDK for the AWS kinesis service" }, @@ -745,12 +766,6 @@ "lookoutequipment": { "description": "C++ SDK for the AWS lookoutequipment service" }, - "lookoutmetrics": { - "description": "C++ SDK for the AWS lookoutmetrics service" - }, - "lookoutvision": { - "description": "C++ SDK for the AWS lookoutvision service" - }, "m2": { "description": "C++ SDK for the AWS m2 service" }, @@ -778,6 +793,9 @@ "marketplace-deployment": { "description": "C++ SDK for the AWS marketplace-deployment service" }, + "marketplace-discovery": { + "description": "C++ SDK for the AWS marketplace-discovery service" + }, "marketplace-entitlement": { "description": "C++ SDK for the AWS marketplace-entitlement service" }, @@ -841,6 +859,9 @@ "monitoring": { "description": "C++ SDK for the AWS monitoring service" }, + "mpa": { + "description": "C++ SDK for the AWS mpa service" + }, "mq": { "description": "C++ SDK for the AWS mq service" }, @@ -850,6 +871,9 @@ "mwaa": { "description": "C++ SDK for the AWS mwaa service" }, + "mwaa-serverless": { + "description": "C++ SDK for the AWS mwaa-serverless service" + }, "neptune": { "description": "C++ SDK for the AWS neptune service" }, @@ -877,12 +901,18 @@ "notificationscontacts": { "description": "C++ SDK for the AWS notificationscontacts service" }, + "nova-act": { + "description": "C++ SDK for the AWS nova-act service" + }, "oam": { "description": "C++ SDK for the AWS oam service" }, "observabilityadmin": { "description": "C++ SDK for the AWS observabilityadmin service" }, + "odb": { + "description": "C++ SDK for the AWS odb service" + }, "omics": { "description": "C++ SDK for the AWS omics service" }, @@ -892,12 +922,6 @@ "opensearchserverless": { "description": "C++ SDK for the AWS opensearchserverless service" }, - "opsworks": { - "description": "C++ SDK for the AWS opsworks service" - }, - "opsworkscm": { - "description": "C++ SDK for the AWS opsworkscm service" - }, "organizations": { "description": "C++ SDK for the AWS organizations service" }, @@ -910,6 +934,15 @@ "panorama": { "description": "C++ SDK for the AWS panorama service" }, + "partnercentral-account": { + "description": "C++ SDK for the AWS partnercentral-account service" + }, + "partnercentral-benefits": { + "description": "C++ SDK for the AWS partnercentral-benefits service" + }, + "partnercentral-channel": { + "description": "C++ SDK for the AWS partnercentral-channel service" + }, "partnercentral-selling": { "description": "C++ SDK for the AWS partnercentral-selling service" }, @@ -958,9 +991,6 @@ "pricing": { "description": "C++ SDK for the AWS pricing service" }, - "privatenetworks": { - "description": "C++ SDK for the AWS privatenetworks service" - }, "proton": { "description": "C++ SDK for the AWS proton service" }, @@ -973,12 +1003,6 @@ "qconnect": { "description": "C++ SDK for the AWS qconnect service" }, - "qldb": { - "description": "C++ SDK for the AWS qldb service" - }, - "qldb-session": { - "description": "C++ SDK for the AWS qldb-session service" - }, "queues": { "description": "C++ SDK for the AWS queues service", "dependencies": [ @@ -1024,6 +1048,9 @@ "resiliencehub": { "description": "C++ SDK for the AWS resiliencehub service" }, + "resiliencehubv2": { + "description": "C++ SDK for the AWS resiliencehubv2 service" + }, "resource-explorer-2": { "description": "C++ SDK for the AWS resource-explorer-2 service" }, @@ -1033,9 +1060,6 @@ "resourcegroupstaggingapi": { "description": "C++ SDK for the AWS resourcegroupstaggingapi service" }, - "robomaker": { - "description": "C++ SDK for the AWS robomaker service" - }, "rolesanywhere": { "description": "C++ SDK for the AWS rolesanywhere service" }, @@ -1054,12 +1078,18 @@ "route53domains": { "description": "C++ SDK for the AWS route53domains service" }, + "route53globalresolver": { + "description": "C++ SDK for the AWS route53globalresolver service" + }, "route53profiles": { "description": "C++ SDK for the AWS route53profiles service" }, "route53resolver": { "description": "C++ SDK for the AWS route53resolver service" }, + "rtbfabric": { + "description": "C++ SDK for the AWS rtbfabric service" + }, "rum": { "description": "C++ SDK for the AWS rum service" }, @@ -1085,12 +1115,18 @@ "s3control": { "description": "C++ SDK for the AWS s3control service" }, + "s3files": { + "description": "C++ SDK for the AWS s3files service" + }, "s3outposts": { "description": "C++ SDK for the AWS s3outposts service" }, "s3tables": { "description": "C++ SDK for the AWS s3tables service" }, + "s3vectors": { + "description": "C++ SDK for the AWS s3vectors service" + }, "sagemaker": { "description": "C++ SDK for the AWS sagemaker service" }, @@ -1112,6 +1148,12 @@ "sagemaker-runtime": { "description": "C++ SDK for the AWS sagemaker-runtime service" }, + "sagemaker-runtime-http2": { + "description": "C++ SDK for the AWS sagemaker-runtime-http2 service" + }, + "sagemakerjobruntime": { + "description": "C++ SDK for the AWS sagemakerjobruntime service" + }, "savingsplans": { "description": "C++ SDK for the AWS savingsplans service" }, @@ -1130,6 +1172,9 @@ "security-ir": { "description": "C++ SDK for the AWS security-ir service" }, + "securityagent": { + "description": "C++ SDK for the AWS securityagent service" + }, "securityhub": { "description": "C++ SDK for the AWS securityhub service" }, @@ -1160,12 +1205,18 @@ "signer": { "description": "C++ SDK for the AWS signer service" }, + "signer-data": { + "description": "C++ SDK for the AWS signer-data service" + }, + "signin": { + "description": "C++ SDK for the AWS signin service" + }, + "simpledbv2": { + "description": "C++ SDK for the AWS simpledbv2 service" + }, "simspaceweaver": { "description": "C++ SDK for the AWS simspaceweaver service" }, - "sms": { - "description": "C++ SDK for the AWS sms service" - }, "sms-voice": { "description": "C++ SDK for the AWS sms-voice service" }, @@ -1190,6 +1241,9 @@ "ssm-contacts": { "description": "C++ SDK for the AWS ssm-contacts service" }, + "ssm-guiconnect": { + "description": "C++ SDK for the AWS ssm-guiconnect service" + }, "ssm-incidents": { "description": "C++ SDK for the AWS ssm-incidents service" }, @@ -1226,6 +1280,9 @@ "support-app": { "description": "C++ SDK for the AWS support-app service" }, + "sustainability": { + "description": "C++ SDK for the AWS sustainability service" + }, "swf": { "description": "C++ SDK for the AWS swf service" }, @@ -1286,6 +1343,9 @@ "trustedadvisor": { "description": "C++ SDK for the AWS trustedadvisor service" }, + "uxc": { + "description": "C++ SDK for the AWS uxc service" + }, "verifiedpermissions": { "description": "C++ SDK for the AWS verifiedpermissions service" }, @@ -1307,15 +1367,15 @@ "wellarchitected": { "description": "C++ SDK for the AWS wellarchitected service" }, + "wickr": { + "description": "C++ SDK for the AWS wickr service" + }, "wisdom": { "description": "C++ SDK for the AWS wisdom service" }, "workdocs": { "description": "C++ SDK for the AWS workdocs service" }, - "worklink": { - "description": "C++ SDK for the AWS worklink service" - }, "workmail": { "description": "C++ SDK for the AWS workmail service" }, @@ -1325,6 +1385,9 @@ "workspaces": { "description": "C++ SDK for the AWS workspaces service" }, + "workspaces-instances": { + "description": "C++ SDK for the AWS workspaces-instances service" + }, "workspaces-thin-client": { "description": "C++ SDK for the AWS workspaces-thin-client service" }, diff --git a/cpp/vcpkg b/cpp/vcpkg index bb14c5ab24c..cea592f4772 160000 --- a/cpp/vcpkg +++ b/cpp/vcpkg @@ -1 +1 @@ -Subproject commit bb14c5ab24c8d4de66092ad655d45f17a38aa1d5 +Subproject commit cea592f4772491abdb7c483387a59ea89889f4be diff --git a/cpp/vcpkg.json b/cpp/vcpkg.json index f3b3bf5f2f7..7853f9b62fa 100644 --- a/cpp/vcpkg.json +++ b/cpp/vcpkg.json @@ -86,18 +86,18 @@ { "name": "openssl", "version-string": "3.3.0" }, { "name": "arcticdb-sparrow", "version": "2.4.0" }, { "name": "arrow", "version": "21.0.0#2" }, - { "name": "aws-sdk-cpp", "version": "1.11.474", "$note": "Update overlay json to upgrade; Upgrade to >=1.11.486 blocked by default integrity change" }, - { "name": "aws-crt-cpp", "version": "0.29.7" }, - { "name": "aws-c-mqtt", "version": "0.11.0" }, - { "name": "aws-c-s3", "version": "0.6.6" }, - { "name": "aws-c-io", "version": "0.14.18" }, - { "name": "aws-c-common", "version": "0.9.28" }, - { "name": "aws-c-auth", "version": "0.7.31" }, - { "name": "aws-c-cal", "version": "0.7.4" }, - { "name": "aws-c-http", "version": "0.8.10" }, - { "name": "aws-c-sdkutils", "version": "0.1.19" }, - { "name": "aws-c-event-stream", "version": "0.4.3" }, - { "name": "aws-checksums", "version": "0.1.20" }, + { "name": "aws-sdk-cpp", "version": "1.11.820", "$note": "Update overlay json to upgrade." }, + { "name": "aws-crt-cpp", "version": "0.39.1" }, + { "name": "aws-c-mqtt", "version": "0.15.2" }, + { "name": "aws-c-s3", "version": "0.12.4" }, + { "name": "aws-c-io", "version": "0.26.3" }, + { "name": "aws-c-common", "version": "0.13.1" }, + { "name": "aws-c-auth", "version": "0.10.3" }, + { "name": "aws-c-cal", "version": "0.9.14" }, + { "name": "aws-c-http", "version": "0.11.0" }, + { "name": "aws-c-sdkutils", "version": "0.2.4" }, + { "name": "aws-c-event-stream", "version": "0.7.1" }, + { "name": "aws-checksums", "version": "0.2.10" }, { "name": "azure-core-cpp", "version": "1.12.0" }, { "name": "azure-identity-cpp", "version": "1.6.0" }, { "name": "benchmark", "version": "1.9.0" }, @@ -116,7 +116,7 @@ { "name": "prometheus-cpp", "version": "1.1.0" }, { "name": "protobuf", "version": "3.21.8" }, { "name": "rapidcheck", "version": "2023-12-14" }, - { "name": "s2n", "version": "1.3.5" }, + { "name": "s2n", "version": "1.7.3" }, { "name": "spdlog", "version": "1.13.0" }, { "name": "xxhash", "version": "0.8.2" }, { "name": "zlib", "version": "1.3.1" }, @@ -126,5 +126,5 @@ "overlay-ports": ["third_party/vcpkg_overlays"] }, "$note on builtin-baseline": "Remember to regenerate third_party/vcpkg_overlays", - "builtin-baseline": "bb14c5ab24c8d4de66092ad655d45f17a38aa1d5" + "builtin-baseline": "cea592f4772491abdb7c483387a59ea89889f4be" } From cf0e65903a812decac01dc7c754460563ab8485f Mon Sep 17 00:00:00 2001 From: Alex Seaton Date: Thu, 4 Jun 2026 20:56:43 +0100 Subject: [PATCH 2/2] Pin thrift to 0.22.0#2 The aws-sdk-cpp baseline bump floated thrift (a transitive dependency of the pinned arrow) from 0.22.0 to 0.23.0. thrift 0.23.0 builds locally but fails to compile in the manylinux CI wheel-build container. Pin it back to 0.22.0#2, the version arrow 21.0.0#2 was tested against, which is still present in the new baseline version database. --- cpp/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/vcpkg.json b/cpp/vcpkg.json index 7853f9b62fa..0308cc7d03e 100644 --- a/cpp/vcpkg.json +++ b/cpp/vcpkg.json @@ -118,6 +118,7 @@ { "name": "rapidcheck", "version": "2023-12-14" }, { "name": "s2n", "version": "1.7.3" }, { "name": "spdlog", "version": "1.13.0" }, + { "name": "thrift", "version": "0.22.0#2" }, { "name": "xxhash", "version": "0.8.2" }, { "name": "zlib", "version": "1.3.1" }, { "name": "zstd", "version": "1.5.2" }