pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/filesystems/glusterfs Update glusterfs to 3.6.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/4310f144423b
branches: trunk
changeset: 649771:4310f144423b
user: manu <manu%pkgsrc.org@localhost>
date: Thu Apr 09 15:20:47 2015 +0000
description:
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/
diffstat:
filesystems/glusterfs/Makefile | 9 +-
filesystems/glusterfs/PLIST | 137 +-
filesystems/glusterfs/distinfo | 18 +-
filesystems/glusterfs/patches/patch-9006 | 55 -
filesystems/glusterfs/patches/patch-9010 | 72 --
filesystems/glusterfs/patches/patch-9045 | 43 -
filesystems/glusterfs/patches/patch-9080 | 264 -------
filesystems/glusterfs/patches/patch-9084 | 350 ----------
filesystems/glusterfs/patches/patch-configure | 61 -
filesystems/glusterfs/patches/patch-xlator_cluster_dht_src_dht-common.c | 17 -
filesystems/glusterfs/patches/patch-xlator_features_glupy_src_Makefile.in | 28 -
filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in | 10 +-
12 files changed, 81 insertions(+), 983 deletions(-)
diffs (truncated from 1151 to 300 lines):
diff -r 48c59f017b5c -r 4310f144423b filesystems/glusterfs/Makefile
--- a/filesystems/glusterfs/Makefile Thu Apr 09 11:56:15 2015 +0000
+++ b/filesystems/glusterfs/Makefile Thu Apr 09 15:20:47 2015 +0000
@@ -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/
@@ -96,11 +96,6 @@
.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"
.include "../../textproc/libxml2/buildlink3.mk"
diff -r 48c59f017b5c -r 4310f144423b filesystems/glusterfs/PLIST
--- a/filesystems/glusterfs/PLIST Thu Apr 09 11:56:15 2015 +0000
+++ b/filesystems/glusterfs/PLIST Thu Apr 09 15:20:47 2015 +0000
@@ -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
diff -r 48c59f017b5c -r 4310f144423b filesystems/glusterfs/distinfo
--- a/filesystems/glusterfs/distinfo Thu Apr 09 11:56:15 2015 +0000
+++ b/filesystems/glusterfs/distinfo Thu Apr 09 15:20:47 2015 +0000
@@ -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
diff -r 48c59f017b5c -r 4310f144423b filesystems/glusterfs/patches/patch-9006
--- a/filesystems/glusterfs/patches/patch-9006 Thu Apr 09 11:56:15 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-$NetBSD: patch-9006,v 1.1 2014/11/18 14:38:15 manu Exp $
-From 4f97f9e26663f03da1ca675b16943544e39399a3 Mon Sep 17 00:00:00 2001
-From: Emmanuel Dreyfus <manu%netbsd.org@localhost>
-Date: Thu, 30 Oct 2014 09:50:41 +0100
-Subject: [PATCH] Lazy umount emulation: deal with stopped volumes
-
-On non Linux systems, lazy umount is emulated using contrib/umountd.
-It first check that the path given to unmount exists, but it should
-not give up on ENOTCONN as it is what happens when a volume is mounted
-but stopped.
-
-This lets NetBSD pass tests/bugs/bug-1049323.t
-
-Backport of: http://review.gluster.org/8991
-
-BUG: 1138897
-Change-Id: I39941577021c0b39f545f9777fe75cd39637427b
-Signed-off-by: Emmanuel Dreyfus <manu%netbsd.org@localhost>
----
- contrib/umountd/umountd.c | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
-
-diff --git contrib/umountd/umountd.c contrib/umountd/umountd.c
-index 42f867d..0d2c6f2 100644
---- contrib/umountd/umountd.c
-+++ contrib/umountd/umountd.c
-@@ -49,14 +49,20 @@ sanity_check (char *path, dev_t *devp)
- if (path == NULL)
- usage ();
-
-- if (stat (path, &st) != 0) {
-- gf_log ("umountd", GF_LOG_ERROR,
-- "Cannot access %s\n", path, strerror (errno));
-- goto out;
-+ if ((ret = stat (path, &st)) != 0) {
-+ switch (errno) {
-+ case ENOTCONN:
-+ /* volume is stopped */
-+ break;
-+ default:
-+ gf_log ("umountd", GF_LOG_ERROR,
-+ "Cannot access %s\n", path, strerror (errno));
-+ goto out;
-+ }
- }
-
- /* If dev was not specified, get it from path */
-- if (*devp == -1)
-+ if (*devp == -1 && ret == 0)
- *devp = st.st_dev;
-
- strncpy (pathtmp, path, PATH_MAX);
---
-1.8.2.3
-
diff -r 48c59f017b5c -r 4310f144423b filesystems/glusterfs/patches/patch-9010
--- a/filesystems/glusterfs/patches/patch-9010 Thu Apr 09 11:56:15 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-$NetBSD: patch-9010,v 1.1 2014/11/18 14:38:15 manu Exp $
-From 70e4f2935ac858f2e83d0c3887b584af8fa0bd5b Mon Sep 17 00:00:00 2001
-From: Emmanuel Dreyfus <manu%netbsd.org@localhost>
-Date: Thu, 30 Oct 2014 10:54:24 +0100
-Subject: [PATCH] Use F_CLOSEM if available
-
-Use F_CLOSEM to close all file descriptors if available.
-
-Backport of Ib3c682825b89c163ebb152848f2533b3cb62cdce
-
-BUG: 1138897
-Change-Id: Ie44c8e07c77ca5509766e0addbb17c1979df68e7
-Signed-off-by: Emmanuel Dreyfus <manu%netbsd.org@localhost>
----
- contrib/uuid/gen_uuid.c | 7 +++++++
- libglusterfs/src/run.c | 8 ++++++--
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git contrib/uuid/gen_uuid.c contrib/uuid/gen_uuid.c
-index 79923cd..e69995a 100644
---- contrib/uuid/gen_uuid.c
-+++ contrib/uuid/gen_uuid.c
-@@ -465,6 +465,12 @@ static ssize_t read_all(int fd, char *buf, size_t count)
- #if defined(USE_UUIDD) && defined(HAVE_SYS_UN_H)
- static void close_all_fds(void)
- {
-+#ifdef F_CLOSEM
-+ (void)fcntl(0, F_CLOSEM);
-+ (void)open("/dev/null", O_RDWR); /* stdin */
-+ (void)open("/dev/null", O_RDWR); /* stdout */
Home |
Main Index |
Thread Index |
Old Index