* Thu Jan 29 2009 Eric Sandeen <sandeen@redhat.com> 1.41.4-2
- Fix debugfs "stat" segfault if no open fs (#482894) - Fix name of libext2fs info page (#481620)
This commit is contained in:
parent
598edd1766
commit
dcd60901c8
23
e2fsprogs-1.41.4-debugfs-stat-segfault.patch
Normal file
23
e2fsprogs-1.41.4-debugfs-stat-segfault.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
Index: e2fsprogs/debugfs/debugfs.c
|
||||||
|
===================================================================
|
||||||
|
--- e2fsprogs.orig/debugfs/debugfs.c 2008-09-12 10:37:52.000000000 -0500
|
||||||
|
+++ e2fsprogs/debugfs/debugfs.c 2009-01-29 16:36:04.748574864 -0600
|
||||||
|
@@ -291,9 +291,6 @@ void do_show_super_stats(int argc, char
|
||||||
|
int c, header_only = 0;
|
||||||
|
int numdirs = 0, first, gdt_csum;
|
||||||
|
|
||||||
|
- gdt_csum = EXT2_HAS_RO_COMPAT_FEATURE(current_fs->super,
|
||||||
|
- EXT4_FEATURE_RO_COMPAT_GDT_CSUM);
|
||||||
|
-
|
||||||
|
reset_getopt();
|
||||||
|
while ((c = getopt (argc, argv, "h")) != EOF) {
|
||||||
|
switch (c) {
|
||||||
|
@@ -321,6 +318,8 @@ void do_show_super_stats(int argc, char
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ gdt_csum = EXT2_HAS_RO_COMPAT_FEATURE(current_fs->super,
|
||||||
|
+ EXT4_FEATURE_RO_COMPAT_GDT_CSUM);
|
||||||
|
gdp = ¤t_fs->group_desc[0];
|
||||||
|
for (i = 0; i < current_fs->group_desc_count; i++, gdp++) {
|
||||||
|
fprintf(out, " Group %2d: block bitmap at %u, "
|
13
e2fsprogs-1.41.4-libext2fs-info.patch
Normal file
13
e2fsprogs-1.41.4-libext2fs-info.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: e2fsprogs/doc/libext2fs.texinfo
|
||||||
|
===================================================================
|
||||||
|
--- e2fsprogs.orig/doc/libext2fs.texinfo 2009-01-28 20:56:26.000000000 -0600
|
||||||
|
+++ e2fsprogs/doc/libext2fs.texinfo 2009-01-29 16:36:53.148590911 -0600
|
||||||
|
@@ -8,7 +8,7 @@
|
||||||
|
@ifinfo
|
||||||
|
@dircategory Development
|
||||||
|
@direntry
|
||||||
|
-* libext2fs: (libext2fs.info). The EXT2FS library.
|
||||||
|
+* libext2fs: (libext2fs). The EXT2FS library.
|
||||||
|
@end direntry
|
||||||
|
@end ifinfo
|
||||||
|
|
@ -4,7 +4,7 @@
|
|||||||
Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
|
Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
|
||||||
Name: e2fsprogs
|
Name: e2fsprogs
|
||||||
Version: 1.41.4
|
Version: 1.41.4
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
# License based on upstream-modified COPYING file,
|
# License based on upstream-modified COPYING file,
|
||||||
# which clearly states "V2" intent.
|
# which clearly states "V2" intent.
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
@ -15,6 +15,8 @@ Source2: blkid_types-wrapper.h
|
|||||||
Source3: uuidd.init
|
Source3: uuidd.init
|
||||||
Patch1: e2fsprogs-1.38-etcblkid.patch
|
Patch1: e2fsprogs-1.38-etcblkid.patch
|
||||||
Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
|
Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
|
||||||
|
Patch3: e2fsprogs-1.41.4-debugfs-stat-segfault.patch
|
||||||
|
Patch4: e2fsprogs-1.41.4-libext2fs-info.patch
|
||||||
|
|
||||||
Url: http://e2fsprogs.sourceforge.net/
|
Url: http://e2fsprogs.sourceforge.net/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -91,6 +93,10 @@ SMP systems.
|
|||||||
# mildly unsafe but 'til I get something better, avoid full fsck
|
# mildly unsafe but 'til I get something better, avoid full fsck
|
||||||
# after an selinux install...
|
# after an selinux install...
|
||||||
%patch2 -p1 -b .featurecheck
|
%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
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper --enable-blkid-selinux
|
%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper --enable-blkid-selinux
|
||||||
@ -289,6 +295,10 @@ fi
|
|||||||
%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
|
%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 29 2009 Eric Sandeen <sandeen@redhat.com> 1.41.4-2
|
||||||
|
- Fix debugfs "stat" segfault if no open fs (#482894)
|
||||||
|
- Fix name of libext2fs info page (#481620)
|
||||||
|
|
||||||
* Thu Jan 29 2009 Eric Sandeen <sandeen@redhat.com> 1.41.4-1
|
* Thu Jan 29 2009 Eric Sandeen <sandeen@redhat.com> 1.41.4-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
- Dropped btrfs & resize fixes, upstream now
|
- Dropped btrfs & resize fixes, upstream now
|
||||||
|
Loading…
Reference in New Issue
Block a user