Thu May 12 22:37:08 UTC 2011

44 files changed, 537 insertions, 172 deletions

diff --git a/extra/alpine/PKGBUILD b/extra/alpine/PKGBUILD
index ec3edad56..6b2f9ee73 100644
--- a/extra/alpine/PKGBUILD
+++ b/extra/alpine/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 104455 2011-01-03 05:46:57Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 121113 2011-04-29 02:56:31Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=alpine
 pkgver=2.00
-pkgrel=12
+pkgrel=13
 _patchlevel=79
 pkgdesc="The Apache-licensed PINE (a tool for reading, sending, and managing electronic messages)"
 arch=('i686' 'x86_64')
 url="http://www.washington.edu/alpine/"
 license=('APACHE')
-depends=('libldap' 'heimdal' 'gettext')
+depends=('libldap' 'krb5' 'gettext')
 optdepends=('aspell: for spell-checking support')
 provides=('pine')
 conflicts=('pine')
@@ -18,10 +18,14 @@ options=('!makeflags')
 source=(ftp://ftp.cac.washington.edu/${pkgname}/${pkgname}.tar.bz2 \
         http://staff.washington.edu/chappa/alpine/patches/alpine-${pkgver}/all_${_patchlevel}.patch.gz \
         2.00-lpam.patch CVE-2008-5514.patch)
-md5sums=('84e44cbf71ed674800a5d57eed9c1c52' 'd7dffd121c9a1cac4c458c0ff71df1ce'\
-         'cd3911c16fc6a072e853c0ccfc35857c' '1b52a54a656979116c09fb1d948a4325')
-sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4' 'd3acbf0e46c50feb2e822ef3bdc0a0f43c007294'\
-         '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3' 'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb')
+md5sums=('84e44cbf71ed674800a5d57eed9c1c52'
+         'd7dffd121c9a1cac4c458c0ff71df1ce'
+         'cd3911c16fc6a072e853c0ccfc35857c'
+         '1b52a54a656979116c09fb1d948a4325')
+sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4'
+          'd3acbf0e46c50feb2e822ef3bdc0a0f43c007294'
+          '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3'
+          'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index f6999d183..98a1c6730 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120797 2011-04-26 15:26:51Z ibiru $
+# $Id: PKGBUILD 122589 2011-05-04 18:41:26Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgname=anjuta
 pkgver=3.0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index 729822c12..9c33cefba 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 117241 2011-03-30 13:34:45Z tpowa $
+# $Id: PKGBUILD 122574 2011-05-04 17:23:19Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=cifs-utils
 pkgver=4.9
-pkgrel=2
+pkgrel=3
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64)
 url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 license=('GPL')
-depends=('libcap' 'keyutils' 'heimdal')
+depends=('libcap' 'keyutils' 'krb5' 'talloc')
 source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
+md5sums=('908d904e6b9e58f09f530de151a88ef8')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -23,4 +24,3 @@ package() {
   # set mount.cifs uid, to enable none root mounting form fstab
   chmod +s $pkgdir/sbin/mount.cifs
 }
-md5sums=('908d904e6b9e58f09f530de151a88ef8')
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index ebf7f6ca7..64ab5d109 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 105161 2011-01-07 06:36:34Z andyrtr $
+# $Id: PKGBUILD 121078 2011-04-29 00:03:07Z stephane $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.4.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
-makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0'  'acl' 'openslp' 'pam' 'xdg-utils' 'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.12.3'
+makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0'  'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
              'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi'  'hicolor-icon-theme')
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
 	cups-avahi.patch
@@ -20,6 +20,8 @@ md5sums=('de8fb5a29c36554925c0c6a6e2c0dae1'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17')
 
+# move client.conf man page for next update to the client pkg.
+
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
   # Avahi support in the dnssd backend. patch from Fedora
@@ -40,7 +42,7 @@ build() {
 
 package_libcups() {
 pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1' 'avahi')
+depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
   make BUILDROOT=${pkgdir} install-headers install-libs || return 1
diff --git a/extra/cvs/PKGBUILD b/extra/cvs/PKGBUILD
index 380e93f2e..76f71a2a1 100644
--- a/extra/cvs/PKGBUILD
+++ b/extra/cvs/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 101751 2010-12-01 14:33:51Z stephane $
+# $Id: PKGBUILD 121072 2011-04-28 22:54:58Z stephane $
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=cvs
 pkgver=1.11.23
-pkgrel=6
+pkgrel=7
 pkgdesc="Concurrent Versions System - a source control system"
 arch=(i686 x86_64)
 url="http://cvs.nongnu.org"
 license=('GPL')
-depends=('heimdal>=1.3.1')
+depends=('krb5')
 optdepends=('openssh: for using cvs over ssh' 'inetutils: for using cvs over rsh')
 install=cvs.install
 source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2
@@ -34,6 +34,6 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR=${pkgdir} install
-  rm ${pkgdir}/usr/share/info/dir
+  make DESTDIR="${pkgdir}" install
+  rm "${pkgdir}"/usr/share/info/dir
 }
diff --git a/extra/cyrus-sasl-plugins/PKGBUILD b/extra/cyrus-sasl-plugins/PKGBUILD
index a511d0fc2..5817bb657 100644
--- a/extra/cyrus-sasl-plugins/PKGBUILD
+++ b/extra/cyrus-sasl-plugins/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 115177 2011-03-17 10:51:19Z andrea $
+# $Id: PKGBUILD 122144 2011-05-02 13:27:49Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cyrus-sasl-plugins
 pkgver=2.1.23
-pkgrel=4
+pkgrel=5
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
-depends=('postgresql-libs>=9.0.3' 'heimdal>=1.3.3' 'libldap>2.4'
+depends=('postgresql-libs>=9.0.3' 'krb5' 'libldap>2.4'
         'libmysqlclient>=5.5.10')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.22-gcc44.patch
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index a33001a96..6d42f9f75 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,33 +1,49 @@
-# $Id: PKGBUILD 75335 2010-04-01 10:43:20Z allan $
+# $Id: PKGBUILD 122168 2011-05-02 15:13:37Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cyrus-sasl
 pkgver=2.1.23
-pkgrel=4
+pkgrel=5
 pkgdesc="SASL authentication daemon"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://asg.web.cmu.edu/cyrus/download/"
-depends=('pam>=1.0.1-2' 'heimdal>=1.3.1' 'libldap' 'cyrus-sasl-plugins>=2.1.22-7' 'db>=4.7')
+depends=('pam>=1.0.1-2' 'krb5' 'libldap' 'cyrus-sasl-plugins' 'db>=5.0')
 replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 backup=(etc/conf.d/saslauthd)
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${pkgname}-${pkgver}.tar.gz
-	saslauthd
-	saslauthd.conf.d) 
+        saslauthd
+        saslauthd.conf.d
+        cyrus-sasl-2.1.23-gcc4.patch
+        cyrus-sasl-2.1.23+db-5.0.patch)
 md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
          '697dfb51206c398bc976ce9f4cffe72d'
-         '96d8a2f6189501f8044838e04d5cae7f')
+         '96d8a2f6189501f8044838e04d5cae7f'
+         '3a71688df7d5724cd55a8de17d74f34e'
+         '35c189c8e93ad37e3ae3c49386fdeb2c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix building with db v5.x
+  patch -Np1 -i ../cyrus-sasl-2.1.23+db-5.0.patch
+
+  # Fix error: #elif with no expression
+  patch -Np1 -i ../cyrus-sasl-2.1.23-gcc4.patch
+
   ./configure --prefix=/usr --mandir=/usr/share/man \
