Bump to 1.0.7. New local USE-flag nfsv4 since that pulls in mit-krb5 which

has its own problems
(Portage version: 2.0.51-r13)

4 files changed, 120 insertions, 20 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index c05d70b9f5df..d789155a1dfb 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.65 2005/01/16 06:22:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.66 2005/02/05 01:43:53 agriffis Exp $
+
+*nfs-utils-1.0.7 (04 Feb 2005)
+
+  04 Feb 2005; Aron Griffis <agriffis@gentoo.org> +nfs-utils-1.0.7.ebuild:
+  Bump to 1.0.7. New local USE-flag nfsv4 since that pulls in mit-krb5 which
+  has its own problems
 
   15 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> :
   Fix digest, bug #78168.
@@ -21,7 +27,7 @@
   07 Dec 2004; Hardave Riar <hardave@gentoo.org> nfs-utils-1.0.6-r6.ebuild:
   Stable on mips, bug #72113
 
-  07 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  07 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
   nfs-utils-1.0.6-r6.ebuild:
   Stable on alpha, bug 72113.
 
@@ -42,7 +48,7 @@
   05 Dec 2004; Jason Wever <weeve@gentoo.org> nfs-utils-1.0.6-r5.ebuild:
   Stable on sparc wrt security bug #72113.
 
-  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
   nfs-utils-1.0.6-r5.ebuild:
   Stable on alpha, bug 72113.
 
@@ -64,7 +70,7 @@
   07 Nov 2004; Joshua Kinard <kumba@gentoo.org> nfs-utils-1.0.6-r4.ebuild:
   Marked stable on mips.
 
-  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
   nfs-utils-1.0.6-r4.ebuild:
   Stable on alpha.
 
@@ -137,8 +143,8 @@
   This ebuild is not in stable on any arch, so nfs-team, please let me know
   what you think of these changes.
   
-  15 Jan 2004; Aron Griffis <agriffis@gentoo.org> nfs-utils-1.0.6.ebuild: Fix
-  bug 30486 by refraining from overwriting /var/lib/nfs/*
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org> nfs-utils-1.0.6.ebuild: 
+  Fix bug 30486 by refraining from overwriting /var/lib/nfs/*
 
   14 Jan 2004; Martin Holzer <mholzer@gentoo.org> files/nfs.confd:
   removing quota entry from conf.d
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 2e02115b71dd..9d58b30cf761 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7f85ee70d102141816130bdc7cea5fa0 nfs-utils-1.0.6-r6.ebuild 3021
 MD5 5e39d50e2886f79bfcc0cb48d24c9aca ChangeLog 9565
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
+MD5 b8a8da80b0d02dd7d9ecfb42246c318f nfs-utils-1.0.7.ebuild 3022
+MD5 46e91b0dea9cbbfedcdccc9386b6326d files/digest-nfs-utils-1.0.7 67
 MD5 28aff43d6059a5645973388f8e4b9d5f files/nfs 5297
-MD5 a23ae1dac684526aeaa679372648f9bf files/nfs.confd 616
 MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r6 67
-MD5 3c693e012dcb68827b8f82cc98fa129b files/nfs-utils-0.3.3-rquotad-overflow.patch 1243
 MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
+MD5 a23ae1dac684526aeaa679372648f9bf files/nfs.confd 616
+MD5 3c693e012dcb68827b8f82cc98fa129b files/nfs-utils-0.3.3-rquotad-overflow.patch 1243
 MD5 df57bdbe3dfddd40cda65b04509d5957 files/nfs-utils-1.0.6-usn36.patch.gz 5596
-MD5 b8368dca9c921631ed7019c5c08c3a11 files/nfsmount 1163
 MD5 3878538fac900450212b414f8c8c39ab files/nfs-utils-1.0.6-uclibc.patch 547
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-Comment: Robbat2 @ Orbis-Terrarum Networks
-
-iD8DBQFB6eL0PpIsIjIzwiwRAjkoAKD1buaOGHN7EyFA8tAtxNIfZbiPdQCgthXJ
-N/FbdnOPzQdkKq8BlVtbedg=
-=Vgha
------END PGP SIGNATURE-----
+MD5 b8368dca9c921631ed7019c5c08c3a11 files/nfsmount 1163
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7
new file mode 100644
index 000000000000..0b0ec24d0c0b
--- /dev/null
+++ b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7
@@ -0,0 +1 @@
+MD5 8f863120261cd572ad320a9152581e11 nfs-utils-1.0.7.tar.gz 398577
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild
new file mode 100644
index 000000000000..fc6cf4dbc8e3
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2005 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.7.ebuild,v 1.1 2005/02/05 01:43:53 agriffis Exp $
+
+inherit gnuconfig eutils flag-o-matic
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://nfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nfs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nfsv4 tcpd"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	>=net-nds/portmap-5b-r6
+	>=sys-apps/util-linux-2.11f"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51
+	>=dev-libs/libevent-1.0b
+	>=net-libs/nfsidmap-0.9
+	nfsv4? ( app-crypt/mit-krb5 )"
+	# 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)
+
+src_unpack() {
+	unpack ${A}
+
+	# getrpcbynumber_r is not in the SuSv3 spec. disable it for uClibc
+	cd ${S}
+	epatch ${FILESDIR}/nfs-utils-1.0.6-uclibc.patch
+
+	# since the usn36 patch is now integrated (at least the parts we care about)
+	# into 1.0.7, we need to re-apply the rquoted patch (04 Feb 2005 agriffis)
+	epatch ${FILESDIR}/nfs-utils-0.3.3-rquotad-overflow.patch
+}
+
+src_compile() {
+	append-flags -I/usr/include/heimdal
+
+	econf \
+		--mandir=/usr/share/man \
+		--with-statedir=/var/lib/nfs \
+		--disable-rquotad \
+		--enable-nfsv3 \
+		--enable-secure-statd \
+		$(use_enable nfsv4) \
+		$(use_enable nfsv4 gss) \
+		|| die "Configure failed"
+
+	if ! use tcpd; then
+		sed -i "s:\(-lwrap\|-DHAVE_TCP_WRAPPER\)::" config.mk
+	fi
+
+	# parallel make fails for depend target
+	emake -j1 depend || die "failed to make depend"
+	emake || die "Failed to compile"
+}
+
+src_install() {
+	make \
+		install_prefix=${D} \
+		MANDIR=${D}/usr/share/man \
+		install \
+		|| die "Failed to install"
+
+	# 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
+	keepdir /var/lib/nfs/v4root
+
+	# 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
+
+	doinitd ${FILESDIR}/nfs ${FILESDIR}/nfsmount
+	newconfd ${FILESDIR}/nfs.confd nfs
+}
+
+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 -a ${f} ${ROOT}/var/lib/nfs/
+	done
+}