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
cvs diff -r1.48 -r1.49 pkgsrc/filesystems/glusterfs/Makefile (switch to unified diff)

--- 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,114 +1,109 @@ @@ -1,114 +1,109 @@
1# $NetBSD: Makefile,v 1.48 2015/03/12 16:35:39 tnn Exp $ 1# $NetBSD: Makefile,v 1.49 2015/04/09 15:20:47 manu Exp $
2 2
3DISTNAME= glusterfs-3.6.0 3DISTNAME= glusterfs-3.6.2
4#PKGREVISION= 1 4#PKGREVISION= 1
5CATEGORIES= filesystems 5CATEGORIES= filesystems
6MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/ 6MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gluster.org/ 9HOMEPAGE= http://www.gluster.org/
10COMMENT= Cluster filesystem 10COMMENT= Cluster filesystem
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= flex bison 15USE_TOOLS+= flex bison
16 16
17CONFIGURE_ARGS+= --disable-fusermount 17CONFIGURE_ARGS+= --disable-fusermount
18CONFIGURE_ARGS+= --localstatedir=${VARBASE} 18CONFIGURE_ARGS+= --localstatedir=${VARBASE}
19 19
20# Make sure we do not attept to link with -lfl 20# Make sure we do not attept to link with -lfl
21# Only libfl.a is available, and libtool wants libfl.so 21# Only libfl.a is available, and libtool wants libfl.so
22MAKE_FLAGS+= LEXLIB="" 22MAKE_FLAGS+= LEXLIB=""
23MAKE_FLAGS+= libglusterfs_la_LIBADD="" 23MAKE_FLAGS+= libglusterfs_la_LIBADD=""
24 24
25PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # only 2.x supported as of 3.6.0 25PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # only 2.x supported as of 3.6.0
26 26
27#REPLACE_PYTHON+= contrib/ipaddr-py/ipaddr.py 27#REPLACE_PYTHON+= contrib/ipaddr-py/ipaddr.py
28#REPLACE_PYTHON+= gen-headers.py 28#REPLACE_PYTHON+= gen-headers.py
29#REPLACE_PYTHON+= tests/bugs/overlap.py 29#REPLACE_PYTHON+= tests/bugs/overlap.py
30#REPLACE_PYTHON+= tests/utils/create-files.py 30#REPLACE_PYTHON+= tests/utils/create-files.py
31REPLACE_PYTHON+= geo-replication/syncdaemon/changelogagent.py 31REPLACE_PYTHON+= geo-replication/syncdaemon/changelogagent.py
32REPLACE_PYTHON+= geo-replication/syncdaemon/gsyncd.py 32REPLACE_PYTHON+= geo-replication/syncdaemon/gsyncd.py
33REPLACE_PYTHON+= contrib/ipaddr-py/ipaddr.py 33REPLACE_PYTHON+= contrib/ipaddr-py/ipaddr.py
34 34
35REPLACE_BASH+= extras/geo-rep/generate-gfid-file.sh 35REPLACE_BASH+= extras/geo-rep/generate-gfid-file.sh
36REPLACE_BASH+= extras/geo-rep/get-gfid.sh 36REPLACE_BASH+= extras/geo-rep/get-gfid.sh
37REPLACE_BASH+= extras/post-upgrade-script-for-quota.sh 37REPLACE_BASH+= extras/post-upgrade-script-for-quota.sh
38REPLACE_BASH+= extras/pre-upgrade-script-for-quota.sh 38REPLACE_BASH+= extras/pre-upgrade-script-for-quota.sh
39REPLACE_BASH+= extras/geo-rep/slave-upgrade.sh 39REPLACE_BASH+= extras/geo-rep/slave-upgrade.sh
40REPLACE_BASH+= extras/geo-rep/gsync-upgrade.sh 40REPLACE_BASH+= extras/geo-rep/gsync-upgrade.sh
41REPLACE_BASH+= geo-replication/src/gverify.sh 41REPLACE_BASH+= geo-replication/src/gverify.sh
42REPLACE_BASH+= geo-replication/src/peer_add_secret_pub.in 42REPLACE_BASH+= geo-replication/src/peer_add_secret_pub.in
43REPLACE_BASH+= geo-replication/src/peer_gsec_create.in 43REPLACE_BASH+= geo-replication/src/peer_gsec_create.in
44REPLACE_BASH+= geo-replication/src/set_geo_rep_pem_keys.sh 44REPLACE_BASH+= geo-replication/src/set_geo_rep_pem_keys.sh
45 45
46 46
47SUBST_CLASSES+= mtab 47SUBST_CLASSES+= mtab
48SUBST_STAGE.mtab= post-build 48SUBST_STAGE.mtab= post-build
49SUBST_FILES.mtab= doc/mount.glusterfs.8 49SUBST_FILES.mtab= doc/mount.glusterfs.8
50SUBST_FILES.mtab= libglusterfs/src/compat.h 50SUBST_FILES.mtab= libglusterfs/src/compat.h
51SUBST_FILES.mtab= xlators/mount/fuse/utils/mount.glusterfs.in 51SUBST_FILES.mtab= xlators/mount/fuse/utils/mount.glusterfs.in
52SUBST_SED.mtab= -e "s,/etc/mtab,/proc/mounts,g" 52SUBST_SED.mtab= -e "s,/etc/mtab,/proc/mounts,g"
53 53
54SUBST_CLASSES+= etc 54SUBST_CLASSES+= etc
55SUBST_STAGE.etc= pre-build 55SUBST_STAGE.etc= pre-build
56SUBST_FILES.etc+= libglusterfs/src/logging.c 56SUBST_FILES.etc+= libglusterfs/src/logging.c
57SUBST_FILES.etc+= extras/ocf/volume 57SUBST_FILES.etc+= extras/ocf/volume
58SUBST_FILES.etc+= doc/glusterfsd.8 58SUBST_FILES.etc+= doc/glusterfsd.8
59SUBST_SED.etc= -e "s,/etc/gluster,${PREFIX}/etc/gluster,g" 59SUBST_SED.etc= -e "s,/etc/gluster,${PREFIX}/etc/gluster,g"
60 60
61SUBST_CLASSES+= vol 61SUBST_CLASSES+= vol
62SUBST_STAGE.vol= post-build 62SUBST_STAGE.vol= post-build
63SUBST_FILES.vol= extras/Makefile 63SUBST_FILES.vol= extras/Makefile
64SUBST_SED.vol= -e "/^vol_DATA/s/glusterd.vol/glusterd.vol.sample/g" 64SUBST_SED.vol= -e "/^vol_DATA/s/glusterd.vol/glusterd.vol.sample/g"
65 65
66EGDIR= ${PREFIX}/etc/glusterfs 66EGDIR= ${PREFIX}/etc/glusterfs
67CONF_FILES+= ${EGDIR}/glusterd.vol.sample ${EGDIR}/glusterd.vol 67CONF_FILES+= ${EGDIR}/glusterd.vol.sample ${EGDIR}/glusterd.vol
68OWN_DIRS+= ${VARBASE}/log/glusterfs 68OWN_DIRS+= ${VARBASE}/log/glusterfs
69BUILD_DEFS+= VARBASE 69BUILD_DEFS+= VARBASE
70 70
71RCD_SCRIPTS= glusterd 71RCD_SCRIPTS= glusterd
72 72
73PLIST_SRC= ${PLIST_SRC_DFLT} 73PLIST_SRC= ${PLIST_SRC_DFLT}
74PLIST_SUBST+= VARBASE=${VARBASE} 74PLIST_SUBST+= VARBASE=${VARBASE}
75PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 75PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
76PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q} 76PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
77MESSAGE_SRC= ${PKGDIR}/MESSAGE.${OPSYS} 77MESSAGE_SRC= ${PKGDIR}/MESSAGE.${OPSYS}
78 78
79pre-build: 79pre-build:
80 cd ${WRKSRC}/extras && \ 80 cd ${WRKSRC}/extras && \
81 echo "glusterd.vol.sample: glusterd.vol" >> Makefile && \ 81 echo "glusterd.vol.sample: glusterd.vol" >> Makefile && \
82 echo " cp glusterd.vol glusterd.vol.sample" >> Makefile 82 echo " cp glusterd.vol glusterd.vol.sample" >> Makefile
83 83
84post-install: 84post-install:
85 ${INSTALL_SCRIPT} ${DESTDIR}/sbin/mount_glusterfs \ 85 ${INSTALL_SCRIPT} ${DESTDIR}/sbin/mount_glusterfs \
86 ${DESTDIR}/${PREFIX}/sbin/mount_glusterfs 86 ${DESTDIR}/${PREFIX}/sbin/mount_glusterfs
87 87
88# Debug 88# Debug
89CFLAGS+= -g 89CFLAGS+= -g
90INSTALL_UNSTRIPPED= yes 90INSTALL_UNSTRIPPED= yes
91CONFIGURE_ARGS+= --enable-debug 91CONFIGURE_ARGS+= --enable-debug
92#.include "../../devel/boehm-gc/buildlink3.mk" 92#.include "../../devel/boehm-gc/buildlink3.mk"
93#CFLAGS+=-DGC_DEBUG 93#CFLAGS+=-DGC_DEBUG
94#CFLAGS+=-include gc.h 94#CFLAGS+=-include gc.h
95#LIBS+=-lgc 95#LIBS+=-lgc
96 96
97.include "../../mk/bsd.prefs.mk" 97.include "../../mk/bsd.prefs.mk"
98 98
99PLIST_VARS+= mmx 
100.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 
101PLIST.mmx= yes 
102.endif 
103 
104#.include "../../devel/argp/buildlink3.mk" 99#.include "../../devel/argp/buildlink3.mk"
105.include "../../security/openssl/buildlink3.mk" 100.include "../../security/openssl/buildlink3.mk"
106.include "../../textproc/libxml2/buildlink3.mk" 101.include "../../textproc/libxml2/buildlink3.mk"
107.include "../../lang/python/application.mk" 102.include "../../lang/python/application.mk"
108.include "../../lang/python/extension.mk" 103.include "../../lang/python/extension.mk"
109 104
110.if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") && exists(/usr/include/execinfo.h) 105.if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") && exists(/usr/include/execinfo.h)
111LIBS+= -lexecinfo 106LIBS+= -lexecinfo
112.endif 107.endif
113 108
114.include "../../mk/bsd.pkg.mk" 109.include "../../mk/bsd.pkg.mk"
cvs diff -r1.21 -r1.22 pkgsrc/filesystems/glusterfs/Attic/PLIST (switch to unified diff)

