--- net/ceph14/Makefile (revision 544949) +++ net/ceph14/Makefile (working copy) @@ -3,8 +3,7 @@ PORTNAME= ceph DISTVERSIONPREFIX= v -DISTVERSION= 14.2.9 -PORTREVISION= 0 +DISTVERSION= 14.2.11 CATEGORIES= net PKGNAMESUFFIX= 14 @@ -39,7 +38,8 @@ liblz4.so:archivers/liblz4 \ libplds4.so:devel/nspr \ libtcmalloc.so:devel/google-perftools \ - librabbitmq.so:net/rabbitmq-c + librabbitmq.so:net/rabbitmq-c \ + libfmt.so:devel/libfmt RUN_DEPENDS= \ bash:shells/bash \ flock:sysutils/flock \ @@ -52,7 +52,6 @@ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \ @@ -87,11 +86,13 @@ 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+= ceph:seastar:0cf6aa6:seastar/src/seastar CMAKE_BUILD_TYPE= Release CMAKE_ON= WITH_SYSTEM_BOOST WITH_BOOST_CONTEXT WITH_FUSE WITH_PYTHON3 CMAKE_OFF= WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS \ - WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2 + WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2 \ + WITH_RADOSGW_KAFKA_ENDPOINT CMAKE_ARGS= -D MGR_PYTHON_VERSION=${PYTHON_VER} \ -D CEPH_MAN_DIR:STRING=man @@ -105,7 +106,7 @@ USERS= ceph GROUPS= ceph -PLIST_SUB= CMAKE_BUILD_TYPE_regex=\bdebug\b +# PLIST_SUB=CMAKE_BUILD_TYPE_regex="\bdebug\b" pre-configure: [ -e ${WRKSRC}/build ] || ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build --- net/ceph14/distinfo (revision 544949) +++ net/ceph14/distinfo (working copy) @@ -1,6 +1,6 @@ -TIMESTAMP = 1588080359 -SHA256 (ceph-ceph-v14.2.9_GH0.tar.gz) = cd3c9a7fe62380a6564cf9534b16c265173ca4120cb743f9c08edf8a2734c7bc -SIZE (ceph-ceph-v14.2.9_GH0.tar.gz) = 21360093 +TIMESTAMP = 1597409334 +SHA256 (ceph-ceph-v14.2.11_GH0.tar.gz) = 45470f70befab52dbf143224e3e9bfc90870369ae9413677e79f387863e76a80 +SIZE (ceph-ceph-v14.2.11_GH0.tar.gz) = 21948721 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 @@ -29,3 +29,5 @@ 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 (ceph-seastar-0cf6aa6_GH0.tar.gz) = 2772b32fbcb0f26c6d1cf07c1fcb9bfef7cdd2fdc41ec21af142d6cb3ff08f38 +SIZE (ceph-seastar-0cf6aa6_GH0.tar.gz) = 896598 --- net/ceph14/pkg-plist (revision 544949) +++ net/ceph14/pkg-plist (working copy) @@ -8,6 +8,7 @@ bin/ceph-crash bin/ceph-debugpack bin/ceph-dencoder +bin/ceph-diff-sorted bin/ceph-fuse bin/ceph-kvstore-tool bin/ceph-mds @@ -52,6 +53,7 @@ bin/rbd-replay bin/rbd-replay-many bin/rbdmap +bin/rgw-orphan-list etc/bash_completion.d/ceph etc/bash_completion.d/rados etc/bash_completion.d/radosgw-admin @@ -58,7 +60,7 @@ etc/bash_completion.d/rbd %%ETCDIR%%/ceph.conf.sample etc/newsyslog.conf.d/file-newsyslog_ceph-log.conf -include/cephfs/ceph_statx.h +include/cephfs/ceph_ll_client.h include/cephfs/libcephfs.h include/rados/buffer.h include/rados/buffer_fwd.h @@ -259,6 +261,10 @@ %%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 +%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/raw/__init__.py +%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/raw/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/raw/__pycache__/test_prepare.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/raw/test_prepare.py %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/test_zap.py %%PYTHON_SITELIBDIR%%/ceph_volume/tests/test_configuration.py %%PYTHON_SITELIBDIR%%/ceph_volume/tests/test_decorators.py @@ -376,6 +382,7 @@ man/man8/ceph-debugpack.8.gz man/man8/ceph-dencoder.8.gz man/man8/ceph-deploy.8.gz +man/man8/ceph-diff-sorted.8.gz man/man8/ceph-fuse.8.gz man/man8/ceph-kvstore-tool.8.gz man/man8/ceph-mds.8.gz @@ -404,6 +411,7 @@ man/man8/rbd-replay.8.gz man/man8/rbd.8.gz man/man8/rbdmap.8.gz +man/man8/rgw-orphan-list.8.gz sbin/ceph-create-keys sbin/ceph-volume sbin/mount.fuse.ceph @@ -436,6 +444,7 @@ %%DATADIR%%/mgr/dashboard/awsauth.py %%DATADIR%%/mgr/dashboard/cherrypy_backports.py %%DATADIR%%/mgr/dashboard/ci/check_grafana_uids.py +%%DATADIR%%/mgr/dashboard/constraints.txt %%DATADIR%%/mgr/dashboard/controllers/__init__.py %%DATADIR%%/mgr/dashboard/controllers/auth.py %%DATADIR%%/mgr/dashboard/controllers/cephfs.py @@ -477,8 +486,6 @@ %%DATADIR%%/mgr/dashboard/frontend/e2e/block/iscsi.po.ts %%DATADIR%%/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts %%DATADIR%%/mgr/dashboard/frontend/e2e/block/mirroring.po.ts -%%DATADIR%%/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts -%%DATADIR%%/mgr/dashboard/frontend/e2e/cluster/alerts.po.ts %%DATADIR%%/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts %%DATADIR%%/mgr/dashboard/frontend/e2e/cluster/configuration.po.ts %%DATADIR%%/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts @@ -738,14 +745,18 @@ %%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.scss %%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.ts -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/alert-list/alert-list.component.html -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/alert-list/alert-list.component.scss -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/alert-list/alert-list.component.spec.ts -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/alert-list/alert-list.component.ts -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-tabs/prometheus-tabs.component.html -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-tabs/prometheus-tabs.component.scss -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-tabs/prometheus-tabs.component.spec.ts -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-tabs/prometheus-tabs.component.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.html +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.scss +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.spec.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.html +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.scss +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.spec.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.html +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.scss +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.spec.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.html %%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.scss %%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.spec.ts @@ -1198,6 +1209,8 @@ %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/dimless-binary.pipe.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.spec.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/duration.pipe.spec.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/duration.pipe.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/empty.pipe.spec.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/empty.pipe.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/encode-uri.pipe.spec.ts @@ -1214,6 +1227,8 @@ %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/list.pipe.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/log-priority.pipe.spec.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/log-priority.pipe.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/map.pipe.spec.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/map.pipe.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/milliseconds.pipe.spec.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/milliseconds.pipe.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/not-available.pipe.spec.ts @@ -1362,6 +1377,7 @@ %%DATADIR%%/mgr/dashboard/tests/helper.py %%DATADIR%%/mgr/dashboard/tests/test_access_control.py %%DATADIR%%/mgr/dashboard/tests/test_api_auditing.py +%%DATADIR%%/mgr/dashboard/tests/test_ceph_service.py %%DATADIR%%/mgr/dashboard/tests/test_cephfs.py %%DATADIR%%/mgr/dashboard/tests/test_controllers.py %%DATADIR%%/mgr/dashboard/tests/test_docs.py @@ -1378,6 +1394,7 @@ %%DATADIR%%/mgr/dashboard/tests/test_pool.py %%DATADIR%%/mgr/dashboard/tests/test_prometheus.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 %%DATADIR%%/mgr/dashboard/tests/test_rest_tasks.py %%DATADIR%%/mgr/dashboard/tests/test_rgw.py