From owner-svn-ports-all@freebsd.org Thu Jan 9 19:21:11 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E4C311F6BE2; Thu, 9 Jan 2020 19:21:11 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47twvW5n7qz4ZRg; Thu, 9 Jan 2020 19:21:11 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C18F55D65; Thu, 9 Jan 2020 19:21:11 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 009JLBpq013630; Thu, 9 Jan 2020 19:21:11 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 009JLABG013623; Thu, 9 Jan 2020 19:21:10 GMT (envelope-from pi@FreeBSD.org) Message-Id: <202001091921.009JLABG013623@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Thu, 9 Jan 2020 19:21:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522534 - in head/net/ceph13: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/net/ceph13: . files X-SVN-Commit-Revision: 522534 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jan 2020 19:21:12 -0000 Author: pi Date: Thu Jan 9 19:21:10 2020 New Revision: 522534 URL: https://svnweb.freebsd.org/changeset/ports/522534 Log: net/ceph13: upgrade 13.2.6 -> 13.2.8 This is the eighth release in the Ceph Mimic stable release series. Its sole purpose is to fix a regression that found its way into the previous release. Notable Changes Due to a missed backport, clusters in the process of being upgraded from 13.2.6 to 13.2.7 might suffer an OSD crash in build_incremental_map_msg. This regression was reported in https://tracker.ceph.com/issues/43106 and is fixed in 13.2.8 (this release). Users of 13.2.6 can upgrade to 13.2.8 directly, i.e. skip 13.2.7 to avoid this. PR: 242886 Submitted by: Willem Jan Withagen (maintainer) Added: head/net/ceph13/files/patch-src_common_bit__vector.hpp (contents, props changed) Modified: head/net/ceph13/Makefile head/net/ceph13/distinfo head/net/ceph13/files/file-git_version head/net/ceph13/pkg-plist Modified: head/net/ceph13/Makefile ============================================================================== --- head/net/ceph13/Makefile Thu Jan 9 18:05:53 2020 (r522533) +++ head/net/ceph13/Makefile Thu Jan 9 19:21:10 2020 (r522534) @@ -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 @@ RUN_DEPENDS= \ 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 @@ USE_LDCONFIG= yes 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 @@ post-install: ${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d ${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample -.include +.include Modified: head/net/ceph13/distinfo ============================================================================== --- head/net/ceph13/distinfo Thu Jan 9 18:05:53 2020 (r522533) +++ head/net/ceph13/distinfo Thu Jan 9 19:21:10 2020 (r522534) @@ -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 Modified: head/net/ceph13/files/file-git_version ============================================================================== --- head/net/ceph13/files/file-git_version Thu Jan 9 18:05:53 2020 (r522533) +++ head/net/ceph13/files/file-git_version Thu Jan 9 19:21:10 2020 (r522534) @@ -1,2 +1,3 @@ -ccf13a5ae9546dd9567f280e85e0de549ca98b90 -v13.2.6-257-gccf13a5ae9 +9a8be262b256411106f4a514022817519a45bee5 +v13.2.8-8-g9a8be262b2 + Added: head/net/ceph13/files/patch-src_common_bit__vector.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ceph13/files/patch-src_common_bit__vector.hpp Thu Jan 9 19:21:10 2020 (r522534) @@ -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) { + } + Modified: head/net/ceph13/pkg-plist ============================================================================== --- head/net/ceph13/pkg-plist Thu Jan 9 18:05:53 2020 (r522533) +++ head/net/ceph13/pkg-plist Thu Jan 9 19:21:10 2020 (r522534) @@ -127,17 +127,17 @@ lib/ceph/mgr/dashboard/controllers/summary.py 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 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.json lib/ceph/mgr/dashboard/frontend/package-lock.json +lib/ceph/mgr/dashboard/frontend/package.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_notification.py 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 @@ lib/librgw.so.2.0.0 %%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