From 7f578b4587fdff6a8908e172073c6a08c1145974 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Wed, 23 Sep 2020 20:13:42 -0700
Subject: [PATCH 01/16] [folly] Update to latest revision

---
 ports/folly/CONTROL                           |  4 +-
 ports/folly/boost-1.70.patch                  | 45 ++++++++---------
 .../disable-non-underscore-posix-names.patch  | 29 +++++++----
 ports/folly/find-double-conversion.patch      | 25 ----------
 ports/folly/fix-addbit.patch                  | 15 ------
 ports/folly/folly_c3861.patch                 | 50 -------------------
 ports/folly/portfile.cmake                    | 11 ++--
 ports/folly/reorder-glog-gflags.patch         | 12 ++---
 8 files changed, 53 insertions(+), 138 deletions(-)
 delete mode 100644 ports/folly/find-double-conversion.patch
 delete mode 100644 ports/folly/fix-addbit.patch
 delete mode 100644 ports/folly/folly_c3861.patch

diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index 302e7a924637a6..6d5e4d21e1bc1d 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,9 +1,9 @@
 Source: folly
-Version: 2019.10.21.00
+Version: 2020.09.14.00
 Port-Version: 4
 Homepage: https://github.com/facebook/folly
 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
-Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread, boost-smart-ptr
+Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread, boost-smart-ptr, fmt
 Default-Features: zlib
 Supports: x64
 
