From 7ca343d778eff63033f8ce0ccc3def7c23e16453 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 1 Mar 2014 08:56:16 +0100
Subject: [PATCH] keyutils: update to 1.5.9.

---
 .../keyutils/patches/request-key.conf.patch   | 21 ++++++++++++++++
 srcpkgs/keyutils/template                     | 25 +++++++------------
 2 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/keyutils/patches/request-key.conf.patch

diff --git a/srcpkgs/keyutils/patches/request-key.conf.patch b/srcpkgs/keyutils/patches/request-key.conf.patch
new file mode 100644
index 00000000000..9ab479631f5
--- /dev/null
+++ b/srcpkgs/keyutils/patches/request-key.conf.patch
@@ -0,0 +1,21 @@
+--- request-key.conf.old	2013-05-28 15:34:10.966001242 +0200
++++ request-key.conf	2013-05-28 15:35:34.857969598 +0200
+@@ -31,11 +31,11 @@
+ 
+ #OP	TYPE	DESCRIPTION	CALLOUT INFO	PROGRAM ARG1 ARG2 ARG3 ...
+ #======	=======	===============	===============	===============================
+-create  dns_resolver *		*               /sbin/key.dns_resolver %k
+-create	user	debug:*		negate		/bin/keyctl negate %k 30 %S
+-create  user    debug:*         rejected        /bin/keyctl reject %k 30 %c %S
+-create  user    debug:*         expired         /bin/keyctl reject %k 30 %c %S
+-create  user    debug:*         revoked         /bin/keyctl reject %k 30 %c %S
+-create	user	debug:loop:*	*		|/bin/cat
++create  dns_resolver *		*               /usr/bin/key.dns_resolver %k
++create	user	debug:*		negate		/usr/bin/keyctl negate %k 30 %S
++create  user    debug:*         rejected        /usr/bin/keyctl reject %k 30 %c %S
++create  user    debug:*         expired         /usr/bin/keyctl reject %k 30 %c %S
++create  user    debug:*         revoked         /usr/bin/keyctl reject %k 30 %c %S
++create	user	debug:loop:*	*		|/usr/bin/cat
+ create	user	debug:*		*		/usr/share/keyutils/request-key-debug.sh %k %d %c %S
+-negate	*	*		*		/bin/keyctl negate %k 30 %S
++negate	*	*		*		/usr/bin/keyctl negate %k 30 %S
diff --git a/srcpkgs/keyutils/template b/srcpkgs/keyutils/template
index e9cc09e514f..36c19719463 100644
--- a/srcpkgs/keyutils/template
+++ b/srcpkgs/keyutils/template
@@ -1,32 +1,25 @@
 # Template file for 'keyutils'
 pkgname=keyutils
-version=1.5.5
-revision=3
+version=1.5.9
+revision=1
 conf_files="/etc/request-key.conf"
 short_desc="Linux Key Management Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2, LGPL-2.1"
 distfiles="http://people.redhat.com/~dhowells/$pkgname/$pkgname-$version.tar.bz2"
-checksum=8fab781fb2d1450b2112a7fbfe6629522ae5a6b901f875a74a201012025a3fc5
+checksum=4da2c5552c688b65ab14d4fd40fbdf720c8b396d8ece643e040cf6e707e083ae
 
 do_build() {
-	sed -e "s|/lib64|/lib|g;s|-m64|${CFLAGS}|g;s|-m32||g" -i Makefile
-	make ${makejobs}
+	make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SBINDIR='/usr/bin' \
+		LIBDIR='/usr/lib' USRLIBDIR='/usr/lib' \
+		BINDIR='/usr/bin' ${makejobs}
 }
 
 do_install() {
-	make DESTDIR=${DESTDIR} install
-
-	vmkdir usr/lib
-	vmkdir usr/bin
-	vmkdir usr/sbin
-
-	mv ${DESTDIR}/bin/* ${DESTDIR}/usr/bin
-	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/sbin
-	mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib
-
-	cd ${DESTDIR}/usr/lib && ln -sf libkeyutils.so.1 libkeyutils.so
+	make DESTDIR=${DESTDIR} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		LIBDIR='/usr/lib' USRLIBDIR='/usr/lib' SBINDIR='/usr/bin' \
+		BINDIR='/usr/bin' install
 }
 
 libkeyutils_package() {