Version BUmp

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

5 files changed, 143 insertions, 19 deletions

diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog
index ccf9de52fc25..99beb7eff7be 100644
--- a/sys-fs/aufs2/ChangeLog
+++ b/sys-fs/aufs2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/aufs2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.36 2011/06/09 13:51:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.37 2011/06/20 05:49:29 jlec Exp $
+
+*aufs2-0_p20110620 (20 Jun 2011)
+
+  20 Jun 2011; Justin Lecher <jlec@gentoo.org> +aufs2-0_p20110620.ebuild,
+  files/aufs2-base-39.patch, files/aufs2-standalone-39.patch:
+  Version BUmp
 
 *aufs2-0_p20110605 (09 Jun 2011)
 
diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs2/Manifest
index 4e75aef5f11d..d0fe24f2cabc 100644
--- a/sys-fs/aufs2/Manifest
+++ b/sys-fs/aufs2/Manifest
@@ -13,7 +13,7 @@ AUX aufs2-base-35.patch 3055 RMD160 b3a41c780a007469ef586e0058c00ef599416005 SHA
 AUX aufs2-base-36.patch 3055 RMD160 6a45e93ff9eb49462491457955abb70815d6a2e3 SHA1 b8bf77f81fb0bc732e075304128ec80598058316 SHA256 f5ee2c878fff11e93f73846439c883da9d9087fcecb9433d6560ccfdf46dad68
 AUX aufs2-base-37.patch 2966 RMD160 9b14dc01ddd7b63053ecbbddeee95c7d0942f1c1 SHA1 472939bdb8d9212c5532eda5634d636d2a803ac6 SHA256 ee92f4dbb9990762d6bfd1ce1d4960dbf17deadd21163140b346cc324889bd3e
 AUX aufs2-base-38.patch 2971 RMD160 368fad0fe2a9f56de474e04e5ac4b35937ab198a SHA1 03b72c6f7d3b18ce9622ea21b7c5e8d5a3f09aee SHA256 e30fe83e0ee29b2facd1dba79aeab944aa078920f799a71d2a8c3f2bd93a3714
-AUX aufs2-base-39.patch 2727 RMD160 00c6b9af30e82fa67d67cfeb772fdf294e2b8bd8 SHA1 68201d3dcff24c081dc7fd1f652bd8239c485fd8 SHA256 cb0cd7c00a5def7ef518144fa86ebd84f59ca2c47f007b418f768acde4b887fd
+AUX aufs2-base-39.patch 2729 RMD160 065b28df8320176eff912ccd3ccd8212771a83fa SHA1 36b06759a254dfe2a1bf8954faa719ecc5035c86 SHA256 ffee642dbcacdbb3be3f15b23b3e8eb3b9e62eb2c65939f1e20539149b26c166
 AUX aufs2-standalone-27.patch 4322 RMD160 a3b0adae7a34369d5835848b32c8bdb90ceb1f14 SHA1 9677eea003fad79255ad876e132d3c5b436f9c14 SHA256 2db4ce52e67f31aeac41010279dd3bc680218ad3080437834caaddd6397a0353
 AUX aufs2-standalone-28.patch 4322 RMD160 5bab72a393a5a5878930d25d20d9c916cd374ba3 SHA1 f9cd11351679e3f759d9e4cccdcb3adfc2590157 SHA256 272bc7bd5873de054370868588646de9a0a71430570c7670cb9201d27268b0a7
 AUX aufs2-standalone-29.patch 6140 RMD160 f97d4bb7a27c83a7de40bf37754f51ccddd962fd SHA1 22d7ed995a5efa3d5c57835b6496c857e91eda92 SHA256 237bedbfc270c0042e62aebd0caa79a0372150f884492435503e6d838fc04d4c
@@ -26,7 +26,7 @@ AUX aufs2-standalone-35.patch 9756 RMD160 157ece414071d1129f7bf57468c5cfcea52db4
 AUX aufs2-standalone-36.patch 8747 RMD160 e7ec313fee92087e9c9c0aea9054b88b08d56d41 SHA1 ab799b635b0165e78de03e4394d3fb863e6e8dee SHA256 4cfff8eb5cebafc897a1f9e45cd92fa5483893e30b6a4add8c0fdd9df64775c7
 AUX aufs2-standalone-37.patch 8726 RMD160 21bd2b983979bfe72e37961db571169ba799e25e SHA1 cfa5e7f0446ca82b13b9dfa532419a21ab9cf841 SHA256 5efde55f07ace99ed0dd70c23252a5b726bab0dd48ac8901b467fd2ef4b9dd07
 AUX aufs2-standalone-38.patch 8732 RMD160 e326b9d0839ee8b718a950c76c70ec8a1cea966c SHA1 7c69b81d27826101edfd616e24e093089a866938 SHA256 3bde56c3d0f641a45e3ab9ccadf73d8a8284d2421eb8f6d08cfe32cb77c762a7