diff --git a/ports/folly/boost-1.70.patch b/ports/folly/boost-1.70.patch
index 98986b96c52cb9..bca0c99e0c8ffe 100644
--- a/ports/folly/boost-1.70.patch
+++ b/ports/folly/boost-1.70.patch
@@ -1,23 +1,22 @@
-diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp
-index 5cc3731..86a4a0b 100644
---- a/folly/portability/PThread.cpp
-+++ b/folly/portability/PThread.cpp
-@@ -18,6 +18,9 @@
- 
- #if !FOLLY_HAVE_PTHREAD && defined(_WIN32)
- #include <boost/thread/tss.hpp> // @manual
-+#include <boost/thread/exceptions.hpp>
-+#include <boost/shared_ptr.hpp>
-+#include <boost/thread/thread_only.hpp>
- 
- #include <errno.h>
- 
-@@ -684,7 +687,7 @@ int pthread_setspecific(pthread_key_t key, const void* value) {
-     // function, which we don't want to do.
-     boost::detail::set_tss_data(
-         realKey,
--        boost::shared_ptr<boost::detail::tss_cleanup_function>(),
-+        0,0,
-         const_cast<void*>(value),
-         false);
-     return 0;
+diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp
+index 2126ec0..ef82ade 100644
+--- a/folly/portability/PThread.cpp
++++ b/folly/portability/PThread.cpp
+@@ -20,6 +20,8 @@
+ #include <boost/thread/exceptions.hpp>
+ #include <boost/thread/tss.hpp>
+ #include <boost/version.hpp>
++#include <boost/shared_ptr.hpp>
++#include <boost/thread/thread_only.hpp>
+ 
+ #include <errno.h>
+ 
+@@ -691,7 +693,7 @@ int pthread_setspecific(pthread_key_t key, const void* value) {
+         boost::detail::thread::cleanup_caller_t(),
+         boost::detail::thread::cleanup_func_t(),
+ #else
+-        boost::shared_ptr<boost::detail::tss_cleanup_function>(),
++        0,0,
+ #endif
+         const_cast<void*>(value),
+         false);
diff --git a/ports/folly/disable-non-underscore-posix-names.patch b/ports/folly/disable-non-underscore-posix-names.patch
index bbe79481cfafea..ad36fad7ad05f2 100644
--- a/ports/folly/disable-non-underscore-posix-names.patch
+++ b/ports/folly/disable-non-underscore-posix-names.patch
@@ -1,27 +1,34 @@
 diff --git a/folly/portability/Windows.h b/folly/portability/Windows.h
-index f7990ca..b22fac5 100644
+index 86fd0f9..ccad11e 100644
 --- a/folly/portability/Windows.h
 +++ b/folly/portability/Windows.h
-@@ -26,16 +26,12 @@
- // These have to be this way because we define our own versions
- // of close(), because the normal Windows versions don't handle
- // sockets at all.
+@@ -32,24 +32,17 @@
+ // disabled to ensure all of the normal names get declared properly.
+ #include <stdio.h>
+ 
 -#ifndef __STDC__
 -/* nolint */
 -#define __STDC__ 1
+ #pragma push_macro("_CRT_DECLARE_NONSTDC_NAMES")
+ #ifdef _CRT_DECLARE_NONSTDC_NAMES
+ #undef _CRT_DECLARE_NONSTDC_NAMES
+ #endif
++
++#include <corecrt.h>
+ #pragma push_macro("_CRT_INTERNAL_NONSTDC_NAMES")
+-#undef _CRT_INTERNAL_NONSTDC_NAMES
 -#include <direct.h> // @manual nolint
 -#include <io.h> // @manual nolint
 -#undef __STDC__
++#define _CRT_INTERNAL_NONSTDC_NAMES 0
++#include <direct.h>
++#include <io.h>
+ #pragma pop_macro("_CRT_INTERNAL_NONSTDC_NAMES")
+-#pragma pop_macro("_CRT_DECLARE_NONSTDC_NAMES")
 -#else
 -#include <direct.h> // @manual nolint
 -#include <io.h> // @manual nolint
 -#endif
-+#include <corecrt.h>
-+#pragma push_macro("_CRT_INTERNAL_NONSTDC_NAMES")
-+#define _CRT_INTERNAL_NONSTDC_NAMES 0
-+#include <direct.h>
-+#include <io.h>
-+#pragma pop_macro("_CRT_INTERNAL_NONSTDC_NAMES")
  
  #if defined(min) || defined(max)
  #error Windows.h needs to be included by this header, or else NOMINMAX needs \
diff --git a/ports/folly/find-double-conversion.patch b/ports/folly/find-double-conversion.patch
deleted file mode 100644
index 53f49e831db6b7..00000000000000
--- a/ports/folly/find-double-conversion.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
-index 1522db2..5ed2ea9 100644
---- a/CMake/folly-deps.cmake
-+++ b/CMake/folly-deps.cmake
-@@ -17,9 +17,17 @@ find_package(Boost 1.51.0 MODULE
- list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES})
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
- 
--find_package(DoubleConversion MODULE REQUIRED)
--list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
--list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
-+find_package(double-conversion CONFIG REQUIRED)
-+if (double-conversion_FOUND)
-+  message(STATUS "Found double-conversion from package config")
-+  set(FOLLY_HAVE_DOUBLE_CONVERSION ON)
-+  # How to obtain link libraries from target? double-conversion doesn't set property INTERFACE_LINK_LIBRARIES
-+  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
-+else()
-+  find_package(DoubleConversion MODULE)
-+  list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
-+  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
-+endif()
- 
- set(FOLLY_HAVE_LIBGFLAGS OFF)
- find_package(gflags CONFIG REQUIRED)
diff --git a/ports/folly/fix-addbit.patch b/ports/folly/fix-addbit.patch
deleted file mode 100644
index 6ac47aa06f6570..00000000000000
--- a/ports/folly/fix-addbit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/folly/lang/Bits.h b/folly/lang/Bits.h
-index f0beb5b..f86a1a3 100644
---- a/folly/lang/Bits.h
-+++ b/folly/lang/Bits.h
-@@ -64,6 +64,10 @@
- #include <folly/lang/Assume.h>
- #include <folly/portability/Builtins.h>
- 
-+#if __has_include(<bit>)
-+#include <bit>
-+#endif
-+
- namespace folly {
- 
- #if __cpp_lib_bit_cast
diff --git a/ports/folly/folly_c3861.patch b/ports/folly/folly_c3861.patch
deleted file mode 100644
index 52aefcb8e272c5..00000000000000
--- a/ports/folly/folly_c3861.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/folly/portability/Builtins.h b/folly/portability/Builtins.h
-index 971cb88..7894333 100644
---- a/folly/portability/Builtins.h
-+++ b/folly/portability/Builtins.h
-@@ -41,7 +41,7 @@ FOLLY_ALWAYS_INLINE void __builtin___clear_cache(char* begin, char* end) {
-   }
- }
- 
--#if !defined(_MSC_VER) || (_MSC_VER < 1923)
-+// #if !defined(_MSC_VER) || (_MSC_VER < 1923)
- FOLLY_ALWAYS_INLINE int __builtin_clz(unsigned int x) {
-   unsigned long index;
-   return int(_BitScanReverse(&index, (unsigned long)x) ? 31 - index : 32);
-@@ -93,7 +93,7 @@ FOLLY_ALWAYS_INLINE int __builtin_ctzll(unsigned long long x) {
-   return int(_BitScanForward64(&index, x) ? index : 64);
- }
- #endif
--#endif // !defined(_MSC_VER) || (_MSC_VER < 1923)
-+// #endif // !defined(_MSC_VER) || (_MSC_VER < 1923)
- 
- FOLLY_ALWAYS_INLINE int __builtin_ffs(int x) {
-   unsigned long index;
-@@ -119,15 +119,15 @@ FOLLY_ALWAYS_INLINE int __builtin_popcount(unsigned int x) {
-   return int(__popcnt(x));
- }
- 
--#if !defined(_MSC_VER) || (_MSC_VER < 1923)
-+// #if !defined(_MSC_VER) || (_MSC_VER < 1923)
- FOLLY_ALWAYS_INLINE int __builtin_popcountl(unsigned long x) {
-   static_assert(sizeof(x) == 4, "");
-   return int(__popcnt(x));
- }
--#endif // !defined(_MSC_VER) || (_MSC_VER < 1923)
-+// #endif // !defined(_MSC_VER) || (_MSC_VER < 1923)
- #endif
- 
--#if !defined(_MSC_VER) || (_MSC_VER < 1923)
-+// #if !defined(_MSC_VER) || (_MSC_VER < 1923)
- #if defined(_M_IX86)
- FOLLY_ALWAYS_INLINE int __builtin_popcountll(unsigned long long x) {
-   return int(__popcnt((unsigned int)(x >> 32))) +
-@@ -138,7 +138,7 @@ FOLLY_ALWAYS_INLINE int __builtin_popcountll(unsigned long long x) {
-   return int(__popcnt64(x));
- }
- #endif
--#endif // !defined(_MSC_VER) || (_MSC_VER < 1923)
-+// #endif // !defined(_MSC_VER) || (_MSC_VER < 1923)
- 
- FOLLY_ALWAYS_INLINE void* __builtin_return_address(unsigned int frame) {
-   // I really hope frame is zero...
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 3853569d9f3c5c..849d15f0b4b482 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -12,16 +12,15 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
-    REF 8874256376d2f8a32867f17c9472a446d6707604 #2019.10.21.00
-    SHA512 96dfdde34697b72e8eb88431d742fffa337fc9146677d63cf0331dc5e4cd341fb00b88edf3781488e3194fa41525e70a6729e1bb6657f224cd1969deea9b468c
+    REF 72a5d49cd557abf28a96059ff79d4975ee01a777 # v2020.09.14.00
+    SHA512 99ba85a570a7d5b4ea3a751cca1ac447e200cff2ebfbd7265f2df9b941765e024a960b78aafe6816a2b393494d2ae1021af9573a841b99f31bfcf7d3740c9314
     HEAD_REF master
     PATCHES
         missing-include-atomic.patch
         reorder-glog-gflags.patch
-        disable-non-underscore-posix-names.patch
-        boost-1.70.patch
-        fix-addbit.patch
-        folly_c3861.patch
+        # disable-non-underscore-posix-names.patch
+        # boost-1.70.patch
+
 )
 
 file(COPY
diff --git a/ports/folly/reorder-glog-gflags.patch b/ports/folly/reorder-glog-gflags.patch
index 85fd1d9fbf8799..3b46d9c146739f 100644
--- a/ports/folly/reorder-glog-gflags.patch
+++ b/ports/folly/reorder-glog-gflags.patch
@@ -1,8 +1,8 @@
 diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
-index e0bbcbb..fb45331 100644
+index 2ccb030..0d10b57 100644
 --- a/CMake/folly-deps.cmake
 +++ b/CMake/folly-deps.cmake
-@@ -24,6 +24,11 @@ find_package(DoubleConversion MODULE REQUIRED)
+@@ -50,6 +50,11 @@ find_package(DoubleConversion MODULE REQUIRED)
  list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
  
@@ -13,10 +13,10 @@ index e0bbcbb..fb45331 100644
 +
  find_package(Gflags MODULE)
  set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
- list(APPEND FOLLY_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
-@@ -31,11 +36,6 @@ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
- list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBGFLAGS_LIBRARY})
- list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
+ if(LIBGFLAGS_FOUND)
+@@ -59,11 +64,6 @@ if(LIBGFLAGS_FOUND)
+   list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
+ endif()
  
 -find_package(Glog MODULE)
 -set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})

From d041383725a5368039e50578010e95cdedd0facd Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Wed, 23 Sep 2020 20:16:15 -0700
Subject: [PATCH 02/16] Fix typo issue

---
 ports/folly/portfile.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 849d15f0b4b482..afb2fb13b08735 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -18,8 +18,8 @@ vcpkg_from_github(
     PATCHES
         missing-include-atomic.patch
         reorder-glog-gflags.patch
-        # disable-non-underscore-posix-names.patch
-        # boost-1.70.patch
+        disable-non-underscore-posix-names.patch
+        boost-1.70.patch
 
 )
 

From b1402bd254f8200ed7754368bbcbf6f468e073db Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Wed, 23 Sep 2020 20:18:32 -0700
Subject: [PATCH 03/16] Remove Port-Version

---
 ports/folly/CONTROL | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index 6d5e4d21e1bc1d..b323fa1b0fb5e3 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,6 +1,5 @@
 Source: folly
 Version: 2020.09.14.00
-Port-Version: 4
 Homepage: https://github.com/facebook/folly
 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
 Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread, boost-smart-ptr, fmt

From 0daad6bf5ab59eee34ab9624e5a30824de13a8ae Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Thu, 24 Sep 2020 03:28:09 -0700
Subject: [PATCH 04/16] [fizz] update to latest revision

---
 ports/fizz/CONTROL         | 4 ++--
 ports/fizz/find-zlib.patch | 6 +++---
 ports/fizz/portfile.cmake  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL
index 152f53ad56d48f..0fe693825f95fc 100644
--- a/ports/fizz/CONTROL
+++ b/ports/fizz/CONTROL
@@ -1,5 +1,5 @@
 Source: fizz
-Version: 2020.02.03.00
-Port-Version: 1
+Version: 2020.09.14.00
+Homepage: https://github.com/facebookincubator/fizz
 Build-Depends: folly, openssl, libsodium, zlib, fmt
 Description: a TLS 1.3 implementation by Facebook
\ No newline at end of file
diff --git a/ports/fizz/find-zlib.patch b/ports/fizz/find-zlib.patch
index 34e93168e0721f..7222db04e5003d 100644
--- a/ports/fizz/find-zlib.patch
+++ b/ports/fizz/find-zlib.patch
@@ -1,8 +1,8 @@
 diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
-index 0c95883..52585aa 100644
+index 7e3347b..76ee974 100644
 --- a/fizz/CMakeLists.txt
 +++ b/fizz/CMakeLists.txt
-@@ -86,6 +86,9 @@ else()
+@@ -89,6 +89,9 @@ else()
    list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
  endif()
  
@@ -10,5 +10,5 @@ index 0c95883..52585aa 100644
 +list(APPEND FIZZ_SHINY_DEPENDENCIES ZLIB::ZLIB)
 +
  set(FIZZ_HEADER_DIRS
-   base
    client
+   crypto
diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake
index 869dfcd2e57e94..538798349eb7d1 100644
--- a/ports/fizz/portfile.cmake
+++ b/ports/fizz/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookincubator/fizz
-    REF c0bafd67140e8c6f4f585c1077f2fd89102e4582 # v2020.02.03.00
-    SHA512 7db706ffdd79f6d753c5530eb67646747d1e7b8b380387f34bd1fc7a06b289a68a6bb4c13faa74e108d4dede72bb2d993d7ad8f60fabcfb3b48abbf4326291c2
+    REF 3071547c10854beb94d70ef5e609a515cb6d6a89 # v2020.09.14.00
+    SHA512 f5a1f0858b0fb77b8ac53d4182b5f1624b36467214c39699cbe5ee233720b4235415f887b4eb8872923e13d200eccfd370f0b650aa348f10d4e182f886d894e8
     HEAD_REF master
     PATCHES
         find-zlib.patch

From bdb021c65e35878080f4ce819b8e5321a0247240 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Thu, 24 Sep 2020 19:31:03 -0700
Subject: [PATCH 05/16] [wangle] update to latest revision

---
 ports/wangle/CONTROL        |  3 ++-
 ports/wangle/portfile.cmake | 12 +++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL
index f550428e82a76f..104e52cc8ad748 100644
--- a/ports/wangle/CONTROL
+++ b/ports/wangle/CONTROL
@@ -1,4 +1,5 @@
 Source: wangle
-Version: 2020.02.03.00
+Version: 2020.09.14.00
+Homepage: https://github.com/facebook/wangle
 Build-Depends: fizz, folly, openssl, glog, libevent, double-conversion, boost-system, boost-thread, boost-filesystem, boost-regex, boost-context
 Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.
diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake
index add21e2258efcb..066e366bf64b46 100644
--- a/ports/wangle/portfile.cmake
+++ b/ports/wangle/portfile.cmake
@@ -1,12 +1,10 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/wangle
-    REF 95f14ac0f628cea685bf39eaf511816320696ba1 # v2020.02.03.00
-    SHA512 3894839b7be1aa0d845f1e461b0a303e09a9d75f3d1fb470bd5304022da7e9060d9e941cdc9d4e5878ab0ae8099477aeceae92d4d4eb80a7de264f81ac8ebf32
+    REF bf64c061ca17be45707bd0a6cc5138b2494ff497 # v2020.09.14.00
+    SHA512 6ac8678d2bd5ed0a5f92cfe6ef1de549682eacf6e7d4e68bdcc102bbf344f2c027b1be6c1d52f95993fe85e2afb83a0f24410e8719bf94a0e75d009ddea046cf
     HEAD_REF master
     PATCHES
         build.patch
@@ -41,6 +39,6 @@ file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test
 )
 
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wangle RENAME copyright)
-file(INSTALL ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/wangle)
+
+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})

