[Folly, fizz, wangle, proxygen, fbthrift, mvfst] Update to latest version (#22967)

* Update folly * Update wangle * Update fizz * Version * Fix patch * Fix patch * version * Fix error in rsocket * Fix patch * Fix patch * version vor rsocket * Update fbthrift * fbthrift version * Fix fbthrift * Fix fbthreft version * fbthrift: fix empty dir * fbthrift: update version * Update mvfst * Update proxygen * Update hashes * update version * remove unused patchfiles * Fix deprecated cmake functions * format and version * version * rsocket: fix version * rsocket: update port version * fix version * fix version * update version * restore version * update port version * update version * fix port version * version * remove v from version string * version * Add quotes * version
2022-02-09 22:05:38 +01:00 · 2022-02-09 22:05:38 +01:00 · 77c11ffd59
--- a/ports/fbthrift/fix-sodium-target.patch
+++ b/ports/fbthrift/fix-sodium-target.patch
@ -1,16 +0,0 @@
-diff --git a/build/fbcode_builder/CMake/FindSodium.cmake b/build/fbcode_builder/CMake/FindSodium.cmake
-index c664ccbe3..3c3f1245c 100644
--- a/build/fbcode_builder/CMake/FindSodium.cmake
-+++ b/build/fbcode_builder/CMake/FindSodium.cmake
-@@ -254,7 +254,10 @@ if(sodium_USE_STATIC_LIBS)
- else()
-     set(_LIB_TYPE SHARED)
- endif()
-add_library(sodium ${_LIB_TYPE} IMPORTED)
-+
-+if(NOT TARGET sodium)
-+    add_library(sodium ${_LIB_TYPE} IMPORTED)
-+endif()
- 
- set_target_properties(sodium PROPERTIES
-     INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}"
--- a/ports/fbthrift/fix-zlib.patch
+++ b/ports/fbthrift/fix-zlib.patch
@ -1,100 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 150671504a9..7b248a0105e 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,7 +106,7 @@ if(lib_only OR build_all)
-   find_package(fizz CONFIG REQUIRED)
-   find_package(fmt CONFIG REQUIRED)
-   find_package(wangle CONFIG REQUIRED)
-  find_package(Zlib REQUIRED)
-+  find_package(ZLIB REQUIRED)
-   find_package(Zstd REQUIRED)
-   # https://cmake.org/cmake/help/v3.9/module/FindThreads.html
-   set(THREADS_PREFER_PTHREAD_FLAG ON)
-@@ -115,7 +115,6 @@ if(lib_only OR build_all)
-     ${LIBGFLAGS_INCLUDE_DIR}
-     ${GLOG_INCLUDE_DIRS}
-     ${OPENSSL_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIRS}
-     ${ZSTD_INCLUDE_DIRS}
-     ${Boost_INCLUDE_DIRS}
-   )
-diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in
-index 69b29b948c5..e1297ed18c3 100644
--- a/thrift/cmake/FBThriftConfig.cmake.in
-+++ b/thrift/cmake/FBThriftConfig.cmake.in
-@@ -28,6 +28,8 @@ else()
-   set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1")
- endif()
- 
-+find_dependency(ZLIB REQUIRED)
-+
- if (NOT TARGET FBThrift::thriftcpp2)
-   include("${FBTHRIFT_CMAKE_DIR}/FBThriftTargets.cmake")
- endif()
-diff --git a/thrift/cmake/FindZlib.cmake b/thrift/cmake/FindZlib.cmake
-deleted file mode 100644
-index c15525b411f..00000000000
--- a/thrift/cmake/FindZlib.cmake
-+++ /dev/null
-@@ -1,46 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# - Try to find Facebook zstd library
-# This will define
-# ZLIB_FOUND
-# ZLIB_INCLUDE_DIR
-# ZLIB_LIBRARIES
-#
-
-find_path(
-  ZLIB_INCLUDE_DIRS zlib.h
-  HINTS
-      $ENV{ZLIB_ROOT}/include
-      ${ZLIB_ROOT}/include
-)
-
-find_library(
-    ZLIB_LIBRARIES z zlib
-    HINTS
-        $ENV{ZLIB_ROOT}/lib
-        ${ZLIB_ROOT}/lib
-)
-
-# For some reason ZLIB_FOUND is never marked as TRUE
-set(ZLIB_FOUND TRUE)
-mark_as_advanced(ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Zstd ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES)
-
-if(ZLIB_FOUND AND NOT ZLIB_FIND_QUIETLY)
-    message(STATUS "ZLIB: ${ZLIB_INCLUDE_DIRS}")
-endif()
-diff --git a/thrift/lib/cpp/CMakeLists.txt b/thrift/lib/cpp/CMakeLists.txt
-index 681622594c9..3df0b5717db 100644
--- a/thrift/lib/cpp/CMakeLists.txt
-+++ b/thrift/lib/cpp/CMakeLists.txt
-@@ -77,8 +77,8 @@ target_link_libraries(
-     thrift-core
-     rpcmetadata
-     Folly::folly
-+    ZLIB::ZLIB
-     ${OPENSSL_LIBRARIES}
-    ${ZLIB_LIBRARIES}
-     ${ZSTD_LIBRARIES}
- )
- 
--- a/ports/fbthrift/portfile.cmake
+++ b/ports/fbthrift/portfile.cmake
@ -4,51 +4,48 @@ vcpkg_find_acquire_program(BISON)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/fbthrift
-    REF v2021.06.14.00
-    SHA512 e59465adcd57722626e5a4407529b164472cde3942bd100b3d6e92c5057f88f1a8544b7181a01e05ed3077ffd2b3811b687aa6741d08aedef6b79aea02305798
+    REF v2022.01.31.00
+    SHA512 159457398fdc0c89c34364b8a89068127c3519ce35af349776016e0ae37ae9508689853e0e371c2065fd715451f466e37c7e3799e054eca02cbc4717809150ab
    HEAD_REF master
