- getrpcbynumber_r is not in the SuSv3 spec. disable it for uClibc

5 files changed, 42 insertions, 14 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 4988bfe4a058..e5b3e154b14c 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.63 2004/12/11 07:19:33 corsair Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.64 2005/01/15 19:02:44 solar Exp $
+
+  15 Jan 2005; <solar@gentoo.org> +files/nfs-utils-1.0.6-uclibc.patch,
+  nfs-utils-1.0.6-r6.ebuild:
+  - getrpcbynumber_r is not in the SuSv3 spec. disable it for uClibc
 
   11 Dec 2004; Markus Rothe <corsair@gentoo.org> nfs-utils-1.0.6-r6.ebuild:
   Stable on ppc64; bug #72113
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 43709da6eb33..65f2f17f3e83 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,20 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 facc245efb1dec9e547d20e02f8d9ae8 ChangeLog 9313
+MD5 7f85ee70d102141816130bdc7cea5fa0 nfs-utils-1.0.6-r6.ebuild 3021
+MD5 4020787756671c03faf77a9ded8de220 ChangeLog 9481
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
-MD5 3622d630199f288fd904334c2fbabb9d nfs-utils-1.0.6-r6.ebuild 2895
 MD5 28aff43d6059a5645973388f8e4b9d5f files/nfs 5297
-MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
 MD5 a23ae1dac684526aeaa679372648f9bf files/nfs.confd 616
-MD5 b8368dca9c921631ed7019c5c08c3a11 files/nfsmount 1163
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nfs-utils-1.0.6-r6 0
 MD5 3c693e012dcb68827b8f82cc98fa129b files/nfs-utils-0.3.3-rquotad-overflow.patch 1243
-MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r6 67
+MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
 MD5 df57bdbe3dfddd40cda65b04509d5957 files/nfs-utils-1.0.6-usn36.patch.gz 5596
+MD5 b8368dca9c921631ed7019c5c08c3a11 files/nfsmount 1163
+MD5 3878538fac900450212b414f8c8c39ab files/nfs-utils-1.0.6-uclibc.patch 547
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFB1MqzroRuSHgZdywRAr8MAJ4tqV4SQjWLrXswgRkwBthuOR41CACeK6by
-dDRgw8vNSCi7aiMFvRTkHTg=
-=3h8X
+iQCVAwUBQelo2J4WFLgrx1GWAQL/eAQAyoI1a2XfoE3nMuokHJA3Oubdg+oqL329
+AoDbxvqdeKlblvZEoD2ED9s1uTYvE0lHKIIAtY4p7MJKkKVTRMk8GAhfMQoAxI9z
+8NFMmrS3x1lM6hDWs3CKRXDRTtgTw0yd7pTtTfTt05PkB/gFoYIrIDnPcBQM2CEe
+UhdQAR630DI=
+=43x2
 -----END PGP SIGNATURE-----
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
index 319c3d94379e..e69de29bb2d1 100644
--- 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
@@ -1 +0,0 @@
-MD5 f17e9983457e1cf61c37f0be4493fce6 nfs-utils-1.0.6.tar.gz 265964
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch b/net-fs/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch
new file mode 100644
index 000000000000..3336549dbaa4
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch
@@ -0,0 +1,18 @@
+--- ./support/nfs/svc_socket.c.orig	2004-12-12 06:43:52.000000000 +0000
++++ ./support/nfs/svc_socket.c	2004-12-12 06:50:04.000000000 +0000
+@@ -66,6 +66,7 @@
+   __bzero ((char *) &addr, sizeof (addr));
+   addr.sin_family = AF_INET;
+ 
++#ifndef __UCLIBC__	/* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
+   ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
+ 			  &rpcp);
+   if (ret == 0 && rpcp != NULL)
+@@ -99,6 +100,7 @@
+ 	}
+     }
+   else
++#endif /* ! __UCLIBC__ */
+     {
+       if (bindresvport (sock, &addr))
+ 	{
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
index 51615370c718..89759ae32a6c 100644
--- a/net-fs/nfs-utils/nfs-utils-1.0.6-r6.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.6-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.10 2004/12/11 23:28:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.6-r6.ebuild,v 1.11 2005/01/15 19:02:44 solar Exp $
 
 inherit gnuconfig eutils
 
@@ -23,6 +23,10 @@ src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/nfs-utils-1.0.6-usn36.patch.gz
 
+	# getrpcbynumber_r is not in the SuSv3 spec. disable it for uClibc
+	cd ${S}
+	epatch ${FILESDIR}/nfs-utils-1.0.6-uclibc.patch
+
 	# rphillips - the rquotad patch is found within the usn36.patch.gz
 	# epatch ${FILESDIR}/nfs-utils-0.3.3-rquotad-overflow.patch
 }