Update 0.6.2 patchset with sys-fs/zfs-0.6.2-r2: Fixes Gentoo bug #487746; Improved zpool create to treat -O mountpoint and -m the same and stop igoring the mountpoint option when altroot is specified (ported from Illumos)

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

3 files changed, 177 insertions, 15 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index d327a6dbce4d..a1ead7a30ca3 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.75 2013/10/14 14:28:24 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.76 2013/10/18 16:26:04 ryao Exp $
+
+*zfs-0.6.2-r2 (18 Oct 2013)
+
+  18 Oct 2013; Richard Yao <ryao@gentoo.org> +zfs-0.6.2-r2.ebuild,
+  zfs-0.6.1-r4.ebuild:
+  Update 0.6.2 patchset with sys-fs/zfs-0.6.2-r2: Fixes Gentoo bug #487746;
+  Improved zpool create to treat -O mountpoint and -m the same and stop igoring
+  the mountpoint option when altroot is specified (ported from Illumos)
 
   14 Oct 2013; Richard Yao <ryao@gentoo.org> zfs-0.6.1-r4.ebuild,
   zfs-0.6.2-r1.ebuild:
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 016a7ea38692..d7377976fd20 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -17,6 +17,7 @@ DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d
 DIST zfs-0.6.1.tar.gz 1535521 SHA256 42ed127f74af0ecafc14800a5d2b766655f5ea821098aba92446c1c447093fad SHA512 ef583639f15a5b2e4582760bb013ab5091abc15bae17884d811afec707aff337248102a22fb9fb6f62f99cb3477a8ae82edfdcfdfb962276f593173a5dfe5871 WHIRLPOOL a6791fc2d384e03073abc850f99ba761afd18073337264d8a7bc08b4ddc6fff52df5ce11addc9a3ac7cdfdd9ce9bd779208e515cda631ec19de05fbf9f92307b
 DIST zfs-0.6.2.tar.gz 1558656 SHA256 91b844bf7a42df22d7533e8004289270b7859b8fcbca3bff8087a79b131318b4 SHA512 008f9decdea3e92f6d74f5369ec9df5776b15efbb9f2bc01012999b71e1f2bc5b46b310a329b60545907dcc78773ec79eb6d21aca49d911f33299fd0a36e1a4b WHIRLPOOL 587279866b6ffa2bfebc91f00cb28de85f7f186426a0292f44c6cde7ca3a51c1911fc0ee431c25c3ee0866174522f90ce04b54de4aa3dc0829ba3a719e47af58
 DIST zfs-kmod-0.6.2-p0.tar.xz 8244 SHA256 84456e1d52c6d44cc377d131ee34c042c289d00f74e7a9b521d8ef82bdfcf369 SHA512 ff29830e44aeb537d82d2c34070a245271b51013131f9191d03ab35eff2b86559c4bdadd3cf21f7aa7bec07c3556ef712db9cca2beedd1288036c29d750567e2 WHIRLPOOL 62b9a920a832f5715a24c2a0cdc914a5e77700b0e8723df868b1bf8b8a7ecec6f7df14cb294dfb4f4f219cc8253615c594b609a117b57b576e1796b8042bfdc5
