Index: head/net/ceph14/Makefile =================================================================== --- head/net/ceph14/Makefile (revision 526505) +++ head/net/ceph14/Makefile (revision 526506) @@ -1,155 +1,171 @@ # Created by: Willem Jan Withagen # $FreeBSD$ PORTNAME= ceph DISTVERSIONPREFIX= v -DISTVERSION= 14.2.4 -PORTREVISION= 2 +DISTVERSION= 14.2.7 CATEGORIES= net PKGNAMESUFFIX= 14 MAINTAINER= wjw@digiware.nl COMMENT= Ceph delivers object, block, and file storage in a unified system LICENSE= GPLv2 LGPL3 LICENSE_COMB= dual # even though i386 will build, it is not really advised. ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= \ bash:shells/bash \ git:devel/git \ yasm:devel/yasm \ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ gperf:devel/gperf \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \ - ${LOCALBASE}/bin/ld:devel/binutils + ${LOCALBASE}/bin/ld:devel/binutils \ + npm:www/npm LIB_DEPENDS= \ ${PY_BOOST} \ libboost_thread.so:devel/boost-libs \ libleveldb.so:databases/leveldb \ libnss3.so:security/nss \ libcryptopp.so:security/cryptopp \ liboath.so:security/oath-toolkit \ libsnappy.so:archivers/snappy \ libcurl.so:ftp/curl \ libxml2.so:textproc/libxml2 \ libexpat.so:textproc/expat2 \ liblz4.so:archivers/liblz4 \ libplds4.so:devel/nspr \ libtcmalloc.so:devel/google-perftools \ librabbitmq.so:net/rabbitmq-c RUN_DEPENDS= \ bash:shells/bash \ ${LOCALBASE}/bin/getopt:misc/getopt \ xml:textproc/xmlstarlet \ jq:textproc/jq \ flock:sysutils/flock \ + ${LOCALBASE}/sbin/smartctl:sysutils/smartmontools \ + ${PYTHON_PKGNAMEPREFIX}grpcio>=0:devel/py-grpcio@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pecan>=0:www/py-pecan@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} -USES= cmake:noninja fuse gettext-runtime gmake pkgconfig python:3.6+ \ +USES= cmake:noninja dos2unix fuse gettext-runtime gmake pkgconfig python:3.7 \ shebangfix ssl USE_PYTHON= cython USE_OPENLDAP= yes USE_GITHUB= yes GH_ACCOUNT= ceph:DEFAULT +DOS2UNIX_FILES= src/pybind/mgr/diskprediction_cloud/common/__init__.py CONFLICTS_INSTALL= ceph PORTSCOUT= limit:^v14\. GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus GH_TUPLE+= ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus GH_TUPLE+= ceph:civetweb:bb99e93:civetweb/src/civetweb GH_TUPLE+= 01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto GH_TUPLE+= ceph:dmclock:4496dbc:dmclock/src/dmclock GH_TUPLE+= ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete GH_TUPLE+= ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure GH_TUPLE+= ceph:googletest:fdb8504:googletest/src/googletest GH_TUPLE+= ceph:isa-l:7e1a337:isa_l/src/isa-l GH_TUPLE+= ceph:lua:1fce39c:lua/src/lua GH_TUPLE+= ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson GH_TUPLE+= ceph:rocksdb:4c736f1:rocksdb/src/rocksdb GH_TUPLE+= ceph:xxHash:1f40c65:xxHash/src/xxHash GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd CMAKE_BUILD_TYPE= Release -CMAKE_ON= WITH_SYSTEM_BOOST WITH_FUSE -CMAKE_OFF= WITH_BOOST_CONTEXT WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS WITH_KVS \ - WITH_SPDK WITH_RDMA WITH_LIBCEPHFS WITH_CEPHFS WITH_RADOSGW_BEAST_FRONTEND \ +CMAKE_ON= WITH_SYSTEM_BOOST WITH_FUSE WITH_SYSTEM_NPM +CMAKE_OFF= WITH_BOOST_CONTEXT WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS \ + WITH_SPDK WITH_RDMA WITH_LIBCEPHFS WITH_CEPHFS \ WITH_MGR_DASHBOARD_FRONTEND -CMAKE_ARGS= \ - -D WITH_PYTHON2=OFF -D WITH_PYTHON3=ON -DMGR_PYTHON_VERSION=${PYTHON_VER} \ +CMAKE_ARGS= -D WITH_PYTHON2=OFF -D WITH_PYTHON3=3.7 -DMGR_PYTHON_VERSION=3.7 \ -D CEPH_MAN_DIR:STRING=man SHEBANG_FILES= src/rbdmap src/ceph-post-file.in src/rbd-replay-many \ src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \ src/ceph-create-keys USE_RC_SUBR= ceph 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: [ -e ${WRKSRC}/build ] || ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build ${CP} files/file-git_version ${WRKSRC}/src/.git_version post-install: + # To install a ceph.conf sample ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph + ${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample + # Get logging and rotation working + ${MKDIR} ${STAGEDIR}/var/log/ceph + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d + ${INSTALL_DATA} files/file-newsyslog_ceph-log.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d + # Create directories used bij daemons ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mds ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-osd ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-rgw ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mgr ${MKDIR} ${STAGEDIR}/var/lib/ceph/mds ${MKDIR} ${STAGEDIR}/var/lib/ceph/mon ${MKDIR} ${STAGEDIR}/var/lib/ceph/osd ${MKDIR} ${STAGEDIR}/var/lib/ceph/mgr ${MKDIR} ${STAGEDIR}/var/lib/ceph/tmp ${MKDIR} ${STAGEDIR}/var/lib/ceph/radosgw + # For PID files and command sockets and log files ${MKDIR} ${STAGEDIR}/var/log/ceph ${MKDIR} ${STAGEDIR}/var/run/ceph # Use the Ceph init.d script as the interface to regular # starting and stopping daemons. rc.d work is done thru # a separate rc.d/ceph script calling init-ceph again. ${MV} ${STAGEDIR}${PREFIX}/etc/init.d/ceph ${STAGEDIR}${PREFIX}/bin/init-ceph # remove files not packaged ${RM} ${STAGEDIR}${DOCSDIR}/sample.fetch_config ${RM} ${STAGEDIR}${DOCSDIR}/sample.ceph.conf ${RMDIR} ${STAGEDIR}${DOCSDIR} ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_bench_log ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_multi_stress_watch ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_perf* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_psim ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_scratchtoolpp ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_smalliobench* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_test* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_tpbench ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_xattr_bench ${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-disk-udev - # ceph-volume does not support ZFS - ${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR}/ceph_volume-* - ${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR}/ceph_volume/ - ${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume - ${RM} ${STAGEDIR}${PREFIX}/man/man8/ceph-volume* ${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume-systemd ${RM} -rf ${STAGEDIR}${PREFIX}/libexec/systemd - ${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d - ${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample .include Index: head/net/ceph14/distinfo =================================================================== --- head/net/ceph14/distinfo (revision 526505) +++ head/net/ceph14/distinfo (revision 526506) @@ -1,31 +1,31 @@ -TIMESTAMP = 1568802415 -SHA256 (ceph-ceph-v14.2.4_GH0.tar.gz) = 17b826b7dca4df6205651f703edac93d19b2fa5542f8a130c03d1009193587c1 -SIZE (ceph-ceph-v14.2.4_GH0.tar.gz) = 21008519 +TIMESTAMP = 1581605576 +SHA256 (ceph-ceph-v14.2.7_GH0.tar.gz) = f2882424ecce6fa3a6bf5bdbdc01fc3dae885d9f2ccb40c50ead859eeba69126 +SIZE (ceph-ceph-v14.2.7_GH0.tar.gz) = 21217939 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 SIZE (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 1838192 SHA256 (ceph-civetweb-bb99e93_GH0.tar.gz) = 1f8498176bf27381fb5516abae0e9068315e20f233cf5270123f38caa68691b0 SIZE (ceph-civetweb-bb99e93_GH0.tar.gz) = 11349651 SHA256 (01org-isa-l_crypto-603529a_GH0.tar.gz) = 52708b98c832bb7e6db60c949ece261d9609c822ae55239b0f2133cec2b3d155 SIZE (01org-isa-l_crypto-603529a_GH0.tar.gz) = 439149 SHA256 (ceph-dmclock-4496dbc_GH0.tar.gz) = 17f31174445058d76bb1895865d9def549fe668a050a8cea9ddd7b34125659d7 SIZE (ceph-dmclock-4496dbc_GH0.tar.gz) = 69730 SHA256 (ceph-gf-complete-7e61b44_GH0.tar.gz) = 7b0e5c1b41399d2c7d97ed7a7547ebf40023bcd104ed9a8b2b75bdee440c1a4d SIZE (ceph-gf-complete-7e61b44_GH0.tar.gz) = 342303 SHA256 (ceph-jerasure-96c76b8_GH0.tar.gz) = 06edaeb8cb5c3076e34cb53dd91c91d54d46fb8c3b837c6280ea2ed076556beb SIZE (ceph-jerasure-96c76b8_GH0.tar.gz) = 806334 SHA256 (ceph-googletest-fdb8504_GH0.tar.gz) = ece3265dae4d0fe5a52e7164432bb416de8bdb45e1c8cf8f361bbe893db30bb8 SIZE (ceph-googletest-fdb8504_GH0.tar.gz) = 1281068 SHA256 (ceph-isa-l-7e1a337_GH0.tar.gz) = 8099bc6ca3ca6ed9376f6cc5072a84d7a1863e2d7f2344bf08682d4efb7ae788 SIZE (ceph-isa-l-7e1a337_GH0.tar.gz) = 458398 SHA256 (ceph-lua-1fce39c_GH0.tar.gz) = fb5f778ce4da349ca903512a2fdb3987b12e3f0a52ab088fb011a8e4dd55848c SIZE (ceph-lua-1fce39c_GH0.tar.gz) = 366778 SHA256 (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 35c330d40ed9def99e8dea8f3b0e4fda7610b813b6f4aac9a70ffefcb9ab1f1e SIZE (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 1019457 SHA256 (ceph-rocksdb-4c736f1_GH0.tar.gz) = 7216de17b5cf49d75ba309175d9fc576a5e08a450b4dced532e6e9f71aca8b90 SIZE (ceph-rocksdb-4c736f1_GH0.tar.gz) = 5468514 SHA256 (ceph-xxHash-1f40c65_GH0.tar.gz) = 809e06b7493ed01f13c7ba972393a5a6d23dd92fd6b884381aa907005e569372 SIZE (ceph-xxHash-1f40c65_GH0.tar.gz) = 25484 SHA256 (facebook-zstd-f4340f4_GH0.tar.gz) = 0db909a46914eb7800bce044b86fcf595451713e56a2b131ace6f70ff25c1c4d SIZE (facebook-zstd-f4340f4_GH0.tar.gz) = 1619022 Index: head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake =================================================================== --- head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake (revision 526505) +++ head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake (nonexistent) @@ -1,11 +0,0 @@ ---- cmake/modules/FindPython3Libs.cmake.orig 2019-09-13 18:07:41 UTC -+++ cmake/modules/FindPython3Libs.cmake -@@ -101,7 +101,7 @@ endif() - # To avoid picking up the system Python.h pre-maturely. - set(CMAKE_FIND_FRAMEWORK LAST) - --set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(Python3Libs_FIND_VERSION) - if(Python3Libs_FIND_VERSION_COUNT GREATER 1) Property changes on: head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ceph14/files/patch-src_tools_rbd-ggate_main.cc =================================================================== --- head/net/ceph14/files/patch-src_tools_rbd-ggate_main.cc (revision 526505) +++ head/net/ceph14/files/patch-src_tools_rbd-ggate_main.cc (nonexistent) @@ -1,31 +0,0 @@ -diff --git a/src/tools/rbd_ggate/main.cc b/src/tools/rbd_ggate/main.cc -index 67fe81942b4f..5ed582fbf81c 100644 ---- src/tools/rbd_ggate/main.cc -+++ src/tools/rbd_ggate/main.cc -@@ -102,14 +102,13 @@ static int do_map(int argc, const char *argv[]) - std::cerr << err << std::endl; - return r; - } -- - if (forker.is_parent()) { -- global_init_postfork_start(g_ceph_context); - if (forker.parent_wait(err) != 0) { - return -ENXIO; - } - return 0; - } -+ global_init_postfork_start(g_ceph_context); - } - - common_init_finish(g_ceph_context); -@@ -204,9 +203,8 @@ static int do_map(int argc, const char *argv[]) - std::cout << "/dev/" << drv->get_devname() << std::endl; - - if (g_conf()->daemonize) { -- forker.daemonize(); -- global_init_postfork_start(g_ceph_context); - global_init_postfork_finish(g_ceph_context); -+ forker.daemonize(); - } - - init_async_signal_handler(); Property changes on: head/net/ceph14/files/patch-src_tools_rbd-ggate_main.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake =================================================================== --- head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake (revision 526505) +++ head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake (nonexistent) @@ -1,11 +0,0 @@ ---- cmake/modules/FindPython3Interp.cmake.orig 2019-09-13 18:07:41 UTC -+++ cmake/modules/FindPython3Interp.cmake -@@ -69,7 +69,7 @@ - - unset(_Python3_NAMES) - --set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(Python3Interp_FIND_VERSION) - if(Python3Interp_FIND_VERSION_COUNT GREATER 1) Property changes on: head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ceph14/files/do_freebsd.sh =================================================================== --- head/net/ceph14/files/do_freebsd.sh (revision 526505) +++ head/net/ceph14/files/do_freebsd.sh (revision 526506) Property changes on: head/net/ceph14/files/do_freebsd.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -ON \ No newline at end of property Index: head/net/ceph14/files/file-git_version =================================================================== --- head/net/ceph14/files/file-git_version (revision 526505) +++ head/net/ceph14/files/file-git_version (revision 526506) @@ -1,2 +1,2 @@ -534c2f14693439413791049826ca23d1706c7a8d -v14.2.4-44-g534c2f1469 +6036662bc04e4d9a0f8ab284b1a18ca54100c1d7 +v14.2.7-508-g6036662bc0 Index: head/net/ceph14/files/file-newsyslog_ceph-log.conf =================================================================== --- head/net/ceph14/files/file-newsyslog_ceph-log.conf (nonexistent) +++ head/net/ceph14/files/file-newsyslog_ceph-log.conf (revision 526506) @@ -0,0 +1,22 @@ +# configuration file for newsyslog for ceph daemons +# +# see newsyslog.conf(5) for details +# +# This requires the following setting on commandline or in ceph.conf +# pid file = /var/run/ceph/$cluster-$type.$id.pid +# +# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num] +/var/log/ceph/ceph.audit.log ceph:ceph 644 7 100 * JN +/var/log/ceph/ceph.log ceph:ceph 644 7 100 * JN +# +/var/log/ceph/ceph-mgr.x.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-mgr.x.pid +/var/log/ceph/ceph-mon.a.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-mon.a.pid +/var/log/ceph/ceph-mon.b.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-mon.b.pid +/var/log/ceph/ceph-mon.c.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-mon.c.pid +# +# This needs to get adjusted for any osds running on this server +/var/log/ceph/ceph-osd.0.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-osd.0.pid +/var/log/ceph/ceph-osd.3.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-osd.3.pid +/var/log/ceph/ceph-osd.6.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-osd.6.pid + + Property changes on: head/net/ceph14/files/file-newsyslog_ceph-log.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ 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: head/net/ceph14/files/patch-src_pybind_mgr_diskprediction_cloud_common___init__.py =================================================================== --- head/net/ceph14/files/patch-src_pybind_mgr_diskprediction_cloud_common___init__.py (nonexistent) +++ head/net/ceph14/files/patch-src_pybind_mgr_diskprediction_cloud_common___init__.py (revision 526506) @@ -0,0 +1,11 @@ +--- src/pybind/mgr/diskprediction_cloud/common/__init__.py.orig 2020-02-17 22:23:19.281206000 +0100 ++++ src/pybind/mgr/diskprediction_cloud/common/__init__.py 2020-02-17 22:23:29.293335000 +0100 +@@ -29,7 +29,7 @@ + pass + + +-def timeout(seconds=10, error_message=os.strerror(errno.ETIME)): ++def timeout(seconds=10, error_message=os.strerror(errno.ETIMEDOUT)): + def decorator(func): + def _handle_timeout(signum, frame): + raise TimeoutError(error_message) Property changes on: head/net/ceph14/files/patch-src_pybind_mgr_diskprediction_cloud_common___init__.py ___________________________________________________________________ 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: head/net/ceph14/pkg-message =================================================================== --- head/net/ceph14/pkg-message (nonexistent) +++ head/net/ceph14/pkg-message (revision 526506) @@ -0,0 +1,17 @@ +[ +{ type: install + message: <