| 1 |
vapier 11/09/02 19:27:13 |
| 2 |
|
| 3 |
Added: nfs-utils-1.2.4-nfsidmap.patch |
| 4 |
Log: |
| 5 |
Add USE="nfsidmap nfsv41" to control new deps and features #381459 by Krzysztof Pawlik. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-fs/nfs-utils/files/nfs-utils-1.2.4-nfsidmap.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.2.4-nfsidmap.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.2.4-nfsidmap.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: nfs-utils-1.2.4-nfsidmap.patch |
| 16 |
=================================================================== |
| 17 |
From 5606a69f9981948e1d6a36df763b2f16c43f080b Mon Sep 17 00:00:00 2001 |
| 18 |
From: Mike Frysinger <vapier@g.o> |
| 19 |
Date: Fri, 2 Sep 2011 14:56:59 -0400 |
| 20 |
Subject: [PATCH] nfsidmap: auto disable when keyutils is not found |
| 21 |
|
| 22 |
Since we already auto-disable based on libnfsidmap capabilities, don't |
| 23 |
make keyutils a hard failure. |
| 24 |
|
| 25 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
| 26 |
--- |
| 27 |
aclocal/keyutils.m4 | 4 ++-- |
| 28 |
aclocal/libnfsidmap.m4 | 3 +-- |
| 29 |
configure.ac | 2 +- |
| 30 |
3 files changed, 4 insertions(+), 5 deletions(-) |
| 31 |
|
| 32 |
diff --git a/aclocal/keyutils.m4 b/aclocal/keyutils.m4 |
| 33 |
index 84bc112..a392c0e 100644 |
| 34 |
--- a/aclocal/keyutils.m4 |
| 35 |
+++ b/aclocal/keyutils.m4 |
| 36 |
@@ -6,6 +6,6 @@ AC_DEFUN([AC_KEYUTILS], [ |
| 37 |
AC_CHECK_LIB([keyutils], [keyctl_instantiate], [LIBKEYUTILS=-lkeyutils], ,) |
| 38 |
AC_SUBST(LIBKEYUTILS) |
| 39 |
|
| 40 |
- AC_CHECK_HEADERS([keyutils.h], , |
| 41 |
- [AC_MSG_ERROR([keyutils.h header not found.])]) |
| 42 |
+ AC_CHECK_HEADERS([keyutils.h]) |
| 43 |
+ |
| 44 |
])dnl |
| 45 |
diff --git a/aclocal/libnfsidmap.m4 b/aclocal/libnfsidmap.m4 |
| 46 |
index 4faa923..484b1ec 100644 |
| 47 |
--- a/aclocal/libnfsidmap.m4 |
| 48 |
+++ b/aclocal/libnfsidmap.m4 |
| 49 |
@@ -15,7 +15,6 @@ AC_DEFUN([AC_LIBNFSIDMAP], [ |
| 50 |
[Define to 1 if you have the `nfs4_set_debug' function.])]) |
| 51 |
|
| 52 |
dnl only enable nfsidmap when libnfsidmap supports it |
| 53 |
- AC_CHECK_LIB([nfsidmap], [nfs4_owner_to_uid], [enable_nfsidmap=yes], |
| 54 |
- [enable_nfsidmap=no]) |
| 55 |
+ AC_CHECK_LIB([nfsidmap], [nfs4_owner_to_uid]) |
| 56 |
|
| 57 |
])dnl |
| 58 |
diff --git a/configure.ac b/configure.ac |
| 59 |
index c9fb27b..1a28f8a 100644 |
| 60 |
--- a/configure.ac |
| 61 |
+++ b/configure.ac |
| 62 |
@@ -266,7 +266,7 @@ if test "$enable_nfsv4" = yes; then |
| 63 |
fi |
| 64 |
fi |
| 65 |
dnl enable nfsidmap when its support by libnfsidmap |
| 66 |
-AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"]) |
| 67 |
+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"]) |
| 68 |
|
| 69 |
|
| 70 |
if test "$knfsd_cv_glibc2" = no; then |
| 71 |
-- |
| 72 |
1.7.6 |
Archives