[aws-*,s2n] Update ports to their latest versions and support Windows…

… on ARM64. (#42698)
microsoft · Dec 16, 2024 · 6a1fccc · 6a1fccc
1 parent e7a608f
commit 6a1fccc
Show file tree

Hide file tree

Showing 45 changed files with 191 additions and 72 deletions.
diff --git a/ports/aws-c-auth/portfile.cmake b/ports/aws-c-auth/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-auth
     REF "v${VERSION}"
-    SHA512 1847b7790590cf079785c4fb98fbcde9988cbc68254d18904a8676802bf96168e7038799642d4b67b834c6c772b7a35c6e7f7d35b93438cb9c0ceac9130e31ad
+    SHA512 8c2b2230d694005d6e8e0245b3bf1c3a623f2bea6f2b854e6cabebf00652af120bf05961b2c18625226d2ede2e07485c5e0a35f8c929cc142af440579d84cc60
     HEAD_REF master
 )
 

diff --git a/ports/aws-c-auth/vcpkg.json b/ports/aws-c-auth/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "aws-c-auth",
-  "version": "0.7.31",
+  "version": "0.8.0",
   "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.",
   "homepage": "https://github.com/awslabs/aws-c-auth",
   "license": "Apache-2.0",
-  "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-c-cal",
     "aws-c-http",

diff --git a/ports/aws-c-cal/portfile.cmake b/ports/aws-c-cal/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-cal
     REF "v${VERSION}"
-    SHA512 7c0fa1fe976e7b432b5126792bd1fad94cf5bacffb4e9a5e374e173f617722431bea880b6026c2c664372399635cbf9f129b6ad48c9aca7c087fb6f94fb81837
+    SHA512 c601a00f5e21bf42bd8e44787182be3805b90ab9c8a23025bed5acac602718548e6236106891b336c4ea81f68a26c3f0a5d33e090246b670efe53229df1fca90
     HEAD_REF master
     PATCHES remove-libcrypto-messages.patch
 )

diff --git a/ports/aws-c-cal/vcpkg.json b/ports/aws-c-cal/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "aws-c-cal",
-  "version": "0.7.4",
+  "version": "0.8.1",
   "description": "C99 wrapper for cryptography primitives.",
   "homepage": "https://github.com/awslabs/aws-c-cal",
   "license": "Apache-2.0",
-  "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-c-common",
     {

diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-common
     REF "v${VERSION}"
-    SHA512 482bfeb5c7dac16486236417af0f5c0a20bc36c271aaf32088d188186861d61bf0b96c5da13a1c88853fdc6a1fb8b8db254a547c3648a659ec6e91177978dc9b
+    SHA512 5ec579dca53a0b5dc8ceac4ef65d1ee5dd76e585f10b7bab14e5c668c001516d48fb0669e2d909d665af665ba1429e5a87e15d7dc784fd3796455531af7b3762
     HEAD_REF master
     PATCHES
         disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow

diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "aws-c-common",
-  "version": "0.9.30",
+  "version": "0.10.6",
   "description": "AWS common library for C",
   "homepage": "https://github.com/awslabs/aws-c-common",
   "license": "Apache-2.0",
-  "supports": "!(windows & arm) & !uwp",
+  "supports": "!(windows & arm32) & !uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/ports/aws-c-compression/portfile.cmake b/ports/aws-c-compression/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-compression
     REF "v${VERSION}"
-    SHA512 8af6b6ff78fbcb37bf858d0b56cb371974742aa769f08581d0efb6262b93f5c01203b6fcce7f3e9d78c915379d2c75e0c677a374793d8cdd1302961c7299553d
+    SHA512 aae2031c22a5d716eb5be274eba7c49a4f4fb322b42d3709a7bf5cd64188b26a0938ef9b0b8e21f4e0cb8d236b4903605a78ddb76221a255d46ac57c5164402c
     HEAD_REF master
 )
 

diff --git a/ports/aws-c-compression/vcpkg.json b/ports/aws-c-compression/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "aws-c-compression",
-  "version": "0.2.19",
+  "version": "0.3.0",
   "description": "C99 implementation of huffman encoding/decoding",
   "homepage": "https://github.com/awslabs/aws-c-compression",
   "license": "Apache-2.0",
-  "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-c-common",
     {

diff --git a/ports/aws-c-event-stream/portfile.cmake b/ports/aws-c-event-stream/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-event-stream
     REF "v${VERSION}"
-    SHA512 522ddc326dfc1865664727a48bcef041ecd3aa40a1fe8e680055059796a31d606a126ed73d8953b77935306ac26e162cc901b813b1ae3ba816a33122f2abc6ce
+    SHA512 0ef4b45e84eb014a392ca5eb4e701999cc294a36d3330036be587ec34d41efc30413f3e6fa829bd9da4ca595db64b4bf9c3df53efd47a14ebf70ed00b3a6dbc0
     HEAD_REF master
 )
 

diff --git a/ports/aws-c-event-stream/vcpkg.json b/ports/aws-c-event-stream/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "aws-c-event-stream",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "description": "C99 implementation of the vnd.amazon.event-stream content-type.",
   "homepage": "https://github.com/awslabs/aws-c-event-stream",
   "license": "Apache-2.0",
