Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Nov 2023 15:38:26 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 609f6539ce9e - main - net/ceph14: Remove expired port
Message-ID:  <202311021538.3A2FcQbr026498@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=609f6539ce9e089e9045c642511f091969a02664

commit 609f6539ce9e089e9045c642511f091969a02664
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-11-02 14:33:26 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-11-02 15:25:43 +0000

    net/ceph14: Remove expired port
    
    2023-10-31 net/ceph14: End of life upstream since 2021-06-30
---
 MOVED                                              |    1 +
 net/Makefile                                       |    1 -
 net/ceph14/Makefile                                |  183 ---
 net/ceph14/distinfo                                |   33 -
 net/ceph14/files/ceph.in                           |   33 -
 net/ceph14/files/do_freebsd.sh                     |   45 -
 net/ceph14/files/file-git_version                  |    2 -
 net/ceph14/files/file-newsyslog_ceph-log.conf      |   22 -
 .../patch-cmake_modules_FindPython3Interp.cmake    |   11 -
 .../patch-cmake_modules_FindPython3Libs.cmake      |   11 -
 net/ceph14/files/patch-src_CMakeLists.txt          |   32 -
 net/ceph14/files/patch-src_auth_KeyRing.cc         |   17 -
 .../files/patch-src_common_crc32c__ppc__asm.S      |   68 -
 ...patch-src_common_crc32c__ppc__fast__zero__asm.S |  115 --
 net/ceph14/files/patch-src_common_ppc-asm.h        |  384 -----
 net/ceph14/files/patch-src_common_ppc-opcode.h     |   37 -
 .../patch-src_compressor_snappy_SnappyCompressor.h |   19 -
 net/ceph14/files/patch-src_librbd_api_Trash.cc     |  180 ---
 net/ceph14/files/patch-src_mgr_ActivePyModules.cc  |   29 -
 .../files/patch-src_msg_async_frames_v2.cc.diff    |   13 -
 .../files/patch-src_os_bluestore_KernelDevice.cc   |   11 -
 ...ind_mgr_diskprediction_cloud_common___init__.py |   11 -
 net/ceph14/files/patch-src_rgw_rgw_asio_client.cc  |   47 -
 net/ceph14/files/patch-src_rgw_rgw_lc.cc.diff      |   13 -
 net/ceph14/files/patch-src_rocksdb_util_channel.h  |   28 -
 .../files/patch-src_tools_rbd_action_Trash.cc      |   22 -
 net/ceph14/pkg-descr                               |   19 -
 net/ceph14/pkg-message                             |   33 -
 net/ceph14/pkg-plist                               | 1633 --------------------
 29 files changed, 1 insertion(+), 3052 deletions(-)

diff --git a/MOVED b/MOVED
index a92e6ea3899f..6abb0785748a 100644
--- a/MOVED
+++ b/MOVED
@@ -7956,3 +7956,4 @@ www/homer|www/homer-web|2023-11-01|Rename port to be consistent with Arch
 textproc/rubygem-yarp|textproc/rubygem-prism|2023-11-01|Remove obsoleted port. Use textproc/rubygem-prism instead
 audio/p5-MIDI|audio/p5-MIDI-Perl|2023-11-01|Move audio/p5-MIDI to audio/p5-MIDI-Perl
 devel/xtoolchain-llvm-devel||2023-11-02|Subsumed into devel/llvm-devel
+net/ceph14||2023-11-02|Has expired: End of life upstream since 2021-06-30
diff --git a/net/Makefile b/net/Makefile
index eea39253cff2..abeba9f1e997 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -74,7 +74,6 @@
     SUBDIR += c3270
     SUBDIR += calendarsupport
     SUBDIR += ccxstream
-    SUBDIR += ceph14
     SUBDIR += cf
     SUBDIR += charm
     SUBDIR += chrony
diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile
deleted file mode 100644
index 1e6cbd007ec2..000000000000
--- a/net/ceph14/Makefile
+++ /dev/null
@@ -1,183 +0,0 @@
-PORTNAME=	ceph
-DISTVERSIONPREFIX=	v
-DISTVERSION=	14.2.22
-PORTREVISION=	13
-CATEGORIES=	net
-PKGNAMESUFFIX=	14
-
-MAINTAINER=	wjw@digiware.nl
-COMMENT=	Ceph delivers object, block, and file storage in a unified system
-WWW=		https://ceph.com/
-
-LICENSE=	GPLv2 LGPL3
-LICENSE_COMB=	dual
-
-BROKEN=	fails to build with fmt 10 and newer
-#BROKEN_FreeBSD_14=	fails to build: static_assert failed due to requirement
-# even though i386 will build, it is not really advised.
-DEPRECATED=	End of life upstream since 2021-06-30
-EXPIRATION_DATE=2023-10-31
-ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
-
-BUILD_DEPENDS=	\
-	bash:shells/bash \
-	git:devel/git \
-	gperf:devel/gperf \
-	yasm:devel/yasm \
-	${PYTHON_PKGNAMEPREFIX}sphinx>=2.1.2,1:textproc/py-sphinx@${PY_FLAVOR} \
-	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \
-	${LOCALBASE}/bin/ld:devel/binutils
-LIB_DEPENDS=	\
-	${PY_BOOST} \
-	libboost_thread.so:devel/boost-libs \
-	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 \
-	libfmt.so:devel/libfmt
-RUN_DEPENDS=	\
-	bash:shells/bash \
-	flock:sysutils/flock \
-	jq:textproc/jq \
-	smartctl:sysutils/smartmontools \
-	xml:textproc/xmlstarlet \
-	${LOCALBASE}/bin/getopt:misc/getopt \
-	${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}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
-	${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \
-	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
-	${PYTHON_PKGNAMEPREFIX}pyjwt1>=0:www/py-pyjwt1@${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 compiler:c++17-lang cpe dos2unix fuse gettext-runtime gmake ldap ncurses \
-		pkgconfig python:3.8-3.9 readline shebangfix ssl
-CPE_VENDOR=	linuxfoundation
-USE_PYTHON=	cython py3kplist
-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:b706286:zstd/src/zstd
-GH_TUPLE+=	ceph:spawn:5f4742f:spawn/src/spawn
-
-OPTIONS_DEFINE=	TESTS
-OPTIONS_SUB=	yes
-
-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_LEVELDB \
-		WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2 \
-		WITH_RADOSGW_KAFKA_ENDPOINT WITH_LEVELDB
-CMAKE_ARGS=	-DMGR_PYTHON_VERSION=${PYTHON_VER} \
-		-DCEPH_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
-
-TESTS_DESC=	Build test/debug tools
-TESTS_CMAKE_ON=	-DWITH_TESTS:BOOL=ON
-TESTS_CMAKE_OFF=-DWITH_TESTS:BOOL=OFF
-
-USE_RC_SUBR=	ceph
-USE_LDCONFIG=	yes
-
-USERS=		ceph
-GROUPS=		ceph
-
-BINARY_ALIAS=	sphinx-build=sphinx-build-${PYTHON_VER}
-
-# PLIST_SUB=CMAKE_BUILD_TYPE_regex="[[:<:]]debug[[:>:]]"
-
-.include <bsd.port.options.mk>
-
-.if ${ARCH} != amd64
-PLIST_SUB+=	NO_AMD64="@comment "
-.else
-PLIST_SUB+=	NO_AMD64=""
-.endif
-
-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
-	# Cleanup after patching
-	${RM} ${WRKSRC}/src/pybind/mgr/diskprediction_cloud/common/__init__.py.orig
-
-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
-	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume-systemd
-	${RM} -rf ${STAGEDIR}${PREFIX}/libexec/systemd
-	${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d
-
-.include <bsd.port.mk>
diff --git a/net/ceph14/distinfo b/net/ceph14/distinfo
deleted file mode 100644
index 1712c725c790..000000000000
--- a/net/ceph14/distinfo
+++ /dev/null
@@ -1,33 +0,0 @@
-TIMESTAMP = 1638610434
-SHA256 (ceph-ceph-v14.2.22_GH0.tar.gz) = 28529ed7dad98a94236563d31d019a4cf17eafc5350d2821a9422d4983ecfdf2
-SIZE (ceph-ceph-v14.2.22_GH0.tar.gz) = 21986508
-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-b706286_GH0.tar.gz) = 955b69b579c4da12cd54e75f2b4dbe58bb71d17ed94574b5451663c5445d1396
-SIZE (facebook-zstd-b706286_GH0.tar.gz) = 1988017
-SHA256 (ceph-spawn-5f4742f_GH0.tar.gz) = c8832724cf3dd873db7c10407404b6cef30fa770902ab446f830902fed21603a
-SIZE (ceph-spawn-5f4742f_GH0.tar.gz) = 7319
diff --git a/net/ceph14/files/ceph.in b/net/ceph14/files/ceph.in
deleted file mode 100644
index f45ebda834c7..000000000000
--- a/net/ceph14/files/ceph.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: ceph
-# REQUIRE: LOGIN
-# BEFORE:  securelevel
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf to enable `ceph':
-#
-# ceph_enable="YES"
-#
-
-. /etc/rc.subr
-
-PATH=$PATH:%%PREFIX%%/bin:%%PREFIX%%/sbin
-
-name="ceph"
-rcvar=${name}_enable
-extra_commands="condrestart"
-
-load_rc_config ${name}
-
-# read configuration and set defaults
-: ${ceph_enable="NO"}
-: ${ceph_configfile:=%%PREFIX%%/etc/ceph/ceph.conf}
-
-start_cmd="%%PREFIX%%/bin/init-ceph $*"
-stop_cmd="%%PREFIX%%/bin/init-ceph $*"
-restart_cmd="%%PREFIX%%/bin/init-ceph $*"
-condrestart_cmd="%%PREFIX%%/bin/init-ceph $*"
-
-run_rc_command "$1"
-
diff --git a/net/ceph14/files/do_freebsd.sh b/net/ceph14/files/do_freebsd.sh
deleted file mode 100644
index ecb1ff283e56..000000000000
--- a/net/ceph14/files/do_freebsd.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/do_freebsd.sh b/do_freebsd.sh
-index b0f0f5dab3..6fff34d829 100755
---- a/do_freebsd.sh
-+++ b/do_freebsd.sh
-@@ -22,18 +22,21 @@ CMAKE_C_FLAGS_DEBUG="$C_FLAGS_DEBUG $COMPILE_FLAGS"
- #
- #   On FreeBSD we need to preinstall all the tools that are required for building
- #   dashboard, because versions fetched are not working on FreeBSD.
-- 
- 
-+echo Keeping the old build
-+if [ -d build.old ]; then
-+    sudo mv build.old build.del
-+    sudo rm -rf build.del &
-+fi
- if [ -d build ]; then
--    mv build build.remove
--    rm -f build.remove &
-+    sudo mv build build.old
- fi
- 
- ./do_cmake.sh "$*" \
- 	-D WITH_CCACHE=ON \
- 	-D CMAKE_BUILD_TYPE=Debug \
--	-D CMAKE_CXX_FLAGS_DEBUG="$CXX_FLAGS_DEBUG" \
--	-D CMAKE_C_FLAGS_DEBUG="$C_FLAGS_DEBUG" \
-+	-D CMAKE_CXX_FLAGS_DEBUG="$CMAKE_CXX_FLAGS_DEBUG" \
-+	-D CMAKE_C_FLAGS_DEBUG="$CMAKE_C_FLAGS_DEBUG" \
- 	-D ENABLE_GIT_VERSION=OFF \
- 	-D WITH_RADOSGW_AMQP_ENDPOINT=OFF \
- 	-D WITH_SYSTEM_BOOST=ON \
-@@ -52,11 +55,12 @@ fi
- 	-D WITH_MGR=YES \
- 	-D WITH_RDMA=OFF \
- 	-D WITH_SPDK=OFF \
-+	-D WITH_RADOSGW_BEAST_FRONTEND=OFF \
- 	2>&1 | tee cmake.log
- 
- echo start building 
- date
--(cd build; gmake -j$NPROC $BUILDOPTS )
-+(cd build; gmake -j$NPROC $BUILDOPTS VERBOSE=1)
- 
- echo start testing 
- date
diff --git a/net/ceph14/files/file-git_version b/net/ceph14/files/file-git_version
deleted file mode 100644
index 7da6dfe13228..000000000000
--- a/net/ceph14/files/file-git_version
+++ /dev/null
@@ -1,2 +0,0 @@
-5ef401921d7a88aea18ec7558f7f9374ebd8f5a6
-v14.2.21-212-g5ef401921d7
diff --git a/net/ceph14/files/file-newsyslog_ceph-log.conf b/net/ceph14/files/file-newsyslog_ceph-log.conf
deleted file mode 100644
index 845852629b73..000000000000
--- a/net/ceph14/files/file-newsyslog_ceph-log.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
-
-
diff --git a/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake b/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake
deleted file mode 100644
index bf239abfd826..000000000000
--- a/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake
+++ /dev/null
@@ -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.9 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/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake b/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake
deleted file mode 100644
index 5485a4215472..000000000000
--- a/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake
+++ /dev/null
@@ -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.9 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)
diff --git a/net/ceph14/files/patch-src_CMakeLists.txt b/net/ceph14/files/patch-src_CMakeLists.txt
deleted file mode 100644
index 91c6f911dd4a..000000000000
--- a/net/ceph14/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/CMakeLists.txt.orig	2020-01-31 17:07:52 UTC
-+++ src/CMakeLists.txt
-@@ -58,6 +58,11 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-varargs")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-designator")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces -Wno-parentheses -Wno-deprecated-register")
-+  if(FREEBSD)
-+    # Need to use the GNU binutils linker to get versioning right.
-+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument")
-+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument")
-+  endif()
-   if(APPLE)
-     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup")
-   endif()
-@@ -516,7 +521,7 @@ set_target_properties(ceph-osd PROPERTIES
-   INSTALL_RPATH "")
- install(TARGETS ceph-osd DESTINATION bin)
- 
--if (WITH_CEPHFS)
-+if (WITH_CEPHFS OR FREEBSD)
-   add_subdirectory(mds)
-   set(ceph_mds_srcs
-     ceph_mds.cc)
-@@ -625,8 +630,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
diff --git a/net/ceph14/files/patch-src_auth_KeyRing.cc b/net/ceph14/files/patch-src_auth_KeyRing.cc
deleted file mode 100644
index 29faeae360f8..000000000000
--- a/net/ceph14/files/patch-src_auth_KeyRing.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/auth/KeyRing.cc b/src/auth/KeyRing.cc
-index a2833183633a..c4fc15a2380b 100644
---- src/auth/KeyRing.cc
-+++ src/auth/KeyRing.cc
-@@ -203,6 +203,12 @@ void KeyRing::decode(bufferlist::const_iterator& bl) {
-   } catch (buffer::error& err) {
-     keys.clear();
-     decode_plaintext(start_pos);
-+  }catch (buffer::end_of_buffer& err) {
-+    keys.clear();
-+    decode_plaintext(start_pos);
-+  } catch (exception& e){
-+    keys.clear();
-+    decode_plaintext(start_pos);
-   }
- }
- 
diff --git a/net/ceph14/files/patch-src_common_crc32c__ppc__asm.S b/net/ceph14/files/patch-src_common_crc32c__ppc__asm.S
deleted file mode 100644
index 75caba2c4c08..000000000000
--- a/net/ceph14/files/patch-src_common_crc32c__ppc__asm.S
+++ /dev/null
@@ -1,68 +0,0 @@
---- src/common/crc32c_ppc_asm.S.orig	2021-01-02 03:36:51.991947000 +0100
-+++ src/common/crc32c_ppc_asm.S	2021-01-02 03:37:48.304305000 +0100
-@@ -17,16 +17,25 @@
-  * http://en.wikipedia.org/wiki/Barrett_reduction
-  *
-  * Copyright (C) 2015 Anton Blanchard <anton@au.ibm.com>, IBM
-- * Copyright (C) 2017 International Business Machines Corp.
-- * All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version
-- * 2 of the License, or (at your option) any later version.
-+ * modify it under the terms of either:
-+ *
-+ *  a) the GNU General Public License as published by the Free Software
-+ *     Foundation; either version 2 of the License, or (at your option)
-+ *     any later version, or
-+ *  b) the Apache License, Version 2.0
-  */
-+
-+#if defined (__clang__)
-+#ifndef __ALTIVEC__
-+#define __ALTIVEC__
-+#endif
-+#include "ppc-asm.h"
-+#else
- #include <ppc-asm.h>
--#include "common/ppc-opcode.h"
-+#endif
-+#include "ppc-opcode.h"
- 
- #undef toc
- 
-@@ -45,8 +54,11 @@
- 	/* byte reverse permute constant */
- 	.octa 0x0F0E0D0C0B0A09080706050403020100
- 
--#define __ASSEMBLY__
--#include "crc32c_ppc_constants.h"
-+#ifdef CRC32_CONSTANTS_HEADER
-+#include CRC32_CONSTANTS_HEADER
-+#else
-+#include "crc32c_ppc_constants.h"
-+#endif
- 
- 	.text
- 
-@@ -80,8 +92,12 @@
- #define VPERM(A, B, C, D)
- #endif
- 
-+#ifndef CRC32_FUNCTION_ASM
-+#define CRC32_FUNCTION_ASM __crc32_vpmsum
-+#endif
-+
- /* unsigned int __crc32_vpmsum(unsigned int crc, void *p, unsigned long len) */
--FUNC_START(__crc32_vpmsum)
-+FUNC_START(CRC32_FUNCTION_ASM)
- 	std	r31,-8(r1)
- 	std	r30,-16(r1)
- 	std	r29,-24(r1)
-@@ -768,4 +784,4 @@
- 	mr	r3,r10
- 	b	.Lout
- 
--FUNC_END(__crc32_vpmsum)
-+FUNC_END(CRC32_FUNCTION_ASM)
diff --git a/net/ceph14/files/patch-src_common_crc32c__ppc__fast__zero__asm.S b/net/ceph14/files/patch-src_common_crc32c__ppc__fast__zero__asm.S
deleted file mode 100644
index ec9b7600984e..000000000000
--- a/net/ceph14/files/patch-src_common_crc32c__ppc__fast__zero__asm.S
+++ /dev/null
@@ -1,115 +0,0 @@
---- src/common/crc32c_ppc_fast_zero_asm.S.orig	2020-08-10 22:15:22.000000000 +0200
-+++ src/common/crc32c_ppc_fast_zero_asm.S	2021-01-03 01:06:00.563321000 +0100
-@@ -1,6 +1,6 @@
- /*
-  * Use the fixed point version of Barrett reduction to compute a mod n
-- * over GF(2) for given n using POWER8 instructions. We use k = 32.
-+ * over GF(2) for n = 0x104c11db7 using POWER8 instructions. We use k = 32.
-  *
-  * http://en.wikipedia.org/wiki/Barrett_reduction
-  *
-@@ -14,33 +14,39 @@
-  *     any later version, or
-  *  b) the Apache License, Version 2.0
-  */
--#include <ppc-asm.h>
--#include "common/ppc-opcode.h"
- 
--#undef toc
--
--#ifndef r1
--#define r1 1
-+#if defined (__clang__)
-+#ifndef __ALTIVEC__
-+#define __ALTIVEC__
- #endif
--
--#ifndef r2
--#define r2 2
-+#include "ppc-asm.h"
-+#else
-+#include <ppc-asm.h>
- #endif
-+#include "ppc-opcode.h"
- 
- 	.section	.data
- .balign 16
--
--.barrett_fz_constants:
-+.constants:
- 	/* Barrett constant m - (4^32)/n */
--	.octa 0x0000000000000000000000011f91caf6	/* x^64 div p(x) */
-+	.octa 0x00000000000000000000000104d101df
-+
- 	/* Barrett constant n */
--	.octa 0x0000000000000000000000011edc6f41
-+	.octa 0x00000000000000000000000104c11db7
- 
--.text
-+.bit_reflected_constants:
-+	/* 33 bit reflected Barrett constant m - (4^32)/n */
-+	.octa 0x000000000000000000000001f7011641
-+
-+	/* 33 bit reflected Barrett constant n */
-+	.octa 0x000000000000000000000001db710641
-+
-+	.text
-+
- /* unsigned int barrett_reduction(unsigned long val) */
- FUNC_START(barrett_reduction)
--	addis	r4,r2,.barrett_fz_constants@toc@ha
--	addi	r4,r4,.barrett_fz_constants@toc@l
-+	lis	r4,.constants@ha
-+	la	r4,.constants@l(r4)
- 
- 	li	r5,16
- 	vxor	v1,v1,v1	/* zero v1 */
-@@ -74,4 +80,47 @@
- 
- 	blr
- FUNC_END(barrett_reduction)
--	
-+
-+/* unsigned int barrett_reduction_reflected(unsigned long val) */
-+FUNC_START(barrett_reduction_reflected)
-+	lis	r4,.bit_reflected_constants@ha
-+	la	r4,.bit_reflected_constants@l(r4)
-+
-+	li	r5,16
-+	vxor	v1,v1,v1	/* zero v1 */
-+
-+	/* Get a into v0 */
-+	MTVRD(v0, r3)
-+	vsldoi	v0,v1,v0,8	/* shift into bottom 64 bits, this is a */
-+
-+	/* Load constants */
-+	lvx	v2,0,r4		/* m */
-+	lvx	v3,r5,r4	/* n */
-+
-+	vspltisw v5,-1		/* all ones */
-+	vsldoi	v6,v1,v5,4	/* bitmask with low 32 bits set */
-+
-+	/*
-+	 * Now for the Barrett reduction algorithm. Instead of bit reflecting
-+	 * our data (which is expensive to do), we bit reflect our constants
-+	 * and our algorithm, which means the intermediate data in our vector
-+	 * registers goes from 0-63 instead of 63-0. We can reflect the
-+	 * algorithm because we don't carry in mod 2 arithmetic.
-+	 */
-+	vand	v4,v0,v6	/* bottom 32 bits of a */
-+	VPMSUMD(v4,v4,v2)	/* ma */
-+	vand	v4,v4,v6	/* bottom 32bits of ma */
-+	VPMSUMD(v4,v4,v3)	/* qn */
-+	vxor	v0,v0,v4	/* a - qn, subtraction is xor in GF(2) */
-+
-+	/*
-+	 * Since we are bit reflected, the result (ie the low 32 bits) is in the
-+	 * high 32 bits. We just need to shift it left 4 bytes
-+	 * V0 [ 0 1 X 3 ]
-+	 * V0 [ 0 X 2 3 ]
-+	 */
-+	vsldoi	v0,v0,v1,4	/* shift result into top 64 bits of v0 */
-+	MFVRD(r3, v0)
-+
-+	blr
-+FUNC_END(barrett_reduction_reflected)
diff --git a/net/ceph14/files/patch-src_common_ppc-asm.h b/net/ceph14/files/patch-src_common_ppc-asm.h
deleted file mode 100644
index 753dc30f6919..000000000000
--- a/net/ceph14/files/patch-src_common_ppc-asm.h
+++ /dev/null
@@ -1,384 +0,0 @@
---- src/common/ppc-asm.h.orig	2021-01-02 03:38:36.578348000 +0100
-+++ src/common/ppc-asm.h	2021-01-02 03:38:12.285208000 +0100
-@@ -0,0 +1,381 @@
-+/* PowerPC asm definitions for GNU C.
-+
-+Copyright (C) 2002-2017 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify it under
-+the terms of the GNU General Public License as published by the Free
-+Software Foundation; either version 3, or (at your option) any later
-+version.
-+
-+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-+WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+Under Section 7 of GPL version 3, you are granted additional
-+permissions described in the GCC Runtime Library Exception, version
-+3.1, as published by the Free Software Foundation.
-+
-+You should have received a copy of the GNU General Public License and
-+a copy of the GCC Runtime Library Exception along with this program;
-+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+<http://www.gnu.org/licenses/>.  */
-+
-+/* Under winnt, 1) gas supports the following as names and 2) in particular
-+   defining "toc" breaks the FUNC_START macro as ".toc" becomes ".2" */
-+
-+#define r0	0
-+#define sp	1
-+#define toc	2
-+#define r3	3
-+#define r4	4
-+#define r5	5
-+#define r6	6
-+#define r7	7
-+#define r8	8
-+#define r9	9
-+#define r10	10
-+#define r11	11
-+#define r12	12
-+#define r13	13
-+#define r14	14
-+#define r15	15
-+#define r16	16
-+#define r17	17
-+#define r18	18
-+#define r19     19
-+#define r20	20
-+#define r21	21
-+#define r22	22
-+#define r23	23
-+#define r24	24
-+#define r25	25
-+#define r26	26
-+#define r27	27
-+#define r28	28
-+#define r29	29
-+#define r30	30
-+#define r31	31
-+
-+#define cr0	0
-+#define cr1	1
-+#define cr2	2
-+#define cr3	3
-+#define cr4	4
-+#define cr5	5
-+#define cr6	6
-+#define cr7	7
-+
-+#define f0	0
-+#define f1	1
-+#define f2	2
-+#define f3	3
-+#define f4	4
-+#define f5	5
-+#define f6	6
-+#define f7	7
-+#define f8	8
-+#define f9	9
-+#define f10	10
-+#define f11	11
-+#define f12	12
-+#define f13	13
-+#define f14	14
-+#define f15	15
-+#define f16	16
-+#define f17	17
-+#define f18	18
-+#define f19	19
-+#define f20	20
-+#define f21	21
-+#define f22	22
-+#define f23	23
-+#define f24	24
-+#define f25	25
-+#define f26	26
-+#define f27	27
-+#define f28	28
-+#define f29	29
-+#define f30	30
-+#define f31	31
-+
-+#ifdef __VSX__
-+#define f32	32
-+#define f33	33
-+#define f34	34
-+#define f35	35
-+#define f36	36
-+#define f37	37
-+#define f38	38
-+#define f39	39
-+#define f40	40
-+#define f41	41
-+#define f42	42
-+#define f43	43
-+#define f44	44
-+#define f45	45
-+#define f46	46
-+#define f47	47
-+#define f48	48
-+#define f49	49
-+#define f50	30
-+#define f51	51
-+#define f52	52
-+#define f53	53
-+#define f54	54
-+#define f55	55
-+#define f56	56
-+#define f57	57
-+#define f58	58
-+#define f59	59
-+#define f60	60
-+#define f61	61
-+#define f62	62
-+#define f63	63
-+#endif
-+
-+#ifdef __ALTIVEC__
-+#define v0	0
-+#define v1	1
-+#define v2	2
-+#define v3	3
-+#define v4	4
-+#define v5	5
-+#define v6	6
-+#define v7	7
-+#define v8	8
-+#define v9	9
-+#define v10	10
-+#define v11	11
-+#define v12	12
-+#define v13	13
-+#define v14	14
-+#define v15	15
-+#define v16	16
-+#define v17	17
-+#define v18	18
-+#define v19	19
-+#define v20	20
-+#define v21	21
-+#define v22	22
-+#define v23	23
-+#define v24	24
-+#define v25	25
-+#define v26	26
-+#define v27	27
-+#define v28	28
-+#define v29	29
-+#define v30	30
-+#define v31	31
-+#endif
-+
-+#ifdef __VSX__
-+#define vs0	0
-+#define vs1	1
-+#define vs2	2
-+#define vs3	3
-+#define vs4	4
-+#define vs5	5
-+#define vs6	6
-+#define vs7	7
-+#define vs8	8
-+#define vs9	9
-+#define vs10	10
-+#define vs11	11
-+#define vs12	12
-+#define vs13	13
-+#define vs14	14
-+#define vs15	15
-+#define vs16	16
-+#define vs17	17
-+#define vs18	18
-+#define vs19	19
-+#define vs20	20
-+#define vs21	21
-+#define vs22	22
-+#define vs23	23
-+#define vs24	24
-+#define vs25	25
-+#define vs26	26
-+#define vs27	27
-+#define vs28	28
-+#define vs29	29
-+#define vs30	30
-+#define vs31	31
-+#define vs32	32
-+#define vs33	33
-+#define vs34	34
-+#define vs35	35
-+#define vs36	36
-+#define vs37	37
-+#define vs38	38
-+#define vs39	39
-+#define vs40	40
-+#define vs41	41
-+#define vs42	42
-+#define vs43	43
-+#define vs44	44
-+#define vs45	45
-+#define vs46	46
-+#define vs47	47
-+#define vs48	48
-+#define vs49	49
-+#define vs50	30
-+#define vs51	51
-+#define vs52	52
-+#define vs53	53
-+#define vs54	54
-+#define vs55	55
-+#define vs56	56
-+#define vs57	57
-+#define vs58	58
-+#define vs59	59
-+#define vs60	60
-+#define vs61	61
-+#define vs62	62
-+#define vs63	63
-+#endif
-+
-+/*
-+ * Macros to glue together two tokens.
-+ */
-+
-+#ifdef __STDC__
-+#define XGLUE(a,b) a##b
-+#else
-+#define XGLUE(a,b) a/**/b
-+#endif
-+
-+#define GLUE(a,b) XGLUE(a,b)
-+
-+/*
-+ * Macros to begin and end a function written in assembler.  If -mcall-aixdesc
-+ * or -mcall-nt, create a function descriptor with the given name, and create
-+ * the real function with one or two leading periods respectively.
-+ */
-+
-+#if defined(__powerpc64__) && _CALL_ELF == 2
-+
-+/* Defining "toc" above breaks @toc in assembler code.  */
-+#undef toc
-+
-+#define FUNC_NAME(name) GLUE(__USER_LABEL_PREFIX__,name)
-+#define JUMP_TARGET(name) FUNC_NAME(name)
-+#define FUNC_START(name) \
-+	.type FUNC_NAME(name),@function; \
-+	.globl FUNC_NAME(name); \
*** 2292 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311021538.3A2FcQbr026498>