Version bump.

Package-Manager: portage-2.1.1_pre2-r8

6 files changed, 142 insertions, 25 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 05a86d0bcd8e..3a8d38efb42b 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.74 2006/06/10 19:14:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.75 2006/07/16 08:04:52 vapier Exp $
+
+*nfs-utils-1.0.9 (16 Jul 2006)
+
+  16 Jul 2006; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.0.9.ebuild:
+  Version bump.
 
 *nfs-utils-1.0.8 (10 Jun 2006)
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index cca5b97d6817..6a9628cac91c 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -41,10 +41,10 @@ AUX nfsmount 1131 RMD160 f67431f36e702c50c67ff799d96c8bd37fbe847f SHA1 c88b592db
 MD5 2af8106db3fdcb3d5ddf22ea5fffb105 files/nfsmount 1131
 RMD160 f67431f36e702c50c67ff799d96c8bd37fbe847f files/nfsmount 1131
 SHA256 8c1b12047327d707743bc579151ff7e3800696cc46cfcaea1c58a93fbc11f9e7 files/nfsmount 1131
-DIST nfs-utils-1.0.6.tar.gz 265964
-DIST nfs-utils-1.0.7.tar.gz 398577
-DIST nfs-utils-1.0.8-CITI_NFS4_ALL-2.dif 36171 RMD160 7b8fc4905326b2affdf20305ec407be69bfdd8f5 SHA1 044255ff0b02a0924d86b31a0a144f44015f66c5 SHA256 d27507189f7641a1a67dac808288cf9560c067380fe2d7f441211ed9e208ba17
-DIST nfs-utils-1.0.8.tar.gz 732829 RMD160 2650814ca04dd4447855e4055243d0c66588e8aa SHA1 db21bf211150f84b462113b81e4d727afcaa6543 SHA256 b7e2304167b2c1bdcd0cad7ee005c7030556897ec8bd8c13fcdcc3365c0cd1a0
+DIST nfs-utils-1.0.6.tar.gz 265964 RMD160 e879f72a7319320a0810e792a2a8fe90d0201144 SHA1 8aed100e71aeeaaced074b05b321e574444730a4 SHA256 aa99fcb016971290f9a871331eed60150ebdd84785dda1b252556a54760b97bf
+DIST nfs-utils-1.0.7.tar.gz 398577 RMD160 ee01e8a4a9d99018a6e318a74364d1f9b835a93b SHA1 a5d4e70c2ece4c71be07f36184b935050f26396a SHA256 14b63a6006f9385dd9fe2ed302865fa9ff152853750aabed445a1475640f17ee
+DIST nfs-utils-1.0.9-CITI_NFS4_ALL-1.dif 42249 RMD160 6524766fe4248cc466cb3180c23569cdcb071f4e SHA1 eac2f17113f416f0390bf39019989f334409812f SHA256 0042c29ee2ab9795400f8324d2a97f830698ed3e6eebd3ad08c47bb1934569f0
+DIST nfs-utils-1.0.9.tar.gz 780431 RMD160 26db73aecf8307a3f6d10a3e331a757747f8182a SHA1 6e288b169c4086c000197caeff2de8fac84fca3d SHA256 55eaf5b4e7799ee7bfae2ea47270a264bc7cc0a4955424e3356916816f19e800
 EBUILD nfs-utils-1.0.6-r6.ebuild 2923 RMD160 91d0907cfdf42ba33a5d869960d44d335c6db846 SHA1 8baa121572769f11ea83fce8ad9c597ca1f9e914 SHA256 67f8ae21a2b2fd81b18ed552a3ba173ee3524020432db068a2dd020407176240
 MD5 9ff9d72b0fb667d05d3d3ae955bf8f55 nfs-utils-1.0.6-r6.ebuild 2923
 RMD160 91d0907cfdf42ba33a5d869960d44d335c6db846 nfs-utils-1.0.6-r6.ebuild 2923
