diff options
| author |   Javier Villavicencio <the_paya@gentoo.org> | 2006-10-19 23:11:02 +0000 |
|---|---|---|
| committer | Javier Villavicencio <the_paya@gentoo.org> | 2006-10-19 23:11:02 +0000 |
| commit | 5c1f4efb4d59abc1763d90af499b857bfddc72e8 (patch) | |
| tree | 7885bdd4c16bcbc5077808e11ad00800053672e1 /sys-freebsd/freebsd-sources | |
| parent | Re-enabling emake -j1, solving bug #151940 (diff) | |
| download | gentoo-2-5c1f4efb4d59abc1763d90af499b857bfddc72e8.tar.gz gentoo-2-5c1f4efb4d59abc1763d90af499b857bfddc72e8.tar.bz2 gentoo-2-5c1f4efb4d59abc1763d90af499b857bfddc72e8.zip | |
Patch to fix bug #151626.
(Portage version: 2.1.2_pre3-r5)
Diffstat (limited to 'sys-freebsd/freebsd-sources')
4 files changed, 42 insertions, 5 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/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" |