gentoo auto-resync : 11:08:2022 - 02:19:03

4 files changed, 3 insertions, 144 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 43f05eebd53c..5de4d8a5865c 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -39,19 +39,17 @@ AUX ceph-osd_at.service.conf 115 BLAKE2B d234b9bd718585baf43f229f583e211607aab02
 AUX ceph-tmpfilesd 29 BLAKE2B 02c5d6c59f6e93d03df3bb304529760824f64895f5bc0eff4a0a311013479e29cd3aa0fe554bbc65941838116d465b7df1ab351e2d80d7a4d1d109e26a7f0f2c SHA512 2d84199c6e57db1c0dd1074d94b899bf04c71ab0b10e91a34a0aa7c6a8136d34310ebe0967dcdde801f5b022502db00a891ce71af10c3ccef4ed396e8d316e15
 AUX ceph.confd-r5 619 BLAKE2B 6d495b970c7ff14972845e46aafc55d227c45817f5f8a9a1cad2e242398cc49f2c53896affe1373433db4175c426f1148242588207c7dee60f28a8c3ee543e5f SHA512 288560fee187c496402d46e3fa17fe99c4d3f2c0bbb389a5a91384a1015939f2389a81398045f0d1c978c4da5a1400e97126b98374185424bc5501d0b821ad5c
 AUX ceph.initd-r12 3088 BLAKE2B 371ee28604bef04766b3b13687feb56e076cf4ef23797bdf469db8b85454624ab005304c798c0945bcd4c5c0478ad7d724ccd33074afef39ab939464969e32b1 SHA512 4eeb1d589cd010b39405d1664f077a79d6a8bb8d9693b32390546e14a240f98ba6e4d6281940f482f57e8364339c68b1b02219c0f837f65a738686b00ac9498c
-AUX ceph.logrotate 427 BLAKE2B 9677f1a2a4872addff71527c800dd06bf65e18b589de3869e2a742c43070de789d5089f8739367efb913a64aeec5a8b82f47c129fac580e7c34e4f8cdc8b7332 SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae
 AUX ceph.logrotate-r2 545 BLAKE2B ef7dab92aa5fbbe7f5d5418feaae1a1f4400dce08ca4484fe5889888f4dcb6d180bfb5888d5c7d6d9bc32bb5c58443fb83c1cb4613a2810cab45e8a74c421279 SHA512 c30edd67b7cc064f09d4e02bac68a0aa26827d8d4e3c027393932587e8ce782893b93b53d7165d361602b29c90ef3d6b755e79d11a1edb054e0172decd4e627b
 AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c594c03d09bf13dfa645e5a0bde1189211ad20036dc4fcfce6758d3a5829d943eb337cc65783af9 SHA512 d180b1a888ec6d870ff523a3b10fd00eca479ee2586a236458af5ffaba21c84e7b8098da6d4bc08fb86c82c61a861dd3c3596a01063d734c329a92808682fc8c
 AUX make-node-frontend-tarball.bash 3196 BLAKE2B 1779c8fe924d8a341bcf922da310c9e3543dd9875db79b2f08fd99419fc2a693e24a5d0c36e7db7b9c46f02bb78b51359e844c8265ff266e8a931a32b877b665 SHA512 4c13ebc9f2a7ba3d45a01cd72135a57b2dc6ad3edfe06a05645957c5522a053be940782f1148c117d8bf785937655083d3d1c74668e8c72d75ae000888a65d85
-AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd058ea64d3ae7fe27d13455f2ac5ca06663d77cfac1d2f9d86d12bba926541042ac09a8778a3a52 SHA512 bbd48d6987e52eaf6d02bccf3aecd06596465af4d3ac93063f9a814106de162a27bf1a33ae1646e669efb3c754f3ba57f395523293ad643b0d81ee588252216b
 AUX rbdmap.initd-r1 2372 BLAKE2B dee62cc3e92425bccfce86009be0fbecc84d55923a7dde302727d42f5f7703642121c690bdf079878c31b71d4c6c200ae6a7f595ede2dfe0bc46d8f6f9f5dd01 SHA512 d249d2299ef8dc4bbd12237cfe6ef626704872130b1092ab96d05894f04df09418364552433b264b80e49ee7e1587ebee71c1131fbbcd7d858cfadf1fe6357d5
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
-DIST ceph-15.2.16.tar.gz 148628915 BLAKE2B 4f624078027c706428eae3eddd5b5479efe3b4442c19a4e6b6cdf8d3839cf56e2863b18249dc3c5079a7e25f60796bfec3202ffd695537587654f5e2f820caaa SHA512 532b8a5073e157fe9ed552b26976faeb64dc29b79a249910c0982134ad5f945d4f57d8bf451adf63487b6d285c6e4bd5c39f0e3fcd449230d6fb3087539f8c3b
+DIST ceph-15.2.17.tar.gz 148640102 BLAKE2B a10dd702ffca005a8741bff645eaf2f671300be969edf9e9e321e29abdc34a403de7c56684fd1509d30c2bd32b996fff3aaa88d1d08c3d258d6f5ef43ecefddf SHA512 952cd4db057fcab5efa3c6331fbc19cf1e904f5855266c2ed13e41ffb2e5a7d18ed133bd113fea493149005a182f429eef39931c4ceac7776aefe84a208a745a
 DIST ceph-16.2.10.tar.gz 157176743 BLAKE2B 065b6f1941f87fde150ab22ba45aa9f58069acf7f33a483456faf0a26e41936846944e800ccd7f99bd8863db8438ae70804621522f75065c0b2506522c4fdd7d SHA512 ae164c24462c3e08763d202acc3e2fe86ffc09f312b5059bae07863e804fc47bd158fc130aa2923246ffcfe26ae6d6d9317326aec96373226e6f9030d7123c8b
 DIST ceph-16.2.9.tar.gz 157168096 BLAKE2B 0a667a9699925cfc920ca0cc535e5331cbcd95997fb0b9816a4d84c8add454b6b17813018bc1d1de07c802167ef50aa528704b10b01f42759189392ccdb5088f SHA512 bf369038ad6383f88abbed267f0239e9d8a1d33b46b34ed260aeeb1fda1b374cb6e658238e1ace013fbbb68e73b8cd2922b7def318d7a110e5f4560eeae8fca3
 DIST ceph-17.2.3.tar.gz 168821857 BLAKE2B 21ec5ac33591ae8b22eae3d88680ae87340e639cc21cb9c79bc4fb2f7b6cc7e93aa6b5af0242a6c094a4af9808a2b6f86b6bd7e3c8f247a513c91defa6d4e4a9 SHA512 fd6e057ba8440f69423e870dddb2705d68015089ff8d97356bdc359c2ab41e19351fb1c914330de6ba05180f48e328e3ea4c877e9dd80be049e2ec5895068595
 DIST ceph-xsimd-17.2.3.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
-EBUILD ceph-15.2.16.ebuild 10897 BLAKE2B d573f515f848378408cc05609469031751df2fdab8e0414bbc0f687eb0330a5136ccf9c85cb320433c1ee83edfd3b1d0cfd7f7ec46d9e775d183ff6668582de2 SHA512 aea7c7ff3762f1a25a8cdbd80cad9195c3af8a8041fe7e04936ce47bc304fbebb0fcba88fa0afe71c2cee3b248579853e89c13b7dfdc8d133c9e2077f3a51bde
+EBUILD ceph-15.2.17.ebuild 10919 BLAKE2B 693955b7dbcad95d54420e11c0ccd666a0ed85c6bdebf127bf58ca2c7618bd53fac9f9171fe33fd1e2e4b8aaf487e39761dceedd10e6af4e2616fc3d1284c6a6 SHA512 6f234d91f6672e8af1b8a7c133d8be70602f9dd3cce78954b4436e0d9d0908c44782d5e3817f474530ec2249901d2720956180a6d4c3573e3a8262090ee6686e
 EBUILD ceph-16.2.10.ebuild 12604 BLAKE2B b20b12cbf32cd6051db33cecaee51a8a38913abbc959b689b460bab87e1286ca20e17f405a714c5904ac1cdc08bf4b4c1f23e7ac8c50ebb083b3071cd151dfe8 SHA512 be1054b759be99ff02608f3e5022340d53c5ffeec0a04df6dc7b13262b6be0e65bbc5d3ebf3aa5f10cfbbfbeee975e1f8194eafd496cec5fdc59ca44c5b26390
 EBUILD ceph-16.2.9-r1.ebuild 12603 BLAKE2B bed9f1ffc126209a8ffdb7186eeabfed222e19c6db4ffc2189e4c65338accfb3c86d3134b0adc9350ef186ee0897092b5ffffa4140b785f6dee6de17ab07a91e SHA512 b5efc7e701b0784c4f4299ffabc01ff7a3ddc73ca16f36d1fd16e7e2562d78f89e11b960f9eacec697d9e788841d73e73d17554a7a916ab09cbe1a7cfc20557f
 EBUILD ceph-17.2.3.ebuild 12449 BLAKE2B 73eac41797937b4a255ea299a17b5adcc6d1afdcdfa9a283ad9cc7bf87b65fe503f4dd17595774979d0ff1652bb739493fbc6ebdad8caa07714e4f6665f53632 SHA512 792d0c808cff8b4c1b329a190a44a830b48504387772df0c994380304d1d39fafe479d5181a5168972672ce930725f48b52a5f51803a0b6b495d5b7800184d2f
diff --git a/sys-cluster/ceph/ceph-15.2.16.ebuild b/sys-cluster/ceph/ceph-15.2.17.ebuild
index 0b443b7f37b3..d3e65042d29a 100644
--- a/sys-cluster/ceph/ceph-15.2.16.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.17.ebuild
@@ -49,6 +49,7 @@ DEPEND="
 	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
 	dev-libs/libaio:=
 	dev-libs/libfmt:=
+	<dev-libs/libfmt-9:=
 	dev-libs/libnl:3=
 	dev-libs/libxml2:=
 	<dev-libs/rocksdb-6.15:=
