pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/filesystems/glusterfs Bump to glusterfs-3.3.1, which b...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/af72fe54526a
branches:  trunk
changeset: 610123:af72fe54526a
user:      manu <manu%pkgsrc.org@localhost>
date:      Fri Oct 19 04:15:21 2012 +0000

description:
Bump to glusterfs-3.3.1, which brings
- unified file and object storage
- storage for Hadoop (not tested here)
- proactive self-healing
- much better performance

diffstat:

 filesystems/glusterfs/MESSAGE.NetBSD       |    32 +-
 filesystems/glusterfs/Makefile             |    17 +-
 filesystems/glusterfs/PLIST                |   102 +-
 filesystems/glusterfs/PLIST.georeplication |     6 +-
 filesystems/glusterfs/distinfo             |    41 +-
 filesystems/glusterfs/files/glusterd.sh    |    12 +-
 filesystems/glusterfs/files/ssl.patch      |  1231 ----------------------------
 filesystems/glusterfs/options.mk           |    18 +-
 filesystems/glusterfs/patches/patch-aa     |    16 -
 filesystems/glusterfs/patches/patch-ab     |    51 -
 filesystems/glusterfs/patches/patch-ac     |    18 -
 filesystems/glusterfs/patches/patch-ae     |   101 --
 filesystems/glusterfs/patches/patch-af     |    16 -
 filesystems/glusterfs/patches/patch-an     |    62 -
 filesystems/glusterfs/patches/patch-ao     |   180 ----
 filesystems/glusterfs/patches/patch-ar     |    16 -
 filesystems/glusterfs/patches/patch-as     |    17 -
 filesystems/glusterfs/patches/patch-ax     |    16 -
 filesystems/glusterfs/patches/patch-bb     |    60 -
 filesystems/glusterfs/patches/patch-be     |   421 ---------
 filesystems/glusterfs/patches/patch-bf     |    57 -
 filesystems/glusterfs/patches/patch-bh     |    39 -
 filesystems/glusterfs/patches/patch-bj     |    15 -
 filesystems/glusterfs/patches/patch-bk     |   171 ---
 filesystems/glusterfs/patches/patch-bl     |    16 -
 filesystems/glusterfs/patches/patch-bm     |    17 -
 filesystems/glusterfs/patches/patch-bn     |    38 -
 filesystems/glusterfs/patches/patch-bo     |    16 -
 filesystems/glusterfs/patches/patch-bp     |    19 -
 filesystems/glusterfs/patches/patch-bq     |    92 --
 filesystems/glusterfs/patches/patch-br     |   119 --
 filesystems/glusterfs/patches/patch-bs     |    83 -
 filesystems/glusterfs/patches/patch-bt     |    27 -
 filesystems/glusterfs/patches/patch-bv     |    24 -
 filesystems/glusterfs/patches/patch-bw     |    23 -
 filesystems/glusterfs/patches/patch-bx     |    18 -
 filesystems/glusterfs/patches/patch-ca     |    25 -
 filesystems/glusterfs/patches/patch-ce     |    75 -
 filesystems/glusterfs/patches/patch-cf     |    16 -
 filesystems/glusterfs/patches/patch-da     |    26 +
 filesystems/glusterfs/patches/patch-db     |    39 +
 41 files changed, 154 insertions(+), 3234 deletions(-)

diffs (truncated from 3671 to 300 lines):

diff -r 78fcf2f118cd -r af72fe54526a filesystems/glusterfs/MESSAGE.NetBSD
--- a/filesystems/glusterfs/MESSAGE.NetBSD      Thu Oct 18 19:23:29 2012 +0000
+++ b/filesystems/glusterfs/MESSAGE.NetBSD      Fri Oct 19 04:15:21 2012 +0000
@@ -1,13 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.12 2011/11/12 06:01:28 manu Exp $
+$NetBSD: MESSAGE.NetBSD,v 1.13 2012/10/19 04:15:21 manu Exp $
 
 *** GlusterFS clients ***
-You need a kernel with the following options (not present in netbsd-5 GENERIC)
-       file-system     PUFFS  
-       pseudo-device   putter
-       pseudo-device   pud
-
-This is required in /etc/sysctl.conf in order to avoid hangs on I/O operations:
+This is required in /etc/sysctl.conf in order to avoid hangs on I/O operations
        kern.sbmax=4194304
        net.inet.tcp.sendbuf_max=1048576
        net.inet.tcp.recvbuf_max=1048576
@@ -15,18 +10,25 @@
 In order to use mount -t glusterfs, please install this link
        ln -s ${PREFIX}/sbin/mount.glusterfs /sbin/mount_glusterfs
 
