[usockets] Update to 0.8.1 (#20517)

* Update usockets to 0.8.1

* Update CI baseline

* Minor tweaks

* Update git-tree hash

Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

5 files changed, 38 insertions, 25 deletions

diff --git a/ports/usockets/CMakeLists.txt b/ports/usockets/CMakeLists.txt
index a57ce6b08..69a742db1 100644
--- a/ports/usockets/CMakeLists.txt
+++ b/ports/usockets/CMakeLists.txt
@@ -3,7 +3,6 @@ project(uSockets C CXX)
 
 option(INSTALL_HEADERS "Install header files" ON)
 
-# To enable this feature, OpenSSL 1.1+ is required and is currently disabled due to issue 4267
 if (CMAKE_USE_OPENSSL)
     find_package(OpenSSL REQUIRED)
     set(USE_OPENSSL "-DUSE_OPENSSL -DLIBUS_USE_OPENSSL")
@@ -24,7 +23,7 @@ set(USOCKETS_EXT_INCLUDE_DIR )
 set(USOCKETS_EXT_LIBS )
 
 if (CMAKE_USE_OPENSSL)
-    # It requires C++17 or later, see https://github.com/uNetworking/uSockets/blob/master/Makefile#L43
+    # It requires C++17 or later, see https://github.com/uNetworking/uSockets/blob/0ebdde0601cc82349fc11a7c4bbb6dc5c9f28f42/Makefile#L55
     set(CMAKE_CXX_STANDARD 17)
     find_package(OpenSSL REQUIRED)
     file(GLOB SSL_SOURCES src/crypto/*.c*)
diff --git a/ports/usockets/portfile.cmake b/ports/usockets/portfile.cmake
index cdb75c5d3..867a4e7a9 100644
--- a/ports/usockets/portfile.cmake
+++ b/ports/usockets/portfile.cmake
@@ -1,38 +1,39 @@
-IF (NOT VCPKG_TARGET_IS_LINUX)
+if(NOT VCPKG_TARGET_IS_LINUX)
    set(USE_LIBUV ON)
-EndIF ()
+endif()
+
+if ("network" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS)
+    message(FATAL_ERROR "Feature 'network' is only supported on Windows")
+endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO uNetworking/uSockets
-    REF 5440dbac79bd76444175b76ee95dfcade12a6aac # 0.7.1
-    SHA512 d4827982a288c81edfcb167cfa6ee8fe11bbae90d25ed9086c006cf6098dfad8b6b910f8fb93ecc67fbea76452627dd4666c7ae3d74fb20112f8e22f7091ec11
+    REF v0.8.1
+    SHA512 B3AD6387E20731831A3A6086D7DE320CCD8F720FAD3237B65EE165236E3F30CBEC3E3B1384BF53BF0F274D7E57665DE79E3244F841455D2ADAFBF954B453437F
     HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-if ("network" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS)
-    message(FATAL_ERROR "Feature network only support Windows")
-endif()
-
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    ssl CMAKE_USE_OPENSSL
-    event CMAKE_USE_EVENT
-    network CMAKE_USE_NETWORK
+    FEATURES
+        ssl CMAKE_USE_OPENSSL
+        event CMAKE_USE_EVENT
+        network CMAKE_USE_NETWORK
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS ${FEATURE_OPTIONS}
-        -DLIBUS_USE_LIBUV=${USE_LIBUV}
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        "-DLIBUS_USE_LIBUV=${USE_LIBUV}"
     OPTIONS_DEBUG
         -DINSTALL_HEADERS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 vcpkg_copy_pdbs()
diff --git a/ports/usockets/vcpkg.json b/ports/usockets/vcpkg.json
index 49a663602..9300c6e94 100644
--- a/ports/usockets/vcpkg.json
+++ b/ports/usockets/vcpkg.json
@@ -1,10 +1,18 @@
 {
   "name": "usockets",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "description": "Miniscule cross-platform eventing, networking & crypto for async applications",
   "homepage": "https://github.com/uNetworking/uSockets",
   "dependencies": [
-    "libuv"
+    "libuv",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "features": {
     "event": {
diff --git a/versions/baseline.json b/versions/baseline.json
index d144a49ee..cdbb9f26c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6841,7 +6841,7 @@
       "port-version": 1
     },
     "usockets": {
-      "baseline": "0.7.1",
+      "baseline": "0.8.1",
       "port-version": 0
     },
     "usrsctp": {
diff --git a/versions/u-/usockets.json b/versions/u-/usockets.json
index f610eb9bc..efac4caed 100644
--- a/versions/u-/usockets.json
+++ b/versions/u-/usockets.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "de62ce303388342f83a490f69bdb92ec41ecc0f2",
+      "version": "0.8.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "ec6a7f57141a0df8d899f38374682a87f381d1ed",
       "version": "0.7.1",
       "port-version": 0