Index: Makefile =================================================================== --- Makefile (revision 520808) +++ Makefile (working copy) @@ -3,8 +3,7 @@ PORTNAME= ceph DISTVERSIONPREFIX= v -DISTVERSION= 13.2.6 -PORTREVISION= 3 +DISTVERSION= 13.2.8 CATEGORIES= net PKGNAMESUFFIX= 13 @@ -45,7 +44,8 @@ jq:textproc/jq \ flock:sysutils/flock \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pecan>=0:www/py-pecan@${PY_FLAVOR} USES= cmake:noninja fuse gettext-runtime gmake pkgconfig python:2.7 \ shebangfix ssl @@ -104,6 +104,20 @@ USERS= ceph GROUPS= ceph +PLIST_SUB= CMAKE_BUILD_TYPE_regex=\bdebug\b + +.include + +# 11.2 and 12.0 RELEASE has clang60 and will give versioning errors +.if (${OSVERSION} < 1102507) || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200099) +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang80:devel/llvm80 +CC= clang80 +CXX= clang++80 +ASM= clang80 +.endif + +.include + pre-configure: ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build ${CP} files/file-git_version ${WRKSRC}/src/.git_version @@ -151,4 +165,4 @@ ${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d ${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample -.include +.include Index: distinfo =================================================================== --- distinfo (revision 520808) +++ distinfo (working copy) @@ -1,6 +1,6 @@ -TIMESTAMP = 1565948132 -SHA256 (ceph-ceph-v13.2.6_GH0.tar.gz) = a4ed5599cd4ea045b79e691a2bc61fceab977f51b25a6e460139cf42891de2be -SIZE (ceph-ceph-v13.2.6_GH0.tar.gz) = 13323448 +TIMESTAMP = 1577200637 +SHA256 (ceph-ceph-v13.2.8_GH0.tar.gz) = fcb198bfd632e57203fd4116b15450a9c31f253ed3ddd2b718a2dd35efd34591 +SIZE (ceph-ceph-v13.2.8_GH0.tar.gz) = 13394132 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 Index: files/file-git_version =================================================================== --- files/file-git_version (revision 520808) +++ files/file-git_version (working copy) @@ -1,2 +1,3 @@ -ccf13a5ae9546dd9567f280e85e0de549ca98b90 -v13.2.6-257-gccf13a5ae9 +9a8be262b256411106f4a514022817519a45bee5 +v13.2.8-8-g9a8be262b2 + Index: files/patch-src_common_bit__vector.hpp =================================================================== --- files/patch-src_common_bit__vector.hpp (nonexistent) +++ files/patch-src_common_bit__vector.hpp (working copy) @@ -0,0 +1,13 @@ +diff --git src/common/bit_vector.hpp src/common/bit_vector.hpp +index 832e75fe6a..73ae6d9e07 100644 +--- src/common/bit_vector.hpp ++++ src/common/bit_vector.hpp +@@ -224,6 +224,7 @@ public: + static void generate_test_instances(std::list &o); + private: + struct NoInitAllocator : public std::allocator<__u32> { ++ NoInitAllocator() {}; + NoInitAllocator(const std::allocator<__u32>& alloc) + : std::allocator<__u32>(alloc) { + } + Property changes on: files/patch-src_common_bit__vector.hpp ___________________________________________________________________ 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: pkg-plist =================================================================== --- pkg-plist (revision 520808) +++ pkg-plist (working copy) @@ -127,6 +127,8 @@ lib/ceph/mgr/dashboard/controllers/task.py lib/ceph/mgr/dashboard/controllers/tcmu_iscsi.py lib/ceph/mgr/dashboard/exceptions.py +lib/ceph/mgr/dashboard/frontend/.editorconfig +lib/ceph/mgr/dashboard/frontend/angular.json lib/ceph/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts lib/ceph/mgr/dashboard/frontend/e2e/cluster/monitors.po.ts lib/ceph/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts @@ -133,11 +135,9 @@ lib/ceph/mgr/dashboard/frontend/e2e/cluster/osds.po.ts lib/ceph/mgr/dashboard/frontend/e2e/helper.po.ts lib/ceph/mgr/dashboard/frontend/e2e/tsconfig.e2e.json -lib/ceph/mgr/dashboard/frontend/.editorconfig -lib/ceph/mgr/dashboard/frontend/angular.json lib/ceph/mgr/dashboard/frontend/karma.conf.js +lib/ceph/mgr/dashboard/frontend/package-lock.json lib/ceph/mgr/dashboard/frontend/package.json -lib/ceph/mgr/dashboard/frontend/package-lock.json lib/ceph/mgr/dashboard/frontend/protractor.conf.js lib/ceph/mgr/dashboard/frontend/proxy.conf.json.sample lib/ceph/mgr/dashboard/frontend/src/app/app-routing.module.ts @@ -537,6 +537,7 @@ lib/ceph/mgr/dashboard/tests/test_rbd_mirroring.py lib/ceph/mgr/dashboard/tests/test_rest_client.py lib/ceph/mgr/dashboard/tests/test_rest_tasks.py +lib/ceph/mgr/dashboard/tests/test_rgw_client.py lib/ceph/mgr/dashboard/tests/test_settings.py lib/ceph/mgr/dashboard/tests/test_task.py lib/ceph/mgr/dashboard/tests/test_tcmu_iscsi.py @@ -609,6 +610,8 @@ %%PYTHON_SITELIBDIR%%/ceph_detect_init/__init__.pyc %%PYTHON_SITELIBDIR%%/ceph_detect_init/alpine/__init__.py %%PYTHON_SITELIBDIR%%/ceph_detect_init/alpine/__init__.pyc +%%PYTHON_SITELIBDIR%%/ceph_detect_init/alt/__init__.py +%%PYTHON_SITELIBDIR%%/ceph_detect_init/alt/__init__.pyc %%PYTHON_SITELIBDIR%%/ceph_detect_init/arch/__init__.py %%PYTHON_SITELIBDIR%%/ceph_detect_init/arch/__init__.pyc %%PYTHON_SITELIBDIR%%/ceph_detect_init/centos/__init__.py