-  "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-c-common",
     "aws-c-io",

diff --git a/ports/aws-c-http/portfile.cmake b/ports/aws-c-http/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-http
     REF "v${VERSION}"
-    SHA512 32b7e83ddae5997771136a5c7a6a7890b8cfa7f8808961e108e1519a9b85a39cccc4f0435526cebd3950607d530b6eb1645692dad4677b5f81f73dcc23ce5be0
+    SHA512 9989b8a0cd10e4f96aa4a3c5e6072aa61d2d4851f1caffb86ff0754f89ad11b2aee3d522fe844ab43120a8006d6aa5ee2f7b74bfc3dd9e46160dabd67daf91e5
     HEAD_REF master
 )
 

diff --git a/ports/aws-c-http/vcpkg.json b/ports/aws-c-http/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "aws-c-http",
-  "version": "0.8.10",
+  "version": "0.9.2",
   "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications",
   "homepage": "https://github.com/awslabs/aws-c-http",
   "license": "Apache-2.0",
-  "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-c-cal",
     "aws-c-common",

diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-io
     REF "v${VERSION}"
-    SHA512 3e690edc5a13bd603fd28917d60e3f96f1796bfc8194c1f9632447a94e02dc0be8297e3b96752cffb70a21d75fc57825acd64a99680189f9a3216e9ec6c3fa9f
+    SHA512 3ed00ef885c4424651222acecb1a8c090b6db36e0e001937734d26a326ddf363078628a03a6e33952dca52d22cb16b9ed8d422cf036d71ea153856e9a1f11659
     HEAD_REF master
 )
 

diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "aws-c-io",
-  "version": "0.14.18",
+  "version": "0.15.3",
   "description": "Handles all IO and TLS work for application protocols.",
   "homepage": "https://github.com/awslabs/aws-c-io",
   "license": "Apache-2.0",
-  "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-c-cal",
     "aws-c-common",

diff --git a/ports/aws-c-mqtt/portfile.cmake b/ports/aws-c-mqtt/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-mqtt
     REF "v${VERSION}"
-    SHA512 4384d20020ee9dbb84db9db7c4feb32477f42990bf4c1412e48184675f10d9056b4433d825056ed8302654788dd1131c3150e99cb173c92520695f8d09311fe3
+    SHA512 62fc05f6153953e42178dc2861a5ce6644ce01e5ba05db3b63899af63bc2d15bb3f45272e6812a21a8ef91b7cf65e91818f7ff8611a3fc45a9b66db33f874204
     HEAD_REF master
 )
 

diff --git a/ports/aws-c-mqtt/vcpkg.json b/ports/aws-c-mqtt/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "aws-c-mqtt",
-  "version": "0.10.7",
+  "version": "0.11.0",
   "description": "C99 implementation of the MQTT 3.1.1 specification.",
   "homepage": "https://github.com/awslabs/aws-c-mqtt",
   "license": "Apache-2.0",
-  "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-c-http",
     "aws-c-io",

diff --git a/ports/aws-c-s3/portfile.cmake b/ports/aws-c-s3/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-s3
     REF "v${VERSION}"
-    SHA512 20e364b50fdbf9cc0c9c515ccf15410c5771c545d585274db97e77f0459b05b3d7af82863a926d373d93590276020778345744db7e7ca575e686cd9bc627f8e2
+    SHA512 887081a014dc49596191a97f9999a5221e3e6341ca192103325dbdabfbeefa143da94d6026682b4f867c336f70ee238e56572960011f788f0be7caf6b1047c06
     HEAD_REF master
 )
 

diff --git a/ports/aws-c-s3/vcpkg.json b/ports/aws-c-s3/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "aws-c-s3",
-  "version": "0.6.6",
+  "version": "0.7.7",
   "description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.",
   "homepage": "https://github.com/awslabs/aws-c-s3",
   "license": "Apache-2.0",
-  "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-c-auth",
     "aws-c-http",

diff --git a/ports/aws-c-sdkutils/portfile.cmake b/ports/aws-c-sdkutils/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-sdkutils
     REF "v${VERSION}"
-    SHA512 a92576c7a4188a2cfa0cacac06ca363bc34dd86c8e8eed20d61aeeee08ed700f4c90d2cbc49a50214bb95fdc1de2fc4c344bcfb12aaeaa12bfe855fe3c585999
+    SHA512 b3e0917d01c0f66adb1b789324d7d2b4d45c5efe22d769a19895f8c9c8473f21fcb7b01f4621e7e46826b14688cf894d18ffc9d0451ab57c0319b666cc28cd20
     HEAD_REF master
 )
 

diff --git a/ports/aws-c-sdkutils/vcpkg.json b/ports/aws-c-sdkutils/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "aws-c-sdkutils",
-  "version": "0.1.19",
+  "version": "0.2.1",
   "description": "C99 library implementing AWS SDK specific utilities. Includes utilities for ARN parsing, reading AWS profiles, etc...",
   "homepage": "https://github.com/awslabs/aws-c-sdkutils",
   "license": "Apache-2.0",