From 0bea1324141798788df43ed39748513c98b6457f Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Thu, 24 Sep 2020 23:26:38 -0700
Subject: [PATCH 06/16] [proxygen] Update to latest release

---
 ports/proxygen/CONTROL        | 2 +-
 ports/proxygen/portfile.cmake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/proxygen/CONTROL b/ports/proxygen/CONTROL
index 86c5b5b7ee3515..8cd2e6ab760231 100644
--- a/ports/proxygen/CONTROL
+++ b/ports/proxygen/CONTROL
@@ -1,5 +1,5 @@
 Source: proxygen
-Version: 2019.10.21.00
+Version: 2020.09.14.00
 Homepage: https://github.com/facebook/proxygen
 Description: It comprises the core C++ HTTP abstractions used at Facebook. 
 Build-Depends: folly, fizz, wangle, zstd, zlib, openssl, boost-iostreams, boost-context, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread
\ No newline at end of file
diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake
index 8624ea48ac961c..a5d4f4a85e0eff 100644
--- a/ports/proxygen/portfile.cmake
+++ b/ports/proxygen/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "Windows")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/proxygen
-    REF ac8a0f520b1d5fb91cd3f3ef681d4b37053b09f0 #v2019.10.21.00
-    SHA512 2a76fed7cf9947e1096b36d25fe7886c06655fa2faf6d4829fd07c682efdf2bd9003a4c9e4772a4ccfd72df81e7066df736d2330a5edf0e836da30dcc81d3b5f
+    REF 67fddcb6f292dbda312a5fe28ae27fbecf4e6805 #v2020.09.14.00
+    SHA512 ecac8642cdd4c871e45b96e596991000a615f8731c09ea31d612a584c6565d279a0d38e5c4807b949cc2f8632b58593642b1f6a7b420bf70be04b604faf77275
     HEAD_REF master
     PATCHES fix-tools-path.patch
 )

