gentoo auto-resync : 05:01:2024 - 08:03:20

3 files changed, 218 insertions, 9 deletions

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index c207e9c0c25a..f65ae8528ca2 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -7,8 +7,11 @@ AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bc
 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7
 AUX glusterfsd-10.2.initd 3042 BLAKE2B 27b79e854164bc2e75a69936abad90f774c1372089bd3d6fc44feef6a6566be39ec6dfe76f26c479a8466b3f76995616aea59c38b092343484dabe20572df45e SHA512 101db0f73dee54703cfb7d196eb6e22f11e15a48f6a18507391caf6b129041f74740757d2cb22492229d5be962126b587c3fb69d688820120f3c0f3be9c58f44
 DIST glusterfs-10.4.tar.gz 8293872 BLAKE2B 01f8764cc71b7bac2ee0419f3f1069ac1c85e26314828b47f348b9bf88ad0b8aa327be16ccfe9cf820aebb7dd9477a7840c721df4435c895be91fed0b1129b7c SHA512 06c563ab77a29145b1fac44f5a56a91539accb69ba736fe6297aa3f38b128e68ba4f7d0b49ac6eb56397a51950fb4de882ff60037e91c61ad13dd89a18139d82
+DIST glusterfs-10.5.tar.gz 8170057 BLAKE2B f614abe8a7333266d75a26fc1756408211b9d83225f4180002d0c04cd9328c75c78644faae0c73140325ac49759a2237855be17469cb544942c5f3de19fdf66a SHA512 393b976308da911562e653e1ed6db2149a7d7390fbd31155bbd4b1bb067c6c155f2c7ca74dc8409474294a8542b6cb4d83cd52f6b68bab6a430a8c080be1be29
 DIST glusterfs-11.0.tar.gz 8355706 BLAKE2B d0ee895b8ce5f506d9bc1f8b962a0f29b0379f086bf18cff0092938b7c2f7025afa2fccf54f58ac751a184a3b0e91a086df2d6496892f204373e070d7576a5d6 SHA512 075f0025a1892ebb28d45d0a4e8971656319582dd7bc2c8b19ea26cd08a789bb54f8bc9752839706cd0ee0ca54be74245230bc453a5d1e9e163af84f08937e69
+DIST glusterfs-11.1.tar.gz 8365581 BLAKE2B 56697bc484be53659f6f277041c6f4fc5f2ef3221709d90dbd621e66138fe2b3be2e31bde4c65d596fed3beacb2ee6a86506e97854cda00066ac804ee57923e9 SHA512 a021a612b01c2c43858b092db926e6d229f0f736c19b8a1015c0d3121fbc7739ab5273384d5e96fde6dbf4eaf620bc32a0530597e80483865d8ca79b820ed3b0
 EBUILD glusterfs-10.4.ebuild 5799 BLAKE2B 57288a885b112b004d9f1e5e97d4a727e11936f0946037790cfb03a91dfed03db7583ccee9eb1baa65429a79fbde27530fb1dad6f8d87dde6e62b1f08eaa6402 SHA512 3ac7c9d8f212c995e19d84afd86f946d2dccf76781e4a61a81e3271efa62e87fd42f23d18f9db04875cd1c8792e1c8418671020388974d10383b6ab82a73da0c
-EBUILD glusterfs-11.0-r1.ebuild 6055 BLAKE2B 24db51a91b799d41b276d701c29e47101947b867c20e8f9e288590ac524d1ff6918735620020e633990cc20c31ec2ddbf09b6ffd80fd1960ed424ec094126c34 SHA512 ed4ef3863a6da103726050a913bb1460cf2e2ef572cd84f7853f253f455316fbc2480fbde76db85336975f69dd16670c1a6af3abce9a6ad24e4c47ab15f730e1
+EBUILD glusterfs-10.5.ebuild 5818 BLAKE2B 4c4e4d8309d321f7928a40bf0946345331c1beec048ea4a20fc4d9df064e82b0846047d36905a0e597cbaabe5b976061719cb1fd8ab86bec5853e750142574cf SHA512 f659a74450aa33563225cd74cdf7f2136db5ce42708b3eb96cb0ae664d9a664a1cee59ffae4dca2c799010714e7c0399d5c7194253ab20cf78c5bac43fb0b721
 EBUILD glusterfs-11.0-r2.ebuild 6167 BLAKE2B 2361cb32409ed2405e11752f4919434b26397fb472f0501ef9dfd4358fdddb02590f76c6e757ac54af35f2fa1277faa46fc408b0184287d50eef9f488082dc20 SHA512 7afa248851ee976954831ae16565bf43b3418555c511d7805a1ed2297994fea0a89c5c975f5b1a2af072dca37a7dd21767c770f6b84ccf86b1d816ef130228fc