--- 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,166 +1,165 @@ @@ -1,166 +1,165 @@
1@comment $NetBSD: PLIST,v 1.21 2015/01/11 23:07:01 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.22 2015/04/09 15:20:47 manu Exp $
2${PYSITELIB}/gluster/__init__.py 2${PYSITELIB}/gluster/__init__.py
3${PYSITELIB}/gluster/__init__.pyc 3${PYSITELIB}/gluster/__init__.pyc
4${PYSITELIB}/gluster/__init__.pyo 4${PYSITELIB}/gluster/__init__.pyo
5${PYSITELIB}/gluster/glupy.py 5${PYSITELIB}/gluster/glupy.py
6${PYSITELIB}/gluster/glupy.pyc 6${PYSITELIB}/gluster/glupy.pyc
7${PYSITELIB}/gluster/glupy.pyo 7${PYSITELIB}/gluster/glupy.pyo
8etc/glusterfs/gluster-rsyslog-5.8.conf 8etc/glusterfs/gluster-rsyslog-5.8.conf
9etc/glusterfs/gluster-rsyslog-7.2.conf 9etc/glusterfs/gluster-rsyslog-7.2.conf
10etc/glusterfs/glusterd.vol.sample 10etc/glusterfs/glusterd.vol.sample
11etc/glusterfs/glusterfs-georep-logrotate 11etc/glusterfs/glusterfs-georep-logrotate
12etc/glusterfs/glusterfs-logrotate 12etc/glusterfs/glusterfs-logrotate
13etc/glusterfs/group-virt.example 13etc/glusterfs/group-virt.example
14etc/glusterfs/logger.conf.example 14etc/glusterfs/logger.conf.example
15include/glusterfs/api/glfs-handles.h 15include/glusterfs/api/glfs-handles.h
16include/glusterfs/api/glfs.h 16include/glusterfs/api/glfs.h
17include/glusterfs/gfchangelog/changelog.h 17include/glusterfs/gfchangelog/changelog.h
18lib/glusterfs/3.6.0/auth/addr.la 18lib/glusterfs/3.6.2/auth/addr.la
19lib/glusterfs/3.6.0/auth/login.la 19lib/glusterfs/3.6.2/auth/login.la
20lib/glusterfs/3.6.0/rpc-transport/socket.la 20lib/glusterfs/3.6.2/rpc-transport/socket.la
21lib/glusterfs/3.6.0/xlator/cluster/afr.la 21lib/glusterfs/3.6.2/xlator/cluster/afr.la
22lib/glusterfs/3.6.0/xlator/cluster/dht.la 22lib/glusterfs/3.6.2/xlator/cluster/dht.la
23${PLIST.mmx}lib/glusterfs/3.6.0/xlator/cluster/disperse.so 23lib/glusterfs/3.6.2/xlator/cluster/distribute.so
24lib/glusterfs/3.6.0/xlator/cluster/distribute.so 24lib/glusterfs/3.6.2/xlator/cluster/nufa.la
25${PLIST.mmx}lib/glusterfs/3.6.0/xlator/cluster/ec.la 25lib/glusterfs/3.6.2/xlator/cluster/pump.la
26lib/glusterfs/3.6.0/xlator/cluster/nufa.la 26lib/glusterfs/3.6.2/xlator/cluster/replicate.so
27lib/glusterfs/3.6.0/xlator/cluster/pump.la 27lib/glusterfs/3.6.2/xlator/cluster/stripe.la
28lib/glusterfs/3.6.0/xlator/cluster/replicate.so 28lib/glusterfs/3.6.2/xlator/cluster/switch.la
29lib/glusterfs/3.6.0/xlator/cluster/stripe.la 29lib/glusterfs/3.6.2/xlator/debug/error-gen.la
30lib/glusterfs/3.6.0/xlator/cluster/switch.la 30lib/glusterfs/3.6.2/xlator/debug/io-stats.la
31lib/glusterfs/3.6.0/xlator/debug/error-gen.la 31lib/glusterfs/3.6.2/xlator/debug/trace.la
32lib/glusterfs/3.6.0/xlator/debug/io-stats.la 32lib/glusterfs/3.6.2/xlator/encryption/crypt.la
33lib/glusterfs/3.6.0/xlator/debug/trace.la 33lib/glusterfs/3.6.2/xlator/encryption/rot-13.la
34lib/glusterfs/3.6.0/xlator/encryption/crypt.la 34lib/glusterfs/3.6.2/xlator/features/access-control.so
35lib/glusterfs/3.6.0/xlator/encryption/rot-13.la 35lib/glusterfs/3.6.2/xlator/features/barrier.la
36lib/glusterfs/3.6.0/xlator/features/access-control.so 36lib/glusterfs/3.6.2/xlator/features/cdc.la
37lib/glusterfs/3.6.0/xlator/features/barrier.la 37lib/glusterfs/3.6.2/xlator/features/changelog.la
38lib/glusterfs/3.6.0/xlator/features/cdc.la 38lib/glusterfs/3.6.2/xlator/features/gfid-access.la
39lib/glusterfs/3.6.0/xlator/features/changelog.la 39lib/glusterfs/3.6.2/xlator/features/glupy.la
40lib/glusterfs/3.6.0/xlator/features/gfid-access.la 40lib/glusterfs/3.6.2/xlator/features/glupy/debug-trace.py
41lib/glusterfs/3.6.0/xlator/features/glupy.la 41lib/glusterfs/3.6.2/xlator/features/glupy/debug-trace.pyc
42lib/glusterfs/3.6.0/xlator/features/glupy/debug-trace.py 42lib/glusterfs/3.6.2/xlator/features/glupy/debug-trace.pyo
43lib/glusterfs/3.6.0/xlator/features/glupy/debug-trace.pyc 43lib/glusterfs/3.6.2/xlator/features/glupy/helloworld.py
44lib/glusterfs/3.6.0/xlator/features/glupy/debug-trace.pyo 44lib/glusterfs/3.6.2/xlator/features/glupy/helloworld.pyc
45lib/glusterfs/3.6.0/xlator/features/glupy/helloworld.py 45lib/glusterfs/3.6.2/xlator/features/glupy/helloworld.pyo
46lib/glusterfs/3.6.0/xlator/features/glupy/helloworld.pyc 46lib/glusterfs/3.6.2/xlator/features/glupy/negative.py
47lib/glusterfs/3.6.0/xlator/features/glupy/helloworld.pyo 47lib/glusterfs/3.6.2/xlator/features/glupy/negative.pyc
48lib/glusterfs/3.6.0/xlator/features/glupy/negative.py 48lib/glusterfs/3.6.2/xlator/features/glupy/negative.pyo
49lib/glusterfs/3.6.0/xlator/features/glupy/negative.pyc 49lib/glusterfs/3.6.2/xlator/features/index.la
50lib/glusterfs/3.6.0/xlator/features/glupy/negative.pyo 50lib/glusterfs/3.6.2/xlator/features/locks.la
51lib/glusterfs/3.6.0/xlator/features/index.la 51lib/glusterfs/3.6.2/xlator/features/mac-compat.la
52lib/glusterfs/3.6.0/xlator/features/locks.la 52lib/glusterfs/3.6.2/xlator/features/marker.la
53lib/glusterfs/3.6.0/xlator/features/mac-compat.la 53lib/glusterfs/3.6.2/xlator/features/posix-locks.so
54lib/glusterfs/3.6.0/xlator/features/marker.la 54lib/glusterfs/3.6.2/xlator/features/prot_client.la
55lib/glusterfs/3.6.0/xlator/features/posix-locks.so 55lib/glusterfs/3.6.2/xlator/features/prot_dht.la
56lib/glusterfs/3.6.0/xlator/features/prot_client.la 56lib/glusterfs/3.6.2/xlator/features/prot_server.la
57lib/glusterfs/3.6.0/xlator/features/prot_dht.la 57lib/glusterfs/3.6.2/xlator/features/quiesce.la
58lib/glusterfs/3.6.0/xlator/features/prot_server.la 58lib/glusterfs/3.6.2/xlator/features/quota.la
59lib/glusterfs/3.6.0/xlator/features/quiesce.la 59lib/glusterfs/3.6.2/xlator/features/quotad.la
60lib/glusterfs/3.6.0/xlator/features/quota.la 60lib/glusterfs/3.6.2/xlator/features/read-only.la
61lib/glusterfs/3.6.0/xlator/features/quotad.la 61lib/glusterfs/3.6.2/xlator/features/snapview-client.la
62lib/glusterfs/3.6.0/xlator/features/read-only.la 62lib/glusterfs/3.6.2/xlator/features/snapview-server.la
63lib/glusterfs/3.6.0/xlator/features/snapview-client.la 63lib/glusterfs/3.6.2/xlator/features/worm.la
64lib/glusterfs/3.6.0/xlator/features/snapview-server.la 64lib/glusterfs/3.6.2/xlator/meta.la
65lib/glusterfs/3.6.0/xlator/features/worm.la 65lib/glusterfs/3.6.2/xlator/mgmt/glusterd.la
66lib/glusterfs/3.6.0/xlator/meta.la 66lib/glusterfs/3.6.2/xlator/mount/api.la
67lib/glusterfs/3.6.0/xlator/mgmt/glusterd.la 67lib/glusterfs/3.6.2/xlator/mount/fuse.la
68lib/glusterfs/3.6.0/xlator/mount/api.la 68lib/glusterfs/3.6.2/xlator/nfs/server.la
69lib/glusterfs/3.6.0/xlator/mount/fuse.la 69lib/glusterfs/3.6.2/xlator/performance/io-cache.la
70lib/glusterfs/3.6.0/xlator/nfs/server.la 70lib/glusterfs/3.6.2/xlator/performance/io-threads.la
71lib/glusterfs/3.6.0/xlator/performance/io-cache.la 71lib/glusterfs/3.6.2/xlator/performance/md-cache.la
72lib/glusterfs/3.6.0/xlator/performance/io-threads.la 72lib/glusterfs/3.6.2/xlator/performance/open-behind.la
73lib/glusterfs/3.6.0/xlator/performance/md-cache.la 73lib/glusterfs/3.6.2/xlator/performance/quick-read.la
74lib/glusterfs/3.6.0/xlator/performance/open-behind.la 74lib/glusterfs/3.6.2/xlator/performance/read-ahead.la
75lib/glusterfs/3.6.0/xlator/performance/quick-read.la 75lib/glusterfs/3.6.2/xlator/performance/readdir-ahead.la
76lib/glusterfs/3.6.0/xlator/performance/read-ahead.la 76lib/glusterfs/3.6.2/xlator/performance/stat-prefetch.so
77lib/glusterfs/3.6.0/xlator/performance/readdir-ahead.la 77lib/glusterfs/3.6.2/xlator/performance/write-behind.la
78lib/glusterfs/3.6.0/xlator/performance/stat-prefetch.so 78lib/glusterfs/3.6.2/xlator/protocol/client.la
79lib/glusterfs/3.6.0/xlator/performance/write-behind.la 79lib/glusterfs/3.6.2/xlator/protocol/server.la
80lib/glusterfs/3.6.0/xlator/protocol/client.la 80lib/glusterfs/3.6.2/xlator/storage/posix.la
81lib/glusterfs/3.6.0/xlator/protocol/server.la 81lib/glusterfs/3.6.2/xlator/system/posix-acl.la
82lib/glusterfs/3.6.0/xlator/storage/posix.la 82lib/glusterfs/3.6.2/xlator/testing/features/template.la
83lib/glusterfs/3.6.0/xlator/system/posix-acl.la 83lib/glusterfs/3.6.2/xlator/testing/performance/symlink-cache.la
84lib/glusterfs/3.6.0/xlator/testing/features/template.la 
85lib/glusterfs/3.6.0/xlator/testing/performance/symlink-cache.la 
86lib/libgfapi.la 84lib/libgfapi.la
87lib/libgfchangelog.la 85lib/libgfchangelog.la
88lib/libgfrpc.la 86lib/libgfrpc.la
89lib/libgfxdr.la 87lib/libgfxdr.la
90lib/libglusterfs.la 88lib/libglusterfs.la
91lib/ocf/resource.d/glusterfs/glusterd 89lib/ocf/resource.d/glusterfs/glusterd
92lib/ocf/resource.d/glusterfs/volume 90lib/ocf/resource.d/glusterfs/volume
93lib/pkgconfig/glusterfs-api.pc 91lib/pkgconfig/glusterfs-api.pc
94lib/pkgconfig/libgfchangelog.pc 92lib/pkgconfig/libgfchangelog.pc
95libexec/glusterfs/gsyncd 93libexec/glusterfs/gsyncd
96libexec/glusterfs/gverify.sh 94libexec/glusterfs/gverify.sh
97libexec/glusterfs/peer_add_secret_pub 95libexec/glusterfs/peer_add_secret_pub
98libexec/glusterfs/peer_gsec_create 96libexec/glusterfs/peer_gsec_create
99libexec/glusterfs/python/syncdaemon/README.md 97libexec/glusterfs/python/syncdaemon/README.md
100libexec/glusterfs/python/syncdaemon/__init__.py 98libexec/glusterfs/python/syncdaemon/__init__.py
101libexec/glusterfs/python/syncdaemon/__init__.pyc 99libexec/glusterfs/python/syncdaemon/__init__.pyc
102libexec/glusterfs/python/syncdaemon/__init__.pyo 100libexec/glusterfs/python/syncdaemon/__init__.pyo
103libexec/glusterfs/python/syncdaemon/changelogagent.py 101libexec/glusterfs/python/syncdaemon/changelogagent.py
104libexec/glusterfs/python/syncdaemon/changelogagent.pyc 102libexec/glusterfs/python/syncdaemon/changelogagent.pyc
105libexec/glusterfs/python/syncdaemon/changelogagent.pyo 103libexec/glusterfs/python/syncdaemon/changelogagent.pyo
106libexec/glusterfs/python/syncdaemon/configinterface.py 104libexec/glusterfs/python/syncdaemon/configinterface.py
107libexec/glusterfs/python/syncdaemon/configinterface.pyc 105libexec/glusterfs/python/syncdaemon/configinterface.pyc
108libexec/glusterfs/python/syncdaemon/configinterface.pyo 106libexec/glusterfs/python/syncdaemon/configinterface.pyo
109libexec/glusterfs/python/syncdaemon/gconf.py 107libexec/glusterfs/python/syncdaemon/gconf.py
110libexec/glusterfs/python/syncdaemon/gconf.pyc 108libexec/glusterfs/python/syncdaemon/gconf.pyc
111libexec/glusterfs/python/syncdaemon/gconf.pyo 109libexec/glusterfs/python/syncdaemon/gconf.pyo
112libexec/glusterfs/python/syncdaemon/gsyncd.py 110libexec/glusterfs/python/syncdaemon/gsyncd.py
113libexec/glusterfs/python/syncdaemon/gsyncd.pyc 111libexec/glusterfs/python/syncdaemon/gsyncd.pyc
114libexec/glusterfs/python/syncdaemon/gsyncd.pyo 112libexec/glusterfs/python/syncdaemon/gsyncd.pyo
115libexec/glusterfs/python/syncdaemon/ipaddr.py 113libexec/glusterfs/python/syncdaemon/ipaddr.py
116libexec/glusterfs/python/syncdaemon/ipaddr.pyc 114libexec/glusterfs/python/syncdaemon/ipaddr.pyc
117libexec/glusterfs/python/syncdaemon/ipaddr.pyo 115libexec/glusterfs/python/syncdaemon/ipaddr.pyo
118libexec/glusterfs/python/syncdaemon/libcxattr.py 116libexec/glusterfs/python/syncdaemon/libcxattr.py
119libexec/glusterfs/python/syncdaemon/libcxattr.pyc 117libexec/glusterfs/python/syncdaemon/libcxattr.pyc
120libexec/glusterfs/python/syncdaemon/libcxattr.pyo 118libexec/glusterfs/python/syncdaemon/libcxattr.pyo
121libexec/glusterfs/python/syncdaemon/libgfchangelog.py 119libexec/glusterfs/python/syncdaemon/libgfchangelog.py
122libexec/glusterfs/python/syncdaemon/libgfchangelog.pyc 120libexec/glusterfs/python/syncdaemon/libgfchangelog.pyc
123libexec/glusterfs/python/syncdaemon/libgfchangelog.pyo 121libexec/glusterfs/python/syncdaemon/libgfchangelog.pyo
124libexec/glusterfs/python/syncdaemon/master.py 122libexec/glusterfs/python/syncdaemon/master.py
125libexec/glusterfs/python/syncdaemon/master.pyc 123libexec/glusterfs/python/syncdaemon/master.pyc
126libexec/glusterfs/python/syncdaemon/master.pyo 124libexec/glusterfs/python/syncdaemon/master.pyo
127libexec/glusterfs/python/syncdaemon/monitor.py 125libexec/glusterfs/python/syncdaemon/monitor.py
128libexec/glusterfs/python/syncdaemon/monitor.pyc 126libexec/glusterfs/python/syncdaemon/monitor.pyc
129libexec/glusterfs/python/syncdaemon/monitor.pyo 127libexec/glusterfs/python/syncdaemon/monitor.pyo
130libexec/glusterfs/python/syncdaemon/repce.py 128libexec/glusterfs/python/syncdaemon/repce.py
131libexec/glusterfs/python/syncdaemon/repce.pyc 129libexec/glusterfs/python/syncdaemon/repce.pyc
132libexec/glusterfs/python/syncdaemon/repce.pyo 130libexec/glusterfs/python/syncdaemon/repce.pyo
133libexec/glusterfs/python/syncdaemon/resource.py 131libexec/glusterfs/python/syncdaemon/resource.py
134libexec/glusterfs/python/syncdaemon/resource.pyc 132libexec/glusterfs/python/syncdaemon/resource.pyc
135libexec/glusterfs/python/syncdaemon/resource.pyo 133libexec/glusterfs/python/syncdaemon/resource.pyo
136libexec/glusterfs/python/syncdaemon/syncdutils.py 134libexec/glusterfs/python/syncdaemon/syncdutils.py
137libexec/glusterfs/python/syncdaemon/syncdutils.pyc 135libexec/glusterfs/python/syncdaemon/syncdutils.pyc
138libexec/glusterfs/python/syncdaemon/syncdutils.pyo 136libexec/glusterfs/python/syncdaemon/syncdutils.pyo
139libexec/glusterfs/set_geo_rep_pem_keys.sh 137libexec/glusterfs/set_geo_rep_pem_keys.sh
140man/man8/gluster.8 138man/man8/gluster.8
141man/man8/glusterd.8 139man/man8/glusterd.8
142man/man8/glusterfs.8 140man/man8/glusterfs.8
143man/man8/glusterfsd.8 141man/man8/glusterfsd.8
144man/man8/mount.glusterfs.8 142man/man8/mount.glusterfs.8
 143sbin/glfsheal
