* Mon Mar 15 2010 Eric Sandeen <sandeen@redhat.com> 1.41.11-1
- New upstream version
This commit is contained in:
parent
eaf372f980
commit
dbfb375bc8
@ -1 +1 @@
|
||||
e2fsprogs-1.41.10.tar.gz
|
||||
e2fsprogs-1.41.11.tar.gz
|
||||
|
@ -1,33 +0,0 @@
|
||||
E2fsprogs 1.41.10 introduced a regression (in commit b71e018) where
|
||||
e2fsck -fD can corrupt non-indexed directories when are exists one or
|
||||
more file names which alphabetically sort before ".". This can happen
|
||||
with ext2 filesystems or for small directories (take less than a
|
||||
block) which contain filenames that begin with a space or some other
|
||||
punctuation mark.
|
||||
|
||||
Fix this by making sure we never reorder the '.' or '..' entry in the
|
||||
directory, since they must be first.
|
||||
|
||||
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
|
||||
---
|
||||
e2fsck/rehash.c | 7 ++++++-
|
||||
1 files changed, 6 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
|
||||
index 780742e..ceb8543 100644
|
||||
--- a/e2fsck/rehash.c
|
||||
+++ b/e2fsck/rehash.c
|
||||
@@ -763,7 +763,12 @@ retry_nohash:
|
||||
|
||||
/* Sort the list */
|
||||
resort:
|
||||
- qsort(fd.harray, fd.num_array, sizeof(struct hash_entry), hash_cmp);
|
||||
+ if (fd.compress)
|
||||
+ qsort(fd.harray+2, fd.num_array-2, sizeof(struct hash_entry),
|
||||
+ hash_cmp);
|
||||
+ else
|
||||
+ qsort(fd.harray, fd.num_array, sizeof(struct hash_entry),
|
||||
+ hash_cmp);
|
||||
|
||||
/*
|
||||
* Look for duplicates
|
@ -1,23 +0,0 @@
|
||||
[PATCH] mke2fs: skip alignment questioning if -F specified
|
||||
|
||||
RH bug 569021 - mke2fs insists on user interaction even if stdin is not a tty and -F is passed
|
||||
|
||||
This is just a warning, -F should easily override it.
|
||||
|
||||
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
|
||||
---
|
||||
|
||||
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
|
||||
index 4b13367..2a23bf7 100644
|
||||
--- a/misc/mke2fs.c
|
||||
+++ b/misc/mke2fs.c
|
||||
@@ -1643,7 +1643,8 @@ got_size:
|
||||
device_name, retval);
|
||||
printf(_("This may result in very poor performance, "
|
||||
"(re)-partitioning suggested.\n"));
|
||||
- proceed_question();
|
||||
+ if (!force)
|
||||
+ proceed_question();
|
||||
}
|
||||
#endif
|
||||
|
@ -3,8 +3,8 @@
|
||||
|
||||
Summary: Utilities for managing ext2, ext3, and ext4 filesystems
|
||||
Name: e2fsprogs
|
||||
Version: 1.41.10
|
||||
Release: 5%{?dist}
|
||||
Version: 1.41.11
|
||||
Release: 1%{?dist}
|
||||
|
||||
# License tags based on COPYING file distinctions for various components
|
||||
License: GPLv2
|
||||
@ -13,8 +13,6 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
Source1: ext2_types-wrapper.h
|
||||
|
||||
Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
|
||||
Patch3: e2fsprogs-1.41.10-fsck-D-fix.patch
|
||||
Patch4: e2fsprogs-1.41.10-no-alignment-question.patch
|
||||
|
||||
Url: http://e2fsprogs.sourceforge.net/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -138,12 +136,6 @@ It was originally inspired by the Multics SubSystem library.
|
||||
# after an selinux install...
|
||||
%patch2 -p1 -b .featurecheck
|
||||
|
||||
# E2fsprogs 1.41.10 introduced a regression (in commit b71e018) where
|
||||
# e2fsck -fD can corrupt non-indexed directories
|
||||
%patch3 -p1 -b .fsckD
|
||||
# Don't ask about alignment issues if -F is specified to fsck
|
||||
%patch4 -p1 -b .fsckF
|
||||
|
||||
%build
|
||||
%configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
|
||||
--disable-e2initrd-helper --disable-libblkid --disable-libuuid
|
||||
@ -302,6 +294,9 @@ exit 0
|
||||
%{_libdir}/pkgconfig/ss.pc
|
||||
|
||||
%changelog
|
||||
* Mon Mar 15 2010 Eric Sandeen <sandeen@redhat.com> 1.41.11-1
|
||||
- New upstream version
|
||||
|
||||
* Mon Mar 01 2010 Eric Sandeen <sandeen@redhat.com> 1.41.10-5
|
||||
- Don't ask for confirmation of misaligned mkfs with -F (#569021)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user