diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
| commit | ca4b95e91b33e5b8f02a063862359ab00c5260d5 (patch) | |
| tree | 872d6a54fa0e59e017aa3101880d82f0e54fb70a /core/krb5 | |
| parent | 041ebdb9062909e39f81cca8c491c7f8adeed2a3 (diff) | |
| parent | 2ed96c6eb798c762b61a93a8b4cf80220c00ac1f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/libvirt/PKGBUILD
community/opendkim/opendkim.rc
core/nfs-utils/blkmapd.service
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-qt/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to 'core/krb5')
| -rw-r--r-- | core/krb5/PKGBUILD | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index 6f4deb508..c2d6bf252 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,18 +1,15 @@ -# $Id: PKGBUILD 155426 2012-04-03 14:17:30Z stephane $ +# $Id: PKGBUILD 160188 2012-05-30 11:50:04Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.10.1 -pkgrel=2 +pkgrel=3 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" license=('custom') depends=('e2fsprogs' 'libldap' 'keyutils') makedepends=('perl') -provides=('heimdal') -replaces=('heimdal') -conflicts=('heimdal') backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar krb5-1.10.1-gcc47.patch @@ -57,7 +54,10 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}/src" - make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install + make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install + + # Fix FS#29889 + install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} "${pkgdir}"/usr/share/doc/${pkgname}/examples # Sample KDC config file install -dm 755 "${pkgdir}"/var/lib/krb5kdc @@ -68,9 +68,7 @@ package() { install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf install -dm 755 "${pkgdir}"/etc/rc.d - install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d - install -m 755 ../../krb5-kadmind "${pkgdir}"/etc/rc.d - install -m 755 ../../krb5-kpropd "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-{kdc,kadmind,kpropd} "${pkgdir}"/etc/rc.d install -dm 755 "${pkgdir}"/usr/share/aclocal install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal |