diff --git a/.dosfstools.metadata b/.dosfstools.metadata new file mode 100644 index 0000000..2d46f49 --- /dev/null +++ b/.dosfstools.metadata @@ -0,0 +1 @@ +8aaedec51f1b9b3455a001d41fac29b7cb78bf85 SOURCES/dosfstools-3.0.20.tar.xz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9241d60 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/dosfstools-3.0.20.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/dosfstools-3.0.20-allow-lowercase-labels.patch b/SOURCES/dosfstools-3.0.20-allow-lowercase-labels.patch new file mode 100644 index 0000000..cf31f6a --- /dev/null +++ b/SOURCES/dosfstools-3.0.20-allow-lowercase-labels.patch @@ -0,0 +1,35 @@ +diff --git a/src/fatlabel.c b/src/fatlabel.c +index 8397a97..d45fb95 100644 +--- a/src/fatlabel.c ++++ b/src/fatlabel.c +@@ -119,8 +119,8 @@ int main(int argc, char *argv[]) + /* don't know if here should be more strict !uppercase(label[i]) */ + if (islower(label[i])) { + fprintf(stderr, +- "fatlabel: labels cannot contain lower case characters\n"); +- exit(1); ++ "fatlabel: warning - lowercase labels might not work properly with DOS or Windows\n"); ++ break; + } + rw = 1; + } +diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c +index cfa3288..9e960ba 100644 +--- a/src/mkfs.fat.c ++++ b/src/mkfs.fat.c +@@ -1536,8 +1536,13 @@ int main(int argc, char **argv) + + case 'n': /* n : Volume name */ + sprintf(volume_name, "%-11.11s", optarg); +- for (i = 0; i < 11; i++) +- volume_name[i] = toupper(volume_name[i]); ++ for (i = 0; volume_name[i] && i < 11; i++) ++ /* don't know if here should be more strict !uppercase(label[i]) */ ++ if (islower(volume_name[i])) { ++ fprintf(stderr, ++ "mkfs.fat: warning - lowercase labels might not work properly with DOS or Windows\n"); ++ break; ++ } + + break; + diff --git a/SOURCES/dosfstools-3.0.20-fix-big-endian.patch b/SOURCES/dosfstools-3.0.20-fix-big-endian.patch new file mode 100644 index 0000000..c7a5b64 --- /dev/null +++ b/SOURCES/dosfstools-3.0.20-fix-big-endian.patch @@ -0,0 +1,13 @@ +diff --git a/src/boot.c b/src/boot.c +index 2c6a38f..7acec70 100644 +--- a/src/boot.c ++++ b/src/boot.c +@@ -62,7 +62,7 @@ static struct { + + /* Unaligned fields must first be accessed byte-wise */ + #define GET_UNALIGNED_W(f) \ +- le16toh( (__u16)f[0] | ((__u16)f[1]<<8) ) ++ ( (__u16)f[0] | ((__u16)f[1]<<8) ) + + static char *get_media_descr(unsigned char media) + { diff --git a/SOURCES/dosfstools-3.0.20-manpage-fix.patch b/SOURCES/dosfstools-3.0.20-manpage-fix.patch new file mode 100644 index 0000000..004b5d6 --- /dev/null +++ b/SOURCES/dosfstools-3.0.20-manpage-fix.patch @@ -0,0 +1,21 @@ +diff -up dosfstools-3.0.20/manpages/en/fsck.fat.8.orig dosfstools-3.0.20/manpages/en/fsck.fat.8 +--- dosfstools-3.0.20/manpages/en/fsck.fat.8.orig 2013-06-12 11:30:18.000000000 +0200 ++++ dosfstools-3.0.20/manpages/en/fsck.fat.8 2013-06-25 14:28:51.000000000 +0200 +@@ -25,7 +25,7 @@ + \fBfsck.fat\fR \- check and repair MS\-DOS filesystems + + .SH SYNOPSIS +-\fBfsck.fat\fR|\fBfsck.msdos\fR|\fBfsck.vfat\fR [\-aAflnrtvVwy] [\-d \fIPATH\fR \-d\ \fI...\fR] [\-u\ \fIPATH\fR \-u \fI...\fR] \fIDEVICE\fR ++\fBfsck.fat\fR|\fBfsck.msdos\fR|\fBfsck.vfat\fR [\-aAflnprtvVwy] [\-d \fIPATH\fR \-d\ \fI...\fR] [\-u\ \fIPATH\fR \-u \fI...\fR] \fIDEVICE\fR + + .SH DESCRIPTION + \fBfsck.fat\fR verifies the consistency of MS\-DOS filesystems and optionally tries to repair them. +@@ -90,6 +90,8 @@ List path names of files being processed + .IP "\fB\-n\fR" 4 + No\-operation mode: non\-interactively check for errors, but don't write + anything to the filesystem. ++.IP "\fB\-p\fR" 4 ++Same as (\fB\-a\fR), for compatibility with other *fsck. + .IP "\fB\-r\fR" 4 + Interactively repair the filesystem. The user is asked for advice whenever + there is more than one approach to fix an inconsistency. diff --git a/SPECS/dosfstools.spec b/SPECS/dosfstools.spec new file mode 100644 index 0000000..32eed9c --- /dev/null +++ b/SPECS/dosfstools.spec @@ -0,0 +1,342 @@ +Name: dosfstools +Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux +Version: 3.0.20 +Release: 10%{?dist} +License: GPLv3+ +Group: Applications/System +Source0: http://www.daniel-baumann.ch/files/software/dosfstools/%{name}-%{version}.tar.xz +URL: http://www.daniel-baumann.ch/software/dosfstools/ +# Sent upstream +Patch0: dosfstools-3.0.20-manpage-fix.patch +Patch1: dosfstools-3.0.20-fix-big-endian.patch +# Backported from upstream +Patch2: dosfstools-3.0.20-allow-lowercase-labels.patch +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +The dosfstools package includes the mkdosfs and dosfsck utilities, +which respectively make and check MS-DOS FAT filesystems on hard +drives or on floppies. + +%prep +%setup -q +%patch0 -p1 -b .manpage-fix +%patch1 -p1 -b .fix-big-endian +%patch2 -p1 -b .allow-lowercase-labels + +%build +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing" + +%install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install-bin install-man install-symlinks PREFIX=%{_prefix} + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc ChangeLog COPYING doc/*-2.x +%{_sbindir}/* +%{_mandir}/man8/* +%{_mandir}/de/man8/* + +%changelog +* Fri Apr 27 2018 Jaroslav Škarvada - 3.0.20-10 +- Backported fix to allow lowercase labels + Resolves: rhbz#1553860 + +* Tue Mar 4 2014 Jaroslav Škarvada - 3.0.20-9 +- Fixed bogus dates in changelog (best effort) +- Fixed man pages packaging + Resolves: rhbz#1057562 + +* Fri Jan 24 2014 Daniel Mach - 3.0.20-8 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 3.0.20-7 +- Mass rebuild 2013-12-27 + +* Fri Nov 22 2013 Jaroslav Škarvada - 3.0.20-6 +- Used /usr/sbin directory instead of /sbin (spotted by rpmdiff) + Related: rhbz#1033599 + +* Fri Nov 22 2013 Jaroslav Škarvada - 3.0.20-5 +- Fixed dosfsck on big endian platforms + Resolves: rhbz#1033599 + +* Thu Aug 8 2013 Jaroslav Škarvada - 3.0.20-4 +- Fixed sources URL + +* Tue Jun 25 2013 Jaroslav Škarvada - 3.0.20-3 +- Fixed fsck.vfat manpage to be consistent with the tool options + +* Fri Jun 14 2013 Jaroslav Škarvada - 3.0.20-2 +- Installed compatibility symlinks + +* Thu Jun 13 2013 Jaroslav Škarvada - 3.0.20-1 +- New version + Resolves: rhbz#973937 + +* Wed Jun 12 2013 Jaroslav Škarvada - 3.0.19-1 +- New version + Resolves: rhbz#971686 + +* Tue Jun 4 2013 Jaroslav Škarvada - 3.0.17-1 +- New version + Resolves: rhbz#968400 +- Dropped fix-label patch (upstreamed) + +* Thu May 2 2013 Jaroslav Škarvada - 3.0.16-3 +- Fixed dosfslabel (by fix-label patch) + Resolves: rhbz#948055 + +* Mon Mar 11 2013 Jaroslav Škarvada - 3.0.16-2 +- Source0 URL synced with upstream + +* Wed Mar 6 2013 Jaroslav Škarvada - 3.0.16-1 +- New version + Resolves: rhbz#916913 + +* Fri Feb 22 2013 Jaroslav Škarvada - 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 - 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 - 3.0.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 3.0.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sat Oct 29 2011 Jaroslav Škarvada - 3.0.12-1 +- New version, all patches were rebased + Resolves: rhbz#749969 + +* Fri Jun 03 2011 Jaroslav Škarvada - 3.0.11-5 +- Fixed device partitions detection + Resolves: rhbz#710480 + +* Tue Apr 05 2011 Jaroslav Škarvada - 3.0.11-4 +- Fixed dosfslabel on FAT32 (#693662) + +* Mon Feb 14 2011 Jaroslav Škarvada - 3.0.11-3 +- Fixed buffer overflow in alloc_rootdir_entry (#674095) +- Dropped fix-reclaim-file patch, obsoleted by fix-alloc-rootdir-entry patch + +* Tue Feb 08 2011 Fedora Release Engineering - 3.0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jan 06 2011 Jaroslav Škarvada - 3.0.11-1 +- New version +- Fixed buffer overflow in reclaim file (#660154) + +* Fri Oct 08 2010 Jaroslav Škarvada - 3.0.10-2 +- Fixed dosfsck and dosfslabel on s390x (#624596) + +* Wed Oct 06 2010 Jaroslav Škarvada - 3.0.10-1 +- Bump to newer release + +* Mon May 31 2010 Jaroslav Škarvada - 3.0.9-3 +- Rebuilt with -fno-strict-aliasing + +* Fri Feb 26 2010 Jaroslav Škarvada - 3.0.9-2 +- Used bz2 compresed sources + +* Fri Feb 26 2010 Jaroslav Škarvada - 3.0.9-1 +- Bump to newer release +- Removed mkdosfs-ygg from Obsoletes/Provides tag as it looks really deprecated +- Drop bounds patch - fixed upstream + +* Sun Dec 06 2009 Lubomir Rintel - 3.0.6-1 +- Bump to newer release +- Fix numerous out-of-bound writes + +* Mon Aug 10 2009 Ville Skyttä - 3.0.1-6 +- Use bzipped upstream tarball. + +* Fri Jul 24 2009 Fedora Release Engineering - 3.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 3.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Jan 30 2009 Stepan Kasal - 3.0.1-3 +- fix the previous commit +- omit the most obsolete documents +- after writing the label, exit with exit code 0 (#468050) + +* Fri Jan 30 2009 Stepan Kasal - 3.0.1-2 +- install all the documentation to the usual docdir (#225707) + +* Mon Jan 19 2009 Peter Vrabec - 3.0.1-1 +- upgrade +- include ChangeLog and COPYING (#225707) + +* Mon Nov 17 2008 Tom "spot" Callaway - 3.0.0-2 +- apply vfat timing fix (bz 448247) + +* Tue Sep 30 2008 Tom "spot" Callaway - 3.0.0-1 +- update to 3.0.0 + +* Wed Jul 16 2008 Tom "spot" Callaway - 2.11-10 +- fix license tag +- fix patch to apply with fuzz=0 + +* Tue Feb 19 2008 Fedora Release Engineering - 2.11-9 +- Autorebuild for GCC 4.3 + +* Tue Apr 3 2007 Jeremy Katz - 2.11-8 +- add dosfslabel (originally by Peter Jones) + +* Wed Feb 21 2007 Peter Vrabec 2.11-7 +- fix debuginfo package (#225707) + +* Wed Jul 12 2006 Jesse Keating - 2.11-6.1 +- rebuild + +* Fri Jun 30 2006 Peter Vrabec 2.11-6 +- fix upgrade path (#197231) + +* Thu May 11 2006 Peter Vrabec 2.11-5 +- fix work with disk image files > 4GB (#191198) + +* Fri Feb 10 2006 Jesse Keating - 2.11-4.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 2.11-4.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 16 2005 Jakub Jelinek 2.11-4 +- rebuilt with GCC 4.1 +- make it build with -D_FORTIFY_SOURCE=2 + +* Sun Nov 06 2005 Peter Vrabec 2.11-3 +- fix LFS (#172369) + +* Fri Nov 04 2005 Peter Vrabec 2.11-2 +- fix LFS + +* Wed Oct 12 2005 Peter Vrabec 2.11-1 +- upgrade + +* Thu Apr 28 2005 Peter Vrabec 2.10-3 +- if HDIO_GETGEO fails, print a warning and default to H=255,S=63 (#155950) + +* Thu Mar 17 2005 Peter Vrabec 2.10-2 +- rebuild + +* Thu Dec 09 2004 Peter Vrabec 2.10-1 +- updated to 2.10 + +* Wed Nov 10 2004 Martin Stransky 2.8-16 +- add check for minimum count of clusters in FAT16 and FAT32 + +* Wed Oct 13 2004 Peter Vrabec 2.8-15 +- fix fat_length type in boot.c. (same problem like in RHEL bug #135293) + +* Wed Oct 6 2004 Jeremy Katz - 2.8-14 +- fix rebuilding (#134834) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Sep 3 2003 Bill Nottingham 2.8-11 +- rebuild + +* Wed Sep 3 2003 Bill Nottingham 2.8-10 +- don't rely on including + +* Tue Jun 24 2003 Jeremy Katz 2.8-9 +- rebuild + +* Tue Jun 24 2003 Jeremy Katz 2.8-8 +- add patch from Vince Busam (http://www.sixpak.org/dosfstools/) to do auto + creation of FAT32 on large devices (#97308) + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Feb 19 2003 Jeremy Katz 2.8-6 +- handle getting the size of loop devices properly (part of #84351) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 12 2002 Elliot Lee 2.8-4 +- Patch2 for errno + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Mar 07 2002 Florian La Roche +- update to version 2.8 + +* Fri Jul 6 2001 Preston Brown +- major upgrade to v2.7. +- forward port old ia64 patch (now incorporated) s390 additions + +* Tue Mar 20 2001 Oliver Paukstadt +- ported to zSeries (64 bit) + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sat Jun 17 2000 Bill Nottingham +- hard link mkdosfs + +* Thu Jun 15 2000 Matt Wilson +- FHS +- patch to build against 2.4 kernel headers (patch3) + +* Fri Apr 28 2000 Bill Nottingham +- fix for ia64 + +* Thu Feb 3 2000 Matt Wilson +- remove mkdosfs.8 symlink, symlink mkdosfs.8.gz to mkfs.msdos.8.gz + +* Wed Feb 02 2000 Cristian Gafton +- fix descriptions and summary +- man pages are compressed + +* Thu Dec 16 1999 Cristian Gafton +- fix the 2.88MB drives (patch from hjl) + +* Mon Aug 16 1999 Matt Wilson +- updated to 2.2 + +* Sun Jun 27 1999 Matt Wilson +- changed to new maintainer, renamed to dosfstools + +* Sat Apr 17 1999 Jeff Johnson +- fix mkdosfs on sparc (#1746) + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 10) + +* Thu Jan 21 1999 Bill Nottingham +- build for RH 6.0 + +* Tue Oct 13 1998 Cristian Gafton +- avoid using unsinged long on alphas + +* Sun Aug 16 1998 Jeff Johnson +- build root + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Jul 10 1997 Erik Troan +- built against glibc