diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-12 18:26:02 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-12 18:26:02 +0100 |
| commit | 320410f103f52cbb71eb6a39d6335e24a9a79495 (patch) | |
| tree | c6590e20b2c787d45458747a8e55aac24c810a13 /core/krb5/PKGBUILD | |
| parent | fd4efab9cfe55b35fdc659aa5777faa1917f2fd6 (diff) | |
| parent | 22b0fa480661b6247dabf39059fe629e1d233a9a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/nsd/PKGBUILD
community/python-pymongo/PKGBUILD
core/krb5/PKGBUILD
extra/pidgin/PKGBUILD
Diffstat (limited to 'core/krb5/PKGBUILD')
| -rw-r--r-- | core/krb5/PKGBUILD | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index ddc548bbc..9eb17fc59 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142223 2011-11-06 13:03:25Z stephane $ +# $Id: PKGBUILD 144896 2011-12-09 11:55:57Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.9.2 -pkgrel=1.1 +pkgrel=2 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -18,12 +18,14 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-sig krb5-kadmind krb5-kdc krb5-kpropd - krb5-1.9.1-config-script.patch) + krb5-1.9.1-config-script.patch + krb5-1.9.1-2011-007.patch) sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' '7f402078fa65bb9ff1beb6cbbbb017450df78560' - '7342410760cf44bfa01bb99bb4c49e12496cb46f') + '7342410760cf44bfa01bb99bb4c49e12496cb46f' + 'ec917dd1d1c96fa331f512331d5aa37c2e9b9df7') options=('!emptydirs') build() { @@ -37,10 +39,15 @@ build() { # by libkrb5, unless do_deps is set to 1, which indicates that the caller # wants the whole list. # - # Patch from upstream : + # Patch from upstream : # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch + # Apply upstream patch to fix a null pointer dereference when processing TGS requests + # CVE-2011-1530 + # see http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-007.txt + patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-007.patch + # FS#25384 sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 |