From 40e1be1925ec1d841cc0daced6be595daf97d69c Mon Sep 17 00:00:00 2001
From: Ryan Phillips <rphillips@gentoo.org>
Date: Mon, 6 Dec 2004 19:18:16 +0000
Subject: [PATCH] Security Patch for DOS.  Please unmask for arches. Fixes
 #72113

---
 net-fs/nfs-utils/ChangeLog                    |   5 +-
 net-fs/nfs-utils/Manifest                     |  13 ++-
 .../nfs-utils/files/digest-nfs-utils-1.0.6-r6 |   1 +
 .../files/nfs-utils-1.0.6-usn36.patch.gz      | Bin 0 -> 5596 bytes
 net-fs/nfs-utils/nfs-utils-1.0.6-r6.ebuild    | 101 ++++++++++++++++++
 5 files changed, 114 insertions(+), 6 deletions(-)
 create mode 100644 net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r6
 create mode 100644 net-fs/nfs-utils/files/nfs-utils-1.0.6-usn36.patch.gz
 create mode 100644 net-fs/nfs-utils/nfs-utils-1.0.6-r6.ebuild

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..44eb510db04f 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,11 +1,14 @@
-MD5 fe20c862425d6b79e9b2e1dbeaed6cee ChangeLog 8317
-MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
+MD5 ad9a457d16c16258f5a2fcd904e833d5 nfs-utils-1.0.6-r6.ebuild 2908
 MD5 038a2973748342f5bd4cfdaff04cfb1b nfs-utils-1.0.6-r5.ebuild 2782
+MD5 77aa6620d12a5f48f06049f79dca5ca9 ChangeLog 8442
+MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
 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 0000000000000000000000000000000000000000..9a9a240b05c507616411f4ff63e1997746d0cbcc
GIT binary patch
literal 5596
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

literal 0
HcmV?d00001

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
+}
-- 
2.26.2