[arch-commits] Commit in lib32-krb5/trunk (PKGBUILD krb5-config_LDFLAGS.patch)

[Laurent Carlier]

    Date: Thursday, April 18, 2013 @ 18:58:08
  Author: lcarlier
Revision: 88498

upgpkg: lib32-krb5 1.11.2-1

Sync with core

Added:
  lib32-krb5/trunk/krb5-config_LDFLAGS.patch
Modified:
  lib32-krb5/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   13 +++++++++----
 krb5-config_LDFLAGS.patch |   12 ++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-18 16:40:06 UTC (rev 88497)
+++ PKGBUILD	2013-04-18 16:58:08 UTC (rev 88498)
@@ -4,7 +4,7 @@
 
 _pkgbasename=krb5
 pkgname=lib32-$_pkgbasename
-pkgver=1.11.1
+pkgver=1.11.2
 pkgrel=1
 pkgdesc="The Kerberos network authentication system (32-bit)"
 arch=('x86_64')
@@ -12,14 +12,19 @@
 license=('custom')
 depends=('lib32-e2fsprogs' 'lib32-libldap' 'lib32-keyutils' "$_pkgbasename")
 makedepends=('perl' 'gcc-multilib')
-source=("http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.11/${_pkgbasename}-${pkgver}-signed.tar")
-sha1sums=('e2e759c35e775d8f03b75c26ffcaa4f2514147f5')
+source=("http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.11/${_pkgbasename}-${pkgver}-signed.tar"
+        krb5-config_LDFLAGS.patch)
+sha1sums=('3863f7bdb2d8fc3e50484fb566124373c4b0a250'
+          '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa')
 options=('!emptydirs')
 
 build() {
    tar zxvf ${_pkgbasename}-${pkgver}.tar.gz
    cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
 
+   # cf https://bugs.gentoo.org/show_bug.cgi?id=448778
+   patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch
+
    rm lib/krb5/krb/deltat.c
 
    export CC="gcc -m32"
@@ -29,7 +34,7 @@
    export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
    export CPPFLAGS+=" -I/usr/include/et"
    ./configure --prefix=/usr \
-               --sysconfdir=/etc/krb5 \
+               --sysconfdir=/etc \
                --mandir=/usr/share/man \
                --localstatedir=/var/lib \
                --libdir=/usr/lib32 \

Added: krb5-config_LDFLAGS.patch
===================================================================
--- krb5-config_LDFLAGS.patch	                        (rev 0)
+++ krb5-config_LDFLAGS.patch	2013-04-18 16:58:08 UTC (rev 88498)
@@ -0,0 +1,12 @@
+Bug #448778
+--- krb5-1.11/src/krb5-config.in	2012-12-18 02:47:04.000000000 +0000
++++ krb5-1.11/src/krb5-config.in	2012-12-28 07:13:16.582693363 +0000
+@@ -217,7 +217,7 @@
+ 	    -e 's#\$(PROG_RPATH)#'$libdir'#' \
+ 	    -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
+ 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+-	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
++	    -e 's#\$(LDFLAGS)##' \
+ 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
+ 	    -e 's#\$(CFLAGS)##'`
+