[arch-commits] Commit in keyutils/trunk (PKGBUILD request-key.conf.patch)

[Tobias Powalowski]

    Date: Tuesday, May 28, 2013 @ 15:45:34
  Author: tpowa
Revision: 186537

upgpkg: keyutils 1.5.5-5

fix paths of binaries in request-key.conf, moved id_resolver to nfs-utils

Added:
  keyutils/trunk/request-key.conf.patch
Modified:
  keyutils/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   20 ++++++++++++--------
 request-key.conf.patch |   21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-28 13:43:37 UTC (rev 186536)
+++ PKGBUILD	2013-05-28 13:45:34 UTC (rev 186537)
@@ -3,26 +3,30 @@
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 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}"
-  make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+  make 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
 }

Added: request-key.conf.patch
===================================================================
--- request-key.conf.patch	                        (rev 0)
+++ request-key.conf.patch	2013-05-28 13:45:34 UTC (rev 186537)
@@ -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