sys-fs/aufs3: Bump to latest aufs3-release; fix combinedif issue, #490790

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 190 insertions, 23 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 0e4f306cab6f..5a583cba15f4 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.75 2013/11/03 19:21:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.76 2013/11/11 15:45:39 jlec Exp $
+
+*aufs3-3_p20131111 (11 Nov 2013)
+
+  11 Nov 2013; Justin Lecher <jlec@gentoo.org> aufs3-3_p20131104.ebuild,
+  +aufs3-3_p20131111.ebuild:
+  Bump to latest aufs3-release; fix combinedif issue, #490790
 
 *aufs3-3_p20131104 (03 Nov 2013)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 6d2ad1a05432..51c280683f5b 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -6,25 +6,27 @@ AUX pax-3.patch 2856 SHA256 511ddca31106798b0890fdffeb05b4149b734cd0c73432610d9a
 DIST aufs3-standalone-3_p20131007.tar.xz 1953352 SHA256 3916a1c34a604a688e92a3c1d58d83e712fbb89748c4f4d0cdce591a22ab1cfc SHA512 e304e1be74553c4160a7db5695e680b50becee061fd7809318468d3aebfa442a75468bc36add14058bcf765b8fa77b88631c17cb7c4997f3ad8a7ca556cc450d WHIRLPOOL b2d04bdd7b03e400589fe906616c9c894eddf21ba10c1029982a26c5e5b10169b9002aeaca3a3fe1a301edb1b8d392e6f3d4a79815f45a3b2b0802e4a31298fa
 DIST aufs3-standalone-3_p20131014.tar.xz 1505556 SHA256 257211ecb9288f0f547418353d5bca7811b0e40b935730bc370fd7e98aacacd3 SHA512 b03417e370077bdb3e42634402d1eef5a934058fbf8b84ca96729d5eab31e5cf3a3e0d67ced40daa295b1719c5c2d89fba166c8e7469e36c196f2865ee4b5d34 WHIRLPOOL 6ebc782b517f7116e428c48fd1a35f8eb6ed29cd0387332efb95d051abb108f3c839f6d1f20c920832337afc6a8ab619b30426b53a043d8dd50cd1c2a24fed90
 DIST aufs3-standalone-3_p20131104.tar.xz 2073160 SHA256 2a55ece940e4f949482879b7296d34394b15f5409d8e91ef27a903130ba3b443 SHA512 768d84b115f0a5dd378f1c2f695fe72730014d008e4a6bbe1bc4fa530233ad992308014f2f110eebfa5a3af7c8246ee7576242dd91e4228ee79011d81b7c6d7b WHIRLPOOL 53baa7db8eddf4fdb102e5ae71ec717c32eb5c094683e449a818f04f32010c496af984d6fea086b45f076baa62bf11f83196bd4ecec37111d1e2924341cf49f4
+DIST aufs3-standalone-3_p20131111.tar.xz 1610788 SHA256 5ea5b080fa8b68f4921fc9fc9247e456c3740321445e5d455ac1eb00454a6d7f SHA512 bf3b35a30164a4f5856db7a66c898e7e3491a5dab05252207fc402b9ef9a946be4cd6fe71370c52c1bc5168653c7323f3ce039f062d9da7f01a84a1ef33c7475 WHIRLPOOL 364b732719d24139eb450275ef9819b58dd8e3fa8bbbc0cd4e4ca5cee5d9beb622931233022f70621887c245dde2d4b879067c68ba8910fdfd8c4fc2f43c1037
 EBUILD aufs3-3_p20131007.ebuild 4698 SHA256 9f443498a9de7e6c238aebc2bd9be4353686c11878f1ffe46c53f7c1f082b710 SHA512 0f38101a85be0724f599e357ca1a9721fa127b5523acb0a2a704a665adb7118cc6eb13f55a89f39ab1e30713e85afab0fe5b5f3b5186e80282eab08d74776889 WHIRLPOOL 23c597f3dc1cc736a77792906b64fcaed150b998fa2c7c93ef8190615a9ff7711738ca7b2cdf8e749265ba467dd6af6d9bf6c810ac43123afa770d0e2452bef3
 EBUILD aufs3-3_p20131014.ebuild 4698 SHA256 ffcd8421f15e90df7e79f0a799b594b2a6e4d1f843ad4f571091077931972dd0 SHA512 acfb8d87f742da0418b43ffaa79390a1d374b64da3ed31652a67a57cddb94d63df6a144fe13cbdfbb9e4f08f02f1c318f44b07bee3faa936d5699f871b7567fb WHIRLPOOL 3bee56dee7da38fd55af4493a7400e336e0521e9780dd2bf791b22bbeec66870243102e718d7cde4689f25a00ce461c9ed1318a80e810680c9fcd33580805e5d
