[paho-mqtt] update to 1.3.14 (#43530)

Signed-off-by: noahknegt <github@noahknegt.com>

ports/paho-mqtt/fix-ODR-libuuid-linux.patch

@@ -1,38 +1,30 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4c06409..29f53c0 100644
+index 16382c1..7e14ab3 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -95,6 +95,12 @@ ADD_LIBRARY(common_obj_static OBJECT ${common_src})
- SET_TARGET_PROPERTIES(common_obj_static PROPERTIES
-     POSITION_INDEPENDENT_CODE ON
-     COMPILE_DEFINITIONS "PAHO_MQTT_STATIC=1")
+@@ -98,6 +98,12 @@ endif()
+ if(PAHO_BUILD_STATIC)
+   add_library(common_obj_static OBJECT ${common_src})
+   set_target_properties(common_obj_static PROPERTIES POSITION_INDEPENDENT_CODE ON)
++  IF(WIN32 OR APPLE)
++  ELSE()
++    find_package(unofficial-libuuid CONFIG REQUIRED)
++    target_link_libraries(common_obj_static PRIVATE unofficial::UUID::uuid)
++    target_compile_definitions(common_obj_static PUBLIC LIBUUID)
++  ENDIF()
+   target_compile_definitions(common_obj_static PRIVATE PAHO_MQTT_STATIC=1)
+ endif()
+ 
+@@ -317,6 +323,12 @@ if(PAHO_WITH_SSL OR PAHO_WITH_LIBRESSL)
+     target_include_directories(common_ssl_obj_static PUBLIC ${SSL_INCLUDE_DIR})
+ 
+     set_property(TARGET common_ssl_obj_static PROPERTY POSITION_INDEPENDENT_CODE ON)
 +    IF(WIN32 OR APPLE)
 +    ELSE()
 +        find_package(unofficial-libuuid CONFIG REQUIRED)
-+        target_link_libraries(common_obj_static PRIVATE unofficial::UUID::uuid)
-+        target_compile_definitions(common_obj_static PUBLIC LIBUUID)
++        target_link_libraries(common_ssl_obj_static PRIVATE unofficial::UUID::uuid)
++        target_compile_definitions(common_ssl_obj_static PUBLIC LIBUUID)
 +    ENDIF()
- ENDIF()
- 
- IF (PAHO_BUILD_SHARED)
-@@ -149,7 +155,6 @@ ENDIF()
- IF (PAHO_BUILD_STATIC)
-     ADD_LIBRARY(paho-mqtt3c-static STATIC $<TARGET_OBJECTS:common_obj_static> MQTTClient.c)
-     ADD_LIBRARY(paho-mqtt3a-static STATIC $<TARGET_OBJECTS:common_obj_static> MQTTAsync.c MQTTAsyncUtils.c)
--
-     TARGET_LINK_LIBRARIES(paho-mqtt3c-static ${LIBS_SYSTEM})
-     TARGET_LINK_LIBRARIES(paho-mqtt3a-static ${LIBS_SYSTEM})
-     IF (NOT WIN32)
-@@ -249,6 +254,12 @@ IF (PAHO_WITH_SSL)
-     	TARGET_INCLUDE_DIRECTORIES(common_ssl_obj_static PUBLIC ${OPENSSL_INCLUDE_DIR})
-     	SET_PROPERTY(TARGET common_ssl_obj_static PROPERTY POSITION_INDEPENDENT_CODE ON)
-     	SET_PROPERTY(TARGET common_ssl_obj_static PROPERTY COMPILE_DEFINITIONS "OPENSSL=1;PAHO_MQTT_STATIC=1")
-+        IF(WIN32 OR APPLE)
-+        ELSE()
-+            find_package(unofficial-libuuid CONFIG REQUIRED)
-+            target_link_libraries(common_ssl_obj_static PRIVATE unofficial::UUID::uuid)
-+            target_compile_definitions(common_ssl_obj_static PUBLIC LIBUUID)
-+        ENDIF()
+     target_compile_definitions(common_ssl_obj_static PRIVATE OPENSSL=1 PAHO_MQTT_STATIC=1)
      
-         ADD_LIBRARY(paho-mqtt3cs-static STATIC $<TARGET_OBJECTS:common_ssl_obj_static> MQTTClient.c SSLSocket.c)
-         ADD_LIBRARY(paho-mqtt3as-static STATIC $<TARGET_OBJECTS:common_ssl_obj_static> MQTTAsync.c MQTTAsyncUtils.c SSLSocket.c)
+     add_library(paho-mqtt3cs-static STATIC

ports/paho-mqtt/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO eclipse/paho.mqtt.c
   REF "v${VERSION}"
-  SHA512 0f436470bcff224461ed3227c8db10914f84bc2dcf76e51b55d4a78b80abaa4e636ac8f7a20e517524625888335c738e975283e5d573ae8d59147aa4de7963fc
+  SHA512 5576ac3531a5c707f92a02cbfb9d60710b42acd99f57bcde311aa224780267a5152e8b92a6b077afab4780ee236d5e0c2a0b8986453439bce4323758b3d4385b
   HEAD_REF master
   PATCHES
     fix-unresolvedsymbol-arm.patch
@@ -12,8 +12,6 @@ vcpkg_from_github(
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PAHO_BUILD_DYNAMIC)
 
-vcpkg_replace_string("${SOURCE_PATH}/src/CMakeLists.txt" [[SET(OPENSSL_ROOT_DIR "" CACHE PATH "Directory containing OpenSSL libraries and includes")]] "")
-
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
   OPTIONS
@@ -38,7 +36,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX)
         [[# Generated by CMake
     include(CMakeFindDependencyMacro)
     find_dependency(OpenSSL)]]
-    )   
+    )
 else()
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/eclipse-paho-mqtt-c/eclipse-paho-mqtt-cConfig.cmake"
         [[# Generated by CMake]]

ports/paho-mqtt/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "paho-mqtt",
-  "version": "1.3.13",
-  "port-version": 1,
+  "version": "1.3.14",
   "description": "Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things",
   "homepage": "https://github.com/eclipse/paho.mqtt.c",
   "license": "EPL-2.0",

versions/baseline.json

@@ -6877,8 +6877,8 @@
       "port-version": 0
     },
     "paho-mqtt": {
-      "baseline": "1.3.13",
-      "port-version": 1
+      "baseline": "1.3.14",
+      "port-version": 0
     },
     "paho-mqttpp3": {
       "baseline": "1.4.1",

versions/p-/paho-mqtt.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "20d2bb397c0b3b632f3bcf6a97175af755148d1e",
+      "version": "1.3.14",
+      "port-version": 0
+    },
     {
       "git-tree": "7ea6a82c6e59b0300a88ba3ce22c81cc0346af9f",
       "version": "1.3.13",