[fftw3/libwebsockets/uwebsockets] Update to latest release (#20051)

12 files changed, 129 insertions, 107 deletions

diff --git a/ports/fftw3/CONTROL b/ports/fftw3/CONTROL
deleted file mode 100644
index 95c693631..000000000
--- a/ports/fftw3/CONTROL
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: fftw3

-Version: 3.3.8-7

-Homepage: https://www.fftw.org/

-Description: FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).

-

-Feature: openmp

-Description: Builds openmp enabled lib

-

-Feature: sse

-Description: Builds part of the library with sse

-

-Feature: sse2

-Description: Builds part of the library with sse2, sse

-

-Feature: avx

-Description: Builds part of the library with avx, sse2, sse

-

-Feature: avx2

-Description: Builds part of the library with avx2, fma, avx, sse2, sse

-

-Feature: threads

-Description: Enable threads in fftw3

diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake
index 161cff768..c98024695 100644
--- a/ports/fftw3/portfile.cmake
+++ b/ports/fftw3/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_download_distfile(ARCHIVE

-    URLS "http://www.fftw.org/fftw-3.3.8.tar.gz"

-    FILENAME "fftw-3.3.8.tar.gz"

-    SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38

+    URLS "http://www.fftw.org/fftw-3.3.9.tar.gz"

+    FILENAME "fftw-3.3.9.tar.gz"

+    SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf

 )

 

 vcpkg_extract_source_archive_ex(

@@ -16,13 +16,14 @@ vcpkg_extract_source_archive_ex(
 

 vcpkg_check_features(

     OUT_FEATURE_OPTIONS FEATURE_OPTIONS

-    openmp ENABLE_OPENMP

-    threads ENABLE_THREADS

-    threads WITH_COMBINED_THREADS

-    avx2 ENABLE_AVX2

-    avx ENABLE_AVX

-    sse2 ENABLE_SSE2

-    sse ENABLE_SSE

+    FEATURES

+        openmp ENABLE_OPENMP

+        threads ENABLE_THREADS

+        threads WITH_COMBINED_THREADS

+        avx2 ENABLE_AVX2

+        avx ENABLE_AVX

+        sse2 ENABLE_SSE2

+        sse ENABLE_SSE

 )

 

 set(ENABLE_FLOAT_CMAKE fftw3f)

@@ -31,9 +32,8 @@ set(ENABLE_DEFAULT_PRECISION_CMAKE fftw3)
 

 foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION)

     if(PRECISION STREQUAL "ENABLE_LONG_DOUBLE")

-        vcpkg_configure_cmake(

-        SOURCE_PATH ${SOURCE_PATH}

-        PREFER_NINJA

+        vcpkg_cmake_configure(

+        SOURCE_PATH "${SOURCE_PATH}"

         OPTIONS 

             -D${PRECISION}=ON

             -DENABLE_OPENMP=${ENABLE_OPENMP}

@@ -42,9 +42,8 @@ foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION)
             -DBUILD_TESTS=OFF

         )

     else()

-        vcpkg_configure_cmake(

-        SOURCE_PATH ${SOURCE_PATH}

-        PREFER_NINJA

+        vcpkg_cmake_configure(

+        SOURCE_PATH "${SOURCE_PATH}"

         OPTIONS 

             -D${PRECISION}=ON

             ${FEATURE_OPTIONS}

@@ -52,25 +51,22 @@ foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION)
         )

     endif()

 

-    vcpkg_install_cmake()

+    vcpkg_cmake_install()

 

     vcpkg_copy_pdbs()

 

-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/${${PRECISION}_CMAKE})

+    vcpkg_cmake_config_fixup(PACKAGE_NAME ${${PRECISION}_CMAKE} CONFIG_PATH lib/cmake)

 endforeach()

 

-file(READ ${SOURCE_PATH}/api/fftw3.h _contents)

+file(READ "${SOURCE_PATH}/api/fftw3.h" _contents)

 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

     string(REPLACE "defined(FFTW_DLL)" "0" _contents "${_contents}")

 else()

     string(REPLACE "defined(FFTW_DLL)" "1" _contents "${_contents}")

 endif()

-file(WRITE ${SOURCE_PATH}/include/fftw3.h "${_contents}")

+file(WRITE "${SOURCE_PATH}/include/fftw3.h" "${_contents}")

 

