rpms/dosfstools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- New version

Browse Source 
- Fixed buffer overflow in reclaim file (#660154)
This commit is contained in:
Jaroslav Škarvada 2011-01-06 14:16:18 +01:00
parent 3bc48cf134
commit 40c2800f2e
5 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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

11
dosfstools-3.0.10-s390x-unalign.patch
View File

@ -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 */

11
dosfstools-3.0.9-fix-reclaim-file.patch Normal file
View File

@ -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);

14
dosfstools.spec
View File

@ -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)

2
sources
View File

@ -1 +1 @@
be73c6077cc5f784f0bb4d3901c88792 dosfstools-3.0.10.tar.bz2
8d2211d5bd813164e20740e7c852aa06 dosfstools-3.0.11.tar.bz2