rpms/e2fsprogs/devel .cvsignore, 1.17, 1.18 e2fsprogs-1.40.4-sb_feature_check_ignore.patch, 1.2, 1.3 e2fsprogs.spec, 1.96, 1.97 sources, 1.17, 1.18 e2fsprogs-1.39-blkid-devmapper.patch, 1.2, NONE e2fsprogs-1.39-mkinstalldirs.patch, 1.3, NONE e2fsprogs-1.40.4-big-inodes.patch, 1.2, NONE e2fsprogs-1.40.4-blkid-ext4dev.patch, 1.1, NONE e2fsprogs-1.40.4-no-static-e2fsck.patch, 1.1, NONE e2fsprogs-1.40.4-uuidd-tidy.patch, 1.2, NONE

Eric Sandeen (sandeen) fedora-extras-commits at redhat.com
Wed Jan 30 04:12:06 UTC 2008 

Author: sandeen

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

Modified Files:
	.cvsignore e2fsprogs-1.40.4-sb_feature_check_ignore.patch 
	e2fsprogs.spec sources 
Removed Files:
	e2fsprogs-1.39-blkid-devmapper.patch 
	e2fsprogs-1.39-mkinstalldirs.patch 
	e2fsprogs-1.40.4-big-inodes.patch 
	e2fsprogs-1.40.4-blkid-ext4dev.patch 
	e2fsprogs-1.40.4-no-static-e2fsck.patch 
	e2fsprogs-1.40.4-uuidd-tidy.patch 
Log Message:
* Mon Jan 28 2008 Eric Sandeen <esandeen at redhat.com> 1.40.5-1
- New upstream version, drop several now-upstream patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Jan 2008 22:29:42 -0000	1.17
+++ .cvsignore	30 Jan 2008 04:11:16 -0000	1.18
@@ -1 +1 @@
-e2fsprogs-1.40.4.tar.gz
+e2fsprogs-1.40.5.tar.gz

e2fsprogs-1.40.4-sb_feature_check_ignore.patch:

Index: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs-1.40.4-sb_feature_check_ignore.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- e2fsprogs-1.40.4-sb_feature_check_ignore.patch	24 Jan 2008 22:54:08 -0000	1.2
+++ e2fsprogs-1.40.4-sb_feature_check_ignore.patch	30 Jan 2008 04:11:16 -0000	1.3
@@ -1,41 +1,35 @@
-Index: e2fsprogs-1.40.4/e2fsck/super.c
+Index: e2fsprogs-1.40.5/e2fsck/super.c
 ===================================================================