-# Cleanup

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

 

-# Handle copyright

-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fftw3)

-file(RENAME ${CURRENT_PACKAGES_DIR}/share/fftw3/COPYING ${CURRENT_PACKAGES_DIR}/share/fftw3/copyright)

+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json
new file mode 100644
index 000000000..646e2627e
--- /dev/null
+++ b/ports/fftw3/vcpkg.json
@@ -0,0 +1,36 @@
+{
+  "name": "fftw3",
+  "version-string": "3.3.9",
+  "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).",
+  "homepage": "https://www.fftw.org/",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "avx": {
+      "description": "Builds part of the library with avx, sse2, sse"
+    },
+    "avx2": {
+      "description": "Builds part of the library with avx2, fma, avx, sse2, sse"
+    },
+    "openmp": {
+      "description": "Builds openmp enabled lib"
+    },
+    "sse": {
+      "description": "Builds part of the library with sse"
+    },
+    "sse2": {
+      "description": "Builds part of the library with sse2, sse"
+    },
+    "threads": {
+      "description": "Enable threads in fftw3"
+    }
+  }
+}
diff --git a/ports/libwebsockets/export-include-path.patch b/ports/libwebsockets/export-include-path.patch
index 562c71285..fe589ca3c 100644
--- a/ports/libwebsockets/export-include-path.patch
+++ b/ports/libwebsockets/export-include-path.patch
@@ -1,48 +1,37 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 06d9eec..5606601 100644
+index f9b5557..ebc624b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -840,8 +840,8 @@ else()
-   set(DEF_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/cmake/libwebsockets)
- endif()
+@@ -1045,8 +1045,8 @@ file(RELATIVE_PATH
+     "${LWS_ABSOLUTE_INSTALL_CMAKE_DIR}"
+     "${LWS_ABSOLUTE_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the cmake dir.
  
 -if (DEFINED REL_INCLUDE_DIR)
 -    set(LWS__INCLUDE_DIRS "\${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}")
 +if (1)
 +    set(LWS__INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../include")
- endif() 
- 
- configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in
-@@ -853,10 +853,6 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config-version.cmake.in
-                 ${PROJECT_BINARY_DIR}/libwebsockets-config-version.cmake 
-                 @ONLY)
+ endif()
  
--# Generate the config file for the build-tree.
--set(LWS__INCLUDE_DIRS 
--    "${PROJECT_SOURCE_DIR}/lib"
--    "${PROJECT_BINARY_DIR}")
- set(LIBWEBSOCKETS_INCLUDE_DIRS ${LWS__INCLUDE_DIRS} CACHE PATH "Libwebsockets include directories")
  configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in
-                 ${PROJECT_BINARY_DIR}/libwebsockets-config.cmake 
 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 82b9170..eab2bf0 100644
+index 85b43d5..724f0b7 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -153,7 +153,7 @@ if (LWS_WITH_STATIC)
- 	add_library(websockets STATIC ${SOURCES})# ${HDR_PUBLIC})
- 	set_target_properties(websockets PROPERTIES LINKER_LANGUAGE C)
- 	list(APPEND LWS_LIBRARIES websockets)
+@@ -164,7 +164,7 @@ if (LWS_WITH_STATIC)
+ 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
+ 		$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>
+ 	)
 -	target_include_directories(websockets PRIVATE ${LWS_LIB_BUILD_INC_PATHS})
 +	target_include_directories(websockets PRIVATE $<BUILD_INTERFACE:${LWS_LIB_BUILD_INC_PATHS}> PUBLIC $<INSTALL_INTERFACE:include>)
+ 	target_compile_definitions(websockets PRIVATE LWS_BUILDING_STATIC)
  
  	if (WIN32)
- 		# Windows uses the same .lib ending for static libraries and shared
-@@ -173,7 +173,7 @@ if (LWS_WITH_SHARED)
- 	add_library(websockets_shared SHARED ${SOURCES} ${RESOURCES})# ${HDR_PUBLIC})
- 	set_target_properties(websockets_shared PROPERTIES LINKER_LANGUAGE C)
- 	list(APPEND LWS_LIBRARIES websockets_shared)
+@@ -190,7 +190,7 @@ if (LWS_WITH_SHARED)
+ 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
+ 		$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>
+ 	)
 -	target_include_directories(websockets_shared PRIVATE ${LWS_LIB_BUILD_INC_PATHS})
 +	target_include_directories(websockets_shared PRIVATE $<BUILD_INTERFACE:${LWS_LIB_BUILD_INC_PATHS}> PUBLIC $<INSTALL_INTERFACE:include>)
