summaryrefslogtreecommitdiff
path: root/multilib/lib32-krb5
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-03-28 00:01:38 +0000
committerroot <root@rshg054.dnsready.net>2012-03-28 00:01:38 +0000
commita26ce336126d18cde915c2331250b8dfbffc24f8 (patch)
treedd0ee1c89d9c153abfde0b4e7878a2931893ed4c /multilib/lib32-krb5
parentc8729cab8302ab82e01135a22fb9fa9704f1559b (diff)
Wed Mar 28 00:01:38 UTC 2012
Diffstat (limited to 'multilib/lib32-krb5')
-rw-r--r--multilib/lib32-krb5/PKGBUILD32
-rw-r--r--multilib/lib32-krb5/krb5-1.10.1-gcc47.patch11
2 files changed, 28 insertions, 15 deletions
diff --git a/multilib/lib32-krb5/PKGBUILD b/multilib/lib32-krb5/PKGBUILD
index 1b70b9d2b..234758af2 100644
--- a/multilib/lib32-krb5/PKGBUILD
+++ b/multilib/lib32-krb5/PKGBUILD
@@ -1,34 +1,35 @@
-# $Id: PKGBUILD 122855 2011-05-06 19:36:38Z stephane $
+# $Id: PKGBUILD 68503 2012-03-26 09:52:05Z pschmitz $
# Maintainer: Florian Pritz <flo@xinu.at>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
_pkgbasename=krb5
pkgname=lib32-$_pkgbasename
-pkgver=1.9.2
-pkgrel=1
+pkgver=1.10.1
+pkgrel=2
pkgdesc="The Kerberos network authentication system (32-bit)"
arch=('x86_64')
url="http://web.mit.edu/kerberos/"
license=('custom')
-depends=('lib32-e2fsprogs' 'lib32-libldap' lib32-keyutils $_pkgbasename)
-makedepends=('perl' gcc-multilib)
+depends=('lib32-e2fsprogs' 'lib32-libldap' 'lib32-keyutils' "$_pkgbasename")
+makedepends=('perl' 'gcc-multilib')
provides=('lib32-heimdal')
replaces=('lib32-heimdal')
conflicts=('lib32-heimdal')
-source=(http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.9/${_pkgbasename}-${pkgver}-signed.tar
-krb5-1.9.1-2011-007.patch)
-sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92'
- '31a130542e92b70c807b2dbe6f9b182dc14f5e9f')
+source=("http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.10/${_pkgbasename}-${pkgver}-signed.tar"
+ 'krb5-1.10.1-gcc47.patch')
+sha1sums=('f9f3b77173f68b268b43e4f9c29bf7c9f3fd1f0e'
+ '78b759d566b1fdefd9bbcd06df14f07f12effe96')
options=('!emptydirs')
build() {
tar zxvf ${_pkgbasename}-${pkgver}.tar.gz
cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
- # 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
+ # With gcc47 : deltat.c:1694:12: error: 'yylval' may be used uninitialized
+ # in this function [-Werror=maybe-uninitialized]
+ # As this is generated code, just ignore the complaint.
+ patch -Np2 -i ../../krb5-1.10.1-gcc47.patch
+ rm lib/krb5/krb/deltat.c
export CC="gcc -m32"
export CXX="g++ -m32"
@@ -39,7 +40,7 @@ build() {
./configure --prefix=/usr \
--sysconfdir=/etc/krb5 \
--mandir=/usr/share/man \
- --localstatedir=/var/lia \
+ --localstatedir=/var/lib \
--libdir=/usr/lib32 \
--enable-shared \
--with-system-et \
@@ -47,7 +48,8 @@ build() {
--disable-rpath \
--without-tcl \
--enable-dns-for-realm \
- --with-ldap
+ --with-ldap \
+ --without-system-verto
make
}
diff --git a/multilib/lib32-krb5/krb5-1.10.1-gcc47.patch b/multilib/lib32-krb5/krb5-1.10.1-gcc47.patch
new file mode 100644
index 000000000..ffd01c2a3
--- /dev/null
+++ b/multilib/lib32-krb5/krb5-1.10.1-gcc47.patch
@@ -0,0 +1,11 @@
+diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y
+--- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y 2011-09-06 07:34:32.000000000 -0400
++++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y 2012-03-24 13:15:11.543551318 -0400
+@@ -44,6 +44,7 @@
+ #ifdef __GNUC__
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wuninitialized"
++#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #endif
+
+ #include <ctype.h>