---- e2fsprogs-1.40.4.orig/e2fsck/super.c
-+++ e2fsprogs-1.40.4/e2fsck/super.c
-@@ -814,10 +814,32 @@ int check_backup_super_block(e2fsck_t ct
+--- e2fsprogs-1.40.5.orig/e2fsck/super.c
++++ e2fsprogs-1.40.5/e2fsck/super.c
+@@ -793,7 +793,11 @@ void check_super_block(e2fsck_t ctx)
+  * unfortunately, we shouldn't ignore it since if it's not set in the
+  * backup, the extended attributes in the filesystem will be stripped
+  * away.
++ *
++ * Well, I'm still going that route for now, 'til I do something
++ * better.  Full-fsck after a fresh install is just no good.  -ERS
+  */
++#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)
+@@ -837,6 +841,9 @@ 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 & ~FEATURE_COMPAT_IGNORE))
-+#define SUPER_INCOMPAT_DIFFERENT(x)	\
-+	(( fs->super->x & ~FEATURE_INCOMPAT_IGNORE) !=	\
-+	 (tfs->super->x & ~FEATURE_INCOMPAT_IGNORE))
-+#define SUPER_RO_COMPAT_DIFFERENT(x)	\
-+	(( fs->super->x & ~FEATURE_RO_COMPAT_IGNORE) !=	\
-+	 (tfs->super->x & ~FEATURE_RO_COMPAT_IGNORE))
-+#define SUPER_DIFFERENT(x)		\
-+	(fs->super->x != tfs->super->x)
-+
+ #define SUPER_INCOMPAT_DIFFERENT(x)	\
+ 	(( fs->super->x & ~FEATURE_INCOMPAT_IGNORE) !=	\
+ 	 (tfs->super->x & ~FEATURE_INCOMPAT_IGNORE))
+@@ -846,7 +853,7 @@ int check_backup_super_block(e2fsck_t ct
+ #define SUPER_DIFFERENT(x)		\
+ 	(fs->super->x != tfs->super->x)
+ 
+-		if (SUPER_DIFFERENT(s_feature_compat) ||
 +		if (SUPER_COMPAT_DIFFERENT(s_feature_compat) ||
-+		    SUPER_INCOMPAT_DIFFERENT(s_feature_incompat) ||
-+		    SUPER_RO_COMPAT_DIFFERENT(s_feature_ro_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.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- e2fsprogs.spec	24 Jan 2008 22:54:08 -0000	1.96
+++ e2fsprogs.spec	30 Jan 2008 04:11:16 -0000	1.97
@@ -3,8 +3,8 @@
 
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
-Version: 1.40.4
-Release: 7%{?dist}
+Version: 1.40.5
+Release: 1%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -13,21 +13,14 @@
 Source1: ext2_types-wrapper.h
 Source2: blkid_types-wrapper.h
 Source3: uuidd.init
-Patch1: e2fsprogs-1.39-blkid-devmapper.patch
-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
-Patch7: e2fsprogs-1.40.4-no-static-e2fsck.patch
-Patch8: e2fsprogs-1.40.4-big-inodes.patch
+Patch1: e2fsprogs-1.38-etcblkid.patch
+Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
-BuildRequires: gettext, texinfo, autoconf, automake >= 1.10, libselinux-devel
-BuildRequires: libsepol-devel, gettext-devel, pkgconfig
-BuildRequires: device-mapper-devel gawk
+BuildRequires: pkgconfig, texinfo, libselinux-devel
+BuildRequires: libsepol-devel, device-mapper-devel
 
 %description
 The e2fsprogs package contains a number of utilities for creating,
@@ -92,27 +85,15 @@
 
 %prep
 %setup -q -n e2fsprogs-%{version}
-# look at device mapper devices
-%patch1 -p1 -b .dm
 # put blkid.tab in /etc/blkid/
-%patch2 -p1 -b .etcblkid
-# Fix for newer autoconf (#220715)
-%patch3 -p1 -b .mkinstalldirs
-# uuidd manpage tidyup
-%patch4 -p1 -b .uuidd-tidy
+%patch1 -p1 -b .etcblkid
 # 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
-# completely clobber e2fsck.static build
-%patch7 -p1 -b .e2fsck-static
-# make 256-byte inodes in most cases
-%patch8 -p1 -b .biginodes
+# mildly unsafe but 'til I get something better, avoid full fsck
+# after an selinux install...
+%patch2 -p1 -b .featurecheck
 
 %build
-aclocal
-autoconf
-%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux --enable-dynamic-e2fsck
+%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
 make %{?_smp_mflags}
 
 %install
@@ -297,6 +278,9 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Mon Jan 28 2008 Eric Sandeen <esandeen at redhat.com> 1.40.5-1
+- New upstream version, drop several now-upstream patches.
+
 * Thu Jan 24 2008 Eric Sandeen <sandeen at redhat.com> 1.40.4-7
 - Fix sb flag comparisons properly this time (#428893)
 - Make 256-byte inodes for the [default] mkfs case.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Jan 2008 22:29:42 -0000	1.17
+++ sources	30 Jan 2008 04:11:16 -0000	1.18
@@ -1 +1 @@
-124d744bdf9d443591eb8193c085944b  e2fsprogs-1.40.4.tar.gz
+69e55eaf543acfab8e2eb8ba2883d8cd  e2fsprogs-1.40.5.tar.gz


--- e2fsprogs-1.39-blkid-devmapper.patch DELETED ---


--- e2fsprogs-1.39-mkinstalldirs.patch DELETED ---


--- e2fsprogs-1.40.4-big-inodes.patch DELETED ---


--- e2fsprogs-1.40.4-blkid-ext4dev.patch DELETED ---


--- e2fsprogs-1.40.4-no-static-e2fsck.patch DELETED ---


--- e2fsprogs-1.40.4-uuidd-tidy.patch DELETED ---

More information about the fedora-extras-commits mailing list