diff options
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | net/Makefile | 2 | ||||
| -rw-r--r-- | net/ceph/files/file-git_version | 2 | ||||
| -rw-r--r-- | net/ceph12/Makefile (renamed from net/ceph/Makefile) | 6 | ||||
| -rw-r--r-- | net/ceph12/distinfo (renamed from net/ceph/distinfo) | 6 | ||||
| -rw-r--r-- | net/ceph12/files/ceph.in (renamed from net/ceph/files/ceph.in) | 0 | ||||
| -rw-r--r-- | net/ceph12/files/file-git_version | 2 | ||||
| -rw-r--r-- | net/ceph12/files/patch-boost-1.67 (renamed from net/ceph/files/patch-boost-1.67) | 0 | ||||
| -rw-r--r-- | net/ceph12/files/patch-src_objectstore_store_test.cc | 39 | ||||
| -rw-r--r-- | net/ceph12/files/patch-src_rgw_CMakeLists.txt | 13 | ||||
| -rw-r--r-- | net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc | 13 | ||||
| -rw-r--r-- | net/ceph12/files/patch-src_tools_ceph__kvstore__tool.cc (renamed from net/ceph/files/patch-src_tools_ceph__kvstore__tool.cc) | 0 | ||||
| -rw-r--r-- | net/ceph12/pkg-descr (renamed from net/ceph/pkg-descr) | 0 | ||||
| -rw-r--r-- | net/ceph12/pkg-plist (renamed from net/ceph/pkg-plist) | 1 |
14 files changed, 76 insertions, 9 deletions
@@ -11640,3 +11640,4 @@ x11/xfree86_xkb_xml||2019-02-24|The project is discontinued 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 diff --git a/net/Makefile b/net/Makefile index 809b1956d8de..3df552ae8cd4 100644 --- a/net/Makefile +++ b/net/Makefile @@ -76,7 +76,7 @@ SUBDIR += cagibi SUBDIR += calendarsupport SUBDIR += ccxstream - SUBDIR += ceph + SUBDIR += ceph12 SUBDIR += ceph13 SUBDIR += cf SUBDIR += charm diff --git a/net/ceph/files/file-git_version b/net/ceph/files/file-git_version deleted file mode 100644 index fa15181c2224..000000000000 --- a/net/ceph/files/file-git_version +++ /dev/null @@ -1,2 +0,0 @@ -3ec878d1e53e1aeb47a9f619c49d9e7c0aa384d5 -v12.2.7 diff --git a/net/ceph/Makefile b/net/ceph12/Makefile index a9c999b25021..2edb6691da2d 100644 --- a/net/ceph/Makefile +++ b/net/ceph12/Makefile @@ -3,9 +3,9 @@ PORTNAME= ceph DISTVERSIONPREFIX= v -DISTVERSION= 12.2.7 -PORTREVISION= 3 +DISTVERSION= 12.2.11 CATEGORIES= net +PKGNAMESUFFIX= 12 MAINTAINER= wjw@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 diff --git a/net/ceph/distinfo b/net/ceph12/distinfo index 7deab8b53caf..d667955db534 100644 --- a/net/ceph/distinfo +++ b/net/ceph12/distinfo @@ -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 diff --git a/net/ceph/files/ceph.in b/net/ceph12/files/ceph.in index 4c04cccb55d3..4c04cccb55d3 100644 --- a/net/ceph/files/ceph.in +++ b/net/ceph12/files/ceph.in diff --git a/net/ceph12/files/file-git_version b/net/ceph12/files/file-git_version new file mode 100644 index 000000000000..268e02b634ff --- /dev/null +++ b/net/ceph12/files/file-git_version @@ -0,0 +1,2 @@ +26dc3775efc7bb286a1d6d66faee0ba30ea23eee +v12.2.11 diff --git a/net/ceph/files/patch-boost-1.67 b/net/ceph12/files/patch-boost-1.67 index 1e3f9ba743f8..1e3f9ba743f8 100644 --- a/net/ceph/files/patch-boost-1.67 +++ b/net/ceph12/files/patch-boost-1.67 diff --git a/net/ceph12/files/patch-src_objectstore_store_test.cc b/net/ceph12/files/patch-src_objectstore_store_test.cc new file mode 100644 index 000000000000..92997a78bba4 --- /dev/null +++ b/net/ceph12/files/patch-src_objectstore_store_test.cc @@ -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; diff --git a/net/ceph12/files/patch-src_rgw_CMakeLists.txt b/net/ceph12/files/patch-src_rgw_CMakeLists.txt new file mode 100644 index 000000000000..5dd91d79b4c0 --- /dev/null +++ b/net/ceph12/files/patch-src_rgw_CMakeLists.txt @@ -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 diff --git a/net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc b/net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc new file mode 100644 index 000000000000..661d055d8ca6 --- /dev/null +++ b/net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc @@ -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, diff --git a/net/ceph/files/patch-src_tools_ceph__kvstore__tool.cc b/net/ceph12/files/patch-src_tools_ceph__kvstore__tool.cc index 41cc5db2f46a..41cc5db2f46a 100644 --- a/net/ceph/files/patch-src_tools_ceph__kvstore__tool.cc +++ b/net/ceph12/files/patch-src_tools_ceph__kvstore__tool.cc diff --git a/net/ceph/pkg-descr b/net/ceph12/pkg-descr index 36f0aa7439a7..36f0aa7439a7 100644 --- a/net/ceph/pkg-descr +++ b/net/ceph12/pkg-descr diff --git a/net/ceph/pkg-plist b/net/ceph12/pkg-plist index 331c9c2fe9c2..d9f674ad54ef 100644 --- a/net/ceph/pkg-plist +++ b/net/ceph12/pkg-plist @@ -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 |