Version bump.

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

3 files changed, 190 insertions, 15 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 3418dccf8370..66fdc73ffe60 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.266 2015/01/19 15:06:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.267 2015/01/31 08:03:17 radhermit Exp $
+
+*nfs-utils-1.3.2 (31 Jan 2015)
+
+  31 Jan 2015; Tim Harder <radhermit@gentoo.org> +nfs-utils-1.3.2.ebuild:
+  Version bump.
 
   19 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
   nfs-utils-1.3.1-r1.ebuild:
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 95fd29ed2095..929b752003b8 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -28,25 +28,21 @@ AUX var-lib-nfs-rpc_pipefs.mount 111 SHA256 59e05e4e6d6af92d5fafaf2d6b8e87670bcd
 DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e WHIRLPOOL 22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119
 DIST nfs-utils-1.3.0.tar.bz2 780749 SHA256 25f1c974018c944347d74eebe89643e1004c822a6145153136b192d1acfaf60d SHA512 9cb9efa26d2b1bd6ae3e0c516ac50b17b4c7993366ae36c7786da734dc8ea4dd7a05f0d6fabb6fba6df36ead8642341a095f1972cb46b400840705356d410a6a WHIRLPOOL c4e6f7aecaa94808a2827297ce0ed8f1b97d88171d37a201a6a217ee2c69e8cf172ac751939fb95ea6c8022a344e04921ee45c6f46dd16057cc679caf8563882
 DIST nfs-utils-1.3.1.tar.bz2 785800 SHA256 748c4afbdfd3e92017fe579f1dd3280a10db1306c43228f83cd6b55f0d95aed3 SHA512 304e718aaee1df4decb0711c58c814ac773d55277baca01fd74d275969b9a1cee4bf0c0c20ba3ed72a112bd92b4744d45179f29a2a69a7fc2ca2590762a671c9 WHIRLPOOL 6fe5e9957c4a2775871ede47d1020f1a642e9242501ff3d21b74c4772ae8dfcafba27334e5844a06f9cc3e0fd286d1f90573511c2b198e330cb46c06cdbfc592
+DIST nfs-utils-1.3.2.tar.bz2 789540 SHA256 5b9c72eef260b86a84619771e11bb013b99431e6b7ff0bbdc03fee90dba591f7 SHA512 65633db58bbc5b6bff6acab412dc085affc61e0a6e0aef72d630e67d05a8d08012dced81178a4c7af65c967c25b48161f8d887d261fdf5ce505b719dbdab757c WHIRLPOOL eee615f032987aee71adf04a3ad5f5b8f79dc4487f1be1a7fb87c42918a12ef9397ba990b02d4adb02265706df9f1e3ef409c141491759c65b8037693b9b06c9
 EBUILD nfs-utils-1.2.9-r3.ebuild 4446 SHA256 bfdf40524e42edb4714b33e7edc21c77a316fed63616c2ba21eecb7f9b0aa40e SHA512 8770ccf5cac0348f0513413691c211c88731e964c85dd50eab18b5c0bd9e1196b77213351b0ce01939242c61cde4d4c04bfa79ecfbf1a399afed24bd6dfb4349 WHIRLPOOL 66f9068cbdaaf9998049c99854174cc37bee1e40fdc2a4c9f83761662e4a1997e5a00a15ba654b4a1077364c4561ad6d8855213452113e18533506ca32f64a3f
 EBUILD nfs-utils-1.3.0-r1.ebuild 4849 SHA256 1793141abbe923bfbf6077d90b5da3ac84347c0eed82209f3f71c133b67423e0 SHA512 486e1e0eb287755606ce47595eb2d427f0d24f40abdb5723cd55404e7de6b11fc74c8e7592bd76afd068cb9a0339b4cc9fefec1a8b17b0b30e7fd5bc3654876c WHIRLPOOL 418b1a3d5372198008f94874becc2e92ee4d19d2226e4c94f011cead89acbfe274d4cb71340bcd9006d8116ee86400ea69f2aae1f3e9e6d6dc1283690ca860bf
 EBUILD nfs-utils-1.3.1-r1.ebuild 5031 SHA256 98f9598d85a9689ac15ea8a422ee3f58d747b664388c2abbb80ad10c303794c7 SHA512 a590b2934e214461aacf15087f424e3208ad88ffb6f513a08bf0746f7f41ebbfbd16a91f4166197ede426562bc93ab72c2050c96ab84f2b120d4065daad98634 WHIRLPOOL 72cdc0168b4a9fba3a856e2a98e579e84647d031882e4e452c245b80221f010c0b3c9fbf08675c9701539ed1b7420edad0ed081cc3a1fd215b627c2ecd62f8e6
