Sat Jan 23 04:37:29 UTC 2010

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14458

Modified Files:
	e2fsprogs-1.38-etcblkid.patch 
	e2fsprogs-1.40.4-sb_feature_check_ignore.patch e2fsprogs.spec 
	sources 
Removed Files:
	e2fsprogs-1.41.4-debugfs-stat-segfault.patch 
	e2fsprogs-1.41.4-dev-mapper-names.patch 
	e2fsprogs-1.41.4-ext4-resize-fixes.patch 
	e2fsprogs-1.41.4-extent-open-leak.patch 
	e2fsprogs-1.41.4-fix-blkid-segfault.patch 
	e2fsprogs-1.41.4-fix-external-journals.patch 
	e2fsprogs-1.41.4-i_file_acl_high-fix.patch 
	e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch 
	e2fsprogs-1.41.4-libext2fs-info.patch 
	e2fsprogs-1.41.4-minimum-resize.patch 
	e2fsprogs-1.41.4-update-sb-journal-backup.patch 
Log Message:
* Fri Jan 22 2010 Eric Sandeen <sandeen at redhat.com> 1.41.9-1
- Update to current upstream


e2fsprogs-1.38-etcblkid.patch:
 RELEASE-NOTES           |    2 +-
 doc/libblkid.txt        |    4 ++--
 lib/blkid/Makefile.in   |    6 ++++--
 lib/blkid/blkidP.h      |    2 +-
 lib/blkid/libblkid.3.in |    4 ++--
 misc/blkid.8.in         |    4 ++--
 misc/blkid.c            |    2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)

Index: e2fsprogs-1.38-etcblkid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-11/e2fsprogs-1.38-etcblkid.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4

--- e2fsprogs-1.38-etcblkid.patch	2 Oct 2008 19:19:50 -0000	1.3
+++ e2fsprogs-1.38-etcblkid.patch	23 Jan 2010 04:37:28 -0000	1.4
@@ -1,7 +1,7 @@
-Index: e2fsprogs-1.41.1/doc/libblkid.txt
+Index: e2fsprogs-1.41.9/doc/libblkid.txt
 ===================================================================
---- e2fsprogs-1.41.1.orig/doc/libblkid.txt	2007-06-30 07:58:34.000000000 -0500
-+++ e2fsprogs-1.41.1/doc/libblkid.txt	2008-10-01 13:20:34.303063944 -0500
+--- e2fsprogs-1.41.9.orig/doc/libblkid.txt
++++ e2fsprogs-1.41.9/doc/libblkid.txt
 @@ -58,7 +58,7 @@ type, or label, or uuid for a particular
  	}
  
@@ -20,10 +20,10 @@ Index: e2fsprogs-1.41.1/doc/libblkid.txt
  
  If you have called blkid_get_cache(), you should call blkid_put_cache()
  when you are done using the blkid library functions.  This will save the
-Index: e2fsprogs-1.41.1/misc/blkid.8.in
+Index: e2fsprogs-1.41.9/misc/blkid.8.in
 ===================================================================
---- e2fsprogs-1.41.1.orig/misc/blkid.8.in	2008-08-24 23:19:56.000000000 -0500
-+++ e2fsprogs-1.41.1/misc/blkid.8.in	2008-10-01 13:20:34.303063944 -0500
+--- e2fsprogs-1.41.9.orig/misc/blkid.8.in
++++ e2fsprogs-1.41.9/misc/blkid.8.in
 @@ -55,7 +55,7 @@ more devices.
  Read from
  .I cachefile
@@ -42,10 +42,10 @@ Index: e2fsprogs-1.41.1/misc/blkid.8.in
  If you don't want to save the cache to the default file, specify
  .IR /dev/null.
  If not specified it will be the same file as that given by the
-Index: e2fsprogs-1.41.1/misc/blkid.c
+Index: e2fsprogs-1.41.9/misc/blkid.c
 ===================================================================
