diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-07 02:29:26 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-07 02:29:26 -0300 |
| commit | 3357db80ffa8a795fb5cdad0fc726470887706b0 (patch) | |
| tree | 461a9d95f958d88aed12f371328b20d87b69323e /core/krb5 | |
| parent | 1921cc4951557545f38946cbed66431f42af26b4 (diff) | |
| parent | ff64a82ccedcb1690d2f0140d63432aa49676591 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/perl-file-path-expand/PKGBUILD
community/perl-file-slurp/PKGBUILD
community/perl-getopt-argvfile/PKGBUILD
community/perl-graphics-colornames/PKGBUILD
community/perl-html-tableextract/PKGBUILD
community/perl-xml-regexp/PKGBUILD
community/perlio-eol/PKGBUILD
community/virtualbox/PKGBUILD
community/xemacs/PKGBUILD
core/gawk/PKGBUILD
extra/bogofilter/PKGBUILD
extra/feh/PKGBUILD
extra/gnome-phone-manager/PKGBUILD
extra/redland/PKGBUILD
extra/ruby/PKGBUILD
extra/samba/PKGBUILD
extra/squirrelmail/PKGBUILD
extra/subversion/PKGBUILD
extra/vsftpd/PKGBUILD
extra/xawtv/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-glib2/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'core/krb5')
| -rw-r--r-- | core/krb5/PKGBUILD | 35 | ||||
| -rw-r--r-- | core/krb5/krb5-kadmind (renamed from core/krb5/kadmind.rc) | 4 | ||||
| -rw-r--r-- | core/krb5/krb5-kdc (renamed from core/krb5/krb5-kdc.rc) | 0 |
3 files changed, 18 insertions, 21 deletions
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index 6cfa48497..f8300bf83 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122855 2011-05-06 19:36:38Z stephane $ +# $Id: PKGBUILD 129991 2011-06-30 18:09:30Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -13,12 +13,12 @@ makedepends=('perl') provides=('heimdal') replaces=('heimdal') conflicts=('heimdal') -backup=('etc/krb5/krb5.conf' 'etc/krb5/kdc.conf') +backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar - kadmind.rc - krb5-kdc.rc) + krb5-kadmind + krb5-kdc) sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066' - '640e3046c6558313d2be81cf2252afc8622892b0' + '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393') options=('!emptydirs') @@ -29,7 +29,6 @@ build() { export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" export CPPFLAGS+=" -I/usr/include/et" ./configure --prefix=/usr \ - --sysconfdir=/etc/krb5 \ --mandir=/usr/share/man \ --localstatedir=/var/lib \ --enable-shared \ @@ -39,26 +38,24 @@ build() { --without-tcl \ --enable-dns-for-realm \ --with-ldap - make } -check() { - # We can't do this in the build directory. - cd "${srcdir}/${pkgname}-${pkgver}" - make -C src check -} - package() { cd "${srcdir}/${pkgname}-${pkgver}/src" make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install - install -D -m 644 config-files/kdc.conf "${pkgdir}"/etc/krb5/kdc.conf - install -D -m 644 config-files/krb5.conf "${pkgdir}"/etc/krb5/krb5.conf + # Sample KDC config file + install -dm 755 "${pkgdir}"/var/lib/krb5kdc + install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf + + # Default configuration file + install -dm 755 "${pkgdir}"/etc + install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf - install -d -m 755 "${pkgdir}"/etc/rc.d - install -m 755 ../../krb5-kdc.rc "${pkgdir}"/etc/rc.d - install -m 755 ../../kadmind.rc "${pkgdir}"/etc/rc.d + 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 -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/core/krb5/kadmind.rc b/core/krb5/krb5-kadmind index 45835e35b..04df0dcff 100644 --- a/core/krb5/kadmind.rc +++ b/core/krb5/krb5-kadmind @@ -14,7 +14,7 @@ case "$1" in if [ ! -z "$PID" -o $? -gt 0 ]; then stat_fail else - add_daemon kadmind + add_daemon krb5-kadmind stat_done fi ;; @@ -24,7 +24,7 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else - rm_daemon kadmind + rm_daemon krb5-kadmind stat_done fi ;; diff --git a/core/krb5/krb5-kdc.rc b/core/krb5/krb5-kdc index 05a03411e..05a03411e 100644 --- a/core/krb5/krb5-kdc.rc +++ b/core/krb5/krb5-kdc |