diff options
| author | kzak <kzak@fedoraproject.org> | 2006-09-17 14:06:13 +0000 |
|---|---|---|
| committer | kzak <kzak@fedoraproject.org> | 2006-09-17 14:06:13 +0000 |
| commit | 2a76ca36e308be8b755b67a49aba764a356ba2d6 (patch) | |
| tree | f09084bb9e43027bac7c3fdd8ccde36620832fcb | |
| parent | e536f6819e1772b31b21a3b4e0eff11596f66352 (diff) | |
| download | e2fsprogs-2a76ca36e308be8b755b67a49aba764a356ba2d6.tar.gz e2fsprogs-2a76ca36e308be8b755b67a49aba764a356ba2d6.tar.xz e2fsprogs-2a76ca36e308be8b755b67a49aba764a356ba2d6.zip | |
fix problem with FAT probinge2fsprogs-1_39-6
| -rw-r--r-- | e2fsprogs-1.39-blkid-fatlabel.patch | 20 | ||||
| -rw-r--r-- | e2fsprogs.spec | 8 |
2 files changed, 27 insertions, 1 deletions
diff --git a/e2fsprogs-1.39-blkid-fatlabel.patch b/e2fsprogs-1.39-blkid-fatlabel.patch new file mode 100644 index 0000000..57d4bb0 --- /dev/null +++ b/e2fsprogs-1.39-blkid-fatlabel.patch @@ -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. ++ diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 29b6f4a..c92338f 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -4,7 +4,7 @@ Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs Version: 1.39 -Release: 5 +Release: 6 License: GPL Group: System Environment/Base 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 Patch39: e2fsprogs-1.39-multilib.patch Patch40: e2fsprogs-1.39-leak.patch +Patch41: e2fsprogs-1.39-blkid-fatlabel.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper @@ -80,6 +81,8 @@ also want to install e2fsprogs. %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 %build aclocal @@ -231,6 +234,9 @@ exit 0 %{_mandir}/man3/uuid_unparse.3* %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 - Fix memory leak in device probing. |