[folly/fizz]Upgrade version. (#8765)

* [folly/fizz]Upgrade version.

* [fizz]Upgrade to v2019.10.28.00.

5 files changed, 31 insertions, 36 deletions

diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL
index fcc118553..86dbc6da6 100644
--- a/ports/fizz/CONTROL
+++ b/ports/fizz/CONTROL
@@ -1,4 +1,4 @@
 Source: fizz

-Version: 2019.07.08.00
+Version: 2019.10.28.00
 Build-Depends: folly, openssl, libsodium, zlib

 Description: a TLS 1.3 implementation by Facebook

diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake
index c18c52690..1647eb1ef 100644
--- a/ports/fizz/portfile.cmake
+++ b/ports/fizz/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 facebookincubator/fizz

-    REF 5a2cbf77381b2489ff636b836c26fde26a66cd7d
-    SHA512 6f6583dae05c95feb521396d932a263984f3b56c4ce18a672214ce5ece960cfb82203f7f6d23fa7b00dca62da640e4294f5f1cd6a6b0459d950c8997b71f3ce1

+    REF 3e933cff04c27c97d0fb0b899ed0c883b4e02e3b # v2019.10.28.00
+    SHA512 522b677f9e6cb0dd7ce2dad226efd831877ce12352efa6a34e743d1ec7a02ba65e7425472a57e88832f68fa4503206d9846580e305da6a0843034455e510b68d

     HEAD_REF master

     PATCHES

         find-zlib.patch

diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index 7b567665a..1ec16d009 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,5 +1,5 @@
 Source: folly
-Version: 2019.06.17.00
+Version: 2019.10.21.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
diff --git a/ports/folly/boost-1.70.patch b/ports/folly/boost-1.70.patch
index 97c01116d..98986b96c 100644
--- a/ports/folly/boost-1.70.patch
+++ b/ports/folly/boost-1.70.patch
@@ -1,23 +1,23 @@
-diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp

-index d75e012..03019f3 100644

---- a/folly/portability/PThread.cpp

-+++ b/folly/portability/PThread.cpp

-@@ -18,6 +18,9 @@

- 

- #if !FOLLY_HAVE_PTHREAD && _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 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/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 31f1c0331..bfe4aa7e6 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
   message(FATAL_ERROR "Folly only supports the x64 architecture.")
 endif()
@@ -14,14 +12,14 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
-    REF d12df6e924adc3889cd2fbeaca078355c5da170f
-    SHA512 ecb55cda91ab6db1519b612b676b5166454132960edce0a36f1b4e42f5e1a5f753d8bbb2ed93e34faed1025a54840eb4dc876a49c88b8dd9c90c8070dafc43b8
+    REF 8874256376d2f8a32867f17c9472a446d6707604 #2019.10.21.00
+    SHA512 96dfdde34697b72e8eb88431d742fffa337fc9146677d63cf0331dc5e4cd341fb00b88edf3781488e3194fa41525e70a6729e1bb6657f224cd1969deea9b468c
     HEAD_REF master
     PATCHES
         missing-include-atomic.patch
-        boost-1.70.patch
         reorder-glog-gflags.patch
         disable-non-underscore-posix-names.patch
+        boost-1.70.patch
 )
 
 file(COPY
@@ -94,5 +92,4 @@ ${_contents}")
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/folly)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/folly/LICENSE ${CURRENT_PACKAGES_DIR}/share/folly/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)