From 1d759fefba58c0e00e12d1978633b1f47772ad51 Mon Sep 17 00:00:00 2001
From: Marius Schiffer <marius@mschiffer.de>
Date: Sat, 26 Mar 2022 14:49:11 +0000
Subject: [PATCH] Fix packaging

---
 ceph/PKGBUILD | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/ceph/PKGBUILD b/ceph/PKGBUILD
index 7770938..4f5dbd0 100644
--- a/ceph/PKGBUILD
+++ b/ceph/PKGBUILD
@@ -20,7 +20,7 @@ makedepends=("zstd" 'bash' 'bc' 'boost' 'boost-libs' 'bzip2' 'c-ares' 'cmake' 'c
              'jq' 'jre11-openjdk-headless' 'junit' 'keyutils' 'leveldb' 'libaio'
              'libatomic_ops' 'libcap' 'libcap-ng' 'libcroco' 'libcurl-compat'
              'libedit' 'libgudev' 'libnl' 'librabbitmq-c' 'libtool' 'util-linux'
-             'libuv' 'libxml2' 'librdkafka' 'libpciaccess' 'lsb-release' 'lua' 'lz4' 'ncurses'
+             'libuv' 'libxml2' 'librdkafka' 'libpciaccess' 'lsb-release' 'lua' 'lz4' 'ncurses' 'liburing'
              'nss' 'numactl' 'oath-toolkit' 'openssl' 'parted' 'pcre' 'pcre2' 'pkgconf' 'protobuf'
              'procps-ng' 'python-astroid' 'python-attrs' 'python-bcrypt'
              'python-cheroot' 'python-cherrypy' 'python-coverage' 'python-dateutil'
@@ -55,18 +55,11 @@ source=(
   'ceph-14.2.0-cython-0.29.patch'
   'ceph-15.2.0-rocksdb-cmake.patch'
   'ceph-16.2.0-liburing.patch'
+  'ceph-16.2.0-boost-string.patch'
   # 'ceph-15.2.5-missing-includes.patch'
   'disable-empty-readable.sh-test.patch'
-
-
-  # Add python >= 3.8 workaround logic for incompatible modules
-  # This has been designated for upstream backporting into the octupus (15) and pacific (16) branches.
-  # TODO: check if merged and included in next releases
-  # https://tracker.ceph.com/issues/45147
-  # https://github.com/ceph/ceph/pull/34846
-  # 'backport_mgr_disabled_modules_workaround_PR34846.patch'
 )
-sha512sums=('SKIP'
+sha512sums=('eab047e646970d444acf1064d98237b8b1677fb16b5e771082d55880f7bc6d8bdb278c2fe514c82ae12c438878d9ecea29139fa6b8d890f9f737138f10fb740c'
             '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
             '25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33'
             '9e6bb46d5bbdc5d93f4f026b2a8d6bdb692d9ea6e7018c1bb0188d95ea8574c76238d968b340fd67ddaa3d8183b310e393e3549dc3a63a795fde696413b0ca94'
@@ -74,11 +67,10 @@ sha512sums=('SKIP'
             '8ec0d668fefee12d2c7f5b5297dd81fc6a559f5823d069e6395d9b4240110eb8f95049d3054697a459948c1f3784b4450539849cf9d7f3b1aa1c7fbd96c475df'
             'ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e'
             '82c1608928ee669ef60b8930ce82c443152c446e669e7bde9ce32f78571afb19a9620c3818b69ac8cb3ea33e7d7ac40f77c89162c71b19b157336d907fa23e3d'
-            'SKIP'
-            '8258661e56b5360f4260fdd29b07bac4d415068a112b61ca8c55c529fb1593d8d61a0d59a4eec8f1567b97167c058082198d008f55f8ee701cb46489df5f7823'
-            '2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222'
-            '79e337a78cc4bd9ed8c8ab66831b3efd5a3a34e16d2c73ecedef03d2a34c7ac65ea25641a808913cd2dc2dc0f992fac35822efe4188622add6898dce1e5f13e3'
-            '4b4d0528d909fb735975db290bc8495ee626fc78d68b82b3525326cb69326cfc310c3078c529246f3d76cec590a3a7c4e92950009211590ebfe55583c4f5b71d')
+            '2e62020cce33e3152cdb9a128023ee673124c4bcfdb9ee17718891ba5c9a16d98eb03ed06fe7dc7833c98487c1c1eb67fadfad1aa2f40c2c648829c86b4caab0'
+            'e8d03f04cbc307b131a0a55cb90d8a568b78a8e8f294d7e4415b7da7acec05b4d1dc32632935841fe2a492de7ee8ff52e544aab91b838431fda3815ca377fa64'
+            'ced317fd8e5171aee1c68bae02ac8d197d88bf6f3edda653d401953b99fc1751e14d1b452a75376fe1998b3d5a21af2cea9c9bc91d76720d1775165ae02b6c99'
+            '2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222')
 
 
 # -fno-plt causes linker errors (undefined reference to internal methods)
@@ -258,7 +250,7 @@ package_ceph() {
   find "${pkgdir}/usr/lib" -maxdepth 1 -type l -delete
   find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type f -delete
   find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type l -delete
-  rm -rf "${pkgdir}"/usr/lib/{ceph/{compressor,crypto,erasure-code},rados-classes}
+  rm -rf "${pkgdir}"/usr/lib/{ceph/{compressor,crypto,erasure-code,librbd},rados-classes}
   rm -rf "${pkgdir}"/usr/lib/python*
   rm -rf "${pkgdir}/usr/include"