Push out accumulated changes.

Package-Manager: portage-2.2_pre5

3 files changed, 126 insertions, 5 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 12a36a7b599d..bd9db83ba948 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.121 2008/04/20 00:52:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.122 2008/04/20 01:02:00 vapier Exp $
+
+*nfs-utils-1.1.1-r1 (20 Apr 2008)
+
+  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +nfs-utils-1.1.1-r1.ebuild:
+  Push out accumulated changes.
 
   20 Apr 2008; Mike Frysinger <vapier@gentoo.org> files/nfs.initd,
   files/rpc.gssd.initd, +files/rpc.svcgssd.initd,
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 78a0bce09073..9b2ea44463de 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -21,13 +21,14 @@ DIST nfs-utils-1.1.1.tar.gz 803906 RMD160 e56bd8f06ad116a48e79cb819dcc693ae0dc7c
 EBUILD nfs-utils-1.0.12-r1.ebuild 2853 RMD160 c85a60d376630bf9f1bbb31b4f1f0b1a894f9e12 SHA1 d509ac4c7a91df4bdd73d06ca24d4be4e7367e13 SHA256 79421617f5ba0c4fa790fa2ec001e391b7db5d465351950a2d94ad79702ef069
 EBUILD nfs-utils-1.0.12-r5.ebuild 3081 RMD160 f1023d33e4861504ce99efe243876ff2f449fa73 SHA1 d274d8b39b67f89e5b6ccc0709eaf21922c152b8 SHA256 41a7e08ac1b06d851ad7fa25e971d3e0a802bbbbf71ed83c83c1d3d5377cd834
 EBUILD nfs-utils-1.1.0-r1.ebuild 3109 RMD160 39f05350068ae5c8ed3a4470c8ab050faa2fa769 SHA1 7ec8b04ae813687a8c9f41b4001112cf3430b32f SHA256 a9fd270fc52bbee05d230b5e96280f7696c2ad96f796fa99ad4481c104710c07
+EBUILD nfs-utils-1.1.1-r1.ebuild 3476 RMD160 0e3eb6fbd0ae1730ce36f00b4bf6a063fdb9ccb9 SHA1 23fbd6747a87e753558dcd6cbd59861eca0f33fc SHA256 e866461cbe94ab5acada6b9a11448081518fbace7ee82e31fab4d20c67687c51
 EBUILD nfs-utils-1.1.1.ebuild 3473 RMD160 da80132e799485c625dd4bb6630b4f687f41ec17 SHA1 a3778a9054ea2b1367afe099d609e9b0f6b9e1a9 SHA256 aeb695b65d9ff762018444996322bb71224c87e9e1a098871c45367db7ed32c4
-MISC ChangeLog 18331 RMD160 acb338b79c0d370f6fad90a931e77686f1d4eeeb SHA1 c6d960c2604b007a408f0ca50592170205a75040 SHA256 bdd499a82dc8c3bc10f75c31947a96337f7f344ae5a0857a2d2b57f5cf50f601
+MISC ChangeLog 18479 RMD160 75d93252acce5bff51b35105a80fe9ca9690a1a6 SHA1 57efbb8c6e1672e530ca8991c7ff82a826104f8e SHA256 e1c04c9dd13890101a72624f82a1bb7c83c99052b95e71380810b9094ab478cb
 MISC metadata.xml 225 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a SHA1 02c4f79d48d465ad7bca76f706d0f7cb7dd039df SHA256 42f511d0cc6e82e29b011c686ba8bb7965f4d92eb6e47ba3e63d4c7edfe9883a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFICpPOj9hvisErhMIRAmAUAKC8+LC+PQlwGkuTSbQU9uAiNwrIZQCgi6hR
-ywQ85GEyZ3/GC+2KTch5igI=
-=VDdb
+iD8DBQFICpYOj9hvisErhMIRAjo3AJ9QepeeA4O3ZvVqmb2fwgcdSVBRtgCg6EqB
+6x2wJxYxxISlCyCyQ4ngDxU=
+=nl1O
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..bca22f694a36
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.1.1-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2008 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.1.1-r1.ebuild,v 1.1 2008/04/20 01:02:00 vapier Exp $
+
+inherit eutils flag-o-matic multilib
+
+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.1.1-1/nfs-utils-1.1.1-001-xlog_segfault_fix.dif
+	http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/1.1.1-1/nfs-utils-1.1.1-002-svcgssd_pass_down_principal_name.dif"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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? (
+			net-libs/librpcsecgss
+			net-libs/libgssglue
+			app-crypt/mit-krb5
+		)
+	)"
+# util-linux dep is to prevent man-page collision
+DEPEND="${RDEPEND}
+	>=sys-apps/util-linux-2.12r-r7"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	epatch "${DISTDIR}"/nfs-utils-1.1.1-001-xlog_segfault_fix.dif "${DISTDIR}"/nfs-utils-1.1.1-002-svcgssd_pass_down_principal_name.dif
+	sed -i \
+		-e 's:libgssapi >= 0\.11:libgssglue >= 0.1:' \
+		-e 's:-lgssapi:-lgssglue:' \
+		configure #191746
+}
+
+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 !nonfsv4 && use_enable kerberos gss) \
+		|| die "Configure failed"
+	emake || die "Failed to compile"
+}
+
+src_install() {
+	emake 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.statd "${D}"/sbin/ || die
+
+	dodoc ChangeLog README
+	docinto linux-nfs ; dodoc linux-nfs/*
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+
+	local f list=""
+	if use !nonfsv4 ; then
+		list="${list} rpc.idmapd"
+		use kerberos && list="${list} rpc.gssd rpc.svcgssd"
+	fi
+	for f in nfs nfsmount rpc.statd ${list} ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
+	done
+	newconfd "${FILESDIR}"/nfs.confd nfs
+	use !nonfsv4 && doins utils/idmapd/idmapd.conf
+
+	# 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() {
+	[[ -s ${ROOT}/etc/exports ]] && rm -f "${D}"/etc/exports
+}
+
+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/$(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
+}