Grab fix from upstream for memleak in mountd #172014 by Bardur Arantsson.

Package-Manager: portage-2.1.2.2

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index d7c0c7c0726f1c00700015a05bae804574b79b38..e25872cc42451c6c7dfc9eb40e21019db1d9838e 100644 (file)
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.87 2007/03/21 15:51:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.88 2007/03/24 09:14:02 vapier Exp $
+
+*nfs-utils-1.0.12-r1 (24 Mar 2007)
+
+  24 Mar 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/nfs-utils-1.0.12-mountd-memleak.patch, +nfs-utils-1.0.12-r1.ebuild:
+  Grab fix from upstream for memleak in mountd #172014 by Bardur Arantsson.
 
   21 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   nfs-utils-1.0.10.ebuild:

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index c616f6b8b90dffeff35d2d1a037f7f7b59bed824..f016cc85af29936cb0b9f8b8877f86ab666b4b35 100644 (file)
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -17,6 +17,10 @@ AUX nfs-utils-1.0.10-uts-release.patch 214 RMD160 d6a66906247e97a7f350326cf91062
 MD5 6cb41ec29e1bbfc92e023f3a4a32fe2b files/nfs-utils-1.0.10-uts-release.patch 214
 RMD160 d6a66906247e97a7f350326cf91062997f83c468 files/nfs-utils-1.0.10-uts-release.patch 214
 SHA256 173bb25bae2c38201dabc8a62cc31f8cec4a6a2b1a026601a95c3dee19d0b5be files/nfs-utils-1.0.10-uts-release.patch 214
+AUX nfs-utils-1.0.12-mountd-memleak.patch 548 RMD160 c4b9c3ad1c857d4389cb727356de0a5eda74030e SHA1 2d1dddeb135a70b50b242d12c1a8167458aa0017 SHA256 d9ae3561bbb7067a833891139107b2e54565dbb36104268289e35e1e18e3da92
+MD5 0ce52669c19c7296ad96c7f87fa04576 files/nfs-utils-1.0.12-mountd-memleak.patch 548
+RMD160 c4b9c3ad1c857d4389cb727356de0a5eda74030e files/nfs-utils-1.0.12-mountd-memleak.patch 548
+SHA256 d9ae3561bbb7067a833891139107b2e54565dbb36104268289e35e1e18e3da92 files/nfs-utils-1.0.12-mountd-memleak.patch 548
 AUX nfs-utils-1.0.6-uclibc.patch 547 RMD160 64efb01e8ac745fd5aebc20fc77d6beee4fa6a2f SHA1 f0c89b7ed7c36f9fc8bd9bfb192ee2e9a3d589da SHA256 101e9152171b445894c6254251a79aef4cf71e916cd4055b0cdb006be97b6703
 MD5 3878538fac900450212b414f8c8c39ab files/nfs-utils-1.0.6-uclibc.patch 547
 RMD160 64efb01e8ac745fd5aebc20fc77d6beee4fa6a2f files/nfs-utils-1.0.6-uclibc.patch 547
@@ -56,6 +60,10 @@ EBUILD nfs-utils-1.0.10.ebuild 2971 RMD160 9364627b0a909caef6498a4389412613391a5
 MD5 7cf7e2d032333161681f71ca913adc70 nfs-utils-1.0.10.ebuild 2971
 RMD160 9364627b0a909caef6498a4389412613391a5307 nfs-utils-1.0.10.ebuild 2971
 SHA256 895f8dd815a496b93d58aaac4ee895b3b3c1ed3f96b53734476f8bf2c1d2d82f nfs-utils-1.0.10.ebuild 2971
