summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--filesystems/glusterfs/Makefile10
-rw-r--r--filesystems/glusterfs/PLIST106
-rw-r--r--filesystems/glusterfs/distinfo9
-rw-r--r--filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in13
4 files changed, 115 insertions, 23 deletions
diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index 5c203a48abb..54b04f50bb8 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2016/04/19 03:12:42 manu Exp $
+# $NetBSD: Makefile,v 1.67 2016/06/16 04:01:02 manu Exp $
-DISTNAME= glusterfs-3.7.11
+DISTNAME= glusterfs-3.8.0
#PKGREVISION= 1
CATEGORIES= filesystems
MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/
@@ -25,7 +25,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # only 2.x supported as of 3.6.0
REPLACE_PYTHON+= contrib/ipaddr-py/ipaddr.py
REPLACE_PYTHON+= extras/ganesha/scripts/generate-epoch.py
-REPLACE_PYTHON+= extras/geo-rep/schedule_georep.py
+REPLACE_PYTHON+= extras/geo-rep/schedule_georep.py.in
REPLACE_PYTHON+= extras/snap_scheduler/gcron.py
REPLACE_PYTHON+= extras/snap_scheduler/snap_scheduler.py
REPLACE_PYTHON+= geo-replication/src/peer_mountbroker.in
@@ -48,6 +48,9 @@ REPLACE_PYTHON+= tools/glusterfind/src/utils.py
REPLACE_BASH+= extras/ganesha/ocf/ganesha_grace
REPLACE_BASH+= extras/ganesha/ocf/ganesha_mon
REPLACE_BASH+= extras/ganesha/ocf/ganesha_nfsd
+REPLACE_BASH+= extras/ganesha/scripts/copy-export-ganesha.sh
+REPLACE_BASH+= extras/ganesha/scripts/create-export-ganesha.sh
+REPLACE_BASH+= extras/ganesha/scripts/dbus-send.sh
REPLACE_BASH+= extras/ganesha/scripts/ganesha-ha.sh
REPLACE_BASH+= extras/geo-rep/generate-gfid-file.sh
REPLACE_BASH+= extras/geo-rep/get-gfid.sh
@@ -57,6 +60,7 @@ REPLACE_BASH+= extras/peer_add_secret_pub.in
REPLACE_BASH+= extras/peer_add_secret_pub.in
REPLACE_BASH+= extras/post-upgrade-script-for-quota.sh
REPLACE_BASH+= extras/pre-upgrade-script-for-quota.sh
+REPLACE_BASH+= extras/stop-all-gluster-processes.sh
REPLACE_BASH+= geo-replication/src/gverify.sh
REPLACE_BASH+= geo-replication/src/peer_gsec_create.in
REPLACE_BASH+= geo-replication/src/set_geo_rep_pem_keys.sh
diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST
index 6c633bcdeaf..108af9299b0 100644
--- a/filesystems/glusterfs/PLIST
+++ b/filesystems/glusterfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2016/04/19 03:12:42 manu Exp $
+@comment $NetBSD: PLIST,v 1.35 2016/06/16 04:01:02 manu Exp $
${PYSITELIB}/gluster/__init__.py
${PYSITELIB}/gluster/__init__.pyc
${PYSITELIB}/gluster/__init__.pyo
@@ -16,6 +16,26 @@ etc/glusterfs/group-virt.example
etc/glusterfs/logger.conf.example
include/glusterfs/api/glfs-handles.h
include/glusterfs/api/glfs.h
+include/glusterfs/byte-order.h
+include/glusterfs/call-stub.h
+include/glusterfs/checksum.h
+include/glusterfs/circ-buff.h
+include/glusterfs/client_t.h
+include/glusterfs/cluster-syncop.h
+include/glusterfs/common-utils.h
+include/glusterfs/compat-errno.h
+include/glusterfs/compat-uuid.h
+include/glusterfs/compat.h
+include/glusterfs/ctr-messages.h
+include/glusterfs/daemon.h
+include/glusterfs/default-args.h
+include/glusterfs/defaults.h
+include/glusterfs/dict.h
+include/glusterfs/event-history.h
+include/glusterfs/event.h
+include/glusterfs/fd-lk.h
+include/glusterfs/fd.h
+include/glusterfs/gf-dirent.h
include/glusterfs/gfchangelog/changelog.h
include/glusterfs/gfdb/gfdb_data_store.h
include/glusterfs/gfdb/gfdb_data_store_helper.h
@@ -23,6 +43,81 @@ 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.h
+include/glusterfs/gidcache.h
+include/glusterfs/glfs-message-id.h
+include/glusterfs/globals.h
+include/glusterfs/glusterfs-acl.h
+include/glusterfs/glusterfs-fops.h
+include/glusterfs/glusterfs.h
+include/glusterfs/graph-utils.h
+include/glusterfs/hashfn.h
+include/glusterfs/iatt.h
+include/glusterfs/inode.h
+include/glusterfs/iobuf.h
+include/glusterfs/latency.h
+include/glusterfs/libglusterfs-messages.h
+include/glusterfs/list.h
+include/glusterfs/lkowner.h
+include/glusterfs/locking.h
+include/glusterfs/logging.h
+include/glusterfs/lvm-defaults.h
+include/glusterfs/mem-pool.h
+include/glusterfs/mem-types.h
+include/glusterfs/options.h
+include/glusterfs/parse-utils.h
+include/glusterfs/quota-common-utils.h
+include/glusterfs/rbthash.h
+include/glusterfs/refcount.h
+include/glusterfs/revision.h
+include/glusterfs/rot-buffs.h
+include/glusterfs/rpc/acl3-xdr.h
+include/glusterfs/rpc/changelog-xdr.h
+include/glusterfs/rpc/cli1-xdr.h
+include/glusterfs/rpc/glusterd1-xdr.h
+include/glusterfs/rpc/glusterfs-fops.h
+include/glusterfs/rpc/glusterfs3-xdr.h
+include/glusterfs/rpc/glusterfs3.h
+include/glusterfs/rpc/mount3udp.h
+include/glusterfs/rpc/msg-nfs3.h
+include/glusterfs/rpc/nlm4-xdr.h
+include/glusterfs/rpc/nsm-xdr.h
+include/glusterfs/rpc/portmap-xdr.h
+include/glusterfs/rpc/protocol-common.h
+include/glusterfs/rpc/rpc-clnt-ping.h
+include/glusterfs/rpc/rpc-clnt.h
+include/glusterfs/rpc/rpc-common-xdr.h
+include/glusterfs/rpc/rpc-drc.h
+include/glusterfs/rpc/rpc-lib-messages.h
+include/glusterfs/rpc/rpc-transport.h
+include/glusterfs/rpc/rpcsvc-common.h
+include/glusterfs/rpc/rpcsvc.h
+include/glusterfs/rpc/xdr-common.h
+include/glusterfs/rpc/xdr-generic.h
+include/glusterfs/rpc/xdr-nfs3.h
+include/glusterfs/rpc/xdr-rpc.h
+include/glusterfs/rpc/xdr-rpcclnt.h
+include/glusterfs/run.h
+include/glusterfs/server/authenticate.h
+include/glusterfs/server/server-common.h
+include/glusterfs/server/server-helpers.h
+include/glusterfs/server/server-mem-types.h
+include/glusterfs/server/server-messages.h
+include/glusterfs/server/server.h
+include/glusterfs/stack.h
+include/glusterfs/statedump.h
+include/glusterfs/store.h
+include/glusterfs/strfd.h
+include/glusterfs/syncop-utils.h
+include/glusterfs/syncop.h
+include/glusterfs/syscall.h
+include/glusterfs/template-component-messages.h
+include/glusterfs/timer.h
+include/glusterfs/timespec.h
+include/glusterfs/trie.h
+include/glusterfs/tw.h
+include/glusterfs/upcall-utils.h
+include/glusterfs/xlator.h
+include/glusterfs/y.tab.h
lib/glusterfs/${GLUSTERFS_VERSION}/auth/addr.la
lib/glusterfs/${GLUSTERFS_VERSION}/auth/login.la
lib/glusterfs/${GLUSTERFS_VERSION}/rpc-transport/socket.la
@@ -63,6 +158,9 @@ lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/glupy/negative.py
lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/glupy/negative.pyc
lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/glupy/negative.pyo
lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/index.la
+lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/leases.a
+lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/leases.la
+lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/leases.so
lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/locks.la
lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/mac-compat.la
lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/marker.la
@@ -85,6 +183,9 @@ lib/glusterfs/${GLUSTERFS_VERSION}/xlator/mgmt/glusterd.la
lib/glusterfs/${GLUSTERFS_VERSION}/xlator/mount/api.la
lib/glusterfs/${GLUSTERFS_VERSION}/xlator/mount/fuse.la
lib/glusterfs/${GLUSTERFS_VERSION}/xlator/nfs/server.la
+lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/decompounder.a
+lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/decompounder.la
+lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/decompounder.so
lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/io-cache.la
lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/io-threads.la
lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/md-cache.la
@@ -114,6 +215,7 @@ lib/ocf/resource.d/heartbeat/ganesha_nfsd
lib/pkgconfig/glusterfs-api.pc
lib/pkgconfig/libgfchangelog.pc
lib/pkgconfig/libgfdb.pc
+libexec/ganesha/copy-export-ganesha.sh
libexec/ganesha/create-export-ganesha.sh
libexec/ganesha/dbus-send.sh
libexec/ganesha/ganesha-ha.sh
@@ -122,10 +224,10 @@ libexec/glusterfs/gfind_missing_files/gcrawler
libexec/glusterfs/gfind_missing_files/gfid_to_path.py
libexec/glusterfs/gfind_missing_files/gfid_to_path.sh
libexec/glusterfs/gfind_missing_files/gfind_missing_files.sh
+libexec/glusterfs/glusterfind/S57glusterfind-delete-post.py
libexec/glusterfs/glusterfind/__init__.py
libexec/glusterfs/glusterfind/__init__.pyc
libexec/glusterfs/glusterfind/__init__.pyo
-libexec/glusterfs/glusterfind/S57glusterfind-delete-post.py
libexec/glusterfs/glusterfind/brickfind.py
libexec/glusterfs/glusterfind/changelog.py
libexec/glusterfs/glusterfind/changelogdata.py
diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo
index df9ddadeb25..f92bc6b0518 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.54 2016/04/19 03:12:42 manu Exp $
+$NetBSD: distinfo,v 1.55 2016/06/16 04:01:02 manu Exp $
-SHA1 (glusterfs-3.7.11.tar.gz) = f8cc65fae0a2326f9ee44f539ed6a81b50b2505f
-RMD160 (glusterfs-3.7.11.tar.gz) = f830b3d4e6650acdd5059c7afdb3c85e8b5fb33e
-Size (glusterfs-3.7.11.tar.gz) = 8043775 bytes
-SHA1 (patch-xlators_mgmt_glusterd_src_Makefile.in) = bfc093b482edc1e95f95152ab407633bdf7d0f55
+SHA1 (glusterfs-3.8.0.tar.gz) = 77c935b7a6fb3a8f41a49137725a3cb7041d23b6
+RMD160 (glusterfs-3.8.0.tar.gz) = 2cd1c53189736c5b663e3ac20b0f4c194dbf2641
+Size (glusterfs-3.8.0.tar.gz) = 8278643 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 09492abcc2f..00000000000
--- 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.8 2016/03/29 22:02:35 joerg Exp $
-
---- xlators/mgmt/glusterd/src/Makefile.in.orig 2015-11-08 21:58:06.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 \