-    PATCHES
-        fix-sodium-target.patch # fixed in master
-        fix-zlib.patch # fixed in master
 )

-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
    OPTIONS
        -DBISON_EXECUTABLE=${BISON}
        -DFLEX_EXECUTABLE=${FLEX}
 )

-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fbthrift)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fbthrift)

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

 # There should be no empty directories in vcpkg/packages/fbthrift_x64-linux
 file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/server/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/common/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/core/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/benchmark
-    ${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/server/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/common/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/core/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/visitation/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/benchmark"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation"
 )

 vcpkg_copy_tools(TOOL_NAMES thrift1 AUTO_CLEAN)
 vcpkg_copy_pdbs()

 # Handle copyright
-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)
--- a/ports/fbthrift/vcpkg.json
+++ b/ports/fbthrift/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "fbthrift",
-  "version-string": "2021.06.14.00",
-  "port-version": 1,
+  "version-string": "2022.01.31.00",
  "description": "Facebook's branch of Apache Thrift, including a new C++ server.",
  "homepage": "https://github.com/facebook/fbthrift",
  "supports": "x64",
@ -18,6 +17,14 @@
    "gflags",
    "glog",
    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
    "wangle",
    "zlib",
    "zstd"
--- a/ports/fizz/0001-fix-libsodium.patch
+++ b/ports/fizz/0001-fix-libsodium.patch
@ -1,17 +1,17 @@
 diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
-index 471d61a..b3cfed2 100644
+index bb3e15e5..80c5051e 100644
 --- a/fizz/CMakeLists.txt
 +++ b/fizz/CMakeLists.txt
-@@ -61,7 +61,7 @@ endif()
- 
+@@ -64,7 +64,7 @@ endif()
+
 include(CheckAtomic)
- 
+
 -find_package(Sodium REQUIRED)
 +find_package(unofficial-sodium CONFIG REQUIRED)
- 
+
 SET(FIZZ_SHINY_DEPENDENCIES "")
 SET(FIZZ_LINK_LIBRARIES "")
