Attachment 211744 Details for Bug 244099 – patch-v2

[patch] patch-v2

ceph14.diff (text/plain), 10.54 KB, created by Kurt Jaeger on 2020-02-18 16:46:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2020-02-18 16:46:32 UTC

Size: 10.54 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 526437)
>+++ Makefile	(working copy)
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	ceph
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	14.2.4
>-PORTREVISION=	2
>+DISTVERSION=	14.2.7
> CATEGORIES=	net
> PKGNAMESUFFIX=	14
> 
>@@ -24,7 +23,8 @@
> 	${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 \
>@@ -46,10 +46,23 @@
> 	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 fuse gettext-runtime gmake pkgconfig python:3.7 \
> 		shebangfix ssl
> USE_PYTHON=	cython
> USE_OPENLDAP=	yes
>@@ -75,12 +88,11 @@
> 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 \
>@@ -93,6 +105,8 @@
> USERS=		ceph
> GROUPS=		ceph
> 
>+PLIST_SUB=	CMAKE_BUILD_TYPE_regex=\bdebug\b
>+
> .include <bsd.port.options.mk>
> 
> # 11.2 and 12.0 RELEASE has clang60 and will give versioning errors
>@@ -110,7 +124,14 @@
> 	${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
>@@ -121,6 +142,7 @@
> 	${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
>@@ -141,15 +163,8 @@
> 	${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 <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 526437)
>+++ distinfo	(working copy)
>@@ -1,6 +1,6 @@
>-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
>Index: files/ceph.in
>===================================================================
>--- files/ceph.in	(revision 526437)
>+++ files/ceph.in	(working copy)
>@@ -1,6 +1,6 @@
> #!/bin/sh
> #
>-# $FreeBSD$
>+# $FreeBSD: head/net/ceph14/files/ceph.in 477944 2018-08-24 07:45:53Z jhale $
> #
> 
> # PROVIDE: ceph
>
>Property changes on: files/ceph.in
>___________________________________________________________________
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Index: files/do_freebsd.sh
>===================================================================
>--- files/do_freebsd.sh	(revision 526437)
>+++ files/do_freebsd.sh	(working copy)
>
>Property changes on: files/do_freebsd.sh
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-ON
>\ No newline at end of property
>Index: files/file-git_version
>===================================================================
>--- files/file-git_version	(revision 526437)
>+++ files/file-git_version	(working copy)
>@@ -1,2 +1,2 @@
>-534c2f14693439413791049826ca23d1706c7a8d
>-v14.2.4-44-g534c2f1469
>+6036662bc04e4d9a0f8ab284b1a18ca54100c1d7
>+v14.2.7-508-g6036662bc0
>
>Property changes on: files/file-git_version
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-ON
>\ No newline at end of property
>Index: files/file-newsyslog_ceph-log.conf
>===================================================================
>--- files/file-newsyslog_ceph-log.conf	(nonexistent)
>+++ files/file-newsyslog_ceph-log.conf	(working copy)
>@@ -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: files/file-newsyslog_ceph-log.conf
>___________________________________________________________________
>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: files/patch-cmake_modules_FindPython3Interp.cmake
>===================================================================
>--- files/patch-cmake_modules_FindPython3Interp.cmake	(revision 526437)
>+++ 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: 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: files/patch-cmake_modules_FindPython3Libs.cmake
>===================================================================
>--- files/patch-cmake_modules_FindPython3Libs.cmake	(revision 526437)
>+++ 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: 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

Actions: View | Diff

Attachments on bug 244099: 211616 | 211744 | 211746