Patch to fix preserving file/dir modes by disabling ACLs

Package-Manager: portage-2.1.4.4

4 files changed, 102 insertions, 2 deletions

diff --git a/sys-fs/btrfs/ChangeLog b/sys-fs/btrfs/ChangeLog
index 3c84e10acaa8..1032b9476576 100644
--- a/sys-fs/btrfs/ChangeLog
+++ b/sys-fs/btrfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/btrfs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/ChangeLog,v 1.3 2008/05/29 16:59:52 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/ChangeLog,v 1.4 2008/06/07 16:38:35 lavajoe Exp $
+
+*btrfs-0.15-r1 (07 Jun 2008)
+
+  07 Jun 2008; Joe Peterson <lavajoe@gentoo.org>
+  +files/btrfs-0.15-acl-disable.patch, +btrfs-0.15-r1.ebuild:
+  Patch to fix preserving file/dir modes by disabling ACLs
 
 *btrfs-0.15 (29 May 2008)
 
diff --git a/sys-fs/btrfs/Manifest b/sys-fs/btrfs/Manifest
index ca6acf590756..3eefe650f5c5 100644
--- a/sys-fs/btrfs/Manifest
+++ b/sys-fs/btrfs/Manifest
@@ -1,7 +1,9 @@
 AUX btrfs-0.14-hotfix.patch 14508 RMD160 df98080a725a9882ca3185c87421f8ac4c5266f2 SHA1 2d9dca87cde74b0943947d35cf6f0c09980cb9da SHA256 0e6370569cf70da7160398bbaa41b725b77a46ba1597b7db80bb1f85e4be0788
+AUX btrfs-0.15-acl-disable.patch 1260 RMD160 3700cd0baa293d02ff2ec490e081e8919ee64119 SHA1 8c02e30e6b844e837d2ce31109a7e50739cc9522 SHA256 8b410a8eea96d54b5cfc3d683d7fae9d8f9f8fdbff008289e37380cdf16a6808
 DIST btrfs-0.14.tar.bz2 103694 RMD160 0e3fa6ee1583452a4818356dff1f2868502811a1 SHA1 1265a79c9b0e87858fcba319854b601b865d097c SHA256 b57a853a0ec0152c3561688a1fd250b68e361b6d0fd0bd6526802a2d7829bcf9
 DIST btrfs-0.15.tar.bz2 107545 RMD160 ad8fbe78395d1f425a769eec9719bb60b63b73e6 SHA1 37930ab229b9795db41b02e25713f886758f3b42 SHA256 f6e0d004c0c13d375718c3ab063e1386e8e6262d78f958b15fad13a8d301433e
 EBUILD btrfs-0.14.ebuild 1342 RMD160 19413cb36bea406410a95119c930ca4bce64a552 SHA1 b265c33e5a1bbb7ce8153d976162b3edadb94ecf SHA256 0ab3c37b8ee05e1d40dd08e20329731a479b54313425693e736b8a87f619a89a
+EBUILD btrfs-0.15-r1.ebuild 1495 RMD160 076c50f2cf03606dbdd4677a68dfe73ea334559e SHA1 da671f69dc2884a59560c895c4a87f5b04c2f003 SHA256 1fc0516f2b5681f5d0f57f2d3e6b974fedba3b933cce31f0af1cb2b6895264d3
 EBUILD btrfs-0.15.ebuild 1446 RMD160 a123e91c9d6daa379cc69fb90821c31bac80a67a SHA1 d2fd0679d594952b7262cf0c80bd2da7e50b8fcd SHA256 ea99a5848fea145f50db50f4f327acd1ceed69f64e2698c552c246d19ecd565b