-EBUILD aufs3-3_p20131104.ebuild 4715 SHA256 251d59fcbe04894e7fa272bebe25671de0a650c1b6644c8bddee786408b6b460 SHA512 a0e93e9adfb082eec0e2852f0c4653bf2311fddb2a2bcb690294627b06d8440e075b3b11901bbf1262a4f8cb3f8b8417a3ccd31af3216ae8aabe47dc70f80c13 WHIRLPOOL de7f08cdc029420ae3c20151e612c66e2edf3b1330a65d3aee4040d39ce71e70fe0955fa8e156cadf9ea9ef020cbc8f0a6f3b97e2b8b8b469840008761048c23
-MISC ChangeLog 20778 SHA256 8500aff2c8d415d8551528b1688374b29b93c8523358ccbc420335a74647ab58 SHA512 2dc85e7e4a5c5fccf4d5362c13bf26369a17c9a71f86f8ff4d41284e95085e5b6f6fcd0fafd90f07ca7dcd18083bc7ace153fe77b3de9092fc65cc9c7d026b83 WHIRLPOOL cc17139ea5016123e08b5856ba4ef8a2a2a2d0083405578102acd074fefc4b9f25c437f8ed93b824d6497301716f237fda50c56c45242a8107ae72c529687141
+EBUILD aufs3-3_p20131104.ebuild 4809 SHA256 26cd5aeda7a48f4a18c45d95123af3df0faacd5ca46b1da551805d9a068c64d0 SHA512 69a736539db14d39d61c890303604f3ff599b1cb47ef8c3080e487851078d4d94544b2ee072f30c2a518f318f28b6a62281a4a37a7f28d5d850a251c1806d755 WHIRLPOOL 3c7a380d0bdffb0f5b478cf505b42c75b4902cde4cc88fbe2517b8a4399cc92f7ef2cea074f8d47cad0ce2d782a87e8c2d9e59aab3a6f51e4b5fd7ed5ff67dc9
+EBUILD aufs3-3_p20131111.ebuild 4809 SHA256 9349ae17f67159ff645231200c45c6028d19ee1a7bc01d35f882849d6ae7c010 SHA512 ebe0406c0d96d4ee5c95239b026f8f556ad785ac9e61f0ec2fee5b8e2f2f7dbb0e33648e11fbcc10a3e8304d8affedd91615ca31fdd6c1f77342bc7db42695ff WHIRLPOOL e5d1596ffe8597a9859f00db9b8fa7d36b612b0ebdc975416c3ba966cd42002da1d3763edb8166360c40aab587e0c0d9d004c8cba72a66596aef204e44e19b23
+MISC ChangeLog 20977 SHA256 d5c708f192882467792211ae3993ec2c73e5226ba1e453f88dc1913ca0d318d5 SHA512 2a57fd46050474dece8630df32e83f607b636b03f2d0f77786a87f834c5925db5de32891462114d71f4eafadbbebb48e69ca8329aae013e1ab355bd2ef5463b9 WHIRLPOOL ceff0c51d1396b20c3b8908865531d3f25f94b059f5e267432fd673eacf7583eedbd302c4c045cf2c178054c4bab6aae3b3162e528a2872b8ff90f24176729ca
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSdqIvAAoJELnU8jG9FVirIGoP/2IyMI+lz94sghP3UAXvIyCV
-ixUmrAcVpHC2YA/2/VSY7F15QBmITETMpDSHDtMKwPmKOf518WbF4uVrVx6QsdYu
-4u/Wnjjct0tCi9jNHcepkxz7BgOREzidHfBhWuuT6HngEJYkdLCZhpwGw1Buo33N
-JCMlAWJw3nxrUc/dr9Ujkpq2hmNtEz/XqNl4yxx9u5i02KPl5rZNOfwup7FTR6yT
-vwBrnzWG3RhIq139GQUS/jkhtoU6aoQvkcTHDnHIYb6LYxSfN5qUD7+Rrg1rn8p1
-5J+Y/1KuewTiLCfAg8uftQs4UHxP2qmfGqfwccsh9nHwZO8ewM9oT5oBCj3dzACV
-pAhFf4ESwjUSeOs0znAe1UPn/7pk0IW1TWWR17U73gSBI0ug762S+24noNuukwhP
-vnxbiOEYDrjDDP5x6tH2EG0Osk9ZtBtz70+ArN32x6ncKAQFZG5+UdvtliRGV5OM
-XcfNfIM3RqqYc8oWKhWOW1Y4ZN7CEXVcYIubnLycw/cGL1T+xgYl9zXNEWXTdmef
-s9jU50hXTZwP28jKe5lMCqzpiBJhdcrZTq3ipvlrkrN9DylD2Nq9GwWIhizSm2NN
-x1PK5RqvC4P+p9oH3uQswfB77J/Ry+AW7lmB0JLyupq1y04Pf37iN0lpRGPvkaaq
-p1wx0I5CpOwNKhHlmhGc
-=y/Ye
+iQIcBAEBCgAGBQJSgPukAAoJELnU8jG9FVirR6gQAIeqkyudJr89zweZQPvSrcnT
+5IZEEgwNYRa8mvXF6DCUbYdq46AiJ01bGc3Yu8XG1KGCzvgodTgLOkNYPavC1s6A
+Z79RT65NKsTsTwNnSZ5Z4n2PZnCI+1/T/IytTGWI9+flhqOX+JAEIDRXj7zByalv
++POaHouqltQY4rnD7EWwZZlxXa5fFbx0bccvNXJf0Eff3huvCBXI9U0i4bwLPzil
+E7N4N7EwF4B3OlEx51Czlj07gbrzkHVZywjvSrhNCYWbuwEAlKVEaIfdJptTk6ia
+4Mm+nKUed5bMPVDBCYNE/hPc2KO3dpMmNduRTgMLkNvWkVbsvIzguo2owNrIrKSG
+2Sa8P6H5CorDpfVx+I7389ZLKKz2RxG5vf3SQZufri/S/d9yLfA/pWzaHB/oIRGf
+YJWvqxDGLcwSVXVK5N3TgNceqMibkuV4J6x7CQW0lWN4PmW4QtEDFD0wr+WEITnE
+RYhuqyt7YayYG8kaqYn4u6/tZUPdgiqWSrn7XrBpFZuVpKDW8iyLolYXb7oOQPwe
+ApLniF4BSGtcNOEpZ0Bzbj+rDYqMp/nxTpiGFGwwUdi+wES4rONtCkLobuSI8sTD
+iujgWC36cUhzpB7tRM2rrb2CAZR/droKhhfyZ1KC7FhwG46jn8aAkJ3/Zbgbyo8y
+ssXClyCjNoo64aFcpwgU
+=zmek
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20131104.ebuild b/sys-fs/aufs3/aufs3-3_p20131104.ebuild
index 5d66c35ba137..6379464cde10 100644
--- a/sys-fs/aufs3/aufs3-3_p20131104.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20131104.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131104.ebuild,v 1.1 2013/11/03 19:21:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131104.ebuild,v 1.2 2013/11/11 15:45:39 jlec Exp $
 
 EAPI=5
 
