Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/chmsee/PKGBUILD
	community/flumotion/PKGBUILD
	community/gnash/PKGBUILD
	community/kadu/PKGBUILD
	community/mythplugins/PKGBUILD
	community/performous/PKGBUILD
	community/sleuthkit/PKGBUILD
	community/virtualbox/PKGBUILD
	community/wbar/PKGBUILD
	core/attr/PKGBUILD
	core/binutils/PKGBUILD
	core/heimdal/PKGBUILD
	core/sqlite3/PKGBUILD
	extra/acpid/PKGBUILD
	extra/apache-ant/PKGBUILD
	extra/aria2/PKGBUILD
	extra/boost/PKGBUILD
	extra/bs/PKGBUILD
	extra/bzr/PKGBUILD
	extra/cvsps/PKGBUILD
	extra/dosbox/PKGBUILD
	extra/ettercap-gtk/PKGBUILD
	extra/fetchmail/PKGBUILD
	extra/gnome-desktop-sharp/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gptfdisk/PKGBUILD
	extra/gqmpeg/PKGBUILD
	extra/gstreamer0.10-base/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk-theme-switch2/PKGBUILD
	extra/icecast/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kmldonkey/PKGBUILD
	extra/kmplayer/PKGBUILD
	extra/libbtctl/PKGBUILD
	extra/libftdi/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libx86/PKGBUILD
	extra/lsdvd/PKGBUILD
	extra/mc/PKGBUILD
	extra/monotone/PKGBUILD
	extra/multitail/PKGBUILD
	extra/nbsmtp/PKGBUILD
	extra/nickle/PKGBUILD
	extra/nppangband/PKGBUILD
	extra/numlockx/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/poppler/PKGBUILD
	extra/python-gtkglext/PKGBUILD
	extra/scim/PKGBUILD
	extra/socat/PKGBUILD
	extra/speedcrunch/PKGBUILD
	extra/transmission/PKGBUILD
	extra/vbetool/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xchat-gnome/xchat-gnome.install
	libre/kernel26-libre/PKGBUILD
	libre/pacman/PKGBUILD
	libre/xchat-gnome-libre/PKGBUILD
	libre/xchat-gnome-libre/gtk2-2.20.patch
	libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
	libre/xchat-gnome-libre/xchat-gnome.install
	multilib/nspluginwrapper/PKGBUILD
	testing/libgweather/libgweather.install
	testing/mesa/PKGBUILD

46 files changed, 493 insertions, 1045 deletions

diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD
index 35c6ba0c1..dd6ffd124 100644
--- a/core/acl/PKGBUILD
+++ b/core/acl/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 105458 2011-01-09 04:03:58Z stephane $
+# $Id: PKGBUILD 123916 2011-05-14 10:31:07Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=acl
-pkgver=2.2.49
-pkgrel=2
+pkgver=2.2.51
+pkgrel=1
 pkgdesc="Access control list utilities, libraries and headers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/acl"
 license=('LGPL')
-depends=('attr>=2.4.41')
+depends=('attr>=2.4.46')
 replaces=('xfsacl')
 provides=('xfsacl')
 conflicts=('xfsacl')
 options=('!libtool')
-source=(http://mirrors.zerg.biz/nongnu/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
-sha256sums=('b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5')
+source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
+sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}"/${pkgname}-${pkgver}
 
   export INSTALL_USER=root INSTALL_GROUP=root 
   ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib
@@ -28,6 +28,7 @@ package() {
 
   make DIST_ROOT="${pkgdir}" install install-lib install-dev
 
-  rm ${pkgdir}/lib/libacl.a
+  # tidy up
+  rm -f ${pkgdir}/lib/libacl.a
   chmod 0755 ${pkgdir}/lib/libacl.so.*.*.*
 }
diff --git a/core/attr/PKGBUILD b/core/attr/PKGBUILD
index 3a9ea3204..30f3ad81a 100644
--- a/core/attr/PKGBUILD
+++ b/core/attr/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 115738 2011-03-20 22:30:28Z allan $
+# $Id: PKGBUILD 123916 2011-05-14 10:31:07Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=attr
-pkgver=2.4.44
-pkgrel=3
+pkgver=2.4.46
+pkgrel=1
 pkgdesc="Extended attribute support library for ACL support"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://oss.sgi.com/projects/xfs/"
+arch=('i686' 'x86_64')
+url="http://savannah.nongnu.org/projects/attr"
 license=('LGPL')
 depends=('glibc') 
 makedepends=('gettext')
@@ -13,32 +13,25 @@ replaces=('xfsattr')
 provides=('xfsattr')
 conflicts=('xfsattr')
 options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/attr/attr-${pkgver}.src.tar.gz)
-sha256sums=('e01fa00686072a02dddf994e6217be950f51c1dc0852ad2e210c48b6e8de793a')
+source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
+sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f')
 
 build() {
-  cd $srcdir/attr-$pkgver 
+  cd "${srcdir}"/${pkgname}-${pkgver}
   
-  # prevent binaries being owned by nobody:nobody
-  sed -i 's#-o $(PKG_USER) -g $(PKG_GROUP)##' include/buildmacros
-  
-  autoconf
-  ./configure --prefix=/usr 
-  sed -i -e 's/man2//g' man/Makefile
+  export INSTALL_USER=root INSTALL_GROUP=root
+  ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib
   make
 }
 
 package() {
-  cd $srcdir/attr-$pkgver
-  make prefix=${pkgdir}/usr install install-lib install-dev
-
-  # tidy up
-  cd "${pkgdir}"
+  cd "${srcdir}"/${pkgname}-${pkgver}
 
-  install -dm755 lib
-  mv -v usr/lib/libattr.so* lib/
-  ln -sv ../../lib/libattr.so.1 usr/lib/libattr.so
+  make DIST_ROOT="${pkgdir}" install install-lib install-dev
 
-  mv -v usr/libexec/libattr.{a,la} usr/lib/
-  rm -rvf usr/libexec
+  # tidy up
+  rm -f "${pkgdir}"/lib/libattr.a
+  chmod 0755 "${pkgdir}"/lib/libattr.so.*.*.*
+  # remove conflicting manpages
+  rm -rf "${pkgdir}"/usr/share/man/man2
 }
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index bf54f3bb2..8de32e57a 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 121290 2011-04-30 08:22:29Z allan $
+# $Id: PKGBUILD 123424 2011-05-11 10:41:25Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
-pkgver=2.21.51
-pkgrel=6
-_date=20110428
+pkgver=2.21
+pkgrel=8
+_date=20110430
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/binutils/"
@@ -16,9 +16,10 @@ depends=('glibc>=2.13' 'zlib')
 makedepends=('dejagnu')
 options=('!libtool' '!distcc' '!ccache')
 install=binutils.install
