[gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/
@ 2015-08-28  9:35 Alexys Jacob
  0 siblings, 0 replies; 12+ messages in thread
From: Alexys Jacob @ 2015-08-28  9:35 UTC (permalink / raw
  To: gentoo-commits

commit:     46fcef61e9b171a5d17c75d2cd2a5602f26e0801
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 09:34:51 2015 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 09:35:09 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46fcef61

sys-cluster/glusterfs: drop old and vulnerable versions wrt #558422 #541540, version bump fix #548734 #550256

Package-Manager: portage-2.2.20.1

 sys-cluster/glusterfs/Manifest                     |   5 +-
 .../files/glusterfs-3.6.5-build-shared-only.patch  | 547 +++++++++++++++++++++
 sys-cluster/glusterfs/glusterfs-3.2.7.ebuild       | 122 -----
 sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild    | 135 -----
 ...usterfs-3.5.3.ebuild => glusterfs-3.5.4.ebuild} |   9 +
 ...usterfs-3.5.3.ebuild => glusterfs-3.6.5.ebuild} |  11 +-
 6 files changed, 568 insertions(+), 261 deletions(-)

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index e08b350..3115e9b 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,4 +1,3 @@
 DIST glusterfs-3.1.2.tar.gz 2086469 SHA256 9a4e910431f572aa180a3ad1821f7524773ec1e8f06342c4040f26619f832838 SHA512 69b61af7c6cd9f54f615f7cd50c6ffda670800c6045604449b130eaa43c90c9adcb518c1312134890cccf3a301066a5af3e97bd7ec9775b7f70ea6d0a4a67cd6 WHIRLPOOL 0ecc86ac943f4c8d9575b8b0ae2ef72002d6510945e1a687409277165eb7688c2e4db50532ae10777828646b782561dfd4314fa766d7a3bcf4762e8be7c34c79
-DIST glusterfs-3.2.7.tar.gz 2424292 SHA256 464c089ff9da5a8e17f7caeae48f1cad59973489dfe940a9f0d8db8bc14cd6c4 SHA512 c4a286e1ddfec6c92d011b5abe4f96321e39dff57294141fc44cda4578fa11582095362733092af9042b38528cb328208e9e46a33c40c70e672ffb4e38dcc013 WHIRLPOOL 843a615b334e1ee84c3bcef1a8aceb113eb6976656ae09c6cbf4dcb201f4d37d9cc8ef3ccd3cc4aeb879bffde556b9f6f7105c3c39afed94a19b9613cd8c4284
-DIST glusterfs-3.3.1.tar.gz 2636698 SHA256 19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519 SHA512 c32e95a0e4568a62fabcf0c52ad3d6a173b62c5536006c3680e3efd1240e2a68177e14891e11d1d16eff5eb67bf60108dbd44151c26241203d8ddb58f0270c69 WHIRLPOOL 30316bbdb7087dd32d35f0f017ea461711830f5450984edb6d6c527d7f9cae5ee307601887cf489a2d675180d1f21a77ac7901f37f44cc860cccbe510c5a18bf
-DIST glusterfs-3.5.3.tar.gz 5021529 SHA256 d805d77da721e6fcb839f1208a9315b4f37b9d2a12c375dd47e5db4a60f5b6c2 SHA512 5a360c9d5180d1e59b8cac9900e4cf776aebf59fd59cca6a0ef27a84cae3781c8c5640b253c73888af751344dce9fd19c1b26bd9aa590ba4fc860143c990f30a WHIRLPOOL a08d3fc6f66dd4191d95611e1b626d8b393e2b8620800039cde20fcebe1643dc2cfe9e7eb3ce3be31aa4f17b8fc881060d40e3493ce189b93668716e2c7ae86d
+DIST glusterfs-3.5.4.tar.gz 5199067 SHA256 8e8bf9ff6b3884c420653dbf7549f8240cb30aa4a55c852ebb8f293f8089ad35 SHA512 eac2e5eacf33a04c574d495ea532703222faa559e34702f5939e9300936064d0867e4de9653be64dd3fa7fc1976e32915521a0ba07dc3c16c03b598a64dc12da WHIRLPOOL b597b677d6284e0419b6d1574d24bc6677bffec120c2ff37fc83f51b0fd048ec9bae8873b530e44cad10e85c109f8a97f3e67f85a4709207d488f64d561fc068
+DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e

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
new file mode 100644
index 0000000..af5332b
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch
@@ -0,0 +1,547 @@
+diff -ur a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am
+--- a/rpc/rpc-transport/rdma/src/Makefile.am	2015-08-28 10:56:17.750192744 +0200
++++ b/rpc/rpc-transport/rdma/src/Makefile.am	2015-08-28 11:00:36.322686236 +0200
+@@ -3,7 +3,7 @@
+ transport_LTLIBRARIES = rdma.la
+ transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
+ 
+-rdma_la_LDFLAGS = -module -avoid-version -nostartfiles
++rdma_la_LDFLAGS = -module -avoid-version -nostartfiles -shared
+ 
+ rdma_la_SOURCES = rdma.c name.c
+ rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la     \
+Only in b/rpc/rpc-transport/rdma/src: Makefile.am.orig
+Only in b/rpc/rpc-transport/rdma/src: Makefile.am.rej
+diff -ur a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am
+--- a/rpc/rpc-transport/socket/src/Makefile.am	2015-08-28 10:56:17.750192744 +0200
++++ b/rpc/rpc-transport/socket/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -3,7 +3,7 @@
+ 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 -ur a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am
+--- a/xlators/cluster/afr/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/cluster/afr/src/Makefile.am	2015-08-28 11:01:31.603219323 +0200
+@@ -10,11 +10,11 @@
+ 	afr-self-heal-entry.c afr-self-heal-metadata.c afr-self-heald.c \
+ 	afr-self-heal-name.c
+ 
+-afr_la_LDFLAGS = -module -avoid-version
++afr_la_LDFLAGS = -module -avoid-version -shared
+ afr_la_SOURCES = $(afr_common_source) $(AFR_SELFHEAL_SOURCES) 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) $(AFR_SELFHEAL_SOURCES) pump.c
+ pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+Only in b/xlators/cluster/afr/src: Makefile.am.orig
+Only in b/xlators/cluster/afr/src: Makefile.am.rej
+diff -ur a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am
+--- a/xlators/cluster/dht/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/cluster/dht/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -11,13 +11,13 @@
+ 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 dht-messages.h dht-helper.h \
+Only in b/xlators/cluster/dht/src: Makefile.am.orig
+diff -ur a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am
+--- a/xlators/cluster/stripe/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/cluster/stripe/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,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
+Only in b/xlators/cluster/stripe/src: Makefile.am.orig
+diff -ur a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am
+--- a/xlators/debug/error-gen/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/debug/error-gen/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am
+--- a/xlators/debug/io-stats/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/debug/io-stats/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am
+--- a/xlators/debug/trace/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/debug/trace/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am
+--- a/xlators/encryption/crypt/src/Makefile.am	2015-08-28 11:18:28.073021439 +0200
++++ b/xlators/encryption/crypt/src/Makefile.am	2015-08-28 11:16:28.051864039 +0200
+@@ -3,7 +3,7 @@
+ xlator_LTLIBRARIES = crypt.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
+ 
+-crypt_la_LDFLAGS = -module -avoid-version
++crypt_la_LDFLAGS = -module -avoid-version -shared
+ 
+ crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c
+ crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto
+Only in b/xlators/encryption/crypt/src: Makefile.am.orig
+Only in b/xlators/encryption/crypt/src: Makefile.am.rej
+diff -ur a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am
+--- a/xlators/encryption/rot-13/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/encryption/rot-13/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/features/changelog/src/Makefile.am b/xlators/features/changelog/src/Makefile.am
+--- a/xlators/features/changelog/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/changelog/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -5,7 +5,7 @@
+ noinst_HEADERS = changelog-helpers.h changelog-mem-types.h changelog-rt.h \
+ 	changelog-misc.h changelog-encoders.h changelog-notifier.h
+ 
+-changelog_la_LDFLAGS = -module -avoid-version
++changelog_la_LDFLAGS = -module -avoid-version -shared
+ 
+ changelog_la_SOURCES = changelog.c changelog-rt.c changelog-helpers.c \
+ 	changelog-encoders.c changelog-notifier.c changelog-barrier.c
+Only in b/xlators/features/changelog/src: Makefile.am.orig
+diff -ur a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am
+--- a/xlators/features/compress/src/Makefile.am	2015-08-28 11:18:28.073021439 +0200
++++ b/xlators/features/compress/src/Makefile.am	2015-08-28 11:17:19.492360095 +0200
+@@ -4,7 +4,7 @@
+ 
+ noinst_HEADERS = cdc.h cdc-mem-types.h
+ 
+-cdc_la_LDFLAGS = -module -avoid-version
++cdc_la_LDFLAGS = -module -avoid-version -shared
+ 
+ cdc_la_SOURCES = cdc.c cdc-helper.c
+ cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS)
+Only in b/xlators/features/compress/src: Makefile.am.rej
+diff -ur a/xlators/features/gfid-access/src/Makefile.am b/xlators/features/gfid-access/src/Makefile.am
+--- a/xlators/features/gfid-access/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/gfid-access/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = gfid-access.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-gfid_access_la_LDFLAGS = -module -avoid-version
++gfid_access_la_LDFLAGS = -module -avoid-version -shared
+ 
+ gfid_access_la_SOURCES = gfid-access.c
+ gfid_access_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am
+--- a/xlators/features/index/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/index/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am
+--- a/xlators/features/locks/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/locks/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am
+--- a/xlators/features/mac-compat/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/mac-compat/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am
+--- a/xlators/features/marker/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/marker/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/features/protect/src/Makefile.am b/xlators/features/protect/src/Makefile.am
+--- a/xlators/features/protect/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/protect/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -2,15 +2,15 @@
+ 
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-prot_dht_la_LDFLAGS = -module -avoid-version
++prot_dht_la_LDFLAGS = -module -avoid-version -shared
+ prot_dht_la_SOURCES = prot_dht.c
+ prot_dht_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+-prot_client_la_LDFLAGS = -module -avoid-version
++prot_client_la_LDFLAGS = -module -avoid-version -shared
+ prot_client_la_SOURCES = prot_client.c
+ prot_client_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+-prot_server_la_LDFLAGS = -module -avoid-version
++prot_server_la_LDFLAGS = -module -avoid-version -shared
+ prot_server_la_SOURCES = prot_server.c
+ prot_server_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ 
+diff -ur a/xlators/features/qemu-block/src/Makefile.am b/xlators/features/qemu-block/src/Makefile.am
+--- a/xlators/features/qemu-block/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/qemu-block/src/Makefile.am	2015-08-28 11:03:19.464259458 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = qemu-block.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-qemu_block_la_LDFLAGS = -module -avoid-version
++qemu_block_la_LDFLAGS = -module -avoid-version -shared
+ qemu_block_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GLIB_LIBS) $(ZLIB_LIBS) -lrt
+ 
+ qemu_block_la_SOURCES_qemu = \
+Only in b/xlators/features/qemu-block/src: Makefile.am.orig
+Only in b/xlators/features/qemu-block/src: Makefile.am.rej
+diff -ur a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am
+--- a/xlators/features/quiesce/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/quiesce/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am
+--- a/xlators/features/quota/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/quota/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,8 +1,8 @@
+ xlator_LTLIBRARIES = quota.la quotad.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+ 
+-quota_la_LDFLAGS = -module -avoid-version
+-quotad_la_LDFLAGS = -module -avoid-version
++quota_la_LDFLAGS = -module -avoid-version -shared
++quotad_la_LDFLAGS = -module -avoid-version -shared
+ 
+ quota_la_SOURCES = quota.c quota-enforcer-client.c
+ quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am
+--- a/xlators/features/read-only/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/read-only/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -4,12 +4,12 @@
+ 
+ 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 -ur a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
+--- a/xlators/mgmt/glusterd/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/mgmt/glusterd/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am
+--- a/xlators/mount/fuse/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/mount/fuse/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -26,7 +26,7 @@
+ 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) \
+Only in b/xlators/mount/fuse/src: Makefile.am.orig
+diff -ur a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am
+--- a/xlators/nfs/server/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/nfs/server/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am
+--- a/xlators/performance/io-cache/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/io-cache/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am
+--- a/xlators/performance/io-threads/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/io-threads/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am
+--- a/xlators/performance/md-cache/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/md-cache/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am
+--- a/xlators/performance/open-behind/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/open-behind/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am
+--- a/xlators/performance/quick-read/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/quick-read/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am
+--- a/xlators/performance/read-ahead/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/performance/read-ahead/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/performance/readdir-ahead/src/Makefile.am b/xlators/performance/readdir-ahead/src/Makefile.am
+--- a/xlators/performance/readdir-ahead/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/readdir-ahead/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = readdir-ahead.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+ 
+-readdir_ahead_la_LDFLAGS = -module -avoid-version
++readdir_ahead_la_LDFLAGS = -module -avoid-version -shared
+ 
+ readdir_ahead_la_SOURCES = readdir-ahead.c
+ readdir_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am
+--- a/xlators/performance/symlink-cache/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/symlink-cache/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am
+--- a/xlators/performance/write-behind/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/write-behind/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/playground/template/src/Makefile.am b/xlators/playground/template/src/Makefile.am
+--- a/xlators/playground/template/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/playground/template/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = template.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/features
+ 
+-template_la_LDFLAGS = -module -avoid-version
++template_la_LDFLAGS = -module -avoid-version -shared
+ 
+ template_la_SOURCES = template.c
+ template_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am
+--- a/xlators/protocol/auth/addr/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/protocol/auth/addr/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am
+--- a/xlators/protocol/auth/login/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/protocol/auth/login/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am
+--- a/xlators/protocol/client/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/protocol/client/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am
+--- a/xlators/protocol/server/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/protocol/server/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/storage/bd/src/Makefile.am b/xlators/storage/bd/src/Makefile.am
+--- a/xlators/storage/bd/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/storage/bd/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = bd.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage
+ 
+-bd_la_LDFLAGS = -module -avoid-version
++bd_la_LDFLAGS = -module -avoid-version -shared
+ LIBBD = -llvm2app -lrt
+ bd_la_SOURCES = bd.c bd-helper.c bd-aio.c
+ bd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBBD) $(LIBAIO)
+diff -ur a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am
+--- a/xlators/storage/posix/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/storage/posix/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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 -ur a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am
+--- a/xlators/system/posix-acl/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/system/posix-acl/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
+@@ -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
+ 

