Numerous backports from HEAD: Send/recv reliability/performance fixes, ZED fixes, systemd compatibility fixes, dracut support, memory leak (userland tools) fixes, drive database update, a pkgconfig file and many more.

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

4 files changed, 178 insertions, 18 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index e6a475af0da2..a63a267ec72d 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.86 2014/12/01 05:26:19 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.87 2014/12/01 07:04:45 ryao Exp $
+
+*zfs-0.6.3-r1 (01 Dec 2014)
+
+  01 Dec 2014; Richard Yao <ryao@gentoo.org> +zfs-0.6.3-r1.ebuild,
+  zfs-9999.ebuild:
+  Numerous backports from HEAD: Send/recv reliability/performance fixes, ZED
+  fixes, systemd compatibility fixes, dracut support, memory leak (userland
+  tools) fixes, drive database update, a pkgconfig file and many more.
 
   01 Dec 2014; Richard Yao <ryao@gentoo.org> zfs-0.6.2-r3.ebuild,
   zfs-0.6.2-r4.ebuild, zfs-0.6.2-r5.ebuild, zfs-0.6.3.ebuild, zfs-9999.ebuild:
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 70ae91c46472..87ea18e95209 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -14,6 +14,7 @@ DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535
 DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d67f148a444d912dbeb24b9a12d SHA512 ad38544ced150ce500c78507782e53a8534815b819e5b9aefda6d670fb7905e31a42cdb4d45164700df48673ea7c42bd1d29a60f1f00e25271b3906de9212d15 WHIRLPOOL cfd4de541eb6c18ee4df8950883525d1b1887e0d9c5f840d97353a5d716ed639f1ab3dc0fe4d8368a890564f10053026bcc738b6066c4488647f1b83be54288d
 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-0.6.3-patches-r1.tar.xz 87852 SHA256 71b5286f77cb6a6c2b97cee406dfd4788f7b40b6675c4a56fc630a47e90d5280 SHA512 e2fa573c7b30a3811e9e1596d35b65f5d013ed5bac43e364b44ffab734398a3294979c152a80ec9a722611cc7c971aec217d8e1a37cc9240a3fa2dddb5b90e3b WHIRLPOOL f2da02d5c7d2385e7de1e858c31d299632ca864d422f0c94e5d3b8674d24beeb073ad2600698350306a9e70dbeef390f0e513d19c126502fceec18795c203d50
 DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe
 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
@@ -29,24 +30,25 @@ EBUILD zfs-0.6.2-r3.ebuild 3655 SHA256 143a03af2539e109d3038bb8460274dd6349be335
 EBUILD zfs-0.6.2-r4.ebuild 3683 SHA256 8c99c8560110f340e5eddc323396ac8de77b33b0279d35a953cea97cba63c065 SHA512 d99d67ad7d4b4f0fdc87b8e547f3c0efac603ec5938d0aaaf8be53c4a86c6f8adc6274a963571c7558ccebfb98790c66124db3f8b17335d28ef3ca29b120dc75 WHIRLPOOL bafeb6a4f5109f4c55da3591086bc2e39943d20b3ca9a27d90071643234fbd2119242f8c8248dc766cdfd34c69855b29bff5484e7dab0c36bca6f32b89027459
 EBUILD zfs-0.6.2-r5.ebuild 3683 SHA256 c11985589b02031c85bb4c4f86e2c4169c3cb4d9aed416990e549b30b27a5691 SHA512 88226270fe39caf4aed3888d760fff935e5c090f3644fe05afb1122e4507b228abee2778219367aa071c3846b089d2169adb9d413580d3168c90e050fca057a3 WHIRLPOOL d7e72c6cf600ffbf153918734eb6a458aee3a52a18d8fb9588b5804c0fbb1595feb641fba988bdc295ef6878de56a69498b935f15db2bc50bbcfe3de6abba9b8
 EBUILD zfs-0.6.2.ebuild 3390 SHA256 3ae9876462e245526c0bbc061179f6bdf0febf58857e1b664d30ad3e976d1d03 SHA512 4c136d848cb9769fad363074beb01634969eaa9bc787f0f380f101654b7742b7c56ca2f2fd222b44b739673804c6703524ec24e8fa36aef17783fc42cd6f7224 WHIRLPOOL deb0cee2af6964ef6f0cf3e327d89af5ec48a7e34faea6cc732e1f5451a0d4e6643b657d66e9b588aa85692ee22c09278e56745f9a9a82f2a34f7548324ed035