+EBUILD glusterfs-11.1.ebuild 6128 BLAKE2B dadaa541645480e3f9d2d555bf3aa40958672b8681401227f6b626dcdfd7bfdfc220aa4f4df9224d61d51e25ad569323c743dfb701daaf87641633ce9065f67d SHA512 745d61b53413990a1b0c258fb7622db2c1e441351e477b21337e1d1343e316d30923159f934f4bce8012094d5a1995f6765d3ec465f152e97399812a017a610d
 MISC metadata.xml 1575 BLAKE2B 8d83c4db883ecd85230029532fdd5cea2e51391c2659a5280d4eeb453390b8413c58aca550f365049de36914da4d0d977356ba30c29afe0ca8e58ff41d34d321 SHA512 07bd2f41605ab4f1bde167d8b3d620492c5d85ef77ea49ae53970ab579afcd70e1aae9a40e8856d88034045c7201fcccdb079efc0af0ac76f32fde3417d7ad76
diff --git a/sys-cluster/glusterfs/glusterfs-10.5.ebuild b/sys-cluster/glusterfs/glusterfs-10.5.ebuild
new file mode 100644
index 000000000000..77d9b51ada6a
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-10.5.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..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 selinux 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:=
+	${PYTHON_DEPS}
+
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	selinux? ( sec-policy/selinux-glusterfs )
+	tcmalloc? ( dev-util/google-perftools )
+	uring? ( sys-libs/liburing:= )
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/acl
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+QA_PKGCONFIG_VERSION=""
+
+# 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 \
+		YACC=yacc.bison \
+		LEX=flex \
+		--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_fix_shebang "${ED}"
+	python_optimize
+}
+
+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/glusterfs-11.0-r1.ebuild b/sys-cluster/glusterfs/glusterfs-11.1.ebuild
index 246487ae307d..46a7085feaa1 100644
--- a/sys-cluster/glusterfs/glusterfs-11.0-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 IUSE="debug emacs +fuse georeplication ipv6 +libtirpc rsyslog selinux static-libs tcmalloc test +uring xml"
 
@@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-11.0-fix-crash.patch"
+	"${FILESDIR}/${PN}-11.0-extras-defer-invoking-of-gluster-volume-set-help-as-.patch"
 )
 
 # sys-apps/util-linux is required for libuuid
@@ -70,8 +70,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-SITEFILE="50${PN}-mode-gentoo.el"
-
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
 
 # Maintainer notes:
@@ -130,8 +128,8 @@ src_install() {
 	default
 
 	# Path changes based on whether app-shells/bash-completion is installed, bug #911523
-	rm -rf "${ED}"/etc/bash_completion.d || die
-	newbashcomp extras/command-completion/gluster.bash ${PN}
+	rm -rf "${ED}"/etc/bash_completion.d "${D}$(get_bashcompdir)" || die
+	newbashcomp extras/command-completion/gluster.bash gluster
 
 	rm \
 		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
@@ -148,7 +146,7 @@ src_install() {
 
 	if use emacs ; then
 		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-site-file-install "${FILESDIR}/50glusterfs-mode-gentoo.el"
 	fi
 
 	insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
@@ -180,7 +178,8 @@ src_install() {
 		find "${D}" -type f -name '*.la' -delete || die
 	fi
 
-	python_optimize "${ED}"
+	python_fix_shebang "${ED}"
+	python_optimize
 }
 
 pkg_postinst() {