Thu Jul 26 18:49:31 UTC 2007

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28284

Modified Files:
	.cvsignore e2fsprogs-1.39-blkid-devmapper.patch e2fsprogs.spec 
	sources 
Added Files:
	e2fsprogs-1.40.2-swapfs.patch 
	e2fsprogs-1.40.2-warning-fixes.patch 
Removed Files:
	e2fsprogs-1.39-32_bit_inodes.patch 
	e2fsprogs-1.39-blkid-devname.patch 
	e2fsprogs-1.39-blkid-fatlabel.patch 
	e2fsprogs-1.39-blkid-gfs.patch 
	e2fsprogs-1.39-close-on-error.patch 
	e2fsprogs-1.39-e2p_percent.patch 
	e2fsprogs-1.39-e2p_percent_div.patch 
	e2fsprogs-1.39-ext2fs_div_ceil.patch 
	e2fsprogs-1.39-fix-loop-wraps.patch 
	e2fsprogs-1.39-fix_formats.patch 
	e2fsprogs-1.39-group_block_inlines.patch 
	e2fsprogs-1.39-group_desc_loops.patch 
	e2fsprogs-1.39-large_file_size.patch e2fsprogs-1.39-leak.patch 
	e2fsprogs-1.39-more_rounding_overflows.patch 
	e2fsprogs-1.39-unused_group_blocks.patch 
	e2fsprogs-1.39-uuid.patch 
Log Message:
Pull in 1.40.2 from devel


e2fsprogs-1.40.2-swapfs.patch:

--- NEW FILE e2fsprogs-1.40.2-swapfs.patch ---
>From db9097caca17401313c0dc840b4ae683e5b5c1df Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen at redhat.com>
Date: Tue, 17 Jul 2007 20:40:25 -0500
Subject: [PATCH] Fix big-endian byte-swapping bug in ext2fs_swap_inode_full()

We need to set t->i_file_acl before we test it in
ext2fs_inode_data_blocks()

Signed-off-by: Eric Sandeen <sandeen at redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---
 lib/ext2fs/swapfs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
index a40caa9..6576c59 100644
--- a/lib/ext2fs/swapfs.c
+++ b/lib/ext2fs/swapfs.c
@@ -150,6 +150,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
 	t->i_dtime = ext2fs_swab32(f->i_dtime);
 	t->i_gid = ext2fs_swab16(f->i_gid);
 	t->i_links_count = ext2fs_swab16(f->i_links_count);
+	t->i_file_acl = ext2fs_swab32(f->i_file_acl);
 	if (hostorder)
 		has_data_blocks = ext2fs_inode_data_blocks(fs, 
 					   (struct ext2_inode *) f);
@@ -158,7 +159,6 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
 		has_data_blocks = ext2fs_inode_data_blocks(fs, 
 					   (struct ext2_inode *) t);
 	t->i_flags = ext2fs_swab32(f->i_flags);
