Bug #99845 - fix double count of files during verification.

Package-Manager: portage-2.1.2_pre2-r3

5 files changed, 105 insertions, 15 deletions

diff --git a/sys-fs/dosfstools/ChangeLog b/sys-fs/dosfstools/ChangeLog
index 3be728797480..bb1dc1506839 100644
--- a/sys-fs/dosfstools/ChangeLog
+++ b/sys-fs/dosfstools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/dosfstools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.34 2006/10/04 16:32:54 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.35 2006/10/05 16:27:07 robbat2 Exp $
+
+*dosfstools-2.11-r2 (05 Oct 2006)
+
+  05 Oct 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/dosfstools-2.11-verify-double-count-fix.patch,
+  +dosfstools-2.11-r2.ebuild:
+  Bug #99845 - fix double count of files during verification.
 
   04 Oct 2006; Daniel Gryniewicz <dang@gentoo.org>
   dosfstools-2.11-r1.ebuild:
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index 375bb3fc8e30..295c4fd40901 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dosfstools-2.10-2.6.headers.patch 740 RMD160 6a6a12403a73dca6d23ccc2ca0b93bf5613ad546 SHA1 86f8c75d93696559f46d4fb481dccdb12e465bcc SHA256 11f08c1f6f56f0cbb017a92825c6de03df94cf736da01683fe7e6f261d385b16
 MD5 15e58786d8b78987b6ff2b5b4850bd4b files/dosfstools-2.10-2.6.headers.patch 740
 RMD160 6a6a12403a73dca6d23ccc2ca0b93bf5613ad546 files/dosfstools-2.10-2.6.headers.patch 740
@@ -13,6 +10,10 @@ AUX dosfstools-2.11-fat32size.patch 1428 RMD160 7434905b76773c0e955285677af4c6ed
 MD5 c60c859ba61e196767e00c2c1071931d files/dosfstools-2.11-fat32size.patch 1428
 RMD160 7434905b76773c0e955285677af4c6ed3ca21f54 files/dosfstools-2.11-fat32size.patch 1428
 SHA256 f2d205fbfbf6a6cb7efb97886e11644b7413a5683b0af154128e496679a1f061 files/dosfstools-2.11-fat32size.patch 1428
+AUX dosfstools-2.11-verify-double-count-fix.patch 1089 RMD160 c18dc1ba44b89e76c880528d96e8523f2e6ea72c SHA1 166d02922083f093c177c703619a401e0d44809d SHA256 d1fb2fc64776469378735c737235b1916d2ae1d150967b42a46594c75b4310bf
+MD5 6abbe0c4011f7a7738f308b92fff4a70 files/dosfstools-2.11-verify-double-count-fix.patch 1089
+RMD160 c18dc1ba44b89e76c880528d96e8523f2e6ea72c files/dosfstools-2.11-verify-double-count-fix.patch 1089
+SHA256 d1fb2fc64776469378735c737235b1916d2ae1d150967b42a46594c75b4310bf files/dosfstools-2.11-verify-double-count-fix.patch 1089
 AUX errno.patch 257 RMD160 7a278839bea6fd5db6949953241990b1f2c9b496 SHA1 99fb75b936c3f91a76b6ced9e05a4094035a8357 SHA256 52c50cc822a0e14bb257970051c85af7b81953734920939cb1828d98403dc9c5
 MD5 af6a07ad458852ef02d58a7a3658ca15 files/errno.patch 257
 RMD160 7a278839bea6fd5db6949953241990b1f2c9b496 files/errno.patch 257
@@ -22,14 +23,18 @@ EBUILD dosfstools-2.11-r1.ebuild 1161 RMD160 2ca9e1813a477d71882c486c21a264efbbd
 MD5 ceedeccf6b8f30ee76a3aa18eba05920 dosfstools-2.11-r1.ebuild 1161
 RMD160 2ca9e1813a477d71882c486c21a264efbbd70668 dosfstools-2.11-r1.ebuild 1161
 SHA256 7b0defc5c305ecfed58abc38134bfe1d412914492e37dddd82f2451a25553c22 dosfstools-2.11-r1.ebuild 1161
+EBUILD dosfstools-2.11-r2.ebuild 1243 RMD160 3cebc709ca021e6f2695599277ba27e2ecdcfb74 SHA1 d04b7c52636fdf63ccd0b2e79fb2f7d9b10b0989 SHA256 20e0230fb869cb300016cb7f9e91a4773fc8082fb5da99d3669ec570c61b4319
+MD5 b24d833bca76f03091e4672d5c8ba910 dosfstools-2.11-r2.ebuild 1243
+RMD160 3cebc709ca021e6f2695599277ba27e2ecdcfb74 dosfstools-2.11-r2.ebuild 1243
+SHA256 20e0230fb869cb300016cb7f9e91a4773fc8082fb5da99d3669ec570c61b4319 dosfstools-2.11-r2.ebuild 1243
 EBUILD dosfstools-2.11.ebuild 1068 RMD160 547079e5d69bd3397f4342960d13245bae06b2f6 SHA1 9bac027013e7d5565959a6c2203c8af8dec8dbec SHA256 07e3778b5897871c2678a366d19f8cd894e8feccd73e566f45d6727be615b38f
 MD5 6a51d37ec4e02a6fa41c6569916a6329 dosfstools-2.11.ebuild 1068
 RMD160 547079e5d69bd3397f4342960d13245bae06b2f6 dosfstools-2.11.ebuild 1068
 SHA256 07e3778b5897871c2678a366d19f8cd894e8feccd73e566f45d6727be615b38f dosfstools-2.11.ebuild 1068
