Security bump for 64bit arches bug #72113 - CAN-2004-0946

5 files changed, 147 insertions, 8 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 25adf846cc1b..fa2e822f543a 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.48 2004/11/07 09:17:11 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.49 2004/11/22 19:30:21 solar Exp $
+
+*nfs-utils-1.0.6-r5 (22 Nov 2004)
+
+  22 Nov 2004; <solar@gentoo.org>
+  +files/nfs-utils-0.3.3-rquotad-overflow.patch, +nfs-utils-1.0.6-r5.ebuild:
+  Security bump for 64bit arches bug #72113 - CAN-2004-0946
 
   07 Nov 2004; Joshua Kinard <kumba@gentoo.org> nfs-utils-1.0.6-r4.ebuild:
   Marked stable on mips.
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 4027174adcd7..bfcbc753d520 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e0f1ba378b5cf1abdf688e85b947db00 ChangeLog 7563
+MD5 ee894c92adcd48ed4a2ab73452c4589c nfs-utils-1.0.6-r5.ebuild 2805
+MD5 6f798f85c1d7cc036d3b7ffbb1649a99 ChangeLog 7770
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
 MD5 4f4b6a8a798a0d3944bff7d29eca3734 nfs-utils-1.0.6-r4.ebuild 2675
 MD5 28aff43d6059a5645973388f8e4b9d5f files/nfs 5297
-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 3c693e012dcb68827b8f82cc98fa129b files/nfs-utils-0.3.3-rquotad-overflow.patch 1243
+MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
+MD5 b8368dca9c921631ed7019c5c08c3a11 files/nfsmount 1163
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBlsRJHTu7gpaalycRAg/lAKCAyWTCKZ7uBXczz79TmRrAshUZvQCguaae
-uIl/Mb5T6gL3gBKdY9vVvW4=
-=mdIi
+iD8DBQFBoj5z94CCfB4KcwwRAivJAKCA1wKpnYhAhrR8f7VqkLGXTcza9gCgu77N
+65fUmwckSNt1SGwHXu3DsWg=
+=6woE
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r5 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r5
new file mode 100644
index 000000000000..319c3d94379e
--- /dev/null
+++ b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.6-r5
@@ -0,0 +1 @@
+MD5 f17e9983457e1cf61c37f0be4493fce6 nfs-utils-1.0.6.tar.gz 265964
diff --git a/net-fs/nfs-utils/files/nfs-utils-0.3.3-rquotad-overflow.patch b/net-fs/nfs-utils/files/nfs-utils-0.3.3-rquotad-overflow.patch
new file mode 100644
index 000000000000..d3ef7a7a1d64
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-0.3.3-rquotad-overflow.patch
@@ -0,0 +1,29 @@
+--- nfs-utils-0.3.3/utils/rquotad/rquota_server.c.orig	Wed Jun 27 12:45:56 2001
++++ nfs-utils-0.3.3/utils/rquotad/rquota_server.c	Thu Nov 11 14:36:39 2004
+@@ -76,6 +76,7 @@ getquota_rslt *getquotainfo(int flags, c
+    char *pathname, *qfpathname;
+    int fd, err, id, type;
+    struct stat stm, stn;
++   struct rquota *rquota;
+ 
+    /*
+     * First check authentication.
+@@ -168,8 +169,16 @@ getquota_rslt *getquotainfo(int flags, c
+           * Make a copy of the info into the last part of the remote quota
+           * struct which is exactly the same.
+           */
+-         memcpy((caddr_t *)&result.getquota_rslt_u.gqr_rquota.rq_bhardlimit,
+-                (caddr_t *)&dq_dqb, sizeof(struct dqblk));
++
++         rquota = &result.getquota_rslt_u.gqr_rquota;
++         rquota->rq_bhardlimit = dq_dqb.dqb_bhardlimit;
++         rquota->rq_bsoftlimit = dq_dqb.dqb_bsoftlimit;;
++         rquota->rq_curblocks = dq_dqb.dqb_curblocks;
++         rquota->rq_fhardlimit = dq_dqb.dqb_ihardlimit;
++         rquota->rq_fsoftlimit = dq_dqb.dqb_isoftlimit;
++         rquota->rq_curfiles = dq_dqb.dqb_curinodes;
++         rquota->rq_btimeleft = dq_dqb.dqb_btime;
++         rquota->rq_ftimeleft = dq_dqb.dqb_itime;
+ 
+          return(&result);
+       }
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.6-r5.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.6-r5.ebuild
new file mode 100644
index 000000000000..06a57b99be37
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.0.6-r5.ebuild
@@ -0,0 +1,100 @@
+# 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-r5.ebuild,v 1.1 2004/11/22 19:30:21 solar 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"
+KEYWORDS="-*"
+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}
+	cd ${S}
+	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
+}