-MISC ChangeLog 43133 SHA256 42744fb0de749ea260d4720e48df54eaac23e648a611af384c3f900fb01aeb59 SHA512 94aafd25b7920d6a0d8a6c59ac2d3db6c86c4a0806eb410ed24b06a4a5331ab2148fdefbc3f9c1494cd8172a6efc4b9f23e0b9a34ad5c32bf5b75fba3a5c636a WHIRLPOOL cbec6d6a5e45dac6b42e2c233c33bc10c6d0e32a9f600274d61f117866b6d8d84b551903a0ec0dd3d6c4d88f49bac260af00ff205c42744d4810510d91af5598
+EBUILD nfs-utils-1.3.2.ebuild 5117 SHA256 919a39efa01d92335b16b1d8f3bdd72d203409e87e2ad11dab4837b8090f2522 SHA512 d94d3fd798df9b134360898b90c99b37381ab7602e1d7bb0b81fdf2f38636086976735587ba1b0a03f640fd5eb10f132e812b4da0c3b02a9d6d69e197588899b WHIRLPOOL 55d8be5dab5106e14d188c45218ce503995a8f023b2e2f9f50bc63a969f9a9316197dd8708a06f6ac51bf34139fa6612dd980e1a20b3cf4d46ad0dc85eac4af7
+MISC ChangeLog 43257 SHA256 a578bde8f8fb59d668c658db6e330af563d0c76a7a787b0eded51913d540425d SHA512 bf79a156ed36c622fb924eb05533872c3c3b98b846bf8a52089cfa860f3d374d68ffca8d55682baf008a1b7e13ae78296e5f2890fb6c0e1d89f7c64484eda1fd WHIRLPOOL 1d50ad81179d6dccdaca3408f8e4f0121a0ece30b3b0b6c08aec78456f7dd5f1ccad449cb98bbd1e323b1696cac94016542462dda0a5c0bdaae86bd716178661
 MISC metadata.xml 636 SHA256 ff4402edfb8a218effdadb00641459f21335e52d055a0f12d084934f3d1b76cd SHA512 090c74991f655df4c08fd062993a15ea9ce4721622d55325539d415e7b89e0920cd9ac6d5cc29a57e56e68998f03384386751bbd56c999897d1c84d4983ae2cb WHIRLPOOL 5f2e62843e843c615c5b0621740d55bcf37453399ca9727f1b70ce53f899157bece44801320558cf769ac4388617f03f65a0bb6167ac07f47561bbb002d40bc9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUvR4EAAoJEJOE+m71LUu6ETwP/AhxG+wSdy3jzS7msX1c2Wr3