+* Only for netbsd-5 branch (later NetBSD GENERIC kernels have it enabled):
+A kernel with the following option is required:
+       file-system     PUFFS  
+       pseudo-device   putter
+       pseudo-device   pud
+
 *** GlusterFS servers ***
 glusterfs servers will need extended attributes in exported filesystems.
-On netbsd-5 branch, this means UFS1 and a kernel with the following options:
+This require a kernel with the following options:
        options         UFS_EXTATTR             
+
+You will need to create the directories below on exported filesystems' roots,
+and then mount with -o extattr
+       .attribute/system
+       .attribute/user
+
+* Only for netbsd-5 branch (later NetBSD version do not need that)
+mount -o extattr shall not be used, but the kernel needs options below:
        options         UFS_EXTATTR_AUTOSTART   
        options         UFS_EXTATTR_AUTOCREATE=1024
 
-On NetBSD-current, UFS_EXTATTR_AUTOSTART and UFS_EXTATTR_AUTOCREATE are not 
-options anymore, but you need to mount the filesystem with -o extattr
-
-You will also need to create theses directories on exported filesystems' roots:
-       .attribute/system
-       .attribute/user
-
 ===========================================================================
diff -r 78fcf2f118cd -r af72fe54526a filesystems/glusterfs/Makefile
--- a/filesystems/glusterfs/Makefile    Thu Oct 18 19:23:29 2012 +0000
+++ b/filesystems/glusterfs/Makefile    Fri Oct 19 04:15:21 2012 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2012/10/03 16:08:33 asau Exp $
+# $NetBSD: Makefile,v 1.33 2012/10/19 04:15:21 manu Exp $
 #
 
-DISTNAME=      glusterfs-3.2.7
+DISTNAME=      glusterfs-3.3.1
 CATEGORIES=    filesystems
-MASTER_SITES=  http://download.gluster.com/pub/gluster/glusterfs/3.2/3.2.7/
+MASTER_SITES=  http://download.gluster.org/pub/gluster/glusterfs/3.3/3.3.1/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.gluster.org/
@@ -15,7 +15,6 @@
 USE_TOOLS+=            flex bison
 
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
-CONFIGURE_ARGS+=       CFLAGS=${CFLAGS:M*:Q}\ -D_INCOMPLETE_XOPEN_C063
 CONFIGURE_ARGS+=       CFLAGS=${CFLAGS:M*:Q}\ -DDEBUG
 
 # Make sure we do not attept to link with -lfl
@@ -62,8 +61,6 @@
 REPLACE_PYTHON+=       ${WRKSRC}/extras/volgen/glusterfs-volgen
 
 EGDIR=                 ${PREFIX}/etc/glusterfs
-CONF_FILES+=           ${EGDIR}/glusterfs.vol.sample ${EGDIR}/glusterfs.vol
-CONF_FILES+=           ${EGDIR}/glusterfsd.vol.sample ${EGDIR}/glusterfsd.vol
 CONF_FILES+=           ${EGDIR}/glusterd.vol.sample ${EGDIR}/glusterd.vol
 OWN_DIRS+=             ${VARBASE}/log/glusterfs
 BUILD_DEFS+=           VARBASE
@@ -71,6 +68,8 @@
 RCD_SCRIPTS=           glusterfsd glusterd
 
 PLIST_SRC=             ${PLIST_SRC_DFLT}
+PLIST_SUBST+=          VARBASE=${VARBASE}
+PLIST_SUBST+=          PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 MESSAGE_SRC=           ${PKGDIR}/MESSAGE.${OPSYS}
 
 
@@ -79,9 +78,7 @@
 
 post-install:
        ${INSTALL_SCRIPT} ${DESTDIR}/sbin/mount.glusterfs \
-           ${DESTDIR}/${PREFIX}/sbin/
-       ${INSTALL_SCRIPT} ${FILESDIR}/xattr-init.sh \
-           ${DESTDIR}/${PREFIX}/etc/glusterfs/
+           ${DESTDIR}/${PREFIX}/sbin/mount.glusterfs
 
 # Debug
 CFLAGS+=               -g
@@ -92,7 +89,7 @@
 .include "../../mk/bsd.prefs.mk"
 .include "../../lang/python/application.mk"
 .if ${OPSYS} == "NetBSD"
