gentoo auto-resync : 19:08:2022 - 02:35:40

5 files changed, 239 insertions, 1 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 63505867b24e..89f73b0667eb 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index d74b035dbd87..3d5227bee2af 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,5 +1,6 @@
 AUX 50glusterfs-mode-gentoo.el 169 BLAKE2B 461afb9f17ef9dee79348279e861039193400d61a926e9d8499351b7e42377cc1bffce6dc2c2d7f3b50b1de016a336bad69c7a79bb800b973288eef542baed85 SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804
 AUX glusterd-10.2-r1.initd 750 BLAKE2B 3ba1362c1626c792a7f27d4e96442d7b0898d391ccfb357be9e1f9ec72e3a13189837b69423cb676cd5eaf8978b4130e989c38ea7b5f61abd30c62083ffbd830 SHA512 aa39a3b9af2189fb1e0a5dd9ce18c45a986c45652eda02652902e4f55411bd54c78c013f3b98265dbbc39d7bb7b1506f587f1ecdff13f6c2d670e85ed1189168
+AUX glusterd-10.2-r2.initd 751 BLAKE2B 9d723089b270e856d1451a6403cdf1ee0d4730b07d1dd8970cb2969f6cd4cee61827cbbbefa45ed4393c30f9c9a62f3ea0f904d23c3f31634b3ae2cc405c70a7 SHA512 cbe20b9c66c038dc9e24ff85ee2724f95fccb357e8d8e1f4cd2371e8599421b1275a9bb67a65330979791fc436c0eaa3ed0afae99dc43546dd49557e188e3796
 AUX glusterd-r4.initd 747 BLAKE2B f0c1c6947e6c42d3fa1e52b7ee4d856aad9fb9218ae07df35d90039038437ca05bd5c382de609de9a8e35aea24592499dbd0f44d6f3c827e2667229242c3dc21 SHA512 9341b4f998bf5f0da24b84e5e83b2534b5693d018961800ac5ae19ab7246fe60b90b3a66f4c5576d7e1beebd3624e3e2d2c426d44f2ea4f766e1014b69441f60
 AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d665f0bbffb59bbd2f81b314df62b8aab4eab5c4d23b9e88f43168160cb0faedece3307ddf2347f5282311 SHA512 28c5f401b2ff017d8faf7b290fa265cc5f1a9d60edf11dbae5801e943e7e0833fa8267880efa80c4fc07048d75afd446808c583d2b62a6c5a6bde25d317bde97
 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4
@@ -13,7 +14,8 @@ DIST glusterfs-9.4.tar.gz 8173625 BLAKE2B c35c63696717bf09f8fbf77dca16a6f45de278
 DIST glusterfs-9.5.tar.gz 8174643 BLAKE2B d7527b7749b753768bde086e88e146564b461f835bb9108ce24da9626d7d87e7e4da1b2a340c6497da2d8bafe0cd43e87c01d4ba6639635ff96d8788997a8042 SHA512 3483068ba6d72a9c63cc6fcb2dbcb38dd5001564d755cc3a30dbf6402eeab9a7c80759a535be1c5c06eae88b61156a336444c89b12bbecdabf56a87f00328a44
 EBUILD glusterfs-10.1-r1.ebuild 5655 BLAKE2B b3eb6f557f2f9526e560b705896f294e11563ea0fb22343211d06dba2dbdc3c3667ac0b58d9f31e43085e1598c4f01368c7e25b8499787c69f017fe79131beb1 SHA512 2e204391b63c61a380ab6628d0a737070709763d5503aaf5ad3f114170179663551738e3b416776cd6b413ce16ea49057e4eaa55d9345432d5ea650dfc97b112
 EBUILD glusterfs-10.2-r1.ebuild 5670 BLAKE2B 4bf384338b9061470d12e3a0f6359bde25547f6a4a7226a99fdd33a3f5c2f985801b678aaeca1e4099d70d403bf59ea89fd76a21161b1f6a84d28c53f0cc48c7 SHA512 beea1d6a570ca7c3ab1d398dddb1849fdd537bc33e4c43272029b489e08383031271fd57ce2b7f5b4589a3874f2e8f70c5bfed2de29d4e8fb3b2a27c4c0d79ed
