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