Attachment #211744 for bug #244099

Lines 3-10 Link Here

(-)Makefile (-17 / +32 lines)
3		3
4	PORTNAME= ceph	4	PORTNAME= ceph
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 14.2.4	6	DISTVERSION= 14.2.7
7	PORTREVISION= 2
8	CATEGORIES= net	7	CATEGORIES= net
9	PKGNAMESUFFIX= 14	8	PKGNAMESUFFIX= 14
10		9
Lines 24-30 Link Here
24	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
25	gperf:devel/gperf \	24	gperf:devel/gperf \
26	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \	25	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \
27	${LOCALBASE}/bin/ld:devel/binutils	26	${LOCALBASE}/bin/ld:devel/binutils \
		27	npm:www/npm
28	LIB_DEPENDS= \	28	LIB_DEPENDS= \
29	${PY_BOOST} \	29	${PY_BOOST} \
30	libboost_thread.so:devel/boost-libs \	30	libboost_thread.so:devel/boost-libs \
Lines 46-55 Link Here
46	xml:textproc/xmlstarlet \	46	xml:textproc/xmlstarlet \
47	jq:textproc/jq \	47	jq:textproc/jq \
48	flock:sysutils/flock \	48	flock:sysutils/flock \
		49	${LOCALBASE}/sbin/smartctl:sysutils/smartmontools \
		50	${PYTHON_PKGNAMEPREFIX}grpcio>=0:devel/py-grpcio@${PY_FLAVOR} \
		51	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
		52	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
