From f7a01a1b56795361e827523122821afa0e5a2218 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Mon, 30 Mar 2009 15:27:59 +0000
Subject: [PATCH] Patch from upstream provided as temporary workaround for bz
 486619

---
 mount-readlink-hang-workaround.diff | 24 ++++++++++++++++++++++++
 ntfs-3g.spec                        |  8 +++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 mount-readlink-hang-workaround.diff

diff --git a/mount-readlink-hang-workaround.diff b/mount-readlink-hang-workaround.diff
new file mode 100644
index 0000000..3f5067f
--- /dev/null
+++ b/mount-readlink-hang-workaround.diff
@@ -0,0 +1,24 @@
+Index: libfuse-lite/mount_util.c
+===================================================================
+RCS file: /cvsroot/ntfs-3g/ntfs-3g/libfuse-lite/mount_util.c,v
+retrieving revision 1.5
+diff -u -p -r1.5 mount_util.c
+--- libfuse-lite/mount_util.c	27 Jun 2008 12:37:02 -0000	1.5
++++ libfuse-lite/mount_util.c	30 Mar 2009 13:30:36 -0000
+@@ -96,6 +96,7 @@ int fuse_mnt_add_mount(const char *progn
+                 strerror(errno));
+         exit(1);
+     }
++/*    
+     res = waitpid(res, &status, 0);
+     if (res == -1) {
+         fprintf(stderr, "%s: waitpid: %s\n", progname, strerror(errno));
+@@ -103,7 +104,7 @@ int fuse_mnt_add_mount(const char *progn
+     }
+     if (status != 0)
+         return -1;
+-
++*/
+     return 0;
+ }
+ 
diff --git a/ntfs-3g.spec b/ntfs-3g.spec
index 558adb8..42467ac 100644
--- a/ntfs-3g.spec
+++ b/ntfs-3g.spec
@@ -5,12 +5,14 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	2009.3.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ntfs-3g.org/ntfs-3g-%{version}.tgz
 Source1:	20-ntfs-config-write-policy.fdi
 Patch0:		ntfs-3g-1.2216-nomtab.patch
+# Patch from upstream provided as temporary workaround for bz 486619
+Patch1:		mount-readlink-hang-workaround.diff
 URL:		http://www.ntfs-3g.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_externalfuse}
@@ -49,6 +51,7 @@ functionality.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -128,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Mon Mar 30 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2:2009.3.8-2
+- Patch from upstream provided as temporary workaround for bz 486619
+
 * Thu Mar 26 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2:2009.3.8-1
 - update to 2009.3.8