-#source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
-#md5sums=('884dcbc87d4722b152aea72312356da1')
-source=(ftp://sourceware.org/pub/$pkgname/snapshots/$pkgname-$pkgver.tar.bz2)
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2
+        binutils-2.21-strip-segfault.patch)
+md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec'
+         '98e8dfaf1c0ededa586823ebfb27825a')
 
 mksource() {
   mkdir ${pkgname}-${_date}
@@ -31,18 +32,21 @@ mksource() {
 }
 
 build() {
+  cd ${srcdir}/binutils
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=12632 
+  patch -Np1 -i $srcdir/binutils-2.21-strip-segfault.patch
+
   cd ${srcdir}
- ln -s binutils-$pkgver binutils
- mkdir binutils-build
- cd binutils-build
+  mkdir binutils-build
+  cd binutils-build
 
   [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
   [[ $CARCH == "mips64el" ]] && CONFIGFLAG="--disable-multilib --disable-werror"
 
- ${srcdir}/binutils/configure --prefix=/usr \
-   --enable-ld=default --enable-gold \
-   --enable-plugins --enable-threads \
-   --enable-shared $CONFIGFLAG
+  ${srcdir}/binutils/configure --prefix=/usr \
+    --enable-ld=default --enable-gold \
+    --enable-plugins --enable-threads \
+    --enable-shared $CONFIGFLAG
 
   # This checks the host environment and makes sure all the necessary tools are available to compile Binutils.
   make configure-host
@@ -85,5 +89,3 @@ package() {
   echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
   echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
 }
-
-md5sums=('0d06cb7a0b58ff6108adeacc72be2972')
diff --git a/core/binutils/binutils-2.21-strip-segfault.patch b/core/binutils/binutils-2.21-strip-segfault.patch
new file mode 100644
index 000000000..0133d879b
--- /dev/null
+++ b/core/binutils/binutils-2.21-strip-segfault.patch
@@ -0,0 +1,96 @@
+diff --git a/binutils/objcopy.c b/binutils/objcopy.c
+index 15c4f95..b64f3d0 100644
+--- a/binutils/objcopy.c
++++ b/binutils/objcopy.c
+@@ -1,6 +1,6 @@
+ /* objcopy.c -- copy object file from input to output, optionally massaging it.
+    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
++   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+    Free Software Foundation, Inc.
+ 
+    This file is part of GNU Binutils.
+@@ -2024,6 +2024,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
+       struct stat buf;
+       int stat_status = 0;
+       bfd_boolean del = TRUE;
++      bfd_boolean ok_object;
+ 
+       /* Create an output file for this member.  */
+       output_name = concat (dir, "/",
+@@ -2061,44 +2062,42 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
+       l->obfd = NULL;
+       list = l;
+ 
+-      if (bfd_check_format (this_element, bfd_object))
++      ok_object = bfd_check_format (this_element, bfd_object);
++      if (!ok_object)
++	bfd_nonfatal_message (NULL, this_element, NULL,
++			      _("Unable to recognise the format of file"));
++
++      /* PR binutils/3110: Cope with archives
++	 containing multiple target types.  */
++      if (force_output_target || !ok_object)
++	output_bfd = bfd_openw (output_name, output_target);
++      else
++	output_bfd = bfd_openw (output_name, bfd_get_target (this_element));
++
++      if (output_bfd == NULL)
+ 	{
+-	  /* PR binutils/3110: Cope with archives
+-	     containing multiple target types.  */
+-	  if (force_output_target)
+-	    output_bfd = bfd_openw (output_name, output_target);
+-	  else
+-	    output_bfd = bfd_openw (output_name, bfd_get_target (this_element));
++	  bfd_nonfatal_message (output_name, NULL, NULL, NULL);
++	  status = 1;
++	  return;
++	}
++
++      if (ok_object)
++	{
++	  del = !copy_object (this_element, output_bfd, input_arch);
+ 
+-	  if (output_bfd == NULL)
++	  if (del && bfd_get_arch (this_element) == bfd_arch_unknown)
++	    /* Try again as an unknown object file.  */
++	    ok_object = FALSE;
++	  else if (!bfd_close (output_bfd))
+ 	    {
+ 	      bfd_nonfatal_message (output_name, NULL, NULL, NULL);
++	      /* Error in new object file. Don't change archive.  */
+ 	      status = 1;
+-	      return;
+ 	    }
+-
+- 	  del = ! copy_object (this_element, output_bfd, input_arch);
+-
+-	  if (! del
+-	      || bfd_get_arch (this_element) != bfd_arch_unknown)
+-	    {
+-	      if (!bfd_close (output_bfd))
+-		{
+-		  bfd_nonfatal_message (output_name, NULL, NULL, NULL);
+-		  /* Error in new object file. Don't change archive.  */
+-		  status = 1;
+-		}
+-	    }
+-	  else
+-	    goto copy_unknown_element;
+ 	}
+-      else
+-	{
+-	  bfd_nonfatal_message (NULL, this_element, NULL,
+-				_("Unable to recognise the format of file"));
+ 
+-	  output_bfd = bfd_openw (output_name, output_target);
+-copy_unknown_element:
++      if (!ok_object)
++	{
+ 	  del = !copy_unknown_object (this_element, output_bfd);
+ 	  if (!bfd_close_all_done (output_bfd))
+ 	    {
+-- 
+1.6.5.GIT
+
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 7c74491c8..9dc49b129 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 103928 2010-12-23 22:10:05Z thomas $
+# $Id: PKGBUILD 123894 2011-05-14 09:00:27Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=cryptsetup
-pkgver=1.2.0
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
         encrypt_hook
 	encrypt_install)
-sha256sums=('411129817ff29e6a957bcbdcd9a2c4c953c1539acd8af912c383262ba901b5ea'
+sha256sums=('c675059a25061851dcaf9732a2118d75585097c8fbb3985026526988e8d76394'
             '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc'
             '8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a')
 
diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD
index 17608e0fc..2038dd5b4 100644
--- a/core/file/PKGBUILD
+++ b/core/file/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 123428 2011-05-11 11:07:46Z allan $
+# $Id: PKGBUILD 123963 2011-05-15 08:19:29Z tpowa $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=file
 pkgver=5.07
-pkgrel=1
+pkgrel=3
 pkgdesc="File type identification utility"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -13,9 +13,11 @@ url="http://www.darwinsys.com/file/"
 depends=('glibc' 'zlib')
 options=('!libtool')
 source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz 
-        file-5.05-zip64.patch)
+        file-5.05-zip64.patch
+        file-5.07-zip-detect.patch)
 md5sums=('b8d1f9a8a644067bd0a703cebf3f4858'
-         '385f020467debd98bd2d8df6143f93d0')
+         '385f020467debd98bd2d8df6143f93d0'
+         'bcbf2e152f38003a2736298bbd0f37f8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,7 +25,7 @@ build() {
 
   # identify zip64 files
   patch -Np1 -i ${srcdir}/file-5.05-zip64.patch
-
+  patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch
   ./configure --prefix=/usr --datadir=/usr/share/file
   make 
 }
diff --git a/core/file/file-5.07-zip-detect.patch b/core/file/file-5.07-zip-detect.patch
new file mode 100644
index 000000000..3e8f128d8
--- /dev/null
+++ b/core/file/file-5.07-zip-detect.patch
@@ -0,0 +1,13 @@
+--- file-5.07/magic/Magdir/archive.old	2011-04-23 17:02:48.000000000 +0200
++++ file-5.07/magic/Magdir/archive	2011-05-15 10:14:44.509271579 +0200
+@@ -654,6 +654,10 @@
+ >>>>78	string	-template		Template
+ !:mime	application/vnd.oasis.opendocument.image-template
+ 
++>26 byte x Zip archive data
++
++
++
+ # StarView Metafile
+ # From Pierre Ducroquet <pinaraf@pinaraf.info>
+ 0	string	VCLMTF	StarView MetaFile
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 2302717db..a645abde4 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121304 2011-04-30 13:23:58Z allan $
+# $Id: PKGBUILD 123891 2011-05-14 08:26:23Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,8 +6,8 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
 pkgver=4.6.0
-pkgrel=4
-_snapshot=4.6-20110429
+pkgrel=5
+_snapshot=4.6-20110513
 _libstdcppmanver=20110201		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 license=('GPL' 'LGPL' 'custom')
@@ -23,13 +23,13 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,
 	gcc_pure64.patch
   gcc_mips64el_lib.patch
 	gcc-hash-style-both.patch)
-md5sums=('fa586a5634ae3b462c5fb2d55160b14f'
-         '2591b1fad977f7bd6136c9ac1298ef04'
-         '366f93c1867f35c8860b42965efde955'
-         '21779792ef7e0ed7abef611160b0099c'
-         'cf518c56b968925a2eca3aa2b4cdbd7b'
-         'f66ef8597b99961eda7573df505ea354'
-         '3d89dd233ceb6a837d14ee6b940a43ed'
+md5sums=('2be769db16ac02f30fb62423b4c50145'
+         'a310d230945f4b3093dd3ca72839c649'
+         '361a10c5a5545c80fd271b18036dd00c'
+         'f7db2f6ed34398361de62cb6b8eb53d2'
+         '9b69c1d8874e8496c1965ee3e32eaa6d'
+         '248e53b461078bf1c89528fb8e4ba051'
+         'e15a01b0d02ff12e975e4c2649e71e55'
          '1e9fd2eaf0ee47ea64e82c48998f1999'
          '4030ee1c08dd1e843c0225b772360e76'
          '67e337993d821d72fccacbed52d48c34'
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 8ca822c20..ed77bbb82 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 119742 2011-04-14 11:29:04Z ibiru $
+# $Id: PKGBUILD 124444 2011-05-21 07:53:58Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=glib2
-pkgver=2.28.6
+pkgver=2.28.7
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
@@ -14,7 +14,7 @@ options=('!libtool' '!docs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.bz2
         glib2.sh
         glib2.csh)
-sha256sums=('557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578'
+sha256sums=('0e1b3816a8934371d4ea2313dfbe25d10d16c950f8d02e0a7879ae10d91b1631'
             '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
             '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
 
diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD
index 4f429109b..59f4cc42a 100644
--- a/core/gmp/PKGBUILD
+++ b/core/gmp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 105599 2011-01-10 18:34:30Z stephane $
+# $Id: PKGBUILD 123886 2011-05-14 03:40:36Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gmp
-pkgver=5.0.1
-pkgrel=2
+pkgver=5.0.2
+pkgrel=1
 pkgdesc="A free library for arbitrary precision arithmetic"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gmplib.org/"
@@ -13,7 +13,7 @@ license=('LGPL3')
 options=(!libtool)
 install=gmp.install
 source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2)
-md5sums=('6bac6df75c192a13419dfd71d19240a7')
+md5sums=('0bbaedc82fb30315b06b1588b9077cd3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,6 +23,10 @@ build() {
     --prefix=/usr --infodir=/usr/share/info \
     --enable-cxx
   make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make check
 }
 
diff --git a/core/gmp/gmp.install b/core/gmp/gmp.install
index 1c31ab365..cad3354f9 100644
--- a/core/gmp/gmp.install
+++ b/core/gmp/gmp.install
@@ -1,4 +1,4 @@
-info_dir=/usr/share/info
+info_dir=usr/share/info
 info_files=(gmp.info gmp.info-1 gmp.info-2)
 
 post_install() {
diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD
index fe0917909..e81bd6921 100644
--- a/core/grep/PKGBUILD
+++ b/core/grep/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 91020 2010-09-21 03:26:36Z allan $
+# $Id: PKGBUILD 124062 2011-05-16 11:49:29Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=grep
-pkgver=2.7
+pkgver=2.8
 pkgrel=1
 pkgdesc="A string search utility"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,12 +14,16 @@ depends=('glibc' 'pcre' 'sh')
 makedepends=('texinfo')
 install=${pkgname}.install
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('6dd9931a52501519d7779a27cf953326')
+md5sums=('b59003c42b330bdabd417e00d07102da')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --bindir=/bin --without-included-regex
   make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make check
 }
 
diff --git a/core/grep/grep.install b/core/grep/grep.install
index ba97d8994..7cd31301f 100644
--- a/core/grep/grep.install
+++ b/core/grep/grep.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(grep.info)
 
 post_install() {
diff --git a/core/heimdal/001_all_heimdal-no_libedit.patch b/core/heimdal/001_all_heimdal-no_libedit.patch
deleted file mode 100644
index a551bdce1..000000000
--- a/core/heimdal/001_all_heimdal-no_libedit.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cf/krb-readline.m4	2005-06-16 18:28:32.000000000 +0200
-+++ cf/krb-readline.m4	2005-06-27 23:17:06.000000000 +0200
-@@ -6,7 +6,6 @@
- dnl el_init
- 
- AC_DEFUN([KRB_READLINE],[
--AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
- if test "$ac_cv_func_el_init" = yes ; then
- 	AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[
- 		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
diff --git a/core/heimdal/002_all_heimal-fPIC.patch b/core/heimdal/002_all_heimal-fPIC.patch
deleted file mode 100644
index c67dbae76..000000000
--- a/core/heimdal/002_all_heimal-fPIC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/editline/Makefile.am	2005-06-16 18:28:44.000000000 +0200
-+++ lib/editline/Makefile.am	2005-06-27 23:21:02.000000000 +0200
-@@ -41,6 +41,9 @@
- 
- EXTRA_DIST = $(man_MANS)
- 
-+$(libeditline_la_OBJECTS): %.lo: %.c
-+	$(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
- snprintf.c:
- 	$(LN_S) $(srcdir)/../roken/snprintf.c .
- strdup.c:
diff --git a/core/heimdal/003_all_heimdal-rxapps.patch b/core/heimdal/003_all_heimdal-rxapps.patch
deleted file mode 100644
index 40fc05f08..000000000
--- a/core/heimdal/003_all_heimdal-rxapps.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- appl/kx/rxtelnet.in	2005-06-16 18:29:10.000000000 +0200
-+++ appl/kx/rxtelnet.in	2005-06-27 23:21:34.000000000 +0200
-@@ -2,7 +2,7 @@
- # $Id: rxtelnet.in,v 1.31 2004/03/07 17:22:06 lha Exp $
- #
- usage="Usage: $0 [-l username] [-k] [-fF] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
--binary=telnet
-+binary=ktelnet
- term=
- kx_args=-P
- while true
---- appl/kx/rxterm.in	2005-06-16 18:29:10.000000000 +0200
-+++ appl/kx/rxterm.in	2005-06-27 23:21:55.000000000 +0200
-@@ -2,7 +2,7 @@
- # $Id: rxterm.in,v 1.23 2002/03/18 17:37:34 joda Exp $
- #
- usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
--binary=rsh
-+binary=krsh
- term=xterm
- while true
- do
diff --git a/core/heimdal/005_all_heimdal-suid_fix.patch b/core/heimdal/005_all_heimdal-suid_fix.patch
deleted file mode 100644
index 35a9ed9f6..000000000
--- a/core/heimdal/005_all_heimdal-suid_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- appl/su/Makefile.am	2005-06-16 18:27:46.000000000 +0200
-+++ appl/su/Makefile.am	2005-06-27 23:25:21.000000000 +0200
-@@ -7,6 +7,7 @@
- bin_PROGRAMS = su
- bin_SUIDS = su
- su_SOURCES = su.c supaths.h
-+su_LDFLAGS = -Wl,-z,now
- man_MANS = su.1
- 
- LDADD = $(LIB_kafs) \
---- appl/otp/Makefile.am	2005-06-16 18:28:46.000000000 +0200
-+++ appl/otp/Makefile.am	2005-06-27 23:25:40.000000000 +0200
-@@ -8,6 +8,7 @@
- bin_SUIDS = otp
- otp_SOURCES = otp.c otp_locl.h
- otpprint_SOURCES = otpprint.c otp_locl.h
-+otp_LDFLAGS = -Wl,-z,now
- 
- man_MANS = otp.1  otpprint.1
- 
diff --git a/core/heimdal/012_all_heimdal-berkdb.patch b/core/heimdal/012_all_heimdal-berkdb.patch
deleted file mode 100644
index 46762c220..000000000
--- a/core/heimdal/012_all_heimdal-berkdb.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Binary files heimdal-0.7-old/cf/.find-func-no-libs2.m4.swp and heimdal-0.7/cf/.find-func-no-libs2.m4.swp differ
-Index: heimdal/cf/db.m4
-===================================================================
---- heimdal.orig/cf/db.m4
-+++ heimdal/cf/db.m4
-@@ -18,24 +18,13 @@ db_type=unknown
- 
- if test "$enable_berkeley_db" != no; then
- 
--  AC_CHECK_HEADERS([				\
--	db4/db.h				\
--	db3/db.h				\
--	db.h					\
--	db_185.h				\
--  ])
-+  AC_CHECK_HEADERS([db.h])
- 
- dnl db_create is used by db3 and db4
- 
--  AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [
-+  AC_FIND_FUNC_NO_LIBS(db_create, db, [
-   #include <stdio.h>
--  #ifdef HAVE_DB4_DB_H
--  #include <db4/db.h>
--  #elif defined(HAVE_DB3_DB_H)
--  #include <db3/db.h>
--  #else
-   #include <db.h>
--  #endif
-   ],[NULL, NULL, 0])
- 
-   if test "$ac_cv_func_db_create" = "yes"; then
-@@ -50,17 +39,9 @@ dnl db_create is used by db3 and db4
- 
- dnl dbopen is used by db1/db2
- 
--    AC_FIND_FUNC_NO_LIBS(dbopen, db2 db, [
-+    AC_FIND_FUNC_NO_LIBS(dbopen, db, [
-     #include <stdio.h>
--    #if defined(HAVE_DB2_DB_H)
--    #include <db2/db.h>
--    #elif defined(HAVE_DB_185_H)
--    #include <db_185.h>
--    #elif defined(HAVE_DB_H)
-     #include <db.h>
--    #else
--    #error no db.h
--    #endif
-     ],[NULL, 0, 0, 0, NULL])
- 
-     if test "$ac_cv_func_dbopen" = "yes"; then
-Index: heimdal/lib/hdb/db.c
-===================================================================
---- heimdal.orig/lib/hdb/db.c
-+++ heimdal/lib/hdb/db.c
-@@ -37,11 +37,7 @@ RCSID("$Id: db.c 20215 2007-02-09 21:59:
- 
- #if HAVE_DB1
- 
--#if defined(HAVE_DB_185_H)
--#include <db_185.h>
--#elif defined(HAVE_DB_H)
- #include <db.h>
--#endif
- 
- static krb5_error_code
- DB_close(krb5_context context, HDB *db)
-Index: heimdal/lib/hdb/db3.c
-===================================================================
---- heimdal.orig/lib/hdb/db3.c
-+++ heimdal/lib/hdb/db3.c
-@@ -37,13 +37,7 @@ RCSID("$Id: db3.c 21610 2007-07-17 07:10
- 
- #if HAVE_DB3
- 
--#ifdef HAVE_DB4_DB_H
--#include <db4/db.h>
--#elif defined(HAVE_DB3_DB_H)
--#include <db3/db.h>
--#else
- #include <db.h>
--#endif
- 
- static krb5_error_code
- DB_close(krb5_context context, HDB *db)
-Index: heimdal/lib/roken/getcap.c
-===================================================================
---- heimdal.orig/lib/roken/getcap.c
-+++ heimdal/lib/roken/getcap.c
-@@ -38,11 +38,13 @@
- #include "roken.h"
- RCSID("$Id: getcap.c 16561 2006-01-13 14:25:32Z lha $");
- 
-+#if defined(HAVE_DBOPEN) && defined(HAVE_DB_H)
-+#define USE_DB
-+#endif
-+
- #include <sys/types.h>
- #include <ctype.h>
--#if defined(HAVE_DB_185_H)
--#include <db_185.h>
--#elif defined(HAVE_DB_H)
-+#ifdef USE_DB
- #include <db.h>
- #endif
- #include <errno.h>	
-Index: heimdal/lib/roken/ndbm_wrap.c
-===================================================================
---- heimdal.orig/lib/roken/ndbm_wrap.c
-+++ heimdal/lib/roken/ndbm_wrap.c
-@@ -37,13 +37,7 @@ RCSID("$Id: ndbm_wrap.c 21634 2007-07-17
- #endif
- 
- #include "ndbm_wrap.h"
--#if defined(HAVE_DB4_DB_H)
--#include <db4/db.h>
--#elif defined(HAVE_DB3_DB_H)
--#include <db3/db.h>
--#else
- #include <db.h>
--#endif
- 
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/core/heimdal/013_all_heimdal-pthread-lib.patch b/core/heimdal/013_all_heimdal-pthread-lib.patch
deleted file mode 100644
index 19f879407..000000000
--- a/core/heimdal/013_all_heimdal-pthread-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- heimdal-0.7.1/cf/pthreads.m4.old	2005-09-09 12:12:28.000000000 +0000
-+++ heimdal-0.7.1/cf/pthreads.m4	2005-09-17 22:23:23.000000000 +0000
-@@ -32,7 +32,7 @@
- 	2.*)
- 		native_pthread_support=yes
- 		PTHREADS_CFLAGS=-pthread
--		PTHREADS_LIBS=-pthread
-+		PTHREADS_LIBS=-lpthread
- 		;;
- 	esac
- 	;;
diff --git a/core/heimdal/014_all_heimdal-path.patch b/core/heimdal/014_all_heimdal-path.patch
deleted file mode 100644
index 36a86f1f9..000000000
--- a/core/heimdal/014_all_heimdal-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- appl/rcp/rcp.c.old	2006-05-03 13:31:59.398493625 +0200
-+++ appl/rcp/rcp.c	2006-05-03 13:32:04.494485981 +0200
-@@ -34,7 +34,7 @@
- #include "rcp_locl.h"
- #include <getarg.h>
- 
--#define RSH_PROGRAM "rsh"
-+#define RSH_PROGRAM "krsh"
- 
- struct  passwd *pwd;
- uid_t	userid;
---- appl/rcp/rcp_locl.h.old	2006-05-03 02:30:31.602025409 +0200
-+++ appl/rcp/rcp_locl.h	2006-05-03 02:30:35.886018983 +0200
-@@ -64,4 +64,4 @@
- #define	_PATH_CP	"/bin/cp"
- #endif
- #undef _PATH_RSH
--#define	_PATH_RSH	BINDIR "/rsh"
-+#define	_PATH_RSH	BINDIR "/krsh"
---- appl/telnet/telnetd/telnetd.h.old	2006-05-03 02:23:14.582680939 +0200
-+++ appl/telnet/telnetd/telnetd.h	2006-05-03 02:23:23.746667193 +0200
-@@ -192,7 +192,7 @@
- #endif
- 
- #undef _PATH_LOGIN
--#define _PATH_LOGIN	BINDIR "/login"
-+#define _PATH_LOGIN	BINDIR "/klogin"
- 
- /* fallbacks */
- 
---- appl/login/shadow.c.old	2006-05-05 06:31:29.517138115 +0200
-+++ appl/login/shadow.c	2006-05-05 06:32:26.433052741 +0200
-@@ -38,7 +38,7 @@
- #ifdef HAVE_SHADOW_H
- 
- #ifndef _PATH_CHPASS
--#define _PATH_CHPASS "/usr/bin/passwd"
-+#define _PATH_CHPASS "/usr/bin/kpasswd"
- #endif
- 
- static int
-@@ -52,7 +52,7 @@
-         printf("fork /bin/passwd");
-         exit(1);
-     case 0:
--        execlp(_PATH_CHPASS, "passwd", who->pw_name, (char *) 0);
-+        execlp(_PATH_CHPASS, "kpasswd", who->pw_name, (char *) 0);
-         exit(1);
-     default:
-         waitpid(pid, &status, 0);
diff --git a/core/heimdal/PKGBUILD b/core/heimdal/PKGBUILD
deleted file mode 100644
index 2951201d1..000000000
--- a/core/heimdal/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 101969 2010-12-03 09:59:28Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-#
-### Attention: remove old pkg before building - it links against itself! ###
-#
-
-pkgname=heimdal
-pkgver=1.3.3
-pkgrel=4
-pkgdesc="Implementation of Kerberos V5 libraries"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.h5l.org/"
-license=('custom')
-depends=('db' 'openssl' 'sqlite3' 'e2fsprogs' 'libldap')
-backup=(etc/krb5.conf)
-options=('!libtool' '!emptydirs')
-install=heimdal.install
-source=(http://www.h5l.org/dist/src/${pkgname}-${pkgver}.tar.gz
-	001_all_heimdal-no_libedit.patch
-	002_all_heimal-fPIC.patch
-	003_all_heimdal-rxapps.patch
-	005_all_heimdal-suid_fix.patch
-	012_all_heimdal-berkdb.patch
-	013_all_heimdal-pthread-lib.patch
-	014_all_heimdal-path.patch
-	heimdal-kdc.rc
-	kadmind.rc
-	kpasswd.rc)
-md5sums=('963c09f1b14c41660be70b55fae9f163'
-         '98e28f11f906c967aac22d6184102c9e'
-         '6d5571bdedba2e2423b90bccdbac2c0a'
-         '2feec3924ee5230b54175b4d4000c872'
-         '45aeb207f360f9f4e9e0fabc8bfeecbc'
-         '56f5d10d0ec40f2fda82ef144ffac1e0'
-         '1b8665b771c4eb6b56ea8582c96e56e3'
-         '8208ae8c0b6ff5ab4f64af1693e9e396'
-         'e59650992b9541a30dfce727a194f6e0'
-         '1f2f86a67bbfddb7af581d35fdca9627'
-         'f8f1eca95b9d3f2b4ebf2417b71b81cf')
-
-build() {
-  cd ${srcdir}/heimdal-${pkgver}
-  patch -Np0 -i ${srcdir}/001_all_heimdal-no_libedit.patch
-  patch -Np0 -i ${srcdir}/002_all_heimal-fPIC.patch
-  patch -Np0 -i ${srcdir}/003_all_heimdal-rxapps.patch
-  patch -Np0 -i ${srcdir}/005_all_heimdal-suid_fix.patch
-  patch -Np1 -i ${srcdir}/012_all_heimdal-berkdb.patch
-  patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch
-  patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch
-
-  sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in \
-	doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
-	lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5
-	
-  sed -i 's|$(LIB_NDBM)|$(LIB_NDBM) $(LIB_db_create)|' lib/otp/Makefile.am
-
-  libtoolize --force
-  aclocal -I cf
-  autoconf
-  automake
-
-  ./configure --prefix=/usr --enable-shared=yes --without-x \
-	--sysconfdir=/etc --mandir=/usr/share/man \
-	--datadir=/var/lib/heimdal \
-	--localstatedir=/var/lib/heimdal \
-	--with-openssl=/usr \
-	--with-readline-lib=/usr/lib \
-	--with-readline-include=/usr/include/readline \
-	--with-sqlite3-lib=/usr/lib \
-	--with-sqlite3-include=/usr/include \
-	--with-openldap=/usr \
-	--libexecdir=/usr/sbin
-	
-  make
-}
-
-package() {
-  cd ${srcdir}/heimdal-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # Rename daemons and their manpages
-  for i in telnetd ftpd rshd; do
-    mv ${pkgdir}/usr/share/man/man8/{,k}${i}.8
-    mv ${pkgdir}/usr/sbin/{,k}${i}
-  done
-  
-  # Rename clients and their manpages
-  for i in rcp rsh telnet ftp su login; do
-    if [ -f ${pkgdir}/usr/share/man/man1/${i}.1 ]; then
-      mv ${pkgdir}/usr/share/man/man1/{,k}${i}.1
-    fi
-    mv ${pkgdir}/usr/bin/{,k}${i}
-  done
-  rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8}
-  
-  # Arch could be a KDC too
-  install -d ${pkgdir}/etc/rc.d
-  install -m644 ${srcdir}/heimdal-${pkgver}/krb5.conf ${pkgdir}/etc/
-  for i in heimdal-kdc kadmind kpasswd; do
-    install -m755 ${srcdir}/${i}.rc ${pkgdir}/etc/rc.d/${i}
-  done
-
-  # Remove conflicts
-  rm ${pkgdir}/usr/share/man/man5/ftpusers.5*		          # man-pages
-  rm ${pkgdir}/usr/share/man/man3/{DES,DH,EVP,OpenSSL,RAND,RSA}*  # openssl (a bit overzealous...)
-  rm ${pkgdir}/usr/share/man/man3/os.3*                           # erlang
-
-  # Install the license
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \
-  	${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/core/heimdal/heimdal-kdc.rc b/core/heimdal/heimdal-kdc.rc
deleted file mode 100644
index b2a3b5fcf..000000000
--- a/core/heimdal/heimdal-kdc.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kdc`
-case "$1" in
-    start)
-        stat_busy "Starting heimdal kdc"
-        if [ -z "$PID" ]; then
-		/usr/sbin/kdc --detach
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon heimdal-kdc
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping heimdal kdc"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon heimdal-kdc
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/core/heimdal/heimdal.install b/core/heimdal/heimdal.install
deleted file mode 100644
index b4fd19000..000000000
--- a/core/heimdal/heimdal.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(heimdal hx509)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.info.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.info.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/core/heimdal/kadmind.rc b/core/heimdal/kadmind.rc
deleted file mode 100644
index 0f3b8c7c4..000000000
--- a/core/heimdal/kadmind.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kadmind`
-case "$1" in
-    start)
-        stat_busy "Starting heimdal admin server"
-        if [ -z "$PID" ]; then
-		/usr/sbin/kadmind &
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon kadmind
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping heimdal admin server"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon kadmind
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/core/heimdal/kpasswd.rc b/core/heimdal/kpasswd.rc
deleted file mode 100644
index 3697322b9..000000000
--- a/core/heimdal/kpasswd.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kpasswdd`
-case "$1" in
-    start)
-        stat_busy "Starting heimdal kpasswdd"
-        if [ -z "$PID" ]; then
-		/usr/sbin/kpasswdd &
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon kpasswd
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping heimdal kpasswdd"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon kpasswd
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD
index 89ea988e5..e44659732 100644
--- a/core/kbd/PKGBUILD
+++ b/core/kbd/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 82650 2010-06-15 05:16:19Z allan $
+# $Id: PKGBUILD 123997 2011-05-15 19:12:02Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kbd
-pkgver=1.15.2
+pkgver=1.15.3
 pkgrel=1
 pkgdesc="Keytable files and keyboard utilities"
 arch=('i686' 'x86_64' 'mips64el')
 url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
 license=('GPL')
 depends=('glibc')
-source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz)
-md5sums=('77d0b51454522bc6c170bbdc6e31202a')
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+        fix-es.po.patch)
+md5sums=('8143e179a0f3c25646ce5085e8777200')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
+  patch -Np1 -i ../fix-es.po.patch
   # rename keymap files with the same names
   # this is needed because when only name of keymap is specified
   # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
@@ -26,7 +27,11 @@ build() {
   mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
 
   ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes || return 1
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
 
   # this is needed because initscripts call /bin/loadkeys
@@ -35,3 +40,5 @@ build() {
   mkdir ${pkgdir}/bin
   ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys
 }
+md5sums=('8143e179a0f3c25646ce5085e8777200'
+         '4ded3edb50fb7a3277bae6a870cee812')
diff --git a/core/kbd/fix-es.po.patch b/core/kbd/fix-es.po.patch
new file mode 100644
index 000000000..578f0a7b7
--- /dev/null
+++ b/core/kbd/fix-es.po.patch
@@ -0,0 +1,11 @@
+--- kbd-1.15.3/po/es.old	2011-05-14 23:12:49.000000000 +0200
++++ kbd-1.15.3/po/es.po	2011-05-15 21:07:02.120669404 +0200
+@@ -1363,7 +1363,7 @@
+ #: src/setfont.c:682
+ #, c-format
+ msgid "Saved %d-char %dx%d font file on %s\n"
+-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
+ 
+ #: src/setkeycodes.c:21
+ #, c-format
diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD
new file mode 100644
index 000000000..0a0258b22
--- /dev/null
+++ b/core/keyutils/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 116950 2011-03-26 15:07:29Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=keyutils
+pkgver=1.4
+pkgrel=1
+pkgdesc="Linux Key Management Utilities"
+arch=(i686 x86_64 'mips64el')
+url="http://www.kernel.org"
+license=('GPL2' 'LGPL2.1')
+depends=('glibc' 'sh')
+backup=(etc/request-key.conf)
+source=(http://people.redhat.com/~dhowells/$pkgname/$pkgname-$pkgver.tar.bz2)
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i -e '/CFLAGS/s|:= -g -O2|+=|' Makefile
+  make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+md5sums=('e168c1bdaf5aa93c2cbf8a5e7f8ef27b')
diff --git a/core/libgssglue/PKGBUILD b/core/libgssglue/PKGBUILD
index 86aecf1d9..da8133b37 100644
--- a/core/libgssglue/PKGBUILD
+++ b/core/libgssglue/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102146 2010-12-06 09:49:56Z allan $
+# $Id: PKGBUILD 123644 2011-05-12 06:23:26Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libgssglue
 pkgver=0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Exports a gssapi interface which calls other random gssapi libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
@@ -15,7 +15,7 @@ options=('!libtool')
 source=(http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz
         gssapi_mech.conf)
 md5sums=('ce1b4c758e6de01b712d154c5c97e540'
-         '234b9cca75a33af98eda3f1683756879')
+         '080be866717e4e06fa6f7d6f43cb395a')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/core/libgssglue/gssapi_mech.conf b/core/libgssglue/gssapi_mech.conf
index f71aca08e..9a832ee1b 100644
--- a/core/libgssglue/gssapi_mech.conf
+++ b/core/libgssglue/gssapi_mech.conf
@@ -15,8 +15,8 @@
 # library                               initialization function
 # ================================      ==========================
 # The MIT K5 gssapi library, use special function for initialization.
-#/usr/lib/libgssapi_krb5.so             mechglue_internal_krb5_init
-/usr/lib/libgssapi.so            mechglue_internal_krb5_init
+/usr/lib/libgssapi_krb5.so             mechglue_internal_krb5_init
+#/usr/lib/libgssapi.so            mechglue_internal_krb5_init
 #
 # The SPKM3 gssapi library function.  Use the function spkm3_gss_initialize.
 # /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so    spkm3_gss_initialize
diff --git a/core/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff b/core/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff
new file mode 100644
index 000000000..e75499e8e
--- /dev/null
+++ b/core/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff
@@ -0,0 +1,17 @@
+Do not issue an error message when unable to remove .cache on read-only fs.
+===================================================================
+RCS file: /cvs/lvm2/LVM2/lib/filters/filter-persistent.c,v
+retrieving revision 1.49
+retrieving revision 1.50
+diff -u -r1.49 -r1.50
+--- LVM2/lib/filters/filter-persistent.c	2011/04/22 12:05:33	1.49
++++ LVM2/lib/filters/filter-persistent.c	2011/05/12 12:42:48	1.50
+@@ -108,7 +108,7 @@
+ 			log_very_verbose("Obtaining device list from "
+ 					 "udev. Removing obolete %s.",
+ 					 pf->file);
+-			if (unlink(pf->file) < 0)
++			if (unlink(pf->file) < 0 && errno != EROFS)
+ 				log_sys_error("unlink", pf->file);
+ 		}
+ 		return 1;
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 4cdd661af..eeea19970 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109502 2011-02-10 10:44:18Z eric $
+# $Id: PKGBUILD 123786 2011-05-13 00:53:49Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.84
+pkgver=2.02.85
 _pkgverlvm=${pkgver}
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,15 +14,21 @@ groups=('base')
 conflicts=('mkinitcpio<0.5.99')
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
         lvm2_install
-        lvm2_hook)
-md5sums=('8b4e0897ee48f02c0dff11940e44e23b' 'e29bc80d636ed17b617d9b384a5f3aa0'\
-         '7103e3fef1180478811ac4e32aec540d')
-sha1sums=('6d92f4474f93c7d3824a0eb3469c7e4f9ef8f1d4' '662fc54ce291fd79bd09701e4c3e10854f325282'\
-         '769767d84c73674cbb68c765460e57c428c314a0')
+        lvm2_hook
+        Be-quiet-on-removing-cache-on-read-only-fs.diff)
+md5sums=('91785ca438e5ce679dd3a386b183d552'
+         'e29bc80d636ed17b617d9b384a5f3aa0'
+         'cf05f2c7281e24269ea9dcc6b4e106ba'
+         '6db89da27928d2415a8e26cd0a842712')
+sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7'
+          '662fc54ce291fd79bd09701e4c3e10854f325282'
+          '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440'
+          '6d7dd04be291d7537235704c816a701fd5beacc0')
 
 build() {
   cd "${srcdir}/LVM2.${_pkgverlvm}"
   sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
+  patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff
   unset LDFLAGS
   ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
     --includedir=/usr/include --with-usrlibdir=/usr/lib \
diff --git a/core/lvm2/lvm2_hook b/core/lvm2/lvm2_hook
index d6d1c1f94..86d2ea582 100644
--- a/core/lvm2/lvm2_hook
+++ b/core/lvm2/lvm2_hook
@@ -18,6 +18,7 @@ run_hook ()
         [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
 
         msg "Activating logical volumes..."
+        [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit
         eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
     fi
 }
diff --git a/core/lzo2/PKGBUILD b/core/lzo2/PKGBUILD
index dbbc4460c..7fe5bc88a 100644
--- a/core/lzo2/PKGBUILD
+++ b/core/lzo2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 100405 2010-11-23 12:35:30Z stephane $
+# $Id: PKGBUILD 122309 2011-05-03 18:52:51Z tpowa $
 # Contributor: Low Kian Seong <fastmail_low@speedymail.org>
 # Maintainer: dorphell <dorphell@archlinux.org>
 pkgname=lzo2
-pkgver=2.04
+pkgver=2.05
 pkgrel=1
 pkgdesc="Portable lossless data compression library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('glibc')
 source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz)
 options=(!libtool)
-sha1sums=('f5bf5c7ae4116e60513e5788d156ef78946677e7')
+md5sums=('c67cda5fa191bab761c7cb06fe091e36')
 
 build() {
   cd "${srcdir}/lzo-${pkgver}"
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
deleted file mode 100644
index 336d5d9d6..000000000
--- a/core/pacman/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=pacman
-pkgver=3.5.2
-pkgrel=1
-pkgdesc="A library-based package manager with dependency support"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.archlinux.org/pacman/"
-license=('GPL')
-groups=('base')
-depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist')
-optdepends=('fakeroot: for makepkg usage as normal user'
-            'curl: for rankmirrors usage')
-backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
-options=(!libtool)
-source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
-        pacman.conf
-        pacman.conf.x86_64
-        pacman.conf.mips64el
-        makepkg.conf)
-md5sums=('b4f1fdbc17100923071ebe8fe9377be5'
-         'e99eb721b6b704f68c5f47468507c102'
-         'f8b939d9b2beb79a0436961a2d707d7c'
-         '14eac9e54b81e1f87a498e90a81c19af'
-         'a8684989d3dfad5a6e1bcf95af3e571b')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var --enable-doc
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install Arch specific stuff
-  mkdir -p $pkgdir/etc
-  case "$CARCH" in
-    i686)
-      install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
-      mycarch="i686"
-      mychost="i686-pc-linux-gnu"
-      myflags="-march=i686 "
-      ;;
-    x86_64)
-      install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
-      mycarch="x86_64"
-      mychost="x86_64-unknown-linux-gnu"
-      myflags="-march=x86-64 "
-      ;;
-    mips64el)
-      install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf
-      mycarch="mips64el"
-      mychost="mips64el-unknown-linux-gnu"
-      myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop "
-      ;;
-  esac
-  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
-  # set things correctly in the default conf file
-  sed -i $pkgdir/etc/makepkg.conf \
-    -e "s|@CARCH[@]|$mycarch|g" \
-    -e "s|@CHOST[@]|$mychost|g" \
-    -e "s|@CARCHFLAGS[@]|$myflags|g"
-
-  # install completion files
-  mkdir -p $pkgdir/etc/bash_completion.d/
-  install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman
-  mkdir -p $pkgdir/usr/share/zsh/site-functions/
-  install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
-}
-
-# vim: set ts=2 sw=2 et:
diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf
deleted file mode 100644
index a655e935f..000000000
--- a/core/pacman/makepkg.conf
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# /etc/makepkg.conf
-#
-
-#########################################################################
-# SOURCE ACQUISITION
-#########################################################################
-#
-#-- The download utilities that makepkg should use to acquire sources
-#  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
-          'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
-          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
-          'rsync::/usr/bin/rsync -z %u %o'
-          'scp::/usr/bin/scp -C %u %o')
-
-# Other common tools:
-# /usr/bin/snarf
-# /usr/bin/lftpget -c
-# /usr/bin/curl
-
-#########################################################################
-# ARCHITECTURE, COMPILE FLAGS
-#########################################################################
-#
-CARCH="@CARCH@"
-CHOST="@CHOST@"
-
-#-- Exclusive: will only run on @CARCH@
-# -march (or -mcpu) builds exclusively for an architecture
-# -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
-CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
-#-- Make Flags: change this for DistCC/SMP systems
-#MAKEFLAGS="-j2"
-
-#########################################################################
-# BUILD ENVIRONMENT
-#########################################################################
-#
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache check)
-#  A negated environment option will do the opposite of the comments below.
-#
-#-- fakeroot: Allow building packages as a non-root user
-#-- distcc:   Use the Distributed C/C++/ObjC compiler
-#-- color:    Colorize output messages
-#-- ccache:   Use ccache to cache compilation
-#-- check:    Run the check() function if present in the PKGBUILD
-#
-BUILDENV=(fakeroot !distcc color !ccache check)
-#
-#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
-#-- specify a space-delimited list of hosts running in the DistCC cluster.
-#DISTCC_HOSTS=""
-
-#########################################################################
-# GLOBAL PACKAGE OPTIONS
-#   These are default values for the options=() settings
-#########################################################################
-#
-# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
-#  A negated option will do the opposite of the comments below.
-#
-#-- strip:     Strip symbols from binaries/libraries
-#-- docs:      Save doc directories specified by DOC_DIRS
-#-- libtool:   Leave libtool (.la) files in packages
-#-- emptydirs: Leave empty directories in packages
-#-- zipman:    Compress manual (man and info) pages in MAN_DIRS with gzip
-#-- purge:     Remove files specified by PURGE_TARGETS
-#
-OPTIONS=(strip docs libtool emptydirs zipman purge)
-
-#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
-INTEGRITY_CHECK=(md5)
-#-- Options to be used when stripping binaries. See `man strip' for details.
-STRIP_BINARIES="--strip-all"
-#-- Options to be used when stripping shared libraries. See `man strip' for details.
-STRIP_SHARED="--strip-unneeded"
-#-- Options to be used when stripping static libraries. See `man strip' for details.
-STRIP_STATIC="--strip-debug"
-#-- Manual (man and info) directories to compress (if zipman is specified)
-MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
-#-- Doc directories to remove (if !docs is specified)
-DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
-#-- Files to be removed from all packages (if purge is specified)
-PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
-
-#########################################################################
-# PACKAGE OUTPUT
-#########################################################################
-#
-# Default: put built package and cached source in build directory
-#
-#-- Destination: specify a fixed directory where all packages will be placed
-#PKGDEST=/home/packages
-#-- Source cache: specify a fixed directory where source files will be cached
-#SRCDEST=/home/sources
-#-- Source packages: specify a fixed directory where all src packages will be placed
-#SRCPKGDEST=/home/srcpackages
-#-- Packager: name/email of the person or organization building packages
-#PACKAGER="John Doe <john@doe.com>"
-
-#########################################################################
-# EXTENSION DEFAULTS
-#########################################################################
-#
-# WARNING: Do NOT modify these variables unless you know what you are
-#          doing.
-#
-PKGEXT='.pkg.tar.xz'
-SRCEXT='.src.tar.gz'
-
-# vim: set ft=sh ts=2 sw=2 et:
diff --git a/core/pacman/pacman.conf b/core/pacman/pacman.conf
deleted file mode 100644
index 206ab23b4..000000000
--- a/core/pacman/pacman.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-HoldPkg     = pacman glibc
-# If upgrades are available for these packages they will be asked for first
-SyncFirst   = pacman
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options (all disabled by default)
-#UseSyslog
-#ShowSize
-#UseDelta
-#TotalDownload
-#CheckSpace
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#Server = file:///home/custompkgs
-
diff --git a/core/pacman/pacman.conf.x86_64 b/core/pacman/pacman.conf.x86_64
deleted file mode 100644
index 6f0423647..000000000
--- a/core/pacman/pacman.conf.x86_64
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-HoldPkg     = pacman glibc
-# If upgrades are available for these packages they will be asked for first
-SyncFirst   = pacman
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options (all disabled by default)
-#UseSyslog
-#ShowSize
-#UseDelta
-#TotalDownload
-#CheckSpace
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the multilib repositories as required here.
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#Server = file:///home/custompkgs
-
diff --git a/core/pacman/pacman.install b/core/pacman/pacman.install
deleted file mode 100644
index 0e598bb4b..000000000
--- a/core/pacman/pacman.install
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-    # one time stuff for md5sum issue with older pacman versions
-    if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then
-        _resetbackups
-    fi
-    if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then
-        _warnupgrade
-    fi
-}
-
-_warnupgrade() {
-    echo ">>> The pacman database format has changed as of pacman 3.5.0."
-    echo ">>> You will need to run \`pacman-db-upgrade\` as root."
-    echo ">>>"
-}
-
-_resetbackups() {
-    echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset"
-    echo ">>> you are able to remove all NoUpgrade lines of already protected"
-    echo ">>> files from pacman.conf."
-    echo ">>>"
-
-    # path variables
-    pacconf="/etc/pacman.conf"
-    dbpath="/var/lib/pacman/local"
-
-    # get a list of NoUpgrade files from the user's pacman.conf
-    echo ">>> Retrieving pacman.conf NoUpgrade list..."
-    config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2)
-    # add the standard list of files, even if they are already above
-    config="$config \
-    etc/passwd etc/group etc/shadow etc/sudoers \
-    etc/fstab etc/raidtab etc/ld.so.conf \
-    etc/rc.conf etc/rc.local \
-    etc/modprobe.conf etc/modules.conf \
-    etc/lilo.conf boot/grub/menu.lst"
-
-    # blank md5sum for use in sed expression
-    zeroes='00000000000000000000000000000000'
-
-    for file in $config; do
-        echo ">>> -> finding owner of /$file..."
-        line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null)
-        # if file is owned by a package, go find its incorrectly stored sum
-        if [ ! -z "$line" ]; then
-            # get the name and version of the package owning file
-            name=$(echo $line | awk '{print $5}')
-            version=$(echo $line | awk '{print $6}')
-            # set the path to the backup array holding the md5sum
-            path="$dbpath/$name-$version/files"
-            # run a sed on the path to reset the line containing $file
-            # NOTE: literal tab characters in sed expression after $file
-            echo ">>> -> resetting sum of /$file..."
-            sed -i "s#$file [0-9a-fA-F]*#$file  $zeroes#" $path
-        else
-            echo ">>> -> $file is unowned."
-        fi
-    done
-}
diff --git a/core/sqlite3/PKGBUILD b/core/sqlite3/PKGBUILD
index 002edf312..8cc4ccf94 100644
--- a/core/sqlite3/PKGBUILD
+++ b/core/sqlite3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 119736 2011-04-14 10:45:02Z andyrtr $
+# $Id: PKGBUILD 124333 2011-05-19 19:31:27Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite3"
-pkgname=('sqlite3' 'sqlite3-tcl') 
-_amalgamationver=3070601
+pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
+_amalgamationver=3070603
 _amalgamationver2=${_amalgamationver/00/}
 _docver=3070600
 pkgver=${_amalgamationver2//0/.}
@@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a
 	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
 	license.txt)
 options=('!libtool' '!emptydirs')
-md5sums=('a9b7327d6762652fe19caf68fb50849d')
+md5sums=('7eb41eea5ffa5cbe359a48629084c425')
 
 build() {
   export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
diff --git a/core/udev/01-settle.patch b/core/udev/01-settle.patch
new file mode 100644
index 000000000..88e23d2a2
--- /dev/null
+++ b/core/udev/01-settle.patch
@@ -0,0 +1,68 @@
+From 2738ec2cf721db0c0deac2ba0abdc73cf7739e9f Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay.sievers@vrfy.org>
+Date: Mon, 16 May 2011 13:17:48 +0200
+Subject: [PATCH 1/7] udevd: create queue file before daemonizing to reliably
+ block 'settle'
+
+---
+ udev/udevd.c |   22 ++++++++++++----------
+ 1 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/udev/udevd.c b/udev/udevd.c
+index be4b071..258d787 100644
+--- a/udev/udevd.c
++++ b/udev/udevd.c
+@@ -1408,6 +1408,13 @@ int main(int argc, char *argv[])
+ 
+ 	udev_monitor_set_receive_buffer_size(monitor, 128*1024*1024);
+ 
++	/* create queue file before signalling 'ready', to make sure we block 'settle' */
++	udev_queue_export = udev_queue_export_new(udev);
++	if (udev_queue_export == NULL) {
++		err(udev, "error creating queue file\n");
++		goto exit;
++	}
++
+ 	if (daemonize) {
+ 		pid_t pid;
+ 		int fd;
+@@ -1421,8 +1428,8 @@ int main(int argc, char *argv[])
+ 			rc = 4;
+ 			goto exit;
+ 		default:
+-			rc = 0;
+-			goto exit;
++			rc = EXIT_SUCCESS;
++			goto exit_keep_queue;
+ 		}
+ 
+ 		setsid();
+@@ -1521,12 +1528,6 @@ int main(int argc, char *argv[])
+ 		goto exit;
+ 	}
+ 
+-	udev_queue_export = udev_queue_export_new(udev);
+-	if (udev_queue_export == NULL) {
+-		err(udev, "error creating queue file\n");
+-		goto exit;
+-	}
+-
+ 	memset(&ep_ctrl, 0, sizeof(struct epoll_event));
+ 	ep_ctrl.events = EPOLLIN;
+ 	ep_ctrl.data.fd = fd_ctrl;
+@@ -1708,9 +1709,10 @@ int main(int argc, char *argv[])
+ 		}
+ 	}
+ 
+-	udev_queue_export_cleanup(udev_queue_export);
+-	rc = 0;
++	rc = EXIT_SUCCESS;
+ exit:
++	udev_queue_export_cleanup(udev_queue_export);
++exit_keep_queue:
+ 	if (fd_ep >= 0)
+ 		close(fd_ep);
+ 	worker_list_cleanup(udev);
+-- 
+1.7.5.1
+
diff --git a/core/udev/02-settle.patch b/core/udev/02-settle.patch
new file mode 100644
index 000000000..4bcb7fdde
--- /dev/null
+++ b/core/udev/02-settle.patch
@@ -0,0 +1,29 @@
+From 12f79fb0b9c919787d8a7d4307895d3d6b4b029b Mon Sep 17 00:00:00 2001
+From: Nix <nix@esperi.org.uk>
+Date: Mon, 16 May 2011 22:51:38 +0200
+Subject: [PATCH 7/7] libudev: queue - accept NULL passed into
+ udev_queue_export_cleanup()
+
+---
+ libudev/libudev-queue-private.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c
+index 0dcf9b0..6e13d8a 100644
+--- a/libudev/libudev-queue-private.c
++++ b/libudev/libudev-queue-private.c
+@@ -104,9 +104,10 @@ void udev_queue_export_cleanup(struct udev_queue_export *udev_queue_export)
+ {
+ 	char filename[UTIL_PATH_SIZE];
+ 
++	if (udev_queue_export == NULL)
++		return;
+ 	util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.tmp", NULL);
+ 	unlink(filename);
+-
+ 	util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.bin", NULL);
+ 	unlink(filename);
+ }
+-- 
+1.7.5.1
+
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index 12a482153..0e235adc6 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 122441 2011-05-04 07:04:25Z andrea $
+# $Id: PKGBUILD 124183 2011-05-17 13:17:56Z tomegun $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
+# Maintainer: Tom Gundersen <teg@jklm.no>
 
 pkgbase="udev"
 pkgname=('udev' 'udev-compat')
-pkgver=167
+pkgver=168
 pkgrel=2
 arch=(i686 x86_64 mips64el)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -18,10 +19,15 @@ source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.ta
         80-drivers.rules 
         81-arch.rules 
         load-modules.sh 
-        cdsymlinks.sh)
+        cdsymlinks.sh
+	01-settle.patch
+	02-settle.patch)
 
 build() {
   cd $srcdir/$pkgbase-$pkgver
+  # fix https://bugs.archlinux.org/task/24288
+  patch -Np1 -i ../01-settle.patch
+  patch -Np1 -i ../02-settle.patch
   ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\
               --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system
   make
@@ -108,8 +114,10 @@ package_udev-compat() {
   install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d
   install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
 }
-md5sums=('4b37e1222f06c14c24147de346aa0bad'
-         '4427855146513a4703ab5c7eb8a0156e'
-         'f17c99779173ddc79f866cf3a5de5e68'
-         'f91fddc67609b45b244a624977c4247b'
-         '2e808ee78d237c478b57af2a68d43769')
+sha256sums=('9ddc43173cf7b397c8cc01d26d644932ff2c2259b3a5eea7be90db96a28080e2'
+            '0cb99cc7cea92238dd6b19a4c104c3b9e9f744c6b9d6b4382c7cd22be18c98f9'
+            '377c13f20de32776107dddc8324f599f31320e8dd1185e3282856aee5cb08499'
+            'c6b41afb24e8f496064d8baad844697a6515cea1b7e0389054cd8a2053477377'
+            'cc0d281926bf2f1ac816c0060a2afc59444ddf0f8dab6e2d9924a2a7c8de4a13'
+            '70d2fd079901bf9940c4811ec91634da0d8b3425ebcdbffeba5a73cb616be650'
+            'fe9d1aafb1a620108790d82960577de4eb757450c35a146475aed3f5e9356f1a')
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 6c94c8c5b..5828eafd3 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 123152 2011-05-09 00:21:36Z allan $
+# $Id: PKGBUILD 123897 2011-05-14 09:14:06Z tpowa $
 # Maintainer:
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
 pkgver=2.19.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://userweb.kernel.org/~kzak/util-linux-ng/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,12 +15,16 @@ conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2')
 provides=('linux32' "util-linux-ng=${pkgver}")
 license=('GPL2')
 options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2
+       mount-segfault-2.19.1.patch)
 optdepends=('perl: for chkdupexe support')
-md5sums=('3eab06f05163dfa65479c44e5231932c')
+md5sums=('3eab06f05163dfa65479c44e5231932c'
+         '3247b52f0e4b8044f23f2f7218e2fdea')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # fix https://bugs.archlinux.org/task/24261
+  patch -Np1 -i ../mount-segfault-2.19.1.patch
   # hardware clock
   sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c
   ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-partx
diff --git a/core/util-linux/mount-segfault-2.19.1.patch b/core/util-linux/mount-segfault-2.19.1.patch
new file mode 100644
index 000000000..7bcb3bc05
--- /dev/null
+++ b/core/util-linux/mount-segfault-2.19.1.patch
@@ -0,0 +1,84 @@
+From f53edda83ebcfd7015c3f35196d6cbd7bc2d8369 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Wed, 11 May 2011 16:57:27 +0200
+Subject: [PATCH] mount: -a segfaults when 4th field is omitted (mount
+ options)
+
+ # echo 'tmpd /tmp/x tmpfs' >> /etc/fstab
+ # mkdir /tmp/x
+ # mount -a
+ segfault
+
+Reported-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ mount/mount.c        |    8 +++++---
+ mount/mount_mntent.c |    5 +++--
+ mount/sundries.c     |    2 ++
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/mount/mount.c b/mount/mount.c
+index ba71149..29963c2 100644
+--- a/mount/mount.c
++++ b/mount/mount.c
+@@ -1163,7 +1163,9 @@ is_mounted_same_loopfile(const char *node0, const char *loopfile, unsigned long
+ 			res = loopfile_used_with((char *) mnt->m.mnt_fsname,
+ 					loopfile, offset);
+ 
+-		else if ((p = strstr(mnt->m.mnt_opts, "loop="))) {
++		else if (mnt->m.mnt_opts &&
++			 (p = strstr(mnt->m.mnt_opts, "loop=")))
++		{
+ 			char *dev = xstrdup(p+5);
+ 			if ((p = strchr(dev, ',')))
+ 				*p = '\0';
+@@ -2052,8 +2054,8 @@ is_fstab_entry_mounted(struct mntentchn *mc, int verbose)
+ 		goto yes;
+ 
+ 	/* extra care for loop devices */
+-	if ((strstr(mc->m.mnt_opts, "loop=") ||
+-	     (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode)))) {
++	if ((mc->m.mnt_opts && strstr(mc->m.mnt_opts, "loop=")) ||
++	    (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode))) {
+ 
+ 		char *p = get_option_value(mc->m.mnt_opts, "offset=");
+ 		uintmax_t offset = 0;
+diff --git a/mount/mount_mntent.c b/mount/mount_mntent.c
+index d90def3..f42c0ad 100644
+--- a/mount/mount_mntent.c
++++ b/mount/mount_mntent.c
+@@ -70,7 +70,7 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) {
+ 	m1 = mangle(mnt->mnt_fsname);
+ 	m2 = mangle(mnt->mnt_dir);
+ 	m3 = mangle(mnt->mnt_type);
+-	m4 = mangle(mnt->mnt_opts);
++	m4 = mnt->mnt_opts ? mangle(mnt->mnt_opts) : "rw";
+ 
+ 	res = fprintf (mfp->mntent_fp, "%s %s %s %s %d %d\n",
+ 		       m1, m2, m3, m4, mnt->mnt_freq, mnt->mnt_passno);
+@@ -78,7 +78,8 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) {
+ 	free(m1);
+ 	free(m2);
+ 	free(m3);
+-	free(m4);
++	if (mnt->mnt_opts)
++		free(m4);
+ 	return (res < 0) ? 1 : 0;
+ }
+ 
+diff --git a/mount/sundries.c b/mount/sundries.c
+index ae4501a..2dec37f 100644
+--- a/mount/sundries.c
++++ b/mount/sundries.c
+@@ -217,6 +217,8 @@ matching_opts (const char *options, const char *test_opts) {
+ 
+      if (test_opts == NULL)
+ 	  return 1;
++     if (options == NULL)
++	  options = "";
+ 
+      len = strlen(test_opts);
+      q = alloca(len+1);
+-- 
+1.7.5.1
+
diff --git a/core/xz/PKGBUILD b/core/xz/PKGBUILD
index 4a5838529..cb1c045b3 100644
--- a/core/xz/PKGBUILD
+++ b/core/xz/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 117397 2011-04-01 14:53:10Z pierre $
+# $Id: PKGBUILD 124452 2011-05-21 17:48:29Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: François Charette <firmicus@gmx.net>
 
 pkgname=xz
-pkgver=5.0.2
+pkgver=5.0.3
 pkgrel=1
 pkgdesc='Library and command line tools for XZ and LZMA compressed files'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ provides=('lzma' 'lzma-utils' 'xz-utils')
 replaces=('lzma' 'lzma-utils' 'xz-utils')
 conflicts=('lzma' 'lzma-utils' 'xz-utils')
 options=('!libtool')
-source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('870d0e6fec3b710903371defb48a2fad')
+source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('fefe52f9ecd521de2a8ce38c21a27574')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'