[azure-iot-sdk-c] LTS Release 07-2022_Ref02 (#26361)

* update versions * add patches * fix ninja error * update port versions * fix linux build issues * bot comment fixes * update version * add openssl override for c-utility * format vcpkg.json file * Update version database * update licenses * Update version database * remove depracated portfile functions * Update version database * fix vcpkg_cmake_config_fixup arguments * Update version database * point to after openssl 3 support * revert overrides * add new openssl patch * fix patches to work on linux * update to actual release code * update versions * remove leftovers from trying to fix linux * Revert "remove leftovers from trying to fix linux" This reverts commit b4589195f1. * Revert "update versions" This reverts commit 6a0fbb5318. * remove leftovers from trying to fix linux * update versions * remove unpublished versions * Update ports/azure-c-shared-utility/vcpkg.json remove port version Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/azure-uamqp-c/portfile.cmake Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/azure-uamqp-c/vcpkg.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/azure-umqtt-c/vcpkg.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * pr comments * update versions * clean up versions * remove version updates from un-updated packages * overwrite versions * Update vcpkg.json * Update vcpkg.json * Update azure-macro-utils-c.json * Update umock-c.json Co-authored-by: Valerie Avva Lim <vaavva@DESKTOP-A98NJKG.localdomain> Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Lily Wang <494550702@qq.com>
2024-11-28 00:49:01 +08:00 · 2022-09-22 14:32:34 -07:00 · 2022-09-22 14:32:34 -07:00 · 9c2ee2a7c5
commit 9c2ee2a7c5
parent ba1f91fd7e
18 changed files with 72 additions and 57 deletions
--- a/ports/azure-c-shared-utility/openssl.patch
+++ b/ports/azure-c-shared-utility/openssl.patch
@ -1,13 +0,0 @@
-diff --git a/adapters/x509_openssl.c b/adapters/x509_openssl.c
-index 5a9e5ac2..bb946c2d 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)
-                 SSL_CTX_clear_extra_chain_certs(ssl_ctx);
- #else
-                 if (ssl_ctx->extra_certs != NULL)
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@ -17,11 +17,10 @@ else()
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-c-shared-utility
-        REF 1a27846886a74702d409a8f0e2d77a38163cefc7
-        SHA512 c30cba73692691fe1310b6180e3aeaf4d86b6276981c680cac31d605634e5dedbce3f823142dfebba4ae2f76ccead965a527d95df0e52af638a30ddec9818fbd
+        REF 9e4322c9d88095ed276bf7e4b31b87b82b1c4d86
+        SHA512 0ede2a30ed787028a48602111be7cebc65593a84a8b3dc94ed34917f44355a180d8b8acf2b6404e47428fe8f761c11485199e9bd2e9aa6628548c585357f63e8
        HEAD_REF master
        PATCHES
-            openssl.patch
            fix-install-location.patch
            fix-utilityFunctions-conditions.patch
            disable-error.patch
--- a/ports/azure-c-shared-utility/vcpkg.json
+++ b/ports/azure-c-shared-utility/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "azure-c-shared-utility",
-  "version-date": "2022-01-21",
-  "port-version": 3,
+  "version-date": "2022-09-15",
  "description": "Azure C SDKs common code",
  "homepage": "https://github.com/Azure/azure-c-shared-utility",
  "license": "MIT",
--- a/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch
+++ b/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch
@ -1,13 +1,14 @@
 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>
+-    $<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})
--- 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 3fd808bee3c88f8578dcc30c0a6d1d396c172070
+        SHA512 2ee26791aca7732d21fe91cbb51be35d1589161d1d7b54542ac1a1277f1a95eb7e1d5ced7be117ce326dd118169e20ffc6bcd0ea9fd8ac9442bd466bc048f1ea
        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
--- 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-09-15",
  "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services",
  "homepage": "https://github.com/Azure/azure-iot-sdk-c",
  "license": "MIT",
--- a/ports/azure-uamqp-c/portfile.cmake
+++ b/ports/azure-uamqp-c/portfile.cmake
@ -12,17 +12,16 @@ else()
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-uamqp-c
-        REF 85aae56beb717dddaf5512845de537d2926afb02
-        SHA512 3d9e7788c784169e6d1d9abd233e00a4c1e6525d67cbc25f8ba42292b6d66d0179a742833a0c00a3a0df6498bf88dc8b12a40c183e7141f7290cbb4eceb67dbe
+        REF 117c8378b80fdafec639dafb6693b7c044281abc
+        SHA512 6726cfb3ecb42d42957b5df94d0b173b566fdd6961814e2b10882e32ae26387a36b05d77c59efbb008b7ed37e276c35128ab4e4adf0739cbf37f5f234626481a
        HEAD_REF master
    )
 endif()

 file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/)

-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
        -Dskip_samples=ON
        -Duse_installed_dependencies=ON
@ -31,12 +30,12 @@ vcpkg_configure_cmake(
        build_as_dynamic
 )

-vcpkg_install_cmake()
+vcpkg_cmake_install()

-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/uamqp)
+vcpkg_cmake_config_fixup(PACKAGE_NAME uamqp CONFIG_PATH "cmake")

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")

-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)

 vcpkg_copy_pdbs()
