Thu Apr 9 15:20:48 2015 UTC ()
Update glusterfs to 3.6.2
This is a maintenance release, complete Changelog can be found here:
http://blog.gluster.org/2015/01/glusterfs-3-6-2-ga-released/
(manu)
diff -r1.48 -r1.49 pkgsrc/filesystems/glusterfs/Makefile
diff -r1.21 -r1.22 pkgsrc/filesystems/glusterfs/PLIST
diff -r1.36 -r1.37 pkgsrc/filesystems/glusterfs/distinfo
diff -r1.1 -r0 pkgsrc/filesystems/glusterfs/patches/patch-9006
diff -r1.1 -r0 pkgsrc/filesystems/glusterfs/patches/patch-9010
diff -r1.1 -r0 pkgsrc/filesystems/glusterfs/patches/patch-9045
diff -r1.1 -r0 pkgsrc/filesystems/glusterfs/patches/patch-9080
diff -r1.1 -r0 pkgsrc/filesystems/glusterfs/patches/patch-9084
diff -r1.1 -r0 pkgsrc/filesystems/glusterfs/patches/patch-configure
diff -r1.1 -r0 pkgsrc/filesystems/glusterfs/patches/patch-xlator_cluster_dht_src_dht-common.c
diff -r1.1 -r0 pkgsrc/filesystems/glusterfs/patches/patch-xlator_features_glupy_src_Makefile.in
diff -r1.1 -r1.2 pkgsrc/filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in
--- pkgsrc/filesystems/glusterfs/Makefile 2015/03/12 16:35:39 1.48
+++ pkgsrc/filesystems/glusterfs/Makefile 2015/04/09 15:20:47 1.49
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2015/03/12 16:35:39 tnn Exp $
+# $NetBSD: Makefile,v 1.49 2015/04/09 15:20:47 manu Exp $
-DISTNAME= glusterfs-3.6.0
+DISTNAME= glusterfs-3.6.2
#PKGREVISION= 1
CATEGORIES= filesystems
MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/
@@ -95,11 +95,6 @@
#LIBS+=-lgc
.include "../../mk/bsd.prefs.mk"
-
-PLIST_VARS+= mmx
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-PLIST.mmx= yes
-.endif
#.include "../../devel/argp/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
--- pkgsrc/filesystems/glusterfs/Attic/PLIST 2015/01/11 23:07:01 1.21
+++ pkgsrc/filesystems/glusterfs/Attic/PLIST 2015/04/09 15:20:47 1.22
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2015/01/11 23:07:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.22 2015/04/09 15:20:47 manu Exp $
${PYSITELIB}/gluster/__init__.py
${PYSITELIB}/gluster/__init__.pyc
${PYSITELIB}/gluster/__init__.pyo
@@ -15,74 +15,72 @@
include/glusterfs/api/glfs-handles.h
include/glusterfs/api/glfs.h
include/glusterfs/gfchangelog/changelog.h
-lib/glusterfs/3.6.0/auth/addr.la
-lib/glusterfs/3.6.0/auth/login.la
-lib/glusterfs/3.6.0/rpc-transport/socket.la
-lib/glusterfs/3.6.0/xlator/cluster/afr.la
-lib/glusterfs/3.6.0/xlator/cluster/dht.la
-${PLIST.mmx}lib/glusterfs/3.6.0/xlator/cluster/disperse.so
-lib/glusterfs/3.6.0/xlator/cluster/distribute.so
-${PLIST.mmx}lib/glusterfs/3.6.0/xlator/cluster/ec.la
-lib/glusterfs/3.6.0/xlator/cluster/nufa.la
-lib/glusterfs/3.6.0/xlator/cluster/pump.la
-lib/glusterfs/3.6.0/xlator/cluster/replicate.so
-lib/glusterfs/3.6.0/xlator/cluster/stripe.la
-lib/glusterfs/3.6.0/xlator/cluster/switch.la
-lib/glusterfs/3.6.0/xlator/debug/error-gen.la
-lib/glusterfs/3.6.0/xlator/debug/io-stats.la
-lib/glusterfs/3.6.0/xlator/debug/trace.la
-lib/glusterfs/3.6.0/xlator/encryption/crypt.la
-lib/glusterfs/3.6.0/xlator/encryption/rot-13.la
-lib/glusterfs/3.6.0/xlator/features/access-control.so
-lib/glusterfs/3.6.0/xlator/features/barrier.la
-lib/glusterfs/3.6.0/xlator/features/cdc.la
-lib/glusterfs/3.6.0/xlator/features/changelog.la
-lib/glusterfs/3.6.0/xlator/features/gfid-access.la
-lib/glusterfs/3.6.0/xlator/features/glupy.la
-lib/glusterfs/3.6.0/xlator/features/glupy/debug-trace.py
-lib/glusterfs/3.6.0/xlator/features/glupy/debug-trace.pyc
-lib/glusterfs/3.6.0/xlator/features/glupy/debug-trace.pyo
-lib/glusterfs/3.6.0/xlator/features/glupy/helloworld.py
-lib/glusterfs/3.6.0/xlator/features/glupy/helloworld.pyc
-lib/glusterfs/3.6.0/xlator/features/glupy/helloworld.pyo
-lib/glusterfs/3.6.0/xlator/features/glupy/negative.py
-lib/glusterfs/3.6.0/xlator/features/glupy/negative.pyc
-lib/glusterfs/3.6.0/xlator/features/glupy/negative.pyo
-lib/glusterfs/3.6.0/xlator/features/index.la
-lib/glusterfs/3.6.0/xlator/features/locks.la
-lib/glusterfs/3.6.0/xlator/features/mac-compat.la
-lib/glusterfs/3.6.0/xlator/features/marker.la
-lib/glusterfs/3.6.0/xlator/features/posix-locks.so
-lib/glusterfs/3.6.0/xlator/features/prot_client.la
-lib/glusterfs/3.6.0/xlator/features/prot_dht.la
-lib/glusterfs/3.6.0/xlator/features/prot_server.la
-lib/glusterfs/3.6.0/xlator/features/quiesce.la
-lib/glusterfs/3.6.0/xlator/features/quota.la
-lib/glusterfs/3.6.0/xlator/features/quotad.la
-lib/glusterfs/3.6.0/xlator/features/read-only.la
-lib/glusterfs/3.6.0/xlator/features/snapview-client.la
-lib/glusterfs/3.6.0/xlator/features/snapview-server.la
-lib/glusterfs/3.6.0/xlator/features/worm.la
-lib/glusterfs/3.6.0/xlator/meta.la
-lib/glusterfs/3.6.0/xlator/mgmt/glusterd.la
-lib/glusterfs/3.6.0/xlator/mount/api.la
-lib/glusterfs/3.6.0/xlator/mount/fuse.la
-lib/glusterfs/3.6.0/xlator/nfs/server.la
-lib/glusterfs/3.6.0/xlator/performance/io-cache.la
-lib/glusterfs/3.6.0/xlator/performance/io-threads.la
-lib/glusterfs/3.6.0/xlator/performance/md-cache.la
-lib/glusterfs/3.6.0/xlator/performance/open-behind.la
-lib/glusterfs/3.6.0/xlator/performance/quick-read.la
-lib/glusterfs/3.6.0/xlator/performance/read-ahead.la
-lib/glusterfs/3.6.0/xlator/performance/readdir-ahead.la
-lib/glusterfs/3.6.0/xlator/performance/stat-prefetch.so
-lib/glusterfs/3.6.0/xlator/performance/write-behind.la
-lib/glusterfs/3.6.0/xlator/protocol/client.la
-lib/glusterfs/3.6.0/xlator/protocol/server.la
-lib/glusterfs/3.6.0/xlator/storage/posix.la
-lib/glusterfs/3.6.0/xlator/system/posix-acl.la
-lib/glusterfs/3.6.0/xlator/testing/features/template.la
-lib/glusterfs/3.6.0/xlator/testing/performance/symlink-cache.la
+lib/glusterfs/3.6.2/auth/addr.la
+lib/glusterfs/3.6.2/auth/login.la
+lib/glusterfs/3.6.2/rpc-transport/socket.la
+lib/glusterfs/3.6.2/xlator/cluster/afr.la
+lib/glusterfs/3.6.2/xlator/cluster/dht.la
+lib/glusterfs/3.6.2/xlator/cluster/distribute.so
+lib/glusterfs/3.6.2/xlator/cluster/nufa.la
+lib/glusterfs/3.6.2/xlator/cluster/pump.la
+lib/glusterfs/3.6.2/xlator/cluster/replicate.so
+lib/glusterfs/3.6.2/xlator/cluster/stripe.la
+lib/glusterfs/3.6.2/xlator/cluster/switch.la
+lib/glusterfs/3.6.2/xlator/debug/error-gen.la
+lib/glusterfs/3.6.2/xlator/debug/io-stats.la
+lib/glusterfs/3.6.2/xlator/debug/trace.la
+lib/glusterfs/3.6.2/xlator/encryption/crypt.la
+lib/glusterfs/3.6.2/xlator/encryption/rot-13.la
+lib/glusterfs/3.6.2/xlator/features/access-control.so
+lib/glusterfs/3.6.2/xlator/features/barrier.la
+lib/glusterfs/3.6.2/xlator/features/cdc.la
+lib/glusterfs/3.6.2/xlator/features/changelog.la
+lib/glusterfs/3.6.2/xlator/features/gfid-access.la
+lib/glusterfs/3.6.2/xlator/features/glupy.la
+lib/glusterfs/3.6.2/xlator/features/glupy/debug-trace.py
+lib/glusterfs/3.6.2/xlator/features/glupy/debug-trace.pyc
+lib/glusterfs/3.6.2/xlator/features/glupy/debug-trace.pyo
+lib/glusterfs/3.6.2/xlator/features/glupy/helloworld.py
+lib/glusterfs/3.6.2/xlator/features/glupy/helloworld.pyc
+lib/glusterfs/3.6.2/xlator/features/glupy/helloworld.pyo
+lib/glusterfs/3.6.2/xlator/features/glupy/negative.py
+lib/glusterfs/3.6.2/xlator/features/glupy/negative.pyc
+lib/glusterfs/3.6.2/xlator/features/glupy/negative.pyo
+lib/glusterfs/3.6.2/xlator/features/index.la
+lib/glusterfs/3.6.2/xlator/features/locks.la
+lib/glusterfs/3.6.2/xlator/features/mac-compat.la
+lib/glusterfs/3.6.2/xlator/features/marker.la
+lib/glusterfs/3.6.2/xlator/features/posix-locks.so
+lib/glusterfs/3.6.2/xlator/features/prot_client.la
+lib/glusterfs/3.6.2/xlator/features/prot_dht.la
+lib/glusterfs/3.6.2/xlator/features/prot_server.la
+lib/glusterfs/3.6.2/xlator/features/quiesce.la
+lib/glusterfs/3.6.2/xlator/features/quota.la
+lib/glusterfs/3.6.2/xlator/features/quotad.la
+lib/glusterfs/3.6.2/xlator/features/read-only.la
+lib/glusterfs/3.6.2/xlator/features/snapview-client.la
+lib/glusterfs/3.6.2/xlator/features/snapview-server.la
+lib/glusterfs/3.6.2/xlator/features/worm.la
+lib/glusterfs/3.6.2/xlator/meta.la
+lib/glusterfs/3.6.2/xlator/mgmt/glusterd.la
+lib/glusterfs/3.6.2/xlator/mount/api.la
+lib/glusterfs/3.6.2/xlator/mount/fuse.la
+lib/glusterfs/3.6.2/xlator/nfs/server.la
+lib/glusterfs/3.6.2/xlator/performance/io-cache.la
+lib/glusterfs/3.6.2/xlator/performance/io-threads.la
+lib/glusterfs/3.6.2/xlator/performance/md-cache.la
+lib/glusterfs/3.6.2/xlator/performance/open-behind.la
+lib/glusterfs/3.6.2/xlator/performance/quick-read.la
+lib/glusterfs/3.6.2/xlator/performance/read-ahead.la
+lib/glusterfs/3.6.2/xlator/performance/readdir-ahead.la
+lib/glusterfs/3.6.2/xlator/performance/stat-prefetch.so
+lib/glusterfs/3.6.2/xlator/performance/write-behind.la
+lib/glusterfs/3.6.2/xlator/protocol/client.la
+lib/glusterfs/3.6.2/xlator/protocol/server.la
+lib/glusterfs/3.6.2/xlator/storage/posix.la
+lib/glusterfs/3.6.2/xlator/system/posix-acl.la
+lib/glusterfs/3.6.2/xlator/testing/features/template.la
+lib/glusterfs/3.6.2/xlator/testing/performance/symlink-cache.la
lib/libgfapi.la
lib/libgfchangelog.la
lib/libgfrpc.la
@@ -142,6 +140,7 @@
man/man8/glusterfs.8
man/man8/glusterfsd.8
man/man8/mount.glusterfs.8
+sbin/glfsheal
sbin/gluster
sbin/glusterd
sbin/glusterfs
--- pkgsrc/filesystems/glusterfs/distinfo 2014/12/11 22:08:22 1.36
+++ pkgsrc/filesystems/glusterfs/distinfo 2015/04/09 15:20:47 1.37
@@ -1,16 +1,8 @@
-$NetBSD: distinfo,v 1.36 2014/12/11 22:08:22 joerg Exp $
+$NetBSD: distinfo,v 1.37 2015/04/09 15:20:47 manu Exp $
-SHA1 (glusterfs-3.6.0.tar.gz) = fe19bf7128c955207f633261b9f0f87ac7341cfc
-RMD160 (glusterfs-3.6.0.tar.gz) = a0078c5a08617f981e09e96eed6eaa2f622dc4b5
-Size (glusterfs-3.6.0.tar.gz) = 5924875 bytes
-SHA1 (patch-9006) = 18ac4e9d58b587bd202f94323a2fb9a168aade80
-SHA1 (patch-9010) = 8d46f4c32c3a14da0724b65c9592196a2439dbea
-SHA1 (patch-9045) = 93cb986d8a2675a714ded956269ffa73f9495827
-SHA1 (patch-9080) = a5be37a2834859afc4cf2daab3bd8c68581ab221
-SHA1 (patch-9084) = bc24386464df02e2e6e7d0f42892881dd5d9ef3a
-SHA1 (patch-configure) = 51de89ba391cb699f34f11882dca0ca67c98e0a6
+SHA1 (glusterfs-3.6.2.tar.gz) = 83aefa6b118f03bf3f78cbe0d8a8b8cc1634078a
+RMD160 (glusterfs-3.6.2.tar.gz) = 941d4e59ab3ed5faf216cc2c9267207aab0fb31a
+Size (glusterfs-3.6.2.tar.gz) = 6018636 bytes
SHA1 (patch-rpc_rpc-lib_src_rpcsvc.c) = a174a78d3daec9b784966b4c4502b335e4561558
-SHA1 (patch-xlator_cluster_dht_src_dht-common.c) = 835a240358948f310205c19514088cf93930b888
-SHA1 (patch-xlator_features_glupy_src_Makefile.in) = b338b98789d70f7c896ee29534a8dbae0ee93f08
SHA1 (patch-xlator_storage_posix_src_posix.c) = 1ca56830afac7cda2fb4fc119fdd6161134eb8b5
-SHA1 (patch-xlators_mgmt_glusterd_src_Makefile.in) = 48f2cbb46ad9d08c3500e23ce93586b265e1f5f5
+SHA1 (patch-xlators_mgmt_glusterd_src_Makefile.in) = 78a2b9d6c406744cb415904030d60aa09b636463
--- pkgsrc/filesystems/glusterfs/patches/Attic/patch-xlators_mgmt_glusterd_src_Makefile.in 2014/12/11 22:08:22 1.1
+++ pkgsrc/filesystems/glusterfs/patches/Attic/patch-xlators_mgmt_glusterd_src_Makefile.in 2015/04/09 15:20:48 1.2
@@ -1,8 +1,9 @@
-$NetBSD: patch-xlators_mgmt_glusterd_src_Makefile.in,v 1.1 2014/12/11 22:08:22 joerg Exp $
+$NetBSD: patch-xlators_mgmt_glusterd_src_Makefile.in,v 1.2 2015/04/09 15:20:48 manu Exp $
---- xlators/mgmt/glusterd/src/Makefile.in.orig 2014-12-10 15:18:18.000000000 +0000
-+++ xlators/mgmt/glusterd/src/Makefile.in
-@@ -356,7 +356,7 @@ noinst_HEADERS = glusterd.h glusterd-uti
+--- xlators/mgmt/glusterd/src/Makefile.in.orig 2015-01-21 13:11:01.000000000 +0100
++++ xlators/mgmt/glusterd/src/Makefile.in 2015-04-09 15:58:41.000000000 +0200
+@@ -358,9 +358,9 @@
+ glusterd-syncop.h glusterd-hooks.h glusterd-locks.h \
glusterd-mgmt.h glusterd-messages.h glusterd-peer-utils.h
AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
@@ -11,3 +12,4 @@
-I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src \
-I$(CONTRIBDIR)/uuid -I$(CONTRIBDIR)/mount \
-DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \
+ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\