---- e2fsprogs-1.41.1.orig/misc/blkid.c	2008-08-28 09:26:31.000000000 -0500
-+++ e2fsprogs-1.41.1/misc/blkid.c	2008-10-01 13:20:54.787002093 -0500
+--- e2fsprogs-1.41.9.orig/misc/blkid.c
++++ e2fsprogs-1.41.9/misc/blkid.c
 @@ -52,7 +52,7 @@ static void usage(int error)
  	fprintf(out,
  		"usage:\t%s [-c <file>] [-ghlLv] [-o format] "
@@ -55,23 +55,23 @@ Index: e2fsprogs-1.41.1/misc/blkid.c
  		"\t-h\tprint this usage message and exit\n"
  		"\t-g\tgarbage collect the blkid cache\n"
  		"\t-s\tshow specified tag(s) (default show all tags)\n"
-Index: e2fsprogs-1.41.1/lib/blkid/Makefile.in
+Index: e2fsprogs-1.41.9/lib/blkid/Makefile.in
 ===================================================================
---- e2fsprogs-1.41.1.orig/lib/blkid/Makefile.in	2008-08-28 09:26:31.000000000 -0500
-+++ e2fsprogs-1.41.1/lib/blkid/Makefile.in	2008-10-01 13:20:34.338002746 -0500
+--- e2fsprogs-1.41.9.orig/lib/blkid/Makefile.in
++++ e2fsprogs-1.41.9/lib/blkid/Makefile.in
 @@ -142,9 +142,10 @@ blkid.pc: $(srcdir)/blkid.pc.in $(top_bu
- 	@cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
+ 	$(Q) cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
  
  installdirs::
--	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/blkid"
-+	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/blkid /etc/blkid"
- 	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+-	$(E) "	MKINSTALLDIRS $(libdir) $(includedir)/blkid"
++	$(E) "  MKINSTALLDIRS $(libdir) $(includedir)/blkid /etc/blkid"
+ 	$(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
 -		$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
 +		$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig \
 +		$(DESTDIR)/etc/blkid
  
  install:: all installdirs 
- 	@echo "	INSTALL_DATA $(libdir)/libblkid.a"
+ 	$(E) "	INSTALL_DATA $(libdir)/libblkid.a"
 @@ -170,6 +171,7 @@ uninstall::
  	$(RM) -f $(DESTDIR)$(libdir)/libblkid.a \
  		$(DESTDIR)$(libdir)/pkgconfig/blkid.pc
@@ -80,10 +80,10 @@ Index: e2fsprogs-1.41.1/lib/blkid/Makefi
  	for i in $(SMANPAGES); do \
  		$(RM) -f $(DESTDIR)$(man3dir)/$$i; \
  	done
-Index: e2fsprogs-1.41.1/lib/blkid/libblkid.3.in
+Index: e2fsprogs-1.41.9/lib/blkid/libblkid.3.in
 ===================================================================
---- e2fsprogs-1.41.1.orig/lib/blkid/libblkid.3.in	2008-08-24 23:19:56.000000000 -0500
-+++ e2fsprogs-1.41.1/lib/blkid/libblkid.3.in	2008-10-01 13:21:23.992001339 -0500
+--- e2fsprogs-1.41.9.orig/lib/blkid/libblkid.3.in
++++ e2fsprogs-1.41.9/lib/blkid/libblkid.3.in
 @@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
  specific block device names into configuration files.
  .P
@@ -102,10 +102,10 @@ Index: e2fsprogs-1.41.1/lib/blkid/libblk
  Caches data extracted from each recognized block device.
  .SH AVAILABILITY
  .B libblkid
-Index: e2fsprogs-1.41.1/lib/blkid/blkidP.h
+Index: e2fsprogs-1.41.9/lib/blkid/blkidP.h
 ===================================================================
---- e2fsprogs-1.41.1.orig/lib/blkid/blkidP.h	2008-08-28 09:26:31.000000000 -0500
-+++ e2fsprogs-1.41.1/lib/blkid/blkidP.h	2008-10-01 13:21:39.192001091 -0500
+--- e2fsprogs-1.41.9.orig/lib/blkid/blkidP.h
++++ e2fsprogs-1.41.9/lib/blkid/blkidP.h
 @@ -104,7 +104,7 @@ struct blkid_struct_cache
  extern char *blkid_strdup(const char *s);
  extern char *blkid_strndup(const char *s, const int length);
@@ -115,11 +115,11 @@ Index: e2fsprogs-1.41.1/lib/blkid/blkidP
  
  #define BLKID_ERR_IO	 5
  #define BLKID_ERR_PROC	 9
-Index: e2fsprogs-1.41.1/RELEASE-NOTES
+Index: e2fsprogs-1.41.9/RELEASE-NOTES
 ===================================================================
---- e2fsprogs-1.41.1.orig/RELEASE-NOTES	2008-09-01 15:01:14.000000000 -0500
-+++ e2fsprogs-1.41.1/RELEASE-NOTES	2008-10-01 13:20:34.383001892 -0500
-@@ -2460,7 +2460,7 @@ label.
+--- e2fsprogs-1.41.9.orig/RELEASE-NOTES
++++ e2fsprogs-1.41.9/RELEASE-NOTES
+@@ -3130,7 +3130,7 @@ label.
  
  Fixed a bug in the blkid library wihch could avoid an infinite loop
  in blkid_find_dev_with_tag() if /proc is not mounted and there the

e2fsprogs-1.40.4-sb_feature_check_ignore.patch:
 super.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Index: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-11/e2fsprogs-1.40.4-sb_feature_check_ignore.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- e2fsprogs-1.40.4-sb_feature_check_ignore.patch	30 Jan 2008 04:11:16 -0000	1.3
+++ e2fsprogs-1.40.4-sb_feature_check_ignore.patch	23 Jan 2010 04:37:28 -0000	1.4
@@ -1,8 +1,8 @@
-Index: e2fsprogs-1.40.5/e2fsck/super.c
+Index: e2fsprogs-1.41.9/e2fsck/super.c
 ===================================================================
---- 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)
+--- e2fsprogs-1.41.9.orig/e2fsck/super.c
++++ e2fsprogs-1.41.9/e2fsck/super.c
+@@ -876,7 +876,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.
@@ -13,20 +13,20 @@ Index: e2fsprogs-1.40.5/e2fsck/super.c
 +#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
+ #define FEATURE_INCOMPAT_IGNORE		(EXT3_FEATURE_INCOMPAT_EXTENTS| \
+@@ -928,6 +932,9 @@ int check_backup_super_block(e2fsck_t ct
+ 		    (EXT2_INODE_SIZE(backup_sb) < EXT2_GOOD_OLD_INODE_SIZE))
  			continue;
- 		}
  
 +#define SUPER_COMPAT_DIFFERENT(x)	\
-+	(( fs->super->x & ~FEATURE_COMPAT_IGNORE) !=	\
-+	 (tfs->super->x & ~FEATURE_COMPAT_IGNORE))
++	((fs->super->x & ~FEATURE_COMPAT_IGNORE) !=	\
++	 (backup_sb->x & ~FEATURE_COMPAT_IGNORE))
  #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
+ 	((fs->super->x & ~FEATURE_INCOMPAT_IGNORE) !=	\
+ 	 (backup_sb->x & ~FEATURE_INCOMPAT_IGNORE))
+@@ -937,7 +944,7 @@ int check_backup_super_block(e2fsck_t ct
  #define SUPER_DIFFERENT(x)		\
- 	(fs->super->x != tfs->super->x)
+ 	(fs->super->x != backup_sb->x)
  
 -		if (SUPER_DIFFERENT(s_feature_compat) ||
 +		if (SUPER_COMPAT_DIFFERENT(s_feature_compat) ||


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-11/e2fsprogs.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- e2fsprogs.spec	24 Jun 2009 17:35:17 -0000	1.137
+++ e2fsprogs.spec	23 Jan 2010 04:37:28 -0000	1.138
@@ -3,10 +3,9 @@
 
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
-Version: 1.41.4
-Release: 12%{?dist}
-# License based on upstream-modified COPYING file,
-# which clearly states "V2" intent.
+Version: 1.41.9
+Release: 1%{?dist}
+# License tags based on COPYING file distinctions for various components
 License: GPLv2
 Group: System Environment/Base
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -17,17 +16,8 @@ Patch1: e2fsprogs-1.38-etcblkid.patch
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
 
 # These are all upstream, or headed there.
-Patch3: e2fsprogs-1.41.4-debugfs-stat-segfault.patch
-Patch4: e2fsprogs-1.41.4-libext2fs-info.patch
-Patch5: e2fsprogs-1.41.4-fix-blkid-segfault.patch
-Patch6: e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch
-Patch7: e2fsprogs-1.41.4-ext4-resize-fixes.patch 
-Patch8: e2fsprogs-1.41.4-fix-external-journals.patch
-Patch9: e2fsprogs-1.41.4-i_file_acl_high-fix.patch
-Patch10: e2fsprogs-1.41.4-minimum-resize.patch
-Patch11: e2fsprogs-1.41.4-update-sb-journal-backup.patch
-Patch12: e2fsprogs-1.41.4-extent-open-leak.patch
-Patch13: e2fsprogs-1.41.4-dev-mapper-names.patch
+Patch3: e2fsprogs-resize-minimum-fix.patch
+Patch4: e2fsprogs-1.41.9-24hr-fsck-grace.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -105,28 +95,8 @@ SMP systems.
 # mildly unsafe but 'til I get something better, avoid full fsck
 # after an selinux install...
 %patch2 -p1 -b .featurecheck
-# Fix segfault in debugfs "stat" if fs not open
-%patch3 -p1 -b .statfs
-# Fix up name of info file
-%patch4 -p1 -b .info
-# Fix blkid segfault in modules.dep scanning
-%patch5 -p1 -b .info
-# Ignore NEEDS_RECOVERY mismatch
-%patch6 -p1 -b .recovery
-# Fix ext4 resize issues
-%patch7 -p1 -b .resize
-# Fix external journals
-%patch8 -p1 -b .ext-journal
-# e2fsck: On a 32-bit filesystem, make sure i_file_acl_high is zero
-%patch9 -p1 -b .acl_hi
-# Fix minimum resize calculation and enforce it
-%patch10 -p1 -b .resize_min
-# Update sb journal backup blocks on resize
-%patch11 -p1 -b .resize_sb_backup
-# Fix memory leak in extent handling
-%patch12 -p1 -b .extent_leak
-# Fix devicemapper names
-%patch13 -p1 -b .devmapper_names
+%patch3 -p1 -b .resize
+%patch4 -p1 -b .24hr
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -227,6 +197,7 @@ fi
 %{_root_sbindir}/resize2fs
 %{_root_sbindir}/tune2fs
 %{_sbindir}/filefrag
+%{_sbindir}/e2freefrag
 %{_sbindir}/mklost+found
 
 %{_bindir}/chattr
@@ -246,6 +217,7 @@ fi
 %{_mandir}/man8/e2fsck.8*
 %{_mandir}/man8/findfs.8*
 %{_mandir}/man8/filefrag.8*
+%{_mandir}/man8/e2freefrag.8*
 %{_mandir}/man8/fsck.ext2.8*
 %{_mandir}/man8/fsck.ext3.8*
 %{_mandir}/man8/fsck.ext4.8*
@@ -325,6 +297,9 @@ fi
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Fri Jan 22 2010 Eric Sandeen <sandeen at redhat.com> 1.41.9-1
+- Update to current upstream
+
 * Wed Jun 24 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-12
 - blkid: use /dev/mapper/<name> vs /dev/dm-<N> (#497259)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-11/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	29 Jan 2009 22:20:37 -0000	1.29
+++ sources	23 Jan 2010 04:37:28 -0000	1.30
@@ -1 +1 @@
-59033388df36987d2b9c9bbf7e19bd57  e2fsprogs-1.41.4.tar.gz
+52f60a9e19a02f142f5546f1b5681927  e2fsprogs-1.41.9.tar.gz


--- e2fsprogs-1.41.4-debugfs-stat-segfault.patch DELETED ---


--- e2fsprogs-1.41.4-dev-mapper-names.patch DELETED ---


--- e2fsprogs-1.41.4-ext4-resize-fixes.patch DELETED ---


--- e2fsprogs-1.41.4-extent-open-leak.patch DELETED ---


--- e2fsprogs-1.41.4-fix-blkid-segfault.patch DELETED ---


--- e2fsprogs-1.41.4-fix-external-journals.patch DELETED ---


--- e2fsprogs-1.41.4-i_file_acl_high-fix.patch DELETED ---


--- e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch DELETED ---


--- e2fsprogs-1.41.4-libext2fs-info.patch DELETED ---


--- e2fsprogs-1.41.4-minimum-resize.patch DELETED ---


--- e2fsprogs-1.41.4-update-sb-journal-backup.patch DELETED ---