+EBUILD nfs-utils-1.0.12-r1.ebuild 2814 RMD160 f6f036682073d8bd07b04bde480e68c29d0edb09 SHA1 427940b2bc6d3d8e57c3e722ebd052e68b1c179c SHA256 bba53b0f5da41dbb13a1071082617e71c9216c3b5ad230f2745dee50ed571a64
+MD5 32ddbc9831c8290e172f6d9fbed42cc8 nfs-utils-1.0.12-r1.ebuild 2814
+RMD160 f6f036682073d8bd07b04bde480e68c29d0edb09 nfs-utils-1.0.12-r1.ebuild 2814
+SHA256 bba53b0f5da41dbb13a1071082617e71c9216c3b5ad230f2745dee50ed571a64 nfs-utils-1.0.12-r1.ebuild 2814
 EBUILD nfs-utils-1.0.12.ebuild 2755 RMD160 297240278d5b159fda50d0e16c3f164d0d586666 SHA1 345953587c50b13f7d91a2359267f9e585ae8891 SHA256 a227c72bd926fe3abbb82167c3d8f939828319a428586b1bbaaecfb43eaa8364
 MD5 b092ff550142746b836f2e611b9527e0 nfs-utils-1.0.12.ebuild 2755
 RMD160 297240278d5b159fda50d0e16c3f164d0d586666 nfs-utils-1.0.12.ebuild 2755
@@ -72,10 +80,10 @@ EBUILD nfs-utils-1.0.9.ebuild 2929 RMD160 08b61561f8adac0c2ca22f42ed3b0cbdb29f6d
 MD5 3d5497055a0b9b1fd93b31364e577b95 nfs-utils-1.0.9.ebuild 2929
 RMD160 08b61561f8adac0c2ca22f42ed3b0cbdb29f6d96 nfs-utils-1.0.9.ebuild 2929
 SHA256 94753c05c1352c7655e9a1a38d60f212a56a1c4ab22f64522c0e19428145b08b nfs-utils-1.0.9.ebuild 2929
-MISC ChangeLog 12612 RMD160 1dd8b106a771f9121294236c9a456e0f670226a6 SHA1 c9810d81eea931551505ca06cef7c829d3b57e87 SHA256 bdbaaf69d5c0e644d335b3e091d23c1d734a76e8e15d8f76ac9eb6bcd766d08b
-MD5 b5c8b2a9ef2e75a32615b4bfce9e5d34 ChangeLog 12612
-RMD160 1dd8b106a771f9121294236c9a456e0f670226a6 ChangeLog 12612
-SHA256 bdbaaf69d5c0e644d335b3e091d23c1d734a76e8e15d8f76ac9eb6bcd766d08b ChangeLog 12612
+MISC ChangeLog 12850 RMD160 d74361ebcfbce488232ebd3a48f82ec7da8ca663 SHA1 07fd91b997093d29161e88b9292deb337551f947 SHA256 050f9e043fbaf72e486998a4bc40d934cbeb6f543dca718f5a68959e2b88d474
+MD5 a6a4044f794f679ea2cb9bac7223e57c ChangeLog 12850
+RMD160 d74361ebcfbce488232ebd3a48f82ec7da8ca663 ChangeLog 12850
+SHA256 050f9e043fbaf72e486998a4bc40d934cbeb6f543dca718f5a68959e2b88d474 ChangeLog 12850
 MISC metadata.xml 225 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a SHA1 02c4f79d48d465ad7bca76f706d0f7cb7dd039df SHA256 42f511d0cc6e82e29b011c686ba8bb7965f4d92eb6e47ba3e63d4c7edfe9883a
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a metadata.xml 225
@@ -86,6 +94,9 @@ SHA256 47dc561a493fce870bfcf7154fe9de77f1ee52aaa75a63635b4fbbcf4fd9ad07 files/di
 MD5 981939bd25f589531226fcbaebda689b files/digest-nfs-utils-1.0.12 250
 RMD160 4de93194725690c970901e58696d0e8ae9c999f3 files/digest-nfs-utils-1.0.12 250
 SHA256 e7414116811bdf30fbef9735564ea69ed25aee0da8e28059d8913b2f9fbeeebd files/digest-nfs-utils-1.0.12 250
+MD5 981939bd25f589531226fcbaebda689b files/digest-nfs-utils-1.0.12-r1 250
+RMD160 4de93194725690c970901e58696d0e8ae9c999f3 files/digest-nfs-utils-1.0.12-r1 250
+SHA256 e7414116811bdf30fbef9735564ea69ed25aee0da8e28059d8913b2f9fbeeebd files/digest-nfs-utils-1.0.12-r1 250
 MD5 95a4b11413b1dc6075035f3866bb6905 files/digest-nfs-utils-1.0.6-r6 247
 RMD160 f158affede021931bb0c52a8fd87e257db93585a files/digest-nfs-utils-1.0.6-r6 247
 SHA256 9cd40166a6bfcf14d67d43980595fc0e2c60c44533c253a64241b250bc3ea730 files/digest-nfs-utils-1.0.6-r6 247
@@ -98,7 +109,7 @@ SHA256 45ce27b77bf35f168dee66b458d6ecd57242510bfb9fedf1a637b9b795dea73f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGAVSOkT4lNIS36YERAsKPAKCdAfUPOQHfoIKx9MgrIZtrTnhVVACgsRU4
-tcExWqovkhPfza9uZ2KkEgw=
-=UVDw
+iD8DBQFGBOv68bi6rjpTunYRApTGAKDVhmxdeeAqIEJ8r9OEzZaEvqqioACgugaz
+WmjRJZ2eGhG4n9s4rPkuns0=
+=fyjh
 -----END PGP SIGNATURE-----

diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.12-r1 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.12-r1
new file mode 100644 (file)
index 0000000..bdb8c3c
--- /dev/null
+++ b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.12-r1
@@ -0,0 +1,3 @@
+MD5 acf3656cec3872deb597aa7ac13f3c3a nfs-utils-1.0.12.tar.gz 778576
+RMD160 a00dbdae386acf3f969714a1571749182c5a19a8 nfs-utils-1.0.12.tar.gz 778576
+SHA256 67d81a53d84777c733ff8a5cf5f3eed9ecda17fb9f949bc65727c1a3427af8ac nfs-utils-1.0.12.tar.gz 778576

diff --git a/net-fs/nfs-utils/files/nfs-utils-1.0.12-mountd-memleak.patch b/net-fs/nfs-utils/files/nfs-utils-1.0.12-mountd-memleak.patch
new file mode 100644 (file)
index 0000000..5a750a8
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.0.12-mountd-memleak.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/172014
+
+From: Steinar H. Gunderson <sgunderson@bigfoot.com>
+Date: Fri, 16 Mar 2007 00:26:35 +0000 (+1100)
+Subject: Fix memory leak in mountd.
+X-Git-Url: http://linux-nfs.org/cgi-bin/gitweb.cgi?p=nfs-utils;a=commitdiff;h=08964495c2a65f6228426e4565a50dae5b75834d
+
+Fix memory leak in mountd.
+
+Signed-off-by: Neil Brown <neilb@suse.de>
+---
+
+--- a/support/export/client.c
++++ b/support/export/client.c
+@@ -329,6 +329,7 @@ add_name(char *old, char *add)
+               strcat(new, ",");
+               strcat(new, cp);
+       }
++      free(old);
+       return new;
+ }
+ 

diff --git a/net-fs/nfs-utils/nfs-utils-1.0.12-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.12-r1.ebuild
new file mode 100644 (file)
index 0000000..056b188
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.0.12-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2007 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.12-r1.ebuild,v 1.1 2007/03/24 09:14:02 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"
+
+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
+               app-crypt/mit-krb5
+       )"
+DEPEND="${RDEPEND}
+       >=sys-apps/portage-2.0.51"
+
+src_unpack() {
+       unpack ${P}.tar.gz
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-mountd-memleak.patch #172014
+       #epatch "${DISTDIR}"/nfs-utils-${PV}-CITI_NFS4_ALL-1.dif
+}
+
+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_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.{lockd,statd} "${D}"/sbin/
+
+       dodoc ChangeLog README
+       docinto linux-nfs ; dodoc linux-nfs/*
+
+       insinto /etc
+       doins "${FILESDIR}"/exports
+       use !nonfsv4 && doins utils/idmapd/idmapd.conf
+
+       doinitd "${FILESDIR}"/nfs "${FILESDIR}"/nfsmount
+       newconfd "${FILESDIR}"/nfs.confd nfs
+
+       # 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
+}