-.include "../../filesystems/perfuse/buildlink3.mk"
+#.include "../../filesystems/perfuse/buildlink3.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r 78fcf2f118cd -r af72fe54526a filesystems/glusterfs/PLIST
--- a/filesystems/glusterfs/PLIST       Thu Oct 18 19:23:29 2012 +0000
+++ b/filesystems/glusterfs/PLIST       Fri Oct 19 04:15:21 2012 +0000
@@ -1,74 +1,53 @@
-@comment $NetBSD: PLIST,v 1.12 2012/06/16 01:47:33 manu Exp $
-etc/glusterfs/xattr-init.sh
-etc/glusterfs/glusterfs.vol.sample
-etc/glusterfs/glusterfsd.vol.sample
 etc/glusterfs/glusterd.vol.sample
-etc/glusterfs/xattr-init.sh
 lib/libglusterfs.la
 lib/libgfrpc.la
 lib/libgfxdr.la
-lib/glusterfs/3.2.7/auth/addr.la
-lib/glusterfs/3.2.7/auth/login.la
-lib/glusterfs/3.2.7/rpc-transport/socket.la
-lib/glusterfs/3.2.7/xlator/cluster/afr.la
-lib/glusterfs/3.2.7/xlator/cluster/dht.la
-lib/glusterfs/3.2.7/xlator/cluster/distribute.so
-lib/glusterfs/3.2.7/xlator/cluster/nufa.la
-lib/glusterfs/3.2.7/xlator/cluster/pump.la
-lib/glusterfs/3.2.7/xlator/cluster/replicate.so
-lib/glusterfs/3.2.7/xlator/cluster/stripe.la
-lib/glusterfs/3.2.7/xlator/cluster/switch.la
-lib/glusterfs/3.2.7/xlator/debug/error-gen.la
-lib/glusterfs/3.2.7/xlator/debug/io-stats.la
-lib/glusterfs/3.2.7/xlator/debug/trace.la
-lib/glusterfs/3.2.7/xlator/encryption/rot-13.la
-lib/glusterfs/3.2.7/xlator/features/access-control.so
-lib/glusterfs/3.2.7/xlator/features/locks.la
-lib/glusterfs/3.2.7/xlator/features/mac-compat.la
-lib/glusterfs/3.2.7/xlator/features/marker.la
-lib/glusterfs/3.2.7/xlator/features/posix-locks.so
-lib/glusterfs/3.2.7/xlator/features/quiesce.la
-lib/glusterfs/3.2.7/xlator/features/quota.la
-lib/glusterfs/3.2.7/xlator/features/read-only.la
-lib/glusterfs/3.2.7/xlator/mgmt/glusterd.la
-lib/glusterfs/3.2.7/xlator/mount/fuse.la
-lib/glusterfs/3.2.7/xlator/nfs/server.la
-lib/glusterfs/3.2.7/xlator/performance/io-cache.la
-lib/glusterfs/3.2.7/xlator/performance/io-threads.la
-lib/glusterfs/3.2.7/xlator/performance/quick-read.la
-lib/glusterfs/3.2.7/xlator/performance/read-ahead.la
-lib/glusterfs/3.2.7/xlator/performance/stat-prefetch.la
-lib/glusterfs/3.2.7/xlator/performance/write-behind.la
-lib/glusterfs/3.2.7/xlator/protocol/client.la
-lib/glusterfs/3.2.7/xlator/protocol/server.la
-lib/glusterfs/3.2.7/xlator/storage/posix.la
-lib/glusterfs/3.2.7/xlator/system/posix-acl.la
-lib/glusterfs/3.2.7/xlator/testing/features/trash.la
-lib/glusterfs/3.2.7/xlator/testing/performance/symlink-cache.la
-man/man8/glusterfs.8
-man/man8/mount.glusterfs.8
+lib/glusterfs/3.3.1/auth/addr.la
+lib/glusterfs/3.3.1/auth/login.la
+lib/glusterfs/3.3.1/rpc-transport/socket.la
+lib/glusterfs/3.3.1/xlator/cluster/afr.la
+lib/glusterfs/3.3.1/xlator/cluster/dht.la
+lib/glusterfs/3.3.1/xlator/cluster/distribute.so
+lib/glusterfs/3.3.1/xlator/cluster/nufa.la
+lib/glusterfs/3.3.1/xlator/cluster/pump.la
+lib/glusterfs/3.3.1/xlator/cluster/replicate.so
+lib/glusterfs/3.3.1/xlator/cluster/stripe.la
+lib/glusterfs/3.3.1/xlator/cluster/switch.la
+lib/glusterfs/3.3.1/xlator/debug/error-gen.la
+lib/glusterfs/3.3.1/xlator/debug/io-stats.la
+lib/glusterfs/3.3.1/xlator/debug/trace.la
+lib/glusterfs/3.3.1/xlator/encryption/rot-13.la
+lib/glusterfs/3.3.1/xlator/features/access-control.so
+lib/glusterfs/3.3.1/xlator/features/index.la
+lib/glusterfs/3.3.1/xlator/features/locks.la
+lib/glusterfs/3.3.1/xlator/features/mac-compat.la
+lib/glusterfs/3.3.1/xlator/features/marker.la
+lib/glusterfs/3.3.1/xlator/features/posix-locks.so
+lib/glusterfs/3.3.1/xlator/features/quiesce.la
+lib/glusterfs/3.3.1/xlator/features/quota.la
+lib/glusterfs/3.3.1/xlator/features/read-only.la
+lib/glusterfs/3.3.1/xlator/features/worm.la
+lib/glusterfs/3.3.1/xlator/mgmt/glusterd.la
+lib/glusterfs/3.3.1/xlator/mount/fuse.la
+lib/glusterfs/3.3.1/xlator/nfs/server.la
+lib/glusterfs/3.3.1/xlator/performance/io-cache.la
+lib/glusterfs/3.3.1/xlator/performance/io-threads.la
+lib/glusterfs/3.3.1/xlator/performance/md-cache.la
+lib/glusterfs/3.3.1/xlator/performance/quick-read.la
+lib/glusterfs/3.3.1/xlator/performance/read-ahead.la
+lib/glusterfs/3.3.1/xlator/performance/stat-prefetch.so
+lib/glusterfs/3.3.1/xlator/performance/write-behind.la
+lib/glusterfs/3.3.1/xlator/protocol/client.la
+lib/glusterfs/3.3.1/xlator/protocol/server.la
+lib/glusterfs/3.3.1/xlator/storage/posix.la
+lib/glusterfs/3.3.1/xlator/system/posix-acl.la
+lib/glusterfs/3.3.1/xlator/testing/performance/symlink-cache.la
 man/man8/gluster.8