+EBUILD glusterfs-10.2-r2.ebuild 5755 BLAKE2B 4135fdce33a03913987d279c6c393ffe07fe501d3f2fa3ef48035d337a19c91e22b21c622bfb6b8d3d9e698abc9d01a93aa6410dcb4fdd63b047b2815a259258 SHA512 9750f5be0a8caffdb7aa24a135b459d169cc56946aeff0c38b05b5ba6e8b3271aea97d38b09b6f9e92be49ccc1ab5921a407f12d1d23632fc6c61cb077231eb9
 EBUILD glusterfs-8.6-r1.ebuild 5549 BLAKE2B b23f1ed817da27181bbe1d046446e1d608c177c0ad2f6a5f0b919d6b43f797aaa8ea53ec6327f60b60742ac8ff7e2027ef6d610136c107bf0a9282fb096933ab SHA512 0afb60317c4690aa7ae157619ec11c29b78d8d5e3b98f90e3feb519635b60b679dc391f37e128efb0f658b33aa17a16d4b3a2afd232119b176ef52e4d5051455
 EBUILD glusterfs-9.4-r1.ebuild 5571 BLAKE2B a2f69784255800f464e14f014a1316a128de51f03439a8ca68924d9c8320cb29a9f24fb97cb9727a858a235d2d9cecfed849692fde5813932b6506146b607698 SHA512 06bb48816431216637dcffb2bcf1c4ad783043b0b96b0060253c89f173ac1bba92beb4615c27c8f014ab30c74ad7399b24c9132591f2134891df30c41356674f
 EBUILD glusterfs-9.5-r1.ebuild 5574 BLAKE2B 0ad30d35d4bf908983e7070e0ae73c3499705a4465ebd4c416aab4416031eca82fe15dcca8b5aad6350dcf42d276f326987109b970d044708b8b352b1b1c2e35 SHA512 9cf9dd83174eb28b6ef1f56deebf5305c48bae8f86267dba73b9bbeb091273ec85abc2d83f4dd3623eedc5676c2f2f1de46cca1fa289227a0d16589fbd98d799
-MISC metadata.xml 1393 BLAKE2B 6f76de3d00fd1625633c2ffe6e54ec8829dc68b21096418a0e9d61cff4d7ff29fa053a3821e3df036a70b797b95dd26474b135c40b1a5074ac3b2059971118ec SHA512 091ce1e57cd22608228bcf059686c67fe37001659d0d9f29bb2fbb1740b8eb00233f8882408ee2f75d30c325d6be4f1a19cecae171c8e88870b8008ab6eaec5a
+MISC metadata.xml 1493 BLAKE2B f604a35253606968126f1619cbc004f7e78b47b5f57f747cbdf67da6a0e126305c5b6773d2ad8ee2d4d323f87fb51d7f39ae01fc78b1ffd9133ba88e4db81df2 SHA512 d57d6e5e0086bd0fdcd3409fa303208427f2acaed7ba4c9b5904618f04df3fd89269334b0c751983f6c4389d0b46b2a72cd10ac0047a96b2289c09f19c0f9eae
diff --git a/sys-cluster/glusterfs/files/glusterd-10.2-r2.initd b/sys-cluster/glusterfs/files/glusterd-10.2-r2.initd
new file mode 100644
index 000000000000..e7e53f3ed9c4
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd-10.2-r2.initd
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Gluster elastic volume management daemon"
+command="/usr/sbin/glusterd"
+pidfile="/run/${SVCNAME}.pid"
+command_args="-N"
+
+command_background="yes"
+
+depend() {
+	need net
+	before netmount
+}
+
+start_pre() {
+	# Ensure that the GlusterFS auxiliary mount parent directory exists
+	checkpath --directory --owner gluster:gluster --mode 0775 /run/gluster
+}
+
+start_post() {
+	local c=0
+	ebegin "Waiting for glusterd to start up"
+	while ! /usr/sbin/gluster volume list >/dev/null 2>&1 && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
+		c=$(( c+1 ))
+	done
+	[ "${c}" -lt "${glusterd_max_wait_start-60}" ]
+	eend $?
+
+	return 0
+}
diff --git a/sys-cluster/glusterfs/glusterfs-10.2-r2.ebuild b/sys-cluster/glusterfs/glusterfs-10.2-r2.ebuild
new file mode 100644
index 000000000000..ef78462da8cb
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-10.2-r2.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit autotools elisp-common python-single-r1 tmpfiles systemd
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="debug emacs +fuse georeplication ipv6 +libtirpc rsyslog static-libs tcmalloc test +uring xml"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	georeplication? ( xml )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="
+	acct-group/gluster
+	acct-user/gluster
+	dev-libs/libaio
+	dev-libs/openssl:=[-bindist(-)]
+	net-libs/rpcsvc-proto
+	dev-libs/userspace-rcu:=
+	sys-apps/util-linux
+	sys-libs/readline:=
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	tcmalloc? ( dev-util/google-perftools )
+	uring? ( sys-libs/liburing:= )
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/acl
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+QA_PKGCONFIG_VERSION=7.10.2
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python3*"
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am -exec \
+		sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-fusermount \
+		--disable-lto \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable static-libs static) \
+		$(use_enable test cmocka) \
+		$(use_enable uring linux-io-uring) \
+		$(use_enable xml xml-output) \
+		$(usex ipv6 --with-ipv6-default "") \
+		$(usex libtirpc "" --without-libtirpc) \
+		$(usex tcmalloc "" --without-tcmalloc) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+	insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	newinitd "${FILESDIR}/glusterfsd-10.2.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-10.2-r2.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	systemd_dounit extras/systemd/{glusterd,glustereventsd,glusterfssharedstorage,gluster-ta-volume}.service
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	python_optimize "${ED}"
+}
+
+pkg_postinst() {
+	tmpfiles_process gluster.conf
+
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml
index 73cd1d833a48..ec48e5f0ac96 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -26,5 +26,6 @@
 		<flag name="ipv6">Use IPv6 by default, requires libtirpc</flag>
 		<flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
 		<flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
+		<flag name="uring">Control whether or not glusterfs is compiled with uring support or not.</flag>
 	</use>
 </pkgmetadata>