Drop gssglue support as libtirpc itself no longer supports it #493912 by Torsten Kaiser.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 168 insertions, 5 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 49a3ddfd8c5e..84141342709b 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.241 2014/02/01 19:01:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.242 2014/02/02 08:12:00 vapier Exp $
+
+*nfs-utils-1.2.9-r3 (02 Feb 2014)
+
+  02 Feb 2014; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.2.9-r3.ebuild:
+  Drop gssglue support as libtirpc itself no longer supports it #493912 by
+  Torsten Kaiser.
 
 *nfs-utils-1.2.9-r2 (01 Feb 2014)
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 19ade77a49c4..8e506ff5e03a 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -74,13 +74,24 @@ EBUILD nfs-utils-1.2.8-r1.ebuild 4027 SHA256 19055b182c8bca25dc47efd2516ef11a623
 EBUILD nfs-utils-1.2.8-r2.ebuild 4095 SHA256 76fcc1ef5d657251f8b348938ac224c2a6b9a9efe797ccda8246c772fe51cb77 SHA512 32f7b226591017489302766483a7675f503d9c8990cdcedd8c4d4447fdb069e9b235de053f93d42bd1eb588faf640beea8c9691a8fe68cd9379f887c8b9f0d6e WHIRLPOOL 20bcb1ed15f50ae06244e640550fbce704c4e9734406e532be9f639b25b2664ee046bc855b004efac0b5aa0abd4a5738d48cf88c88d268b7497edcd838a06dc1
 EBUILD nfs-utils-1.2.9-r1.ebuild 4068 SHA256 41d9d9f2580dc1554afecb787f657036800e049e2d260db6a8db3990c732a4f5 SHA512 1cf2fa93feb2c50347c0facb332792c1d10199eed38a133218c174fd9f4af371b2c2844677826bd17e3358674f223371c60c558ab06e526f290dfa37ea63b55c WHIRLPOOL bc33f1fb0b4052ea4a5611ef6eb56de0b1e9dec8ee66ef98dad3a7a7b3792a03106d87717936d68027c4ce03a439129a62486bfc3d81e8253c53e3e0cce226da
 EBUILD nfs-utils-1.2.9-r2.ebuild 4367 SHA256 eac06d8f714370e8b5f7be317bc7eb9f2fc4394dbb0631e4e7ed010ad5e929e8 SHA512 e4cfc841eec2e993deb1c352eb306eb96e9e6aab5d9d4c7ca2b01c16cb2c467813a6cde2999f1e81eeaa55199e1901cd07d36b185b44c944f6640e74b7da543f WHIRLPOOL 62cca1460fb134eff41a9b882bc752ca3522c86d5e1b2b2a1c131e5ae5855caf159843ce3015b2176b387b35a8cc53a73f4236482795f694af87cdfd9d432016
+EBUILD nfs-utils-1.2.9-r3.ebuild 4306 SHA256 ddc676f4c04a9ba3402135603fca7a99beabbe7f8ed4dcda8bbd0d79c9728cd1 SHA512 98f8e0306996936f820470230b0e41005a4e78e21675ad40e2e9419c61ccb523f6ab6aae185129c6204180278faf6d19bde55978d03c1837f5b54f1676071134 WHIRLPOOL 1609c9bdb16c11369eb0fcf93d8d8625a59f53cd4e5cabb8d8d311d2e79c0c8c0e179e7a38685d53adae6baa724e154b2e82a03b9d9fd0d6822b29c817adf887
 EBUILD nfs-utils-1.2.9.ebuild 4029 SHA256 0739c6faff846ab605635750fcb1a3ebdf24271833fa572a76217e8b7d79189b SHA512 3cca8936433fdfb0b2aa7cf23b0e92daeef1e094a3f9192e8bd61e6f92dbdf7c6544670828ae707a146044dd828074eac704fb58989e4f9a3b879f876502ab94 WHIRLPOOL 212d9f84f923b234e84238d7b0b9ddc1f6fa8f2f5c7cd47fe512e8173e603dd0a2dfa0e4a6dd8884c2026162cf1130fcfe07abbd53a9e12d24a92bd576f3c546
