From d14a25fc4f65ae3d6e62f4668e9cb88d74834255 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 18 Mar 2012 00:02:54 +0000
Subject: Sun Mar 18 00:02:53 UTC 2012

---
 core/krb5/PKGBUILD | 37 +++++++++----------------------------
 1 file changed, 9 insertions(+), 28 deletions(-)

(limited to 'core/krb5')

diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index e93b19963..0868fcdd9 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144896 2011-12-09 11:55:57Z stephane $
+# $Id: PKGBUILD 153617 2012-03-16 17:46:18Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=krb5
-pkgver=1.9.2
-pkgrel=2
+pkgver=1.10.1
+pkgrel=1
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64')
 url="http://web.mit.edu/kerberos/"
@@ -14,40 +14,20 @@ provides=('heimdal')
 replaces=('heimdal')
 conflicts=('heimdal')
 backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
-source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
+source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar
         krb5-kadmind
         krb5-kdc
-        krb5-kpropd
-        krb5-1.9.1-config-script.patch
-        krb5-1.9.1-2011-007.patch)
-sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92'
+        krb5-kpropd)
+sha1sums=('f9f3b77173f68b268b43e4f9c29bf7c9f3fd1f0e'
           '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
           '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
-          '7f402078fa65bb9ff1beb6cbbbb017450df78560'
-          '7342410760cf44bfa01bb99bb4c49e12496cb46f'
-          'ec917dd1d1c96fa331f512331d5aa37c2e9b9df7')
+          '7f402078fa65bb9ff1beb6cbbbb017450df78560')
 options=('!emptydirs')
 
 build() {
    tar zxvf ${pkgname}-${pkgver}.tar.gz
    cd "${srcdir}/${pkgname}-${pkgver}/src"
 
-   # - Make krb5-config suppress CFLAGS output when called with --libs
-   #   cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
-   #
-   # - Omit extra libraries because their interfaces are not exposed to applications
-   #   by libkrb5, unless do_deps is set to 1, which indicates that the caller
-   #   wants the whole list.
-   #
-   #   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
 
@@ -62,7 +42,8 @@ build() {
                --disable-rpath \
                --without-tcl \
                --enable-dns-for-realm \
-               --with-ldap
+               --with-ldap \
+               --without-system-verto
    make
 }
 
-- 
cgit v1.2.3-54-g00ecf