145sbin/gluster 144sbin/gluster
146sbin/glusterd 145sbin/glusterd
147sbin/glusterfs 146sbin/glusterfs
148sbin/glusterfsd 147sbin/glusterfsd
149sbin/mount_glusterfs 148sbin/mount_glusterfs
150sbin/umountd 149sbin/umountd
151share/doc/glusterfs/benchmarking/README 150share/doc/glusterfs/benchmarking/README
152share/doc/glusterfs/benchmarking/glfs-bm.c 151share/doc/glusterfs/benchmarking/glfs-bm.c
153share/doc/glusterfs/benchmarking/launch-script.sh 152share/doc/glusterfs/benchmarking/launch-script.sh
154share/doc/glusterfs/benchmarking/local-script.sh 153share/doc/glusterfs/benchmarking/local-script.sh
155share/doc/glusterfs/benchmarking/rdd.c 154share/doc/glusterfs/benchmarking/rdd.c
156share/doc/glusterfs/glusterfs-mode.el 155share/doc/glusterfs/glusterfs-mode.el
157share/doc/glusterfs/glusterfs.vim 156share/doc/glusterfs/glusterfs.vim
158share/examples/rc.d/glusterd 157share/examples/rc.d/glusterd
159share/glusterfs/scripts/generate-gfid-file.sh 158share/glusterfs/scripts/generate-gfid-file.sh
160share/glusterfs/scripts/get-gfid.sh 159share/glusterfs/scripts/get-gfid.sh
161share/glusterfs/scripts/gsync-sync-gfid 160share/glusterfs/scripts/gsync-sync-gfid
162share/glusterfs/scripts/gsync-upgrade.sh 161share/glusterfs/scripts/gsync-upgrade.sh
163share/glusterfs/scripts/post-upgrade-script-for-quota.sh 162share/glusterfs/scripts/post-upgrade-script-for-quota.sh
164share/glusterfs/scripts/pre-upgrade-script-for-quota.sh 163share/glusterfs/scripts/pre-upgrade-script-for-quota.sh
165share/glusterfs/scripts/slave-upgrade.sh 164share/glusterfs/scripts/slave-upgrade.sh
166@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 165@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
cvs diff -r1.36 -r1.37 pkgsrc/filesystems/glusterfs/distinfo (switch to unified diff)