-MISC ChangeLog 5384 RMD160 63a2fd4e832158582879f57618e3aa7d54ba48d9 SHA1 07b2db868812cfa63da1a9772428a0def30a0ebe SHA256 88f8c35227f36ee02c66333ccb1518f03cc19f34338d678638dd884d6ac2bcbe
-MD5 dcc103be2a38836bb444485043b9b9a7 ChangeLog 5384
-RMD160 63a2fd4e832158582879f57618e3aa7d54ba48d9 ChangeLog 5384
-SHA256 88f8c35227f36ee02c66333ccb1518f03cc19f34338d678638dd884d6ac2bcbe ChangeLog 5384
+MISC ChangeLog 5624 RMD160 fd221c8d46a2cd6012c1e32827efb4236adf8d79 SHA1 50f1c6dcb2f5fb1e6b7395b88a7882bd351a5ba4 SHA256 3fd4a162e74a44498d82c86286576ad9a187ca074257c0f8b7ce742fe2270f77
+MD5 510f8a97ce354d40f366b7de684071ff ChangeLog 5624
+RMD160 fd221c8d46a2cd6012c1e32827efb4236adf8d79 ChangeLog 5624
+SHA256 3fd4a162e74a44498d82c86286576ad9a187ca074257c0f8b7ce742fe2270f77 ChangeLog 5624
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -40,10 +45,6 @@ SHA256 c946bca113e3ab1d84c98a99bfffc26fb49bf3edd28b8376fe74eefcc07ab1d5 files/di
 MD5 3c7a4ddc11c30509a29c1c99df7471d4 files/digest-dosfstools-2.11-r1 256
 RMD160 c3071a1984b8de8aa722fc0bf1854ecd59563e9a files/digest-dosfstools-2.11-r1 256
 SHA256 c946bca113e3ab1d84c98a99bfffc26fb49bf3edd28b8376fe74eefcc07ab1d5 files/digest-dosfstools-2.11-r1 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFI+I8omPajV0RnrERAghMAJ0cPUeVUSDcYvfVHAUiPs/mY4t4iQCdExkb
-iIh3rF1jLJxbnq5Tn0Oh/ak=
-=QgxZ
------END PGP SIGNATURE-----
+MD5 3c7a4ddc11c30509a29c1c99df7471d4 files/digest-dosfstools-2.11-r2 256
+RMD160 c3071a1984b8de8aa722fc0bf1854ecd59563e9a files/digest-dosfstools-2.11-r2 256
+SHA256 c946bca113e3ab1d84c98a99bfffc26fb49bf3edd28b8376fe74eefcc07ab1d5 files/digest-dosfstools-2.11-r2 256
diff --git a/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild b/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild
new file mode 100644
index 000000000000..685438a0d6d1
--- /dev/null
+++ b/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild
@@ -0,0 +1,42 @@
+# 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.1 2006/10/05 16:27:07 robbat2 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
+	epatch "${FILESDIR}"/dosfstools-2.11-verify-double-count-fix.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-r2 b/sys-fs/dosfstools/files/digest-dosfstools-2.11-r2
new file mode 100644
index 000000000000..00e5fa079ba2
--- /dev/null
+++ b/sys-fs/dosfstools/files/digest-dosfstools-2.11-r2
@@ -0,0 +1,3 @@
+MD5 407d405ade410f7597d364ab5dc8c9f6 dosfstools-2.11.src.tar.gz 68346
+RMD160 0336d407319ccbf8d4c4bf16a2330e713ab6b0ab dosfstools-2.11.src.tar.gz 68346
+SHA256 0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484 dosfstools-2.11.src.tar.gz 68346
diff --git a/sys-fs/dosfstools/files/dosfstools-2.11-verify-double-count-fix.patch b/sys-fs/dosfstools/files/dosfstools-2.11-verify-double-count-fix.patch
new file mode 100644
index 000000000000..5890c7869f62
--- /dev/null
+++ b/sys-fs/dosfstools/files/dosfstools-2.11-verify-double-count-fix.patch
@@ -0,0 +1,37 @@
+Don't double-count n_files during a verification pass.
+
+Bugzilla: http://bugs.gentoo.org/show_bug.cgi?id=99845
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude '*~' dosfstools-2.11.orig/dosfsck/dosfsck.c dosfstools-2.11/dosfsck/dosfsck.c
+--- dosfstools-2.11.orig/dosfsck/dosfsck.c	2004-02-25 11:28:57.000000000 -0800
++++ dosfstools-2.11/dosfsck/dosfsck.c	2006-10-05 09:21:41.116526881 -0700
+@@ -84,6 +84,7 @@
+ {
+     DOS_FS fs;
+     int rw,salvage_files,verify,c;
++	unsigned n_files_check=0, n_files_verify=0;
+     unsigned long free_clusters;
+     
+     rw = salvage_files = verify = 0;
+@@ -154,12 +155,15 @@
+     free_clusters = update_free(&fs);
+     file_unused();
+     qfree(&mem_queue);
++	n_files_check = n_files;
+     if (verify) {
+-	printf("Starting verification pass.\n");
+-	read_fat(&fs);
+-	scan_root(&fs);
+-	reclaim_free(&fs);
+-	qfree(&mem_queue);
++		n_files = 0;
++		printf("Starting verification pass.\n");
++		read_fat(&fs);
++		scan_root(&fs);
++		reclaim_free(&fs);
++		qfree(&mem_queue);
++		n_files_verify = n_files;
+     }
+ 
+     if (fs_changed()) {