From fd194eb779e9ba3d1aaf791b65d5f736903b0048 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Fri, 25 Sep 2020 03:26:02 -0700
Subject: [PATCH 07/16] Fix folly static link issue

---
 ports/folly/reorder-glog-gflags.patch | 4 ++--
 ports/proxygen/portfile.cmake         | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/folly/reorder-glog-gflags.patch b/ports/folly/reorder-glog-gflags.patch
index 3b46d9c146739f..ff427328d06343 100644
--- a/ports/folly/reorder-glog-gflags.patch
+++ b/ports/folly/reorder-glog-gflags.patch
@@ -6,9 +6,9 @@ index 2ccb030..0d10b57 100644
  list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
  
-+find_package(Glog MODULE)
++find_package(Glog CONFIG REQUIRED)
 +set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
-+list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
++list(APPEND FOLLY_LINK_LIBRARIES glog::glog)
 +list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
 +
  find_package(Gflags MODULE)
diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake
index a5d4f4a85e0eff..dd44964dbec7a3 100644
--- a/ports/proxygen/portfile.cmake
+++ b/ports/proxygen/portfile.cmake
@@ -34,6 +34,10 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/proxygen)
 vcpkg_copy_pdbs()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-#Handle copyright
+
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

From 62b009a3794536d5db29741e75bf307db6251bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Sun, 27 Sep 2020 19:28:30 -0700
Subject: [PATCH 08/16] Update ports/folly/portfile.cmake

---
 ports/folly/portfile.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index afb2fb13b08735..6452f8844456f9 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -20,7 +20,6 @@ vcpkg_from_github(
         reorder-glog-gflags.patch
         disable-non-underscore-posix-names.patch
         boost-1.70.patch
-
 )
 
 file(COPY

From 9fd98826c1553a073f73fb85ae9e549e00f58a1c Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Mon, 28 Sep 2020 00:38:28 -0700
Subject: [PATCH 09/16] fix tools path for proxygen

---
 ports/proxygen/fix-httpclient-tools-path.patch | 11 +++++++++++
 ports/proxygen/portfile.cmake                  |  8 +++-----
 2 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 ports/proxygen/fix-httpclient-tools-path.patch

diff --git a/ports/proxygen/fix-httpclient-tools-path.patch b/ports/proxygen/fix-httpclient-tools-path.patch
new file mode 100644
index 00000000000000..7f9849f60b5287
--- /dev/null
+++ b/ports/proxygen/fix-httpclient-tools-path.patch
@@ -0,0 +1,11 @@
+diff --git a/proxygen/httpclient/samples/curl/CMakeLists.txt b/proxygen/httpclient/samples/curl/CMakeLists.txt
+index e7b6012..70e4caf 100644
+--- a/proxygen/httpclient/samples/curl/CMakeLists.txt
++++ b/proxygen/httpclient/samples/curl/CMakeLists.txt
+@@ -29,5 +29,5 @@ target_compile_options(
+ install(
+     TARGETS proxygen_curl
+     EXPORT proxygen-exports
+-    DESTINATION bin
++    DESTINATION tools
+ )
diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake
index dd44964dbec7a3..4a0e426202ce4f 100644
--- a/ports/proxygen/portfile.cmake
+++ b/ports/proxygen/portfile.cmake
@@ -6,7 +6,9 @@ vcpkg_from_github(
     REF 67fddcb6f292dbda312a5fe28ae27fbecf4e6805 #v2020.09.14.00
     SHA512 ecac8642cdd4c871e45b96e596991000a615f8731c09ea31d612a584c6565d279a0d38e5c4807b949cc2f8632b58593642b1f6a7b420bf70be04b604faf77275
     HEAD_REF master
-    PATCHES fix-tools-path.patch
+    PATCHES
+        fix-tools-path.patch
+        fix-httpclient-tools-path.patch
 )
 
 vcpkg_find_acquire_program(PYTHON3)
@@ -34,10 +36,6 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/proxygen)
 vcpkg_copy_pdbs()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

From 2f8fa051300d95242e61ef70a512aac45b984e52 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Thu, 22 Oct 2020 03:26:57 -0700
Subject: [PATCH 10/16] Remove unused patch

---
 ports/folly/fix-cmake-3.18.patch | 48 --------------------------------
 ports/folly/portfile.cmake       |  1 -
 2 files changed, 49 deletions(-)
 delete mode 100644 ports/folly/fix-cmake-3.18.patch

diff --git a/ports/folly/fix-cmake-3.18.patch b/ports/folly/fix-cmake-3.18.patch
deleted file mode 100644
index c4ba62c76db1bf..00000000000000
--- a/ports/folly/fix-cmake-3.18.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/CMake/GenPkgConfig.cmake b/CMake/GenPkgConfig.cmake
-index f8701b4..00a1e75 100644
---- a/CMake/GenPkgConfig.cmake
-+++ b/CMake/GenPkgConfig.cmake
-@@ -92,7 +92,19 @@ function(gen_pkgconfig_vars)
- 
-   # Set the output variables
-   string(REPLACE ";" " " cflags "${cflags}")
--  set("${var_prefix}_CFLAGS" "${cflags}" PARENT_SCOPE)
-   string(REPLACE ";" " " private_libs "${private_libs}")
-+  
-+  # Since CMake 3.18 FindThreads may include a generator expression requiring
-+  # a target, which gets propagated to us through INTERFACE_COMPILE_OPTIONS.
-+  # Before CMake 3.19 there's no way to solve this in a general way, so we
-+  # work around the specific case. See #1414 and CMake bug #21074.
-+  if(CMAKE_VERSION VERSION_LESS 3.19)
-+    string(REPLACE
-+      "<COMPILE_LANG_AND_ID:CUDA,NVIDIA>" "<COMPILE_LANGUAGE:CUDA>"
-+      cflags "${cflags}"
-+    )
-+  endif()
-+
-+  set("${var_prefix}_CFLAGS" "${cflags}" PARENT_SCOPE)
-   set("${var_prefix}_PRIVATE_LIBS" "${private_libs}" PARENT_SCOPE)
- endfunction()
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2de9298..950dd76 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -414,10 +414,18 @@ configure_file(
-   ${CMAKE_CURRENT_BINARY_DIR}/libfolly.pc.gen
-   @ONLY
- )
-+
-+# Specify target to allow resolving generator expressions requiring
-+# a target for CMake >=3.19. See #1414.
-+if(NOT CMAKE_VERSION VERSION_LESS 3.19)
-+  set(target_arg TARGET folly_deps)
-+endif()
-+
- file(
-   GENERATE
-   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libfolly.pc
-   INPUT ${CMAKE_CURRENT_BINARY_DIR}/libfolly.pc.gen
-+  ${target_arg}
- )
- install(
-   FILES ${CMAKE_CURRENT_BINARY_DIR}/libfolly.pc
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index ed2a874a9236a8..6452f8844456f9 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -20,7 +20,6 @@ vcpkg_from_github(
         reorder-glog-gflags.patch
         disable-non-underscore-posix-names.patch
         boost-1.70.patch
-        fix-cmake-3.18.patch # Remove this patch on the next update
 )
 
 file(COPY

From 953c532ccbad7adaed356a04efa84b18a9f5f10b Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Thu, 22 Oct 2020 23:34:56 -0700
Subject: [PATCH 11/16] Update to latest revision for fix folly build failure
 on osx

---
 ports/fizz/CONTROL                    | 2 +-
 ports/fizz/portfile.cmake             | 7 ++++---
 ports/folly/CONTROL                   | 2 +-
 ports/folly/portfile.cmake            | 4 ++--
 ports/folly/reorder-glog-gflags.patch | 8 ++++----
 ports/proxygen/CONTROL                | 5 +++--
 ports/proxygen/portfile.cmake         | 4 ++--
 ports/wangle/CONTROL                  | 2 +-
 ports/wangle/portfile.cmake           | 4 ++--
 scripts/ci.baseline.txt               | 3 ---
 10 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL
index 0fe693825f95fc..19b03e429fffa2 100644
--- a/ports/fizz/CONTROL
+++ b/ports/fizz/CONTROL
@@ -1,5 +1,5 @@
 Source: fizz
-Version: 2020.09.14.00
+Version: 2020.10.19.00
 Homepage: https://github.com/facebookincubator/fizz
 Build-Depends: folly, openssl, libsodium, zlib, fmt
 Description: a TLS 1.3 implementation by Facebook
\ No newline at end of file
diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake
index 538798349eb7d1..459c6a8079c170 100644
--- a/ports/fizz/portfile.cmake
+++ b/ports/fizz/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookincubator/fizz
-    REF 3071547c10854beb94d70ef5e609a515cb6d6a89 # v2020.09.14.00
-    SHA512 f5a1f0858b0fb77b8ac53d4182b5f1624b36467214c39699cbe5ee233720b4235415f887b4eb8872923e13d200eccfd370f0b650aa348f10d4e182f886d894e8
+    REF 1c40fde31b5eff8a05f928497429bffe7425b4fd # v2020.10.19.00
+    SHA512 9e0de756855941c377f2a52d9b751e6ae066c8d8ae4e7a06211b2537a039e533cbc782cbce947cb703d7bd4c5cb5fb4420e71eeafdcb5f1264d788ca3eb0b76d
     HEAD_REF master
     PATCHES
         find-zlib.patch
@@ -41,5 +41,6 @@ file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include
 )
 
-# Handle copyright
+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)
\ No newline at end of file
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index b323fa1b0fb5e3..8b31a73b67f2ba 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,5 +1,5 @@
 Source: folly
-Version: 2020.09.14.00
+Version: 2020.10.19.00
 Homepage: https://github.com/facebook/folly
 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
 Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread, boost-smart-ptr, fmt
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 6452f8844456f9..3016caec974385 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -12,8 +12,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
-    REF 72a5d49cd557abf28a96059ff79d4975ee01a777 # v2020.09.14.00
-    SHA512 99ba85a570a7d5b4ea3a751cca1ac447e200cff2ebfbd7265f2df9b941765e024a960b78aafe6816a2b393494d2ae1021af9573a841b99f31bfcf7d3740c9314
+    REF 430aa0d8db79989dd56f8a0361fcb1c305618e41 # v2020.10.19.00
+    SHA512 d9f6aa0f7a8aee044c01af289d71e4c80d63e40ff128ac840663e3103d19cdd0da161a0b0d106493d950b9ac9a905c5e2abf8c1970c2f16b94dd95c0d1b1943e
     HEAD_REF master
     PATCHES
         missing-include-atomic.patch
diff --git a/ports/folly/reorder-glog-gflags.patch b/ports/folly/reorder-glog-gflags.patch
index ff427328d06343..38ddbc166f2830 100644
--- a/ports/folly/reorder-glog-gflags.patch
+++ b/ports/folly/reorder-glog-gflags.patch
@@ -1,8 +1,8 @@
 diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
-index 2ccb030..0d10b57 100644
+index 92b8ce7..04589ed 100644
 --- a/CMake/folly-deps.cmake
 +++ b/CMake/folly-deps.cmake
-@@ -50,6 +50,11 @@ find_package(DoubleConversion MODULE REQUIRED)
+@@ -52,6 +52,11 @@ find_package(DoubleConversion MODULE REQUIRED)
  list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
  
@@ -14,8 +14,8 @@ index 2ccb030..0d10b57 100644
  find_package(Gflags MODULE)
  set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
  if(LIBGFLAGS_FOUND)
-@@ -59,11 +64,6 @@ if(LIBGFLAGS_FOUND)
-   list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
+@@ -61,11 +66,6 @@ if(LIBGFLAGS_FOUND)
+   set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
  endif()
  
 -find_package(Glog MODULE)
diff --git a/ports/proxygen/CONTROL b/ports/proxygen/CONTROL
index 8cd2e6ab760231..952467f158454d 100644
--- a/ports/proxygen/CONTROL
+++ b/ports/proxygen/CONTROL
@@ -1,5 +1,6 @@
 Source: proxygen
-Version: 2020.09.14.00
+Version: 2020.10.19.00
 Homepage: https://github.com/facebook/proxygen
 Description: It comprises the core C++ HTTP abstractions used at Facebook. 
-Build-Depends: folly, fizz, wangle, zstd, zlib, openssl, boost-iostreams, boost-context, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread
\ No newline at end of file
+Build-Depends: folly, fizz, wangle, zstd, zlib, openssl, boost-iostreams, boost-context, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread
+Supports: !windows
diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake
index 4a0e426202ce4f..65e022fcb3e3a0 100644
--- a/ports/proxygen/portfile.cmake
+++ b/ports/proxygen/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "Windows")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/proxygen
-    REF 67fddcb6f292dbda312a5fe28ae27fbecf4e6805 #v2020.09.14.00
-    SHA512 ecac8642cdd4c871e45b96e596991000a615f8731c09ea31d612a584c6565d279a0d38e5c4807b949cc2f8632b58593642b1f6a7b420bf70be04b604faf77275
+    REF bb2b1f2b3660fa1f15bbdff14ddba2a4ff5c43fa #v2020.10.19.00
+    SHA512 8547a8c329764f8448a9f294811ef1dfcfcfa77a15fa2fdd9ab25a5f7ab8d40c9932348d3a1b16b87ba56844c13ebf918e7080f247ff7fadad7363a70e2d0fe2
     HEAD_REF master
     PATCHES
         fix-tools-path.patch
diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL
index 104e52cc8ad748..a347c0782e31a2 100644
--- a/ports/wangle/CONTROL
+++ b/ports/wangle/CONTROL
@@ -1,5 +1,5 @@
 Source: wangle
-Version: 2020.09.14.00
+Version: 2020.10.19.00
 Homepage: https://github.com/facebook/wangle
 Build-Depends: fizz, folly, openssl, glog, libevent, double-conversion, boost-system, boost-thread, boost-filesystem, boost-regex, boost-context
 Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.
diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake
index 066e366bf64b46..37239515558796 100644
--- a/ports/wangle/portfile.cmake
+++ b/ports/wangle/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/wangle
-    REF bf64c061ca17be45707bd0a6cc5138b2494ff497 # v2020.09.14.00
-    SHA512 6ac8678d2bd5ed0a5f92cfe6ef1de549682eacf6e7d4e68bdcc102bbf344f2c027b1be6c1d52f95993fe85e2afb83a0f24410e8719bf94a0e75d009ddea046cf
+    REF 4bf3896ad5e938a01ba20efaf1ea59317d846fb2 # v2020.10.19.00
+    SHA512 1c21199225ebfe9a95391c2bb607412ebadc7aac326373e30dc9d49223a2437b382b4c3160fb2147a505bc2182f03f651c95f7c67f916e336ac81af76884f5fa
     HEAD_REF master
     PATCHES
         build.patch
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 49fafc396bf569..632d1c693272f1 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1309,9 +1309,6 @@ protobuf-c:x64-windows-static=fail
 protobuf-c:x64-uwp=fail
 protobuf-c:arm64-windows=fail
 protobuf-c:arm-uwp=fail
