Wants=remote-fs-pre.target is needed (#493798 by Vitaly Kirsanov)

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

4 files changed, 169 insertions, 16 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 41c1548e10be..33bb378dc13d 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.232 2013/12/21 18:18:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.233 2013/12/22 09:50:02 pacho Exp $
+
+*nfs-utils-1.2.9-r1 (22 Dec 2013)
+
+  22 Dec 2013; Pacho Ramos <pacho@gentoo.org> +files/rpc-statd.service-r1,
+  +nfs-utils-1.2.9-r1.ebuild:
+  Wants=remote-fs-pre.target is needed (#493798 by Vitaly Kirsanov)
 
   21 Dec 2013; Agostino Sarubbo <ago@gentoo.org> nfs-utils-1.2.9.ebuild:
   Stable for ppc, wrt bug #493422
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index e992c305a300..a740f33acf30 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 0001-mountd-Fix-is_subdirectory-again.patch 2704 SHA256 1c1204dc5fc62debb8cc66ca299a741a3d8e515f480ff7aecb4ad72819658de7 SHA512 59a29c72096357fc35e805f0a1e443c7a6ee9b07c96ed85481b1101a6090311937b39f45aefa60325f968a5c7d2bc5550c2a43f2f54bd8522b615b84bdf71c86 WHIRLPOOL fc0c806c3c68f6d215f24a418b92b94188e23cc9249a8e0cea6ec22a1139747ab05cccab253bddff6787a15301225792658dadc8d6d1c4c6aba5543ea893d600
 AUX 0001-statd-exit-if-a-statd-is-already-running.patch 3593 SHA256 d3e402c73b204d4b5e161563005269318dad6e992792c902da76ff8368b872cb SHA512 e04d451618d6f6197dc0692844cc115fec93575525cd0569d582f9278007e2dbec692ef46065c675de13d608e034161f39a60d46766873933d05d18b94633f6c WHIRLPOOL fdf6de89a5ae3f26c1091f8b314684ba0cac3aab68731d3d56e5a909a2211b8f84b8212fbf0f7179427f98bdb102b9bb3d1c3828e66e283bc70abddc9ef3964d
@@ -30,6 +30,7 @@ AUX nfsmount.confd 326 SHA256 b9389e143c2c4f95c11f97a8a379e007f140559016f60011c9
 AUX nfsmount.initd 1126 SHA256 b57637c7eb8e40b5cc1655e8afa69dc0aaecbd3186bdca3301586d1e9b797357 SHA512 e2c4d2bf9690b092d7062d95f4242e2591e3ed0aa8b9b36eae977d5d0350b0d90d339f7e75bdcc794abef27cf1541642a8a6dbbaed90e58cc823db4c92af9336 WHIRLPOOL 54a2bdb24015a6d8184fdde3351b152c5625cb6e4ff17876d592a1600fedec1724081b4ff233711ad9d290ea761827067c40ba8ae21121fc6066ba7ed230e483
 AUX rpc-mountd.service 251 SHA256 d48a2bedfc62e20a21e2b55b822290ca849cc43bd8aafafd72687a389956e44b SHA512 6d9d163d35ebfeb2cd2d00f4d3c4d7973c6f6b9615c59e1e05e5431b91e0ade3cdd414896245f53ad0bf897ad70dcb0d06eb94c71d52c9ea3787df08483f2e1b WHIRLPOOL 5aa94ae3d682919790e485a5c00b8b396674e8059b563472dd007e8be0084ab6a8aadf9a72f0a01ee68260d71e51075cbd9c86de36b713495a7beb275a3f4cab
 AUX rpc-statd.service 268 SHA256 f6e9479410ea3c41949ef8c552c0246cfc4324d60a69900fa14d10c50dc2c305 SHA512 6e0ff528f98b669c33e810082c772161c9750b626e755f0bc07e2134e43ab26eb3b73d92d1da5e05926a88c1ddbd44c2670c9388de470d2a90a82c7f34253775 WHIRLPOOL 97d1fff09f4dbda3a54a88c2323df594c6170fb3891d8e542370757bd80916b0e8b027358e81fdf08ae4a8e2a79ca1c0361320fc552221626fbcbb17a4ece937
+AUX rpc-statd.service-r1 295 SHA256 f6bf14cc4ad506b4af6eae332f1befa1ec837fb0a4431a02f4ab3593dc1f55ad SHA512 fc5ef04ddcd7c4fdf041d7b45e92c84f10d264e767f5c9f8f3b8e989f792e605de9177449d4c267fd1cf1ffdae1d0f9faebf33bd0de2fdf8fd9cc4262374f86c WHIRLPOOL 17ba4cc83a2e93052c424154efdb4d82c1a9b1fdd1127613c4b4440ce631648b24710144e840e1d5e4356b403d379b48fc1fea85ea6fb50003c518bf967d4ce6
 AUX rpc.gssd.initd 567 SHA256 00d9c29280a83e8458c33139d04a9b38c6fdba9d7cb9b420ca83bf6b10e6435d SHA512 cd4f763c7cced0eecb03e2d4c8fb1d5fbbddd119a014dee4e9cb881d3750fb01a50daa4475700914785cb1313ceef638b7de4d8dddac90cbab63888cc81938f6 WHIRLPOOL d9f4c381f18b76a2c5b1c0c2adb56b0005264a3230c436d4556c45e13372bea09cf1fc35f02d734cac7081322f72873e46d2b2d451334ad908f14ad7fcd54acc
 AUX rpc.idmapd.initd 595 SHA256 3ce65326859c43983dad25ad2d4731488c488037796e39b6b5eda336e8bf81ef SHA512 624ac8c5a381a0ccc1bb7dfd06c080a9de85a9e94e1d4071a6ef401e1b20f0d05d767be5e85eea374c3a4c29218b3db6013383afa0bdd1a7f61b77260675bfdb WHIRLPOOL f25787957ec201bc97754c7864ada3e2c9be05bda054fc8ebdc29e6ebfa2280419d3dc44f54f71a1adf195f257e6e8292645b55e76006341bff101e5bddec94f
 AUX rpc.pipefs.initd 822 SHA256 6503951b3c200ccf3f46396f7b9274f0a565807f7f6e561c17bed6b0133ae49a SHA512 d711406b29f6634fcde0f21157eb6b2230574e535c261c4478194c3c2c3ffa4bce7b326cbfa0e9f8e816c48b95a306a5cdbc94422db2acf64b48593637df133b WHIRLPOOL 4dec97b8883efdf03ef3692606baa430029e71e35cf34857f8dde287dba3d071a442ae03924c6a478f7fdf6fa79b211d39b08f16e241cbd0cfa31f763c028439
@@ -62,23 +63,14 @@ EBUILD nfs-utils-1.2.6.ebuild 3864 SHA256 b9b8d50f103d596ff47718cb96c9bed767f3a5
 EBUILD nfs-utils-1.2.7-r1.ebuild 4005 SHA256 0c46b606419416fce029b219ac136a87f645cee93e489eb29924a08c1981cfbf SHA512 7cc1b85aba2ab31cf5c1d1922d4e817a68554189aa5726953e86e9acab3a68a8566430d3c08878f7060c00d346872b5a12194774cc548527256a5b8b0e4fd1c5 WHIRLPOOL 0a813b0f59daeea05c93c6f5b21f8e7553f98b44cb7668dc5b2c0635f15e02fdfc91ec53970a7581a4cedaf66d8a779bef18ac63f830bb393788221a6c0fb603
 EBUILD nfs-utils-1.2.8-r1.ebuild 4027 SHA256 19055b182c8bca25dc47efd2516ef11a623939a7f1e15a95e5e10c256258e2cd SHA512 76d8be488fffdbeb0f3e56f5854896e28ae04e0262e26250f613a4fda063fd13a337e761ba12f57034452867d425f20d4c32c24c8e3d56f6f0ee35305237d548 WHIRLPOOL d0d9c4571987cda56c9d6be354b1f3a963ecadb3f9ab4cc1ad26139346cb1f5637655153f8f23dfc810308fbbd354c1916fdc83257682de0fed60137d163c004
 EBUILD nfs-utils-1.2.8-r2.ebuild 4095 SHA256 76fcc1ef5d657251f8b348938ac224c2a6b9a9efe797ccda8246c772fe51cb77 SHA512 32f7b226591017489302766483a7675f503d9c8990cdcedd8c4d4447fdb069e9b235de053f93d42bd1eb588faf640beea8c9691a8fe68cd9379f887c8b9f0d6e WHIRLPOOL 20bcb1ed15f50ae06244e640550fbce704c4e9734406e532be9f639b25b2664ee046bc855b004efac0b5aa0abd4a5738d48cf88c88d268b7497edcd838a06dc1
+EBUILD nfs-utils-1.2.9-r1.ebuild 4060 SHA256 dc5782d3763660435ec8d1aeb13474bab3fc211511eeb7621aa33c83d8886df7 SHA512 c4c1a5977407cefcc82c3fbee9753af86a4bb2e7fa5cd7a1420ebadc174f960e4bbfba9a02881c5b51b1a51d48814eecef53ffda6688ca0c0d6b207d176d4d0d WHIRLPOOL 1ac449578df36aa15bc4696d0ee08e43de89614c804fa35578c3b1b2f0aa405f848dffdc150d240a8fac61fd3f51b0125b208b0586d2333b5a1e01d479af544a
 EBUILD nfs-utils-1.2.9.ebuild 4029 SHA256 363120b593b22a35d92be1851a89c3282239331c8b194c080811330ef485b862 SHA512 44c4b75a71d57732b4a7ece0e5b79a41724f24a35cbe7e29604b4c38ecbe58c3cd20faebbed2ba5af4471008e1ba4ef7dffe00de961b1c9e31bdc71fb6e93114 WHIRLPOOL 463fe46dc0d1d061e5277baed81b2dc6fa6f79e56a46c6bfa5cd51b50d470ddd87636af80e750d858278535f5140ca4aab747063390201d75b75a1d260bb6360
-MISC ChangeLog 36540 SHA256 f583dba5836dea47534911674dc73da295811ac2239e647803d12ed3398163ee SHA512 a9081f6a54a85ca5d6f1b4e01f876f98a42d845470a9c4b99a3562ab6ae5c9453a7dde2bd01355286f28a04179b2e611cf314523f130ad6ed761d17a75d0c48a WHIRLPOOL 03e392204d5bc61a86c96f5bf54b4f98d10baec60c37f193d68327af16e6ba96b039e531192fed796e596ae6142bef3275be688d6239b3e2435fa285f720df87
+MISC ChangeLog 36751 SHA256 c85735848609156dc02d55e7ffb7023524f0b158ee7c74f920e7eea49a0bb409 SHA512 c6426e863916388801fc7d4eda147fd00c4b63563950e526681303559f699457568ddabd1e190d9f6de69afd6c1efcd4d9fe546fbfcceb041d6666e73985649a WHIRLPOOL 3ab100f9eba522c4a6c41a47cdbed2dc9d08d11483f65f1d5eda4e2a80a361f0c5ba031a1ce9237524bde3ea0da9e46534ce40bbf2552e90af689cba4274558e
 MISC metadata.xml 728 SHA256 654292a2a5f9be2660c579f750c31cb7d2c77de85fb305876c466a672486fbc0 SHA512 289e3ba39ed190f9a8fa5641ab3845503a982e252ea2ff40ce48bcddc66381883e0ffa334446372d0f4e3d97cdbaf5df548db48bc58c6f29479591f659004fa0 WHIRLPOOL f1de0a51ed05327d86442a2503b3a8f7507edde56b1930c7fbae402cdec184122e5047b97f5258af4bb44b32cf9e934a356a32f32e51a76b16614f62dd757c8f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJStdqiAAoJELp701BxlEWfxa0P/2ccGUk4i10DkrbwHfZsXYuR
-yZPnviXqP3CcqdjowX74t5L8eRa5Rcd4Iai1/3lSPoH+DFY1uUNr5p5vjrtQOqXD
-zKg042RRi2+Li6sNOGHEF9+2ojAxu/fYr73bwXVcSUCfpuVdt4uS6QRfrnFek4cJ
-MsOhWbJJaflEmmhcXY2LKIm6jt20HCG7QgbwyjYPo/lvlZ0+LwiAjFQpKAPE3gQC
-qYG2PoLKNx5rwhhe9ZIZW6vJJBUTLFmEPIGzjXy1D70x+2nmvBLIGCKBSdU7Qa+g
-3e7ljURwdGRhUEI/vL5GG/hljn9CBTqqJDWOTa39sdBcSsy7tSmA+4Q8BKPNlwij
-rhbxS7/W3lA+OJPW/Vc+m1jTxXZafVDWTekyPmk+RtB5tzcNQ7CMhDOCTOB/Ey+E
-0GrdlvPFlIWe/y3FaS00Bc3Qbnd7KgFdp+vAPYdZ/f/Clu43IkB2oCp8+MG15z/Q
-4VFPksK00IycYPyR5ZVrc/aCzicSKdmBZl/7VAE89y9AlnSye/PaFsp9d0hs+sco
-yTk9C0RRfRdAclGAFbxHdZFdWcWqoweHa17t8iVeoE2WY2W0lGAbDFypkozATKei
-hTlpk9j5equ5h7TWY/82fqXPtWJhJtRBSl/MX9nglCHjEdRHufRpGrRMYJMSEP5L
-CRdaW8Mxj7l7wqELRMmd
-=0PXm
+iEYEAREIAAYFAlK2tcsACgkQCaWpQKGI+9ShtgCfZI0Cj/k/iBZ+GpwOvAGtm4EJ
+8WgAn3lUCuENmT0gWy0+2N5uL6xFJomL
+=Js+c
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/rpc-statd.service-r1 b/net-fs/nfs-utils/files/rpc-statd.service-r1
new file mode 100644
index 000000000000..b19eb17f59f3
--- /dev/null
+++ b/net-fs/nfs-utils/files/rpc-statd.service-r1
@@ -0,0 +1,14 @@
+[Unit]
+Description=NFSv2/3 Network Status Monitor Daemon
+After=rpcbind.service
+Requires=rpcbind.service
+Before=remote-fs-pre.target
+Wants=remote-fs-pre.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs
+ExecStart=/sbin/rpc.statd $OPTS_RPC_STATD
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild
new file mode 100644
index 000000000000..b9c4ff5e9da0
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild,v 1.1 2013/12/22 09:50:02 pacho Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic multilib autotools systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/"
+SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
+RESTRICT="test" #315573
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
+	caps? ( sys-libs/libcap )
+	sys-libs/e2fsprogs-libs
+	>=net-nds/rpcbind-0.2.0-r1
+	net-libs/libtirpc
+	libmount? ( sys-apps/util-linux )
+	nfsdcld? ( >=dev-db/sqlite-3.3 )
+	nfsv4? (
+		>=dev-libs/libevent-1.0b
+		>=net-libs/libnfsidmap-0.21-r1
+		kerberos? (
+			net-libs/librpcsecgss
+			>=net-libs/libgssglue-0.3
+			net-libs/libtirpc[kerberos]
+			app-crypt/mit-krb5
+		)
+		nfsidmap? (
+			>=net-libs/libnfsidmap-0.24
+			sys-apps/keyutils
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+	uuid? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
+	eautoreconf
+}
+
+src_configure() {
+	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+	econf \
+		--with-statedir=/var/lib/nfs \
+		--enable-tirpc \
+		$(use_enable libmount libmount-mount) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable nfsdcld nfsdcltrack) \
+		$(use_enable nfsv4) \
+		$(use_enable nfsv41) \
+		$(use_enable ipv6) \
+		$(use_enable caps) \
+		$(use_enable uuid) \
+		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
+		$(usex nfsv4 "$(use_with kerberos gssglue)" "--without-gssglue")
+}
+
+src_compile(){
+	# remove compiled files bundled in the tarball
+	emake clean
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		# Install a config file for idmappers in newer kernels. #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsmount rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	for f in nfs nfsmount ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED}"/etc/conf.d/nfs || die #234132
+	systemd_dounit "${FILESDIR}"/nfsd.service
+	systemd_newunit "${FILESDIR}"/rpc-statd.service-r1 rpc-statd.service
+	systemd_dounit "${FILESDIR}"/rpc-mountd.service
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
+	local f
+	mkdir -p "${ROOT}"/var/lib/nfs #368505
+	for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
+		cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
+	done
+}