rpms/e2fsprogs
7
0
Fork 1
Code Issues Pull Requests Releases Activity

fix problem with FAT probing

Browse Source
This commit is contained in:
kzak 2006-09-17 14:06:13 +00:00
parent e536f6819e
commit 2a76ca36e3
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
e2fsprogs-1.39-blkid-fatlabel.patch Normal file
View File

@ -0,0 +1,20 @@
--- e2fsprogs-1.39/lib/blkid/probe.c.fatlabel 2006-09-17 15:45:54.000000000 +0200
+++ e2fsprogs-1.39/lib/blkid/probe.c 2006-09-17 15:46:32.000000000 +0200
@@ -348,8 +348,8 @@
}
if (vol_label && memcmp(vol_label, no_name, 11)) {
- label = vol_label;
- label_len = figure_label_len(vol_label, 11);
+ if ((label_len = figure_label_len(vol_label, 11)))
+ label = vol_label;
}
/* We can't just print them as %04X, because they are unaligned */
--- e2fsprogs-1.39/lib/blkid/ChangeLog.fatlabel 2006-09-17 15:51:05.000000000 +0200
+++ e2fsprogs-1.39/lib/blkid/ChangeLog 2006-09-17 15:52:37.000000000 +0200
@@ -0,0 +1,4 @@
+2006-09-17 Karel Zak <kzak@redhat.com>
+
+ * probe.c (probe_fat): Fix problem with empty FAT label.
+

8
e2fsprogs.spec
View File

@ -4,7 +4,7 @@
Summary: Utilities for managing the second extended (ext2) filesystem. Summary: Utilities for managing the second extended (ext2) filesystem.
Name: e2fsprogs Name: e2fsprogs
Version: 1.39 Version: 1.39
Release: 5 Release: 6
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@ -17,6 +17,7 @@ Patch37: e2fsprogs-1.39-blkid-gfs.patch
Patch38: e2fsprogs-1.39-blkid-devname.patch Patch38: e2fsprogs-1.39-blkid-devname.patch
Patch39: e2fsprogs-1.39-multilib.patch Patch39: e2fsprogs-1.39-multilib.patch
Patch40: e2fsprogs-1.39-leak.patch Patch40: e2fsprogs-1.39-leak.patch
Patch41: e2fsprogs-1.39-blkid-fatlabel.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)
Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
@ -80,6 +81,8 @@ also want to install e2fsprogs.
%patch39 -p1 -b .multilib %patch39 -p1 -b .multilib
# Fix probing from leaking memory in error cases. # Fix probing from leaking memory in error cases.
%patch40 -p1 -b .leak %patch40 -p1 -b .leak
# Fix poblem with empty FAT label.
%patch41 -p1 -b .fatlabel
%build %build
aclocal aclocal
@ -231,6 +234,9 @@ exit 0
%{_mandir}/man3/uuid_unparse.3* %{_mandir}/man3/uuid_unparse.3*
%changelog %changelog
* Sun Sep 17 2006 Karel Zak <kzak@redhat.com> - 1.39-6
- Fix problem with empty FAT label (#206656)
* Tue Sep 5 2006 Peter Jones <pjones@redhat.com> - 1.39-5 * Tue Sep 5 2006 Peter Jones <pjones@redhat.com> - 1.39-5
- Fix memory leak in device probing. - Fix memory leak in device probing.