--- 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 @@ @@ -1,16 +1,8 @@
1$NetBSD: distinfo,v 1.36 2014/12/11 22:08:22 joerg Exp $ 1$NetBSD: distinfo,v 1.37 2015/04/09 15:20:47 manu Exp $
2 2
3SHA1 (glusterfs-3.6.0.tar.gz) = fe19bf7128c955207f633261b9f0f87ac7341cfc 3SHA1 (glusterfs-3.6.2.tar.gz) = 83aefa6b118f03bf3f78cbe0d8a8b8cc1634078a
4RMD160 (glusterfs-3.6.0.tar.gz) = a0078c5a08617f981e09e96eed6eaa2f622dc4b5 4RMD160 (glusterfs-3.6.2.tar.gz) = 941d4e59ab3ed5faf216cc2c9267207aab0fb31a
5Size (glusterfs-3.6.0.tar.gz) = 5924875 bytes 5Size (glusterfs-3.6.2.tar.gz) = 6018636 bytes
6SHA1 (patch-9006) = 18ac4e9d58b587bd202f94323a2fb9a168aade80 
7SHA1 (patch-9010) = 8d46f4c32c3a14da0724b65c9592196a2439dbea 
8SHA1 (patch-9045) = 93cb986d8a2675a714ded956269ffa73f9495827 
9SHA1 (patch-9080) = a5be37a2834859afc4cf2daab3bd8c68581ab221 
10SHA1 (patch-9084) = bc24386464df02e2e6e7d0f42892881dd5d9ef3a 
11SHA1 (patch-configure) = 51de89ba391cb699f34f11882dca0ca67c98e0a6 
12SHA1 (patch-rpc_rpc-lib_src_rpcsvc.c) = a174a78d3daec9b784966b4c4502b335e4561558 6SHA1 (patch-rpc_rpc-lib_src_rpcsvc.c) = a174a78d3daec9b784966b4c4502b335e4561558
13SHA1 (patch-xlator_cluster_dht_src_dht-common.c) = 835a240358948f310205c19514088cf93930b888 
14SHA1 (patch-xlator_features_glupy_src_Makefile.in) = b338b98789d70f7c896ee29534a8dbae0ee93f08 
15SHA1 (patch-xlator_storage_posix_src_posix.c) = 1ca56830afac7cda2fb4fc119fdd6161134eb8b5 7SHA1 (patch-xlator_storage_posix_src_posix.c) = 1ca56830afac7cda2fb4fc119fdd6161134eb8b5
16SHA1 (patch-xlators_mgmt_glusterd_src_Makefile.in) = 48f2cbb46ad9d08c3500e23ce93586b265e1f5f5 8SHA1 (patch-xlators_mgmt_glusterd_src_Makefile.in) = 78a2b9d6c406744cb415904030d60aa09b636463
File Deleted: pkgsrc/filesystems/glusterfs/patches/Attic/patch-9006
File Deleted: pkgsrc/filesystems/glusterfs/patches/Attic/patch-9010
File Deleted: pkgsrc/filesystems/glusterfs/patches/Attic/patch-9045
File Deleted: pkgsrc/filesystems/glusterfs/patches/Attic/patch-9080
File Deleted: pkgsrc/filesystems/glusterfs/patches/Attic/patch-9084
File Deleted: pkgsrc/filesystems/glusterfs/patches/Attic/patch-configure
File Deleted: pkgsrc/filesystems/glusterfs/patches/Attic/patch-xlator_cluster_dht_src_dht-common.c
File Deleted: pkgsrc/filesystems/glusterfs/patches/Attic/patch-xlator_features_glupy_src_Makefile.in
cvs diff -r1.1 -r1.2 pkgsrc/filesystems/glusterfs/patches/Attic/patch-xlators_mgmt_glusterd_src_Makefile.in (switch to unified diff)

