[folly/fizz/wangle/proxygen/fbthrift] Update to latest revision

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

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
 )
 

ports/fizz/CONTROL

@@ -1,5 +1,5 @@
 Source: fizz
-Version: 2020.02.03.00
-Port-Version: 1
+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

ports/fizz/find-zlib.patch

@@ -1,14 +1,14 @@
 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()
 
 +find_package(ZLIB REQUIRED)
 +list(APPEND FIZZ_SHINY_DEPENDENCIES ZLIB::ZLIB)
 +
  set(FIZZ_HEADER_DIRS
-   base
    client
+   crypto

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 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)

ports/folly/CONTROL

@@ -1,9 +1,8 @@
 Source: folly
-Version: 2019.10.21.00
-Port-Version: 5
+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
+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
 

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);

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 \

ports/folly/portfile.cmake

@@ -12,17 +12,14 @@ 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 430aa0d8db79989dd56f8a0361fcb1c305618e41 # v2020.10.19.00
+    SHA512 d9f6aa0f7a8aee044c01af289d71e4c80d63e40ff128ac840663e3103d19cdd0da161a0b0d106493d950b9ac9a905c5e2abf8c1970c2f16b94dd95c0d1b1943e
     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
-        fix-cmake-3.18.patch # Remove this patch on the next update
 )
 
 file(COPY

ports/folly/reorder-glog-gflags.patch

@@ -1,22 +1,22 @@
 diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
-index e0bbcbb..fb45331 100644
+index 92b8ce7..04589ed 100644
 --- a/CMake/folly-deps.cmake
 +++ b/CMake/folly-deps.cmake
-@@ -24,6 +24,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})
 
-+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)
  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)
+@@ -61,11 +66,6 @@ if(LIBGFLAGS_FOUND)
+   set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
+ endif()
 
 -find_package(Glog MODULE)
 -set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})

ports/proxygen/CONTROL

@@ -1,5 +1,6 @@
 Source: proxygen
-Version: 2019.10.21.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
+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&!osx