azure-iot-sdk-c: Update to latest LTS packages

Signed-off-by: Scott Ware <[email protected]>

Author: srware

recipes-azure/azure-c-shared-utility/azure-c-shared-utility.inc

@@ -1,4 +1,4 @@
-inherit cmake
+inherit cmake pkgconfig
 
 DEPENDS = "\
     azure-macro-utils-c \
@@ -13,10 +13,9 @@ RDEPENDS:${PN} = "\
 "
 
 SRC_URI += "\
-    file://Fix-packaging-issues.patch \
-    file://Use-pkg-config-to-find-libs.patch \
-    file://0001-hmac.c-fix-compile-error-for-digest-pointer-vs-array.patch \
-    file://0001-Fix-openssl-3.x-compatibility.patch \
+    file://0001-Fix-packaging-issues.patch \
+    file://0002-Use-pkg-config-to-find-libs.patch \
+    file://0003-Fix-include-paths.patch \
 "
 
 S = "${WORKDIR}/git"

recipes-azure/azure-c-shared-utility/azure-c-shared-utility_git.bb

@@ -4,13 +4,13 @@ HOMEPAGE = "https://github.com/Azure/azure-c-shared-utility"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4283671594edec4c13aeb073c219237a"
 
-BRANCH = "lts_07_2020"
+BRANCH = "master"
 SRC_URI = "\
     git://github.com/Azure/azure-c-shared-utility.git;protocol=https;branch=${BRANCH} \
 "
 
-SRCREV = "85fe8977e98cc0e84609e9250ba34b0d455b96df"
+SRCREV = "ceeafc67441b5b6a6d3ea32cf4bf3bcb3fa760af"
 
-PV = "${BRANCH}+git${SRCPV}"
+PV = "1.1.12+git${SRCPV}"
 
 require ${BPN}.inc

recipes-azure/azure-c-shared-utility/files/0001-Fix-openssl-3.x-compatibility.patch

@@ -1,7 +1,7 @@
-From b26fc183207b583d5fb7f60015bb46752cd60706 Mon Sep 17 00:00:00 2001
+From 6141c65ed260d46fab602d8fe5a84d143f24370e Mon Sep 17 00:00:00 2001
 From: Scott Ware <[email protected]>
-Date: Tue, 7 Apr 2020 20:55:05 +0100
-Subject: [PATCH 1/2] Fix packaging issues
+Date: Sun, 21 Apr 2024 21:52:22 +0100
+Subject: [PATCH] Fix packaging issues
 
 Upstream-Status: Pending
 
@@ -11,7 +11,7 @@ Signed-off-by: Scott Ware <[email protected]>
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 263974b..5251ffe 100644
+index 85220955..00e79a95 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -11,6 +11,9 @@ project(azure_c_shared_utility)
@@ -24,7 +24,7 @@ index 263974b..5251ffe 100644
  # Include the common build rules for the C SDK
  include(configs/azure_iot_build_rules.cmake)
 
-@@ -487,7 +490,14 @@ if(${build_as_dynamic})
+@@ -519,7 +522,14 @@ if(${build_as_dynamic})
          ${source_h_files}
          ${def_files}
      )
@@ -40,6 +40,3 @@ index 263974b..5251ffe 100644
  endif()
 
  set(aziotsharedutil_target_libs)
--- 
-2.7.4
-

recipes-azure/azure-c-shared-utility/files/Fix-packaging-issues.patch renamed to recipes-azure/azure-c-shared-utility/files/0001-Fix-packaging-issues.patch

@@ -1,31 +1,21 @@
-From fea2b8280b0889b5c03f628c498cae7125f2a64c Mon Sep 17 00:00:00 2001
+From 3fe99f466679a9876cd264f7a07f1ca37fe6c15f Mon Sep 17 00:00:00 2001
 From: Scott Ware <[email protected]>
-Date: Tue, 7 Apr 2020 20:59:53 +0100
+Date: Mon, 22 Apr 2024 09:33:47 +0100
 Subject: [PATCH] Use pkg-config to find libs
 
