Fix building with arches that do not support nfsctl syscalls.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 56 insertions, 7 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 4363f5b716d8..0a98f7b819ab 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.190 2011/10/17 18:56:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.191 2011/12/08 05:53:21 vapier Exp $
+
+  08 Dec 2011; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.4.ebuild,
+  +files/nfs-utils-1.2.4-no-nfsctl.patch:
+  Fix building with arches that do not support nfsctl syscalls.
 
   17 Oct 2011; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.4.ebuild:
   Pull in pkg-config since we use it #387365 by bay.
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 28b0767f4ecd..3e1df019c6aa 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -14,6 +14,7 @@ AUX nfs-utils-1.2.4-cross-build.patch 1883 RMD160 d6e079286b6a8f0f92c77c1e79db56
 AUX nfs-utils-1.2.4-exportfs-skip-dir.patch 1079 RMD160 062c6897c9d939df8b4b6bb12da55712e41e2baa SHA1 f6e974c4cf03a35e143ff838e9e531ce4d6a9524 SHA256 16476adcec288a302fded2c8e1dbfc8012a57f98a6710a182623c45c889f85e4
 AUX nfs-utils-1.2.4-exportfs-xlog.patch 1757 RMD160 0da3208e243bcd794faa9e189fbd983dd949fa3f SHA1 9081b7b193d3e54ef246c5dc96b6d650699a536d SHA256 b9a7bcb4c4f619dee1b4a7faabbeb07875ff0e8ba04a97a77cd4cd2dbaac51ce
 AUX nfs-utils-1.2.4-nfsidmap.patch 1925 RMD160 f11d80ee9ce99beb250301573630b2a6710d6892 SHA1 7b7ff10bcc2b053e3cd6fc9897a5238eb9cf726a SHA256 ae15774002b877a75376c176bb313ca950100ba95be2d1641b1dacb8aaa0c33c
+AUX nfs-utils-1.2.4-no-nfsctl.patch 1043 RMD160 d9762cf7441c91df4ac64cb57023845ebe7fe124 SHA1 cbb5c5b35b3fae789f0b47e64825b42993e499ce SHA256 cb2f92895762337e377989835a360f423f6f0e3e2b4a82bde600496da16631b5
 AUX nfs.confd 948 RMD160 eee237aeb641e823d3b505371faf8c4a33582a51 SHA1 bf296a1ea20478d729307496b2d34299a493168c SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e
 AUX nfs.initd 4337 RMD160 3ab7f3d0558078a247b68d6018f6b8ac208eb4d8 SHA1 d3e5da7320ff67673b23570a9e14c28c76169acd SHA256 1a29bd99e30b02b3f0af7438856c83cde23f261f940895841f6154d4f9b244b0
 AUX nfsmount.initd 1130 RMD160 7ac01f228fcd9539e11cf200a0ba2ed82987a91b SHA1 1f4bfd0155489b6ce2e044f34d057c222202b1bb SHA256 4d6965abb56b72bdcd18cbf900b6e1614d12da6b92b1a5b18727c36eaa131d37
@@ -38,13 +39,13 @@ EBUILD nfs-utils-1.2.1.ebuild 3120 RMD160 c97608ea950bb115875d1c2058112b67e50015
 EBUILD nfs-utils-1.2.2-r2.ebuild 3387 RMD160 957cda2a26635d233322f2ca62a4466bbe2ad537 SHA1 bd0fc823c4e79d0c5a0025f31f9a416a3411da78 SHA256 9dd1368b530d093538f6adb4715ec6634fe050e664b6ae0b004f65a8fae9c4f4
 EBUILD nfs-utils-1.2.3-r1.ebuild 3243 RMD160 fd7ff6d183dab514a48bb361d52d6e7aaf88f66a SHA1 0622a8f2007e56295f5090e02f75550ce59f59f4 SHA256 5660e204ebd82df18a3ea663115dd821bc73828192e9e54862b5bb01121c81b0
 EBUILD nfs-utils-1.2.3.ebuild 3150 RMD160 03ce5a05c2bc11e3d0fa87c86faf590329307531 SHA1 2293dc44577dd9d4c91f0e234e22301989810d12 SHA256 b1c484e0cc4b032cd44ff66d9e73866e0dfcea87c22917994f2aa6312db1bcba