-# proxygen fails with "Target 'Windows' not supported by proxygen!"
-proxygen:x64-windows=fail
-proxygen:x64-windows-static=fail
 pthreads:arm64-windows=fail
 pthreads:arm-uwp=fail
 pthreads:x64-uwp=fail

From 1962a9f1b00b248fccf36177999e88c93a825fa2 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Fri, 23 Oct 2020 00:24:06 -0700
Subject: [PATCH 12/16] [fbthrift] Update to latest revision

---
 ports/fbthrift/CONTROL        | 2 +-
 ports/fbthrift/portfile.cmake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/fbthrift/CONTROL b/ports/fbthrift/CONTROL
index 75b69dc953edc6..d650963821926e 100644
--- a/ports/fbthrift/CONTROL
+++ b/ports/fbthrift/CONTROL
@@ -1,5 +1,5 @@
 Source: fbthrift
-Version: 2019.11.11.00
+Version: 2020.10.19.00
 Homepage: https://github.com/facebook/fbthrift
 Description: Facebook's branch of Apache Thrift, including a new C++ server.
 Build-Depends: openssl, zlib, fmt, gflags, glog, rsocket, fizz, folly, wangle, zstd, boost-context, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread
diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake
index ecd03825de7558..62c1a7a2e2e8f0 100644
--- a/ports/fbthrift/portfile.cmake
+++ b/ports/fbthrift/portfile.cmake
@@ -6,8 +6,8 @@ vcpkg_find_acquire_program(BISON)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/fbthrift
-    REF 3b56786f0822f78a408addffaf3a54b1b8c86dcd # v2019.11.11.00
-    SHA512 d892c6825345d2dc68abbe7a0eacb5ee0444fdea328d8d6bbcd512752058a2de715c03567120090a355115bb9d5d41f3f9c8dc2f82b8054d0b5a2fd1621bf473
+    REF e184b41448dab2f462094fa005ed05269cfba3e3 # v2020.10.19.00
+    SHA512 df03e1779fd3f1868ed7be21292bcd91ae65bcca591b0265a40391dde7e3b3b81d83fe7eb4ec8dd5c440be471375b8e2c8c24befefaca3ae0cab9ce10bfd362c
     HEAD_REF master
 )
 

From 6f5d24d6a3aed3c7f906b05d6dd609c410e0f078 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Fri, 23 Oct 2020 03:53:40 -0700
Subject: [PATCH 13/16] Install gperf on macos machine

---
 scripts/azure-pipelines/osx/configuration/Vagrantfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/azure-pipelines/osx/configuration/Vagrantfile b/scripts/azure-pipelines/osx/configuration/Vagrantfile
index c08703777b63be..c8bf8ce6b4fc73 100644
--- a/scripts/azure-pipelines/osx/configuration/Vagrantfile
+++ b/scripts/azure-pipelines/osx/configuration/Vagrantfile
@@ -21,7 +21,8 @@ brew_formulas = [
   'libtool',
   'mono',
   'pkg-config',
-  'yasm' ]
+  'yasm',
+  'gperf' ]
 
 brew_cask_formulas = [
   'powershell',

From 8fc84be5aef530ae0879247ace0cfc56610983ed Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Mon, 26 Oct 2020 18:21:38 -0700
Subject: [PATCH 14/16] Disable proxygen:x64-osx temporarily

---
 scripts/azure-pipelines/osx/configuration/Vagrantfile | 3 +--
 scripts/ci.baseline.txt                               | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/azure-pipelines/osx/configuration/Vagrantfile b/scripts/azure-pipelines/osx/configuration/Vagrantfile
index c8bf8ce6b4fc73..c08703777b63be 100644
--- a/scripts/azure-pipelines/osx/configuration/Vagrantfile
+++ b/scripts/azure-pipelines/osx/configuration/Vagrantfile
@@ -21,8 +21,7 @@ brew_formulas = [
   'libtool',
   'mono',
   'pkg-config',
-  'yasm',
-  'gperf' ]
+  'yasm' ]
 
 brew_cask_formulas = [
   'powershell',
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 632d1c693272f1..62ca6e1c645f53 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1309,6 +1309,7 @@ protobuf-c:x64-windows-static=fail
 protobuf-c:x64-uwp=fail
 protobuf-c:arm64-windows=fail
 protobuf-c:arm-uwp=fail
+proxygen:x64-osx=fail
 pthreads:arm64-windows=fail
 pthreads:arm-uwp=fail
 pthreads:x64-uwp=fail

From 93180484a9f587475a87450f05eda091a6fdd488 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Tue, 27 Oct 2020 00:53:55 -0700
Subject: [PATCH 15/16] Remove the unused patch for proxygen

---
 .../proxygen/fix-httpclient-tools-path.patch  | 11 -----
 ports/proxygen/fix-tools-path.patch           | 49 -------------------
 ports/proxygen/portfile.cmake                 |  5 +-
 3 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 ports/proxygen/fix-httpclient-tools-path.patch
 delete mode 100644 ports/proxygen/fix-tools-path.patch

diff --git a/ports/proxygen/fix-httpclient-tools-path.patch b/ports/proxygen/fix-httpclient-tools-path.patch
deleted file mode 100644
index 7f9849f60b5287..00000000000000
--- a/ports/proxygen/fix-httpclient-tools-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/proxygen/httpclient/samples/curl/CMakeLists.txt b/proxygen/httpclient/samples/curl/CMakeLists.txt
-index e7b6012..70e4caf 100644
---- a/proxygen/httpclient/samples/curl/CMakeLists.txt
-+++ b/proxygen/httpclient/samples/curl/CMakeLists.txt
-@@ -29,5 +29,5 @@ target_compile_options(
- install(
-     TARGETS proxygen_curl
-     EXPORT proxygen-exports
--    DESTINATION bin
-+    DESTINATION tools
- )
diff --git a/ports/proxygen/fix-tools-path.patch b/ports/proxygen/fix-tools-path.patch
deleted file mode 100644
index 2e6ab171a370ee..00000000000000
--- a/ports/proxygen/fix-tools-path.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/proxygen/httpserver/CMakeLists.txt b/proxygen/httpserver/CMakeLists.txt
-index 40046e5..ab53b06 100644
---- a/proxygen/httpserver/CMakeLists.txt
-+++ b/proxygen/httpserver/CMakeLists.txt
-@@ -45,7 +45,7 @@ target_link_libraries(
- install(
-     TARGETS proxygen_push
-     EXPORT proxygen-exports
--    DESTINATION bin
-+    DESTINATION tools
- )
- 
- add_executable(proxygen_proxy
-@@ -66,7 +66,7 @@ target_link_libraries(
- install(
-     TARGETS proxygen_proxy
-     EXPORT proxygen-exports
--    DESTINATION bin
-+    DESTINATION tools
- )
- 
- add_executable(proxygen_static
-@@ -87,7 +87,7 @@ target_link_libraries(
- install(
-     TARGETS proxygen_static
-     EXPORT proxygen-exports
--    DESTINATION bin
-+    DESTINATION tools
- )
- 
- add_executable(proxygen_echo
-@@ -108,7 +108,7 @@ target_link_libraries(
- install(
-     TARGETS proxygen_echo
-     EXPORT proxygen-exports
--    DESTINATION bin
-+    DESTINATION tools
- )
- 
- if (BUILD_QUIC)
-@@ -140,7 +140,7 @@ if (BUILD_QUIC)
-   install(
-       TARGETS hq
-       EXPORT proxygen-exports
--      DESTINATION bin
-+      DESTINATION tools
-   )
- endif()
- 
diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake
index 65e022fcb3e3a0..abe5633e20aac9 100644
--- a/ports/proxygen/portfile.cmake
+++ b/ports/proxygen/portfile.cmake
@@ -6,9 +6,6 @@ vcpkg_from_github(
     REF bb2b1f2b3660fa1f15bbdff14ddba2a4ff5c43fa #v2020.10.19.00
     SHA512 8547a8c329764f8448a9f294811ef1dfcfcfa77a15fa2fdd9ab25a5f7ab8d40c9932348d3a1b16b87ba56844c13ebf918e7080f247ff7fadad7363a70e2d0fe2
     HEAD_REF master
-    PATCHES
-        fix-tools-path.patch
-        fix-httpclient-tools-path.patch
 )
 
 vcpkg_find_acquire_program(PYTHON3)
@@ -33,6 +30,8 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+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_copy_pdbs()
 

From 0cf800213562dc2fb8181b2a51779b1fdeab45ae Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Tue, 27 Oct 2020 20:32:11 -0700
Subject: [PATCH 16/16] Fix proxygen supports:.

---
 ports/proxygen/CONTROL  | 4 ++--
 scripts/ci.baseline.txt | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/proxygen/CONTROL b/ports/proxygen/CONTROL
index 952467f158454d..5b660c3df5f072 100644
--- a/ports/proxygen/CONTROL
+++ b/ports/proxygen/CONTROL
@@ -1,6 +1,6 @@
 Source: proxygen
 Version: 2020.10.19.00
 Homepage: https://github.com/facebook/proxygen
-Description: It comprises the core C++ HTTP abstractions used at Facebook. 
+Description: It comprises the core C++ HTTP abstractions used at Facebook.
 Build-Depends: folly, fizz, wangle, zstd, zlib, openssl, boost-iostreams, boost-context, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread
-Supports: !windows
+Supports: !windows&!osx
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index de0a3c750f23b0..0b9eb78c6c5b2b 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1297,7 +1297,6 @@ protobuf-c:x64-windows-static=fail
 protobuf-c:x64-uwp=fail
 protobuf-c:arm64-windows=fail
 protobuf-c:arm-uwp=fail
-proxygen:x64-osx=fail
 pthreads:arm64-windows=fail
 pthreads:arm-uwp=fail
 pthreads:x64-uwp=fail