Patch to fix bug #151626.

Package-Manager: portage-2.1.2_pre3-r5

5 files changed, 58 insertions, 27 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 3d489a20b6ec..c4ccb93f3ecd 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.26 2006/10/19 04:42:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.27 2006/10/19 23:11:02 the_paya Exp $
+
+  19 Oct 2006; Javier Villavicencio <the_paya@gentoo.org>
+  +files/freebsd-sources-6.1-ntfs.patch, freebsd-sources-6.1-r4.ebuild:
+  Fixes bug #151626, thanks to Simon Koenig for reporting and testing.
 
   19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Remove 6.2_beta1 ebuild.
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 605687bebd77..0c71d5912ace 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX SA-06-16-smbfs.patch 874 RMD160 73c3680d7ed5c452c4160105baf1407e69b71eee SHA1 f6157a02e0cfdcdc2f3fceed56a15f451ba219ac SHA256 73dab3542ffb63818151b9d6fe21d6d0b0734da992c76d80525b711d02efaee6
 MD5 05e64e6f86c3e33185f6a1a0d2ccddf4 files/SA-06-16-smbfs.patch 874
 RMD160 73c3680d7ed5c452c4160105baf1407e69b71eee files/SA-06-16-smbfs.patch 874
@@ -29,6 +26,10 @@ AUX freebsd-sources-6.1-intrcnt.patch 800 RMD160 b6f36e51dc8267537af828c808b4502
 MD5 b9280c2eeae04a5afa38fbf6505f6120 files/freebsd-sources-6.1-intrcnt.patch 800
 RMD160 b6f36e51dc8267537af828c808b4502db452378e files/freebsd-sources-6.1-intrcnt.patch 800
 SHA256 24cd3cbd09852fe08d272eff1d8d335d4975489857669e74aae8c63a7019bd08 files/freebsd-sources-6.1-intrcnt.patch 800
+AUX freebsd-sources-6.1-ntfs.patch 1043 RMD160 0389ef971934db5b239d81ec016d94a21398c226 SHA1 03d8c702bbd6bd79f7b3cbe64f720487b87fa442 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469
+MD5 ea9ee941c9105bed2e9d226450087ee1 files/freebsd-sources-6.1-ntfs.patch 1043
+RMD160 0389ef971934db5b239d81ec016d94a21398c226 files/freebsd-sources-6.1-ntfs.patch 1043
+SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 files/freebsd-sources-6.1-ntfs.patch 1043
 AUX freebsd-sources-6.2-sparc64.patch 18794 RMD160 7e529e32924c872ea033f03c781a86031fe8d13b SHA1 ef21dc71571d547c01f5ce8f43a33e9e4d00a519 SHA256 a1b5803f3366d3466ba3c07f510e0b8c72e17b515a1dc82f696e5a10bec7a60c
 MD5 2d9b3844827a93ea31fe3189359d693f files/freebsd-sources-6.2-sparc64.patch 18794
 RMD160 7e529e32924c872ea033f03c781a86031fe8d13b files/freebsd-sources-6.2-sparc64.patch 18794
@@ -38,23 +39,23 @@ MD5 91662a80d0cd0cd3dca34f3c1ca54830 files/freebsd-sources-gentoo.patch 1191
 RMD160 1c8ce1849d767a995f075fe43b7313b341bd0805 files/freebsd-sources-gentoo.patch 1191
 SHA256 e5e7186858259e7d6d21e925dde640a68b27255cf69ab089ee82675568e7d9a7 files/freebsd-sources-gentoo.patch 1191
 DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA1 f9da69cabdaaad268c79670c06ba4fff3e3ef6a8 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f
-DIST freebsd-sys-6.2_beta2.tar.bz2 18317253 RMD160 c53fdcb1289d56f5184b3912fdb0ce2cc4edcc49 SHA1 5f5e3d61f7580eecafb87cbd08050ac8a2c8a1c4 SHA256 a5e503e13340bd1ac674aeae3737d4b65f3b00650a43ef11bfb9771fcf0f62d3
+DIST freebsd-sys-6.2_beta2.tar.bz2 1582664 RMD160 104f94c6dbd595b5a9a140c8b6ea42119291d1a1 SHA1 f62e514c25ebd9dc57ec30247c88f99617cea6ab SHA256 823a2b369714e9d8f5a2c75fd295fb657d21c7ba772e3ac08d89a29c86bcddb4
 EBUILD freebsd-sources-6.1-r3.ebuild 2419 RMD160 0b883b91a5c9e6c4cd5139fb16982e4b00696a5b SHA1 9bbf8a010ea090eebcf64e204defc628289f65bc SHA256 bb0fa9e58602f70288ceb22f27f603bfb997686f48ddbc03e821abfa07f36e57
 MD5 242afb82662fb880568a677072a59eb9 freebsd-sources-6.1-r3.ebuild 2419
 RMD160 0b883b91a5c9e6c4cd5139fb16982e4b00696a5b freebsd-sources-6.1-r3.ebuild 2419
 SHA256 bb0fa9e58602f70288ceb22f27f603bfb997686f48ddbc03e821abfa07f36e57 freebsd-sources-6.1-r3.ebuild 2419