-AUX aufs2-standalone-39.patch 7677 RMD160 3f0d21c8ebdbab05e3d072447278be7e9dba8a22 SHA1 acd55f3ebb50e61558cf01e72344292e015c1e01 SHA256 485335ae4ae0938f0c0a7bf62402f8d092b958e0fcc5c6a902a5b098a0a06d18
+AUX aufs2-standalone-39.patch 7682 RMD160 ae20b4a9e93300936e7abd2050247c12cd7d1cc1 SHA1 700fdd299c8b90a9d38afa931f970806d3ee0214 SHA256 3d0414ad13f86df7226237d2128c65cd710569bcc215a425c01a0e7eac837595
 AUX pax.patch 4821 RMD160 9576b969b6c5d893b40c76e4bb297a34bcbf13e9 SHA1 bd06819d7b01959a8ed5756c78d29255923287c6 SHA256 c82946d79fd3826803aacf5533aa398c8c7e7516a0c8c88a56aa75e27af3c7ad
 AUX utils-2.6.31.patch 444 RMD160 b89f0373c7d9537cc3124e7d8beaa0eda411a6f3 SHA1 8dcb097c0ddb4a325aef7f043db6809dcbef4035 SHA256 d10f948b03dd47cf2e5635a064c02231d4b7af2c28d45e0368fb0470b15cae62
 DIST aufs2-0_p20100809.tar.bz2 12227959 RMD160 92f33cd69399ef249c59a79991fae22b71e85415 SHA1 69d6d696f84c27adf3b5f4e663ef3489c20e6186 SHA256 5b4441c709e3e41c03319172facaed60f9a83f46e8045a68882a27efef6eaa6b
@@ -34,18 +34,20 @@ DIST aufs2-0_p20101122.tar.bz2 14124185 RMD160 b4b94438b916bb3972c55e6c3edc37eec
 DIST aufs2-0_p20110120.tar.bz2 2325118 RMD160 2b756ad239c7d96e04789bc1bff23b064da03eba SHA1 ee58cf1bdeaca6eaad352353a792b40494fc0b44 SHA256 93e0e6b1c862fa2565932200350b8bcb313f9db129f51e44b37e17fbc3c2b9b7
 DIST aufs2-0_p20110327.tar.bz2 1660490 RMD160 d649d610f339b2873738c5aa68c5c4bc2ae95322 SHA1 c3c58428692cdf76d683b8c25c2afafeb644e5db SHA256 4e36cb579fc78a5339f60efba6fb359960c69863747f8b5f35327c5dcec5c1b8
 DIST aufs2-0_p20110605.tar.xz 1508296 RMD160 870eb2234192ace4b71a1f7b9efa832ce7238266 SHA1 05f5b1fa00ad51a52addb68b39f46e89f923b317 SHA256 b606af4c0acfceafcbd9895c728bbcfae3d2ba1ec473fcb3cb90d9ffd863bcfe
