forked from pool/glusterfs
Accepting request 137373 from filesystems
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/137373 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glusterfs?expand=0&rev=5
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
2204d39fef
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2929dc9bc08adb1f8c52ab5552d62b0aa07e218dba05523a24f674f22d82bfb6
|
||||
size 1416200
|
||||
3
glusterfs-3.3.0.tar.xz
Normal file
3
glusterfs-3.3.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:59f1ae0b1c3ef97768b0b740b7f0146aedd0102d19c19e50fb04ae5990126066
|
||||
size 1541028
|
||||
@ -15,12 +15,12 @@ not needed
|
||||
libglusterfs/src/graph.c | 4 ++--
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: glusterfs-3.2.4/cli/src/cli.c
|
||||
Index: glusterfs-3.3.0/cli/src/cli.c
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/cli/src/cli.c
|
||||
+++ glusterfs-3.2.4/cli/src/cli.c
|
||||
@@ -81,7 +81,7 @@ static char gf_doc[] = "";
|
||||
static char argp_doc[] = "";
|
||||
--- glusterfs-3.3.0.orig/cli/src/cli.c
|
||||
+++ glusterfs-3.3.0/cli/src/cli.c
|
||||
@@ -80,7 +80,7 @@ extern int connected;
|
||||
/* using argp for command line parsing */
|
||||
|
||||
const char *argp_program_version = "" \
|
||||
- PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__ \
|
||||
@ -28,11 +28,11 @@ Index: glusterfs-3.2.4/cli/src/cli.c
|
||||
"\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n" \
|
||||
"Copyright (c) 2006-2011 Gluster Inc. " \
|
||||
"<http://www.gluster.com>\n" \
|
||||
Index: glusterfs-3.2.4/glusterfsd/src/glusterfsd.c
|
||||
Index: glusterfs-3.3.0/glusterfsd/src/glusterfsd.c
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/glusterfsd/src/glusterfsd.c
|
||||
+++ glusterfs-3.2.4/glusterfsd/src/glusterfsd.c
|
||||
@@ -87,7 +87,7 @@ static char gf_doc[] = "";
|
||||
--- glusterfs-3.3.0.orig/glusterfsd/src/glusterfsd.c
|
||||
+++ glusterfs-3.3.0/glusterfsd/src/glusterfsd.c
|
||||
@@ -90,7 +90,7 @@ static char gf_doc[] = "";
|
||||
static char argp_doc[] = "--volfile-server=SERVER [MOUNT-POINT]\n" \
|
||||
"--volfile=VOLFILE [MOUNT-POINT]";
|
||||
const char *argp_program_version = "" \
|
||||
@ -41,11 +41,11 @@ Index: glusterfs-3.2.4/glusterfsd/src/glusterfsd.c
|
||||
"\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n" \
|
||||
"Copyright (c) 2006-2011 Gluster Inc. " \
|
||||
"<http://www.gluster.com>\n" \
|
||||
Index: glusterfs-3.2.4/libglusterfs/src/graph.c
|
||||
Index: glusterfs-3.3.0/libglusterfs/src/graph.c
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/libglusterfs/src/graph.c
|
||||
+++ glusterfs-3.2.4/libglusterfs/src/graph.c
|
||||
@@ -54,8 +54,8 @@ _gf_dump_details (int argc, char **argv)
|
||||
--- glusterfs-3.3.0.orig/libglusterfs/src/graph.c
|
||||
+++ glusterfs-3.3.0/libglusterfs/src/graph.c
|
||||
@@ -45,8 +45,8 @@ _gf_dump_details (int argc, char **argv)
|
||||
fprintf (gf_log_logfile,
|
||||
"========================================"
|
||||
"========================================\n");
|
||||
|
||||
@ -1,324 +0,0 @@
|
||||
From: Jan Engelhardt <jengelh@medozas.de>
|
||||
Date: 2011-10-05 15:16:20.783482347 +0200
|
||||
Upstream: tbd
|
||||
|
||||
build: use system's libuuid instead
|
||||
|
||||
Obey thy http://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries
|
||||
|
||||
---
|
||||
configure.ac | 4 +++-
|
||||
libglusterfs/src/Makefile.am | 6 +++---
|
||||
libglusterfs/src/common-utils.h | 2 +-
|
||||
libglusterfs/src/iatt.h | 2 +-
|
||||
libglusterfs/src/inode.h | 2 +-
|
||||
xlators/features/marker/src/Makefile.am | 2 +-
|
||||
xlators/features/marker/src/marker.h | 2 +-
|
||||
xlators/mgmt/glusterd/src/Makefile.am | 2 +-
|
||||
xlators/mgmt/glusterd/src/glusterd-op-sm.c | 2 +-
|
||||
xlators/mgmt/glusterd/src/glusterd-op-sm.h | 2 +-
|
||||
xlators/mgmt/glusterd/src/glusterd-pmap.h | 2 +-
|
||||
xlators/mgmt/glusterd/src/glusterd-sm.c | 2 +-
|
||||
xlators/mgmt/glusterd/src/glusterd-sm.h | 2 +-
|
||||
xlators/mgmt/glusterd/src/glusterd-store.h | 2 +-
|
||||
xlators/mgmt/glusterd/src/glusterd-utils.h | 2 +-
|
||||
xlators/mgmt/glusterd/src/glusterd.c | 2 +-
|
||||
xlators/mgmt/glusterd/src/glusterd.h | 2 +-
|
||||
xlators/nfs/server/src/Makefile.am | 2 +-
|
||||
xlators/nfs/server/src/mount3.h | 2 +-
|
||||
xlators/nfs/server/src/nfs-common.h | 2 +-
|
||||
xlators/nfs/server/src/nfs3-fh.h | 2 +-
|
||||
21 files changed, 25 insertions(+), 23 deletions(-)
|
||||
|
||||
Index: glusterfs-3.2.4/configure.ac
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/configure.ac
|
||||
+++ glusterfs-3.2.4/configure.ac
|
||||
@@ -340,10 +340,12 @@ AC_SUBST(SYNCDAEMON_SUBDIR)
|
||||
#check if libxml is present if so enable HAVE_LIB_XML
|
||||
echo -n "checking if libxml2 is present... "
|
||||
|
||||
+PKG_CHECK_MODULES([libuuid], [uuid])
|
||||
PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6.19],
|
||||
[echo "yes (features requiring libxml2 enabled)" AC_DEFINE(HAVE_LIB_XML, 1, [define if libxml2 is present])],
|
||||
[echo "no"] )
|
||||
|
||||
+# v - this is not needed
|
||||
AC_SUBST(LIBXML2_CFLAGS)
|
||||
AC_SUBST(LIBXML2_LIBS)
|
||||
|
||||
@@ -482,7 +484,7 @@ AC_SUBST(AM_LIBTOOLFLAGS)
|
||||
CONTRIBDIR='$(top_srcdir)/contrib'
|
||||
AC_SUBST(CONTRIBDIR)
|
||||
|
||||
-INCLUDES='-I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/uuid'
|
||||
+INCLUDES='-I$(top_srcdir)/libglusterfs/src'
|
||||
AC_SUBST(INCLUDES)
|
||||
|
||||
AM_CONDITIONAL([GF_DARWIN_HOST_OS], test "${GF_HOST_OS}" = "GF_DARWIN_HOST_OS")
|
||||
Index: glusterfs-3.2.4/libglusterfs/src/Makefile.am
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/libglusterfs/src/Makefile.am
|
||||
+++ glusterfs-3.2.4/libglusterfs/src/Makefile.am
|
||||
@@ -1,12 +1,12 @@
|
||||
-libglusterfs_la_CFLAGS = -fPIC -Wall -g -shared -nostartfiles $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS)
|
||||
+libglusterfs_la_CFLAGS = -fPIC -Wall -g -shared -nostartfiles $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) ${libuuid_CFLAGS}
|
||||
|
||||
libglusterfs_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE -DXLATORDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator\" -D$(GF_HOST_OS) -I$(CONTRIBDIR)/rbtree -DSCHEDULERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler\" -I$(CONTRIBDIR)/md5
|
||||
|
||||
-libglusterfs_la_LIBADD = @LEXLIB@
|
||||
+libglusterfs_la_LIBADD = @LEXLIB@ ${libuuid_LIBS}
|
||||
|
||||
lib_LTLIBRARIES = libglusterfs.la
|
||||
|
||||
-libglusterfs_la_SOURCES = dict.c graph.lex.c y.tab.c xlator.c logging.c hashfn.c defaults.c common-utils.c timer.c inode.c call-stub.c compat.c fd.c compat-errno.c event.c mem-pool.c gf-dirent.c syscall.c iobuf.c globals.c statedump.c stack.c checksum.c $(CONTRIBDIR)/md5/md5.c $(CONTRIBDIR)/rbtree/rb.c rbthash.c latency.c graph.c $(CONTRIBDIR)/uuid/clear.c $(CONTRIBDIR)/uuid/copy.c $(CONTRIBDIR)/uuid/gen_uuid.c $(CONTRIBDIR)/uuid/pack.c $(CONTRIBDIR)/uuid/parse.c $(CONTRIBDIR)/uuid/unparse.c $(CONTRIBDIR)/uuid/uuid_time.c $(CONTRIBDIR)/uuid/compare.c $(CONTRIBDIR)/uuid/isnull.c $(CONTRIBDIR)/uuid/unpack.c syncop.c graph-print.c trie.c daemon.c
|
||||
+libglusterfs_la_SOURCES = dict.c graph.lex.c y.tab.c xlator.c logging.c hashfn.c defaults.c common-utils.c timer.c inode.c call-stub.c compat.c fd.c compat-errno.c event.c mem-pool.c gf-dirent.c syscall.c iobuf.c globals.c statedump.c stack.c checksum.c $(CONTRIBDIR)/md5/md5.c $(CONTRIBDIR)/rbtree/rb.c rbthash.c latency.c graph.c syncop.c graph-print.c trie.c daemon.c
|
||||
|
||||
noinst_HEADERS = common-utils.h defaults.h dict.h glusterfs.h hashfn.h logging.h xlator.h stack.h timer.h list.h inode.h call-stub.h compat.h fd.h revision.h compat-errno.h event.h mem-pool.h byte-order.h gf-dirent.h locking.h syscall.h iobuf.h globals.h statedump.h checksum.h $(CONTRIBDIR)/md5/md5.h $(CONTRIBDIR)/rbtree/rb.h rbthash.h iatt.h latency.h mem-types.h $(CONTRIBDIR)/uuid/uuidd.h $(CONTRIBDIR)/uuid/uuid.h $(CONTRIBDIR)/uuid/uuidP.h $(CONTRIBDIR)/uuid/uuid_types.h syncop.h graph-utils.h graph-mem-types.h trie.h trie-mem-types.h daemon.h
|
||||
|
||||
Index: glusterfs-3.2.4/libglusterfs/src/common-utils.h
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/libglusterfs/src/common-utils.h
|
||||
+++ glusterfs-3.2.4/libglusterfs/src/common-utils.h
|
||||
@@ -47,7 +47,7 @@ void trap (void);
|
||||
#include "glusterfs.h"
|
||||
#include "locking.h"
|
||||
#include "mem-pool.h"
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
|
||||
#define min(a,b) ((a)<(b)?(a):(b))
|
||||
Index: glusterfs-3.2.4/libglusterfs/src/iatt.h
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/libglusterfs/src/iatt.h
|
||||
+++ glusterfs-3.2.4/libglusterfs/src/iatt.h
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <unistd.h>
|
||||
|
||||
#include "compat.h"
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
typedef enum {
|
||||
IA_INVAL = 0,
|
||||
Index: glusterfs-3.2.4/libglusterfs/src/inode.h
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/libglusterfs/src/inode.h
|
||||
+++ glusterfs-3.2.4/libglusterfs/src/inode.h
|
||||
@@ -41,7 +41,7 @@ typedef struct _dentry dentry_t;
|
||||
#include "list.h"
|
||||
#include "xlator.h"
|
||||
#include "iatt.h"
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
|
||||
struct _inode_table {
|
||||
Index: glusterfs-3.2.4/xlators/features/marker/src/Makefile.am
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/features/marker/src/Makefile.am
|
||||
+++ glusterfs-3.2.4/xlators/features/marker/src/Makefile.am
|
||||
@@ -9,7 +9,7 @@ marker_la_LIBADD = $(top_builddir)/libgl
|
||||
noinst_HEADERS = marker-mem-types.h marker.h marker-quota.h marker-quota-helper.h marker-common.h $(top_builddir)/xlators/lib/src/libxlator.h
|
||||
|
||||
AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -fno-strict-aliasing -D$(GF_HOST_OS) \
|
||||
- -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/lib/src $(GF_CFLAGS) -shared -nostartfiles
|
||||
+ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/lib/src $(GF_CFLAGS) -shared -nostartfiles ${libuuid_CFLAGS}
|
||||
|
||||
CLEANFILES =
|
||||
|
||||
Index: glusterfs-3.2.4/xlators/features/marker/src/marker.h
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/features/marker/src/marker.h
|
||||
+++ glusterfs-3.2.4/xlators/features/marker/src/marker.h
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "marker-quota.h"
|
||||
#include "xlator.h"
|
||||
#include "defaults.h"
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
#include "call-stub.h"
|
||||
|
||||
#define MARKER_XATTR_PREFIX "trusted.glusterfs"
|
||||
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/Makefile.am
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/Makefile.am
|
||||
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/Makefile.am
|
||||
@@ -17,7 +17,7 @@ AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64
|
||||
-I$(rpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/rpc/xdr/src\
|
||||
-I$(top_srcdir)/rpc/rpc-lib/src -I$(CONTRIBDIR)/uuid -I$(top_srcdir)/contrib/md5 -DGFS_PREFIX=\"$(prefix)\" \
|
||||
-DDATADIR=\"$(localstatedir)\" -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
|
||||
- -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(LIBXML2_CFLAGS)
|
||||
+ -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(LIBXML2_CFLAGS) ${libuuid_CFLAGS}
|
||||
|
||||
|
||||
CLEANFILES =
|
||||
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-op-sm.c
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-op-sm.c
|
||||
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-op-sm.c
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <sys/mount.h>
|
||||
|
||||
#include <libgen.h>
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
#include "fnmatch.h"
|
||||
#include "xlator.h"
|
||||
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-op-sm.h
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-op-sm.h
|
||||
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-op-sm.h
|
||||
@@ -30,7 +30,7 @@
|
||||
#endif
|
||||
|
||||
#include <pthread.h>
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
#include "glusterfs.h"
|
||||
#include "xlator.h"
|
||||
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-pmap.h
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-pmap.h
|
||||
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-pmap.h
|
||||
@@ -26,7 +26,7 @@
|
||||
#endif
|
||||
|
||||
#include <pthread.h>
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
#include "glusterfs.h"
|
||||
#include "xlator.h"
|
||||
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-sm.c
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-sm.c
|
||||
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-sm.c
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <sys/resource.h>
|
||||
|
||||
#include <libgen.h>
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
#include "fnmatch.h"
|
||||
#include "xlator.h"
|
||||
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-sm.h
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-sm.h
|
||||
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-sm.h
|
||||
@@ -26,7 +26,7 @@
|
||||
#endif
|
||||
|
||||
#include <pthread.h>
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
#include "rpc-clnt.h"
|
||||
#include "glusterfs.h"
|
||||
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-store.h
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-store.h
|
||||
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-store.h
|
||||
@@ -26,7 +26,7 @@
|
||||
#endif
|
||||
|
||||
#include <pthread.h>
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
#include "glusterfs.h"
|
||||
#include "xlator.h"
|
||||
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-utils.h
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-utils.h
|
||||
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-utils.h
|
||||
@@ -26,7 +26,7 @@
|
||||
#endif
|
||||
|
||||
#include <pthread.h>
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
#include "glusterfs.h"
|
||||
#include "xlator.h"
|
||||
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd.c
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd.c
|
||||
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd.c
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <sys/resource.h>
|
||||
|
||||
#include <libgen.h>
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
#include "glusterd.h"
|
||||
#include "rpcsvc.h"
|
||||
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd.h
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd.h
|
||||
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd.h
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <pthread.h>
|
||||
#include <libgen.h>
|
||||
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
#include "rpc-clnt.h"
|
||||
#include "glusterfs.h"
|
||||
Index: glusterfs-3.2.4/xlators/nfs/server/src/Makefile.am
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/nfs/server/src/Makefile.am
|
||||
+++ glusterfs-3.2.4/xlators/nfs/server/src/Makefile.am
|
||||
@@ -8,6 +8,6 @@ server_la_LIBADD = $(top_builddir)/libgl
|
||||
noinst_HEADERS = nfs.h nfs-common.h nfs-fops.h nfs-inodes.h nfs-generics.h mount3.h nfs3-fh.h nfs3.h nfs3-helpers.h nfs-mem-types.h $(nfsrpclibdir)/xdr-rpc.h $(nfsrpclibdir)/msg-nfs3.h $(nfsrpclibdir)/xdr-common.h $(nfsrpclibdir)/xdr-nfs3.h $(nfsrpclibdir)/rpc-socket.h $(nfsrpclibdir)/rpcsvc.h
|
||||
AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
|
||||
-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)\
|
||||
- -I$(nfsrpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree
|
||||
+ -I$(nfsrpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree ${libuuid_CFLAGS}
|
||||
|
||||
CLEANFILES =
|
||||
Index: glusterfs-3.2.4/xlators/nfs/server/src/mount3.h
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/nfs/server/src/mount3.h
|
||||
+++ glusterfs-3.2.4/xlators/nfs/server/src/mount3.h
|
||||
@@ -34,7 +34,7 @@
|
||||
#include "xdr-nfs3.h"
|
||||
#include "locking.h"
|
||||
#include "nfs3-fh.h"
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
/* Registered with portmap */
|
||||
#define GF_MOUNTV3_PORT 38465
|
||||
Index: glusterfs-3.2.4/xlators/nfs/server/src/nfs-common.h
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/nfs/server/src/nfs-common.h
|
||||
+++ glusterfs-3.2.4/xlators/nfs/server/src/nfs-common.h
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "xlator.h"
|
||||
#include "rpcsvc.h"
|
||||
#include "iatt.h"
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
//NFS_PATH_MAX hard-coded to 4096 as a work around for bug 2476.
|
||||
//nfs server crashes when path received is longer than PATH_MAX
|
||||
Index: glusterfs-3.2.4/xlators/nfs/server/src/nfs3-fh.h
|
||||
===================================================================
|
||||
--- glusterfs-3.2.4.orig/xlators/nfs/server/src/nfs3-fh.h
|
||||
+++ glusterfs-3.2.4/xlators/nfs/server/src/nfs3-fh.h
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "xdr-nfs3.h"
|
||||
#include "iatt.h"
|
||||
#include <sys/types.h>
|
||||
-#include "uuid.h"
|
||||
+#include <uuid/uuid.h>
|
||||
|
||||
/* BIG FAT WARNING: The file handle code is tightly coupled to NFSv3 file
|
||||
* handles for now. This will change if and when we need v4. */
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 24 03:45:09 UTC 2012 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release 3.3.0
|
||||
* New: Unified File & Object access
|
||||
* New: Hadoop hooks - HDFS compatibility layer
|
||||
* New volume type: Repstr - replicated + striped (+ distributed)
|
||||
volumes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 2 15:43:43 UTC 2011 - coolo@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package glusterfs
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -15,34 +15,43 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: glusterfs
|
||||
%define lname_rpc libgfrpc0
|
||||
%define lname_xdr libgfxdr0
|
||||
%define lname_gf libglusterfs0
|
||||
Version: 3.2.4
|
||||
Version: 3.3.0
|
||||
Release: 0
|
||||
Group: System/Filesystems
|
||||
Summary: Aggregating distributed file system
|
||||
Summary: Aggregating distributed file system
|
||||
License: GPL-2.0+ ; GPL-3.0
|
||||
Group: System/Filesystems
|
||||
Url: http://gluster.org/
|
||||
|
||||
#Git-Clone: git://github.com/gluster/glusterfs
|
||||
Source: %name-%version.tar.xz
|
||||
Patch1: glusterfs-init.diff
|
||||
Patch2: glusterfs-date.diff
|
||||
Patch3: glusterfs-system-uuid.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: automake
|
||||
BuildRequires: bison
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: flex
|
||||
BuildRequires: fuse-devel >= 2.6.5
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(uuid)
|
||||
BuildRequires: python
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: xz
|
||||
%if 0%{?sles_version} == 11
|
||||
BuildRequires: fuse-devel >= 2.6.5
|
||||
BuildRequires: libuuid-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: openssl-devel
|
||||
%else
|
||||
BuildRequires: pkgconfig(fuse) >= 2.6.5
|
||||
BuildRequires: pkgconfig(libcrypto)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(uuid)
|
||||
%endif
|
||||
Requires: python
|
||||
|
||||
%description
|
||||
@ -55,35 +64,36 @@ Translators from GNU Hurd kernel. Much of the code in GlusterFS is in
|
||||
user space and easily manageable.
|
||||
|
||||
%package -n %lname_rpc
|
||||
Summary: GlusterFS Remote Procedure Call library
|
||||
Group: System/Libraries
|
||||
Summary: GlusterFS Remote Procedure Call library
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %lname_rpc
|
||||
GlusterFS is a clustered file-system capable of scaling to several
|
||||
petabytes.
|
||||
|
||||
%package -n %lname_xdr
|
||||
Summary: GlusterFS's External Data Representation library
|
||||
Group: System/Libraries
|
||||
Summary: GlusterFS's External Data Representation library
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %lname_xdr
|
||||
GlusterFS is a clustered file-system capable of scaling to several
|
||||
petabytes.
|
||||
|
||||
%package -n %lname_gf
|
||||
Summary: GlusterFS's core library
|
||||
Group: System/Libraries
|
||||
Summary: GlusterFS's core library
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %lname_gf
|
||||
GlusterFS is a clustered file-system capable of scaling to several
|
||||
petabytes.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for glusterfs
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %name = %version
|
||||
Requires: %lname_rpc = %version, %lname_xdr = %version
|
||||
Summary: Development files for glusterfs
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %lname_gf = %version
|
||||
Requires: %lname_rpc = %version
|
||||
Requires: %lname_xdr = %version
|
||||
Requires: %name = %version
|
||||
|
||||
%description devel
|
||||
GlusterFS is a clustered file-system capable of scaling to several
|
||||
@ -94,7 +104,7 @@ links.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P 1 -P 2 -P 3 -p1
|
||||
%patch -P 1 -P 2 -p1
|
||||
|
||||
%build
|
||||
./autogen.sh;
|
||||
@ -171,12 +181,12 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
|
||||
%_initrddir/glusterd
|
||||
%dir %_sysconfdir/%name
|
||||
%config(noreplace) %_sysconfdir/%name/glusterd.vol
|
||||
%config %_sysconfdir/%name/*.sample
|
||||
#%config %_sysconfdir/%name/*.sample
|
||||
/sbin/mount.%name
|
||||
%_libexecdir/%name
|
||||
%_libdir/%name
|
||||
%_sbindir/gluster*
|
||||
%_mandir/man*/*
|
||||
#%_mandir/man*/*
|
||||
%_docdir/%name
|
||||
%_localstatedir/lib/glusterd
|
||||
%_localstatedir/log/%name
|
||||
|
||||
Loading…
Reference in New Issue
Block a user