-MISC ChangeLog 37976 SHA256 1335084663c9ed251b9d110f622cc49f5e6bbfd3372bc2ef689776de44befe15 SHA512 697e366c4cc016892acaec205f0acce5dd4ce44cab79159efee0ef9dce54741a1942b303424d54b8921e1f98eb9d9ade37466476e8bd5516c44d6935955866c6 WHIRLPOOL 15fbfc3379f1c7b587b418be593a5b760c0af1056e9035df6edaaa142a57ae799ad596e0bb14164669fa9c61d34f63068ab65e9d873ac030600028c91fbc3788
+MISC ChangeLog 38184 SHA256 7da5756e8ba91de06df93bcb6ef19795f0b28ecdcfea75cb5a27ee6412859d44 SHA512 52acb2f074132a33cad44e2907ad85524a14ebf49c292fa1bc22247fdefb1f832301a6a236aacff628da118b6b37db200c4aa07d786f641249d16ca5611cdb1e WHIRLPOOL 0b290f0d95dda509cbe6743835088e5b93f29103051378f5b6dff3f812ae6668a7f8645723f7fa60e0fe15b78cf734193874995f1d6d0e89a9b8741462175394
 MISC metadata.xml 728 SHA256 654292a2a5f9be2660c579f750c31cb7d2c77de85fb305876c466a672486fbc0 SHA512 289e3ba39ed190f9a8fa5641ab3845503a982e252ea2ff40ce48bcddc66381883e0ffa334446372d0f4e3d97cdbaf5df548db48bc58c6f29479591f659004fa0 WHIRLPOOL f1de0a51ed05327d86442a2503b3a8f7507edde56b1930c7fbae402cdec184122e5047b97f5258af4bb44b32cf9e934a356a32f32e51a76b16614f62dd757c8f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLtRJIACgkQCaWpQKGI+9TdVACfXAEw6QjXxpinwx/S9RMs7W+w
-hCYAn2BXLtaTCF9/cqsWqPAO+CeOyUSZ
-=ssJQ
+iQIcBAEBCAAGBQJS7f3SAAoJEPGu1DbS6WIAqKsP/jBauAnM6oPCdQnVq4cp5nmd
+dHLXfnJAzVFWgg0ZoRZ5r86UIt5f1NwvuB8WrePfPepOLHd/rqGjy0y+ndsQnstW
+Q5rqaKgURJQ2XZ9r8V7HxwDXPEx2+zQBrUbmt/p0i47CvhGeRlX9vf6X4QWiBONv
+dM98uMw1WnTjyfaJXi+uOl8bvNUz6Uh//D/WdlazDdgt4Xv0KIEcZ5mxKfyvdINc
+BvIh6WuPElol9brYhbeS/sTWy53eyaNBPB1pDhYMcw+CC+bYo8LHvy4b8gwQCmKj
+0exMHQd2U6OAofipG6XwhsOwQ+E7uOkwWDnhYq6gnsA3e2V4umQndibcOfRpgpTV
+FtV1sDD/r9FMRz4movqgYWXR6Rt1d6Rpn+NtLk3dyJ/yHIMhOZBS9uu9Hl8nmsnN
+QrIaHDvUlmgnT+d15DJ/im2OhYtU3sQwefjJ+2vWW7aVFhqxRg5SMouAzxQhY/qw
+H1vah1w5Tzapny0A2bk7qe/cObjAjVHCJHZ8u+u3IanwT/X7lpTswFm5kNssHwpG
+TEKWVBO6y7jLVszAF5y5njBux9WgJrgr9jiHlCbv52U8ykXJPIZDaovSUIJh4Age
+9aToRRbEx9rLNbVVsssRH2fHn957FfPgnbkZvH6+eiX4OKBDaO8qXXPaQNyfvqaj
+XCoTh8aIGXzCM8zUqkZI
+=N+Vd
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild
new file mode 100644
index 000000000000..300cf42240e0
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2014 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-r3.ebuild,v 1.1 2014/02/02 08:12:00 vapier 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+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/libtirpc-0.2.4-r1[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) \
+		$(use_enable kerberos gss) \
+		--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_dotmpfilesd "${FILESDIR}"/nfs-utils.conf
+	systemd_newunit "${FILESDIR}"/nfsd.service-r1 nfsd.service
+	systemd_newunit "${FILESDIR}"/rpc-statd.service-r2 rpc-statd.service
+	systemd_newunit "${FILESDIR}"/rpc-mountd.service-r1 rpc-mountd.service
+	systemd_dounit "${FILESDIR}"/rpc-idmapd.service
+	systemd_dounit "${FILESDIR}"/{proc-fs-nfsd,var-lib-nfs-rpc_pipefs}.mount
+	use nfsv4 && use kerberos && systemd_dounit "${FILESDIR}"/rpc-{gssd,svcgssd}.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
+}