diff options
| -rw-r--r-- | sys-fs/dosfstools/dosfstools-2.11-r1.ebuild | 41 | ||||
| -rw-r--r-- | sys-fs/dosfstools/dosfstools-2.11-r2.ebuild | 42 | ||||
| -rw-r--r-- | sys-fs/dosfstools/dosfstools-2.11.ebuild | 38 | ||||
| -rw-r--r-- | sys-fs/dosfstools/files/dosfstools-2.10-2.6.headers.patch | 25 | ||||
| -rw-r--r-- | sys-fs/dosfstools/files/dosfstools-2.10-lseek64.patch | 168 | ||||
| -rw-r--r-- | sys-fs/dosfstools/files/errno.patch | 10 |
6 files changed, 0 insertions, 324 deletions
diff --git a/sys-fs/dosfstools/dosfstools-2.11-r1.ebuild b/sys-fs/dosfstools/dosfstools-2.11-r1.ebuild deleted file mode 100644 index 4e194f26595c..000000000000 --- a/sys-fs/dosfstools/dosfstools-2.11-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.11-r1.ebuild,v 1.12 2006/10/04 16:32:53 dang Exp $ - -inherit eutils - -DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat" -HOMEPAGE="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/" -SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" -IUSE="" - -DEPEND="" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i \ - -e '/^PREFIX/s:=:=/usr:' \ - -e '/^MANDIR/s:/usr:/share:' \ - Makefile || die "sed Makefile" - epatch "${FILESDIR}"/dosfstools-2.11-fat32size.patch -} - -src_compile() { - # this package does *not* play well with optimisations - # please dont change to: make OPTFLAGS="${CFLAGS}" - emake -j1 || die -} - -src_install() { - make PREFIX="${D}"/usr install || die - dodoc CHANGES TODO - newdoc dosfsck/README README.dosfsck - newdoc dosfsck/CHANGES CHANGES.dosfsck - newdoc mkdosfs/README README.mkdosfs - newdoc mkdosfs/ChangeLog ChangeLog.mkdosfs -} diff --git a/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild b/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild deleted file mode 100644 index c8fb6d5f598e..000000000000 --- a/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild,v 1.2 2006/12/14 05:47:34 vapier Exp $ - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat" -HOMEPAGE="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/" -SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="" - -DEPEND="" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i \ - -e '/^PREFIX/s:=:=/usr:' \ - -e '/^MANDIR/s:/usr:/share:' \ - Makefile || die "sed Makefile" - epatch "${FILESDIR}"/dosfstools-2.11-fat32size.patch - epatch "${FILESDIR}"/dosfstools-2.11-verify-double-count-fix.patch - epatch "${FILESDIR}"/dosfstools-2.11-build.patch -} - -src_compile() { - tc-export CC - emake -j1 || die -} - -src_install() { - emake PREFIX="${D}"/usr install || die - dodoc CHANGES TODO - newdoc dosfsck/README README.dosfsck - newdoc dosfsck/CHANGES CHANGES.dosfsck - newdoc mkdosfs/README README.mkdosfs - newdoc mkdosfs/ChangeLog ChangeLog.mkdosfs -} diff --git a/sys-fs/dosfstools/dosfstools-2.11.ebuild b/sys-fs/dosfstools/dosfstools-2.11.ebuild deleted file mode 100644 index 37f3dcf0492d..000000000000 --- a/sys-fs/dosfstools/dosfstools-2.11.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.11.ebuild,v 1.4 2006/06/16 20:42:01 corsair Exp $ - -DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat" -HOMEPAGE="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/" -SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" -IUSE="" - -DEPEND="" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i \ - -e '/^PREFIX/s:=:=/usr:' \ - -e '/^MANDIR/s:/usr:/share:' \ - Makefile || die "sed Makefile" -} - -src_compile() { - # this package does *not* play well with optimisations - # please dont change to: make OPTFLAGS="${CFLAGS}" - make || die -} - -src_install() { - make PREFIX="${D}"/usr install || die - dodoc CHANGES TODO - newdoc dosfsck/README README.dosfsck - newdoc dosfsck/CHANGES CHANGES.dosfsck - newdoc mkdosfs/README README.mkdosfs - newdoc mkdosfs/ChangeLog ChangeLog.mkdosfs -} diff --git a/sys-fs/dosfstools/files/dosfstools-2.10-2.6.headers.patch b/sys-fs/dosfstools/files/dosfstools-2.10-2.6.headers.patch deleted file mode 100644 index 025e40f46981..000000000000 --- a/sys-fs/dosfstools/files/dosfstools-2.10-2.6.headers.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ur dosfsck/boot.org dosfsck/boot.c ---- dosfsck/boot.org 2004-03-04 06:45:51.368946816 +0000 -+++ dosfsck/boot.c 2004-03-04 06:45:24.838979984 +0000 -@@ -14,6 +14,10 @@ - #include "io.h" - #include "boot.h" - -+#ifndef MSDOS_FAT12 -+#define MSDOS_FAT12 MAX_FAT12 -+#endif // !MSDOS_FAT12 -+ - #define ROUND_TO_MULTIPLE(n,m) ((n) && (m) ? (n)+(m)-1-((n)-1)%(m) : 0) - /* don't divide by zero */ - -diff -ur mkdosfs/mkdosfs.c mkdosfs/mkdosfs.c ---- mkdosfs/mkdosfs.c 2005-04-14 17:14:59.000000000 +0100 -+++ mkdosfs/mkdosfs.c 2005-04-14 17:16:05.000000000 +0100 -@@ -54,6 +54,7 @@ - #include <linux/hdreg.h> - #include <linux/fs.h> - #include <linux/fd.h> -+#include <linux/types.h> - #include <endian.h> - #include <mntent.h> - #include <signal.h> diff --git a/sys-fs/dosfstools/files/dosfstools-2.10-lseek64.patch b/sys-fs/dosfstools/files/dosfstools-2.10-lseek64.patch deleted file mode 100644 index ea99c3fbb0d2..000000000000 --- a/sys-fs/dosfstools/files/dosfstools-2.10-lseek64.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff -Naur dosfstools-2.10-orig/Makefile dosfstools-2.10/Makefile ---- dosfstools-2.10-orig/Makefile 2003-05-15 19:00:27.000000000 +0000 -+++ dosfstools-2.10/Makefile 2004-06-28 05:00:45.000000000 +0000 -@@ -7,7 +7,7 @@ - OPTFLAGS = -O2 -fomit-frame-pointer - WARNFLAGS = -Wall - DEBUGFLAGS = --CFLAGS = $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS) -+CFLAGS = -D_GNU_SOURCE $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS) - LDFLAGS = - - PREFIX = -diff -Naur dosfstools-2.10-orig/dosfsck/io.c dosfstools-2.10/dosfsck/io.c ---- dosfstools-2.10-orig/dosfsck/io.c 2003-06-14 20:03:20.000000000 +0000 -+++ dosfstools-2.10/dosfsck/io.c 2004-06-28 04:59:45.000000000 +0000 -@@ -39,32 +39,6 @@ - - unsigned device_no; - --/* Use the _llseek system call directly, because there (once?) was a bug in -- * the glibc implementation of it. */ --#include <linux/unistd.h> --#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__ --/* On alpha, the syscall is simply lseek, because it's a 64 bit system. */ --static loff_t llseek( int fd, loff_t offset, int whence ) --{ -- return lseek(fd, offset, whence); --} --#else --# ifndef __NR__llseek --# error _llseek system call not present --# endif --static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo, -- loff_t *, res, uint, wh ); -- --static loff_t llseek( int fd, loff_t offset, int whence ) --{ -- loff_t actual; -- -- if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0) -- return (loff_t)-1; -- return actual; --} --#endif -- - - void fs_open(char *path,int rw) - { -@@ -86,7 +60,7 @@ - CHANGE *walk; - int got; - -- if (llseek(fd,pos,0) != pos) pdie("Seek to %lld",pos); -+ if (lseek64(fd,pos,0) != pos) pdie("Seek to %lld",pos); - if ((got = read(fd,data,size)) < 0) pdie("Read %d bytes at %lld",size,pos); - if (got != size) die("Got %d bytes instead of %d at %lld",got,size,pos); - for (walk = changes; walk; walk = walk->next) { -@@ -106,7 +80,7 @@ - void *scratch; - int okay; - -- if (llseek(fd,pos,0) != pos) pdie("Seek to %lld",pos); -+ if (lseek64(fd,pos,0) != pos) pdie("Seek to %lld",pos); - scratch = alloc(size); - okay = read(fd,scratch,size) == size; - free(scratch); -@@ -121,7 +95,7 @@ - - if (write_immed) { - did_change = 1; -- if (llseek(fd,pos,0) != pos) pdie("Seek to %lld",pos); -+ if (lseek64(fd,pos,0) != pos) pdie("Seek to %lld",pos); - if ((did = write(fd,data,size)) == size) return; - if (did < 0) pdie("Write %d bytes at %lld",size,pos); - die("Wrote %d bytes instead of %d at %lld",did,size,pos); -@@ -144,7 +118,7 @@ - while (changes) { - this = changes; - changes = changes->next; -- if (llseek(fd,this->pos,0) != this->pos) -+ if (lseek64(fd,this->pos,0) != this->pos) - fprintf(stderr,"Seek to %lld failed: %s\n Did not write %d bytes.\n", - this->pos,strerror(errno),this->size); - else if ((size = write(fd,this->data,this->size)) < 0) -diff -Naur dosfstools-2.10-orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs.c ---- dosfstools-2.10-orig/mkdosfs/mkdosfs.c 2003-06-14 20:07:08.000000000 +0000 -+++ dosfstools-2.10/mkdosfs/mkdosfs.c 2004-06-28 05:00:16.000000000 +0000 -@@ -93,30 +93,6 @@ - - #endif /* __BIG_ENDIAN */ - --/* Use the _llseek system call directly, because there (once?) was a bug in -- * the glibc implementation of it. */ --#include <linux/unistd.h> --#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__ --/* On alpha, the syscall is simply lseek, because it's a 64 bit system. */ --static loff_t llseek( int fd, loff_t offset, int whence ) --{ -- return lseek(fd, offset, whence); --} --#else --# ifndef __NR__llseek --# error _llseek system call not present --# endif --static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo, -- loff_t *, res, uint, wh ); --static loff_t llseek( int fd, loff_t offset, int whence ) --{ -- loff_t actual; -- -- if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0) -- return (loff_t)-1; -- return actual; --} --#endif - - /* Constant definitions */ - -@@ -423,7 +399,7 @@ - { - long got; - -- if (llseek (dev, (loff_t)current_block * BLOCK_SIZE, SEEK_SET) /* Seek to the correct location */ -+ if (lseek64 (dev, (loff_t)current_block * BLOCK_SIZE, SEEK_SET) /* Seek to the correct location */ - != (loff_t)current_block * BLOCK_SIZE) - die ("seek failed during testing for blocks"); - -@@ -542,7 +518,7 @@ - { - char ch; - -- if (llseek (fd, offset, SEEK_SET) < 0) -+ if (lseek64 (fd, offset, SEEK_SET) < 0) - return FALSE; - if (read (fd, &ch, 1) < 1) - return FALSE; -@@ -565,7 +541,7 @@ - } - - /* first try SEEK_END, which should work on most devices nowadays */ -- if ((low = llseek(fd, 0, SEEK_END)) <= 0) { -+ if ((low = lseek64(fd, 0, SEEK_END)) <= 0) { - low = 0; - for (high = 1; valid_offset (fd, high); high *= 2) - low = high; -@@ -1310,7 +1286,7 @@ - #define seekto(pos,errstr) \ - do { \ - loff_t __pos = (pos); \ -- if (llseek (dev, __pos, SEEK_SET) != __pos) \ -+ if (lseek64 (dev, __pos, SEEK_SET) != __pos) \ - error ("seek to " errstr " failed whilst writing tables"); \ - } while(0) - -@@ -1667,11 +1643,11 @@ - die("unable to create %s"); - /* seek to the intended end-1, and write one byte. this creates a - * sparse-as-possible file of appropriate size. */ -- if (llseek( dev, offset, SEEK_SET ) != offset) -+ if (lseek64( dev, offset, SEEK_SET ) != offset) - die( "seek failed" ); - if (write( dev, &null, 1 ) < 0) - die( "write failed" ); -- if (llseek( dev, 0, SEEK_SET ) != 0) -+ if (lseek64( dev, 0, SEEK_SET ) != 0) - die( "seek failed" ); - } - diff --git a/sys-fs/dosfstools/files/errno.patch b/sys-fs/dosfstools/files/errno.patch deleted file mode 100644 index 9142c5993b20..000000000000 --- a/sys-fs/dosfstools/files/errno.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mkdosfs/mkdosfs.c.orig 2003-02-27 01:46:48.000000000 -0500 -+++ mkdosfs/mkdosfs.c 2003-02-27 01:47:00.000000000 -0500 -@@ -49,6 +49,7 @@ - - #include "../version.h" - -+#include <errno.h> - #include <fcntl.h> - #include <linux/hdreg.h> - #include <linux/fs.h> |