-@@ -246,7 +246,7 @@ target_link_libraries(fizz
+@@ -255,7 +255,7 @@ target_link_libraries(fizz
   PUBLIC
     ${FOLLY_LIBRARIES}
     ${OPENSSL_LIBRARIES}
@ -19,17 +19,17 @@ index 471d61a..b3cfed2 100644
 +    unofficial-sodium::sodium
     Threads::Threads
     ZLIB::ZLIB
-   PRIVATE
+     ${ZSTD_LIBRARY}
 diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
-index 679b0e6..b28750f 100644
+index 679b0e61..b28750fa 100644
 --- a/fizz/cmake/fizz-config.cmake.in
 +++ b/fizz/cmake/fizz-config.cmake.in
@@ -26,7 +26,7 @@ endif()
 set(FIZZ_LIBRARIES fizz::fizz)
- 
+
 include(CMakeFindDependencyMacro)
 -find_dependency(Sodium)
 +find_dependency(unofficial-sodium CONFIG REQUIRED)
 find_dependency(folly CONFIG)
 find_dependency(ZLIB)
- 
+
--- a/ports/fizz/fix-zlib.patch
+++ b/ports/fizz/fix-zlib.patch
@ -1,36 +0,0 @@
-diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
-index 485e38fc..471d61a5 100644
--- a/fizz/CMakeLists.txt
-+++ b/fizz/CMakeLists.txt
-@@ -87,6 +87,8 @@ else()
-   list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
- endif()
- 
-+find_package(ZLIB REQUIRED)
-+
- find_package(Libevent CONFIG QUIET)
- if(TARGET event)
-   message(STATUS "Found libevent from package config")
-@@ -246,6 +248,7 @@ target_link_libraries(fizz
-     ${OPENSSL_LIBRARIES}
-     sodium
-     Threads::Threads
-+    ZLIB::ZLIB
-   PRIVATE
-     ${GLOG_LIBRARIES}
-     ${GFLAGS_LIBRARIES}
-diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
-index d9918469..679b0e61 100644
--- a/fizz/cmake/fizz-config.cmake.in
-+++ b/fizz/cmake/fizz-config.cmake.in
-@@ -25,7 +25,10 @@ endif()
- 
- set(FIZZ_LIBRARIES fizz::fizz)
- 
-+include(CMakeFindDependencyMacro)
- find_dependency(Sodium)
-+find_dependency(folly CONFIG)
-+find_dependency(ZLIB)
- 
- if (NOT fizz_FIND_QUIETLY)
-   message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}")
--- a/ports/fizz/portfile.cmake
+++ b/ports/fizz/portfile.cmake
@ -3,11 +3,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebookincubator/fizz
-    REF v2021.06.14.00
-    SHA512 ff55f933d55031128b5355707fd025649ad90d261d91ec5f9d793433a77e63d3c2527a7f0111d6a3151667ab29f4117f96a505bcb80c1a4a99bd60346f05f4de
+    REF v2022.01.31.00
+    SHA512 544f843f47cb6113d0ad804079e6d767f33723d9d529c2751c5c6317d65c35bd327b43852904b2a37c2af615276176fe2de667907a9a460c0dfc7593eca46459
    HEAD_REF master
    PATCHES
-        fix-zlib.patch
        0001-fix-libsodium.patch
 )

@ -17,25 +16,22 @@ file(REMOVE
    ${SOURCE_PATH}/fizz/cmake/FindGlog.cmake
 )

-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}/fizz"
-    PREFER_NINJA
    OPTIONS
        -DBUILD_TESTS=OFF
        -DBUILD_EXAMPLES=OFF
        -DINCLUDE_INSTALL_DIR:STRING=include
 )

-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fizz)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fizz)
 vcpkg_copy_pdbs()

 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake" "lib/cmake/fizz" "share/fizz")

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

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/fizz/tool/test" "${CURRENT_PACKAGES_DIR}/include/fizz/util/test")