@@ -53,31 +53,31 @@ EBUILD nfs-utils-1.0.7-r2.ebuild 3395 RMD160 b33824d81fef08c0976cb7694370128ca98
 MD5 01f2e46602cfc6d42ca139775b561c02 nfs-utils-1.0.7-r2.ebuild 3395
 RMD160 b33824d81fef08c0976cb7694370128ca986bd9d nfs-utils-1.0.7-r2.ebuild 3395
 SHA256 68db78e66897bc7e02b80f6d1631b8b38e356c582f58f2f4268fde15388d119f nfs-utils-1.0.7-r2.ebuild 3395
-EBUILD nfs-utils-1.0.8.ebuild 2939 RMD160 2deba74676bd2f345edaf351a7c4f3447116f062 SHA1 d88e9dee6ba471eef32975a1f8493cc4e287c327 SHA256 e71afc8301c36d06d68f6e0d561338a40ee9ae84a675d56e0854ac02237564c7
-MD5 6bbd56a0159b2b1f7dd1ac9b91acd145 nfs-utils-1.0.8.ebuild 2939
-RMD160 2deba74676bd2f345edaf351a7c4f3447116f062 nfs-utils-1.0.8.ebuild 2939
-SHA256 e71afc8301c36d06d68f6e0d561338a40ee9ae84a675d56e0854ac02237564c7 nfs-utils-1.0.8.ebuild 2939
-MISC ChangeLog 11089 RMD160 b0606b36f4fa2fb5778840d80f42870a9e2fed57 SHA1 a9d22655ecf2b85d198657652fd493daec1f5a8b SHA256 587adccd411275289385d2953c5e4a1903eda995c25aa1e678fd1e2038d1f77b
-MD5 e769d09d98a65b9e7c1ee80f327338aa ChangeLog 11089
-RMD160 b0606b36f4fa2fb5778840d80f42870a9e2fed57 ChangeLog 11089
-SHA256 587adccd411275289385d2953c5e4a1903eda995c25aa1e678fd1e2038d1f77b ChangeLog 11089
+EBUILD nfs-utils-1.0.9.ebuild 2938 RMD160 80104defa92e55f63c59d0a4ada484bbefdbc334 SHA1 6e647b232cfb8483657b10316720a4bf028a32f3 SHA256 e39a66c3bcd565fcbd8185fa7a65b9e006a54fa68c7c6e901cb27255c3089cab
+MD5 87d3da2ae65723f21d9082c2730a4715 nfs-utils-1.0.9.ebuild 2938
+RMD160 80104defa92e55f63c59d0a4ada484bbefdbc334 nfs-utils-1.0.9.ebuild 2938
+SHA256 e39a66c3bcd565fcbd8185fa7a65b9e006a54fa68c7c6e901cb27255c3089cab nfs-utils-1.0.9.ebuild 2938
+MISC ChangeLog 11213 RMD160 e7214672cff385272caaff5795845cfa159670f6 SHA1 681c377a0832e67bbd7c70e336241b0d0f9bf065 SHA256 b90a3e9692c0e462178f8e5bf772a69bff48974d9d09aa4e578a2a026394fdf8
+MD5 5731fea4ea789a16d269207710d457f3 ChangeLog 11213
+RMD160 e7214672cff385272caaff5795845cfa159670f6 ChangeLog 11213
+SHA256 b90a3e9692c0e462178f8e5bf772a69bff48974d9d09aa4e578a2a026394fdf8 ChangeLog 11213
 MISC metadata.xml 225 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a SHA1 02c4f79d48d465ad7bca76f706d0f7cb7dd039df SHA256 42f511d0cc6e82e29b011c686ba8bb7965f4d92eb6e47ba3e63d4c7edfe9883a
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a metadata.xml 225
 SHA256 42f511d0cc6e82e29b011c686ba8bb7965f4d92eb6e47ba3e63d4c7edfe9883a metadata.xml 225
-MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r6 67
-RMD160 813c5ac91e1e991aa5f5b7396051e66ceadb76a3 files/digest-nfs-utils-1.0.6-r6 67
-SHA256 1352c2a3716deea0bfbbdfcc1e498379611fe929bf0d842d11f5b31c7b399a9a files/digest-nfs-utils-1.0.6-r6 67
-MD5 46e91b0dea9cbbfedcdccc9386b6326d files/digest-nfs-utils-1.0.7-r2 67
-RMD160 6b6ef3960cee9f3504e52e84d34d05bbd2f4d90e files/digest-nfs-utils-1.0.7-r2 67
-SHA256 fb7a810340d1b8f7a0998fe8b3ea7ffb327d5039a27e76b33e3f3fbf2dd10ef8 files/digest-nfs-utils-1.0.7-r2 67
-MD5 10b5ba641b8f196dfa4daf18bd65831d files/digest-nfs-utils-1.0.8 530
-RMD160 2bc404c2664969ab91ee305873cb7a3663805af1 files/digest-nfs-utils-1.0.8 530
-SHA256 108102572f4dbecddc47014832dce4f7769adadfe23e48f421c50075b2bc369e files/digest-nfs-utils-1.0.8 530
+MD5 95a4b11413b1dc6075035f3866bb6905 files/digest-nfs-utils-1.0.6-r6 247
+RMD160 f158affede021931bb0c52a8fd87e257db93585a files/digest-nfs-utils-1.0.6-r6 247
+SHA256 9cd40166a6bfcf14d67d43980595fc0e2c60c44533c253a64241b250bc3ea730 files/digest-nfs-utils-1.0.6-r6 247
+MD5 f2fe82c00325eb2e464f1e4853c0b3ea files/digest-nfs-utils-1.0.7-r2 247
+RMD160 9e7048e0ebcf5f54683063a7ede59c97916c74d1 files/digest-nfs-utils-1.0.7-r2 247
+SHA256 9d807f4b615b487743d5033700a4099eb0bf115e35e483d2a22d98723399a93f files/digest-nfs-utils-1.0.7-r2 247
+MD5 628c669b2f17af1cff539b4a40c8b4dc files/digest-nfs-utils-1.0.9 530
+RMD160 747a6728b8c33481152750c09acfc85615850bdb files/digest-nfs-utils-1.0.9 530
+SHA256 45ce27b77bf35f168dee66b458d6ecd57242510bfb9fedf1a637b9b795dea73f files/digest-nfs-utils-1.0.9 530
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEofjQamhnQswr0vIRAuamAJ4q3RJvOQW+PK/naMVpmK80FUA0igCgsuld
-SxBwlNxyQNqNzX1SqcdnO0M=
-=iPbJ
+iD8DBQFEufNramhnQswr0vIRAmh7AJ4lFkb5NepGz4PXt357SdVMPfPRsgCePozT
+bjWovDNWitB6fiEuIFZDDs8=
+=SE8p
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r6 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r6
index 319c3d94379e..d005fa58e47f 100644
--- a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r6
+++ b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r6
@@ -1 +1,3 @@
 MD5 f17e9983457e1cf61c37f0be4493fce6 nfs-utils-1.0.6.tar.gz 265964
+RMD160 e879f72a7319320a0810e792a2a8fe90d0201144 nfs-utils-1.0.6.tar.gz 265964
+SHA256 aa99fcb016971290f9a871331eed60150ebdd84785dda1b252556a54760b97bf nfs-utils-1.0.6.tar.gz 265964
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7-r2 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7-r2
index 0b0ec24d0c0b..df6015350e97 100644
--- a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7-r2
+++ b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7-r2
@@ -1 +1,3 @@
 MD5 8f863120261cd572ad320a9152581e11 nfs-utils-1.0.7.tar.gz 398577
