From be3641934f5de91e5eaf62574be50dd1d19db5de620a77af6cbd7fa651a96c85 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 24 Sep 2012 17:42:39 +0000 Subject: [PATCH] glusterfs-3.3.0 OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=11 --- glusterfs-system-uuid.diff | 338 ------------------------------------- glusterfs.spec | 7 +- 2 files changed, 3 insertions(+), 342 deletions(-) delete mode 100644 glusterfs-system-uuid.diff diff --git a/glusterfs-system-uuid.diff b/glusterfs-system-uuid.diff deleted file mode 100644 index 8f475d6..0000000 --- a/glusterfs-system-uuid.diff +++ /dev/null @@ -1,338 +0,0 @@ -From: Jan Engelhardt -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 | 11 ++++------- - 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 | 3 ++- - 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, 27 insertions(+), 27 deletions(-) - -Index: glusterfs-3.3.0/configure.ac -=================================================================== ---- glusterfs-3.3.0.orig/configure.ac -+++ glusterfs-3.3.0/configure.ac -@@ -364,10 +364,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) - -@@ -528,7 +530,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.3.0/libglusterfs/src/Makefile.am -=================================================================== ---- glusterfs-3.3.0.orig/libglusterfs/src/Makefile.am -+++ glusterfs-3.3.0/libglusterfs/src/Makefile.am -@@ -1,12 +1,12 @@ - libglusterfs_la_CFLAGS = -fPIC -Wall -g -shared -nostartfiles $(GF_CFLAGS) \ -- $(GF_DARWIN_LIBGLUSTERFS_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\" - --libglusterfs_la_LIBADD = @LEXLIB@ -+libglusterfs_la_LIBADD = @LEXLIB@ ${libuuid_LIBS} - - lib_LTLIBRARIES = libglusterfs.la - -@@ -17,11 +17,8 @@ libglusterfs_la_SOURCES = dict.c xlator. - 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 daemon.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.c \ -+ syncop.c \ - graph-print.c trie.c run.c options.c fd-lk.c circ-buff.c event-history.c - - nodist_libglusterfs_la_SOURCES = y.tab.c graph.lex.c -Index: glusterfs-3.3.0/libglusterfs/src/common-utils.h -=================================================================== ---- glusterfs-3.3.0.orig/libglusterfs/src/common-utils.h -+++ glusterfs-3.3.0/libglusterfs/src/common-utils.h -@@ -38,7 +38,7 @@ void trap (void); - #include "glusterfs.h" - #include "locking.h" - #include "mem-pool.h" --#include "uuid.h" -+#include - - - -Index: glusterfs-3.3.0/libglusterfs/src/iatt.h -=================================================================== ---- glusterfs-3.3.0.orig/libglusterfs/src/iatt.h -+++ glusterfs-3.3.0/libglusterfs/src/iatt.h -@@ -22,7 +22,7 @@ - #include - - #include "compat.h" --#include "uuid.h" -+#include - - typedef enum { - IA_INVAL = 0, -Index: glusterfs-3.3.0/libglusterfs/src/inode.h -=================================================================== ---- glusterfs-3.3.0.orig/libglusterfs/src/inode.h -+++ glusterfs-3.3.0/libglusterfs/src/inode.h -@@ -33,7 +33,7 @@ typedef struct _dentry dentry_t; - #include "list.h" - #include "xlator.h" - #include "iatt.h" --#include "uuid.h" -+#include - - - struct _inode_table { -Index: glusterfs-3.3.0/xlators/features/marker/src/Makefile.am -=================================================================== ---- glusterfs-3.3.0.orig/xlators/features/marker/src/Makefile.am -+++ glusterfs-3.3.0/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.3.0/xlators/features/marker/src/marker.h -=================================================================== ---- glusterfs-3.3.0.orig/xlators/features/marker/src/marker.h -+++ glusterfs-3.3.0/xlators/features/marker/src/marker.h -@@ -27,7 +27,7 @@ - #include "marker-quota.h" - #include "xlator.h" - #include "defaults.h" --#include "uuid.h" -+#include - #include "call-stub.h" - - #define MARKER_XATTR_PREFIX "trusted.glusterfs" -Index: glusterfs-3.3.0/xlators/mgmt/glusterd/src/Makefile.am -=================================================================== ---- glusterfs-3.3.0.orig/xlators/mgmt/glusterd/src/Makefile.am -+++ glusterfs-3.3.0/xlators/mgmt/glusterd/src/Makefile.am -@@ -26,7 +26,8 @@ AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 - -I$(CONTRIBDIR)/uuid \ - -DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \ - -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\ -- -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(LIBXML2_CFLAGS) -+ -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(LIBXML2_CFLAGS) \ -+ ${libuuid_CFLAGS} - - - CLEANFILES = -Index: glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-op-sm.c -=================================================================== ---- glusterfs-3.3.0.orig/xlators/mgmt/glusterd/src/glusterd-op-sm.c -+++ glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-op-sm.c -@@ -28,7 +28,7 @@ - #include - - #include --#include "uuid.h" -+#include - - #include "fnmatch.h" - #include "xlator.h" -Index: glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-op-sm.h -=================================================================== ---- glusterfs-3.3.0.orig/xlators/mgmt/glusterd/src/glusterd-op-sm.h -+++ glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-op-sm.h -@@ -30,7 +30,7 @@ - #endif - - #include --#include "uuid.h" -+#include - - #include "glusterfs.h" - #include "xlator.h" -Index: glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-pmap.h -=================================================================== ---- glusterfs-3.3.0.orig/xlators/mgmt/glusterd/src/glusterd-pmap.h -+++ glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-pmap.h -@@ -26,7 +26,7 @@ - #endif - - #include --#include "uuid.h" -+#include - - #include "glusterfs.h" - #include "xlator.h" -Index: glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-sm.c -=================================================================== ---- glusterfs-3.3.0.orig/xlators/mgmt/glusterd/src/glusterd-sm.c -+++ glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-sm.c -@@ -27,7 +27,7 @@ - #include - - #include --#include "uuid.h" -+#include - - #include "fnmatch.h" - #include "xlator.h" -Index: glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-sm.h -=================================================================== ---- glusterfs-3.3.0.orig/xlators/mgmt/glusterd/src/glusterd-sm.h -+++ glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-sm.h -@@ -26,7 +26,7 @@ - #endif - - #include --#include "uuid.h" -+#include - - #include "rpc-clnt.h" - #include "glusterfs.h" -Index: glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-store.h -=================================================================== ---- glusterfs-3.3.0.orig/xlators/mgmt/glusterd/src/glusterd-store.h -+++ glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-store.h -@@ -26,7 +26,7 @@ - #endif - - #include --#include "uuid.h" -+#include - - #include "glusterfs.h" - #include "xlator.h" -Index: glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-utils.h -=================================================================== ---- glusterfs-3.3.0.orig/xlators/mgmt/glusterd/src/glusterd-utils.h -+++ glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd-utils.h -@@ -26,7 +26,7 @@ - #endif - - #include --#include "uuid.h" -+#include - - #include "glusterfs.h" - #include "xlator.h" -Index: glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd.c -=================================================================== ---- glusterfs-3.3.0.orig/xlators/mgmt/glusterd/src/glusterd.c -+++ glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd.c -@@ -28,7 +28,7 @@ - #include - - #include --#include "uuid.h" -+#include - - #include "glusterd.h" - #include "rpcsvc.h" -Index: glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd.h -=================================================================== ---- glusterfs-3.3.0.orig/xlators/mgmt/glusterd/src/glusterd.h -+++ glusterfs-3.3.0/xlators/mgmt/glusterd/src/glusterd.h -@@ -30,7 +30,7 @@ - #include - #include - --#include "uuid.h" -+#include - - #include "rpc-clnt.h" - #include "glusterfs.h" -Index: glusterfs-3.3.0/xlators/nfs/server/src/Makefile.am -=================================================================== ---- glusterfs-3.3.0.orig/xlators/nfs/server/src/Makefile.am -+++ glusterfs-3.3.0/xlators/nfs/server/src/Makefile.am -@@ -14,6 +14,6 @@ AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 - -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\" \ - -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)\ - -I$(nfsrpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree\ -- -I$(top_srcdir)/rpc/xdr/src/ -+ -I$(top_srcdir)/rpc/xdr/src/ ${libuuid_CFLAGS} - - CLEANFILES = -Index: glusterfs-3.3.0/xlators/nfs/server/src/mount3.h -=================================================================== ---- glusterfs-3.3.0.orig/xlators/nfs/server/src/mount3.h -+++ glusterfs-3.3.0/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 - - /* Registered with portmap */ - #define GF_MOUNTV3_PORT 38465 -Index: glusterfs-3.3.0/xlators/nfs/server/src/nfs-common.h -=================================================================== ---- glusterfs-3.3.0.orig/xlators/nfs/server/src/nfs-common.h -+++ glusterfs-3.3.0/xlators/nfs/server/src/nfs-common.h -@@ -30,7 +30,7 @@ - #include "xlator.h" - #include "rpcsvc.h" - #include "iatt.h" --#include "uuid.h" -+#include - - //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.3.0/xlators/nfs/server/src/nfs3-fh.h -=================================================================== ---- glusterfs-3.3.0.orig/xlators/nfs/server/src/nfs3-fh.h -+++ glusterfs-3.3.0/xlators/nfs/server/src/nfs3-fh.h -@@ -29,7 +29,7 @@ - #include "xdr-nfs3.h" - #include "iatt.h" - #include --#include "uuid.h" -+#include - - /* 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. */ diff --git a/glusterfs.spec b/glusterfs.spec index 61b381a..e0a54d9 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -31,7 +31,6 @@ Url: http://gluster.org/ 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 @@ -105,7 +104,7 @@ links. %prep %setup -q -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 1 -P 2 -p1 %build ./autogen.sh; @@ -182,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