Date: Mon, 1 Jan 2018 01:36:00 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457752 - in head/net/ceph: . files Message-ID: <201801010136.w011a0nR057264@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Jan 1 01:36:00 2018 New Revision: 457752 URL: https://svnweb.freebsd.org/changeset/ports/457752 Log: net/ceph: update to 12.2.2 Changes: http://ceph.com/releases/v12-2-1-luminous-released/ Changes: http://ceph.com/releases/v12-2-2-luminous-released/ PR: 224185 Submitted by: Willem Jan Withagen (maintainer) Differential Revision: https://reviews.freebsd.org/D13699 Added: head/net/ceph/files/patch-src_tools_ceph__kvstore__tool.cc (contents, props changed) Modified: head/net/ceph/Makefile (contents, props changed) head/net/ceph/distinfo (contents, props changed) head/net/ceph/files/ceph.in head/net/ceph/files/file-git_version head/net/ceph/pkg-plist (contents, props changed) Modified: head/net/ceph/Makefile ============================================================================== --- head/net/ceph/Makefile Mon Jan 1 01:24:29 2018 (r457751) +++ head/net/ceph/Makefile Mon Jan 1 01:36:00 2018 (r457752) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= ceph -DISTVERSION= v12.2.0 -PORTREVISION= 2 +DISTVERSIONPREFIX= v +DISTVERSION= 12.2.2 CATEGORIES= net MAINTAINER= wjw@digiware.nl @@ -53,7 +53,6 @@ USE_GITHUB= yes GH_ACCOUNT= ceph:DEFAULT GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus GH_TUPLE+= ceph:ceph-object-corpus:f0ba19f:ceph_object_corpus/ceph-object-corpus -GH_TUPLE+= ceph:Beast:d8db5f1:Beast/src/Beast GH_TUPLE+= ceph:civetweb:de23828:civetweb/src/civetweb GH_TUPLE+= 01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto GH_TUPLE+= ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete @@ -68,6 +67,8 @@ GH_TUPLE+= facebook:zstd:dc99312:zstd/src/zstd CMAKE_BUILD_TYPE= Release CMAKE_ARGS= \ + -D CMAKE_C_LINK_FLAGS:STRING=" -fuse-ld=/usr/bin/ld.lld" \ + -D CMAKE_CXX_LINK_FLAGS:STRING=" -fuse-ld=/usr/bin/ld.lld" \ -D WITH_SYSTEM_BOOST:BOOL=ON \ -D CEPH_MAN_DIR:STRING=man \ -D WITH_LTTNG:BOOL=OFF \ @@ -79,7 +80,8 @@ CMAKE_ARGS= \ -D HAVE_BABELTRACE:BOOL=OFF \ -D WITH_LIBCEPHFS:BOOL=OFF \ -D WITH_CEPHFS:BOOL=OFF \ - -D WITH_EMBEDDED:BOOL=OFF + -D WITH_EMBEDDED:BOOL=OFF \ + -D WITH_RADOSGW_BEAST_FRONTEND:BOOL=OFF SHEBANG_FILES=src/rbdmap src/ceph-post-file.in src/rbd-replay-many \ src/brag/client/ceph-brag src/ceph-rest-api \ Modified: head/net/ceph/distinfo ============================================================================== --- head/net/ceph/distinfo Mon Jan 1 01:24:29 2018 (r457751) +++ head/net/ceph/distinfo Mon Jan 1 01:36:00 2018 (r457752) @@ -1,12 +1,10 @@ -TIMESTAMP = 1504214691 -SHA256 (ceph-ceph-v12.2.0_GH0.tar.gz) = f664e3fe1258b7369acee71569177c6c2b05c0c2291c2d59f77bd281bec169e5 -SIZE (ceph-ceph-v12.2.0_GH0.tar.gz) = 16953050 +TIMESTAMP = 1514583693 +SHA256 (ceph-ceph-v12.2.2_GH0.tar.gz) = 398e8b2217b4b270083a6bb8c8dab1c312a6c373d6e02b8f24c82f82e704518a +SIZE (ceph-ceph-v12.2.2_GH0.tar.gz) = 17408729 SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 466f7185015df8d13f8b2b9a17ee30ab419bcd667284ce2b6d32a1128c4640f1 SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3634266 SHA256 (ceph-ceph-object-corpus-f0ba19f_GH0.tar.gz) = 90e4052c6dca0e272bdca492216e62fdc0d19719e121451798295799bdf95499 SIZE (ceph-ceph-object-corpus-f0ba19f_GH0.tar.gz) = 1837935 -SHA256 (ceph-Beast-d8db5f1_GH0.tar.gz) = a0dda7ee9abdef7f6e2a3f178e85dbfa7ebc8ce428ccc6cd0ac76883f406808b -SIZE (ceph-Beast-d8db5f1_GH0.tar.gz) = 17823430 SHA256 (ceph-civetweb-de23828_GH0.tar.gz) = a9a95dd58e9b4a696fa0c822c1401856c55ef9b67fb28cf15d97f19f1af2ecbd SIZE (ceph-civetweb-de23828_GH0.tar.gz) = 6850197 SHA256 (01org-isa-l_crypto-603529a_GH0.tar.gz) = 52708b98c832bb7e6db60c949ece261d9609c822ae55239b0f2133cec2b3d155 Modified: head/net/ceph/files/ceph.in ============================================================================== --- head/net/ceph/files/ceph.in Mon Jan 1 01:24:29 2018 (r457751) +++ head/net/ceph/files/ceph.in Mon Jan 1 01:36:00 2018 (r457752) @@ -32,5 +32,5 @@ stop_cmd="%%PREFIX%%/bin/init-ceph $*" restart_cmd="%%PREFIX%%/bin/init-ceph $*" condrestart_cmd="%%PREFIX%%/bin/init-ceph $*" -run_rc_command "$1" +run_rc_command "$1" "$*" Modified: head/net/ceph/files/file-git_version ============================================================================== --- head/net/ceph/files/file-git_version Mon Jan 1 01:24:29 2018 (r457751) +++ head/net/ceph/files/file-git_version Mon Jan 1 01:36:00 2018 (r457752) @@ -1,2 +1,2 @@ -bcf89707d6c3c3086f001d08c754095b9e7a85f1 -v12.2.0-6-gbcf89707d6 +cf0baeeeeba3b47f9427c6c97e2144b094b7e5ba +v12.2.2 Added: head/net/ceph/files/patch-src_tools_ceph__kvstore__tool.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ceph/files/patch-src_tools_ceph__kvstore__tool.cc Mon Jan 1 01:36:00 2018 (r457752) @@ -0,0 +1,31 @@ +--- src/tools/ceph_kvstore_tool.cc.orig 2017-11-30 14:59:27 UTC ++++ src/tools/ceph_kvstore_tool.cc +@@ -36,11 +36,13 @@ using namespace std; + + class StoreTool + { ++#ifdef HAVE_LIBAIO + boost::scoped_ptr<BlueStore> bluestore; ++#endif + + // TODO: make KeyValueDB enable_shared_from_this + // bluestore will hold *db* also, use unique_ptr/shared_ptr will + // double free. + KeyValueDB* db; + + string store_path; +@@ -74,10 +76,13 @@ class StoreTool + } + + ~StoreTool() { ++#ifdef HAVE_LIBAIO + if (bluestore) { + bluestore->umount(); + } +- else { ++ else ++#endif ++ { + if (db) { + delete db; + } Modified: head/net/ceph/pkg-plist ============================================================================== --- head/net/ceph/pkg-plist Mon Jan 1 01:24:29 2018 (r457751) +++ head/net/ceph/pkg-plist Mon Jan 1 01:36:00 2018 (r457752) @@ -95,7 +95,8 @@ lib/ceph/erasure-code/libec_shec_sse3.so lib/ceph/erasure-code/libec_shec_sse4.so lib/ceph/libceph-common.so lib/ceph/libceph-common.so.0 -lib/ceph/mgr/mgr_module.py +lib/ceph/mgr/balancer/__init__.py +lib/ceph/mgr/balancer/module.py lib/ceph/mgr/dashboard/__init__.py lib/ceph/mgr/dashboard/cephfs_clients.py lib/ceph/mgr/dashboard/servers.html @@ -112,6 +113,7 @@ lib/ceph/mgr/dashboard/rbd_iscsi.py lib/ceph/mgr/dashboard/rbd_mirroring.html lib/ceph/mgr/dashboard/rbd_mirroring.py lib/ceph/mgr/dashboard/rbd_pool.html +lib/ceph/mgr/dashboard/standby.html lib/ceph/mgr/dashboard/static/favicon.ico lib/ceph/mgr/dashboard/static/logo-mini.png lib/ceph/mgr/dashboard/static/underscore-min.js @@ -1170,6 +1172,11 @@ lib/ceph/mgr/dashboard/README.rst lib/ceph/mgr/dashboard/filesystem.html lib/ceph/mgr/dashboard/types.py lib/ceph/mgr/dashboard/HACKING.rst +lib/ceph/mgr/influx/__init__.py +lib/ceph/mgr/influx/module.py +lib/ceph/mgr/localpool/__init__.py +lib/ceph/mgr/localpool/module.py +lib/ceph/mgr/mgr_module.py lib/ceph/mgr/prometheus/__init__.py lib/ceph/mgr/prometheus/module.py lib/ceph/mgr/restful/api/request.py @@ -1186,6 +1193,8 @@ lib/ceph/mgr/restful/module.py lib/ceph/mgr/restful/decorators.py lib/ceph/mgr/restful/hooks.py lib/ceph/mgr/restful/__init__.py +lib/ceph/mgr/selftest/__init__.py +lib/ceph/mgr/selftest/module.py lib/ceph/mgr/status/__init__.py lib/ceph/mgr/status/module.py lib/ceph/mgr/zabbix/__init__.py @@ -1315,6 +1324,7 @@ lib/rados-classes/libcls_version.so.1.0.0 libexec/ceph/ceph-osd-prestart.sh libexec/ceph/ceph_common.sh man/man8/ceph-authtool.8.gz +man/man8/ceph-bluestore-tool.8.gz man/man8/ceph-clsinfo.8.gz man/man8/ceph-conf.8.gz man/man8/ceph-create-keys.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801010136.w011a0nR057264>