From 40c2800f2e34ede0daa42159660cc42e78e8cf57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Thu, 6 Jan 2011 14:16:18 +0100
Subject: [PATCH] - New version - Fixed buffer overflow in reclaim file
 (#660154)

---
 .gitignore                              |  1 +
 dosfstools-3.0.10-s390x-unalign.patch   | 11 -----------
 dosfstools-3.0.9-fix-reclaim-file.patch | 11 +++++++++++
 dosfstools.spec                         | 14 +++++++++-----
 sources                                 |  2 +-
 5 files changed, 22 insertions(+), 17 deletions(-)
 delete mode 100644 dosfstools-3.0.10-s390x-unalign.patch
 create mode 100644 dosfstools-3.0.9-fix-reclaim-file.patch

diff --git a/.gitignore b/.gitignore
index 6d510f0..f98cbc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 dosfstools-3.0.9.tar.bz2
 /dosfstools-3.0.10.tar.gz
 /dosfstools-3.0.10.tar.bz2
+/dosfstools-3.0.11.tar.bz2
diff --git a/dosfstools-3.0.10-s390x-unalign.patch b/dosfstools-3.0.10-s390x-unalign.patch
deleted file mode 100644
index 9c6bbc6..0000000
--- a/dosfstools-3.0.10-s390x-unalign.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dosfstools-3.0.9/src/boot.c.old	2010-01-23 10:13:11.000000000 +0100
-+++ dosfstools-3.0.9/src/boot.c	2010-10-06 13:50:55.028885433 +0200
-@@ -59,7 +59,7 @@
-     { 0xff, "5.25\" 320k floppy 2s/40tr/8sec" },
- };
- 
--#if defined __alpha || defined __arm || defined __arm__ || defined __ia64__ || defined __s390x__ \
-+#if defined __alpha || defined __arm || defined __arm__ || defined __ia64__ \
-  || defined __x86_64__ || defined __ppc64__ || defined __bfin__ \
-  || defined __MICROBLAZE__
- /* Unaligned fields must first be copied byte-wise */
diff --git a/dosfstools-3.0.9-fix-reclaim-file.patch b/dosfstools-3.0.9-fix-reclaim-file.patch
new file mode 100644
index 0000000..1dd621d
--- /dev/null
+++ b/dosfstools-3.0.9-fix-reclaim-file.patch
@@ -0,0 +1,11 @@
+--- dosfstools-3.0.9/src/fat.c.old	2010-01-23 10:13:34.000000000 +0100
++++ dosfstools-3.0.9/src/fat.c	2010-12-10 14:36:29.510247580 +0100
+@@ -486,7 +486,7 @@
+ 	    DIR_ENT de;
+ 	    loff_t offset;
+ 	    files++;
+-	    offset = alloc_rootdir_entry(fs,&de,"FSCK%04dREC");
++	    offset = alloc_rootdir_entry(fs,&de,"FSCK%04d");
+ 	    de.start = CT_LE_W(i&0xffff);
+ 	    if (fs->fat_bits == 32)
+ 		de.starthi = CT_LE_W(i>>16);
diff --git a/dosfstools.spec b/dosfstools.spec
index 60ea27b..3445fa7 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -1,14 +1,14 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
-Version: 3.0.10
-Release: 2%{?dist}
+Version: 3.0.11
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/System
 Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.bz2
 URL: http://www.daniel-baumann.ch/software/dosfstools/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Fix dosfsck and dosfslabel on s390x
-Patch0: dosfstools-3.0.10-s390x-unalign.patch
+# Fix buffer overflow in reclaim file (#660154)
+Patch0: dosfstools-3.0.9-fix-reclaim-file.patch
 
 %description
 The dosfstools package includes the mkdosfs and dosfsck utilities,
@@ -17,7 +17,7 @@ drives or on floppies.
 
 %prep
 %setup -q
-%patch0 -p1 -b .s390x-unalign
+%patch0 -p1 -b .fix-reclaim-file
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing"
@@ -36,6 +36,10 @@ rm -rf %{buildroot}
 %{_mandir}/man8/*
 
 %changelog
+* Thu Jan 06 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.11-1
+- New version
+- Fixed buffer overflow in reclaim file (#660154)
+
 * Fri Oct 08 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.10-2
 - Fixed dosfsck and dosfslabel on s390x (#624596)
 
diff --git a/sources b/sources
index a45b13e..d2497a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be73c6077cc5f784f0bb4d3901c88792  dosfstools-3.0.10.tar.bz2
+8d2211d5bd813164e20740e7c852aa06  dosfstools-3.0.11.tar.bz2