diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
commit | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch) | |
tree | c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /sys-cluster/glusterfs | |
parent | e9d044d4b9b71200a96adfa280848858c0f468c9 (diff) |
gentoo resync : 05.12.2021
Diffstat (limited to 'sys-cluster/glusterfs')
-rw-r--r-- | sys-cluster/glusterfs/Manifest | 20 | ||||
-rw-r--r-- | sys-cluster/glusterfs/files/glusterd-r3.initd | 32 | ||||
-rw-r--r-- | sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch | 65 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-10.0.ebuild (renamed from sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild) | 20 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild | 207 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild | 194 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild | 194 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild | 195 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-9.4.ebuild (renamed from sys-cluster/glusterfs/glusterfs-9.3.ebuild) | 2 | ||||
-rw-r--r-- | sys-cluster/glusterfs/metadata.xml | 2 |
10 files changed, 17 insertions, 914 deletions
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest index e0466d123a45..d84e0f7370ab 100644 --- a/sys-cluster/glusterfs/Manifest +++ b/sys-cluster/glusterfs/Manifest @@ -1,25 +1,15 @@ AUX 50glusterfs-mode-gentoo.el 169 BLAKE2B 461afb9f17ef9dee79348279e861039193400d61a926e9d8499351b7e42377cc1bffce6dc2c2d7f3b50b1de016a336bad69c7a79bb800b973288eef542baed85 SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804 -AUX glusterd-r3.initd 755 BLAKE2B 6b402725a6a53839ff718ae19f4917b61330f78ae6657480a218f06657d5d7db1c4b57efa275159be76bc84fd5b600a22bd4b374a8a6fbb56576799650ce89fe SHA512 d6f46374f48cf78c4114c786fbba4412764527cec020f43ab2a46000fcada98bdb6dfb67ba9db2be3e39a851cba1db97a7154e4cab6df7ce541c0157c781706c AUX glusterd-r4.initd 747 BLAKE2B f0c1c6947e6c42d3fa1e52b7ee4d856aad9fb9218ae07df35d90039038437ca05bd5c382de609de9a8e35aea24592499dbd0f44d6f3c827e2667229242c3dc21 SHA512 9341b4f998bf5f0da24b84e5e83b2534b5693d018961800ac5ae19ab7246fe60b90b3a66f4c5576d7e1beebd3624e3e2d2c426d44f2ea4f766e1014b69441f60 -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 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7 -DIST glusterfs-7.9.tar.gz 7702149 BLAKE2B e23b5a45a8c2c4f02f0992dfc78bea942a1dcc621082cb5c6aebf73e0cba17a7c0334700aec8c82dc7d093fbddcf9f579320561412b94ec010cf51c0210f2654 SHA512 5683bf2ff3550b8286e27b70981cb176c445e432624db79f065eb5928bc4afdf009f54f3b1d5abde1f6d2c532c9c4820860685aea0d0f709dc78fcf35bfea688 -DIST glusterfs-8.3.tar.gz 7829522 BLAKE2B 1ba60f7209db4f1ce21237c3adea94df1b9eae04d15f99eb414bf961ea67aa7e08d01ea47c8793a33afbc0ff6cf63ecb81f78fa1ba74d66e2d4358ef2bdadacc SHA512 7ca9d3d8938eb27a7347461a07457e90d1ee6e8d5417970e38245c819cf09bf2ecf9de3954b75edf5cf14816e1059fb381b95935ae1f973ebd14ee7531322aa9 -DIST glusterfs-8.4.tar.gz 7833014 BLAKE2B c67f510c655465e9fbecaa7f391531543e37a2a84917592e699d88564b24fe55689b95770f385ac5b645069f287d4af974db76a77c0f44ea5d2e88f995b427f7 SHA512 a81394b3584c2e6c27060367b443c0879512054ed9287740bc24308603b9e3c11376179ed6589d5d38441982cd6415e3612f98ae4c97ddf7d5c747b42171d796 +DIST glusterfs-10.0.tar.gz 8277236 BLAKE2B f7f50311c6754a74a60b36f163d06a9888b92debfdb3a971f092fc18ca9f8c8fe44026101eb446d551a3b452070ef31d37a4f958691416cdd51884fbcf312a47 SHA512 5a9d292461fc8a0c61767b80d1013cdb104706fd564033aac23e87d68d56686df2e9c38a8890a6a50db0afe6a54cf57e05fe8e5a8883bc3157aa6c93e5aaa343 DIST glusterfs-8.5.tar.gz 7873397 BLAKE2B 6ababf15fda216c9a47c05859f7123847d711dd5a12e3ec2c5dcf8475f35830c9a32f7b21ad763ab1be59b06f1d93f83acc0cbb8f7635456a3638be73b162aa4 SHA512 e256141a76deb9a255be31422d76b0c81aad4a7e5b166d2be90a79d340ceb811cbff11f469166ef7582f40f58f47fb056aa05aafd4b35f094bf9c21a5c08f3bb DIST glusterfs-8.6.tar.gz 7826147 BLAKE2B 3a8a488c9a8e4b1daf3ed01fa5e52a62cf791349c1169aaf8609252bfb8bc0a0534f9fc23fac27cfab11ac6fb5e3e1d9588b4ec8080b02cf97e679bf2c8fb5c2 SHA512 bb1125e5d6b4d424234bc40786847f217e7a05cecad1462dd91248cf9559569914f04e1f909e829051cb1db4079ecf906440a38af9de2bbf3bcf53ca8fa1f349 -DIST glusterfs-9.1.tar.gz 8206207 BLAKE2B dea099eb1d366704010247964c24de404fb09c00a375dde4af30a2af836d3b35689fab91a75268aa01dba45860eb50a6e0572913c059e53fb5799d2302c2f005 SHA512 2c26813f12fed7a0640cc470badc2b83f156b660ef475487a689dca6c3fa407192f4959aeaf7a981969a079cf5d2c7aace85ff818ea6133d5a085d90d226e1da -DIST glusterfs-9.2.tar.gz 8212980 BLAKE2B 7fb42186c5d309c357f72e3037fc09d8b15f32770d74173dd4779bab91056d1ceb78a4a651fec2018faf1597357576d41593e9d7b04cf9af7f4742301b284b01 SHA512 34a0a1745029e2fad3c8fc6a044b4e4645f8cf11eddc3c8c8e94cce9733449248c577ce6066bc49010a65121d991daf67766393fe513ac694082f0efa1d4ef95 -DIST glusterfs-9.3.tar.gz 8167846 BLAKE2B 119e2c089ef250fafb2b2dfdcf71f40cc25fdda6ac1cbb38a8557a3c206f721227eceadd87b40341e6bf2b32a7cb24996910f45e061f25d193ab2ca4070ddc76 SHA512 0974cf57a6810505f767c490b53201e62bb73ca2fd3c5203d9882dcbe4088c816afb5445ef606d12fb797b1b1fa5e0994f2ea0816577f70e630637668a20f005 -EBUILD glusterfs-7.9-r1.ebuild 5919 BLAKE2B 5aaab652acccfea58034ad71ca937947fa4c38ab3629aa3da6a3f4e77960f18f813fb8781d04e142c248581c07afa44c8699bc5a13c9796d38f65c6341335c6c SHA512 2e9443235a9a7fe493f9df20115b33b4918f23c0af580e34ba232b09a52a658b536290573a8218ad64a6594cbe387d4dea7d8d0928b657f4e803c912a5b56449 -EBUILD glusterfs-8.3-r1.ebuild 5433 BLAKE2B fef5fa52d039133126eb57fcd3578c487aceabe1776b5d6a5bc9ad07e3a9c1d6a6798c0c130b651a1430a09e67336bf5175f09e0fe811776045c8be4d0870fea SHA512 e850928695ea82b3f3257cd83be5f5d34de8d5dce807c5a86914caf4c796e5fd64be92a60cf5f71d02132e0575961c1d66ee7f735f5d1eab176c1b9139ca0db8 -EBUILD glusterfs-8.4-r1.ebuild 5433 BLAKE2B fef5fa52d039133126eb57fcd3578c487aceabe1776b5d6a5bc9ad07e3a9c1d6a6798c0c130b651a1430a09e67336bf5175f09e0fe811776045c8be4d0870fea SHA512 e850928695ea82b3f3257cd83be5f5d34de8d5dce807c5a86914caf4c796e5fd64be92a60cf5f71d02132e0575961c1d66ee7f735f5d1eab176c1b9139ca0db8 +DIST glusterfs-9.4.tar.gz 8173625 BLAKE2B c35c63696717bf09f8fbf77dca16a6f45de278253e768c6ffc40c0c097da9ea1b32888233da412a5333281995e89e08d9ed23fd47aba7c506de84b08f9f80cea SHA512 2a17197bd2b425117e34af004a6177b7c5012807cd99b9c6d37a1081e0ab9def6b013bedd0ba4122d149969755e0e2985bef8aed9cf612a27a6452b8719a33bf +EBUILD glusterfs-10.0.ebuild 5529 BLAKE2B d299dea9a5ef9575790c154e8c5ce8695ad640bcd901073fcdc8deb26c76665661a40c5459a9c40de5d81686be6bb2c8dc0e593de609436b3595c3ef2700d843 SHA512 a65a8a04e25c515de6a49b60da198f3f1c9cc26348fac8573d8d6278880dd124a4bf4faed3e92f1ce10fbf96e3e7006a75dbf5f2d8d4b57dd1ffdbf8926044ae EBUILD glusterfs-8.5-r1.ebuild 5434 BLAKE2B 7b819c7b98e882752f3c76a4df20d2c197c6d6b2bcdf6419972ce0a4bec33a6af72d9ae62307f87faf79b62980ab0a9d9aaaf221131625c3662c6e8e949881a6 SHA512 03a396e9b1c76ed932e8039945f007f71a137bd9966d598af6a3831a1af6b8e8c6a20b02ead72c896e1d312e221700c5843e507694e4189453e5c029b9986c4a EBUILD glusterfs-8.6.ebuild 5433 BLAKE2B 49ad2a5ccb48f2bfd4f76c994e72cc60e78d5965c022621d3947ccd0adfe7b9687f4f83497baea7e04f0f9a7655f886f0c7f80d2be10b547d3a3b891a766e0c9 SHA512 4c85260ae305d39a8d4f1cb8cb863066e5cad0356e121d12490da5843439829c47750fa6605ad6e5343ed90310a222b5ca2b28ba981c5c935f21f10eb7aaed28 -EBUILD glusterfs-9.1-r1.ebuild 5458 BLAKE2B a40723b4dcc5b58e363dd1be0fd00cd4f9b7c43f624cc4f89e083811d3bdbef166bd51f16c994f84ec67075f4d3ad47da4a7aff9d9771a2cb4a14356ec487f6c SHA512 26ad8356a77943c141344e1ba05d641398be4301ddb389e13462017a14c54a9c114167c4edd8fd495e636ed61bb0c0dbce1fbf886f60d61f583cf9e2a4e05b15 -EBUILD glusterfs-9.2-r1.ebuild 5458 BLAKE2B f44b0f014e5ae10f939ba1dec4815ca886ca4de737a69a45450089eb082c8d1d8eaf0ab70bcb0d741926c0daccb9faaf276c1e1a035da48d2a590a26707e7f41 SHA512 14ad8f4703bd2ee433a76f6b41e1740afcb7675ed16515845b092ce082619502b5b7305712a8c3531460f94310b4fa891aa22758f2d7b0182cd1b568ca9930bb -EBUILD glusterfs-9.3.ebuild 5458 BLAKE2B f44b0f014e5ae10f939ba1dec4815ca886ca4de737a69a45450089eb082c8d1d8eaf0ab70bcb0d741926c0daccb9faaf276c1e1a035da48d2a590a26707e7f41 SHA512 14ad8f4703bd2ee433a76f6b41e1740afcb7675ed16515845b092ce082619502b5b7305712a8c3531460f94310b4fa891aa22758f2d7b0182cd1b568ca9930bb -MISC metadata.xml 1517 BLAKE2B a6c5d95e4b88f94312fd1c5103fae3db276f8fd44aaa805da4b483ff79bdd4382148ab1dc90f8a838544564e23d44f2a81f21236ccb508adc0295d890a538eb8 SHA512 bd540edf12b945bd9359a2a0df62e738bcaf381726f662261059d041fa4f9f7b9869e05952aae031912afd4c9436db1c3ed2c8c4fd5a678f7956d64465eab55b +EBUILD glusterfs-9.4.ebuild 5459 BLAKE2B f3691f82fb49c5eca9de6a5eecc7b52aa55d561481740065b940f573c639f6028dac2ae4c40ea5d698d94ae033f0c38de087ff6e1ee708117985d6f8f0d00372 SHA512 09e644d1fc7862a285ea71f4d2293798d5171ce5d045388d3220a0957ee38fe561cb59f7b80057e7a4bb64d17fa7f2da155224a4afe9b9bf5561f45e2bb5ba90 +MISC metadata.xml 1393 BLAKE2B 6f76de3d00fd1625633c2ffe6e54ec8829dc68b21096418a0e9d61cff4d7ff29fa053a3821e3df036a70b797b95dd26474b135c40b1a5074ac3b2059971118ec SHA512 091ce1e57cd22608228bcf059686c67fe37001659d0d9f29bb2fbb1740b8eb00233f8882408ee2f75d30c325d6be4f1a19cecae171c8e88870b8008ab6eaec5a diff --git a/sys-cluster/glusterfs/files/glusterd-r3.initd b/sys-cluster/glusterfs/files/glusterd-r3.initd deleted file mode 100644 index 27682d06216d..000000000000 --- a/sys-cluster/glusterfs/files/glusterd-r3.initd +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Gluster elastic volume management daemon" -command="/usr/sbin/glusterd" -pidfile="/var/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 /var/run/gluster -} - -start_post() { - local c=0 - ebegin "Waiting for glusterd to start up" - while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do - (( ++c )) - done - [ "${c}" -lt "${glusterd_max_wait_start-60}" ] - eend $? - - return 0 -} diff --git a/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch b/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch deleted file mode 100644 index f7930406cd18..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch +++ /dev/null @@ -1,65 +0,0 @@ -# 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-9.2-r1.ebuild b/sys-cluster/glusterfs/glusterfs-10.0.ebuild index 8bc22e9cba26..d766c71646f4 100644 --- a/sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild +++ b/sys-cluster/glusterfs/glusterfs-10.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit autotools elisp-common python-single-r1 tmpfiles @@ -15,7 +15,7 @@ LICENSE="|| ( GPL-2 LGPL-3+ )" SLOT="0/${PV%%.*}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml" +IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs tcmalloc test +xml" REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml ) ipv6? ( libtirpc )" @@ -28,19 +28,20 @@ RDEPEND=" acct-group/gluster acct-user/gluster dev-libs/libaio - dev-libs/userspace-rcu:= + dev-libs/openssl:=[-bindist(-)] net-libs/rpcsvc-proto + dev-libs/userspace-rcu:= sys-apps/util-linux sys-libs/liburing:= 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} ) - xml? ( dev-libs/libxml2 ) - !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) - dev-libs/openssl:=[-bindist(-)] + tcmalloc? ( dev-util/google-perftools ) + xml? ( dev-libs/libxml2 ) " DEPEND=" ${RDEPEND} @@ -90,15 +91,16 @@ src_prepare() { 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 syslog) \ $(use_enable test cmocka) \ $(use_enable xml xml-output) \ - $(use libtirpc || echo --without-libtirpc) \ - $(use ipv6 && echo --with-ipv6-default) \ + $(usex ipv6 --with-ipv6-default "") \ + $(usex libtirpc "" --without-libtirpc) \ + $(usex tcmalloc "" --without-tcmalloc) \ --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ --localstatedir="${EPREFIX}"/var } diff --git a/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild deleted file mode 100644 index 9fe0f1f7df80..000000000000 --- a/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools elisp-common python-single-r1 tmpfiles - -SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" - -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/" - -LICENSE="|| ( GPL-2 LGPL-3+ )" -SLOT="0/${PV%%.*}" -IUSE="debug emacs +fuse +georeplication infiniband ipv6 +libtirpc rsyslog static-libs +syslog test +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(-)] ) ) - dev-libs/openssl:=[-bindist(-)] -" -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 -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 \ - $(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}"/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 - - 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 - - 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-8.3-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild deleted file mode 100644 index e951ef2e84cd..000000000000 --- a/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools elisp-common python-single-r1 tmpfiles - -SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" - -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/" - -LICENSE="|| ( GPL-2 LGPL-3+ )" -SLOT="0/${PV%%.*}" -IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml" - -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} 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/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} ) - xml? ( dev-libs/libxml2 ) - !elibc_glibc? ( sys-libs/argp-standalone ) - libtirpc? ( net-libs/libtirpc:= ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) - dev-libs/openssl:=[-bindist(-)] -" -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 ) - -# 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 \ - $(use_enable debug) \ - $(use_enable fuse fuse-client) \ - $(use_enable georeplication) \ - $(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}"/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}/${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 - - 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-8.4-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild deleted file mode 100644 index e951ef2e84cd..000000000000 --- a/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools elisp-common python-single-r1 tmpfiles - -SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" - -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/" - -LICENSE="|| ( GPL-2 LGPL-3+ )" -SLOT="0/${PV%%.*}" -IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml" - -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} 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/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} ) - xml? ( dev-libs/libxml2 ) - !elibc_glibc? ( sys-libs/argp-standalone ) - libtirpc? ( net-libs/libtirpc:= ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) - dev-libs/openssl:=[-bindist(-)] -" -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 ) - -# 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 \ - $(use_enable debug) \ - $(use_enable fuse fuse-client) \ - $(use_enable georeplication) \ - $(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}"/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}/${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 - - 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-9.1-r1.ebuild b/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild deleted file mode 100644 index 481163386a99..000000000000 --- a/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools elisp-common python-single-r1 tmpfiles - -SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/" - -LICENSE="|| ( GPL-2 LGPL-3+ )" -SLOT="0/${PV%%.*}" -IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml" - -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} 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/userspace-rcu:= - net-libs/rpcsvc-proto - sys-apps/util-linux - sys-libs/liburing:= - sys-libs/readline:= - emacs? ( >=app-editors/emacs-23.1:* ) - fuse? ( >=sys-fs/fuse-2.7.0:0 ) - georeplication? ( ${PYTHON_DEPS} ) - xml? ( dev-libs/libxml2 ) - !elibc_glibc? ( sys-libs/argp-standalone ) - libtirpc? ( net-libs/libtirpc:= ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) - dev-libs/openssl:=[-bindist(-)] -" -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 ) - -# 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 \ - $(use_enable debug) \ - $(use_enable fuse fuse-client) \ - $(use_enable georeplication) \ - $(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}"/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}/${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 - - 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-9.3.ebuild b/sys-cluster/glusterfs/glusterfs-9.4.ebuild index 8bc22e9cba26..a259a27a6aa4 100644 --- a/sys-cluster/glusterfs/glusterfs-9.3.ebuild +++ b/sys-cluster/glusterfs/glusterfs-9.4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit autotools elisp-common python-single-r1 tmpfiles diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml index 6ee302ff2dc3..73cd1d833a48 100644 --- a/sys-cluster/glusterfs/metadata.xml +++ b/sys-cluster/glusterfs/metadata.xml @@ -23,8 +23,6 @@ <use> <flag name="fuse">Add FUSE mount helper</flag> <flag name="georeplication">Enable support for georeplication (requires <pkg>dev-lang/python</pkg>)</flag> - <flag name="infiniband">Add support for Infiniband ibverbs transport. - Libraries can be found in science overlay</flag> <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> |