49	${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \	53	${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
50	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR}	54	${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf@${PY_FLAVOR} \
		55	${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \
		56	${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \
		57	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
		58	${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
		59	${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \
		60	${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${PY_FLAVOR} \
		61	${PYTHON_PKGNAMEPREFIX}pecan>=0:www/py-pecan@${PY_FLAVOR} \
		62	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
		63	${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR}
51		64
52	USES= cmake:noninja fuse gettext-runtime gmake pkgconfig python:3.6+ \	65	USES= cmake:noninja fuse gettext-runtime gmake pkgconfig python:3.7 \
53	shebangfix ssl	66	shebangfix ssl
54	USE_PYTHON= cython	67	USE_PYTHON= cython
55	USE_OPENLDAP= yes	68	USE_OPENLDAP= yes
Lines 75-86 Link Here
75	GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd	88	GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd
76		89
77	CMAKE_BUILD_TYPE= Release	90	CMAKE_BUILD_TYPE= Release
78	CMAKE_ON= WITH_SYSTEM_BOOST WITH_FUSE	91	CMAKE_ON= WITH_SYSTEM_BOOST WITH_FUSE WITH_SYSTEM_NPM
79	CMAKE_OFF= WITH_BOOST_CONTEXT WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS WITH_KVS \	92	CMAKE_OFF= WITH_BOOST_CONTEXT WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS \
80	WITH_SPDK WITH_RDMA WITH_LIBCEPHFS WITH_CEPHFS WITH_RADOSGW_BEAST_FRONTEND \	93	WITH_SPDK WITH_RDMA WITH_LIBCEPHFS WITH_CEPHFS \
81	WITH_MGR_DASHBOARD_FRONTEND	94	WITH_MGR_DASHBOARD_FRONTEND
82	CMAKE_ARGS= \	95	CMAKE_ARGS= -D WITH_PYTHON2=OFF -D WITH_PYTHON3=3.7 -DMGR_PYTHON_VERSION=3.7 \
83	-D WITH_PYTHON2=OFF -D WITH_PYTHON3=ON -DMGR_PYTHON_VERSION=${PYTHON_VER} \
84	-D CEPH_MAN_DIR:STRING=man	96	-D CEPH_MAN_DIR:STRING=man
85		97
86	SHEBANG_FILES= src/rbdmap src/ceph-post-file.in src/rbd-replay-many \	98	SHEBANG_FILES= src/rbdmap src/ceph-post-file.in src/rbd-replay-many \
Lines 93-98 Link Here
93	USERS= ceph	105	USERS= ceph
94	GROUPS= ceph	106	GROUPS= ceph
95		107
		108	PLIST_SUB= CMAKE_BUILD_TYPE_regex=\bdebug\b
		109
96	.include <bsd.port.options.mk>	110	.include <bsd.port.options.mk>
97		111
98	# 11.2 and 12.0 RELEASE has clang60 and will give versioning errors	112	# 11.2 and 12.0 RELEASE has clang60 and will give versioning errors
Lines 110-116 Link Here
110	${CP} files/file-git_version ${WRKSRC}/src/.git_version	124	${CP} files/file-git_version ${WRKSRC}/src/.git_version
111		125
112	post-install:	126	post-install:
		127	# To install a ceph.conf sample
113	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph	128	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph
		129	${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample
		130	# Get logging and rotation working
		131	${MKDIR} ${STAGEDIR}/var/log/ceph
		132	${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
		133	${INSTALL_DATA} files/file-newsyslog_ceph-log.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
		134	# Create directories used bij daemons
114	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mds	135	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mds
115	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-osd	136	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-osd
116	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-rgw	137	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-rgw
Lines 121-126 Link Here
121	${MKDIR} ${STAGEDIR}/var/lib/ceph/mgr	142	${MKDIR} ${STAGEDIR}/var/lib/ceph/mgr
122	${MKDIR} ${STAGEDIR}/var/lib/ceph/tmp	143	${MKDIR} ${STAGEDIR}/var/lib/ceph/tmp
123	${MKDIR} ${STAGEDIR}/var/lib/ceph/radosgw	144	${MKDIR} ${STAGEDIR}/var/lib/ceph/radosgw
		145	# For PID files and command sockets and log files
124	${MKDIR} ${STAGEDIR}/var/log/ceph	146	${MKDIR} ${STAGEDIR}/var/log/ceph
125	${MKDIR} ${STAGEDIR}/var/run/ceph	147	${MKDIR} ${STAGEDIR}/var/run/ceph
126	# Use the Ceph init.d script as the interface to regular	148	# Use the Ceph init.d script as the interface to regular
Lines 141-155 Link Here
141	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_tpbench	163	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_tpbench
142	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_xattr_bench	164	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_xattr_bench
143	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-disk-udev	165	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-disk-udev
144	# ceph-volume does not support ZFS
145	${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR}/ceph_volume-*
146	${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR}/ceph_volume/
147	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume
148	${RM} ${STAGEDIR}${PREFIX}/man/man8/ceph-volume*
149	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume-systemd	166	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume-systemd
150	${RM} -rf ${STAGEDIR}${PREFIX}/libexec/systemd	167	${RM} -rf ${STAGEDIR}${PREFIX}/libexec/systemd
151
152	${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d	168	${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d
153	${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample
154		169
155	.include <bsd.port.post.mk>	170	.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1568802415	1	TIMESTAMP = 1581605576
2	SHA256 (ceph-ceph-v14.2.4_GH0.tar.gz) = 17b826b7dca4df6205651f703edac93d19b2fa5542f8a130c03d1009193587c1	2	SHA256 (ceph-ceph-v14.2.7_GH0.tar.gz) = f2882424ecce6fa3a6bf5bdbdc01fc3dae885d9f2ccb40c50ead859eeba69126
3	SIZE (ceph-ceph-v14.2.4_GH0.tar.gz) = 21008519	3	SIZE (ceph-ceph-v14.2.7_GH0.tar.gz) = 21217939
4	SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 8ab8f36f3e0a720c882b8bb4abb3f2e26bd6b025cc263119207f7d2eb3b1e490	4	SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 8ab8f36f3e0a720c882b8bb4abb3f2e26bd6b025cc263119207f7d2eb3b1e490
5	SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3685656	5	SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3685656
6	SHA256 (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 79ff0d1b9f959c9f5264a0dff193105d71885615deaa9c8469902400fd82d214	6	SHA256 (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 79ff0d1b9f959c9f5264a0dff193105d71885615deaa9c8469902400fd82d214

Lines 1-6 Link Here

(-)files/ceph.in (-1 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2	#	2	#
3	# $FreeBSD$	3	# $FreeBSD: head/net/ceph14/files/ceph.in 477944 2018-08-24 07:45:53Z jhale $
4	#	4	#
5		5
6	# PROVIDE: ceph	6	# PROVIDE: ceph

Lines 1-2 Link Here

(-)files/file-git_version (-2 / +2 lines)
1	534c2f14693439413791049826ca23d1706c7a8d	1	6036662bc04e4d9a0f8ab284b1a18ca54100c1d7
2	v14.2.4-44-g534c2f1469	2	v14.2.7-508-g6036662bc0




# 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



Lines 1-11 Link Here

(-)files/patch-cmake_modules_FindPython3Interp.cmake (-11 lines)
1	--- cmake/modules/FindPython3Interp.cmake.orig 2019-09-13 18:07:41 UTC
2	+++ cmake/modules/FindPython3Interp.cmake
3	@@ -69,7 +69,7 @@
4
5	unset(_Python3_NAMES)
6
7	-set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
8	+set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
9
10	if(Python3Interp_FIND_VERSION)
11	if(Python3Interp_FIND_VERSION_COUNT GREATER 1)

Lines 1-11 Link Here

(-)files/patch-cmake_modules_FindPython3Libs.cmake (-11 lines)
1	--- cmake/modules/FindPython3Libs.cmake.orig 2019-09-13 18:07:41 UTC
2	+++ cmake/modules/FindPython3Libs.cmake
3	@@ -101,7 +101,7 @@ endif()
4	# To avoid picking up the system Python.h pre-maturely.
5	set(CMAKE_FIND_FRAMEWORK LAST)
6
7	-set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
8	+set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
9
10	if(Python3Libs_FIND_VERSION)
11	if(Python3Libs_FIND_VERSION_COUNT GREATER 1)

Return to bug 244099

Line 0 Link Here

(-)files/file-newsyslog_ceph-log.conf (+22 lines)
	1	# configuration file for newsyslog for ceph daemons
	2	#
	3	# see newsyslog.conf(5) for details
	4	#
	5	# This requires the following setting on commandline or in ceph.conf
	6	# pid file = /var/run/ceph/$cluster-$type.$id.pid
	7	#
	8	# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num]
	9	/var/log/ceph/ceph.audit.log ceph:ceph 644 7 100 * JN
	10	/var/log/ceph/ceph.log ceph:ceph 644 7 100 * JN
	11	#
	12	/var/log/ceph/ceph-mgr.x.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-mgr.x.pid
	13	/var/log/ceph/ceph-mon.a.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-mon.a.pid
	14	/var/log/ceph/ceph-mon.b.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-mon.b.pid
	15	/var/log/ceph/ceph-mon.c.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-mon.c.pid
	16	#
	17	# This needs to get adjusted for any osds running on this server
	18	/var/log/ceph/ceph-osd.0.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-osd.0.pid
	19	/var/log/ceph/ceph-osd.3.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-osd.3.pid
	20	/var/log/ceph/ceph-osd.6.log ceph:ceph 644 7 1000 * J /var/run/ceph/ceph-osd.6.pid
	21
	22