From 15aaa8154f8b627eb4495519db483b347c0746ee Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 28 Jun 2023 11:55:36 +0200 Subject: [PATCH 01/18] Rebuilt due to fmt 10 update. From cce9b9cdb0dd71be4c324d594a50ff9cdeebbd7b Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 6 Jul 2023 14:10:48 -0500 Subject: [PATCH 02/18] Update to 2023.07.03.00 - Use SPDX license identifier Signed-off-by: Michel Alexandre Salim --- sources | 2 +- wangle.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 912b236..2183249 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wangle-2023.04.24.00.tar.gz) = b3ad46a5a8a84d4077ed9018d901fd6f5e1a1b9951b13665b63704fe2a18936e4a29406873a4a28126f25145bef96b517f47216ee3053dd201698591053e039b +SHA512 (wangle-2023.07.03.00.tar.gz) = c1dbde9f0c7b9c2edc192123b8420fe6a56038a7dbe90cbef91578ea0e9ebe890de45d3c8aa8bec376fce30e76e3b709a5353b79a91f8e6e63159c97197242a6 diff --git a/wangle.spec b/wangle.spec index ab1eb4f..5fafb68 100644 --- a/wangle.spec +++ b/wangle.spec @@ -10,11 +10,11 @@ %bcond_without check Name: wangle -Version: 2023.04.24.00 +Version: 2023.07.03.00 Release: %autorelease Summary: Framework for building services in a consistent/modular/composable way -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/facebook/wangle Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz # disable failing tests, see patch for context From dfad6998cde15fe41cdafebc8b686dbeb85f5dfd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:57:39 +0000 Subject: [PATCH 03/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 829958beabb506310cb939c602f48c5cd9a7f956 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Mon, 11 Sep 2023 14:43:00 -0500 Subject: [PATCH 04/18] Update to 2023.09.11.00 Signed-off-by: Michel Lind --- sources | 2 +- wangle-disable_failed_tests.patch | 16 +++++++--------- wangle.spec | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sources b/sources index 2183249..1c07547 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wangle-2023.07.03.00.tar.gz) = c1dbde9f0c7b9c2edc192123b8420fe6a56038a7dbe90cbef91578ea0e9ebe890de45d3c8aa8bec376fce30e76e3b709a5353b79a91f8e6e63159c97197242a6 +SHA512 (wangle-2023.09.11.00.tar.gz) = d8d9d1c3dd281365100210851fbbdd64ca4f363803f75d565a42e84e0c39ef6dae369cb72649a2b331d0edad563ea2e696f7ad8cd5875de9b49891117b3529d1 diff --git a/wangle-disable_failed_tests.patch b/wangle-disable_failed_tests.patch index 576c2bf..8512da8 100644 --- a/wangle-disable_failed_tests.patch +++ b/wangle-disable_failed_tests.patch @@ -1,7 +1,6 @@ -diff -ruN wangle-2021.12.20.00/wangle/bootstrap/test/BootstrapTest.cpp wangle-disable_failed_tests/wangle/bootstrap/test/BootstrapTest.cpp ---- wangle-2021.12.20.00/wangle/bootstrap/test/BootstrapTest.cpp 2021-12-19 19:29:28.000000000 -0800 -+++ wangle-disable_failed_tests/wangle/bootstrap/test/BootstrapTest.cpp 2021-12-23 12:04:07.412647589 -0800 -@@ -353,6 +353,7 @@ +--- a/wangle/bootstrap/test/BootstrapTest.cpp ++++ b/wangle/bootstrap/test/BootstrapTest.cpp +@@ -353,6 +353,7 @@ TEST(Bootstrap, UDP) { server.bind(0); } @@ -9,7 +8,7 @@ diff -ruN wangle-2021.12.20.00/wangle/bootstrap/test/BootstrapTest.cpp wangle-di TEST(Bootstrap, UDPClientServerTest) { connections = 0; -@@ -382,6 +383,7 @@ +@@ -382,6 +383,7 @@ TEST(Bootstrap, UDPClientServerTest) { EXPECT_EQ(connections, 1); } @@ -17,10 +16,9 @@ diff -ruN wangle-2021.12.20.00/wangle/bootstrap/test/BootstrapTest.cpp wangle-di TEST(Bootstrap, UnixServer) { TestServer server; -diff -ruN wangle-2021.12.20.00/wangle/CMakeLists.txt wangle-disable_failed_tests/wangle/CMakeLists.txt ---- wangle-2021.12.20.00/wangle/CMakeLists.txt 2021-12-19 19:29:28.000000000 -0800 -+++ wangle-disable_failed_tests/wangle/CMakeLists.txt 2021-12-23 12:01:23.779810003 -0800 -@@ -295,7 +295,9 @@ +--- a/wangle/CMakeLists.txt ++++ b/wangle/CMakeLists.txt +@@ -291,7 +291,9 @@ if(BUILD_TESTS) # add_gtest(service/test/ServiceTest.cpp ServiceTest) # this test requires arguments? # add_gtest(ssl/test/SSLCacheTest.cpp SSLCacheTest) diff --git a/wangle.spec b/wangle.spec index 5fafb68..0cd5e01 100644 --- a/wangle.spec +++ b/wangle.spec @@ -10,7 +10,7 @@ %bcond_without check Name: wangle -Version: 2023.07.03.00 +Version: 2023.09.11.00 Release: %autorelease Summary: Framework for building services in a consistent/modular/composable way From 4bec0df6df165420ff5c3eb251d1bb9c38e371bf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Oct 2023 10:03:24 +0200 Subject: [PATCH 05/18] rebuild for new libsodium From bcd533c70439ad4a0757940756e70c0a954be516 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Mon, 16 Oct 2023 20:52:39 -0500 Subject: [PATCH 06/18] Update to 2023.10.09.00 Signed-off-by: Michel Lind --- sources | 2 +- wangle.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 1c07547..9f136ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wangle-2023.09.11.00.tar.gz) = d8d9d1c3dd281365100210851fbbdd64ca4f363803f75d565a42e84e0c39ef6dae369cb72649a2b331d0edad563ea2e696f7ad8cd5875de9b49891117b3529d1 +SHA512 (wangle-2023.10.09.00.tar.gz) = 4a34dd5f9447201abf153ed9d0816d4e4f7b29a4f3f6e77ffffe6763178fc68e4325adc4c49b4f0104d29366154cae71dcc244fa5390d8798c7d48f0f07be8ba diff --git a/wangle.spec b/wangle.spec index 0cd5e01..2086add 100644 --- a/wangle.spec +++ b/wangle.spec @@ -10,7 +10,7 @@ %bcond_without check Name: wangle -Version: 2023.09.11.00 +Version: 2023.10.09.00 Release: %autorelease Summary: Framework for building services in a consistent/modular/composable way From bf4ba338e2e5f1dab7d455a5e0d85acaa36b75d8 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Tue, 17 Oct 2023 16:02:47 -0500 Subject: [PATCH 07/18] Update to 2023.10.16.00 Signed-off-by: Michel Lind --- sources | 2 +- wangle.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9f136ce..e221f9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wangle-2023.10.09.00.tar.gz) = 4a34dd5f9447201abf153ed9d0816d4e4f7b29a4f3f6e77ffffe6763178fc68e4325adc4c49b4f0104d29366154cae71dcc244fa5390d8798c7d48f0f07be8ba +SHA512 (wangle-2023.10.16.00.tar.gz) = fe332984f88a6671a76ea4739b5ecd59cb3b395665000cca1737d8879f31781a7309362f097c995d1301ffb81045c24a11bfd4cd7897b30e904b248202d8f5b4 diff --git a/wangle.spec b/wangle.spec index 2086add..dd203a4 100644 --- a/wangle.spec +++ b/wangle.spec @@ -10,7 +10,7 @@ %bcond_without check Name: wangle -Version: 2023.10.09.00 +Version: 2023.10.16.00 Release: %autorelease Summary: Framework for building services in a consistent/modular/composable way From dc51b2c637b31ef9d2ec4b5c5e0e4fdc71790297 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Mon, 22 Jan 2024 17:04:21 -0600 Subject: [PATCH 08/18] Update to 2024.01.22.00 Signed-off-by: Michel Lind --- sources | 2 +- wangle.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index e221f9d..0b4b615 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wangle-2023.10.16.00.tar.gz) = fe332984f88a6671a76ea4739b5ecd59cb3b395665000cca1737d8879f31781a7309362f097c995d1301ffb81045c24a11bfd4cd7897b30e904b248202d8f5b4 +SHA512 (wangle-2024.01.22.00.tar.gz) = 01591c8e7223785868ff0e28064e44f075f602164cb0434b4d3f9f6a3d440a36e2e571fdce6250adbc374d311848f22b006cde6dd1b5187f01fa8b3adf01b001 diff --git a/wangle.spec b/wangle.spec index dd203a4..fe2e92f 100644 --- a/wangle.spec +++ b/wangle.spec @@ -10,7 +10,7 @@ %bcond_without check Name: wangle -Version: 2023.10.16.00 +Version: 2024.01.22.00 Release: %autorelease Summary: Framework for building services in a consistent/modular/composable way From 9fa437f13d48169cf03b369ca48bf71a3107ea6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:21:44 +0000 Subject: [PATCH 09/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 92dd6d105526037fd8c69ac51c77c0bcbac79813 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Fri, 23 Feb 2024 17:42:42 -0600 Subject: [PATCH 10/18] Update to 2024.02.19.00 Signed-off-by: Michel Lind --- sources | 2 +- wangle.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 0b4b615..0fbb184 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wangle-2024.01.22.00.tar.gz) = 01591c8e7223785868ff0e28064e44f075f602164cb0434b4d3f9f6a3d440a36e2e571fdce6250adbc374d311848f22b006cde6dd1b5187f01fa8b3adf01b001 +SHA512 (wangle-2024.02.19.00.tar.gz) = e1e77814e23237e95e42bf32684276d8b541b12c64d524711e90e412fbca55a9370dd665ed138b1fe0a4d5114faf15f4c3b86e7c7da51e77311b8b45dadbcf81 diff --git a/wangle.spec b/wangle.spec index fe2e92f..79fa638 100644 --- a/wangle.spec +++ b/wangle.spec @@ -10,7 +10,7 @@ %bcond_without check Name: wangle -Version: 2024.01.22.00 +Version: 2024.02.19.00 Release: %autorelease Summary: Framework for building services in a consistent/modular/composable way From 424c75fd628bd312dfccf24f3edc524851b71b38 Mon Sep 17 00:00:00 2001 From: JasenChao Date: Tue, 9 Apr 2024 09:54:27 +0800 Subject: [PATCH 11/18] Add riscv64 support. --- wangle.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wangle.spec b/wangle.spec index 79fa638..78a5683 100644 --- a/wangle.spec +++ b/wangle.spec @@ -22,7 +22,7 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: %{name}-disable_failed_tests.patch %endif -ExclusiveArch: x86_64 aarch64 ppc64le +ExclusiveArch: x86_64 aarch64 ppc64le riscv64 BuildRequires: cmake %if %{with toolchain_clang} From 5bc22f35c814272b68b0ac6406c0b843a138ab28 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:06:42 +0000 Subject: [PATCH 12/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 46cb5d3765d9b5d974eb3360149343de334f8933 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Thu, 25 Jul 2024 13:31:52 -0500 Subject: [PATCH 13/18] Update to 2024.07.22.00 (rhbz#2266619) - replace `std::latch` with `folly::Latch` for C++17 compatibility - similarly, replace `std::barrier` with `boost::barrier` - switch to disabling unwanted tests via `--exclude-regex` Signed-off-by: Michel Lind --- sources | 2 +- wangle-disable_failed_tests.patch | 31 ---------- wangle-replace-std-latch.diff | 99 +++++++++++++++++++++++++++++++ wangle.spec | 20 +++++-- 4 files changed, 114 insertions(+), 38 deletions(-) delete mode 100644 wangle-disable_failed_tests.patch create mode 100644 wangle-replace-std-latch.diff diff --git a/sources b/sources index 0fbb184..399d28b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wangle-2024.02.19.00.tar.gz) = e1e77814e23237e95e42bf32684276d8b541b12c64d524711e90e412fbca55a9370dd665ed138b1fe0a4d5114faf15f4c3b86e7c7da51e77311b8b45dadbcf81 +SHA512 (wangle-2024.07.22.00.tar.gz) = 8a95a455b30c63164a5b1ae2b5e65358f5e0aaa8dbcf02d24e163a838ef44181b73d4fc1edb51c064c4104f780eadce645a5830d45ba9e3ff69faf09d34e14ae diff --git a/wangle-disable_failed_tests.patch b/wangle-disable_failed_tests.patch deleted file mode 100644 index 8512da8..0000000 --- a/wangle-disable_failed_tests.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/wangle/bootstrap/test/BootstrapTest.cpp -+++ b/wangle/bootstrap/test/BootstrapTest.cpp -@@ -353,6 +353,7 @@ TEST(Bootstrap, UDP) { - server.bind(0); - } - -+/* fine on mock, failed on Koji - TEST(Bootstrap, UDPClientServerTest) { - connections = 0; - -@@ -382,6 +383,7 @@ TEST(Bootstrap, UDPClientServerTest) { - - EXPECT_EQ(connections, 1); - } -+*/ - - TEST(Bootstrap, UnixServer) { - TestServer server; ---- a/wangle/CMakeLists.txt -+++ b/wangle/CMakeLists.txt -@@ -291,7 +291,9 @@ if(BUILD_TESTS) - # add_gtest(service/test/ServiceTest.cpp ServiceTest) - # this test requires arguments? - # add_gtest(ssl/test/SSLCacheTest.cpp SSLCacheTest) -- add_gtest(ssl/test/SSLContextManagerTest.cpp SSLContextManagerTest) -+ # this test fails against the packaged folly -+ # E1223 11:17:23.030416 2602 SSLContextManager.cpp:491] error loading client CA folly/io/async/test/certs/client_chain.pem: std::runtime_error: SSL_CTX_load_verify_locations: SSL error # 80000002; no such file; system lib -+ # add_gtest(ssl/test/SSLContextManagerTest.cpp SSLContextManagerTest) - add_gtest(ssl/test/TLSCredProcessorTest.cpp TLSCredProcessorTest) - add_gtest(util/test/FilePollerTest.cpp FilePollerTest) - endif() diff --git a/wangle-replace-std-latch.diff b/wangle-replace-std-latch.diff new file mode 100644 index 0000000..6622eef --- /dev/null +++ b/wangle-replace-std-latch.diff @@ -0,0 +1,99 @@ +--- a/wangle/bootstrap/test/AcceptRoutingHandlerTest.cpp ++++ b/wangle/bootstrap/test/AcceptRoutingHandlerTest.cpp +@@ -14,7 +14,7 @@ + * limitations under the License. + */ + +-#include ++#include + + #include "Mocks.h" + +@@ -182,7 +182,7 @@ TEST_F(AcceptRoutingHandlerTest, ParseRo + })); + + // Downstream pipeline is created, and its handler receives events +- std::latch barrier(2); ++ folly::Latch barrier(2); + EXPECT_CALL(*downstreamHandler_, transportActive(_)); + EXPECT_CALL(*downstreamHandler_, read(_, _)) + .WillOnce(Invoke([&](MockBytesToBytesHandler::Context* /*ctx*/, +@@ -208,7 +208,7 @@ TEST_F(AcceptRoutingHandlerTest, ParseRo + + TEST_F(AcceptRoutingHandlerTest, SocketErrorInRoutingPipeline) { + // Server receives data, and parses routing data +- std::latch barrierConnect(2); ++ folly::Latch barrierConnect(2); + EXPECT_CALL(*routingDataHandler_, transportActive(_)); + EXPECT_CALL(*routingDataHandler_, parseRoutingData(_, _)) + .WillOnce( +@@ -224,7 +224,7 @@ TEST_F(AcceptRoutingHandlerTest, SocketE + + // Socket exception after routing pipeline had been created + barrierConnect.arrive_and_wait(); +- std::latch barrierException(2); ++ folly::Latch barrierException(2); + std::move(futureClientPipeline) + .thenValue([](DefaultPipeline* clientPipeline) { + clientPipeline->getTransport()->getEventBase()->runInEventBaseThread( +@@ -259,7 +259,7 @@ TEST_F(AcceptRoutingHandlerTest, OnNewCo + delete downstreamHandler_; + + // Send client request that triggers server processing +- std::latch barrierConnect(2); ++ folly::Latch barrierConnect(2); + EXPECT_CALL(*routingDataHandler_, transportActive(_)) + .WillOnce(Invoke([&](MockBytesToBytesHandler::Context* /*ctx*/) { + barrierConnect.arrive_and_wait(); +@@ -269,7 +269,7 @@ TEST_F(AcceptRoutingHandlerTest, OnNewCo + futureClientPipeline.wait(); + + // Expect an exception on the routing data handler +- std::latch barrierException(2); ++ folly::Latch barrierException(2); + EXPECT_CALL(*routingDataHandler_, readException(_, _)) + .WillOnce(Invoke([&](MockBytesToBytesHandler::Context* /*ctx*/, + folly::exception_wrapper /*ex*/) { +--- a/wangle/bootstrap/test/BootstrapTest.cpp ++++ b/wangle/bootstrap/test/BootstrapTest.cpp +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include + + using namespace wangle; +@@ -167,7 +168,7 @@ TEST(Bootstrap, ServerAcceptGroupTest) { + SocketAddress address; + server.getSockets()[0]->getAddress(&address); + +- std::latch barrier(2); ++ folly::Latch barrier(2); + auto thread = std::thread([&]() { + TestClient client; + client.pipelineFactory(std::make_shared()); +--- a/wangle/channel/test/PipelineTest.cpp ++++ b/wangle/channel/test/PipelineTest.cpp +@@ -14,7 +14,7 @@ + * limitations under the License. + */ + +-#include ++#include + + #include + #include +@@ -373,10 +373,10 @@ TEST(Pipeline, Concurrent) { + NiceMock> handler1, handler2; + auto pipeline = Pipeline::create(); + (*pipeline).addBack(&handler1).addBack(&handler2).finalize(); +- std::barrier b{2}; ++ boost::barrier b{2}; + auto spam = [&] { + for (int i = 0; i < 100000; i++) { +- b.arrive_and_wait(); ++ b.count_down_and_wait(); + pipeline->read(i); + } + }; diff --git a/wangle.spec b/wangle.spec index 78a5683..3bd04e1 100644 --- a/wangle.spec +++ b/wangle.spec @@ -10,17 +10,14 @@ %bcond_without check Name: wangle -Version: 2024.02.19.00 +Version: 2024.07.22.00 Release: %autorelease Summary: Framework for building services in a consistent/modular/composable way License: Apache-2.0 URL: https://github.com/facebook/wangle -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -# disable failing tests, see patch for context -%if %{without all_tests} -Patch0: %{name}-disable_failed_tests.patch -%endif +Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch: %{name}-replace-std-latch.diff ExclusiveArch: x86_64 aarch64 ppc64le riscv64 @@ -34,6 +31,7 @@ BuildRequires: gcc-c++ BuildRequires: fizz-devel = %{version} BuildRequires: folly-devel = %{version} %if %{with check} +BuildRequires: boost-devel BuildRequires: gmock-devel BuildRequires: gtest-devel %endif @@ -85,7 +83,17 @@ cd - %if %{with check} %check cd wangle +%if %{with all_tests} %ctest +%else +EXCLUDED_TESTS='--exclude-regex ' +# somehow we can't just disable these two +# [ FAILED ] SSLContextManagerTest.TestSingleClientCAFileSet +# [ FAILED ] SSLContextManagerTest.TestMultipleClientCAsSet +EXCLUDED_TESTS+='SSLContextManagerTest' + +%ctest ${EXCLUDED_TESTS} +%endif cd - %endif From 42b93cef359d48652bd8fb0c807137cd62686e51 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Wed, 21 Aug 2024 13:14:56 -0500 Subject: [PATCH 14/18] Update to version 2024.08.19.00; Fixes: RHBZ#2301646 Signed-off-by: Michel Lind --- sources | 2 +- wangle-replace-std-latch.diff | 99 ----------------------------------- wangle.spec | 3 +- 3 files changed, 2 insertions(+), 102 deletions(-) delete mode 100644 wangle-replace-std-latch.diff diff --git a/sources b/sources index 399d28b..1451d24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wangle-2024.07.22.00.tar.gz) = 8a95a455b30c63164a5b1ae2b5e65358f5e0aaa8dbcf02d24e163a838ef44181b73d4fc1edb51c064c4104f780eadce645a5830d45ba9e3ff69faf09d34e14ae +SHA512 (wangle-2024.08.19.00.tar.gz) = 3a48aad4a3bc862ebb3c00db3099164d3c4c47e7dc1822ece1c07700e7b8c2d673d9d470cc7d8d4fc599e2299c2c1fd068e82e1dbd942c04ca8a6c3fc3be82ee diff --git a/wangle-replace-std-latch.diff b/wangle-replace-std-latch.diff deleted file mode 100644 index 6622eef..0000000 --- a/wangle-replace-std-latch.diff +++ /dev/null @@ -1,99 +0,0 @@ ---- a/wangle/bootstrap/test/AcceptRoutingHandlerTest.cpp -+++ b/wangle/bootstrap/test/AcceptRoutingHandlerTest.cpp -@@ -14,7 +14,7 @@ - * limitations under the License. - */ - --#include -+#include - - #include "Mocks.h" - -@@ -182,7 +182,7 @@ TEST_F(AcceptRoutingHandlerTest, ParseRo - })); - - // Downstream pipeline is created, and its handler receives events -- std::latch barrier(2); -+ folly::Latch barrier(2); - EXPECT_CALL(*downstreamHandler_, transportActive(_)); - EXPECT_CALL(*downstreamHandler_, read(_, _)) - .WillOnce(Invoke([&](MockBytesToBytesHandler::Context* /*ctx*/, -@@ -208,7 +208,7 @@ TEST_F(AcceptRoutingHandlerTest, ParseRo - - TEST_F(AcceptRoutingHandlerTest, SocketErrorInRoutingPipeline) { - // Server receives data, and parses routing data -- std::latch barrierConnect(2); -+ folly::Latch barrierConnect(2); - EXPECT_CALL(*routingDataHandler_, transportActive(_)); - EXPECT_CALL(*routingDataHandler_, parseRoutingData(_, _)) - .WillOnce( -@@ -224,7 +224,7 @@ TEST_F(AcceptRoutingHandlerTest, SocketE - - // Socket exception after routing pipeline had been created - barrierConnect.arrive_and_wait(); -- std::latch barrierException(2); -+ folly::Latch barrierException(2); - std::move(futureClientPipeline) - .thenValue([](DefaultPipeline* clientPipeline) { - clientPipeline->getTransport()->getEventBase()->runInEventBaseThread( -@@ -259,7 +259,7 @@ TEST_F(AcceptRoutingHandlerTest, OnNewCo - delete downstreamHandler_; - - // Send client request that triggers server processing -- std::latch barrierConnect(2); -+ folly::Latch barrierConnect(2); - EXPECT_CALL(*routingDataHandler_, transportActive(_)) - .WillOnce(Invoke([&](MockBytesToBytesHandler::Context* /*ctx*/) { - barrierConnect.arrive_and_wait(); -@@ -269,7 +269,7 @@ TEST_F(AcceptRoutingHandlerTest, OnNewCo - futureClientPipeline.wait(); - - // Expect an exception on the routing data handler -- std::latch barrierException(2); -+ folly::Latch barrierException(2); - EXPECT_CALL(*routingDataHandler_, readException(_, _)) - .WillOnce(Invoke([&](MockBytesToBytesHandler::Context* /*ctx*/, - folly::exception_wrapper /*ex*/) { ---- a/wangle/bootstrap/test/BootstrapTest.cpp -+++ b/wangle/bootstrap/test/BootstrapTest.cpp -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include - - using namespace wangle; -@@ -167,7 +168,7 @@ TEST(Bootstrap, ServerAcceptGroupTest) { - SocketAddress address; - server.getSockets()[0]->getAddress(&address); - -- std::latch barrier(2); -+ folly::Latch barrier(2); - auto thread = std::thread([&]() { - TestClient client; - client.pipelineFactory(std::make_shared()); ---- a/wangle/channel/test/PipelineTest.cpp -+++ b/wangle/channel/test/PipelineTest.cpp -@@ -14,7 +14,7 @@ - * limitations under the License. - */ - --#include -+#include - - #include - #include -@@ -373,10 +373,10 @@ TEST(Pipeline, Concurrent) { - NiceMock> handler1, handler2; - auto pipeline = Pipeline::create(); - (*pipeline).addBack(&handler1).addBack(&handler2).finalize(); -- std::barrier b{2}; -+ boost::barrier b{2}; - auto spam = [&] { - for (int i = 0; i < 100000; i++) { -- b.arrive_and_wait(); -+ b.count_down_and_wait(); - pipeline->read(i); - } - }; diff --git a/wangle.spec b/wangle.spec index 3bd04e1..cc39271 100644 --- a/wangle.spec +++ b/wangle.spec @@ -10,14 +10,13 @@ %bcond_without check Name: wangle -Version: 2024.07.22.00 +Version: 2024.08.19.00 Release: %autorelease Summary: Framework for building services in a consistent/modular/composable way License: Apache-2.0 URL: https://github.com/facebook/wangle Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch: %{name}-replace-std-latch.diff ExclusiveArch: x86_64 aarch64 ppc64le riscv64 From 224a2e7a89d6b46210debd588a1aa53561a8e210 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:44:26 +0000 Subject: [PATCH 15/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 66560b9b583d8671efd16ebdcada72ea846fc251 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Wed, 5 Feb 2025 21:20:53 -0600 Subject: [PATCH 16/18] Update to version 2025.02.03.00; Fixes: RHBZ#2307993 Signed-off-by: Michel Lind --- sources | 2 +- wangle.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 1451d24..138dc84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wangle-2024.08.19.00.tar.gz) = 3a48aad4a3bc862ebb3c00db3099164d3c4c47e7dc1822ece1c07700e7b8c2d673d9d470cc7d8d4fc599e2299c2c1fd068e82e1dbd942c04ca8a6c3fc3be82ee +SHA512 (wangle-2025.02.03.00.tar.gz) = 8c25a9c104c34a3ba02bbf14588a97ae9e8aea7cabcd1a881548573cdff259e40f6f2c439212cf8d22a5d95d65f51438a211473102f40ecba87f3d5ef2eff499 diff --git a/wangle.spec b/wangle.spec index cc39271..8ed5ed3 100644 --- a/wangle.spec +++ b/wangle.spec @@ -10,7 +10,7 @@ %bcond_without check Name: wangle -Version: 2024.08.19.00 +Version: 2025.02.03.00 Release: %autorelease Summary: Framework for building services in a consistent/modular/composable way @@ -91,6 +91,12 @@ EXCLUDED_TESTS='--exclude-regex ' # [ FAILED ] SSLContextManagerTest.TestMultipleClientCAsSet EXCLUDED_TESTS+='SSLContextManagerTest' +%ifarch ppc64le +# The following tests FAILED: +# 6 - BroadcastPoolTest (SEGFAULT) +EXCLUDED_TESTS+='|BroadcastPoolTest' +%endif + %ctest ${EXCLUDED_TESTS} %endif cd - From bdef791b639685fcace6accd6588e4b87ecabf87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:16:56 +0000 Subject: [PATCH 17/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 71537401a1c50ee22c578c05cc392a08030de1e1 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Fri, 16 Jan 2026 20:14:06 +0000 Subject: [PATCH 18/18] Retiring folly and related libraries, https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/KLNKMLQ3Q2O6SOSICXCCKGUILW76SNVL/ --- .gitignore | 1 - README.md | 3 -- changelog | 89 -------------------------------------- dead.package | 1 + sources | 1 - wangle.spec | 118 --------------------------------------------------- 6 files changed, 1 insertion(+), 212 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.md delete mode 100644 changelog create mode 100644 dead.package delete mode 100644 sources delete mode 100644 wangle.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 61fbcb6..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/wangle-????.??.??.??.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 9be2c93..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# wangle - -The wangle package diff --git a/changelog b/changelog deleted file mode 100644 index b416a67..0000000 --- a/changelog +++ /dev/null @@ -1,89 +0,0 @@ -* Thu Nov 18 2021 Michel Alexandre Salim - 2021.11.15.00-3 -- Rebuilt with OpenSSL 1.1.1 - -* Thu Nov 18 2021 Michel Alexandre Salim - 2021.11.15.00-2 -- Opt in to rpmautospec - -* Thu Nov 18 2021 Michel Alexandre Salim - 2021.11.15.00-1 -- Update to 2021.11.15.00 - -* Tue Sep 14 2021 Sahana Prasad - 2021.08.02.00-2 -- Rebuilt with OpenSSL 3.0.0 - -* Thu Aug 5 2021 Filipe Brandenburger - 2021.08.02.00-1 -- Update to 2021.08.02.00 - -* Thu Jul 29 2021 Michel Alexandre Salim - 2021.07.22.00-3 -- Use C++20 standard, in order to enable C++ coroutines - -* Tue Jul 27 2021 Michel Alexandre Salim - 2021.07.22-00-2 -- Rebuilt for folly 2021.07.22.00 - -* Sat Jul 24 2021 Michel Alexandre Salim - 2021.07.22.00-1 -- Update to 2021.07.22.00 - -* Fri Jul 23 2021 Fedora Release Engineering - 2021.06.28.00-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jul 12 2021 Michel Alexandre Salim - 2021.06.28.00-1 -- Update to 2021.06.28.00 - -* Wed Jun 09 2021 Michel Alexandre Salim - 2021.06.07.00-1 -- Update to 2021.06.07.00 - -* Mon May 10 2021 Michel Alexandre Salim - 2021.05.10.00-1 -- Update to 2021.05.10.00 - -* Mon Apr 26 2021 Michel Alexandre Salim - 2021.04.26.00-1 -- Update to 2021.04.26.00 - -* Fri Apr 16 2021 Michel Alexandre Salim - 2021.04.12.00-1 -- Update to 2021.04.12.00 - -* Mon Mar 29 2021 Michel Alexandre Salim - 2021.03.29.00-1 -- Update to 2021.03.29.00 - -* Wed Mar 24 2021 Michel Alexandre Salim - 2021.03.22.00-1 -- Update to 2021.03.22.00 - -* Mon Mar 15 2021 Michel Alexandre Salim - 2021.03.15.00-1 -- Update to 2021.03.15.00 - -* Wed Feb 03 2021 Michel Alexandre Salim - 2021.02.01.00-1 -- Update to 2021.02.01.00 - -* Wed Jan 27 2021 Fedora Release Engineering - 2021.01.25.00-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jan 26 17:49:34 PST 2021 Michel Alexandre Salim - 2021.01.25.00-1 -- Update to 2021.01.25.00 - -* Tue Dec 29 12:15:28 PST 2020 Michel Alexandre Salim - 2020.12.28.00-1 -- Update to 2020.12.28.00 - -* Tue Dec 22 16:56:57 PST 2020 Michel Alexandre Salim - 2020.12.21.00-1 -- Update to 2020.12.21.00 - -* Mon Nov 30 10:42:48 PST 2020 Michel Alexandre Salim - 2020.11.30.00-1 -- Update to 2020.11.30.00 - -* Mon Nov 23 2020 Michel Alexandre Salim - 2020.11.23.00-1 -- Update to 2020.11.23.00 - -* Mon Nov 16 2020 Michel Alexandre Salim - 2020.11.16.00-1 -- Update to 2020.11.16.00 - -* Mon Nov 9 2020 Michel Alexandre Salim - 2020.11.09.00-1 -- Update to 2020.11.09.00 - -* Mon Nov 2 2020 Michel Alexandre Salim - 2020.11.02.00-1 -- Update to 2020.11.02.00 - -* Fri Oct 30 2020 Michel Alexandre Salim - 2020.10.26.00-3 -- Enable static subpackage on architectures where fizz-static is available - -* Wed Oct 28 2020 Michel Alexandre Salim - 2020.10.26.00-2 -- Add ExcludeArch on s390x due to dependency on folly - -* Mon Oct 26 2020 Michel Alexandre Salim - 2020.10.26.00-1 -- Initial package diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..d3a5483 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Retiring folly and related libraries, https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/KLNKMLQ3Q2O6SOSICXCCKGUILW76SNVL/ diff --git a/sources b/sources deleted file mode 100644 index 138dc84..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (wangle-2025.02.03.00.tar.gz) = 8c25a9c104c34a3ba02bbf14588a97ae9e8aea7cabcd1a881548573cdff259e40f6f2c439212cf8d22a5d95d65f51438a211473102f40ecba87f3d5ef2eff499 diff --git a/wangle.spec b/wangle.spec deleted file mode 100644 index 8ed5ed3..0000000 --- a/wangle.spec +++ /dev/null @@ -1,118 +0,0 @@ -%bcond_with toolchain_clang - -# use this to re-test running all tests -%bcond_with all_tests - -%if %{with toolchain_clang} -%global toolchain clang -%endif - -%bcond_without check - -Name: wangle -Version: 2025.02.03.00 -Release: %autorelease -Summary: Framework for building services in a consistent/modular/composable way - -License: Apache-2.0 -URL: https://github.com/facebook/wangle -Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz - -ExclusiveArch: x86_64 aarch64 ppc64le riscv64 - -BuildRequires: cmake -%if %{with toolchain_clang} -BuildRequires: clang -%else -BuildRequires: gcc-c++ -%endif -# Library dependencies -BuildRequires: fizz-devel = %{version} -BuildRequires: folly-devel = %{version} -%if %{with check} -BuildRequires: boost-devel -BuildRequires: gmock-devel -BuildRequires: gtest-devel -%endif - - -%global _description %{expand: -Wangle is a library that makes it easy to build protocols, application clients, -and application servers. - -It's like Netty + Finagle smooshed together, but in C++.} - -%description %{_description} - - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-static < 2022.02.28.00-1 - -%description devel %{_description} -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - - -%prep -%autosetup -p1 - - -%build -cd wangle -%cmake \ -%if %{with check} - -DBUILD_TESTS=ON \ -%else - -DBUILD_TESTS=OFF \ -%endif - -DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name} \ - -DPACKAGE_VERSION=%{version} -%cmake_build -cd - - - -%install -cd wangle -%cmake_install -cd - - - -%if %{with check} -%check -cd wangle -%if %{with all_tests} -%ctest -%else -EXCLUDED_TESTS='--exclude-regex ' -# somehow we can't just disable these two -# [ FAILED ] SSLContextManagerTest.TestSingleClientCAFileSet -# [ FAILED ] SSLContextManagerTest.TestMultipleClientCAsSet -EXCLUDED_TESTS+='SSLContextManagerTest' - -%ifarch ppc64le -# The following tests FAILED: -# 6 - BroadcastPoolTest (SEGFAULT) -EXCLUDED_TESTS+='|BroadcastPoolTest' -%endif - -%ctest ${EXCLUDED_TESTS} -%endif -cd - -%endif - - -%files -%license LICENSE -%{_libdir}/*.so.%{version} - -%files devel -%doc CONTRIBUTING.md README.md tutorial.md -%{_includedir}/* -%{_libdir}/*.so -%{_libdir}/cmake/%{name} - - -%changelog -%autochangelog