New version

Resolves: rhbz#903581
- Switched to xz compressed sources
- Dropped dosfslabel-fat32 patch (upstreamed)

.gitignore

@@ -1 +1 @@
-dosfstools-3.0.12.tar.bz2
+dosfstools-*.tar.xz

dosfstools-3.0.12-dosfslabel-fat32.patch

@@ -1,37 +0,0 @@
-diff -up dosfstools-3.0.9/src/dosfslabel.c.old dosfstools-3.0.9/src/dosfslabel.c
---- dosfstools-3.0.9/src/dosfslabel.c.old	2010-01-23 10:13:31.000000000 +0100
-+++ dosfstools-3.0.9/src/dosfslabel.c	2011-04-05 10:56:24.642612056 +0200
-@@ -85,7 +85,7 @@ static void check_atari( void )
- 
- int main(int argc, char *argv[])
- {
--    DOS_FS fs;
-+    DOS_FS fs = {0};
-     rw = 0;
- 
-     char *device = NULL;
-@@ -116,6 +116,8 @@ int main(int argc, char *argv[])
- 
-     fs_open(device, rw);
-     read_boot(&fs);
-+    if (fs.fat_bits == 32)
-+        read_fat(&fs);
-     if (!rw) {
- 	fprintf(stdout, "%s\n", fs.label);
- 	exit(0);
-diff -up dosfstools-3.0.9/src/fat.c.old dosfstools-3.0.9/src/fat.c
---- dosfstools-3.0.9/src/fat.c.old	2010-01-23 10:13:34.000000000 +0100
-+++ dosfstools-3.0.9/src/fat.c	2011-04-05 10:57:22.659733090 +0200
-@@ -89,8 +89,10 @@ void read_fat(DOS_FS *fs)
-     unsigned long total_num_clusters;
- 
-     /* Clean up from previous pass */
--    free(fs->fat);
--    free(fs->cluster_owner);
-+    if (fs->fat)
-+        free(fs->fat);
-+    if (fs->cluster_owner)
-+        free(fs->cluster_owner);
-     fs->fat = NULL;
-     fs->cluster_owner = NULL;
- 

dosfstools.spec

@@ -1,16 +1,14 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
-Version: 3.0.12
-Release: 3%{?dist}
+Version: 3.0.14
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/System
-Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.bz2
+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 dosfslabel on FAT32 (#693662)
-Patch1: dosfstools-3.0.12-dosfslabel-fat32.patch
 # Fix device partitions detection (#710480)
 Patch2: dosfstools-3.0.12-dev-detect-fix.patch
 
@@ -22,7 +20,6 @@ drives or on floppies.
 %prep
 %setup -q
 %patch0 -p1 -b .fix-alloc-rootdir-entry
-%patch1 -p1 -b .dosfslabel-fat32
 %patch2 -p1 -b .dev-detect-fix
 
 %build
@@ -42,6 +39,12 @@ rm -rf %{buildroot}
 %{_mandir}/man8/*
 
 %changelog
+* Thu Jan 24 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.14-1
+- New version
+  Resolves: rhbz#903581
+- Switched to xz compressed sources
+- Dropped dosfslabel-fat32 patch (upstreamed)
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

sources

@@ -1 +1 @@
-5c7c2adac9eae4afbe1f16443142b566  dosfstools-3.0.12.tar.bz2
+791172a19bc2250fe89c9a59c67bf3b5  dosfstools-3.0.14.tar.xz