Index: head/net/ceph14/Makefile =================================================================== --- head/net/ceph14/Makefile (revision 533160) +++ head/net/ceph14/Makefile (revision 533161) @@ -1,160 +1,160 @@ # Created by: Willem Jan Withagen # $FreeBSD$ PORTNAME= ceph DISTVERSIONPREFIX= v -DISTVERSION= 14.2.7 -PORTREVISION= 1 +DISTVERSION= 14.2.8 +PORTREVISION= 0 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 BUILD_DEPENDS= \ bash:shells/bash \ git:devel/git \ gperf:devel/gperf \ yasm:devel/yasm \ ${PYTHON_PKGNAMEPREFIX}sphinx>0: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 \ libleveldb.so:databases/leveldb \ 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 RUN_DEPENDS= \ bash:shells/bash \ flock:sysutils/flock \ jq:textproc/jq \ + smartctl:sysutils/smartmontools \ xml:textproc/xmlstarlet \ ${LOCALBASE}/bin/getopt:misc/getopt \ - ${LOCALBASE}/sbin/smartctl:sysutils/smartmontools \ ${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}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} \ ${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} USES= cmake:noninja dos2unix fuse gettext-runtime gmake ncurses \ pkgconfig python:3.7+ shebangfix ssl -USE_PYTHON= cython +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 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_RADOSGW_BEAST_FRONTEND \ - WITH_MGR_DASHBOARD_FRONTEND WITH_SYSTEM_NPM \ - WITH_LIBCEPHFS WITH_CEPHFS WITH_PYTHON2 + WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2 CMAKE_ARGS= -D MGR_PYTHON_VERSION=${PYTHON_VER} \ -D CEPH_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 USE_RC_SUBR= ceph USE_LDCONFIG= yes USERS= ceph GROUPS= ceph PLIST_SUB= CMAKE_BUILD_TYPE_regex=\bdebug\b 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 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 Index: head/net/ceph14/distinfo =================================================================== --- head/net/ceph14/distinfo (revision 533160) +++ head/net/ceph14/distinfo (revision 533161) @@ -1,31 +1,31 @@ -TIMESTAMP = 1581605576 -SHA256 (ceph-ceph-v14.2.7_GH0.tar.gz) = f2882424ecce6fa3a6bf5bdbdc01fc3dae885d9f2ccb40c50ead859eeba69126 -SIZE (ceph-ceph-v14.2.7_GH0.tar.gz) = 21217939 +TIMESTAMP = 1586673911 +SHA256 (ceph-ceph-v14.2.8_GH0.tar.gz) = 313e7e17f898ffde8b85093541e6e9a1fb3515456f95404d67133e60d305f370 +SIZE (ceph-ceph-v14.2.8_GH0.tar.gz) = 21358433 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 Index: head/net/ceph14/files/patch-src_rgw_rgw_rest_conn.h =================================================================== --- head/net/ceph14/files/patch-src_rgw_rgw_rest_conn.h (revision 533160) +++ head/net/ceph14/files/patch-src_rgw_rgw_rest_conn.h (nonexistent) @@ -1,13 +0,0 @@ -diff --git a/src/rgw/rgw_rest_conn.h b/src/rgw/rgw_rest_conn.h -index 82047d24e5..9a210292b2 100644 ---- src/rgw/rgw_rest_conn.h -+++ src/rgw/rgw_rest_conn.h -@@ -438,7 +438,7 @@ public: - int wait(T *dest, E *err_result = nullptr); - }; - --template -+template - int RGWRESTSendResource::wait(T *dest, E *err_result) - { - int ret = req.wait(); Property changes on: head/net/ceph14/files/patch-src_rgw_rgw_rest_conn.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ceph14/files/patch-src_rgw_rgw__iam__policy.h =================================================================== --- head/net/ceph14/files/patch-src_rgw_rgw__iam__policy.h (revision 533160) +++ head/net/ceph14/files/patch-src_rgw_rgw__iam__policy.h (nonexistent) @@ -1,21 +0,0 @@ -diff --git a/src/rgw/rgw_iam_policy.h b/src/rgw/rgw_iam_policy.h -index f6269dbef6ac..00048b4a7af0 100644 ---- src/rgw/rgw_iam_policy.h -+++ src/rgw/rgw_iam_policy.h -@@ -9,7 +9,6 @@ - #include - #include - #include --#include - - #include - #include -@@ -125,7 +124,7 @@ static constexpr std::uint64_t stsAll = 79; - static constexpr std::uint64_t s3Count = s3BypassGovernanceRetention + 1; - static constexpr std::uint64_t allCount = stsAll + 1; - --using Action_t = bitset; -+using Action_t = std::bitset; - using NotAction_t = Action_t; - - static const Action_t None(0); Property changes on: head/net/ceph14/files/patch-src_rgw_rgw__iam__policy.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ceph14/files/file-git_version =================================================================== --- head/net/ceph14/files/file-git_version (revision 533160) +++ head/net/ceph14/files/file-git_version (revision 533161) @@ -1,2 +1,3 @@ -6036662bc04e4d9a0f8ab284b1a18ca54100c1d7 -v14.2.7-508-g6036662bc0 +2d095e947a02261ce61424021bb43bd3022d35cb +v14.2.8 + Property changes on: head/net/ceph14/files/file-git_version ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -ON \ No newline at end of property +yes \ No newline at end of property Index: head/net/ceph14/files/patch-src_CMakeLists.txt =================================================================== --- head/net/ceph14/files/patch-src_CMakeLists.txt (revision 533160) +++ head/net/ceph14/files/patch-src_CMakeLists.txt (revision 533161) @@ -1,36 +1,32 @@ -git diff src/CMakeLists.txt -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 60e261b10e..287ecc6600 100644 -*** src/CMakeLists.txt.org 2019-09-27 10:19:32.501849000 +0200 ---- src/CMakeLists.txt 2019-09-27 10:18:05.318965000 +0200 -*************** -*** 58,63 **** ---- 58,68 ---- - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-varargs") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-designator") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces -Wno-parentheses -Wno-deprecated-register") -+ if(FREEBSD) -+ # Need to use the GNU binutils linker to get versioning right. -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument") -+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument") -+ endif() - if(APPLE) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup") - endif() -*************** -*** 516,522 **** - INSTALL_RPATH "") - install(TARGETS ceph-osd DESTINATION bin) - -! if (WITH_CEPHFS) - add_subdirectory(mds) - set(ceph_mds_srcs - ceph_mds.cc) ---- 521,527 ---- - INSTALL_RPATH "") - install(TARGETS ceph-osd DESTINATION bin) - -! if (WITH_CEPHFS OR FREEBSD) - add_subdirectory(mds) - set(ceph_mds_srcs - ceph_mds.cc) +--- src/CMakeLists.txt.orig 2020-01-31 17:07:52 UTC ++++ src/CMakeLists.txt +@@ -58,6 +58,11 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-varargs") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-designator") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces -Wno-parentheses -Wno-deprecated-register") ++ if(FREEBSD) ++ # Need to use the GNU binutils linker to get versioning right. ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument") ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument") ++ endif() + if(APPLE) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup") + endif() +@@ -516,7 +521,7 @@ set_target_properties(ceph-osd PROPERTIES + INSTALL_RPATH "") + install(TARGETS ceph-osd DESTINATION bin) + +-if (WITH_CEPHFS) ++if (WITH_CEPHFS OR FREEBSD) + add_subdirectory(mds) + set(ceph_mds_srcs + ceph_mds.cc) +@@ -625,8 +630,6 @@ add_subdirectory(bash_completion) + add_subdirectory(client) + + if(WITH_LIBCEPHFS) +- find_package(PkgConfig QUIET REQUIRED) +- pkg_check_modules(CAPNG REQUIRED libcap-ng) + set(libcephfs_srcs libcephfs.cc) + add_library(cephfs ${CEPH_SHARED} ${libcephfs_srcs}) + target_link_libraries(cephfs PRIVATE client ceph-common Index: head/net/ceph14/files/patch-src_test_libcephfs_lazyio.cc =================================================================== --- head/net/ceph14/files/patch-src_test_libcephfs_lazyio.cc (nonexistent) +++ head/net/ceph14/files/patch-src_test_libcephfs_lazyio.cc (revision 533161) @@ -0,0 +1,15 @@ +--- src/test/libcephfs/lazyio.cc.orig 2020-03-02 17:49:20 UTC ++++ src/test/libcephfs/lazyio.cc +@@ -21,7 +21,12 @@ + #include + #include + #include ++#ifdef __linux__ + #include ++#endif ++#ifdef __FreeBSD__ ++#include ++#endif + + rados_t cluster; + Property changes on: head/net/ceph14/files/patch-src_test_libcephfs_lazyio.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/ceph14/pkg-message =================================================================== --- head/net/ceph14/pkg-message (revision 533160) +++ head/net/ceph14/pkg-message (revision 533161) @@ -1,18 +1,19 @@ [ { type: install message: <