Date: Sun, 30 Jul 2017 22:45:51 +0000 (UTC) From: "Danilo G. Baio" <dbaio@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446944 - in head/net/glusterfs: . files Message-ID: <201707302245.v6UMjpFJ087303@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Sun Jul 30 22:45:50 2017 New Revision: 446944 URL: https://svnweb.freebsd.org/changeset/ports/446944 Log: net/glusterfs: Update to 3.11.1 - Regenerate patches While here: - Fix Q/A errors (shebangfix) - Update WWW - Use OPSYS with OSVERSION PR: 220674 Submitted by: craig001@lerwick.hopto.org (maintainer) Reviewed by: mat Differential Revision: https://reviews.freebsd.org/D11550 Added: head/net/glusterfs/files/patch-contrib_fuse-lib_mount.c (contents, props changed) head/net/glusterfs/files/patch-extras_Makefile.in (contents, props changed) Deleted: head/net/glusterfs/files/patch-contrib-fuse-lib-mount.c head/net/glusterfs/files/patch-extras-Makefile.in Modified: head/net/glusterfs/Makefile head/net/glusterfs/distinfo head/net/glusterfs/files/patch-configure head/net/glusterfs/pkg-descr head/net/glusterfs/pkg-plist Modified: head/net/glusterfs/Makefile ============================================================================== --- head/net/glusterfs/Makefile Sun Jul 30 21:46:10 2017 (r446943) +++ head/net/glusterfs/Makefile Sun Jul 30 22:45:50 2017 (r446944) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= glusterfs -PORTVERSION= 3.9.0 -PORTREVISION= 3 +PORTVERSION= 3.11.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/ @@ -14,18 +14,26 @@ LICENSE_COMB= dual LIB_DEPENDS= libargp.so:devel/argp-standalone liburcu-bp.so:sysutils/liburcu -USE_GCC= any - USES= bison gettext libtool pkgconfig python readline shebangfix \ sqlite ssl BROKEN_SSL= libressl -SHEBANG_FILES= extras/ganesha/scripts/create-export-ganesha.sh \ - extras/ganesha/scripts/dbus-send.sh \ - extras/ganesha/scripts/ganesha-ha.sh \ - extras/ganesha/scripts/generate-epoch.py \ - extras/peer_add_secret_pub.in \ +SHEBANG_FILES= extras/peer_add_secret_pub.in \ + events/src/glustereventsd.py \ + events/src/peer_eventsapi.py \ + tools/glusterfind/src/nodeagent.py \ + tools/glusterfind/src/brickfind.py \ + tools/glusterfind/src/changelog.py \ + tools/glusterfind/glusterfind.in \ + tools/gfind_missing_files/gfid_to_path.py \ + extras/pre-upgrade-script-for-quota.sh \ + events/tools/eventsdash.py \ + extras/post-upgrade-script-for-quota.sh \ + extras/snap_scheduler/gcron.py \ + extras/snap_scheduler/snap_scheduler.py \ + events/src/peer_eventsapi.py \ + events/src/glustereventsd.py \ tools/glusterfind/S57glusterfind-delete-post.py USE_GNOME= glib20 libxml2 @@ -46,5 +54,11 @@ LDFLAGS+= -L"${LOCALBASE}/lib" -largp INSTALL_TARGET= install-strip PLIST_SUB= GLUSTERLIBDIR="lib/${PORTNAME}/${PORTVERSION}" KMODDIR?= /boot/modules + +.include <bsd.port.options.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101001 +USE_GCC= yes +.endif .include <bsd.port.mk> Modified: head/net/glusterfs/distinfo ============================================================================== --- head/net/glusterfs/distinfo Sun Jul 30 21:46:10 2017 (r446943) +++ head/net/glusterfs/distinfo Sun Jul 30 22:45:50 2017 (r446944) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479924003 -SHA256 (glusterfs-3.9.0.tar.gz) = b417c674454b17d1851828a1ca395cb9e7ab198378391da04e2fb8911cc1fb14 -SIZE (glusterfs-3.9.0.tar.gz) = 8709782 +TIMESTAMP = 1499632037 +SHA256 (glusterfs-3.11.1.tar.gz) = c7e0502631c9bc9da05795b666b74ef40a30a0344f5a2e205e65bd2faefe1442 +SIZE (glusterfs-3.11.1.tar.gz) = 9155001 Modified: head/net/glusterfs/files/patch-configure ============================================================================== --- head/net/glusterfs/files/patch-configure Sun Jul 30 21:46:10 2017 (r446943) +++ head/net/glusterfs/files/patch-configure Sun Jul 30 22:45:50 2017 (r446944) @@ -1,6 +1,6 @@ ---- configure.orig 2016-11-15 14:54:31 UTC +--- configure.orig 2017-06-27 15:25:15 UTC +++ configure -@@ -13428,6 +13428,9 @@ case $host_os in +@@ -13475,6 +13475,9 @@ case $host_os in linux*) #do nothing ;; Added: head/net/glusterfs/files/patch-contrib_fuse-lib_mount.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/glusterfs/files/patch-contrib_fuse-lib_mount.c Sun Jul 30 22:45:50 2017 (r446944) @@ -0,0 +1,10 @@ +--- contrib/fuse-lib/mount.c.orig 2017-06-27 15:25:12 UTC ++++ contrib/fuse-lib/mount.c +@@ -382,6 +382,7 @@ fuse_mount_sys (const char *mountpoint, + build_iovec (&iov, &iovlen, "from", "/dev/fuse", -1); + build_iovec (&iov, &iovlen, "volname", source, -1); + build_iovec (&iov, &iovlen, "fd", fdstr, -1); ++ build_iovec (&iov, &iovlen, "allow_other", NULL, -1); + ret = nmount (iov, iovlen, mountflags); + #else + ret = mount (source, mountpoint, fstype, mountflags, Added: head/net/glusterfs/files/patch-extras_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/glusterfs/files/patch-extras_Makefile.in Sun Jul 30 22:45:50 2017 (r446944) @@ -0,0 +1,22 @@ +--- extras/Makefile.in.orig 2017-06-27 15:25:17 UTC ++++ extras/Makefile.in +@@ -637,8 +637,8 @@ install-volDATA: $(vol_DATA) + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(voldir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(voldir)" || exit $$?; \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(voldir)/$${files}.sample'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(voldir)/$${files}.sample" || exit $$?; \ + done + + uninstall-volDATA: +@@ -937,7 +937,7 @@ install-data-local: + fi + $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/groups + $(INSTALL_DATA) $(top_srcdir)/extras/group-virt.example \ +- $(DESTDIR)$(GLUSTERD_WORKDIR)/groups/virt ++ $(DESTDIR)$(GLUSTERD_WORKDIR)/groups/virt.sample + $(INSTALL_DATA) $(top_srcdir)/extras/group-metadata-cache \ + $(DESTDIR)$(GLUSTERD_WORKDIR)/groups/metadata-cache + $(INSTALL_DATA) $(top_srcdir)/extras/group-gluster-block \ Modified: head/net/glusterfs/pkg-descr ============================================================================== --- head/net/glusterfs/pkg-descr Sun Jul 30 21:46:10 2017 (r446943) +++ head/net/glusterfs/pkg-descr Sun Jul 30 22:45:50 2017 (r446944) @@ -6,4 +6,4 @@ resources and managing data in a single global namespa is based on a stackable user space design and can deliver exceptional performance for diverse workloads. -WWW: http://www.gluster.org +WWW: https://www.gluster.org Modified: head/net/glusterfs/pkg-plist ============================================================================== --- head/net/glusterfs/pkg-plist Sun Jul 30 21:46:10 2017 (r446943) +++ head/net/glusterfs/pkg-plist Sun Jul 30 22:45:50 2017 (r446944) @@ -1,20 +1,22 @@ bin/glusterfind -@sample etc/ganesha/ganesha-ha.conf.sample %%ETCDIR%%/eventsconfig.json %%ETCDIR%%/gluster-rsyslog-5.8.conf %%ETCDIR%%/gluster-rsyslog-7.2.conf @sample %%ETCDIR%%/glusterd.vol.sample %%ETCDIR%%/glusterfs-georep-logrotate %%ETCDIR%%/glusterfs-logrotate +%%ETCDIR%%/group-gluster-block +%%ETCDIR%%/group-metadata-cache +%%ETCDIR%%/group-nl-cache %%ETCDIR%%/group-virt.example %%ETCDIR%%/logger.conf.example include/glusterfs/api/glfs-handles.h include/glusterfs/api/glfs.h +include/glusterfs/atomic.h include/glusterfs/byte-order.h include/glusterfs/call-stub.h include/glusterfs/checksum.h include/glusterfs/circ-buff.h -include/glusterfs/cli1-xdr.h include/glusterfs/client_t.h include/glusterfs/cluster-syncop.h include/glusterfs/common-utils.h @@ -43,7 +45,6 @@ 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 @@ -84,6 +85,7 @@ 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-pragmas.h include/glusterfs/rpc/rpc-transport.h include/glusterfs/rpc/rpcsvc-common.h include/glusterfs/rpc/rpcsvc.h @@ -111,7 +113,6 @@ include/glusterfs/throttle-tbf.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 @@ -124,13 +125,13 @@ include/glusterfs/y.tab.h %%GLUSTERLIBDIR%%/xlator/cluster/distribute.so %%GLUSTERLIBDIR%%/xlator/cluster/ec.so %%GLUSTERLIBDIR%%/xlator/cluster/nufa.so -%%GLUSTERLIBDIR%%/xlator/cluster/pump.so %%GLUSTERLIBDIR%%/xlator/cluster/replicate.so %%GLUSTERLIBDIR%%/xlator/cluster/stripe.so %%GLUSTERLIBDIR%%/xlator/cluster/switch.so %%GLUSTERLIBDIR%%/xlator/cluster/tier.so %%GLUSTERLIBDIR%%/xlator/debug/error-gen.so %%GLUSTERLIBDIR%%/xlator/debug/io-stats.so +%%GLUSTERLIBDIR%%/xlator/debug/sink.so %%GLUSTERLIBDIR%%/xlator/debug/trace.so %%GLUSTERLIBDIR%%/xlator/encryption/crypt.so %%GLUSTERLIBDIR%%/xlator/encryption/rot-13.so @@ -146,26 +147,23 @@ include/glusterfs/y.tab.h %%GLUSTERLIBDIR%%/xlator/features/glupy.so %%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.py %%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.pyc -%%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.pyo +%%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.%%PYTHON_PYOEXTENSION%% %%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.py %%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.pyc -%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.pyo +%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.%%PYTHON_PYOEXTENSION%% %%GLUSTERLIBDIR%%/xlator/features/glupy/negative.py %%GLUSTERLIBDIR%%/xlator/features/glupy/negative.pyc -%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.pyo +%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.%%PYTHON_PYOEXTENSION%% %%GLUSTERLIBDIR%%/xlator/features/index.so %%GLUSTERLIBDIR%%/xlator/features/leases.so %%GLUSTERLIBDIR%%/xlator/features/locks.so -%%GLUSTERLIBDIR%%/xlator/features/mac-compat.so %%GLUSTERLIBDIR%%/xlator/features/marker.so %%GLUSTERLIBDIR%%/xlator/features/posix-locks.so -%%GLUSTERLIBDIR%%/xlator/features/prot_client.so -%%GLUSTERLIBDIR%%/xlator/features/prot_dht.so -%%GLUSTERLIBDIR%%/xlator/features/prot_server.so %%GLUSTERLIBDIR%%/xlator/features/quiesce.so %%GLUSTERLIBDIR%%/xlator/features/quota.so %%GLUSTERLIBDIR%%/xlator/features/quotad.so %%GLUSTERLIBDIR%%/xlator/features/read-only.so +%%GLUSTERLIBDIR%%/xlator/features/selinux.so %%GLUSTERLIBDIR%%/xlator/features/shard.so %%GLUSTERLIBDIR%%/xlator/features/snapview-client.so %%GLUSTERLIBDIR%%/xlator/features/snapview-server.so @@ -176,11 +174,11 @@ include/glusterfs/y.tab.h %%GLUSTERLIBDIR%%/xlator/mgmt/glusterd.so %%GLUSTERLIBDIR%%/xlator/mount/api.so %%GLUSTERLIBDIR%%/xlator/mount/fuse.so -%%GLUSTERLIBDIR%%/xlator/nfs/server.so %%GLUSTERLIBDIR%%/xlator/performance/decompounder.so %%GLUSTERLIBDIR%%/xlator/performance/io-cache.so %%GLUSTERLIBDIR%%/xlator/performance/io-threads.so %%GLUSTERLIBDIR%%/xlator/performance/md-cache.so +%%GLUSTERLIBDIR%%/xlator/performance/nl-cache.so %%GLUSTERLIBDIR%%/xlator/performance/open-behind.so %%GLUSTERLIBDIR%%/xlator/performance/quick-read.so %%GLUSTERLIBDIR%%/xlator/performance/read-ahead.so @@ -213,47 +211,40 @@ lib/libglusterfs.so.0 lib/libglusterfs.so.0.0.1 lib/ocf/resource.d/glusterfs/glusterd lib/ocf/resource.d/glusterfs/volume -lib/ocf/resource.d/heartbeat/ganesha_grace -lib/ocf/resource.d/heartbeat/ganesha_mon -lib/ocf/resource.d/heartbeat/ganesha_nfsd %%PYTHON_SITELIBDIR%%/gluster/__init__.py %%PYTHON_SITELIBDIR%%/gluster/__init__.pyc -%%PYTHON_SITELIBDIR%%/gluster/__init__.pyo +%%PYTHON_SITELIBDIR%%/gluster/__init__.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.py %%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.pyc -%%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.pyo +%%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.py %%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.pyc -%%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.pyo +%%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.py %%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.pyc -%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.pyo +%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.%%PYTHON_PYOEXTENSION%% libdata/pkgconfig/glusterfs-api.pc libdata/pkgconfig/libgfchangelog.pc libdata/pkgconfig/libgfdb.pc -libexec/ganesha/create-export-ganesha.sh -libexec/ganesha/dbus-send.sh -libexec/ganesha/ganesha-ha.sh -libexec/ganesha/generate-epoch.py libexec/glusterfs/events/__init__.py libexec/glusterfs/events/__init__.pyc -libexec/glusterfs/events/__init__.pyo +libexec/glusterfs/events/__init__.%%PYTHON_PYOEXTENSION%% libexec/glusterfs/events/eventsapiconf.py libexec/glusterfs/events/eventsapiconf.pyc -libexec/glusterfs/events/eventsapiconf.pyo +libexec/glusterfs/events/eventsapiconf.%%PYTHON_PYOEXTENSION%% libexec/glusterfs/events/eventtypes.py libexec/glusterfs/events/eventtypes.pyc -libexec/glusterfs/events/eventtypes.pyo +libexec/glusterfs/events/eventtypes.%%PYTHON_PYOEXTENSION%% libexec/glusterfs/events/gf_event.py libexec/glusterfs/events/gf_event.pyc -libexec/glusterfs/events/gf_event.pyo +libexec/glusterfs/events/gf_event.%%PYTHON_PYOEXTENSION%% libexec/glusterfs/events/glustereventsd.py libexec/glusterfs/events/handlers.py libexec/glusterfs/events/handlers.pyc -libexec/glusterfs/events/handlers.pyo +libexec/glusterfs/events/handlers.%%PYTHON_PYOEXTENSION%% libexec/glusterfs/events/utils.py libexec/glusterfs/events/utils.pyc -libexec/glusterfs/events/utils.pyo +libexec/glusterfs/events/utils.%%PYTHON_PYOEXTENSION%% libexec/glusterfs/gfind_missing_files/gcrawler libexec/glusterfs/gfind_missing_files/gfid_to_path.py libexec/glusterfs/gfind_missing_files/gfid_to_path.sh @@ -261,26 +252,26 @@ libexec/glusterfs/gfind_missing_files/gfind_missing_fi 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/__init__.%%PYTHON_PYOEXTENSION%% libexec/glusterfs/glusterfind/brickfind.py libexec/glusterfs/glusterfind/changelog.py libexec/glusterfs/glusterfind/changelogdata.py libexec/glusterfs/glusterfind/changelogdata.pyc -libexec/glusterfs/glusterfind/changelogdata.pyo +libexec/glusterfs/glusterfind/changelogdata.%%PYTHON_PYOEXTENSION%% libexec/glusterfs/glusterfind/conf.py libexec/glusterfs/glusterfind/conf.pyc -libexec/glusterfs/glusterfind/conf.pyo +libexec/glusterfs/glusterfind/conf.%%PYTHON_PYOEXTENSION%% libexec/glusterfs/glusterfind/libgfchangelog.py libexec/glusterfs/glusterfind/libgfchangelog.pyc -libexec/glusterfs/glusterfind/libgfchangelog.pyo +libexec/glusterfs/glusterfind/libgfchangelog.%%PYTHON_PYOEXTENSION%% libexec/glusterfs/glusterfind/main.py libexec/glusterfs/glusterfind/main.pyc -libexec/glusterfs/glusterfind/main.pyo +libexec/glusterfs/glusterfind/main.%%PYTHON_PYOEXTENSION%% libexec/glusterfs/glusterfind/nodeagent.py libexec/glusterfs/glusterfind/tool.conf libexec/glusterfs/glusterfind/utils.py libexec/glusterfs/glusterfind/utils.pyc -libexec/glusterfs/glusterfind/utils.pyo +libexec/glusterfs/glusterfind/utils.%%PYTHON_PYOEXTENSION%% libexec/glusterfs/peer_add_secret_pub libexec/glusterfs/peer_eventsapi.py man/man8/gluster.8.gz @@ -290,6 +281,7 @@ man/man8/glusterfsd.8.gz man/man8/mount.glusterfs.8.gz sbin/conf.py sbin/gcron.py +sbin/gf_attach sbin/gfind_missing_files sbin/glfsheal sbin/gluster @@ -312,16 +304,17 @@ sbin/umountd %%DATADIR%%/scripts/post-upgrade-script-for-quota.sh %%DATADIR%%/scripts/pre-upgrade-script-for-quota.sh %%DATADIR%%/scripts/stop-all-gluster-processes.sh +/var/db/glusterd/groups/gluster-block +/var/db/glusterd/groups/metadata-cache +/var/db/glusterd/groups/nl-cache @sample /var/db/glusterd/groups/virt.sample /var/db/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh /var/db/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh /var/db/glusterd/hooks/1/delete/post/S57glusterfind-delete-post -/var/db/glusterd/hooks/1/reset/post/S31ganesha-reset.sh /var/db/glusterd/hooks/1/set/post/S30samba-set.sh /var/db/glusterd/hooks/1/set/post/S32gluster_enable_shared_storage.sh /var/db/glusterd/hooks/1/start/post/S29CTDBsetup.sh /var/db/glusterd/hooks/1/start/post/S30samba-start.sh -/var/db/glusterd/hooks/1/start/post/S31ganesha-start.sh /var/db/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh /var/db/glusterd/hooks/1/stop/pre/S30samba-stop.sh @dir /var/db/glusterd/events @@ -333,8 +326,6 @@ sbin/umountd @dir /var/db/glusterd/hooks/1/add-brick @dir /var/db/glusterd/hooks/1/delete/post @dir /var/db/glusterd/hooks/1/delete -@dir /var/db/glusterd/hooks/1/reset/post -@dir /var/db/glusterd/hooks/1/reset @dir /var/db/glusterd/hooks/1/set/post @dir /var/db/glusterd/hooks/1/set @dir /var/db/glusterd/hooks/1/start/post
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707302245.v6UMjpFJ087303>