Gentoo Archives: gentoo-commits

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