From 407525b571b48cfd65e1ad7a02d250a927c967c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Dec 2017 03:04:39 +0000 Subject: gentoo resync : 01.12.2017 --- sys-cluster/glusterfs/Manifest | 8 +- 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.12.3.ebuild | 2 +- sys-cluster/glusterfs/glusterfs-3.6.5.ebuild | 182 ------- 7 files changed, 2 insertions(+), 846 deletions(-) delete mode 100644 sys-cluster/glusterfs/files/glusterd-r2.initd delete mode 100644 sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch delete mode 100644 sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch delete mode 100644 sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch delete mode 100644 sys-cluster/glusterfs/glusterfs-3.6.5.ebuild (limited to 'sys-cluster/glusterfs') diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest index ad94993189ca..77061312890e 100644 --- a/sys-cluster/glusterfs/Manifest +++ b/sys-cluster/glusterfs/Manifest @@ -1,18 +1,12 @@ AUX 50glusterfs-mode-gentoo.el 169 BLAKE2B 461afb9f17ef9dee79348279e861039193400d61a926e9d8499351b7e42377cc1bffce6dc2c2d7f3b50b1de016a336bad69c7a79bb800b973288eef542baed85 SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804 -AUX glusterd-r2.initd 749 BLAKE2B 7fc6fbd6de4b21eee1b55c344f8c9238b9589e7e8d66658abf5486d87ab63857e6dd8d677db67906c8e9a9a1349e16bcc3a7f0c53655f604562eb2a8c40c5898 SHA512 90b2ab62bd69f0a6f4ef9596ea4b287524650821251ff9cf6fe43f7f362e359c43615fd5ba68d4b5589af1a3e712a91cab69bb95b363b4e20efdf9e02a5e1e6a AUX glusterd-r3.initd 755 BLAKE2B 6b402725a6a53839ff718ae19f4917b61330f78ae6657480a218f06657d5d7db1c4b57efa275159be76bc84fd5b600a22bd4b374a8a6fbb56576799650ce89fe SHA512 d6f46374f48cf78c4114c786fbba4412764527cec020f43ab2a46000fcada98bdb6dfb67ba9db2be3e39a851cba1db97a7154e4cab6df7ce541c0157c781706c AUX glusterfs-3.12.2-poisoned-sysmacros.patch 431 BLAKE2B 4446b2ba5aad48dfe54c24e0cf802196d6ee4898a77f7a6950e2c1971550deddc7ff232dab021b4bfcb962f4544fa6bebba314b07942228298a5c38758c38442 SHA512 fb9f56254a90325bfc92d60af41075b51460d179eac7149cf1d0dc218d7cc7c9102eaf0591c2763df2fa68d2595f87dd3427d810bc182b61103bd5f9588c77db AUX glusterfs-3.12.2-silent_rules.patch 632 BLAKE2B f9aa9dfb128b7ba2bf212b3b59f1092dd94f24f43c91ec416af9e6c157a9a165581fad83f926e60557a236ca54ae7e2611fc927cd022bf0f931472d6ae1fba1d SHA512 81ec26ad0385b3c9e94c918a720ecea606cf5adf9f28aa57bfcd8de179e24b4feb344573820528716d6530079553bd3df7ac1cea39e3893b35573990fe3ffd1c AUX glusterfs-3.12.3-libtirpc.patch 1416 BLAKE2B 3b71ef845ddfd6a3c1e3c1b804e9fed421c27e5b1ad68eda21dbcd039022531e54dd5881f2bc3bad0b1ccc3d94f13b5253ae98dd8c83d2792c71e5965ff35e85 SHA512 adad49a9e3c3d190ba5f193f7ed5078a8cd143149965ff137327908845ab985478bb1e799b712b095101bd7773384147928eb08aff4d5b5572a4859be5c61915 -AUX glusterfs-3.4.0-silent_rules.patch 553 BLAKE2B 67ac66f19b0875b011ea05a006db8beaabf50578bc824f57ff9868f54635395c316a7f5f2163ae29176a1cdd905d815c3e7fce3e547fec37857844a81fabf5d2 SHA512 67fe230a667084f30960d4ed79f58c7da93edde086ca8614cb3f7160901cb87da471cce932cfae470033c5dfc92b00ed69fd0e32238bc0e9af770e1946f511ce -AUX glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch 2145 BLAKE2B 2126a62329664ca59b709dfed237246119f8a8fa2e614bc93138168a519f92f1616245a718dcebd7525bc07cc9453d7c0be1eb97755d4eecf44d2d247ebf1eb4 SHA512 22d4ead173579698a23b7d66e566e61410e5bc0178b1dc0b7346b18d7e8cf33a44873b83a09e6dab32b06e7df8285da4bb7eb730626c61c1b3d28e9e8ce86f00 -AUX glusterfs-3.6.5-build-shared-only.patch 27261 BLAKE2B 82e7d214775f816a523614c65ea6ba8bf83ee0a0b7705b4f537f483ba0a68fbea9868afee25dae911d2eeccec5f43f535c40e79a963069967739bddb1ae5bffa SHA512 cbaa02845022cb32aab1e419d13f8291b59aa6de78ccdd944af52d05defcd4ae9bb891c0f303f7d4870056e0777d70507b137aa9e38a4a13a267925a3cbc0277 AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d665f0bbffb59bbd2f81b314df62b8aab4eab5c4d23b9e88f43168160cb0faedece3307ddf2347f5282311 SHA512 28c5f401b2ff017d8faf7b290fa265cc5f1a9d60edf11dbae5801e943e7e0833fa8267880efa80c4fc07048d75afd446808c583d2b62a6c5a6bde25d317bde97 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7 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 -EBUILD glusterfs-3.12.3.ebuild 6577 BLAKE2B 24c68258fd6d722d9300ce6ab96024fc6d1206e0d5c1bb5c812ece2b659a7e91227f4acc3436b43ef0f7d223da44a6403bd6cddb2a2c987426ebbf82b2ff115e SHA512 100937f67b93be5a5b18cebf7bc38398895781fc7e4bd83a5e83df429d631f69695fe7e767395202aadefd5376d15a32bc6f7fd53e3e251d22d1b393ddf7bb01 -EBUILD glusterfs-3.6.5.ebuild 5609 BLAKE2B 37d8a5df7c72ad82ab9c43f6d46a0df8e3e4e8b1686b034da2885c4d74a5d8433222122bb1383729b79a43b5f9be14f8987346591bf6cc56f6a8823a5c4d4725 SHA512 89629b74afb06c7409375a8c342873840436f6eaccbc4a29800b264090dd31f1dcfa391d77d655a6ecc73ce906a6d7b253e6a9065697ab920ac5e75ea64a1b45 +EBUILD glusterfs-3.12.3.ebuild 6574 BLAKE2B 6d1248d9dbb68d21d3181bcce41f0da31f3ca94f9d55190c74e759f14587e1b4c6912a7df4976f4c1a4b075ee84f304a64bbf97f47e6f4facd996cca97a3c84e SHA512 b4a7578df685eaad9c0e98eebe7c85919879ecdbf78c2e00204c67da12d08c2e7c80f16c8945cc321e94946deca7ae34b87977e8463b9020a22fa27e99ca38e5 MISC metadata.xml 1658 BLAKE2B 8bddb420e7ff711d3de6270eb1a3e9c8fcc9e67ea36d567543a8e22699dc0011affcc9ca39fc01b3ee6bec0a59341d2305f3de94a986ec7afec736db54092550 SHA512 173e9829db764acf7effd75cbc057ad05238b04481a6a6622045740dd885f54a97e17238f60ac893b35322ad711eed88b6cb791c067054f4cfaa81d56df8795d diff --git a/sys-cluster/glusterfs/files/glusterd-r2.initd b/sys-cluster/glusterfs/files/glusterd-r2.initd deleted file mode 100644 index 924939400f30..000000000000 --- 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 1b79e0d079e4..000000000000 --- 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 5c4df0c97025..000000000000 --- 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?= -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 af5332bc9b1e..000000000000 --- 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.12.3.ebuild b/sys-cluster/glusterfs/glusterfs-3.12.3.ebuild index 6134e78493da..04036b762ed8 100644 --- a/sys-cluster/glusterfs/glusterfs-3.12.3.ebuild +++ b/sys-cluster/glusterfs/glusterfs-3.12.3.ebuild @@ -13,7 +13,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" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" 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} ) 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 88fd9cdb3998..000000000000 --- 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 -} -- cgit v1.2.3