diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index b6439af26986..c0372e8dc7d1 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -1,183 +1,180 @@ # Created by: Willem Jan Withagen PORTNAME= ceph DISTVERSIONPREFIX= v -DISTVERSION= 14.2.21 -PORTREVISION= 3 +DISTVERSION= 14.2.22 CATEGORIES= net PKGNAMESUFFIX= 14 MAINTAINER= wjw@digiware.nl COMMENT= Ceph delivers object, block, and file storage in a unified system LICENSE= GPLv2 LGPL3 LICENSE_COMB= dual # even though i386 will build, it is not really advised. ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le BUILD_DEPENDS= \ bash:shells/bash \ git:devel/git \ gperf:devel/gperf \ yasm:devel/yasm \ ${PYTHON_PKGNAMEPREFIX}sphinx>=2.1.2,1:textproc/py-sphinx@${PY_FLAVOR} \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \ ${LOCALBASE}/bin/ld:devel/binutils LIB_DEPENDS= \ ${PY_BOOST} \ libboost_thread.so:devel/boost-libs \ libnss3.so:security/nss \ libcryptopp.so:security/cryptopp \ liboath.so:security/oath-toolkit \ libsnappy.so:archivers/snappy \ libcurl.so:ftp/curl \ libxml2.so:textproc/libxml2 \ libexpat.so:textproc/expat2 \ liblz4.so:archivers/liblz4 \ libplds4.so:devel/nspr \ 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 \ jq:textproc/jq \ smartctl:sysutils/smartmontools \ xml:textproc/xmlstarlet \ ${LOCALBASE}/bin/getopt:misc/getopt \ ${PYTHON_PKGNAMEPREFIX}grpcio>=0:devel/py-grpcio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \ ${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}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt1>=0:www/py-pyjwt1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \ ${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 USE_GITHUB= yes GH_ACCOUNT= ceph:DEFAULT DOS2UNIX_FILES= src/pybind/mgr/diskprediction_cloud/common/__init__.py CONFLICTS_INSTALL= ceph PORTSCOUT= limit:^v14\. GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus GH_TUPLE+= ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus GH_TUPLE+= ceph:civetweb:bb99e93:civetweb/src/civetweb GH_TUPLE+= 01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto GH_TUPLE+= ceph:dmclock:4496dbc:dmclock/src/dmclock GH_TUPLE+= ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete GH_TUPLE+= ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure GH_TUPLE+= ceph:googletest:fdb8504:googletest/src/googletest GH_TUPLE+= ceph:isa-l:7e1a337:isa_l/src/isa-l 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 OPTIONS_SUB= yes 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_LEVELDB \ WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2 \ WITH_RADOSGW_KAFKA_ENDPOINT WITH_LEVELDB CMAKE_ARGS= -DMGR_PYTHON_VERSION=${PYTHON_VER} \ -DCEPH_MAN_DIR:STRING=man 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 USERS= ceph GROUPS= ceph BINARY_ALIAS= sphinx-build=sphinx-build-${PYTHON_VER} # PLIST_SUB=CMAKE_BUILD_TYPE_regex="[[:<:]]debug[[:>:]]" .include .if ${ARCH} != amd64 PLIST_SUB+= NO_AMD64="@comment " .else PLIST_SUB+= NO_AMD64="" .endif pre-configure: [ -e ${WRKSRC}/build ] || ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build ${CP} files/file-git_version ${WRKSRC}/src/.git_version # Use the module finders that come with Cmake for Boost and Python ${RM} ${WRKSRC}/cmake/modules/FindBoost.cmake || true # Cleanup after patching ${RM} ${WRKSRC}/src/pybind/mgr/diskprediction_cloud/common/__init__.py.orig post-install: # To install a ceph.conf sample ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph ${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample # Get logging and rotation working ${MKDIR} ${STAGEDIR}/var/log/ceph ${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${INSTALL_DATA} files/file-newsyslog_ceph-log.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d # Create directories used bij daemons ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mds ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-osd ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-rgw ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mgr ${MKDIR} ${STAGEDIR}/var/lib/ceph/mds ${MKDIR} ${STAGEDIR}/var/lib/ceph/mon ${MKDIR} ${STAGEDIR}/var/lib/ceph/osd ${MKDIR} ${STAGEDIR}/var/lib/ceph/mgr ${MKDIR} ${STAGEDIR}/var/lib/ceph/tmp ${MKDIR} ${STAGEDIR}/var/lib/ceph/radosgw # For PID files and command sockets and log files ${MKDIR} ${STAGEDIR}/var/log/ceph ${MKDIR} ${STAGEDIR}/var/run/ceph # Use the Ceph init.d script as the interface to regular # starting and stopping daemons. rc.d work is done thru # a separate rc.d/ceph script calling init-ceph again. ${MV} ${STAGEDIR}${PREFIX}/etc/init.d/ceph ${STAGEDIR}${PREFIX}/bin/init-ceph # remove files not packaged ${RM} ${STAGEDIR}${DOCSDIR}/sample.fetch_config ${RM} ${STAGEDIR}${DOCSDIR}/sample.ceph.conf ${RMDIR} ${STAGEDIR}${DOCSDIR} ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_bench_log ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_multi_stress_watch ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_perf* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_psim ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_scratchtoolpp ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_smalliobench* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_test* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_tpbench ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_xattr_bench ${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-disk-udev ${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume-systemd ${RM} -rf ${STAGEDIR}${PREFIX}/libexec/systemd ${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d .include diff --git a/net/ceph14/distinfo b/net/ceph14/distinfo index ecb5f6a89c8c..1712c725c790 100644 --- a/net/ceph14/distinfo +++ b/net/ceph14/distinfo @@ -1,33 +1,33 @@ -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 SIZE (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 1838192 SHA256 (ceph-civetweb-bb99e93_GH0.tar.gz) = 1f8498176bf27381fb5516abae0e9068315e20f233cf5270123f38caa68691b0 SIZE (ceph-civetweb-bb99e93_GH0.tar.gz) = 11349651 SHA256 (01org-isa-l_crypto-603529a_GH0.tar.gz) = 52708b98c832bb7e6db60c949ece261d9609c822ae55239b0f2133cec2b3d155 SIZE (01org-isa-l_crypto-603529a_GH0.tar.gz) = 439149 SHA256 (ceph-dmclock-4496dbc_GH0.tar.gz) = 17f31174445058d76bb1895865d9def549fe668a050a8cea9ddd7b34125659d7 SIZE (ceph-dmclock-4496dbc_GH0.tar.gz) = 69730 SHA256 (ceph-gf-complete-7e61b44_GH0.tar.gz) = 7b0e5c1b41399d2c7d97ed7a7547ebf40023bcd104ed9a8b2b75bdee440c1a4d SIZE (ceph-gf-complete-7e61b44_GH0.tar.gz) = 342303 SHA256 (ceph-jerasure-96c76b8_GH0.tar.gz) = 06edaeb8cb5c3076e34cb53dd91c91d54d46fb8c3b837c6280ea2ed076556beb SIZE (ceph-jerasure-96c76b8_GH0.tar.gz) = 806334 SHA256 (ceph-googletest-fdb8504_GH0.tar.gz) = ece3265dae4d0fe5a52e7164432bb416de8bdb45e1c8cf8f361bbe893db30bb8 SIZE (ceph-googletest-fdb8504_GH0.tar.gz) = 1281068 SHA256 (ceph-isa-l-7e1a337_GH0.tar.gz) = 8099bc6ca3ca6ed9376f6cc5072a84d7a1863e2d7f2344bf08682d4efb7ae788 SIZE (ceph-isa-l-7e1a337_GH0.tar.gz) = 458398 SHA256 (ceph-lua-1fce39c_GH0.tar.gz) = fb5f778ce4da349ca903512a2fdb3987b12e3f0a52ab088fb011a8e4dd55848c SIZE (ceph-lua-1fce39c_GH0.tar.gz) = 366778 SHA256 (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 35c330d40ed9def99e8dea8f3b0e4fda7610b813b6f4aac9a70ffefcb9ab1f1e SIZE (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 1019457 SHA256 (ceph-rocksdb-4c736f1_GH0.tar.gz) = 7216de17b5cf49d75ba309175d9fc576a5e08a450b4dced532e6e9f71aca8b90 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 $) --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 $) -+# 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 @@ -1,17 +1,20 @@ [ { type: install message: <