Security Patch for DOS. Please unmask for arches. Fixes #72113

5 files changed, 113 insertions, 5 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index eda25b64e870..319023c9b856 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.54 2004/12/05 18:25:07 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.55 2004/12/06 19:18:16 rphillips Exp $
+
+  06 Dec 2004; <rphillips@gentoo.org> nfs-utils-1.0.6-r6.ebuild:
+  Added ubuntu's DOS vulnerability patch. fixes #72113
 
   05 Dec 2004; Jason Wever <weeve@gentoo.org> nfs-utils-1.0.6-r5.ebuild:
   Stable on sparc wrt security bug #72113.
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 8b87a3fbe2f7..d98ac47f520e 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,11 +1,14 @@
+MD5 075bff46c7edfc9b99b577d9c0ee11ef nfs-utils-1.0.6-r6.ebuild 2895
+MD5 038a2973748342f5bd4cfdaff04cfb1b nfs-utils-1.0.6-r5.ebuild 2782
 MD5 fe20c862425d6b79e9b2e1dbeaed6cee ChangeLog 8317
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
-MD5 038a2973748342f5bd4cfdaff04cfb1b nfs-utils-1.0.6-r5.ebuild 2782
 MD5 4f4b6a8a798a0d3944bff7d29eca3734 nfs-utils-1.0.6-r4.ebuild 2675
 MD5 28aff43d6059a5645973388f8e4b9d5f files/nfs 5297
-MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r5 67
-MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
 MD5 a23ae1dac684526aeaa679372648f9bf files/nfs.confd 616
-MD5 b8368dca9c921631ed7019c5c08c3a11 files/nfsmount 1163
 MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r4 67
+MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r5 67
+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 df57bdbe3dfddd40cda65b04509d5957 files/nfs-utils-1.0.6-usn36.patch.gz 5596
+MD5 b8368dca9c921631ed7019c5c08c3a11 files/nfsmount 1163
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
new file mode 100644
index 000000000000..319c3d94379e
--- /dev/null
+++ b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r6
@@ -0,0 +1 @@
+MD5 f17e9983457e1cf61c37f0be4493fce6 nfs-utils-1.0.6.tar.gz 265964
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.0.6-usn36.patch.gz b/net-fs/nfs-utils/files/nfs-utils-1.0.6-usn36.patch.gz
new file mode 100644
index 000000000000..9a9a240b05c5
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.0.6-usn36.patch.gz
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.6-r6.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.6-r6.ebuild
new file mode 100644
index 000000000000..3bbc20241bad
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.0.6-r6.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2004 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.6-r6.ebuild,v 1.1 2004/12/06 19:18:16 rphillips Exp $
+
+inherit gnuconfig eutils
+
+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="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"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/nfs-utils-1.0.6-usn36.patch.gz
+
+	# rphillips - the rquotad patch is found within the usn36.patch.gz
+	# epatch ${FILESDIR}/nfs-utils-0.3.3-rquotad-overflow.patch
+}
+
+src_compile() {
+	econf \
+		--mandir=/usr/share/man \
+		--with-statedir=/var/lib/nfs \
+		--disable-rquotad \
+		--enable-nfsv3 \
+		--enable-secure-statd \
+		|| 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
+
+	echo
+	einfo "NFS V2 and V3 servers now default to \"sync\" IO if ${P}"
+	einfo "(or later) is installed."
+	einfo "More info at ${HOMEPAGE} (see questions 5, 12, 13, and 14)."
+	echo
+	einfo "If you plan on using NFS V4 then you should emerge the idmapd"
+	einfo "package now."
+	echo
+	ewarn "PLEASE note: Since the latest NFS utils has changed the server"
+	ewarn "default to \"sync\" IO, then if no behavior is specified in the"
+	ewarn "export list, thus assuming the default behavior, a warning will"
+	ewarn "be generated at export time."
+	echo
+}