diff --git a/sys-cluster/glusterfs/glusterfs-3.2.7.ebuild b/sys-cluster/glusterfs/glusterfs-3.2.7.ebuild
deleted file mode 100644
index ffd564e..0000000
--- a/sys-cluster/glusterfs/glusterfs-3.2.7.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-inherit autotools elisp-common eutils multilib python versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
-
-RDEPEND="emacs? ( virtual/emacs )
-		fuse? ( >=sys-fs/fuse-2.7.0 )
-		infiniband? ( sys-infiniband/libibverbs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.1.0-parallel-build.patch" \
-		"${FILESDIR}/${PN}-docdir.patch" \
-		"${FILESDIR}/glusterd-3.2.0-workdir.patch"
-	sed -i -e "s/ -ggdb3//g" -e "s/ -m64//g" argp-standalone/configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable fuse fuse-client) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		--enable-georeplication \
-		--disable-bdb \
-		--docdir=/usr/share/doc/${PF} \
-		--localstatedir=/var
-}
-
-src_compile() {
-	emake
-	if use emacs ; then
-		elisp-compile extras/glusterfs-mode.el || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el* || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}/glusterfs.vim"
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/glusterfs.vim
-	fi
-
-	if use extras ; then
-		newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize
-		newbin extras/backend-cleanup.sh glusterfs-backend-cleanup
-		newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute
-		newbin extras/disk_usage_sync.sh glusterfs-disk-usage-sync
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-
-	newinitd "${FILESDIR}/${PN}.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
-
-	python_convert_shebangs -r 2 "${ED}"
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	elog
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	elog
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	elog
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers.  Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-
-	if [[ ${REPLACING_VERSIONS} < 3.1 ]]; then
-		elog
-		elog "You are upgrading from a previous version of ${PN}, please read:"
-		elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.2_Upgrade_Guide"
-	fi
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild b/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild
deleted file mode 100644
index fd8b7dd..0000000
--- a/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils elisp-common eutils multilib python versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
-
-RDEPEND="emacs? ( virtual/emacs )
-	fuse? ( >=sys-fs/fuse-2.7.0 )
-	infiniband? ( sys-infiniband/libibverbs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.0-parallel-build.patch"
-	"${FILESDIR}/${PN}-3.3.0-docdir.patch"
-	"${FILESDIR}/${PN}-3.3.0-silent_rules.patch"
-	"${FILESDIR}/${PN}-3.3.0-avoid-version.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s/ -ggdb3//g" \
-		-i argp-standalone/configure.ac || die
-	sed -e "s:\$(PYTHON):${PREFIX}/usr/bin/python2:g" \
-		-i xlators/features/marker/utils/src/Makefile.am || die #446330
-	sed -e 's:"/usr/local/libexec/glusterfs:GSYNCD_PREFIX":' \
-		-i xlators/mgmt/glusterd/src/glusterd.c || die #464196
-	autotools-utils_src_prepare
-	cd argp-standalone && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
-		$(use_enable fuse fuse-client)
-		$(use_enable infiniband ibverbs)
-		$(use_enable static-libs static)
-		--enable-georeplication
-		--docdir=/usr/share/doc/${PF}
-		--localstatedir=/var
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use emacs ; then
-		elisp-compile extras/glusterfs-mode.el || die
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el* || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	if use extras ; then
-		newbin extras/backend-xattr-sanitize.sh ${PN}-backend-xattr-sanitize
-		newbin extras/backend-cleanup.sh ${PN}-backend-cleanup
-		newbin extras/migrate-unify-to-distribute.sh ${PN}-migrate-unify-to-distribute
-		newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
-
-	python_convert_shebangs -r 2 "${ED}"
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	elog
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	elog
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	elog
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-
-	elog
-	elog "You are upgrading from a previous version of ${PN}, please read:"
-	elog "http://vbellur.wordpress.com/2012/05/31/upgrading-to-glusterfs-3-3/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/sys-cluster/glusterfs/glusterfs-3.5.3.ebuild b/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild
similarity index 96%
copy from sys-cluster/glusterfs/glusterfs-3.5.3.ebuild
copy to sys-cluster/glusterfs/glusterfs-3.5.4.ebuild
index e818b41..ad162ac 100644
--- a/sys-cluster/glusterfs/glusterfs-3.5.3.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild
@@ -57,6 +57,14 @@ pkg_setup() {
 	( use georeplication || use glupy ) && python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	autotools-utils_src_prepare
+
+	# argp-standalone source dir is not clean...
+	cd argp-standalone
+	emake distclean
+}
+
 src_configure() {
 	local myeconfargs=(
 		--disable-dependency-tracking
@@ -139,6 +147,7 @@ src_install() {
 
 	# QA
 	rm -rf "${ED}/var/run/" || die
+	use static-libs || find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
 
 	use georeplication && python_fix_shebang "${ED}"
 }

diff --git a/sys-cluster/glusterfs/glusterfs-3.5.3.ebuild b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
similarity index 95%
rename from sys-cluster/glusterfs/glusterfs-3.5.3.ebuild
rename to sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
index e818b41..5015ae8 100644
--- a/sys-cluster/glusterfs/glusterfs-3.5.3.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
@@ -43,7 +43,7 @@ SITEFILE="50${PN}-mode-gentoo.el"
 PATCHES=(
 	"${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
 	"${FILESDIR}/${PN}-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-3.5.1-build-shared-only.patch"
+	"${FILESDIR}/${PN}-3.6.5-build-shared-only.patch"
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
@@ -57,6 +57,14 @@ pkg_setup() {
 	( use georeplication || use glupy ) && python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	autotools-utils_src_prepare
+
+	# contrib/argp-standalone source dir is not clean...
+	cd contrib/argp-standalone
+	emake distclean
+}
+
 src_configure() {
 	local myeconfargs=(
 		--disable-dependency-tracking
@@ -139,6 +147,7 @@ src_install() {
 
 	# QA
 	rm -rf "${ED}/var/run/" || die
+	use static-libs || find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
 
 	use georeplication && python_fix_shebang "${ED}"
 }


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/
@ 2017-02-10 13:04 Alexys Jacob
  0 siblings, 0 replies; 12+ messages in thread
From: Alexys Jacob @ 2017-02-10 13:04 UTC (permalink / raw
  To: gentoo-commits

commit:     4db4f466470ead5803952a38332aea12ebb3d4e6
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 13:03:20 2017 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 13:04:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db4f466

sys-cluster/glusterfs: drop old and vulnerable wrt #541540

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-cluster/glusterfs/Manifest                     |   1 -
 sys-cluster/glusterfs/files/glusterd-workdir.patch |  49 ---------
 .../files/glusterfs-3.1.0-parallel-build.patch     |  22 ----
 sys-cluster/glusterfs/files/glusterfs-docdir.patch |  51 ----------
 sys-cluster/glusterfs/glusterfs-3.1.2.ebuild       | 112 ---------------------
 sys-cluster/glusterfs/metadata.xml                 |   1 -
 6 files changed, 236 deletions(-)

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 97d98978c0..c55ec43970 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,4 +1,3 @@
-DIST glusterfs-3.1.2.tar.gz 2086469 SHA256 9a4e910431f572aa180a3ad1821f7524773ec1e8f06342c4040f26619f832838 SHA512 69b61af7c6cd9f54f615f7cd50c6ffda670800c6045604449b130eaa43c90c9adcb518c1312134890cccf3a301066a5af3e97bd7ec9775b7f70ea6d0a4a67cd6 WHIRLPOOL 0ecc86ac943f4c8d9575b8b0ae2ef72002d6510945e1a687409277165eb7688c2e4db50532ae10777828646b782561dfd4314fa766d7a3bcf4762e8be7c34c79
 DIST glusterfs-3.5.4.tar.gz 5199067 SHA256 8e8bf9ff6b3884c420653dbf7549f8240cb30aa4a55c852ebb8f293f8089ad35 SHA512 eac2e5eacf33a04c574d495ea532703222faa559e34702f5939e9300936064d0867e4de9653be64dd3fa7fc1976e32915521a0ba07dc3c16c03b598a64dc12da WHIRLPOOL b597b677d6284e0419b6d1574d24bc6677bffec120c2ff37fc83f51b0fd048ec9bae8873b530e44cad10e85c109f8a97f3e67f85a4709207d488f64d561fc068
 DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e
 DIST glusterfs-3.7.4.tar.gz 7552110 SHA256 f98f448117d1de7666ae425eddd8d7d87b02c57f6627234ce96ba60566f47173 SHA512 f9a281f3a37835f9f54679740ddb19b307babe576a8f14c9ef24d256f483789c227d7e7c5b0ed4ef5c13a257bcf00d0c17b6108fa60c5e45d0175df6e236b3a5 WHIRLPOOL 7b0320936de078234228cb691f3e381da3cc89c638d6246aba63695aa36cb114afca6e53d12d23de441b8da0b3a594ac1702b450d5d14720254af73e689c4ab8

diff --git a/sys-cluster/glusterfs/files/glusterd-workdir.patch b/sys-cluster/glusterfs/files/glusterd-workdir.patch
deleted file mode 100644
index 285136373d..0000000000
--- a/sys-cluster/glusterfs/files/glusterd-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/gluster.8  2010-10-13 06:20:36.000000000 +0200
-+++ b/doc/gluster.8  2010-10-26 10:48:36.738500314 +0200
-@@ -118,7 +118,7 @@
- .TP
- .PP
- .SH FILES
--/etc/glusterd/*
-+/var/lib/glusterd/*
-
- .SH SEE ALSO
- .nf
---- 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

diff --git a/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch b/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch
deleted file mode 100644
index 9320c12ea7..0000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- glusterfsd/src/Makefile.am
-+++ glusterfsd/src/Makefile.am
-@@ -20,5 +20,6 @@ uninstall-local:
- 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
- 	ln -s glusterfsd $(DESTDIR)$(sbindir)/glusterfs
---- libglusterfs/src/Makefile.am
-+++ libglusterfs/src/Makefile.am
-@@ -15,7 +15,9 @@
- graph.lex.c: graph.l y.tab.h
- 	$(LEX) -t $(srcdir)/graph.l > $@
- 
--y.tab.c y.tab.h: graph.y
-+y.tab.c: y.tab.h
-+
-+y.tab.h: graph.y
- 	$(YACC) -d $(srcdir)/graph.y
- 
- CLEANFILES = graph.lex.c y.tab.c y.tab.h

diff --git a/sys-cluster/glusterfs/files/glusterfs-docdir.patch b/sys-cluster/glusterfs/files/glusterfs-docdir.patch
deleted file mode 100644
index 5e26f637b2..0000000000
--- a/sys-cluster/glusterfs/files/glusterfs-docdir.patch
+++ /dev/null
@@ -1,51 +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.
-
----
- doc/examples/Makefile.am        |    1 -
- extras/Makefile.am              |    3 +--
- extras/benchmarking/Makefile.am |    4 +---
- 3 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
-index b4c93f4..5296d83 100644
---- a/doc/examples/Makefile.am
-+++ b/doc/examples/Makefile.am
-@@ -1,7 +1,6 @@
- EXTRA = README unify.vol replicate.vol stripe.vol protocol-client.vol protocol-server.vol posix-locks.vol trash.vol write-behind.vol io-threads.vol io-cache.vol read-ahead.vol filter.vol trace.vol
- EXTRA_DIST = $(EXTRA)
- 
--docdir = $(datadir)/doc/$(PACKAGE_NAME)
- Examplesdir = $(docdir)/examples
- Examples_DATA = $(EXTRA)
- 
-diff --git a/extras/Makefile.am b/extras/Makefile.am
-index 9be3973..ea0b33d 100644
---- 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
-diff --git a/extras/benchmarking/Makefile.am b/extras/benchmarking/Makefile.am
-index 04cc061..bfcc592 100644
---- 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
- 
--- 
-1.6.3
-

diff --git a/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild
deleted file mode 100644
index 2c8b8ca74c..0000000000
--- a/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit autotools elisp-common eutils multilib versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
-
-RDEPEND="emacs? ( virtual/emacs )
-		fuse? ( >=sys-fs/fuse-2.7.0 )
-		infiniband? ( sys-fabric/libibverbs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.1.0-parallel-build.patch" \
-		"${FILESDIR}/${PN}-docdir.patch" \
-		"${FILESDIR}/glusterd-workdir.patch"
-	sed -i -e "s/ -ggdb3//g" argp-standalone/configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable fuse fuse-client) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		--disable-bdb \
-		--docdir=/usr/share/doc/${PF} \
-		--localstatedir=/var
-}
-
-src_compile() {
-	emake || die
-	if use emacs ; then
-		elisp-compile extras/glusterfs-mode.el || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el* || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}/glusterfs.vim" || die
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/glusterfs.vim || die
-	fi
-
-	if use extras ; then
-		newbin extras/volgen/glusterfs-volgen glusterfs-volgen || die
-		newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize || die
-		newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute || die
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS || die
-
-	newinitd "${FILESDIR}/${PN}.initd" glusterfsd || die
-	newinitd "${FILESDIR}/glusterd.initd" glusterd || die
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd || die
-
-	keepdir /var/log/${PN} || die
-	keepdir /var/lib/glusterd || die
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	elog
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	elog
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	elog
-	elog "For more information on how to mount exported GlusterFS filesystems visit:"
-	elog "http://www.gluster.org/docs/index.php/Mounting_a_GlusterFS_Volume"
-	elog
-	elog "If you are upgrading from glusterfs 3.0.x please read:"
-	elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.1_Upgrade_Guide"
-	elog
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers.  Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml
index 9bc43af51b..dbe49ffe84 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -14,7 +14,6 @@
     <flag name="fuse">Add FUSE mount helper</flag>
     <flag name="glupy">Enable support for translators written in Python</flag>
     <flag name="georeplication">Enable support for georeplication (requires <pkg>dev-lang/python</pkg>)</flag>
-    <flag name="extras">Install extra helper scripts</flag>
     <flag name="infiniband">Add support for Infiniband ibverbs transport.
 			Libraries can be found in science overlay</flag>
     <flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/
@ 2017-04-21 18:40 Alexys Jacob
  0 siblings, 0 replies; 12+ messages in thread
From: Alexys Jacob @ 2017-04-21 18:40 UTC (permalink / raw
  To: gentoo-commits

commit:     f76cdccea1e4c66e22514984774e0d6e91a7904c
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 21 18:39:05 2017 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Apr 21 18:39:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f76cdcce

sys-cluster/glusterfs: drop old ebuild

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 sys-cluster/glusterfs/Manifest                     |   1 -
 .../files/glusterfs-3.5.1-build-shared-only.patch  | 576 ---------------------
 sys-cluster/glusterfs/glusterfs-3.5.4.ebuild       | 182 -------
 3 files changed, 759 deletions(-)

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 9d286d388f6..4b45438299d 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,5 +1,4 @@
 DIST glusterfs-3.10.1.tar.gz 8926368 SHA256 d3c23df3299964efe6b688c94ddde258506ecf173b58e8c07fa18d470bb21517 SHA512 35acf10d37db7ca9cf7d88e4eabcac4febdccfe15cbe68df86c44042987547f3a56447a1ced5ed238d171efdbcb97dd1fc6917283641bdcd7d476deb37ad0871 WHIRLPOOL 7ce3b5cbe136b1d09b4c0c062decf0d9c5bba03f9b7249648e886ceff758061e73863c9f6d82ed2de3fc41546950ee08c022683174283dc03201c12d61d295aa
-DIST glusterfs-3.5.4.tar.gz 5199067 SHA256 8e8bf9ff6b3884c420653dbf7549f8240cb30aa4a55c852ebb8f293f8089ad35 SHA512 eac2e5eacf33a04c574d495ea532703222faa559e34702f5939e9300936064d0867e4de9653be64dd3fa7fc1976e32915521a0ba07dc3c16c03b598a64dc12da WHIRLPOOL b597b677d6284e0419b6d1574d24bc6677bffec120c2ff37fc83f51b0fd048ec9bae8873b530e44cad10e85c109f8a97f3e67f85a4709207d488f64d561fc068
 DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e
 DIST glusterfs-3.7.4.tar.gz 7552110 SHA256 f98f448117d1de7666ae425eddd8d7d87b02c57f6627234ce96ba60566f47173 SHA512 f9a281f3a37835f9f54679740ddb19b307babe576a8f14c9ef24d256f483789c227d7e7c5b0ed4ef5c13a257bcf00d0c17b6108fa60c5e45d0175df6e236b3a5 WHIRLPOOL 7b0320936de078234228cb691f3e381da3cc89c638d6246aba63695aa36cb114afca6e53d12d23de441b8da0b3a594ac1702b450d5d14720254af73e689c4ab8
 DIST glusterfs-3.8.11.tar.gz 8544971 SHA256 2285c02f9449168eabeaa7b72706e80f3de659eb685293dd899c71c33798702e SHA512 61cadc567a73403c78eac5e472aadd1457053be936042ea1218c172760376b026152e84b4ca15a0c249524347d434cc7d35c3a73f4d0b01e89c6aec5edcbbb49 WHIRLPOOL 21d4c2da1d281cb03181c21385a62d74c71f24936d2c33da22085accb5fa563b7095757b7df3eb30bf865c37fe683c420756c542d6933c99c0d3f9025c07a217

diff --git a/sys-cluster/glusterfs/files/glusterfs-3.5.1-build-shared-only.patch b/sys-cluster/glusterfs/files/glusterfs-3.5.1-build-shared-only.patch
deleted file mode 100644
index 9acf0d7526c..00000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.5.1-build-shared-only.patch
+++ /dev/null
@@ -1,576 +0,0 @@
-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 174bea8..cab9993 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/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am
-index d7ebac6..66ae6f5 100644
---- a/xlators/encryption/crypt/src/Makefile.am
-+++ b/xlators/encryption/crypt/src/Makefile.am
-@@ -3,7 +3,7 @@ if ENABLE_CRYPT_XLATOR
- xlator_LTLIBRARIES = crypt.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
- 
--crypt_la_LDFLAGS = -module -avoid-version
-+crypt_la_LDFLAGS = -module -avoid-version -shared
- 
- crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c
- crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto
-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/changelog/src/Makefile.am b/xlators/features/changelog/src/Makefile.am
-index 54c21ac..d98f43f 100644
---- a/xlators/features/changelog/src/Makefile.am
-+++ b/xlators/features/changelog/src/Makefile.am
-@@ -5,7 +5,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- noinst_HEADERS = changelog-helpers.h changelog-mem-types.h changelog-rt.h \
- 	changelog-misc.h changelog-encoders.h changelog-notifier.h
- 
--changelog_la_LDFLAGS = -module -avoid-version
-+changelog_la_LDFLAGS = -module -avoid-version -shared
- 
- changelog_la_SOURCES = changelog.c changelog-rt.c changelog-helpers.c \
- 	changelog-encoders.c changelog-notifier.c
-diff --git a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am
-index d3abe03..659cd49 100644
---- a/xlators/features/compress/src/Makefile.am
-+++ b/xlators/features/compress/src/Makefile.am
-@@ -4,7 +4,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
- noinst_HEADERS = cdc.h cdc-mem-types.h
- 
--cdc_la_LDFLAGS = -module -avoid-version
-+cdc_la_LDFLAGS = -module -avoid-version -shared
- 
- cdc_la_SOURCES = cdc.c cdc-helper.c
- cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS)
-diff --git a/xlators/features/gfid-access/src/Makefile.am b/xlators/features/gfid-access/src/Makefile.am
-index db53aff..4eeaa4f 100644
---- a/xlators/features/gfid-access/src/Makefile.am
-+++ b/xlators/features/gfid-access/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = gfid-access.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--gfid_access_la_LDFLAGS = -module -avoid-version
-+gfid_access_la_LDFLAGS = -module -avoid-version -shared
- 
- gfid_access_la_SOURCES = gfid-access.c
- gfid_access_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 0f79731..eda6a05 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/protect/src/Makefile.am b/xlators/features/protect/src/Makefile.am
-index 968e88c..84ceec2 100644
---- a/xlators/features/protect/src/Makefile.am
-+++ b/xlators/features/protect/src/Makefile.am
-@@ -2,15 +2,15 @@ xlator_LTLIBRARIES = prot_dht.la prot_client.la prot_server.la
- 
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--prot_dht_la_LDFLAGS = -module -avoid-version
-+prot_dht_la_LDFLAGS = -module -avoid-version -shared
- prot_dht_la_SOURCES = prot_dht.c
- prot_dht_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
--prot_client_la_LDFLAGS = -module -avoid-version
-+prot_client_la_LDFLAGS = -module -avoid-version -shared
- prot_client_la_SOURCES = prot_client.c
- prot_client_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
--prot_server_la_LDFLAGS = -module -avoid-version
-+prot_server_la_LDFLAGS = -module -avoid-version -shared
- prot_server_la_SOURCES = prot_server.c
- prot_server_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
-diff --git a/xlators/features/qemu-block/src/Makefile.am b/xlators/features/qemu-block/src/Makefile.am
-index 08a7b62..30639e0 100644
---- a/xlators/features/qemu-block/src/Makefile.am
-+++ b/xlators/features/qemu-block/src/Makefile.am
-@@ -2,7 +2,7 @@ if ENABLE_QEMU_BLOCK
- xlator_LTLIBRARIES = qemu-block.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--qemu_block_la_LDFLAGS = -module -avoid-version
-+qemu_block_la_LDFLAGS = -module -avoid-version -shared
- qemu_block_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GLIB_LIBS) -lz -lrt
- 
- qemu_block_la_SOURCES_qemu = \
-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 7165adc..06905f3 100644
---- a/xlators/features/quota/src/Makefile.am
-+++ b/xlators/features/quota/src/Makefile.am
-@@ -1,8 +1,8 @@
- xlator_LTLIBRARIES = quota.la quotad.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--quota_la_LDFLAGS = -module -avoid-version
--quotad_la_LDFLAGS = -module -avoid-version
-+quota_la_LDFLAGS = -module -avoid-version -shared
-+quotad_la_LDFLAGS = -module -avoid-version -shared
- 
- quota_la_SOURCES = quota.c quota-enforcer-client.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 a6f49ae..b071280 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 62fbf65..1995f67 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/readdir-ahead/src/Makefile.am b/xlators/performance/readdir-ahead/src/Makefile.am
-index 539d6ed..020b670 100644
---- a/xlators/performance/readdir-ahead/src/Makefile.am
-+++ b/xlators/performance/readdir-ahead/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = readdir-ahead.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
- 
--readdir_ahead_la_LDFLAGS = -module -avoid-version
-+readdir_ahead_la_LDFLAGS = -module -avoid-version -shared
- 
- readdir_ahead_la_SOURCES = readdir-ahead.c
- readdir_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/playground/template/src/Makefile.am b/xlators/playground/template/src/Makefile.am
-index 21f1c5f..3161bc8 100644
---- a/xlators/playground/template/src/Makefile.am
-+++ b/xlators/playground/template/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = template.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/features
- 
--template_la_LDFLAGS = -module -avoid-version
-+template_la_LDFLAGS = -module -avoid-version -shared
- 
- template_la_SOURCES = template.c
- template_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 6a18bf0..9a0393f 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/src/Makefile.am b/xlators/storage/bd/src/Makefile.am
-index 3d93f74..589185d 100644
---- a/xlators/storage/bd/src/Makefile.am
-+++ b/xlators/storage/bd/src/Makefile.am
-@@ -2,7 +2,7 @@ if ENABLE_BD_XLATOR
- xlator_LTLIBRARIES = bd.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage
- 
--bd_la_LDFLAGS = -module -avoid-version
-+bd_la_LDFLAGS = -module -avoid-version -shared
- LIBBD = -llvm2app -lrt
- bd_la_SOURCES = bd.c bd-helper.c bd-aio.c
- bd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBBD) $(LIBAIO)
-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
- 

diff --git a/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild b/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild
deleted file mode 100644
index 47828a12964..00000000000
--- a/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband qemu-block rsyslog static-libs +syslog systemtap vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	glupy? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="bd-xlator? ( sys-fs/lvm2 )
-	emacs? ( virtual/emacs )
-	fuse? ( >=sys-fs/fuse-2.7.0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
-	qemu-block? ( dev-libs/glib:2 )
-	systemtap? ( dev-util/systemtap )
-	xml? ( dev-libs/libxml2 )
-	sys-libs/readline:=
-	dev-libs/libaio
-	dev-libs/openssl:=
-	|| ( sys-libs/glibc sys-libs/argp-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
-	"${FILESDIR}/${PN}-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-3.5.1-build-shared-only.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	( use georeplication || use glupy ) && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-
-	# argp-standalone source dir is not clean...
-	cd argp-standalone
-	emake distclean
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--disable-fusermount
-		$(use_enable debug)
-		$(use_enable bd-xlator)
-		$(use_enable crypt-xlator)
-		$(use_enable fuse fuse-client)
-		$(use_enable georeplication)
-		$(use_enable glupy)
-		$(use_enable infiniband ibverbs)
-		$(use_enable qemu-block)
-		$(use_enable static-libs static)
-		$(use_enable syslog)
-		$(use_enable systemtap)
-		$(use_enable xml xml-output)
-		--docdir=/usr/share/doc/${PF}
-		--localstatedir=/var
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	rm \
-		"${D}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${D}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${D}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r2.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
-
-	# QA
-	rm -rf "${ED}/var/run/" || die
-	use static-libs || find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
-
-	use georeplication && python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-
-	elog
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://www.gluster.org/community/documentation/index.php/Upgrade_to_3.5"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/
@ 2017-11-21 20:43 James Le Cuirot
  0 siblings, 0 replies; 12+ messages in thread
From: James Le Cuirot @ 2017-11-21 20:43 UTC (permalink / raw
  To: gentoo-commits

commit:     7e3732f96f34540928841e6fe3be3a0978767d31
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 13:24:36 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 20:43:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e3732f9

sys-cluster/glusterfs: Fix building against glibc 2.26 due to no RPC

Bug: https://bugs.gentoo.org/381391
Package-Manager: Portage-2.3.14, Repoman-2.3.6

 .../files/glusterfs-3.12.3-libtirpc.patch          | 45 ++++++++++++++++++++++
 sys-cluster/glusterfs/glusterfs-3.12.2.ebuild      |  7 +++-
 sys-cluster/glusterfs/metadata.xml                 |  1 +
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/glusterfs/files/glusterfs-3.12.3-libtirpc.patch b/sys-cluster/glusterfs/files/glusterfs-3.12.3-libtirpc.patch
new file mode 100644
index 00000000000..fdc1f1f9597
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.12.3-libtirpc.patch
@@ -0,0 +1,45 @@
+From 6394d8d8e90d5400b49005bf3005523b2e306b2c Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Mon, 20 Nov 2017 20:44:45 +0000
+Subject: [PATCH] build: Allow libtirpc to be explicitly requested
+
+Some distributions like Gentoo no longer include the RPC stuff in
+their glibc packages.
+
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ configure.ac | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index ce689225c..90d2f98c8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -291,6 +291,10 @@ else
+         CFLAGS="${CFLAGS} -g -rdynamic"
+ fi
+ 
++AC_ARG_WITH([libtirpc],
++        AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
++        [], [with_libtirpc=no])
++
+ AC_ARG_ENABLE([privport_tracking],
+               AC_HELP_STRING([--disable-privport_tracking],
+                              [Disable internal tracking of privileged ports.]))
+@@ -1050,6 +1054,13 @@ AC_SUBST(GF_DISTRIBUTION)
+ GF_HOST_OS=""
+ GF_LDFLAGS="-rdynamic"
+ 
++if test "x$with_libtirpc" = "xyes" ; then
++    PKG_CHECK_MODULES([TIRPC], [libtirpc],
++       [GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
++       [AC_MSG_ERROR([libtirpc requested but library not found])]
++    )
++fi
++
+ dnl check for gcc -Werror=format-security
+ saved_CFLAGS=$CFLAGS
+ CFLAGS="-Wformat -Werror=format-security"
+-- 
+2.15.0
+

diff --git a/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild
index f5220e9f181..dc1e9dfbba1 100644
--- a/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
+IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
 
 REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
 	glupy? ( ${PYTHON_REQUIRED_USE} )"
@@ -28,6 +28,8 @@ RDEPEND="bd-xlator? ( sys-fs/lvm2 )
 	fuse? ( >=sys-fs/fuse-2.7.0:0 )
 	georeplication? ( ${PYTHON_DEPS} )
 	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
 	qemu-block? ( dev-libs/glib:2 )
 	systemtap? ( dev-util/systemtap )
 	tiering? ( dev-db/sqlite:3 )
@@ -37,6 +39,7 @@ RDEPEND="bd-xlator? ( sys-fs/lvm2 )
 	dev-libs/openssl:=[-bindist]
 	dev-libs/userspace-rcu:=
 	|| ( sys-libs/glibc sys-libs/argp-standalone )
+	net-libs/rpcsvc-proto
 	sys-apps/util-linux"
 DEPEND="${RDEPEND}
 	virtual/acl
@@ -57,6 +60,7 @@ SITEFILE="50${PN}-mode-gentoo.el"
 PATCHES=(
 	"${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
 	"${FILESDIR}/${PN}-3.12.2-silent_rules.patch"
+	"${FILESDIR}/${PN}-3.12.3-libtirpc.patch"
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
@@ -108,6 +112,7 @@ src_configure() {
 		$(use_enable test cmocka) \
 		$(use_enable tiering) \
 		$(use_enable xml xml-output) \
+		$(use_with libtirpc) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localstatedir="${EPREFIX}"/var

diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml
index dbe49ffe848..805ab9d1871 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -16,6 +16,7 @@
     <flag name="georeplication">Enable support for georeplication (requires <pkg>dev-lang/python</pkg>)</flag>
     <flag name="infiniband">Add support for Infiniband ibverbs transport.
 			Libraries can be found in science overlay</flag>
+    <flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
     <flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
     <flag name="qemu-block">Transparently create files as QCow2/QED images in the backend, including the possibility to snapshot.</flag>
     <flag name="systemtap">Enable support for <pkg>dev-util/systemtap</pkg></flag>


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/
@ 2017-11-28 10:08 James Le Cuirot
  0 siblings, 0 replies; 12+ messages in thread
From: James Le Cuirot @ 2017-11-28 10:08 UTC (permalink / raw
  To: gentoo-commits

commit:     dd3ee9c37a203fefe6c6de23136aa1542ea398ce
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 28 10:08:04 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 28 10:08:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3ee9c3

sys-cluster/glusterfs: Drop vulnerable 3.6.5

Bug: https://bugs.gentoo.org/635172
Closes: https://bugs.gentoo.org/635172
Closes: https://bugs.gentoo.org/635172
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sys-cluster/glusterfs/Manifest                     |   1 -
 sys-cluster/glusterfs/files/glusterd-r2.initd      |  32 --
 .../files/glusterfs-3.4.0-silent_rules.patch       |  23 -
 ...libraries-using-LIBADD-instead-of-LDFLAGS.patch |  54 --
 .../files/glusterfs-3.6.5-build-shared-only.patch  | 547 ---------------------
 sys-cluster/glusterfs/glusterfs-3.6.5.ebuild       | 182 -------
 6 files changed, 839 deletions(-)

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 3dcadc08908..78d1fe1e8d0 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,2 +1 @@
 DIST glusterfs-3.12.3.tar.gz 7187644 BLAKE2B 736c6bb408b0bd289ce5ce0abcc7e8bf4b7f96e4e92a1e669f016b59fb16993b17f7cf50fed09a6eeb851b57054c7bf9e595b642c506b0aca567d7ae80de0e84 SHA512 f648b8324a69360b510c947e49918467c969dcc21b6a408b6916b780aa78c44abe027b6c84d696eed7d5f381b055edd3be1dfe4f3ea8f76d15d9319cd08cfa3d
-DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e

diff --git a/sys-cluster/glusterfs/files/glusterd-r2.initd b/sys-cluster/glusterfs/files/glusterd-r2.initd
deleted file mode 100644
index 924939400f3..00000000000
--- a/sys-cluster/glusterfs/files/glusterd-r2.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-}
-
-start_pre() {
-	# Ensure that the GlusterFS auxiliary mount parent directory exists
-	checkpath --directory --owner root:root --mode 0700 /var/run/gluster
-}
-
-start_post() {
-	local c=0
-	ebegin "Waiting for glusterd to start up"
-	while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
-		(( ++c ))
-	done
-	[ "${c}" -lt "${glusterd_max_wait_start-60}" ]
-	eend $?
-
-	return 0
-}

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
deleted file mode 100644
index 1b79e0d079e..00000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.ac	2013-07-12 19:43:26.000000000 +0200
-+++ configure.ac2	2013-07-25 13:58:48.294091861 +0200
-@@ -10,20 +10,6 @@
- 
- 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
--
- AC_CONFIG_HEADERS([config.h])
- 
- AC_CONFIG_FILES([Makefile

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
deleted file mode 100644
index 5c4df0c9702..00000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8bfe3752c3a0a4db49a879048cdd089da6c45ed0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
-Date: Thu, 26 Jun 2014 19:04:54 +0200
-Subject: [PATCH] Add libraries using LIBADD instead of LDFLAGS
-
----
- xlators/encryption/crypt/src/Makefile.am  | 6 +++---
- xlators/features/compress/src/Makefile.am | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am
-index b13f650..d7ebac6 100644
---- a/xlators/encryption/crypt/src/Makefile.am
-+++ b/xlators/encryption/crypt/src/Makefile.am
-@@ -3,10 +3,10 @@ if ENABLE_CRYPT_XLATOR
- xlator_LTLIBRARIES = crypt.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
- 
--crypt_la_LDFLAGS = -module -avoid-version -lssl -lcrypto
-+crypt_la_LDFLAGS = -module -avoid-version
- 
- crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c
--crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-+crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto
- 
- noinst_HEADERS = crypt-common.h crypt-mem-types.h crypt.h metadata.h
- 
-@@ -21,4 +21,4 @@ else
- noinst_DIST = keys.c data.c metadata.c atom.c crypt.c
- noinst_HEADERS = crypt-common.h crypt-mem-types.h crypt.h metadata.h
- 
--endif
-\ No newline at end of file
-+endif
-diff --git a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am
-index 0bf757c..d3abe03 100644
---- a/xlators/features/compress/src/Makefile.am
-+++ b/xlators/features/compress/src/Makefile.am
-@@ -4,10 +4,10 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
- noinst_HEADERS = cdc.h cdc-mem-types.h
- 
--cdc_la_LDFLAGS = -module -avoid-version $(LIBZ_LIBS)
-+cdc_la_LDFLAGS = -module -avoid-version
- 
- cdc_la_SOURCES = cdc.c cdc-helper.c
--cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-+cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS)
- 
- AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) \
- -shared -nostartfiles  $(LIBZ_CFLAGS)
--- 
-1.9.2
-

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
deleted file mode 100644
index af5332bc9b1..00000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch
+++ /dev/null
@@ -1,547 +0,0 @@
-diff -ur a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am
---- a/rpc/rpc-transport/rdma/src/Makefile.am	2015-08-28 10:56:17.750192744 +0200
-+++ b/rpc/rpc-transport/rdma/src/Makefile.am	2015-08-28 11:00:36.322686236 +0200
-@@ -3,7 +3,7 @@
- transport_LTLIBRARIES = rdma.la
- transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
- 
--rdma_la_LDFLAGS = -module -avoid-version -nostartfiles
-+rdma_la_LDFLAGS = -module -avoid-version -nostartfiles -shared
- 
- rdma_la_SOURCES = rdma.c name.c
- rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la     \
-Only in b/rpc/rpc-transport/rdma/src: Makefile.am.orig
-Only in b/rpc/rpc-transport/rdma/src: Makefile.am.rej
-diff -ur a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am
---- a/rpc/rpc-transport/socket/src/Makefile.am	2015-08-28 10:56:17.750192744 +0200
-+++ b/rpc/rpc-transport/socket/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -3,7 +3,7 @@
- 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 -ur a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am
---- a/xlators/cluster/afr/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/cluster/afr/src/Makefile.am	2015-08-28 11:01:31.603219323 +0200
-@@ -10,11 +10,11 @@
- 	afr-self-heal-entry.c afr-self-heal-metadata.c afr-self-heald.c \
- 	afr-self-heal-name.c
- 
--afr_la_LDFLAGS = -module -avoid-version
-+afr_la_LDFLAGS = -module -avoid-version -shared
- afr_la_SOURCES = $(afr_common_source) $(AFR_SELFHEAL_SOURCES) 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) $(AFR_SELFHEAL_SOURCES) pump.c
- pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
-Only in b/xlators/cluster/afr/src: Makefile.am.orig
-Only in b/xlators/cluster/afr/src: Makefile.am.rej
-diff -ur a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am
---- a/xlators/cluster/dht/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/cluster/dht/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -11,13 +11,13 @@
- 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 dht-messages.h dht-helper.h \
-Only in b/xlators/cluster/dht/src: Makefile.am.orig
-diff -ur a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am
---- a/xlators/cluster/stripe/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/cluster/stripe/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,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
-Only in b/xlators/cluster/stripe/src: Makefile.am.orig
-diff -ur a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am
---- a/xlators/debug/error-gen/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/debug/error-gen/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am
---- a/xlators/debug/io-stats/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/debug/io-stats/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am
---- a/xlators/debug/trace/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/debug/trace/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am
---- a/xlators/encryption/crypt/src/Makefile.am	2015-08-28 11:18:28.073021439 +0200
-+++ b/xlators/encryption/crypt/src/Makefile.am	2015-08-28 11:16:28.051864039 +0200
-@@ -3,7 +3,7 @@
- xlator_LTLIBRARIES = crypt.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
- 
--crypt_la_LDFLAGS = -module -avoid-version
-+crypt_la_LDFLAGS = -module -avoid-version -shared
- 
- crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c
- crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto
-Only in b/xlators/encryption/crypt/src: Makefile.am.orig
-Only in b/xlators/encryption/crypt/src: Makefile.am.rej
-diff -ur a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am
---- a/xlators/encryption/rot-13/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/encryption/rot-13/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/features/changelog/src/Makefile.am b/xlators/features/changelog/src/Makefile.am
---- a/xlators/features/changelog/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/changelog/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -5,7 +5,7 @@
- noinst_HEADERS = changelog-helpers.h changelog-mem-types.h changelog-rt.h \
- 	changelog-misc.h changelog-encoders.h changelog-notifier.h
- 
--changelog_la_LDFLAGS = -module -avoid-version
-+changelog_la_LDFLAGS = -module -avoid-version -shared
- 
- changelog_la_SOURCES = changelog.c changelog-rt.c changelog-helpers.c \
- 	changelog-encoders.c changelog-notifier.c changelog-barrier.c
-Only in b/xlators/features/changelog/src: Makefile.am.orig
-diff -ur a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am
---- a/xlators/features/compress/src/Makefile.am	2015-08-28 11:18:28.073021439 +0200
-+++ b/xlators/features/compress/src/Makefile.am	2015-08-28 11:17:19.492360095 +0200
-@@ -4,7 +4,7 @@
- 
- noinst_HEADERS = cdc.h cdc-mem-types.h
- 
--cdc_la_LDFLAGS = -module -avoid-version
-+cdc_la_LDFLAGS = -module -avoid-version -shared
- 
- cdc_la_SOURCES = cdc.c cdc-helper.c
- cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS)
-Only in b/xlators/features/compress/src: Makefile.am.rej
-diff -ur a/xlators/features/gfid-access/src/Makefile.am b/xlators/features/gfid-access/src/Makefile.am
---- a/xlators/features/gfid-access/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/gfid-access/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = gfid-access.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--gfid_access_la_LDFLAGS = -module -avoid-version
-+gfid_access_la_LDFLAGS = -module -avoid-version -shared
- 
- gfid_access_la_SOURCES = gfid-access.c
- gfid_access_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am
---- a/xlators/features/index/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/index/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am
---- a/xlators/features/locks/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/locks/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am
---- a/xlators/features/mac-compat/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/mac-compat/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am
---- a/xlators/features/marker/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/marker/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/features/protect/src/Makefile.am b/xlators/features/protect/src/Makefile.am
---- a/xlators/features/protect/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/protect/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -2,15 +2,15 @@
- 
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--prot_dht_la_LDFLAGS = -module -avoid-version
-+prot_dht_la_LDFLAGS = -module -avoid-version -shared
- prot_dht_la_SOURCES = prot_dht.c
- prot_dht_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
--prot_client_la_LDFLAGS = -module -avoid-version
-+prot_client_la_LDFLAGS = -module -avoid-version -shared
- prot_client_la_SOURCES = prot_client.c
- prot_client_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
--prot_server_la_LDFLAGS = -module -avoid-version
-+prot_server_la_LDFLAGS = -module -avoid-version -shared
- prot_server_la_SOURCES = prot_server.c
- prot_server_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
-diff -ur a/xlators/features/qemu-block/src/Makefile.am b/xlators/features/qemu-block/src/Makefile.am
---- a/xlators/features/qemu-block/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/qemu-block/src/Makefile.am	2015-08-28 11:03:19.464259458 +0200
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = qemu-block.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--qemu_block_la_LDFLAGS = -module -avoid-version
-+qemu_block_la_LDFLAGS = -module -avoid-version -shared
- qemu_block_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GLIB_LIBS) $(ZLIB_LIBS) -lrt
- 
- qemu_block_la_SOURCES_qemu = \
-Only in b/xlators/features/qemu-block/src: Makefile.am.orig
-Only in b/xlators/features/qemu-block/src: Makefile.am.rej
-diff -ur a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am
---- a/xlators/features/quiesce/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/quiesce/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am
---- a/xlators/features/quota/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/quota/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,8 +1,8 @@
- xlator_LTLIBRARIES = quota.la quotad.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--quota_la_LDFLAGS = -module -avoid-version
--quotad_la_LDFLAGS = -module -avoid-version
-+quota_la_LDFLAGS = -module -avoid-version -shared
-+quotad_la_LDFLAGS = -module -avoid-version -shared
- 
- quota_la_SOURCES = quota.c quota-enforcer-client.c
- quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am
---- a/xlators/features/read-only/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/read-only/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -4,12 +4,12 @@
- 
- 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 -ur a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
---- a/xlators/mgmt/glusterd/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/mgmt/glusterd/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am
---- a/xlators/mount/fuse/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/mount/fuse/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -26,7 +26,7 @@
- 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) \
-Only in b/xlators/mount/fuse/src: Makefile.am.orig
-diff -ur a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am
---- a/xlators/nfs/server/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/nfs/server/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am
---- a/xlators/performance/io-cache/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/io-cache/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am
---- a/xlators/performance/io-threads/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/io-threads/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am
---- a/xlators/performance/md-cache/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/md-cache/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am
---- a/xlators/performance/open-behind/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/open-behind/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am
---- a/xlators/performance/quick-read/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/quick-read/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am
---- a/xlators/performance/read-ahead/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/performance/read-ahead/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/performance/readdir-ahead/src/Makefile.am b/xlators/performance/readdir-ahead/src/Makefile.am
---- a/xlators/performance/readdir-ahead/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/readdir-ahead/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = readdir-ahead.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
- 
--readdir_ahead_la_LDFLAGS = -module -avoid-version
-+readdir_ahead_la_LDFLAGS = -module -avoid-version -shared
- 
- readdir_ahead_la_SOURCES = readdir-ahead.c
- readdir_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am
---- a/xlators/performance/symlink-cache/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/symlink-cache/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am
---- a/xlators/performance/write-behind/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/write-behind/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/playground/template/src/Makefile.am b/xlators/playground/template/src/Makefile.am
---- a/xlators/playground/template/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/playground/template/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = template.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/features
- 
--template_la_LDFLAGS = -module -avoid-version
-+template_la_LDFLAGS = -module -avoid-version -shared
- 
- template_la_SOURCES = template.c
- template_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am
---- a/xlators/protocol/auth/addr/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/protocol/auth/addr/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am
---- a/xlators/protocol/auth/login/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/protocol/auth/login/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am
---- a/xlators/protocol/client/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/protocol/client/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am
---- a/xlators/protocol/server/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/protocol/server/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/storage/bd/src/Makefile.am b/xlators/storage/bd/src/Makefile.am
---- a/xlators/storage/bd/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/storage/bd/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = bd.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage
- 
--bd_la_LDFLAGS = -module -avoid-version
-+bd_la_LDFLAGS = -module -avoid-version -shared
- LIBBD = -llvm2app -lrt
- bd_la_SOURCES = bd.c bd-helper.c bd-aio.c
- bd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBBD) $(LIBAIO)
-diff -ur a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am
---- a/xlators/storage/posix/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/storage/posix/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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 -ur a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am
---- a/xlators/system/posix-acl/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/system/posix-acl/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -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
- 

diff --git a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
deleted file mode 100644
index 88fd9cdb399..00000000000
--- a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband qemu-block rsyslog static-libs +syslog systemtap vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	glupy? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="bd-xlator? ( sys-fs/lvm2 )
-	emacs? ( virtual/emacs )
-	fuse? ( >=sys-fs/fuse-2.7.0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
-	qemu-block? ( dev-libs/glib:2 )
-	systemtap? ( dev-util/systemtap )
-	xml? ( dev-libs/libxml2 )
-	sys-libs/readline:=
-	dev-libs/libaio
-	dev-libs/openssl:=
-	|| ( sys-libs/glibc sys-libs/argp-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
-	"${FILESDIR}/${PN}-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-3.6.5-build-shared-only.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	( use georeplication || use glupy ) && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-
-	# contrib/argp-standalone source dir is not clean...
-	cd contrib/argp-standalone
-	emake distclean
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--disable-fusermount
-		$(use_enable debug)
-		$(use_enable bd-xlator)
-		$(use_enable crypt-xlator)
-		$(use_enable fuse fuse-client)
-		$(use_enable georeplication)
-		$(use_enable glupy)
-		$(use_enable infiniband ibverbs)
-		$(use_enable qemu-block)
-		$(use_enable static-libs static)
-		$(use_enable syslog)
-		$(use_enable systemtap)
-		$(use_enable xml xml-output)
-		--docdir=/usr/share/doc/${PF}
-		--localstatedir=/var
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	rm \
-		"${D}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${D}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${D}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r2.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
-
-	# QA
-	rm -rf "${ED}/var/run/" || die
-	use static-libs || find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
-
-	use georeplication && python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-
-	elog
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://www.gluster.org/community/documentation/index.php/Upgrade_to_3.6"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/
@ 2018-03-08 23:06 James Le Cuirot
  0 siblings, 0 replies; 12+ messages in thread
From: James Le Cuirot @ 2018-03-08 23:06 UTC (permalink / raw
  To: gentoo-commits

commit:     8367c70f19adaadfc5bf86786e02b5a11dfc093f
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  8 23:02:34 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Mar  8 23:06:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8367c70f

sys-cluster/glusterfs: Update 9999 with new silent rules patch

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../glusterfs/files/glusterfs-4.1.0-silent_rules.patch    | 15 +++++++++++++++
 sys-cluster/glusterfs/glusterfs-9999.ebuild               |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/glusterfs/files/glusterfs-4.1.0-silent_rules.patch b/sys-cluster/glusterfs/files/glusterfs-4.1.0-silent_rules.patch
new file mode 100644
index 00000000000..236898ab8c1
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-4.1.0-silent_rules.patch
@@ -0,0 +1,15 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2018-03-08 22:50:23.221758897 +0000
++++ b/configure.ac	2018-03-08 22:53:12.776129757 +0000
+@@ -19,11 +19,6 @@
+ #but libglusterfs fails to build with contrib (Then are not set up that way?)
+ #AM_INIT_AUTOMAKE([subdir-objects])
+ 
+-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
+ 
+ AC_CONFIG_HEADERS([config.h site.h])
+ 

diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild
index 4615e8fa756..2733e778803 100644
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -65,7 +65,7 @@ SITEFILE="50${PN}-mode-gentoo.el"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
-	"${FILESDIR}/${PN}-3.12.2-silent_rules.patch"
+	"${FILESDIR}/${PN}-4.1.0-silent_rules.patch"
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
@@ -178,7 +178,7 @@ src_install() {
 	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
 
 	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
 
 	# QA
 	rm -r "${ED}/var/run/" || die


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/
@ 2018-03-09 23:34 James Le Cuirot
  0 siblings, 0 replies; 12+ messages in thread
From: James Le Cuirot @ 2018-03-09 23:34 UTC (permalink / raw
  To: gentoo-commits

commit:     c4217a516c1e8dc5b04400198f9b0e20a37d0bd0
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  9 23:33:30 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Mar  9 23:34:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4217a51

sys-cluster/glusterfs: Add ipv6 USE flag to control ipv6-default

This is important because ipv6-default breaks Gluster for systems that
have IPv6 disabled.

A couple of patches were required because --without-ipv6-default is
broken and the configure summary is sometimes misleading.

Bug: https://bugs.gentoo.org/639838
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/glusterfs-TIRPC-config-summary.patch     | 48 ++++++++++++++++++++++
 .../files/glusterfs-without-ipv6-default.patch     | 38 +++++++++++++++++
 ...erfs-4.0.0.ebuild => glusterfs-4.0.0-r1.ebuild} |  9 ++--
 sys-cluster/glusterfs/glusterfs-9999.ebuild        |  9 ++--
 sys-cluster/glusterfs/metadata.xml                 |  1 +
 5 files changed, 99 insertions(+), 6 deletions(-)

diff --git a/sys-cluster/glusterfs/files/glusterfs-TIRPC-config-summary.patch b/sys-cluster/glusterfs/files/glusterfs-TIRPC-config-summary.patch
new file mode 100644
index 00000000000..c19ac7667b0
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-TIRPC-config-summary.patch
@@ -0,0 +1,48 @@
+From 1e1c3cc0761879e8a2e4d4a884dacc555bbe7fa0 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 9 Mar 2018 23:06:43 +0000
+Subject: [PATCH 2/2] build: Fix misleading TIRPC result in configure summary
+
+Requesting ipv6-default even if you explicitly disable libtirpc will
+then implicitly enable libtirpc because that is required. That is fine
+but the configure summary should not then show TIRPC as disabled when
+it is not.
+
+The result has also been made clearer by stating that TIRPC is
+"missing" when it has been tried but not found.
+
+BUG: 1553938
+Change-Id: I945bd6859aaf3defa682b0d05ee34a9827b9c45f
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ configure.ac | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d42179182..9571dac76 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1097,16 +1097,15 @@ AC_SUBST(GF_DISTRIBUTION)
+ GF_HOST_OS=""
+ GF_LDFLAGS="-rdynamic"
+ 
+-DISABLE_LIBTIRPC=no
+ dnl include tirpc for IPv6 builds
+ if test "x$with_libtirpc" = "xyes" || test "x$with_ipv6_default" = "xyes" ; then
+     PKG_CHECK_MODULES([TIRPC], [libtirpc],
+-       [GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
+-       [DISABLE_LIBTIRPC=yes])
++       [with_libtirpc=yes; GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
++       [with_libtirpc=missing])
+ fi
+ 
+-if test "x$DISABLE_LIBTIRPC" = "xyes" ; then
+-    with_libtirpc=no; with_ipv6_default=no
++if test "x$with_libtirpc" = "xmissing" ; then
++    with_ipv6_default=no
+     AC_CHECK_HEADERS([rpc/rpc.h],[
+         AC_MSG_WARN([
+             ---------------------------------------------------------------------------------
+-- 
+2.16.1
+

diff --git a/sys-cluster/glusterfs/files/glusterfs-without-ipv6-default.patch b/sys-cluster/glusterfs/files/glusterfs-without-ipv6-default.patch
new file mode 100644
index 00000000000..ed30a6a293f
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-without-ipv6-default.patch
@@ -0,0 +1,38 @@
+From c77b8f23af7d285fd82dbd3e4db3fa2c09899e58 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 9 Mar 2018 22:39:41 +0000
+Subject: [PATCH 1/2] build: Fix configure --without-ipv6-default behaviour
+
+The current behaviour disables ipv6-default when no switch is given at
+all but otherwise checks if libtirpc was requested, regardless of
+whether you have given --with-ipv6-default or --without-ipv6-default.
+
+I believe the intention was to enable when libtirpc is requested by
+default but otherwise respect the switch given.
+
+This is important because ipv6-default breaks Gluster for systems that
+have IPv6 disabled.
+
+BUG: 1553926
+Change-Id: I76b91ae2699574b2e5b777453732bb5cbd79bbca
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 827ec0518..d42179182 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -315,7 +315,7 @@ AC_ARG_WITH([libtirpc],
+ 
+ AC_ARG_WITH([ipv6-default],
+         AC_HELP_STRING([--with-ipv6-default], [Set IPv6 as default.]),
+-        [with_ipv6_default=$with_libtirpc], [with_ipv6_default=no])
++        [], [with_ipv6_default=$with_libtirpc])
+ 
+ if test "x$ac_cv_file__etc_redhat_release" = "xyes"; then
+         if rpm -qa centos-release | grep centos; then
+-- 
+2.16.1
+

diff --git a/sys-cluster/glusterfs/glusterfs-4.0.0.ebuild b/sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild
similarity index 95%
rename from sys-cluster/glusterfs/glusterfs-4.0.0.ebuild
rename to sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild
index a4a5bf36143..9d29f16de07 100644
--- a/sys-cluster/glusterfs/glusterfs-4.0.0.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild
@@ -20,10 +20,11 @@ HOMEPAGE="https://www.gluster.org/"
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0"
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
+IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
 
 REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	glupy? ( ${PYTHON_REQUIRED_USE} )"
+	glupy? ( ${PYTHON_REQUIRED_USE} )
+	ipv6? ( libtirpc )"
 
 # the tests must be run as root
 RESTRICT="test"
@@ -66,6 +67,8 @@ SITEFILE="50${PN}-mode-gentoo.el"
 PATCHES=(
 	"${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
 	"${FILESDIR}/${PN}-3.12.2-silent_rules.patch"
+	"${FILESDIR}/${PN}-without-ipv6-default.patch"
+	"${FILESDIR}/${PN}-TIRPC-config-summary.patch"
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
@@ -117,7 +120,7 @@ src_configure() {
 		$(use_enable test cmocka) \
 		$(use_enable tiering) \
 		$(use_enable xml xml-output) \
-		$(use_with libtirpc ipv6-default) \
+		$(use_with ipv6 ipv6-default) \
 		$(use_with libtirpc) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \

diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild
index 2733e778803..c48c92ed2f0 100644
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9999.ebuild
@@ -20,10 +20,11 @@ HOMEPAGE="https://www.gluster.org/"
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0"
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
+IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
 
 REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	glupy? ( ${PYTHON_REQUIRED_USE} )"
+	glupy? ( ${PYTHON_REQUIRED_USE} )
+	ipv6? ( libtirpc )"
 
 # the tests must be run as root
 RESTRICT="test"
@@ -66,6 +67,8 @@ SITEFILE="50${PN}-mode-gentoo.el"
 PATCHES=(
 	"${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
 	"${FILESDIR}/${PN}-4.1.0-silent_rules.patch"
+	"${FILESDIR}/${PN}-without-ipv6-default.patch"
+	"${FILESDIR}/${PN}-TIRPC-config-summary.patch"
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
@@ -117,7 +120,7 @@ src_configure() {
 		$(use_enable test cmocka) \
 		$(use_enable tiering) \
 		$(use_enable xml xml-output) \
-		$(use_with libtirpc ipv6-default) \
+		$(use_with ipv6 ipv6-default) \
 		$(use_with libtirpc) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \

diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml
index bc97470af6a..ce2361e3e3e 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="georeplication">Enable support for georeplication (requires <pkg>dev-lang/python</pkg>)</flag>
 		<flag name="infiniband">Add support for Infiniband ibverbs transport.
 			Libraries can be found in science overlay</flag>
+		<flag name="ipv6">Use IPv6 by default, requires libtirpc</flag>
 		<flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
 		<flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
 		<flag name="qemu-block">Transparently create files as QCow2/QED images in the backend, including the possibility to snapshot.</flag>


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/
@ 2020-08-12 15:06 Sam James
  0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2020-08-12 15:06 UTC (permalink / raw
  To: gentoo-commits

commit:     245ac0ef00c215baea76f892e04454434f87cbfc
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Wed Aug 12 15:06:14 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 15:06:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=245ac0ef

sys-cluster/glusterfs: version bump 7.7

Include fix for flock.
Drop seek fix that's included upstream.

Bug: https://bugs.gentoo.org/733228

Additional references:
https://bugzilla.redhat.com/show_bug.cgi?id=1718562
https://bugzilla.redhat.com/show_bug.cgi?id=1776152
https://review.gluster.org/#/c/glusterfs/+/23794/8/xlators/features/locks/src/common.c

Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/16790
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-cluster/glusterfs/Manifest                     |   1 +
 .../glusterfs/files/glusterfs-7.7-flock.patch      |  65 +++++++
 sys-cluster/glusterfs/glusterfs-7.7.ebuild         | 211 +++++++++++++++++++++
 3 files changed, 277 insertions(+)

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index f447cd32c5d..83fad50ecf9 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -2,3 +2,4 @@ DIST glusterfs-6.8.tar.gz 7572097 BLAKE2B 76b7c699a4fc864d8074b591b3583030d837a0
 DIST glusterfs-6.9.tar.gz 7580928 BLAKE2B 655544b7ffa70ac9980e1a1041af538f473b6b6c8cb77f6e3447908b903b3a2b3ee0234c18fb71f997f31f24f8a790ab2f5a05a6b392090601db455ac726262a SHA512 3bf167aed4f572f94ad4708c5fff7b578a334af1eb0322c36e15127a2089b6359e8d91a36793d8af93c8f76dbdf6ded649c3e0a6c1a879163c8d8b640cea334b
 DIST glusterfs-7.5.tar.gz 7649044 BLAKE2B 01088654051a33c3a009b42c6e7adf7cabc52927a83a3331eced428ed3e6bfb3f7198fcc53a2b1dce678ac58c2f2619d02cce72a9850a50f3a26b37d39baeeaa SHA512 dfd8f04fb398daa7d7f58ef978ab69c0a55a313ac2af3287f7e1e7044f708317227c8749af5fd8d56844dfb8ad47bbd3214c42b806e2e21191a6a8617ab0be38
 DIST glusterfs-7.6.tar.gz 7653500 BLAKE2B ff3d4817f2a8b85126669cfbe6f58990aaccfffd91464d7acd97d7092c8eb94c21552eaf5e2301e3e6a7f99534b40c2afce1ade593d8ac559baee2d175538333 SHA512 c26b2046e7afdbb37fdd395fd9f692a0513ebb58c91ea223fbbaf9f8b41641b1fd009f2975e187f0feb8d83fb5cd4a8a0c2fdf4591a8a31e920d6bba75ae7c0f
+DIST glusterfs-7.7.tar.gz 7675420 BLAKE2B cadd415053d791f5fe4fddbc45bf237275b29fb0340202eaf81bbd2e98c8e7a1b59fa276b8b47679224198675759287a2245095a751602a866d512155dfa73c8 SHA512 0a301802920e337a4931ed36133c76ef551e0c1794d324e5a0a120d289a53fb8a4a2fd8adaa7abe5a40b8b17cc2bb18d01426c9f18d91f68b1589429ddbaa125

diff --git a/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch b/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch
new file mode 100644
index 00000000000..f7930406cd1
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch
@@ -0,0 +1,65 @@
+# https://bugs.gentoo.org/733228
+# https://bugzilla.redhat.com/show_bug.cgi?id=1718562
+# https://bugzilla.redhat.com/show_bug.cgi?id=1776152
+# https://review.gluster.org/#/c/glusterfs/+/23794/8/xlators/features/locks/src/common.c
+
+From 6ef82683064a87c434bd67e2004935281e4c04cc Mon Sep 17 00:00:00 2001
+From: l17zhou <cynthia.zhou@nokia-sbell.com>
+Date: Tue, 03 Dec 2019 07:43:35 +0200
+Subject: [PATCH] add clean local after grant lock
+
+found by flock test, without correct ref number of fd,
+lock will not be correctly released.
+
+Fixes: bz#1779089
+Change-Id: I3e466b17c852eb219c8778e43af8ad670a8449cc
+Signed-off-by: l17zhou <cynthia.zhou@nokia-sbell.com>
+---
+
+diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c
+index c78d537..4c6b78c 100644
+--- a/xlators/features/locks/src/common.c
++++ b/xlators/features/locks/src/common.c
+@@ -962,7 +962,7 @@
+     struct list_head granted_list;
+     posix_lock_t *tmp = NULL;
+     posix_lock_t *lock = NULL;
+-
++    pl_local_t *local = NULL;
+     INIT_LIST_HEAD(&granted_list);
+ 
+     pthread_mutex_lock(&pl_inode->mutex);
+@@ -977,9 +977,9 @@
+ 
+         pl_trace_out(this, lock->frame, NULL, NULL, F_SETLKW, &lock->user_flock,
+                      0, 0, NULL);
+-
+-        STACK_UNWIND_STRICT(lk, lock->frame, 0, 0, &lock->user_flock, NULL);
+-
++        local = lock->frame->local;
++        PL_STACK_UNWIND_AND_FREE(local, lk, lock->frame, 0, 0,
++                                 &lock->user_flock, NULL);
+         __destroy_lock(lock);
+     }
+ 
+@@ -999,6 +999,7 @@
+     struct list_head granted_list;
+     posix_lock_t *tmp = NULL;
+     posix_lock_t *lock = NULL;
++    pl_local_t *local = NULL;
+ 
+     int ret = -1;
+ 
+@@ -1026,9 +1027,9 @@
+ 
+         pl_trace_out(this, lock->frame, NULL, NULL, F_SETLKW, &lock->user_flock,
+                      0, 0, NULL);
+-
+-        STACK_UNWIND_STRICT(lk, lock->frame, 0, 0, &lock->user_flock, NULL);
+-
++        local = lock->frame->local;
++        PL_STACK_UNWIND_AND_FREE(local, lk, lock->frame, 0, 0,
++                                 &lock->user_flock, NULL);
+         __destroy_lock(lock);
+     }
+ 

diff --git a/sys-cluster/glusterfs/glusterfs-7.7.ebuild b/sys-cluster/glusterfs/glusterfs-7.7.ebuild
new file mode 100644
index 00000000000..2f3011803d8
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-7.7.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools elisp-common python-single-r1 systemd
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
+else
+	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="
+	acct-group/gluster
+	acct-user/gluster
+	dev-libs/libaio
+	dev-libs/userspace-rcu:=
+	net-libs/rpcsvc-proto
+	sys-apps/util-linux
+	sys-libs/readline:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
+	xml? ( dev-libs/libxml2 )
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/acl
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.7-flock.patch"
+)
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python3*"
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am |
+		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-fusermount \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable infiniband ibverbs) \
+		$(use_enable static-libs static) \
+		$(use_enable syslog) \
+		$(use_enable test cmocka) \
+		$(use_enable xml xml-output) \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
+		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+	fi
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	if use georeplication ; then
+		# move the gsync-sync-gfid tool to a binary path
+		# and set a symlink to be compliant with all other distros
+		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
+		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
+	fi
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+pkg_postinst() {
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/
@ 2021-05-19 10:06 Joonas Niilola
  0 siblings, 0 replies; 12+ messages in thread
From: Joonas Niilola @ 2021-05-19 10:06 UTC (permalink / raw
  To: gentoo-commits

commit:     9e597c877e100dff6e1dae28eb0fdb5884b43610
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Fri May 14 15:34:50 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed May 19 10:06:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e597c87

sys-cluster/glusterfs: version 8.5

Suggestions from ionen:

* Re-ordered pre-amble.
* Drop systemd inherit.
* Re-order phase funcs (src_test before src_install).

Spotted whilst making above changes:

tmpfiles.d files installed into /etc/tmpfiles.d instead of
/usr/lib/tmpfiles.d (as per systemd hard-coded path).

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sys-cluster/glusterfs/Manifest                |   1 +
 sys-cluster/glusterfs/files/glusterd-r4.initd |  32 +++++
 sys-cluster/glusterfs/glusterfs-8.5.ebuild    | 194 ++++++++++++++++++++++++++
 3 files changed, 227 insertions(+)

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index beb25fa2e3a..1ae29a49765 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,5 +1,6 @@
 DIST glusterfs-7.9.tar.gz 7702149 BLAKE2B e23b5a45a8c2c4f02f0992dfc78bea942a1dcc621082cb5c6aebf73e0cba17a7c0334700aec8c82dc7d093fbddcf9f579320561412b94ec010cf51c0210f2654 SHA512 5683bf2ff3550b8286e27b70981cb176c445e432624db79f065eb5928bc4afdf009f54f3b1d5abde1f6d2c532c9c4820860685aea0d0f709dc78fcf35bfea688
 DIST glusterfs-8.3.tar.gz 7829522 BLAKE2B 1ba60f7209db4f1ce21237c3adea94df1b9eae04d15f99eb414bf961ea67aa7e08d01ea47c8793a33afbc0ff6cf63ecb81f78fa1ba74d66e2d4358ef2bdadacc SHA512 7ca9d3d8938eb27a7347461a07457e90d1ee6e8d5417970e38245c819cf09bf2ecf9de3954b75edf5cf14816e1059fb381b95935ae1f973ebd14ee7531322aa9
 DIST glusterfs-8.4.tar.gz 7833014 BLAKE2B c67f510c655465e9fbecaa7f391531543e37a2a84917592e699d88564b24fe55689b95770f385ac5b645069f287d4af974db76a77c0f44ea5d2e88f995b427f7 SHA512 a81394b3584c2e6c27060367b443c0879512054ed9287740bc24308603b9e3c11376179ed6589d5d38441982cd6415e3612f98ae4c97ddf7d5c747b42171d796
+DIST glusterfs-8.5.tar.gz 7873397 BLAKE2B 6ababf15fda216c9a47c05859f7123847d711dd5a12e3ec2c5dcf8475f35830c9a32f7b21ad763ab1be59b06f1d93f83acc0cbb8f7635456a3638be73b162aa4 SHA512 e256141a76deb9a255be31422d76b0c81aad4a7e5b166d2be90a79d340ceb811cbff11f469166ef7582f40f58f47fb056aa05aafd4b35f094bf9c21a5c08f3bb
 DIST glusterfs-9.0.tar.gz 8171193 BLAKE2B f9f9905515607b4877432bde264075f73c4c076ae435a67ab803affc468f5f88d02235419fea6e25db19adecff9b797a41eb5ac63772fe81251c064389f7aca6 SHA512 daa5a7342c067c75668910e8fed17145636e7a576830b4cd68e81d9fceedaab918228b8780ebd5014e2397e0606858af650cd2c52bec0883ccd2126955ad07e7
 DIST glusterfs-9.1.tar.gz 8206207 BLAKE2B dea099eb1d366704010247964c24de404fb09c00a375dde4af30a2af836d3b35689fab91a75268aa01dba45860eb50a6e0572913c059e53fb5799d2302c2f005 SHA512 2c26813f12fed7a0640cc470badc2b83f156b660ef475487a689dca6c3fa407192f4959aeaf7a981969a079cf5d2c7aace85ff818ea6133d5a085d90d226e1da

diff --git a/sys-cluster/glusterfs/files/glusterd-r4.initd b/sys-cluster/glusterfs/files/glusterd-r4.initd
new file mode 100644
index 00000000000..ba4749aef07
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd-r4.initd
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Gluster elastic volume management daemon"
+command="/usr/sbin/glusterd"
+pidfile="/run/${SVCNAME}.pid"
+command_args="-N"
+
+command_background="yes"
+
+depend() {
+	need net
+	before netmount
+}
+
+start_pre() {
+	# Ensure that the GlusterFS auxiliary mount parent directory exists
+	checkpath --directory --owner gluster:gluster --mode 0775 /run/gluster
+}
+
+start_post() {
+	local c=0
+	ebegin "Waiting for glusterd to start up"
+	while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
+		(( ++c ))
+	done
+	[ "${c}" -lt "${glusterd_max_wait_start-60}" ]
+	eend $?
+
+	return 0
+}

diff --git a/sys-cluster/glusterfs/glusterfs-8.5.ebuild b/sys-cluster/glusterfs/glusterfs-8.5.ebuild
new file mode 100644
index 00000000000..2a8426c43e1
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-8.5.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools elisp-common python-single-r1 tmpfiles
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="
+	acct-group/gluster
+	acct-user/gluster
+	dev-libs/libaio
+	dev-libs/userspace-rcu:=
+	net-libs/rpcsvc-proto
+	sys-apps/util-linux
+	sys-libs/readline:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	xml? ( dev-libs/libxml2 )
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	dev-libs/openssl:=[-bindist]
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/acl
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python3*"
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am -exec \
+		sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-fusermount \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable static-libs static) \
+		$(use_enable syslog) \
+		$(use_enable test cmocka) \
+		$(use_enable xml xml-output) \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+	insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r4.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	python_optimize "${ED}"
+}
+
+pkg_postinst() {
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	tmpfiles_process glusterfs.conf
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/
@ 2022-06-15 13:32 Joonas Niilola
  0 siblings, 0 replies; 12+ messages in thread
From: Joonas Niilola @ 2022-06-15 13:32 UTC (permalink / raw
  To: gentoo-commits

commit:     8cffcdeb67a222db2f726567beca821618b3481f
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Wed Jun 15 08:49:49 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 13:32:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cffcdeb

sys-cluster/glusterfs: version 10.2

No major changes, mostly minor bug fixes, except for one SSE related
issue where certain structures needs to be aligned.

Closes: https://bugs.gentoo.org/852077
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/25907
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sys-cluster/glusterfs/Manifest                    |   1 +
 sys-cluster/glusterfs/files/glusterd-10.2.initd   |  32 ++++
 sys-cluster/glusterfs/files/glusterfsd-10.2.initd | 121 +++++++++++++
 sys-cluster/glusterfs/glusterfs-10.2.ebuild       | 199 ++++++++++++++++++++++
 4 files changed, 353 insertions(+)

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index e511f730095d..788e05693802 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,4 +1,5 @@
 DIST glusterfs-10.1.tar.gz 8273640 BLAKE2B a29eb83fbc3a65e5f5a1db3694e6f46519973256a10f5e16419c832cb308a36961a4e3569fffd3f6e21e47b4b1ff78bcd2e687fce7b9710dfb25d88fca2d622f SHA512 38bec8ae33128641b17c645733589c32d554ebb771bda50a11d35019e71654f3b75ca95d24d0c0d1ec4eb460edd99983e843a7218092d422d2185a227345de42
+DIST glusterfs-10.2.tar.gz 8278598 BLAKE2B 48e70a244e34cc41a5befbe94635e945c95b87f26e5e1892b099d23a13c6fb70eefb2a66b247a564b03eeb0707ee480b50096b154b3ac5d2a13051e6371995b3 SHA512 290c701fbd3f100096ef26b589ee0714449fc620c35e62bcb5fe2fe8de5f64963b40d7d5fe1b97b274ba791fa45f4175305b6a112f184f6ce11a1e0dc9f7ea30
 DIST glusterfs-8.6.tar.gz 7826147 BLAKE2B 3a8a488c9a8e4b1daf3ed01fa5e52a62cf791349c1169aaf8609252bfb8bc0a0534f9fc23fac27cfab11ac6fb5e3e1d9588b4ec8080b02cf97e679bf2c8fb5c2 SHA512 bb1125e5d6b4d424234bc40786847f217e7a05cecad1462dd91248cf9559569914f04e1f909e829051cb1db4079ecf906440a38af9de2bbf3bcf53ca8fa1f349
 DIST glusterfs-9.4.tar.gz 8173625 BLAKE2B c35c63696717bf09f8fbf77dca16a6f45de278253e768c6ffc40c0c097da9ea1b32888233da412a5333281995e89e08d9ed23fd47aba7c506de84b08f9f80cea SHA512 2a17197bd2b425117e34af004a6177b7c5012807cd99b9c6d37a1081e0ab9def6b013bedd0ba4122d149969755e0e2985bef8aed9cf612a27a6452b8719a33bf
 DIST glusterfs-9.5.tar.gz 8174643 BLAKE2B d7527b7749b753768bde086e88e146564b461f835bb9108ce24da9626d7d87e7e4da1b2a340c6497da2d8bafe0cd43e87c01d4ba6639635ff96d8788997a8042 SHA512 3483068ba6d72a9c63cc6fcb2dbcb38dd5001564d755cc3a30dbf6402eeab9a7c80759a535be1c5c06eae88b61156a336444c89b12bbecdabf56a87f00328a44

diff --git a/sys-cluster/glusterfs/files/glusterd-10.2.initd b/sys-cluster/glusterfs/files/glusterd-10.2.initd
new file mode 100644
index 000000000000..af8f941d87d7
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd-10.2.initd
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Gluster elastic volume management daemon"
+command="/usr/sbin/glusterd"
+pidfile="/run/${SVCNAME}.pid"
+command_args="-N"
+
+command_background="yes"
+
+depend() {
+	need net
+	before netmount
+}
+
+start_pre() {
+	# Ensure that the GlusterFS auxiliary mount parent directory exists
+	checkpath --directory --owner gluster:gluster --mode 0775 /run/gluster
+}
+
+start_post() {
+	local c=0
+	ebegin "Waiting for glusterd to start up"
+	while ! /usr/sbin/gluster volume list >/dev/null 2>&1 && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
+		$(( c=c+1 ))
+	done
+	[ "${c}" -lt "${glusterd_max_wait_start-60}" ]
+	eend $?
+
+	return 0
+}

diff --git a/sys-cluster/glusterfs/files/glusterfsd-10.2.initd b/sys-cluster/glusterfs/files/glusterfsd-10.2.initd
new file mode 100644
index 000000000000..c8b6562e02a2
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfsd-10.2.initd
@@ -0,0 +1,121 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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}" -a ! -d "${GLUSTERFS_MOUNTPOINT}" ]
+	then
+		eerror "The mountpoint ${GLUSTERFS_MOUNTPOINT} does not exist."
+		return 1
+	fi
+}
+
+start() {
+	local status daemon
+
+	checkconfig || return 1
+
+	ebegin "Starting GlusterFS (${SVCNAME})"
+	eindent
+
+	if [ -z "${GLUSTERFS_MOUNTPOINT}" ]
+	then
+		einfo "Starting in server mode ..."
+		daemon="glusterfsd"
+	else
+		einfo "Starting in client mode. Mounting filesystem ..."
+		daemon="glusterfs"
+	fi
+
+	if [ -n "${GLUSTERFS_SERVER}" ]
+	then
+		einfo "Using server supplied volume file"
+		start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \
+			--exec /usr/sbin/${daemon} -- \
+			--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/${daemon} -- \
+			--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}
+}

diff --git a/sys-cluster/glusterfs/glusterfs-10.2.ebuild b/sys-cluster/glusterfs/glusterfs-10.2.ebuild
new file mode 100644
index 000000000000..2551faf99a31
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-10.2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools elisp-common python-single-r1 tmpfiles systemd
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs tcmalloc test +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="
+	acct-group/gluster
+	acct-user/gluster
+	dev-libs/libaio
+	dev-libs/openssl:=[-bindist(-)]
+	net-libs/rpcsvc-proto
+	dev-libs/userspace-rcu:=
+	sys-apps/util-linux
+	sys-libs/liburing:=
+	sys-libs/readline:=
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	tcmalloc? ( dev-util/google-perftools )
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/acl
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python3*"
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am -exec \
+		sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-fusermount \
+		--disable-lto \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable static-libs static) \
+		$(use_enable test cmocka) \
+		$(use_enable xml xml-output) \
+		$(usex ipv6 --with-ipv6-default "") \
+		$(usex libtirpc "" --without-libtirpc) \
+		$(usex tcmalloc "" --without-tcmalloc) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+	insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	newinitd "${FILESDIR}/glusterfsd-10.2.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-10.2.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	systemd_dounit extras/systemd/{glusterd,glustereventsd,glusterfssharedstorage,gluster-ta-volume}.service
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	python_optimize "${ED}"
+}
+
+pkg_postinst() {
+	tmpfiles_process gluster.conf
+
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/
@ 2023-08-02 12:50 Sam James
  0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2023-08-02 12:50 UTC (permalink / raw
  To: gentoo-commits

commit:     63d1454a8abf951e3fe74190c7b09e0de882dad1
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Wed Aug  2 12:29:28 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  2 12:50:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d1454a

sys-cluster/glusterfs: fix crash without tcmalloc

Closes: https://bugs.gentoo.org/911588
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../glusterfs/files/glusterfs-11.0-fix-crash.patch |  16 ++
 sys-cluster/glusterfs/glusterfs-11.0-r1.ebuild     | 215 +++++++++++++++++++++
 2 files changed, 231 insertions(+)

diff --git a/sys-cluster/glusterfs/files/glusterfs-11.0-fix-crash.patch b/sys-cluster/glusterfs/files/glusterfs-11.0-fix-crash.patch
new file mode 100644
index 000000000000..6a4a1ec517ab
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-11.0-fix-crash.patch
@@ -0,0 +1,16 @@
+# https://bugs.gentoo.org/911588
+# https://github.com/gluster/glusterfs/issues/4192
+# https://github.com/gluster/glusterfs/pull/4196
+diff --git a/libglusterfs/src/glusterfs/mem-pool.h b/libglusterfs/src/glusterfs/mem-pool.h
+index 46f764f56e5..416b7ddf1e3 100644
+--- a/libglusterfs/src/glusterfs/mem-pool.h
++++ b/libglusterfs/src/glusterfs/mem-pool.h
+@@ -297,7 +297,7 @@ typedef struct per_thread_pool_list {
+      * in the implementation code so we just make it a single-element array
+      * here.
+      */
+-    per_thread_pool_t pools[];
++    per_thread_pool_t pools[1];
+ } per_thread_pool_list_t;
+ 
+ /* actual pool structure, shared between different mem_pools */

diff --git a/sys-cluster/glusterfs/glusterfs-11.0-r1.ebuild b/sys-cluster/glusterfs/glusterfs-11.0-r1.ebuild
new file mode 100644
index 000000000000..df0fe73818d4
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-11.0-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools elisp-common python-single-r1 tmpfiles systemd bash-completion-r1
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="debug emacs +fuse georeplication ipv6 +libtirpc rsyslog selinux static-libs tcmalloc test +uring xml"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	georeplication? ( xml )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-11.0-fix-crash.patch"
+)
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="
+	acct-group/gluster
+	acct-user/gluster
+	dev-libs/libaio
+	dev-libs/openssl:=[-bindist(-)]
+	net-libs/rpcsvc-proto
+	dev-libs/userspace-rcu:=
+	sys-apps/util-linux
+	sys-libs/readline:=
+	${PYTHON_DEPS}
+
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	selinux? ( sec-policy/selinux-glusterfs )
+	tcmalloc? ( dev-util/google-perftools )
+	uring? ( sys-libs/liburing:= )
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/acl
+	test? (
+		>=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-libs/xxhash
+		dev-vcs/git
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr
+	)
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python3*"
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am -exec \
+		sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		YACC=yacc.bison \
+		LEX=flex \
+		--disable-fusermount \
+		--disable-lto \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable static-libs static) \
+		$(use_enable test cmocka) \
+		$(use_enable uring linux-io-uring) \
+		$(use_enable xml xml-output) \
+		$(usex ipv6 --with-ipv6-default "") \
+		$(usex libtirpc "" --without-libtirpc) \
+		$(usex tcmalloc "" --without-tcmalloc) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+src_install() {
+	default
+
+	# Path changes based on whether app-shells/bash-completion is installed, bug #911523
+	rm -rf "${ED}"/etc/bash_completion.d || die
+	newbashcomp extras/command-completion/gluster.bash ${PN}
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+	insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	newinitd "${FILESDIR}/glusterfsd-10.2.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-10.2-r2.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	systemd_dounit extras/systemd/{glusterd,glustereventsd,glusterfssharedstorage,gluster-ta-volume}.service
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	python_optimize "${ED}"
+}
+
+pkg_postinst() {
+	tmpfiles_process gluster.conf
+
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/
@ 2023-08-29 10:08 Joonas Niilola
  0 siblings, 0 replies; 12+ messages in thread
From: Joonas Niilola @ 2023-08-29 10:08 UTC (permalink / raw
  To: gentoo-commits

commit:     3e1eb910497ba0fca83c9a9a1200a9d2ebcf6c14
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Mon Aug 28 08:32:03 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 10:08:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e1eb910

sys-cluster/glusterfs: rev bump to 11.0-r2

Includes patch for bashcompletion.
Fixes python related QA issues.
Avoids environment variable (and assists my unused files script for
false positives in files/).

Closes: https://bugs.gentoo.org/913125
Closes: https://bugs.gentoo.org/913126
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/32483
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...r-invoking-of-gluster-volume-set-help-as-.patch |  85 ++++++++
 sys-cluster/glusterfs/glusterfs-11.0-r2.ebuild     | 216 +++++++++++++++++++++
 2 files changed, 301 insertions(+)

diff --git a/sys-cluster/glusterfs/files/glusterfs-11.0-extras-defer-invoking-of-gluster-volume-set-help-as-.patch b/sys-cluster/glusterfs/files/glusterfs-11.0-extras-defer-invoking-of-gluster-volume-set-help-as-.patch
new file mode 100644
index 000000000000..f3eacb3a823d
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-11.0-extras-defer-invoking-of-gluster-volume-set-help-as-.patch
@@ -0,0 +1,85 @@
+From 26126dd1467fc40af372b9f2ba6ab167e5b9f309 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@uls.co.za>
+Date: Mon, 28 Aug 2023 09:54:47 +0200
+Subject: [PATCH] extras: defer invoking of gluster volume set help as late as
+ we can.
+
+---
+ extras/command-completion/gluster.bash | 44 +++++++++++++++++++-------
+ 1 file changed, 32 insertions(+), 12 deletions(-)
+
+diff --git a/extras/command-completion/gluster.bash b/extras/command-completion/gluster.bash
+index 70f8e19558..a096b62890 100644
+--- a/extras/command-completion/gluster.bash
++++ b/extras/command-completion/gluster.bash
+@@ -1,15 +1,5 @@
+ #!/bin/bash
+ 
+-if pidof glusterd > /dev/null 2>&1; then
+-        GLUSTER_SET_OPTIONS="
+-        $(for token in `gluster volume set help 2>/dev/null | grep "^Option:" | cut -d ' ' -f 2`
+-        do
+-                echo "{$token},"
+-        done)
+-        "
+-        GLUSTER_RESET_OPTIONS="$GLUSTER_SET_OPTIONS"
+-fi
+-
+ GLUSTER_TOP_SUBOPTIONS1="
+         {nfs},
+         {brick},
+@@ -161,12 +151,14 @@ GLUSTER_VOLUME_OPTIONS="
+                 },
+                 {reset
+                         {__VOLNAME
+-                                [ $GLUSTER_RESET_OPTIONS ]
++                                {__VOLOPTIONS
++                                },
+                         }
+                 },
+                 {set
+                         {__VOLNAME
+-                                [ $GLUSTER_SET_OPTIONS ]
++                                {__VOLOPTIONS
++                                },
+                         }
+                 },
+                 {start
+@@ -280,6 +272,34 @@ __VOLNAME ()
+         return 0
+ }
+ 
++__VOLOPTIONS()
++{
++        local zero=0
++        local ret=0
++        local cur_word="$2"
++        local list=""
++
++        if [ "X$1" == "X" ]; then
++                return
++
++        elif [ "$1" == "match" ]; then
++                return 0
++
++        elif [ "$1" == "complete" ]; then
++                if ! pidof glusterd > /dev/null 2>&1; then
++                        list='';
++                else
++                        list=`gluster volume set help 2>/dev/null | grep "^Option:" | cut -d ' ' -f 2`
++                fi
++        else
++                return 0
++        fi
++
++        func_return=`echo $(compgen -W "$list" -- $cur_word)`
++
++        return 0
++}
++
+ _gluster_throw () {
+ #echo $1 >&2
+         COMPREPLY=''
+-- 
+2.41.0
+

diff --git a/sys-cluster/glusterfs/glusterfs-11.0-r2.ebuild b/sys-cluster/glusterfs/glusterfs-11.0-r2.ebuild
new file mode 100644
index 000000000000..5500c9af30b3
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-11.0-r2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools elisp-common python-single-r1 tmpfiles systemd bash-completion-r1
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="debug emacs +fuse georeplication ipv6 +libtirpc rsyslog selinux static-libs tcmalloc test +uring xml"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	georeplication? ( xml )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-11.0-fix-crash.patch"
+	"${FILESDIR}/${PN}-11.0-extras-defer-invoking-of-gluster-volume-set-help-as-.patch"
+)
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="
+	acct-group/gluster
+	acct-user/gluster
+	dev-libs/libaio
+	dev-libs/openssl:=[-bindist(-)]
+	net-libs/rpcsvc-proto
+	dev-libs/userspace-rcu:=
+	sys-apps/util-linux
+	sys-libs/readline:=
+	${PYTHON_DEPS}
+
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	selinux? ( sec-policy/selinux-glusterfs )
+	tcmalloc? ( dev-util/google-perftools )
+	uring? ( sys-libs/liburing:= )
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/acl
+	test? (
+		>=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-libs/xxhash
+		dev-vcs/git
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr
+	)
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python3*"
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am -exec \
+		sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		YACC=yacc.bison \
+		LEX=flex \
+		--disable-fusermount \
+		--disable-lto \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable static-libs static) \
+		$(use_enable test cmocka) \
+		$(use_enable uring linux-io-uring) \
+		$(use_enable xml xml-output) \
+		$(usex ipv6 --with-ipv6-default "") \
+		$(usex libtirpc "" --without-libtirpc) \
+		$(usex tcmalloc "" --without-tcmalloc) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+src_install() {
+	default
+
+	# Path changes based on whether app-shells/bash-completion is installed, bug #911523
+	rm -rf "${ED}"/etc/bash_completion.d "${D}$(get_bashcompdir)" || die
+	newbashcomp extras/command-completion/gluster.bash gluster
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "50${PN}-mode-gentoo.el"
+
+	fi
+
+	insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+	insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	newinitd "${FILESDIR}/glusterfsd-10.2.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-10.2-r2.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	systemd_dounit extras/systemd/{glusterd,glustereventsd,glusterfssharedstorage,gluster-ta-volume}.service
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	python_fix_shebang "${ED}"
+	python_optimize
+}
+
+pkg_postinst() {
+	tmpfiles_process gluster.conf
+
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2023-08-29 10:08 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-10 13:04 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/, sys-cluster/glusterfs/files/ Alexys Jacob
  -- strict thread matches above, loose matches on Subject: below --
2023-08-29 10:08 Joonas Niilola
2023-08-02 12:50 Sam James
2022-06-15 13:32 Joonas Niilola
2021-05-19 10:06 Joonas Niilola
2020-08-12 15:06 Sam James
2018-03-09 23:34 James Le Cuirot
2018-03-08 23:06 James Le Cuirot
2017-11-28 10:08 James Le Cuirot
2017-11-21 20:43 James Le Cuirot
2017-04-21 18:40 Alexys Jacob
2015-08-28  9:35 Alexys Jacob

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox