repo: rm upstreamed iterator depreciations

This commit removes the patches to three files from
ceph-17.2.5-fix-iterator-depreciations:

- src/include/xlist.h
- src/include/rados/librados.hpp
- src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h

As the upstream has fixed them.

However, the patches to the following have not yet been applied
upstream, and thus remain:

- src/include/rangeset.h
- src/msg/async/dpdk/circular_buffer.h

Upstream-Ref: https://github.com/ceph/ceph/commit/77a3ed56a7b7326814ea5d37214bec1d88ec334e
Upstream-Ref: https://github.com/ceph/ceph/commit/691119c389e119a03aea606b7c4093d46c6db43d
Upstream-Ref: https://github.com/ceph/ceph/commit/905969611d256b6613bd86347bd51ddeb0603b79
Upstream-Ref: https://github.com/ceph/ceph/commit/c662ee698c6366e1b53856eb1a2c903c301a426f

3 files changed, 2 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 659c78c68577..43f4b922fcd6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -107,7 +107,7 @@ pkgbase = ceph
 	sha512sums = f1f549c5da829db787ee6ee3cf47912d5b48efb2533de05fd9735736e9218a78cf79c5958e1409a2c8adcca51460eb3ae7e73b5c1ec6cf73d4f07670c9934c3b
 	sha512sums = 81f540c8312972887a7cb43b8a4e29bfc6f24d5774787a4a8edfe65cca7d3b08faa08ecd09066d7ea67111769a5aec7385fe9a969546626f58874dd8aff5b664
 	sha512sums = 781a01e622a70d56bf1948bdc0b427ffa95a86cec7dd9d26c6007a9ec024a942a8ca55f2acc3d37344862f1d6bf11cae998d8071754cd841a66bfba4ec9c58bf
-	sha512sums = 2a6f33791760e14543c90077bfc6bf1b6b82ee2996e80b4762eadb887a0d9a67c221b6f10832ddf780dc6abaed246a1e2ee7680c9c861c4ff70e61b752a37b36
+	sha512sums = 612faebfb5eec3651832f349ea3c23b50d2386889ff77592b0acff653049efdc5c2254f63c30d88b9a730813bf1f1945dda0d0beab0db7db3e0708ba8d057a40
 	sha512sums = 02ca1a9bf15f9cd6f474f264ba2bf66ae725bac990a7cac315dabe377c66935a7afd8117f18a1f82c78bdf9ab2c3e5a2a227f2ffc166974dd7bb99b290f1f233
 	sha512sums = d9729c33f2b8c03ab918919e3b62cbc0825314ad09596dc12984ac5964f8b421db3376b84fa26e0952e0781deb218f8aff6ba32f9c8e5a22bd27afac8dcaf6d3
 	sha512sums = 79be1630ae4a599509e5d789d4aefe412ce47e67ad482f853664fa4b01e063c20593e3da668e6a776ad038fb07606ae948eea41bab20776c33c87f9ab49505e0
