diff options
| author |   Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2017-02-10 16:55:20 +0100 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2017-02-10 23:33:12 +0100 |
| commit | b9d22571e6c37c2be1898ddc770e621942ab5877 (patch) | |
| tree | a2c81b873650271332eaf7da981a817d0fede4f0 /sys-cluster/glusterfs | |
| parent | sys-cluster/dlm: remove unused file (diff) | |
| download | gentoo-b9d22571e6c37c2be1898ddc770e621942ab5877.tar.gz gentoo-b9d22571e6c37c2be1898ddc770e621942ab5877.tar.bz2 gentoo-b9d22571e6c37c2be1898ddc770e621942ab5877.zip | |
sys-cluster/glusterfs: remove unused patches/files
Closes: https://github.com/gentoo/gentoo/pull/3900
Diffstat (limited to 'sys-cluster/glusterfs')
12 files changed, 0 insertions, 1409 deletions
diff --git a/sys-cluster/glusterfs/files/glusterd-3.2.0-workdir.patch b/sys-cluster/glusterfs/files/glusterd-3.2.0-workdir.patch deleted file mode 100644 index a312bdbc64d7..000000000000 --- a/sys-cluster/glusterfs/files/glusterd-3.2.0-workdir.patch +++ /dev/null @@ -1,49 +0,0 @@ -Change the default workdir of the glusterd daemon to /var/lib/glusterd instead of /etc/glusterd. -This directory is dynamically populated by glusterd via the gluster CLI so it does better -belong into /var/lib/. - -Patch by Ultrabug. - ---- a/xlators/mgmt/glusterd/src/glusterd.h 2010-10-13 06:20:37.000000000 +0200 -+++ b/xlators/mgmt/glusterd/src/glusterd.h 2010-10-26 10:47:52.747265444 +0200 -@@ -204,7 +204,7 @@ - GLUSTERD_VOL_COMP_RJT, - }; - --#define GLUSTERD_DEFAULT_WORKDIR "/etc/glusterd" -+#define GLUSTERD_DEFAULT_WORKDIR "/var/lib/glusterd" - #define GLUSTERD_DEFAULT_PORT GF_DEFAULT_BASE_PORT - #define GLUSTERD_INFO_FILE "glusterd.info" - #define GLUSTERD_VOLUME_DIR_PREFIX "vols" ---- a/doc/glusterd.vol 2010-10-13 06:20:36.000000000 +0200 -+++ b/doc/glusterd.vol 2010-10-26 10:48:16.487931870 +0200 -@@ -1,6 +1,6 @@ - volume management - type mgmt/glusterd -- option working-directory /etc/glusterd -+ option working-directory /var/lib/glusterd - option transport-type socket,rdma - option transport.socket.keepalive-time 10 - option transport.socket.keepalive-interval 2 ---- a/doc/glusterd.8 2010-10-13 06:20:36.000000000 +0200 -+++ b/doc/glusterd.8 2010-10-26 10:48:44.898729373 +0200 -@@ -70,7 +70,7 @@ - - .PP - .SH FILES --/etc/glusterd/* -+/var/lib/glusterd/* - - .SH SEE ALSO - .nf ---- a/doc/gluster.8 2011-04-22 19:37:28.000000000 +0200 -+++ b/doc/gluster.8 2011-05-16 11:56:14.318682346 +0200 -@@ -121,7 +121,7 @@ - Exit the gluster command line interface. - - .SH FILES --/etc/glusterd/* -+/var/lib/glusterd/* - .SH SEE ALSO - .nf - \fBfusermount\fR(1), \fBmount.glusterfs\fR(8), \fBglusterfs\fR(8), \fBglusterd\fR(8)
\ No newline at end of file diff --git a/sys-cluster/glusterfs/files/glusterd-r1.initd b/sys-cluster/glusterfs/files/glusterd-r1.initd deleted file mode 100644 index 019b51dd1609..000000000000 --- a/sys-cluster/glusterfs/files/glusterd-r1.initd +++ /dev/null @@ -1,16 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -description="Gluster elastic volume management daemon" -command="/usr/sbin/glusterd" -pidfile="/var/run/${SVCNAME}.pid" -command_args="-N" - -command_background="yes" - -depend() { - need net - before netmount -} diff --git a/sys-cluster/glusterfs/files/glusterd.initd b/sys-cluster/glusterfs/files/glusterd.initd deleted file mode 100644 index 5e8efb545783..000000000000 --- a/sys-cluster/glusterfs/files/glusterd.initd +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -PIDFILE=/var/run/glusterd.pid - -depend() { - need net - before netmount -} - -start() { - ebegin "Starting glusterd" - start-stop-daemon --start -q --exec /usr/sbin/glusterd \ - --pidfile "${PIDFILE}" --make-pidfile --background \ - -- -N - eend $? -} - -stop() { - ebegin "Stopping glusterd" - start-stop-daemon --stop -q --pidfile "${PIDFILE}" - eindent - - einfo "Unmounting GlusterFS filesystems" - umount -t fuse.glusterfs -a - - einfo "Killing remaining GlusterFS processes" - for PID in $(find /var/lib/glusterd/ -type f -name "*.pid" -exec cat {} \;); do - kill "${PID}" - done - - eoutdent - eend $? -} diff --git a/sys-cluster/glusterfs/files/glusterfs-3.3.0-avoid-version.patch b/sys-cluster/glusterfs/files/glusterfs-3.3.0-avoid-version.patch deleted file mode 100644 index 2af2d502fc9e..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-3.3.0-avoid-version.patch +++ /dev/null @@ -1,431 +0,0 @@ -diff --git a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am -index b4b940b..80f7a22 100644 ---- a/rpc/rpc-transport/rdma/src/Makefile.am -+++ b/rpc/rpc-transport/rdma/src/Makefile.am -@@ -3,7 +3,7 @@ - transport_LTLIBRARIES = rdma.la - transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport - --rdma_la_LDFLAGS = -module -avoidversion -+rdma_la_LDFLAGS = -module -avoid-version -shared - - rdma_la_SOURCES = rdma.c name.c - rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ -diff --git a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am -index 2c918c7..b07db72 100644 ---- a/rpc/rpc-transport/socket/src/Makefile.am -+++ b/rpc/rpc-transport/socket/src/Makefile.am -@@ -3,7 +3,7 @@ noinst_HEADERS = socket.h name.h - rpctransport_LTLIBRARIES = socket.la - rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport - --socket_la_LDFLAGS = -module -avoidversion -+socket_la_LDFLAGS = -module -avoid-version -shared - - socket_la_SOURCES = socket.c name.c - socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am -index 95db5dd..cdecea1 100644 ---- a/xlators/cluster/afr/src/Makefile.am -+++ b/xlators/cluster/afr/src/Makefile.am -@@ -7,11 +7,11 @@ afr_common_source = afr-dir-read.c afr-dir-write.c afr-inode-read.c \ - afr-self-heal-algorithm.c afr-lk-common.c afr-self-heald.c \ - $(top_builddir)/xlators/lib/src/libxlator.c - --afr_la_LDFLAGS = -module -avoidversion -+afr_la_LDFLAGS = -module -avoid-version -shared - afr_la_SOURCES = $(afr_common_source) afr.c - afr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --pump_la_LDFLAGS = -module -avoidversion -+pump_la_LDFLAGS = -module -avoid-version -shared - pump_la_SOURCES = $(afr_common_source) pump.c - pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - -diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am -index e35058d..127a023 100644 ---- a/xlators/cluster/dht/src/Makefile.am -+++ b/xlators/cluster/dht/src/Makefile.am -@@ -12,13 +12,13 @@ dht_la_SOURCES = $(dht_common_source) dht.c - nufa_la_SOURCES = $(dht_common_source) nufa.c - switch_la_SOURCES = $(dht_common_source) switch.c - --dht_la_LDFLAGS = -module -avoidversion -+dht_la_LDFLAGS = -module -avoid-version -shared - dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --nufa_la_LDFLAGS = -module -avoidversion -+nufa_la_LDFLAGS = -module -avoid-version -shared - nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --switch_la_LDFLAGS = -module -avoidversion -+switch_la_LDFLAGS = -module -avoid-version -shared - switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - - noinst_HEADERS = dht-common.h dht-mem-types.h \ -diff --git a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am -index 8c48d34..18aba97 100644 ---- a/xlators/cluster/stripe/src/Makefile.am -+++ b/xlators/cluster/stripe/src/Makefile.am -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = stripe.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster - --stripe_la_LDFLAGS = -module -avoidversion -+stripe_la_LDFLAGS = -module -avoid-version -shared - - stripe_la_SOURCES = stripe.c stripe-helpers.c \ - $(top_builddir)/xlators/lib/src/libxlator.c -diff --git a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am -index df90803..cce10c0 100644 ---- a/xlators/debug/error-gen/src/Makefile.am -+++ b/xlators/debug/error-gen/src/Makefile.am -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = error-gen.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug - --error_gen_la_LDFLAGS = -module -avoidversion -+error_gen_la_LDFLAGS = -module -avoid-version -shared - - error_gen_la_SOURCES = error-gen.c - error_gen_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am -index b894e79..cff914a 100644 ---- a/xlators/debug/io-stats/src/Makefile.am -+++ b/xlators/debug/io-stats/src/Makefile.am -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = io-stats.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug - --io_stats_la_LDFLAGS = -module -avoidversion -+io_stats_la_LDFLAGS = -module -avoid-version -shared - - io_stats_la_SOURCES = io-stats.c - io_stats_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am -index 0f1679a..a0eb5a6 100644 ---- a/xlators/debug/trace/src/Makefile.am -+++ b/xlators/debug/trace/src/Makefile.am -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = trace.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug - --trace_la_LDFLAGS = -module -avoidversion -+trace_la_LDFLAGS = -module -avoid-version -shared - - trace_la_SOURCES = trace.c - trace_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am -index ba5e623..45573aa 100644 ---- a/xlators/encryption/rot-13/src/Makefile.am -+++ b/xlators/encryption/rot-13/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = rot-13.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption - --rot_13_la_LDFLAGS = -module -avoidversion -+rot_13_la_LDFLAGS = -module -avoid-version -shared - - rot_13_la_SOURCES = rot-13.c - rot_13_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am -index 5d037c7..c43c936 100644 ---- a/xlators/features/index/src/Makefile.am -+++ b/xlators/features/index/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = index.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --index_la_LDFLAGS = -module -avoidversion -+index_la_LDFLAGS = -module -avoid-version -shared - - index_la_SOURCES = index.c - index_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am -index e396768..5181e28 100644 ---- a/xlators/features/locks/src/Makefile.am -+++ b/xlators/features/locks/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = locks.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --locks_la_LDFLAGS = -module -avoidversion -+locks_la_LDFLAGS = -module -avoid-version -shared - - locks_la_SOURCES = common.c posix.c entrylk.c inodelk.c reservelk.c \ - clear.c -diff --git a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am -index 915c13e..698b990 100644 ---- a/xlators/features/mac-compat/src/Makefile.am -+++ b/xlators/features/mac-compat/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = mac-compat.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --mac_compat_la_LDFLAGS = -module -avoidversion -+mac_compat_la_LDFLAGS = -module -avoid-version -shared - - mac_compat_la_SOURCES = mac-compat.c - mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am -index 501586a..630ae96 100644 ---- a/xlators/features/marker/src/Makefile.am -+++ b/xlators/features/marker/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = marker.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --marker_la_LDFLAGS = -module -avoidversion -+marker_la_LDFLAGS = -module -avoid-version -shared - - marker_la_SOURCES = marker.c marker-quota.c marker-quota-helper.c marker-common.c - marker_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am -index e8ab4cb..4234269 100644 ---- a/xlators/features/quiesce/src/Makefile.am -+++ b/xlators/features/quiesce/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = quiesce.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --quiesce_la_LDFLAGS = -module -avoidversion -+quiesce_la_LDFLAGS = -module -avoid-version -shared - - quiesce_la_SOURCES = quiesce.c - quiesce_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am -index 4baa5f0..cd687bc 100644 ---- a/xlators/features/quota/src/Makefile.am -+++ b/xlators/features/quota/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = quota.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --quota_la_LDFLAGS = -module -avoidversion -+quota_la_LDFLAGS = -module -avoid-version -shared - - quota_la_SOURCES = quota.c - quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am -index 31ae4f3..45dcef5 100644 ---- a/xlators/features/read-only/src/Makefile.am -+++ b/xlators/features/read-only/src/Makefile.am -@@ -4,12 +4,12 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - - noinst_HEADERS = read-only-common.h - --read_only_la_LDFLAGS = -module -avoidversion -+read_only_la_LDFLAGS = -module -avoid-version -shared - - read_only_la_SOURCES = read-only.c read-only-common.c - read_only_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --worm_la_LDFLAGS = -module -avoidversion -+worm_la_LDFLAGS = -module -avoid-version -shared - - worm_la_SOURCES = read-only-common.c worm.c - worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am -index 485350b..7facc66 100644 ---- a/xlators/mgmt/glusterd/src/Makefile.am -+++ b/xlators/mgmt/glusterd/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = glusterd.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt - glusterd_la_CPPFLAGS = "-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\"" --glusterd_la_LDFLAGS = -module -avoidversion $(LIBXML2_LIBS) -lcrypto -+glusterd_la_LDFLAGS = -module -avoid-version -shared - glusterd_la_SOURCES = glusterd.c glusterd-handler.c glusterd-sm.c \ - glusterd-op-sm.c glusterd-utils.c glusterd-rpc-ops.c \ - glusterd-store.c glusterd-handshake.c glusterd-pmap.c \ -@@ -12,7 +12,8 @@ glusterd_la_SOURCES = glusterd.c glusterd-handler.c glusterd-sm.c \ - - glusterd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/rpc/xdr/src/libgfxdr.la \ -- $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la -+ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ -+ $(LIBXML2_LIBS) -lcrypto - - noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h \ - glusterd-sm.h glusterd-store.h glusterd-mem-types.h \ -diff --git a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am -index ef3b672..48cca34 100644 ---- a/xlators/nfs/server/src/Makefile.am -+++ b/xlators/nfs/server/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = server.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/nfs - nfsrpclibdir = $(top_srcdir)/rpc/rpc-lib/src --server_la_LDFLAGS = -module -avoidversion -+server_la_LDFLAGS = -module -avoid-version -shared - server_la_SOURCES = nfs.c nfs-common.c nfs-fops.c nfs-inodes.c \ - nfs-generics.c mount3.c nfs3-fh.c nfs3.c nfs3-helpers.c nlm4.c \ - nlmcbk_svc.c mount3udp_svc.c -diff --git a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am -index 6dd270e..f066519 100644 ---- a/xlators/performance/io-cache/src/Makefile.am -+++ b/xlators/performance/io-cache/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = io-cache.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --io_cache_la_LDFLAGS = -module -avoidversion -+io_cache_la_LDFLAGS = -module -avoid-version -shared - - io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c - io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am -index 72f9a80..2de6cbb 100644 ---- a/xlators/performance/io-threads/src/Makefile.am -+++ b/xlators/performance/io-threads/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = io-threads.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --io_threads_la_LDFLAGS = -module -avoidversion -+io_threads_la_LDFLAGS = -module -avoid-version -shared - - io_threads_la_SOURCES = io-threads.c - io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am -index 150e724..dc6fb54 100644 ---- a/xlators/performance/md-cache/src/Makefile.am -+++ b/xlators/performance/md-cache/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = md-cache.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --md_cache_la_LDFLAGS = -module -avoidversion -+md_cache_la_LDFLAGS = -module -avoid-version -shared - - md_cache_la_SOURCES = md-cache.c - md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am -index db917f8..1da51b2 100644 ---- a/xlators/performance/quick-read/src/Makefile.am -+++ b/xlators/performance/quick-read/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = quick-read.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --quick_read_la_LDFLAGS = -module -avoidversion -+quick_read_la_LDFLAGS = -module -avoid-version -shared - - quick_read_la_SOURCES = quick-read.c - quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am -index b46020a..1e17a3a 100644 ---- a/xlators/performance/read-ahead/src/Makefile.am -+++ b/xlators/performance/read-ahead/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = read-ahead.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --read_ahead_la_LDFLAGS = -module -avoidversion -+read_ahead_la_LDFLAGS = -module -avoid-version -shared - - read_ahead_la_SOURCES = read-ahead.c page.c - read_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am -index 06e85fc..2f893ce 100644 ---- a/xlators/performance/symlink-cache/src/Makefile.am -+++ b/xlators/performance/symlink-cache/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = symlink-cache.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/performance - --symlink_cache_la_LDFLAGS = -module -avoidversion -+symlink_cache_la_LDFLAGS = -module -avoid-version -shared - - symlink_cache_la_SOURCES = symlink-cache.c - symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am -index a5ebc90..838d6da 100644 ---- a/xlators/performance/write-behind/src/Makefile.am -+++ b/xlators/performance/write-behind/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = write-behind.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --write_behind_la_LDFLAGS = -module -avoidversion -+write_behind_la_LDFLAGS = -module -avoid-version -shared - - write_behind_la_SOURCES = write-behind.c - write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am -index f09d1c5..c77fce3 100644 ---- a/xlators/protocol/auth/addr/src/Makefile.am -+++ b/xlators/protocol/auth/addr/src/Makefile.am -@@ -1,7 +1,7 @@ - auth_LTLIBRARIES = addr.la - authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth - --addr_la_LDFLAGS = -module -avoidversion -+addr_la_LDFLAGS = -module -avoid-version -shared - - addr_la_SOURCES = addr.c - addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am -index b4719d1..5a5db4d 100644 ---- a/xlators/protocol/auth/login/src/Makefile.am -+++ b/xlators/protocol/auth/login/src/Makefile.am -@@ -1,7 +1,7 @@ - auth_LTLIBRARIES = login.la - authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth - --login_la_LDFLAGS = -module -avoidversion -+login_la_LDFLAGS = -module -avoid-version -shared - - login_la_SOURCES = login.c - login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am -index 29c6e9d..19d2ed5 100644 ---- a/xlators/protocol/client/src/Makefile.am -+++ b/xlators/protocol/client/src/Makefile.am -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = client.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol - --client_la_LDFLAGS = -module -avoidversion -+client_la_LDFLAGS = -module -avoid-version -shared - - client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ -diff --git a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am -index 0df5894..6eae10d 100644 ---- a/xlators/protocol/server/src/Makefile.am -+++ b/xlators/protocol/server/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = server.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol - --server_la_LDFLAGS = -module -avoidversion -+server_la_LDFLAGS = -module -avoid-version -shared - - server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ -diff --git a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am -index 408dcb8..3f6a4b6 100644 ---- a/xlators/storage/posix/src/Makefile.am -+++ b/xlators/storage/posix/src/Makefile.am -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = posix.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage - --posix_la_LDFLAGS = -module -avoidversion -+posix_la_LDFLAGS = -module -avoid-version -shared - - posix_la_SOURCES = posix.c posix-helpers.c posix-handle.c - posix_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am -index c095569..b799eb9 100644 ---- a/xlators/system/posix-acl/src/Makefile.am -+++ b/xlators/system/posix-acl/src/Makefile.am -@@ -1,6 +1,6 @@ - xlator_LTLIBRARIES = posix-acl.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/system --posix_acl_la_LDFLAGS = -module -avoidversion -+posix_acl_la_LDFLAGS = -module -avoid-version -shared - posix_acl_la_SOURCES = posix-acl.c posix-acl-xattr.c - posix_acl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - diff --git a/sys-cluster/glusterfs/files/glusterfs-3.3.0-docdir.patch b/sys-cluster/glusterfs/files/glusterfs-3.3.0-docdir.patch deleted file mode 100644 index 83f3043d4ef5..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-3.3.0-docdir.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6a17bb8523c4c7810bf7797371df22cfb259f7a7 Mon Sep 17 00:00:00 2001 -From: MATSUU Takuto <matsuu@gentoo.org> -Date: Sat, 16 May 2009 07:01:53 +0900 -Subject: [PATCH] Use the standard autoconf $docdir variable. - ---- a/extras/Makefile.am -+++ b/extras/Makefile.am -@@ -1,6 +1,5 @@ - --docdir = $(datadir)/doc/glusterfs/ --EditorModedir = $(docdir)/ -+EditorModedir = $(docdir) - EditorMode_DATA = glusterfs-mode.el glusterfs.vim - - SUBDIRS = init.d benchmarking ---- a/extras/benchmarking/Makefile.am -+++ b/extras/benchmarking/Makefile.am -@@ -1,7 +1,5 @@ - --docdir = $(datadir)/doc/$(PACKAGE_NAME)/benchmarking -- --benchmarkingdir = $(docdir) -+benchmarkingdir = $(docdir)/benchmarking - - benchmarking_DATA = rdd.c glfs-bm.c README launch-script.sh local-script.sh - diff --git a/sys-cluster/glusterfs/files/glusterfs-3.3.0-parallel-build.patch b/sys-cluster/glusterfs/files/glusterfs-3.3.0-parallel-build.patch deleted file mode 100644 index ab3a3d1547ca..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-3.3.0-parallel-build.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/glusterfsd/src/Makefile.am -+++ b/glusterfsd/src/Makefile.am -@@ -25,6 +25,7 @@ - install-data-local: - $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run - $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/log/glusterfs -+ $(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) - rm -f $(DESTDIR)$(sbindir)/glusterfs - rm -f $(DESTDIR)$(sbindir)/glusterd - ln -s glusterfsd $(DESTDIR)$(sbindir)/glusterfs ---- a/libglusterfs/src/Makefile.am -+++ b/libglusterfs/src/Makefile.am -@@ -43,6 +43,7 @@ - graph.lex.c: graph.l y.tab.h - $(LEX) -t $(srcdir)/graph.l > $@ - -+y.tab.c: y.tab.h - y.tab.h: graph.y - $(YACC) -d $(srcdir)/graph.y - diff --git a/sys-cluster/glusterfs/files/glusterfs-3.3.0-silent_rules.patch b/sys-cluster/glusterfs/files/glusterfs-3.3.0-silent_rules.patch deleted file mode 100644 index d9e25494b64c..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-3.3.0-silent_rules.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 4551fcf..a30c62e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -19,20 +19,6 @@ AC_INIT([glusterfs],[3.3.0],[gluster-users@gluster.org]) - - AM_INIT_AUTOMAKE - --m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) -- --if make --help 2>&1 | grep -q no-print-directory; then -- AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory"; --fi -- --if make --help 2>&1 | grep -q quiet; then -- AM_MAKEFLAGS="$AM_MAKEFLAGS --quiet" --fi -- --if libtool --help 2>&1 | grep -q quiet; then -- AM_LIBTOOLFLAGS="--quiet"; --fi -- - AM_CONFIG_HEADER([config.h]) - - AC_CONFIG_FILES([Makefile diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.0-build-shared-only.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.0-build-shared-only.patch deleted file mode 100644 index 38afa6c4f387..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-3.4.0-build-shared-only.patch +++ /dev/null @@ -1,505 +0,0 @@ -From 96dfc056d9525dd102bd78dc2f25fa51e00fbab5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch> -Date: Fri, 26 Jul 2013 10:28:25 +0200 -Subject: [PATCH 2/2] Build shared plugins only. - ---- - rpc/rpc-transport/rdma/src/Makefile.am | 2 +- - rpc/rpc-transport/socket/src/Makefile.am | 2 +- - xlators/cluster/afr/src/Makefile.am | 4 ++-- - xlators/cluster/dht/src/Makefile.am | 6 +++--- - xlators/cluster/stripe/src/Makefile.am | 2 +- - xlators/debug/error-gen/src/Makefile.am | 2 +- - xlators/debug/io-stats/src/Makefile.am | 2 +- - xlators/debug/trace/src/Makefile.am | 2 +- - xlators/encryption/rot-13/src/Makefile.am | 2 +- - xlators/features/index/src/Makefile.am | 2 +- - xlators/features/locks/src/Makefile.am | 2 +- - xlators/features/mac-compat/src/Makefile.am | 2 +- - xlators/features/marker/src/Makefile.am | 2 +- - xlators/features/quiesce/src/Makefile.am | 2 +- - xlators/features/quota/src/Makefile.am | 2 +- - xlators/features/read-only/src/Makefile.am | 4 ++-- - xlators/mgmt/glusterd/src/Makefile.am | 2 +- - xlators/mount/fuse/src/Makefile.am | 2 +- - xlators/nfs/server/src/Makefile.am | 2 +- - xlators/performance/io-cache/src/Makefile.am | 2 +- - xlators/performance/io-threads/src/Makefile.am | 2 +- - xlators/performance/md-cache/src/Makefile.am | 2 +- - xlators/performance/open-behind/src/Makefile.am | 2 +- - xlators/performance/quick-read/src/Makefile.am | 2 +- - xlators/performance/read-ahead/src/Makefile.am | 2 +- - xlators/performance/symlink-cache/src/Makefile.am | 2 +- - xlators/performance/write-behind/src/Makefile.am | 2 +- - xlators/protocol/auth/addr/src/Makefile.am | 2 +- - xlators/protocol/auth/login/src/Makefile.am | 2 +- - xlators/protocol/client/src/Makefile.am | 2 +- - xlators/protocol/server/src/Makefile.am | 2 +- - xlators/storage/bd_map/src/Makefile.am | 2 +- - xlators/storage/posix/src/Makefile.am | 2 +- - xlators/system/posix-acl/src/Makefile.am | 2 +- - 34 files changed, 38 insertions(+), 38 deletions(-) - -diff --git a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am -index 2bf7cf2..8e52d70 100644 ---- a/rpc/rpc-transport/rdma/src/Makefile.am -+++ b/rpc/rpc-transport/rdma/src/Makefile.am -@@ -3,7 +3,7 @@ - transport_LTLIBRARIES = rdma.la - transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport - --rdma_la_LDFLAGS = -module -avoid-version -+rdma_la_LDFLAGS = -module -avoid-version -shared - - rdma_la_SOURCES = rdma.c name.c - rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ -diff --git a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am -index 71e6ed6..b481fe9 100644 ---- a/rpc/rpc-transport/socket/src/Makefile.am -+++ b/rpc/rpc-transport/socket/src/Makefile.am -@@ -3,7 +3,7 @@ noinst_HEADERS = socket.h name.h - rpctransport_LTLIBRARIES = socket.la - rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport - --socket_la_LDFLAGS = -module -avoid-version -+socket_la_LDFLAGS = -module -avoid-version -shared - - socket_la_SOURCES = socket.c name.c - socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -diff --git a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am -index 35d18a6..959fea8 100644 ---- a/xlators/cluster/afr/src/Makefile.am -+++ b/xlators/cluster/afr/src/Makefile.am -@@ -7,11 +7,11 @@ afr_common_source = afr-dir-read.c afr-dir-write.c afr-inode-read.c \ - afr-self-heal-algorithm.c afr-lk-common.c afr-self-heald.c \ - $(top_builddir)/xlators/lib/src/libxlator.c - --afr_la_LDFLAGS = -module -avoid-version -+afr_la_LDFLAGS = -module -avoid-version -shared - afr_la_SOURCES = $(afr_common_source) afr.c - afr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --pump_la_LDFLAGS = -module -avoid-version -+pump_la_LDFLAGS = -module -avoid-version -shared - pump_la_SOURCES = $(afr_common_source) pump.c - pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - -diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am -index 5324d21..d5f36ea 100644 ---- a/xlators/cluster/dht/src/Makefile.am -+++ b/xlators/cluster/dht/src/Makefile.am -@@ -12,13 +12,13 @@ dht_la_SOURCES = $(dht_common_source) dht.c - nufa_la_SOURCES = $(dht_common_source) nufa.c - switch_la_SOURCES = $(dht_common_source) switch.c - --dht_la_LDFLAGS = -module -avoid-version -+dht_la_LDFLAGS = -module -avoid-version -shared - dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --nufa_la_LDFLAGS = -module -avoid-version -+nufa_la_LDFLAGS = -module -avoid-version -shared - nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --switch_la_LDFLAGS = -module -avoid-version -+switch_la_LDFLAGS = -module -avoid-version -shared - switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - - noinst_HEADERS = dht-common.h dht-mem-types.h \ -diff --git a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am -index 2d15142..6989de9 100644 ---- a/xlators/cluster/stripe/src/Makefile.am -+++ b/xlators/cluster/stripe/src/Makefile.am -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = stripe.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster - --stripe_la_LDFLAGS = -module -avoid-version -+stripe_la_LDFLAGS = -module -avoid-version -shared - - stripe_la_SOURCES = stripe.c stripe-helpers.c \ - $(top_builddir)/xlators/lib/src/libxlator.c -diff --git a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am -index 5075c59..a7681c4 100644 ---- a/xlators/debug/error-gen/src/Makefile.am -+++ b/xlators/debug/error-gen/src/Makefile.am -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = error-gen.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug - --error_gen_la_LDFLAGS = -module -avoid-version -+error_gen_la_LDFLAGS = -module -avoid-version -shared - - error_gen_la_SOURCES = error-gen.c - error_gen_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am -index 332d790..bf62017 100644 ---- a/xlators/debug/io-stats/src/Makefile.am -+++ b/xlators/debug/io-stats/src/Makefile.am -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = io-stats.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug - --io_stats_la_LDFLAGS = -module -avoid-version -+io_stats_la_LDFLAGS = -module -avoid-version -shared - - io_stats_la_SOURCES = io-stats.c - io_stats_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am -index 7b2597b..2030ed4 100644 ---- a/xlators/debug/trace/src/Makefile.am -+++ b/xlators/debug/trace/src/Makefile.am -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = trace.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug - --trace_la_LDFLAGS = -module -avoid-version -+trace_la_LDFLAGS = -module -avoid-version -shared - - trace_la_SOURCES = trace.c - trace_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am -index 94e8d18..d13894e 100644 ---- a/xlators/encryption/rot-13/src/Makefile.am -+++ b/xlators/encryption/rot-13/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = rot-13.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption - --rot_13_la_LDFLAGS = -module -avoid-version -+rot_13_la_LDFLAGS = -module -avoid-version -shared - - rot_13_la_SOURCES = rot-13.c - rot_13_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am -index 73bb897..5519798 100644 ---- a/xlators/features/index/src/Makefile.am -+++ b/xlators/features/index/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = index.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --index_la_LDFLAGS = -module -avoid-version -+index_la_LDFLAGS = -module -avoid-version -shared - - index_la_SOURCES = index.c - index_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am -index 8908c1f..1a17a0f 100644 ---- a/xlators/features/locks/src/Makefile.am -+++ b/xlators/features/locks/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = locks.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --locks_la_LDFLAGS = -module -avoid-version -+locks_la_LDFLAGS = -module -avoid-version -shared - - locks_la_SOURCES = common.c posix.c entrylk.c inodelk.c reservelk.c \ - clear.c -diff --git a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am -index f8567ed..a283eb0 100644 ---- a/xlators/features/mac-compat/src/Makefile.am -+++ b/xlators/features/mac-compat/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = mac-compat.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --mac_compat_la_LDFLAGS = -module -avoid-version -+mac_compat_la_LDFLAGS = -module -avoid-version -shared - - mac_compat_la_SOURCES = mac-compat.c - mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am -index a7c6764..477fe0f 100644 ---- a/xlators/features/marker/src/Makefile.am -+++ b/xlators/features/marker/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = marker.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --marker_la_LDFLAGS = -module -avoid-version -+marker_la_LDFLAGS = -module -avoid-version -shared - - marker_la_SOURCES = marker.c marker-quota.c marker-quota-helper.c marker-common.c - marker_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am -index 15e4662..b3cd9d1 100644 ---- a/xlators/features/quiesce/src/Makefile.am -+++ b/xlators/features/quiesce/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = quiesce.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --quiesce_la_LDFLAGS = -module -avoid-version -+quiesce_la_LDFLAGS = -module -avoid-version -shared - - quiesce_la_SOURCES = quiesce.c - quiesce_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am -index 9546f42..4cfa983 100644 ---- a/xlators/features/quota/src/Makefile.am -+++ b/xlators/features/quota/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = quota.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --quota_la_LDFLAGS = -module -avoid-version -+quota_la_LDFLAGS = -module -avoid-version -shared - - quota_la_SOURCES = quota.c - quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am -index 4c14621..a3f79fa 100644 ---- a/xlators/features/read-only/src/Makefile.am -+++ b/xlators/features/read-only/src/Makefile.am -@@ -4,12 +4,12 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - - noinst_HEADERS = read-only-common.h - --read_only_la_LDFLAGS = -module -avoid-version -+read_only_la_LDFLAGS = -module -avoid-version -shared - - read_only_la_SOURCES = read-only.c read-only-common.c - read_only_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --worm_la_LDFLAGS = -module -avoid-version -+worm_la_LDFLAGS = -module -avoid-version -shared - - worm_la_SOURCES = read-only-common.c worm.c - worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am -index df15453..d03d653 100644 ---- a/xlators/mgmt/glusterd/src/Makefile.am -+++ b/xlators/mgmt/glusterd/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = glusterd.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt - glusterd_la_CPPFLAGS = $(AM_CPPFLAGS) "-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\"" --glusterd_la_LDFLAGS = -module -avoid-version -+glusterd_la_LDFLAGS = -module -avoid-version -shared - if ENABLE_BD_XLATOR - glusterd_la_LDFLAGS += -llvm2app - endif -diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am -index 653121d..3f221d8 100644 ---- a/xlators/mount/fuse/src/Makefile.am -+++ b/xlators/mount/fuse/src/Makefile.am -@@ -24,7 +24,7 @@ endif - fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \ - $(CONTRIBDIR)/fuse-lib/misc.c $(mount_source) - --fuse_la_LDFLAGS = -module -avoid-version -+fuse_la_LDFLAGS = -module -avoid-version -shared - fuse_la_LIBADD = @GF_FUSE_LDADD@ - - AM_CPPFLAGS = $(GF_CPPFLAGS) \ -diff --git a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am -index 2795a93..2614822 100644 ---- a/xlators/nfs/server/src/Makefile.am -+++ b/xlators/nfs/server/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = server.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/nfs - nfsrpclibdir = $(top_srcdir)/rpc/rpc-lib/src --server_la_LDFLAGS = -module -avoid-version -+server_la_LDFLAGS = -module -avoid-version -shared - server_la_SOURCES = nfs.c nfs-common.c nfs-fops.c nfs-inodes.c \ - nfs-generics.c mount3.c nfs3-fh.c nfs3.c nfs3-helpers.c nlm4.c \ - nlmcbk_svc.c mount3udp_svc.c acl3.c -diff --git a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am -index 155be99..ba0738c 100644 ---- a/xlators/performance/io-cache/src/Makefile.am -+++ b/xlators/performance/io-cache/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = io-cache.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --io_cache_la_LDFLAGS = -module -avoid-version -+io_cache_la_LDFLAGS = -module -avoid-version -shared - - io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c - io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am -index d63042e..aba1fdb 100644 ---- a/xlators/performance/io-threads/src/Makefile.am -+++ b/xlators/performance/io-threads/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = io-threads.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --io_threads_la_LDFLAGS = -module -avoid-version -+io_threads_la_LDFLAGS = -module -avoid-version -shared - - io_threads_la_SOURCES = io-threads.c - io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am -index 8c9f5a8..4d714fa 100644 ---- a/xlators/performance/md-cache/src/Makefile.am -+++ b/xlators/performance/md-cache/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = md-cache.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --md_cache_la_LDFLAGS = -module -avoid-version -+md_cache_la_LDFLAGS = -module -avoid-version -shared - - md_cache_la_SOURCES = md-cache.c - md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am -index 1252857..568434a 100644 ---- a/xlators/performance/open-behind/src/Makefile.am -+++ b/xlators/performance/open-behind/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = open-behind.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --open_behind_la_LDFLAGS = -module -avoid-version -+open_behind_la_LDFLAGS = -module -avoid-version -shared - - open_behind_la_SOURCES = open-behind.c - open_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am -index 4906f40..8d42116 100644 ---- a/xlators/performance/quick-read/src/Makefile.am -+++ b/xlators/performance/quick-read/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = quick-read.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --quick_read_la_LDFLAGS = -module -avoid-version -+quick_read_la_LDFLAGS = -module -avoid-version -shared - - quick_read_la_SOURCES = quick-read.c - quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am -index be80ae7..eae0540 100644 ---- a/xlators/performance/read-ahead/src/Makefile.am -+++ b/xlators/performance/read-ahead/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = read-ahead.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --read_ahead_la_LDFLAGS = -module -avoid-version -+read_ahead_la_LDFLAGS = -module -avoid-version -shared - - read_ahead_la_SOURCES = read-ahead.c page.c - read_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am -index 4091c32..0d600d6 100644 ---- a/xlators/performance/symlink-cache/src/Makefile.am -+++ b/xlators/performance/symlink-cache/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = symlink-cache.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/performance - --symlink_cache_la_LDFLAGS = -module -avoid-version -+symlink_cache_la_LDFLAGS = -module -avoid-version -shared - - symlink_cache_la_SOURCES = symlink-cache.c - symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am -index 6c829d8..746e5c1 100644 ---- a/xlators/performance/write-behind/src/Makefile.am -+++ b/xlators/performance/write-behind/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = write-behind.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --write_behind_la_LDFLAGS = -module -avoid-version -+write_behind_la_LDFLAGS = -module -avoid-version -shared - - write_behind_la_SOURCES = write-behind.c - write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am -index 426e7c2..fa7234d 100644 ---- a/xlators/protocol/auth/addr/src/Makefile.am -+++ b/xlators/protocol/auth/addr/src/Makefile.am -@@ -1,7 +1,7 @@ - auth_LTLIBRARIES = addr.la - authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth - --addr_la_LDFLAGS = -module -avoid-version -+addr_la_LDFLAGS = -module -avoid-version -shared - - addr_la_SOURCES = addr.c - addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am -index d84db91..022739d 100644 ---- a/xlators/protocol/auth/login/src/Makefile.am -+++ b/xlators/protocol/auth/login/src/Makefile.am -@@ -1,7 +1,7 @@ - auth_LTLIBRARIES = login.la - authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth - --login_la_LDFLAGS = -module -avoid-version -+login_la_LDFLAGS = -module -avoid-version -shared - - login_la_SOURCES = login.c - login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff --git a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am -index cf89d42..8f2612c 100644 ---- a/xlators/protocol/client/src/Makefile.am -+++ b/xlators/protocol/client/src/Makefile.am -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = client.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol - --client_la_LDFLAGS = -module -avoid-version -+client_la_LDFLAGS = -module -avoid-version -shared - - client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ -diff --git a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am -index 25d6706..15a2548 100644 ---- a/xlators/protocol/server/src/Makefile.am -+++ b/xlators/protocol/server/src/Makefile.am -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = server.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol - --server_la_LDFLAGS = -module -avoid-version -+server_la_LDFLAGS = -module -avoid-version -shared - - server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ -diff --git a/xlators/storage/bd_map/src/Makefile.am b/xlators/storage/bd_map/src/Makefile.am -index 91412e9..5c59626 100644 ---- a/xlators/storage/bd_map/src/Makefile.am -+++ b/xlators/storage/bd_map/src/Makefile.am -@@ -3,7 +3,7 @@ if ENABLE_BD_XLATOR - xlator_LTLIBRARIES = bd_map.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage - --bd_map_la_LDFLAGS = -module -avoid-version -+bd_map_la_LDFLAGS = -module -avoid-version -shared - LIBBD = -llvm2app -lrt - bd_map_la_SOURCES = bd_map.c bd_map_help.c - bd_map_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBBD) -diff --git a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am -index 88efcc7..79ca903 100644 ---- a/xlators/storage/posix/src/Makefile.am -+++ b/xlators/storage/posix/src/Makefile.am -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = posix.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage - --posix_la_LDFLAGS = -module -avoid-version -+posix_la_LDFLAGS = -module -avoid-version -shared - - posix_la_SOURCES = posix.c posix-helpers.c posix-handle.c posix-aio.c - posix_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBAIO) -diff --git a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am -index 11c939f..561c52d 100644 ---- a/xlators/system/posix-acl/src/Makefile.am -+++ b/xlators/system/posix-acl/src/Makefile.am -@@ -1,6 +1,6 @@ - xlator_LTLIBRARIES = posix-acl.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/system --posix_acl_la_LDFLAGS = -module -avoid-version -+posix_acl_la_LDFLAGS = -module -avoid-version -shared - posix_acl_la_SOURCES = posix-acl.c posix-acl-xattr.c - posix_acl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --- -1.8.2.1 - diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.0-nfs-exit-when-all-volumes-are-disabled.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.0-nfs-exit-when-all-volumes-are-disabled.patch deleted file mode 100644 index 5a1bdec89e62..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-3.4.0-nfs-exit-when-all-volumes-are-disabled.patch +++ /dev/null @@ -1,42 +0,0 @@ -From fdc83183263e04bee56672e9d9922cc9457146cb Mon Sep 17 00:00:00 2001 -From: Rajesh Amaravathi <rajesh@redhat.com> -Date: Fri, 21 Jun 2013 14:58:23 +0530 -Subject: [PATCH 1/1] nfs: exit when all volumes are disabled - -Instead of triggering 4-5 error logs, when nfs is -disabled for all volumes, exit the process. - -Change-Id: Ib286f143c4f74ba22f502aca0e7dcd0907db6563 -BUG: 976750 -Signed-off-by: Rajesh Amaravathi <rajesh@redhat.com> -Reviewed-on: http://review.gluster.org/5245 -Reviewed-by: Santosh Pradhan <spradhan@redhat.com> -Tested-by: Gluster Build System <jenkins@build.gluster.com> -Reviewed-by: Vijay Bellur <vbellur@redhat.com> ---- - xlators/nfs/server/src/nfs.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c -index 6cd0594..c3a76c6 100644 ---- a/xlators/nfs/server/src/nfs.c -+++ b/xlators/nfs/server/src/nfs.c -@@ -533,10 +533,11 @@ nfs_init_state (xlator_t *this) - if (!this) - return NULL; - -- if ((!this->children) || (!this->children->xlator)) { -- gf_log (GF_NFS, GF_LOG_ERROR, "nfs must have at least one" -- " child subvolume"); -- return NULL; -+ if (!this->children) { -+ gf_log (GF_NFS, GF_LOG_INFO, -+ "NFS is manually disabled: Exiting"); -+ /* Nothing for nfs process to do, exit cleanly */ -+ kill (getpid (), SIGTERM); - } - - nfs = GF_CALLOC (1, sizeof (*nfs), gf_nfs_mt_nfs_state); --- -1.7.4.1 - diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch deleted file mode 100644 index c26085a9dfe7..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2b789331dc933b186360fc8cbffb06289ee60ee9 Mon Sep 17 00:00:00 2001 -From: Vijay Bellur <vbellur@redhat.com> -Date: Tue, 10 Jun 2014 22:21:28 +0530 -Subject: [PATCH 1/3] cluster/dht: Don't do extra unref in dht-migration checks - -Problem: -syncop_open used to perform a ref in syncop_open_cbk so the extra -unref was needed but now syncop_open_cbk does not take a ref so no -need to do extra unref. - -Fix: -remove the extra fd_unref and let dht_local_wipe do the final unref. - -Change-Id: Ibe8f9a678d456a0c7bff175306068b5cd297ecc4 -BUG: 961615 -Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> -Signed-off-by: Vijay Bellur <vbellur@redhat.com> -Reviewed-on: http://review.gluster.org/8029 -Tested-by: Gluster Build System <jenkins@build.gluster.com> -Tested-by: Joe Julian <joe@julianfamily.org> -Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> ---- - xlators/cluster/dht/src/dht-helper.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c -index ef29e3f..dd8dc49 100644 ---- a/xlators/cluster/dht/src/dht-helper.c -+++ b/xlators/cluster/dht/src/dht-helper.c -@@ -802,13 +802,10 @@ dht_migration_complete_check_task (void *data) - if (!local->fd) - goto out; - /* once we detect the migration complete, the fd-ctx is no more -- required.. delete the ctx, and do one extra 'fd_unref' for open fd */ -+ required.. delete the ctx */ - ret = fd_ctx_del (local->fd, this, NULL); -- if (!ret) { -- fd_unref (local->fd); -- ret = 0; -+ if (!ret) - goto out; -- } - - /* perform open as root:root. There is window between linkfile - * creation(root:root) and setattr with the correct uid/gid --- -1.9.2 - diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch deleted file mode 100644 index 316e079322ca..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 0cf6f0727482b5b8816b5e58cb67ef124eae808e Mon Sep 17 00:00:00 2001 -From: Justin Clift <justin@gluster.org> -Date: Tue, 24 Jun 2014 20:57:02 +0100 -Subject: [PATCH] fuse: fix memory leak in fuse_getxattr() - -The fuse_getxattr() function was not freeing fuse_state_t resulting in a -memory leak. As a result, when continuous writes (run dd command in a loop) -were done from a FUSE mount point, the OOM killer killed the client -process (glusterfs). - -Manual backport of: http://review.gluster.org/#/c/5392/, provided -by Martin Svec <martin.svec@zoner.cz>. - -BUG: 1112844 -Change-Id: Ic723675c53384d48c79ad1b11b21c1b17fb56866 ---- - xlators/mount/fuse/src/fuse-bridge.c | 27 ++++++++++++++------------- - 1 file changed, 14 insertions(+), 13 deletions(-) - -diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c -index e531970..da5937b 100644 ---- a/xlators/mount/fuse/src/fuse-bridge.c -+++ b/xlators/mount/fuse/src/fuse-bridge.c -@@ -3207,6 +3207,7 @@ fuse_getxattr (xlator_t *this, fuse_in_header_t *finh, void *msg) - fuse_state_t *state = NULL; - struct fuse_private *priv = NULL; - int rv = 0; -+ int op_errno = EINVAL; - char *newkey = NULL; - - priv = this->private; -@@ -3227,26 +3228,23 @@ fuse_getxattr (xlator_t *this, fuse_in_header_t *finh, void *msg) - "%"PRIu64": GETXATTR %s/%"PRIu64" (%s):" - "refusing positioned getxattr", - finh->unique, state->loc.path, finh->nodeid, name); -- send_fuse_err (this, finh, EINVAL); -- FREE (finh); -- return; -+ op_errno = EINVAL; -+ goto err; - } - #endif - - if (!priv->acl) { - if ((strcmp (name, "system.posix_acl_access") == 0) || - (strcmp (name, "system.posix_acl_default") == 0)) { -- send_fuse_err (this, finh, ENOTSUP); -- GF_FREE (finh); -- return; -+ op_errno = ENOTSUP; -+ goto err; - } - } - - if (!priv->selinux) { - if (strncmp (name, "security.", 9) == 0) { -- send_fuse_err (this, finh, ENODATA); -- GF_FREE (finh); -- return; -+ op_errno = ENODATA; -+ goto err; - } - } - -@@ -3254,16 +3252,19 @@ fuse_getxattr (xlator_t *this, fuse_in_header_t *finh, void *msg) - - rv = fuse_flip_xattr_ns (priv, name, &newkey); - if (rv) { -- send_fuse_err (this, finh, ENOMEM); -- free_fuse_state (state); -- goto out; -+ op_errno = ENOMEM; -+ goto err; - } - - state->size = fgxi->size; - state->name = newkey; - - fuse_resolve_and_resume (state, fuse_getxattr_resume); -- out: -+ -+ return; -+ err: -+ send_fuse_err (this, finh, op_errno); -+ free_fuse_state (state); - return; - } - --- -1.9.2 - diff --git a/sys-cluster/glusterfs/files/glusterfs.initd b/sys-cluster/glusterfs/files/glusterfs.initd deleted file mode 100644 index 1f5bde65da12..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs.initd +++ /dev/null @@ -1,120 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -if [[ "${SVCNAME}" != "glusterfs" ]] -then - GLUSTERFS_NAME="${SVCNAME#glusterfs.}" -else - GLUSTERFS_NAME="glusterfs" -fi - -GLUSTERFS_PIDFILE="/var/run/${SVCNAME}.pid" - -eval 'GLUSTERFS_LOGFILE="${'${GLUSTERFS_NAME}'_log:-/var/log/glusterfs/'${GLUSTERFS_NAME}'.log}"' -eval 'GLUSTERFS_VOLFILE="${'${GLUSTERFS_NAME}'_vol:-/etc/glusterfs/'${GLUSTERFS_NAME}'.vol}"' -eval 'GLUSTERFS_SERVER="${'${GLUSTERFS_NAME}'_server}"' -eval 'GLUSTERFS_PORT="${'${GLUSTERFS_NAME}'_port:-6996}"' -eval 'GLUSTERFS_TRANSPORT="${'${GLUSTERFS_NAME}'_transport:-socket}"' -eval 'GLUSTERFS_OPTS="${'${GLUSTERFS_NAME}'_opts}"' -eval 'GLUSTERFS_MOUNTPOINT="${'${GLUSTERFS_NAME}'_mountpoint}"' - -depend() { - need net - [[ -n "${GLUSTERFS_MOUNTPOINT}" ]] && need fuse - use dns - before netmount - after firewall ntp-client ntpd -} - -checkconfig() { - if [[ -z "${GLUSTERFS_NAME}" ]] - then - eerror "The service name is not properly formatted." - return 1 - fi - - if [[ -z "${GLUSTERFS_SERVER}" ]] - then - if [[ -z "${GLUSTERFS_VOLFILE}" ]] - then - eerror "No GlusterFS volume file source has been defined. Edit /etc/conf.d/glusterfs" - eerror "and configure a volume file source for ${SVCNAME}." - return 1 - else - if [[ ! -f "${GLUSTERFS_VOLFILE}" ]] - then - eerror "Cannot find volume file: ${GLUSTERFS_VOLFILE}" - return 1 - fi - fi - fi - - if [[ -n "${GLUSTERFS_MOUNTPOINT}" && ! -d "${GLUSTERFS_MOUNTPOINT}" ]] - then - eerror "The mountpoint ${GLUSTERFS_MOUNTPOINT} does not exist." - return 1 - fi -} - -start() { - local status - - checkconfig || return 1 - - ebegin "Starting GlusterFS (${SVCNAME})" - eindent - - if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]] - then - einfo "Starting in server mode ..." - else - einfo "Starting in client mode. Mounting filesystem ..." - fi - - if [[ -n "${GLUSTERFS_SERVER}" ]] - then - einfo "Using server supplied volume file" - start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \ - --exec /usr/sbin/glusterfsd -- \ - --pid-file=${GLUSTERFS_PIDFILE} \ - --log-file=${GLUSTERFS_LOGFILE} \ - --volfile-server=${GLUSTERFS_SERVER} \ - --volfile-server-port=${GLUSTERFS_PORT} \ - --volfile-server-transport=${GLUSTERFS_TRANSPORT} \ - ${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT} - status="$?" - else - einfo "Using local volume file" - start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \ - --exec /usr/sbin/glusterfsd -- \ - --pid-file=${GLUSTERFS_PIDFILE} \ - --log-file=${GLUSTERFS_LOGFILE} \ - --volfile=${GLUSTERFS_VOLFILE} \ - ${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT} - status="$?" - fi - - eoutdent - eend ${status} -} - -stop() { - local status - - ebegin "Stopping GlusterFS (${SVCNAME})" - eindent - if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]] - then - einfo "Stopping server process ..." - start-stop-daemon --stop --pidfile ${GLUSTERFS_PIDFILE} - status="$?" - else - einfo "Unmounting ${GLUSTERFS_MOUNTPOINT} ..." - umount "${GLUSTERFS_MOUNTPOINT}" - status="$?" - fi - eoutdent - eend ${status} -} |