Mailinglist Archive: opensuse-commit (1301 mails)
| < Previous | Next > |
commit e2fsprogs
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 27 Jul 2007 01:24:32 +0200
- Message-id: <20070726232432.8FA09678332@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package e2fsprogs
checked in at Fri Jul 27 01:24:32 CEST 2007.
--------
--- e2fsprogs/e2fsprogs.changes 2007-07-18 16:53:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/e2fsprogs/e2fsprogs.changes 2007-07-26 12:38:42.000000000 +0200
@@ -1,0 +2,19 @@
+Thu Jul 26 12:35:50 CEST 2007 - mkoenig@xxxxxxx
+
+- Fix big-endian byte-swapping bug in ext2fs_swap_inode_full()
+ e2fsprogs-1.40-be_swap_fix.patch
+
+-------------------------------------------------------------------
+Wed Jul 25 17:30:25 CEST 2007 - bk@xxxxxxx
+
+- e2fsprogs requires libext2fs2 of the same version number to work
+- enable make check and make gcc-wall in %check (executed last)
+- shut up bogus gcc warning for use of uninitialised variables
+
+-------------------------------------------------------------------
+Wed Jul 25 11:18:46 CEST 2007 - mkoenig@xxxxxxx
+
+- remove e2fsprogs-blkid_probe_ext4.patch
+ broken and it is way too early to support
+
+-------------------------------------------------------------------
Old:
----
e2fsprogs-blkid_probe_ext4.patch
New:
----
e2fsprogs-1.40-be_swap_fix.patch
e2fsprogs-uninitialized.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ e2fsprogs.spec ++++++
--- /var/tmp/diff_new_pack.BWN489/_old 2007-07-27 01:23:38.000000000 +0200
+++ /var/tmp/diff_new_pack.BWN489/_new 2007-07-27 01:23:38.000000000 +0200
@@ -11,7 +11,9 @@
# norootforbuild
Name: e2fsprogs
-%define no_command_hiding 1
+# This breaks make check and changes the Makefiles at other places too,
+# do not use for production builds until it's carefully reviewed:
+%define no_command_hiding 0
BuildRequires: libvolume_id-devel
License: GPL v2 or later
Group: System/Filesystems
@@ -19,7 +21,7 @@
PreReq: %install_info_prereq
Autoreqprov: on
Version: 1.40.2
-Release: 1
+Release: 4
Summary: Utilities for the Second Extended File System
URL: http://e2fsprogs.sourceforge.net
Source: %{name}-%{version}.tar.bz2
@@ -41,8 +43,9 @@
Patch15: e2fsprogs-1.39-uuid_duplicates.patch
Patch16: e2fsprogs-1.39-resize2fs_manpage.patch
Patch17: e2fsprogs-strncat.patch
-Patch19: e2fsprogs-blkid_probe_ext4.patch
Patch20: e2fsprogs-blkid_probe_hfsplus.patch
+Patch21: e2fsprogs-uninitialized.diff
+Patch22: e2fsprogs-1.40-be_swap_fix.patch
# libcom_err patches
Patch30: libcom_err-no-static-buffer.patch
Patch31: libcom_err-no-init_error_table.patch
@@ -52,6 +55,7 @@
# Do not suppress make commands
Patch99: e2fsprogs-no_cmd_hiding.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: libext2fs2 = %{version} libcom_err2 = %{version} libuuid1 = %{version} libblkid1 = %{version}
%description
Utilities needed to create and maintain ext2 and ext3 file systems
@@ -227,15 +231,16 @@
%patch15 -p1
%patch16
%patch17 -p1
-%patch19 -p1
%patch20 -p1
+%patch21
+%patch22 -p1
# libcom_err patches
%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch34 -p1
-%if no_command_hiding
+%if %{no_command_hiding}
%patch99
%endif
cp %{S:1} po
@@ -256,10 +261,8 @@
--enable-elf-shlibs \
--disable-evms \
--with-ldopts=-pthread \
- CFLAGS="$RPM_OPT_FLAGS"
+ CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
make
-#make check
-#make gcc-wall
%install
rm -rf $RPM_BUILD_ROOT
@@ -267,6 +270,13 @@
%{find_lang} %{name}
rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
+%check
+%if !%{no_command_hiding}
+# always run make check when e2fsprogs-no_cmd_hiding.patch is fixed!
+make check ||
+make gcc-wall
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -410,6 +420,16 @@
%{_mandir}/man3/com_err.3.gz
%changelog
+* Thu Jul 26 2007 - mkoenig@xxxxxxx
+- Fix big-endian byte-swapping bug in ext2fs_swap_inode_full()
+ e2fsprogs-1.40-be_swap_fix.patch
+* Wed Jul 25 2007 - bk@xxxxxxx
+- e2fsprogs requires libext2fs2 of the same version number to work
+- enable make check and make gcc-wall in %%check (executed last)
+- shut up bogus gcc warning for use of uninitialised variables
+* Wed Jul 25 2007 - mkoenig@xxxxxxx
+- remove e2fsprogs-blkid_probe_ext4.patch
+ broken and it is way too early to support
* Wed Jul 18 2007 - mkoenig@xxxxxxx
- update to version 1.40.2
bugfix release
++++++ e2fsprogs-1.40-be_swap_fix.patch ++++++
commit db9097caca17401313c0dc840b4ae683e5b5c1df
Author: Eric Sandeen <sandeen@xxxxxxxxxx>
Date: Tue Jul 17 20:40:25 2007 -0500
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@xxxxxxxxxx>
Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
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-uninitialized.diff ++++++
# bk@xxxxxxx:
# This patch is just here to silence the (in this case) stupid gcc warning,
# where gcc says that b is used uninitialized. "may" whould have been more
# correct, but even that is wrong because as block_ind_bmap() where the
# uninitialized access could have happened, is declared static and both
# callers which gcc warns about call block_ind_bmap() with flags & ~BMAP_SET,
# which means that
# if (flags & BMAP_SET) {
# b = *ret_blk;
# which is the line which gcc offends, is never reached, so that's a clearly
# bogus "is using uninitialized" warning. Anyway, to prevent others from
# investgating again, just initialize them:
#
--- lib/ext2fs/bmap.c
+++ lib/ext2fs/bmap.c
@@ -99,7 +99,7 @@ static _BMAP_INLINE_ errcode_t block_din
int *blocks_alloc,
blk_t nr, blk_t *ret_blk)
{
- blk_t b;
+ blk_t b = 0;
errcode_t retval;
blk_t addr_per_block;
@@ -119,7 +119,7 @@ static _BMAP_INLINE_ errcode_t block_tin
int *blocks_alloc,
blk_t nr, blk_t *ret_blk)
{
- blk_t b;
+ blk_t b = 0;
errcode_t retval;
blk_t addr_per_block;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |