commit ef3a86c9519181c8e80678055896cef43513f8c72b0d816279026292a2daf82b Author: OBS User unknown Date: Mon Jan 15 23:10:35 2007 +0000 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dosfstools?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/dosfstools-2.11-buffer.patch b/dosfstools-2.11-buffer.patch new file mode 100644 index 0000000..1eb2378 --- /dev/null +++ b/dosfstools-2.11-buffer.patch @@ -0,0 +1,12 @@ +diff -pur dosfstools-2.11-3/mkdosfs/mkdosfs.c dosfstools-2.11/mkdosfs/mkdosfs.c +--- dosfstools-2.11-3/mkdosfs/mkdosfs.c 2005-11-03 08:26:13.112421613 -0800 ++++ dosfstools-2.11/mkdosfs/mkdosfs.c 2005-11-07 07:14:47.288053612 -0800 +@@ -809,7 +809,7 @@ setup_tables (void) + /* On Atari, the first few bytes of the boot sector are assigned + * differently: The jump code is only 2 bytes (and m68k machine code + * :-), then 6 bytes filler (ignored), then 3 byte serial number. */ +- strncpy( bs.system_id-1, "mkdosf", 6 ); ++ strncpy( bs.system_id, "mkdosf", 6); + else + strcpy (bs.system_id, "mkdosfs"); + if (sectors_per_cluster) diff --git a/dosfstools-2.11-linuxfs.patch b/dosfstools-2.11-linuxfs.patch new file mode 100644 index 0000000..22d2040 --- /dev/null +++ b/dosfstools-2.11-linuxfs.patch @@ -0,0 +1,10 @@ +--- mkdosfs/mkdosfs.c ++++ mkdosfs/mkdosfs.c +@@ -51,6 +51,6 @@ + + #include + #include +-#include ++#include + #include + #include diff --git a/dosfstools-2.11.src.tar.bz2 b/dosfstools-2.11.src.tar.bz2 new file mode 100644 index 0000000..76b69f4 --- /dev/null +++ b/dosfstools-2.11.src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0db13d3c863b35b8dc0fd378a61aa02b92a388c12433e7927eba5e5f9b3048aa +size 55729 diff --git a/dosfstools-subfs.patch b/dosfstools-subfs.patch new file mode 100644 index 0000000..38dbc4a --- /dev/null +++ b/dosfstools-subfs.patch @@ -0,0 +1,21 @@ +--- mkdosfs/mkdosfs.c.orig 2003-06-14 22:07:08.000000000 +0200 ++++ mkdosfs/mkdosfs.c 2005-02-15 16:02:35.175598263 +0100 +@@ -592,11 +592,15 @@ + FILE *f; + struct mntent *mnt; + +- if ((f = setmntent (MOUNTED, "r")) == NULL) +- return; ++ if ((f = setmntent ("/proc/mounts", "r")) == NULL) ++ if ((f = setmntent (MOUNTED, "r")) == NULL) ++ return; + while ((mnt = getmntent (f)) != NULL) + if (strcmp (device_name, mnt->mnt_fsname) == 0) +- die ("%s contains a mounted file system."); ++ if (strcmp ("subfs", mnt->mnt_type) != 0) ++ die ("%s contains a mounted file system."); ++ else ++ printf("Device mounted using subfs, please do not access it while creating filesystem\n"); + endmntent (f); + } + diff --git a/dosfstools.changes b/dosfstools.changes new file mode 100644 index 0000000..6e78869 --- /dev/null +++ b/dosfstools.changes @@ -0,0 +1,204 @@ +------------------------------------------------------------------- +Sat May 27 19:15:11 CEST 2006 - schwab@suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- +Wed Jan 25 21:35:33 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Tue Nov 8 14:25:16 CET 2005 - dmueller@suse.de + +- don't build as root + +------------------------------------------------------------------- +Mon Nov 7 16:15:50 CET 2005 - yxu@suse.de + +- fixed overflowing buffer problem + +------------------------------------------------------------------- +Mon Apr 11 11:49:11 CEST 2005 - mcihar@suse.cz + +- update to 2.11 +- use sys/mount.h instead of linux/fs.h, this fixes compilation with current GCC + +------------------------------------------------------------------- +Tue Feb 15 16:53:10 CET 2005 - mcihar@suse.cz + +- deal with subfs (bug #50838) + - use /proc/mounts if available for deciding whether device is + mounted or not + - just issue warning if it is mounted as subfs + +------------------------------------------------------------------- +Thu Aug 19 14:05:43 CEST 2004 - mcihar@suse.cz + +- merged some dosfsck fixes from FreeDOS + +------------------------------------------------------------------- +Thu Jul 15 17:18:39 CEST 2004 - schwab@suse.de + +- Fix unaligned accesses [#40296]. + +------------------------------------------------------------------- +Wed Jun 2 00:50:55 CEST 2004 - ro@suse.de + +- avoid inclusion of linux/audit.h + +------------------------------------------------------------------- +Thu Mar 18 15:47:09 CET 2004 - mcihar@suse.cz + +- fix dosfsck man page (pointed out in bug #34757) + +------------------------------------------------------------------- +Mon Mar 08 19:46:55 CET 2004 - mcihar@suse.cz + +- fix broken dosfsck (bug #34757) + +------------------------------------------------------------------- +Thu Jan 29 21:42:36 CET 2004 - mcihar@suse.cz + +- include more documentation + +------------------------------------------------------------------- +Thu Jan 15 08:56:16 CET 2004 - kukuk@suse.de + +- Make compile with kernel 2.6.1 headers + +------------------------------------------------------------------- +Thu Oct 23 16:56:31 CEST 2003 - schwab@suse.de + +- Don't define llseek to lseek64, creates infinite recursion. + +------------------------------------------------------------------- +Tue Oct 14 12:04:31 CEST 2003 - mcihar@suse.cz + +- install links also for {fsck,mkfs}.vfat + man pages (bug #32284) + +------------------------------------------------------------------- +Mon Sep 29 13:32:05 CEST 2003 - mcihar@suse.cz + +- updated to 2.10: + - dosfsck: various 64-bit fixes and removed some warnings by Michal + Cihar + - mkdosfs: better error message if called without parameters (also + suggested by Michal) + +------------------------------------------------------------------- +Mon Jun 09 17:36:02 CEST 2003 - mcihar@suse.cz + +- new upstream version 2.9: + * dosfsck: Fix potential for "Internal error: next_cluster on bad cluster". + * dosfsck: When clearing long file names, don't overwrite the dir + entries with all zeros, but put 0xe5 into the first byte. + Otherwise, some OSes stop reading the directory at that point... + * dosfsck: in statistics printed by -v, fix 32bit overflow in number + of data bytes. + * dosfsck: fix an potential overflow in "too many clusters" check + * dosfsck: allow FAT size > 32MB. + * dosfsck: allow for only one FAT + * dosfsck: with -v, also check that last sector of the filesystem can + be read (in case a partition is smaller than the fs thinks) +- realy working large file support +- don't package obsolette documentation + +------------------------------------------------------------------- +Wed Dec 04 11:05:49 CET 2002 - mcihar@suse.cz + +- don't allow -fPIC on i386 in CFLAGS, even on i386-debug, because + this package doesn't build with it + +------------------------------------------------------------------- +Mon Dec 2 00:00:36 CET 2002 - ro@suse.de + +- include errno.h where needed + +------------------------------------------------------------------- +Tue Sep 10 13:43:16 CEST 2002 - mcihar@suse.cz + +- added -D_FILE_OFFSET_BITS=64 to CFLAGS to support larger files/partitions + +------------------------------------------------------------------- +Tue May 21 01:44:36 CEST 2002 - ro@suse.de + +- extend 64bit ifdefs for new platforms + +------------------------------------------------------------------- +Fri Mar 1 16:16:48 CET 2002 - jantos@suse.cz + +- Fixed missing files in documentation (bug 13973) + +------------------------------------------------------------------- +Fri Sep 14 16:37:41 CEST 2001 - schwab@suse.de + +- Fix crash if mkdosfs is called without arguments. + +------------------------------------------------------------------- +Tue May 22 18:04:31 CEST 2001 - pblaha@suse.cz + +- fixed include files on ia64 + +------------------------------------------------------------------- +Sun Apr 8 17:45:37 CEST 2001 - schwab@suse.de + +- Fix to build on ia64. + +------------------------------------------------------------------- +Mon Mar 5 17:11:41 CET 2001 - pblaha@suse.cz + +- update on 2.8 + +------------------------------------------------------------------- +Mon Feb 12 07:58:30 CET 2001 - ro@suse.de + +- don't include linux/fs.h + +------------------------------------------------------------------- +Thu Jan 18 20:00:23 CET 2001 - schwab@suse.de + +- Add Obsoletes: dosfstls. + +------------------------------------------------------------------- +Wed Jan 17 10:41:12 CET 2001 - pblaha@suse.cz + +- added message "not enough memory to run dosfsck\n" +- if not free memory for malloc + +------------------------------------------------------------------- +Fri Dec 22 10:14:48 CET 2000 - pblaha@suse.cz + +- upgrade on 2.6 and rename on dosfstools + +------------------------------------------------------------------- +Mon Dec 4 16:13:17 CET 2000 - sf@suse.de + +- corrected patch to compile on Alpha and ia64 + +------------------------------------------------------------------- +Tue Nov 21 18:09:54 CET 2000 - uli@suse.de + +- worked around strncasecmp declaration conflict in mkdosfs.c + +------------------------------------------------------------------- +Mon Nov 13 11:32:39 CET 2000 - ro@suse.de + +- hacked to compile on 2.4 includes + +------------------------------------------------------------------- +Thu Nov 2 11:44:12 CET 2000 - pblaha@suse.cz + +- update to version 2.4 + +------------------------------------------------------------------- +Mon Jun 5 18:33:32 CEST 2000 - schwab@suse.de + +- Fix llseek on ia64. + +------------------------------------------------------------------- +Fri Jun 2 15:32:06 MEST 2000 - bubnikv@suse.cz + +- new package in SuSE, version 2.2 +- makes packages dosfsck and mkdosfs obsolette + diff --git a/dosfstools.spec b/dosfstools.spec new file mode 100644 index 0000000..1ba6513 --- /dev/null +++ b/dosfstools.spec @@ -0,0 +1,192 @@ +# +# spec file for package dosfstools (Version 2.11) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: dosfstools +Provides: mkdosfs dosfsck +License: GPL +Group: System/Filesystems +Autoreqprov: on +Summary: Utilities for Making and Checking MS-DOS FAT File Systems on Linux +Version: 2.11 +Release: 15 +URL: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools +Source: dosfstools-%{version}.src.tar.bz2 +#Patch0: dosfstools-%{version}-define.patch +#Patch1: dosfstools-%{version}-sign.patch +#Patch2: dosfstools-%{version}-manpage.patch +Patch3: dosfstools-%{version}-linuxfs.patch +Patch4: unaligned.patch +#Patch5: dosfsck-freedos.patch +Patch6: dosfstools-subfs.patch +Patch7: dosfstools-%{version}-buffer.patch +Obsoletes: mkdosfs dosfsck dosfstls +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +The dosfstools package includes the mkdosfs and dosfsck utilities, +which respectively make and check MS-DOS FAT file systems on hard +drives or on floppies. + + + +Authors: +-------- + Dave Hudson + Werner Almesberger + Roman Hodek + +%prep +%setup +#%patch0 +#%patch1 +#%patch2 +%patch3 +%patch4 -p1 +#%patch5 +%patch6 +%patch7 -p1 + +%build +make OPTFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $RPM_OPT_FLAGS" + +%install +# directories +install -d $RPM_BUILD_ROOT{/sbin,%{_mandir}/man8} +# binaries +install -m755 mkdosfs/mkdosfs $RPM_BUILD_ROOT/sbin/ +install -m755 dosfsck/dosfsck $RPM_BUILD_ROOT/sbin/ +# alternative names +ln -sf mkdosfs $RPM_BUILD_ROOT/sbin/mkfs.msdos +ln -sf dosfsck $RPM_BUILD_ROOT/sbin/fsck.msdos +ln -sf mkdosfs $RPM_BUILD_ROOT/sbin/mkfs.vfat +ln -sf dosfsck $RPM_BUILD_ROOT/sbin/fsck.vfat +# man pages +install -m 644 mkdosfs/mkdosfs.8 $RPM_BUILD_ROOT%{_mandir}/man8/ +install -m 644 dosfsck/dosfsck.8 $RPM_BUILD_ROOT%{_mandir}/man8/ +# man pages for alternative names +ln -sf mkdosfs.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/mkfs.msdos.8.gz +ln -sf dosfsck.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/fsck.msdos.8.gz +ln -sf mkdosfs.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/mkfs.vfat.8.gz +ln -sf dosfsck.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/fsck.vfat.8.gz +# documentation +install -m755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/dosfsck +install -m755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/mkdosfs +install -m644 CHANGES TODO README.Atari $RPM_BUILD_ROOT/%{_docdir}/%{name}/ +install -m644 dosfsck/{COPYING,README} $RPM_BUILD_ROOT/%{_docdir}/%{name}/dosfsck +install -m644 mkdosfs/{COPYING,README} $RPM_BUILD_ROOT/%{_docdir}/%{name}/mkdosfs + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc %{_docdir}/%{name} +/sbin/* +%{_mandir}/man8/*.gz + +%changelog -n dosfstools +* Sat May 27 2006 - schwab@suse.de +- Don't strip binaries. +* Wed Jan 25 2006 - mls@suse.de +- converted neededforbuild to BuildRequires +* Tue Nov 08 2005 - dmueller@suse.de +- don't build as root +* Mon Nov 07 2005 - yxu@suse.de +- fixed overflowing buffer problem +* Mon Apr 11 2005 - mcihar@suse.cz +- update to 2.11 +- use sys/mount.h instead of linux/fs.h, this fixes compilation with current GCC +* Tue Feb 15 2005 - mcihar@suse.cz +- deal with subfs (bug #50838) +- use /proc/mounts if available for deciding whether device is + mounted or not +- just issue warning if it is mounted as subfs +* Thu Aug 19 2004 - mcihar@suse.cz +- merged some dosfsck fixes from FreeDOS +* Thu Jul 15 2004 - schwab@suse.de +- Fix unaligned accesses [#40296]. +* Wed Jun 02 2004 - ro@suse.de +- avoid inclusion of linux/audit.h +* Thu Mar 18 2004 - mcihar@suse.cz +- fix dosfsck man page (pointed out in bug #34757) +* Mon Mar 08 2004 - mcihar@suse.cz +- fix broken dosfsck (bug #34757) +* Thu Jan 29 2004 - mcihar@suse.cz +- include more documentation +* Thu Jan 15 2004 - kukuk@suse.de +- Make compile with kernel 2.6.1 headers +* Thu Oct 23 2003 - schwab@suse.de +- Don't define llseek to lseek64, creates infinite recursion. +* Tue Oct 14 2003 - mcihar@suse.cz +- install links also for {fsck,mkfs}.vfat + man pages (bug #32284) +* Mon Sep 29 2003 - mcihar@suse.cz +- updated to 2.10: +- dosfsck: various 64-bit fixes and removed some warnings by Michal + Cihar +- mkdosfs: better error message if called without parameters (also + suggested by Michal) +* Mon Jun 09 2003 - mcihar@suse.cz +- new upstream version 2.9: + * dosfsck: Fix potential for "Internal error: next_cluster on bad cluster". + * dosfsck: When clearing long file names, don't overwrite the dir + entries with all zeros, but put 0xe5 into the first byte. + Otherwise, some OSes stop reading the directory at that point... + * dosfsck: in statistics printed by -v, fix 32bit overflow in number + of data bytes. + * dosfsck: fix an potential overflow in "too many clusters" check + * dosfsck: allow FAT size > 32MB. + * dosfsck: allow for only one FAT + * dosfsck: with -v, also check that last sector of the filesystem can + be read (in case a partition is smaller than the fs thinks) +- realy working large file support +- don't package obsolette documentation +* Wed Dec 04 2002 - mcihar@suse.cz +- don't allow -fPIC on i386 in CFLAGS, even on i386-debug, because + this package doesn't build with it +* Mon Dec 02 2002 - ro@suse.de +- include errno.h where needed +* Tue Sep 10 2002 - mcihar@suse.cz +- added -D_FILE_OFFSET_BITS=64 to CFLAGS to support larger files/partitions +* Tue May 21 2002 - ro@suse.de +- extend 64bit ifdefs for new platforms +* Fri Mar 01 2002 - jantos@suse.cz +- Fixed missing files in documentation (bug 13973) +* Fri Sep 14 2001 - schwab@suse.de +- Fix crash if mkdosfs is called without arguments. +* Tue May 22 2001 - pblaha@suse.cz +- fixed include files on ia64 +* Sun Apr 08 2001 - schwab@suse.de +- Fix to build on ia64. +* Mon Mar 05 2001 - pblaha@suse.cz +- update on 2.8 +* Mon Feb 12 2001 - ro@suse.de +- don't include linux/fs.h +* Thu Jan 18 2001 - schwab@suse.de +- Add Obsoletes: dosfstls. +* Wed Jan 17 2001 - pblaha@suse.cz +- added message "not enough memory to run dosfsck\n" +- if not free memory for malloc +* Fri Dec 22 2000 - pblaha@suse.cz +- upgrade on 2.6 and rename on dosfstools +* Mon Dec 04 2000 - sf@suse.de +- corrected patch to compile on Alpha and ia64 +* Tue Nov 21 2000 - uli@suse.de +- worked around strncasecmp declaration conflict in mkdosfs.c +* Mon Nov 13 2000 - ro@suse.de +- hacked to compile on 2.4 includes +* Thu Nov 02 2000 - pblaha@suse.cz +- update to version 2.4 +* Mon Jun 05 2000 - schwab@suse.de +- Fix llseek on ia64. +* Fri Jun 02 2000 - bubnikv@suse.cz +- new package in SuSE, version 2.2 +- makes packages dosfsck and mkdosfs obsolette diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/unaligned.patch b/unaligned.patch new file mode 100644 index 0000000..02f89af --- /dev/null +++ b/unaligned.patch @@ -0,0 +1,33 @@ +diff -rup dosfstools-2.10/dosfsck/boot.c dosfstools-2.10.2/dosfsck/boot.c +--- dosfstools-2.10/dosfsck/boot.c 2004-06-17 21:18:01.289544641 +0200 ++++ dosfstools-2.10.2/dosfsck/boot.c 2004-06-17 21:19:12.176001322 +0200 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + #include "common.h" + #include "dosfsck.h" +@@ -35,18 +36,11 @@ static struct { + { 0xff, "5.25\" 320k floppy 2s/40tr/8sec" }, + }; + +-#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__ +-/* Unaligned fields must first be copied byte-wise */ +-#define GET_UNALIGNED_W(f) \ +- ({ \ +- unsigned short __v; \ +- memcpy( &__v, &f, sizeof(__v) ); \ +- CF_LE_W( *(unsigned short *)&f ); \ +- }) +-#else +-#define GET_UNALIGNED_W(f) CF_LE_W( *(unsigned short *)&f ) ++#ifndef get_unaligned ++#define get_unaligned(ptr) (*(ptr)) + #endif + ++#define GET_UNALIGNED_W(f) CF_LE_W( get_unaligned ((unsigned short *)&f)) + + static char *get_media_descr( unsigned char media ) + {