Attachment #212253 for bug #244675




PORTNAME=	ceph
DISTVERSIONPREFIX=	v
DISTVERSION=	14.2.7
PORTREVISION=	2
CATEGORIES=	net
PKGNAMESUFFIX=	14


	bash:shells/bash \
	flock:sysutils/flock \
	jq:textproc/jq \
	smartctl:sysutils/smartmontools \
	xml:textproc/xmlstarlet \
	${LOCALBASE}/bin/getopt:misc/getopt \
	${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}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} \


USES=		cmake:noninja dos2unix fuse gettext-runtime gmake ncurses \
		pkgconfig python:3.7+ shebangfix ssl
USE_PYTHON=	cython py3kplist
USE_OPENLDAP=	yes
USE_GITHUB=	yes
GH_ACCOUNT=	ceph:DEFAULT

CMAKE_BUILD_TYPE=	Release
CMAKE_ON=	WITH_SYSTEM_BOOST WITH_BOOST_CONTEXT WITH_FUSE WITH_PYTHON3
CMAKE_OFF=	WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS \
		WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2
		WITH_MGR_DASHBOARD_FRONTEND WITH_SYSTEM_NPM \
		WITH_LIBCEPHFS WITH_CEPHFS WITH_PYTHON2
CMAKE_ARGS=	-D MGR_PYTHON_VERSION=${PYTHON_VER} \
		-D CEPH_MAN_DIR:STRING=man


pre-configure:
	[ -e ${WRKSRC}/build ] || ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build
	${CP} files/file-git_version ${WRKSRC}/src/.git_version
	# Use the module finders that come with Cmake for Boost and Python
	${RM} ${WRKSRC}/cmake/modules/FindBoost.cmake || true

post-install:
	# To install a ceph.conf sample





index a1d076fbce..ea4ad6cb6f 100644
--- cmake/modules/FindPython3Interp.cmake
+++ 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)





diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 28ec9835f8..4ac08f9d00 100644
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -625,8 +625,6 @@ add_subdirectory(bash_completion)
 add_subdirectory(client)
 
 if(WITH_LIBCEPHFS)
