Merge pull request #1 from vaavva/vaavva/csdk-release

Vaavva/csdk release
vaavva · Aug 12, 2022 · 751512c · 751512c
2 parents f93ba15 + 925f9f4
commit 751512c
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 26 deletions.
diff --git a/ports/azure-c-shared-utility/openssl.patch b/ports/azure-c-shared-utility/openssl.patch
@@ -1,13 +1,22 @@
 diff --git a/adapters/x509_openssl.c b/adapters/x509_openssl.c
-index 5a9e5ac2..bb946c2d 100644
+index 46195b40..5a9e5ac2 100644
 --- a/adapters/x509_openssl.c
 +++ b/adapters/x509_openssl.c
 @@ -75,7 +75,7 @@ static int load_certificate_chain(SSL_CTX* ssl_ctx, const char* certificate)
                  // certificates.
 
                  /* Codes_SRS_X509_OPENSSL_07_006: [ If successful x509_openssl_add_ecc_credentials shall to import each certificate in the cert chain. ] */
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && (OPENSSL_VERSION_NUMBER < 0x20000000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && (OPENSSL_VERSION_NUMBER < 0x20000000L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && (OPENSSL_VERSION_NUMBER < 0x20000000L)
                  SSL_CTX_clear_extra_chain_certs(ssl_ctx);
  #else
                  if (ssl_ctx->extra_certs != NULL)
+@@ -345,7 +345,7 @@ int x509_openssl_add_certificates(SSL_CTX* ssl_ctx, const char* certificates)
+         else
+         {
+             /*Codes_SRS_X509_OPENSSL_02_012: [ x509_openssl_add_certificates shall get the memory BIO method function by calling BIO_s_mem. ]*/
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && (OPENSSL_VERSION_NUMBER < 0x20000000L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && (OPENSSL_VERSION_NUMBER < 0x20000000L)
+             const BIO_METHOD* bio_method;
+ #else
+             BIO_METHOD* bio_method;
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
@@ -17,8 +17,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-c-shared-utility
-        REF 1a27846886a74702d409a8f0e2d77a38163cefc7
-        SHA512 c30cba73692691fe1310b6180e3aeaf4d86b6276981c680cac31d605634e5dedbce3f823142dfebba4ae2f76ccead965a527d95df0e52af638a30ddec9818fbd
+        REF a573357197179356543c74836fe943c4864c94ba
+        SHA512 54d5e8a8ef59d11781532e3ef3479d80975a35fd4c382e1240bcb6575a964bc4a54c707391406bcfb7e0841c80228cb599155a534487b29d9f83a3aad06221e5
         HEAD_REF master
         PATCHES
             openssl.patch

diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-c-shared-utility",
-  "version-date": "2022-01-21",
+  "version-date": "2022-07-18",
   "port-version": 3,
   "description": "Azure C SDKs common code",
   "homepage": "https://github.com/Azure/azure-c-shared-utility",

diff --git a/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch b/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch
@@ -1,13 +1,13 @@
 diff --git a/iothub_client/CMakeLists.txt b/iothub_client/CMakeLists.txt
-index 07ab3b7..9769a08 100644
+index 5a8f5573c..07ab3b7cb 100644
 --- a/iothub_client/CMakeLists.txt
 +++ b/iothub_client/CMakeLists.txt
-@@ -441,7 +441,7 @@ add_library(iothub_client
- target_include_directories(iothub_client
+@@ -442,8 +442,6 @@ target_include_directories(iothub_client
      PUBLIC
      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
--    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot/include>
-+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot>
+     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot/include>
+-    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/deps/umock-c/inc>
+-    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/deps/azure-macro-utils-c/inc>
  )
  applyXcodeBuildFlagsIfNeeded(iothub_client)
  target_link_libraries(iothub_client ${iothub_client_libs})
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
@@ -14,8 +14,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-iot-sdk-c
-        REF 5805fb669ffe2adff021d68c62725d0bd783ac49
-        SHA512 8f1aa1020f3bb8b3e801f3977d11be50fd07d961c89ac921f795ef8a99312f12e1ddb2268ce3d2fb84b6a42bb5806cde410e6b51c7c4539a9a11a9ae512dbcd1
+        REF 02bfa1bab1620999af7fe971e68d61171827cb8b
+        SHA512 0c961fcef48849e394c492283c6244425d86db7ab5d15d2a767a30c670cf5b6a01f1e95a7260e6d61b5d16babffef1e127a33e617be002d2a98221ae72160ad0
         HEAD_REF master
         PATCHES
             fix-install-location.patch
@@ -42,6 +42,7 @@ vcpkg_cmake_configure(
         -Dbuild_as_dynamic=OFF
         -Duse_edge_modules=ON
         -Dwarnings_as_errors=OFF
+        -Dhsm_type_sastoken=OFF
     MAYBE_UNUSED_VARIABLES
         build_as_dynamic
         warnings_as_errors

diff --git a/ports/azure-iot-sdk-c/vcpkg.json b/ports/azure-iot-sdk-c/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "azure-iot-sdk-c",
-  "version-date": "2022-01-21",
-  "port-version": 2,
+  "version-date": "2022-07-18",
   "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services",
   "homepage": "https://github.com/Azure/azure-iot-sdk-c",
   "license": "MIT",

diff --git a/ports/azure-macro-utils-c/vcpkg.json b/ports/azure-macro-utils-c/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-macro-utils-c",
-  "version-date": "2022-01-21",
+  "version-date": "2022-07-18",
   "description": "A library of macros for the Azure IoT SDK Suite",
   "features": {
     "public-preview": {

diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake
@@ -12,8 +12,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uamqp-c
-        REF 85aae56beb717dddaf5512845de537d2926afb02
-        SHA512 3d9e7788c784169e6d1d9abd233e00a4c1e6525d67cbc25f8ba42292b6d66d0179a742833a0c00a3a0df6498bf88dc8b12a40c183e7141f7290cbb4eceb67dbe
+        REF 9adecc7afc9fb2c1d05b5b850005ecae6e4d98f2
+        SHA512 e90b9dd76bf753d30bdbfd62afb39c0d49e09e106d0546c66c214a339abfbe2cd53aa383f2e6d9ef445b553d4fa65438acdd18b80a88ab93c613466709bf828f
         HEAD_REF master
     )
 endif()

diff --git a/ports/azure-uamqp-c/vcpkg.json b/ports/azure-uamqp-c/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-uamqp-c",
-  "version-date": "2022-01-21",
+  "version-date": "2022-07-18",
   "port-version": 1,
   "description": "AMQP library for C",
   "homepage": "https://github.com/Azure/azure-uamqp-c",

diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake
@@ -14,8 +14,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uhttp-c
-        REF 1cc70f4d21ad69768cafb9551b1b512118fba995
-        SHA512 6604e82b347a1a4eb5072ab762fde7bd5ae9b32848a78da9103e0eb528b9ccd420a12dbc237dc0b5fe6db271d5cdcd24eedf1cde8ac058102fdd24c5a5a33f26
+        REF f07e04f3ae007bd90b51cb8a931bacaa8590ab43
+        SHA512 308bda3b9c965be40d1c2dbe5c94fc2d4ae5b0b60b30eb693f9a5dd8b8be2ba0991e8e6fda4b42b0b535cf735ef6e1d5b97e4db95d06df54aa50c756232576af
         HEAD_REF master
     )
 endif()

diff --git a/ports/azure-uhttp-c/vcpkg.json b/ports/azure-uhttp-c/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-uhttp-c",
-  "version-date": "2022-01-21",
+  "version-date": "2022-07-18",
   "port-version": 1,
   "description": "Azure HTTP Library written in C",
   "homepage": "https://github.com/Azure/azure-uhttp-c",

diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake
@@ -14,8 +14,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-umqtt-c
-        REF 09558f380a314ea89b28f406cc810f47718cea49
-        SHA512 7fc1b3d4ed6bd7401b764e27755270dd97caeb09f3bdede90e2e8c554acd13b5c24f9c7343e642bcb62d2937b8169d900fa46a1b97a8c439733c8cdcac19d548
+        REF a4f77d1d5a5945921f38800e9a44ae8d05eb0778
+        SHA512 b15dad3f2ce14b1b06486fc110094219d7ba867ac7fbdf91ad732e57bf1c97e8b666882d987057bd96acf30f6f9e487bffc9426078c3f8e76c90dbe9e8373b08
         HEAD_REF master
     )
 endif()

diff --git a/ports/azure-umqtt-c/vcpkg.json b/ports/azure-umqtt-c/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-umqtt-c",
-  "version-date": "2022-01-21",
+  "version-date": "2022-07-18",
   "port-version": 1,
   "description": "General purpose library for communication over the mqtt protocol",
   "homepage": "https://github.com/Azure/azure-umqtt-c",

diff --git a/ports/umock-c/vcpkg.json b/ports/umock-c/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "umock-c",
-  "version-date": "2022-01-21",
+  "version-date": "2022-07-18",
   "description": "A pure C mocking library",
   "homepage": "https://github.com/Azure/umock-c",
   "dependencies": [