-MISC ChangeLog 630 RMD160 d0a2127d5117fa55f7077dbaaa8e9649437d166c SHA1 8a2bc8752217004e7d7c17e200e88b9d2e99a601 SHA256 a48fb26c3656622d139d2c0c5b1e99590f7095876edefe12ce74ae9512a04c9a
+MISC ChangeLog 831 RMD160 e2199ae3a259400da051e59a9368c9fcbe45136d SHA1 5e48c65888b3c95372d84f00b939bfa7d767b282 SHA256 935115832c7c2e82c72cc2133ef20a0ea1703769c862e1d63dbf46cf96a3890e
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
diff --git a/sys-fs/btrfs/btrfs-0.15-r1.ebuild b/sys-fs/btrfs/btrfs-0.15-r1.ebuild
new file mode 100644
index 000000000000..63ef6287dd63
--- /dev/null
+++ b/sys-fs/btrfs/btrfs-0.15-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-0.15-r1.ebuild,v 1.1 2008/06/07 16:38:35 lavajoe Exp $
+
+inherit eutils linux-mod
+
+DESCRIPTION="A checksumming copy-on-write filesystem"
+HOMEPAGE="http://btrfs.wiki.kernel.org/"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-fs/e2fsprogs"
+PDEPEND="~sys-fs/btrfs-progs-${PV}"
+
+pkg_setup()
+{
+	linux-mod_pkg_setup
+
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="KERNELDIR=/lib/modules/${KV_FULL}/build"
+	MODULE_NAMES="btrfs(fs:${S}/"
+
+	if ! kernel_is 2 6; then
+		eerror "Need a 2.6 kernel to compile against!"
+		die "Need a 2.6 kernel to compile against!"
+	fi
+
+	if ! linux_chkconfig_present LIBCRC32C; then
+		eerror "You need to enable LIBCRC32C in your kernel!"
+		die "You need to enable LIBCRC32C in your kernel!"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-acl-disable.patch"
+}
+
+src_install()
+{
+	linux-mod_src_install
+
+	dodoc INSTALL TODO
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	ewarn "WARNING: Btrfs is under heavy development and is not suitable for"
+	ewarn "any uses other than benchmarking and review."
+	ewarn "The Btrfs disk format is not yet finalized."
+	ewarn ""
+	ewarn "Note: If upgrading from 0.14, there is no disk format change,"
+	ewarn "      but it might be prudent to fsck after upgrading."
+}
diff --git a/sys-fs/btrfs/files/btrfs-0.15-acl-disable.patch b/sys-fs/btrfs/files/btrfs-0.15-acl-disable.patch
new file mode 100644
index 000000000000..e6dae4b314c6
--- /dev/null
+++ b/sys-fs/btrfs/files/btrfs-0.15-acl-disable.patch
@@ -0,0 +1,31 @@
+--- btrfs-0.15/xattr.c.orig	2008-06-03 11:11:03.000000000 -0600
++++ btrfs-0.15/xattr.c	2008-06-03 11:11:23.000000000 -0600
+@@ -29,22 +29,22 @@
+ static struct xattr_handler *btrfs_xattr_handler_map[] = {
+ 	[BTRFS_XATTR_INDEX_USER]		= &btrfs_xattr_user_handler,
+ #ifdef CONFIG_FS_POSIX_ACL
+-	[BTRFS_XATTR_INDEX_POSIX_ACL_ACCESS]	= &btrfs_xattr_acl_access_handler,
+-	[BTRFS_XATTR_INDEX_POSIX_ACL_DEFAULT]	= &btrfs_xattr_acl_default_handler,
++//	[BTRFS_XATTR_INDEX_POSIX_ACL_ACCESS]	= &btrfs_xattr_acl_access_handler,
++//	[BTRFS_XATTR_INDEX_POSIX_ACL_DEFAULT]	= &btrfs_xattr_acl_default_handler,
+ #endif
+ 	[BTRFS_XATTR_INDEX_TRUSTED]		= &btrfs_xattr_trusted_handler,
+ 	[BTRFS_XATTR_INDEX_SECURITY]		= &btrfs_xattr_security_handler,
+-	[BTRFS_XATTR_INDEX_SYSTEM]		= &btrfs_xattr_system_handler,
++//	[BTRFS_XATTR_INDEX_SYSTEM]		= &btrfs_xattr_system_handler,
+ };
+ struct xattr_handler *btrfs_xattr_handlers[] = {
+ 	&btrfs_xattr_user_handler,
+ #ifdef CONFIG_FS_POSIX_ACL
+-	&btrfs_xattr_acl_access_handler,
+-	&btrfs_xattr_acl_default_handler,
++//	&btrfs_xattr_acl_access_handler,
++//	&btrfs_xattr_acl_default_handler,
+ #endif
+ 	&btrfs_xattr_trusted_handler,
+ 	&btrfs_xattr_security_handler,
+-	&btrfs_xattr_system_handler,
++//	&btrfs_xattr_system_handler,
+ 	NULL,
+ };
+