[folly,fizz,wangle,mvfst,proxygen,fbthrift] update to 2024.01.01.00 (m…

…icrosoft#36027)
Osyotr · Jan 23, 2024 · 939b8b4 · 939b8b4
1 parent e0745da
commit 939b8b4
Show file tree

Hide file tree

Showing 22 changed files with 64 additions and 30 deletions.
diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/fbthrift
     REF "v${VERSION}"
-    SHA512 8730c2ecfeccf221e746df9f8e449d31934fd7e6f7861631d4c38e891cfc7b5ab07ffb48b56048031820f771966d6435bee2996738934bca9324548aeba5b30d
+    SHA512 9138917c622eb1254043520708d49391196412ef5a4c309e82c25eacfcc680a41b3a0b81cde9c777a1893015da5751bac1a627633ef917f9e94b39771a981a07
     HEAD_REF master
     PATCHES 
         fix-glog.patch

diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fbthrift",
-  "version-string": "2023.10.02.00",
+  "version-string": "2024.01.01.00",
   "description": "Facebook's branch of Apache Thrift, including a new C++ server.",
   "homepage": "https://github.com/facebook/fbthrift",
   "license": "Apache-2.0",

diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookincubator/fizz
     REF "v${VERSION}"
-    SHA512 ff0dfe95640a24568a2950442576fbf4acd9a1dd354b7f7687cb1946cc2f896664e6e54b29ec051eccddb765bab276cb94c9920c724c4b4a5b1fc5f29c26e649
+    SHA512 e940aacb6dd08163f292a6e3e07e5782ccaa7658c638791a75604ba4a05da6a827a383d1727e56c85823da99a678a60ae67207f64b64c274786ad85793fd04bb
     HEAD_REF master
     PATCHES
         0001-fix-libsodium.patch

diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fizz",
-  "version-string": "2023.10.02.00",
+  "version-string": "2024.01.01.00",
   "description": "a TLS 1.3 implementation by Facebook",
   "homepage": "https://github.com/facebookincubator/fizz",
   "license": "BSD-3-Clause",

diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
@@ -9,7 +9,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
     REF "v${VERSION}"
-    SHA512 406dbbd5a61a5b0713e7e6c7677be76392c21a5d702b051e72158513436ea9605afe616c5bc1405cb9455be1d1993990c9f2608284204210f41ffc2055e7831b
+    SHA512 c563aa64efa3098235db5f6354cdbc96d829f8bfc24e24464e0cae65279d00f1bba722c7060c2e76c89723ef66ef94225a02d6fb65e24fa6125adb619fc1d74b
     HEAD_REF main
     PATCHES
         reorder-glog-gflags.patch

diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "folly",
-  "version-string": "2023.10.02.00",
-  "port-version": 1,
+  "version-string": "2024.01.01.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",

diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/mvfst
     REF "v${VERSION}"
-    SHA512 074ad8201e2c35b51bde0f8eaeb22bfe87af80fd9f3dc6c3de343b19d4b3d7738780a208d4719ee4fbd9d3f2f8a1a95b4858e8dc3fad16c26e4a859ecab75eca
+    SHA512 6bcc4df79b42bafb06ee69f253733dd5136ef329b8009fc5677f62c3476d205f5f0cdcca242d0bde15914bf487a37aeeab1adb4ad555d2edd5e6b3935e84dd37
     HEAD_REF main
 )
 

diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mvfst",
-  "version-string": "2023.10.02.00",
+  "version-string": "2024.01.01.00",
   "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.",
   "homepage": "https://github.com/facebook/mvfst",
   "license": "MIT",

diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/proxygen
     REF "v${VERSION}"
-    SHA512 83b294895878c556b855688a78da524d7034a6dc4f1ed9c2b0e73a1bad55df2c4aae94921eb45e173ac0b53ed3ee885194caf37f0dff442f5a343701e4c0ccd8
+    SHA512 9a7081e0dafc93f1610a20ad2026111667711336efa46b9208873b539251f5b00d95597acde53818664aa6ea1fcda0dbd3417222af2fa23dc2f6b4c2bb079124
     HEAD_REF master
     PATCHES
         remove-register.patch

diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "proxygen",
-  "version-string": "2023.10.02.00",
+  "version-string": "2024.01.01.00",
   "description": "It comprises the core C++ HTTP abstractions used at Facebook.",
   "homepage": "https://github.com/facebook/proxygen",
   "license": "BSD-3-Clause",

diff --git a/ports/rsocket/fix-rsockserver-build-error.patch b/ports/rsocket/fix-rsockserver-build-error.patch
@@ -64,7 +64,7 @@ index 72d212c..79a09f1 100644
                    }
                  } catch (const std::exception& ex) {
 -                  value.emplaceException(std::current_exception(), ex);
-+                  value.emplaceException(folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), ex);
++                  value.emplaceException(std::current_exception());
                  } catch (...) {
                    value.emplaceException(std::current_exception());
                  }
@@ -77,7 +77,7 @@ index 9dff78b..bccd70d 100644
      } catch (const std::exception& ex) {
        subscriber.onError(
 -          folly::exception_wrapper(std::current_exception(), ex));
-+          folly::exception_wrapper(folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), ex));
++          folly::exception_wrapper(std::current_exception()));
      } catch (...) {
        subscriber.onError(std::runtime_error(
            "Flowable::fromGenerator() threw from Subscriber:onNext()"));
@@ -90,7 +90,7 @@ index 314ba7f..fe63504 100644
          }
        } catch (const std::exception& exn) {
 -        folly::exception_wrapper ew{std::current_exception(), exn};
-+        folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn};
++        folly::exception_wrapper ew{std::current_exception()};
          this->terminateErr(std::move(ew));
        }
      }
@@ -99,7 +99,7 @@ index 314ba7f..fe63504 100644
        } catch (const std::exception& exn) {
          this->terminateErr(
 -            folly::exception_wrapper{std::current_exception(), exn});
-+            folly::exception_wrapper{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn});
++            folly::exception_wrapper{std::current_exception()});
        }
      }
 
@@ -108,7 +108,7 @@ index 314ba7f..fe63504 100644
          mappedStream = flowable_->function_(std::move(value));
        } catch (const std::exception& exn) {
 -        folly::exception_wrapper ew{std::current_exception(), exn};
-+        folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn};
++        folly::exception_wrapper ew{std::current_exception()};
          {
            std::lock_guard<std::mutex> g(onErrorExGuard_);
            onErrorEx_ = ew;
@@ -121,7 +121,7 @@ index d1dc3b5..582f9c4 100644
      } catch (const std::exception& exn) {
        this->cancel();
 -      auto ew = folly::exception_wrapper{std::current_exception(), exn};
-+      auto ew = folly::exception_wrapper{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn};
++      auto ew = folly::exception_wrapper{std::current_exception()};
        LOG(ERROR) << "'next' method should not throw: " << ew.what();
        onErrorImpl(ew);
        return;
@@ -134,7 +134,7 @@ index 451c6bd..0e60b48 100644
          this->observerOnNext(observable_->function_(std::move(value)));
        } catch (const std::exception& exn) {
 -        folly::exception_wrapper ew{std::current_exception(), exn};
-+        folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn};
++        folly::exception_wrapper ew{std::current_exception()};
          this->terminateErr(std::move(ew));
        }
      }
@@ -147,7 +147,7 @@ index 0b3e739..4defd64 100644
          this->observerOnSuccess(map_operator->function_(std::move(value)));
        } catch (const std::exception& exn) {
 -        folly::exception_wrapper ew{std::current_exception(), exn};
-+        folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn};
++        folly::exception_wrapper ew{std::current_exception()};
          this->observerOnError(std::move(ew));
        }
      }
diff --git a/ports/rsocket/vcpkg.json b/ports/rsocket/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "rsocket",
   "version-string": "2021.08.30.00",
