From 1020a32d76d1a91eb7ad11d1497f731edb36e05f Mon Sep 17 00:00:00 2001 From: Bronek Kozicki Date: Wed, 3 Sep 2025 11:12:43 +0100 Subject: [PATCH 1/2] Downgrade to boost 1.83 --- conan/profiles/default | 3 +++ conanfile.py | 2 +- src/test/server/ServerStatus_test.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/conan/profiles/default b/conan/profiles/default index 3a7bcda1c6..0417704f8a 100644 --- a/conan/profiles/default +++ b/conan/profiles/default @@ -26,6 +26,9 @@ tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw'] {% if compiler == "apple-clang" and compiler_version >= 17 %} tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw'] {% endif %} +{% if compiler == "clang" and compiler_version == 16 %} +tools.build:cxxflags=['-DBOOST_ASIO_DISABLE_CONCEPTS'] +{% endif %} {% if compiler == "gcc" and compiler_version < 13 %} tools.build:cxxflags=['-Wno-restrict'] {% endif %} diff --git a/conanfile.py b/conanfile.py index ab4657277c..bff4c93aa3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -104,7 +104,7 @@ class Xrpl(ConanFile): def requirements(self): # Conan 2 requires transitive headers to be specified transitive_headers_opt = {'transitive_headers': True} if conan_version.split('.')[0] == '2' else {} - self.requires('boost/1.86.0', force=True, **transitive_headers_opt) + self.requires('boost/1.83.0', force=True, **transitive_headers_opt) self.requires('date/3.0.4', **transitive_headers_opt) self.requires('lz4/1.10.0', force=True) self.requires('protobuf/3.21.12', force=True) diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp index b27dee6e0a..bcd355e301 100644 --- a/src/test/server/ServerStatus_test.cpp +++ b/src/test/server/ServerStatus_test.cpp @@ -681,7 +681,7 @@ class ServerStatus_test : public beast::unit_test::suite, resp["Upgrade"] == "websocket"); BEAST_EXPECT( resp.find("Connection") != resp.end() && - resp["Connection"] == "Upgrade"); + resp["Connection"] == "upgrade"); } void From 8d01f35eb9c516aab4c93a0288f8d599370501af Mon Sep 17 00:00:00 2001 From: Bronek Kozicki Date: Wed, 3 Sep 2025 15:39:50 +0100 Subject: [PATCH 2/2] Set version to 2.6.1-rc1 --- src/libxrpl/protocol/BuildInfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxrpl/protocol/BuildInfo.cpp b/src/libxrpl/protocol/BuildInfo.cpp index d5077aa44d..ae15ea6dec 100644 --- a/src/libxrpl/protocol/BuildInfo.cpp +++ b/src/libxrpl/protocol/BuildInfo.cpp @@ -36,7 +36,7 @@ namespace BuildInfo { // and follow the format described at http://semver.org/ //------------------------------------------------------------------------------ // clang-format off -char const* const versionString = "2.6.0" +char const* const versionString = "2.6.1-rc1" // clang-format on #if defined(DEBUG) || defined(SANITIZER)