testing/ceph17: upgrade to 17.2.1

* use system rocksdb

3 files changed, 35 insertions, 19 deletions

diff --git a/testing/ceph17/12-arrow.patch b/testing/ceph17/12-arrow.patch
deleted file mode 100644
index 11b611850b..0000000000
--- a/testing/ceph17/12-arrow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-issue submitted as: https://tracker.ceph.com/issues/55420
-
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -4,7 +4,7 @@
- endif()
- 
- if(WITH_RADOSGW_SELECT_PARQUET)
--  set(ARROW_LIBRARIES Arrow::Parquet)
-+  set(ARROW_LIBRARIES "-larrow -lparquet")
-   add_definitions(-D_ARROW_EXIST)
-   message("-- arrow is installed, radosgw/s3select-op is able to process parquet objects")
- endif(WITH_RADOSGW_SELECT_PARQUET)
diff --git a/testing/ceph17/46-statx.patch b/testing/ceph17/46-statx.patch
new file mode 100644
index 0000000000..1773e6bd51
--- /dev/null
+++ b/testing/ceph17/46-statx.patch
@@ -0,0 +1,28 @@
+--- a/src/client/fuse_ll.cc
++++ b/src/client/fuse_ll.cc
+@@ -25,6 +25,7 @@
+ #include <unistd.h>
+ 
+ #if defined(__linux__)
++#include <features.h>
+ #include <libgen.h>
+ #include <sys/vfs.h>
+ #include <sys/xattr.h>
+@@ -178,7 +179,7 @@
+   struct fuse_args args;
+ };
+ 
+-#if defined(__linux__)
++#if defined(__linux__) && defined(__GLIBC__)
+ static int already_fuse_mounted(const char *path, bool &already_mounted)
+ {
+   struct statx path_statx;
+@@ -248,7 +249,7 @@
+ 
+   return err;
+ }
+-#else // non-linux platforms
++#else // non-linux platforms and musl
+ static int already_fuse_mounted(const char *path, bool &already_mounted)
+ {
+   already_mounted = false;
diff --git a/testing/ceph17/APKBUILD b/testing/ceph17/APKBUILD
index ce374222a7..4c24bf7963 100644
--- a/testing/ceph17/APKBUILD
+++ b/testing/ceph17/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Duncan Bellamy <dunk@denkimushi.com>
 # Maintainer: Duncan Bellamy <dunk@denkimushi.com>
 _pkgname=ceph
-pkgver=17.2.0
+pkgver=17.2.1
 _majorver=${pkgver%%.*}
 pkgname=$_pkgname$_majorver
 pkgrel=7
@@ -95,6 +95,7 @@ makedepends="
 	py3-sphinx
 	rabbitmq-c-dev
 	readline-dev
+	rocksdb-dev
 	rpcgen
 	samurai
 	snappy-dev
@@ -119,7 +120,6 @@ source="https://download.ceph.com/tarballs/ceph-$pkgver.tar.gz
 	11-dump_time_header_impl.patch
 	11-parse_rfc1123_alt.patch
 	11-s3_expiration_header.patch
-	12-arrow.patch
 	13-liburing.patch
 	20-pci.patch
 	21-cypress.patch
@@ -130,6 +130,7 @@ source="https://download.ceph.com/tarballs/ceph-$pkgver.tar.gz
 	39-req_bytes.patch
 	40-nasm.patch
 	45-python.patch
+	46-statx.patch	
 	"
 # to prevent things from installing ceph17 libs, since they have the same SOMAJOR
 sonameprefix="ceph$_majorver:so:"
@@ -197,7 +198,7 @@ prepare() {
 build() {
 	export CEPH_BUILD_VIRTUALENV="$builddir"
 	export NPM_REGISTRY="https://npm.open-registry.dev"
-	export CXXFLAGS="$CXXFLAGS -fpermissive"
+	export CXXFLAGS="$CXXFLAGS -fpermissive -D STATX_INO=0x100U"
 
 	case "$CARCH" in
 		s390x) _par="OFF" ;;
@@ -223,7 +224,7 @@ build() {
 		-DWITH_SYSTEM_BOOST=ON \
 		-DWITH_SYSTEM_LIBURING=ON \
 		-DWITH_SYSTEM_NPM=ON \
-		-DWITH_SYSTEM_ROCKSDB=OFF \
+		-DWITH_SYSTEM_ROCKSDB=ON \
 		-DWITH_SYSTEM_ARROW=ON \
 		-DWITH_PYTHON3=3 \
 		-DWITH_LTTNG=OFF \
@@ -627,14 +628,13 @@ mgr() {
 }
 
 sha512sums="
-70b96e709f153f16069bec8346ea73812d699eaab91a012351d02addb3fd176b84fce32c3dae84fdf91d0ffe49f2bb258410b47caeee81d81a672b4dbd04cc7e  ceph-17.2.0.tar.gz
+cb88a3feff67ce41c575cb6c0067a32de51fcbf36d8f9f7273cccd54a3413ee890f473e83fcc1429a86b858b05c412fca8b2cfc24871c5adf612e3d224227cf0  ceph-17.2.1.tar.gz
 110bdbcb40216c7ed155a8d23020784741b4992d895f4f04a146d275506e4e68053854d3b063b41e9c9b3e3e4f95b6b90602f92c185c853c0d8f47ad0c6b7121  ceph.confd
 ce5f162501f6b67fe254546dddf880d1a5b1d1a0fa69e0b1918de17e8da45c5c6124512b8cbd98b76f29d931403de0d11c5ffd330ed8ee1f4dc75bb04baecae3  ceph.initd
 94687578411bf0de1b17555ed81c188c88ea63ac4a25993bd8fde9cf68afbbfbdec7b2d7c54fdcfbd4aed4eb78754e8061c308955596cbe037ff15b575874cc6  10-musl-fixes.patch
 211e6f5f8fc962878196ec917984781eb4a8a9495bcc8d1729b34ac66abd2d4a0b7388ae2caee9d5deb664d54860d120a37215924625e82eac9bfca16179667a  11-dump_time_header_impl.patch
 ff6e281388432ef864e72e00833f979c7bafe14d56c08968835a123466bf5e82239dfb8a7d89afa9caabba445217ae4ba0d7f89093c2edf243dd7cca3353efbe  11-parse_rfc1123_alt.patch
 52b11dfd157dfb7363d2d3428901559189263caaa1c5f29a924b9be7ea012d4f54a887b22d2e2a3d756f6fd771f626505912dca52e6b19a56e018be45b7acb8b  11-s3_expiration_header.patch
-9a5b173c8fa0d2fb26f837cbbd801b36929459dc2e1758b9b8eeb13d6cc605a6dfaa3aab9f406a805b08a590bbc6a3367e565f5bb8772c590a4bd9c400f32383  12-arrow.patch
 3ba1801d9e2ab427ed14abd01881ef2115cd38309134145ec5a0a2a7adee2007e8b84b66ac1c7d5ea1139946aa87159dfb0768cd80181f42140979d790efe817  13-liburing.patch
 03ef3598181c45ecba5600a1e4db7fd897ea9d3c8abdfaad2dcf84c7a241d9ba18e7f7885d69ee0572ee307fc94600a2784a07da909d37a51de27f8ded2e3a70  20-pci.patch
 5b44cc43ce5ef7aed3c4da5a0d6d3bdcc2306217b5f72a501363e0cee6b9b5a6fffeaa610977540396f7459d1182cf5146547b6a8a08ebd0838f415a6396a7b1  21-cypress.patch
@@ -645,4 +645,5 @@ abb3cab9c01cc3d6d42a9858678059a8c9c43bda2649bf97b489fdc205eb10ae27f9fb7302062e0f
 3e0162cdd6fec1553319a2ad92f7d439b3febd543c33515b1f553a899ef8ebb06f414e35e74849d118fec5db6b9b239925a56730679d87334a2e9b9f7074e9c4  39-req_bytes.patch
 00f579eb9417cfc6fc99b5347febd5ae299004d47dd2fa389509bb2bdcb406f89c5cc0d2164ac2ad800f10129e89a56c794cd62c12d410de12ba6a664316e0a3  40-nasm.patch
 f49427d3420574043e18cad517a6f81ee38a48b827195f564fd728fd2f2b32dbf17f9e21842b01bbf3ab40875c70b0db316a478b8cc48dd92c839d2ce5e7fd63  45-python.patch
+f589c85baca2654e54ebd986ddda70a9b38116332c7c10aa5b75cd8a9c37e8d157baf0ad9ac91e36750046e7554d6831d93cb16d3967b5986155b8f38cff66c5  46-statx.patch
 "