+ 	target_compile_definitions(websockets_shared PRIVATE LWS_BUILDING_SHARED)
  
  	# We want the shared lib to be named "libwebsockets"
- 	# not "libwebsocket_shared".
diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake
index c617c96ab..4bbaefbb8 100644
--- a/ports/libwebsockets/portfile.cmake
+++ b/ports/libwebsockets/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO warmcat/libwebsockets
-    REF 736f0739ed8c75db0e29c7678b5a9194e957c347 # v4.1.6
-    SHA512 7632439f8cdc87d275a0524b87ea5cd19c3401c1b7bb7fcf673eef3e1ab36c0ec022d2dce050d07bc106af3166575882507a56ac829a4361329311484dc2c5c4
+    REF 8d605f0649ed1ab6d27a443c7688598ea21fdb75 # v4.2.2
+    SHA512 824b7e7eded0fea41a1c22da8453b97a1ffd0f416e2d2ee3a23f799cfd449d1d0cc2f58de19a7d5dbd336e0ebceec16dd2a78cb80519d02bb49133047f99a9e2
     HEAD_REF master
     PATCHES
         fix-dependency-libuv.patch
@@ -132,9 +132,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LWS_WITH_SHARED)
 # option(LWS_WITH_LWS_DSH "Support lws_dsh_t Disordered Shared Heap" OFF)
 ##
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DLWS_WITH_STATIC=${LWS_WITH_STATIC}
         -DLWS_WITH_SHARED=${LWS_WITH_SHARED}
@@ -150,31 +149,33 @@ vcpkg_configure_cmake(
     # OPTIONS_DEBUG -DDEBUGGABLE=1
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 if (VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+    vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
 else()
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libwebsockets)
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libwebsockets)
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/libwebsockets-test-server)
-file(READ ${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake LIBWEBSOCKETSCONFIG_CMAKE)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libwebsockets-test-server")
+file(READ "${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake" LIBWEBSOCKETSCONFIG_CMAKE)
 string(REPLACE "/../include" "/../../include" LIBWEBSOCKETSCONFIG_CMAKE "${LIBWEBSOCKETSCONFIG_CMAKE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake "${LIBWEBSOCKETSCONFIG_CMAKE}")
-file(READ ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake LIBWEBSOCKETSTARGETSDEBUG_CMAKE)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake" "${LIBWEBSOCKETSCONFIG_CMAKE}")
+file(READ "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake" LIBWEBSOCKETSTARGETSDEBUG_CMAKE)
 string(REPLACE "websockets_static.lib" "websockets.lib" LIBWEBSOCKETSTARGETSDEBUG_CMAKE "${LIBWEBSOCKETSTARGETSDEBUG_CMAKE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake "${LIBWEBSOCKETSTARGETSDEBUG_CMAKE}")
-file(READ ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake LIBWEBSOCKETSTARGETSRELEASE_CMAKE)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake" "${LIBWEBSOCKETSTARGETSDEBUG_CMAKE}")
+file(READ "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake" LIBWEBSOCKETSTARGETSRELEASE_CMAKE)
 string(REPLACE "websockets_static.lib" "websockets.lib" LIBWEBSOCKETSTARGETSRELEASE_CMAKE "${LIBWEBSOCKETSTARGETSRELEASE_CMAKE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake "${LIBWEBSOCKETSTARGETSRELEASE_CMAKE}")
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake" "${LIBWEBSOCKETSTARGETSRELEASE_CMAKE}")
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     if (VCPKG_TARGET_IS_WINDOWS)
-        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/websockets_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/websockets.lib)
-        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/websockets_static.lib ${CURRENT_PACKAGES_DIR}/lib/websockets.lib)
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/websockets_static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/websockets.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/lib/websockets_static.lib" "${CURRENT_PACKAGES_DIR}/lib/websockets.lib")
     endif()
 endif ()
+
 vcpkg_copy_pdbs()
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libwebsockets/vcpkg.json b/ports/libwebsockets/vcpkg.json
index 897f6772b..e33c30a2e 100644
--- a/ports/libwebsockets/vcpkg.json
+++ b/ports/libwebsockets/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libwebsockets",
-  "version-semver": "4.1.6",
-  "port-version": 2,
+  "version-semver": "4.2.2",
   "description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.",
   "homepage": "https://github.com/warmcat/libwebsockets",
   "supports": "!(arm | uwp)",
@@ -9,6 +8,14 @@
     "libuv",
     "openssl",
     "pthreads",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib"
   ]
 }
diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake
index 9c4150126..220a20207 100644
--- a/ports/uwebsockets/portfile.cmake
+++ b/ports/uwebsockets/portfile.cmake
@@ -1,12 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO uNetworking/uWebSockets
-    REF b7c82d791010bd4c9b45528846f95b9886e9f984 # v19.2.0
-    SHA512 54bd50d3e16e6d78081c1d780ddcb67668ab6d54d90fd99531522833b1a49796c94cc4dbe4e3685a3b1b2372fe6c08e4f84b3c0da061587da198e4076da4c3c1
+    REF d40c2d1a3119e5855ddc187f6647d79fd2229e08 # v19.5.0
+    SHA512 c99df55c1e557ba2ea035a4774988d76b0d5d239b42b5cccd267d7d0344aa84d5134efb960f46520f246d8bd7b2034f3626942e07a080e8493e9664dd2de5f49
     HEAD_REF master
 )
 
-file(COPY ${SOURCE_PATH}/src  DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(RENAME ${CURRENT_PACKAGES_DIR}/include/src ${CURRENT_PACKAGES_DIR}/include/uwebsockets/)
+file(COPY "${SOURCE_PATH}/src"  DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(RENAME "${CURRENT_PACKAGES_DIR}/include/src" "${CURRENT_PACKAGES_DIR}/include/uwebsockets")
 
-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)
diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json
index 642458b0b..e886f53a1 100644
--- a/ports/uwebsockets/vcpkg.json
+++ b/ports/uwebsockets/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "uwebsockets",
-  "version": "19.2.0",
+  "version": "19.5.0",
   "description": "Simple, secure & standards compliant web I/O for the most demanding of applications",
   "homepage": "https://github.com/uWebSockets/uWebSockets",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 4e6b6ec49..31586bad9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2041,7 +2041,7 @@
       "port-version": 1
     },
     "fftw3": {
-      "baseline": "3.3.8-7",
+      "baseline": "3.3.9",
       "port-version": 0
     },
     "fftwpp": {
@@ -3821,8 +3821,8 @@
       "port-version": 3
     },
     "libwebsockets": {
-      "baseline": "4.1.6",
-      "port-version": 2
+      "baseline": "4.2.2",
+      "port-version": 0
     },
     "libxdiff": {
       "baseline": "0.23",
@@ -6653,7 +6653,7 @@
       "port-version": 0
     },
     "uwebsockets": {
-      "baseline": "19.2.0",
+      "baseline": "19.5.0",
       "port-version": 0
     },
     "v-hacd": {
diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json
index 5abf3a408..2bb735e80 100644
--- a/versions/f-/fftw3.json
+++ b/versions/f-/fftw3.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "28c3b35930f17c8ec3e05cd24d582e81df0c9dce",
+      "version-string": "3.3.9",
+      "port-version": 0
+    },
+    {
       "git-tree": "6fd8682a3c82db155e040aa24a3a396b5c6c1332",
       "version-string": "3.3.8-7",
       "port-version": 0
diff --git a/versions/l-/libwebsockets.json b/versions/l-/libwebsockets.json
index 765c8cb00..50ea7bdaa 100644
--- a/versions/l-/libwebsockets.json
+++ b/versions/l-/libwebsockets.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "d3336ccb948156f48c50ee15980a5bb56374d3b3",
+      "version-semver": "4.2.2",
+      "port-version": 0
+    },
+    {
       "git-tree": "fa509ae21580082ef8aea72e394bb7005f689371",
       "version-semver": "4.1.6",
       "port-version": 2
diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json
index a31b28fc3..8b5f54baa 100644
--- a/versions/u-/uwebsockets.json
+++ b/versions/u-/uwebsockets.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "2f80ce22f9718454ab35607c0a65138b65c06fe7",
+      "version": "19.5.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "b01131e5a07feb1613415677213d377995bfdc40",
       "version": "19.2.0",
       "port-version": 0