From 676d1ab311565313d78bb7fc549150e94df514ed8b2481321556c87443ef93c6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 16 Nov 2009 13:30:04 +0000 Subject: [PATCH] Accepting request 24413 from Base:System Copy from Base:System/dosfstools based on submit request 24413 from user msmeissn OBS-URL: https://build.opensuse.org/request/show/24413 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dosfstools?expand=0&rev=10 --- dosfstools-2.11-linuxfs.patch | 7 +- dosfstools.changes | 5 ++ dosfstools.spec | 116 +--------------------------------- 3 files changed, 11 insertions(+), 117 deletions(-) diff --git a/dosfstools-2.11-linuxfs.patch b/dosfstools-2.11-linuxfs.patch index 22d2040..f91ef1f 100644 --- a/dosfstools-2.11-linuxfs.patch +++ b/dosfstools-2.11-linuxfs.patch @@ -1,6 +1,8 @@ ---- mkdosfs/mkdosfs.c +Index: mkdosfs/mkdosfs.c +=================================================================== +--- mkdosfs/mkdosfs.c.orig +++ mkdosfs/mkdosfs.c -@@ -51,6 +51,6 @@ +@@ -51,7 +51,7 @@ #include #include @@ -8,3 +10,4 @@ +#include #include #include + #include diff --git a/dosfstools.changes b/dosfstools.changes index d3b2b60..08e28b7 100644 --- a/dosfstools.changes +++ b/dosfstools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 19:09:13 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Tue Jun 24 15:15:31 CEST 2008 - pgajdos@suse.cz diff --git a/dosfstools.spec b/dosfstools.spec index 7d0b14d..8acf591 100644 --- a/dosfstools.spec +++ b/dosfstools.spec @@ -25,7 +25,7 @@ Group: System/Filesystems AutoReqProv: on Summary: Utilities for Making and Checking MS-DOS FAT File Systems on Linux Version: 2.11 -Release: 145 +Release: 146 Url: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools Source: %{name}-%{version}.src.tar.bz2 Patch0: %{name}-%{version}-linuxfs.patch @@ -101,117 +101,3 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/*.gz %changelog -* Tue Jun 24 2008 pgajdos@suse.cz -- added warning for creation msdos on filesystem with sector size - greater than 4096 [fate#303325] (unsupported-sector-size.patch) -* Thu Sep 06 2007 pgajdos@suse.cz -- determine sector size of device automatically or if -S parameter - present, verify, that it's not under physical sector size - (determine-sector-size.patch) -* Thu Aug 09 2007 olh@suse.de -- remove inclusion of asm/unaligned.h, use private copy of - asm-generic/unaligned.h -* Thu Apr 26 2007 lnussel@suse.de -- remove obsolete subfs patch -- fix handling of zero heads and sectors -* Wed Apr 04 2007 pgajdos@suse.cz -- added Supplements: filesystem(vfat) line to spec file - [fate#301966] -* Tue Jan 30 2007 prusnak@suse.cz -- mkdosfs now opens device with O_EXCL [#238687] -* 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