diff --git a/PKGBUILD b/PKGBUILD
index c6bfcedcb857..371efe317735 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -110,7 +110,7 @@ sha512sums=('dca9aea2ce210c15fcc34cb06a5dc5b4488ffa36d684166d47ebd87e48b54b6fee0
             'f1f549c5da829db787ee6ee3cf47912d5b48efb2533de05fd9735736e9218a78cf79c5958e1409a2c8adcca51460eb3ae7e73b5c1ec6cf73d4f07670c9934c3b'
             '81f540c8312972887a7cb43b8a4e29bfc6f24d5774787a4a8edfe65cca7d3b08faa08ecd09066d7ea67111769a5aec7385fe9a969546626f58874dd8aff5b664'
             '781a01e622a70d56bf1948bdc0b427ffa95a86cec7dd9d26c6007a9ec024a942a8ca55f2acc3d37344862f1d6bf11cae998d8071754cd841a66bfba4ec9c58bf'
-            '2a6f33791760e14543c90077bfc6bf1b6b82ee2996e80b4762eadb887a0d9a67c221b6f10832ddf780dc6abaed246a1e2ee7680c9c861c4ff70e61b752a37b36'
+            '612faebfb5eec3651832f349ea3c23b50d2386889ff77592b0acff653049efdc5c2254f63c30d88b9a730813bf1f1945dda0d0beab0db7db3e0708ba8d057a40'
             '02ca1a9bf15f9cd6f474f264ba2bf66ae725bac990a7cac315dabe377c66935a7afd8117f18a1f82c78bdf9ab2c3e5a2a227f2ffc166974dd7bb99b290f1f233'
             'd9729c33f2b8c03ab918919e3b62cbc0825314ad09596dc12984ac5964f8b421db3376b84fa26e0952e0781deb218f8aff6ba32f9c8e5a22bd27afac8dcaf6d3'
             '79be1630ae4a599509e5d789d4aefe412ce47e67ad482f853664fa4b01e063c20593e3da668e6a776ad038fb07606ae948eea41bab20776c33c87f9ab49505e0'
diff --git a/ceph-17.2.5-fix-iterator-depreciations.patch b/ceph-17.2.5-fix-iterator-depreciations.patch
index db57ed696843..af8635d05eea 100644
--- a/ceph-17.2.5-fix-iterator-depreciations.patch
+++ b/ceph-17.2.5-fix-iterator-depreciations.patch
@@ -1,42 +1,3 @@
-diff --git a/src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h b/src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h
-index 9948a4292fd..505f9826919 100644
---- a/src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h
-+++ b/src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h
-@@ -294,7 +294,13 @@ class StringKVInnerNodeLayout {
-   friend class delta_inner_t;
- public:
-   template <bool is_const>
--  class iter_t : public std::iterator<std::input_iterator_tag, StringKVInnerNodeLayout> {
-+  class iter_t {
-+    using iterator_category = std::input_iterator_tag;
-+    using value_type = StringKVInnerNodeLayout;
-+    using difference_type = std::ptrdiff_t;
-+    using pointer = StringKVInnerNodeLayout*;
-+    using reference = StringKVInnerNodeLayout&;
-+
-     friend class StringKVInnerNodeLayout;
- 
-     template <typename iterator, typename const_iterator>
-diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
-index b40d7bf9a57..683a87a28f4 100644
---- a/src/include/rados/librados.hpp
-+++ b/src/include/rados/librados.hpp
-@@ -104,8 +104,14 @@ inline namespace v14_2_0 {
-   };
-   CEPH_RADOS_API std::ostream& operator<<(std::ostream& os, const librados::ObjectCursor& oc);
- 
--  class CEPH_RADOS_API NObjectIterator : public std::iterator <std::forward_iterator_tag, ListObject> {
-+  class CEPH_RADOS_API NObjectIterator {
-   public:
-+    using iterator_category = std::forward_iterator_tag;
-+    using value_type = ListObject;
-+    using difference_type = std::ptrdiff_t;
-+    using pointer = ListObject*;
-+    using reference = ListObject&;
-+
-     static const NObjectIterator __EndObjectIterator;
-     NObjectIterator(): impl(NULL) {}
-     ~NObjectIterator();
 diff --git a/src/include/rangeset.h b/src/include/rangeset.h
 index e7e3d047c72..f19af0b61e4 100644
 --- a/src/include/rangeset.h
@@ -58,46 +19,6 @@ index e7e3d047c72..f19af0b61e4 100644
    //typedef typename map<T,T>::iterator mapit;
  
    map<T,T> ranges;
-diff --git a/src/include/xlist.h b/src/include/xlist.h
-index 733a318a9bd..7e1ae49b246 100644
---- a/src/include/xlist.h
-+++ b/src/include/xlist.h
-@@ -159,10 +159,16 @@ public:
-     remove(_back);
-   }
- 
--  class iterator: std::iterator<std::forward_iterator_tag, T> {
-+  class iterator {
-   private:
-     item *cur;
-   public:
-+    using iterator_category = std::forward_iterator_tag;
-+    using value_type = T;
-+    using difference_type = std::ptrdiff_t;
-+    using pointer = T*;
-+    using reference = T&;
-+
-     iterator(item *i = 0) : cur(i) {}
-     T operator*() { return static_cast<T>(cur->_item); }
-     iterator& operator++() {
-@@ -183,10 +189,16 @@ public:
-   iterator begin() { return iterator(_front); }
-   iterator end() { return iterator(NULL); }
- 
--  class const_iterator: std::iterator<std::forward_iterator_tag, T> {
-+  class const_iterator {
-   private:
-     item *cur;
-   public:
-+    using iterator_category = std::forward_iterator_tag;
-+    using value_type = T;
-+    using difference_type = std::ptrdiff_t;
-+    using pointer = T*;
-+    using reference = T&;
-+
-     const_iterator(item *i = 0) : cur(i) {}
-     const T operator*() { return static_cast<const T>(cur->_item); }
-     const_iterator& operator++() {
 diff --git a/src/msg/async/dpdk/circular_buffer.h b/src/msg/async/dpdk/circular_buffer.h
 index 2c92c120444..bf5d422dac6 100644
 --- a/src/msg/async/dpdk/circular_buffer.h