From 6deaf57ca544861ea1e760e2775b90b379e725b8 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 31 May 2013 13:41:12 +0000
Subject: [PATCH] core/keyutils to 1.5.5-5

---
 core/keyutils/PKGBUILD | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD
index 20f6c437d..3c3aef417 100644
--- a/core/keyutils/PKGBUILD
+++ b/core/keyutils/PKGBUILD
@@ -1,34 +1,36 @@
-# $Id: PKGBUILD 144589 2011-12-07 12:54:44Z stephane $
+# $Id: PKGBUILD 186780 2013-05-31 07:19:13Z tpowa $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - commented out sed line, doesn't build otherwise
 #  - must build -j1, everything must build in order
 
 pkgname=keyutils
 pkgver=1.5.5
-pkgrel=4
+pkgrel=5
 pkgdesc="Linux Key Management Utilities"
 arch=(i686 x86_64)
 url="http://www.kernel.org"
 license=('GPL2' 'LGPL2.1')
 depends=('glibc' 'sh')
 backup=(etc/request-key.conf)
-source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d759680b2f23c99af95938f5026f25fb')
+source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+request-key.conf.patch)
+md5sums=('d759680b2f23c99af95938f5026f25fb'
+         '89a819a7e4e90936b210c9d5020d296d')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # fix paths of binaries in /etc/request-key.conf
+  patch -Np0 -i ../request-key.conf.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  #sed -i "s|/lib64|/lib|g" Makefile
-  make -j1 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+  make -j1 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SBINDIR='/usr/bin' BINDIR='/usr/bin'
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" SBINDIR='/usr/bin' BINDIR='/usr/bin' LIBDIR='/usr/lib' USRLIBDIR='/usr/lib'  install
-  # add nfsidmap to config file #30396
-  echo "# NFS idmap resolver" >> $pkgdir/etc/request-key.conf
-  echo "create id_resolver * * /usr/sbin/nfsidmap %k %d" \
-       >> $pkgdir/etc/request-key.conf
 }