-EBUILD freebsd-sources-6.1-r4.ebuild 2530 RMD160 bd3ba4af2cef79d5cd089bc0b0b7035267af81e2 SHA1 802dc37b0c3e2d43186702ab90466f1259d11c62 SHA256 de4c5bce9f0ca5fbb6b97b28fae0aa67e440ff03d4c3355ef9976325540c0766
-MD5 6a03faf7ce60f4ad00e01e3372ba65f9 freebsd-sources-6.1-r4.ebuild 2530
-RMD160 bd3ba4af2cef79d5cd089bc0b0b7035267af81e2 freebsd-sources-6.1-r4.ebuild 2530
-SHA256 de4c5bce9f0ca5fbb6b97b28fae0aa67e440ff03d4c3355ef9976325540c0766 freebsd-sources-6.1-r4.ebuild 2530
+EBUILD freebsd-sources-6.1-r4.ebuild 2572 RMD160 d7ee3293d2bc651367b669154690ef59ae31e55e SHA1 15129e9f0a8ce018da10fb8e0b2a95a73c9143fc SHA256 926542fbef0bb45f7f5e24b8bcb8844f91e78ca4ad4af9b29fd3f0d013a60448
+MD5 8cf11566c5e1e2d0dc534d606ef1b74f freebsd-sources-6.1-r4.ebuild 2572
+RMD160 d7ee3293d2bc651367b669154690ef59ae31e55e freebsd-sources-6.1-r4.ebuild 2572
+SHA256 926542fbef0bb45f7f5e24b8bcb8844f91e78ca4ad4af9b29fd3f0d013a60448 freebsd-sources-6.1-r4.ebuild 2572
 EBUILD freebsd-sources-6.2_beta2.ebuild 2823 RMD160 00c9318c140c35c8f1e132771ea62a3460928df9 SHA1 3cbfaa2cd572c30d1b303ddb0780d730e03dcab3 SHA256 f2c7838df14499858b0af76f336002552707351cd53ff3ead04ab39910212c64
 MD5 2ecc55a4a122a9ce87af80b2485c10bb freebsd-sources-6.2_beta2.ebuild 2823
 RMD160 00c9318c140c35c8f1e132771ea62a3460928df9 freebsd-sources-6.2_beta2.ebuild 2823
 SHA256 f2c7838df14499858b0af76f336002552707351cd53ff3ead04ab39910212c64 freebsd-sources-6.2_beta2.ebuild 2823
-MISC ChangeLog 8458 RMD160 332d189a160ce9f5539224d4a843e596d599492c SHA1 5203b100ab6f2a76bdda8078915a8a025446ed93 SHA256 1df83eabe4829a3fa2f32b9722c62cf3f34b1d0490c3842d8ba1553717bc1e2f
-MD5 a66183b7b6774b63ccad54b21ad29fa5 ChangeLog 8458
-RMD160 332d189a160ce9f5539224d4a843e596d599492c ChangeLog 8458
-SHA256 1df83eabe4829a3fa2f32b9722c62cf3f34b1d0490c3842d8ba1553717bc1e2f ChangeLog 8458
+MISC ChangeLog 8659 RMD160 7963b887f45e349c33da4bc8bef3fd13dfdf55cb SHA1 6d53a71f3db2686be410f8a493fcca3a47f50072 SHA256 d84b665a4b09e013745095d36960cb2a7c0d24f4012937aee216a4596fac1b60
+MD5 3e528f59d88a394c7a8d31b0a9f49747 ChangeLog 8659
+RMD160 7963b887f45e349c33da4bc8bef3fd13dfdf55cb ChangeLog 8659
+SHA256 d84b665a4b09e013745095d36960cb2a7c0d24f4012937aee216a4596fac1b60 ChangeLog 8659
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -65,13 +66,6 @@ SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/di
 MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-freebsd-sources-6.1-r4 256
 RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-freebsd-sources-6.1-r4 256
 SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-freebsd-sources-6.1-r4 256