+DIST zfs-kmod-0.6.2-p1.tar.xz 15988 SHA256 0d5ee6d53f6ba694937a9c1f009a0c18519e56cfcd328e5a42a0486f967608e5 SHA512 77b4f167073fa1be2501889f6795972a370c90b58dca121c95c38d98b37fa092ad043e5ab447e677f2207da7119b9fd2c940990bec83118edf18daff2eccaa16 WHIRLPOOL 730347f5d6c7449f309f6b53cdbcbb77b94c35385cebdb5a953f851f01d26c87d615b8ef673a7346f8351e01237833e18ed2fc7cca78bb200e7537222b3e46e2
 EBUILD zfs-0.6.0_rc10-r4.ebuild 2425 SHA256 43d49734f34c11cf4bb7f52ed60238f472a9d44f8571ecf5da5e3d0de866cbe3 SHA512 922b9e5a920da0cee6a3f02d55cfa2462f9f7d9d7783930075c642bebe981d3cbeaa7d510bff8867afdc63c9c089e598828688317c3d603f5580dc802c543a77 WHIRLPOOL f7451202156bef5884c7cf25e61bade72f4c1213e7aa95d1b455257bf421ca4e07a8130d4a9dad409def546f4c422ffd370d7b442a2561f2a60e7ad7d5c05894
 EBUILD zfs-0.6.0_rc11-r3.ebuild 2425 SHA256 91c81e66eb4cb7362810bc748d1cb05b2d515e6cf670fd9547761997bba71064 SHA512 1708af9529f0a7cc72c2d4f27ff7176d14842a5d7b5761ed9176fada6816a6f2d686c5997708f41a5ad634237aa5ecb68374045ad869848127a1ad0cdf2db93d WHIRLPOOL 86ef757aa5aac1d24eeb38d16eb87f5a4e34db02bdb3df74f5e884126fc90be2b4bb36c5cb5954908afa45d1d53d6c4857aed2c04e14f378c962586d458eb8f0
 EBUILD zfs-0.6.0_rc12-r3.ebuild 2425 SHA256 7ae28e9025453f623fdfddccbaba6d4f56448da1837df30fd4102babe853ae3c SHA512 d33c48ab59528413ffdba58aaaed0022d19a33cd402731c32ddf89ec043fb1552d57cc5a74d2c4efdc9bc2aa25140846c3ee1c80cf3b9d9f098cb54816d0e3ae WHIRLPOOL 59634e47aa9824b1397ea374433309928a71074d1cc7b415ff1fd125696cc8404e15e1f59091ec74acdab749a2a48b86cd0c3ff053dc70a12c6998b21c789eff
@@ -24,24 +25,25 @@ EBUILD zfs-0.6.0_rc13-r2.ebuild 2767 SHA256 a01f304e92fd0fdb0c2d61d2924948a8184a
 EBUILD zfs-0.6.0_rc14-r1.ebuild 2898 SHA256 94eec2441edd8094dad6bb73a576198fcb5c3221de9e4cff13193f86906897a3 SHA512 e948a46ab4560754896044411fb51b1188e601dca4cd9de56022b72ee6d8c942329813e71a9dadb9c9665d203c5d8dd04c1f9071472950eaead78898ed5826f1 WHIRLPOOL 84080714d51b18a663812115c16eb734f71ab2f02d5138a30dcc660a361caa198021ae46b744c35edd8b78edfcc3f9a2b5ece8fdf68b2ac26dae199eb76028a3
 EBUILD zfs-0.6.1-r4.ebuild 3733 SHA256 26dfaf61978ca7a74adf0cd5de815b348bf3a39fb553745bccdacbe0049af86a SHA512 6eba565e81c829c0c062f6b43795c3f937a012d794f164171b9f5a86a12d77f4c11bc8a0152a8151dd59175e584416e9cc02bb0b7b451e6864312d01cc324a4f WHIRLPOOL 5ae5fc47488e9724f4517c6e17508844ed13680491682aa301a4f944bae9bb95d870191ff5b751049193a5ca46939709b302a68d95cf8661d5bc4c305cf6cd14
 EBUILD zfs-0.6.2-r1.ebuild 3631 SHA256 9bea1a040b039ade4e3ab44fe5e0b0b728f6ec13311c2718abed7ba973f5917b SHA512 7693d1edd1163ea287f68ca49627c9d78b6ba88e03b4e498e7f9605b302d00b410f50c173dce7a3004928f15f392da418bc4ff0a392631f2393a6d890564c13f WHIRLPOOL 81eac75ca255dfcb807bd86e53c7be403e6a8684889bd20f6807747816ee51863476d55141773f7a3bf45daf3f22fcf1fa5e899506863d5c4c58b10a5b72fb28
