rpms/e2fsprogs/devel e2fsprogs-1.40.4-sb_feature_check_ignore.patch, NONE, 1.1 e2fsprogs.spec, 1.93, 1.94

[Eric Sandeen (sandeen)]

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14498

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.40.4-sb_feature_check_ignore.patch 
Log Message:
* Wed Jan 23 2008 Eric Sandeen <sandeen at redhat.com> 1.40.4-5
- ignore some primary/backup superblock flag differences (#428893)
- teach libblkid about ext4dev


e2fsprogs-1.40.4-sb_feature_check_ignore.patch:

--- NEW FILE e2fsprogs-1.40.4-sb_feature_check_ignore.patch ---
Index: e2fsprogs-1.40.4/e2fsck/super.c
===================================================================
--- e2fsprogs-1.40.4.orig/e2fsck/super.c
+++ e2fsprogs-1.40.4/e2fsck/super.c
@@ -814,10 +814,29 @@ int check_backup_super_block(e2fsck_t ct
 			continue;
 		}
 
-#define SUPER_DIFFERENT(x) (fs->super->x != tfs->super->x)
-		if (SUPER_DIFFERENT(s_feature_compat) ||
-		    SUPER_DIFFERENT(s_feature_incompat) ||
-		    SUPER_DIFFERENT(s_feature_ro_compat) ||
+		/*
+		 * A few flags are set on the fly by the kernel, but
+		 * only in the primary superblock.  They are safe
+	 	 * to copy even if they differ.
+	 	 */ 
+
+#define FEATURE_COMPAT_IGNORE		(EXT2_FEATURE_COMPAT_EXT_ATTR)
+#define FEATURE_RO_COMPAT_IGNORE	(EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
+					 EXT4_FEATURE_RO_COMPAT_DIR_NLINK)
+#define FEATURE_INCOMPAT_IGNORE		(EXT3_FEATURE_INCOMPAT_EXTENTS)
+
+#define SUPER_COMPAT_DIFFERENT(x)	\
+	((fs->super->x & ~FEATURE_COMPAT_IGNORE) != tfs->super->x)
+#define SUPER_INCOMPAT_DIFFERENT(x)	\
+	((fs->super->x & ~FEATURE_INCOMPAT_IGNORE) != tfs->super->x)
+#define SUPER_RO_COMPAT_DIFFERENT(x)	\
+	((fs->super->x & ~FEATURE_RO_COMPAT_IGNORE) != tfs->super->x)
+#define SUPER_DIFFERENT(x)		\
+	(fs->super->x != tfs->super->x)
+
+		if (SUPER_COMPAT_DIFFERENT(s_feature_compat) ||
+		    SUPER_INCOMPAT_DIFFERENT(s_feature_incompat) ||
+		    SUPER_RO_COMPAT_DIFFERENT(s_feature_ro_compat) ||
 		    SUPER_DIFFERENT(s_blocks_count) ||
 		    SUPER_DIFFERENT(s_inodes_count) ||
 		    memcmp(fs->super->s_uuid, tfs->super->s_uuid,


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- e2fsprogs.spec	15 Jan 2008 18:16:43 -0000	1.93
+++ e2fsprogs.spec	23 Jan 2008 20:43:41 -0000	1.94
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.40.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -17,6 +17,8 @@
 Patch2: e2fsprogs-1.38-etcblkid.patch
 Patch3: e2fsprogs-1.39-mkinstalldirs.patch
 Patch4: e2fsprogs-1.40.4-uuidd-tidy.patch
+Patch5: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
+Patch6: e2fsprogs-1.40.4-blkid-ext4dev.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -96,6 +98,10 @@
 %patch3 -p1 -b .mkinstalldirs
 # uuidd manpage tidyup
 %patch4 -p1 -b .uuidd-tidy
+# ignore some flag differences on primary/backup sb feature checks
+%patch5 -p1 -b .featurecheck
+# teach blkid about ext4dev, for now
+%patch6 -p1 -b .ext4-blkid
 
 %build
 aclocal
@@ -285,6 +291,10 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Wed Jan 23 2008 Eric Sandeen <sandeen at redhat.com> 1.40.4-5
+- ignore some primary/backup superblock flag differences (#428893)
+- teach libblkid about ext4dev
+
 * Mon Jan 10 2008 Eric Sandeen <sandeen at redhat.com> 1.40.4-4
 - Build e2fsck as a dynamically linked binary.
 - Re-fix uidd manpage default paths.