gentoo resync : 25.08.2020

4 files changed, 287 insertions, 5 deletions

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index c418652770d7..bae97b2412f9 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,6 +1,7 @@
 AUX 50glusterfs-mode-gentoo.el 169 BLAKE2B 461afb9f17ef9dee79348279e861039193400d61a926e9d8499351b7e42377cc1bffce6dc2c2d7f3b50b1de016a336bad69c7a79bb800b973288eef542baed85 SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804
 AUX glusterd-r3.initd 755 BLAKE2B 6b402725a6a53839ff718ae19f4917b61330f78ae6657480a218f06657d5d7db1c4b57efa275159be76bc84fd5b600a22bd4b374a8a6fbb56576799650ce89fe SHA512 d6f46374f48cf78c4114c786fbba4412764527cec020f43ab2a46000fcada98bdb6dfb67ba9db2be3e39a851cba1db97a7154e4cab6df7ce541c0157c781706c
 AUX glusterfs-6.7-fix-seek.patch 1247 BLAKE2B 77ede2514e3afcca12a0d2fef7d24ed66924ffe9ff804bbd48b56a04f27268b8b09471368afaececf9c6c7a304889c5f5271207442ff134d0ad215b46ac2ddf7 SHA512 839eb1d2bb87cae9adbfcc1f81c6187697e0b9c69fcd4c6aea9182c45fef09e3fe3ed3be210c8321a4530f4b9a6a140429ca2437bf5daf8357518ac1732f8434
+AUX glusterfs-7.7-flock.patch 2112 BLAKE2B d3fb045d06a1e574f162369b4730c8d88ddc880384e20a3ec13b0324e22728244b940c8533edbb8da1c8f9d6b331258778dd5975371e969a02ff27487fc8bff4 SHA512 9648371fb438e35b01c021e5cdf31b97d5107b9766e616178388dfa0978f981fde6463a5dec0083d5fadf3300dc27faf35ed00f69138a24697b7fcaea2489765
 AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d665f0bbffb59bbd2f81b314df62b8aab4eab5c4d23b9e88f43168160cb0faedece3307ddf2347f5282311 SHA512 28c5f401b2ff017d8faf7b290fa265cc5f1a9d60edf11dbae5801e943e7e0833fa8267880efa80c4fc07048d75afd446808c583d2b62a6c5a6bde25d317bde97
 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4
 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791
@@ -9,9 +10,11 @@ DIST glusterfs-6.8.tar.gz 7572097 BLAKE2B 76b7c699a4fc864d8074b591b3583030d837a0
 DIST glusterfs-6.9.tar.gz 7580928 BLAKE2B 655544b7ffa70ac9980e1a1041af538f473b6b6c8cb77f6e3447908b903b3a2b3ee0234c18fb71f997f31f24f8a790ab2f5a05a6b392090601db455ac726262a SHA512 3bf167aed4f572f94ad4708c5fff7b578a334af1eb0322c36e15127a2089b6359e8d91a36793d8af93c8f76dbdf6ded649c3e0a6c1a879163c8d8b640cea334b
 DIST glusterfs-7.5.tar.gz 7649044 BLAKE2B 01088654051a33c3a009b42c6e7adf7cabc52927a83a3331eced428ed3e6bfb3f7198fcc53a2b1dce678ac58c2f2619d02cce72a9850a50f3a26b37d39baeeaa SHA512 dfd8f04fb398daa7d7f58ef978ab69c0a55a313ac2af3287f7e1e7044f708317227c8749af5fd8d56844dfb8ad47bbd3214c42b806e2e21191a6a8617ab0be38
 DIST glusterfs-7.6.tar.gz 7653500 BLAKE2B ff3d4817f2a8b85126669cfbe6f58990aaccfffd91464d7acd97d7092c8eb94c21552eaf5e2301e3e6a7f99534b40c2afce1ade593d8ac559baee2d175538333 SHA512 c26b2046e7afdbb37fdd395fd9f692a0513ebb58c91ea223fbbaf9f8b41641b1fd009f2975e187f0feb8d83fb5cd4a8a0c2fdf4591a8a31e920d6bba75ae7c0f