--- 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,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-xlators_mgmt_glusterd_src_Makefile.in,v 1.1 2014/12/11 22:08:22 joerg Exp $ 1$NetBSD: patch-xlators_mgmt_glusterd_src_Makefile.in,v 1.2 2015/04/09 15:20:48 manu Exp $
2 2
3--- xlators/mgmt/glusterd/src/Makefile.in.orig 2014-12-10 15:18:18.000000000 +0000 3--- xlators/mgmt/glusterd/src/Makefile.in.orig 2015-01-21 13:11:01.000000000 +0100
4+++ xlators/mgmt/glusterd/src/Makefile.in 4+++ xlators/mgmt/glusterd/src/Makefile.in 2015-04-09 15:58:41.000000000 +0200
5@@ -356,7 +356,7 @@ noinst_HEADERS = glusterd.h glusterd-uti 5@@ -358,9 +358,9 @@
 6 glusterd-syncop.h glusterd-hooks.h glusterd-locks.h \
6 glusterd-mgmt.h glusterd-messages.h glusterd-peer-utils.h 7 glusterd-mgmt.h glusterd-messages.h glusterd-peer-utils.h
7  8
8 AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ 9 AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
9- -I$(rpclibdir) -I$(CONTRIBDIR)/rbtree \ 10- -I$(rpclibdir) -I$(CONTRIBDIR)/rbtree \
10+ -I$(CONTRIBDIR)/rbtree \ 11+ -I$(CONTRIBDIR)/rbtree \
11 -I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src \ 12 -I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src \
12 -I$(CONTRIBDIR)/uuid -I$(CONTRIBDIR)/mount \ 13 -I$(CONTRIBDIR)/uuid -I$(CONTRIBDIR)/mount \
13 -DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \ 14 -DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \
 15 -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\