-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)
--- a/ports/fizz/vcpkg.json
+++ b/ports/fizz/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "fizz",
-  "version-string": "2021.06.14.00",
-  "port-version": 1,
+  "version-string": "2022.01.31.00",
  "description": "a TLS 1.3 implementation by Facebook",
  "homepage": "https://github.com/facebookincubator/fizz",
  "dependencies": [
@ -9,6 +8,14 @@
    "folly",
    "libsodium",
    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
    "zstd"
  ]
 }
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@ -8,8 +8,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/folly
-    REF v2021.06.14.00
-    SHA512 aee5adc1a44d9b193f3f41b5fc9fa7575c677d8bf27ed3a3b612a2fbe53505f82481ce78f13fb41ae3ca81ca25446426fbdfdc578f503f919b4af5abe56ad71c
+    REF v2022.01.31.00
+    SHA512 fef065c8a879e5b80eb521eaa09d2ac4eb22563e759834e60f665f07df5c2863c76217798680381bc51fad8c44f4b5d5abfb924a94c89635a41708abf6d70133
    HEAD_REF main
    PATCHES
        reorder-glog-gflags.patch
@ -19,11 +19,11 @@ vcpkg_from_github(
 )

 file(COPY
-    ${CMAKE_CURRENT_LIST_DIR}/FindLZ4.cmake
-    ${CMAKE_CURRENT_LIST_DIR}/FindSnappy.cmake
-    DESTINATION ${SOURCE_PATH}/CMake/
+    "${CMAKE_CURRENT_LIST_DIR}/FindLZ4.cmake"
+    "${CMAKE_CURRENT_LIST_DIR}/FindSnappy.cmake"
+    DESTINATION "${SOURCE_PATH}/CMake/"
 )
-file(REMOVE ${SOURCE_PATH}/CMake/FindGFlags.cmake)
+file(REMOVE "${SOURCE_PATH}/CMake/FindGFlags.cmake")

 if(VCPKG_CRT_LINKAGE STREQUAL static)
    set(MSVC_USE_STATIC_RUNTIME ON)
@ -48,9 +48,8 @@ feature(lz4 LZ4)
 feature(zstd Zstd)
 feature(snappy Snappy)

-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
    OPTIONS
        -DMSVC_USE_STATIC_RUNTIME=${MSVC_USE_STATIC_RUNTIME}
        -DCMAKE_DISABLE_FIND_PACKAGE_LibDwarf=ON
@ -63,11 +62,11 @@ vcpkg_configure_cmake(
        ${FEATURE_OPTIONS}
 )

-vcpkg_install_cmake(ADD_BIN_TO_PATH)
+vcpkg_cmake_install(ADD_BIN_TO_PATH)

 vcpkg_copy_pdbs()

-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()

 # Release folly-targets.cmake does not link to the right libraries in debug mode.
 # We substitute with generator expressions so that the right libraries are linked for debug and release.
@ -78,8 +77,8 @@ STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>
 STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
 string(REPLACE "-vc140-mt.lib" "-vc140-mt\$<\$<CONFIG:DEBUG>:-gd>.lib" _contents "${_contents}")
 FILE(WRITE ${FOLLY_TARGETS_CMAKE} "${_contents}")
