Attachment 153091 Details for Bug 194409 – unified diff to bring port candidate upto glusterfs 3.6.2

[patch] unified diff to bring port candidate upto glusterfs 3.6.2

glusterfs-3.6.2.diff (text/plain), 5.56 KB, created by craig001 on 2015-02-16 22:08:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: craig001

Created: 2015-02-16 22:08:02 UTC

Size: 5.56 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-16 21:32:02.000000000 +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
>@@ -31,6 +31,6 @@
> 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-16 20:33:49.000000000 +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-16 21:21:41.000000000 +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-16 21:55:21.000000000 +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
>@@ -102,16 +102,63 @@
> %%PYTHON_SITELIBDIR%%/gluster/glupy.pyo
> libdata/pkgconfig/glusterfs-api.pc
> libdata/pkgconfig/libgfchangelog.pc
>+libexec/glusterfs/gsyncd
>+libexec/glusterfs/gverify.sh
>+libexec/glusterfs/peer_add_secret_pub
>+libexec/glusterfs/peer_gsec_create
>+libexec/glusterfs/python/syncdaemon/README.md
>+libexec/glusterfs/python/syncdaemon/__init__.py
>+libexec/glusterfs/python/syncdaemon/__init__.pyc
>+libexec/glusterfs/python/syncdaemon/__init__.pyo
>+libexec/glusterfs/python/syncdaemon/changelogagent.py
>+libexec/glusterfs/python/syncdaemon/changelogagent.pyc
>+libexec/glusterfs/python/syncdaemon/changelogagent.pyo
>+libexec/glusterfs/python/syncdaemon/configinterface.py
>+libexec/glusterfs/python/syncdaemon/configinterface.pyc
>+libexec/glusterfs/python/syncdaemon/configinterface.pyo
>+libexec/glusterfs/python/syncdaemon/gconf.py
>+libexec/glusterfs/python/syncdaemon/gconf.pyc
>+libexec/glusterfs/python/syncdaemon/gconf.pyo
>+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
>+libexec/glusterfs/python/syncdaemon/libgfchangelog.py
>+libexec/glusterfs/python/syncdaemon/libgfchangelog.pyc
>+libexec/glusterfs/python/syncdaemon/libgfchangelog.pyo
>+libexec/glusterfs/python/syncdaemon/master.py
>+libexec/glusterfs/python/syncdaemon/master.pyc
>+libexec/glusterfs/python/syncdaemon/master.pyo
>+libexec/glusterfs/python/syncdaemon/monitor.py
>+libexec/glusterfs/python/syncdaemon/monitor.pyc
>+libexec/glusterfs/python/syncdaemon/monitor.pyo
>+libexec/glusterfs/python/syncdaemon/repce.py
>+libexec/glusterfs/python/syncdaemon/repce.pyc
>+libexec/glusterfs/python/syncdaemon/repce.pyo
>+libexec/glusterfs/python/syncdaemon/resource.py
>+libexec/glusterfs/python/syncdaemon/resource.pyc
>+libexec/glusterfs/python/syncdaemon/resource.pyo
>+libexec/glusterfs/python/syncdaemon/syncdutils.py
>+libexec/glusterfs/python/syncdaemon/syncdutils.pyc
>+libexec/glusterfs/python/syncdaemon/syncdutils.pyo
>+libexec/glusterfs/set_geo_rep_pem_keys.sh
> man/man8/gluster.8.gz
> man/man8/glusterd.8.gz
> 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

Actions: View | Diff

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