diff --git a/.cvsignore b/.cvsignore index 025cfa4..701281f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glusterfs-1.3.8.tar.gz +glusterfs-1.3.8pre6.tar.gz diff --git a/glusterfs-1.3.8-mount.patch b/glusterfs-1.3.8-mount.patch index 61b7493..f460ce7 100644 --- a/glusterfs-1.3.8-mount.patch +++ b/glusterfs-1.3.8-mount.patch @@ -1,6 +1,5 @@ -diff -Naupr glusterfs-1.3.8.orig/glusterfs-fuse/utils/mount.glusterfs.in glusterfs-1.3.8/glusterfs-fuse/utils/mount.glusterfs.in ---- glusterfs-1.3.8.orig/glusterfs-fuse/utils/mount.glusterfs.in 2008-01-08 12:49:35.000000000 +0100 -+++ glusterfs-1.3.8/glusterfs-fuse/utils/mount.glusterfs.in 2008-01-08 13:44:30.000000000 +0100 +--- glusterfs-1.3.8.orig/xlators/mount/fuse/utils/mount.glusterfs.in 2008-01-08 12:49:35.000000000 +0100 ++++ glusterfs-1.3.8/xlators/mount/fuse/utils/mount.glusterfs.in 2008-01-08 13:44:30.000000000 +0100 @@ -121,6 +121,12 @@ main () # $2=$(echo "$@" | sed -n 's/[^ ]* \([^ ]*\).*/\1/p'); diff --git a/glusterfs-1.3.8pre6-tla751.patch b/glusterfs-1.3.8pre6-tla751.patch new file mode 100644 index 0000000..95b2d91 --- /dev/null +++ b/glusterfs-1.3.8pre6-tla751.patch @@ -0,0 +1,96 @@ +--- glusterfs-1.3.8pre6/glusterfs/src/glusterfs.c 2008-04-15 17:30:12.000000000 +0200 ++++ glusterfs-1.3.8/glusterfs/src/glusterfs.c 2008-04-22 11:08:52.000000000 +0200 +@@ -492,7 +492,7 @@ main (int32_t argc, char *argv[]) + signal (SIGUSR1, (sighandler_t)malloc_stats); + #endif + /* This is used to dump details */ +- signal (SIGUSR2, (sighandler_t)glusterfs_stats); ++ signal (SIGUSR2, glusterfs_stats); + + #if HAVE_BACKTRACE + /* Handle SIGABORT and SIGSEGV */ +@@ -540,11 +540,21 @@ main (int32_t argc, char *argv[]) + + if (ctx->mount_point) { + graph = fuse_graph (graph); ++ /* Initialize the FUSE before the transport */ ++ if (graph->init (graph) == -1) { ++ gf_log ("glusterfs", GF_LOG_ERROR, "Initializing FUSE failed"); ++ return -1; ++ } ++ graph->ready = 1; /* Initialization Done */ + } + + if (xlator_graph_init (graph) == -1) { + gf_log ("glusterfs", GF_LOG_ERROR, + "Initializing graph failed"); ++ if (ctx->mount_point) { ++ /* Just call umount of FUSE */ ++ graph->fini (graph); ++ } + return -1; + } + +--- glusterfs-1.3.8pre6/libglusterfs/src/common-utils.h 2008-04-04 20:49:55.000000000 +0200 ++++ glusterfs-1.3.8/libglusterfs/src/common-utils.h 2008-04-22 11:08:51.000000000 +0200 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + void trap (void); + +--- glusterfs-1.3.8pre6/libglusterfs/src/revision.h 2008-04-17 20:21:59.000000000 +0200 ++++ glusterfs-1.3.8/libglusterfs/src/revision.h 2008-04-22 11:08:52.000000000 +0200 +@@ -1 +1 @@ +-#define GLUSTERFS_REPOSITORY_REVISION "glusterfs--mainline--2.5--patch-748" ++#define GLUSTERFS_REPOSITORY_REVISION "glusterfs--mainline--2.5--patch-751" +--- glusterfs-1.3.8pre6/xlators/mount/fuse/src/fuse-bridge.c 2008-04-03 20:27:48.000000000 +0200 ++++ glusterfs-1.3.8/xlators/mount/fuse/src/fuse-bridge.c 2008-04-22 11:08:52.000000000 +0200 +@@ -2658,8 +2658,11 @@ init (xlator_t *this) + void + fini (xlator_t *this) + { +- +- ++ struct fuse_private *priv = this->private; ++ if (dict_get (this->options, "mount-point")) { ++ char *mount_point = data_to_str (dict_get (this->options, "mount-point")); ++ fuse_unmount (mount_point, priv->ch); ++ } + } + + struct xlator_fops fops = { +--- glusterfs-1.3.8pre6/xlators/storage/posix/src/posix.c 2008-04-02 18:44:05.000000000 +0200 ++++ glusterfs-1.3.8/xlators/storage/posix/src/posix.c 2008-04-22 11:08:51.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include "glusterfs.h" + #include "dict.h" +@@ -2162,16 +2163,18 @@ posix_readdir (call_frame_t *frame, + /* TODO - consider endianness here */ + this_entry = (void *)(buf + filled); + this_entry->d_ino = entry->d_ino; +- this_entry->d_type = entry->d_type; + this_entry->d_len = entry->d_reclen; + +-#ifdef GF_LINUX_HOST_OS +- this_entry->d_off = entry->d_off; ++#ifndef GF_SOLARIS_HOST_OS ++ this_entry->d_type = entry->d_type; + #endif + #ifdef GF_DARWIN_HOST_OS + this_entry->d_off = telldir(dir); + /* d_reclen in Linux == d_namlen in Darwin */ + this_entry->d_len = entry->d_namlen; ++#else ++ /* For all other OS types */ ++ this_entry->d_off = entry->d_off; + #endif + + strncpy (this_entry->d_name, entry->d_name, this_entry->d_len); diff --git a/glusterfs.spec b/glusterfs.spec index f883714..651ede2 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -14,16 +14,17 @@ Summary: Cluster File System Name: glusterfs Version: 1.3.8 -Release: 0.8%{?dist} +Release: 0.10%{?dist} License: GPLv3+ Group: System Environment/Base URL: http://www.gluster.org/docs/index.php/GlusterFS -Source0: http://ftp.zresearch.com/pub/gluster/glusterfs/1.3/glusterfs-%{version}.tar.gz +Source0: http://ftp.zresearch.com/pub/gluster/glusterfs/1.3/glusterfs-%{version}pre6.tar.gz Source1: glusterfsd.init Source2: glusterfsd.sysconfig Source3: umount.glusterfs Patch0: glusterfs-1.3.7-ocreat.patch Patch1: glusterfs-1.3.8-mount.patch +Patch2: glusterfs-1.3.8pre6-tla751.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig @@ -114,9 +115,10 @@ This package provides the development libraries. %prep -%setup -q +%setup -q -n %{name}-%{version}pre6 %patch0 -p1 -b .ocreat %patch1 -p1 -b .mount +%patch2 -p1 -b .tla751 %build @@ -193,6 +195,7 @@ fi /sbin/mount.glusterfs /sbin/umount.glusterfs %dir /var/log/glusterfs/ +%{_mandir}/man8/glusterfs.8* %endif @@ -202,8 +205,10 @@ fi %config(noreplace) %{_sysconfdir}/glusterfs/*.vol %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd %{_sysconfdir}/init.d/glusterfsd +%{_sbindir}/glusterfs %{_sbindir}/glusterfsd %dir /var/log/glusterfs/ +%{_mandir}/man8/glusterfs.8* %files devel @@ -214,6 +219,14 @@ fi %changelog +* Tue Apr 23 2008 Matthias Saou 1.3.8-0.10 +- Include short patch to include fixes from latest TLA 751. + +* Mon Apr 22 2008 Matthias Saou 1.3.8-0.9 +- Update to 1.3.8pre6. +- Include glusterfs binary in both the client and server packages, now that + glusterfsd is a symlink to it instead of a separate binary. + * Sun Feb 3 2008 Matthias Saou 1.3.8-0.8 - Add python version check and disable bindings for version < 2.4. diff --git a/sources b/sources index 6beee6d..6002bb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb7ebc04cab10966877863f31799382d glusterfs-1.3.8.tar.gz +98d53572f463d472d016616c75ca0f60 glusterfs-1.3.8pre6.tar.gz