svn commit: r494078 - in head: . net net/ceph net/ceph12 net/ceph12/files
Kurt Jaeger
pi at FreeBSD.org
Wed Feb 27 18:57:15 UTC 2019
Author: pi
Date: Wed Feb 27 18:57:12 2019
New Revision: 494078
URL: https://svnweb.freebsd.org/changeset/ports/494078
Log:
net/ceph: rename to net/ceph12, update 12.2.7 -> 12.2.11
PR: 236004
Submitted by: Willem Jan Withagen <wjw at digiware.nl> (maintainer)
Relnotes: https://ceph.com/releases/v12-2-11-luminous-released/
https://ceph.com/releases/v12-2-10-luminous-released/
https://ceph.com/releases/v12-2-8-released/
Added:
head/net/ceph12/
- copied from r494077, head/net/ceph/
head/net/ceph12/files/patch-src_objectstore_store_test.cc (contents, props changed)
head/net/ceph12/files/patch-src_rgw_CMakeLists.txt (contents, props changed)
head/net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc (contents, props changed)
Deleted:
head/net/ceph/
Modified:
head/MOVED
head/net/Makefile
head/net/ceph12/Makefile
head/net/ceph12/distinfo
head/net/ceph12/files/file-git_version
head/net/ceph12/pkg-plist
Modified: head/MOVED
==============================================================================
--- head/MOVED Wed Feb 27 18:49:02 2019 (r494077)
+++ head/MOVED Wed Feb 27 18:57:12 2019 (r494078)
@@ -11640,3 +11640,4 @@ x11/xfree86_xkb_xml||2019-02-24|The project is discont
devel/rtichoke|devel/radian|2019-02-26|Project is renamed
sysutils/xen-tools411|sysutils/xen-tools|2019-02-27|Rename in preparation for having a single Xen port
emulators/xen-kernel411|emulators/xen-kernel|2019-02-27|Rename in preparation for having a single Xen port
+net/ceph|net/ceph12|2019-02-27|Make room for other ceph versions
Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile Wed Feb 27 18:49:02 2019 (r494077)
+++ head/net/Makefile Wed Feb 27 18:57:12 2019 (r494078)
@@ -76,7 +76,7 @@
SUBDIR += cagibi
SUBDIR += calendarsupport
SUBDIR += ccxstream
- SUBDIR += ceph
+ SUBDIR += ceph12
SUBDIR += ceph13
SUBDIR += cf
SUBDIR += charm
Modified: head/net/ceph12/Makefile
==============================================================================
--- head/net/ceph/Makefile Wed Feb 27 18:49:02 2019 (r494077)
+++ head/net/ceph12/Makefile Wed Feb 27 18:57:12 2019 (r494078)
@@ -3,9 +3,9 @@
PORTNAME= ceph
DISTVERSIONPREFIX= v
-DISTVERSION= 12.2.7
-PORTREVISION= 3
+DISTVERSION= 12.2.11
CATEGORIES= net
+PKGNAMESUFFIX= 12
MAINTAINER= wjw at digiware.nl
COMMENT= Ceph delivers object, block, and file storage in a unified system
@@ -104,7 +104,7 @@ post-patch:
pre-configure:
${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build
- ${CP} files/file-git_version ${WRKSRC}/src/.git_version
+ ${CP} ${FILESDIR}/file-git_version ${WRKSRC}/src/.git_version
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph
Modified: head/net/ceph12/distinfo
==============================================================================
--- head/net/ceph/distinfo Wed Feb 27 18:49:02 2019 (r494077)
+++ head/net/ceph12/distinfo Wed Feb 27 18:57:12 2019 (r494078)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1535200366
-SHA256 (ceph-ceph-v12.2.7_GH0.tar.gz) = 742dd402686b6c48824687be9bff951ede7608d41736cbcd55b130f7bd94f086
-SIZE (ceph-ceph-v12.2.7_GH0.tar.gz) = 12236446
+TIMESTAMP = 1550935963
+SHA256 (ceph-ceph-v12.2.11_GH0.tar.gz) = 67a2afe2de2087279e5a6bfab9c2b2a391093fb73723b629aaaeb204044be499
+SIZE (ceph-ceph-v12.2.11_GH0.tar.gz) = 12451786
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
Modified: head/net/ceph12/files/file-git_version
==============================================================================
--- head/net/ceph/files/file-git_version Wed Feb 27 18:49:02 2019 (r494077)
+++ head/net/ceph12/files/file-git_version Wed Feb 27 18:57:12 2019 (r494078)
@@ -1,2 +1,2 @@
-3ec878d1e53e1aeb47a9f619c49d9e7c0aa384d5
-v12.2.7
+26dc3775efc7bb286a1d6d66faee0ba30ea23eee
+v12.2.11
Added: head/net/ceph12/files/patch-src_objectstore_store_test.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/ceph12/files/patch-src_objectstore_store_test.cc Wed Feb 27 18:57:12 2019 (r494078)
@@ -0,0 +1,39 @@
+diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
+old mode 100644
+new mode 100755
+index 326c9785d0..8d39249360
+--- src/test/objectstore/store_test.cc
++++ src/test/objectstore/store_test.cc
+@@ -4313,7 +4313,7 @@ TEST_P(StoreTest, Synthetic) {
+ doSyntheticTest(store, 10000, 400*1024, 40*1024, 0);
+ }
+
+-
++#if defined(WITH_BLUESTORE)
+ TEST_P(StoreTestSpecificAUSize, SyntheticMatrixSharding) {
+ if (string(GetParam()) != "bluestore")
+ return;
+@@ -4485,6 +4485,7 @@ TEST_P(StoreTestSpecificAUSize, SyntheticMatrixPreferDeferred) {
+ };
+ do_matrix(m, store, doSyntheticTest);
+ }
++#endif // #if defined(WITH_BLUESTORE)
+
+ TEST_P(StoreTest, AttrSynthetic) {
+ ObjectStore::Sequencer osr("test");
+@@ -6855,6 +6856,7 @@ TEST_P(StoreTestSpecificAUSize, fsckOnUnalignedDevice2) {
+ g_conf->apply_changes(NULL);
+ }
+
++#if defined(WITH_BLUESTORE)
+ TEST_P(StoreTest, SpuriousReadErrorTest) {
+ if (string(GetParam()) != "bluestore")
+ return;
+@@ -6921,6 +6923,7 @@ TEST_P(StoreTest, SpuriousReadErrorTest) {
+ g_conf->set_val("bluestore_debug_inject_csum_err_probability", "0");
+ g_ceph_context->_conf->apply_changes(nullptr);
+ }
++#endif // #if defined(WITH_BLUESTORE)
+
+ int main(int argc, char **argv) {
+ vector<const char*> args;
Added: head/net/ceph12/files/patch-src_rgw_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/ceph12/files/patch-src_rgw_CMakeLists.txt Wed Feb 27 18:57:12 2019 (r494078)
@@ -0,0 +1,13 @@
+diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
+index 57cb2a5b94..57a9ceb78b 100644
+--- src/rgw/CMakeLists.txt
++++ src/rgw/CMakeLists.txt
+@@ -182,7 +182,7 @@ if (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL)
+ endif()
+
+ add_executable(radosgw rgw_main.cc)
+-target_link_libraries(radosgw radosgw_a librados
++target_link_libraries(radosgw radosgw_a rgw_a librados
+ cls_rgw_client cls_lock_client cls_refcount_client
+ cls_log_client cls_statelog_client cls_timeindex_client
+ cls_version_client cls_replica_log_client cls_user_client
Added: head/net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc Wed Feb 27 18:57:12 2019 (r494078)
@@ -0,0 +1,13 @@
+diff --git a/src/rgw/rgw_sync_module_es.cc b/src/rgw/rgw_sync_module_es.cc
+index aa58219b5a..de4200d75e 100644
+--- src/rgw/rgw_sync_module_es.cc
++++ src/rgw/rgw_sync_module_es.cc
+@@ -244,7 +244,7 @@ struct es_index_config {
+ };
+
+ static bool is_sys_attr(const std::string& attr_name){
+- static constexpr std::initializer_list<const char*> rgw_sys_attrs = {RGW_ATTR_PG_VER,
++ static const std::initializer_list<const char*> rgw_sys_attrs = {RGW_ATTR_PG_VER,
+ RGW_ATTR_SOURCE_ZONE,
+ RGW_ATTR_ID_TAG,
+ RGW_ATTR_TEMPURL_KEY1,
Modified: head/net/ceph12/pkg-plist
==============================================================================
--- head/net/ceph/pkg-plist Wed Feb 27 18:49:02 2019 (r494077)
+++ head/net/ceph12/pkg-plist Wed Feb 27 18:57:12 2019 (r494078)
@@ -104,6 +104,7 @@ lib/ceph/mgr/dashboard/__init__.py
lib/ceph/mgr/dashboard/base.html
lib/ceph/mgr/dashboard/cephfs_clients.py
lib/ceph/mgr/dashboard/clients.html
+lib/ceph/mgr/dashboard/config_options.html
lib/ceph/mgr/dashboard/filesystem.html
lib/ceph/mgr/dashboard/health.html
lib/ceph/mgr/dashboard/module.py
More information about the svn-ports-head
mailing list