-	t->i_file_acl = ext2fs_swab32(f->i_file_acl);
 	t->i_dir_acl = ext2fs_swab32(f->i_dir_acl);
 	if (!islnk || has_data_blocks ) {
 		for (i = 0; i < EXT2_N_BLOCKS; i++)


e2fsprogs-1.40.2-warning-fixes.patch:

--- NEW FILE e2fsprogs-1.40.2-warning-fixes.patch ---
Index: e2fsprogs-1.40.2/misc/badblocks.c
===================================================================
--- e2fsprogs-1.40.2.orig/misc/badblocks.c
+++ e2fsprogs-1.40.2/misc/badblocks.c
@@ -992,7 +992,7 @@ int main (int argc, char ** argv)
 		last_block = strtoul (argv[optind], &tmp, 0);
 		printf("last_block = %d (%s)\n", last_block, argv[optind]);
 		if (*tmp || errno || 
-		    (last_block == ULONG_MAX && errno == ERANGE)) {
+		    (last_block == UINT_MAX && errno == ERANGE)) {
 			com_err (program_name, 0, _("invalid blocks count - %s"),
 				 argv[optind]);
 			exit (1);
@@ -1005,7 +1005,7 @@ int main (int argc, char ** argv)
 		from_count = strtoul (argv[optind], &tmp, 0);
 		printf("from_count = %d\n", from_count);
 		if (*tmp || errno ||
-		    (from_count == ULONG_MAX && errno == ERANGE)) {
+		    (from_count == UINT_MAX && errno == ERANGE)) {
 			com_err (program_name, 0, _("invalid starting block - %s"),
 				 argv[optind]);
 			exit (1);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-7/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Jul 2006 20:54:40 -0000	1.15
+++ .cvsignore	26 Jul 2007 18:48:58 -0000	1.16
@@ -1 +1 @@
-e2fsprogs-1.39.tar.gz
+e2fsprogs-1.40.2.tar.gz

e2fsprogs-1.39-blkid-devmapper.patch:

Index: e2fsprogs-1.39-blkid-devmapper.patch
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-7/e2fsprogs-1.39-blkid-devmapper.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- e2fsprogs-1.39-blkid-devmapper.patch	6 Jul 2006 20:54:40 -0000	1.1
+++ e2fsprogs-1.39-blkid-devmapper.patch	26 Jul 2007 18:48:58 -0000	1.2
@@ -1,68 +1,3 @@
---- e2fsprogs-1.39/debugfs/Makefile.in.dm	2005-09-06 05:40:13.000000000 -0400
-+++ e2fsprogs-1.39/debugfs/Makefile.in	2006-07-06 14:11:32.000000000 -0400
-@@ -27,7 +27,7 @@
- 
- LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \
- 	$(LIBUUID) $(DLOPEN_LIB)
--DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID)
-+DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
- 
- .c.o:
- 	@echo "	CC $<"
---- e2fsprogs-1.39/MCONFIG.in.dm	2006-03-22 20:19:19.000000000 -0500
-+++ e2fsprogs-1.39/MCONFIG.in	2006-07-06 14:11:32.000000000 -0400
-@@ -79,6 +79,7 @@
- LIBBLKID = $(LIB)/libblkid at LIB_EXT@ $(DEVMAPPER_LIBS)
- LIBINTL = @LIBINTL@
- DEPLIBUUID = $(LIB)/libuuid at LIB_EXT@
-+DEPLIBBLKID = $(LIB)/libblkid at LIB_EXT@
- 
- STATIC_LIBSS = $(LIB)/libss at STATIC_LIB_EXT@
- STATIC_LIBCOM_ERR = $(LIB)/libcom_err at STATIC_LIB_EXT@
-@@ -87,6 +88,7 @@
- STATIC_LIBUUID = $(LIB)/libuuid at STATIC_LIB_EXT@ @SOCKET_LIB@ 
- STATIC_LIBBLKID = $(LIB)/libblkid at STATIC_LIB_EXT@ $(STATIC_DEVMAPPER_LIBS)
- DEPSTATIC_LIBUUID = $(LIB)/libuuid at STATIC_LIB_EXT@
-+DEPSTATIC_LIBBLKID = $(LIB)/libblkid at STATIC_LIB_EXT@
- 
- PROFILED_LIBSS = $(LIB)/libss at PROFILED_LIB_EXT@
- PROFILED_LIBCOM_ERR = $(LIB)/libcom_err at PROFILED_LIB_EXT@
---- e2fsprogs-1.39/misc/Makefile.in.dm	2006-07-06 14:13:57.000000000 -0400
-+++ e2fsprogs-1.39/misc/Makefile.in	2006-07-06 14:14:27.000000000 -0400
-@@ -55,7 +55,7 @@
- STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
- 
- LIBS_BLKID= $(LIBBLKID) $(LIBUUID)
--DEPLIBS_BLKID= $(LIBBLKID) $(DEPLIBUUID)
-+DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID)
- 
- LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) 
- DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) 
---- e2fsprogs-1.39/e2fsck/Makefile.in.dm	2006-03-27 00:44:11.000000000 -0500
-+++ e2fsprogs-1.39/e2fsck/Makefile.in	2006-07-06 14:11:32.000000000 -0400
-@@ -18,11 +18,11 @@
- XTRA_CFLAGS=	-DRESOURCE_TRACK -I.
- 
- LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL)
--DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID)
-+DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
- 
- STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
- 	$(STATIC_LIBUUID) $(LIBINTL)
--STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
-+STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(DEPSTATIC_LIBBLKID) \
- 	$(DEPSTATIC_LIBUUID)
- 
- PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \
-@@ -119,7 +119,7 @@
- e2fsck.static: $(OBJS)  $(STATIC_DEPLIBS)
- 	@echo "	LD $@"
- 	@$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck.static $(OBJS) \
--		$(STATIC_LIBS) 
-+		$(STATIC_LIBS)
- 
- e2fsck.shared: $(OBJS)  $(DEPLIBS)
- 	@echo "	LD $@"
 --- e2fsprogs-1.39/configure.in.dm	2006-04-08 21:36:21.000000000 -0400
 +++ e2fsprogs-1.39/configure.in	2006-07-06 14:11:32.000000000 -0400
 @@ -494,11 +494,15 @@