+DIST glusterfs-7.7.tar.gz 7675420 BLAKE2B cadd415053d791f5fe4fddbc45bf237275b29fb0340202eaf81bbd2e98c8e7a1b59fa276b8b47679224198675759287a2245095a751602a866d512155dfa73c8 SHA512 0a301802920e337a4931ed36133c76ef551e0c1794d324e5a0a120d289a53fb8a4a2fd8adaa7abe5a40b8b17cc2bb18d01426c9f18d91f68b1589429ddbaa125
 EBUILD glusterfs-6.8.ebuild 6113 BLAKE2B 32f0c68de4c61fef290d80d13de98240e3da590e6ae60a0b5f9088e92d5b7ada00d7e46d55f15209e053a9b1502b49453f910b3af3e05bfdcb5163638d3b82f8 SHA512 0977bd902bc225f0ea0005ef7d057b72669cb002cf1ca35d7f24a036a45321f81ae981eca7ad69275138fdd08d2fcae4971e2302a41ba3f4e01a4bfa677a96bb
 EBUILD glusterfs-6.9.ebuild 6116 BLAKE2B e7ee1fe782c1ff3fdbd6ecbbd14494654826de439fd95b137546fd9f7259b14788b6caf1d042780579ecbe630e5fe8e1d1261d6d55b7318aa1ca506c1f3768ee SHA512 0464665f3b72f9fecf6bdbea8c3c19c38c780a9288780ba9390920e23ecb089875801b5f625bc47ad84cce9107e58dd14adbc29478a27ffdcfcf6a0b17dc6475
 EBUILD glusterfs-7.5.ebuild 6117 BLAKE2B a2f6a3c7f3e9071066dbdf85c9ae072757160de16eccabbd2fe08ba3fc805220451ff77b3bb3819c41199de61435067234de6ab0d98eb1b6695e5d88a0a8bfce SHA512 2c5ea8cd5d9a6f1957a699248678955c01b64125a9bb35bdbd8f71db6424819213f60c3bc69132dca7e89de3ed7ee497dd656d2eff67c3a1a3ea549466c0bb9f
 EBUILD glusterfs-7.6.ebuild 6116 BLAKE2B e7ee1fe782c1ff3fdbd6ecbbd14494654826de439fd95b137546fd9f7259b14788b6caf1d042780579ecbe630e5fe8e1d1261d6d55b7318aa1ca506c1f3768ee SHA512 0464665f3b72f9fecf6bdbea8c3c19c38c780a9288780ba9390920e23ecb089875801b5f625bc47ad84cce9107e58dd14adbc29478a27ffdcfcf6a0b17dc6475
+EBUILD glusterfs-7.7.ebuild 6025 BLAKE2B dd301333d2a89a836bbb427a1b509cbc6405f125ecde11cb81c10912e841c7b686dbf563ae070dfd5eba79ea52754c6562e7ae0676f49ff89d6875f9f8703522 SHA512 f53a4b1cfe74537e4271ad6e982f883b31c7a256685c382583ecea5e8c280a87d73b3e3c9aaab43772cc16e03e64406538340f8521e358e373abef1decb97164
 EBUILD glusterfs-9999.ebuild 5975 BLAKE2B e7dff556a3ce1af02657aa623f86870c574524a731ac24b15890e49c1ac1d7c80224354141b4aa59b64c47f851996aafb76ce34fc790b88ba8a8faf12f34bd4d SHA512 6daf0254c09e6d04580a3dfb819380f50fb4721b1afb2c2e765f9c1f80acaa7bfbe131d587ec0a5d44cb56263e03808422b60731eb9b2209698b66a28ccde9c8