--- a/ports/azure-uamqp-c/vcpkg.json
+++ b/ports/azure-uamqp-c/vcpkg.json
@ -1,14 +1,21 @@
 {
  "name": "azure-uamqp-c",
-  "version-date": "2022-01-21",
-  "port-version": 1,
+  "version-date": "2022-09-15",
  "description": "AMQP library for C",
  "homepage": "https://github.com/Azure/azure-uamqp-c",
  "license": "MIT",
  "dependencies": [
    "azure-c-shared-utility",
    "azure-macro-utils-c",
-    "umock-c"
+    "umock-c",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
  ],
  "features": {
    "public-preview": {
--- 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 2b86b92628e55c9597aef8b96b0a73048ef072b3
+        SHA512 bc4cadaf4f64ffff4d8839fe8f604b77d6a912ab28b6100df93f4c7fbc96fa68a4e09b4670d27d078aac32a2d7792c408aa78a580328c02759c7a1c04d82d721
        HEAD_REF master
    )
 endif()
--- a/ports/azure-uhttp-c/vcpkg.json
+++ b/ports/azure-uhttp-c/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "azure-uhttp-c",
-  "version-date": "2022-01-21",
-  "port-version": 1,
+  "version-date": "2022-09-15",
  "description": "Azure HTTP Library written in C",
  "homepage": "https://github.com/Azure/azure-uhttp-c",
  "license": "MIT",
--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@ -14,16 +14,16 @@ else()
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-umqtt-c
-        REF 09558f380a314ea89b28f406cc810f47718cea49
-        SHA512 7fc1b3d4ed6bd7401b764e27755270dd97caeb09f3bdede90e2e8c554acd13b5c24f9c7343e642bcb62d2937b8169d900fa46a1b97a8c439733c8cdcac19d548
+        REF 566127ad605172735b9ac5cc6797261f3dd6c45c
+        SHA512 19e997e1dd7ecfbf5e8f11f44daa89cee7aa793f95aaed4bdaf792f5443173e0ca434d69f68a6633ee7cdc504d03a42f4b4e8aeec549c7ffdbd5e03db8cce6b5
        HEAD_REF master
    )
 endif()

-file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/)
+file(COPY "${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake" DESTINATION "${SOURCE_PATH}/deps/c-utility/configs/")

 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
        -Dskip_samples=ON
        -Duse_installed_dependencies=ON
--- a/ports/azure-umqtt-c/vcpkg.json
+++ b/ports/azure-umqtt-c/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "azure-umqtt-c",
-  "version-date": "2022-01-21",
-  "port-version": 1,
+  "version-date": "2022-09-15",
  "description": "General purpose library for communication over the mqtt protocol",
  "homepage": "https://github.com/Azure/azure-umqtt-c",
  "license": "MIT",
--- a/versions/a-/azure-c-shared-utility.json
+++ b/versions/a-/azure-c-shared-utility.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "2bfbac018e320a4f8d18aba279855bebd798e74f",
+      "version-date": "2022-09-15",
+      "port-version": 0
+    },
    {
      "git-tree": "ec45ec6a9a5b28ecab27857508355956d151a814",
      "version-date": "2022-01-21",
--- a/versions/a-/azure-iot-sdk-c.json
+++ b/versions/a-/azure-iot-sdk-c.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "2a47653f79ed3d0017784d96142716554dd4de95",
+      "version-date": "2022-09-15",
+      "port-version": 0
+    },
    {
      "git-tree": "80f1eb4e465fef817503af2c9599b2186d4922e6",
      "version-date": "2022-01-21",
--- a/versions/a-/azure-uamqp-c.json
+++ b/versions/a-/azure-uamqp-c.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "42efba430e30e78eaf72b03c94f8c4afe07bcfda",
+      "version-date": "2022-09-15",
+      "port-version": 0
+    },
    {
      "git-tree": "d7d284a159afe6ab21ce65d5e5d96dbee83339f6",
      "version-date": "2022-01-21",
--- a/versions/a-/azure-uhttp-c.json
+++ b/versions/a-/azure-uhttp-c.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "5c83542c6dc2b853932ac25c4d8314a5556aab40",
+      "version-date": "2022-09-15",
+      "port-version": 0
+    },
    {
      "git-tree": "28439985096cc9a714695d10830ceb2f54859c24",
      "version-date": "2022-01-21",
--- a/versions/a-/azure-umqtt-c.json
+++ b/versions/a-/azure-umqtt-c.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "28ef0c8d4778d3fd30120290bcb4a121a2efc14f",
+      "version-date": "2022-09-15",
+      "port-version": 0
+    },
    {
      "git-tree": "5953c7aee01e5c0972a8eb97fbb763c74b60c49c",
      "version-date": "2022-01-21",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -333,8 +333,8 @@
      "port-version": 0
    },
    "azure-c-shared-utility": {
-      "baseline": "2022-01-21",
-      "port-version": 3
+      "baseline": "2022-09-15",
+      "port-version": 0
    },
    "azure-core-cpp": {
      "baseline": "1.7.2",
@ -349,8 +349,8 @@
      "port-version": 0
    },
    "azure-iot-sdk-c": {
-      "baseline": "2022-01-21",
-      "port-version": 2
+      "baseline": "2022-09-15",
+      "port-version": 0
    },
    "azure-kinect-sensor-sdk": {
      "baseline": "1.4.1",
@ -401,16 +401,16 @@
      "port-version": 0
    },
    "azure-uamqp-c": {
-      "baseline": "2022-01-21",
-      "port-version": 1
+      "baseline": "2022-09-15",
+      "port-version": 0
    },
    "azure-uhttp-c": {
-      "baseline": "2022-01-21",
-      "port-version": 1
+      "baseline": "2022-09-15",
+      "port-version": 0
    },
    "azure-umqtt-c": {
-      "baseline": "2022-01-21",
-      "port-version": 1
+      "baseline": "2022-09-15",
+      "port-version": 0
    },
    "b64": {
      "baseline": "2.0.0.1",