-man/man8/glusterd.8
-man/man8/glusterfsd.8
 sbin/glusterd
 sbin/glusterfs
 sbin/glusterfsd
 sbin/gluster
 sbin/mount.glusterfs
-share/doc/glusterfs/examples/README
-share/doc/glusterfs/examples/unify.vol
-share/doc/glusterfs/examples/replicate.vol
-share/doc/glusterfs/examples/stripe.vol
-share/doc/glusterfs/examples/protocol-client.vol
-share/doc/glusterfs/examples/protocol-server.vol
-share/doc/glusterfs/examples/posix-locks.vol
-share/doc/glusterfs/examples/trash.vol
-share/doc/glusterfs/examples/write-behind.vol
-share/doc/glusterfs/examples/io-threads.vol
-share/doc/glusterfs/examples/io-cache.vol
-share/doc/glusterfs/examples/read-ahead.vol
-share/doc/glusterfs/examples/filter.vol
-share/doc/glusterfs/examples/trace.vol
 share/doc/glusterfs/benchmarking/rdd.c
 share/doc/glusterfs/benchmarking/glfs-bm.c
 share/doc/glusterfs/benchmarking/README
@@ -78,3 +57,4 @@
 share/doc/glusterfs/glusterfs.vim
 share/examples/rc.d/glusterfsd
 share/examples/rc.d/glusterd
+@exec test -d ${PKG_SYSCONFDIR}/glusterd -a ! -d ${VARBASE}/lib/glusterd && ${MKDIR} -p ${VARBASE}/lib/ && mv ${PKG_SYSCONFDIR}/glusterd  ${VARBASE}/lib/glusterd && ${LN} -s ${VARBASE}/lib/glusterd  
${PKG_SYSCONFDIR}/glusterd
diff -r 78fcf2f118cd -r af72fe54526a filesystems/glusterfs/PLIST.georeplication
--- a/filesystems/glusterfs/PLIST.georeplication        Thu Oct 18 19:23:29 2012 +0000
+++ b/filesystems/glusterfs/PLIST.georeplication        Fri Oct 19 04:15:21 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.georeplication,v 1.4 2011/09/27 12:45:02 manu Exp $
+@comment $NetBSD: PLIST.georeplication,v 1.5 2012/10/19 04:15:21 manu Exp $
 libexec/glusterfs/python/syncdaemon/README.md
 libexec/glusterfs/python/syncdaemon/__init__.py
 libexec/glusterfs/python/syncdaemon/__init__.pyc
@@ -12,6 +12,9 @@
 libexec/glusterfs/python/syncdaemon/gsyncd.py
 libexec/glusterfs/python/syncdaemon/gsyncd.pyc
 libexec/glusterfs/python/syncdaemon/gsyncd.pyo
