Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/
Date: Tue, 30 Jun 2020 13:31:18
Message-Id: 1593523856.9eeec6b5730cb7cd51f548e92f216ed9ed77b181.whissi@gentoo
1 commit: 9eeec6b5730cb7cd51f548e92f216ed9ed77b181
2 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Tue Jun 30 08:29:17 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 30 13:30:56 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eeec6b5
7
8 sys-cluster/glusterfs: bump to 6.9
9
10 Package-Manager: Portage-2.3.102, Repoman-2.3.23
11 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 sys-cluster/glusterfs/Manifest | 1 +
15 sys-cluster/glusterfs/glusterfs-6.9.ebuild | 211 +++++++++++++++++++++++++++++
16 2 files changed, 212 insertions(+)
17
18 diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
19 index 82df78bdd8b..d63476847c3 100644
20 --- a/sys-cluster/glusterfs/Manifest
21 +++ b/sys-cluster/glusterfs/Manifest
22 @@ -2,6 +2,7 @@ DIST glusterfs-4.1.8.tar.gz 7835272 BLAKE2B 2546b9c0fe38989df71b8f72b193ce42c499
23 DIST glusterfs-6.5.tar.gz 7536238 BLAKE2B 35c58da9e8564bda1f34b095f14316148cae2b5ff1820d22ae945a06d34ac57aea968e5914af3f5831250fd591a103fe4022e160bb96d491a7c915b5b68c54e7 SHA512 b7356de07e8126aea80b0489b9ac39ce0d10ea324fe38d05ff5740765e886f80fc7e6bdda9d4db1371d7b955b055cb76ea29e918e759a575db331a6436bad90f
24 DIST glusterfs-6.7.tar.gz 7565257 BLAKE2B bb38383cad0cbf890b89dd75f7b260d21b381aed6da0bf7cf7b3335941d8e195fe5ff60a1c882df941daeb8ad627fddd1a44223c62d71e2388fd85a7ea46a386 SHA512 64d576c91e5accdb3547dc7216d854e96512c9035ddb87dc4018930f2b0a008ad929cd80ae89a340fca7a8d36e2106a30797d7b08768477b1415db95123e07d4
25 DIST glusterfs-6.8.tar.gz 7572097 BLAKE2B 76b7c699a4fc864d8074b591b3583030d837a0beb63bb54e93458930a4af29bd9b1874dd33f0b7aecbf57d7dc454d448e67b71f38975281108a9fed76f9cf4aa SHA512 a28af19aa0ab2a356a2b7eff447d6b39ff821d7da59037e91a38d8cb43f51f7007b790f765fcbaccf9107554b59174e72d8b1ae9947e6342d2815bfae1adbad7
26 +DIST glusterfs-6.9.tar.gz 7580928 BLAKE2B 655544b7ffa70ac9980e1a1041af538f473b6b6c8cb77f6e3447908b903b3a2b3ee0234c18fb71f997f31f24f8a790ab2f5a05a6b392090601db455ac726262a SHA512 3bf167aed4f572f94ad4708c5fff7b578a334af1eb0322c36e15127a2089b6359e8d91a36793d8af93c8f76dbdf6ded649c3e0a6c1a879163c8d8b640cea334b
27 DIST glusterfs-7.2.tar.gz 7630773 BLAKE2B abceafd06ca8f5de1c84708a1a3ec4453c5d536d8811b773fa6f5dd02d6e3d450c329bc4d0fa32d970ff57e82a1fe3aa48ec9c3a7d3d5ca5817a91e8930b1b6e SHA512 fd1059222c4d30fa5c4011083c3c53af44433180ae124c884a774628051d31d95386bef71d4d25ed2b0c5dd8d9a6936601e8e37d963b34d291cb88ea45e31ff2
28 DIST glusterfs-7.3.tar.gz 7636144 BLAKE2B 8595e4eafc66b6b926d9aad220b569d7f5ae22b020ee3701db37f3db9dba6a33f805cebe322fb0423a1a8f18b85685411fa967beb34b03028d23b24725c5be00 SHA512 901f55d5084e90f4b5907fbbe7d5f7d1937198b500efc369651970053029b727c0bfc6180b6058a3211523b4e16a63bf821b1a9f81dfc1b87b2061d271ec9b3f
29 DIST glusterfs-7.5.tar.gz 7649044 BLAKE2B 01088654051a33c3a009b42c6e7adf7cabc52927a83a3331eced428ed3e6bfb3f7198fcc53a2b1dce678ac58c2f2619d02cce72a9850a50f3a26b37d39baeeaa SHA512 dfd8f04fb398daa7d7f58ef978ab69c0a55a313ac2af3287f7e1e7044f708317227c8749af5fd8d56844dfb8ad47bbd3214c42b806e2e21191a6a8617ab0be38
30
31 diff --git a/sys-cluster/glusterfs/glusterfs-6.9.ebuild b/sys-cluster/glusterfs/glusterfs-6.9.ebuild
32 new file mode 100644
33 index 00000000000..14d47e54215
34 --- /dev/null
35 +++ b/sys-cluster/glusterfs/glusterfs-6.9.ebuild
36 @@ -0,0 +1,211 @@
37 +# Copyright 1999-2020 Gentoo Authors
38 +# Distributed under the terms of the GNU General Public License v2
39 +
40 +EAPI=7
41 +
42 +PYTHON_COMPAT=( python3_{6..9} )
43 +
44 +inherit autotools elisp-common python-single-r1 systemd
45 +
46 +if [[ ${PV#9999} != ${PV} ]]; then
47 + inherit git-r3
48 + EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
49 +else
50 + SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
51 + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
52 +fi
53 +
54 +DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
55 +HOMEPAGE="https://www.gluster.org/"
56 +
57 +LICENSE="|| ( GPL-2 LGPL-3+ )"
58 +SLOT="0"
59 +IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
60 +
61 +REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
62 + ipv6? ( libtirpc )"
63 +
64 +# the tests must be run as root
65 +RESTRICT="test"
66 +
67 +# sys-apps/util-linux is required for libuuid
68 +RDEPEND="
69 + acct-group/gluster
70 + acct-user/gluster
71 + dev-libs/libaio
72 + dev-libs/userspace-rcu:=
73 + net-libs/rpcsvc-proto
74 + sys-apps/util-linux
75 + sys-libs/readline:=
76 + emacs? ( >=app-editors/emacs-23.1:* )
77 + fuse? ( >=sys-fs/fuse-2.7.0:0 )
78 + georeplication? ( ${PYTHON_DEPS} )
79 + infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
80 + xml? ( dev-libs/libxml2 )
81 + !elibc_glibc? ( sys-libs/argp-standalone )
82 + libtirpc? ( net-libs/libtirpc:= )
83 + !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
84 + !libressl? ( dev-libs/openssl:=[-bindist] )
85 + libressl? ( dev-libs/libressl:= )
86 +"
87 +DEPEND="
88 + ${RDEPEND}
89 + sys-devel/bison
90 + sys-devel/flex
91 + virtual/acl
92 + test? ( >=dev-util/cmocka-1.0.1
93 + app-benchmarks/dbench
94 + dev-vcs/git
95 + net-fs/nfs-utils
96 + virtual/perl-Test-Harness
97 + dev-libs/yajl
98 + sys-fs/xfsprogs
99 + sys-apps/attr )
100 +"
101 +BDEPEND="
102 + virtual/pkgconfig
103 +"
104 +
105 +SITEFILE="50${PN}-mode-gentoo.el"
106 +
107 +DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
108 +
109 +# Maintainer notes:
110 +# * The build system will always configure & build argp-standalone but it'll never use it
111 +# if the argp.h header is found in the system. Which should be the case with
112 +# glibc or if argp-standalone is installed.
113 +
114 +pkg_setup() {
115 + python_setup "python3*"
116 + python-single-r1_pkg_setup
117 +}
118 +
119 +src_prepare() {
120 + default
121 +
122 + # https://bugs.gentoo.org/705536
123 + # https://bugzilla.redhat.com/show_bug.cgi?id=1793990
124 + eapply "${FILESDIR}/glusterfs-6.7-fix-seek.patch"
125 +
126 + # build rpc-transport and xlators only once as shared libs
127 + find rpc/rpc-transport xlators -name Makefile.am |
128 + xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
129 +
130 + # fix execution permissions
131 + chmod +x libglusterfs/src/gen-defaults.py || die
132 +
133 + eautoreconf
134 +}
135 +
136 +src_configure() {
137 + econf \
138 + --disable-fusermount \
139 + $(use_enable debug) \
140 + $(use_enable fuse fuse-client) \
141 + $(use_enable georeplication) \
142 + $(use_enable infiniband ibverbs) \
143 + $(use_enable static-libs static) \
144 + $(use_enable syslog) \
145 + $(use_enable test cmocka) \
146 + $(use_enable xml xml-output) \
147 + $(use libtirpc || echo --without-libtirpc) \
148 + $(use ipv6 && echo --with-ipv6-default) \
149 + --with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
150 + --localstatedir="${EPREFIX}"/var
151 +}
152 +
153 +src_compile() {
154 + default
155 + use emacs && elisp-compile extras/glusterfs-mode.el
156 +}
157 +
158 +src_install() {
159 + default
160 +
161 + rm \
162 + "${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
163 + "${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
164 + "${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
165 +
166 + insinto /etc/logrotate.d
167 + newins "${FILESDIR}"/glusterfs.logrotate glusterfs
168 +
169 + if use rsyslog ; then
170 + insinto /etc/rsyslog.d
171 + newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
172 + fi
173 +
174 + if use emacs ; then
175 + elisp-install ${PN} extras/glusterfs-mode.el*
176 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
177 + fi
178 +
179 + if use vim-syntax ; then
180 + insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
181 + insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
182 + fi
183 +
184 + # insert some other tools which might be useful
185 + insinto /usr/share/glusterfs/scripts
186 + doins \
187 + extras/backend-{cleanup,xattr-sanitize}.sh \
188 + extras/clear_xattrs.sh \
189 + extras/migrate-unify-to-distribute.sh
190 +
191 + # correct permissions on installed scripts
192 + # fperms 0755 /usr/share/glusterfs/scripts/*.sh
193 + chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
194 +
195 + if use georeplication ; then
196 + # move the gsync-sync-gfid tool to a binary path
197 + # and set a symlink to be compliant with all other distros
198 + mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
199 + dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
200 + fi
201 +
202 + newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
203 + newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
204 + newconfd "${FILESDIR}/${PN}.confd" glusterfsd
205 +
206 + keepdir /var/log/${PN}
207 + keepdir /var/lib/glusterd/{events,glusterfind/.keys}
208 +
209 + # QA
210 + rm -r "${ED}/var/run/" || die
211 + if ! use static-libs; then
212 + find "${D}" -type f -name '*.la' -delete || die
213 + fi
214 +}
215 +
216 +src_test() {
217 + ./run-tests.sh || die
218 +}
219 +
220 +pkg_postinst() {
221 + elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
222 + elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
223 + elog " /etc/init.d/glusterd start"
224 + echo
225 + elog "For static configurations, the glusterfsd startup script can be multiplexed."
226 + elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
227 + elog "separate service. To create additional instances of the glusterfsd service"
228 + elog "simply create a symlink to the glusterfsd startup script."
229 + echo
230 + elog "Example:"
231 + elog " # ln -s glusterfsd /etc/init.d/glusterfsd2"
232 + elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
233 + elog "You can now treat glusterfsd2 like any other service"
234 + echo
235 + ewarn "You need to use a ntp client to keep the clocks synchronized across all"
236 + ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
237 + ewarn "run GlusterFS."
238 + echo
239 + elog "If you are upgrading from a previous version of ${PN}, please read:"
240 + elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
241 +
242 + use emacs && elisp-site-regen
243 +}
244 +
245 +pkg_postrm() {
246 + use emacs && elisp-site-regen
247 +}