-  "port-version": 2,
+  "port-version": 3,
   "description": "C++ implementation of RSocket http://rsocket.io",
   "homepage": "https://github.com/rsocket/rsocket-cpp",
   "dependencies": [

diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/wangle
     REF "v${VERSION}"
-    SHA512 d5e44265e9e609d6fa42e7d3b71598e23460b4157eb45adeb1552077d30390775e6523d58d7d52446ea59509cbfdd7906f295220b70994df0c4f24128932cff4
+    SHA512 a3c671b19cb4f4875fa894b3374a4c24e6d4715fbb025c21434d7ca89f10f0affb8c25f392acc15793b4a92b48998d95c51b5120457e1b47ea15890221d0dd6c
     HEAD_REF master
     PATCHES
         fix-config-cmake.patch

diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "wangle",
-  "version-string": "2023.10.02.00",
+  "version-string": "2024.01.01.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",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2589,7 +2589,7 @@
       "port-version": 0
     },
     "fbthrift": {
-      "baseline": "2023.10.02.00",
+      "baseline": "2024.01.01.00",
       "port-version": 0
     },
     "fcl": {
@@ -2633,7 +2633,7 @@
       "port-version": 0
     },
     "fizz": {
-      "baseline": "2023.10.02.00",
+      "baseline": "2024.01.01.00",
       "port-version": 0
     },
     "flagpp": {
@@ -2717,8 +2717,8 @@
       "port-version": 0
     },
     "folly": {
-      "baseline": "2023.10.02.00",
-      "port-version": 1
+      "baseline": "2024.01.01.00",
+      "port-version": 0
     },
     "font-chef": {
       "baseline": "1.1.0",
@@ -5825,7 +5825,7 @@
       "port-version": 7
     },
     "mvfst": {
-      "baseline": "2023.10.02.00",
+      "baseline": "2024.01.01.00",
       "port-version": 0
     },
     "mygui": {
@@ -6817,7 +6817,7 @@
       "port-version": 0
     },
     "proxygen": {
-      "baseline": "2023.10.02.00",
+      "baseline": "2024.01.01.00",
       "port-version": 0
     },
     "psimd": {
@@ -7582,7 +7582,7 @@
     },
     "rsocket": {
       "baseline": "2021.08.30.00",
-      "port-version": 2
+      "port-version": 3
     },
     "rtabmap": {
       "baseline": "0.21.0",
@@ -9025,7 +9025,7 @@
       "port-version": 5
     },
     "wangle": {
-      "baseline": "2023.10.02.00",
+      "baseline": "2024.01.01.00",
       "port-version": 0
     },
     "wasmedge": {

diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "824b246c1bf15c6d96a4ca1126d3e9a279663585",
+      "version-string": "2024.01.01.00",
+      "port-version": 0
+    },
     {
       "git-tree": "80891c5a004015fd7a5c4334de145c92474f2cec",
       "version-string": "2023.10.02.00",

diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b3a03c5a987e674153efbc6e8a9ab1ed9655b0b0",
+      "version-string": "2024.01.01.00",
+      "port-version": 0
+    },
     {
       "git-tree": "1d8026070e16e8f91275e5f97699bfd5452166d4",
       "version-string": "2023.10.02.00",

diff --git a/versions/f-/folly.json b/versions/f-/folly.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "14d0ea48901f854308ce005f8de818b0a0bb06b2",
+      "version-string": "2024.01.01.00",
+      "port-version": 0
+    },
     {
       "git-tree": "5d4dff9c56b8324d2e6b7ca2ba6ad0b60845de56",
       "version-string": "2023.10.02.00",

diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c0b5b25444aee23d293543cb07f671e422d131a1",
+      "version-string": "2024.01.01.00",
+      "port-version": 0
+    },
     {
       "git-tree": "082167d3253fd7af5973a5e970a407c117702841",
       "version-string": "2023.10.02.00",

diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dd720dffa16fc78103cb6e6fc9aae13e94d33fb3",
+      "version-string": "2024.01.01.00",
+      "port-version": 0
+    },
     {
       "git-tree": "193a933153e2cfab49dd265a48ebeb650a9107e4",
       "version-string": "2023.10.02.00",

diff --git a/versions/r-/rsocket.json b/versions/r-/rsocket.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "52b82b815b431e296ffea53c1ce955c7df267d82",
+      "version-string": "2021.08.30.00",
+      "port-version": 3
+    },
     {
       "git-tree": "b1d02b39aaa70e97e3ec2551d1cfc6ae1a163199",
       "version-string": "2021.08.30.00",

diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "efa950ad690a3f10060fe5c09cfea6a55201736a",
+      "version-string": "2024.01.01.00",
+      "port-version": 0
+    },
     {
       "git-tree": "ff239f5d33f181256ff31bbb5cfc0bdc7329937c",
       "version-string": "2023.10.02.00",