+RMD160 ee01e8a4a9d99018a6e318a74364d1f9b835a93b nfs-utils-1.0.7.tar.gz 398577
+SHA256 14b63a6006f9385dd9fe2ed302865fa9ff152853750aabed445a1475640f17ee nfs-utils-1.0.7.tar.gz 398577
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.9 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.9
new file mode 100644
index 000000000000..3b2d2d4bcd73
--- /dev/null
+++ b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.9
@@ -0,0 +1,6 @@
+MD5 12f747588becd83fb8a812788c006d2c nfs-utils-1.0.9-CITI_NFS4_ALL-1.dif 42249
+RMD160 6524766fe4248cc466cb3180c23569cdcb071f4e nfs-utils-1.0.9-CITI_NFS4_ALL-1.dif 42249
+SHA256 0042c29ee2ab9795400f8324d2a97f830698ed3e6eebd3ad08c47bb1934569f0 nfs-utils-1.0.9-CITI_NFS4_ALL-1.dif 42249
+MD5 73981058e49b0b4ce2a15e21960529f5 nfs-utils-1.0.9.tar.gz 780431
+RMD160 26db73aecf8307a3f6d10a3e331a757747f8182a nfs-utils-1.0.9.tar.gz 780431
+SHA256 55eaf5b4e7799ee7bfae2ea47270a264bc7cc0a4955424e3356916816f19e800 nfs-utils-1.0.9.tar.gz 780431
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.9.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.9.ebuild
new file mode 100644
index 000000000000..8643aa21b235
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.0.9.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2006 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.0.9.ebuild,v 1.1 2006/07/16 08:04:52 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://nfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nfs/${P}.tar.gz
+	http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/1.0.9-1/nfs-utils-1.0.9-CITI_NFS4_ALL-1.dif"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nonfsv4 tcpd kerberos"
+
+# 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)
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	>=net-nds/portmap-5b-r6
+	!nonfsv4? (
+		>=dev-libs/libevent-1.0b
+		>=net-libs/libnfsidmap-0.16
+	)
+	kerberos? ( app-crypt/mit-krb5 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	epatch "${DISTDIR}"/nfs-utils-1.0.9-CITI_NFS4_ALL-1.dif
+	epatch "${FILESDIR}"/${PN}-1.0.7-man-pages.patch #107991
+}
+
+src_compile() {
+	econf \
+		--mandir=/usr/share/man \
+		--with-statedir=/var/lib/nfs \
+		--disable-rquotad \
+		--enable-nfsv3 \
+		--enable-secure-statd \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable !nonfsv4 nfsv4) \
+		$(use_enable kerberos gss) \
+		|| die "Configure failed"
+
+	emake || die "Failed to compile"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	dodir /usr/lib/nfs
+	keepdir /var/lib/nfs/{sm,sm.bak}
+	mv "${D}"/var/lib/nfs/* "${D}"/usr/lib/nfs
+	keepdir /var/lib/nfs
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${D}"/usr/sbin/rpc.{lockd,statd} "${D}"/sbin/
+
+	dodoc ChangeLog README
+	docinto linux-nfs ; dodoc linux-nfs/*
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	use !nonfsv4 && doins utils/idmapd/idmapd.conf
+	use kerberos && newins support/gssapi/SAMPLE_gssapi_mech.conf
+
+	doinitd "${FILESDIR}"/nfs "${FILESDIR}"/nfsmount
+	newconfd "${FILESDIR}"/nfs.confd nfs
+
+	# uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
+	if ! use elibc_glibc ; then
+		dobin tools/rpcgen/rpcgen || die "rpcgen"
+		newdoc tools/rpcgen/README README.rpcgen
+	fi
+}
+
+pkg_preinst() {
+	if [[ -s ${ROOT}/etc/exports ]] ; then
+		rm -f "${IMAGE}"/etc/exports
+	fi
+}
+
+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.  This fixes
+	# bug 30486
+	local f
+	for f in "${ROOT}"/usr/lib/nfs/*; do
+		[[ -f ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from /usr/lib/nfs to /var/lib/nfs"
+		cp -pPR ${f} "${ROOT}"/var/lib/nfs/
+	done
+}