From 666d4a320e763e55d89b61fe077d7cc407875717 Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Mon, 16 Feb 2009 12:24:48 +0000
Subject: [PATCH] Update to latest stable 1.3.12 and backport to all current
 branches.

---
 .cvsignore                   |  2 +-
 glusterfs-1.3.7-ocreat.patch | 12 ------------
 glusterfs-1.3.8-mount.patch  | 15 ---------------
 glusterfs.spec               | 14 +++++++++-----
 glusterfsd.init              |  2 ++
 glusterfsd.sysconfig         |  1 +
 sources                      |  2 +-
 7 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 glusterfs-1.3.7-ocreat.patch
 delete mode 100644 glusterfs-1.3.8-mount.patch

diff --git a/.cvsignore b/.cvsignore
index c38441a..93f9195 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-glusterfs-1.3.9.tar.gz
+glusterfs-1.3.12.tar.gz
diff --git a/glusterfs-1.3.7-ocreat.patch b/glusterfs-1.3.7-ocreat.patch
deleted file mode 100644
index 5b0aa88..0000000
--- a/glusterfs-1.3.7-ocreat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naupr glusterfs-1.3.7.orig/xlators/protocol/server/src/server-protocol.c glusterfs-1.3.7/xlators/protocol/server/src/server-protocol.c
---- glusterfs-1.3.7.orig/xlators/protocol/server/src/server-protocol.c	2007-10-16 09:37:00.000000000 +0200
-+++ glusterfs-1.3.7/xlators/protocol/server/src/server-protocol.c	2007-11-26 11:49:05.000000000 +0100
-@@ -4930,7 +4930,7 @@ mop_setspec (call_frame_t *frame,
-     goto fail;
-   }
-   
--  ret = open (GLUSTERFSD_SPEC_PATH, O_WRONLY | O_CREAT | O_SYNC);
-+  ret = open (GLUSTERFSD_SPEC_PATH, O_WRONLY | O_CREAT | O_SYNC, 0644);
-   spec_fd = ret;
-   if (spec_fd < 0){
-     remote_errno = errno;
diff --git a/glusterfs-1.3.8-mount.patch b/glusterfs-1.3.8-mount.patch
deleted file mode 100644
index f460ce7..0000000
--- a/glusterfs-1.3.8-mount.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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');
-     
-     mount_point="$2";
-+
-+    # Simple check to avoid multiple identical mounts
-+    if grep -q "glusterfs $mount_point fuse" /etc/mtab; then
-+        echo "$0: according to mtab, a glusterfs is already mounted on $mount_point"
-+        exit 1
-+    fi
-     
-     fs_options=$(echo "$fs_options,$new_fs_options");
-     
diff --git a/glusterfs.spec b/glusterfs.spec
index 7f323a4..78b4226 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -13,7 +13,7 @@
 
 Summary: Cluster File System
 Name: glusterfs
-Version: 1.3.9
+Version: 1.3.12
 Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Base
@@ -22,8 +22,6 @@ Source0: http://ftp.zresearch.com/pub/gluster/glusterfs/1.3/glusterfs-%{version}
 Source1: glusterfsd.init
 Source2: glusterfsd.sysconfig
 Source3: umount.glusterfs
-Patch0: glusterfs-1.3.7-ocreat.patch
-Patch1: glusterfs-1.3.8-mount.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -115,8 +113,6 @@ This package provides the development libraries.
 
 %prep
 %setup -q
-%patch0 -p1 -b .ocreat
-%patch1 -p1 -b .mount
 
 
 %build
@@ -217,6 +213,14 @@ fi
 
 
 %changelog
+* Mon Feb 16 2009 Matthias Saou <http://freshrpms.net/> 1.3.12-1
+- Update to 1.3.12.
+- Remove no longer needed ocreat patch.
+
+* Thu Jul 17 2008 Matthias Saou <http://freshrpms.net/> 1.3.10-1
+- Update to 1.3.10.
+- Remove mount patch, it's been included upstream now.
+
 * Fri May 16 2008 Matthias Saou <http://freshrpms.net/> 1.3.9-1
 - Update to 1.3.9.
 
diff --git a/glusterfsd.init b/glusterfsd.init
index 1c9ce54..826c3fb 100644
--- a/glusterfsd.init
+++ b/glusterfsd.init
@@ -20,10 +20,12 @@ RETVAL=0
 GLUSTERFSD_CONFIG="/etc/glusterfs/glusterfs-server.vol"
 GLUSTERFSD_LOGFILE="/var/log/glusterfs/glusterfsd.log"
 GLUSTERFSD_LOGLEVEL="WARNING"
+GLUSTERFSD_NOFILE="65536"
 [ -f /etc/sysconfig/glusterfsd ] && source /etc/sysconfig/glusterfsd
 
 start() {
 	echo -n $"Starting $prog: "
+	ulimit -n ${GLUSTERFSD_NOFILE}
 	daemon $glusterfsd -f ${GLUSTERFSD_CONFIG} -l ${GLUSTERFSD_LOGFILE} -L ${GLUSTERFSD_LOGLEVEL}
 	RETVAL=$?
 	echo
diff --git a/glusterfsd.sysconfig b/glusterfsd.sysconfig
index 136499d..c3f41c2 100644
--- a/glusterfsd.sysconfig
+++ b/glusterfsd.sysconfig
@@ -4,4 +4,5 @@
 #GLUSTERFSD_CONFIG="/etc/glusterfs/glusterfs-server.vol"
 #GLUSTERFSD_LOGFILE="/var/log/glusterfs/glusterfsd.log"
 #GLUSTERFSD_LOGLEVEL="ERROR"
+#GLUSTERFSD_NOFILE="65536"
 
diff --git a/sources b/sources
index ad228a5..da2dcdc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a4f46de3928e8c7ea9787b12b172a24  glusterfs-1.3.9.tar.gz
+db11e3d9d227f5b10b2a93c0d8929123  glusterfs-1.3.12.tar.gz