+EBUILD zfs-0.6.3-r1.ebuild 3562 SHA256 f8f2fde6ac0900d2222c4f06a6dd8a065159b7a962f4195834412ac9f4c4308f SHA512 eb22f8e1cd5f0dd3fe1f0cba333b1b9aa2060908f01080eed75a4fc04e60ce2f5d50720c85327255ca4581d0f4afd1f3a0c102e63c9b3d92af31108d9f10a5b2 WHIRLPOOL a81ac1f2ca20c3c8e4416cefbab70ef26bcfff366362e88902c1564affa587c511ca335832d02c270cfcf74507cda556034ccb4cfb08a35ef17fa7505fbcf835
 EBUILD zfs-0.6.3.ebuild 3406 SHA256 61687aa42e03238e502d19031fcd03b2d08716a47335300c2f14bc02f4efd6bb SHA512 76392340e0c59efa9126bd9d4f7de3e90baed6131b82fe6a21918d055e8de984a630a8fc810b1f5883323fbc536c587020bc57b08f0681b27b3a118ce827ceb1 WHIRLPOOL a619d14e3cd750c95f8fa3920fb3f4306f0d4d7e56c4f8323d05f87280af837a104657f08dac58135f51c677fe02450df1432d59b6d0fcadbd01e778748b44d6
-EBUILD zfs-9999.ebuild 3627 SHA256 4883eae28485f4fdde092aa4a31f02f6c8a7d24cacedc8af21d3c6f175de240b SHA512 44b94269a82cb41e04274478e71fa3dbba9b415fb396f7bf959aae59a1c728e578c189a0d10661630ab6d521f7dc76772c5f2c02f9ee76455dd85613889c4adf WHIRLPOOL 07065fd6fc75f83ab3edc953b31d0747c841002dc477185aed1bd8b4da2fe34df7e92a0637f713fe86f538b551bcaf2840d9cfe750e8e087e6fbd58f9ab28960
-MISC ChangeLog 17270 SHA256 4b2f8945a863c9d1363a37d57697ef41e9cb033a39f50cdee4895610d25c0bf7 SHA512 cc0230245dc06ad8f80d0169c506d05ed23bef23d27d5beae0814ece1f993431c14f8f95ce313e872f7cb2419e87bc1cfb5c53acbaf377dcff12fe28ade570ed WHIRLPOOL f8ab300968f902b9d0b8ba39ebba8de095f547ae4058462429f5aa20c7ba788772026a7981a619ac6ebdfe6af77bedfc6dd1b40a55ae0fc990718d582fcf7186
+EBUILD zfs-9999.ebuild 3643 SHA256 ada5845bef447c5961379b3f7b50cd54518af88a23ec5b5d9d45fdd508502a32 SHA512 60e7f696d41a61112fd697e4d665e7589fd66a3f748f9611e37bb2458cd46520d1b29060a4ff89a51c46b337814eaa41d55bdef7e7cf48e4b4663f6f44c8601f WHIRLPOOL 91069aeebbf7d6e3de5d8642a541f48fde357eba682bee55bccd80147316ed9723ab60171ac57d544546d4d6d353d3204de02c48f312fa84849d4a32f5c008ef
+MISC ChangeLog 17610 SHA256 1e2a81b942d11d2efa122fa314f23fab236425987ba493292d0ef611f1bd4b7d SHA512 1bd786d29281715343349ebbc4bf7c8466d1475ae5b133576d4e440659cb4e23bab856d18ac98fc0b97985ad51b5dca6abbe314650561993dc7019e0a4a67f17 WHIRLPOOL 74010c86c43aaed7b2f4ea54393dd8b79486b7c32de0f71a1063be10e6171b3d200c374a27fa022fd950e963b3ff24133fc07cde9f280b237239bc6febfc52b6
 MISC metadata.xml 546 SHA256 980db453ce3112b91daa26f61bbc8eec61d12d0998d0bf76a1308aecad499c42 SHA512 33e25501a30e8cb8e890c1dbf98f5d5264a7958f7d710d37d4ee36efbb318d0db23533fefd51ca419cdc6f72416c1d0cc4fd3b1e68a157dca14890d54f411df6 WHIRLPOOL c96639028769b95ba23db8e8e20d71f5894b1ecebd6d3e62effc610d48e2c55797fa3536dea6e654185f288dd8edb6a2a063829598703f0f0ca61aa02f995314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUe/wpAAoJECDuEZm+6ExkFzUP/jsjstpRZx+N9AH+wRLIBjIp