-  find_package(PkgConfig QUIET REQUIRED)
-  pkg_check_modules(CAPNG REQUIRED libcap-ng)
   set(libcephfs_srcs libcephfs.cc)
   add_library(cephfs ${CEPH_SHARED} ${libcephfs_srcs})
   target_link_libraries(cephfs PRIVATE client ceph-common

Lines 6-13 Link Here

(-)pkg-message (-1 / +2 lines)
6	into a package but will require the user to install it himself.	6	into a package but will require the user to install it himself.
7		7
8	To install the dashboard, please execute:	8	To install the dashboard, please execute:
		9	sudo pkg install python2
9	sudo pkg install npm	10	sudo pkg install npm
10	cd /usr/local/share/ceph/mgr/dashboard/frontend	11	cd ${LOCALBASE}/share/ceph/mgr/dashboard/frontend
11	chown -R ceph .	12	chown -R ceph .
12	ls -asl /var/lib/ceph	13	ls -asl /var/lib/ceph
13	chown -R ceph:ceph /var/lib/ceph	14	chown -R ceph:ceph /var/lib/ceph




/you/have/to/check/what/makeplist/gives/you
bin/ceph
bin/ceph-authtool
bin/ceph-bluestore-tool
bin/ceph-client-debug
bin/ceph-clsinfo
bin/ceph-conf
bin/ceph-coverage

bin/ceph-objectstore-tool
bin/ceph-osd
bin/ceph-osdomap-tool
bin/ceph_kvstorebench
bin/ceph-post-file
bin/ceph-rbdnamer
bin/ceph-run
bin/ceph-syn
bin/ceph_erasure_code
bin/ceph_erasure_code_benchmark
bin/ceph_kvstorebench
bin/ceph_objectstore_bench
bin/ceph_omapbench
bin/ceph_radosacl

bin/ceph_rgw_multiparser
bin/ceph_scratchtool
bin/cephdeduptool
bin/cephfs-data-scan
bin/cephfs-journal-tool
bin/cephfs-table-tool
bin/crushtool
bin/init-ceph
bin/librados-config

etc/bash_completion.d/rbd
%%ETCDIR%%/ceph.conf.sample
etc/newsyslog.conf.d/file-newsyslog_ceph-log.conf
include/cephfs/ceph_statx.h
include/cephfs/libcephfs.h
include/rados/buffer.h
include/rados/buffer_fwd.h
include/rados/crc32c.h

lib/ceph/erasure-code/libec_shec_sse3.so
lib/ceph/erasure-code/libec_shec_sse4.so
lib/ceph/libceph-common.so.0
lib/libcephfs.so
lib/libcephfs.so.2
lib/libcephfs.so.2.0.0
lib/librados.so
lib/librados.so.2
lib/librados.so.2.0.0

%%PYTHON_SITELIBDIR%%/ceph_volume/util/system.py
%%PYTHON_SITELIBDIR%%/ceph_volume/util/templates.py
%%PYTHON_SITELIBDIR%%/ceph_volume_client.py
%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/top_level.txt
%%PYTHON_SITELIBDIR%%/cephfs.so
%%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
%%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
%%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt

lib/rados-classes/libcls_cas.so
lib/rados-classes/libcls_cas.so.1
lib/rados-classes/libcls_cas.so.1.0.0
lib/rados-classes/libcls_cephfs.so
lib/rados-classes/libcls_cephfs.so.1
lib/rados-classes/libcls_cephfs.so.1.0.0
lib/rados-classes/libcls_hello.so
lib/rados-classes/libcls_hello.so.1
lib/rados-classes/libcls_hello.so.1.0.0

Return to bug 244675

Lines 4-10 Link Here

(-)Makefile (-7 / +6 lines)
4	PORTNAME= ceph	4	PORTNAME= ceph
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 14.2.7	6	DISTVERSION= 14.2.7
7	PORTREVISION= 1	7	PORTREVISION= 2
8	CATEGORIES= net	8	CATEGORIES= net
9	PKGNAMESUFFIX= 14	9	PKGNAMESUFFIX= 14
10		10
Lines 44-58 Link Here
44	bash:shells/bash \	44	bash:shells/bash \
45	flock:sysutils/flock \	45	flock:sysutils/flock \
46	jq:textproc/jq \	46	jq:textproc/jq \
		47	smartctl:sysutils/smartmontools \
47	xml:textproc/xmlstarlet \	48	xml:textproc/xmlstarlet \
48	${LOCALBASE}/bin/getopt:misc/getopt \	49	${LOCALBASE}/bin/getopt:misc/getopt \
49	${LOCALBASE}/sbin/smartctl:sysutils/smartmontools \
50	${PYTHON_PKGNAMEPREFIX}grpcio>=0:devel/py-grpcio@${PY_FLAVOR} \	50	${PYTHON_PKGNAMEPREFIX}grpcio>=0:devel/py-grpcio@${PY_FLAVOR} \
51	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \	51	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
52	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \	52	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
53	${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \	53	${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
54	${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf@${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} \	55	${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \
57	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \	56	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
58	${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \	57	${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
Lines 64-70 Link Here
64		63
65	USES= cmake:noninja dos2unix fuse gettext-runtime gmake ncurses \	64	USES= cmake:noninja dos2unix fuse gettext-runtime gmake ncurses \
66	pkgconfig python:3.7+ shebangfix ssl	65	pkgconfig python:3.7+ shebangfix ssl
67	USE_PYTHON= cython	66	USE_PYTHON= cython py3kplist
68	USE_OPENLDAP= yes	67	USE_OPENLDAP= yes
69	USE_GITHUB= yes	68	USE_GITHUB= yes
70	GH_ACCOUNT= ceph:DEFAULT	69	GH_ACCOUNT= ceph:DEFAULT
Lines 91-99 Link Here
91	CMAKE_BUILD_TYPE= Release	90	CMAKE_BUILD_TYPE= Release
92	CMAKE_ON= WITH_SYSTEM_BOOST WITH_BOOST_CONTEXT WITH_FUSE WITH_PYTHON3	91	CMAKE_ON= WITH_SYSTEM_BOOST WITH_BOOST_CONTEXT WITH_FUSE WITH_PYTHON3
93	CMAKE_OFF= WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS \	92	CMAKE_OFF= WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS \
94	WITH_SPDK WITH_RDMA WITH_RADOSGW_BEAST_FRONTEND \	93	WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2
95	WITH_MGR_DASHBOARD_FRONTEND WITH_SYSTEM_NPM \
96	WITH_LIBCEPHFS WITH_CEPHFS WITH_PYTHON2
97	CMAKE_ARGS= -D MGR_PYTHON_VERSION=${PYTHON_VER} \	94	CMAKE_ARGS= -D MGR_PYTHON_VERSION=${PYTHON_VER} \
98	-D CEPH_MAN_DIR:STRING=man	95	-D CEPH_MAN_DIR:STRING=man
99		96
Lines 124-129 Link Here
124	pre-configure:	121	pre-configure:
125	[ -e ${WRKSRC}/build ] \|\| ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build	122	[ -e ${WRKSRC}/build ] \|\| ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build
126	${CP} files/file-git_version ${WRKSRC}/src/.git_version	123	${CP} files/file-git_version ${WRKSRC}/src/.git_version
		124	# Use the module finders that come with Cmake for Boost and Python
		125	${RM} ${WRKSRC}/cmake/modules/FindBoost.cmake \|\| true
127		126
128	post-install:	127	post-install:
129	# To install a ceph.conf sample	128	# To install a ceph.conf sample

Line 0 Link Here

(-)files/patch-cmake_modules_FindPtyhon3Interp.cmake.diff (+14 lines)
	1
	2	index a1d076fbce..ea4ad6cb6f 100644
	3	--- cmake/modules/FindPython3Interp.cmake
	4	+++ cmake/modules/FindPython3Interp.cmake
	5	@@ -69,7 +69,7 @@
	6
	7	unset(_Python3_NAMES)
	8
	9	-set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
	10	+set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
	11
	12	if(Python3Interp_FIND_VERSION)
	13	if(Python3Interp_FIND_VERSION_COUNT GREATER 1)
	14

Line 0 Link Here

(-)files/patch-src_CMakeLists.txt.2 (+13 lines)
	1	diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
	2	index 28ec9835f8..4ac08f9d00 100644
	3	--- src/CMakeLists.txt
	4	+++ src/CMakeLists.txt
	5	@@ -625,8 +625,6 @@ add_subdirectory(bash_completion)
	6	add_subdirectory(client)
	7
	8	if(WITH_LIBCEPHFS)
	9	- find_package(PkgConfig QUIET REQUIRED)
	10	- pkg_check_modules(CAPNG REQUIRED libcap-ng)
	11	set(libcephfs_srcs libcephfs.cc)
	12	add_library(cephfs ${CEPH_SHARED} ${libcephfs_srcs})
	13	target_link_libraries(cephfs PRIVATE client ceph-common

Lines 1-6 Link Here

(-)pkg-plist (-1 / +20 lines)
		1	/you/have/to/check/what/makeplist/gives/you
1	bin/ceph	2	bin/ceph
2	bin/ceph-authtool	3	bin/ceph-authtool
3	bin/ceph-bluestore-tool	4	bin/ceph-bluestore-tool
		5	bin/ceph-client-debug
4	bin/ceph-clsinfo	6	bin/ceph-clsinfo
5	bin/ceph-conf	7	bin/ceph-conf
6	bin/ceph-coverage	8	bin/ceph-coverage
Lines 16-27 Link Here
16	bin/ceph-objectstore-tool	18	bin/ceph-objectstore-tool
17	bin/ceph-osd	19	bin/ceph-osd
18	bin/ceph-osdomap-tool	20	bin/ceph-osdomap-tool
19	bin/ceph_kvstorebench
20	bin/ceph-post-file	21	bin/ceph-post-file
21	bin/ceph-rbdnamer	22	bin/ceph-rbdnamer
22	bin/ceph-run	23	bin/ceph-run
		24	bin/ceph-syn
23	bin/ceph_erasure_code	25	bin/ceph_erasure_code
24	bin/ceph_erasure_code_benchmark	26	bin/ceph_erasure_code_benchmark
		27	bin/ceph_kvstorebench
25	bin/ceph_objectstore_bench	28	bin/ceph_objectstore_bench
26	bin/ceph_omapbench	29	bin/ceph_omapbench
27	bin/ceph_radosacl	30	bin/ceph_radosacl
Lines 29-34 Link Here
29	bin/ceph_rgw_multiparser	32	bin/ceph_rgw_multiparser
30	bin/ceph_scratchtool	33	bin/ceph_scratchtool
31	bin/cephdeduptool	34	bin/cephdeduptool
		35	bin/cephfs-data-scan
		36	bin/cephfs-journal-tool
		37	bin/cephfs-table-tool
32	bin/crushtool	38	bin/crushtool
33	bin/init-ceph	39	bin/init-ceph
34	bin/librados-config	40	bin/librados-config
Lines 53-58 Link Here
53	etc/bash_completion.d/rbd	59	etc/bash_completion.d/rbd
54	%%ETCDIR%%/ceph.conf.sample	60	%%ETCDIR%%/ceph.conf.sample
55	etc/newsyslog.conf.d/file-newsyslog_ceph-log.conf	61	etc/newsyslog.conf.d/file-newsyslog_ceph-log.conf
		62	include/cephfs/ceph_statx.h
		63	include/cephfs/libcephfs.h
56	include/rados/buffer.h	64	include/rados/buffer.h
57	include/rados/buffer_fwd.h	65	include/rados/buffer_fwd.h
58	include/rados/crc32c.h	66	include/rados/crc32c.h
Lines 101-106 Link Here
101	lib/ceph/erasure-code/libec_shec_sse3.so	109	lib/ceph/erasure-code/libec_shec_sse3.so
102	lib/ceph/erasure-code/libec_shec_sse4.so	110	lib/ceph/erasure-code/libec_shec_sse4.so
103	lib/ceph/libceph-common.so.0	111	lib/ceph/libceph-common.so.0
		112	lib/libcephfs.so
		113	lib/libcephfs.so.2
		114	lib/libcephfs.so.2.0.0
104	lib/librados.so	115	lib/librados.so
105	lib/librados.so.2	116	lib/librados.so.2
106	lib/librados.so.2.0.0	117	lib/librados.so.2.0.0
Lines 259-264 Link Here
259	%%PYTHON_SITELIBDIR%%/ceph_volume/util/system.py	270	%%PYTHON_SITELIBDIR%%/ceph_volume/util/system.py
260	%%PYTHON_SITELIBDIR%%/ceph_volume/util/templates.py	271	%%PYTHON_SITELIBDIR%%/ceph_volume/util/templates.py
261	%%PYTHON_SITELIBDIR%%/ceph_volume_client.py	272	%%PYTHON_SITELIBDIR%%/ceph_volume_client.py
		273	%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
		274	%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
		275	%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
		276	%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/top_level.txt
		277	%%PYTHON_SITELIBDIR%%/cephfs.so
262	%%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO	278	%%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
263	%%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt	279	%%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
264	%%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt	280	%%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
Lines 277-282 Link Here
277	lib/rados-classes/libcls_cas.so	293	lib/rados-classes/libcls_cas.so
278	lib/rados-classes/libcls_cas.so.1	294	lib/rados-classes/libcls_cas.so.1
279	lib/rados-classes/libcls_cas.so.1.0.0	295	lib/rados-classes/libcls_cas.so.1.0.0
		296	lib/rados-classes/libcls_cephfs.so
		297	lib/rados-classes/libcls_cephfs.so.1
		298	lib/rados-classes/libcls_cephfs.so.1.0.0
280	lib/rados-classes/libcls_hello.so	299	lib/rados-classes/libcls_hello.so
281	lib/rados-classes/libcls_hello.so.1	300	lib/rados-classes/libcls_hello.so.1
282	lib/rados-classes/libcls_hello.so.1.0.0	301	lib/rados-classes/libcls_hello.so.1.0.0