+EBUILD zfs-0.6.2-r2.ebuild 3631 SHA256 5c6f38f3bc0e4756b3452fe4c8c5dedfa55aced582547957cf1c75c4a1e6d42d SHA512 682a9fff1585d08707ca84be6b752fd4cd4040e97f584e2889deab7818d963bb37e4a7e9d04a6f3b6de865e0bd79bbb7bddc9b95dd1e0808138092bf68351f7a WHIRLPOOL d4875050fe7b8aa141bb43a2b5050ac6ce5410c620cdec43312b916fb0369e2869e8922b1ec32c7607bd9671515b91f20a5d560c99b3a03847d438c4cdbf261e
 EBUILD zfs-0.6.2.ebuild 3392 SHA256 18fcdc47bdbefdbc086b6fd6db8ca48d21560b1fa9ef0c1c3e5e64fc70802832 SHA512 a6405759c13611573dc04efa373bf9c1d33804dcb0977a598b0da775616b741e64d5ad25ab31a857117058b453ed7f3f617c92d27510506e323aeacfb9c64c75 WHIRLPOOL c19a40880679bda65244bfacc96ee3153b05903917d1f6dcfbb1d0bbc93e16a2307c37fbb4585b3d758fd187d0a5d419fbc9974d2198e1e476bc314e2e4b8cc3
 EBUILD zfs-9999.ebuild 3414 SHA256 dd4978bcea7d2b1c302e47e65334e86e33a838cfb31577866c5ad24a76e04a7c SHA512 6eb001d7396df336690c9917e735045a8b12913fa337474ad915da9f987c5a8b16e77e23efd54a9f189e9257c004ac73d24ce758c8d75db6458488d94508fb9c WHIRLPOOL 0da253e105a37664dee8c58ae771d38d103ca7e560ac4e7828b01d8acccc6fbad1726d8e15005f0848dee70922231f4826a6aa44994214f8090cca58c6ceee13
-MISC ChangeLog 14691 SHA256 d20816ffbdd9624801907ede045703d75bb5e32d9924580a258eb149785c6d08 SHA512 14816956ea9de24bd9fbe205dcb9c1b93d2617d192a9b0465179c059090a8790c70a9c6ae76dd4a1346c050b29fa1ca00f20bd3cfaec9cbb34258a5940a21e96 WHIRLPOOL a73a95f41f848e37af395eb94be82212a385707346035b4cfd36e0edba6918e2ff911d92f58d22ed3784ec91068ac3b86ee7402631a3d978b51d7d4cb0ca7350
+MISC ChangeLog 15039 SHA256 5f6c174d0c758ac20c195633fa1b0b6b3c76caa058db9cca0cc7eeee5b9e7708 SHA512 d6f25772ccd3e9a6036a4eb1d046936e24e78a421fad205f4ae915d18030e3a472d10473c34dc07b6ebb657d19240da36423abfe78400e8ea4fe436dd125c419 WHIRLPOOL 90d4604c89737a9872dca515580b5b536c51b6eaf327a79aa387a34e7157e2fad19d139867048c431105a71cdab822107d1eccf8f0e50c5cb4a9bcd9574a90e9
 MISC metadata.xml 546 SHA256 980db453ce3112b91daa26f61bbc8eec61d12d0998d0bf76a1308aecad499c42 SHA512 33e25501a30e8cb8e890c1dbf98f5d5264a7958f7d710d37d4ee36efbb318d0db23533fefd51ca419cdc6f72416c1d0cc4fd3b1e68a157dca14890d54f411df6 WHIRLPOOL c96639028769b95ba23db8e8e20d71f5894b1ecebd6d3e62effc610d48e2c55797fa3536dea6e654185f288dd8edb6a2a063829598703f0f0ca61aa02f995314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSW/9WAAoJECDuEZm+6ExkEhYP/1SzS/P9f6Sc+ebzIUGw6E4H