-  "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-c-common",
     {

diff --git a/ports/aws-checksums/portfile.cmake b/ports/aws-checksums/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-checksums
     REF "v${VERSION}"
-    SHA512 9a352ef1a26032260874d0d78511c308ac49e074b27c1819fb9ae1ccc92decffb1c1a737aa4a18873e210e9df264a35cec4e7f4c4b406af0ff35ecd9f42b58d0
+    SHA512 56ea4946a40816e11ae8819d7d383f8c871c1b9ad5bdf410f61169e62263daf08a5eea4e81eb0f9bd8de2e3ff5479b1a61e6441f7281bda70029ae35abd4ae59
     HEAD_REF master
 )
 

diff --git a/ports/aws-checksums/vcpkg.json b/ports/aws-checksums/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "aws-checksums",
-  "version": "0.1.20",
+  "version": "0.2.2",
   "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.",
   "homepage": "https://github.com/awslabs/aws-checksums",
   "license": "Apache-2.0",
-  "supports": "!(windows & arm)",
   "dependencies": [
     "aws-c-common",
     {

diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-crt-cpp
     REF "v${VERSION}"
-    SHA512 acea11d88b4826b31a7072ec7ccae0d8bf2ab7c41fb692af716fe37e3c93fc1cb410f6307907f3cacbc3521bde141c557e61683056ebb6ed5712098bee3db733
+    SHA512 d89038277b030ee7611447daf08521f9c08bf39143861518f7343d3c2397ddb46358a2911713b92d780c8bd49e50c5c06a8b8f93bd3f2cba1a1fdf27144bb0a8
     PATCHES
         no-werror.patch
 )

diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "aws-crt-cpp",
-  "version": "0.29.6",
+  "version": "0.29.7",
   "description": "C++ wrapper around the aws-c-* libraries. Provides Cross-Platform Transport Protocols and SSL/TLS implementations for C++.",
   "homepage": "https://github.com/awslabs/aws-crt-cpp",
   "license": "Apache-2.0",
-  "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-c-auth",
     "aws-c-cal",

diff --git a/ports/aws-sdk-cpp/generateFeatures.ps1 b/ports/aws-sdk-cpp/generateFeatures.ps1
@@ -1,6 +1,5 @@
 [CmdletBinding()]
 param(
-    [Parameter(Mandatory=$true)][string]$SourcesRef,
     [Parameter(Mandatory=$false)][string]$PortDirectory = $PSScriptRoot,
     [Parameter(Mandatory=$false)][string]$vcpkg = "$PSScriptRoot/../../vcpkg"
 )
@@ -10,24 +9,27 @@ $ErrorActionPreference = "Stop"
 $ManifestIn = "$PortDirectory/vcpkg.in.json"
 $ManifestOut = "$PortDirectory/vcpkg.json"
 
-$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$SourcesRef"
+$manifest = Get-Content $ManifestIn | ConvertFrom-Json
+$version = $manifest.version
+
+Write-Host "Using version from vcpkg.in.json: $version"
+
+$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$version"
 if (-not (Test-Path $ExtractedSources)) {
     if (Test-Path "$ExtractedSources.tmp") {
         Remove-Item -Force "$ExtractedSources.tmp"
     }
     git clone --depth=1 "https://github.com/aws/aws-sdk-cpp" "$ExtractedSources.tmp" | Out-Host
-    git -c "$ExtractedSources.tmp" checkout $SourcesRef
+    git -c "$ExtractedSources.tmp" checkout $version
     Move-Item "$ExtractedSources.tmp" "$ExtractedSources"
 }
 Write-Host "Using sources directory: $ExtractedSources"
 
-
 $subfolders = Get-ChildItem -Path "$ExtractedSources\generated\src\aws-cpp-sdk-*", "$ExtractedSources\src\aws-cpp-sdk*" | Sort-Object -Property Name
 
-$manifest = Get-Content $ManifestIn | ConvertFrom-Json
 $manifest | Add-Member `
     -NotePropertyName '$note' `
-    -NotePropertyValue 'Automatically generated by generateFeatures.ps1'
+    -NotePropertyValue 'Automatically generated by generateFeatures.ps1 from vcpkg.in.json, do not edit manually'
 $manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{}
 
 function GetDescription($dir, $modulename)

diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/aws-sdk-cpp
     REF "${VERSION}"
-    SHA512 7f4aea0810df1bfc907f65454b83e7c345c61198de350e974118695ed4d7ff0a9e42c8f1009b34e9b05b247079d778d4b4bbf681c5e149857c78ed10088a0127
+    SHA512 b9695a664db722d7426f0ad9375cbac023d577e199d52ca09dcd12d95fa70dd3a2988655b22cc3a8c78317a8e08edcab7301fd711a685d6c5ba584c57b54722d
     PATCHES
         fix-aws-root.patch
         lock-curl-http-and-tls-settings.patch

diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json
@@ -1,10 +1,9 @@
 {
   "name": "aws-sdk-cpp",
-  "version": "1.11.352",
+  "version": "1.11.467",
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "license": "Apache-2.0",
-  "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-crt-cpp",
     {