Mon Aug 8 23:14:38 UTC 2011

96 files changed, 2835 insertions, 236 deletions

diff --git a/community-staging/aria2/PKGBUILD b/community-staging/aria2/PKGBUILD
new file mode 100644
index 000000000..19a015c8a
--- /dev/null
+++ b/community-staging/aria2/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=aria2
+pkgver=1.12.1
+pkgrel=2
+pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
+arch=('i686' 'x86_64')
+url='http://aria2.sourceforge.net/'
+license=('GPL')
+depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates')
+source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2")
+md5sums=('9f3bf96d92bc8b70b74817ed10c2c7e7')
+
+build() {
+  cd aria2-${pkgver}
+
+  ./configure \
+    --prefix=/usr \
+    --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+  make
+}
+
+package() {
+  cd aria2-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community-staging/filezilla/PKGBUILD b/community-staging/filezilla/PKGBUILD
new file mode 100644
index 000000000..73cb4f030
--- /dev/null
+++ b/community-staging/filezilla/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 53693 2011-08-07 21:01:03Z bluewind $
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=filezilla
+pkgver=3.5.0
+pkgrel=2
+pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
+arch=('i686' 'x86_64')
+url="http://filezilla-project.org/"
+license=('GPL')
+depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite3')
+install=filezilla.install
+source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2")
+md5sums=('25617d75167d07c0d3cfced69a4cf7cc')
+
+build() {
+  cd ${pkgname}-${pkgver}
+   ./autogen.sh
+  ./configure \
+    --prefix=/usr \
+    --disable-manualupdatecheck \
+    --disable-autoupdatecheck \
+    --disable-static \
+    --with-tinyxml=builtin
+
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+}
+md5sums=('6a83c3afe99c2679d5a3aa73607d80a7')
diff --git a/community-staging/filezilla/filezilla.install b/community-staging/filezilla/filezilla.install
new file mode 100644
index 000000000..1a05f573e
--- /dev/null
+++ b/community-staging/filezilla/filezilla.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community-staging/freerdp/PKGBUILD b/community-staging/freerdp/PKGBUILD
new file mode 100644
index 000000000..799008275
--- /dev/null
+++ b/community-staging/freerdp/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 53713 2011-08-07 21:41:20Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
+
+pkgname=freerdp
+pkgver=0.8.2
+pkgrel=3
+pkgdesc="Free RDP client"
+arch=('i686' 'x86_64')
+url="http://freerdp.sourceforge.net"
+license=('GPL')
+depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib')
+makedepends=('krb5')
+conflicts=('freerdp-git')
+changelog=${pkgname}.changelog
+options=('!libtool')
+source=(http://downloads.sourceforge.net/project/freerdp/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('cde590336292c977dfc1b4b7badf24d2')
+
+build() {
+  cd `find ${srcdir}/ -type d -name freerdp-\*`
+  [ -x configure ] || sh ./autogen.sh
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd `find ${srcdir}/ -type d -name freerdp-\*`
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community-staging/freerdp/freerdp.changelog b/community-staging/freerdp/freerdp.changelog
new file mode 100644
index 000000000..d47f165c3
--- /dev/null
+++ b/community-staging/freerdp/freerdp.changelog
@@ -0,0 +1,2 @@
+0.7.1-1 to 0.7.1-2
+* Added x86_64 to supported architectures (tested by figue).
diff --git a/community-staging/gloox/PKGBUILD b/community-staging/gloox/PKGBUILD
new file mode 100644
index 000000000..bd6adf0e1
--- /dev/null
+++ b/community-staging/gloox/PKGBUILD
@@ -0,0 +1,22 @@
+# $Id: PKGBUILD 53716 2011-08-07 21:42:08Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: William Rea <sillywilly@gmail.com>
+
+pkgname=gloox
+pkgver=1.0
+pkgrel=2
+pkgdesc="C++ libraries for development of Jabber client/component/server"
+arch=(i686 x86_64)
+url="http://camaya.net/gloox"
+options=('!libtool')
+license=("GPL")
+depends=('libidn' 'gnutls')
+source=(http://camaya.net/download/gloox-$pkgver.tar.bz2)
+md5sums=('f8eacf1c6476e0a309b453fd04f90e31')
+
+build() {
+  cd $startdir/src/gloox-$pkgver
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=$startdir/pkg install
+}
diff --git a/community-staging/gnustep-base/ChangeLog b/community-staging/gnustep-base/ChangeLog
new file mode 100644
index 000000000..590f23f5e
--- /dev/null
+++ b/community-staging/gnustep-base/ChangeLog
@@ -0,0 +1,6 @@
+2007-07-24 Snowman <eric@archlinux>
+	* rebuilt against toolchain in current
+	* fixed SMP build
+	* fixed file ownership
+2007-06-26 tardo <tardo@nagi-fanboi.net>
+* Built for x86_64
diff --git a/community-staging/gnustep-base/PKGBUILD b/community-staging/gnustep-base/PKGBUILD
new file mode 100644
index 000000000..d13e1f326
--- /dev/null
+++ b/community-staging/gnustep-base/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 53739 2011-08-07 22:05:20Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# Contributor: Sebastian Sareyko <public@nooms.de>
+
+pkgname=gnustep-base
+pkgver=1.22.0
+pkgrel=3
+pkgdesc="The GNUstep base package"
+arch=('i686' 'x86_64')
+url="http://www.gnustep.org/"
+license=("GPL" "LGPL")
+depends=(libxslt avahi gmp gcc-libs openssl libffi gnustep-make gnutls)
+makedepends=(gcc-objc)
+conflicts=('gnustep-base-svn')
+groups=('gnustep-core')
+options=('!emptydirs' '!makeflags')
+source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz)
+md5sums=('7faab4891ae6c1e7a6c806d6da368410')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  source /etc/profile.d/GNUstep.sh
+  ./configure --prefix=/usr --sysconfdir=/etc/GNUstep --with-ffi-include=/usr/lib/libffi-3.0.9/include/
+  # fix file ownership
+  sed -i 's/tar -xf $(TIMEZONE_ARCHIVE);/tar -xf $(TIMEZONE_ARCHIVE);chown -R root:root * ;/' NSTimeZones/Makefile.postamble
+  make VERBOSE=1
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  chown -R root.root "$pkgdir/"
+}
diff --git a/community-staging/gsasl/PKGBUILD b/community-staging/gsasl/PKGBUILD
new file mode 100644
index 000000000..735a57862
--- /dev/null
+++ b/community-staging/gsasl/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 53719 2011-08-07 21:42:52Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Orivej Desh <smpuj@bk.ru>
+# Maintainer: Orivej Desh <smpuj@bk.ru>
+
+pkgname=gsasl
+pkgver=1.6.1
+pkgrel=3
+pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms"
+arch=("i686" "x86_64")
+url="http://josefsson.org/gsasl/"
+license=("GPL")
+depends=('gnutls' 'libidn' 'krb5' 'libgcrypt')
+source=("ftp://ftp.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz")
+md5sums=('7ae813eeb1f90ad52e9a781ac9e17f28')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la"
+}
diff --git a/community-staging/gwenhywfar/PKGBUILD b/community-staging/gwenhywfar/PKGBUILD
new file mode 100644
index 000000000..1512a7eb1
--- /dev/null
+++ b/community-staging/gwenhywfar/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 53745 2011-08-07 22:06:07Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: William Rea <sillywilly@gmail.com>
+
+pkgname=gwenhywfar
+pkgver=4.2.0
+pkgrel=2
+pkgdesc="OS abstraction functions for various projects"
+arch=(i686 x86_64)
+url="http://www.aquamaniac.de"
+options=('!libtool')
+license=("LGPL")
+depends=('openssl' 'gnutls')
+makedepends=('gtk2' 'qt')
+optdepends=('gtk2' 'qt')
+source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=62&file=01&dummy=gwenhywfar-$pkgver.tar.gz")
+md5sums=('62d15e090a0c21bc9d22489ceaaadfde')
+
+build() {
+  pacman -Q gwenhywfar && return 1
+  cd $srcdir/gwenhywfar-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-ssl
+  make
+  make DESTDIR=$pkgdir install
+}
diff --git a/community-staging/libinfinity/PKGBUILD b/community-staging/libinfinity/PKGBUILD
new file mode 100644
index 000000000..6f6e5f123
--- /dev/null
+++ b/community-staging/libinfinity/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 53722 2011-08-07 21:43:34Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Gregory Haynes <greg@greghaynes.net>
+
+pkgname=libinfinity
+pkgver=0.5.1
+pkgrel=2
+pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
+arch=('i686' 'x86_64')
+url="http://gobby.0x539.de"
+license=('GPL')
+depends=('gnutls>=1.7.2' 'gsasl>=0.2.21' 'glib2>=2.16' 'libxml2>=2.0' 'gtk2')
+makedepends=('gtk-doc' 'pkgconfig')
+optdepends=('avahi: zeroconf support'
+            'gtk2: gtk support')
+options=('!libtool')
+source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('85e6d75e101fe25503653d2202054eff')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --localstatedir=/var
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  rm -rf $pkgdir/var
+}
diff --git a/community-staging/libmicrohttpd/PKGBUILD b/community-staging/libmicrohttpd/PKGBUILD
new file mode 100644
index 000000000..357863f07
--- /dev/null
+++ b/community-staging/libmicrohttpd/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 53725 2011-08-07 21:44:17Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
+# Contributor: Kao Dome <kaodome@gmail.com>
+# Contributor: Dmitrij D. Czarkoff <czarkoff@gmail.com>
+# Contributor: Mathias Rohnstock <linksoft@gmx.de>
+
+pkgname=libmicrohttpd
+pkgver=0.9.12
+pkgrel=2
+pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/libmicrohttpd/"
+license=('LGPL')
+options=('!libtool')
+depends=('gnutls')
+install=libmicrohttpd.install
+source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz)
+md5sums=('35b000cd7d201ace2b071d53a02b2c0d')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-dependency-tracking --enable-largefile \
+	--enable-curl --enable-messages --with-pic
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/platform.h \
+	${pkgdir}/usr/include/$pkgname/platform.h
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \
+	${pkgdir}/usr/include/$pkgname/plibc.h
+  sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' \
+	$pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc
+}
diff --git a/community-staging/libmicrohttpd/libmicrohttpd.install b/community-staging/libmicrohttpd/libmicrohttpd.install
new file mode 100644
index 000000000..dc0d2b996
--- /dev/null
+++ b/community-staging/libmicrohttpd/libmicrohttpd.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(microhttpd.info microhttpd-tutorial.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.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.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/community-staging/libvirt/PKGBUILD b/community-staging/libvirt/PKGBUILD
new file mode 100644
index 000000000..87c98529a
--- /dev/null
+++ b/community-staging/libvirt/PKGBUILD
@@ -0,0 +1,81 @@
+# $Id: PKGBUILD 53748 2011-08-07 22:06:51Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Jonathan Wiersma <archaur at jonw dot org>
+
+pkgname=libvirt
+pkgver=0.9.4
+pkgrel=2
+pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
+arch=('i686' 'x86_64')
+url="http://libvirt.org/"
+license=('LGPL')
+depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
+	 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap'
+	 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs'
+	 'iproute2')
+makedepends=('pkgconfig' 'lvm2')
+optdepends=('bridge-utils: for briged networking (default)'
+	    'dnsmasq: for NAT/DHCP for guests'
+	    'kernel26-ovz24: for openvz guests'
+	    'kvm'
+	    'lxc'
+	    'openbsd-netcat: for remote management over ssh'
+	    'qemu'
+	    'user-mode-linux'
+	    'virtualbox_bin'
+	    'virtualbox-ose'
+	    'xen'
+	    'radvd')
+options=('emptydirs' '!libtool')
+backup=('etc/conf.d/libvirtd'
+	'etc/libvirt/libvirtd.conf'
+	'etc/libvirt/qemu.conf'
+	'etc/sasl2/libvirt.conf')
+install="libvirt.install"
+source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
+	libvirtd.rc.d
+	libvirtd.conf.d
+	openbsd-netcat-default.patch
+	unixperms.patch
+	yajl-2.x.patch)
+md5sums=('86b411b11bd23d4af20611699f372af7'
+         'c43244c40a0437038c82089618e7beaa'
+         '3ed0e24f5b5e25bf553f5427d64915e6'
+         'ee7052f3929d5d918236c646a59edebf'
+         'db95aecdf2ccf3693fef5821cdcb7eba'
+         '5745bb8d0b254abb7a3528c66e03b0f9')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # python2 fix
+  export PYTHON=`which python2`
+  for file in $(find . -name '*.py' -print); do
+    sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file
+    sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+  done
+
+#  for more information on authentication see http://libvirt.org/auth.html
+#  If you wish to have unix-permissions based access rather than only polkit
+#  access, create a group called libvirt and uncomment the line below:
+#  patch -Np1 -i "$srcdir"/unixperms.patch
+
+  [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch
+
+  # fixes for yajl 2.0 API changes
+#  [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir/yajl-2.x.patch"
+
+  export LDFLAGS=-lX11
+  [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \
+	--with-storage-lvm --without-xen --with-udev --without-hal
+  find -name Makefile -exec sed -i 's#-L /usr#-L/usr#' {} \;
+  make -j1
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd
+  install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd
+  rm -rf $pkgdir/var/run
+}
diff --git a/community-staging/libvirt/libvirt.install b/community-staging/libvirt/libvirt.install
new file mode 100644
index 000000000..3881386d2
--- /dev/null
+++ b/community-staging/libvirt/libvirt.install
@@ -0,0 +1,38 @@
+_libvirt_setup() {
+  rm -f /usr/lib/python?.?/site-packages/libvirt.pyc
+  echo ">>> To use libvirt as a non-root user:"
+  echo ">>>  Use polkit to grant access."
+  echo ">>>  ...or change the access model in /etc/libvirt/libvirtd.conf."
+  echo ">>>     (see unixperms.patch in PKGBUILD for help)"
+  echo ""
+}
+
+post_install() {
+  _libvirt_setup || return 1
+  echo ">>> Be sure to see optdepends as you may find some of them helpfull."
+  echo ">>>  Especially: bridge-utils, dnsmasq, and hal."
+  echo ""
+  echo ">>> To start libvirtd run: '/etc/rc.d/libvirtd start' as root."
+  echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon"
+  echo ">>>  booting."
+  echo ""
+  /bin/true
+}
+
+post_upgrade() {
+  _libvirt_setup || return 1
+  echo ">>> To finish the upgrade, restart libvirtd by running the command:"
+  echo ">>>  '/etc/rc.d/libvirtd restart' as root or rebooting."
+  echo ">>> You may also need to run 'rm -rf ~/.libvirt'"
+  echo ""
+  /bin/true
+}
+
+post_remove() {
+   rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc
+   echo ">>> You may wish to delete the group 'libvirt' if it still exists."
+   echo ">>>  It can be removed by running 'groupdel libvirt' as root."
+   echo ""
+   depmod -a
+   /bin/true
+}
diff --git a/community-staging/libvirt/libvirtd.conf.d b/community-staging/libvirt/libvirtd.conf.d
new file mode 100644
index 000000000..d4d25b47a
--- /dev/null
+++ b/community-staging/libvirt/libvirtd.conf.d
@@ -0,0 +1,3 @@
+LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf"
+LIBVIRTD_ARGS="-p /var/run/libvirtd.pid"
+KRB5_KTNAME="/etc/libvirt/krb5.tab"
diff --git a/community-staging/libvirt/libvirtd.rc.d b/community-staging/libvirt/libvirtd.rc.d
new file mode 100755
index 000000000..193bffa9c
--- /dev/null
+++ b/community-staging/libvirt/libvirtd.rc.d
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/conf.d/libvirtd
+. /etc/rc.d/functions
+
+LIBVIRTD_CONFIG_ARGS=
+if [ -n "$LIBVIRTD_CONFIG" ]
+then
+	LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG"
+fi
+
+PID=`pidof -o %PPID /usr/sbin/libvirtd`
+case "$1" in
+    start)
+	stat_busy "Starting libvirtd"
+	export RADVD=/usr/sbin/radvd
+	for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do
+		[ -d $i ] || mkdir -p $i
+	done
+	[ -z "$PID" ] && (
+		mkdir -p /var/{cache,run}/libvirt
+		rm -rf /var/cache/libvirt/*
+		KRB5_KTNAME=$KRB5_KTNAME \
+			/usr/sbin/libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
+	)
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
+		add_daemon libvirtd
+		stat_done
+	fi
+	;;
+    stop)
+	stat_busy "Stopping libvirtd"
+	[ ! -z "$PID" ]  && (
+		kill $PID &> /dev/null
+		rm -rf /var/cache/libvirt/*
+		rm -f /var/run/libvirtd.pid
+	)
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
+		rm_daemon libvirtd
+		stat_done
+	fi
+	;;
+    restart)
+	$0 stop
+	sleep 1
+	$0 start
+	;;
+    reload)
+	stat_busy "Reloading libvirtd configuration"
+	[ ! -z "$PID" ]  && kill -HUP $PID &> /dev/null
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
+		stat_done
+	fi
+	;;
+    *)
+        echo $"Usage: $0 {start|stop|restart|reload}"
+        ;;
+esac
+exit 0
diff --git a/community-staging/libvirt/openbsd-netcat-default.patch b/community-staging/libvirt/openbsd-netcat-default.patch
new file mode 100644
index 000000000..c7543c5a4
--- /dev/null
+++ b/community-staging/libvirt/openbsd-netcat-default.patch
@@ -0,0 +1,36 @@
+diff -wbBur libvirt-0.9.4.org/src/qemu/qemu_migration.c libvirt-0.9.4/src/qemu/qemu_migration.c
+--- libvirt-0.9.4.org/src/qemu/qemu_migration.c	2011-08-03 05:36:34.000000000 +0400
++++ libvirt-0.9.4/src/qemu/qemu_migration.c	2011-08-03 13:29:56.000000000 +0400
+@@ -1612,7 +1612,7 @@
+         ret = qemuMonitorMigrateToUnix(priv->mon, background_flags,
+                                                unixfile);
+     } else if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) {
+-        const char *args[] = { "nc", "-U", unixfile, NULL };
++        const char *args[] = { "nc.openbsd", "-U", unixfile, NULL };
+         ret = qemuMonitorMigrateToCommand(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, args);
+     } else {
+         ret = -1;
+diff -wbBur libvirt-0.9.4.org/src/remote/remote_driver.c libvirt-0.9.4/src/remote/remote_driver.c
+--- libvirt-0.9.4.org/src/remote/remote_driver.c	2011-07-29 09:14:03.000000000 +0400
++++ libvirt-0.9.4/src/remote/remote_driver.c	2011-08-03 13:30:05.000000000 +0400
+@@ -588,7 +588,7 @@
+                                                 username,
+                                                 !tty,
+                                                 !verify,
+-                                                netcat ? netcat : "nc",
++                                                netcat ? netcat : "nc.openbsd",
+                                                 keyfile,
+                                                 sockname)))
+             goto failed;
+diff -wbBur libvirt-0.9.4.org/src/rpc/virnetsocket.c libvirt-0.9.4/src/rpc/virnetsocket.c
+--- libvirt-0.9.4.org/src/rpc/virnetsocket.c	2011-08-01 05:32:35.000000000 +0400
++++ libvirt-0.9.4/src/rpc/virnetsocket.c	2011-08-03 13:29:46.000000000 +0400
+@@ -629,7 +629,7 @@
+     if (noVerify)
+         virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
+     virCommandAddArgList(cmd, nodename,
+-                         netcat ? netcat : "nc",
++                         netcat ? netcat : "nc.openbsd",
+                          "-U", path, NULL);
+ 
+     return virNetSocketNewConnectCommand(cmd, retsock);
diff --git a/community-staging/libvirt/unixperms.patch b/community-staging/libvirt/unixperms.patch
new file mode 100644
index 000000000..b3fb86cf5
--- /dev/null
+++ b/community-staging/libvirt/unixperms.patch
@@ -0,0 +1,47 @@
+diff -ur libvirt-0.7.4-orig/daemon/libvirtd.conf libvirt-0.7.4-patched/daemon/libvirtd.conf
+--- libvirt-0.7.4-orig/daemon/libvirtd.conf	2009-11-23 03:10:33.398655655 -0800
++++ libvirt-0.7.4-patched/daemon/libvirtd.conf	2009-11-23 03:09:37.831189671 -0800
+@@ -78,14 +78,14 @@
+ # without becoming root.
+ #
+ # This is restricted to 'root' by default.
+-#unix_sock_group = "libvirt"
++unix_sock_group = "libvirt"
+ 
+ # Set the UNIX socket permissions for the R/O socket. This is used
+ # for monitoring VM status only
+ #
+ # Default allows any user. If setting group ownership may want to
+ # restrict this to:
+-#unix_sock_ro_perms = "0777"
++unix_sock_ro_perms = "0770"
+ 
+ # Set the UNIX socket permissions for the R/W socket. This is used
+ # for full management of VMs
+@@ -95,7 +95,7 @@
+ #
+ # If not using PolicyKit and setting group ownership for access
+ # control then you may want to relax this to:
+-#unix_sock_rw_perms = "0770"
++unix_sock_rw_perms = "0770"
+ 
+ # Set the name of the directory in which sockets will be found/created.
+ #unix_sock_dir = "/var/run/libvirt"
+@@ -126,7 +126,7 @@
+ #
+ # To restrict monitoring of domains you may wish to enable
+ # an authentication mechanism here
+-#auth_unix_ro = "none"
++auth_unix_ro = "none"
+ 
+ # Set an authentication scheme for UNIX read-write sockets
+ # By default socket permissions only allow root. If PolicyKit
+@@ -135,7 +135,7 @@
+ #
+ # If the unix_sock_rw_perms are changed you may wish to enable
+ # an authentication mechanism here
+-#auth_unix_rw = "none"
++auth_unix_rw = "none"
+ 
+ # Change the authentication scheme for TCP sockets.
+ #
diff --git a/community-staging/libvirt/yajl-2.x.patch b/community-staging/libvirt/yajl-2.x.patch
new file mode 100644
index 000000000..80d3edce0
--- /dev/null
+++ b/community-staging/libvirt/yajl-2.x.patch
@@ -0,0 +1,66 @@
+--- a/src/util/json.c	2011-03-24 03:10:26.000000000 -0400
++++ b/src/util/json.c	2011-04-25 20:01:29.354939116 -0400
+@@ -709,7 +709,7 @@
+ 
+ static int virJSONParserHandleNumber(void * ctx,
+                                      const char * s,
+-                                     unsigned int l)
++                                     size_t l)
+ {
+     virJSONParserPtr parser = ctx;
+     char *str = strndup(s, l);
+@@ -735,7 +735,7 @@
+ 
+ static int virJSONParserHandleString(void * ctx,
+                                      const unsigned char * stringVal,
+-                                     unsigned int stringLen)
++                                     size_t stringLen)
+ {
+     virJSONParserPtr parser = ctx;
+     virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal,
+@@ -756,7 +756,7 @@
+ 
+ static int virJSONParserHandleMapKey(void * ctx,
+                                      const unsigned char * stringVal,
+-                                     unsigned int stringLen)
++                                     size_t stringLen)
+ {
+     virJSONParserPtr parser = ctx;
+     virJSONParserStatePtr state;
+@@ -894,14 +894,14 @@
+ /* XXX add an incremental streaming parser - yajl trivially supports it */
+ virJSONValuePtr virJSONValueFromString(const char *jsonstring)
+ {
+-    yajl_parser_config cfg = { 1, 1 };
+     yajl_handle hand;
+     virJSONParser parser = { NULL, NULL, 0 };
+     virJSONValuePtr ret = NULL;
+ 
+     VIR_DEBUG("string=%s", jsonstring);
+ 
+-    hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser);
++    hand = yajl_alloc(&parserCallbacks, NULL, &parser);
++    yajl_config(hand, yajl_allow_comments, 1);
+ 
+     if (yajl_parse(hand,
+                    (const unsigned char *)jsonstring,
+@@ -1002,15 +1002,16 @@
+ 
+ char *virJSONValueToString(virJSONValuePtr object)
+ {
+-    yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */
+     yajl_gen g;
+     const unsigned char *str;
+     char *ret = NULL;
+-    unsigned int len;
++    size_t len;
+ 
+     VIR_DEBUG("object=%p", object);
+ 
+-    g = yajl_gen_alloc(&conf, NULL);
++    g = yajl_gen_alloc(NULL);
++    yajl_gen_config(g, yajl_gen_beautify, 0);
++    yajl_gen_config(g, yajl_gen_indent_string, " ");
+ 
+     if (virJSONValueToStringOne(object, g) < 0) {
+         virReportOOMError();
diff --git a/community-staging/mailutils/PKGBUILD b/community-staging/mailutils/PKGBUILD
new file mode 100644
index 000000000..521f58a01
--- /dev/null
+++ b/community-staging/mailutils/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 53728 2011-08-07 21:45:04Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=mailutils
+pkgver=2.2
+pkgrel=3
+pkgdesc="MUA command line tool (mailx)"
+arch=(i686 x86_64)
+url="http://www.gnu.org/software/mailutils/"
+license=('GPL')
+depends=('libldap' 'pam' 'gnutls' 'guile')
+makedepends=('python2' 'emacs')
+optdepends=('python2')
+conflicts=('libsieve')
+install=mailutils.install
+options=(zipman !emptydirs)
+source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2)
+md5sums=('834d2f616b922856127ecfe6c2de7d1a')
+
+build() {
+  cd "$srcdir/mailutils-$pkgver"
+
+  py2=`pacman -Q python2 | cut -d\  -f2 | cut -d. -f1-2`
+  py3=`pacman -Q python | cut -d\  -f2 | cut -d. -f1-2`
+
+  export PYTHON=/usr/bin/python2
+  export PYTHON_CONFIG=/usr/bin/python2-config
+  export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`"
+  export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`"
+
+  [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \
+	--libexecdir=/usr/lib/$pkgname --without-fribidi \
+	--without-tcp-wrappers
+#  [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \;
+  make -j1
+}
+
+package() {
+  cd "$srcdir/mailutils-$pkgver"
+  make -j1 DESTDIR=$pkgdir install
+  rm -f $pkgdir/usr/share/info/dir
+  mv $pkgdir/usr/bin/mail $pkgdir/usr/bin/gnu-mail
+  mv $pkgdir/usr/share/man/man1/mail.1 $pkgdir/usr/share/man/man1/gnu-mail.1
+  chown -R root:root $pkgdir
+}
diff --git a/community-staging/mailutils/mailutils.install b/community-staging/mailutils/mailutils.install
new file mode 100644
index 000000000..03b451b3e
--- /dev/null
+++ b/community-staging/mailutils/mailutils.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(mailutils.info mailutils.info-1 mailutils.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.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.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/community-staging/minbif/PKGBUILD b/community-staging/minbif/PKGBUILD
new file mode 100644
index 000000000..663b6d65a
--- /dev/null
+++ b/community-staging/minbif/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 53751 2011-08-07 23:40:14Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: AkiraYB <brunoyb!yahoo,com,br>
+
+pkgname=minbif
+pkgver=1.0.4
+pkgrel=4
+pkgdesc='An IRC gateway to IM networks that uses libpurple.'
+arch=('i686' 'x86_64')
+url='http://minbif.im/'
+license=('GPL2')
+depends=('gnutls' 'libcaca' 'libpurple')
+makedepends=('cmake')
+optdepends=('xinetd: to run minbif through xinetd')
+backup=('etc/minbif/minbif.conf'
+        'etc/minbif/minbif.motd')
+install='minbif.install'
+source=("http://minbif.im/attachments/download/90/${pkgname}-${pkgver}.tar.gz"
+        'minbif')
+md5sums=('25069fb6015dfb9ddc24ef2e09e74da3'
+         '307a6fab42bcaeed11a55b5fb4589778')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make PREFIX=/usr CONF_PREFIX=/etc/minbif ENABLE_MINBIF=ON ENABLE_IMLIB=ON ENABLE_CACA=ON \
+       ENABLE_VIDEO=OFF ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -dm0755 "${pkgdir}/var/lib"
+  install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif"
+  install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif/users"
+  install -Dm0755 "${srcdir}/minbif" "${pkgdir}/etc/rc.d/minbif"
+
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community-staging/minbif/minbif b/community-staging/minbif/minbif
new file mode 100644
index 000000000..47888d169
--- /dev/null
+++ b/community-staging/minbif/minbif
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/bin/minbif`
+case "$1" in
+  start)
+    stat_busy "Starting minbif daemon"
+    if [ -z "$PID" ]; then
+      if [ ! -d /var/run/minbif ]; then
+        mkdir -p /var/run/minbif && chown minbif:minbif /var/run/minbif
+      fi
+      [ -f /var/run/minbif/minbif.pid ] && rm -f /var/run/minbif/minbif.pid
+      CMD='/usr/bin/minbif --pidfile /var/run/minbif/minbif.pid \
+                           /etc/minbif/minbif.conf'
+      su -s /bin/sh -c "$CMD" minbif
+
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        add_daemon minbif
+        stat_done
+      fi
+    else
+      stat_fail
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping minbif daemon"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm -f /var/run/minbif/minbif.pid
+      rm_daemon minbif
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community-staging/minbif/minbif.install b/community-staging/minbif/minbif.install
new file mode 100644
index 000000000..264763407
--- /dev/null
+++ b/community-staging/minbif/minbif.install
@@ -0,0 +1,18 @@
+post_install() {
+  grep -qs ^minbif: /etc/group || groupadd -g 67 minbif
+  grep -qs ^minbif: /etc/passwd || useradd -u 67 -g minbif \
+    -d /var/lib/minbif -s /bin/false minbif
+
+  chown -R minbif:minbif /var/lib/minbif
+  chmod 0770 /var/lib/minbif
+  chmod 0770 /var/lib/minbif/users
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  grep -qs ^minbif: /etc/passwd && userdel minbif
+  grep -qs ^minbif: /etc/group && groupdel minbif
+}
diff --git a/community-staging/remmina-plugins/PKGBUILD b/community-staging/remmina-plugins/PKGBUILD
new file mode 100644
index 000000000..9e4534e2f
--- /dev/null
+++ b/community-staging/remmina-plugins/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 53731 2011-08-07 21:45:50Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
+
+pkgname=remmina-plugins
+pkgver=0.9.2
+pkgrel=2
+pkgdesc="Remina plugins"
+#"Remmina supports multiple network protocols in an integrated and consistant user interface.
+# Currently RDP, VNC, XDMCP and SSH are supported."
+arch=(i686 x86_64)
+url="http://sourceforge.net/projects/remmina/"
+license=('GPL')
+conflicts=(remmina-plugins-svn)
+depends=("remmina>=0.9.0" freerdp libxkbfile telepathy-glib)
+makedepends=(intltool pkgconfig gettext perl avahi)
+install=remmina-plugins.install
+options=('!libtool')
+source=(http://downloads.sourceforge.net/project/remmina/0.9/$pkgname-$pkgver.tar.gz)
+md5sums=('6f6b7cb18f7604f3f17eeda5173ede6a')
+
+build() {
+  cd $srcdir/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --enable-ssh --enable-rdp \
+	--enable-vnc --enable-xdmcp --enable-nx \
+	--enable-telepathy
+  make
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community-staging/remmina-plugins/remmina-plugins.install b/community-staging/remmina-plugins/remmina-plugins.install
new file mode 100644
index 000000000..1a05f573e
--- /dev/null
+++ b/community-staging/remmina-plugins/remmina-plugins.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community-staging/rsyslog/PKGBUILD b/community-staging/rsyslog/PKGBUILD
new file mode 100644
index 000000000..97cac9669
--- /dev/null
+++ b/community-staging/rsyslog/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 53734 2011-08-07 21:46:32Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=rsyslog
+pkgver=5.8.3
+pkgrel=2
+pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
+url="http://www.rsyslog.com/"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('zlib')
+makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls')
+optdepends=('postgresql-libs: PostgreSQL Database Support'
+	    'libmysqlclient: MySQL Database Support'
+	    'net-snmp'
+	    'gnutls')
+backup=('etc/rsyslog.conf' \
+	'etc/logrotate.d/rsyslog'
+	'etc/conf.d/rsyslog')
+options=('strip' 'zipman' '!libtool')
+source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
+	'rsyslog'
+	'rsyslog.logrotate'
+	'rsyslog.conf.d')
+md5sums=('b505c1558814335c000f15b59c4db562'
+         'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
+         '8065db4bef3061a4f000ba58779f6829'
+         '1a0cd4530dd5d1439456d5ae230574d9')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+              --enable-mysql \
+              --enable-pgsql \
+              --enable-mail \
+              --enable-imfile \
+              --enable-imtemplate \
+              --enable-snmp \
+              --enable-gnutls \
+              --enable-inet \
+              --with-systemdsystemunitdir=/lib/systemd/system
+  make
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make install DESTDIR=${pkgdir}
+  # Install Daemons and Configuration Files
+  install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d
+  install -D -m644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf
+  install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
+  install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
+}
diff --git a/community-staging/rsyslog/rsyslog b/community-staging/rsyslog/rsyslog
new file mode 100755
index 000000000..ee0145418
--- /dev/null
+++ b/community-staging/rsyslog/rsyslog
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/rsyslog
+
+PID=`pidof -o %PPID /usr/sbin/rsyslogd`
+case "$1" in
+  start)
+    stat_busy "Starting RSyslogd"
+    [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon rsyslogd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping RSyslogd"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm -f /var/run/rsyslogd.pid
+      rm -f /var/rsyslogd.persist
+      rm_daemon rsyslogd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community-staging/rsyslog/rsyslog.conf.d b/community-staging/rsyslog/rsyslog.conf.d
new file mode 100644
index 000000000..e39f8c3b9
--- /dev/null
+++ b/community-staging/rsyslog/rsyslog.conf.d
@@ -0,0 +1,6 @@
+#
+# Parameters to be passed to rsyslogd
+# This should almost certainly include at least the current compatability
+# level, e.g. -c4
+#
+RSYSLOGD_ARGS="-c4"
diff --git a/community-staging/rsyslog/rsyslog.logrotate b/community-staging/rsyslog/rsyslog.logrotate
new file mode 100644
index 000000000..76306c560
--- /dev/null
+++ b/community-staging/rsyslog/rsyslog.logrotate
@@ -0,0 +1,7 @@
+/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log {
+    missingok
+    sharedscripts
+    postrotate
+	/usr/bin/killall -HUP /usr/sbin/rsyslogd
+    endscript
+}
diff --git a/community-testing/fpc/Makefile-mk382.diff b/community-testing/fpc/Makefile-mk382.diff
new file mode 100644
index 000000000..00909766d
--- /dev/null
+++ b/community-testing/fpc/Makefile-mk382.diff
@@ -0,0 +1,174 @@
+--- Makefile.fpc.orig	2011-04-02 01:15:34.000000000 +0400
++++ Makefile.fpc	2011-08-05 22:29:44.000000000 +0400
+@@ -4,7 +4,7 @@
+ 
+ [package]
+ name=compiler
+-version=2.4.4
++version=2.5.1
+ 
+ [target]
+ programs=pp
+@@ -32,7 +32,7 @@
+ unexport FPC_VERSION FPC_COMPILERINFO
+ 
+ # Which platforms are ready for inclusion in the cycle
+-CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb # mipsel mips
++CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr
+ 
+ # All supported targets used for clean
+ ALLTARGETS=$(CYCLETARGETS)
+@@ -148,6 +148,12 @@
+ ifeq ($(CPC_TARGET),arm)
+ CPUSUF=arm
+ endif
++ifeq ($(CPC_TARGET),mips)
++CPUSUF=mips
++endif
++ifeq ($(CPC_TARGET),mipsel)
++CPUSUF=mipsel
++endif
+ 
+ # Do not define the default -d$(CPU_TARGET) because that
+ # will conflict with our -d$(CPC_TARGET)
+@@ -224,12 +230,39 @@
+ override LOCALOPT+=
+ endif
+ 
++# mipsel specific
++ifeq ($(PPC_TARGET),mipsel)
++override LOCALOPT+=-Fumips
++endif
++
++
++OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo
++OPTWPOPERFORM=-Owdevirtcalls,optvmts -Fw$(BASEDIR)/pp1.wpo
++# symbol liveness WPO requires nm, smart linking and no stripping (the latter
++# is forced by the Makefile when necessary)
++ifneq ($(findstring $(OS_TARGET),darwin linux freebsd solaris),)
++ifdef LINKSMART
++ifdef CREATESMART
++OPTWPOCOLLECT+=-OWsymbolliveness -Xs-
++OPTWPOPERFORM+=-Owsymbolliveness
++endif
++endif
++endif
++
++
+ [rules]
+ #####################################################################
+ # Setup Targets
+ #####################################################################
+ 
+ ifeq ($(OS_TARGET),win32)
++USE_CMP_FOR_DIFF=1
++endif
++ifeq ($(OS_TARGET),win64)
++USE_CMP_FOR_DIFF=1
++endif
++
++ifdef USE_CMP_FOR_DIFF
+ ifdef CMP
+ override DIFF:=$(CMP) -i218
+ endif
+@@ -267,6 +300,8 @@
+ TEMPNAME1=ppc1$(EXEEXT)
+ TEMPNAME2=ppc2$(EXEEXT)
+ TEMPNAME3=ppc3$(EXEEXT)
++TEMPWPONAME1=ppcwpo1$(EXEEXT)
++TEMPWPONAME2=ppcwpo2$(EXEEXT)
+ MAKEDEP=ppdep$(EXEEXT)
+ MSG2INC=./msg2inc$(EXEEXT)
+ ifdef CROSSINSTALL
+@@ -327,15 +362,15 @@
+         -$(DEL) $(addsuffix /*$(PPUEXT),$(COMPILERSOURCEDIR))
+ 
+ tempclean:
+-        -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC)
++        -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC) pp1.wpo pp2.wpo
+ 
+ execlean :
+-        -$(DEL) ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) $(EXENAME)
++        -$(DEL) ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME) $(TEMPWPONAME1) $(TEMPWPONAME2)
+ 
+ $(addsuffix _clean,$(ALLTARGETS)):
+         -$(DELTREE) $(addprefix $(subst _clean,,$@),/units)
+         -$(DEL) $(addprefix $(subst _clean,,$@)/,*$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT))
+-        -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcppc$(EXEEXT) $(EXENAME))
++        -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME))
+ 
+ cycleclean: cleanall $(addsuffix _clean,$(CPC_TARGET))
+         -$(DEL) $(EXENAME)
+@@ -444,6 +479,28 @@
+ # Normal cycle
+ #
+ 
++ifndef NOWPOCYCLE
++ifdef RELEASE
++DOWPOCYCLE=1
++# Two WPO cycles in case of RELEASE=1
++wpocycle:
++# don't use cycle_clean, it will delete the compiler utilities again
++        $(RM) $(EXENAME)
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOCOLLECT)' compiler
++        $(RM) $(EXENAME)
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(RTLOPT) $(OPTWPOPERFORM)' rtlclean rtl
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOPERFORM) $(subst pp1.wpo,pp2.wpo,$(OPTWPOCOLLECT))' $(addsuffix _clean,$(ALLTARGETS)) compiler
++        $(MOVE) $(EXENAME) $(TEMPWPONAME1)
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(RTLOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' rtlclean rtl
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(LOCALOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' $(addsuffix _clean,$(ALLTARGETS)) compiler
++        $(COPY) $(EXENAME) $(TEMPWPONAME2)
++endif
++endif
++
++ifndef DOWPOCYCLE
++wpocycle:
++endif
++
+ # Used to avoid unnecessary steps
+ ifdef DIFF
+ ifdef OLDFPC
+@@ -490,6 +547,7 @@
+         $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OLDFPC=$(BASEDIR)/$(TEMPNAME2)' next
+         $(DIFF) $(TEMPNAME3) $(EXENAME)
+         $(MAKE) $(addsuffix _all,$(TARGET_DIRS)) 'FPC=$(BASEDIR)/$(EXENAME)'
++        $(MAKE) wpocycle
+         $(MAKE) echotime
+ 
+ else
+@@ -508,8 +566,11 @@
+ # ppc<ARCH> (target native)
+ ifndef CROSSINSTALL
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl
++# building a native compiler for embedded targets is not possible
++ifneq ($(OS_TARGET),embedded)
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler
+ endif
++endif
+ 
+ endif
+ 
+@@ -523,10 +584,10 @@
+ # ppc3/ppcXXX = native (skipped for cross installation)
+ #
+ 
++cycle: override FPC=
+ cycle:
+ # ppc (source native)
+ # Clear detected compiler binary, because it can be existing crosscompiler binary, but we need native compiler here
+-override FPC=
+         $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 rtlclean rtl
+         $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) EXENAME=$(TEMPNAME) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 cycleclean compiler
+ # ppcross<ARCH> (source native)
+@@ -535,8 +596,11 @@
+ # ppc<ARCH> (target native)
+ ifndef CROSSINSTALL
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' rtlclean rtl
++# building a native compiler for embedded targets is not possible
++ifneq ($(OS_TARGET),embedded)
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' cycleclean compiler
+ endif
++endif
+ 
+ endif
+ 
diff --git a/community-testing/fpc/PKGBUILD b/community-testing/fpc/PKGBUILD
new file mode 100644
index 000000000..5a1002143
--- /dev/null
+++ b/community-testing/fpc/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id: PKGBUILD 53690 2011-08-07 20:47:34Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Valeriy Lyasotskiy <onestep@ukr.net>
+# Contributor: Jan Willemson <janwil@hot.ee>
+# Contributor: Hugo Ideler <hugoideler@dse.nl>
+# Original PKGBUILD: Andre Naumann <anaumann@SPARCed.org>
+# See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc
+
+pkgname=fpc
+pkgver=2.4.4
+pkgrel=2
+pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library."
+arch=('i686' 'x86_64')
+url="http://www.freepascal.org/"
+license=('GPL' 'LGPL' 'custom')
+backup=("etc/fpc.cfg")
+depends=(ncurses)
+makedepends=(fpc)
+options=(zipman)
+source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz
+	Makefile-mk382.diff)
+md5sums=('d069dfd3412bd0d26dcd1b81ac998305'
+         'a2242d261b055d08fa4d70e88ca1d1a7')
+
+build() {
+  cd ${srcdir}/fpcbuild-$pkgver
+  pushd fpcsrc/compiler
+  patch -uN Makefile.fpc $srcdir/Makefile-mk382.diff
+  fpcmake -Tall
+  popd
+  make NOGDB=1 build
+  make NOGDB=1 build OS_TARGET=win32 CPU_TARGET=i386
+}
+
+package() {
+  cd ${srcdir}/fpcbuild-$pkgver
+
+  export HOME=$srcdir
+
+  make -j1 NOGDB=1 PREFIX=${pkgdir}/usr install
+
+  make NOGDB=1 PREFIX=${pkgdir}/usr crossinstall OS_TARGET=win32 CPU_TARGET=i386
+  ln -s /usr/lib/fpc/$pkgver/ppcross386 $pkgdir/usr/bin/ppcross386
+
+  # install package license
+  install -m 755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m 644 fpcsrc/rtl/COPYING.FPC ${pkgdir}/usr/share/licenses/${pkgname}/
+
+  # create symlink for compiler
+  [ "$CARCH" = "i686" ] && ln -s /usr/lib/fpc/${pkgver}/ppc386 ${pkgdir}/usr/bin/
+  [ "$CARCH" = "x86_64" ] && ln -s /usr/lib/fpc/${pkgver}/ppcx64 ${pkgdir}/usr/bin/
+
+  # install sample config file
+  mkdir -p ${pkgdir}/etc
+  ${pkgdir}/usr/lib/fpc/${pkgver}/samplecfg /usr/lib/fpc/${pkgver} ${pkgdir}/etc
+
+  mv $pkgdir/usr/man $pkgdir/usr/share/
+}
diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD
index af18a5dbb..891e3d14f 100644
--- a/community/cdfs/PKGBUILD
+++ b/community/cdfs/PKGBUILD
@@ -1,31 +1,27 @@
-# $Id: PKGBUILD 42474 2011-03-16 21:46:25Z spupykin $
+# $Id: PKGBUILD 52427 2011-07-25 09:33:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
 
 pkgname=cdfs
 pkgver=2.6.27
-pkgrel=14
+pkgrel=15
 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
 arch=(i686 x86_64)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
 license=('GPL')
+makedepends=('linux-headers')
 install=cdfs.install
-source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$pkgname-$pkgver.tar.bz2")
-md5sums=('ac64c014a90e3c488394832ea29605b3')
+source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$pkgname-$pkgver.tar.bz2"
+	"cdfs-3.0.0.patch")
+md5sums=('ac64c014a90e3c488394832ea29605b3'
+         'aba7da94a9dcbb8a93ea423cb6958fef')
 
 build() {
-  _kernver=`pacman -Q kernel26 | cut -d . -f 3 | cut -f 1 -d -`
-  depends=("kernel26>=2.6.${_kernver}" "kernel26<2.6.`expr ${_kernver} + 1`")
+  _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
+  depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
 
   cd $srcdir/$pkgname-$pkgver
-
-  patch cddata.c <<EOF
-85c85
-<   .sendfile         = generic_file_sendfile
----
-> //  .sendfile         = generic_file_sendfile
-EOF
-
+  patch -p1 <$srcdir/cdfs-3.0.0.patch
   make
   mkdir -p $pkgdir/lib/modules/`uname -r`/extra
   cp cdfs.ko $pkgdir/lib/modules/`uname -r`/extra
diff --git a/community/cdfs/cdfs-3.0.0.patch b/community/cdfs/cdfs-3.0.0.patch
new file mode 100644
index 000000000..20194b848
--- /dev/null
+++ b/community/cdfs/cdfs-3.0.0.patch
@@ -0,0 +1,274 @@
+diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c
+--- cdfs-2.6.27/cddata.c	2009-12-21 17:04:03.000000000 +0300
++++ cdfs-2.6.27.my/cddata.c	2011-07-24 21:18:44.000000000 +0400
+@@ -83,7 +83,7 @@
+ #else
+   .mmap             = generic_file_readonly_mmap,
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
+-  .sendfile         = generic_file_sendfile
++//  .sendfile         = generic_file_sendfile
+ #else
+   .splice_read      = generic_file_splice_read
+ #endif
+diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
+--- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
++++ cdfs-2.6.27.my/root.c	2011-07-25 13:16:59.000000000 +0400
+@@ -32,19 +30,14 @@
+  *	Added code to transform /proc/cdfs into a sequential synthetic file.  *
+  *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+ 
+-
+ #include <linux/seq_file.h>
+-
+-#ifndef OLD_KERNEL
+ #include <linux/statfs.h>
+-#endif
++#include <linux/sched.h>
+ 
+ extern struct seq_operations cdfs_operations;
+ extern struct _track_info *dummy_track_p;
+ 
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) 
+ struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); 
+-#endif
+ /*============================================================================*
+  *  cdfs_open()                                                               *
+  *	Description:                                                          *
+@@ -115,15 +108,8 @@
+ 
+ /********************************************************************/
+ 
+-#ifdef OLD_KERNEL
+-static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){
+-  kdev_t dev = sb->s_dev;
+-  int i, j, t;
+-  struct cdrom_tochdr  hdr;
+-#else
+ static int cdfs_fill_super(struct super_block *sb, void *data, int silent){
+   int i, t;
+-#endif
+   struct cdrom_tocentry   entry;   
+   int no_audio=0, no_data=0;
+   cd * this_cd;
+@@ -131,24 +117,13 @@
+ 
+   PRINT("cdfs_mount\n");
+ 
+-#ifdef OLD_KERNEL
+-  MOD_INC_USE_COUNT;
+-
+-  set_blocksize(dev, CD_FRAMESIZE);  // voor bread met ide-cd
+-#else
+   sb_set_blocksize(sb, CD_FRAMESIZE);  // voor bread met ide-cd
+-#endif
+ 
+   sb->s_blocksize = CD_FRAMESIZE;
+   sb->s_blocksize_bits = 11;
+ 
+   if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){
+-#ifdef OLD_KERNEL
+-    MOD_DEC_USE_COUNT;     
+-    return NULL;
+-#else
+     return -ENOMEM;
+-#endif
+   }
+ 
+   this_cd->mode           = MODE;
+@@ -160,13 +135,8 @@
+ 
+   // Initialize cache for maximum sector size
+   if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) {
+-#ifdef OLD_KERNEL
+-    MOD_DEC_USE_COUNT;
+-    return NULL;
+-#else
+     kfree(cdfs_info(sb));
+     return -ENOMEM;
+-#endif
+   }
+ 
+   // Cache is still invalid
+@@ -183,23 +153,13 @@
+   if (this_cd->toc_scsi){
+     if (cdfs_toc_read_full(sb)){
+       printk("TOC read failed\n");
+-#ifdef OLD_KERNEL
+-      MOD_DEC_USE_COUNT;
+-      return NULL;
+-#else
+       goto invalid;
+-#endif
+     }
+   } else {
+     //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){
+     if (cdfs_toc_read(sb)){
+       printk("cdfs_toc_read failed\n");
+-#ifdef OLD_KERNEL
+-      MOD_DEC_USE_COUNT;
+-      return NULL;
+-#else
+       goto invalid;
+-#endif
+     }
+   }
+ 
+@@ -365,11 +325,7 @@
+   sb->s_flags |= MS_RDONLY;
+   sb->s_op     = &cdfs_ops;
+   /* always get inode status */
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
+   retinode=cdfs_iget(sb, 0);
+-#else
+-  retinode=iget(sb, 0);
+-#endif
+   if ( IS_ERR(retinode) )
+     return PTR_ERR(retinode);
+ 
+@@ -379,16 +335,12 @@
+ 
+   cdfs_proc_cd = this_cd;
+ 
+-#ifdef OLD_KERNEL
+-  return sb;
+-#else
+   return 0;
+ 
+ invalid:
+   kfree(this_cd->cache);
+   kfree(cdfs_info(sb));
+   return -EINVAL;
+-#endif
+ }
+ 
+ /************************************************************************/
+@@ -410,27 +362,12 @@
+   // Remove /proc entry
+   cdfs_proc_cd = NULL; 
+   kfree(cdfs_info(sb));
+-
+-#ifdef OLD_KERNEL
+-  MOD_DEC_USE_COUNT;
+-#endif
+-
+ }
+ 
+ /************************************************************************/
+ 
+-#ifdef OLD_KERNEL
+-static int cdfs_statfs(struct super_block *sb, struct statfs *buf) {
+-  cd * this_cd = cdfs_info(sb);
+-#else
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+ static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) {
+   cd * this_cd = cdfs_info(d->d_sb);
+-#else
+-static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) {
+-  cd * this_cd = cdfs_info(sb);
+-#endif
+-#endif
+   PRINT("rmfs_statfs\n");
+ 
+   buf->f_type    = CDFS_MAGIC;
+@@ -460,11 +397,7 @@
+ 
+ /************************************************************************/
+ 
+-#ifdef OLD_KERNEL
+-static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){
+-#else
+ static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){
+-#endif
+   struct inode * inode;
+   int i;
+   cd * this_cd = cdfs_info(dir->i_sb);
+@@ -480,15 +413,9 @@
+ /* Use goto and read inode with iget()/cdfs_iget() */
+ /* Thanks to David Howells for patch and Master class in his mail */
+ found:
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
+ inode = cdfs_iget(dir->i_sb, i);
+ if (IS_ERR(inode))
+   return ERR_CAST(inode);
+-#else
+-  inode = iget(dir->i_sb, i);
+-  if (!inode)
+-    return ERR_PTR(-ENOMEM);
+-#endif
+ d_add(dentry, inode);
+ return NULL;
+ }
+@@ -529,12 +456,8 @@
+     i->i_fop   = &cdfs_dir_operations;
+   } else {                                          /* file */
+     i->i_size  = this_cd->track[i->i_ino].size;
+-#ifdef OLD_KERNEL
+-    i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time;
+-#else
+     i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time;
+     i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
+-#endif
+     i->i_mode  = this_cd->mode;
+     if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) {
+       i->i_fop          = &cdfs_cddata_file_operations; 
+@@ -587,33 +510,21 @@
+ /******************************************************************/
+ 
+ static struct super_operations cdfs_ops = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+-  .read_inode = cdfs_read_inode,
+-#endif
+   .put_super  = cdfs_umount,
+   .statfs     = cdfs_statfs
+ };
+ 
+-#ifdef OLD_KERNEL
+-static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount);
+-#else
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+-static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
+-  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
+-#else
+-static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) {
+-  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super);
+-#endif
+-}
++//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
++//  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
++//}
+ 
+ static struct file_system_type cdfs_fs_type = {
+   .owner    = THIS_MODULE,
+   .name     = "cdfs",
+-  .get_sb   = cdfs_get_sb,
++//  .get_sb   = cdfs_get_sb,
+   .kill_sb  = kill_block_super,
+   .fs_flags = FS_REQUIRES_DEV
+ };
+-#endif
+ 
+ /******************************************************/
+ 
+@@ -621,10 +532,6 @@
+ MODULE_DESCRIPTION("CDfs: a CD filesystem");
+ MODULE_LICENSE("GPL"); 
+ 
+-#ifdef OLD_KERNEL
+-EXPORT_NO_SYMBOLS;
+-#endif
+-
+ /******************************************************************/
+ 
+ static int __init cdfs_init(void) {
+@@ -676,11 +583,7 @@
+   
+   if (!options) return;
+   
+-#ifdef OLD_KERNEL
+-  for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) {
+-#else
+   while ((this_char = strsep(&options,",")) != NULL) {
+-#endif
+     
+     if (!strcmp(this_char,"single")) 
+       this_cd->single=TRUE;
diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD
index 9da467697..dfa286c56 100644
--- a/community/dspam/PKGBUILD
+++ b/community/dspam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44186 2011-04-04 13:07:03Z spupykin $
+# $Id: PKGBUILD 53655 2011-08-07 17:18:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=dspam
-pkgver=3.9.0
-pkgrel=4
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="A scalable, open-source statistical anti-spam filter"
 arch=('i686' 'x86_64')
 url="http://dspam.nuclearelephant.com/"
@@ -22,7 +22,7 @@ source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam
 	dspam.logrotated
 	dspam)
 install=$pkgname.install
-md5sums=('10d092b57d628d8c91655fee5dc0d0cd'
+md5sums=('2e83e98a03af492df82532441e4ce335'
          '2163ca41de383f09f4d754e2d35cb158'
          'bb2300eff5b2a6eb987750c71a2c2169')
 
diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD
index a1d83a6bd..6f28671fa 100644
--- a/community/gnome-commander/PKGBUILD
+++ b/community/gnome-commander/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49734 2011-06-20 19:34:19Z ibiru $
+# $Id: PKGBUILD 53650 2011-08-07 16:53:25Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Johannes Sjolund <j.sjolund@gmail.com>
 
 pkgname=gnome-commander
-pkgver=1.2.8.12
+pkgver=1.2.8.13
 pkgrel=1
 pkgdesc="A graphical two-pane filemanager for Gnome"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool')
 options=(!libtool)
 install=gnome-commander.install
 source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('3431f28c7ff1dd882e4b5d6e6b2351929138cc123be4027e20b767eb5725bfee')
+sha256sums=('d5fd6da276a21046c73ae9ebdc676ee3c82b4a2149e6dc6d38006f8b364a5893')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD
index 0e8662c8b..576477ef8 100644
--- a/community/knemo/PKGBUILD
+++ b/community/knemo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44066 2011-04-01 20:42:30Z lcarlier $
+# $Id: PKGBUILD 53704 2011-08-07 21:16:33Z lcarlier $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
 
 pkgname=knemo
-pkgver=0.7.1
+pkgver=0.7.2
 pkgrel=1
 pkgdesc="The KDE Network Monitor"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 options=('libtool')
 source=("http://www.kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.bz2")
-md5sums=('e9a129917dfc6515c992ee1de3c08c16')
+md5sums=('4f90d81e2d0980ed3ae4e4fefc4bf20b')
 
 build() {
   cd ${srcdir}
diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD
index d9c89d9b7..3f8ff7311 100644
--- a/community/mygui/PKGBUILD
+++ b/community/mygui/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 53635 2011-08-07 03:07:13Z svenstaro $
+# $Id: PKGBUILD 53640 2011-08-07 04:39:00Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Andrew Belitsky <belitsky.a@gmail.com>
 pkgbase=mygui
 pkgname=('mygui' 'mygui-docs')
 pkgver=3.2.0rc1
-pkgrel=7
+pkgrel=8
 pkgdesc="A multilayer and overlappable GUI System for OGRE"
 arch=('i686' 'x86_64')
 url="http://mygui.info/"
 license=('LGPL')
 depends=('boost-libs' 'ogre' 'ois')
-makedepends=('boost' 'cmake' 'doxygen' 'graphviz')
+makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu')
 install=mygui.install
 source=("http://downloads.sourceforge.net/my-gui/MyGUI_3.2.0_RC1.zip")
 md5sums=('1ac1340148e81ad49a26c8a87acefc6b')
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index 127bf5c92..449f8d6cf 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 49143 2011-06-11 22:40:49Z spupykin $
+# $Id: PKGBUILD 52418 2011-07-24 20:40:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools-modules
-pkgver=2011.05.27
-_pkgsubver=420096
+pkgver=2011.07.19
+_pkgsubver=450511
 pkgrel=1
-pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools."
+pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
 arch=('i686' 'x86_64')
 url="http://open-vm-tools.sourceforge.net/"
 license=('GPL')
-makedepends=('libdnet' 'icu' 'uriparser' 'kernel26-headers')
-depends=("kernel26")
+makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers')
+depends=("linux")
 install=$pkgname.install
-source=(http://kent.dl.sourceforge.net/sourceforge/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz)
-md5sums=('3e43d4857d412d02115e69db193830b5')
+source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz")
+md5sums=('efe9b078045e9f7ea1e1311bf11857e6')
 
 build() {
   cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
@@ -24,9 +24,9 @@ build() {
 }
 
 package() {
-  _kernver=`pacman -Q kernel26 | cut -d . -f 3 | cut -f 1 -d -`
-  depends=("kernel26>=2.6.${_kernver}" "kernel26<2.6.`expr ${_kernver} + 1`")
-  KERNEL_VERSION="2.6.${_kernver}-ARCH"
+  _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
+  depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
+  KERNEL_VERSION=`uname -r`
   msg "Kernel = $KERNEL_VERSION"
 
   cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
diff --git a/community/open-vm-tools-modules/open-vm-tools-modules.install b/community/open-vm-tools-modules/open-vm-tools-modules.install
index 7f44b03ef..8de8d6ec5 100644
--- a/community/open-vm-tools-modules/open-vm-tools-modules.install
+++ b/community/open-vm-tools-modules/open-vm-tools-modules.install
@@ -14,7 +14,7 @@ post_install() {
 
   echo ">>>"
   echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually"
-  echo ">>> disable loading of pcnet32 driver by blacklisting it in /etc/rc.conf."
+  echo ">>> disable loading of pcnet32 driver"
   echo ">>>"
 }
 
@@ -29,6 +29,6 @@ post_remove() {
   sed "/VMware net driver/,+1 d" -i /etc/modprobe.d/modprobe.conf
 
   echo ">>>"
-  echo ">>> Remember to un-blacklist pcnet32 driver in /etc/rc.conf."
+  echo ">>> Remember to un-blacklist pcnet32 driver"
   echo ">>>"
 }
diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD
index 447d3dedd..92e48c99b 100644
--- a/community/open-vm-tools/PKGBUILD
+++ b/community/open-vm-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49148 2011-06-11 22:48:15Z spupykin $
+# $Id: PKGBUILD 52415 2011-07-24 20:39:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools
-pkgver=2011.05.27
-_pkgsubver=420096
+pkgver=2011.07.19
+_pkgsubver=450511
 pkgrel=1
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools."
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}
 	tools.conf
 	vmware-guestd
 	xautostart.conf)
-md5sums=('3e43d4857d412d02115e69db193830b5'
+md5sums=('efe9b078045e9f7ea1e1311bf11857e6'
          '06f7448e274db2a911f582e276088fc9'
          'b183ec265200d68431a5e4eb1b0c8cf5'
          '8c333a979578bdc0c3134c1dd6bb7353'
diff --git a/community/uzbl/PKGBUILD b/community/uzbl/PKGBUILD
index c3e4c667d..98e006db0 100644
--- a/community/uzbl/PKGBUILD
+++ b/community/uzbl/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 51925 2011-07-18 08:18:29Z lcarlier $
+# $Id: PKGBUILD 53737 2011-08-07 22:05:14Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Dieter Plaetinck <dieter@plaetinck.be>
 
 pkgbase=uzbl
 pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed')
-pkgver=2011.07.17
+pkgver=2011.07.25
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.uzbl.org"
 license=('GPL3')
 makedepends=('git' 'pkgconfig' 'libwebkit>=1.3.13')
 source=(uzbl-$pkgver.tar.gz::https://github.com/Dieterbe/uzbl/tarball/$pkgver)
-md5sums=('c4f441d25c1edf7dddc5b8ce40994e64')
+md5sums=('96fed3e0c690df6bf4b46af6a9cd0194')
 
 build() {
     cd "$srcdir"/Dieterbe-uzbl-*
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 1cdf18903..9df5a53bf 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 53171 2011-07-31 11:38:59Z ibiru $
+# $Id: PKGBUILD 53173 2011-07-31 12:12:47Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
 pkgver=4.1.0
-pkgrel=2.1
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
 makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
-'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2'
+'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2'
 'xorg-server-devel' 'xf86driproto' 'libxcomposite')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
@@ -17,7 +17,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
         10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh
         change_default_driver_dir.patch
         fix-kernel-panic.patch)
-_kernver=2.6.39-ARCH
+_kernver=3.0-ARCH
 
 build() {
     cd "$srcdir/VirtualBox-${pkgver}_OSE"
@@ -45,7 +45,7 @@ build() {
 
 package_virtualbox() {
     pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
-    depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'kernel26-headers' 'gcc' 'make')
+    depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'linux-headers' 'gcc' 'make')
     optdepends=('qt: for VirtualBox GUI'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-sdk: developer kit')
@@ -173,7 +173,7 @@ package_virtualbox-archlinux-modules(){
     pkgdesc="Additions only for Arch Linux guests (kernel modules)"
     license=('GPL')
     install=virtualbox-archlinux-modules.install
-    depends=('kernel26>=2.6.39' 'kernel26<2.6.40')
+    depends=('linux>=3.0' 'linux<3.1')
     replaces=('virtualbox-guest-modules')
     conflicts=('virtualbox-guest-modules')
 
diff --git a/community/virtualbox/virtualbox-archlinux-modules.install b/community/virtualbox/virtualbox-archlinux-modules.install
index 8faef400e..40e979b05 100644
--- a/community/virtualbox/virtualbox-archlinux-modules.install
+++ b/community/virtualbox/virtualbox-archlinux-modules.install
@@ -1,4 +1,4 @@
-KERNEL_VERSION='2.6.39-ARCH'
+KERNEL_VERSION='3.0-ARCH'
 
 post_install() {
   cat << EOM
diff --git a/core/libgssglue/PKGBUILD b/core/libgssglue/PKGBUILD
index 493598561..d651bf612 100644
--- a/core/libgssglue/PKGBUILD
+++ b/core/libgssglue/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123644 2011-05-12 06:23:26Z tpowa $
+# $Id: PKGBUILD 133594 2011-07-29 21:01:43Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libgssglue
-pkgver=0.1
-pkgrel=4
+pkgver=0.3
+pkgrel=1
 pkgdesc="Exports a gssapi interface which calls other random gssapi libraries"
 arch=('i686' 'x86_64')
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
@@ -14,7 +14,7 @@ backup=(etc/gssapi_mech.conf)
 options=('!libtool')
 source=(http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz
         gssapi_mech.conf)
-md5sums=('ce1b4c758e6de01b712d154c5c97e540'
+md5sums=('48aaad11b7371ba3270faa322202c038'
          '080be866717e4e06fa6f7d6f43cb395a')
 
 build() {
diff --git a/core/libtirpc/PKGBUILD b/core/libtirpc/PKGBUILD
index 80ae3d14c..6035cdb2c 100644
--- a/core/libtirpc/PKGBUILD
+++ b/core/libtirpc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 132087 2011-07-20 00:51:34Z eric $
+# $Id: PKGBUILD 133597 2011-07-29 21:03:33Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libtirpc
 pkgver=0.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Transport Independent RPC library (SunRPC replacement)"
 arch=('i686' 'x86_64')
 url="http://libtirpc.sourceforge.net/"
@@ -12,17 +12,26 @@ depends=('libgssglue')
 backup=('etc/netconfig')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2
-       libtirpc-0.2.1-fortify.patch)
+       libtirpc-0.2.1-fortify.patch
+       libtirpc-0.2.3rc1.patch
+       libtirpc-fix-segfault-0.2.2.patch)
 md5sums=('74c41c15c2909f7d11d9c7bfa7db6273'
-         '2e5c067f1651469dfbbdc91d3c9c60e8')
+         '2e5c067f1651469dfbbdc91d3c9c60e8'
+         'ac2a1657b44f4a99c37d8265b05b9133'
+         '5a3ab55934cad4e8b38fc90c54756472')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   # fix http://bugs.gentoo.org/293593
   # https://bugs.archlinux.org/task/20082
   patch -Np1 -i ../libtirpc-0.2.1-fortify.patch
+  # add patches from fedora git to make nfs-utils compile again
+  patch -Np1 -i ../libtirpc-0.2.3rc1.patch
+  patch -Np1 -i ../libtirpc-fix-segfault-0.2.2.patch
+  sh autogen.sh
+  autoreconf -fisv
   ./configure --prefix=/usr --enable-gss
-  make 
+  make
 }
 
 package() {
diff --git a/core/libtirpc/libtirpc-0.2.3rc1.patch b/core/libtirpc/libtirpc-0.2.3rc1.patch
new file mode 100644
index 000000000..d57a59e1f
--- /dev/null
+++ b/core/libtirpc/libtirpc-0.2.3rc1.patch
@@ -0,0 +1,637 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7ee8cbc..6731ff9 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -50,7 +50,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln
+         rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
+         rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \
+         svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
+-        auth_time.c auth_des.c authdes_prot.c des_crypt.c
++        auth_time.c auth_des.c authdes_prot.c
+ 
+ ## XDR
+ libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c
+diff --git a/src/auth_des.c b/src/auth_des.c
+index 37e7667..f0c8b8c 100644
+--- a/src/auth_des.c
++++ b/src/auth_des.c
+@@ -223,6 +223,7 @@ authdes_pk_seccreate(const char *servername, netobj *pkey, u_int window,
+ 		goto failed;
+ 	}
+ 	ad->ad_nis_srvr = NULL; /* not needed any longer */
++	auth_get(auth);		/* Reference for caller */
+ 	return (auth);
+ 
+ failed:
+@@ -472,6 +473,12 @@ authdes_destroy(AUTH *auth)
+ 	FREE(auth, sizeof(AUTH));
+ }
+ 
++static bool_t
++authdes_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere)
++{
++	return ((*xfunc)(xdrs, xwhere));
++}
++
+ static struct auth_ops *
+ authdes_ops(void)
+ {
+@@ -487,6 +494,8 @@ authdes_ops(void)
+ 		ops.ah_validate = authdes_validate;
+ 		ops.ah_refresh = authdes_refresh;
+ 		ops.ah_destroy = authdes_destroy;
++		ops.ah_wrap = authdes_wrap;
++		ops.ah_unwrap = authdes_wrap;
+         }
+ 	mutex_unlock(&authdes_ops_lock);
+ 	return (&ops);
+diff --git a/src/auth_gss.c b/src/auth_gss.c
+index df3017a..a992049 100644
+--- a/src/auth_gss.c
++++ b/src/auth_gss.c
+@@ -200,6 +200,8 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec)
+ 
+ 	if (!authgss_refresh(auth))
+ 		auth = NULL;
++	else
++		auth_get(auth); /* Reference for caller */
+ 
+ 	clnt->cl_auth = save_auth;
+ 
+@@ -555,9 +557,20 @@ authgss_destroy_context(AUTH *auth)
+ 
+ 	if (gd->gc.gc_ctx.length != 0) {
+ 		if (gd->established) {
++			AUTH *save_auth = NULL;
++
++			/* Make sure we use the right auth_ops */
++			if (gd->clnt->cl_auth != auth) {
++				save_auth = gd->clnt->cl_auth;
++				gd->clnt->cl_auth = auth;
++			}
++
+ 			gd->gc.gc_proc = RPCSEC_GSS_DESTROY;
+ 			clnt_call(gd->clnt, NULLPROC, (xdrproc_t)xdr_void, NULL,
+ 				  (xdrproc_t)xdr_void, NULL, AUTH_TIMEOUT);
++			
++			if (save_auth != NULL)
++				gd->clnt->cl_auth = save_auth;
+ 		}
+ 		gss_release_buffer(&min_stat, &gd->gc.gc_ctx);
+ 		/* XXX ANDROS check size of context  - should be 8 */
+diff --git a/src/auth_none.c b/src/auth_none.c
+index a439ec6..008c589 100644
+--- a/src/auth_none.c
++++ b/src/auth_none.c
+@@ -155,6 +155,12 @@ authnone_destroy(AUTH *client)
+ {
+ }
+ 
++static bool_t
++authnone_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere)
++{
++	return ((*xfunc)(xdrs, xwhere));
++}
++
+ static struct auth_ops *
+ authnone_ops()
+ {
+@@ -170,6 +176,8 @@ authnone_ops()
+ 		ops.ah_validate = authnone_validate;
+ 		ops.ah_refresh = authnone_refresh;
+ 		ops.ah_destroy = authnone_destroy;
++		ops.ah_wrap = authnone_wrap;
++		ops.ah_unwrap = authnone_wrap;
+ 	}
+ 	mutex_unlock(&ops_lock);
+ 	return (&ops);
+diff --git a/src/auth_unix.c b/src/auth_unix.c
+index c2469da..4b9b13f 100644
+--- a/src/auth_unix.c
++++ b/src/auth_unix.c
+@@ -162,6 +162,7 @@ authunix_create(machname, uid, gid, len, aup_gids)
+ 	 */
+ 	auth->ah_cred = au->au_origcred;
+ 	marshal_new_auth(auth);
++	auth_get(auth);		/* Reference for caller */
+ 	return (auth);
+ #ifndef _KERNEL
+  cleanup_authunix_create:
+@@ -396,6 +397,12 @@ marshal_new_auth(auth)
+ 	XDR_DESTROY(xdrs);
+ }
+ 
++static bool_t
++authunix_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere)
++{
++	return ((*xfunc)(xdrs, xwhere));
++}
++
+ static struct auth_ops *
+ authunix_ops()
+ {
+@@ -411,6 +418,8 @@ authunix_ops()
+ 		ops.ah_validate = authunix_validate;
+ 		ops.ah_refresh = authunix_refresh;
+ 		ops.ah_destroy = authunix_destroy;
++		ops.ah_wrap = authunix_wrap;
++		ops.ah_unwrap = authunix_wrap;
+ 	}
+ 	mutex_unlock(&ops_lock);
+ 	return (&ops);
+diff --git a/src/authgss_prot.c b/src/authgss_prot.c
+index 9d7fa09..0168318 100644
+--- a/src/authgss_prot.c
++++ b/src/authgss_prot.c
+@@ -161,6 +161,7 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
+ 	databuflen = end - start - 4;
+ 	XDR_SETPOS(xdrs, start + 4);
+ 	databuf.value = XDR_INLINE(xdrs, databuflen);
++	databuf.length = databuflen;
+ 
+ 	xdr_stat = FALSE;
+ 
+@@ -169,7 +170,6 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
+ 		XDR_SETPOS(xdrs, start);
+ 		if (!xdr_u_int(xdrs, (u_int *)&databuflen))
+ 			return (FALSE);
+-		databuf.length = databuflen;
+ 
+ 		/* Checksum rpc_gss_data_t. */
+ 		maj_stat = gss_get_mic(&min_stat, ctx, qop,
+diff --git a/src/clnt_dg.c b/src/clnt_dg.c
+index 79fed5d..4a1f60a 100644
+--- a/src/clnt_dg.c
++++ b/src/clnt_dg.c
+@@ -366,7 +366,7 @@ call_again:
+ 
+ 	if ((! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
+ 	    (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
+-	    (! (*xargs)(xdrs, argsp))) {
++	    (! AUTH_WRAP(cl->cl_auth, xdrs, xargs, argsp))) {
+ 		cu->cu_error.re_status = RPC_CANTENCODEARGS;
+ 		goto out;
+ 	}
+@@ -400,8 +400,8 @@ get_reply:
+ 	 * (We assume that this is actually only executed once.)
+ 	 */
+ 	reply_msg.acpted_rply.ar_verf = _null_auth;
+-	reply_msg.acpted_rply.ar_results.where = resultsp;
+-	reply_msg.acpted_rply.ar_results.proc = xresults;
++	reply_msg.acpted_rply.ar_results.where = NULL;
++	reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
+ 
+         fd.fd = cu->cu_fd;
+         fd.events = POLLIN;
+@@ -512,6 +512,10 @@ get_reply:
+ 					    &reply_msg.acpted_rply.ar_verf)) {
+ 				cu->cu_error.re_status = RPC_AUTHERROR;
+ 				cu->cu_error.re_why = AUTH_INVALIDRESP;
++			} else if (! AUTH_UNWRAP(cl->cl_auth, &reply_xdrs,
++						 xresults, resultsp)) {
++				if (cu->cu_error.re_status == RPC_SUCCESS)
++				     cu->cu_error.re_status = RPC_CANTDECODERES;
+ 			}
+ 			if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) {
+ 				xdrs->x_op = XDR_FREE;
+diff --git a/src/clnt_vc.c b/src/clnt_vc.c
+index 359063c..097cae8 100644
+--- a/src/clnt_vc.c
++++ b/src/clnt_vc.c
+@@ -364,7 +364,7 @@ call_again:
+ 	if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) ||
+ 	    (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
+ 	    (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
+-	    (! (*xdr_args)(xdrs, args_ptr))) {
++	    (! AUTH_WRAP(cl->cl_auth, xdrs, xdr_args, args_ptr))) {
+ 		if (ct->ct_error.re_status == RPC_SUCCESS)
+ 			ct->ct_error.re_status = RPC_CANTENCODEARGS;
+ 		(void)xdrrec_endofrecord(xdrs, TRUE);
+@@ -420,7 +420,8 @@ call_again:
+ 		    &reply_msg.acpted_rply.ar_verf)) {
+ 			ct->ct_error.re_status = RPC_AUTHERROR;
+ 			ct->ct_error.re_why = AUTH_INVALIDRESP;
+-		} else if (! (*xdr_results)(xdrs, results_ptr)) {
++		} else if (! AUTH_UNWRAP(cl->cl_auth, xdrs,
++					 xdr_results, results_ptr)) {
+ 			if (ct->ct_error.re_status == RPC_SUCCESS)
+ 				ct->ct_error.re_status = RPC_CANTDECODERES;
+ 		}
+diff --git a/src/svc.c b/src/svc.c
+index b4a63d0..08cd6c9 100644
+--- a/src/svc.c
++++ b/src/svc.c
+@@ -77,9 +77,6 @@ static struct svc_callout
+ 
+ extern rwlock_t svc_lock;
+ extern rwlock_t svc_fd_lock;
+-#ifdef HAVE_LIBGSSAPI
+-extern struct svc_auth_ops svc_auth_gss_ops;
+-#endif
+ 
+ static struct svc_callout *svc_find (rpcprog_t, rpcvers_t,
+ 				     struct svc_callout **, char *);
+@@ -717,11 +714,9 @@ svc_getreq_common (fd)
+ 	  SVC_DESTROY (xprt);
+ 	  break;
+ 	}
+-    else if ((xprt->xp_auth != NULL) 
+-#ifdef HAVE_LIBGSSAPI
+-	  	&& (xprt->xp_auth->svc_ah_ops != &svc_auth_gss_ops)
+-#endif
+-	) {
++    else if ((xprt->xp_auth != NULL) &&
++	     (xprt->xp_auth->svc_ah_private == NULL))
++	{
+ 	  xprt->xp_auth = NULL;
+ 	}
+     }
+diff --git a/src/svc_auth.c b/src/svc_auth.c
+index c6b3a0b..e80d5f9 100644
+--- a/src/svc_auth.c
++++ b/src/svc_auth.c
+@@ -98,8 +98,8 @@ _authenticate(rqst, msg)
+ 	rqst->rq_xprt->xp_verf.oa_length = 0;
+ 	cred_flavor = rqst->rq_cred.oa_flavor;
+ 	switch (cred_flavor) {
+-	case AUTH_NULL:
+-		dummy = _svcauth_null(rqst, msg);
++	case AUTH_NONE:
++		dummy = _svcauth_none(rqst, msg);
+ 		return (dummy);
+ 	case AUTH_SYS:
+ 		dummy = _svcauth_unix(rqst, msg);
+@@ -132,15 +132,6 @@ _authenticate(rqst, msg)
+ 	return (AUTH_REJECTEDCRED);
+ }
+ 
+-/*ARGSUSED*/
+-enum auth_stat
+-_svcauth_null(rqst, msg)
+-	struct svc_req *rqst;
+-	struct rpc_msg *msg;
+-{
+-	return (AUTH_OK);
+-}
+-
+ /*
+  *  Allow the rpc service to register new authentication types that it is
+  *  prepared to handle.  When an authentication flavor is registered,
+diff --git a/src/svc_auth_unix.c b/src/svc_auth_unix.c
+index ce83859..9585069 100644
+--- a/src/svc_auth_unix.c
++++ b/src/svc_auth_unix.c
+@@ -43,6 +43,8 @@
+ 
+ #include <rpc/rpc.h>
+ 
++extern SVCAUTH svc_auth_none;
++
+ /*
+  * Unix longhand authenticator
+  */
+@@ -67,6 +69,8 @@ _svcauth_unix(rqst, msg)
+ 	assert(rqst != NULL);
+ 	assert(msg != NULL);
+ 
++	rqst->rq_xprt->xp_auth = &svc_auth_none;
++
+ 	area = (struct area *) rqst->rq_clntcred;
+ 	aup = &area->area_aup;
+ 	aup->aup_machname = area->area_machname;
+@@ -142,5 +146,6 @@ _svcauth_short(rqst, msg)
+ 	struct svc_req *rqst;
+ 	struct rpc_msg *msg;
+ {
++	rqst->rq_xprt->xp_auth = &svc_auth_none;
+ 	return (AUTH_REJECTEDCRED);
+ }
+diff --git a/src/svc_dg.c b/src/svc_dg.c
+index 66a56ee..5ef9df2 100644
+--- a/src/svc_dg.c
++++ b/src/svc_dg.c
+@@ -134,6 +134,7 @@ svc_dg_create(fd, sendsize, recvsize)
+ 	su->su_cache = NULL;
+ 	xprt->xp_fd = fd;
+ 	xprt->xp_p2 = su;
++	xprt->xp_auth = NULL;
+ 	xprt->xp_verf.oa_base = su->su_verfbody;
+ 	svc_dg_ops(xprt);
+ 	xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage);
+@@ -234,10 +235,27 @@ svc_dg_reply(xprt, msg)
+ 	bool_t stat = FALSE;
+ 	size_t slen;
+ 
++	xdrproc_t xdr_results;
++	caddr_t xdr_location;
++	bool_t has_args;
++
++	if (msg->rm_reply.rp_stat == MSG_ACCEPTED &&
++	    msg->rm_reply.rp_acpt.ar_stat == SUCCESS) {
++		has_args = TRUE;
++		xdr_results = msg->acpted_rply.ar_results.proc;
++		xdr_location = msg->acpted_rply.ar_results.where;
++
++		msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
++		msg->acpted_rply.ar_results.where = NULL;
++	} else
++		has_args = FALSE;
++
+ 	xdrs->x_op = XDR_ENCODE;
+ 	XDR_SETPOS(xdrs, 0);
+ 	msg->rm_xid = su->su_xid;
+-	if (xdr_replymsg(xdrs, msg)) {
++	if (xdr_replymsg(xdrs, msg) &&
++	    (!has_args ||
++	     (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
+ 		struct msghdr *msg = &su->su_msghdr;
+ 		struct iovec iov;
+ 
+@@ -264,7 +282,12 @@ svc_dg_getargs(xprt, xdr_args, args_ptr)
+ 	xdrproc_t xdr_args;
+ 	void *args_ptr;
+ {
+-	return (*xdr_args)(&(su_data(xprt)->su_xdrs), args_ptr);
++	if (! SVCAUTH_UNWRAP(xprt->xp_auth, &(su_data(xprt)->su_xdrs),
++			     xdr_args, args_ptr)) {
++		(void)svc_freeargs(xprt, xdr_args, args_ptr);
++		return FALSE;
++	}
++	return TRUE;
+ }
+ 
+ static bool_t
+@@ -288,6 +311,10 @@ svc_dg_destroy(xprt)
+ 	xprt_unregister(xprt);
+ 	if (xprt->xp_fd != -1)
+ 		(void)close(xprt->xp_fd);
++	if (xprt->xp_auth != NULL) {
++		SVCAUTH_DESTROY(xprt->xp_auth);
++		xprt->xp_auth = NULL;
++	}
+ 	XDR_DESTROY(&(su->su_xdrs));
+ 	(void) mem_free(rpc_buffer(xprt), su->su_iosz);
+ 	(void) mem_free(su, sizeof (*su));
+diff --git a/src/svc_vc.c b/src/svc_vc.c
+index aaaf2d7..74632e2 100644
+--- a/src/svc_vc.c
++++ b/src/svc_vc.c
+@@ -172,6 +172,7 @@ svc_vc_create(fd, sendsize, recvsize)
+ 	xprt->xp_p1 = r;
+ 	xprt->xp_p2 = NULL;
+ 	xprt->xp_p3 = NULL;
++	xprt->xp_auth = NULL;
+ 	xprt->xp_verf = _null_auth;
+ 	svc_vc_rendezvous_ops(xprt);
+ 	xprt->xp_port = (u_short)-1;	/* It is the rendezvouser */
+@@ -283,6 +284,7 @@ makefd_xprt(fd, sendsize, recvsize)
+ 	xdrrec_create(&(cd->xdrs), sendsize, recvsize,
+ 	    xprt, read_vc, write_vc);
+ 	xprt->xp_p1 = cd;
++	xprt->xp_auth = NULL;
+ 	xprt->xp_verf.oa_base = cd->verf_body;
+ 	svc_vc_ops(xprt);  /* truely deals with calls */
+ 	xprt->xp_port = 0;  /* this is a connection, not a rendezvouser */
+@@ -412,6 +414,10 @@ __svc_vc_dodestroy(xprt)
+ 		XDR_DESTROY(&(cd->xdrs));
+ 		mem_free(cd, sizeof(struct cf_conn));
+ 	}
++	if (xprt->xp_auth != NULL) {
++		SVCAUTH_DESTROY(xprt->xp_auth);
++		xprt->xp_auth = NULL;
++	}
+ 	if (xprt->xp_rtaddr.buf)
+ 		mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen);
+ 	if (xprt->xp_ltaddr.buf)
+@@ -610,7 +616,11 @@ svc_vc_recv(xprt, msg)
+ 	}
+ 
+ 	xdrs->x_op = XDR_DECODE;
+-	(void)xdrrec_skiprecord(xdrs);
++	/*
++	 * No need skip records with nonblocking connections
++	 */
++	if (cd->nonblock == FALSE)
++		(void)xdrrec_skiprecord(xdrs);
+ 	if (xdr_callmsg(xdrs, msg)) {
+ 		cd->x_id = msg->rm_xid;
+ 		return (TRUE);
+@@ -628,8 +638,13 @@ svc_vc_getargs(xprt, xdr_args, args_ptr)
+ 
+ 	assert(xprt != NULL);
+ 	/* args_ptr may be NULL */
+-	return ((*xdr_args)(&(((struct cf_conn *)(xprt->xp_p1))->xdrs),
+-	    args_ptr));
++
++	if (! SVCAUTH_UNWRAP(xprt->xp_auth,
++			     &(((struct cf_conn *)(xprt->xp_p1))->xdrs),
++			     xdr_args, args_ptr)) {
++		return FALSE;  
++	}
++	return TRUE;
+ }
+ 
+ static bool_t
+@@ -658,15 +673,35 @@ svc_vc_reply(xprt, msg)
+ 	XDR *xdrs;
+ 	bool_t rstat;
+ 
++	xdrproc_t xdr_results;
++	caddr_t xdr_location;
++	bool_t has_args;
++
+ 	assert(xprt != NULL);
+ 	assert(msg != NULL);
+ 
+ 	cd = (struct cf_conn *)(xprt->xp_p1);
+ 	xdrs = &(cd->xdrs);
+ 
++	if (msg->rm_reply.rp_stat == MSG_ACCEPTED &&
++	    msg->rm_reply.rp_acpt.ar_stat == SUCCESS) {
++		has_args = TRUE;
++		xdr_results = msg->acpted_rply.ar_results.proc;
++		xdr_location = msg->acpted_rply.ar_results.where;
++
++		msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
++		msg->acpted_rply.ar_results.where = NULL;
++	} else
++		has_args = FALSE;
++
+ 	xdrs->x_op = XDR_ENCODE;
+ 	msg->rm_xid = cd->x_id;
+-	rstat = xdr_replymsg(xdrs, msg);
++	rstat = FALSE;
++	if (xdr_replymsg(xdrs, msg) &&
++	    (!has_args ||
++	     (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
++		rstat = TRUE;
++	}
+ 	(void)xdrrec_endofrecord(xdrs, TRUE);
+ 	return (rstat);
+ }
+diff --git a/src/xdr_rec.c b/src/xdr_rec.c
+index 4e815d7..2aca623 100644
+--- a/src/xdr_rec.c
++++ b/src/xdr_rec.c
+@@ -64,7 +64,6 @@
+ #include <rpc/clnt.h>
+ #include <stddef.h>
+ #include "rpc_com.h"
+-#include <unistd.h>
+ static bool_t	xdrrec_getlong(XDR *, long *);
+ static bool_t	xdrrec_putlong(XDR *, const long *);
+ static bool_t	xdrrec_getbytes(XDR *, char *, u_int);
+@@ -330,22 +329,22 @@ xdrrec_getpos(xdrs)
+ 	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
+ 	off_t pos;
+ 
+-	pos = lseek((int)(u_long)rstrm->tcp_handle, (off_t)0, 1);
+-	if (pos != -1)
+-		switch (xdrs->x_op) {
++	switch (xdrs->x_op) {
+ 
+-		case XDR_ENCODE:
+-			pos += rstrm->out_finger - rstrm->out_base;
+-			break;
++	case XDR_ENCODE:
++		pos = rstrm->out_finger - rstrm->out_base
++			- BYTES_PER_XDR_UNIT;
++		break;
+ 
+-		case XDR_DECODE:
+-			pos -= rstrm->in_boundry - rstrm->in_finger;
+-			break;
++	case XDR_DECODE:
++		pos = rstrm->in_boundry - rstrm->in_finger
++			- BYTES_PER_XDR_UNIT;
++		break;
+ 
+-		default:
+-			pos = (off_t) -1;
+-			break;
+-		}
++	default:
++		pos = (off_t) -1;
++		break;
++	}
+ 	return ((u_int) pos);
+ }
+ 
+diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h
+index 734e6b9..5f66e67 100644
+--- a/tirpc/rpc/auth.h
++++ b/tirpc/rpc/auth.h
+@@ -203,8 +203,22 @@ typedef struct __auth {
+ 
+ 	} *ah_ops;
+ 	void *ah_private;
++	int ah_refcnt;
+ } AUTH;
+ 
++static __inline int
++auth_get(AUTH *auth)
++{
++	return __sync_add_and_fetch(&auth->ah_refcnt, 1);
++}
++
++static __inline int
++auth_put(AUTH *auth)
++{
++	return __sync_sub_and_fetch(&auth->ah_refcnt, 1);
++}
++
++
+ 
+ /*
+  * Authentication ops.
+@@ -234,10 +248,23 @@ typedef struct __auth {
+ #define auth_refresh(auth, msg)		\
+ 		((*((auth)->ah_ops->ah_refresh))(auth, msg))
+ 
+-#define AUTH_DESTROY(auth)		\
+-		((*((auth)->ah_ops->ah_destroy))(auth))
+-#define auth_destroy(auth)		\
+-		((*((auth)->ah_ops->ah_destroy))(auth))
++#define AUTH_DESTROY(auth)						\
++		do {							\
++			int refs;					\
++			if ((refs = auth_put((auth))) == 0)		\
++				((*((auth)->ah_ops->ah_destroy))(auth));\
++			log_debug("%s: auth_put(), refs %d\n",		\
++				__func__, refs);			\
++		} while (0)
++
++#define auth_destroy(auth)						\
++		do {							\
++			int refs;					\
++			if ((refs = auth_put((auth))) == 0)		\
++				((*((auth)->ah_ops->ah_destroy))(auth));\
++			log_debug("%s: auth_put(), refs %d\n",		\
++				__func__, refs);			\
++		} while (0)
+ 
+ #define AUTH_WRAP(auth, xdrs, xfunc, xwhere)            \
+ 		((*((auth)->ah_ops->ah_wrap))(auth, xdrs, \
+@@ -373,7 +400,7 @@ __END_DECLS
+ __BEGIN_DECLS
+ struct svc_req;
+ struct rpc_msg;
+-enum auth_stat _svcauth_null (struct svc_req *, struct rpc_msg *);
++enum auth_stat _svcauth_none (struct svc_req *, struct rpc_msg *);
+ enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *);
+ enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *);
+ __END_DECLS
+diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h
+index e3d6897..d2881ad 100644
+--- a/tirpc/rpc/des.h
++++ b/tirpc/rpc/des.h
+@@ -33,6 +33,9 @@
+  * Copyright (c) 1986 by Sun Microsystems, Inc.
+  */
+ 
++#ifndef _RPC_DES_H_
++#define _RPC_DES_H_
++
+ #define DES_MAXLEN 	65536	/* maximum # of bytes to encrypt  */
+ #define DES_QUICKLEN	16	/* maximum # of bytes to encrypt quickly */
+ 
+@@ -80,3 +83,5 @@ struct desparams {
+  * Software DES.
+  */
+ extern int _des_crypt( char *, int, struct desparams * );
++
++#endif
+diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h
+index 659e90c..14269d1 100644
+--- a/tirpc/rpc/svc_auth.h
++++ b/tirpc/rpc/svc_auth.h
+@@ -44,17 +44,23 @@
+ /*
+  * Interface to server-side authentication flavors.
+  */
+-typedef struct {
++typedef struct SVCAUTH {
+ 	struct svc_auth_ops {
+-		int   (*svc_ah_wrap)(void);
+-		int   (*svc_ah_unwrap)(void);
+-		int   (*svc_ah_destroy)(void);
++		int     (*svc_ah_wrap)(struct SVCAUTH *, XDR *, xdrproc_t,
++				       caddr_t);
++		int     (*svc_ah_unwrap)(struct SVCAUTH *, XDR *, xdrproc_t,
++					 caddr_t);
++		int     (*svc_ah_destroy)(struct SVCAUTH *);
+ 		} *svc_ah_ops;
+ 	caddr_t svc_ah_private;
+ } SVCAUTH;
+ 
+-#define SVCAUTH_DESTROY(cred)		((*(cred)->svc_ah_ops->svc_ah_destroy)())
+-#define svcauth_destroy(cred)		((*(cred)->svc_ah_ops->svc_ah_destroy)())
++#define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \
++	((*((auth)->svc_ah_ops->svc_ah_wrap))(auth, xdrs, xfunc, xwhere))
++#define SVCAUTH_UNWRAP(auth, xdrs, xfunc, xwhere) \
++	((*((auth)->svc_ah_ops->svc_ah_unwrap))(auth, xdrs, xfunc, xwhere))
++#define SVCAUTH_DESTROY(auth) \
++	((*((auth)->svc_ah_ops->svc_ah_destroy))(auth))
+ 
+ /*
+  * Server side authenticator
diff --git a/core/libtirpc/libtirpc-fix-segfault-0.2.2.patch b/core/libtirpc/libtirpc-fix-segfault-0.2.2.patch
new file mode 100644
index 000000000..8a04c16de
--- /dev/null
+++ b/core/libtirpc/libtirpc-fix-segfault-0.2.2.patch
@@ -0,0 +1,28 @@
+diff -up libtirpc-0.2.2/src/svc_dg.c.orig libtirpc-0.2.2/src/svc_dg.c
+--- libtirpc-0.2.2/src/svc_dg.c.orig	2011-07-19 15:02:41.087631000 -0400
++++ libtirpc-0.2.2/src/svc_dg.c	2011-07-19 15:04:43.154243000 -0400
+@@ -254,8 +254,8 @@ svc_dg_reply(xprt, msg)
+ 	XDR_SETPOS(xdrs, 0);
+ 	msg->rm_xid = su->su_xid;
+ 	if (xdr_replymsg(xdrs, msg) &&
+-	    (!has_args ||
+-	     (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
++	    (!has_args || (xprt->xp_auth &&
++	     SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
+ 		struct msghdr *msg = &su->su_msghdr;
+ 		struct iovec iov;
+ 
+diff -up libtirpc-0.2.2/src/svc_vc.c.orig libtirpc-0.2.2/src/svc_vc.c
+--- libtirpc-0.2.2/src/svc_vc.c.orig	2011-07-19 15:05:28.577588000 -0400
++++ libtirpc-0.2.2/src/svc_vc.c	2011-07-19 15:05:40.058928000 -0400
+@@ -698,8 +698,8 @@ svc_vc_reply(xprt, msg)
+ 	msg->rm_xid = cd->x_id;
+ 	rstat = FALSE;
+ 	if (xdr_replymsg(xdrs, msg) &&
+-	    (!has_args ||
+-	     (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
++	    (!has_args || (xprt->xp_auth &&
++	     SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
+ 		rstat = TRUE;
+ 	}
+ 	(void)xdrrec_endofrecord(xdrs, TRUE);
diff --git a/core/lilo/PKGBUILD b/core/lilo/PKGBUILD
index 216f1b91d..8202e1853 100644
--- a/core/lilo/PKGBUILD
+++ b/core/lilo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 118988 2011-04-09 21:38:07Z tpowa $
+# $Id: PKGBUILD 134681 2011-08-07 15:40:03Z tpowa $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=lilo
 pkgver=23.2
-pkgrel=1
+pkgrel=3
 pkgdesc="A bootloader for Linux"
 arch=('i686' 'x86_64')
 url="https://alioth.debian.org/projects/lilo/"
@@ -23,7 +23,7 @@ options=('!makeflags')
 source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz"
         'lilo.conf')
 md5sums=('51b9b9db665d3b8724919e3d46054d12'
-         'a3a4c90bead3f9b8672bd384ff9f8db1')
+         'ca2d8cd9b63f11444861939b42df29c1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/lilo/lilo.conf b/core/lilo/lilo.conf
index 0e31e77a5..9d42a2333 100644
--- a/core/lilo/lilo.conf
+++ b/core/lilo/lilo.conf
@@ -11,16 +11,16 @@ timeout=50
 lba32
 prompt
 
-image=/boot/vmlinuz26
+image=/boot/vmlinuz-linux
 	label=arch
 	root=/dev/hda3
-	initrd=/boot/kernel26.img
+	initrd=/boot/initramfs-linux.img
 	read-only
 
-image=/boot/vmlinuz26
+image=/boot/vmlinuz-linux
 	label=arch-fallback
 	root=/dev/hda3
-	initrd=/boot/kernel26-fallback.img
+	initrd=/boot/initramfs-linux-fallback.img
 	read-only
 
 #other=/dev/hda1
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index 0f9d96fc8..44d4c7c66 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 129978 2011-06-30 18:05:23Z thomas $
+# $Id: PKGBUILD 134363 2011-08-03 06:56:40Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
 pkgver=3.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -17,7 +17,8 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
         mdadm.conf 
         mdadm_install
         mdadm_hook
-        disable-werror.patch)
+        disable-werror.patch
+        linux-3.0.patch)
 install=mdadm.install
 replaces=('raidtools')
 md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
@@ -25,12 +26,14 @@ md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
          '00cbed931db4f15b6ce49e3e7d433966'
          '4bb000166fb13e82ceaa2422fdfaac7e'
          '36f7cc564ed3267888d90208e0eb7adc'
-         '4ad87b74a4bc9a34621280abe0e0c3e4')
+         '4ad87b74a4bc9a34621280abe0e0c3e4'
+         'c499b3edbf2c400c8a1984e18c7ce7fa')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np0 -i ../disable-werror.patch
-  make CXFLAGS="$CFLAGS"
+  patch -Np1 -i ../linux-3.0.patch
+  make CXiFLAGS="$CFLAGS"
 }
 
 package() {
diff --git a/core/mdadm/linux-3.0.patch b/core/mdadm/linux-3.0.patch
new file mode 100644
index 000000000..cd9d5473c
--- /dev/null
+++ b/core/mdadm/linux-3.0.patch
@@ -0,0 +1,45 @@
+From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb@suse.de>
+Date: Fri, 17 Jun 2011 22:49:24 +1000
+Subject: [PATCH 1/1] util: correctly parse shorter linux version numbers.
+
+The next version of Linux might be 3.0.  If it is, get_linux_version
+will fail.
+So make it more robust.
+
+Reported-by: Namhyung Kim <namhyung@gmail.com>
+Reported-by: Milan Broz <mbroz@redhat.com>
+Signed-off-by: NeilBrown <neilb@suse.de>
+---
+ util.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/util.c b/util.c
+index 10bbe56..55d171a 100644
+--- a/util.c
++++ b/util.c
+@@ -146,16 +146,16 @@ int get_linux_version()
+ {
+ 	struct utsname name;
+ 	char *cp;
+-	int a,b,c;
++	int a = 0, b = 0,c = 0;
+ 	if (uname(&name) <0)
+ 		return -1;
+ 
+ 	cp = name.release;
+ 	a = strtoul(cp, &cp, 10);
+-	if (*cp != '.') return -1;
+-	b = strtoul(cp+1, &cp, 10);
+-	if (*cp != '.') return -1;
+-	c = strtoul(cp+1, NULL, 10);
++	if (*cp == '.')
++		b = strtoul(cp+1, &cp, 10);
++	if (*cp == '.')
++		c = strtoul(cp+1, &cp, 10);
+ 
+ 	return (a*1000000)+(b*1000)+c;
+ }
+-- 
+1.7.2.3
+
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index 3adca96d4..69ee72ca5 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 131837 2011-07-16 00:22:48Z dreisner $
+# $Id: PKGBUILD 134117 2011-08-01 17:55:07Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -6,8 +6,8 @@
 # Contributor: Marco Lima <cipparello gmail com>
 
 pkgname=nfs-utils
-pkgver=1.2.3
-pkgrel=3
+pkgver=1.2.4
+pkgrel=2
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64')
 url='http://nfs.sourceforge.net'
@@ -24,9 +24,10 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
 	idmapd.conf
 	start-statd.patch
 	nfs-utils-1.1.4-mtab-sym.patch
-	nfs-utils-1.1.4-no-exec.patch)
+	nfs-utils-1.1.4-no-exec.patch
+        kernel-3.0-segfault.patch)
 install=nfs-utils.install
-md5sums=('1131dc5f27c4f3905a6e7ee0d594fd4d'
+md5sums=('938dc0574f3eb9891a8ed4746f806277'
          'fc508e10cdf5e8ddd80373b1b2bc99a1'
          'f73f197a16b02c3e248488ec35c4cf43'
          '5ae080f6117cef3140f02bc162bdc755'
@@ -35,13 +36,14 @@ md5sums=('1131dc5f27c4f3905a6e7ee0d594fd4d'
          'eb4f4027fab6fc1201f1ca04f5954c76'
          'e24f81a8c8657672e262c61235d34b4a'
          '7674106eaaa4c149bccd4f05fe3604e9'
-         '4f4827dfc93008dfadd0a530ad0872b2')
+         '4f4827dfc93008dfadd0a530ad0872b2'
+         'ab92e67f3d0ee2935faab9cdabef8003')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}
   patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
-  patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
-
+  #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
+  patch -Np1 -i ../kernel-3.0-segfault.patch
   # arch specific patch
   patch -Np0 -i $srcdir/start-statd.patch
 
@@ -67,6 +69,7 @@ package() {
   install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf
   install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf
   # directories
+  mkdir "$pkgdir/"etc/exports.d
   mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs
   mkdir "$pkgdir/"var/lib/nfs/v4recovery
 }
diff --git a/core/nfs-utils/kernel-3.0-segfault.patch b/core/nfs-utils/kernel-3.0-segfault.patch
new file mode 100644
index 000000000..3dba94a05
--- /dev/null
+++ b/core/nfs-utils/kernel-3.0-segfault.patch
@@ -0,0 +1,53 @@
+mount.nfs segfaults if kernel version number does not contain
+at least 3 components delimited with a dot.
+
+Avoid this by matching up to three unsigned integers inialised
+to zero, separated by dots.
+
+A version that does not start with an integer is probably a future
+version where the versioning evolved to another scheme.
+Return UINT_MAX which is guaranteed to be higher than existing
+versions. This would also make it possible to easily identify
+versions that do not start with an integer.
+
+Signed-off-by: Luk Claes <luk@...>
+---
+ utils/mount/version.h |   16 +++++++++-------
+ 1 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/utils/mount/version.h b/utils/mount/version.h
+index af61a6f..531cf68 100644
+--- a/utils/mount/version.h
++++ b/utils/mount/version.h
+@@ -23,8 +23,8 @@
+ #ifndef _NFS_UTILS_MOUNT_VERSION_H
+ #define _NFS_UTILS_MOUNT_VERSION_H
+
+-#include <stdlib.h>
+-#include <string.h>
++#include <stdio.h>
++#include <limits.h>
+
+ #include <sys/utsname.h>
+
+@@ -37,14 +37,16 @@ static inline unsigned int MAKE_VERSION(unsigned int p, unsigned int q,
+ static inline unsigned int linux_version_code(void)
+ {
+ 	struct utsname my_utsname;
+-	unsigned int p, q, r;
++	unsigned int p, q = 0, r = 0;
+
++	/* UINT_MAX as backward compatibility code should not be run */
+ 	if (uname(&my_utsname))
+-		return 0;
++		return UINT_MAX;
+
+-	p = (unsigned int)atoi(strtok(my_utsname.release, "."));
+-	q = (unsigned int)atoi(strtok(NULL, "."));
+-	r = (unsigned int)atoi(strtok(NULL, "."));
++	/* UINT_MAX as future versions might not start with an integer */
++	if (sscanf(my_utsname.release, "%u.%u.%u", &p, &q, &r) < 1)
++		return UINT_MAX;
++	
+ 	return MAKE_VERSION(p, q, r);
+ }
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index 5a4f10780..4836f52a6 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 127852 2011-06-18 20:12:05Z stephane $
+# $Id: PKGBUILD 134648 2011-08-07 10:12:55Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
-pkgver=1.1.3
-pkgrel=2
+pkgver=1.1.4
+pkgrel=1
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.kernel.org/pub/linux/libs/pam/"
-depends=('glibc' 'db' 'cracklib')
+depends=('glibc' 'db' 'cracklib' 'libtirpc')
 makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
 backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment)
 source=(http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
         ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2
         other)
 options=('!libtool' '!emptydirs')
-md5sums=('6db7fcb5db6253350e3a4648ceac40e7'
+md5sums=('e9af5fb27bb22edb55d077e2888b3ebc'
          'e2788389a6c59224110a45fcff30e02b'
          '6e6c8719e5989d976a14610f340bd33a')
 
diff --git a/core/syslinux/PKGBUILD b/core/syslinux/PKGBUILD
index 03f529f11..a999277f1 100644
--- a/core/syslinux/PKGBUILD
+++ b/core/syslinux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120229 2011-04-21 12:44:04Z tpowa $
+# $Id: PKGBUILD 134206 2011-08-02 14:26:49Z ibiru $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=syslinux
 pkgver=4.04
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE"
 url="http://syslinux.zytor.com/"
@@ -23,7 +23,7 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t
         syslinux-install_update)
 md5sums=('a3936208767eb7ced65320abe2e33a10'
          '5274062f91931eae6573f1ec3cd5b640'
-         '5ad0a9cccd60ada4fd5a93380c76d5df'
+         '4dc27d8ab3802f8e50f3dda28168ce6d'
          'b5b4953c0a5a01cd16441402f6321765')
 
 build() {
diff --git a/core/syslinux/syslinux.cfg b/core/syslinux/syslinux.cfg
index 2212283a8..02127d21d 100644
--- a/core/syslinux/syslinux.cfg
+++ b/core/syslinux/syslinux.cfg
@@ -51,15 +51,15 @@ MENU COLOR tabmsg       31;40   #30ffffff #00000000 std
 
 LABEL arch
 	MENU LABEL Arch Linux
-	LINUX ../vmlinuz26
+	LINUX ../vmlinuz-linux
 	APPEND root=/dev/sda3 ro
-	INITRD ../kernel26.img
+	INITRD ../initramfs-linux.img
 
 LABEL archfallback
 	MENU LABEL Arch Linux Fallback
-	LINUX ../vmlinuz26
+	LINUX ../vmlinuz-linux
 	APPEND root=/dev/sda3 ro
-	INITRD ../kernel26-fallback.img
+	INITRD ../initramfs-linux-fallback.img
 
 #LABEL windows
 #        MENU LABEL Windows
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index f71ae7d95..56a7880d7 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 110704 2011-02-21 18:04:49Z tpowa $
+# $Id: PKGBUILD 134698 2011-08-07 16:20:42Z dreisner $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-utils
 pkgver=1.0.24.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org"
@@ -18,11 +18,16 @@ source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2
         alsa.conf.d
         90alsa)
 backup=(etc/conf.d/alsa)
+md5sums=('8238cd57cb301d1c36bcf0ecb59ce6b2'
+         '2ba1a1cbf653bf1a69f8a720fd6549da'
+         '62ebef77d5617d0036012cc541dcf23c'
+         '4c8ae9f976c7df5e271a4cb91ccc7767'
+         '529216f6a46e61a546640e08ea7a0879')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -Np1 -i ../alsaconf.patch
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --with-systemdsystemunitdir=/lib/systemd/system
   make
 }
 
@@ -35,8 +40,3 @@ package() {
   # dir where to save ALSA state
   install -d ${pkgdir}/var/lib/alsa
 }
-md5sums=('8238cd57cb301d1c36bcf0ecb59ce6b2'
-         '2ba1a1cbf653bf1a69f8a720fd6549da'
-         '62ebef77d5617d0036012cc541dcf23c'
-         '4c8ae9f976c7df5e271a4cb91ccc7767'
-         '529216f6a46e61a546640e08ea7a0879')
diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD
index 959b19cd6..238f6b3b1 100644
--- a/extra/archboot/PKGBUILD
+++ b/extra/archboot/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 133615 2011-07-30 06:14:47Z tpowa $
+# $Id: PKGBUILD 133661 2011-07-30 09:38:54Z tpowa $
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=archboot
-pkgver=2011.07
-pkgrel=2
+pkgver=2011.08
+pkgrel=1
 pkgdesc="Advanced, modular arch boot/install image creation utility"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.archlinux.org/"
-depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1' 'libisoburn>=1.1.2' 'squashfs-tools>=4.2')
+depends=('mkinitcpio>=0.7.2-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.07.3-1' 'subversion>=1.6.17-6' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-3' 'cryptsetup>=1.3.1-2' 'dialog>=1.1_20110707-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=4.0.0-1' 'grep>=2.9-1' 'iputils>=20101006-1' 'jfsutils>=1.1.15-2' 'less>=444-1' 'lvm2>=2.02.86-1' 'mdadm>=3.2.2-2' 'module-init-tools>=3.16-1' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-18' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-4' 'psmisc>=22.14-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-3' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P4-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-3' 'openssh>=5.8p2-9' 'hwdetect>=2011.06-1' 'shadow>=4.1.4.3-2' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre2-1' 'dosfstools>=3.0.11-1' 'glibc>=2.14-4' 'linux-api-headers>=2.6.39.1-1' 'linux>=3.0-2' 'kernel26-lts>=2.6.32.43-1' 'xinetd>=2.3.14-7' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-7' 'lilo>=23.2-1' 'iptables>=1.4.12-2' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=003-1' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-2' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.86-1' 'screen>=4.0.3-12' 'elfutils>=0.152-1' 'pam>=1.1.3-2' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.4-1' 'nfsidmap>=0.24-2' 'readline>=6.2.001-2' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.266-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-6' 'libldap>=2.4.26-3' 'gpm>=1.20.6-6' 'libevent>=2.0.12-1' 'gcc-libs>=4.6.1-2' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.10-1' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.6-1' 'dmraid>=1.0.0.rc16.3-2' 'linux-atm>=2.5.1-2' 'netcfg>=2.6.5-1' 'parted>=3.0-3' 'tzdata>=2011h-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.5.0-1' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.39-1' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-2' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.17-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.3-1' 'libtirpc>=0.2.2-2' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=172-2' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.3-1' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.2-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-6' 'linux-firmware>=20110727-1' 'iana-etc>=2.30-2' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.5.2-1' 'libisoburn>=1.1.2-1' 'squashfs-tools>=4.2-1')
 optdepends=('grub2-bios: for grub2 support'
             'grub2-efi-i386: for grub2 support'
             'grub2-efi-x86_64: for grub2 support'
@@ -44,5 +44,5 @@ build()
   gcc -o vmware-detect vmware-detect.c
   install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect
 }
-md5sums=('dadac046c8da0c45c7ed55e223b5a0b5'
+md5sums=('4b71827d6767c99c1144df9215108349'
          '7e2b03463747cb22ab388e79a09fa0cb')
diff --git a/extra/dirmngr/PKGBUILD b/extra/dirmngr/PKGBUILD
index e8faa4a88..f2f6b60e5 100644
--- a/extra/dirmngr/PKGBUILD
+++ b/extra/dirmngr/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 87316 2010-08-12 11:57:22Z tpowa $
+# $Id: PKGBUILD 134465 2011-08-04 06:40:27Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=dirmngr
 pkgver=1.1.0
-pkgrel=1
+pkgrel=3
 pkgdesc="A daemon to handle CRL and certificate requests"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="ftp://ftp.gnupg.org/gcrypt/dirmngr"
 depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth')
 source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
+install=dirmngr.install
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/dirmngr/dirmngr.install b/extra/dirmngr/dirmngr.install
new file mode 100644
index 000000000..e26e0e7fd
--- /dev/null
+++ b/extra/dirmngr/dirmngr.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(dirmngr.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.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.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD
index 02c404210..fb8437925 100644
--- a/extra/ethtool/PKGBUILD
+++ b/extra/ethtool/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 127195 2011-06-11 08:04:12Z ibiru $
+# $Id: PKGBUILD 134800 2011-08-07 20:06:54Z ibiru $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributer: Martin Kemp <mdkemp@elys.com>
 pkgname=ethtool
-pkgver=2.6.39
+pkgver=3.0
 pkgrel=1
 epoch=1
-pkgdesc="gkernel ethtool"
-arch=(i686 x86_64)
+pkgdesc="Utility for controlling network drivers and hardware"
+arch=('i686' 'x86_64')
 url="http://www.kernel.org/pub/software/network/ethtool/"
 license=('GPL')
 depends=('glibc')
 source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('97211a1e3a496bc3bd0b75849d0fbae9')
+md5sums=('cb129398cbbf39859901b55ecac101da')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnupg2/PKGBUILD b/extra/gnupg2/PKGBUILD
index e2711da0d..f237df630 100644
--- a/extra/gnupg2/PKGBUILD
+++ b/extra/gnupg2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 106675 2011-01-17 20:37:07Z tpowa $
+# $Id: PKGBUILD 134651 2011-08-07 10:18:11Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnupg2
-pkgver=2.0.17
+pkgver=2.0.18
 pkgrel=1
 pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool"
 arch=('i686' 'x86_64')
@@ -27,4 +27,4 @@ package() {
   mv ${pkgdir}/usr/share/gnupg{,2}
   rm -f ${pkgdir}/usr/share/info/dir
 }
-md5sums=('123af099740fd159c73a0352a274ec81')
+md5sums=('2f37e0722666a0fedbe4d9f9227ac4d7')
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 8321c3e82..152171fb6 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 125862 2011-05-30 16:53:31Z andyrtr $
+# $Id: PKGBUILD 134716 2011-08-07 16:47:04Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Art Gramlich <art@gramlich-net.com>
 
 pkgname=icu
-pkgver=4.8
+pkgver=4.8.1
 pkgrel=1
 pkgdesc="International Components for Unicode library"
 arch=(i686 x86_64)
 url="http://www.icu-project.org/"
 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
+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=('e78194c49d7fd8131353aa180d11b789'
+md5sums=('af36f635271a239d76d038d6cf8da8df'
          'ebd5470fc969c75e52baf4af94a9ee82')
 
 build() {
diff --git a/extra/libassuan/PKGBUILD b/extra/libassuan/PKGBUILD
index 468f2b6a3..29aa66536 100644
--- a/extra/libassuan/PKGBUILD
+++ b/extra/libassuan/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 87326 2010-08-12 11:59:25Z tpowa $
+# $Id: PKGBUILD 131235 2011-07-12 07:35:37Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libassuan
-pkgver=2.0.1
+pkgver=2.0.2
 pkgrel=1
 pkgdesc="A IPC library used by some GnuPG related software"
 arch=('i686' 'x86_64')
@@ -11,6 +11,7 @@ url="http://www.gnupg.org/related_software/libassuan"
 depends=('libgpg-error')
 options=('!libtool')
 source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
+install=libassuan.install
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -22,4 +23,4 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
-md5sums=('53a7d4c22af909d7236d17d454ef935b')
+md5sums=('3e7d00fd2ee8a0b9c51ac7616ef3f1ec')
diff --git a/extra/libassuan/libassuan.install b/extra/libassuan/libassuan.install
new file mode 100644
index 000000000..07e2672db
--- /dev/null
+++ b/extra/libassuan/libassuan.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(assuan.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.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.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/extra/libksba/PKGBUILD b/extra/libksba/PKGBUILD
index 4e19d60a7..51f23e123 100644
--- a/extra/libksba/PKGBUILD
+++ b/extra/libksba/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 87317 2010-08-12 11:57:33Z tpowa $
+# $Id: PKGBUILD 134460 2011-08-04 06:38:08Z tpowa $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=libksba
-pkgver=1.0.8
+pkgver=1.2.0
 pkgrel=1
-pkgdesc="Libksba is a CMS and X.509 access library"
+pkgdesc="A CMS and X.509 access library"
 arch=(i686 x86_64)
 license=('GPL')
 url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba"
 depends=('bash' 'libgpg-error' 'glibc')
 source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
 options=(!libtool)
+install=libksba.install
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -19,4 +20,4 @@ build() {
   make
   make DESTDIR=$startdir/pkg install
 }
-md5sums=('8acac0b3cbd0030dfc6d0f6a58c9b5b2')
+md5sums=('e797f370b69b4dc776499d6a071ae137')
diff --git a/extra/libksba/libksba.install b/extra/libksba/libksba.install
new file mode 100644
index 000000000..3715b8960
--- /dev/null
+++ b/extra/libksba/libksba.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(ksba.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.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.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index a71c5c93e..d6bc1f95d 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130222 2011-07-04 13:03:05Z pierre $
+# $Id: PKGBUILD 134666 2011-08-07 10:50:50Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
 pkgver=1.4.29
-pkgrel=1
+pkgrel=2
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -19,9 +19,9 @@ options=('!libtool' 'emptydirs')
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2"
         'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
 md5sums=('e6e67b09986cb504db630b5a86b2dd76'
-         '369f2eea6231342b514ca4777bf395c8'
+         '268386e71f5748dc1d887b9a0ab65589'
          '913e2157fa78d990c32146f387d44c2b'
-         '2803a9ee7f20409c69f1566d2d90720e')
+         'acdaa94299e6299cb5085e6d88babeca')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
diff --git a/extra/lighttpd/lighttpd.conf b/extra/lighttpd/lighttpd.conf
index 8e8ab69e7..4ca1b23a4 100644
--- a/extra/lighttpd/lighttpd.conf
+++ b/extra/lighttpd/lighttpd.conf
@@ -6,7 +6,6 @@ server.port		= 80
 server.username		= "http"
 server.groupname	= "http"
 server.document-root	= "/srv/http"
-server.pid-file		= "/var/run/lighttpd/lighttpd.pid"
 server.errorlog		= "/var/log/lighttpd/error.log"
 dir-listing.activate	= "enable"
 index-file.names	= ( "index.html" )
diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d
index 345e889ae..88f0a1474 100644
--- a/extra/lighttpd/lighttpd.rc.d
+++ b/extra/lighttpd/lighttpd.rc.d
@@ -4,24 +4,13 @@
 . /etc/rc.d/functions
 
 
-get_pid_file() {
-	/usr/sbin/lighttpd -p -f /etc/lighttpd/lighttpd.conf 2>/dev/null | grep server.pid-file | sed -E 's/.*"(.+)"/\1/'
-}
+pid_file='/var/run/lighttpd/lighttpd-angel.pid'
 
 get_pid() {
-	local pid_file=$(get_pid_file)
-	local pid=$(pidof -o %PPID lighttpd-angel)
-	# only needed when updating from 1.4.26
-	# TODO: remove in future versions
-	local old_pid=$(pidof -o %PPID lighttpd)
 	if [ -r "${pid_file}" ]; then
 		cat "${pid_file}"
-	elif [ -n "${pid}" ]; then
-		echo "${pid}"
-	elif [ -n "${old_pid}" ]; then
-		echo "${old_pid}"
 	else
-		echo ''
+		pgrep -f /usr/sbin/lighttpd-angel
 	fi
 }
 
@@ -43,7 +32,7 @@ test_config() {
 		stat_die
 	fi
 
-	local piddir=$(dirname "$(get_pid_file)")
+	local piddir=$(dirname "${pid_file}")
 	if [ ! -d "${piddir}" ]; then
 		install -d -m755 -o http -g http "${piddir}"
 	fi
@@ -60,6 +49,7 @@ start() {
 		if [ $? -gt 0 ]; then
 			stat_die
 		else
+			echo $! > "${pid_file}"
 			add_daemon lighttpd
 			stat_done
 		fi
@@ -75,7 +65,19 @@ stop() {
 	if [ $? -gt 0 ]; then
 		stat_fail
 	else
-		local pid_file=$(get_pid_file)
+		[ -f "${pid_file}" ] && rm -f "${pid_file}"
+		rm_daemon lighttpd
+		stat_done
+	fi
+}
+
+gracefull-stop() {
+	stat_busy 'Stopping lighttpd gracefully'
+	local PID=$(get_pid)
+	[ -n "$PID" ] && kill -INT $PID &> /dev/null
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
 		[ -f "${pid_file}" ] && rm -f "${pid_file}"
 		rm_daemon lighttpd
 		stat_done
@@ -103,6 +105,10 @@ case "$1" in
 		test_config
 		stop
 		;;
+	gracefull-stop)
+		test_config
+		stop
+		;;
 	reload)
 		test_config
 		reload
@@ -120,7 +126,7 @@ case "$1" in
 		ck_status lighttpd
 		;;
 	*)
-	echo "usage: $0 {start|stop|reload|restart|status}"
+	echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}"
 esac
 
 exit 0
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
index 201e916fa..c5525ea12 100644
--- a/extra/lirc/PKGBUILD
+++ b/extra/lirc/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 127217 2011-06-11 09:10:14Z ibiru $
+# $Id: PKGBUILD 133620 2011-07-30 06:46:23Z ibiru $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=4
+pkgrel=6
 epoch=1
-_kernver=2.6.39-ARCH
+_kernver=3.0-ARCH
 arch=('i686' 'x86_64')
 url="http://www.lirc.org/"
 license=('GPL')
-makedepends=('help2man' 'kernel26-headers>=2.6.39' 'kernel26-headers<2.6.40' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python')
+makedepends=('help2man' 'linux-headers>=3.0' 'linux-headers<3.1' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
@@ -60,7 +60,7 @@ build() {
 
 package_lirc() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'kernel26>=2.6.39' 'kernel26<2.6.40')
+  depends=('lirc-utils' 'linux>=3.0' 'linux<3.1')
   replaces=('lirc+pctv')
   install=lirc.install
 
diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install
index 26fb1391e..0d42e8a5c 100644
--- a/extra/lirc/lirc.install
+++ b/extra/lirc/lirc.install
@@ -1,4 +1,4 @@
-KERNEL_VERSION=2.6.39-ARCH
+KERNEL_VERSION=3.0-ARCH
 
 post_install() {
   # updating module dependencies
diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD
index 809f53c2e..9d6c1ff6e 100644
--- a/extra/lm_sensors/PKGBUILD
+++ b/extra/lm_sensors/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 132325 2011-07-23 00:44:08Z eric $
+# $Id: PKGBUILD 134304 2011-08-02 20:34:25Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=lm_sensors
 pkgver=3.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
 arch=('i686' 'x86_64')
 url="http://www.lm-sensors.org/"
@@ -15,7 +15,7 @@ backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord')
 options=('!emptydirs')
 source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \
 	sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \
-        sensord.rc daemonarg.patch)
+        sensord.rc daemonarg.patch linux_3.0.patch)
 md5sums=('8c0eebda8524fc87da1393b4564d279b'
          'c370f5e620bfe41113354a1e22c0c18c'
          '232bedf043dd5dedde82df1a399c682c'
@@ -24,7 +24,8 @@ md5sums=('8c0eebda8524fc87da1393b4564d279b'
          '970408d2e509dc4138927020efefe323'
          '96a8dd468e81d455ec9b165bdf33e0b7'
          '41a5c20854bbff00ea7174bd2276b736'
-         '40c8eb16af8249a0f1d851fc1057ea15')
+         '40c8eb16af8249a0f1d851fc1057ea15'
+         '5c1be382963145f7191d9c4e45ca9f67')
 sha1sums=('cb819e5a93adb36ef00e6d3c5363f5f474efa78a'
           'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
           'a068ac0a3115a6191a487e11422506baa922b40a'
@@ -33,13 +34,15 @@ sha1sums=('cb819e5a93adb36ef00e6d3c5363f5f474efa78a'
           'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f'
           'de8d4d65406815c389f8a04e2a8508a1ae6749c8'
           '72a60251d1d55a67307dab4105d9f3f01a080af4'
-          '34241388c4001bfb6e49b7e10da1217e29a258d6')
+          '34241388c4001bfb6e49b7e10da1217e29a258d6'
+          '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \
-         -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/detect/sensors-detect
+         -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service}
   patch -p1 < ../daemonarg.patch
+  patch -p0 < ../linux_3.0.patch
   make PREFIX=/usr
 }
 
@@ -47,6 +50,7 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
     PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
+  install -D -m644 prog/init/lm_sensors.service "${pkgdir}/lib/systemd/system/lm_sensors.service"
   install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors"
   install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol"
   install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
diff --git a/extra/lm_sensors/linux_3.0.patch b/extra/lm_sensors/linux_3.0.patch
new file mode 100644
index 000000000..da02a3d49
--- /dev/null
+++ b/extra/lm_sensors/linux_3.0.patch
@@ -0,0 +1,11 @@
+--- prog/detect/sensors-detect	2011-08-02 10:23:46.000000000 +0200
++++ prog/detect/sensors-detect	2011-08-02 10:24:04.000000000 +0200
+@@ -2472,7 +2472,7 @@
+ 
+ sub initialize_kernel_version
+ {
+-	`uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
++	`uname -r` =~ /(\d+)\.(\d+)(.*)/;
+ 	@kernel_version = ($1, $2, $3, $4);
+ 	chomp($kernel_arch = `uname -m`);
+ 
diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD
index 1c245bb45..bcf5e453d 100644
--- a/extra/midori/PKGBUILD
+++ b/extra/midori/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 124201 2011-05-17 17:28:05Z andyrtr $
+# $Id: PKGBUILD 134671 2011-08-07 11:28:53Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: rabyte <rabyte.at.gmail.dot.com>
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
 
 pkgname=midori
-#_gitdate=20090306
-pkgver=0.3.6 #_git${_gitdate}
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 arch=('i686' 'x86_64')
@@ -15,24 +14,11 @@ install=midori.install
 depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss' 'sqlite3' 'glib2')
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
 optdepends=('vala: for use in extensions')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2
-	#midori-${_gitdate}.tar.bz2
-)
-md5sums=('c4cb0686601b1c470c317de3d3f8e8fd')
-
-# source PKGBUILD && mksource
-mksource() {
-        mkdir /tmp/$pkgname-source
-        pushd /tmp/$pkgname-source
-	git clone -v git://git.xfce.org/kalikiana/midori
-	cd midori
-	git archive --prefix=midori-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-source/midori-${_gitdate}.tar.bz2
-        popd
-}
+source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2)
+md5sums=('14aa14ccabf3d003903f1584dab15d7a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-#  cd ${srcdir}/${pkgname}-${_gitdate}
   # python2 
   export PYTHON=/usr/bin/python2
   sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index ecfc88f0a..3eb045e5d 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125645 2011-05-27 17:39:58Z ibiru $
+# $Id: PKGBUILD 134721 2011-08-07 16:59:44Z dreisner $
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 # Contributor: Tor Krill <tor@krill.nu>
@@ -7,7 +7,7 @@
 
 pkgname=networkmanager
 pkgver=0.8.9997
-pkgrel=1
+pkgrel=2
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -43,6 +43,7 @@ build() {
     --with-dhclient=/usr/sbin/dhclient \
     --with-dhcpcd=/sbin/dhcpcd \
     --with-iptables=/usr/sbin/iptables \
+    --with-systemdsystemunitdir=/lib/systemd/system \
     --disable-static \
     --enable-more-warnings=no \
     --disable-wimax
diff --git a/extra/ossp/PKGBUILD b/extra/ossp/PKGBUILD
index 964013d1c..2b71ca3f9 100644
--- a/extra/ossp/PKGBUILD
+++ b/extra/ossp/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 99925 2010-11-19 14:16:05Z heftig $
+# $Id: PKGBUILD 132457 2011-07-24 17:19:01Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Jonathan Liu <net147@gmail.com>
 
 pkgname=ossp
 pkgver=1.3.2
-pkgrel=10
+pkgrel=11
 pkgdesc="Emulate OSS device using CUSE"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/osspd"
 license=(GPL2)
-depends=('fuse>=2.8.0' 'kernel26>=2.6.35-2')
+depends=('fuse>=2.8.0')
 makedepends=(libpulse alsa-lib)
 optdepends=("libpulse: PulseAudio backend"
             "alsa-lib: ALSA backend")
 backup=(etc/conf.d/osspd)
 source=("http://downloads.sourceforge.net/project/osspd/${pkgname}-${pkgver}.tar.gz"
         osspd.rc.d osspd.conf.d)
+md5sums=('ee2d8c894de2fa4eb3291804fbc7df45'
+         '0c02208ce1dfe74b6e9840f3600678cc'
+         '5a5a3db1bb3c98d48d4794613cf12ef0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -37,7 +40,3 @@ package() {
   install -D -m755 "$srcdir/osspd.rc.d" "$pkgdir/etc/rc.d/osspd"
   install -D -m644 "$srcdir/osspd.conf.d" "$pkgdir/etc/conf.d/osspd"
 }
-
-md5sums=('ee2d8c894de2fa4eb3291804fbc7df45'
-         '69b745e0c499cd50019266a99082ce8b'
-         '5a5a3db1bb3c98d48d4794613cf12ef0')
diff --git a/extra/ossp/osspd.rc.d b/extra/ossp/osspd.rc.d
index 78d7602ae..c5fabf855 100755
--- a/extra/ossp/osspd.rc.d
+++ b/extra/ossp/osspd.rc.d
@@ -14,20 +14,13 @@ if [[ -z "$DSP_SLAVE" ]]; then
   fi
 fi
 
-preclaim_oss=/sys/module/soundcore/parameters/preclaim_oss
-
 PID=`pidof -o %PPID /usr/sbin/osspd`
 case "$1" in
   start)
     stat_busy "Starting OSS userspace bridge"
     if [ -z "$PID" ]; then 
-      if [[ -r $preclaim_oss && "$(cat $preclaim_oss)" -eq 1 ]]; then
-        echo "Must boot with soundcore.preclaim_oss=0"
-        stat_die
-      fi
-      modprobe cuse &>/dev/null
-      modprobe -r snd-pcm-oss snd-mixer-oss &>/dev/null
-      sleep 0.1
+      /sbin/modprobe cuse &>/dev/null
+      /sbin/udevadm settle --quiet
       /usr/sbin/osspd --dsp-slave="$DSP_SLAVE"
     fi
     if [ -n "$PID" -o $? -gt 0 ]; then
diff --git a/extra/pinentry/PKGBUILD b/extra/pinentry/PKGBUILD
index ae742029e..71baf5bdc 100644
--- a/extra/pinentry/PKGBUILD
+++ b/extra/pinentry/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 106680 2011-01-17 20:41:54Z tpowa $
+# $Id: PKGBUILD 131244 2011-07-12 07:40:08Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pinentry
 pkgver=0.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,6 +15,7 @@ optdepends=('gtk: for gtk backend'
             'qt: for qt4 backend')  
 source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
         gtk2-pinentry-segfault.patch)
+install=pinentry.install
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
diff --git a/extra/pinentry/pinentry.install b/extra/pinentry/pinentry.install
new file mode 100644
index 000000000..eed2c7124
--- /dev/null
+++ b/extra/pinentry/pinentry.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(pinentry.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.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.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD
index 553c69d38..2a9ed84eb 100644
--- a/extra/rtkit/PKGBUILD
+++ b/extra/rtkit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111724 2011-02-28 21:05:00Z heftig $
+# $Id: PKGBUILD 134840 2011-08-07 20:46:13Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=rtkit
 pkgver=0.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Realtime Policy and Watchdog Daemon"
 arch=('i686' 'x86_64')
 url="http://git.0pointer.de/?p=rtkit.git"
@@ -18,7 +18,12 @@ md5sums=('9ab7f2a25ddf05584ea2216dfe4cefd4')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --libexecdir=/usr/lib --prefix=/usr --sysconfdir=/etc
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --with-systemdsystemunitdir=/lib/systemd/system
+
   make
 }
 
diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD
index fec4728e9..ca35f2882 100644
--- a/extra/scim-tables/PKGBUILD
+++ b/extra/scim-tables/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 110895 2011-02-22 20:15:32Z bisson $
+# $Id: PKGBUILD 134848 2011-08-07 23:21:19Z bisson $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Gan Lu <rhythm.gan@gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=scim-tables
-pkgver=0.5.9
-pkgrel=2
+pkgver=0.5.10
+pkgrel=1
 pkgdesc='Generic table input method module for SCIM'
 arch=('i686' 'x86_64')
 url='http://www.scim-im.org/'
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('scim')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('aeca1c8a2eb10a214edc07fa248cd7450f78e387')
+sha1sums=('c6e6fbd9999ceba5cb982349fee8391e16a9c2fe')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD
index e9755aada..f8d96e585 100644
--- a/extra/scim/PKGBUILD
+++ b/extra/scim/PKGBUILD
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD 125359 2011-05-26 09:22:50Z bisson $
+# $Id: PKGBUILD 134853 2011-08-08 03:28:47Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Gan Lu <rhythm.gan@gmail.com>
 
 pkgname=scim
-pkgver=1.4.10
+pkgver=1.4.11
 pkgrel=1
 pkgdesc='Input method user interface and development platform'
 url='http://www.scim-im.org/projects/scim'
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('gtk2' 'gcc-libs')
+options=('!libtool')
 makedepends=('intltool')
+depends=('gtk2' 'libtool')
 backup=('etc/scim/config' 'etc/scim/global')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_$pkgver.tar.gz")
-sha1sums=('bf33a6ceb199453fed909a61f54e971653fe5abf')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        'wtf.patch')
+sha1sums=('dd93094f62e5707db88d4f0e7ebd3392ae75b942'
+          '14d2be6c8f9f4af6494c3e806d3cadef5803597a')
 
 install=install
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../wtf.patch # revert broken commit 303
 
 	./bootstrap
 	./configure \
@@ -34,7 +37,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/scim/wtf.patch b/extra/scim/wtf.patch
new file mode 100644
index 000000000..c0e5ab078
--- /dev/null
+++ b/extra/scim/wtf.patch
@@ -0,0 +1,93 @@
+diff -aur old/extras/panel/scim_panel_gtk.cpp new/extras/panel/scim_panel_gtk.cpp
+--- old/extras/panel/scim_panel_gtk.cpp	2011-08-04 13:21:29.000000000 -0700
++++ new/extras/panel/scim_panel_gtk.cpp	2011-08-07 16:11:12.977663776 -0700
+@@ -479,12 +479,12 @@
+ 
+ static bool               _should_exit                 = false;
+ 
++static bool               _panel_is_on                 = false;
+ 
+-static struct timeval     _last_menu_deactivate_time = {0, 0};
++static GThread           *_panel_agent_thread          = 0;
++
++static PanelAgent        *_panel_agent                 = 0;
+ 
+-// client repository
+-static PropertyRepository            _frontend_property_repository;
+-static HelperPropertyRepository      _helper_property_repository;
+ static std::vector<String> _factory_menu_uuids;
+ 
+ static std::list<String>  _recent_factory_uuids;
+@@ -1187,16 +1187,16 @@
+ 
+     GtkRequisition ws;
+     gint pos_x, pos_y;
++
++    gtk_widget_size_request (_toolbar_window, &ws);
++
++    pos_x = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X),
+                            workarea_x + workarea_width - ws.width);
+     pos_y = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_Y),
+                            workarea_y + workarea_height - ws.height);
+     if (pos_x == -1 && pos_y == -1) {
+         pos_x = workarea_x + workarea_width  - ws.width;
+         pos_y = workarea_y + workarea_height - ws.height;
+-                           workarea_y + workarea_height - ws.height);
+-    if (pos_x == -1 && pos_y == -1) {
+-        pos_x = workarea_x + workarea_width  - ws.width;
+-        pos_y = workarea_y + workarea_height - ws.height;
+     }
+ 
+     if (_toolbar_auto_snap) {
+@@ -1215,6 +1215,10 @@
+     else if (pos_y < 0)
+         pos_y = 0;
+ 
++    if (_toolbar_window_x != pos_x || _toolbar_window_y != pos_y || force) {
++        gtk_window_move (GTK_WINDOW (_toolbar_window), pos_x, pos_y);
++        _toolbar_window_x = pos_x;
++        _toolbar_window_y = pos_y;
+     }
+ }
+ 
+@@ -1227,9 +1231,9 @@
+ #endif
+     return gdk_screen_width ();
+ }
+-        return gdk_screen_get_width (_current_screen);
+-#endif
+-    return gdk_screen_width ();
++
++static int
++ui_screen_height (void)
+ {
+ #if GDK_MULTIHEAD_SAFE
+     if (_current_screen)
+@@ -1237,10 +1241,6 @@
+ #endif
+     return gdk_screen_height ();
+ }
+-        return gdk_screen_get_height (_current_screen);
+-#endif
+-    return gdk_screen_height ();
+-}
+ 
+ static void
+ ui_get_workarea (int &x, int &y, int &width, int &height)
+@@ -1929,11 +1929,11 @@
+     static gulong motion_handler;
+     GdkCursor *cursor;
+ 
+-        if (!_config.null () &&
+-            (_toolbar_window_x != pos_x || _toolbar_window_y != pos_y)) {
+-            _config->write (
+-                SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X, pos_x);
+-            _config->write (
++    if (click_type == 0 && event->button <= 1) {
++        if (_toolbar_window_draging)
++            return FALSE;
++
++        // Connection pointer motion handler to this window.
+         motion_handler = g_signal_connect (G_OBJECT (window), "motion-notify-event",
+                                            G_CALLBACK (ui_toolbar_window_motion_cb),
+                                            NULL);
diff --git a/extra/usermin/PKGBUILD b/extra/usermin/PKGBUILD
index c7494e10a..712901cf1 100644
--- a/extra/usermin/PKGBUILD
+++ b/extra/usermin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 104514 2011-01-03 20:58:29Z tpowa $
+# $Id: PKGBUILD 134661 2011-08-07 10:26:07Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=usermin
-pkgver=1.460
+pkgver=1.480
 pkgrel=1
 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding"
 arch=(i686 x86_64)
@@ -124,6 +124,6 @@ build() {
   #install license
   install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/usermin/LICENCE
 }
-md5sums=('d22452de87891e4012411e3aa86aec1f'
+md5sums=('b5fa9938a29b7e83c36249f0b01119a3'
          'cfef4490cd1ef9517c0b39a7bd75c968'
          'ec37a79f948f778224550930d2a7ca07')
diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD
index d1a55f636..51fd18d68 100644
--- a/extra/webmin/PKGBUILD
+++ b/extra/webmin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 122336 2011-05-03 22:31:36Z tpowa $
+# $Id: PKGBUILD 134656 2011-08-07 10:21:55Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.550
+pkgver=1.560
 pkgrel=1
 pkgdesc="a web-based interface for system administration"
 arch=(i686 x86_64)
@@ -210,9 +210,7 @@ build() {
   # install license
   install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
 }
-
-
-md5sums=('d892599a6e3e6f102a8261d2804fb1b5'
+md5sums=('6a3eb723f991fd8c3004655472352cd7'
          'da6bea412a5be8cf82a813078fec5847'
          'bfebb75bb94029b48c46b7f1ba1aa811'
          '0673e51af0e81418b4a6c1e205f7e5cd')
diff --git a/extra/xfce4-notifyd/PKGBUILD b/extra/xfce4-notifyd/PKGBUILD
index c08a9d259..4aca1ff44 100644
--- a/extra/xfce4-notifyd/PKGBUILD
+++ b/extra/xfce4-notifyd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108801 2011-02-03 16:49:52Z andyrtr $
+# $Id: PKGBUILD 134711 2011-08-07 16:35:59Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-notifyd
-pkgver=0.2.1
+pkgver=0.2.2
 pkgrel=1
 pkgdesc="notification daemon for the xfce desktop"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ replaces=('notification-daemon-xfce')
 options=('!libtool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/apps/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0a63857901809887b587c73024d1089b')
+md5sums=('8687fb7a0f270231ada265e363b6ffcc')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/xfce4-screenshooter/PKGBUILD b/extra/xfce4-screenshooter/PKGBUILD
index 4db623812..9a793fbc4 100644
--- a/extra/xfce4-screenshooter/PKGBUILD
+++ b/extra/xfce4-screenshooter/PKGBUILD
@@ -1,33 +1,32 @@
-# $Id: PKGBUILD 104774 2011-01-04 21:47:46Z andyrtr $
+# $Id: PKGBUILD 134703 2011-08-07 16:23:19Z andyrtr $
 # Maintainer: tobias <tobias funnychar archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-screenshooter
-pkgver=1.7.9
-pkgrel=2
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="plugin that makes screenshots for the Xfce4 panel"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
 groups=('xfce4-goodies')
-#depends=('xfce4-panel' 'libxfcegui4' 'libxfce4ui' 'exo' 'libsoup' 'hicolor-icon-theme')
-depends=('xfce4-panel' 'libxfcegui4' 'libsoup' 'hicolor-icon-theme')
+depends=('xfce4-panel' 'libsoup' 'hicolor-icon-theme')
 makedepends=('intltool')
 install=${pkgname}.install
 options=('!libtool')
-source=(http://archive.xfce.org/src/apps/${pkgname}/1.7/${pkgname}-${pkgver}.tar.bz2
+source=(http://archive.xfce.org/src/apps/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2
 	xfce4-screenshooter-1.7.9-dsofix.patch
 	fix_segfault.diff)
 conflicts=('xfce4-screenshooter-plugin')
 replaces=('xfce4-screenshooter-plugin')
-md5sums=('c01d1cf3830bf8d60e09c0cdd223034c'
+md5sums=('b51ab5725418e7258273c4a6402adb02'
          '355a7d005bf9200f5a5577f0bc901945'
          '794d7e0ff18cad369bd50a78e883f986')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/xfce4-screenshooter-1.7.9-dsofix.patch
-  patch -Np1 -i ${srcdir}/fix_segfault.diff
+  #patch -Np1 -i ${srcdir}/fix_segfault.diff
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
diff --git a/staging/gnutls/PKGBUILD b/staging/gnutls/PKGBUILD
new file mode 100644
index 000000000..38d7d94d6
--- /dev/null
+++ b/staging/gnutls/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 134729 2011-08-07 19:08:57Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnutls
+pkgver=3.0.0
+pkgrel=1
+pkgdesc="A library which provides a secure layer over a reliable transport layer"
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL')
+url="http://www.gnu.org/software/gnutls/"
+install=gnutls.install
+options=('!libtool' '!zipman')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
+md5sums=('0677a66667f48810ff8df8335a9a9f9b')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--with-zlib \
+	--disable-static \
+	--disable-guile \
+	--without-p11-kit
+  make
+}
+
+# i686 test segfault
+
+#check() {
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+  #make check # passes all  || /bin/true
+#  make check # || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html
+#}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
+  # gzip -9 all files in infodir and manpages manually
+  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
+  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
+}
diff --git a/staging/gnutls/gnutls.install b/staging/gnutls/gnutls.install
new file mode 100644
index 000000000..9ce7c6edc
--- /dev/null
+++ b/staging/gnutls/gnutls.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $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 $infodir/dir 2> /dev/null
+  done
+}
diff --git a/staging/libvncserver/PKGBUILD b/staging/libvncserver/PKGBUILD
new file mode 100644
index 000000000..1b45fd593
--- /dev/null
+++ b/staging/libvncserver/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 134732 2011-08-07 19:13:36Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=libvncserver
+pkgver=0.9.8
+pkgrel=3
+pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
+arch=('i686' 'x86_64')
+url="http://libvncserver.sourceforge.net/"
+license=('GPL')
+depends=('libjpeg' 'zlib' 'gnutls')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz")
+md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3')
+
+build() {
+  cd "${srcdir}/LibVNCServer-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/LibVNCServer-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/nettle/PKGBUILD b/staging/nettle/PKGBUILD
new file mode 100644
index 000000000..e079a16f8
--- /dev/null
+++ b/staging/nettle/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 134726 2011-08-07 17:54:31Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: bender02 at gmx dot com
+
+pkgname=nettle
+pkgver=2.2
+pkgrel=1
+pkgdesc="A low-level cryptographic library"
+arch=('i686' 'x86_64')
+url="http://www.lysator.liu.se/~nisse/nettle/"
+license=('GPL2')
+install=$pkgname.install
+depends=('gmp')
+source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz)
+md5sums=('9a9c6102eb9909019f8a13b67578cdfe')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --libdir=/usr/lib \
+	--enable-shared \
+	--disable-static # <-- seems not working now
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+  
+  # remove static libs
+  rm -f ${pkgdir}/usr/lib/{libhogweed,libnettle}.a
+}
diff --git a/staging/nettle/nettle.install b/staging/nettle/nettle.install
new file mode 100644
index 000000000..3d19b5f19
--- /dev/null
+++ b/staging/nettle/nettle.install
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(nettle.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.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.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/libssh2/PKGBUILD b/testing/libssh2/PKGBUILD
new file mode 100644
index 000000000..4eeb02c5d
--- /dev/null
+++ b/testing/libssh2/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 134704 2011-08-07 16:23:21Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: ice-man <icemanf@gmail.com>
+
+pkgname=libssh2
+pkgver=1.2.8
+pkgrel=1
+pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
+url="http://www.libssh2.org/"
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('openssl')
+makedepends=('zlib')
+options=('!libtool')
+source=("http://www.libssh2.org/download/${pkgname}-${pkgver}.tar.gz")
+md5sums=('1b236563b75d1b1f0d483352dc5918cf')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}