+DIST aufs2-0_p20110620.tar.xz 1513024 RMD160 6787a4d76999dbe70f3176674007988b53300165 SHA1 ba73b01f77295e54611a540d7ae80db13c3d84df SHA256 3f348d2b2274b8eba101e47455bb7a06237356be8b31a2d36ce9ad0c06e84be5
 EBUILD aufs2-0_p20100809.ebuild 3247 RMD160 1779af21dcf53c2ff90617f171f2547ba4ec035f SHA1 b01271a1382df1e9facb02823c7bb7522bbd74bd SHA256 b6527cba1e67f3afcb1f4125eda9bcf7e8c898df250c4ae7b8e2ef285171bd39
 EBUILD aufs2-0_p20101122.ebuild 3412 RMD160 76b835c667f2edc232585f5734c0bf97f4920ff4 SHA1 6848dd1ea4d4a55b839b9fe5300b9ea9f76545b3 SHA256 11781a1d71fccc8adfd37d050c106958a38b837ceaed96748b9243c01feb3505
 EBUILD aufs2-0_p20110120-r1.ebuild 3809 RMD160 571a3a07d339e2711cff19ae83c515bc9f855dd0 SHA1 a8507e5e0761247b3525079fcd93845a16c01151 SHA256 68d086101ae63926e945f368c64da801abcb31d58d93ecbfea27f8ca6497a034
 EBUILD aufs2-0_p20110120.ebuild 4033 RMD160 832d873c5e8f97a2dd1589a292a3e346c7037dab SHA1 6f667b64bdc891a5c8bab69182fa494cd0ff81bc SHA256 91c07b38742e1590f26c5a70ca24ed5a969f8e6386643494aff60d6c6b317707
 EBUILD aufs2-0_p20110327.ebuild 3806 RMD160 b30b6e686477aca8477fcabfcdfcc3746f43db78 SHA1 5705534b04374bed17e19f390ec6660c65e33b7b SHA256 e67f8f0716a7184b405cdad71326d81dcb1afedc8ba5e575a0280c52dd34f6ab
 EBUILD aufs2-0_p20110605.ebuild 3805 RMD160 b31e894f33cd450958a7e3dbb34cee8336ec92c8 SHA1 f28154e00f0e715204c01a137154274fdf035c1a SHA256 e0d6d2a9cfb14709561138654f9d2bbf16a0944c6272026bf03a6a12851a48ec
-MISC ChangeLog 7954 RMD160 00bcf7c402ec4a35f70289a572cdaac1d021946a SHA1 0202ab2fb7131560eae42f66450097fb3cc500da SHA256 e6389150609cdcd6cf496146ea4cc064a13877a52b7816f0d1cca8b99d86ff0b
+EBUILD aufs2-0_p20110620.ebuild 3805 RMD160 8293c29e5dd4ed823df5881fca5fa274cd3b0355 SHA1 491b28ceff5356b0d9d5246c05050a425499b104 SHA256 f792e89c0945d52e6befd3d91465849cd00d5197dd8b0f92e7203246ddbd01e6
+MISC ChangeLog 8140 RMD160 3e3f5d87294c8544750ce366589404a839ab0313 SHA1 02b3369819fa09398847b5e7d5e6f2163061c506 SHA256 0e252a2b3be139d445f238f7524d2c0f004491143ba0fbb1a3f2ce2e3a53aa8e
 MISC metadata.xml 704 RMD160 592d993abdffb3af8519a0ca331548e0e45593dd SHA1 311576b500cde5fae84f621393371e30c5f791e5 SHA256 71b9740f4dfe687701efd3465500fb99ca9e2ec8a9f14379580fa58b45db5e05
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3w0AIACgkQgAnW8HDreRZE7gCcDlDNkb5fJI5f1SamlraacVpK
-+W4An31UejOsplgnJ03rogoC9eEDt6V3
-=M/bn
+iEYEARECAAYFAk3+324ACgkQgAnW8HDreRY6hACdH53K21xvTWPddRhi1yv4V/ym
+vJgAmwUN1MJPWb804WJs+ZtUltJwvp2d
+=67xg
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs2/aufs2-0_p20110620.ebuild b/sys-fs/aufs2/aufs2-0_p20110620.ebuild
new file mode 100644
index 000000000000..a3f1d5c5ba22
--- /dev/null
+++ b/sys-fs/aufs2/aufs2-0_p20110620.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20110620.ebuild,v 1.1 2011/06/20 05:49:29 jlec Exp $
+
+EAPI="4"
+
+inherit linux-mod multilib toolchain-funcs
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug fuse hardened hfs inotify kernel-patch nfs ramfs"
+
+DEPEND="dev-vcs/git"
+RDEPEND="!sys-fs/aufs"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
+	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
+	use nfs && CONFIG_CHECK="${CONFIG_CHECK} ~EXPORTFS"
+	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
+	use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
+
+	# this is needed so merging a binpkg aufs2 is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 2 6 31 && die "kernel too old"
+	kernel_is gt 2 6 39 && die "kernel too new"
+
+	linux-mod_pkg_setup
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null && \
+		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null
+			epatch "${FILESDIR}"/aufs2-{base,standalone}-${KV_PATCH}.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the aufs2 module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply ${FILESDIR}/aufs2-base-${KV_PATCH}.patch and"
+			eerror "${FILESDIR}/aufs2-standalone-${KV_PATCH}.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local branch=origin/aufs2.1-${KV_PATCH}
+	git checkout -q $branch || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && use amd64 && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use hardened ; then
+		epatch "${FILESDIR}"/pax.patch
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+	sed -i "s:__user::g" include/linux/aufs_type.h || die
+
+	cd "${WORKDIR}"/${PN}-util
+	git checkout -q origin/aufs2.1
+	sed -i "/LDFLAGS += -static -s/d" Makefile || die
+	sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
+
+	cd "${WORKDIR}"/${PN}-util
+	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README
+	docinto design
+	dodoc design/*.txt
+	cd "${WORKDIR}"/${PN}-util
+	emake DESTDIR="${D}" KDIR=${KV_DIR} install
+	docinto
+	newdoc README README-utils
+}
diff --git a/sys-fs/aufs2/files/aufs2-base-39.patch b/sys-fs/aufs2/files/aufs2-base-39.patch
index 299697f18077..e98dc85a214f 100644
--- a/sys-fs/aufs2/files/aufs2-base-39.patch
+++ b/sys-fs/aufs2/files/aufs2-base-39.patch
@@ -1,10 +1,10 @@
-aufs2.1 base patch for linux-2.6.
+aufs2.1 base patch for linux-2.6.39
 
 diff --git a/fs/namei.c b/fs/namei.c
-index e6cd611..27d7dc7 100644
+index e3c4f11..202d358 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -1768,7 +1768,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
+@@ -1769,7 +1769,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
   * needs parent already locked. Doesn't follow mounts.
   * SMP-safe.
   */
