From 3f4e7826daac5005f485bf7ab012b6039770e0400bae2691978a465813800edd Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 11 Apr 2012 08:24:13 +0000
Subject: [PATCH] Accepting request 113159 from
 home:jeff_mahoney:branches:security

- Add nfs4 idmap support

OBS-URL: https://build.opensuse.org/request/show/113159
OBS-URL: https://build.opensuse.org/package/show/security/keyutils?expand=0&rev=14
---
 keyutils.changes       |  4 ++++
 keyutils.spec          | 15 ++++++++-------
 request-key-nfs4.patch | 12 ++++++++++++
 3 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 request-key-nfs4.patch

diff --git a/keyutils.changes b/keyutils.changes
index 94d5084..c0481f5 100644
--- a/keyutils.changes
+++ b/keyutils.changes
@@ -1,4 +1,8 @@
 -------------------------------------------------------------------
+Wed Apr 11 03:43:35 UTC 2012 - jeffm@suse.com
+
+- Add nfs4 idmap support
+-------------------------------------------------------------------
 Wed Oct  5 15:04:53 UTC 2011 - uli@suse.com
 
 - cross-build fix: use %__cc macro
diff --git a/keyutils.spec b/keyutils.spec
index e6dc2a8..903078a 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package keyutils
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,20 +16,19 @@
 #
 
 
-
 Name:           keyutils
 %define lname	libkeyutils1
 Url:            http://people.redhat.com/~dhowells/keyutils/
-License:        GPLv2+ ; LGPLv2.1+
-Group:          System/Kernel
-AutoReqProv:    on
 Summary:        Linux Key Management Utilities
+License:        GPL-2.0+ ; LGPL-2.1+
+Group:          System/Kernel
 Version:        1.5.3
-Release:        1
+Release:        0
 Source0:        http://people.redhat.com/~dhowells/keyutils/%name-%version.tar.bz2
 Source1:        baselibs.conf
 Patch1:         request-key-cifs.patch
 Patch2:         parallel-make.patch
+Patch3:         request-key-nfs4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -50,7 +49,8 @@ system calls.
 %package devel
 Summary:        Development package for building linux key management utilities
 Group:          System/Kernel
-Requires:       %lname = %version, glibc-devel 
+Requires:       %lname = %version
+Requires:       glibc-devel
 
 %description devel
 This package provides headers and libraries for building key utilities.
@@ -59,6 +59,7 @@ This package provides headers and libraries for building key utilities.
 %setup -q
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1
 
 %build
 make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS" CC="%__cc"
diff --git a/request-key-nfs4.patch b/request-key-nfs4.patch
new file mode 100644
index 0000000..1d2a470
--- /dev/null
+++ b/request-key-nfs4.patch
@@ -0,0 +1,12 @@
+---
+ request-key.conf |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/request-key.conf
++++ b/request-key.conf
+@@ -40,3 +40,5 @@ create	user	debug:loop:*	*		|/bin/cat
+ create	user	debug:*		*		/usr/share/keyutils/request-key-debug.sh %k %d %c %S
+ create	cifs.spnego	*	*		/usr/sbin/cifs.upcall -c %k
+ negate	*	*		*		/bin/keyctl negate %k 30 %S
++create  id_resolver    *	*		/usr/sbin/nfsidmap %k %d 600
++