-    --with-ldap=/usr --with-saslauthd=/var/run/saslauthd
+    --with-ldap=/usr --with-saslauthd=/var/run/saslauthd \
+    --disable-krb4 --with-gss_impl=mit --disable-otp
   cd saslauthd
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  make testsaslauthd || return 1
-  install -m755 testsaslauthd "${pkgdir}/usr/sbin" || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/saslauthd"
+  make DESTDIR="${pkgdir}" install
+  make testsaslauthd
+  install -m755 testsaslauthd "${pkgdir}/usr/sbin"
 
   install -dm766 "${pkgdir}/var/run/saslauthd"
   install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch
new file mode 100644
index 000000000..62df3e67e
--- /dev/null
+++ b/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch
@@ -0,0 +1,24 @@
+diff -Naur cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c cyrus-sasl-2.1.23/sasldb/db_berkeley.c
+--- cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c	2009-04-28 08:09:18.000000000 -0700
++++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c	2011-05-02 07:16:42.748675977 -0700
+@@ -100,7 +100,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+diff -Naur cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c cyrus-sasl-2.1.23/utils/dbconverter-2.c
+--- cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c	2003-02-13 11:56:17.000000000 -0800
++++ cyrus-sasl-2.1.23/utils/dbconverter-2.c	2011-05-02 07:16:42.748675977 -0700
+@@ -214,7 +214,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
new file mode 100644
index 000000000..0d8627b1f
--- /dev/null
+++ b/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
@@ -0,0 +1,21 @@
+diff -Naur cyrus-sasl-2.1.23.ori/plugins/digestmd5.c cyrus-sasl-2.1.23/plugins/digestmd5.c
+--- cyrus-sasl-2.1.23.ori/plugins/digestmd5.c	2009-04-28 08:09:17.000000000 -0700
++++ cyrus-sasl-2.1.23/plugins/digestmd5.c	2011-05-02 07:56:55.375403814 -0700
+@@ -2715,7 +2715,7 @@
+ 	"DIGEST-MD5",			/* mech_name */
+ #ifdef WITH_RC4
+ 	128,				/* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else 
+ 	1,
+@@ -4034,7 +4034,7 @@
+ 	"DIGEST-MD5",
+ #ifdef WITH_RC4				/* mech_name */
+ 	128,				/* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else
+ 	1,
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 5c37e7454..8d3718c07 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 119695 2011-04-13 19:29:24Z andyrtr $
+# $Id: PKGBUILD 123590 2011-05-11 17:20:39Z andyrtr $
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=dovecot
-pkgver=2.0.12
+pkgver=2.0.13
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
 url="http://dovecot.org/"
 license=("LGPL")
-depends=('heimdal>=1.3.3' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10'
+depends=('krb5' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10'
         'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl')
 makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22')
 optdepends=('libldap: ldap plugin')
@@ -25,7 +25,7 @@ backup=(etc/dovecot/dovecot.conf
 	etc/ssl/dovecot-openssl.cnf)
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh)
-md5sums=('689e1a8863d4fb2fd252e1a6121dd181'
+md5sums=('fd8a0702275a61332db7353dadff0f92'
          'd020d43eab4ded6fb379dadc570a9490')
 
 build() {
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 798ec14fe..195be21c6 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 120574 2011-04-25 17:24:21Z ibiru $
+# $Id: PKGBUILD 122571 2011-05-04 16:49:38Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop"
 arch=('i686' 'x86_64')
-depends=('libsoup' 'nss' 'libgnome-keyring' 'heimdal' 'libgweather' 'libical' 'db' 'libgdata')
+depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
 makedepends=('intltool' 'gperf' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org"
diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD
index 2364818a9..963b54508 100644
--- a/extra/evolution-exchange/PKGBUILD
+++ b/extra/evolution-exchange/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120624 2011-04-25 18:31:36Z ibiru $
+# $Id: PKGBUILD 122586 2011-05-04 18:25:32Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-exchange
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Ximian Connector Exchange plugin for Evolution"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD
index 8998e12c4..046dca618 100644
--- a/extra/exo/PKGBUILD
+++ b/extra/exo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 106429 2011-01-16 21:30:41Z ibiru $
+# $Id: PKGBUILD 123595 2011-05-11 17:34:16Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=exo
-pkgver=0.6.0
-pkgrel=2
+pkgver=0.6.1
+pkgrel=1
 pkgdesc="Extensions to Xfce by os-cillation"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL')
@@ -17,7 +17,7 @@ optdepends=('perl-uri: for mail-compose helper script')
 options=('!libtool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/xfce/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ac9deafdf9de426d8a03855ac549f424')
+md5sums=('2ae3d9a9dedc3adebb748fa8724e02ce')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index d7489ad85..62c9797a6 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 120449 2011-04-23 22:47:50Z bisson $
+# $Id: PKGBUILD 123419 2011-05-11 10:13:28Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=feh
-pkgver=1.13
+pkgver=1.14
 pkgrel=1
 pkgdesc='Fast, lightweight image viewer which uses imlib2'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama')
 optdepends=('perl: feh-cam, webcam wrapper for feh')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('8b2c8250137edbda630b920e5eb7ca7ba5818a5e')
+sha1sums=('da8886b62aa46c8e85cbced73ef14d704ab66907')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD
index 11898fa33..16f608ea1 100644
--- a/extra/gc/PKGBUILD
+++ b/extra/gc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 18876 2008-11-09 22:41:09Z andyrtr $
+# $Id: PKGBUILD 123615 2011-05-11 19:36:33Z jgc $
 # Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
 # Contributor: dorphell <dorphell@gmx.net>
 pkgname=gc
 pkgver=7.1
-pkgrel=1
+pkgrel=3
 pkgdesc="A garbage collector for C and C++"
 arch=(i686 x86_64)
 url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
@@ -15,7 +15,16 @@ md5sums=('2ff9924c7249ef7f736ecfe6f08f3f9b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-cplusplus || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --enable-cplusplus
+  make
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}/usr/share/gc"
+  install -m755 -d "${pkgdir}/usr/share/doc/gc"
+  install -m644 doc/README{,.{changes,contributors,environment,linux}} \
+    "${pkgdir}/usr/share/doc/gc/"
+
+  sed -i -e 's/GC_MALLOC 1L/gc 3/' doc/gc.man
+  install -m755 -d "${pkgdir}/usr/share/man/man3"
+  install -m644 doc/gc.man "${pkgdir}/usr/share/man/man3/gc.3"
 }
diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD
index 13b4ead43..bfbeec073 100644
--- a/extra/geoip/PKGBUILD
+++ b/extra/geoip/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 40077 2009-05-27 06:02:01Z juergen $
+# $Id: PKGBUILD 123437 2011-05-11 11:45:24Z juergen $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=geoip
-pkgver=1.4.6
+pkgver=1.4.7
 pkgrel=1
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=('zlib')
 backup=(etc/geoip/GeoIP.conf)
 options=('!libtool')
 source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-${pkgver}.tar.gz)
-md5sums=('cb14b1beeb40631a12676b11ca0c309a')
+md5sums=('a802175d5b7e2b57b540a7dd308d9205')
 
 build() {
   cd ${startdir}/src/GeoIP-${pkgver}
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index 97f803ce8..1031b6b1d 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 120905 2011-04-27 08:37:19Z ibiru $
+# $Id: PKGBUILD 122550 2011-05-04 14:36:21Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
 pkgver=3.0.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The Control Center for GNOME"
 arch=('i686' 'x86_64')
-depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop')
+depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5')
 optdepends=('mesa-demos: provides glxinfo for graphics information'
             'apg: adds password generation for user accounts')
 makedepends=('gnome-doc-utils' 'intltool' 'networkmanager')
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index a65f24d5a..06f71588b 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 120747 2011-04-26 10:46:20Z heftig $
+# $Id: PKGBUILD 122583 2011-05-04 18:20:31Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-settings-daemon
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme'
-         'libcanberra' 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf'
-         'pulseaudio' 'pulseaudio-alsa')
+         'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf'
+         'dconf' 'pulseaudio' 'pulseaudio-alsa')
 makedepends=('intltool' 'gtk-doc')
 options=('!emptydirs' '!libtool')
 install=gnome-settings-daemon.install
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index e1f13a17a..34974115f 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 123342 2011-05-10 13:48:13Z ibiru $
+# $Id: PKGBUILD 123600 2011-05-11 18:16:09Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
 pkgver=3.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="The next generation GNOME Shell"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeShell"
@@ -22,12 +22,14 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p
         network_fixes_up_to_5090a4ccce.patch
         shell-xfixes-cursor_missing_free.patch
         st-private_fix_memory_leak.patch
+        st-private_correct_fix_memory_leak.patch
         0001-Don-t-crash-when-removing-nameless-user.patch)
 sha256sums=('01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079'
             'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db'
             '01bf41483d5d8935ed2dd6294ee04024f2d9bcb2ef13276b07331e485965c822'
             'c8b92768c869d0d77595da3466cc0dba3b6f067ea5fac048f32a918bbe98bbf6'
             '8b80a0cec39c38a47521183a3030a782ab84bb6ea5e9cc58213589245288e718'
+            'c676067fff399a87625187381db5331d82c44f6c14f51d409392851dbbeb5074'
             '291d1fa51344325e3dabc0c1287750cde98605c30f079ffad9b3523a3aba860d')
 
 build() {
@@ -37,6 +39,7 @@ build() {
   patch -Np1 -i "${srcdir}/network_fixes_up_to_5090a4ccce.patch"
   patch -Np1 -i "${srcdir}/shell-xfixes-cursor_missing_free.patch"
   patch -Np1 -i "${srcdir}/st-private_fix_memory_leak.patch"
+  patch -Np1 -i "${srcdir}/st-private_correct_fix_memory_leak.patch"
   patch -Np1 -i "${srcdir}/0001-Don-t-crash-when-removing-nameless-user.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
diff --git a/extra/gnome-shell/st-private_correct_fix_memory_leak.patch b/extra/gnome-shell/st-private_correct_fix_memory_leak.patch
new file mode 100644
index 000000000..d3f887c29
--- /dev/null
+++ b/extra/gnome-shell/st-private_correct_fix_memory_leak.patch
@@ -0,0 +1,52 @@
+From c975740f9228b2c53d79ac08ad704fca5f1c5b6e Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Wed, 11 May 2011 15:21:18 +0000
+Subject: st-private: Correct fix for memory leak
+
+The previous fix in 72f9f482d was wrong; we need to keep around
+the buffer until cairo is done with the pattern.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=649497
+---
+diff --git a/src/st/st-private.c b/src/st/st-private.c
+index 51798a1..21ca09a 100644
+--- a/src/st/st-private.c
++++ b/src/st/st-private.c
+@@ -667,6 +667,7 @@ cairo_pattern_t *
+ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
+                                  cairo_pattern_t *src_pattern)
+ {
++  static cairo_user_data_key_t shadow_pattern_user_data;
+   cairo_t *cr;
+   cairo_surface_t *src_surface;
+   cairo_surface_t *surface_in;
+@@ -728,6 +729,8 @@ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
+                                                      width_out,
+                                                      height_out,
+                                                      rowstride_out);
++  cairo_surface_set_user_data (surface_out, &shadow_pattern_user_data,
++                               pixels_out, (cairo_destroy_func_t) g_free);
+ 
+   dst_pattern = cairo_pattern_create_for_surface (surface_out);
+   cairo_surface_destroy (surface_out);
+@@ -745,8 +748,7 @@ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
+                               (width_out - width_in) / 2.0,
+                               (height_out - height_in) / 2.0);
+       cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
+-
+-      goto out;
++      return dst_pattern;
+     }
+ 
+   /* Read all the code from the cairo_pattern_set_matrix call
+@@ -784,8 +786,6 @@ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
+ 
+   cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
+ 
+- out:
+-  g_free (pixels_out);
+   return dst_pattern;
+ }
+ 
+--
+cgit v0.9
diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD
index 39abc3f5e..3474b4c22 100644
--- a/extra/gnome-vfs/PKGBUILD
+++ b/extra/gnome-vfs/PKGBUILD
@@ -1,18 +1,15 @@
-# $Id: PKGBUILD 119776 2011-04-15 07:50:36Z jgc $
+# $Id: PKGBUILD 122580 2011-05-04 18:07:34Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-vfs
 pkgver=2.24.4
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'heimdal' 'gnutls')
+depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
-options=('!libtool' '!emptydirs' '!makeflags')
-conflicts=(gnome-vfs-samba)
-provides=(gnome-vfs-samba)
-replaces=(gnome-vfs-samba gnome-vfs-extras)
+options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-vfs.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
@@ -36,6 +33,10 @@ build() {
       --enable-avahi --disable-howl \
       --disable-openssl --enable-gnutls
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 3fd2a00e1..120a3402d 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 110525 2011-02-19 18:19:40Z bisson $
+# $Id: PKGBUILD 123442 2011-05-11 13:08:33Z bisson $
 # Maintainer: kevin <kevin@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
-pkgver=2.26.3
-pkgrel=3
+pkgver=2.28.0
+pkgrel=1
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
@@ -23,7 +24,7 @@ optdepends=('mono: sharp bindings'
             'tcl: tcl bindings')
 source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
         'LICENSE')
-sha1sums=('04503ac5a9eaa579859f0d017811fa245717edec'
+sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d'
           'e78277e502c29abb74b9587a5dc951ec392554ea')
 
 options=('!libtool')
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 08615d760..e67d63520 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 117444 2011-04-02 06:12:32Z ibiru $
+# $Id: PKGBUILD 122323 2011-05-03 20:18:27Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
 pkgver=2.24.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
-makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'heimdal' 'gnutls'
+makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls'
              'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
 options=('!libtool' '!docs')
 license=('LGPL')
@@ -29,7 +29,7 @@ build() {
 package_gtk2() {
     pkgdesc="The GTK+ Toolkit (v2)"
     install=gtk2.install
-    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'heimdal' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
+    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
     backup=(etc/gtk-2.0/gtkrc)
 
     cd "${srcdir}/gtk+-${pkgver}"
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index 7c3a55dba..5550647fc 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 119847 2011-04-15 22:42:57Z ibiru $
+# $Id: PKGBUILD 122547 2011-05-04 14:30:27Z stephane $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
 pkgver=3.0.9
-pkgrel=1
+pkgrel=2
 pkgdesc="The GTK+ Toolkit (v3)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'gnutls' 'heimdal' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info')
+depends=('atk' 'cairo' 'gtk-update-icon-cache' 'gnutls' 'krb5' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info')
 makedepends=('gobject-introspection')
 options=('!libtool' '!docs')
 backup=(etc/gtk-3.0/settings.ini)
diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD
index 6d634fb80..602d12bb4 100644
--- a/extra/gutenprint/PKGBUILD
+++ b/extra/gutenprint/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122412 2011-05-04 06:25:40Z andyrtr $
+# $Id: PKGBUILD 123069 2011-05-07 23:28:40Z stephane $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gutenprint
 pkgver=5.2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Top quality printer drivers for POSIX systems"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index b6a8f2be3..6e7524f53 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 114724 2011-03-15 19:35:12Z andyrtr $
+# $Id: PKGBUILD 123623 2011-05-11 21:09:44Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Art Gramlich <art@gramlich-net.com>
 
 pkgname=icu
 pkgver=4.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="International Components for Unicode library"
 arch=(i686 x86_64)
 url="http://www.icu-project.org/"
@@ -12,11 +12,15 @@ license=('custom:"icu"')
 depends=('gcc-libs' 'sh')
 source=(http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
 	#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
+	icu.8198.revert.icu5431.patch
 )
-md5sums=('da64675d85f0c2191cef93a8cb5eea88')
+md5sums=('da64675d85f0c2191cef93a8cb5eea88'
+         'ebd5470fc969c75e52baf4af94a9ee82')
 
 build() {
   cd ${srcdir}/icu/source
+  # fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200
+  patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--mandir=/usr/share/man
diff --git a/extra/icu/icu.8198.revert.icu5431.patch b/extra/icu/icu.8198.revert.icu5431.patch
new file mode 100644
index 000000000..4c3e78b8e
--- /dev/null
+++ b/extra/icu/icu.8198.revert.icu5431.patch
@@ -0,0 +1,129 @@
+Index: icu/trunk/source/layout/IndicReordering.cpp

+===================================================================

+--- icu/trunk/source/layout/IndicReordering.cpp	(revision 25772)

++++ icu/trunk/source/layout/IndicReordering.cpp	(revision 26090)

+@@ -126,4 +126,8 @@

+     FeatureMask fSMFeatures;

+ 

++    LEUnicode   fPreBaseConsonant;

++    LEUnicode   fPreBaseVirama;

++    le_int32    fPBCIndex;

++    FeatureMask fPBCFeatures;

+ 

+     void saveMatra(LEUnicode matra, le_int32 matraIndex, IndicClassTable::CharClass matraClass)

+@@ -172,5 +176,6 @@

+           fMatraFeatures(0), fMPreOutIndex(-1), fMPreFixups(mpreFixups),

+           fVMabove(0), fVMpost(0), fVMIndex(0), fVMFeatures(0),

+-          fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0)

++          fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0),

++          fPreBaseConsonant(0), fPreBaseVirama(0), fPBCIndex(0), fPBCFeatures(0)

+     {

+         // nothing else to do...

+@@ -191,4 +196,6 @@

+         fVMabove = fVMpost  = 0;

+         fSMabove = fSMbelow = 0;

++

++        fPreBaseConsonant = fPreBaseVirama = 0;

+     }

+ 

+@@ -386,4 +393,12 @@

+     }

+ 

++    void notePreBaseConsonant(le_uint32 index,LEUnicode PBConsonant, LEUnicode PBVirama, FeatureMask features)

++    {

++        fPBCIndex = index;

++        fPreBaseConsonant = PBConsonant;

++        fPreBaseVirama = PBVirama;

++        fPBCFeatures = features;

++    }

++

+     void noteBaseConsonant()

+     {

+@@ -465,4 +480,20 @@

+     }

+     

++    void writePreBaseConsonant()

++    {

++        // The TDIL spec says that consonant + virama + RRA should produce a rakar in Malayalam.  However,

++        // it seems that almost none of the fonts for Malayalam are set up to handle this.

++        // So, we're going to force the issue here by using the rakar as defined with RA in most fonts.

++

++        if (fPreBaseConsonant == 0x0d31) { // RRA

++            fPreBaseConsonant = 0x0d30; // RA

++        }

++        

++        if (fPreBaseConsonant != 0) {

++            writeChar(fPreBaseConsonant, fPBCIndex, fPBCFeatures);

++            writeChar(fPreBaseVirama,fPBCIndex-1,fPBCFeatures);

++        }

++    }

++

+     le_int32 getOutputIndex()

+     {

+@@ -723,4 +754,5 @@

+             }

+ 

++            

+             IndicClassTable::CharClass charClass = CC_RESERVED;

+             IndicClassTable::CharClass nextClass = CC_RESERVED;

+@@ -730,7 +762,9 @@

+             le_bool  seenVattu = FALSE;

+             le_bool  seenBelowBaseForm = FALSE;

++            le_bool  seenPreBaseForm = FALSE;

+             le_bool  hasNukta = FALSE;

+             le_bool  hasBelowBaseForm = FALSE;

+             le_bool  hasPostBaseForm = FALSE;

++            le_bool  hasPreBaseForm = FALSE;

+ 

+             if (postBase < markStart && classTable->isNukta(chars[postBase])) {

+@@ -746,12 +780,20 @@

+                 hasBelowBaseForm = IndicClassTable::hasBelowBaseForm(charClass) && !hasNukta;

+                 hasPostBaseForm  = IndicClassTable::hasPostBaseForm(charClass)  && !hasNukta;

++                hasPreBaseForm = IndicClassTable::hasPreBaseForm(charClass) && !hasNukta;

+ 

+                 if (IndicClassTable::isConsonant(charClass)) {

+                     if (postBaseLimit == 0 || seenVattu ||

+                         (baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) ||

+-                        !(hasBelowBaseForm || hasPostBaseForm)) {

++                        !(hasBelowBaseForm || hasPostBaseForm || hasPreBaseForm)) {

+                         break;

+                     }

+ 

++                    // Note any pre-base consonants

++                    if ( baseConsonant == lastConsonant && lastConsonant > 0 && 

++                         hasPreBaseForm && classTable->isVirama(chars[baseConsonant - 1])) {

++                        output.notePreBaseConsonant(lastConsonant,chars[lastConsonant],chars[lastConsonant-1],tagArray2);

++                        seenPreBaseForm = TRUE;

++   

++                    }

+                     // consonants with nuktas are never vattus

+                     seenVattu = IndicClassTable::isVattu(charClass) && !hasNukta;

+@@ -786,10 +828,12 @@

+ 

+             // write any pre-base consonants

++            output.writePreBaseConsonant();

++

+             le_bool supressVattu = TRUE;

+ 

+             for (i = baseLimit; i < baseConsonant; i += 1) {

+                 LEUnicode ch = chars[i];

+-                // Don't put 'blwf' on first consonant.

+-                FeatureMask features = (i == baseLimit? tagArray2 : tagArray1);

++                // Don't put 'pstf' or 'blwf' on anything before the base consonant.

++                FeatureMask features = tagArray1 & ~( pstfFeatureMask | blwfFeatureMask );

+ 

+                 charClass = classTable->getCharClass(ch);

+@@ -842,5 +886,5 @@

+ 

+             // write below-base consonants

+-            if (baseConsonant != lastConsonant) {

++            if (baseConsonant != lastConsonant && !seenPreBaseForm) {

+                 for (i = bcSpan + 1; i < postBase; i += 1) {

+                     output.writeChar(chars[i], i, tagArray1);

+@@ -872,5 +916,5 @@

+             // write post-base consonants

+             // FIXME: does this put the right tags on post-base consonants?

+-            if (baseConsonant != lastConsonant) {

++            if (baseConsonant != lastConsonant && !seenPreBaseForm) {

+                 if (postBase <= lastConsonant) {

+                     for (i = postBase; i <= lastConsonant; i += 1) {

diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index fda93d318..0f4a867d4 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 122716 2011-05-06 07:29:37Z andrea $
+# $Id: PKGBUILD 122843 2011-05-06 11:48:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
 pkgver=4.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'heimdal'
+depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
         'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
         'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
diff --git a/extra/libgnomecups/PKGBUILD b/extra/libgnomecups/PKGBUILD
index 2a510ccde..157e18f50 100644
--- a/extra/libgnomecups/PKGBUILD
+++ b/extra/libgnomecups/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 75341 2010-04-01 10:56:43Z allan $
+# $Id: PKGBUILD 122592 2011-05-04 18:48:08Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Paulius Palevicius <paulius@birzai.com>
 
 pkgname=libgnomecups
 pkgver=0.2.3
-pkgrel=7
+pkgrel=8
 pkgdesc="GNOME cups library"
 arch=(i686 x86_64)
 license=('LGPL' 'GPL')
 url="http://www.gnome.org"
-depends=('libcups>=1.3.8-2' 'glib2>=2.16.4' 'heimdal>=1.3.1' 'gnutls>=2.4.1')
+depends=('libcups' 'glib2' 'krb5' 'gnutls')
 makedepends=('perlxml')
 options=(!libtool)
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2
@@ -20,8 +20,12 @@ md5sums=('dc4920c15c9f886f73ea74fbff0ae48b'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   # This avoids generating huge 'IPP request failed with status 1030' lines
-  patch -Np1 -i ${srcdir}/libgnomecups_0.2.3-ignore-ipp-not-found.patch || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  patch -Np1 -i ${srcdir}/libgnomecups_0.2.3-ignore-ipp-not-found.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libgnomeprint/PKGBUILD b/extra/libgnomeprint/PKGBUILD
index af1265592..db2bfedcd 100644
--- a/extra/libgnomeprint/PKGBUILD
+++ b/extra/libgnomeprint/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 91999 2010-09-28 16:38:45Z ibiru $
+# $Id: PKGBUILD 122595 2011-05-04 18:55:04Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnomeprint
 pkgver=2.18.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Printing routines for GNOME"
 arch=(i686 x86_64)
 license=('LGPL' 'GPL')
-depends=('pango>=1.28.1' 'libart-lgpl>=2.3.21' 'libxml2>=2.7.7' 'libgnomecups>=0.2.3-4' 'heimdal>=1.3.3' 'gnutls>=2.8.6')
+depends=('pango' 'libart-lgpl' 'libxml2' 'libgnomecups' 'krb5' 'gnutls')
 makedepends=('intltool' 'pkgconfig')
 replaces=('libgnomeprint-cups')
 conflicts=('libgnomeprint-cups')
@@ -20,5 +20,9 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index c9bc4d702..849b1bf09 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 122501 2011-05-04 10:25:04Z ronald $
+# $Id: PKGBUILD 123432 2011-05-11 11:09:27Z juergen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
 pkgver=5.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://maxima.sourceforge.net"
-depends=('sbcl=1.0.47' 'texinfo' 'sh')
+depends=('sbcl=1.0.48' 'texinfo' 'sh')
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
 # needs rebuild when bash changes version
diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD
index 659fb1951..9a940857c 100644
--- a/extra/mutt/PKGBUILD
+++ b/extra/mutt/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 116680 2011-03-24 21:41:03Z bisson $
+# $Id: PKGBUILD 121107 2011-04-29 00:34:05Z stephane $
 # Contributor: tobias [tobias [at] archlinux.org]
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=mutt
 pkgver=1.5.21
-pkgrel=4
+pkgrel=5
 pkgdesc='Small but very powerful text-based mail client'
 url='http://www.mutt.org/'
 license=('GPL')
 backup=('etc/Muttrc')
 arch=('i686' 'x86_64')
-depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'heimdal')
+depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5')
 source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9')
 
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 4add473fa..0f40309d1 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 120688 2011-04-25 23:12:25Z ibiru $
+# $Id: PKGBUILD 123610 2011-05-11 18:27:48Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A window manager for GNOME3"
 arch=(i686 x86_64)
 license=('GPL')
@@ -15,11 +15,14 @@ url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+        squash_some_leaks.patch)
+sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708'
+            'dda962cfd884ffbe2c3c4a86641964228d7b04ef30e19bb2894c4398fa4c296a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/squash_some_leaks.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/mutter \
       --localstatedir=/var --disable-static
diff --git a/extra/mutter/squash_some_leaks.patch b/extra/mutter/squash_some_leaks.patch
new file mode 100644
index 000000000..0e6b506bc
--- /dev/null
+++ b/extra/mutter/squash_some_leaks.patch
@@ -0,0 +1,70 @@
+From 65963748860aec8e3d7ee939b3b16876f4117904 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 05 May 2011 20:11:02 +0000
+Subject: region-utils.c: Squash a memory leak
+
+"chunk" was an allocated but unused variable.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=649504
+---
+diff --git a/src/compositor/region-utils.c b/src/compositor/region-utils.c
+index b4071ca..cf3c64e 100644
+--- a/src/compositor/region-utils.c
++++ b/src/compositor/region-utils.c
+@@ -248,7 +248,6 @@ expand_region_inverse (cairo_region_t *region,
+   MetaRegionBuilder builder;
+   MetaRegionIterator iter;
+   cairo_rectangle_int_t extents;
+-  cairo_region_t *chunk;
+ 
+   int last_x;
+ 
+@@ -268,16 +267,11 @@ expand_region_inverse (cairo_region_t *region,
+                      extents.x, extents.y + extents.height, extents.width, 1,
+                      x_amount, y_amount, flip);
+ 
+-  chunk = NULL;
+-
+   last_x = extents.x;
+   for (meta_region_iterator_init (&iter, region);
+        !meta_region_iterator_at_end (&iter);
+        meta_region_iterator_next (&iter))
+     {
+-      if (chunk == NULL)
+-        chunk = cairo_region_create ();
+-
+       if (iter.rectangle.x > last_x)
+         add_expanded_rect (&builder,
+                            last_x, iter.rectangle.y,
+--
+cgit v0.9
+From d0414a3ea697738dcdf2641b6a8000df35215862 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 05 May 2011 20:46:00 +0000
+Subject: theme.c: Squash memory leak
+
+When converting a token to a different type, we need to free its
+string.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=649500
+---
+diff --git a/src/ui/theme.c b/src/ui/theme.c
+index 0077388..9305645 100644
+--- a/src/ui/theme.c
++++ b/src/ui/theme.c
+@@ -2639,11 +2639,13 @@ meta_theme_replace_constants (MetaTheme   *theme,
+         {
+           if (meta_theme_lookup_int_constant (theme, t->d.v.name, &ival))
+             {
++              g_free (t->d.v.name);
+               t->type = POS_TOKEN_INT;
+               t->d.i.val = ival;
+             }
+           else if (meta_theme_lookup_float_constant (theme, t->d.v.name, &dval))
+             {
++              g_free (t->d.v.name);
+               t->type = POS_TOKEN_DOUBLE;
+               t->d.d.val = dval;
+             }
+--
+cgit v0.9
diff --git a/extra/neon/PKGBUILD b/extra/neon/PKGBUILD
index c87a5f0c2..c0fe650cf 100644
--- a/extra/neon/PKGBUILD
+++ b/extra/neon/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 77208 2010-04-11 13:31:45Z pierre $
+# $Id: PKGBUILD 121086 2011-04-29 00:26:05Z stephane $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 # KEEP LIBTOOL FILES!
 pkgname=neon
 pkgver=0.29.3
-pkgrel=2
+pkgrel=3
 pkgdesc="HTTP and WebDAV client library with a C interface"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
-depends=('heimdal' 'expat' 'ca-certificates')
+depends=('krb5' 'expat' 'ca-certificates')
 url="http://www.webdav.org/neon/"
 source=("http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz")
 md5sums=('ba1015b59c112d44d7797b62fe7bee51')
@@ -20,7 +20,7 @@ build() {
   ./configure --prefix=/usr \
     --with-expat --enable-shared --disable-static \
     --with-ssl=openssl --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-  make || return 1
+  make
 }
 
 package() {
diff --git a/extra/nss_ldap/PKGBUILD b/extra/nss_ldap/PKGBUILD
index 299f8413e..0a1f93d38 100644
--- a/extra/nss_ldap/PKGBUILD
+++ b/extra/nss_ldap/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 109106 2011-02-06 10:18:06Z andyrtr $
+# $Id: PKGBUILD 121171 2011-04-29 06:45:19Z stephane $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Comete <la_comete@tiscali.fr>
 
 pkgname=nss_ldap
 pkgver=265
-pkgrel=1
+pkgrel=2
 pkgdesc="The nss_ldap module provides the means for Linux and Solaris workstations to resolve the entities defined in RFC 2307 from LDAP directories."
 arch=(i686 x86_64)
 url="http://www.padl.com/OSS/nss_ldap.html"
 license=('LGPL')
-depends=('libldap>=2.4.18' 'heimdal>=1.2.1')
+depends=('libldap>=2.4.18' 'krb5')
 backup=("etc/nss_ldap.conf")
 source=(http://www.padl.com/download/${pkgname}-${pkgver}.tar.gz)
 md5sums=('c1cb02d1a85538cf16bca6f6a562abe4')
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 070c3f169..6bd883503 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 116932 2011-03-26 14:54:05Z tpowa $
+# $Id: PKGBUILD 122577 2011-05-04 17:48:52Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
@@ -8,16 +8,16 @@ pkgver=3.5.8
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.5.8
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
-makedepends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb')
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb')
 options=(!makeflags)
 source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
-        samba samba.logrotate 
-        swat.xinetd 
-        samba.pam 
+        samba samba.logrotate
+        swat.xinetd
+        samba.pam
         samba.conf.d
         fix-ipv6-mount.patch)
 ### UNINSTALL dmapi package before building!!!
@@ -44,12 +44,12 @@ build() {
               --disable-avahi \
               --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \
               --enable-external-libtdb
-  make || return 1
+  make
 }
 
 package_smbclient () {
 pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('readline>=6.0.00' 'popt' 'libldap>=2.4.18-1' 'cifs-utils' 'libcap>=2.16' 'heimdal>=1.2-1' 'db>=4.7' 'e2fsprogs' 'tdb' 'talloc')
+depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc')
   cd ${srcdir}/${pkgbase}-${_realver}/source3
   mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
   install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
@@ -72,17 +72,17 @@ depends=('readline>=6.0.00' 'popt' 'libldap>=2.4.18-1' 'cifs-utils' 'libcap>=2.1
 
 package_samba () {
 pkgdesc="Tools to access a server's filespace and printers via SMB"
-backup=(etc/logrotate.d/samba 
-        etc/pam.d/samba 
+backup=(etc/logrotate.d/samba
+        etc/pam.d/samba
         etc/samba/smb.conf
         etc/xinetd.d/swat
         etc/conf.d/samba)
-depends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'fam' 'gnutls>=2.4.1' 'e2fsprogs' 'tdb' 'talloc')
+depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
   cd ${srcdir}/samba-${_realver}/source3
   mkdir -p ${pkgdir}/var/log/samba
   mkdir -p ${pkgdir}/etc/samba/private
   chmod 700 ${pkgdir}/etc/samba/private
-  make DESTDIR=${pkgdir} install 
+  make DESTDIR=${pkgdir} install
   chmod 644 ${pkgdir}/usr/include/*.h
   rm -rf ${pkgdir}/usr/var
   (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index c54bc6df9..e2e922778 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 117231 2011-03-30 10:39:06Z juergen $
+# $Id: PKGBUILD 123411 2011-05-11 09:13:37Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher) 
 
 pkgname=sbcl
-pkgver=1.0.47
+pkgver=1.0.48
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('glibc')
 provides=('common-lisp' 'cl-asdf')
 makedepends=('sbcl' 'texinfo')
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp")
-md5sums=('2e90fca5ffec9ce19ed232b24f09cd0a'
+md5sums=('f60f27bcc04d1c9241562aafe4ee5d4a'
          '7ac0c1936547f4278198b8bf7725204d')
 url="http://www.sbcl.org/"
 install=sbcl.install
diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD
index 308051009..c04443584 100644
--- a/extra/sharutils/PKGBUILD
+++ b/extra/sharutils/PKGBUILD
@@ -1,32 +1,32 @@
-# $Id: PKGBUILD 98391 2010-11-08 19:40:29Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 123635 2011-05-11 23:31:36Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sharutils
-pkgver=4.10
+pkgver=4.11.1
 pkgrel=1
-pkgdesc="GNU shar makes so-called shell archives out of many files"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/sharutils/"
+pkgdesc='Makes so-called shell archives out of many files'
+url='http://www.gnu.org/software/sharutils/'
 license=('GPL')
+arch=('i686' 'x86_64')
 depends=('perl' 'gettext' 'texinfo')
-install=${pkgname}.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('f918859228238d69e1ce78ccbec8f9e0')
+source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('e9c9f869f8ecb3bcb30cc323e02e0a1266aeb109')
+
+install=install
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --infodir=/usr/share/info \
-    --disable-nls
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+
+	make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  rm ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/sharutils/install b/extra/sharutils/install
new file mode 100644
index 000000000..1de76964c
--- /dev/null
+++ b/extra/sharutils/install
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+filelist=(sharutils.info.gz)
+
+post_install() {
+	for file in ${filelist[@]}; do
+		install-info $infodir/$file $infodir/dir
+	done
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	for file in ${filelist[@]}; do
+		install-info --delete $infodir/$file $infodir/dir
+	done
+}
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 8465f232d..0f9c0a70a 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 103462 2010-12-19 17:12:50Z paul $
+# $Id: PKGBUILD 121110 2011-04-29 01:29:30Z stephane $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
 pkgver=1.6.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Replacement for CVS, another versioning system (SVN)"
 arch=('i686' 'x86_64')
 license=('apache' 'bsd')
 depends=('neon' 'apr-util')
-makedepends=('heimdal' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 
+makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 
              'autoconf' 'sqlite3' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
 source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
         svnserve svn svnserve.conf svnmerge.py
diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD
index 01b065caa..534995696 100644
--- a/extra/telepathy-mission-control/PKGBUILD
+++ b/extra/telepathy-mission-control/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 123367 2011-05-10 16:31:02Z ibiru $
+# $Id: PKGBUILD 123605 2011-05-11 18:21:04Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Ju Liu <liuju86 at gmail dot com>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 # Contributor: Andreas Zwinkau <beza1e1@web.de>
 pkgname=telepathy-mission-control
-pkgver=5.7.10
+pkgver=5.7.11
 pkgrel=1
 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers."
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-glib' 'libgnome-keyring')
 makedepends=('libxslt' 'python2')
 options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz)
-md5sums=('2793b7502c9a88dd1c7468c684bb7a5f')
+md5sums=('d4b37aa43f391c34d033b1af5ab32e6d')
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 242452147..a83355164 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 120079 2011-04-19 13:10:40Z guillaume $
+# $Id: PKGBUILD 121168 2011-04-29 06:39:53Z stephane $
 # Maintainer: Guillaume ALAUX <guillaume at alaux dot net>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=(wireshark-cli wireshark-gtk)
 pkgbase=wireshark
 pkgver=1.4.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'heimdal' 'libpcap' 'bash' 'gnutls' 'libcap')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap')
 url="http://www.wireshark.org/"
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
@@ -23,7 +23,7 @@ build() {
 
 package_wireshark-cli() {
   pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version"
-  depends=('heimdal' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2')
+  depends=('krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2')
   install=wireshark.install
   conflicts=(wireshark)
 
diff --git a/extra/xfprint/PKGBUILD b/extra/xfprint/PKGBUILD
index 71e48bd8d..1d622e190 100644
--- a/extra/xfprint/PKGBUILD
+++ b/extra/xfprint/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 85560 2010-07-15 21:39:23Z andyrtr $
+# $Id: PKGBUILD 122851 2011-05-06 14:01:10Z stephane $
 # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfprint
 pkgver=4.6.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A print dialog and a printer manager for Xfce"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://www.xfce.org/"
 groups=('xfce4')
-depends=("libxfcegui4>=$pkgver" "xfconf>=$pkgver" 'libcups>=1.3.10' 'a2ps' 'heimdal>=1.3.1'
+depends=("libxfcegui4>=$pkgver" "xfconf>=$pkgver" 'libcups>=1.3.10' 'a2ps' 'krb5'
          'gnutls>=2.6.5' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
-	xfprint-manager-fix.diff)
+source=(http://archive.xfce.org/xfce/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
+        xfprint-manager-fix.diff)
 md5sums=('d92fca97a42816085080baf07a99a62e'
          '69b3619a285e94d602a1d0ac08f4ca06')