-FILE(READ ${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake _contents)
-FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake
+FILE(READ "${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake" _contents)
+FILE(WRITE "${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake"
 "include(CMakeFindDependencyMacro)
 find_dependency(Threads)
 find_dependency(glog CONFIG)
@ -87,9 +86,9 @@ find_dependency(gflags CONFIG REQUIRED)
 find_dependency(ZLIB)
 ${_contents}")

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

 # Handle copyright
-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_fixup_pkgconfig()
--- a/ports/folly/vcpkg.json
+++ b/ports/folly/vcpkg.json
@ -1,9 +1,9 @@
 {
  "name": "folly",
-  "version-string": "2021.06.14.00",
-  "port-version": 4,
+  "version-string": "2022.01.31.00",
  "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
  "homepage": "https://github.com/facebook/folly",
+  "license": "Apache-2.0",
  "supports": "(windows & x64 & !uwp) | (!windows & (x64 | arm64))",
  "dependencies": [
    "boost-chrono",
@ -23,7 +23,15 @@
    "gflags",
    "glog",
    "libevent",
-    "openssl"
+    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
  ],
  "default-features": [
    "zlib"
--- a/ports/mvfst/portfile.cmake
+++ b/ports/mvfst/portfile.cmake
@ -1,8 +1,8 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebookincubator/mvfst
-    REF 531b935a
-    SHA512  47683907e5c19aa7392bffc0f23378636e73e03bbbd598640d20042234a9385ac7ca2fb8202905e1c101713bfb3467df78b12fd1629ca83a3ccf2bae2f58a2e1
+    REF e569853
+    SHA512 66697d8149defe43f7b91ed509117a6330556ad89dfb64a3a778c6cdd706f01d8df7d356e2896d04dffc91e51c68735283b2a27915f3d909834dd0b0a95640de
    HEAD_REF main
 )

--- a/ports/mvfst/vcpkg.json
+++ b/ports/mvfst/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "mvfst",
-  "version": "0.1",
-  "port-version": 1,
+  "version": "0.2",
  "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.",
  "homepage": "https://github.com/facebookincubator/mvfst",
  "supports": "!windows",
--- a/ports/proxygen/fix-duplicated-target.patch
+++ b/ports/proxygen/fix-duplicated-target.patch
@ -1,16 +0,0 @@
-diff --git a/build/fbcode_builder/CMake/FindSodium.cmake b/build/fbcode_builder/CMake/FindSodium.cmake
-index c664ccbe3..3c3f1245c 100644
--- a/build/fbcode_builder/CMake/FindSodium.cmake
-+++ b/build/fbcode_builder/CMake/FindSodium.cmake
-@@ -254,7 +254,10 @@ if(sodium_USE_STATIC_LIBS)
- else()
-     set(_LIB_TYPE SHARED)
- endif()
-add_library(sodium ${_LIB_TYPE} IMPORTED)
-+
-+if(NOT TARGET sodium)
-+    add_library(sodium ${_LIB_TYPE} IMPORTED)
-+endif()
- 
- set_target_properties(sodium PROPERTIES
-     INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}"
--- a/ports/proxygen/portfile.cmake
+++ b/ports/proxygen/portfile.cmake
@ -1,16 +1,15 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/proxygen
-    REF v2021.06.14.00
-    SHA512 f5ab54514575f86897438f40a481796c34031101775b61a01581338c91686159995e4f822909e42eed4c006b2c6a6351887d469cc9df1df80711dba10cc15a19
+    REF v2022.01.31.00
+    SHA512 f340466fb52e01bb71289f7cf1e8aee2ef8a0d5db21998ea85aaf07b128144de05747ececcac65e99d1d452bddc0d0dc60ba17087311c8337e31fbdda6f4ce3a
    HEAD_REF master
    PATCHES
        remove-register.patch
-        fix-duplicated-target.patch # fixed in master
 )

 vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY)
+get_filename_component(PYTHON3_PATH "${PYTHON3}" DIRECTORY)
 vcpkg_add_to_path(${PYTHON3_PATH})

 if (VCPKG_TARGET_IS_WINDOWS)
@ -24,18 +23,17 @@ else()
    endif()
 endif()

-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
 )

-vcpkg_install_cmake()
+vcpkg_cmake_install()

 vcpkg_copy_tools(TOOL_NAMES proxygen_curl proxygen_echo proxygen_proxy proxygen_push proxygen_static AUTO_CLEAN)

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/proxygen)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/proxygen)
 vcpkg_copy_pdbs()

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

-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)
--- a/ports/proxygen/vcpkg.json
+++ b/ports/proxygen/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "proxygen",
-  "version-string": "2021.06.14.00",
-  "port-version": 1,
+  "version-string": "2022.01.31.00",
  "description": "It comprises the core C++ HTTP abstractions used at Facebook.",
  "homepage": "https://github.com/facebook/proxygen",
  "supports": "!windows",
@ -17,6 +16,14 @@
    "fizz",
    "folly",
    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
    "wangle",
    "zlib",
    "zstd"
