[gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/files/, sys-cluster/glusterfs/

["Michał Górny" <mgorny@gentoo.org>]

commit:     54f9f4e0810c8984f625eb20450856afe1533947
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Mon Mar 25 05:07:39 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 12:55:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f9f4e0

sys-cluster/glusterfs: drop 10.4, 11.0-r2

Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/35905
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-cluster/glusterfs/Manifest                     |   2 -
 .../glusterfs/files/glusterfs-11.0-fix-crash.patch |  16 --
 sys-cluster/glusterfs/glusterfs-10.4.ebuild        | 206 --------------------
 sys-cluster/glusterfs/glusterfs-11.0-r2.ebuild     | 215 ---------------------
 4 files changed, 439 deletions(-)

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index b963955981e5..c70f65d694f5 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,4 +1,2 @@
-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

diff --git a/sys-cluster/glusterfs/files/glusterfs-11.0-fix-crash.patch b/sys-cluster/glusterfs/files/glusterfs-11.0-fix-crash.patch
deleted file mode 100644
index 6a4a1ec517ab..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-11.0-fix-crash.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# https://bugs.gentoo.org/911588
-# https://github.com/gluster/glusterfs/issues/4192
-# https://github.com/gluster/glusterfs/pull/4196
-diff --git a/libglusterfs/src/glusterfs/mem-pool.h b/libglusterfs/src/glusterfs/mem-pool.h
-index 46f764f56e5..416b7ddf1e3 100644
---- a/libglusterfs/src/glusterfs/mem-pool.h
-+++ b/libglusterfs/src/glusterfs/mem-pool.h
-@@ -297,7 +297,7 @@ typedef struct per_thread_pool_list {
-      * in the implementation code so we just make it a single-element array
-      * here.
-      */
--    per_thread_pool_t pools[];
-+    per_thread_pool_t pools[1];
- } per_thread_pool_list_t;
- 
- /* actual pool structure, shared between different mem_pools */

diff --git a/sys-cluster/glusterfs/glusterfs-10.4.ebuild b/sys-cluster/glusterfs/glusterfs-10.4.ebuild
deleted file mode 100644
index a386a0e05b29..000000000000
--- a/sys-cluster/glusterfs/glusterfs-10.4.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# 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=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 \
-		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_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/glusterfs-11.0-r2.ebuild b/sys-cluster/glusterfs/glusterfs-11.0-r2.ebuild
deleted file mode 100644
index 902ae0e31b69..000000000000
--- a/sys-cluster/glusterfs/glusterfs-11.0-r2.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools elisp-common python-single-r1 tmpfiles systemd bash-completion-r1
-
-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"
-
-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
-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-libs/xxhash
-		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
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-# 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
-
-	# Path changes based on whether app-shells/bash-completion is installed, bug #911523
-	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 \
-		"${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}/50glusterfs-mode-gentoo.el"
-	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
-}