update ziti-sdk to v0.36.5 (#797)

* update vcpkg baseline to 2023.12.12
* update ziti-sdk-c@0.36.5

---------

Co-authored-by: Shawn Carey <shawn.carey@netfoundry.io>

.github/actions/build/action.yml

@@ -29,9 +29,9 @@ runs:
 
     - uses: lukka/run-vcpkg@v10
       with:
-        # use 2023.06.20 vcpkg baseline,
+        # use 2023.12.12 vcpkg baseline,
         # see https://learn.microsoft.com/en-us/vcpkg/users/examples/versioning.getting-started#builtin-baseline
-        vcpkgGitCommitId: 'f6a5d4e8eb7476b8d7fc12a56dff300c1c986131'
+        vcpkgGitCommitId: 'c8696863d371ab7f46e213d8f5ca923c4aef2a00'
 
     - uses: lukka/run-cmake@v10.6 # pin version to avoid failed glibc dependency on ubuntu 20 runners. go back to @latest when ubuntu 22+ is adopted for runner os.
       name: Configure CMake

.github/actions/openziti-tunnel-build-action/redhat-7/Dockerfile

@@ -39,7 +39,7 @@ ENV VCPKG_ROOT=/usr/local/vcpkg
 ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
 
 RUN cd /usr/local \
-    && git clone --branch 2023.06.20 https://github.com/microsoft/vcpkg \
+    && git clone --branch 2023.12.12 https://github.com/microsoft/vcpkg \
     && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
 
 COPY ./entrypoint.sh /root/

.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile

@@ -42,7 +42,7 @@ ENV VCPKG_ROOT=/usr/local/vcpkg
 ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
 
 RUN cd /usr/local \
-    && git clone --branch 2023.06.20 https://github.com/microsoft/vcpkg \
+    && git clone --branch 2023.12.12 https://github.com/microsoft/vcpkg \
     && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
 
 WORKDIR /github/workspace

.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile

@@ -43,7 +43,7 @@ ENV VCPKG_ROOT=/usr/local/vcpkg
 ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
 
 RUN cd /usr/local \
-    && git clone --branch 2023.06.20 https://github.com/microsoft/vcpkg \
+    && git clone --branch 2023.12.12 https://github.com/microsoft/vcpkg \
     && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics \
     && chmod -R ugo+rwX /usr/local/vcpkg
 

.github/actions/openziti-tunnel-build-action/ubuntu-16.04/Dockerfile

@@ -41,7 +41,7 @@ ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
 
 RUN cd /usr/local \
     && git config --global advice.detachedHead false \
-    && git clone --branch 2023.06.20 https://github.com/microsoft/vcpkg \
+    && git clone --branch 2023.12.12 https://github.com/microsoft/vcpkg \
     && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
 
 WORKDIR /github/workspace

.github/actions/openziti-tunnel-build-action/ubuntu-18.04/Dockerfile

@@ -54,7 +54,7 @@ ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
 
 RUN cd /usr/local \
     && git config --global advice.detachedHead false \
-    && git clone --branch 2023.06.20 https://github.com/microsoft/vcpkg \
+    && git clone --branch 2023.12.12 https://github.com/microsoft/vcpkg \
     && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
 
 WORKDIR /github/workspace

.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile

@@ -55,7 +55,7 @@ ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
 
 RUN cd /usr/local \
     && git config --global advice.detachedHead false \
-    && git clone --branch 2023.06.20 https://github.com/microsoft/vcpkg \
+    && git clone --branch 2023.12.12 https://github.com/microsoft/vcpkg \
     && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
 
 COPY ./entrypoint.sh /root/

.github/actions/openziti-tunnel-build-action/ubuntu-22.04/Dockerfile

@@ -55,7 +55,7 @@ ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
 
 RUN cd /usr/local \
     && git config --global advice.detachedHead false \
-    && git clone --branch 2023.06.20 https://github.com/microsoft/vcpkg \
+    && git clone --branch 2023.12.12 https://github.com/microsoft/vcpkg \
     && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
 
 COPY ./entrypoint.sh /root/

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)
 
 
 set(ZITI_SDK_DIR "" CACHE FILEPATH "developer option: use local ziti-sdk-c checkout")
-set(ZITI_SDK_VERSION "0.35.12" CACHE STRING "ziti-sdk-c version or branch to use")
+set(ZITI_SDK_VERSION "0.36.5" CACHE STRING "ziti-sdk-c version or branch to use")
 
 # if TUNNEL_SDK_ONLY then don't descend into programs/ziti-edge-tunnel
 option(TUNNEL_SDK_ONLY "build only ziti-tunnel-sdk (without ziti)" OFF)
@@ -119,19 +119,6 @@ message("cross-compiling: ${CMAKE_CROSSCOMPILING}")
 link_directories(${CMAKE_BINARY_DIR}/lib)
 
 add_subdirectory(deps)
-
-find_package(libuv CONFIG QUIET)
-if (libuv_FOUND)
-    if (TARGET uv_a)
-        set(tunnel_libuv_lib uv_a)
-    else()
-        set(tunnel_libuv_lib uv)
-    endif()
-else()
-    find_path(tunnel_libuv_include_dir NAMES uv.h)
-    find_library(tunnel_libuv_lib uv_a NAMES uv)
-endif()
-
 add_subdirectory(lib/ziti-tunnel)
 
 if(NOT TUNNEL_SDK_ONLY)

lib/ziti-tunnel/CMakeLists.txt

@@ -46,7 +46,6 @@ target_include_directories(ziti-tunnel-sdk-c
 target_link_libraries(ziti-tunnel-sdk-c
         PUBLIC ziti
         PUBLIC lwipcore
-        PUBLIC ${tunnel_libuv_lib}
         )
 
 #copy relevant .h files to the include folder

programs/tests/CMakeLists.txt

@@ -3,8 +3,24 @@ project(tests)
 add_executable(ziti-edge-tunnel-test ziti-edge-tunnel-test.c)
 set_property(TARGET ziti-edge-tunnel-test PROPERTY C_STANDARD 11)
 
+find_package(libuv CONFIG QUIET)
+if (libuv_FOUND)
+        # newer libuv versions have proper namespacing
+        if (TARGET libuv::uv_a)
+                set(libuv_lib libuv::uv_a)
+        elseif (TARGET uv_a)
+                set(libuv_lib uv_a)
+        elseif (TARGET libuv::uv)
+                set(libuv_lib libuv::uv)
+        else()
+                set(libuv_lib uv)
+        endif()
+else()
+        find_library(libuv_lib uv_a NAMES uv)
+endif()
+
 target_link_libraries(ziti-edge-tunnel-test
-        PUBLIC ${tunnel_libuv_lib}
+        PUBLIC ${libuv_lib}
         )
 
 install(TARGETS ziti-edge-tunnel-test

vcpkg.json

@@ -20,5 +20,5 @@
       ]
     }
   },
-  "builtin-baseline": "f6a5d4e8eb7476b8d7fc12a56dff300c1c986131"
+  "builtin-baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00"
 }