[arch-commits] Commit in krb5 (repos/multilib-staging-x86_64 trunk/PKGBUILD)

[Jelle van der Waa]

    Date: Thursday, March 23, 2017 @ 09:53:02
  Author: jelle
Revision: 291234

revert lib32-krb5 commit

Modified:
  krb5/trunk/PKGBUILD
Deleted:
  krb5/repos/multilib-staging-x86_64/

----------+
 PKGBUILD |   88 +++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 51 insertions(+), 37 deletions(-)

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2017-03-23 05:38:20 UTC (rev 291233)
+++ trunk/PKGBUILD	2017-03-23 09:53:02 UTC (rev 291234)
@@ -1,46 +1,52 @@
 # $Id$
-# Maintainer: Florian Pritz <flo at xinu.at>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Maintainer:
 
-_pkgbasename=krb5
-pkgname=lib32-$_pkgbasename
+pkgname=krb5
 pkgver=1.15
 pkgrel=1
-pkgdesc="The Kerberos network authentication system (32-bit)"
-arch=('x86_64')
-url="https://web.mit.edu/kerberos/"
+pkgdesc="The Kerberos network authentication system"
+arch=('i686' 'x86_64')
+url='https://web.mit.edu/kerberos/'
 license=('custom')
-depends=('lib32-e2fsprogs' 'lib32-libldap' 'lib32-keyutils' "$_pkgbasename")
-makedepends=('perl' 'gcc-multilib')
-source=(https://web.mit.edu/kerberos/dist/krb5/${pkgver}/${_pkgbasename}-${pkgver}.tar.gz{,.asc}
-        krb5-config_LDFLAGS.patch)
+depends=('e2fsprogs' 'libldap' 'keyutils')
+makedepends=('perl')
+backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
+options=('!emptydirs')
+source=(https://web.mit.edu/kerberos/dist/krb5/${pkgver}/${pkgname}-${pkgver}.tar.gz{,.asc}
+        krb5-config_LDFLAGS.patch
+        krb5-kadmind.service
+        krb5-kdc.service
+        krb5-kpropd.service
+        krb5-kpropd at .service
+        krb5-kpropd.socket)
 sha1sums=('07fb763082c21e9e597b39aac6413302e3aa7c97'
           'SKIP'
-          'f125824ed37f31e6fd2fdb6a437be8ff1c3700ab')
-options=('!emptydirs')
+          'f125824ed37f31e6fd2fdb6a437be8ff1c3700ab'
+          '59bbc7e686cbb4bcefddf0f134d928d7bd5e7722'
+          '2ef2476a8673b3b702e829d8f451c839c2273b02'
+          '74d66aefd291f22dd80799f0437cc03d83083ed5'
+          '6787c6ce2783b3f980c423e2dd4abf5236af670b'
+          'f3677d30dbbd7106c581379c2c6ebb1bf7738912')
 validpgpkeys=('2C732B1C0DBEF678AB3AF606A32F17FD0055C305') # Tom Yu <tlyu at mit.edu>
 
 prepare() {
-   tar zxvf ${_pkgbasename}-${pkgver}.tar.gz
-   cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  tar -xf ${pkgname}-${pkgver}.tar.gz
+  cd ${pkgname}-${pkgver}
+  # cf https://bugs.gentoo.org/show_bug.cgi?id=448778
+  patch -p1 -i "${srcdir}"/krb5-config_LDFLAGS.patch
 
-   # cf https://bugs.gentoo.org/show_bug.cgi?id=448778
-   patch -p1 -i "${srcdir}"/krb5-config_LDFLAGS.patch
+  # FS#25384
+  sed -i "/KRB5ROOT=/s/\/local//" src/util/ac_check_krb5.m4
 }
 
 build() {
-   cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
-
-   export CC="gcc -m32"
-   export CXX="g++ -m32"
-   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
+   cd ${pkgname}-${pkgver}/src
    export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
    export CPPFLAGS+=" -I/usr/include/et"
    ./configure --prefix=/usr \
+               --sbindir=/usr/bin \
                --sysconfdir=/etc \
                --localstatedir=/var/lib \
-               --libdir=/usr/lib32 \
                --enable-shared \
                --with-system-et \
                --with-system-ss \
@@ -49,23 +55,31 @@
                --enable-dns-for-realm \
                --with-ldap \
                --without-system-verto
-
    make
 }
 
-#check() {
-   # We can't do this in the build directory.
+package() {
+   cd ${pkgname}-${pkgver}/src
+   make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install
 
-   # only works if the hostname is set properly/resolves to something. whatever...
-   #cd "${srcdir}/${_pkgbasename}-${pkgver}"
-   #make -C src check
-#}
+   # Fix FS#29889
+   install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} "${pkgdir}"/usr/share/doc/${pkgname}/examples
 
-package() {
-   cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
-   make DESTDIR="${pkgdir}" install
+   # Sample KDC config file
+   install -dm 755 "${pkgdir}"/var/lib/krb5kdc
+   install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf
 
-   rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
-   mkdir -p "$pkgdir/usr/share/licenses"
-   ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+   # Default configuration file
+   install -dm 755 "${pkgdir}"/etc
+   install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
+
+   install -dm 755 "${pkgdir}"/usr/share/aclocal
+   install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal
+
+   install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+   # systemd stuff
+   install -dm 755 "${pkgdir}"/usr/lib/systemd/system
+   install -m 644 ../../krb5-{kadmind.service,kdc.service,kpropd.service,kpropd at .service,kpropd.socket} \
+      "${pkgdir}"/usr/lib/systemd/system
 }