+libexec/glusterfs/python/syncdaemon/ipaddr.py
+libexec/glusterfs/python/syncdaemon/ipaddr.pyc
+libexec/glusterfs/python/syncdaemon/ipaddr.pyo
 libexec/glusterfs/python/syncdaemon/libcxattr.py
 libexec/glusterfs/python/syncdaemon/libcxattr.pyc
 libexec/glusterfs/python/syncdaemon/libcxattr.pyo
@@ -30,4 +33,3 @@
 libexec/glusterfs/python/syncdaemon/syncdutils.py
 libexec/glusterfs/python/syncdaemon/syncdutils.pyc
 libexec/glusterfs/python/syncdaemon/syncdutils.pyo
-libexec/glusterfs/gsyncd
diff -r 78fcf2f118cd -r af72fe54526a filesystems/glusterfs/distinfo
--- a/filesystems/glusterfs/distinfo    Thu Oct 18 19:23:29 2012 +0000
+++ b/filesystems/glusterfs/distinfo    Fri Oct 19 04:15:21 2012 +0000
@@ -1,36 +1,7 @@
-$NetBSD: distinfo,v 1.25 2012/06/16 01:47:33 manu Exp $
+$NetBSD: distinfo,v 1.26 2012/10/19 04:15:21 manu Exp $
 
-SHA1 (glusterfs-3.2.7.tar.gz) = 13873edece614ecdbb75953daefaf76c4fd2ca3b
-RMD160 (glusterfs-3.2.7.tar.gz) = 8ecc90a0bf852a57db33d15480b494926abe2abe
-Size (glusterfs-3.2.7.tar.gz) = 2424292 bytes
-SHA1 (patch-aa) = bfd1dbcb6945dd387d88bd96616e4bc29c3e0628
-SHA1 (patch-ab) = d240bfd8bd8e5994f612a3387cd75f30bb91c8d7
-SHA1 (patch-ac) = 21d86775c2174ea630404a1a329dfd49c7f493d9
-SHA1 (patch-ae) = d5d0dce5cb82c61fbb02289123d0be34ce835e18
-SHA1 (patch-af) = ac9333cc55ad0cf42233e3c69b32e22c483c077a
-SHA1 (patch-an) = 21f56d5379023bd2ea3432b4e3e3f9a0979c496f
-SHA1 (patch-ao) = 26e350655e276c8cb3ecb3cc9b7c0a4e7ab2ff7b
-SHA1 (patch-ar) = 27d0288083d06623a328e851a776095aa1f1d2df
-SHA1 (patch-as) = a2c637bf52151e85969927f281e432693ac539ba
-SHA1 (patch-ax) = 054942de06c3df60ffc0c190dd2702f77edd9ec6
-SHA1 (patch-bb) = f7b79676322064396242b0f3e6cd81c180c7dd8e
-SHA1 (patch-be) = f178ee8106c349354f7f21bc37fca3ca47ca9e44
-SHA1 (patch-bf) = 0f182ccd632b5e622237bd95c9978c113f8ce531
-SHA1 (patch-bh) = d88d4e8b863f36b2c27c4f5eff2fdc235ef76fd8
-SHA1 (patch-bj) = 9b8b2374d4c197e60a1990b09be1117bf0c0a552
-SHA1 (patch-bk) = 3464ae85a444f5dc8adf2262b3bc25d88a531bb8
-SHA1 (patch-bl) = 4e61aef116ce34907f7a93beaa9ad7a3c49751a9
-SHA1 (patch-bm) = 401fe1c2bbf71474e2238c3e6c3fe5a5c614c4f5
-SHA1 (patch-bn) = 98ce48be2239f42edc4ef8e26644305f6aa0a5eb
-SHA1 (patch-bo) = be0dcdcc0acb6a5e54664372c34a28f1307fbd00
-SHA1 (patch-bp) = 77463ea7d739d532e20dbe5bd66d58c22ba0c248
-SHA1 (patch-bq) = 083f22383b88890f9e6f2c90a4435657ccd10579
-SHA1 (patch-br) = 153aa644c306407e3135620f31d0ff918bfdb1e5
-SHA1 (patch-bs) = d2f79ef19143f74f5a12187ea2dfd9e1ed92b726
-SHA1 (patch-bt) = 58f8e5ce66e6b691dd9972bd649dc18f7d5a258a
-SHA1 (patch-bv) = 2c3b654e5858bf0948307ca6ae7048e276fca9ef
-SHA1 (patch-bw) = dca12eb81163fd1a0ada13165e990ddcb8fefbf2
-SHA1 (patch-bx) = b2aca473091bb64d14c6da046379d33ca8a5785e



Home | Main Index | Thread Index | Old Index