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

New version

Browse Source 
Resolves: rhbz#913884
- Dropped patches: fix-alloc-rootdir-entry, dev-detect-fix (all upstreamed)
This commit is contained in:
Jaroslav Škarvada 2013-02-22 10:24:45 +01:00
parent dfcc8e03fb
commit eb31dda566
4 changed files with 7 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dosfstools-3.0.12-dev-detect-fix.patch
View File

@ -1,18 +0,0 @@
diff -up dosfstools-3.0.12/src/mkdosfs.c.old dosfstools-3.0.9/src/mkdosfs.c
--- dosfstools-3.0.12/src/mkdosfs.c.old 2010-01-31 08:29:13.000000000 +0100
+++ dosfstools-3.0.12/src/mkdosfs.c 2011-06-02 12:02:40.525623995 +0200
@@ -1684,10 +1684,10 @@ main (int argc, char **argv)
* the 'superfloppy' format. As I don't know how to find out if
* this is a MO disk I introduce a -I (ignore) switch. -Joey
*/
- if (!ignore_full_disk && ((statbuf.st_rdev & 0xff3f) == 0x0300 || /* hda, hdb */
- (statbuf.st_rdev & 0xff0f) == 0x0800 || /* sd */
- (statbuf.st_rdev & 0xff3f) == 0x0d00 || /* xd */
- (statbuf.st_rdev & 0xff3f) == 0x1600) /* hdc, hdd */
+ if (!ignore_full_disk && ((statbuf.st_rdev & 0xffffff3f) == 0x0300 || /* hda, hdb */
+ (statbuf.st_rdev & 0xffffff0f) == 0x0800 || /* sd */
+ (statbuf.st_rdev & 0xffffff3f) == 0x0d00 || /* xd */
+ (statbuf.st_rdev & 0xffffff3f) == 0x1600) /* hdc, hdd */
)
die("Device partition expected, not making filesystem on entire device '%s' (use -I to override)");

25
dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
View File

@ -1,25 +0,0 @@
--- dosfstools-3.0.12/src/check.c.old 2010-01-23 10:13:17.000000000 +0100
+++ dosfstools-3.0.12/src/check.c 2011-01-31 17:43:31.462674941 +0100
@@ -174,7 +174,10 @@
offset = fs->root_start + next_free * sizeof(DIR_ENT);
memset(de, 0, sizeof(DIR_ENT));
while (1) {
- sprintf((char *)de->name, pattern, curr_num);
+ char expanded[12];
+ sprintf(expanded, pattern, curr_num);
+ memcpy(de->name, expanded, 8);
+ memcpy(de->ext, expanded + 8, 3);
for (scan = 0; scan < fs->root_entries; scan++)
if (scan != next_free &&
!strncmp((const char *)root[scan].name,
--- dosfstools-3.0.12/src/fat.c
+++ dosfstools-3.0.12/src/fat.c
@@ -474,7 +474,7 @@ void reclaim_file(DOS_FS * fs)
DIR_ENT de;
loff_t offset;
files++;
- offset = alloc_rootdir_entry(fs, &de, "FSCK%04d");
+ offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC");
de.start = CT_LE_W(i & 0xffff);
if (fs->fat_bits == 32)
de.starthi = CT_LE_W(i >> 16);

13
dosfstools.spec
View File

@ -1,16 +1,12 @@
Name: dosfstools
Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
Version: 3.0.14
Version: 3.0.15
Release: 1%{?dist}
License: GPLv3+
Group: Applications/System
Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.xz
URL: http://www.daniel-baumann.ch/software/dosfstools/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Fix buffer overflow in alloc_rootdir_entry (#674095)
Patch0: dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
# Fix device partitions detection (#710480)
Patch2: dosfstools-3.0.12-dev-detect-fix.patch
%description
The dosfstools package includes the mkdosfs and dosfsck utilities,
@ -19,8 +15,6 @@ drives or on floppies.
%prep
%setup -q
%patch0 -p1 -b .fix-alloc-rootdir-entry
%patch2 -p1 -b .dev-detect-fix
%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing"
@ -39,6 +33,11 @@ rm -rf %{buildroot}
%{_mandir}/man8/*
%changelog
* Fri Feb 22 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.15-1
- New version
Resolves: rhbz#913884
- Dropped patches: fix-alloc-rootdir-entry, dev-detect-fix (all upstreamed)
* Thu Jan 24 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.14-1
- New version
Resolves: rhbz#903581

2
sources
View File

@ -1 +1 @@
791172a19bc2250fe89c9a59c67bf3b5 dosfstools-3.0.14.tar.xz
64d2020bd8e92105dfad30feee72a3ec dosfstools-3.0.15.tar.xz