[arch-commits] Commit in krb5/trunk (PKGBUILD)

[Jelle van der Waa]

    Date: Wednesday, March 22, 2017 @ 10:51:08
  Author: jelle
Revision: 291205

upgpkg: lib32-krb5 1.15-1

openssl 1.1 rebuild

Modified:
  krb5/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-22 08:30:49 UTC (rev 291204)
+++ PKGBUILD	2017-03-22 10:51:08 UTC (rev 291205)
@@ -1,52 +1,46 @@
 # $Id$
-# Maintainer:
+# Maintainer: Florian Pritz <flo at xinu.at>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
 
-pkgname=krb5
+_pkgbasename=krb5
+pkgname=lib32-$_pkgbasename
 pkgver=1.15
 pkgrel=1
-pkgdesc="The Kerberos network authentication system"
-arch=('i686' 'x86_64')
-url='https://web.mit.edu/kerberos/'
+pkgdesc="The Kerberos network authentication system (32-bit)"
+arch=('x86_64')
+url="https://web.mit.edu/kerberos/"
 license=('custom')
-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)
+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)
 sha1sums=('07fb763082c21e9e597b39aac6413302e3aa7c97'
           'SKIP'
-          'f125824ed37f31e6fd2fdb6a437be8ff1c3700ab'
-          '59bbc7e686cbb4bcefddf0f134d928d7bd5e7722'
-          '2ef2476a8673b3b702e829d8f451c839c2273b02'
-          '74d66aefd291f22dd80799f0437cc03d83083ed5'
-          '6787c6ce2783b3f980c423e2dd4abf5236af670b'
-          'f3677d30dbbd7106c581379c2c6ebb1bf7738912')
+          'f125824ed37f31e6fd2fdb6a437be8ff1c3700ab')
+options=('!emptydirs')
 validpgpkeys=('2C732B1C0DBEF678AB3AF606A32F17FD0055C305') # Tom Yu <tlyu at mit.edu>
 
 prepare() {
-  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
+   tar zxvf ${_pkgbasename}-${pkgver}.tar.gz
+   cd "${srcdir}/${_pkgbasename}-${pkgver}"
 
-  # FS#25384
-  sed -i "/KRB5ROOT=/s/\/local//" src/util/ac_check_krb5.m4
+   # cf https://bugs.gentoo.org/show_bug.cgi?id=448778
+   patch -p1 -i "${srcdir}"/krb5-config_LDFLAGS.patch
 }
 
 build() {
-   cd ${pkgname}-${pkgver}/src
+   cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
+
+   export CC="gcc -m32"
+   export CXX="g++ -m32"
+   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
    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 \
@@ -55,31 +49,23 @@
                --enable-dns-for-realm \
                --with-ldap \
                --without-system-verto
+
    make
 }
 
-package() {
-   cd ${pkgname}-${pkgver}/src
-   make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install
+#check() {
+   # We can't do this in the build directory.
 
-   # Fix FS#29889
-   install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} "${pkgdir}"/usr/share/doc/${pkgname}/examples
+   # only works if the hostname is set properly/resolves to something. whatever...
+   #cd "${srcdir}/${_pkgbasename}-${pkgver}"
+   #make -C src check
+#}
 
-   # Sample KDC config file
-   install -dm 755 "${pkgdir}"/var/lib/krb5kdc
-   install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf
+package() {
+   cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
+   make DESTDIR="${pkgdir}" install
 
-   # 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
+   rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
+   mkdir -p "$pkgdir/usr/share/licenses"
+   ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
 }