-MISC metadata.xml 1291 BLAKE2B 72dac243dd9994bc08e89169ab70d5d1e096b0cf7a2aa7b47a04c17ff3711ffec3a42c9c43a10c6d5a5a544ab189913efe1405400bdf213f1566d84732077b6a SHA512 4260fbc16780f89d233100581973ed4fd480c19ffe514b1c8091d553bb1f83a475219918784d4d9a8b985b7a88e57c9ce3912cf5857c76cb2487282f26677df8
+MISC metadata.xml 1361 BLAKE2B 3a105a6248cd2b4c785b15518bca119697aa9b7d3b8609cc38fdd4ec8a401caff9c772f900c65de9b75050994d5b147dd5461747b10b4aac5080ee3c83e8efb1 SHA512 d4aa9447507f9e3e145765e048089e31eac7b5969844798429a142e0089568254ff5ce1401db62addfa4584022f5e84bc1756cb0c7338f4fe08ac348feba77ae
diff --git a/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch b/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch
new file mode 100644
index 000000000000..f7930406cd18
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch
@@ -0,0 +1,65 @@
+# https://bugs.gentoo.org/733228
+# https://bugzilla.redhat.com/show_bug.cgi?id=1718562
+# https://bugzilla.redhat.com/show_bug.cgi?id=1776152
+# https://review.gluster.org/#/c/glusterfs/+/23794/8/xlators/features/locks/src/common.c
+
+From 6ef82683064a87c434bd67e2004935281e4c04cc Mon Sep 17 00:00:00 2001
+From: l17zhou <cynthia.zhou@nokia-sbell.com>
+Date: Tue, 03 Dec 2019 07:43:35 +0200
+Subject: [PATCH] add clean local after grant lock
+
+found by flock test, without correct ref number of fd,
+lock will not be correctly released.
+
+Fixes: bz#1779089
+Change-Id: I3e466b17c852eb219c8778e43af8ad670a8449cc
+Signed-off-by: l17zhou <cynthia.zhou@nokia-sbell.com>
+---
+
+diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c
+index c78d537..4c6b78c 100644
+--- a/xlators/features/locks/src/common.c
++++ b/xlators/features/locks/src/common.c
+@@ -962,7 +962,7 @@
+     struct list_head granted_list;
+     posix_lock_t *tmp = NULL;
+     posix_lock_t *lock = NULL;
+-
++    pl_local_t *local = NULL;
+     INIT_LIST_HEAD(&granted_list);
+ 
+     pthread_mutex_lock(&pl_inode->mutex);
+@@ -977,9 +977,9 @@
+ 
+         pl_trace_out(this, lock->frame, NULL, NULL, F_SETLKW, &lock->user_flock,
+                      0, 0, NULL);
+-
+-        STACK_UNWIND_STRICT(lk, lock->frame, 0, 0, &lock->user_flock, NULL);
+-
++        local = lock->frame->local;
++        PL_STACK_UNWIND_AND_FREE(local, lk, lock->frame, 0, 0,
++                                 &lock->user_flock, NULL);
+         __destroy_lock(lock);
+     }
+ 
+@@ -999,6 +999,7 @@
+     struct list_head granted_list;
+     posix_lock_t *tmp = NULL;
+     posix_lock_t *lock = NULL;
++    pl_local_t *local = NULL;
+ 
+     int ret = -1;
+ 
+@@ -1026,9 +1027,9 @@
+ 
+         pl_trace_out(this, lock->frame, NULL, NULL, F_SETLKW, &lock->user_flock,
+                      0, 0, NULL);
+-
+-        STACK_UNWIND_STRICT(lk, lock->frame, 0, 0, &lock->user_flock, NULL);
+-
++        local = lock->frame->local;
++        PL_STACK_UNWIND_AND_FREE(local, lk, lock->frame, 0, 0,
++                                 &lock->user_flock, NULL);
+         __destroy_lock(lock);
+     }
+ 
diff --git a/sys-cluster/glusterfs/glusterfs-7.7.ebuild b/sys-cluster/glusterfs/glusterfs-7.7.ebuild
new file mode 100644
index 000000000000..2f3011803d87
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-7.7.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools elisp-common python-single-r1 systemd
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
+else
+	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+	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/userspace-rcu:=
+	net-libs/rpcsvc-proto
+	sys-apps/util-linux
+	sys-libs/readline:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
+	xml? ( dev-libs/libxml2 )
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+"
+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 )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.7-flock.patch"
+)
+
+# 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 |
+		xargs 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 \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable infiniband ibverbs) \
+		$(use_enable static-libs static) \
+		$(use_enable syslog) \
+		$(use_enable test cmocka) \
+		$(use_enable xml xml-output) \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
+		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+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
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+	fi
+
+	# 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
+
+	if use georeplication ; then
+		# move the gsync-sync-gfid tool to a binary path
+		# and set a symlink to be compliant with all other distros
+		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
+		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
+	fi
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+pkg_postinst() {
+	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 cbd9d0546eb1..2b36a91f63e6 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>jaco@uls.co.za</email>
-		<name>Jaco Kroon</name>
-		<description>Please CC on bugs</description>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>proxy maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
 		GlusterFS is a cluster file-system capable of scaling to several peta-bytes. It aggregates various storage bricks over Infiniband RDMA or TCP/IP interconnect into one large parallel network file system. GlusterFS is based on a stackable user space design without compromising performance.