From 8bfe9bcf0574f0f6d91f9633926cddb5806c778c Mon Sep 17 00:00:00 2001
From: "Tom \"spot\" Callaway" <tcallawa@redhat.com>
Date: Tue, 11 Oct 2011 10:32:54 -0400
Subject: [PATCH] 2011.10.9-RC

---
 .gitignore                                    |  1 +
 ntfs-3g.spec                                  | 28 ++++++-------------
 ....10.9-RC-ntfsck-unsupported-return-0.patch | 16 +++++++++++
 sources                                       |  2 +-
 4 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 ntfs-3g_ntfsprogs-2011.10.9-RC-ntfsck-unsupported-return-0.patch

diff --git a/.gitignore b/.gitignore
index 4a8926e..cb633e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ ntfs-3g-2010.8.8.tgz
 /ntfs-3g-2010.10.2.tgz
 /ntfs-3g-2011.1.15.tgz
 /ntfs-3g_ntfsprogs-2011.4.12.tgz
+/ntfs-3g_ntfsprogs-2011.10.9-RC.tgz
diff --git a/ntfs-3g.spec b/ntfs-3g.spec
index 706b92c..b1c1528 100644
--- a/ntfs-3g.spec
+++ b/ntfs-3g.spec
@@ -3,12 +3,12 @@
 %define with_externalfuse %{?_with_externalfuse:1}%{!?_with_externalfuse:0}
 
 # For release candidates
-# %%global subver -RC
+%global subver -RC
 
 Name:		ntfs-3g
 Summary:	Linux NTFS userspace driver
-Version:	2011.4.12
-Release:	5%{?dist}
+Version:	2011.10.9
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://tuxera.com/opensource/%{name}_ntfsprogs-%{version}%{?subver}.tgz
@@ -25,16 +25,7 @@ Epoch:		2
 Provides:	ntfsprogs-fuse = %{epoch}:%{version}-%{release}
 Obsoletes:	ntfsprogs-fuse
 Provides:	fuse-ntfs-3g = %{epoch}:%{version}-%{release}
-Patch0:		ntfs-3g-2011.4.12-ntfsprogs-header-fix.patch
-Patch1:		ntfs-3g_ntfsprogs-2011.4.12-enable-extras-option-full.patch
-# http://ntfs-3g.git.sourceforge.net/git/gitweb.cgi?p=ntfs-3g/ntfs-3g_ntfsprogs;a=commit;h=571dbc5784af042c94ed0f025c4d2d842c591d1f
-# https://bugzilla.redhat.com/show_bug.cgi?id=735862
-Patch2:		ntfs-3g_ntfsprogs-571dbc5784af042c94ed0f025c4d2d842c591d1f.patch
-# http://ntfs-3g.git.sourceforge.net/git/gitweb.cgi?p=ntfs-3g/ntfs-3g_ntfsprogs;a=blobdiff;f=ntfsprogs/ntfsck.c;h=0964a4de57a385308f9b5bf61b04b25812e17b7f;hp=ff6946dfe286a87e0dafd4c6a509a8b7bc69625e;hb=HEAD;hpb=0289d1a6c31942609b96fdf2c1baeb7355fee2bc
-Patch3:		ntfsprogs-ntfsck-cleanups-from-git.patch
-# http://ntfs-3g.git.sourceforge.net/git/gitweb.cgi?p=ntfs-3g/ntfs-3g_ntfsprogs;a=blobdiff;f=ntfsprogs/ntfsfix.c;h=9b3d5eeb368ff85fa6ef3c18b44c2dcc2ba5ea07;hp=97a14a59b6318c0f2baa1c7a111bde3254e42d5a;hb=HEAD;hpb=44116675cad2055b326a9ac797c5105d78896475
-# bz 711662, 723562
-Patch4:		ntfsprogs-ntfsfix-cleanups-from-git.patch
+Patch0:		ntfs-3g_ntfsprogs-2011.10.9-RC-ntfsck-unsupported-return-0.patch
 
 %description
 NTFS-3G is a stable, open source, GPL licensed, POSIX, read/write NTFS 
@@ -75,12 +66,7 @@ included utilities see man 8 ntfsprogs after installation).
 
 %prep
 %setup -q -n %{name}_ntfsprogs-%{version}%{?subver}
-%patch0 -p1 -b .header-fix
-%patch1 -p1 -b .enable-extras
-%patch2 -p1 -b .735862
-%patch3 -p1 -b .fsckfixes
-%patch4 -p1 -b .ntfsfixfixes
-autoreconf -if
+%patch0 -p1 -b .unsupported
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -195,6 +181,10 @@ cp -a %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/
 %{_mandir}/man8/ntfs[^m][^o]*.8*
 
 %changelog
+* Tue Oct 11 2011 Tom Callaway <spot@fedoraproject.org> - 2:2011.10.9-1
+- 2011.10.9-RC
+- patch ntfsck to return 0 instead of 1 on unsupported filesystem cases
+
 * Mon Sep 12 2011 Tom Callaway <spot@fedoraproject.org> - 2:2011.4.12-5
 - fix ntfsck symlink (thanks to Chris Smart for catching it)
 
diff --git a/ntfs-3g_ntfsprogs-2011.10.9-RC-ntfsck-unsupported-return-0.patch b/ntfs-3g_ntfsprogs-2011.10.9-RC-ntfsck-unsupported-return-0.patch
new file mode 100644
index 0000000..8fd39c6
--- /dev/null
+++ b/ntfs-3g_ntfsprogs-2011.10.9-RC-ntfsck-unsupported-return-0.patch
@@ -0,0 +1,16 @@
+diff -up ntfs-3g_ntfsprogs-2011.10.9-RC/ntfsprogs/ntfsck.c.OLD ntfs-3g_ntfsprogs-2011.10.9-RC/ntfsprogs/ntfsck.c
+--- ntfs-3g_ntfsprogs-2011.10.9-RC/ntfsprogs/ntfsck.c.OLD	2011-10-11 10:24:02.381335115 -0400
++++ ntfs-3g_ntfsprogs-2011.10.9-RC/ntfsprogs/ntfsck.c	2011-10-11 10:26:41.513559206 -0400
+@@ -877,7 +877,11 @@ int main(int argc, char **argv)
+ 	if (errors)
+ 		return 2;
+ 	if (unsupported)
+-		return 1;
++		ntfs_log_info("ntfsck was unable to run properly.\n");
++		// If we return 1 here, we fail for ntfs services fscking on boot just because
++		// ntfsck isn't smart enough to handle 99% of cases. So, we just return 0.
++		// return 1;
++		return 0;
+ 	return 0;
+ }
+ 
diff --git a/sources b/sources
index 85a757f..2c7d4ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c4ce318373b15332239a77a9d2a39fe  ntfs-3g_ntfsprogs-2011.4.12.tgz
+c8dfbb6ae78f10499188b06234cd72e5  ntfs-3g_ntfsprogs-2011.10.9-RC.tgz