Attachment 218123 Details for Bug 249492 – Patch to update the net/glusterfs port

[patch] Patch to update the net/glusterfs port

glusterfs.patch (text/plain), 9.83 KB, created by Timur I. Bakeyev on 2020-09-20 23:28:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timur I. Bakeyev

Created: 2020-09-20 23:28:49 UTC

Size: 9.83 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 549396)
>+++ Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	glusterfs
> PORTVERSION=	8.0
>+PORTREVISION=	1
> CATEGORIES=	net
> MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
> 
>@@ -11,19 +12,20 @@
> LICENSE=	GPLv2 LGPL3
> LICENSE_COMB=	dual
> 
>+BROKEN_SSL=	libressl
>+
>+BUILD_DEPENDS=	bash:shells/bash
>+RUN_DEPENDS=	bash:shells/bash
> LIB_DEPENDS=	libargp.so:devel/argp-standalone \
> 		libcurl.so:ftp/curl \
> 		liburcu-bp.so:sysutils/liburcu \
> 		libuuid.so:misc/e2fsprogs-libuuid
> 
>-RUN_DEPENDS=	bash:shells/bash
>+USES=		autoreconf bison compiler:c11 gettext gnome libtool pkgconfig python \
>+		readline shebangfix sqlite ssl
> 
>-BROKEN_SSL=	libressl
>-
>-USES=		autoreconf bison compiler:c11 gettext gnome libtool pkgconfig \
>-		python readline shebangfix sqlite ssl
>-
>-SHEBANG_FILES=	events/src/glustereventsd.py events/src/peer_eventsapi.py \
>+SHEBANG_FILES=	build-aux/pkg-version \
>+		events/src/glustereventsd.py events/src/peer_eventsapi.py \
> 		events/tools/eventsdash.py extras/ganesha/ocf/ganesha_grace \
> 		extras/ganesha/ocf/ganesha_mon extras/ganesha/ocf/ganesha_nfsd \
> 		extras/ganesha/scripts/create-export-ganesha.sh \
>@@ -62,9 +64,16 @@
> CPPFLAGS+=	-I"${LOCALBASE}/include"
> LDFLAGS+=	-L"${LOCALBASE}/lib" -largp
> INSTALL_TARGET=	install-strip
>-PLIST_SUB=	GLUSTERLIBDIR="lib/${PORTNAME}"
>+PLIST_SUB=	GLUSTERLIBDIR="lib/${PORTNAME}" \
>+		PORTVERSION="${PORTVERSION}"
> KMODDIR?=	/boot/modules
> 
> OPTIONS_DEFINE=	DOCS
> 
>+post-install:
>+		${LN} -nfs ${PREFIX}/libexec/glusterfs/glusterfind/S57glusterfind-delete-post.py		${STAGEDIR}/var/db/glusterd/hooks/1/delete/post/S57glusterfind-delete-post
>+		${LN} -nfs ../libexec/glusterfs/peer_eventsapi.py						${STAGEDIR}${PREFIX}/sbin/gluster-eventsapi
>+		${LN} -nfs ../libexec/glusterfs/gfevents/glustereventsd.py					${STAGEDIR}${PREFIX}/sbin/glustereventsd
>+		${LN} -nfs ../libexec/glusterfs/gfind_missing_files/gfind_missing_files.sh			${STAGEDIR}${PREFIX}/sbin/gfind_missing_files
>+
> .include <bsd.port.mk>
>Index: files/patch-mount_glusterfs.in
>===================================================================
>--- files/patch-mount_glusterfs.in	(revision 549396)
>+++ files/patch-mount_glusterfs.in	(working copy)
>@@ -1,5 +1,5 @@
>---- xlators/mount/fuse/utils/mount_glusterfs.in.orig	2017-06-27 22:25:12.392137135 +0700
>-+++ xlators/mount/fuse/utils/mount_glusterfs.in	2017-12-19 18:24:21.736142000 +0700
>+--- xlators/mount/fuse/utils/mount_glusterfs.in.orig	2017-06-28 05:25:12 UTC
>++++ xlators/mount/fuse/utils/mount_glusterfs.in
> @@ -463,50 +463,44 @@ parse_options()
>          if [ "$key" = "$value" ]; then
>              without_options $pair;
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 549396)
>+++ pkg-plist	(working copy)
>@@ -112,71 +112,71 @@
> include/glusterfs/upcall-utils.h
> include/glusterfs/xlator.h
> include/glusterfs/y.tab.h
>-%%GLUSTERLIBDIR%%/auth/addr.so
>-%%GLUSTERLIBDIR%%/auth/login.so
>-%%GLUSTERLIBDIR%%/cloudsync-plugins/cloudsyncs3.so
>-%%GLUSTERLIBDIR%%/rpc-transport/socket.so
>-%%GLUSTERLIBDIR%%/xlator/cluster/afr.so
>-%%GLUSTERLIBDIR%%/xlator/cluster/dht.so
>-%%GLUSTERLIBDIR%%/xlator/cluster/disperse.so
>-%%GLUSTERLIBDIR%%/xlator/cluster/distribute.so
>-%%GLUSTERLIBDIR%%/xlator/cluster/ec.so
>-%%GLUSTERLIBDIR%%/xlator/cluster/nufa.so
>-%%GLUSTERLIBDIR%%/xlator/cluster/replicate.so
>-%%GLUSTERLIBDIR%%/xlator/cluster/switch.so
>-%%GLUSTERLIBDIR%%/xlator/debug/delay-gen.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/features/access-control.so
>-%%GLUSTERLIBDIR%%/xlator/features/arbiter.so
>-%%GLUSTERLIBDIR%%/xlator/features/barrier.so
>-%%GLUSTERLIBDIR%%/xlator/features/bit-rot.so
>-%%GLUSTERLIBDIR%%/xlator/features/bitrot-stub.so
>-%%GLUSTERLIBDIR%%/xlator/features/cdc.so
>-%%GLUSTERLIBDIR%%/xlator/features/changelog.so
>-%%GLUSTERLIBDIR%%/xlator/features/cloudsync.so
>-%%GLUSTERLIBDIR%%/xlator/features/gfid-access.so
>-%%GLUSTERLIBDIR%%/xlator/features/index.so
>-%%GLUSTERLIBDIR%%/xlator/features/leases.so
>-%%GLUSTERLIBDIR%%/xlator/features/locks.so
>-%%GLUSTERLIBDIR%%/xlator/features/marker.so
>-%%GLUSTERLIBDIR%%/xlator/features/namespace.so
>-%%GLUSTERLIBDIR%%/xlator/features/posix-locks.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/sdfs.so
>-%%GLUSTERLIBDIR%%/xlator/features/selinux.so
>-%%GLUSTERLIBDIR%%/xlator/features/shard.so
>-%%GLUSTERLIBDIR%%/xlator/features/snapview-client.so
>-%%GLUSTERLIBDIR%%/xlator/features/snapview-server.so
>-%%GLUSTERLIBDIR%%/xlator/features/thin-arbiter.so
>-%%GLUSTERLIBDIR%%/xlator/features/trash.so
>-%%GLUSTERLIBDIR%%/xlator/features/upcall.so
>-%%GLUSTERLIBDIR%%/xlator/features/utime.so
>-%%GLUSTERLIBDIR%%/xlator/features/worm.so
>-%%GLUSTERLIBDIR%%/xlator/meta.so
>-%%GLUSTERLIBDIR%%/xlator/mgmt/glusterd.so
>-%%GLUSTERLIBDIR%%/xlator/mount/api.so
>-%%GLUSTERLIBDIR%%/xlator/mount/fuse.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
>-%%GLUSTERLIBDIR%%/xlator/performance/readdir-ahead.so
>-%%GLUSTERLIBDIR%%/xlator/performance/stat-prefetch.so
>-%%GLUSTERLIBDIR%%/xlator/performance/write-behind.so
>-%%GLUSTERLIBDIR%%/xlator/playground/template.so
>-%%GLUSTERLIBDIR%%/xlator/protocol/client.so
>-%%GLUSTERLIBDIR%%/xlator/protocol/server.so
>-%%GLUSTERLIBDIR%%/xlator/storage/posix.so
>-%%GLUSTERLIBDIR%%/xlator/system/posix-acl.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/auth/addr.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/auth/login.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/cloudsync-plugins/cloudsyncs3.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/rpc-transport/socket.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/afr.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/dht.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/disperse.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/distribute.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/ec.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/nufa.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/replicate.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/switch.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/delay-gen.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/error-gen.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/io-stats.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/sink.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/trace.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/access-control.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/arbiter.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/barrier.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/bit-rot.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/bitrot-stub.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/cdc.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/changelog.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/cloudsync.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/gfid-access.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/index.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/leases.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/locks.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/marker.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/namespace.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/posix-locks.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/quiesce.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/quota.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/quotad.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/read-only.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/sdfs.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/selinux.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/shard.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/snapview-client.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/snapview-server.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/thin-arbiter.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/trash.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/upcall.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/utime.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/worm.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/meta.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/mgmt/glusterd.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/mount/api.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/mount/fuse.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/io-cache.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/io-threads.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/md-cache.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/nl-cache.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/open-behind.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/quick-read.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/read-ahead.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/readdir-ahead.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/stat-prefetch.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/write-behind.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/playground/template.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/protocol/client.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/protocol/server.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/storage/posix.so
>+%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/system/posix-acl.so
> lib/libgfapi.so
> lib/libgfapi.so.0
> lib/libgfapi.so.0.0.0

Flags:

koobs: maintainer-approval? (daniel)

Actions: View | Diff

Attachments on bug 249492: 218123 | 218313 | 218314