diff --git a/sys-cluster/ceph/files/ceph.logrotate b/sys-cluster/ceph/files/ceph.logrotate
deleted file mode 100644
index df03f5e69a4b..000000000000
--- a/sys-cluster/ceph/files/ceph.logrotate
+++ /dev/null
@@ -1,18 +0,0 @@
-/var/log/ceph/*.log
-{
-    rotate 7
-    daily
-    compress
-    sharedscripts
-    prerotate
-	for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
-		ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >/dev/null
-	done
-    endscript
-    postrotate
-	for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
-		ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >/dev/null
-        done
-    endscript
-    missingok
-}
diff --git a/sys-cluster/ceph/files/rbdmap.initd b/sys-cluster/ceph/files/rbdmap.initd
deleted file mode 100644
index 9313cf658863..000000000000
--- a/sys-cluster/ceph/files/rbdmap.initd
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/sbin/openrc-run
-
-DESC="RBD Mapping:"
-RBDMAPFILE="/etc/ceph/rbdmap"
-
-extra_started_commands="reload"
-
-depend() {
-	need localmount net
-	before netmount
-}
-
-start() {
-
-	if [ ! -f "${RBDMAPFILE}" ]; then
-		ewarn "$DESC : No ${RBDMAPFILE} found."
-		exit 0
-	fi
-
-	RET=0
-	# Read /etc/ceph/rbdmap to create non-existant mapping
-	while read DEV PARAMS; do
-		case "$DEV" in
-		  ""|\#*)
-		  	continue
-			;;
-		  */*)
-		  	;;
-		  *)
-		  	DEV=rbd/$DEV
-			;;
-		esac
-		ebegin "${DESC} '${DEV}'"
-		newrbd=""
-		MAP_RV=""
-		RET_OP=0
-		OIFS=$IFS
-		IFS=','
-		for PARAM in ${PARAMS[@]}; do
-			CMDPARAMS="${CMDPARAMS} --$(echo ${PARAM} | tr '=' ' ')"
-		done
-		IFS=$OIFS
-		if [ ! -b /dev/rbd/${DEV} ]; then
-			MAP_RV=$(rbd map ${DEV} ${CMDPARAMS} 2>&1)
-			if [ $? -eq 0 ]; then
-				newrbd="yes"
-			else
-				RET=$((${RET}+$?))
-				RET_OP=1
-			fi
-		fi
-		eend ${RET_OP} "${MAP_RV}"
-
-		if [ "$newrbd" ]; then
-			## Mount new rbd
-			MNT_RV=""
-			mount --fake /dev/rbd/${DEV} >>/dev/null 2>&1 \
-			&& MNT_RV=$(mount -vn /dev/rbd/${DEV} 2>&1)
-			[ -n "${MNT_RV}" ] && einfo "mount: ${MNT_RV}"
-
-			## post-mapping
-			if [ -x "/etc/ceph/rbd.d/${DEV}" ]; then
-				einfo "RBD Running post-map hook '/etc/ceph/rbd.d/${DEV}'"
-				/etc/ceph/rbd.d/${DEV} map "/dev/rbd/${DEV}"
-			fi
-		fi
-	done < ${RBDMAPFILE}
-	eend ${RET}
-}
-
-stop() {
-
-	RET=0
-	## Unmount and unmap all rbd devices
-	if ls /dev/rbd[0-9]* >/dev/null 2>&1; then
-		for DEV in /dev/rbd[0-9]*; do
-			## pre-unmapping
-			for L in $(find /dev/rbd -type l); do
-				LL="${L##/dev/rbd/}"
-				if [ "$(readlink -f $L)" = "${DEV}" ] \
-				&& [ -x "/etc/ceph/rbd.d/${LL}" ]; then
-					einfo "RBD pre-unmap:  '${DEV}' hook '/etc/ceph/rbd.d/${LL}'"
-					/etc/ceph/rbd.d/${LL} unmap "$L"
-					break
-				fi
-			done
-
-			ebegin "Unmapping RBD device: '${DEV}'"
-			UMNT_RV=""
-			UMAP_RV=""
-			RET_OP=0
-			MNT=$(findmnt --mtab --source ${DEV} --noheadings | awk '{print $1'})
-			if [ -n "${MNT}" ]; then
-				einfo "un-mounting '${MNT}'"
-				UMNT_RV=$(umount "${MNT}" 2>&1)
-			fi
-			if mountpoint -q "${MNT}"; then
-				## Un-mounting failed.
-				RET_OP=1
-				RET=$((${RET}+1))
-			else
-				## Un-mapping.
-				UMAP_RV=$(rbd unmap $DEV 2>&1)
-				if [ $? -ne 0 ]; then
-					RET=$((${RET}+$?))
-					RET_OP=1
-				fi
-			fi
-			eend ${RET_OP} "${UMAP_RV}"
-			[ -n "${UMNT_RV}" ] && einfo "${UMNT_RV}"
-		done
-	fi
-	eend ${RET}
-}
-
-reload() {
-	start
-}
-
-status() {
-	rbd showmapped
-}