1 |
commit: dd3ee9c37a203fefe6c6de23136aa1542ea398ce |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 28 10:08:04 2017 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 28 10:08:04 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3ee9c3 |
7 |
|
8 |
sys-cluster/glusterfs: Drop vulnerable 3.6.5 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/635172 |
11 |
Closes: https://bugs.gentoo.org/635172 |
12 |
Closes: https://bugs.gentoo.org/635172 |
13 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
14 |
|
15 |
sys-cluster/glusterfs/Manifest | 1 - |
16 |
sys-cluster/glusterfs/files/glusterd-r2.initd | 32 -- |
17 |
.../files/glusterfs-3.4.0-silent_rules.patch | 23 - |
18 |
...libraries-using-LIBADD-instead-of-LDFLAGS.patch | 54 -- |
19 |
.../files/glusterfs-3.6.5-build-shared-only.patch | 547 --------------------- |
20 |
sys-cluster/glusterfs/glusterfs-3.6.5.ebuild | 182 ------- |
21 |
6 files changed, 839 deletions(-) |
22 |
|
23 |
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest |
24 |
index 3dcadc08908..78d1fe1e8d0 100644 |
25 |
--- a/sys-cluster/glusterfs/Manifest |
26 |
+++ b/sys-cluster/glusterfs/Manifest |
27 |
@@ -1,2 +1 @@ |
28 |
DIST glusterfs-3.12.3.tar.gz 7187644 BLAKE2B 736c6bb408b0bd289ce5ce0abcc7e8bf4b7f96e4e92a1e669f016b59fb16993b17f7cf50fed09a6eeb851b57054c7bf9e595b642c506b0aca567d7ae80de0e84 SHA512 f648b8324a69360b510c947e49918467c969dcc21b6a408b6916b780aa78c44abe027b6c84d696eed7d5f381b055edd3be1dfe4f3ea8f76d15d9319cd08cfa3d |
29 |
-DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e |
30 |
|
31 |
diff --git a/sys-cluster/glusterfs/files/glusterd-r2.initd b/sys-cluster/glusterfs/files/glusterd-r2.initd |
32 |
deleted file mode 100644 |
33 |
index 924939400f3..00000000000 |
34 |
--- a/sys-cluster/glusterfs/files/glusterd-r2.initd |
35 |
+++ /dev/null |
36 |
@@ -1,32 +0,0 @@ |
37 |
-#!/sbin/openrc-run |
38 |
-# Copyright 1999-2015 Gentoo Foundation |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-description="Gluster elastic volume management daemon" |
42 |
-command="/usr/sbin/glusterd" |
43 |
-pidfile="/var/run/${SVCNAME}.pid" |
44 |
-command_args="-N" |
45 |
- |
46 |
-command_background="yes" |
47 |
- |
48 |
-depend() { |
49 |
- need net |
50 |
- before netmount |
51 |
-} |
52 |
- |
53 |
-start_pre() { |
54 |
- # Ensure that the GlusterFS auxiliary mount parent directory exists |
55 |
- checkpath --directory --owner root:root --mode 0700 /var/run/gluster |
56 |
-} |
57 |
- |
58 |
-start_post() { |
59 |
- local c=0 |
60 |
- ebegin "Waiting for glusterd to start up" |
61 |
- while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do |
62 |
- (( ++c )) |
63 |
- done |
64 |
- [ "${c}" -lt "${glusterd_max_wait_start-60}" ] |
65 |
- eend $? |
66 |
- |
67 |
- return 0 |
68 |
-} |
69 |
|
70 |
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch |
71 |
deleted file mode 100644 |
72 |
index 1b79e0d079e..00000000000 |
73 |
--- a/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch |
74 |
+++ /dev/null |
75 |
@@ -1,23 +0,0 @@ |
76 |
---- configure.ac 2013-07-12 19:43:26.000000000 +0200 |
77 |
-+++ configure.ac2 2013-07-25 13:58:48.294091861 +0200 |
78 |
-@@ -10,20 +10,6 @@ |
79 |
- |
80 |
- AM_INIT_AUTOMAKE |
81 |
- |
82 |
--m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) |
83 |
-- |
84 |
--if make --help 2>&1 | grep -q no-print-directory; then |
85 |
-- AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory"; |
86 |
--fi |
87 |
-- |
88 |
--if make --help 2>&1 | grep -q quiet; then |
89 |
-- AM_MAKEFLAGS="$AM_MAKEFLAGS --quiet" |
90 |
--fi |
91 |
-- |
92 |
--if libtool --help 2>&1 | grep -q quiet; then |
93 |
-- AM_LIBTOOLFLAGS="--quiet"; |
94 |
--fi |
95 |
-- |
96 |
- AC_CONFIG_HEADERS([config.h]) |
97 |
- |
98 |
- AC_CONFIG_FILES([Makefile |
99 |
|
100 |
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch b/sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch |
101 |
deleted file mode 100644 |
102 |
index 5c4df0c9702..00000000000 |
103 |
--- a/sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch |
104 |
+++ /dev/null |
105 |
@@ -1,54 +0,0 @@ |
106 |
-From 8bfe3752c3a0a4db49a879048cdd089da6c45ed0 Mon Sep 17 00:00:00 2001 |
107 |
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@××××××××.ch> |
108 |
-Date: Thu, 26 Jun 2014 19:04:54 +0200 |
109 |
-Subject: [PATCH] Add libraries using LIBADD instead of LDFLAGS |
110 |
- |
111 |
---- |
112 |
- xlators/encryption/crypt/src/Makefile.am | 6 +++--- |
113 |
- xlators/features/compress/src/Makefile.am | 4 ++-- |
114 |
- 2 files changed, 5 insertions(+), 5 deletions(-) |
115 |
- |
116 |
-diff --git a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am |
117 |
-index b13f650..d7ebac6 100644 |
118 |
---- a/xlators/encryption/crypt/src/Makefile.am |
119 |
-+++ b/xlators/encryption/crypt/src/Makefile.am |
120 |
-@@ -3,10 +3,10 @@ if ENABLE_CRYPT_XLATOR |
121 |
- xlator_LTLIBRARIES = crypt.la |
122 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption |
123 |
- |
124 |
--crypt_la_LDFLAGS = -module -avoid-version -lssl -lcrypto |
125 |
-+crypt_la_LDFLAGS = -module -avoid-version |
126 |
- |
127 |
- crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c |
128 |
--crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
129 |
-+crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto |
130 |
- |
131 |
- noinst_HEADERS = crypt-common.h crypt-mem-types.h crypt.h metadata.h |
132 |
- |
133 |
-@@ -21,4 +21,4 @@ else |
134 |
- noinst_DIST = keys.c data.c metadata.c atom.c crypt.c |
135 |
- noinst_HEADERS = crypt-common.h crypt-mem-types.h crypt.h metadata.h |
136 |
- |
137 |
--endif |
138 |
-\ No newline at end of file |
139 |
-+endif |
140 |
-diff --git a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am |
141 |
-index 0bf757c..d3abe03 100644 |
142 |
---- a/xlators/features/compress/src/Makefile.am |
143 |
-+++ b/xlators/features/compress/src/Makefile.am |
144 |
-@@ -4,10 +4,10 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
145 |
- |
146 |
- noinst_HEADERS = cdc.h cdc-mem-types.h |
147 |
- |
148 |
--cdc_la_LDFLAGS = -module -avoid-version $(LIBZ_LIBS) |
149 |
-+cdc_la_LDFLAGS = -module -avoid-version |
150 |
- |
151 |
- cdc_la_SOURCES = cdc.c cdc-helper.c |
152 |
--cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
153 |
-+cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS) |
154 |
- |
155 |
- AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) \ |
156 |
- -shared -nostartfiles $(LIBZ_CFLAGS) |
157 |
--- |
158 |
-1.9.2 |
159 |
- |
160 |
|
161 |
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch b/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch |
162 |
deleted file mode 100644 |
163 |
index af5332bc9b1..00000000000 |
164 |
--- a/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch |
165 |
+++ /dev/null |
166 |
@@ -1,547 +0,0 @@ |
167 |
-diff -ur a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am |
168 |
---- a/rpc/rpc-transport/rdma/src/Makefile.am 2015-08-28 10:56:17.750192744 +0200 |
169 |
-+++ b/rpc/rpc-transport/rdma/src/Makefile.am 2015-08-28 11:00:36.322686236 +0200 |
170 |
-@@ -3,7 +3,7 @@ |
171 |
- transport_LTLIBRARIES = rdma.la |
172 |
- transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport |
173 |
- |
174 |
--rdma_la_LDFLAGS = -module -avoid-version -nostartfiles |
175 |
-+rdma_la_LDFLAGS = -module -avoid-version -nostartfiles -shared |
176 |
- |
177 |
- rdma_la_SOURCES = rdma.c name.c |
178 |
- rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ |
179 |
-Only in b/rpc/rpc-transport/rdma/src: Makefile.am.orig |
180 |
-Only in b/rpc/rpc-transport/rdma/src: Makefile.am.rej |
181 |
-diff -ur a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am |
182 |
---- a/rpc/rpc-transport/socket/src/Makefile.am 2015-08-28 10:56:17.750192744 +0200 |
183 |
-+++ b/rpc/rpc-transport/socket/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
184 |
-@@ -3,7 +3,7 @@ |
185 |
- rpctransport_LTLIBRARIES = socket.la |
186 |
- rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport |
187 |
- |
188 |
--socket_la_LDFLAGS = -module -avoid-version |
189 |
-+socket_la_LDFLAGS = -module -avoid-version -shared |
190 |
- |
191 |
- socket_la_SOURCES = socket.c name.c |
192 |
- socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl |
193 |
-diff -ur a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am |
194 |
---- a/xlators/cluster/afr/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
195 |
-+++ b/xlators/cluster/afr/src/Makefile.am 2015-08-28 11:01:31.603219323 +0200 |
196 |
-@@ -10,11 +10,11 @@ |
197 |
- afr-self-heal-entry.c afr-self-heal-metadata.c afr-self-heald.c \ |
198 |
- afr-self-heal-name.c |
199 |
- |
200 |
--afr_la_LDFLAGS = -module -avoid-version |
201 |
-+afr_la_LDFLAGS = -module -avoid-version -shared |
202 |
- afr_la_SOURCES = $(afr_common_source) $(AFR_SELFHEAL_SOURCES) afr.c |
203 |
- afr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
204 |
- |
205 |
--pump_la_LDFLAGS = -module -avoid-version |
206 |
-+pump_la_LDFLAGS = -module -avoid-version -shared |
207 |
- pump_la_SOURCES = $(afr_common_source) $(AFR_SELFHEAL_SOURCES) pump.c |
208 |
- pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
209 |
- |
210 |
-Only in b/xlators/cluster/afr/src: Makefile.am.orig |
211 |
-Only in b/xlators/cluster/afr/src: Makefile.am.rej |
212 |
-diff -ur a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am |
213 |
---- a/xlators/cluster/dht/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
214 |
-+++ b/xlators/cluster/dht/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
215 |
-@@ -11,13 +11,13 @@ |
216 |
- nufa_la_SOURCES = $(dht_common_source) nufa.c |
217 |
- switch_la_SOURCES = $(dht_common_source) switch.c |
218 |
- |
219 |
--dht_la_LDFLAGS = -module -avoid-version |
220 |
-+dht_la_LDFLAGS = -module -avoid-version -shared |
221 |
- dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
222 |
- |
223 |
--nufa_la_LDFLAGS = -module -avoid-version |
224 |
-+nufa_la_LDFLAGS = -module -avoid-version -shared |
225 |
- nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
226 |
- |
227 |
--switch_la_LDFLAGS = -module -avoid-version |
228 |
-+switch_la_LDFLAGS = -module -avoid-version -shared |
229 |
- switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
230 |
- |
231 |
- noinst_HEADERS = dht-common.h dht-mem-types.h dht-messages.h dht-helper.h \ |
232 |
-Only in b/xlators/cluster/dht/src: Makefile.am.orig |
233 |
-diff -ur a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am |
234 |
---- a/xlators/cluster/stripe/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
235 |
-+++ b/xlators/cluster/stripe/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
236 |
-@@ -1,7 +1,7 @@ |
237 |
- xlator_LTLIBRARIES = stripe.la |
238 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster |
239 |
- |
240 |
--stripe_la_LDFLAGS = -module -avoid-version |
241 |
-+stripe_la_LDFLAGS = -module -avoid-version -shared |
242 |
- |
243 |
- stripe_la_SOURCES = stripe.c stripe-helpers.c \ |
244 |
- $(top_builddir)/xlators/lib/src/libxlator.c |
245 |
-Only in b/xlators/cluster/stripe/src: Makefile.am.orig |
246 |
-diff -ur a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am |
247 |
---- a/xlators/debug/error-gen/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
248 |
-+++ b/xlators/debug/error-gen/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
249 |
-@@ -2,7 +2,7 @@ |
250 |
- xlator_LTLIBRARIES = error-gen.la |
251 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug |
252 |
- |
253 |
--error_gen_la_LDFLAGS = -module -avoid-version |
254 |
-+error_gen_la_LDFLAGS = -module -avoid-version -shared |
255 |
- |
256 |
- error_gen_la_SOURCES = error-gen.c |
257 |
- error_gen_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
258 |
-diff -ur a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am |
259 |
---- a/xlators/debug/io-stats/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
260 |
-+++ b/xlators/debug/io-stats/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
261 |
-@@ -2,7 +2,7 @@ |
262 |
- xlator_LTLIBRARIES = io-stats.la |
263 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug |
264 |
- |
265 |
--io_stats_la_LDFLAGS = -module -avoid-version |
266 |
-+io_stats_la_LDFLAGS = -module -avoid-version -shared |
267 |
- |
268 |
- io_stats_la_SOURCES = io-stats.c |
269 |
- io_stats_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
270 |
-diff -ur a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am |
271 |
---- a/xlators/debug/trace/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
272 |
-+++ b/xlators/debug/trace/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
273 |
-@@ -2,7 +2,7 @@ |
274 |
- xlator_LTLIBRARIES = trace.la |
275 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug |
276 |
- |
277 |
--trace_la_LDFLAGS = -module -avoid-version |
278 |
-+trace_la_LDFLAGS = -module -avoid-version -shared |
279 |
- |
280 |
- trace_la_SOURCES = trace.c |
281 |
- trace_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
282 |
-diff -ur a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am |
283 |
---- a/xlators/encryption/crypt/src/Makefile.am 2015-08-28 11:18:28.073021439 +0200 |
284 |
-+++ b/xlators/encryption/crypt/src/Makefile.am 2015-08-28 11:16:28.051864039 +0200 |
285 |
-@@ -3,7 +3,7 @@ |
286 |
- xlator_LTLIBRARIES = crypt.la |
287 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption |
288 |
- |
289 |
--crypt_la_LDFLAGS = -module -avoid-version |
290 |
-+crypt_la_LDFLAGS = -module -avoid-version -shared |
291 |
- |
292 |
- crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c |
293 |
- crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto |
294 |
-Only in b/xlators/encryption/crypt/src: Makefile.am.orig |
295 |
-Only in b/xlators/encryption/crypt/src: Makefile.am.rej |
296 |
-diff -ur a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am |
297 |
---- a/xlators/encryption/rot-13/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
298 |
-+++ b/xlators/encryption/rot-13/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
299 |
-@@ -1,7 +1,7 @@ |
300 |
- xlator_LTLIBRARIES = rot-13.la |
301 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption |
302 |
- |
303 |
--rot_13_la_LDFLAGS = -module -avoid-version |
304 |
-+rot_13_la_LDFLAGS = -module -avoid-version -shared |
305 |
- |
306 |
- rot_13_la_SOURCES = rot-13.c |
307 |
- rot_13_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
308 |
-diff -ur a/xlators/features/changelog/src/Makefile.am b/xlators/features/changelog/src/Makefile.am |
309 |
---- a/xlators/features/changelog/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
310 |
-+++ b/xlators/features/changelog/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
311 |
-@@ -5,7 +5,7 @@ |
312 |
- noinst_HEADERS = changelog-helpers.h changelog-mem-types.h changelog-rt.h \ |
313 |
- changelog-misc.h changelog-encoders.h changelog-notifier.h |
314 |
- |
315 |
--changelog_la_LDFLAGS = -module -avoid-version |
316 |
-+changelog_la_LDFLAGS = -module -avoid-version -shared |
317 |
- |
318 |
- changelog_la_SOURCES = changelog.c changelog-rt.c changelog-helpers.c \ |
319 |
- changelog-encoders.c changelog-notifier.c changelog-barrier.c |
320 |
-Only in b/xlators/features/changelog/src: Makefile.am.orig |
321 |
-diff -ur a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am |
322 |
---- a/xlators/features/compress/src/Makefile.am 2015-08-28 11:18:28.073021439 +0200 |
323 |
-+++ b/xlators/features/compress/src/Makefile.am 2015-08-28 11:17:19.492360095 +0200 |
324 |
-@@ -4,7 +4,7 @@ |
325 |
- |
326 |
- noinst_HEADERS = cdc.h cdc-mem-types.h |
327 |
- |
328 |
--cdc_la_LDFLAGS = -module -avoid-version |
329 |
-+cdc_la_LDFLAGS = -module -avoid-version -shared |
330 |
- |
331 |
- cdc_la_SOURCES = cdc.c cdc-helper.c |
332 |
- cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS) |
333 |
-Only in b/xlators/features/compress/src: Makefile.am.rej |
334 |
-diff -ur a/xlators/features/gfid-access/src/Makefile.am b/xlators/features/gfid-access/src/Makefile.am |
335 |
---- a/xlators/features/gfid-access/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
336 |
-+++ b/xlators/features/gfid-access/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
337 |
-@@ -1,7 +1,7 @@ |
338 |
- xlator_LTLIBRARIES = gfid-access.la |
339 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
340 |
- |
341 |
--gfid_access_la_LDFLAGS = -module -avoid-version |
342 |
-+gfid_access_la_LDFLAGS = -module -avoid-version -shared |
343 |
- |
344 |
- gfid_access_la_SOURCES = gfid-access.c |
345 |
- gfid_access_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
346 |
-diff -ur a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am |
347 |
---- a/xlators/features/index/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
348 |
-+++ b/xlators/features/index/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
349 |
-@@ -1,7 +1,7 @@ |
350 |
- xlator_LTLIBRARIES = index.la |
351 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
352 |
- |
353 |
--index_la_LDFLAGS = -module -avoid-version |
354 |
-+index_la_LDFLAGS = -module -avoid-version -shared |
355 |
- |
356 |
- index_la_SOURCES = index.c |
357 |
- index_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
358 |
-diff -ur a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am |
359 |
---- a/xlators/features/locks/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
360 |
-+++ b/xlators/features/locks/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
361 |
-@@ -1,7 +1,7 @@ |
362 |
- xlator_LTLIBRARIES = locks.la |
363 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
364 |
- |
365 |
--locks_la_LDFLAGS = -module -avoid-version |
366 |
-+locks_la_LDFLAGS = -module -avoid-version -shared |
367 |
- |
368 |
- locks_la_SOURCES = common.c posix.c entrylk.c inodelk.c reservelk.c \ |
369 |
- clear.c |
370 |
-diff -ur a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am |
371 |
---- a/xlators/features/mac-compat/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
372 |
-+++ b/xlators/features/mac-compat/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
373 |
-@@ -1,7 +1,7 @@ |
374 |
- xlator_LTLIBRARIES = mac-compat.la |
375 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
376 |
- |
377 |
--mac_compat_la_LDFLAGS = -module -avoid-version |
378 |
-+mac_compat_la_LDFLAGS = -module -avoid-version -shared |
379 |
- |
380 |
- mac_compat_la_SOURCES = mac-compat.c |
381 |
- mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
382 |
-diff -ur a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am |
383 |
---- a/xlators/features/marker/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
384 |
-+++ b/xlators/features/marker/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
385 |
-@@ -1,7 +1,7 @@ |
386 |
- xlator_LTLIBRARIES = marker.la |
387 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
388 |
- |
389 |
--marker_la_LDFLAGS = -module -avoid-version |
390 |
-+marker_la_LDFLAGS = -module -avoid-version -shared |
391 |
- |
392 |
- marker_la_SOURCES = marker.c marker-quota.c marker-quota-helper.c marker-common.c |
393 |
- marker_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
394 |
-diff -ur a/xlators/features/protect/src/Makefile.am b/xlators/features/protect/src/Makefile.am |
395 |
---- a/xlators/features/protect/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
396 |
-+++ b/xlators/features/protect/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
397 |
-@@ -2,15 +2,15 @@ |
398 |
- |
399 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
400 |
- |
401 |
--prot_dht_la_LDFLAGS = -module -avoid-version |
402 |
-+prot_dht_la_LDFLAGS = -module -avoid-version -shared |
403 |
- prot_dht_la_SOURCES = prot_dht.c |
404 |
- prot_dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
405 |
- |
406 |
--prot_client_la_LDFLAGS = -module -avoid-version |
407 |
-+prot_client_la_LDFLAGS = -module -avoid-version -shared |
408 |
- prot_client_la_SOURCES = prot_client.c |
409 |
- prot_client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
410 |
- |
411 |
--prot_server_la_LDFLAGS = -module -avoid-version |
412 |
-+prot_server_la_LDFLAGS = -module -avoid-version -shared |
413 |
- prot_server_la_SOURCES = prot_server.c |
414 |
- prot_server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
415 |
- |
416 |
-diff -ur a/xlators/features/qemu-block/src/Makefile.am b/xlators/features/qemu-block/src/Makefile.am |
417 |
---- a/xlators/features/qemu-block/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
418 |
-+++ b/xlators/features/qemu-block/src/Makefile.am 2015-08-28 11:03:19.464259458 +0200 |
419 |
-@@ -2,7 +2,7 @@ |
420 |
- xlator_LTLIBRARIES = qemu-block.la |
421 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
422 |
- |
423 |
--qemu_block_la_LDFLAGS = -module -avoid-version |
424 |
-+qemu_block_la_LDFLAGS = -module -avoid-version -shared |
425 |
- qemu_block_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GLIB_LIBS) $(ZLIB_LIBS) -lrt |
426 |
- |
427 |
- qemu_block_la_SOURCES_qemu = \ |
428 |
-Only in b/xlators/features/qemu-block/src: Makefile.am.orig |
429 |
-Only in b/xlators/features/qemu-block/src: Makefile.am.rej |
430 |
-diff -ur a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am |
431 |
---- a/xlators/features/quiesce/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
432 |
-+++ b/xlators/features/quiesce/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
433 |
-@@ -1,7 +1,7 @@ |
434 |
- xlator_LTLIBRARIES = quiesce.la |
435 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
436 |
- |
437 |
--quiesce_la_LDFLAGS = -module -avoid-version |
438 |
-+quiesce_la_LDFLAGS = -module -avoid-version -shared |
439 |
- |
440 |
- quiesce_la_SOURCES = quiesce.c |
441 |
- quiesce_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
442 |
-diff -ur a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am |
443 |
---- a/xlators/features/quota/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
444 |
-+++ b/xlators/features/quota/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
445 |
-@@ -1,8 +1,8 @@ |
446 |
- xlator_LTLIBRARIES = quota.la quotad.la |
447 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
448 |
- |
449 |
--quota_la_LDFLAGS = -module -avoid-version |
450 |
--quotad_la_LDFLAGS = -module -avoid-version |
451 |
-+quota_la_LDFLAGS = -module -avoid-version -shared |
452 |
-+quotad_la_LDFLAGS = -module -avoid-version -shared |
453 |
- |
454 |
- quota_la_SOURCES = quota.c quota-enforcer-client.c |
455 |
- quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
456 |
-diff -ur a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am |
457 |
---- a/xlators/features/read-only/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
458 |
-+++ b/xlators/features/read-only/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
459 |
-@@ -4,12 +4,12 @@ |
460 |
- |
461 |
- noinst_HEADERS = read-only-common.h |
462 |
- |
463 |
--read_only_la_LDFLAGS = -module -avoid-version |
464 |
-+read_only_la_LDFLAGS = -module -avoid-version -shared |
465 |
- |
466 |
- read_only_la_SOURCES = read-only.c read-only-common.c |
467 |
- read_only_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
468 |
- |
469 |
--worm_la_LDFLAGS = -module -avoid-version |
470 |
-+worm_la_LDFLAGS = -module -avoid-version -shared |
471 |
- |
472 |
- worm_la_SOURCES = read-only-common.c worm.c |
473 |
- worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
474 |
-diff -ur a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am |
475 |
---- a/xlators/mgmt/glusterd/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
476 |
-+++ b/xlators/mgmt/glusterd/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
477 |
-@@ -1,7 +1,7 @@ |
478 |
- xlator_LTLIBRARIES = glusterd.la |
479 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt |
480 |
- glusterd_la_CPPFLAGS = $(AM_CPPFLAGS) "-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\"" |
481 |
--glusterd_la_LDFLAGS = -module -avoid-version |
482 |
-+glusterd_la_LDFLAGS = -module -avoid-version -shared |
483 |
- if ENABLE_BD_XLATOR |
484 |
- glusterd_la_LDFLAGS += -llvm2app |
485 |
- endif |
486 |
-diff -ur a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am |
487 |
---- a/xlators/mount/fuse/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
488 |
-+++ b/xlators/mount/fuse/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
489 |
-@@ -26,7 +26,7 @@ |
490 |
- fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \ |
491 |
- $(CONTRIBDIR)/fuse-lib/misc.c $(mount_source) |
492 |
- |
493 |
--fuse_la_LDFLAGS = -module -avoid-version |
494 |
-+fuse_la_LDFLAGS = -module -avoid-version -shared |
495 |
- fuse_la_LIBADD = @GF_FUSE_LDADD@ |
496 |
- |
497 |
- AM_CPPFLAGS = $(GF_CPPFLAGS) \ |
498 |
-Only in b/xlators/mount/fuse/src: Makefile.am.orig |
499 |
-diff -ur a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am |
500 |
---- a/xlators/nfs/server/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
501 |
-+++ b/xlators/nfs/server/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
502 |
-@@ -1,7 +1,7 @@ |
503 |
- xlator_LTLIBRARIES = server.la |
504 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/nfs |
505 |
- nfsrpclibdir = $(top_srcdir)/rpc/rpc-lib/src |
506 |
--server_la_LDFLAGS = -module -avoid-version |
507 |
-+server_la_LDFLAGS = -module -avoid-version -shared |
508 |
- server_la_SOURCES = nfs.c nfs-common.c nfs-fops.c nfs-inodes.c \ |
509 |
- nfs-generics.c mount3.c nfs3-fh.c nfs3.c nfs3-helpers.c nlm4.c \ |
510 |
- nlmcbk_svc.c mount3udp_svc.c acl3.c |
511 |
-diff -ur a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am |
512 |
---- a/xlators/performance/io-cache/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
513 |
-+++ b/xlators/performance/io-cache/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
514 |
-@@ -1,7 +1,7 @@ |
515 |
- xlator_LTLIBRARIES = io-cache.la |
516 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
517 |
- |
518 |
--io_cache_la_LDFLAGS = -module -avoid-version |
519 |
-+io_cache_la_LDFLAGS = -module -avoid-version -shared |
520 |
- |
521 |
- io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c |
522 |
- io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
523 |
-diff -ur a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am |
524 |
---- a/xlators/performance/io-threads/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
525 |
-+++ b/xlators/performance/io-threads/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
526 |
-@@ -1,7 +1,7 @@ |
527 |
- xlator_LTLIBRARIES = io-threads.la |
528 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
529 |
- |
530 |
--io_threads_la_LDFLAGS = -module -avoid-version |
531 |
-+io_threads_la_LDFLAGS = -module -avoid-version -shared |
532 |
- |
533 |
- io_threads_la_SOURCES = io-threads.c |
534 |
- io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
535 |
-diff -ur a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am |
536 |
---- a/xlators/performance/md-cache/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
537 |
-+++ b/xlators/performance/md-cache/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
538 |
-@@ -1,7 +1,7 @@ |
539 |
- xlator_LTLIBRARIES = md-cache.la |
540 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
541 |
- |
542 |
--md_cache_la_LDFLAGS = -module -avoid-version |
543 |
-+md_cache_la_LDFLAGS = -module -avoid-version -shared |
544 |
- |
545 |
- md_cache_la_SOURCES = md-cache.c |
546 |
- md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
547 |
-diff -ur a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am |
548 |
---- a/xlators/performance/open-behind/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
549 |
-+++ b/xlators/performance/open-behind/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
550 |
-@@ -1,7 +1,7 @@ |
551 |
- xlator_LTLIBRARIES = open-behind.la |
552 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
553 |
- |
554 |
--open_behind_la_LDFLAGS = -module -avoid-version |
555 |
-+open_behind_la_LDFLAGS = -module -avoid-version -shared |
556 |
- |
557 |
- open_behind_la_SOURCES = open-behind.c |
558 |
- open_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
559 |
-diff -ur a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am |
560 |
---- a/xlators/performance/quick-read/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
561 |
-+++ b/xlators/performance/quick-read/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
562 |
-@@ -1,7 +1,7 @@ |
563 |
- xlator_LTLIBRARIES = quick-read.la |
564 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
565 |
- |
566 |
--quick_read_la_LDFLAGS = -module -avoid-version |
567 |
-+quick_read_la_LDFLAGS = -module -avoid-version -shared |
568 |
- |
569 |
- quick_read_la_SOURCES = quick-read.c |
570 |
- quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
571 |
-diff -ur a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am |
572 |
---- a/xlators/performance/read-ahead/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
573 |
-+++ b/xlators/performance/read-ahead/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
574 |
-@@ -1,7 +1,7 @@ |
575 |
- xlator_LTLIBRARIES = read-ahead.la |
576 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
577 |
- |
578 |
--read_ahead_la_LDFLAGS = -module -avoid-version |
579 |
-+read_ahead_la_LDFLAGS = -module -avoid-version -shared |
580 |
- |
581 |
- read_ahead_la_SOURCES = read-ahead.c page.c |
582 |
- read_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
583 |
-diff -ur a/xlators/performance/readdir-ahead/src/Makefile.am b/xlators/performance/readdir-ahead/src/Makefile.am |
584 |
---- a/xlators/performance/readdir-ahead/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
585 |
-+++ b/xlators/performance/readdir-ahead/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
586 |
-@@ -1,7 +1,7 @@ |
587 |
- xlator_LTLIBRARIES = readdir-ahead.la |
588 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
589 |
- |
590 |
--readdir_ahead_la_LDFLAGS = -module -avoid-version |
591 |
-+readdir_ahead_la_LDFLAGS = -module -avoid-version -shared |
592 |
- |
593 |
- readdir_ahead_la_SOURCES = readdir-ahead.c |
594 |
- readdir_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
595 |
-diff -ur a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am |
596 |
---- a/xlators/performance/symlink-cache/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
597 |
-+++ b/xlators/performance/symlink-cache/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
598 |
-@@ -1,7 +1,7 @@ |
599 |
- xlator_LTLIBRARIES = symlink-cache.la |
600 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/performance |
601 |
- |
602 |
--symlink_cache_la_LDFLAGS = -module -avoid-version |
603 |
-+symlink_cache_la_LDFLAGS = -module -avoid-version -shared |
604 |
- |
605 |
- symlink_cache_la_SOURCES = symlink-cache.c |
606 |
- symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
607 |
-diff -ur a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am |
608 |
---- a/xlators/performance/write-behind/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
609 |
-+++ b/xlators/performance/write-behind/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
610 |
-@@ -1,7 +1,7 @@ |
611 |
- xlator_LTLIBRARIES = write-behind.la |
612 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
613 |
- |
614 |
--write_behind_la_LDFLAGS = -module -avoid-version |
615 |
-+write_behind_la_LDFLAGS = -module -avoid-version -shared |
616 |
- |
617 |
- write_behind_la_SOURCES = write-behind.c |
618 |
- write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
619 |
-diff -ur a/xlators/playground/template/src/Makefile.am b/xlators/playground/template/src/Makefile.am |
620 |
---- a/xlators/playground/template/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
621 |
-+++ b/xlators/playground/template/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
622 |
-@@ -1,7 +1,7 @@ |
623 |
- xlator_LTLIBRARIES = template.la |
624 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/features |
625 |
- |
626 |
--template_la_LDFLAGS = -module -avoid-version |
627 |
-+template_la_LDFLAGS = -module -avoid-version -shared |
628 |
- |
629 |
- template_la_SOURCES = template.c |
630 |
- template_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
631 |
-diff -ur a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am |
632 |
---- a/xlators/protocol/auth/addr/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
633 |
-+++ b/xlators/protocol/auth/addr/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
634 |
-@@ -1,7 +1,7 @@ |
635 |
- auth_LTLIBRARIES = addr.la |
636 |
- authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth |
637 |
- |
638 |
--addr_la_LDFLAGS = -module -avoid-version |
639 |
-+addr_la_LDFLAGS = -module -avoid-version -shared |
640 |
- |
641 |
- addr_la_SOURCES = addr.c |
642 |
- addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
643 |
-diff -ur a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am |
644 |
---- a/xlators/protocol/auth/login/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
645 |
-+++ b/xlators/protocol/auth/login/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
646 |
-@@ -1,7 +1,7 @@ |
647 |
- auth_LTLIBRARIES = login.la |
648 |
- authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth |
649 |
- |
650 |
--login_la_LDFLAGS = -module -avoid-version |
651 |
-+login_la_LDFLAGS = -module -avoid-version -shared |
652 |
- |
653 |
- login_la_SOURCES = login.c |
654 |
- login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
655 |
-diff -ur a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am |
656 |
---- a/xlators/protocol/client/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
657 |
-+++ b/xlators/protocol/client/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
658 |
-@@ -2,7 +2,7 @@ |
659 |
- xlator_LTLIBRARIES = client.la |
660 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol |
661 |
- |
662 |
--client_la_LDFLAGS = -module -avoid-version |
663 |
-+client_la_LDFLAGS = -module -avoid-version -shared |
664 |
- |
665 |
- client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ |
666 |
- $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ |
667 |
-diff -ur a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am |
668 |
---- a/xlators/protocol/server/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
669 |
-+++ b/xlators/protocol/server/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
670 |
-@@ -1,7 +1,7 @@ |
671 |
- xlator_LTLIBRARIES = server.la |
672 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol |
673 |
- |
674 |
--server_la_LDFLAGS = -module -avoid-version |
675 |
-+server_la_LDFLAGS = -module -avoid-version -shared |
676 |
- |
677 |
- server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ |
678 |
- $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ |
679 |
-diff -ur a/xlators/storage/bd/src/Makefile.am b/xlators/storage/bd/src/Makefile.am |
680 |
---- a/xlators/storage/bd/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
681 |
-+++ b/xlators/storage/bd/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
682 |
-@@ -2,7 +2,7 @@ |
683 |
- xlator_LTLIBRARIES = bd.la |
684 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage |
685 |
- |
686 |
--bd_la_LDFLAGS = -module -avoid-version |
687 |
-+bd_la_LDFLAGS = -module -avoid-version -shared |
688 |
- LIBBD = -llvm2app -lrt |
689 |
- bd_la_SOURCES = bd.c bd-helper.c bd-aio.c |
690 |
- bd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBBD) $(LIBAIO) |
691 |
-diff -ur a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am |
692 |
---- a/xlators/storage/posix/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
693 |
-+++ b/xlators/storage/posix/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
694 |
-@@ -2,7 +2,7 @@ |
695 |
- xlator_LTLIBRARIES = posix.la |
696 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage |
697 |
- |
698 |
--posix_la_LDFLAGS = -module -avoid-version |
699 |
-+posix_la_LDFLAGS = -module -avoid-version -shared |
700 |
- |
701 |
- posix_la_SOURCES = posix.c posix-helpers.c posix-handle.c posix-aio.c |
702 |
- posix_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBAIO) |
703 |
-diff -ur a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am |
704 |
---- a/xlators/system/posix-acl/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
705 |
-+++ b/xlators/system/posix-acl/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
706 |
-@@ -1,6 +1,6 @@ |
707 |
- xlator_LTLIBRARIES = posix-acl.la |
708 |
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/system |
709 |
--posix_acl_la_LDFLAGS = -module -avoid-version |
710 |
-+posix_acl_la_LDFLAGS = -module -avoid-version -shared |
711 |
- posix_acl_la_SOURCES = posix-acl.c posix-acl-xattr.c |
712 |
- posix_acl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
713 |
- |
714 |
|
715 |
diff --git a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild |
716 |
deleted file mode 100644 |
717 |
index 88fd9cdb399..00000000000 |
718 |
--- a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild |
719 |
+++ /dev/null |
720 |
@@ -1,182 +0,0 @@ |
721 |
-# Copyright 1999-2017 Gentoo Foundation |
722 |
-# Distributed under the terms of the GNU General Public License v2 |
723 |
- |
724 |
-EAPI=5 |
725 |
- |
726 |
-PYTHON_COMPAT=( python2_7 ) |
727 |
-AUTOTOOLS_AUTORECONF=1 |
728 |
- |
729 |
-inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator |
730 |
- |
731 |
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" |
732 |
-HOMEPAGE="http://www.gluster.org/" |
733 |
-SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz" |
734 |
- |
735 |
-LICENSE="|| ( GPL-2 LGPL-3+ )" |
736 |
-SLOT="0" |
737 |
-KEYWORDS="amd64 ppc ppc64 x86" |
738 |
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband qemu-block rsyslog static-libs +syslog systemtap vim-syntax +xml" |
739 |
- |
740 |
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} ) |
741 |
- glupy? ( ${PYTHON_REQUIRED_USE} )" |
742 |
- |
743 |
-RDEPEND="bd-xlator? ( sys-fs/lvm2 ) |
744 |
- emacs? ( virtual/emacs ) |
745 |
- fuse? ( >=sys-fs/fuse-2.7.0 ) |
746 |
- georeplication? ( ${PYTHON_DEPS} ) |
747 |
- infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) |
748 |
- qemu-block? ( dev-libs/glib:2 ) |
749 |
- systemtap? ( dev-util/systemtap ) |
750 |
- xml? ( dev-libs/libxml2 ) |
751 |
- sys-libs/readline:= |
752 |
- dev-libs/libaio |
753 |
- dev-libs/openssl:= |
754 |
- || ( sys-libs/glibc sys-libs/argp-standalone )" |
755 |
-DEPEND="${RDEPEND} |
756 |
- virtual/pkgconfig |
757 |
- sys-devel/bison |
758 |
- sys-devel/flex" |
759 |
- |
760 |
-SITEFILE="50${PN}-mode-gentoo.el" |
761 |
- |
762 |
-PATCHES=( |
763 |
- "${FILESDIR}/${PN}-3.4.0-silent_rules.patch" |
764 |
- "${FILESDIR}/${PN}-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch" |
765 |
- "${FILESDIR}/${PN}-3.6.5-build-shared-only.patch" |
766 |
-) |
767 |
- |
768 |
-DOCS=( AUTHORS ChangeLog NEWS README THANKS ) |
769 |
- |
770 |
-# Maintainer notes: |
771 |
-# * The build system will always configure & build argp-standalone but it'll never use it |
772 |
-# if the argp.h header is found in the system. Which should be the case with |
773 |
-# glibc or if argp-standalone is installed. |
774 |
- |
775 |
-pkg_setup() { |
776 |
- ( use georeplication || use glupy ) && python-single-r1_pkg_setup |
777 |
-} |
778 |
- |
779 |
-src_prepare() { |
780 |
- autotools-utils_src_prepare |
781 |
- |
782 |
- # contrib/argp-standalone source dir is not clean... |
783 |
- cd contrib/argp-standalone |
784 |
- emake distclean |
785 |
-} |
786 |
- |
787 |
-src_configure() { |
788 |
- local myeconfargs=( |
789 |
- --disable-dependency-tracking |
790 |
- --disable-silent-rules |
791 |
- --disable-fusermount |
792 |
- $(use_enable debug) |
793 |
- $(use_enable bd-xlator) |
794 |
- $(use_enable crypt-xlator) |
795 |
- $(use_enable fuse fuse-client) |
796 |
- $(use_enable georeplication) |
797 |
- $(use_enable glupy) |
798 |
- $(use_enable infiniband ibverbs) |
799 |
- $(use_enable qemu-block) |
800 |
- $(use_enable static-libs static) |
801 |
- $(use_enable syslog) |
802 |
- $(use_enable systemtap) |
803 |
- $(use_enable xml xml-output) |
804 |
- --docdir=/usr/share/doc/${PF} |
805 |
- --localstatedir=/var |
806 |
- ) |
807 |
- autotools-utils_src_configure |
808 |
-} |
809 |
- |
810 |
-src_compile() { |
811 |
- autotools-utils_src_compile |
812 |
- |
813 |
- use emacs && elisp-compile extras/glusterfs-mode.el |
814 |
-} |
815 |
- |
816 |
-src_install() { |
817 |
- autotools-utils_src_install |
818 |
- |
819 |
- rm \ |
820 |
- "${D}"/etc/glusterfs/glusterfs-{georep-,}logrotate \ |
821 |
- "${D}"/etc/glusterfs/gluster-rsyslog-*.conf \ |
822 |
- "${D}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed" |
823 |
- |
824 |
- insinto /etc/logrotate.d |
825 |
- newins "${FILESDIR}"/glusterfs.logrotate glusterfs |
826 |
- |
827 |
- if use rsyslog ; then |
828 |
- insinto /etc/rsyslog.d |
829 |
- newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf |
830 |
- fi |
831 |
- |
832 |
- if use emacs ; then |
833 |
- elisp-install ${PN} extras/glusterfs-mode.el* |
834 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
835 |
- fi |
836 |
- |
837 |
- if use vim-syntax ; then |
838 |
- insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim |
839 |
- insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim |
840 |
- fi |
841 |
- |
842 |
- # insert some other tools which might be useful |
843 |
- insinto /usr/share/glusterfs/scripts |
844 |
- doins \ |
845 |
- extras/backend-{cleanup,xattr-sanitize}.sh \ |
846 |
- extras/clear_xattrs.sh \ |
847 |
- extras/migrate-unify-to-distribute.sh |
848 |
- |
849 |
- # correct permissions on installed scripts |
850 |
- # fperms 0755 /usr/share/glusterfs/scripts/*.sh |
851 |
- chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die |
852 |
- |
853 |
- if use georeplication ; then |
854 |
- # move the gsync-sync-gfid tool to a binary path |
855 |
- # and set a symlink to be compliant with all other distros |
856 |
- mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die |
857 |
- dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid |
858 |
- fi |
859 |
- |
860 |
- newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd |
861 |
- newinitd "${FILESDIR}/glusterd-r2.initd" glusterd |
862 |
- newconfd "${FILESDIR}/${PN}.confd" glusterfsd |
863 |
- |
864 |
- keepdir /var/log/${PN} |
865 |
- keepdir /var/lib/glusterd |
866 |
- |
867 |
- # QA |
868 |
- rm -rf "${ED}/var/run/" || die |
869 |
- use static-libs || find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete |
870 |
- |
871 |
- use georeplication && python_fix_shebang "${ED}" |
872 |
-} |
873 |
- |
874 |
-pkg_postinst() { |
875 |
- elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" |
876 |
- elog "volumes dynamically. To do so, simply use the gluster CLI after running:" |
877 |
- elog " /etc/init.d/glusterd start" |
878 |
- echo |
879 |
- elog "For static configurations, the glusterfsd startup script can be multiplexed." |
880 |
- elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" |
881 |
- elog "separate service. To create additional instances of the glusterfsd service" |
882 |
- elog "simply create a symlink to the glusterfsd startup script." |
883 |
- echo |
884 |
- elog "Example:" |
885 |
- elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" |
886 |
- elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" |
887 |
- elog "You can now treat glusterfsd2 like any other service" |
888 |
- echo |
889 |
- ewarn "You need to use a ntp client to keep the clocks synchronized across all" |
890 |
- ewarn "of your servers. Setup a NTP synchronizing service before attempting to" |
891 |
- ewarn "run GlusterFS." |
892 |
- |
893 |
- elog |
894 |
- elog "If you are upgrading from a previous version of ${PN}, please read:" |
895 |
- elog " http://www.gluster.org/community/documentation/index.php/Upgrade_to_3.6" |
896 |
- |
897 |
- use emacs && elisp-site-regen |
898 |
-} |
899 |
- |
900 |
-pkg_postrm() { |
901 |
- use emacs && elisp-site-regen |
902 |
-} |