--- a/ports/rsocket/fix-folly.patch
+++ b/ports/rsocket/fix-folly.patch
@ -0,0 +1,13 @@
+diff --git a/rsocket/transports/tcp/TcpConnectionAcceptor.cpp b/rsocket/transports/tcp/TcpConnectionAcceptor.cpp
+index 12ac289f..c37f621a 100644
+--- a/rsocket/transports/tcp/TcpConnectionAcceptor.cpp
+++ b/rsocket/transports/tcp/TcpConnectionAcceptor.cpp
+@@ -31,7 +31,7 @@ class TcpConnectionAcceptor::SocketCallback
+ 
+   void connectionAccepted(
+       folly::NetworkSocket fdNetworkSocket,
+-      const folly::SocketAddress& address) noexcept override {
+      const folly::SocketAddress& address, AcceptInfo info) noexcept override {
+     int fd = fdNetworkSocket.toFd();
+ 
+     VLOG(2) << "Accepting TCP connection from " << address << " on FD " << fd;
--- a/ports/rsocket/portfile.cmake
+++ b/ports/rsocket/portfile.cmake
@ -13,6 +13,7 @@ vcpkg_from_github(
    fix-cmake-config.patch
    fix-find-dependencies.patch
    use-cpp-17.patch
+    fix-folly.patch
 )

 vcpkg_cmake_configure(
--- a/ports/rsocket/vcpkg.json
+++ b/ports/rsocket/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "rsocket",
  "version-string": "2021.08.30.00",
+  "port-version": 1,
  "description": "C++ implementation of RSocket http://rsocket.io",
  "homepage": "https://github.com/rsocket/rsocket-cpp",
  "dependencies": [
--- a/ports/wangle/portfile.cmake
+++ b/ports/wangle/portfile.cmake
@ -3,40 +3,39 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/wangle
-    REF v2021.06.14.00
-    SHA512 15fd2c9515ec3d0c3293a8f96d01d3e91e2ef82694d592aae6573648957f691a7da5d7c2aef7391a827a67e2f58fef7668778e0f0323aac11c5b16a1ba889cc3
+    REF v2022.01.31.00
+    SHA512 bb0ce38e7a54c094a828dbf75c0b719e49b2c39420bb648d54dbc13a083c982c31f104903d8d93558e254bdf1133dbf320f170a83c30fec78bdb9eeaf085a10a
    HEAD_REF master
    PATCHES
        fix-config-cmake.patch
        fix_dependency.patch
 )

-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}/wangle"
-    PREFER_NINJA
    OPTIONS
        -DBUILD_TESTS=OFF
        -DBUILD_EXAMPLES=OFF
        -DINCLUDE_INSTALL_DIR:STRING=include
 )

-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/wangle)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wangle)