diff --git a/sys-fs/aufs2/files/aufs2-standalone-39.patch b/sys-fs/aufs2/files/aufs2-standalone-39.patch
index 57dd820c24fa..777febabe1cf 100644
--- a/sys-fs/aufs2/files/aufs2-standalone-39.patch
+++ b/sys-fs/aufs2/files/aufs2-standalone-39.patch
@@ -1,4 +1,4 @@
-aufs2.1 standalone patch for linux-2.6.
+aufs2.1 standalone patch for linux-2.6.39
 
 diff --git a/fs/file_table.c b/fs/file_table.c
 index 01e4c1e..0e800e2 100644
@@ -26,7 +26,7 @@ index 33c963d..e31e8d5 100644
  /*
   * iprune_sem provides exclusion between the icache shrinking and the
 diff --git a/fs/namei.c b/fs/namei.c
-index 27d7dc7..3c72fd5 100644
+index 202d358..876010f 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
 @@ -364,6 +364,7 @@ int deny_write_access(struct file * file)
@@ -37,7 +37,7 @@ index 27d7dc7..3c72fd5 100644
  
  /**
   * path_get - get a reference to a path
-@@ -1772,6 +1773,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1773,6 +1774,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
  {
  	return __lookup_hash(&nd->last, nd->path.dentry, nd);
  }
@@ -46,10 +46,10 @@ index 27d7dc7..3c72fd5 100644
  /**
   * lookup_one_len - filesystem helper to lookup single pathname component
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 7dba2ed..d7570d1 100644
+index d99bcf5..3ec2aa7 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -1524,6 +1524,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1508,6 +1508,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
  	}
  	return 0;
  }
@@ -172,7 +172,7 @@ index 8d9c48f..29108aa 100644
  int devcgroup_inode_mknod(int mode, dev_t dev)
  {
 diff --git a/security/security.c b/security/security.c
-index 1011423..3bb850b 100644
+index 4ba6d4c..9f64bb8 100644
 --- a/security/security.c
 +++ b/security/security.c
 @@ -373,6 +373,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
@@ -233,13 +233,13 @@ index 1011423..3bb850b 100644
  {
 @@ -520,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask)
  		return 0;
- 	return security_ops->inode_permission(inode, mask);
+ 	return security_ops->inode_permission(inode, mask, 0);
  }
 +EXPORT_SYMBOL(security_inode_permission);
  
  int security_inode_exec_permission(struct inode *inode, unsigned int flags)
  {
-@@ -628,6 +636,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -626,6 +634,7 @@ int security_file_permission(struct file *file, int mask)
  
  	return fsnotify_perm(file, mask);
  }
@@ -247,7 +247,7 @@ index 1011423..3bb850b 100644
  
  int security_file_alloc(struct file *file)
  {
-@@ -655,6 +664,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+@@ -653,6 +662,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
  		return ret;
  	return ima_file_mmap(file, prot);
  }