Fix by Ulrich Mueller for generation of filesystems on 256meg devices #112504.

Package-Manager: portage-2.0.53_rc7

5 files changed, 105 insertions, 10 deletions

diff --git a/sys-fs/dosfstools/ChangeLog b/sys-fs/dosfstools/ChangeLog
index ad9e5352436a..e5437036f416 100644
--- a/sys-fs/dosfstools/ChangeLog
+++ b/sys-fs/dosfstools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/dosfstools
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.22 2005/06/18 04:18:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.23 2005/11/15 00:42:34 vapier Exp $
+
+*dosfstools-2.11-r1 (15 Nov 2005)
+
+  15 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/dosfstools-2.11-fat32size.patch, +dosfstools-2.11-r1.ebuild:
+  Fix by Ulrich Mueller for generation of filesystems on 256meg devices #112504.
 
 *dosfstools-2.11 (18 Jun 2005)
 
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index fbc22ea03d5a..a544526075d4 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 60b357f3b338a154f2aa991d2d34adcc ChangeLog 3943
+MD5 a4776599aaf0860f865997e7fb4f8dde ChangeLog 4180
+MD5 949a1dbe6212033409dfa4ed9e5620ed dosfstools-2.11-r1.ebuild 1146
 MD5 546303e494f3db286f6afcd160061943 dosfstools-2.11.ebuild 1061
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 3bf9835ac36dac3de2f6981202be596a dosfstools-2.10-r1.ebuild 1318
 MD5 bc7f130eda06c0ef85f2022829a13a2e files/digest-dosfstools-2.11 70
-MD5 af6a07ad458852ef02d58a7a3658ca15 files/errno.patch 257
+MD5 bc7f130eda06c0ef85f2022829a13a2e files/digest-dosfstools-2.11-r1 70
 MD5 15e58786d8b78987b6ff2b5b4850bd4b files/dosfstools-2.10-2.6.headers.patch 740
-MD5 9eae6c4e222bcb616db95d21959a7688 files/digest-dosfstools-2.10-r1 70
 MD5 1892bf8b14475bb28ecd9c09492ba854 files/dosfstools-2.10-lseek64.patch 5650
+MD5 c60c859ba61e196767e00c2c1071931d files/dosfstools-2.11-fat32size.patch 1428
+MD5 af6a07ad458852ef02d58a7a3658ca15 files/errno.patch 257
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCs6DHgIKl8Uu19MoRApaPAJ4hwv3REERPk7D5ozFNlHUl53AG3ACfTBEp
-Yud+naACAYG8O3xFGHxvLgo=
-=s610
+iD8DBQFDeS9BgIKl8Uu19MoRAqi/AJwMqETTLKqJrugXJYZ1gnKBJlXtTQCdGieq
+HXdEAICPzCCLA3JF2xlKXHw=
+=u/T8
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/dosfstools/dosfstools-2.11-r1.ebuild b/sys-fs/dosfstools/dosfstools-2.11-r1.ebuild
new file mode 100644
index 000000000000..c32d405f193d
--- /dev/null
+++ b/sys-fs/dosfstools/dosfstools-2.11-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 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.1 2005/11/15 00:42:34 vapier 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 ~hppa ~ia64 ~ppc ~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/files/digest-dosfstools-2.11-r1 b/sys-fs/dosfstools/files/digest-dosfstools-2.11-r1
new file mode 100644
index 000000000000..6f106d56fc2a
--- /dev/null
+++ b/sys-fs/dosfstools/files/digest-dosfstools-2.11-r1
@@ -0,0 +1 @@
+MD5 407d405ade410f7597d364ab5dc8c9f6 dosfstools-2.11.src.tar.gz 68346
diff --git a/sys-fs/dosfstools/files/dosfstools-2.11-fat32size.patch b/sys-fs/dosfstools/files/dosfstools-2.11-fat32size.patch
new file mode 100644
index 000000000000..5047155dd841
--- /dev/null
+++ b/sys-fs/dosfstools/files/dosfstools-2.11-fat32size.patch
@@ -0,0 +1,46 @@
+Fix generation of FAT filesystems on devices that are 256meg in size
+
+Patch by Ulrich Mueller and accepted upstream
+
+http://bugs.gentoo.org/112504
+
+--- mkdosfs/mkdosfs.c
++++ mkdosfs/mkdosfs.c
+@@ -769,18 +769,19 @@
+ 	  size_fat = 32;
+       }
+       if (size_fat == 32) {
+-	  /* For FAT32, try to do the same as M$'s format command:
+-	   * fs size < 256M: 0.5k clusters
+-	   * fs size <   8G: 4k clusters
+-	   * fs size <  16G: 8k clusters
+-	   * fs size >= 16G: 16k clusters
++	  /* For FAT32, try to do the same as M$'s format command
++	   * (see http://www.win.tue.nl/~aeb/linux/fs/fat/fatgen103.pdf p. 20):
++	   * fs size <= 260M: 0.5k clusters
++	   * fs size <=   8G: 4k clusters
++	   * fs size <=  16G: 8k clusters
++	   * fs size >   16G: 16k clusters
+ 	   */
+ 	  unsigned long sz_mb =
+ 	      (blocks+(1<<(20-BLOCK_SIZE_BITS))-1) >> (20-BLOCK_SIZE_BITS);
+-	  bs.cluster_size = sz_mb >= 16*1024 ? 32 :
+-			    sz_mb >=  8*1024 ? 16 :
+-			    sz_mb >=     256 ?  8 :
+-					        1;
++	  bs.cluster_size = sz_mb > 16*1024 ? 32 :
++			    sz_mb >  8*1024 ? 16 :
++			    sz_mb >     260 ?  8 :
++					       1;
+       }
+       else {
+ 	  /* FAT12 and FAT16: start at 4 sectors per cluster */
+@@ -1036,6 +1037,8 @@
+ 	break;
+ 
+       case 32:
++	if (clust32 < MIN_CLUST_32)
++	  fprintf(stderr, "WARNING: Not enough clusters for a 32 bit FAT!\n");
+ 	cluster_count = clust32;
+ 	fat_length = fatlength32;
+ 	bs.fat_length = CT_LE_W(0);