-EBUILD nfs-utils-1.2.4.ebuild 3611 RMD160 eebeeddb03e8716022fb1717ec6b54ee7851d3df SHA1 1c131acdb2d9965558ef8bc0e2aac1b139f4bf79 SHA256 492e09abdde72703aa0f267022521b1dcc6410246ccf69a5850d2986ba254665
-MISC ChangeLog 30174 RMD160 b72a2d04b53bd681e9df1d9bc306fe03a480f900 SHA1 b0c051bca75464568975ecfbe1465832efc27260 SHA256 7965a34e693352c139e2048f3779cff9a1aa26df999fa198003a7f426fd2abca
+EBUILD nfs-utils-1.2.4.ebuild 3661 RMD160 10a9fba202983a0fbc841c6a567c1890d4f07651 SHA1 88216215c831690d47c5c51106a2adc68ea84227 SHA256 ee3c73e6e12b090a4774276eefd0c2ffc27f69d20ba232c929291f5e9f383282
+MISC ChangeLog 30355 RMD160 bd57536dcad683e59b8def7db0931f0f240868ce SHA1 f88d9acb3573d208f6c90d0a3294482c9382b8b9 SHA256 1eb5fdf11c53ec227e7bec3658c1cd7d583689718a4d0e151670c52b1be16571
 MISC metadata.xml 530 RMD160 a57266554db20273338db07f0f895de97ee9b6d6 SHA1 3fd1043140c05d3f9d81a671acaf46d566e06af5 SHA256 97600ac996d2c56119c2ee41073ac83f8c732fff5931ecdbe5b66090e31d13af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6ceoMACgkQaC/OocHi7JY52wD+N4T4icwtWrD+cxLEQELEiq9U
-SWptGwpxa8PoJlVEpzEBAJ57nV4E7vot8Ih45WJEPjJVJhaUVQ6NSkVKFs9FOac0
-=NOaO
+iF4EAREIAAYFAk7gUN4ACgkQaC/OocHi7JaaGwD/WDn1BaDZT2yDRB3k9tFJCGVd
+Qfn70XVxk8X+t4BqebwBAJREo+dJpKhEzRKYnXumulUb8PWKAssHCqsBYKRsZAzc
+=9tws
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-no-nfsctl.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-no-nfsctl.patch
new file mode 100644
index 000000000000..e36ac25547f3
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.2.4-no-nfsctl.patch
@@ -0,0 +1,43 @@
+From b02133aaa4feec085627172b5466d8c64a11a5a6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 8 Dec 2011 00:10:27 -0500
+Subject: [PATCH] nfsctl: fix building with newer arches
+
+Newer arches omitting both nfsctl and nfsservctl which breaks nfsctl.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ support/nfs/nfsctl.c |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/support/nfs/nfsctl.c b/support/nfs/nfsctl.c
+index 89fa1a4..fec775f 100644
+--- a/support/nfs/nfsctl.c
++++ b/support/nfs/nfsctl.c
+@@ -11,16 +11,22 @@
+ #endif
+ 
+ #include <unistd.h>
++#include <errno.h>
+ #include <asm/unistd.h>
+ #include "nfslib.h"
+ 
+ /* compatibility hack... */
+-#ifndef __NR_nfsctl
++#if !defined(__NR_nfsctl) && defined(__NR_nfsservctl)
+ #define __NR_nfsctl	__NR_nfsservctl
+ #endif
+ 
+ int
+ nfsctl (int cmd, struct nfsctl_arg * argp, union nfsctl_res * resp)
+ {
++#ifdef __NR_nfsctl
+   return syscall (__NR_nfsctl, cmd, argp, resp);
++#else
++  errno = ENOSYS;
++  return -1;
++#endif
+ }
+-- 
+1.7.6.1
+
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild
index d705f447f3cf..20cef1d1b28e 100644
--- a/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.2.4.ebuild,v 1.5 2011/10/17 18:56:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild,v 1.6 2011/12/08 05:53:21 vapier Exp $
 
 EAPI="2"
 
@@ -52,6 +52,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-conditional.patch
 	epatch "${FILESDIR}"/${PN}-1.2.4-nfsidmap.patch
 	epatch "${FILESDIR}"/${PN}-1.2.4-cross-build.patch
+	epatch "${FILESDIR}"/${PN}-1.2.4-no-nfsctl.patch
 	eautoreconf
 }