aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Spaith <johngithub@spaith.com>2019-11-21 16:37:42 -0800
committerRobert Schumacher <roschuma@microsoft.com>2019-11-21 16:37:42 -0800
commit4411b9fe677cce470615e8b2b11e698806d9435c (patch)
treee3430b714c218eeea2cc7b5607443141569ab7fd
parent0223359a990c8801c2d444dc699888633dcb480f (diff)
downloadvcpkg-4411b9fe677cce470615e8b2b11e698806d9435c.tar.gz
vcpkg-4411b9fe677cce470615e8b2b11e698806d9435c.zip
[azure-iot-sdk-c] Update public-preview feature to branch with fixed telemetry (#9059)
* Bring sha to public-preview-pnp post telemetry explosion * Updating to latest code * Update version * Pointing to proper public-preview branch * Pointing to SHA post public-preview branch update * [azure-iot-sdk-c] Remove unused patch file
-rw-r--r--ports/azure-iot-sdk-c/CONTROL2
-rw-r--r--ports/azure-iot-sdk-c/cmake-hsm-option.patch20
-rw-r--r--ports/azure-iot-sdk-c/portfile.cmake6
3 files changed, 4 insertions, 24 deletions
diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL
index 047f55c6a..f545665b0 100644
--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@@ -1,5 +1,5 @@
Source: azure-iot-sdk-c
-Version: 2019-10-11.2
+Version: 2019-11-21.1
Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c
Description: A C99 SDK for connecting devices to Microsoft Azure IoT services
diff --git a/ports/azure-iot-sdk-c/cmake-hsm-option.patch b/ports/azure-iot-sdk-c/cmake-hsm-option.patch
deleted file mode 100644
index ea6af5c23..000000000
--- a/ports/azure-iot-sdk-c/cmake-hsm-option.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b2c51de83..5d42dc441 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -121,9 +121,12 @@ if (${use_prov_client})
- set(use_prov_client_core ON)
-
- if ("${hsm_custom_lib}" STREQUAL "")
-- set(hsm_type_x509 ON)
-- set(hsm_type_sastoken ON)
-- set(hsm_type_symm_key ON)
-+ if ((NOT ${hsm_type_x509}) AND (NOT ${hsm_type_sastoken}) AND (NOT ${hsm_type_symm_key}))
-+ # If the cmake option did not explicitly configure an hsm type, then enable them all.
-+ set(hsm_type_x509 ON)
-+ set(hsm_type_sastoken ON)
-+ set(hsm_type_symm_key ON)
-+ endif()
- else()
- set(hsm_type_custom ON)
- endif()
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index 98d051e2b..83f637114 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -6,10 +6,10 @@ if("public-preview" IN_LIST FEATURES)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-iot-sdk-c
- REF d1cdf78b5160af8e08354e102a6b96395eee79e1
- SHA512 0efbfc19e5eef4831b55ded0e8d88e83194bc0f26886841ddc83405c15b7f1bae983e22dc569e22846acd78b843b9e7492883b7c502f4eed92ff80ef45a9942d
+ REF cb2e8d390df56ffa31d08ca0a79ab58ff96160cc
+ SHA512 6798b17d6768b3ccbd0eb66719b50f364cd951736eb71110e2dc9deca054a1566ff88b9e8c5e9b52536e4308cad6cd3cbebff3282c123083e3afaee5535e724b
HEAD_REF public-preview
- PATCHES improve-external-deps.patch cmake-hsm-option.patch
+ PATCHES improve-external-deps.patch
)
else()
vcpkg_from_github(