diff options
| author | James Meyer <james.meyer@operamail.com> | 2014-02-16 23:52:06 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2014-02-19 19:03:03 (GMT) |
| commit | 50b81af15276b7136fef966b4c100d393b554190 (patch) | |
| tree | 26bb5a712226c07492dbf7ca9418d68aa4f2a366 | |
| parent | eafdcf37bde62cdee3ebd7b0bcf0b6e36d5042ef (diff) | |
| download | linhes_pkgbuild-50b81af15276b7136fef966b4c100d393b554190.zip linhes_pkgbuild-50b81af15276b7136fef966b4c100d393b554190.tar.gz linhes_pkgbuild-50b81af15276b7136fef966b4c100d393b554190.tar.bz2 | |
keyutils: 1.5.8
update binary path to /usr/bin
refs #961
| -rw-r--r-- | abs/core/keyutils/PKGBUILD | 34 | ||||
| -rw-r--r-- | abs/core/keyutils/request-key.conf.patch | 21 |
2 files changed, 40 insertions, 15 deletions
diff --git a/abs/core/keyutils/PKGBUILD b/abs/core/keyutils/PKGBUILD index 463df40..417e929 100644 --- a/abs/core/keyutils/PKGBUILD +++ b/abs/core/keyutils/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 162664 2012-06-27 18:33:40Z tpowa $ +# $Id: PKGBUILD 198652 2013-11-01 13:53:34Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=keyutils -pkgver=1.5.5 -pkgrel=3 +pkgver=1.5.8 +pkgrel=1 pkgdesc="Linux Key Management Utilities" -arch=(i686 x86_64) +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') +backup=('etc/request-key.conf') +source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + request-key.conf.patch) + +prepare() { + cd ${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}" + cd ${pkgname}-${pkgver} + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SBINDIR='/usr/bin' BINDIR='/usr/bin' } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" 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 + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" SBINDIR='/usr/bin' BINDIR='/usr/bin' LIBDIR='/usr/lib' USRLIBDIR='/usr/lib' install } +md5sums=('3c7f463039b83833c12a9414c2fcb389' + '89a819a7e4e90936b210c9d5020d296d') diff --git a/abs/core/keyutils/request-key.conf.patch b/abs/core/keyutils/request-key.conf.patch new file mode 100644 index 0000000..9ab4796 --- /dev/null +++ b/abs/core/keyutils/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 |