From d5eafb41cda7c33bad6ecc6bd854e2514ec7faa6 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Tue, 5 Dec 2023 03:20:01 +0200 Subject: [PATCH] [aws-sdk-cpp and co] Update to the latest version. (#35445) --- ports/aws-c-auth/portfile.cmake | 2 +- ports/aws-c-auth/vcpkg.json | 2 +- ports/aws-c-common/portfile.cmake | 2 +- ports/aws-c-common/vcpkg.json | 2 +- ports/aws-c-io/portfile.cmake | 2 +- ports/aws-c-io/vcpkg.json | 2 +- ports/aws-c-mqtt/portfile.cmake | 2 +- ports/aws-c-mqtt/vcpkg.json | 2 +- ports/aws-c-s3/portfile.cmake | 2 +- ports/aws-c-s3/vcpkg.json | 2 +- ports/aws-crt-cpp/portfile.cmake | 2 +- ports/aws-crt-cpp/vcpkg.json | 2 +- ports/aws-sdk-cpp/portfile.cmake | 2 +- ports/aws-sdk-cpp/vcpkg.in.json | 3 +- ports/aws-sdk-cpp/vcpkg.json | 3 +- ports/s2n/portfile.cmake | 3 +- ports/s2n/remove-trycompile.patch | 59 ------------------------------- ports/s2n/vcpkg.json | 2 +- versions/a-/aws-c-auth.json | 5 +++ versions/a-/aws-c-common.json | 5 +++ versions/a-/aws-c-io.json | 5 +++ versions/a-/aws-c-mqtt.json | 5 +++ versions/a-/aws-c-s3.json | 5 +++ versions/a-/aws-crt-cpp.json | 5 +++ versions/a-/aws-sdk-cpp.json | 5 +++ versions/baseline.json | 18 +++++----- versions/s-/s2n.json | 5 +++ 27 files changed, 66 insertions(+), 88 deletions(-) delete mode 100644 ports/s2n/remove-trycompile.patch diff --git a/ports/aws-c-auth/portfile.cmake b/ports/aws-c-auth/portfile.cmake index 381fd83daf..2793a550f5 100644 --- 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 2f3b4c8bc91b84f570eda29904fc6078557fd393a879cd710f8ad06abc37fd0fffb535a19c2813a333a2c384da8756f85bb6589bdc3aa1a2a4a9754795aca705 + SHA512 e247b145132818bb1adf03689fdc98984e6ac50e6d81d0d7caf60d53ba3d3a95bbb4e76f48ac4582365f9038d0d8b29e57947190ec5c34f68e816dd7efcc117d HEAD_REF master ) diff --git a/ports/aws-c-auth/vcpkg.json b/ports/aws-c-auth/vcpkg.json index 2394a7d120..091f504789 100644 --- a/ports/aws-c-auth/vcpkg.json +++ b/ports/aws-c-auth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-auth", - "version": "0.7.6", + "version": "0.7.8", "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", diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake index 0143b7cdae..e96d1a8284 100644 --- 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 4e9df8edeefa7765fb68c25b36a72dd389ef3cf99ec0d37661f527a85f36d59f87fe6f0d2c7c52132abe45062ac7eb74513552d98b72c5aadb074624b1eb741f + SHA512 f04bdc01d52b5ad191d320d352a13dd4cb9675127596c2c2229657211bc5fa3cddf05a3b395a0dc0ac5ce2f09cecf54c04b9cfacb08299e24a16a47684560f11 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 index 381ae8b131..9d7a14ce9c 100644 --- a/ports/aws-c-common/vcpkg.json +++ b/ports/aws-c-common/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-common", - "version": "0.9.9", + "version": "0.9.10", "description": "AWS common library for C", "homepage": "https://github.com/awslabs/aws-c-common", "license": "Apache-2.0", diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake index 36320230b8..bf331bfbaa 100644 --- 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 286090cb04fa75e98e8bf33a665f9a1dce8601d543af330b0a610f10ddddc211408db56bdcc125a2b399181530bd56fb102cddcba32fb885d1ab6bd6ab666be2 + SHA512 cb76ddf7d43c440443c6e5fb33a022f540d8ca95572f36b263836fe6bebfd0790370c84fec37b45475645167ab71bb14de320b9988803ac01f6bbb0d7436949a HEAD_REF master ) diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json index 66a7a0d66a..e6fc427362 100644 --- a/ports/aws-c-io/vcpkg.json +++ b/ports/aws-c-io/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-io", - "version": "0.13.35", + "version": "0.13.36", "description": "Handles all IO and TLS work for application protocols.", "homepage": "https://github.com/awslabs/aws-c-io", "license": "Apache-2.0", diff --git a/ports/aws-c-mqtt/portfile.cmake b/ports/aws-c-mqtt/portfile.cmake index 78355c1450..e7775f07ee 100644 --- 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 e7c85fbbf91848720848751748d75eeb2b788552871d3055a93724aa9d814ef088821d77a8dc8fa265b8f8c730990d221e5babc4bdbff0b73f03e24bb54d3c60 + SHA512 9664596de78a8778349cf32d5dd207ed8e5a28e1d13505f942c8486c3fbf516ec49121af312d85182ebdc66b464d430fcd2d28606b1c2652a8dfb9c173334681 HEAD_REF master ) diff --git a/ports/aws-c-mqtt/vcpkg.json b/ports/aws-c-mqtt/vcpkg.json index b22e3ce289..1bec811c34 100644 --- a/ports/aws-c-mqtt/vcpkg.json +++ b/ports/aws-c-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-mqtt", - "version": "0.9.9", + "version": "0.9.10", "description": "C99 implementation of the MQTT 3.1.1 specification.", "homepage": "https://github.com/awslabs/aws-c-mqtt", "license": "Apache-2.0", diff --git a/ports/aws-c-s3/portfile.cmake b/ports/aws-c-s3/portfile.cmake index b5ce27ecc7..a1d50b64f5 100644 --- 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 5a6738d77d87ece6125233c6f50a446843dd8d3b11749a61c80d0eb8e8528d51ab9ccfe65fb59a00bc249d5a4d47b7787b5dcae963d8f60f49eaf5d9c1b3f7db + SHA512 62dca71a857f7c55cb824cf1a81f3dbefa7cf7d50e5fadec5f2e67d4c2e33c2902a483145b4e9390aa5adf68ab65588c7c71e91717b74733db2a15e7a1cc5794 HEAD_REF master ) diff --git a/ports/aws-c-s3/vcpkg.json b/ports/aws-c-s3/vcpkg.json index 1d73db0e10..362b597c81 100644 --- a/ports/aws-c-s3/vcpkg.json +++ b/ports/aws-c-s3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-s3", - "version": "0.3.24", + "version": "0.4.3", "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", diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake index ee85a65633..030981d73c 100644 --- 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 32359a7a94e9f044de1184e633a7e2466e697022fd713a507c143c465c6ecb9632354c067d3987e21d86b9c614c8d2af180645b6c79a5c6533cbeb6a1a762bcf + SHA512 4160aae9aaf98556d9fd26a13feb09f7fce2a20e073740d13ab9890fdab158de63918c8fd2f4a2d07e92798e2df47b6696b38e614c9631ebcdddf7ea1c44a126 PATCHES no-werror.patch ) diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json index 65b1f07cde..a211574cd5 100644 --- a/ports/aws-crt-cpp/vcpkg.json +++ b/ports/aws-crt-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-crt-cpp", - "version": "0.24.7", + "version": "0.24.8", "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", diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 525068260a..1dc66c5f4b 100644 --- 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 03d21fd2b12116a43aa8163f69d5707d259c6330ddee80a5fef3b344d3797bab72e56ade7fd6669c2532798337a922e2439e0c57d1e76d2b2e8470909c4d996d + SHA512 4410eaff815ce7b6c0bc0d37bd4175754d5103d2e3cfd60755df57dad103ab7e7705b79fc6039d2c8b7d1ccec650912f5ff0aa73baa2d9cf6d6608a493d11088 PATCHES patch-relocatable-rpath.patch fix-aws-root.patch diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json index a618a77d86..e79a583786 100644 --- a/ports/aws-sdk-cpp/vcpkg.in.json +++ b/ports/aws-sdk-cpp/vcpkg.in.json @@ -1,7 +1,6 @@ { "name": "aws-sdk-cpp", - "version": "1.11.160", - "port-version": 1, + "version": "1.11.215", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 55cbd7b75a..745435741a 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,8 +1,7 @@ { "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", - "version": "1.11.201", - "port-version": 1, + "version": "1.11.215", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", diff --git a/ports/s2n/portfile.cmake b/ports/s2n/portfile.cmake index 98bb2c08a0..0909ebee5b 100644 --- a/ports/s2n/portfile.cmake +++ b/ports/s2n/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/s2n-tls REF "v${VERSION}" - SHA512 cfdfcdaa9d57427211e896845358da85d7498fa0478b6916dd34f36c755100c0421c07ccd624ed2d4baf9fcfe0dde6629159769619ac22e9ef1535ba20bf8979 + SHA512 deead85f2ab22441e1110d442fc93273d96d8dd6a203940cca7ef166fc1c9e7ab75ffe2d550e013e1e1e3266b208904cff94cc2482d6fd00e0546293b0ba11d4 PATCHES fix-cmake-target-path.patch - remove-trycompile.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/s2n/remove-trycompile.patch b/ports/s2n/remove-trycompile.patch deleted file mode 100644 index d9385fd457..0000000000 --- a/ports/s2n/remove-trycompile.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt (revision 4aec93c6a74aacf60cec6229b35094f56cb0f87b) -+++ b/CMakeLists.txt (date 1675010024800) -@@ -393,55 +393,6 @@ - message(STATUS "Enabling libcrypto interning") - endif() - --# Determine if EVP_md5_sha1 is available in libcrypto --try_compile( -- LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH -- ${CMAKE_BINARY_DIR} -- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md5_sha1.c" -- LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS} --) --if (LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH) -- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH) --endif() -- --# Determine if RC4 is available in libcrypto --try_compile( -- LIBCRYPTO_SUPPORTS_EVP_RC4 -- ${CMAKE_BINARY_DIR} -- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_rc4.c" -- LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS} --) -- --if (LIBCRYPTO_SUPPORTS_EVP_RC4) -- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_RC4) --endif() -- --# Determine if EVP_MD_CTX_set_pkey_ctx is available in libcrypto --try_compile( -- LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX -- ${CMAKE_BINARY_DIR} -- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md_ctx_set_pkey_ctx.c" -- LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS} -- CMAKE_FLAGS ${ADDITIONAL_FLAGS} --) -- --if (LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX) -- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX) --endif() -- --# Determine if Kyber512 implementation from AWS-LC is available --try_compile( -- LIBCRYPTO_SUPPORTS_EVP_KYBER_512 -- ${CMAKE_BINARY_DIR} -- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_kyber_512.c" -- LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS} -- COMPILE_DEFINITIONS "-Werror" --) -- --if(S2N_AWSLC_KYBER_UNSTABLE AND LIBCRYPTO_SUPPORTS_EVP_KYBER_512) -- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_KYBER512) --endif() -- - if (NOT DEFINED CMAKE_AR) - message(STATUS "CMAKE_AR undefined, setting to `ar` by default") - SET(CMAKE_AR ar) diff --git a/ports/s2n/vcpkg.json b/ports/s2n/vcpkg.json index 1f26ea583b..76f883756f 100644 --- a/ports/s2n/vcpkg.json +++ b/ports/s2n/vcpkg.json @@ -1,6 +1,6 @@ { "name": "s2n", - "version": "1.3.34", + "version": "1.3.56", "description": "C99 implementation of the TLS/SSL protocols.", "homepage": "https://github.com/aws/s2n-tls", "license": "Apache-2.0", diff --git a/versions/a-/aws-c-auth.json b/versions/a-/aws-c-auth.json index 896cd855b1..10e4aaaa27 100644 --- a/versions/a-/aws-c-auth.json +++ b/versions/a-/aws-c-auth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e80f8a3a15231a8d513d03ff7761acf4a5c18269", + "version": "0.7.8", + "port-version": 0 + }, { "git-tree": "ab09a6f41712ba35a021c3d6392a804e47858668", "version": "0.7.6", diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json index ccc20b53b6..b5181534e6 100644 --- a/versions/a-/aws-c-common.json +++ b/versions/a-/aws-c-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e07be2013141ae49e6bf3340ccce57b0031cfb17", + "version": "0.9.10", + "port-version": 0 + }, { "git-tree": "30465cfdc4851970efc5767fd57ad6e0dedad46a", "version": "0.9.9", diff --git a/versions/a-/aws-c-io.json b/versions/a-/aws-c-io.json index f735eb7584..f028000068 100644 --- a/versions/a-/aws-c-io.json +++ b/versions/a-/aws-c-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "586cb06ad50ef2627c4dd30ab97b88d79e559fd5", + "version": "0.13.36", + "port-version": 0 + }, { "git-tree": "caab59ca1fe5071d552eaf073a501151ac6099a5", "version": "0.13.35", diff --git a/versions/a-/aws-c-mqtt.json b/versions/a-/aws-c-mqtt.json index 936cc9a53a..fad9f5f683 100644 --- a/versions/a-/aws-c-mqtt.json +++ b/versions/a-/aws-c-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79c21d94b22888e395bd53041457397fcb013486", + "version": "0.9.10", + "port-version": 0 + }, { "git-tree": "9210c6a8260e7b5058fd4d9bb7d1a42cd6d78079", "version": "0.9.9", diff --git a/versions/a-/aws-c-s3.json b/versions/a-/aws-c-s3.json index 4dbc1faa7c..952da0a5ae 100644 --- a/versions/a-/aws-c-s3.json +++ b/versions/a-/aws-c-s3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e12d01447182cce36c5524fbd6a22f8135dd9ecb", + "version": "0.4.3", + "port-version": 0 + }, { "git-tree": "709e576231214f693d747d8187e44b30c77f4443", "version": "0.3.24", diff --git a/versions/a-/aws-crt-cpp.json b/versions/a-/aws-crt-cpp.json index 1ad459bf30..9e9690b8c9 100644 --- a/versions/a-/aws-crt-cpp.json +++ b/versions/a-/aws-crt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ec1e5fdb18e38dc54d06842860ec7f95df53c5a", + "version": "0.24.8", + "port-version": 0 + }, { "git-tree": "855f83fcf951b5fcaf0af75159ff979980670088", "version": "0.24.7", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 1be1f631ff..9bfb28eb8f 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbebf005503aa74f6725df8f4d04eb21a894e127", + "version": "1.11.215", + "port-version": 0 + }, { "git-tree": "f669bd77e23c643da0c15162dc46d84b924938a0", "version": "1.11.201", diff --git a/versions/baseline.json b/versions/baseline.json index 793cdff1fb..067085f3ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -353,7 +353,7 @@ "port-version": 0 }, "aws-c-auth": { - "baseline": "0.7.6", + "baseline": "0.7.8", "port-version": 0 }, "aws-c-cal": { @@ -361,7 +361,7 @@ "port-version": 0 }, "aws-c-common": { - "baseline": "0.9.9", + "baseline": "0.9.10", "port-version": 0 }, "aws-c-compression": { @@ -377,15 +377,15 @@ "port-version": 0 }, "aws-c-io": { - "baseline": "0.13.35", + "baseline": "0.13.36", "port-version": 0 }, "aws-c-mqtt": { - "baseline": "0.9.9", + "baseline": "0.9.10", "port-version": 0 }, "aws-c-s3": { - "baseline": "0.3.24", + "baseline": "0.4.3", "port-version": 0 }, "aws-c-sdkutils": { @@ -397,7 +397,7 @@ "port-version": 0 }, "aws-crt-cpp": { - "baseline": "0.24.7", + "baseline": "0.24.8", "port-version": 0 }, "aws-lambda-cpp": { @@ -405,8 +405,8 @@ "port-version": 0 }, "aws-sdk-cpp": { - "baseline": "1.11.201", - "port-version": 1 + "baseline": "1.11.215", + "port-version": 0 }, "azmq": { "baseline": "2023-03-23", @@ -7621,7 +7621,7 @@ "port-version": 0 }, "s2n": { - "baseline": "1.3.34", + "baseline": "1.3.56", "port-version": 0 }, "safeint": { diff --git a/versions/s-/s2n.json b/versions/s-/s2n.json index 7cb031d6d1..870385eaa4 100644 --- a/versions/s-/s2n.json +++ b/versions/s-/s2n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a5705f86914ceeaa101adb9b7aca73c785aa584", + "version": "1.3.56", + "port-version": 0 + }, { "git-tree": "2928707380a76632c3953b843ce34019fbf2c90c", "version": "1.3.34",