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