Attachment 153404 Details for Bug 194409 – unified diff to bring port candidate upto gluster 3.6.2 with georeplication disabled

[patch] unified diff to bring port candidate upto gluster 3.6.2 with georeplication disabled

glusterfs-3.6.2_1.diff (text/plain), 4.05 KB, created by craig001 on 2015-02-24 00:01:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: craig001

Created: 2015-02-24 00:01:56 UTC

Size: 4.05 KB

patch

obsolete

>diff -ruN glusterfs.orig/Makefile glusterfs/Makefile
>--- glusterfs.orig/Makefile	2014-11-24 20:49:56.000000000 +0000
>+++ glusterfs/Makefile	2015-02-23 23:30:10.176996888 +0000
>@@ -1,10 +1,10 @@
> # $FreeBSD$
> 
> PORTNAME=	glusterfs
>-PORTVERSION=	3.6.0.b.3
>+PORTVERSION=	3.6.2
> CATEGORIES=	net
> MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
>-DISTNAME=	${PORTNAME}-3.6.0beta3
>+DISTNAME=	${PORTNAME}-3.6.2
> 
> MAINTAINER=	craig001@lerwick.hopto.org
> COMMENT=	GlusterFS distributed file system
>@@ -25,12 +25,13 @@
> 		--localstatedir=/var \
> 		--disable-epoll \
> 		--enable-glupy \
>+		--disable-georeplication \
> 		ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \
> 		ac_cv_func_setfsuid=no 	ac_cv_func_fdatasync=no \
> 		ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no
> CPPFLAGS+=	-I"${LOCALBASE}/include"
> LDFLAGS+=	-L"${LOCALBASE}/lib" -largp
> INSTALL_TARGET=	install-strip
>-PLIST_SUB=	GLUSTERLIBDIR="${PREFIX}/lib/${PORTNAME}/3.6.0beta3"
>+PLIST_SUB=	GLUSTERLIBDIR="${PREFIX}/lib/${PORTNAME}/3.6.2"
> 
> .include <bsd.port.mk>
>diff -ruN glusterfs.orig/distinfo glusterfs/distinfo
>--- glusterfs.orig/distinfo	2014-11-24 09:08:43.000000000 +0000
>+++ glusterfs/distinfo	2015-02-22 14:13:25.450368263 +0000
>@@ -1,2 +1,2 @@
>-SHA256 (glusterfs-3.6.0beta3.tar.gz) = a5b7d2e41e27348232be74ff448b66c3df1241de8001c82a0e9344d1c42d076e
>-SIZE (glusterfs-3.6.0beta3.tar.gz) = 5888792
>+SHA256 (glusterfs-3.6.2.tar.gz) = 4ab515a5ed8316cf8a19d80d8fbe89312c03ba5ee2f81f789d705e05649de0cf
>+SIZE (glusterfs-3.6.2.tar.gz) = 6018636
>diff -ruN glusterfs.orig/files/patch-configure glusterfs/files/patch-configure
>--- glusterfs.orig/files/patch-configure	2014-11-24 09:52:21.000000000 +0000
>+++ glusterfs/files/patch-configure	2015-02-22 14:13:25.453343313 +0000
>@@ -1,20 +1,21 @@
>---- configure.orig	2014-10-01 03:18:06.000000000 +0900
>-+++ configure	2014-11-24 18:52:14.000000000 +0900
>-@@ -19494,7 +19494,7 @@
>- saved_LDFLAGS=$LDFLAGS
>+--- configure.orig	2015-02-16 21:13:46.743376747 +0000
>++++ configure	2015-02-16 21:20:20.085666758 +0000
>+@@ -16076,6 +16076,9 @@
>+      linux*)
>+ #do nothing
>+        ;;
>++     freebsd*)
>++#do nothing
>++       ;;
>+      netbsd*)
>+ #do nothing
>+        ;;
>+@@ -19518,7 +19521,7 @@
>  
>- case $host_os in
>--     linux*)
>-+     linux*|freebsd*)
>-        CFLAGS="`${PYTHON}-config --cflags`"
>-        CPPFLAGS=$CFLAGS
>-        LDFLAGS="-L`${PYTHON}-config --prefix`/lib `${PYTHON}-config --ldflags`"
>-@@ -19507,7 +19507,7 @@
>- esac
>  
>  
> -for ac_header in python$PYTHON_VERSION/Python.h
>-+for ac_header in Python.h
>++for ac_header in python$PYTHON_VERSION/Python.h Python.h
>  do
>  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
>  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
>diff -ruN glusterfs.orig/pkg-plist glusterfs/pkg-plist
>--- glusterfs.orig/pkg-plist	2014-11-24 20:56:19.000000000 +0000
>+++ glusterfs/pkg-plist	2015-02-23 23:44:28.011931532 +0000
>@@ -78,8 +78,8 @@
> %%GLUSTERLIBDIR%%/xlator/testing/features/template.so
> %%GLUSTERLIBDIR%%/xlator/testing/performance/symlink-cache.so
> lib/libgfapi.so
>-lib/libgfapi.so.7
>-lib/libgfapi.so.7.0.0
>+lib/libgfapi.so.0
>+lib/libgfapi.so.0.0.0
> lib/libgfchangelog.so
> lib/libgfchangelog.so.0
> lib/libgfchangelog.so.0.0.1
>@@ -107,11 +107,13 @@
> man/man8/glusterfs.8.gz
> man/man8/glusterfsd.8.gz
> man/man8/mount.glusterfs.8.gz
>+sbin/glfsheal
> sbin/gluster
> sbin/glusterd
> sbin/glusterfs
> sbin/glusterfsd
> sbin/mount_glusterfs
>+sbin/umountd
> %%PORTDOCS%%%%DOCSDIR%%/benchmarking/README
> %%PORTDOCS%%%%DOCSDIR%%/benchmarking/glfs-bm.c
> %%PORTDOCS%%%%DOCSDIR%%/benchmarking/launch-script.sh
>@@ -119,13 +121,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/benchmarking/rdd.c
> %%PORTDOCS%%%%DOCSDIR%%/glusterfs-mode.el
> %%PORTDOCS%%%%DOCSDIR%%/glusterfs.vim
>-%%DATADIR%%/scripts/generate-gfid-file.sh
>-%%DATADIR%%/scripts/get-gfid.sh
>-%%DATADIR%%/scripts/gsync-sync-gfid
>-%%DATADIR%%/scripts/gsync-upgrade.sh
> %%DATADIR%%/scripts/post-upgrade-script-for-quota.sh
> %%DATADIR%%/scripts/pre-upgrade-script-for-quota.sh
>-%%DATADIR%%/scripts/slave-upgrade.sh
> @sample /var/db/glusterd/groups/virt.sample
> @dir /var/db/glusterd/groups
> @dir /var/db/glusterd

Actions: View | Diff

Attachments on bug 194409: 148379 | 149233 | 149791 | 153091 | 153404 | 158002 | 163544 | 163545 | 163805 | 163811 | 163830 | 163831