-l/EE/fh1iSCcTMCUNTmJ1VedQ7QDXn+YqEV3J3GNGy7KfR6BbUMAT/+N0XtLPysN
-dru8Ss7nXUuzoc+gVrKRNBEf6Kkj6uOe6Ferr07kuvWnJobfZDk0j6Im4pJkN18S
-MuHw/iK0FWQadcBM5YGuGyX9sBZoYxtaNswro69uPVopXCx8GD5UL87AfVLUAvSa
-yCA5J/IdBCGqkOsBQ9GUCGFIl8ORHNyAb/0fCgncKuy9DxOaJwPVZJzc0k5BLxuc
-7h4fs13+pKr1wHJRaMzF9QqJdE+OS9Sx81k3UhovCTMqkzrZBVY9Wi+ULDCoZOoo
-42yPzI+DElKqH3TNRhf4Vqz39oubU6WHl8XtXC4Dgne8n22ZotpwAnQsw2mocueQ
-4DBEEl0SiztlqrGyfwb3Dsb0tTZ2ZEAR6Q2S1NkkCp3ELs2CbtqBAFThvX7C++pF
-dH4rkFNKRPyM2/vl5g4toHjzktTAkK1vHTZdc1t0RJzNsWUoYUA+WWeoqBzUpsfQ
-ciL5kyQ6k100VH8osrJa02S9b7GMmGrJ/LHd/cYdXPPFX8xD0UPpSCPXLjKlmlLn
-1bRtin3WGDEEivUUwjm+l0ZgMA+LSrxlS1N7PpEPZsurpawg2qunfgH7mB4IqHTd
-hpOPNzrzu2rmjzHCpH3b
-=FFNi
+iQEcBAEBCAAGBQJUzIxQAAoJEEqz6FtPBkyjkwcIAIB0lRwHPHNHBTC0jsxmH9Mv
+Zy41MnaYXB6GMDP3pXH4bMyKrGSRr94camDzOdCkJ4u2T3pdA9OWT6fQxyrLwzGl
+ZHk59Zg16tc8yz2OCKpN4UYh6cj6aR9iTgbUQ6f5AQ1SEetwW7xTdEvvyCuKkvEq
+yk+LtoojML/6nzMXUl1+KHXoS0TDQ+RALetPQ4nYbK8ySWVaUZT7/BqvEd0HM7Xb
+BJgQ3SXjdUKWTu7zpHnU9QEU4kIblSmgS4wJrXkIa6kra1RaUXm9CWm5vnAOJODA
+Q6HeACNQV51sv1guwZLaZVTO771/w9YbEN98pEZugqzkl9e61/wP+1qyGDA9l50=
+=OKo1
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/nfs-utils-1.3.2.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.2.ebuild
new file mode 100644
index 000000000000..86f256fa6c68
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.3.2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 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.3.2.ebuild,v 1.1 2015/01/31 08:03:17 radhermit Exp $
+
+EAPI="5"
+
+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-2.1
+		>=net-libs/libnfsidmap-0.21-r1
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+		nfsidmap? (
+			>=net-libs/libnfsidmap-0.24
+			>=sys-apps/keyutils-1.5.9
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	uuid? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND_COMMON}
+	!net-nds/portmap
+	!<sys-apps/openrc-0.13.4
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+"
+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
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+	econf \
+		--with-statedir="${EPREFIX}"/var/lib/nfs \
+		--enable-tirpc \
+		--with-tirpcinclude="${EPREFIX}"/usr/include/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
+	keepdir /etc/exports.d
+
+	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 nfsclient rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	for f in nfs nfsclient ; 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 systemd/*.{mount,service,target}
+	if ! use nfsv4 || ! use kerberos ; then
+		rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
+	fi
+	if ! use nfsv41 ; then
+		rm "${D}$(systemd_get_unitdir)"/nfs-blkmap.* || die
+	fi
+	rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die
+	sed -i -r \
+		-e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
+		-e '/^(After|Wants)=nfs-config.service$/d' \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+		"${D}$(systemd_get_unitdir)"/* || die
+}
+
+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 "${EROOT}"/var/lib/nfs #368505
+	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
+	done
+
+	if systemd_is_booted; then
+		if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
+			ewarn "We have switched to upstream systemd unit files. Since"
+			ewarn "they got renamed, you should probably enable the new ones."
+			ewarn "You can run 'equery files nfs-utils | grep systemd'"
+			ewarn "to know what services you need to enable now."
+		fi
+	else
+		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
+		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
+		ewarn "same runlevel as nfsmount."
+	fi
+}