-MD5 0f2904d6b2a3b24fc4c9fefc270251b8 files/digest-freebsd-sources-6.2_beta2 274
-RMD160 06ba901d88237dab2854e2997761b03e9ba492cf files/digest-freebsd-sources-6.2_beta2 274
-SHA256 5ce9bfe2a79137d2a41872733f01f9e1d067b424f11a38b635e9df99dd59e4e3 files/digest-freebsd-sources-6.2_beta2 274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFNwJQAiZjviIA2XgRAikiAJ9N2kllzMRo9SszVPd83g65NJNDmwCgwqvC
-w4vN0KsUtUH2t/tbSCxqT7U=
-=vDJw
------END PGP SIGNATURE-----
+MD5 e4165c3bc3220cb02b0d33b104c820ca files/digest-freebsd-sources-6.2_beta2 271
+RMD160 9f9e95e03ebe521447fa0e06796443692b5af06e files/digest-freebsd-sources-6.2_beta2 271
+SHA256 9e681758e1ee66a105e3878590dd4f7dd0df501cc58584f075c871d476824d41 files/digest-freebsd-sources-6.2_beta2 271
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_beta2 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_beta2
index a86dd3328eaa..af284bfc1db3 100644
--- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_beta2
+++ b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_beta2
@@ -1,3 +1,3 @@
-MD5 7457f7ec6d84a5cc00a8689fca2082ea freebsd-sys-6.2_beta2.tar.bz2 18317253
-RMD160 c53fdcb1289d56f5184b3912fdb0ce2cc4edcc49 freebsd-sys-6.2_beta2.tar.bz2 18317253
-SHA256 a5e503e13340bd1ac674aeae3737d4b65f3b00650a43ef11bfb9771fcf0f62d3 freebsd-sys-6.2_beta2.tar.bz2 18317253
+MD5 6454d1881584fc0e494f2410f44520c1 freebsd-sys-6.2_beta2.tar.bz2 1582664
+RMD160 104f94c6dbd595b5a9a140c8b6ea42119291d1a1 freebsd-sys-6.2_beta2.tar.bz2 1582664
+SHA256 823a2b369714e9d8f5a2c75fd295fb657d21c7ba772e3ac08d89a29c86bcddb4 freebsd-sys-6.2_beta2.tar.bz2 1582664
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch
new file mode 100644
index 000000000000..e74fcd3f9b88
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch
@@ -0,0 +1,32 @@
+--- sys/fs/ntfs/ntfs_vnops.c.orig	2006-10-17 17:31:36 -0300
++++ sys/fs/ntfs/ntfs_vnops.c	2006-10-17 17:30:24 -0300
+@@ -507,8 +507,12 @@
+ 
+ 	/* Simulate . in every dir except ROOT */
+ 	if( ip->i_number != NTFS_ROOTINO ) {
+-		struct dirent dot = { NTFS_ROOTINO,
+-				sizeof(struct dirent), DT_DIR, 1, "." };
++		struct dirent dot;
++		dot.d_fileno	= NTFS_ROOTINO;
++		dot.d_reclen	= sizeof(struct dirent);
++		dot.d_type	= DT_DIR;
++		dot.d_namlen	= 1;
++		bcopy(".", dot.d_name, 1);
+ 
+ 		if( uio->uio_offset < sizeof(struct dirent) ) {
+ 			dot.d_fileno = ip->i_number;
+@@ -522,8 +526,12 @@
+ 
+ 	/* Simulate .. in every dir including ROOT */
+ 	if( uio->uio_offset < 2 * sizeof(struct dirent) ) {
+-		struct dirent dotdot = { NTFS_ROOTINO,
+-				sizeof(struct dirent), DT_DIR, 2, ".." };
++		struct dirent dotdot;
++		dotdot.d_fileno	= NTFS_ROOTINO;
++		dotdot.d_reclen	= sizeof(struct dirent);
++		dotdot.d_type	= DT_DIR;
++		dotdot.d_namlen	= 2;
++		bcopy("..", dotdot.d_name, 2);
+ 
+ 		error = uiomove((char *)&dotdot,sizeof(struct dirent),uio);
+ 		if(error)
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r4.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r4.ebuild
index 541822fca1be..5588ed4dc8c7 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r4.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r4.ebuild,v 1.1 2006/09/04 18:49:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r4.ebuild,v 1.2 2006/10/19 23:11:02 the_paya Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
@@ -39,6 +39,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-6.0-werror.patch"
 	epatch "${FILESDIR}/${PN}-6.1-gcc41.patch"
 	epatch "${FILESDIR}/${PN}-6.1-intrcnt.patch"
+	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
 
 	# This is to be able to use sandbox safely, see bug #146284
 	epatch "${FILESDIR}/${P}-devfs-deadlock.patch"