Version bump, add default enabled libmount use flag (bug #487962).

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

4 files changed, 162 insertions, 18 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 7e9071f5a676..5de195932eb7 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.227 2013/09/25 17:26:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.228 2013/11/07 07:50:22 radhermit Exp $
+
+*nfs-utils-1.2.9 (07 Nov 2013)
+
+  07 Nov 2013; Tim Harder <radhermit@gentoo.org> +nfs-utils-1.2.9.ebuild,
+  metadata.xml:
+  Version bump, add default enabled libmount use flag (bug #487962).
 
   25 Sep 2013; Agostino Sarubbo <ago@gentoo.org> nfs-utils-1.2.7-r1.ebuild:
   Stable for ppc, wrt bug #480074
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 9fb36ce52439..47979a2eeaec 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
@@ -47,6 +47,7 @@ DIST nfs-utils-1.2.5.tar.bz2 698148 SHA256 3595ed4f6ee5c13514540861ad5e89907aa4f
 DIST nfs-utils-1.2.6.tar.bz2 755305 SHA256 70267288500408495085b7c54a667c4e8cfde5882f3193da095fc7dad2da0b83 SHA512 634f6d71d081fd9a06e28f25d9270d04d92cacc7bd1f99507ed610bd703d4df9e9ce4fab0de1463dd25ac64a99ae5a54f65340edb12ac007583b83a872dcbc25 WHIRLPOOL b87b0e543aacaa74ea305dccfd966c4f7717929636c8ed6f0bfd1bfec1ef2e6e913855b4a704ffd31215582931a795707455eaa3d639e601b154eb0ea77d13a2
 DIST nfs-utils-1.2.7.tar.bz2 2902130 SHA256 7ef8e0a8b22cd7ff33f3afd28e770d45643fae303468a180640c2967833fe75e SHA512 c63b28be8e7b9cbc3ccb4950f31fd30f3ddc9c8707dcad4c3f2ee78fb464df9e0f1f58dc0c47e530c5afaa604712b4dc5e15af795810374e833c09a19dfd32e1 WHIRLPOOL 785511e2eb03649027977d81f11d7a5b1f960d4fdc57b790af5a3d441aa63858d8c2876e851049ea1b799a93796b209c9a3d22837f3aa3744ba17395a4fc8dbc
 DIST nfs-utils-1.2.8.tar.bz2 2747577 SHA256 1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6 SHA512 abe13f37dccb40258ac2f654143e540b9ac8c41ca10fe88f104ebb558334d41c0e31220dbae0122836e43236cac763fbcfc1d5bd708aca3b282152ac3ac7213b WHIRLPOOL 95bc97e572aebae4b99d20b67845e081d75f4126fc74e9f081a6bc1a913796f5370befb5a21c7626668bd430b8671c4732ddfbf319e6a2ef8df8e15f4ef213a1
+DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e WHIRLPOOL 22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119
 EBUILD nfs-utils-1.1.4-r1.ebuild 3167 SHA256 c0f3eedc4f31424c7788e55f504980bb530464d1bed49ed0cc0e431eef633403 SHA512 2173b772ffba0f6ffc361e846ed58a78247eedf1b7beb2b87a37fe71c654d65681e666d32e73f3ed767f9a421e65c228b9242022c02cde7aa7a31383469b88d4 WHIRLPOOL 300ceb5299d93ae8539c6e154dba43da535c39b6318f4979b635c1d0d25c9fba8761f8ea25988e793a2bd23613e2a4e2b24182291e92530aa2120a50b0f8b3e7
 EBUILD nfs-utils-1.1.5.ebuild 3098 SHA256 35a23dde75f23c921c1731f4bce5bfd6a9ab4aa66416e73864b7c8909e89a964 SHA512 f25708af1eb291a2d4df9ac795c396a9d3b0e844d9478f23567e0d90cbd33414d9a3d250135c801536ce6ed4f4de2d364a7f90d70ee7d1daab2a248f304c88ad WHIRLPOOL b9fb0cfb27a52cb71eb95e4c266e8077b0fabfcbafcb3d5a891c5350f04d604bfa2a6314179f07755eb28c1a24ff23f84e64ac8cc34e79e42169b774407950cc
 EBUILD nfs-utils-1.1.6-r1.ebuild 3212 SHA256 02ecf4976fd1e54ff1440a8e7b6eb2333b7e4ff2392f082c34b5b41c493f809c SHA512 df5022cdb232cfa672495d4185ce4a669ba4133e4077f5e412a0f44abd83fac2fb2a52c0fbf78e5004de1fc4c65dbbf10f6cff2f38778bf3b70cb561f2b67e42 WHIRLPOOL 7eb6753f41c8972d83330f12aa0c24bc0a46d8167912e9d698926945294c1f87ef56b25ec35017ec2057d5ebdfdb53c380141c80dc6f0323069a729ae18dff36
@@ -61,22 +62,17 @@ EBUILD nfs-utils-1.2.6.ebuild 3864 SHA256 b9b8d50f103d596ff47718cb96c9bed767f3a5
 EBUILD nfs-utils-1.2.7-r1.ebuild 4003 SHA256 ff8a9558d742e79f4ac66dd3f1e0a16d0923907aa0826fc8a622ca398dc2efc8 SHA512 fbbdf8996d77e77bfc12d9a6fca8fcdc1c8f30d0725c569eacf30b81314b7c6ff3884d79aa50706095afa7df8d5bcbe1b1b7819bcf2c9e246ef126b5d67b8c28 WHIRLPOOL d1555de998065361ea921ddf7377c6e01475cca1abbbab2f47b84f9dbaf23ade20a5fff2505ab1ba85697a2528f7dd9353c10b79b43c57f72532bd01c1cef700
 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
-MISC ChangeLog 35932 SHA256 d69fa18f72930323cdb5e39a72517f6096dcf789e0e332dd49b80bbc72093c64 SHA512 574f87e88af99a0713b0c44efee0b81ad0f98466272dbbb292188bd2fae187689cbda7e129fe6ea2e5b37181b8fe35c266b1d2890045e6ec41f6492a58f2ad2b WHIRLPOOL ec53a4faddb548860cdcae52a0f20844dbd945f83bed72680ef303ee1a866a20dd1af917d0953ce80f88e3536e1396bafba6f695cac96429cdd164a2c2a6eddd
-MISC metadata.xml 668 SHA256 d9ecc29c31ebf779ec222513db190cc0e9d0737f806aea26913d097b09bbfa47 SHA512 2b269153829d1d8df6e97871814479af8fbe18a48cf0b6a33947212264875a4002feda4163b465b4a67e253e5f27e47badc53d414ebb9f3281253f813fa1dacd WHIRLPOOL a53c14f8e6f7cce4f75a7fda60d8b9f96a57eb3a877470906fa1c40befcd9791411934e7ab610ce612f6d42d4d953e0a2a78ffc9e21e9b98328a395c4de7daa8
+EBUILD nfs-utils-1.2.9.ebuild 4039 SHA256 efa47b93e131b0880986afc75a467828566035322da48f2b94ab1e814a026420 SHA512 875db60f26fc2d4de880a7be2af821dc8bed2b7885f03281131dbf3660ed37e5c2d77dc1ad75f7fc642242011300c2335282a48106d7cf065b8f48d51a766bef WHIRLPOOL 1de695ca7772418d515e3b7fbc6e13d8e038895f2aa921f1a407b1308512f388f2278a7199b47da3eb779aa5e83b1232e8bcf8ebfb5a07dd096de8d3e1fbc2d2
+MISC ChangeLog 36130 SHA256 dcce1c9a1fb6fdacf9094757aab80ba518948e58a24e193487bc9feafd5e36e4 SHA512 49410e747b917d16cb6a9eb56b4c5c727e1d5c53973f3384aaa1b2bd640cb4938851721dc0e00bf7612168bbb2eedbb51f2ae0f98da7ec06cf9ae2c3b737cfbf WHIRLPOOL f345c23a2dc806d0639ac3fc9215d785c9187dd28dc376f9155a429b361aa5cceea1459584a5b9563a4b599386e071e970fd62063746d545fdbf521c13682286
+MISC metadata.xml 728 SHA256 654292a2a5f9be2660c579f750c31cb7d2c77de85fb305876c466a672486fbc0 SHA512 289e3ba39ed190f9a8fa5641ab3845503a982e252ea2ff40ce48bcddc66381883e0ffa334446372d0f4e3d97cdbaf5df548db48bc58c6f29479591f659004fa0 WHIRLPOOL f1de0a51ed05327d86442a2503b3a8f7507edde56b1930c7fbae402cdec184122e5047b97f5258af4bb44b32cf9e934a356a32f32e51a76b16614f62dd757c8f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSQxvqAAoJELp701BxlEWfZKIP/16L39Ab3wxp0fojelZLFxIW
-tsoB5b9KniWag4PiPQDqArk2gllBUUJ43fNDnA5LfRQhVaK1iym+QwkyUIadPQQd
-B0Zn5a4mlLWdcaDwkJkihJqKWaofUM4UsVMqtDTHlrVJf8rGP4FymbRrLZcS6iLA
-thK3CgEWgp37aK+mjMIA3rduPvP3hrpuE8CST9+hITgTesHugzXBK4s1Njsii647
-y5w4cxxfNGBDOKgF1PEZta5G789niWAqHZifwRx9FlnIjYoxYPibgGpPE/M66Q6o
-r0Z6zA7sD8YNMPpNNZ+djmEsK6HajExN31vB+EcD3e3f9spMT58umKtLESDGrONC
-n7hWDTdojHxqAfV5tMm7LC5KKSaSZNIkj94IJuoAh3RldSxsVUkmjEkE4Vt/EpF+
-wbcX/1dvJjlOdNNPBb3fp2Gnb7EwSgPQR61SuzcppObXJDjrxSbC2kXcjYqA9P+r
-Xp0cPUAU0HbFSZ/sKkjaebLhCKXgus1UREGOcBfbJkIc8dN7NpycNFB4t6P6o5BY
-t+OD5CiA6zpRbcQV38i2FqgX2u5UchLq7SxFRCkhLBwUYtRZawoQ67FwnhMkkN11
-ds+dFFdSms/Mt3Z9/TLxZen3i4sNcodT4V27UC22HIL6ZQqfjyo2kihSmTLwm8PZ
-89AdBxWz1SVzmdu4Heo3
-=nMEp
+iQEcBAEBCAAGBQJSe0ZDAAoJEEqz6FtPBkyjzssH/Rvdfc24AMVWXnnK224NZZ1V
+u70q9sJuDBgcRZC6itJujkaC/h1cf9tkpSm3soK1LxG3cuR+lTl91CMKAegVL0tC
+zo/kBqjxzZle9WSNQyVuO2NdpHvpi8KhEBd8MDlPJdE/ZT1tV97kcRrkn7tkFfC2
+pkM/5G2S4LLBfwVN6lf0OfuLcHJhDKQI/czg/rx8uiQdUCkPWA2UUWgUNLAPbFbF
+ONxyIciO0OztsY/9cUDTDwJh9elXFLIDCY//9XnShcpsuC/zDel/uczJ2zlBIEpJ
+ECvClc9dW+5iF9r+VU4b88Exl7wsjcoOnSe7tlMww43GD2YvsP0s31w6dkMa1Hk=
+=Mqv4
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml
index e1edd02fed0b..715d2d63e001 100644
--- a/net-fs/nfs-utils/metadata.xml
+++ b/net-fs/nfs-utils/metadata.xml
@@ -4,6 +4,7 @@
 <herd>net-fs</herd>
 	<longdescription>NFS client and server daemons</longdescription>
 	<use>
+		<flag name='libmount'>Link mount.nfs with libmount</flag>
 		<flag name='nfsdcld'>Enable nfsdcld NFSv4 clientid tracking daemon</flag>
 		<flag name='nfsidmap'>Enable support for newer nfsidmap helper</flag>
 		<flag name='nfsv3'>Enable support for NFSv3</flag>
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild
new file mode 100644
index 000000000000..fa97e9db09e2
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.2.9.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.ebuild,v 1.1 2013/11/07 07:50:22 radhermit 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_dounit "${FILESDIR}"/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
+}