-2tVgM4eP1cKuqR5eJ/YDCOABLnkFr2UlkKhuqMpft32mGe6W/L74PzROAymHP+8u
-MmYIqWADaGD7EkDwNC1mkKZ7fpOOv2AmxS4Itt1HVaBAY0Z8Y8jEOmOijCSFlfka
-SKdvOxLwcXAsYMpgAj/lF5BwFgpbKMtIkLH2zpxXcFJkFqOX+0PErzCXJuJrataC
-cRDx5OKIhBYh5JeWggMEBb9ak4CrYGvrVgZDveP2/u/V3PgBHdEPKie7q68/S5wW
-ENTOhmCF/32dEmrXRtWIgfjLTDen+7Z28Y0pOB+U7y7mq2os9jQEr43XhKdSMCOW
-/G7nY+8+ejJpK3m++xpXE7vWZpD5tOoE2s4K4cfE8tsNPr76cARN79FluSdFow3M
-xLjNP2cS9XSuojZjGp3vZ436GsohE/QOLha1TtHja24GVdEgUJJcuq3fF+1UufMX
-VPomknYDWla6OElLTsFEm4xuZn8jmKe8h0KrQKlKrwjV4X+vIWPL+lEI4wfywCIk
-peQQ1sQD1pkpw87PPv79g/3KRgUZHkZIE/+qa/esREkoJzP1t104juKy+lKw5Bi1
-TyxXHOnwuCLZDaCvSwkWETUJZbxwjz2+62Ax/Qu1YVUF6Xpb4/WM9wvHrc61JaJZ
-BnnK3TjWUs55/SiW81Cq
-=K6jB
+iQIcBAEBCAAGBQJSYWDkAAoJECDuEZm+6ExkBNkQAJOZnZOcj35vKxa5JjqhTyI2
+IkVIoN34kO/MXXzjsWpOUgpYVFDkGeeimhfIP8Wlo4dcDtUtVGTUDf/OSpry2rTA
+cizJchYpWBe9e3en/xlb8h+ZKtC33MFaBrn4gyvaFJXPvQKjZhQ/P3nR6jv4Otil
+AtySwuZMLPIu/RHohjSsoS5t2FuD5etaHLIrSfbVgltVxfy3kIEMffBi0DeaeYwd
+tJJKq9MU/9vh0g+jYp2GYvlqBQLepWhD3v+gYQW1dPZVZmxNJVXboXC8wWY0wHyR
+AHdKV7nTHg1GyyKgrt75f2iI91lL36/xvqaCWqmnVYzsWEpD24pvLTUZpLQ2GB3a
+HGWc/mziUYA9gJa0tqvYx6faXEUI8MW5RnH58AZkbQq5XkIJ6lge8BDPPYVXVcqj
+fol10+N4MRt2s0oszrAnE3u0RuJ1Sivq21R/b69v3T/AOvQr5GCngV8h/rSI5urp
+y6nvFP//wvA1b7yC6l4TLjzbgbYflfpOPHPRAO1A7zcAv8DXSS4sOfMgcwOlSoeJ
+oVfADMNZ6EoHtQQmMs+Wc51dBY8H3WOL7m4wJJS+Y0puf3u5LFZ4bZ6L/gzUzbh3
+PaXmjD0vrJgH/lQu5NZ8rZCIZWGWwYGvqH0A5W8vM4nAcElevW3Qg+Msg9UJls5V
+jej5dmCoqAGQODovK5of
+=rUKC
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/zfs-0.6.2-r2.ebuild b/sys-fs/zfs/zfs-0.6.2-r2.ebuild
new file mode 100644
index 000000000000..418d33bd142a
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.6.2-r2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.2-r2.ebuild,v 1.1 2013/10/18 16:26:04 ryao Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit python-single-r1
+
+AT_M4DIR="config"
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-2 linux-mod
+	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
+else
+	inherit eutils versionator
+	MY_PV=$(replace_version_separator 3 '-')
+	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz
+		http://dev.gentoo.org/~ryao/dist/${PN}-kmod-${MY_PV}-p1.tar.xz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+	KEYWORDS="~amd64"
+fi
+
+inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="bash-completion custom-cflags kernel-builtin +rootfs selinux test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	selinux? ( sys-libs/libselinux )
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!=sys-apps/grep-2.13*
+	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
+	!sys-fs/zfs-fuse
+	!prefix? ( virtual/udev )
+	test-suite? (
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+		)
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-boot/grub-2.00-r2:2
+		)
+"
+
+pkg_setup() {
+	:
+}
+
+src_prepare() {
+	if [ ${PV} != "9999" ]
+	then
+		# Apply patch set
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		epatch "${WORKDIR}/${PN}-kmod-${MY_PV}-patches"
+	fi
+
+	# Update paths
+	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+		-e "s|/sbin/parted|/usr/sbin/parted|" \
+		-i scripts/common.sh.in
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(udev_get_udevdir)"
+		--with-blkid
+		$(use_with selinux)
+	)
+	autotools-utils_src_configure
+
+	# prepare systemd unit and helper script
+	cat "${FILESDIR}/zfs.service.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs.service" || die
+	cat "${FILESDIR}/zfs-init.sh.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs-init.sh" || die
+}
+
+src_install() {
+	autotools-utils_src_install
+	gen_usr_ldscript -a uutil nvpair zpool zfs
+	rm -rf "${ED}usr/lib/dracut"
+	use test-suite || rm -rf "${ED}usr/share/zfs"
+
+	use bash-completion && newbashcomp "${FILESDIR}/bash-completion" zfs
+
+	exeinto /usr/libexec
+	doexe "${T}/zfs-init.sh"
+	systemd_dounit "${T}/zfs.service"
+}
+
+pkg_postinst() {
+
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
+		|| ewarn 'You should add zfs to the boot runlevel.'
+
+	if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
+	fi
+
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		remove_moduledb
+	fi
+}