-Signed-off-by: Scott Ware <[email protected]>
-
-Add link options to cmake configs. Other package (such as
-azure-iot-sdk-c) link library of azure-c-shared-utility
-with these options to avoid the following error
-...
-ld: iothub_client/libiothub_client.so.1.4.1: undefined reference to `ERR_load_BIO_strings'
-collect2: error: ld returned 1 exit status
-...
-
-Upstream-Status: Inappropriate [oe specific]
+Upstream-Status: Pending
 
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+Signed-off-by: Scott Ware <scott.r.ware@intel.com>
 ---
- CMakeLists.txt                      | 31 ++++++++++-------------------
+ CMakeLists.txt                      | 30 ++++++++++-------------------
  configs/azure_iot_build_rules.cmake |  5 +++++
- 2 files changed, 15 insertions(+), 21 deletions(-)
+ 2 files changed, 15 insertions(+), 20 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e7078fee..c8c0f9d5 100644
+index 00e79a95..eef28e29 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -116,9 +116,13 @@ if(${use_openssl})
+@@ -126,7 +126,11 @@ if(${use_openssl})
      # If OpenSSL::SSL OR OpenSSL::Crypto are not set then you need to run
      # the find package for openssl
      if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR})
@@ -36,30 +26,35 @@ index e7078fee..c8c0f9d5 100644
 +            pkg_check_modules(CRYPTO libcrypto)
 +        endif()
      endif()
+ 
+     # The block below enables the v1 back-compatibility layer in OpenSSL 3,
+@@ -136,7 +140,7 @@ if(${use_openssl})
+         add_definitions(-DOPENSSL_API_COMPAT=0x10101000L)
+     endif()
+ 
 -    include_directories(${OPENSSL_INCLUDE_DIR})
 +    include_directories(${OPENSSL_INCLUDE_DIR} ${CRYPTO_INCLUDE_DIR})
  endif()
 
  if(${use_applessl})
-@@ -511,26 +515,11 @@ if(${use_http})
+@@ -543,25 +547,11 @@ if(${use_http})
          set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 winhttp)
      else()
          if (NOT use_builtin_httpapi)
--            if (CMAKE_CROSSCOMPILING)
--                # As mentioned at https://cmake.org/Wiki/CMake_Cross_Compiling the
--                # pkg-config tool can not be used by cmake while cross compiling.
--                message(STATUS "Cross compiling not using pkg-config")
--            else()
--                # try pkg-config first
--                find_package(PkgConfig)
--                if(PKG_CONFIG_FOUND)
--                    pkg_check_modules(CURL libcurl)
--                endif()
--            endif()
 -
--            # if that didn't work, try CMake find_package
--            if(NOT CURL_FOUND)
--                find_package(CURL)
+-            # try CMake find_package first
+-            find_package(CURL)
+-
+-            # As mentioned at https://cmake.org/Wiki/CMake_Cross_Compiling the
+-            # pkg-config tool can not be used by cmake while cross compiling.
+-            if (NOT CMAKE_CROSSCOMPILING)
+-                # if find_package didn't work, try pkg-config
+-                if(NOT CURL_FOUND)
+-                    find_package(PkgConfig)
+-                    if(PKG_CONFIG_FOUND)
+-                        pkg_check_modules(CURL libcurl)
+-                    endif()
+-                endif()
 +            find_package(PkgConfig)
 +            if(PKG_CONFIG_FOUND)
 +                pkg_check_modules(CURL libcurl)
@@ -71,7 +66,7 @@ index e7078fee..c8c0f9d5 100644
              include_directories(${CURL_INCLUDE_DIRS})
              set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES})
          endif(NOT use_builtin_httpapi)
-@@ -571,7 +560,7 @@ if(${use_bearssl})
+@@ -602,7 +592,7 @@ if(${use_bearssl})
  endif()
 
  if(${use_openssl})
@@ -81,12 +76,12 @@ index e7078fee..c8c0f9d5 100644
          set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32)
      endif()
 diff --git a/configs/azure_iot_build_rules.cmake b/configs/azure_iot_build_rules.cmake
-index be3e14fe..4f85a2b8 100644
+index 655b7f01..747fd256 100644
 --- a/configs/azure_iot_build_rules.cmake
 +++ b/configs/azure_iot_build_rules.cmake
-@@ -76,6 +76,11 @@ elseif(UNIX) #LINUX OR APPLE
-     if(NOT (IN_OPENWRT OR APPLE))
-         set (CMAKE_C_FLAGS "-D_POSIX_C_SOURCE=200112L ${CMAKE_C_FLAGS}")
+@@ -77,6 +77,11 @@ elseif(UNIX) #LINUX OR APPLE
+         # _XOPEN_SOURCE=500 is required for glibc to expose random and srandom.
+         set (CMAKE_C_FLAGS "-D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=500 ${CMAKE_C_FLAGS}")
      endif()
 +
 +    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lssl -lcrypto")
@@ -96,6 +91,3 @@ index be3e14fe..4f85a2b8 100644
  endif()
 
  enable_testing()
--- 
-2.27.0
-

recipes-azure/azure-c-shared-utility/files/0001-hmac.c-fix-compile-error-for-digest-pointer-vs-array.patch

@@ -0,0 +1,25 @@
+From f63a8f5454f772e3bd87b27e349464d3829dc36d Mon Sep 17 00:00:00 2001
+From: Scott Ware <[email protected]>
+Date: Mon, 22 Apr 2024 13:31:34 +0100
+Subject: [PATCH] Fix include paths
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Ware <[email protected]>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eef28e29..08039dc3 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -726,7 +726,7 @@ install (TARGETS ${targets} EXPORT aziotsharedutilTargets
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot
++    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ )
+ install (FILES ${source_h_files} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azure_c_shared_utility)
+ install (FILES ${micromock_h_files_full_path} ${INSTALL_H_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot)

recipes-azure/azure-c-shared-utility/files/Use-pkg-config-to-find-libs.patch renamed to recipes-azure/azure-c-shared-utility/files/0002-Use-pkg-config-to-find-libs.patch

@@ -7,11 +7,10 @@ DEPENDS = "\
     parson \
 "
 
-SRC_URI += "\
-    file://Fix-cmake-build-issues.patch \
-    file://Use-provided-parson-lib.patch \
-    file://0001-serializer-samples-Disable-devicetwin_simplesample.patch \
-"
+#SRC_URI += "\
+#    file://Fix-cmake-build-issues.patch \
+#    file://Use-provided-parson-lib.patch \
+#"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
@@ -24,22 +23,14 @@ PACKAGECONFIG[mqtt] = "-Duse_mqtt:BOOL=ON, -Duse_mqtt:BOOL=OFF, azure-umqtt-c"
 
 EXTRA_OECMAKE = "\
     -Dbuild_as_dynamic:BOOL=ON \
-    -Dskip_samples:BOOL=OFF \
+    -Dskip_samples:BOOL=ON \
     -Duse_installed_dependencies:BOOL=ON \
     -Dbuild_service_client:BOOL=OFF \
     -Dbuild_provisioning_service_client:BOOL=OFF \
+    -Drun_e2e_tests:BOOL=OFF \
+    -Dhsm_type_sastoken:BOOL=OFF \
 "
 
-do_install:append() {
-    # Install samples
-    for sample in `find ${B} -perm 0755 -type f -path '*/samples/*'`; do
-        if [ ! -e ${D}${bindir} ]; then
-            install -m 0755 -d ${D}${bindir}
-        fi
-        install -m 0755 $sample ${D}${bindir}
-    done
-}
-
 sysroot_stage_all:append () {
     sysroot_stage_dir ${D}${exec_prefix}/cmake ${SYSROOT_DESTDIR}${exec_prefix}/cmake
 }
@@ -48,8 +39,4 @@ FILES:${PN}-dev += "\
     ${exec_prefix}/cmake \
 "
 
-FILES:${PN}-samples += " \
-    ${bindir} \
-"
-
 BBCLASSEXTEND = "native nativesdk"