Date: Sun, 5 Dec 2021 18:10:21 GMT From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 30f5003a33ea - main - net/ceph14: update to 14.2.22 release (+) Message-ID: <202112051810.1B5IAL43085267@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=30f5003a33eaba30e73fb74b8cb90afc1a6da078 commit 30f5003a33eaba30e73fb74b8cb90afc1a6da078 Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2021-12-05 18:04:56 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2021-12-05 18:04:56 +0000 net/ceph14: update to 14.2.22 release (+) Upgrade Ceph14/Nautilus to the latest version. Maintainer notes: Fixed a few compilation errors so gcc is no longer required. Developemnt takes place with Clang, so gcc should not be needed. Added a few more required modules Update the way of installing the dashboard Committer note: Limit supported Python versions as range 3.8-3.9, some dependencies still not support py310+ yet. PR: 260238 Submitted by: maintainer Sponsored by: Netzkommune GmbH --- net/ceph14/Makefile | 15 +++++------- net/ceph14/distinfo | 10 ++++---- net/ceph14/files/patch-src_test_rgw_CMakeLists.txt | 27 ---------------------- net/ceph14/pkg-message | 11 +++++---- net/ceph14/pkg-plist | 9 ++++++++ 5 files changed, 27 insertions(+), 45 deletions(-) diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index b6439af26986..c0372e8dc7d1 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -2,8 +2,7 @@ PORTNAME= ceph DISTVERSIONPREFIX= v -DISTVERSION= 14.2.21 -PORTREVISION= 3 +DISTVERSION= 14.2.22 CATEGORIES= net PKGNAMESUFFIX= 14 @@ -39,7 +38,6 @@ LIB_DEPENDS= \ libtcmalloc.so:devel/google-perftools \ librabbitmq.so:net/rabbitmq-c \ libfmt.so:devel/libfmt -# libleveldb.so:databases/leveldb \ RUN_DEPENDS= \ bash:shells/bash \ flock:sysutils/flock \ @@ -59,10 +57,11 @@ RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pecan>=0:www/py-pecan@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} USES= cmake:noninja compiler:c++17-lang cpe dos2unix fuse gettext-runtime gmake ncurses \ - pkgconfig python:3.7+ readline shebangfix ssl + pkgconfig python:3.8-3.9 readline shebangfix ssl CPE_VENDOR= linuxfoundation USE_PYTHON= cython py3kplist USE_OPENLDAP= yes @@ -86,7 +85,7 @@ GH_TUPLE+= ceph:lua:1fce39c:lua/src/lua GH_TUPLE+= ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson GH_TUPLE+= ceph:rocksdb:4c736f1:rocksdb/src/rocksdb GH_TUPLE+= ceph:xxHash:1f40c65:xxHash/src/xxHash -GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd +GH_TUPLE+= facebook:zstd:b706286:zstd/src/zstd GH_TUPLE+= ceph:spawn:5f4742f:spawn/src/spawn OPTIONS_DEFINE= TESTS @@ -104,12 +103,10 @@ SHEBANG_FILES= src/rbdmap src/ceph-post-file.in src/rbd-replay-many \ src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \ src/ceph-create-keys -TESTS_DESC= Build test/debug tools (Broken with Clang) +TESTS_DESC= Build test/debug tools TESTS_CMAKE_ON= -DWITH_TESTS:BOOL=ON TESTS_CMAKE_OFF=-DWITH_TESTS:BOOL=OFF -USE_CXXSTD= gnu++17 - USE_RC_SUBR= ceph USE_LDCONFIG= yes diff --git a/net/ceph14/distinfo b/net/ceph14/distinfo index ecb5f6a89c8c..1712c725c790 100644 --- a/net/ceph14/distinfo +++ b/net/ceph14/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1621102521 -SHA256 (ceph-ceph-v14.2.21_GH0.tar.gz) = a21743228d64d096119b2a92e871277bec6c60f7d274069c23e5a7c8da7f194a -SIZE (ceph-ceph-v14.2.21_GH0.tar.gz) = 21956991 +TIMESTAMP = 1638610434 +SHA256 (ceph-ceph-v14.2.22_GH0.tar.gz) = 28529ed7dad98a94236563d31d019a4cf17eafc5350d2821a9422d4983ecfdf2 +SIZE (ceph-ceph-v14.2.22_GH0.tar.gz) = 21986508 SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 8ab8f36f3e0a720c882b8bb4abb3f2e26bd6b025cc263119207f7d2eb3b1e490 SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3685656 SHA256 (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 79ff0d1b9f959c9f5264a0dff193105d71885615deaa9c8469902400fd82d214 @@ -27,7 +27,7 @@ SHA256 (ceph-rocksdb-4c736f1_GH0.tar.gz) = 7216de17b5cf49d75ba309175d9fc576a5e08 SIZE (ceph-rocksdb-4c736f1_GH0.tar.gz) = 5468514 SHA256 (ceph-xxHash-1f40c65_GH0.tar.gz) = 809e06b7493ed01f13c7ba972393a5a6d23dd92fd6b884381aa907005e569372 SIZE (ceph-xxHash-1f40c65_GH0.tar.gz) = 25484 -SHA256 (facebook-zstd-f4340f4_GH0.tar.gz) = 0db909a46914eb7800bce044b86fcf595451713e56a2b131ace6f70ff25c1c4d -SIZE (facebook-zstd-f4340f4_GH0.tar.gz) = 1619022 +SHA256 (facebook-zstd-b706286_GH0.tar.gz) = 955b69b579c4da12cd54e75f2b4dbe58bb71d17ed94574b5451663c5445d1396 +SIZE (facebook-zstd-b706286_GH0.tar.gz) = 1988017 SHA256 (ceph-spawn-5f4742f_GH0.tar.gz) = c8832724cf3dd873db7c10407404b6cef30fa770902ab446f830902fed21603a SIZE (ceph-spawn-5f4742f_GH0.tar.gz) = 7319 diff --git a/net/ceph14/files/patch-src_test_rgw_CMakeLists.txt b/net/ceph14/files/patch-src_test_rgw_CMakeLists.txt deleted file mode 100644 index e48450465768..000000000000 --- a/net/ceph14/files/patch-src_test_rgw_CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt -index 36df883a66..efb6c4b5b8 100644 ---- src/test/rgw/CMakeLists.txt -+++ src/test/rgw/CMakeLists.txt -@@ -138,14 +138,14 @@ add_executable(unittest_rgw_string test_rgw_string.cc) - add_ceph_unittest(unittest_rgw_string) - - # unitttest_rgw_dmclock_queue --add_executable(unittest_rgw_dmclock_scheduler test_rgw_dmclock_scheduler.cc $<TARGET_OBJECTS:unit-main>) --add_ceph_unittest(unittest_rgw_dmclock_scheduler) -- --target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock) --if(WITH_BOOST_CONTEXT) -- target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING) -- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context) --endif() -+# add_executable(unittest_rgw_dmclock_scheduler test_rgw_dmclock_scheduler.cc $<TARGET_OBJECTS:unit-main>) -+# add_ceph_unittest(unittest_rgw_dmclock_scheduler) -+# -+# target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock) -+# if(WITH_BOOST_CONTEXT) -+# target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING) -+# target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context) -+# endif() - - if(WITH_RADOSGW_AMQP_ENDPOINT) - add_executable(unittest_rgw_amqp test_rgw_amqp.cc) diff --git a/net/ceph14/pkg-message b/net/ceph14/pkg-message index e590eda16587..7c2cf9f6901a 100644 --- a/net/ceph14/pkg-message +++ b/net/ceph14/pkg-message @@ -6,11 +6,14 @@ It comes with a web based dashboard that cannot be build into a package but will require the user to install it himself. To install the dashboard, please execute: - sudo pkg install npm-node14 + as root execute: cd ${LOCALBASE}/share/ceph/mgr/dashboard/frontend - sudo -u ceph npm ci - sudo chown -R ceph:ceph . - sudo chown -R ceph:ceph /var/lib/ceph + pkg install rpm2cpio + fetch http://download.ceph.com/rpm-nautilus/el8/noarch/ceph-mgr-dashboard-14.2.22-0.el8.noarch.rpm + rpm2cpio ${DISTDIR}/ceph-mgr-dashboard-${DISTVERSION}-0.el7.noarch.rpm | \ + ( cd ${WRKDIR}/dashboard; cpio -divm ) + chown -R ceph:ceph . + chown -R ceph:ceph /var/lib/ceph EOM } diff --git a/net/ceph14/pkg-plist b/net/ceph14/pkg-plist index 85bd42f503dd..39a16ca92520 100644 --- a/net/ceph14/pkg-plist +++ b/net/ceph14/pkg-plist @@ -54,6 +54,8 @@ bin/rbd-replay bin/rbd-replay-many bin/rbdmap bin/rgw-orphan-list +bin/rgw-gap-list +bin/rgw-gap-list-comparator etc/bash_completion.d/ceph etc/bash_completion.d/rados etc/bash_completion.d/radosgw-admin @@ -162,6 +164,7 @@ lib/librgw_admin_user.so.1.0.0 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/deactivate.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/listing.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/migrate%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/prepare.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/trigger.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/zap.cpython-%%PYTHON_SUFFIX%%.pyc @@ -172,6 +175,7 @@ lib/librgw_admin_user.so.1.0.0 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/deactivate.py %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/listing.py %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/main.py +%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/migrate.py %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/prepare.py %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/trigger.py %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/zap.py @@ -233,6 +237,7 @@ lib/librgw_admin_user.so.1.0.0 %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_create.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_deactivate.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_listing.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_migrate%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_prepare.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_trigger.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_zap.cpython-%%PYTHON_SUFFIX%%.pyc @@ -242,6 +247,7 @@ lib/librgw_admin_user.so.1.0.0 %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_create.py %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_deactivate.py %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_listing.py +%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_migrate.py %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_prepare.py %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_trigger.py %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_zap.py @@ -1018,6 +1024,8 @@ sbin/mount.fuse.ceph %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-daemon.service.spec.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-daemon.service.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-site.service.spec.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-site.service.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-user.service.spec.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-user.service.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/role.service.spec.ts @@ -1381,6 +1389,7 @@ sbin/mount.fuse.ceph %%DATADIR%%/mgr/dashboard/tests/test_plugin_debug.py %%DATADIR%%/mgr/dashboard/tests/test_pool.py %%DATADIR%%/mgr/dashboard/tests/test_prometheus.py +%%DATADIR%%/mgr/dashboard/tests/test_rbd.py %%DATADIR%%/mgr/dashboard/tests/test_rbd_mirroring.py %%DATADIR%%/mgr/dashboard/tests/test_rbd_service.py %%DATADIR%%/mgr/dashboard/tests/test_rest_client.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112051810.1B5IAL43085267>