@@ -71,8 +6,8 @@
  
 -	DEVMAPPER_REQ='libselinux libsepol'
 -	DEVMAPPER_PC_LIBS='-ldevmapper'
--	DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol'
--	STATIC_DEVMAPPER_LIBS='/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a'
+-	DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol -lpthread'
+-	STATIC_DEVMAPPER_LIBS='/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a -lpthread'
 -
 +	PKG_PROG_PKG_CONFIG()
 + 


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-7/e2fsprogs.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- e2fsprogs.spec	23 Feb 2007 11:41:09 -0000	1.70
+++ e2fsprogs.spec	26 Jul 2007 18:48:58 -0000	1.71
@@ -3,34 +3,19 @@
 
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
-Version: 1.39
-Release: 11
+Version: 1.40.2
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
-Patch29: e2fsprogs-1.39-close-on-error.patch
 Patch30: e2fsprogs-1.38-resize-inode.patch
 Patch32: e2fsprogs-1.38-no_pottcdate.patch
 Patch34: e2fsprogs-1.39-blkid-devmapper.patch
 Patch36: e2fsprogs-1.38-etcblkid.patch
-Patch37: e2fsprogs-1.39-blkid-gfs.patch
-Patch38: e2fsprogs-1.39-blkid-devname.patch
 Patch39: e2fsprogs-1.39-multilib.patch
-Patch40: e2fsprogs-1.39-leak.patch
-Patch41: e2fsprogs-1.39-blkid-fatlabel.patch
-Patch50: e2fsprogs-1.39-ext2fs_div_ceil.patch
-Patch51: e2fsprogs-1.39-fix-loop-wraps.patch
-Patch52: e2fsprogs-1.39-e2p_percent.patch
-Patch53: e2fsprogs-1.39-group_desc_loops.patch
-Patch54: e2fsprogs-1.39-unused_group_blocks.patch
-Patch55: e2fsprogs-1.39-fix_formats.patch
-Patch56: e2fsprogs-1.39-group_block_inlines.patch
-Patch57: e2fsprogs-1.39-32_bit_inodes.patch
-Patch58: e2fsprogs-1.39-more_rounding_overflows.patch
-Patch59: e2fsprogs-1.39-large_file_size.patch
-Patch60: e2fsprogs-1.39-e2p_percent_div.patch
-Patch61: e2fsprogs-1.39-uuid.patch
 Patch62: e2fsprogs-1.39-mkinstalldirs.patch
+Patch63: e2fsprogs-1.40.2-warning-fixes.patch
+Patch64: e2fsprogs-1.40.2-swapfs.patch
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
@@ -79,41 +64,22 @@
 
 %prep
 %setup -q -n e2fsprogs-%{version}
-# close fd's on error
-%patch29 -p1 -b .close-on-error
-# enable tune2fs to set and clear the resize inode
+# enable tune2fs to set and clear the resize inode (#167816)
 %patch30 -p1 -b .resize-inode
-# drop timestamp from mo files
+# drop timestamp from mo files (#168815/168814/245653)
 %patch32 -p1 -b .pottcdate
 # look at device mapper devices
 %patch34 -p1 -b .dm
 # put blkid.tab in /etc/blkid/
 %patch36 -p1 -b .etcblkid
-# GFS/GFS2 detection
-%patch37 -p1 -b .gfs
-# Fix device mapper names in blkid
-%patch38 -p1 -b .devname
-# Fix multilib conflicts
+# Fix multilib conflicts (#192665)
 %patch39 -p1 -b .multilib
-# Fix probing from leaking memory in error cases.
-%patch40 -p1 -b .leak
-# Fix poblem with empty FAT label.
-%patch41 -p1 -b .fatlabel
-# 32-bit 16T fixups
-%patch50 -p1 -b .ext2fs_div_ceil
-%patch51 -p1 -b .fix-loop-wraps
-%patch52 -p1 -b .e2p_percent
-%patch53 -p1 -b .group_desc_loops
-%patch54 -p1 -b .unused_group_blocks
-%patch55 -p1 -b .fix_formats
-%patch56 -p1 -b .group_block_inlines
-%patch57 -p1 -b .32_bit_inodes
-%patch58 -p1 -b .more_rounding_overflows
-%patch59 -p1 -b .large_file_size
-%patch60 -p1 -b .e2p_percent_div
-%patch61 -p1 -b .uuid
+# Fix for newer autoconf (#220715)
 %patch62 -p1 -b .mkinstalldirs
-
+# Fix type warning in badblocks
+%patch63 -p1 -b .warnings
+# Fix ext2fs_swap_inode_full() on bigendian boxes
+%patch64 -p1 -b .swapfs
 %build
 aclocal
 autoconf
@@ -264,6 +230,30 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Wed Jul 18 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-2
+- Fix bug in ext2fs_swap_inode_full() on big-endian boxes
+
+* Tue Jul 17 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-1
+- New version 1.40.2
+- Fix up warning in badblocks
+
+* Mon Jun 25 2007 Eric Sandeen <esandeen at redhat.com> 1.39-15
+- Fix up .po files to remove timestamps; multilib issues (#245653)
+
+* Fri Jun 22 2007 Eric Sandeen <esandeen at redhat.com> 1.39-14
+- Many coverity-found potential leaks, segfaults, etc (#239354)
+- Fix debugfs segfaults when no fs open (#208416, #209330)
+- Avoid recursive loops in logdump due to symlinks in /dev (#210371)
+- Don't write changes to the backup superblocks by default (#229561)
+- Correct byteswapping for fast symlinks with xattrs (#232663)
+- e2fsck: added sanity check for xattr validation (#230193)
+
+* Wed Jun 20 2007 Eric Sandeen <esandeen at redhat.com> 1.39-13
+- add dist tag to release field
+
+* Wed Jun 20 2007 Eric Sandeen <esandeen at redhat.com> 1.39-12
+- add LUKS support to libblkid (#242421)
+
 * Fri Feb 23 2007 Karsten Hopp <karsten at redhat.com> 1.39-11
 - fix post/preun requirements
 - use smp flags


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Jul 2006 20:54:40 -0000	1.15
+++ sources	26 Jul 2007 18:48:58 -0000	1.16
@@ -1 +1 @@
-06f7806782e357797fad1d34b7ced0c6  e2fsprogs-1.39.tar.gz
+130ce559a0f311ea2bc04a47b4982d0a  e2fsprogs-1.40.2.tar.gz


--- e2fsprogs-1.39-32_bit_inodes.patch DELETED ---


--- e2fsprogs-1.39-blkid-devname.patch DELETED ---


--- e2fsprogs-1.39-blkid-fatlabel.patch DELETED ---


--- e2fsprogs-1.39-blkid-gfs.patch DELETED ---


--- e2fsprogs-1.39-close-on-error.patch DELETED ---


--- e2fsprogs-1.39-e2p_percent.patch DELETED ---


--- e2fsprogs-1.39-e2p_percent_div.patch DELETED ---


--- e2fsprogs-1.39-ext2fs_div_ceil.patch DELETED ---


--- e2fsprogs-1.39-fix-loop-wraps.patch DELETED ---


--- e2fsprogs-1.39-fix_formats.patch DELETED ---


--- e2fsprogs-1.39-group_block_inlines.patch DELETED ---


--- e2fsprogs-1.39-group_desc_loops.patch DELETED ---


--- e2fsprogs-1.39-large_file_size.patch DELETED ---


--- e2fsprogs-1.39-leak.patch DELETED ---


--- e2fsprogs-1.39-more_rounding_overflows.patch DELETED ---


--- e2fsprogs-1.39-unused_group_blocks.patch DELETED ---


--- e2fsprogs-1.39-uuid.patch DELETED ---


