Merge ~athos-ribeiro/ubuntu/+source/ceph:resource-agents-split into ubuntu/+source/ceph:ubuntu/devel

[Athos Ribeiro]

We removed the resource-agents transition package for noble. This should now depend on resource-agents-common.

Since the package was FTBFS, I am also providing a fix for that here.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/ceph-resource-agents-split/+packages

[Luciano Lo Giudice (lmlogiudice)]

lgtm, thanks!

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks, Luciano!

Uploaded.

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ceph_18.2.0-0ubuntu5.dsc: done.
  Uploading ceph_18.2.0-0ubuntu5.debian.tar.xz: done.
  Uploading ceph_18.2.0-0ubuntu5_source.buildinfo: done.
  Uploading ceph_18.2.0-0ubuntu5_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This was uploaded and is in noble-proposed already. Marking this MP as merged.

diff --git a/debian/changelog b/debian/changelog
index 7e73163..e482308 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+ceph (18.2.0-0ubuntu5) noble; urgency=medium
+
+  * d/control: depend on resource-agents-common. The transitional
+    resource-agents package has been removed.
+  * d/p/cmake-allow-empty-submodules.patch: use quotes to allow empty
+    submodules variable during the cmake build configuration. This is
+    a FTBFS fix for noble.
+  * d/control: switch to cython3-legacy. Thanks to Bas Couwenberg.
+    (Closes: #1056793)
+  * d/p/fix-boost-reef.patch: drop boost 1.74 changes.
+  * d/p/fix-boost-1.82-build.patch: fix build for boost >= 1.82.
+
+ -- Athos Ribeiro <[e-mail]>  Fri, 19 Jan 2024 16:36:49 -0300
+
 ceph (18.2.0-0ubuntu4) noble; urgency=medium
 
   * No-change rebuild for ICU soname change.
diff --git a/debian/control b/debian/control
index 18350c8..683ad2d 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Browser: https://salsa.debian.org/ceph-team/ceph
 Build-Depends:
  clang [armhf mipsel armel m68k sh4],
  cmake,
- cython3,
+ cython3-legacy,
  debhelper (>= 10~),
  default-jdk,
  dh-exec,
@@ -467,7 +467,7 @@ Recommends:
  pacemaker,
 Depends:
  ceph (>= ${binary:Version}),
- resource-agents,
+ resource-agents-common,
  ${misc:Depends},
 Description: OCF-compliant resource agents for Ceph
  Ceph is a distributed storage and network file system designed to provide
diff --git a/debian/patches/cmake-allow-empty-submodules.patch b/debian/patches/cmake-allow-empty-submodules.patch
new file mode 100644
index 0000000..827b6dc
--- /dev/null
+++ b/debian/patches/cmake-allow-empty-submodules.patch
@@ -0,0 +1,23 @@
+Description: Quote variable in cmake file to allow empy values
+ Use quotes to allow empty submodules variable during the cmake build
+ configuration, fixing a FTBFS issue started in noble.
+Author: Athos Ribeiro <[e-mail]>
+Forwarded: no
+Last-Update: 2024-01-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/cmake/modules/CTags.cmake
++++ b/cmake/modules/CTags.cmake
+@@ -16,10 +16,10 @@
+       OUTPUT_VARIABLE submodules
+       OUTPUT_STRIP_TRAILING_WHITESPACE)
+     if(${result_code} EQUAL 0)
+-      string(REPLACE "${TAGS_SRC_DIR}/" "" submodules ${submodules})
++      string(REPLACE "${TAGS_SRC_DIR}/" "" submodules "${submodules}")
+       # cmake list uses ";" as the delimiter, so split the string manually
+       # before iterating in it.
+-      string(REPLACE "\n" ";" submodules ${submodules})
++      string(REPLACE "\n" ";" submodules "${submodules}")
+       list(APPEND excludes ${submodules})
+     endif()
+   endif()
diff --git a/debian/patches/fix-boost-1.82-build.patch b/debian/patches/fix-boost-1.82-build.patch
new file mode 100644
index 0000000..3ec3525
--- /dev/null
+++ b/debian/patches/fix-boost-1.82-build.patch
@@ -0,0 +1,167 @@
+From 244c5ebbd4d5683da7f57612cc02e946aae7fd73 Mon Sep 17 00:00:00 2001
+From: "Adam C. Emerson" <[e-mail]>
+Date: Mon, 15 May 2023 18:31:38 -0400
+Subject: [PATCH] build: Bump boost to 1.82
+
+Needed to fix coroutine detection under Clang
+
+Signed-off-by: Adam C. Emerson <[e-mail]>
+---
+ CMakeLists.txt                 |  9 +++++++--
+ cmake/modules/BuildBoost.cmake |  6 +++---
+ cmake/modules/FindBoost.cmake  |  2 +-
+ install-deps.sh                |  4 ++--
+ make-dist                      |  4 ++--
+ src/rgw/rgw_asio_client.cc     | 14 +++++++-------
+ win32_deps_build.sh            |  4 ++--
+ 7 files changed, 24 insertions(+), 19 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ac7b5c953b..2852a7488ac 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -661,7 +661,7 @@ if(WITH_SYSTEM_BOOST)
+   if(BOOST_ROOT AND CMAKE_LIBRARY_ARCHITECTURE)
+     set(BOOST_LIBRARYDIR "${BOOST_ROOT}/lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+   endif()
+-  find_package(Boost 1.79 COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
++  find_package(Boost 1.82 COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
+   if(NOT ENABLE_SHARED)
+     set_property(TARGET Boost::iostreams APPEND PROPERTY
+       INTERFACE_LINK_LIBRARIES ZLIB::ZLIB)
+@@ -675,11 +675,16 @@ else()
+   set(BOOST_J ${DEFAULT_BOOST_J} CACHE STRING "max jobs for Boost build") # override w/-DBOOST_J=<n>
+   set(Boost_USE_STATIC_LIBS ON)
+   include(BuildBoost)
+-  build_boost(1.79
++  build_boost(1.82
+     COMPONENTS ${BOOST_COMPONENTS} ${BOOST_HEADER_COMPONENTS})
+ endif()
+ include_directories(BEFORE SYSTEM ${Boost_INCLUDE_DIRS})
+ 
++if(Boost_VERSION VERSION_EQUAL 1.81 OR Boost_VERSION VERSION_EQUAL 1.82)
++  # This is a workaround for https://github.com/boostorg/phoenix/issues/111
++  add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-DBOOST_PHOENIX_STL_TUPLE_H_>)
++endif()
++
+ # dashboard angular2 frontend
+ option(WITH_MGR_DASHBOARD_FRONTEND "Build the mgr/dashboard frontend using `npm`" ON)
+ option(WITH_SYSTEM_NPM "Assume that dashboard build tools already installed through packages" OFF)
+diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
+index 8cccecd144b..a2257879590 100644
+--- a/cmake/modules/BuildBoost.cmake
++++ b/cmake/modules/BuildBoost.cmake
+@@ -149,14 +149,14 @@ function(do_build_boost root_dir version)
+     check_boost_version("${PROJECT_SOURCE_DIR}/src/boost" ${version})
+     set(source_dir
+       SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost")
+-  elseif(version VERSION_GREATER 1.79)
++  elseif(version VERSION_GREATER 1.82)
+     message(FATAL_ERROR "Unknown BOOST_REQUESTED_VERSION: ${version}")
+   else()
+     message(STATUS "boost will be downloaded...")
+     # NOTE: If you change this version number make sure the package is available
+     # at the three URLs below (may involve uploading to download.ceph.com)
+-    set(boost_version 1.79.0)
+-    set(boost_sha256 475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39)
++    set(boost_version 1.82.0)
++    set(boost_sha256 a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6)
+     string(REPLACE "." "_" boost_version_underscore ${boost_version} )
+     string(JOIN " " boost_url
+       https://boostorg.jfrog.io/artifactory/main/release/${boost_version}/source/boost_${boost_version_underscore}.tar.bz2
+diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
+index cf0326a1eda..d47c4862dd0 100644
+--- a/cmake/modules/FindBoost.cmake
++++ b/cmake/modules/FindBoost.cmake
+@@ -1653,7 +1653,7 @@ else()
+   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
+   # _Boost_COMPONENT_DEPENDENCIES.
+   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+-    "1.80.0" "1.80" "1.79.0" "1.79"
++    "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79"
+     "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74"
+     "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69"
+     "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
+diff --git a/make-dist b/make-dist
+index 22bf2c98c00..dfe56cef64f 100755
+--- a/make-dist
++++ b/make-dist
+@@ -191,8 +191,8 @@ ln -s . $outfile
+ tar cvf $outfile.version.tar $outfile/src/.git_version $outfile/ceph.spec
+ # NOTE: If you change this version number make sure the package is available
+ # at the three URLs referenced below (may involve uploading to download.ceph.com)
+-boost_version=1.79.0
+-download_boost $boost_version 475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39 \
++boost_version=1.82.0
++download_boost $boost_version a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6 \
+                https://boostorg.jfrog.io/artifactory/main/release/$boost_version/source \
+                https://download.ceph.com/qa
+ download_liburing 0.7 8e2842cfe947f3a443af301bdd6d034455536c38a455c7a700d0c1ad165a7543 \
+diff --git a/src/rgw/rgw_asio_client.cc b/src/rgw/rgw_asio_client.cc
+index a0ec0bf5c06..51d43140ba5 100644
+--- a/src/rgw/rgw_asio_client.cc
++++ b/src/rgw/rgw_asio_client.cc
+@@ -39,11 +39,11 @@ int ClientIO::init_env(CephContext *cct)
+     const auto& value = header->value();
+ 
+     if (field == beast::http::field::content_length) {
+-      env.set("CONTENT_LENGTH", value.to_string());
++      env.set("CONTENT_LENGTH", std::string(value));
+       continue;
+     }
+     if (field == beast::http::field::content_type) {
+-      env.set("CONTENT_TYPE", value.to_string());
++      env.set("CONTENT_TYPE", std::string(value));
+       continue;
+     }
+ 
+@@ -62,26 +62,26 @@ int ClientIO::init_env(CephContext *cct)
+     }
+     *dest = '\0';
+ 
+-    env.set(buf, value.to_string());
++    env.set(buf, std::string(value));
+   }
+ 
+   int major = request.version() / 10;
+   int minor = request.version() % 10;
+   env.set("HTTP_VERSION", std::to_string(major) + '.' + std::to_string(minor));
+ 
+-  env.set("REQUEST_METHOD", request.method_string().to_string());
++  env.set("REQUEST_METHOD", std::string(request.method_string()));
+ 
+   // split uri from query
+   auto uri = request.target();
+   auto pos = uri.find('?');
+   if (pos != uri.npos) {
+     auto query = uri.substr(pos + 1);
+-    env.set("QUERY_STRING", query.to_string());
++    env.set("QUERY_STRING", std::string(query));
+     uri = uri.substr(0, pos);
+   }
+-  env.set("SCRIPT_URI", uri.to_string());
++  env.set("SCRIPT_URI", std::string(uri));
+ 
+-  env.set("REQUEST_URI", request.target().to_string());
++  env.set("REQUEST_URI", std::string(request.target()));
+ 
+   char port_buf[16];
+   snprintf(port_buf, sizeof(port_buf), "%d", local_endpoint.port());
+diff --git a/win32_deps_build.sh b/win32_deps_build.sh
+index 8535339e7bc..7e6b1e0aa14 100755
+--- a/win32_deps_build.sh
++++ b/win32_deps_build.sh
+@@ -20,8 +20,8 @@ sslDir="${depsToolsetDir}/openssl"
+ sslSrcDir="${depsSrcDir}/openssl"
+ 
+ # For now, we'll keep the version number within the file path when not using git.
+-boostUrl="https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.gz"
+-boostSrcDir="${depsSrcDir}/boost_1_79_0"
++boostUrl="https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.gz"
++boostSrcDir="${depsSrcDir}/boost_1_82_0"
+ boostDir="${depsToolsetDir}/boost"
+ zlibDir="${depsToolsetDir}/zlib"
+ zlibSrcDir="${depsSrcDir}/zlib"
+-- 
+2.43.0
+
diff --git a/debian/patches/fix-boost-reef.patch b/debian/patches/fix-boost-reef.patch
deleted file mode 100644
index d63190e..0000000
--- a/debian/patches/fix-boost-reef.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-Description: Build Reef with Boost 1.74
-Author: Luciano Lo Giudice <[e-mail]>
-Forwarded: no
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1bf0ce095d..11eb88d282 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -651,7 +651,7 @@ if(WITH_SYSTEM_BOOST)
-   if(BOOST_ROOT AND CMAKE_LIBRARY_ARCHITECTURE)
-     set(BOOST_LIBRARYDIR "${BOOST_ROOT}/lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-   endif()
--  find_package(Boost 1.79 COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
-+  find_package(Boost 1.74 COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
-   if(NOT ENABLE_SHARED)
-     set_property(TARGET Boost::iostreams APPEND PROPERTY
-       INTERFACE_LINK_LIBRARIES ZLIB::ZLIB)
-diff --git a/src/common/Graylog.h b/src/common/Graylog.h
-index c8c5013199..7788ca4065 100644
---- a/src/common/Graylog.h
-+++ b/src/common/Graylog.h
-@@ -4,6 +4,8 @@
- #ifndef __CEPH_LOG_GRAYLOG_H
- #define __CEPH_LOG_GRAYLOG_H
- 
-+#include <utility>
-+
- #include <boost/asio.hpp>
- #include <boost/iostreams/filtering_stream.hpp>
- #include <boost/iostreams/filter/zlib.hpp>
-diff --git a/src/rgw/rgw_dmclock_async_scheduler.cc b/src/rgw/rgw_dmclock_async_scheduler.cc
-index 28738e9f3a..38d7dd0af3 100644
---- a/src/rgw/rgw_dmclock_async_scheduler.cc
-+++ b/src/rgw/rgw_dmclock_async_scheduler.cc
-@@ -1,6 +1,8 @@
- // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
- // vim: ts=8 sw=2 smarttab ft=cpp
- 
-+#include <utility>
-+
- #include "common/async/completion.h"
- #include "rgw_dmclock_async_scheduler.h"
- #include "rgw_dmclock_scheduler.h"
-diff --git a/src/common/error_code.cc b/src/common/error_code.cc
-index 60086c550a..ef748adb42 100644
---- a/src/common/error_code.cc
-+++ b/src/common/error_code.cc
-@@ -14,6 +14,7 @@
-  */
- 
- #include <exception>
-+#include <utility>
- 
- #include "common/error_code.h"
- 
-diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
-index 7dc158fe15..a5e919ac6f 100644
---- a/src/mgr/Mgr.cc
-+++ b/src/mgr/Mgr.cc
-@@ -11,6 +11,8 @@
-  * Foundation.  See file COPYING.
-  */
- 
-+#include <utility>
-+
- #include <Python.h>
- 
- #include "osdc/Objecter.h"
-diff --git a/src/mon/error_code.cc b/src/mon/error_code.cc
-index a2cd392999..ed471c7249 100644
---- a/src/mon/error_code.cc
-+++ b/src/mon/error_code.cc
-@@ -14,6 +14,7 @@
-  */
- 
- #include <string>
-+#include <utility>
- 
- #include "common/error_code.h"
- #include "common/errno.h"
-diff --git a/src/osd/error_code.cc b/src/osd/error_code.cc
-index 97f0012fdb..bbcc97f371 100644
---- a/src/osd/error_code.cc
-+++ b/src/osd/error_code.cc
-@@ -14,6 +14,7 @@
-  */
- 
- #include <string>
-+#include <utility>
- 
- #include "common/error_code.h"
- #include "common/errno.h"
-diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
-index f006597e82..6414325188 100644
---- a/src/osdc/Objecter.cc
-+++ b/src/osdc/Objecter.cc
-@@ -14,6 +14,7 @@
- 
- #include <algorithm>
- #include <cerrno>
-+#include <utility>
- 
- #include "Objecter.h"
- #include "osd/OSDMap.h"
-diff --git a/src/osdc/error_code.cc b/src/osdc/error_code.cc
-index 7823e8b088..c6d3400aa1 100644
---- a/src/osdc/error_code.cc
-+++ b/src/osdc/error_code.cc
-@@ -14,6 +14,7 @@
-  */
- 
- #include <string>
-+#include <utility>
- 
- #include "common/error_code.h"
- #include "error_code.h"
-diff --git a/src/rgw/services/svc_mdlog.cc b/src/rgw/services/svc_mdlog.cc
-index 09a68d3d71..17b11c4d60 100644
---- a/src/rgw/services/svc_mdlog.cc
-+++ b/src/rgw/services/svc_mdlog.cc
-@@ -137,7 +137,7 @@ public:
-   ~SysObjReadCR() override {
-     try {
-       request_cleanup();
--    } catch (const boost::container::length_error_t& e) {
-+    } catch (const std::length_error& e) {
-       ldpp_dout(dpp, 0) << "ERROR: " << __func__ <<
- 	": reference counted object mismatched, \"" << e.what() <<
- 	"\"" << dendl;
-@@ -218,7 +218,7 @@ public:
-   ~SysObjWriteCR() override {
-     try {
-       request_cleanup();
--    } catch (const boost::container::length_error_t& e) {
-+    } catch (const std::length_error& e) {
-       ldpp_dout(dpp, 0) << "ERROR: " << __func__ <<
- 	": reference counted object mismatched, \"" << e.what() <<
- 	"\"" << dendl;
-diff --git a/src/rgw/rgw_cr_rest.cc b/src/rgw/rgw_cr_rest.cc
-index 04920a1551..d0c4fde31d 100644
---- a/src/rgw/rgw_cr_rest.cc
-+++ b/src/rgw/rgw_cr_rest.cc
-@@ -1,6 +1,8 @@
- // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
- // vim: ts=8 sw=2 smarttab ft=cpp
- 
-+#include <utility>
-+
- #include "rgw_cr_rest.h"
- 
- #include "rgw_coroutine.h"
-diff --git a/src/rgw/driver/rados/rgw_cr_tools.cc b/src/rgw/driver/rados/rgw_cr_tools.cc
-index 94665a35aa..231c89b59c 100644
---- a/src/rgw/driver/rados/rgw_cr_tools.cc
-+++ b/src/rgw/driver/rados/rgw_cr_tools.cc
-@@ -1,6 +1,8 @@
- // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
- // vim: ts=8 sw=2 smarttab ft=cpp
- 
-+#include <utility>
-+
- #include "common/errno.h"
- 
- #include "rgw_cr_tools.h"
-diff --git a/src/rgw/driver/rados/rgw_sync_error_repo.cc b/src/rgw/driver/rados/rgw_sync_error_repo.cc
-index 44305b60b6..1f8edf2560 100644
---- a/src/rgw/driver/rados/rgw_sync_error_repo.cc
-+++ b/src/rgw/driver/rados/rgw_sync_error_repo.cc
-@@ -12,6 +12,8 @@
-  * Foundation.  See file COPYING.
-  */
- 
-+#include <utility>
-+
- #include "rgw_sync_error_repo.h"
- #include "rgw_coroutine.h"
- #include "rgw_sal.h"
-diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
-index 633a296330..3aec2a6932 100644
---- a/src/rgw/rgw_asio_frontend.cc
-+++ b/src/rgw/rgw_asio_frontend.cc
-@@ -4,6 +4,7 @@
- #include <atomic>
- #include <ctime>
- #include <thread>
-+#include <utility>
- #include <vector>
- 
- #include <boost/asio.hpp>
-diff --git a/src/librbd/io/ObjectRequest.cc b/src/librbd/io/ObjectRequest.cc
-index 6d246cdf33..a29078727c 100644
---- a/src/librbd/io/ObjectRequest.cc
-+++ b/src/librbd/io/ObjectRequest.cc
-@@ -1,6 +1,8 @@
- // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
- // vim: ts=8 sw=2 smarttab
- 
-+#include <utility>
-+
- #include "librbd/io/ObjectRequest.h"
- #include "common/ceph_context.h"
- #include "common/dout.h"
-diff --git a/src/tools/neorados.cc b/src/tools/neorados.cc
-index 24966d2aee..7327764701 100644
---- a/src/tools/neorados.cc
-+++ b/src/tools/neorados.cc
-@@ -21,6 +21,7 @@
- #include <string>
- #include <string_view>
- #include <tuple>
-+#include <utility>
- #include <vector>
- 
- #include <boost/asio.hpp>
-diff --git a/src/tools/cephfs/Resetter.cc b/src/tools/cephfs/Resetter.cc
-index 7c0aa30ab6..130376db36 100644
---- a/src/tools/cephfs/Resetter.cc
-+++ b/src/tools/cephfs/Resetter.cc
-@@ -12,6 +12,7 @@
-  * 
-  */
- #include <memory>
-+#include <utility>
- #include "common/errno.h"
- #include "osdc/Journaler.h"
- #include "mds/JournalPointer.h"
-diff --git a/src/tools/cephfs/MDSUtility.cc b/src/tools/cephfs/MDSUtility.cc
-index 54386d2199..231e42988b 100644
---- a/src/tools/cephfs/MDSUtility.cc
-+++ b/src/tools/cephfs/MDSUtility.cc
-@@ -11,6 +11,8 @@
-  * Foundation.  See file COPYING.
-  */
- 
-+#include <utility>
-+
- #include "MDSUtility.h"
- #include "mon/MonClient.h"
-
-diff --git a/src/librbd/cache/ParentCacheObjectDispatch.cc b/src/librbd/cache/ParentCacheObjectDispatch.cc
-index d5ef373abc..4e9eef6777 100644
---- a/src/librbd/cache/ParentCacheObjectDispatch.cc
-+++ b/src/librbd/cache/ParentCacheObjectDispatch.cc
-@@ -1,6 +1,8 @@
- // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
- // vim: ts=8 sw=2 smarttab
- 
-+#include <utility>
-+
- #include "common/errno.h"
- #include "include/neorados/RADOS.hpp"
- #include "librbd/ImageCtx.h"
diff --git a/debian/patches/series b/debian/patches/series
index d6f865c..608f0eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,5 +14,6 @@ spdk_top-string-format.patch
 spdk-fix-make-exe.patch
 fix-CheckCxxAtomic-riscv64.patch
 patch-out-exporter.patch
-fix-boost-reef.patch
 fix-mantic-misc.patch
+cmake-allow-empty-submodules.patch
+fix-boost-1.82-build.patch