diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-12 13:04:54 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-12 13:04:54 +0100 |
| commit | 24633b6f6af8dc77ca77224448d226d8e99c9ce1 (patch) | |
| tree | 0e862445be6a105957104f94f7e4f2668e1fdbba /core/krb5 | |
| parent | d28ed89b1e41f7e71045a5c2e898aa3b369eda47 (diff) | |
| parent | 8c2563c3c13cb7a279544f6926cbdd2eb902cc9a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cdemu-daemon/PKGBUILD
community/chmsee/PKGBUILD
community/fceux/PKGBUILD
community/ginac/PKGBUILD
community/gstreamermm/PKGBUILD
community/gtksourceviewmm/PKGBUILD
community/lgi/PKGBUILD
community/libmirage/PKGBUILD
core/gawk/PKGBUILD
core/gettext/PKGBUILD
extra/enca/PKGBUILD
extra/gnutls/PKGBUILD
extra/hdf5/PKGBUILD
extra/kdebase/PKGBUILD
extra/libass/PKGBUILD
extra/libdiscid/PKGBUILD
extra/libxcomposite/PKGBUILD
extra/libxdamage/PKGBUILD
extra/maxima/PKGBUILD
extra/nx/PKGBUILD
extra/opencv/PKGBUILD
extra/pidgin/PKGBUILD
extra/redland/PKGBUILD
extra/sharutils/PKGBUILD
extra/soundtouch/PKGBUILD
extra/sqlite/PKGBUILD
extra/twisted/PKGBUILD
libre/dpkg/PKGBUILD
Diffstat (limited to 'core/krb5')
| -rw-r--r-- | core/krb5/PKGBUILD | 9 | ||||
| -rw-r--r-- | core/krb5/krb5-config_LDFLAGS.patch | 12 |
2 files changed, 19 insertions, 2 deletions
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index f14875218..5f7a75608 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173666 2012-12-20 14:18:03Z stephane $ +# $Id: PKGBUILD 174452 2013-01-04 16:47:52Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.11 -pkgrel=1 +pkgrel=2 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -12,6 +12,7 @@ depends=('e2fsprogs' 'libldap' 'keyutils') makedepends=('perl') backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-signed.tar + krb5-config_LDFLAGS.patch krb5-kadmind krb5-kadmind.service krb5-kdc @@ -21,6 +22,7 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-si krb5-kpropd@.service krb5-kpropd.socket) sha1sums=('dcdc305bd2b63cf8b8cb698cb9ea28f0a6282136' + '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' @@ -35,6 +37,9 @@ build() { tar zxvf ${pkgname}-${pkgver}.tar.gz cd "${srcdir}/${pkgname}-${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 # FS#25384 diff --git a/core/krb5/krb5-config_LDFLAGS.patch b/core/krb5/krb5-config_LDFLAGS.patch new file mode 100644 index 000000000..0b300cb44 --- /dev/null +++ b/core/krb5/krb5-config_LDFLAGS.patch @@ -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)##'` + |