-file(READ ${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake _contents)
+file(READ "${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake" _contents)
 STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
 STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake" "${_contents}")

 vcpkg_copy_pdbs()

 file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug/include
-    ${CURRENT_PACKAGES_DIR}/include/wangle/util/test
-    ${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs
-    ${CURRENT_PACKAGES_DIR}/include/wangle/service/test
-    ${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/include/wangle/util/test"
+    "${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs"
+    "${CURRENT_PACKAGES_DIR}/include/wangle/service/test"
+    "${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test"
 )

-file(INSTALL ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/wangle/vcpkg.json
+++ b/ports/wangle/vcpkg.json
@ -1,8 +1,9 @@
 {
  "name": "wangle",
-  "version-string": "2021.06.14.00",
+  "version-string": "2022.01.31.00",
  "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.",
  "homepage": "https://github.com/facebook/wangle",
+  "license": "Apache-2.0",
  "dependencies": [
    "boost-context",
    "boost-filesystem",
@ -14,6 +15,14 @@
    "folly",
    "glog",
    "libevent",
-    "openssl"
+    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
  ]
 }
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2137,8 +2137,8 @@
      "port-version": 3
    },
    "fbthrift": {
-      "baseline": "2021.06.14.00",
-      "port-version": 1
+      "baseline": "2022.01.31.00",
+      "port-version": 0
    },
    "fcl": {
      "baseline": "0.7.0",
@ -2177,8 +2177,8 @@
      "port-version": 1
    },
    "fizz": {
-      "baseline": "2021.06.14.00",
-      "port-version": 1
+      "baseline": "2022.01.31.00",
+      "port-version": 0
    },
    "flann": {
      "baseline": "2019-04-07",
@ -2233,8 +2233,8 @@
      "port-version": 0
    },
    "folly": {
-      "baseline": "2021.06.14.00",
-      "port-version": 4
+      "baseline": "2022.01.31.00",
+      "port-version": 0
    },
    "font-chef": {
      "baseline": "1.1.0",
@ -4637,8 +4637,8 @@
      "port-version": 5
    },
    "mvfst": {
-      "baseline": "0.1",
-      "port-version": 1
+      "baseline": "0.2",
+      "port-version": 0
    },
    "mygui": {
      "baseline": "3.4.1",
@ -5493,8 +5493,8 @@
      "port-version": 0
    },
    "proxygen": {
-      "baseline": "2021.06.14.00",
-      "port-version": 1
+      "baseline": "2022.01.31.00",
+      "port-version": 0
    },
    "psimd": {
      "baseline": "2021-02-21",
@ -6154,7 +6154,7 @@
    },
    "rsocket": {
      "baseline": "2021.08.30.00",
-      "port-version": 0
+      "port-version": 1
    },
    "rtabmap": {
      "baseline": "0.20.13",
@ -7281,7 +7281,7 @@
      "port-version": 2
    },
    "wangle": {
-      "baseline": "2021.06.14.00",
+      "baseline": "2022.01.31.00",
      "port-version": 0
    },
    "wavelib": {
--- a/versions/f-/fbthrift.json
+++ b/versions/f-/fbthrift.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "f92f736e3c525d5ac52b546eae1e0b9cf880b382",
+      "version-string": "2022.01.31.00",
+      "port-version": 0
+    },
    {
      "git-tree": "3b06c9c143910647d74c5688610fc294bc493849",
      "version-string": "2021.06.14.00",
--- a/versions/f-/fizz.json
+++ b/versions/f-/fizz.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "14651559e385107d92830b5464007f7b49a1ce4c",
+      "version-string": "2022.01.31.00",
+      "port-version": 0
+    },
    {
      "git-tree": "8472de52ae8a7914ab4c87e23be8250ae497a0aa",
      "version-string": "2021.06.14.00",
--- a/versions/f-/folly.json
+++ b/versions/f-/folly.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "b6f74d739ff2aef400ac83919bd9753eb1cc647f",
+      "version-string": "2022.01.31.00",
+      "port-version": 0
+    },
    {
      "git-tree": "c31f74183da180ea71937f3c5b6ac0c8a3619b1b",
      "version-string": "2021.06.14.00",
--- a/versions/m-/mvfst.json
+++ b/versions/m-/mvfst.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "72ff9157858363c60db8f1e0bd8de03546f7d0e4",
+      "version": "0.2",
+      "port-version": 0
+    },
    {
      "git-tree": "c73381f28aba19d8c008096270feca19a798fa92",
      "version": "0.1",
--- a/versions/p-/proxygen.json
+++ b/versions/p-/proxygen.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "d17fc3eb415126e6e9d5d77eb2de69ffd3c30869",
+      "version-string": "2022.01.31.00",
+      "port-version": 0
+    },
    {
      "git-tree": "8dd3b93e98f28386e8c44f50df2efb4c2bb30ce1",
      "version-string": "2021.06.14.00",
--- a/versions/r-/rsocket.json
+++ b/versions/r-/rsocket.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "073c3faa3992179768ce7e76cc7d39b654db9e8c",
+      "version-string": "2021.08.30.00",
+      "port-version": 1
+    },
    {
      "git-tree": "9dbf0f51130cc7c6e2c23a2ca3a104e22384f4e7",
      "version-string": "2021.08.30.00",
--- a/versions/w-/wangle.json
+++ b/versions/w-/wangle.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "387fe8f00443c17cf01fe0ebc235dd8cc5dd3f03",
+      "version-string": "2022.01.31.00",
+      "port-version": 0
+    },
    {
      "git-tree": "070f35ba95d1f0b817f225896daa7bd48ce3e47d",
      "version-string": "2021.06.14.00",