@@ -75,19 +75,20 @@ pkg_setup() {
 	cd ${PN}-standalone || die
 	local module_branch=origin/${PN}.${PATCH_BRANCH}
 	git checkout -q -b local-gentoo ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-mmap.patch ${PN}-standalone.patch > ${PN}-standalone-base-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-combined.patch > /dev/null ); then
+	combinediff ${PN}-base.patch ${PN}-mmap.patch > "${T}"/combined-1.patch
+	combinediff ${PN}-standalone.patch  "${T}"/combined-1.patch > ${PN}-standalone-base-mmap-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.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} < "${T}"/${PN}-standalone/${PN}-standalone-base-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-combined.patch
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.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 ${PN} module"
 			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-combined.patch by hand"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
 			die "missing kernel patch, please apply it first"
 		fi
 	fi
@@ -151,7 +152,7 @@ src_install() {
 
 	use doc && doins -r Documentation
 
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-combined.patch
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
 
 	dodoc Documentation/filesystems/aufs/README
 }
diff --git a/sys-fs/aufs3/aufs3-3_p20131111.ebuild b/sys-fs/aufs3/aufs3-3_p20131111.ebuild
new file mode 100644
index 000000000000..de86bc79a72c
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20131111.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131111.ebuild,v 1.1 2013/11/11 15:45:39 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=12
+# highest supported version
+KERN_MAX_VER=13
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	kernel_is lt 3 9 && CONFIG_CHECK+=" ~EXPERIMENTAL"
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	git checkout -q -b local-gentoo ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-mmap.patch > "${T}"/combined-1.patch
+	combinediff ${PN}-standalone.patch  "${T}"/combined-1.patch > ${PN}-standalone-base-mmap-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.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} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.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 ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	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 module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_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 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use pax_kernel; then
+		if kernel_is ge 3 11; then
+			epatch "${FILESDIR}"/pax-3.11.patch
+		else
+			epatch "${FILESDIR}"/pax-3.patch
+		fi
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README
+}