From cb6b03c90100171d241491762b7794cb08779cfe Mon Sep 17 00:00:00 2001 From: manu Date: Mon, 9 Nov 2015 04:13:56 +0000 Subject: [PATCH] Maintenance update of glusterfs to 3.7.6 --- filesystems/glusterfs/Makefile | 4 +- filesystems/glusterfs/PLIST | 159 +++++++++--------- filesystems/glusterfs/distinfo | 10 +- ...atch-xlators_mgmt_glusterd_src_Makefile.in | 13 -- 4 files changed, 86 insertions(+), 100 deletions(-) delete mode 100644 filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile index 324c3499d2c2..7a6ff889b8db 100644 --- a/filesystems/glusterfs/Makefile +++ b/filesystems/glusterfs/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.56 2015/10/10 13:25:09 manu Exp $ +# $NetBSD: Makefile,v 1.57 2015/11/09 04:13:56 manu Exp $ -DISTNAME= glusterfs-3.7.5 +DISTNAME= glusterfs-3.7.6 #PKGREVISION= 1 CATEGORIES= filesystems MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/ diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST index 48ff816c83dc..0f0f3e4f5065 100644 --- a/filesystems/glusterfs/PLIST +++ b/filesystems/glusterfs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.28 2015/10/10 13:25:09 manu Exp $ +@comment $NetBSD: PLIST,v 1.29 2015/11/09 04:13:56 manu Exp $ ${PYSITELIB}/gluster/__init__.py ${PYSITELIB}/gluster/__init__.pyc ${PYSITELIB}/gluster/__init__.pyo @@ -18,87 +18,88 @@ include/glusterfs/api/glfs-handles.h include/glusterfs/api/glfs.h include/glusterfs/gfchangelog/changelog.h include/glusterfs/gfdb/gfdb_data_store.h +include/glusterfs/gfdb/gfdb_data_store_helper.h include/glusterfs/gfdb/gfdb_data_store_types.h include/glusterfs/gfdb/gfdb_mem-types.h include/glusterfs/gfdb/gfdb_sqlite3.h -include/glusterfs/gfdb/gfdb_sqlite3_helper.c -lib/glusterfs/3.7.5/auth/addr.la -lib/glusterfs/3.7.5/auth/login.la -lib/glusterfs/3.7.5/rpc-transport/socket.la -lib/glusterfs/3.7.5/xlator/cluster/afr.la -lib/glusterfs/3.7.5/xlator/cluster/dht.la -lib/glusterfs/3.7.5/xlator/cluster/disperse.so -lib/glusterfs/3.7.5/xlator/cluster/distribute.so -lib/glusterfs/3.7.5/xlator/cluster/ec.la -lib/glusterfs/3.7.5/xlator/cluster/nufa.la -lib/glusterfs/3.7.5/xlator/cluster/pump.la -lib/glusterfs/3.7.5/xlator/cluster/replicate.so -lib/glusterfs/3.7.5/xlator/cluster/stripe.la -lib/glusterfs/3.7.5/xlator/cluster/switch.la -lib/glusterfs/3.7.5/xlator/cluster/tier.la -lib/glusterfs/3.7.5/xlator/debug/error-gen.la -lib/glusterfs/3.7.5/xlator/debug/io-stats.la -lib/glusterfs/3.7.5/xlator/debug/trace.la -lib/glusterfs/3.7.5/xlator/encryption/crypt.la -lib/glusterfs/3.7.5/xlator/encryption/rot-13.la -lib/glusterfs/3.7.5/xlator/features/access-control.so -lib/glusterfs/3.7.5/xlator/features/arbiter.la -lib/glusterfs/3.7.5/xlator/features/barrier.la -lib/glusterfs/3.7.5/xlator/features/bit-rot.la -lib/glusterfs/3.7.5/xlator/features/bitrot-stub.la -lib/glusterfs/3.7.5/xlator/features/cdc.la -lib/glusterfs/3.7.5/xlator/features/changelog.la -lib/glusterfs/3.7.5/xlator/features/changetimerecorder.la -lib/glusterfs/3.7.5/xlator/features/ganesha.la -lib/glusterfs/3.7.5/xlator/features/gfid-access.la -lib/glusterfs/3.7.5/xlator/features/glupy.la -lib/glusterfs/3.7.5/xlator/features/glupy/debug-trace.py -lib/glusterfs/3.7.5/xlator/features/glupy/debug-trace.pyc -lib/glusterfs/3.7.5/xlator/features/glupy/debug-trace.pyo -lib/glusterfs/3.7.5/xlator/features/glupy/helloworld.py -lib/glusterfs/3.7.5/xlator/features/glupy/helloworld.pyc -lib/glusterfs/3.7.5/xlator/features/glupy/helloworld.pyo -lib/glusterfs/3.7.5/xlator/features/glupy/negative.py -lib/glusterfs/3.7.5/xlator/features/glupy/negative.pyc -lib/glusterfs/3.7.5/xlator/features/glupy/negative.pyo -lib/glusterfs/3.7.5/xlator/features/index.la -lib/glusterfs/3.7.5/xlator/features/locks.la -lib/glusterfs/3.7.5/xlator/features/mac-compat.la -lib/glusterfs/3.7.5/xlator/features/marker.la -lib/glusterfs/3.7.5/xlator/features/posix-locks.so -lib/glusterfs/3.7.5/xlator/features/prot_client.la -lib/glusterfs/3.7.5/xlator/features/prot_dht.la -lib/glusterfs/3.7.5/xlator/features/prot_server.la -lib/glusterfs/3.7.5/xlator/features/quiesce.la -lib/glusterfs/3.7.5/xlator/features/quota.la -lib/glusterfs/3.7.5/xlator/features/quotad.la -lib/glusterfs/3.7.5/xlator/features/read-only.la -lib/glusterfs/3.7.5/xlator/features/shard.la -lib/glusterfs/3.7.5/xlator/features/snapview-client.la -lib/glusterfs/3.7.5/xlator/features/snapview-server.la -lib/glusterfs/3.7.5/xlator/features/trash.la -lib/glusterfs/3.7.5/xlator/features/upcall.la -lib/glusterfs/3.7.5/xlator/features/worm.la -lib/glusterfs/3.7.5/xlator/meta.la -lib/glusterfs/3.7.5/xlator/mgmt/glusterd.la -lib/glusterfs/3.7.5/xlator/mount/api.la -lib/glusterfs/3.7.5/xlator/mount/fuse.la -lib/glusterfs/3.7.5/xlator/nfs/server.la -lib/glusterfs/3.7.5/xlator/performance/io-cache.la -lib/glusterfs/3.7.5/xlator/performance/io-threads.la -lib/glusterfs/3.7.5/xlator/performance/md-cache.la -lib/glusterfs/3.7.5/xlator/performance/open-behind.la -lib/glusterfs/3.7.5/xlator/performance/quick-read.la -lib/glusterfs/3.7.5/xlator/performance/read-ahead.la -lib/glusterfs/3.7.5/xlator/performance/readdir-ahead.la -lib/glusterfs/3.7.5/xlator/performance/stat-prefetch.so -lib/glusterfs/3.7.5/xlator/performance/write-behind.la -lib/glusterfs/3.7.5/xlator/protocol/client.la -lib/glusterfs/3.7.5/xlator/protocol/server.la -lib/glusterfs/3.7.5/xlator/storage/posix.la -lib/glusterfs/3.7.5/xlator/system/posix-acl.la -lib/glusterfs/3.7.5/xlator/testing/features/template.la -lib/glusterfs/3.7.5/xlator/testing/performance/symlink-cache.la +include/glusterfs/gfdb/gfdb_sqlite3_helper.h +lib/glusterfs/3.7.6/auth/addr.la +lib/glusterfs/3.7.6/auth/login.la +lib/glusterfs/3.7.6/rpc-transport/socket.la +lib/glusterfs/3.7.6/xlator/cluster/afr.la +lib/glusterfs/3.7.6/xlator/cluster/dht.la +lib/glusterfs/3.7.6/xlator/cluster/disperse.so +lib/glusterfs/3.7.6/xlator/cluster/distribute.so +lib/glusterfs/3.7.6/xlator/cluster/ec.la +lib/glusterfs/3.7.6/xlator/cluster/nufa.la +lib/glusterfs/3.7.6/xlator/cluster/pump.la +lib/glusterfs/3.7.6/xlator/cluster/replicate.so +lib/glusterfs/3.7.6/xlator/cluster/stripe.la +lib/glusterfs/3.7.6/xlator/cluster/switch.la +lib/glusterfs/3.7.6/xlator/cluster/tier.la +lib/glusterfs/3.7.6/xlator/debug/error-gen.la +lib/glusterfs/3.7.6/xlator/debug/io-stats.la +lib/glusterfs/3.7.6/xlator/debug/trace.la +lib/glusterfs/3.7.6/xlator/encryption/crypt.la +lib/glusterfs/3.7.6/xlator/encryption/rot-13.la +lib/glusterfs/3.7.6/xlator/features/access-control.so +lib/glusterfs/3.7.6/xlator/features/arbiter.la +lib/glusterfs/3.7.6/xlator/features/barrier.la +lib/glusterfs/3.7.6/xlator/features/bit-rot.la +lib/glusterfs/3.7.6/xlator/features/bitrot-stub.la +lib/glusterfs/3.7.6/xlator/features/cdc.la +lib/glusterfs/3.7.6/xlator/features/changelog.la +lib/glusterfs/3.7.6/xlator/features/changetimerecorder.la +lib/glusterfs/3.7.6/xlator/features/ganesha.la +lib/glusterfs/3.7.6/xlator/features/gfid-access.la +lib/glusterfs/3.7.6/xlator/features/glupy.la +lib/glusterfs/3.7.6/xlator/features/glupy/debug-trace.py +lib/glusterfs/3.7.6/xlator/features/glupy/debug-trace.pyc +lib/glusterfs/3.7.6/xlator/features/glupy/debug-trace.pyo +lib/glusterfs/3.7.6/xlator/features/glupy/helloworld.py +lib/glusterfs/3.7.6/xlator/features/glupy/helloworld.pyc +lib/glusterfs/3.7.6/xlator/features/glupy/helloworld.pyo +lib/glusterfs/3.7.6/xlator/features/glupy/negative.py +lib/glusterfs/3.7.6/xlator/features/glupy/negative.pyc +lib/glusterfs/3.7.6/xlator/features/glupy/negative.pyo +lib/glusterfs/3.7.6/xlator/features/index.la +lib/glusterfs/3.7.6/xlator/features/locks.la +lib/glusterfs/3.7.6/xlator/features/mac-compat.la +lib/glusterfs/3.7.6/xlator/features/marker.la +lib/glusterfs/3.7.6/xlator/features/posix-locks.so +lib/glusterfs/3.7.6/xlator/features/prot_client.la +lib/glusterfs/3.7.6/xlator/features/prot_dht.la +lib/glusterfs/3.7.6/xlator/features/prot_server.la +lib/glusterfs/3.7.6/xlator/features/quiesce.la +lib/glusterfs/3.7.6/xlator/features/quota.la +lib/glusterfs/3.7.6/xlator/features/quotad.la +lib/glusterfs/3.7.6/xlator/features/read-only.la +lib/glusterfs/3.7.6/xlator/features/shard.la +lib/glusterfs/3.7.6/xlator/features/snapview-client.la +lib/glusterfs/3.7.6/xlator/features/snapview-server.la +lib/glusterfs/3.7.6/xlator/features/trash.la +lib/glusterfs/3.7.6/xlator/features/upcall.la +lib/glusterfs/3.7.6/xlator/features/worm.la +lib/glusterfs/3.7.6/xlator/meta.la +lib/glusterfs/3.7.6/xlator/mgmt/glusterd.la +lib/glusterfs/3.7.6/xlator/mount/api.la +lib/glusterfs/3.7.6/xlator/mount/fuse.la +lib/glusterfs/3.7.6/xlator/nfs/server.la +lib/glusterfs/3.7.6/xlator/performance/io-cache.la +lib/glusterfs/3.7.6/xlator/performance/io-threads.la +lib/glusterfs/3.7.6/xlator/performance/md-cache.la +lib/glusterfs/3.7.6/xlator/performance/open-behind.la +lib/glusterfs/3.7.6/xlator/performance/quick-read.la +lib/glusterfs/3.7.6/xlator/performance/read-ahead.la +lib/glusterfs/3.7.6/xlator/performance/readdir-ahead.la +lib/glusterfs/3.7.6/xlator/performance/stat-prefetch.so +lib/glusterfs/3.7.6/xlator/performance/write-behind.la +lib/glusterfs/3.7.6/xlator/protocol/client.la +lib/glusterfs/3.7.6/xlator/protocol/server.la +lib/glusterfs/3.7.6/xlator/storage/posix.la +lib/glusterfs/3.7.6/xlator/system/posix-acl.la +lib/glusterfs/3.7.6/xlator/testing/features/template.la +lib/glusterfs/3.7.6/xlator/testing/performance/symlink-cache.la lib/libgfapi.la lib/libgfchangelog.la lib/libgfdb.la diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo index aad1e1d95d4e..4b7fe584597e 100644 --- a/filesystems/glusterfs/distinfo +++ b/filesystems/glusterfs/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.44 2015/11/03 00:15:01 agc Exp $ +$NetBSD: distinfo,v 1.45 2015/11/09 04:13:56 manu Exp $ -SHA1 (glusterfs-3.7.5.tar.gz) = 02bccea59e86b89a77f40f5b283ab7e0cd01ff39 -RMD160 (glusterfs-3.7.5.tar.gz) = 5eae65f52c96616c81b31b9772784cda6172dfa7 -SHA512 (glusterfs-3.7.5.tar.gz) = 1483c05a88ebd75f10c3b815332c3867083a3ee30dd42f6b6ba6e444538711e02af7dd7d653f85b03ab6e8221c9fb32f13294ca364a39e71422be6697c72b806 -Size (glusterfs-3.7.5.tar.gz) = 7612239 bytes -SHA1 (patch-xlators_mgmt_glusterd_src_Makefile.in) = 188eab283bd7433c86e7767e594ba8fb97645e23 +SHA1 (glusterfs-3.7.6.tar.gz) = e611726b87f55e91041d4e8e6aa8c50e861f0957 +RMD160 (glusterfs-3.7.6.tar.gz) = 58a9e1cc6b6c80caf03d0f495ff7c98673e816ea +Size (glusterfs-3.7.6.tar.gz) = 7690697 bytes diff --git a/filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in b/filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in deleted file mode 100644 index d0b11d9d341f..000000000000 --- a/filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-xlators_mgmt_glusterd_src_Makefile.in,v 1.4 2015/06/08 13:40:08 joerg Exp $ - ---- xlators/mgmt/glusterd/src/Makefile.in.orig 2015-06-08 13:01:09.000000000 +0000 -+++ xlators/mgmt/glusterd/src/Makefile.in -@@ -409,7 +409,7 @@ noinst_HEADERS = glusterd.h glusterd-uti - glusterd-server-quorum.h glusterd-errno.h - - AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -- -I$(rpclibdir) -I$(CONTRIBDIR)/rbtree \ -+ -I$(CONTRIBDIR)/rbtree \ - -I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src \ - -I$(CONTRIBDIR)/mount \ - -I$(CONTRIBDIR)/userspace-rcu \