-P/sHSD00P+TDKSaAz6E/nXPcPwLSJH2qUDtolqxPpCl6kqV20USm0YVR1Sw2WaDl
-e8SM4FZ+AgYGGWM5c9jVr3EPVvMGTslAioMCj5Ut9oRNg7Yp0wcR969xYa34IPEK
-NgvrARIfS5zAKejQowgNhRumIejWSTwaOxzHvvtBRPBD4nKTiW3LY3dqMcW5QUsV
-FocK/bYnJmzY411f9m0WELBLhzn1AmtzmOGdK80wm8ui9254XePWBUd4qCYIH+GP
-63dn/iURUh8sqnW2C/kpzQYHPvXnAgayoEOHojT8JaznhB9S5E89m0FktvdY+XJW
-IOEaLA3MOOKgfFYFbjcMJzq2ODgFbHINBwGUbjMhivYihIp8+f8jNGbv9j3UEI8O
-eE+Mv4Rc7atBiitZwIhz4eDZ+Oa1dzARHP9Q8CIRxnhe3GYla4ICyY/yvlt17nJG
-VUNYNbuHrcSbXGz4A8pJpxvq10Hk2aqwa92w9Absr8vOTMt/jaPJ7PVjGi8ZjihZ
-vnqVaFXvSrxhGtYb54+psliPVxSbG3MZF3dITSK9FBI6gVjK43NeNbp+gI6PY1JD
-qD80qG6iYNbrH4wTE/BcCLT3Qh/Duntbg22zQ2wCa9IH52WbY/8qAYpd81bOm1gl
-KcoiKbZwgwe+fMb8yLhc
-=m6SU
+iQIcBAEBCAAGBQJUfBM6AAoJECDuEZm+6Exk0g0P/1tlrG/C+Gsgd9YvphWb1lqP
+NNL2oQwaPFBVKZQfcFjMDqJk/vS/2g3C9X9bcyo8bOCXQLhvDLVxUpBCe83KDKGL
++788wlu/vKXeZd20nFNIKcmLGrxuQ2dRnPEeoZxKO3EVPq7+Br7NpuY1GjtV4YhV
+BP0AOUHAnpmectboKgBvxEgOSVg4ygdWW+rlw9UERONEHJYfnak8bh4kwbwT9pxO
+aBcTy3TnkewjsbtZcwW+s6VVQQi5QzPN/CNytgYuxJcO/dSoxMOeJObJr/DuoTSr
+FvZCg17F7O0kyVjy0J9V1Mwrqlh3Nzdx9ckGOSokofOCUo6OIFZ8l8Tc1fFt0sen
+guJ0uBGIMHRh1/LAugTLIGHik6LooC9ZvAZ/S5x6jC51sefQfwL6XPIVlFbQmgFQ
+T2sqIRN6ItzuExxHLD4Ri3/RkqA/pjYBc2QNKn+xfCA/v/mvsjHYr8wXv0W/M9yw
+5hW0wrEJUdUXjCXx4JX3d58xZSaVmk8/kZnQc2YKUFEcFmpdJKF6aB7890G4BX9C
+oIzeuA4VEFehSlnhimqpKtdMDpq/JtYBATrdWufTzj5NmI6pvETZiyyTAVcpgaoU
+6VC+pAckTNhyqciM+ZH+8kS0l+u6TgnEyvCgfyJ5yxBPIu4HF54V72172jJQVqPV
+J7CnfSVX4nRSDY4t9cTc
+=8fAc
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/zfs-0.6.3-r1.ebuild b/sys-fs/zfs/zfs-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..9fee452ab5fd
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.6.3-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.3-r1.ebuild,v 1.1 2014/12/01 07:04:45 ryao Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3,3_4} )
+
+inherit python-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
+	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz
+		http://dev.gentoo.org/~ryao/dist/${P}-patches-${PR}.tar.xz"
+	S="${WORKDIR}/${PN}-${P}"
+	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 bash-completion? ( MIT )"
+SLOT="0"
+IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	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}/${P}-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-dracutdir="/usr$(get_libdir)/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-blkid
+		$(use_enable debug)
+	)
+	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 zfs_core
+	use test-suite || rm -rf "${ED}usr/share/zfs"
+
+	use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" 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
+}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 762441bd6d53..ccb22df10c93 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.55 2014/12/01 05:26:19 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.56 2014/12/01 07:04:45 ryao Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3,3_4} )
@@ -91,6 +91,7 @@ src_configure() {
 		--bindir="${EPREFIX}/bin"
 		--sbindir="${EPREFIX}/sbin"
 		--with-config=user
+		--with-dracutdir="/usr$(get_libdir)/dracut"
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
 		--with-udevdir="$(get_udevdir)"
@@ -113,7 +114,6 @@ src_configure() {
 src_install() {
 	autotools-utils_src_install
 	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-	rm -rf "${ED}usr/lib/dracut"
 	use test-suite || rm -rf "${ED}usr/share/zfs"
 
 	use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs