From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Feb 2020 21:05:55 +0000 Subject: gentoo resync : 10.02.2020 --- sys-cluster/glusterfs/Manifest | 5 +- .../glusterfs/files/glusterfs-6.7-fix-seek.patch | 45 +++++ sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild | 214 +++++++++++++++++++++ sys-cluster/glusterfs/glusterfs-6.7.ebuild | 210 -------------------- sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild | 211 ++++++++++++++++++++ sys-cluster/glusterfs/glusterfs-7.2.ebuild | 207 -------------------- 6 files changed, 473 insertions(+), 419 deletions(-) create mode 100644 sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch create mode 100644 sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild delete mode 100644 sys-cluster/glusterfs/glusterfs-6.7.ebuild create mode 100644 sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild delete mode 100644 sys-cluster/glusterfs/glusterfs-7.2.ebuild (limited to 'sys-cluster/glusterfs') diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest index 843b4db9bc1f..3dd106b561ba 100644 --- a/sys-cluster/glusterfs/Manifest +++ b/sys-cluster/glusterfs/Manifest @@ -3,6 +3,7 @@ AUX glusterd-r3.initd 755 BLAKE2B 6b402725a6a53839ff718ae19f4917b61330f78ae66574 AUX glusterfs-3.12.2-poisoned-sysmacros.patch 431 BLAKE2B 4446b2ba5aad48dfe54c24e0cf802196d6ee4898a77f7a6950e2c1971550deddc7ff232dab021b4bfcb962f4544fa6bebba314b07942228298a5c38758c38442 SHA512 fb9f56254a90325bfc92d60af41075b51460d179eac7149cf1d0dc218d7cc7c9102eaf0591c2763df2fa68d2595f87dd3427d810bc182b61103bd5f9588c77db AUX glusterfs-4.1.0-silent_rules.patch 500 BLAKE2B bd6812be1059f04bcb34e9408b6ef24f6bd0992cc432ff22da9f21970e11dd5394e1421a6967cae6c026207dcf1d7ae591afaa06e4a25a62c0e79f7f679cd22e SHA512 1cbdfd9f04a917387f0b3299f3ab04074c34e5a4911642ccf4274f1270a97acbf0e27f89c89ce6a1cd2e26238761f956cd1dfa3033d763ead32b0d0fd92a0798 AUX glusterfs-6.7-fix-rebalance-crash.patch 5861 BLAKE2B caaf103b10d18e4540ab1e516f5ee06aeeb418e12a570d9f4df7c1952302a2035b8ead11fee17d2d797e5872e977ebd8c124aa8bdda26e28a23e8a4173338222 SHA512 149bc10d47424bc40e55cb4053ab251adf88f890a6e4e2e03cddbb23fe411b9d1621fe183b8e09acd36d7945827f85eefcc83c58b01d27f988d6e88bdb1bcafd +AUX glusterfs-6.7-fix-seek.patch 1247 BLAKE2B 77ede2514e3afcca12a0d2fef7d24ed66924ffe9ff804bbd48b56a04f27268b8b09471368afaececf9c6c7a304889c5f5271207442ff134d0ad215b46ac2ddf7 SHA512 839eb1d2bb87cae9adbfcc1f81c6187697e0b9c69fcd4c6aea9182c45fef09e3fe3ed3be210c8321a4530f4b9a6a140429ca2437bf5daf8357518ac1732f8434 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 @@ -13,7 +14,7 @@ DIST glusterfs-6.7.tar.gz 7565257 BLAKE2B bb38383cad0cbf890b89dd75f7b260d21b381a DIST glusterfs-7.2.tar.gz 7630773 BLAKE2B abceafd06ca8f5de1c84708a1a3ec4453c5d536d8811b773fa6f5dd02d6e3d450c329bc4d0fa32d970ff57e82a1fe3aa48ec9c3a7d3d5ca5817a91e8930b1b6e SHA512 fd1059222c4d30fa5c4011083c3c53af44433180ae124c884a774628051d31d95386bef71d4d25ed2b0c5dd8d9a6936601e8e37d963b34d291cb88ea45e31ff2 EBUILD glusterfs-4.1.8.ebuild 6785 BLAKE2B 1daf6faa219ec1c64fe661f068aadd6d7735c029f2692cba1f4ce84abe40a7f2defa29bcdbe84f962fc59b805124c5d252be2909afb946e086bc52a3137d347d SHA512 d0a7aaec14523e68ed676ef461bd59ff73de94e40f197a64d9a24b71a98949915327b7732637a57b6138e8171b402d851969732fda9039a255ac9696aa554976 EBUILD glusterfs-6.5.ebuild 6223 BLAKE2B a708adff12d8467555d22e8652bfc30ad538a00b9ff0bbb3e0379ec9eaee1dc41d6b00432ab63ad0e4fea9c181ec8fd17a6d7013c82410ca7f31b484a171f4cc SHA512 2c2a011e1e96e07a057f04e16a0296f93ffce38aa25c87312682f3f605c66ed3a9fb7c528c86eb11163249ebeb7080acc03eef7c151aa85f587b1a29e67acbb2 -EBUILD glusterfs-6.7.ebuild 6343 BLAKE2B 96c3f8481e64de65ed72e8c0f7efcd16af5df450246ee0ae4d32afb6d82dee2f3ada4e0770793042df65a2fc692deaa4b568d9a0b9e88ab4e43acc97f1cbd64b SHA512 e9c5c53b5aa9f033ba563b9475de2600ff0baa06029ff9e2bc51932952b3dd5b4bb2e7116766e86b7d5262b8f3d3b9a8193a608a502cd6d4b6295062fa4d91be -EBUILD glusterfs-7.2.ebuild 6225 BLAKE2B 9d5b56203bafea2898e70663c1cd58c36f9ce3d1d775303e9f98634af153bdab042605967c7fd99ed7e2403c3b80d413411af3fa4c79e28fd523a63d9ee0f2c9 SHA512 ceecd841ec42ecca2ce9985a302538edd2a4fad13993336f0477f985a54e13f5d6b4a9a89788dc19186d13af7be8034ddee9ffb069cc8ef9c2fa1d0c95dbccb9 +EBUILD glusterfs-6.7-r1.ebuild 6484 BLAKE2B 8fe0924b0de96f68c70becf17ee2ffeb094f3e00d14ebcb527efc45aa251f59961a255de9039e502480af601e71acc110ebb173ef3a403197b99ab1a0ad0b2e1 SHA512 c20d29404d857d0bd12e822e374c5b29adede828098ac0bd692f70fda52d51d172edf054e437bcf52a5bff2b2d77ac2218c1b66518693ba622ed9b740811099c +EBUILD glusterfs-7.2-r1.ebuild 6366 BLAKE2B f2b859dd7fc0c3f278943918b8e75d31a42045b03cc1f09aa104799371f727254ffc9e3c6831005f5f4b1cef1de3e25fc3dbedb6019f3b3cddf69f297f9fd4c5 SHA512 4cac260a0b364dfe051dceb9acfac86b84e24aef5a28c63c9b53fcda233e2dd158a185f48c3bcbcb3033ac109727eea0c9cc70b36c8f20a28f1594aa57133e8f EBUILD glusterfs-9999.ebuild 6789 BLAKE2B a803818430d7faca876f1db48f7082fba1560a9fc539303a1ec7b8154ba0b43716a76f415ac11fde898780afac2469d7b73c28115a6b2a832c1cea8486874ff0 SHA512 3355f1533d7a3a8e8b9ad437c077172a0285e2d0911fdcdf8efab75ab65785671699a26d744ed62cd4f1487678353fe7ccfda55496bd72f209a542dd6a60b0ae MISC metadata.xml 1724 BLAKE2B 8d164da1feb4e49490543de9841ec60282199451f2dcd6920c6781bcff41cb1248fcea7895501db0501f01a1b87b27e91a068adacd87842630f17efebf4d8954 SHA512 5bc076910d574a03f1b29db15fe1933e1b9b6f0f2cde654a6934397f7fa6f10c5063dd0318248d522da508af1ce56d16f1a204bc4be8429430f189143baaf043 diff --git a/sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch b/sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch new file mode 100644 index 000000000000..07d1ecef0376 --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch @@ -0,0 +1,45 @@ +diff --git a/xlators/performance/open-behind/src/open-behind.c b/xlators/performance/open-behind/src/open-behind.c +index 70a144abb5..95e00dbd79 100644 +--- a/xlators/performance/open-behind/src/open-behind.c ++++ b/xlators/performance/open-behind/src/open-behind.c +@@ -708,6 +708,32 @@ ob_fstat(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) + return 0; + } + ++int ++ob_seek(call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, ++ gf_seek_what_t what, dict_t *xdata) ++{ ++ call_stub_t *stub = NULL; ++ fd_t *wind_fd = NULL; ++ ++ wind_fd = ob_get_wind_fd(this, fd, NULL); ++ ++ stub = fop_seek_stub(frame, default_seek_resume, wind_fd, offset, what, ++ xdata); ++ ++ fd_unref(wind_fd); ++ ++ if (!stub) ++ goto err; ++ ++ open_and_resume(this, wind_fd, stub); ++ ++ return 0; ++err: ++ STACK_UNWIND_STRICT(fstat, frame, -1, ENOMEM, 0, 0); ++ ++ return 0; ++} ++ + int + ob_flush(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) + { +@@ -1256,6 +1282,7 @@ struct xlator_fops fops = { + .flush = ob_flush, + .fsync = ob_fsync, + .fstat = ob_fstat, ++ .seek = ob_seek, + .ftruncate = ob_ftruncate, + .fsetxattr = ob_fsetxattr, + .setxattr = ob_setxattr, diff --git a/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild b/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild new file mode 100644 index 000000000000..d36a647109cf --- /dev/null +++ b/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild @@ -0,0 +1,214 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit autotools elisp-common python-single-r1 systemd user + +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="!elibc_glibc? ( sys-libs/argp-standalone ) + emacs? ( >=app-editors/emacs-23.1:* ) + fuse? ( >=sys-fs/fuse-2.7.0:0 ) + georeplication? ( ${PYTHON_DEPS} ) + infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) + libtirpc? ( net-libs/libtirpc:= ) + !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) + xml? ( dev-libs/libxml2 ) + sys-libs/readline:= + dev-libs/libaio + !libressl? ( dev-libs/openssl:=[-bindist] ) + libressl? ( dev-libs/libressl:= ) + dev-libs/userspace-rcu:= + net-libs/rpcsvc-proto + sys-apps/util-linux" +DEPEND="${RDEPEND} + virtual/acl + virtual/pkgconfig + sys-devel/bison + sys-devel/flex + 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 )" + +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 + + # Needed for statedumps + # https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3 + enewgroup gluster + enewuser gluster -1 -1 "${EPREFIX}"/var/run/gluster gluster +} + +src_prepare() { + default + + # https://bugzilla.redhat.com/show_bug.cgi?id=1786983 + eapply "${FILESDIR}/glusterfs-6.7-fix-rebalance-crash.patch" + + # https://bugs.gentoo.org/705536 + # https://bugzilla.redhat.com/show_bug.cgi?id=1793990 + eapply "${FILESDIR}/glusterfs-6.7-fix-seek.patch" + + # 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-dependency-tracking \ + --disable-silent-rules \ + --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 \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --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/glusterfs-6.7.ebuild b/sys-cluster/glusterfs/glusterfs-6.7.ebuild deleted file mode 100644 index 9bb5a61620be..000000000000 --- a/sys-cluster/glusterfs/glusterfs-6.7.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit autotools elisp-common python-single-r1 systemd user - -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="!elibc_glibc? ( sys-libs/argp-standalone ) - emacs? ( >=app-editors/emacs-23.1:* ) - fuse? ( >=sys-fs/fuse-2.7.0:0 ) - georeplication? ( ${PYTHON_DEPS} ) - infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) - libtirpc? ( net-libs/libtirpc:= ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) - xml? ( dev-libs/libxml2 ) - sys-libs/readline:= - dev-libs/libaio - !libressl? ( dev-libs/openssl:=[-bindist] ) - libressl? ( dev-libs/libressl:= ) - dev-libs/userspace-rcu:= - net-libs/rpcsvc-proto - sys-apps/util-linux" -DEPEND="${RDEPEND} - virtual/acl - virtual/pkgconfig - sys-devel/bison - sys-devel/flex - 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 )" - -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 - - # Needed for statedumps - # https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3 - enewgroup gluster - enewuser gluster -1 -1 "${EPREFIX}"/var/run/gluster gluster -} - -src_prepare() { - default - - # https://bugzilla.redhat.com/show_bug.cgi?id=1786983 - eapply "${FILESDIR}/glusterfs-6.7-fix-rebalance-crash.patch" - - # 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-dependency-tracking \ - --disable-silent-rules \ - --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 \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --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/glusterfs-7.2-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild new file mode 100644 index 000000000000..d122e64c2265 --- /dev/null +++ b/sys-cluster/glusterfs/glusterfs-7.2-r1.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,7,8} ) + +inherit autotools elisp-common python-single-r1 systemd user + +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="!elibc_glibc? ( sys-libs/argp-standalone ) + emacs? ( >=app-editors/emacs-23.1:* ) + fuse? ( >=sys-fs/fuse-2.7.0:0 ) + georeplication? ( ${PYTHON_DEPS} ) + infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) + libtirpc? ( net-libs/libtirpc:= ) + !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) + xml? ( dev-libs/libxml2 ) + sys-libs/readline:= + dev-libs/libaio + !libressl? ( dev-libs/openssl:=[-bindist] ) + libressl? ( dev-libs/libressl:= ) + dev-libs/userspace-rcu:= + net-libs/rpcsvc-proto + sys-apps/util-linux" +DEPEND="${RDEPEND} + virtual/acl + virtual/pkgconfig + sys-devel/bison + sys-devel/flex + 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 )" + +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 + + # Needed for statedumps + # https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3 + enewgroup gluster + enewuser gluster -1 -1 "${EPREFIX}"/var/run/gluster gluster +} + +src_prepare() { + default + + # https://bugs.gentoo.org/705536 + # https://bugzilla.redhat.com/show_bug.cgi?id=1793990 + eapply "${FILESDIR}/glusterfs-6.7-fix-seek.patch" + + # 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-dependency-tracking \ + --disable-silent-rules \ + --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 \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --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/glusterfs-7.2.ebuild b/sys-cluster/glusterfs/glusterfs-7.2.ebuild deleted file mode 100644 index 27be5d5543a4..000000000000 --- a/sys-cluster/glusterfs/glusterfs-7.2.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit autotools elisp-common python-single-r1 systemd user - -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="!elibc_glibc? ( sys-libs/argp-standalone ) - emacs? ( >=app-editors/emacs-23.1:* ) - fuse? ( >=sys-fs/fuse-2.7.0:0 ) - georeplication? ( ${PYTHON_DEPS} ) - infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) - libtirpc? ( net-libs/libtirpc:= ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) - xml? ( dev-libs/libxml2 ) - sys-libs/readline:= - dev-libs/libaio - !libressl? ( dev-libs/openssl:=[-bindist] ) - libressl? ( dev-libs/libressl:= ) - dev-libs/userspace-rcu:= - net-libs/rpcsvc-proto - sys-apps/util-linux" -DEPEND="${RDEPEND} - virtual/acl - virtual/pkgconfig - sys-devel/bison - sys-devel/flex - 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 )" - -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 - - # Needed for statedumps - # https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3 - enewgroup gluster - enewuser gluster -1 -1 "${EPREFIX}"/var/run/gluster gluster -} - -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-dependency-tracking \ - --disable-silent-rules \ - --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 \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --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 -} -- cgit v1.2.3