[ntfs-3g/f12/master] add support for context= mount option (Till Maas) (bz502946)

[Tom Callaway]

commit 38157bb80f3898f725c25c129be274e05a6677b5
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Thu Sep 9 15:57:35 2010 -0400

    add support for context= mount option (Till Maas) (bz502946)

 ntfs-3g-2010.8.8-context-mount-option.patch |   11 +++++++++++
 ntfs-3g.spec                                |    9 +++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/ntfs-3g-2010.8.8-context-mount-option.patch b/ntfs-3g-2010.8.8-context-mount-option.patch
new file mode 100644
index 0000000..a546edd
--- /dev/null
+++ b/ntfs-3g-2010.8.8-context-mount-option.patch
@@ -0,0 +1,11 @@
+diff -up ntfs-3g-2010.8.8/libfuse-lite/mount.c.context ntfs-3g-2010.8.8/libfuse-lite/mount.c
+--- ntfs-3g-2010.8.8/libfuse-lite/mount.c.context	2010-09-09 15:53:39.470942002 -0400
++++ ntfs-3g-2010.8.8/libfuse-lite/mount.c	2010-09-09 15:54:33.335942001 -0400
+@@ -65,6 +65,7 @@ static const struct fuse_opt fuse_mount_
+     FUSE_OPT_KEY("large_read",          KEY_KERN_OPT),
+     FUSE_OPT_KEY("blksize=",            KEY_KERN_OPT),
+     FUSE_OPT_KEY("default_permissions", KEY_KERN_OPT),
++    FUSE_OPT_KEY("context=",            KEY_KERN_OPT),
+     FUSE_OPT_KEY("max_read=",           KEY_KERN_OPT),
+     FUSE_OPT_KEY("max_read=",           FUSE_OPT_KEY_KEEP),
+     FUSE_OPT_KEY("user=",               KEY_MTAB_OPT),
diff --git a/ntfs-3g.spec b/ntfs-3g.spec
index 2cdeb5b..e0e2898 100644
--- a/ntfs-3g.spec
+++ b/ntfs-3g.spec
@@ -8,12 +8,13 @@
 Name:		ntfs-3g
 Summary:	Linux NTFS userspace driver
 Version:	2010.8.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://tuxera.com/opensource/ntfs-3g-%{version}%{?subver}.tgz
 Source1:	20-ntfs-config-write-policy.fdi
 Patch0:		ntfs-3g-1.2216-nomtab.patch
+Patch1:		ntfs-3g-2010.8.8-context-mount-option.patch
 URL:		http://www.ntfs-3g.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_externalfuse}
@@ -49,7 +50,8 @@ functionality.
 
 %prep
 %setup -q -n %{name}-%{version}%{?subver}
-%patch0 -p1
+%patch0 -p1 -b .nomtab
+%patch1 -p1 -b .context
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -134,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Thu Sep  9 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2010.8.8-2
+- add support for context= mount option (Till Maas) (bz502946)
+
 * Mon Aug  9 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2010.8.8-1
 - update to 2010.8.8