Merge branch 'master' of ssh://gparabola/srv/git/abslibre-mips64el

322 files changed, 12705 insertions, 1663 deletions

diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD
index b36205e09..77a3bcae9 100644
--- a/community/0ad/PKGBUILD
+++ b/community/0ad/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
 # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
 pkgname=0ad
-pkgver=a9
-_pkgver=r11339-alpha
+pkgver=a10
+_pkgver=r11863-alpha
 pkgrel=1
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL2' 'CCPL')
 depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'gamin' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'openexr' 'python2' 'sdl' 'wxgtk' 'zip' 'zlib' 'libgl' '0ad-data')
 makedepends=('boost' 'cmake' 'mesa')
 source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz")
-md5sums=('6db1e62215654269516f5eb1eec371f1')
+md5sums=('f42a2e18515cbcd48b99f0ea3796b3a4')
 
 build() {
   cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 53ff54a87..677e10b47 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69396 2012-04-15 17:01:41Z seblu $
+# $Id: PKGBUILD 70904 2012-05-18 22:37:04Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
@@ -6,7 +6,7 @@
 
 pkgname=acpid
 pkgver=2.0.16
-pkgrel=1
+pkgrel=2
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
 arch=('i686' 'x86_64')
 url='http://tedfelix.com/linux/acpid-netlink.html'
@@ -16,15 +16,19 @@ optdepends=('perl: use perl based examples')
 replaces=('acpid2')
 backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
 source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
-        'acpid'
+        'acpid.rc'
+        'acpid.conf'
+        'acpid.socket'
+        'acpid.service'
         'anything'
-        'handler.sh'
-        'acpid.conf.d')
+        'handler.sh')
 md5sums=('d59fc02c9c34f0d5c137495302e2c074'
-         'd69203a032c4583f9abaafcf21a7ed84'
+         '077475c75fbdd9de75f9a397130ccd91'
+         '929c6d2e91295c22ed9ec6212d7eabef'
+         'ee6cb99e50e580c50331a73045412ae9'
+         '953e26477c5d4f5f013d6861c04b4af6'
          '2d37b98d6e74bab815604b8b48c6cfd4'
-         '615439f4a89716c747907d4fc3c8df75'
-         '929c6d2e91295c22ed9ec6212d7eabef')
+         '74ee3c33714ff5cb44f30c9a0dceeef0')
 
 build() {
   cd $pkgname-$pkgver
@@ -33,15 +37,22 @@ build() {
 }
 
 package() {
-  cd $pkgname-$pkgver
+  pushd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
+  popd
+
+  # default config
+  install -Dm644 anything "$pkgdir/etc/acpi/events/anything"
+  install -Dm755 handler.sh "$pkgdir/etc/acpi/handler.sh"
 
-  install -Dm755 ../acpid "$pkgdir/etc/rc.d/acpid"
-  install -Dm644 ../anything "$pkgdir/etc/acpi/events/anything"
-  install -Dm755 ../handler.sh "$pkgdir/etc/acpi/handler.sh"
-  install -Dm644 ../acpid.conf.d "$pkgdir/etc/conf.d/acpid"
+  # initscripts
+  install -Dm755 acpid.rc "$pkgdir/etc/rc.d/acpid"
+  install -Dm644 acpid.conf "$pkgdir/etc/conf.d/acpid"
+  install -Dm644 acpid.socket "$pkgdir/usr/lib/systemd/system/acpid.socket"
+  install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service"
 
-  chmod 755 "$pkgdir"/usr/sbin/acpid
+  # fix acpid rights
+  chmod 755 "$pkgdir/usr/sbin/acpid"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/acpid/acpid.conf b/community/acpid/acpid.conf
new file mode 100644
index 000000000..b60103a2d
--- /dev/null
+++ b/community/acpid/acpid.conf
@@ -0,0 +1,5 @@
+#
+# Arguments to be passed to the acpid daemon
+#
+
+ACPID_ARGS=""
diff --git a/community/acpid/acpid.rc b/community/acpid/acpid.rc
new file mode 100644
index 000000000..674f4621b
--- /dev/null
+++ b/community/acpid/acpid.rc
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[[ -f /etc/conf.d/acpid ]] && . /etc/conf.d/acpid
+
+PID=$(pidof -o %PPID /usr/sbin/acpid)
+case "$1" in
+  start)
+    stat_busy "Starting acpid"
+    [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon acpid
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping acpid"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon acpid
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/acpid/acpid.service b/community/acpid/acpid.service
new file mode 100644
index 000000000..31fcc0575
--- /dev/null
+++ b/community/acpid/acpid.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=ACPI event daemon
+Requires=acpid.socket
+
+[Service]
+EnvironmentFile=/etc/conf.d/acpid
+ExecStart=/usr/sbin/acpid -f $ACPID_ARGS
diff --git a/community/acpid/acpid.socket b/community/acpid/acpid.socket
new file mode 100644
index 000000000..1e5365bf1
--- /dev/null
+++ b/community/acpid/acpid.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=ACPID Listen Socket
+
+[Socket]
+ListenStream=/run/acpid.socket
+
+[Install]
+WantedBy=sockets.target
diff --git a/community/acpid/handler.sh b/community/acpid/handler.sh
index aac143a9a..b5a548f43 100644
--- a/community/acpid/handler.sh
+++ b/community/acpid/handler.sh
@@ -9,16 +9,24 @@ set $*
 
 case "$1" in
     button/power)
-        #echo "PowerButton pressed!">/dev/tty5
         case "$2" in
-            PBTN|PWRF)  logger "PowerButton pressed: $2" ;;
-            *)          logger "ACPI action undefined: $2" ;;
+            PBTN|PWRF)
+                logger "PowerButton pressed: $2"
+                poweroff
+                ;;
+            *)
+                logger "ACPI action undefined: $2"
+                ;;
         esac
         ;;
     button/sleep)
         case "$2" in
-            SLPB|SBTN)   echo -n mem >/sys/power/state ;;
-            *)      logger "ACPI action undefined: $2" ;;
+            SLPB|SBTN)
+                echo -n mem >/sys/power/state
+                ;;
+            *)
+                logger "ACPI action undefined: $2"
+                ;;
         esac
         ;;
     ac_adapter)
@@ -28,43 +36,51 @@ case "$1" in
                     00000000)
                         echo -n $minspeed >$setspeed
                         #/etc/laptop-mode/laptop-mode start
-                    ;;
+                        ;;
                     00000001)
                         echo -n $maxspeed >$setspeed
                         #/etc/laptop-mode/laptop-mode stop
-                    ;;
+                        ;;
                 esac
                 ;;
-            *)  logger "ACPI action undefined: $2" ;;
+            *)
+                logger "ACPI action undefined: $2"
+                ;;
         esac
         ;;
     battery)
         case "$2" in
             BAT0)
                 case "$4" in
-                    00000000)   #echo "offline" >/dev/tty5
-                    ;;
-                    00000001)   #echo "online"  >/dev/tty5
-                    ;;
+                    00000000)
+                        logger 'Battery online'
+                        ;;
+                    00000001)
+                        logger 'Battery offline'
+                        ;;
                 esac
                 ;;
-            CPU0)	
+            CPU0)
                 ;;
             *)  logger "ACPI action undefined: $2" ;;
         esac
         ;;
     button/lid)
-       	case "$3" in
-	    close)
-		#echo "LID closed!">/dev/tty5
-		;;
-	    open)
-		#echo "LID opened!">/dev/tty5
-        	;;
-	esac
-	;;
-
+        case "$3" in
+            close)
+                logger 'LID closed'
+                ;;
+            open)
+                logger 'LID opened'
+                ;;
+            *)
+                logger "ACPI action undefined: $3"
+                ;;
+    esac
+    ;;
     *)
         logger "ACPI group/action undefined: $1 / $2"
         ;;
 esac
+
+# vim:set ts=4 sw=4 ft=sh et:
diff --git a/community/armagetronad/PKGBUILD b/community/armagetronad/PKGBUILD
index 431cf4344..7b9972f5f 100644
--- a/community/armagetronad/PKGBUILD
+++ b/community/armagetronad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68998 2012-04-07 15:11:48Z kkeen $
+# $Id: PKGBUILD 70736 2012-05-16 00:12:56Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Filippo 'JoeyrS' Civiletti <joeyrs@gmail.com>
 
 pkgname=armagetronad
 pkgver=0.2.8.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A Tron Clone in 3D.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://armagetronad.net/'
@@ -35,6 +35,9 @@ package() {
      cd "$srcdir/armagetronad-$pkgver"
      make DESTDIR="$pkgdir" install
      install -D -m 644 "desktop/armagetronad.desktop" "$pkgdir/usr/share/applications/armagetronad.desktop"
+     install -d "$pkgdir/usr/share/pixmaps/"
+     ln -s /usr/share/armagetronad/desktop/icons/large/armagetronad.png \
+           "$pkgdir/usr/share/pixmaps/armagetronad.png"
      mv "$pkgdir/usr/bin/armagetronad" "$pkgdir/usr/bin/armagetronad_bin"
      printf "#!/bin/bash\n/usr/bin/armagetronad_bin --configdir /etc/armagetronad --datadir /usr/share/armagetronad" > "$pkgdir/usr/bin/armagetronad"
      chmod +x "$pkgdir/usr/bin/armagetronad"
diff --git a/community/awesome/01-fix_glib2_build.patch b/community/awesome/01-fix_glib2_build.patch
new file mode 100644
index 000000000..aeab63fbb
--- /dev/null
+++ b/community/awesome/01-fix_glib2_build.patch
@@ -0,0 +1,31 @@
+From d3d8160e273b56d0262d2570cfa6bcb76b9ea771 Mon Sep 17 00:00:00 2001
+From: Thomas Moschny <thomas.moschny@gmx.de>
+Date: Wed, 14 Dec 2011 20:00:53 +0100
+Subject: [PATCH] Fix build with glib2 2.31.0
+
+Starting with glib2 2.31.0, It is no longer possible to
+include individual headers (like "ghash.h") -- you must
+#include <glib.h>.
+
+Signed-off-by: Thomas Moschny <thomas.moschny@gmx.de>
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+---
+ spawn.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/spawn.c b/spawn.c
+index 3c8cf07..a6d6c5e 100644
+--- a/spawn.c
++++ b/spawn.c
+@@ -24,7 +24,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
+-#include <glib/gspawn.h>
++#include <glib.h>
+ 
+ #include "spawn.h"
+ #include "screen.h"
+-- 
+1.7.2.5
+
diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD
new file mode 100644
index 000000000..b67f9c548
--- /dev/null
+++ b/community/awesome/PKGBUILD
@@ -0,0 +1,64 @@
+# $Id: PKGBUILD 70615 2012-05-12 21:06:01Z ibiru $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Contributor: xduugu
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Vesa Kaihlavirta
+
+pkgname=awesome
+pkgver=3.4.11
+pkgrel=4
+pkgdesc='Highly configurable framework window manager'
+arch=('i686' 'x86_64')
+url='http://awesome.naquadah.org/'
+license=('GPL2')
+depends=(
+  'cairo'
+  'dbus'
+  'imlib2'
+  'libev'
+  'libxdg-basedir'
+  'lua'
+  'pango'
+  'startup-notification'
+  'xcb-util-image'
+  'xcb-util-keysyms'
+  'xcb-util-wm'
+  'xorg-xmessage'
+)
+makedepends=(
+  'asciidoc'
+  'cmake'
+  'docbook-xsl'
+  'doxygen'
+  'gperf'
+  'imagemagick'
+  'luadoc'
+  'xmlto'
+)
+optdepends=(
+  'rlwrap: readline support for awesome-client'
+  'feh: image background setter for awsetbg'
+)
+provides=('notification-daemon')
+source=("$url/download/$pkgname-$pkgver.tar.xz"
+        "$pkgname.desktop"
+        '01-fix_glib2_build.patch')
+md5sums=('d6aa71334b5cd4ef63ce69d6c612ecf2'
+         '0fdbeec43d211c6750041d7e37611a6a'
+         'baa179074c36e26ef156ebb2060bfd5c')
+
+build() {
+  cd $pkgname-$pkgver
+  # to remove in 3.4.12
+  patch -N -p1 -i ../01-fix_glib2_build.patch
+  make CMAKE_ARGS=' -DPREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE'
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  # install desktop file so you can start awesome from your login manager
+  install -Dm644 ../awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/awesome/awesome.desktop b/community/awesome/awesome.desktop
new file mode 100644
index 000000000..453399c6e
--- /dev/null
+++ b/community/awesome/awesome.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Awesome
+Comment=Highly configurable framework window manager
+Type=XSession
+Exec=awesome
+TryExec=awesome
diff --git a/community/bcg729/PKGBUILD b/community/bcg729/PKGBUILD
new file mode 100644
index 000000000..23cb66cf3
--- /dev/null
+++ b/community/bcg729/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=bcg729
+pkgver=1.0.0
+pkgrel=2
+pkgdesc="g729 codec"
+arch=('i686' 'x86_64')
+url="http://www.linphone.org/eng/documentation/dev/bcg729.html"
+license=('GPL')
+depends=('mediastreamer')
+options=('!libtool')
+source=(http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/bcg729-$pkgver.tar.gz)
+md5sums=('45e127a9a309aff94d3262d97b5aeab0')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index 00d2cc85f..fc1930db8 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 69400 2012-04-15 20:25:26Z tredaelli $
+# $Id: PKGBUILD 70477 2012-05-09 10:21:50Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: shahid <helllamer@gmail.com>
 
 pkgbase=bitcoin
 pkgname=('bitcoin-daemon' 'bitcoin-qt')
-pkgver=0.6.0
+pkgver=0.6.2
+_commit=06d764e
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.bitcoin.org/"
@@ -12,21 +13,18 @@ makedepends=('boost' 'automoc4' 'miniupnpc')
 conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
 replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
 license=('MIT')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}-linux.tar.gz")
-sha256sums=('13faa8b7c8c9ce3518ebe31ff2d97920f4feb4f06c1d08455b272fdaaeeb1f97')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/bitcoin/$pkgbase/tarball/v$pkgver")
+sha256sums=('03c72d7bcdec70cb88033abb785b50686880b95d4768e8586891a9728d498c5a')
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver-linux/src"
-
-  # FIXME GCC 4.7.0 is too strict
-  echo "QMAKE_CXXFLAGS += $CXXFLAGS -fpermissive" >> bitcoin-qt.pro
+  cd "$srcdir/bitcoin-$pkgbase-$_commit"
 
   # and make qt gui
   qmake
   make
 
   # make bitcoind
-  make -f makefile.unix -C src CXXFLAGS="$CXXFLAGS -fpermissive" USE_UPNP=1
+  make -f makefile.unix -C src  CXXFLAGS="$CXXFLAGS" USE_UPNP=1
 }
 
 
@@ -35,7 +33,7 @@ package_bitcoin-qt() {
   depends=(boost-libs qt miniupnpc)
   install=bitcoin-qt.install
 
-  cd "$srcdir/$pkgbase-$pkgver-linux/src"
+  cd "$srcdir/bitcoin-$pkgbase-$_commit"
   install -Dm755 bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt
   install -Dm644 contrib/debian/bitcoin-qt.desktop \
     "$pkgdir"/usr/share/applications/bitcoin.desktop
@@ -49,7 +47,7 @@ package_bitcoin-daemon() {
   pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon"
   depends=(boost-libs miniupnpc openssl)
 
-  cd "$srcdir/$pkgbase-$pkgver-linux/src"
+  cd "$srcdir/bitcoin-$pkgbase-$_commit"
   install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind
   install -Dm644 contrib/debian/examples/bitcoin.conf \
     "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf"
diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD
index de29d6970..79bbbdae8 100644
--- a/community/blender/PKGBUILD
+++ b/community/blender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69995 2012-04-28 00:27:10Z svenstaro $
+# $Id: PKGBUILD 70565 2012-05-11 20:09:37Z svenstaro $
 # Contributor: John Sowiak <john@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
@@ -13,9 +13,9 @@
 _svn=false
 
 pkgname=blender
-pkgver=2.63
+pkgver=2.63a
 pkgrel=1
-epoch=3
+epoch=4
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -30,7 +30,7 @@ options=(!strip)
 install=blender.install
 if [ $_svn = false ]; then
   source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('1cc18a9074ba63313a5711887de76c54')
+  md5sums=('31a60b3ce5466d965cb7e2648995e092')
 else
   source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
   md5sums=('7579d1139d0d6025df8afcfca64a65c4')
diff --git a/community/ccrtp/PKGBUILD b/community/ccrtp/PKGBUILD
index 25595a7d7..311579ea4 100644
--- a/community/ccrtp/PKGBUILD
+++ b/community/ccrtp/PKGBUILD
@@ -1,41 +1,30 @@
-# $Id: PKGBUILD 64382 2012-02-12 15:47:02Z arodseth $
+# $Id: PKGBUILD 70714 2012-05-15 11:37:10Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ccrtp
-pkgver=1.8.0
-pkgrel=2
+pkgver=2.0.3
+pkgrel=1
 pkgdesc="GNU ccRTP"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://www.gnu.org/software/ccrtp/"
 license=('GPL' 'custom')
-depends=('commoncpp2' 'zlib' 'libxml2' 'libgcrypt')
+depends=('zlib' 'libxml2' 'libgcrypt' 'ucommon')
 options=('!libtool')
 install=$pkgname.install
-source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-        'gcc46.patch')
-sha256sums=('365feddd276c78104600204ae6db4e76c66036df1e5b905e855239daac6a2473'
-            '4ac9385228dc8b8893e0868d5a06477e4009e9fb2dc191460406da58fc6a6fb3')
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
+sha256sums=('365feddd276c78104600204ae6db4e76c66036df1e5b905e855239daac6a2473')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Np1 -i "$srcdir/gcc46.patch"
-  # arch64 fix from Mandriva
-  [ "$CARCH" == "x86_64" ] && export CXXFLAGS="$CXXFLAGS -fpermissive"
-  export LDFLAGS="$LDFLAGS `pkg-config --libs libccgnu2`"
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make DESTDIR="$pkgdir" install
   install -Dm644 COPYING.addendum "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  #rm -rf "$pkgdir/usr/share/info/dir"
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/cuda-sdk/PKGBUILD b/community/cuda-sdk/PKGBUILD
new file mode 100644
index 000000000..152b3add9
--- /dev/null
+++ b/community/cuda-sdk/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Thomas Jost <schnouki@schnouki.net>
+# Contributor: Carson Reynolds <carson@k2.t.u-tokyo.ac.jp>
+
+pkgname=cuda-sdk
+pkgver=4.2.9
+pkgrel=1
+pkgdesc="NVIDIA's GPU programming sdk"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/object/cuda_home.html"
+license=('custom')
+depends=('cuda-toolkit' 'nvidia' 'opencl-nvidia' 'freeglut' 'libxmu')
+makedepends=('perl')
+source=(http://developer.download.nvidia.com/compute/cuda/4_2/rel/sdk/gpucomputingsdk_${pkgver}_linux.run)
+md5sums=('693d969aca8bb06a5a1d51ef5c3ca04b')
+
+build() {
+  cd "$srcdir"
+
+  sh gpucomputingsdk_${pkgver}_linux.run --noexec --keep --nox11 --nochown --target sdk >/dev/null
+  cd sdk
+  
+  find . -name *.cu | xargs sed -i "1 i #undef _GLIBCXX_ATOMIC_BUILTINS"
+  find . -name *.cu | xargs sed -i "1 i #undef _GLIBCXX_USE_INT128"
+
+  #find . -name 'Makefile*' -exec sed -i 's/^\tmake /\t$(MAKE) /g; s/^\t@make /\t@$(MAKE) /g' "{}" +
+
+  # Sadly we need to install this first and compile afterwards, this is why we only have build()
+  install -dm755 "$pkgdir/opt/cuda-sdk"
+  ./install-sdk-linux.pl --prefix="$pkgdir/opt/cuda-sdk" --cudaprefix="/opt/cuda-toolkit" >/dev/null
+
+  cd "$pkgdir/opt/cuda-sdk"
+  make CUDA_INSTALL_PATH=/opt/cuda-toolkit NO_MPI=1
+  # simpleMPI sometimes causes segfaults when building...
+
+  install -Dm755 "$pkgdir/opt/cuda-sdk/License.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index 0346592a0..32dcd10e3 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 68423 2012-03-24 13:07:55Z lfleischer $
+# $Id: PKGBUILD 70879 2012-05-18 11:38:46Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
 
 pkgname=deadbeef
-pkgver=0.5.2
-pkgrel=1
+pkgver=0.5.4
+pkgrel=2
 pkgdesc='An audio player for GNU/Linux based on GTK2.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://deadbeef.sourceforge.net'
@@ -12,7 +12,7 @@ license=('GPL2')
 depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb'
              'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip'
-             'libsamplerate')
+             'libsamplerate' 'yasm')
 optdepends=('libsamplerate: for Resampler plugin'
             'libvorbis: for Ogg Vorbis playback'
             'libmad: for MP1/MP2/MP3 playback'
@@ -33,7 +33,7 @@ optdepends=('libsamplerate: for Resampler plugin'
 options=('!libtool')
 install='deadbeef.install'
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('0810c1b609b6c1ca43578ebf321fdec4')
+md5sums=('062b7c15d21e383a54e43b3e8076d8e3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD
index ace0834a4..51037ff0d 100644
--- a/community/dmenu/PKGBUILD
+++ b/community/dmenu/PKGBUILD
@@ -27,5 +27,4 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make PREFIX=/usr DESTDIR=$pkgdir install
   install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-md5sums=('85204de9ac040e0ba544978ce6d6a105')
+}
\ No newline at end of file
diff --git a/community/dos2unix/PKGBUILD b/community/dos2unix/PKGBUILD
index e85d40e06..0a8bbf17f 100644
--- a/community/dos2unix/PKGBUILD
+++ b/community/dos2unix/PKGBUILD
@@ -1,9 +1,10 @@
+# $Id: PKGBUILD 70487 2012-05-09 15:02:28Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski
 # Contributor: Renato Garcia <fgar.renatoATgmailDOTcom>
 # Contributor: Gerson E. Ruotolo <gersonruotolo@globo.com>
 
 pkgname=dos2unix
-pkgver=5.3.3
+pkgver=6.0
 pkgrel=1
 pkgdesc='Text file format converter'
 arch=('i686' 'x86_64')
@@ -13,7 +14,7 @@ depends=('glibc')
 makedepends=('perl')
 conflicts=('hd2u')
 source=("http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f352d648b97197c8a786eccc832764d8')
+md5sums=('2fc8d6ebe9f1a519b15ebe0850e9aabd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD
index 1dc0c2a38..ade9c7dae 100644
--- a/community/doublecmd/PKGBUILD
+++ b/community/doublecmd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70226 2012-05-02 13:40:27Z idevolder $
+# $Id: PKGBUILD 70846 2012-05-17 18:29:58Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: (sirocco AT ngs.ru)
 
@@ -6,7 +6,7 @@ pkgbase=doublecmd
 pkgname=('doublecmd-gtk2' 'doublecmd-qt')
 pkgver=0.5.4
 _helpver=0.5.1
-pkgrel=2
+pkgrel=2.1
 url="http://doublecmd.sourceforge.net/"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD
index a2bb91007..44cd7b43e 100644
--- a/community/fpc/PKGBUILD
+++ b/community/fpc/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 61619 2012-01-04 22:27:59Z spupykin $
+# $Id: PKGBUILD 70842 2012-05-17 18:20:47Z idevolder $
 # 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>
+# Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Original PKGBUILD: Andre Naumann <anaumann@SPARCed.org>
 # See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc
 
 pkgname=fpc
 pkgver=2.6.0
-pkgrel=1
+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' 'mips64el')
 url="http://www.freepascal.org/"
@@ -45,6 +46,9 @@ package() {
   mkdir -p ${pkgdir}/etc
   ${pkgdir}/usr/lib/fpc/${pkgver}/samplecfg $pkgdir/usr/lib/fpc/${pkgver} ${pkgdir}/etc
 
+  # use -fPIC by default
+  echo -e "#ifdef cpux86_64\n# for x86_64 use -fPIC by default\n-Cg\n#endif" >> "$pkgdir/etc/fpc.cfg"
+
   mv $pkgdir/usr/man $pkgdir/usr/share/
 
   find $pkgdir/etc/ -type f -exec sed -i "s|$pkgdir||g" {} \;
diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD
new file mode 100644
index 000000000..ad30d215f
--- /dev/null
+++ b/community/freeorion/PKGBUILD
@@ -0,0 +1,100 @@
+# $Id: PKGBUILD 70724 2012-05-15 19:44:31Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: guini <sidtrun@googlemail.com>
+# Contributor: Forrest Loomis <cybercyst _ at _ gmail dot com>
+# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: fana-m <geminin@gmx.net>
+
+pkgname=freeorion
+pkgver=0.4
+_fixedrevision=4635
+pkgrel=5
+pkgdesc="Turn-based galactic conquest game inspired by Master of Orion"
+arch=('x86_64' 'i686')
+url="http://www.freeorion.org/"
+license=('GPL')
+if [ "$CARCH" == "x86_64" ]
+then
+  depends=('lib32-nvidia-cg-toolkit')
+else
+  depends=('nvidia-cg-toolkit')
+fi
+depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils')
+makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-10' 'graphviz' 'libogg'
+             'desktop-file-utils' 'setconf' 'clang' 'cmake' 'gendesk' 'subversion')
+options=('!strip' '!emptydirs')
+install=$pkgname.install
+source=("$pkgname.sh")
+sha256sums=('111532e460aec847ff455ee67dd64f46e2fa5ceba39a0349d25a84b69c646eaf')
+
+build() {
+  cd "$srcdir"
+  gendesk
+
+  msg2 "Checking out svn revision $_fixedrevision..."
+  if [[ -d "$pkgname/.svn" ]]; then
+    (cd "$pkgname" && svn up -r "$_fixedrevision")
+  else
+    svn co \
+      https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/ \
+      --config-dir ./ -r "$_fixedrevision" "$pkgname"
+  fi
+
+  msg2 "Setting up build directory..."
+  rm -rf "$srcdir/$pkgname-build"
+  cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build"
+  cd "$srcdir/$pkgname-build"
+
+  msg2 "Generating makefiles..."
+  cmake -G "Unix Makefiles"
+  
+  msg2 "GLU fix..."
+  setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING "'-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU '"
+
+  msg2 "Compiling..."
+  make -j1
+
+  msg2 "OGRE fix..."
+  sed -i 's:PluginFolder=.:PluginFolder=/usr/lib/OGRE/:g' \
+    "$srcdir/$pkgname-build/ogre_plugins.cfg"
+}
+
+package() {
+  cd "$srcdir/$pkgname-build"
+
+  msg2 "Packaging documentation..."
+  install -Dm644 loki_setup/README.txt \
+    "$pkgdir/usr/share/doc/$pkgname/README.txt"
+
+  msg2 "Packaging binaries..."
+  install -Dm 755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/freeorion"
+  install -Dm 755 freeorion "$pkgdir/usr/bin/freeorion.elf"
+  install -Dm 755 freeorionca "$pkgdir/usr/bin/freeorionca"
+  install -Dm 755 freeoriond "$pkgdir/usr/bin/freeoriond"
+
+  msg2 "Packaging data..."
+  mkdir -p "$pkgdir/usr/share/$pkgname" "$pkgdir/usr/lib/$pkgname"
+  cp -r default "$pkgdir/usr/share/$pkgname"
+  install -Dm 644 OISInput.cfg "$pkgdir/usr/share/OISInput.cfg"
+
+  msg2 "Packaging license..."
+  install -Dm 644 default/COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+  cd "$srcdir"
+
+  msg2 "Packaging icon and shortcut..."
+  install -Dm 644 "$pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/freeorion.png"
+  install -Dm 644 "$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/freeorion.desktop"
+
+  msg2 "Packaging OGRE plugins configuration..."
+  install -Dm 644 "$srcdir/$pkgname-build/ogre_plugins.cfg" \
+    "$pkgdir/usr/share/freeorion/ogre_plugins.cfg"
+
+  msg2 "Cleaning up..."
+  find "$pkgdir" -name ".svn" -print0 | xargs -0 rm -rf
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/freeorion/freeorion.install b/community/freeorion/freeorion.install
new file mode 100644
index 000000000..ad97d7bab
--- /dev/null
+++ b/community/freeorion/freeorion.install
@@ -0,0 +1,13 @@
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/freeorion/freeorion.sh b/community/freeorion/freeorion.sh
new file mode 100644
index 000000000..d80623ab2
--- /dev/null
+++ b/community/freeorion/freeorion.sh
@@ -0,0 +1,143 @@
+#!/bin/sh
+#
+# written by Markus Sinner, http://psitronic.de
+#
+# Nightly builds on.
+# http://freeorion.psitronic.de/download/nightly/
+#
+# This is a wrapper-script for starting FreeOrion on
+# ix86 (and maybe x64) Linux Systems.
+# This script will CD into application and set some
+# enviroment variables.
+
+# ---- commandline PARAMETERS and ENVIROMENT variables -----
+# This script supports parameters, that will be evaluated
+# BEFORE freeorion binary is called and will be removed, 
+# because the binary won't support them.
+# Currently only one parameter at a time is supported!
+# Parameters other than these will be appended as command
+# line parameters to the call of the freeorion binary.
+#
+# --strace
+#   This starts freeorion using the "strace" utility. 
+#   Generates a strace logifle /tmp/freeorion.trace.
+#   Make sure it is installed on your system!
+# --gdb
+#   Runs freeorion in a gdb instance, passes the original
+#   parameters through the --args parameter of gdb
+#
+#
+# ENVIROMENT variables
+# This script supports some enviroment variables. To set them
+# either use the followin command BEFORE you execute this script.
+#    export XXXX="value"
+# This permanently set the variable in you current shell script.
+# Or you prepend the options when running this script, like this:
+#    PARAM1="hello" PARAM2="yo man" /usr/bin/freeorion.elf
+#
+# Supportet are:
+#   FO_TRACE=
+#      Use this to prepend something to calling freorion.
+#      This variables also is used internally, when --gdb or --trace
+#      appear on the command line.
+#   FO_GDB_ARGS=
+#      If you use --gbd, you should uses this env to add GDB parameters.
+#      Make sure you end this list of parameters with --args, otherwise
+#      gdb won't start. Example: FO_GDB_ARGS="-q -s fo.symbols --args"
+#   LD_LIBRARY_PATH=
+#      This is a well known env and will be honored by this script.
+#
+
+
+# ---------- STARTS HERE ---------------
+# Change into application directory
+# If this is a symlink, then we
+# need to change into the dir of symlink-target.
+if [ -h $0 ]; then
+  echo "I am Symlink. Following into my targets basedir"
+  ME=`readlink $0`
+else
+  echo "Following into my basedir"
+  ME=$0
+fi
+
+# This is important! Script won't work outside its installation dir
+ROOT=/usr/share/freeorion
+cd ${ROOT}
+echo -n "CWD: "
+pwd
+
+
+
+# Check for python. If freeorionca binary is missing it, use
+# the shipped version.
+if ldd /usr/bin/freeorionca | grep "libpython.*not found"; then
+    #echo "python2.5 missing. Using shipped version."
+    PYTHON_USE_SHIPPED=1
+else 
+    #echo "python2.5 found. Using it."
+    PYTHON_USE_SHIPPED=0
+fi
+
+# Set Python library home for loading modules
+# If no python 2.5 is detected, use shipped python 2.5
+if [ "$PYTHON_USE_SHIPPED" = "1" ]; then
+    export PYTHONHOME=/usr/lib/freeorion/python2.5
+    export PYTHONPATH=${PYTHONHOME}
+    export PYTHONDEBUG=1
+    export PYTHONVERBOSE=1
+    echo "PYTHONHOME=${PYTHONHOME}"
+    
+    export LD_LIBRARY_PATH=${PYTHONHOME}:${LD_LIBRARY_PATH}
+    export LD_PRELOAD=${PYTHONHOME}/libutil.so.1:${PYTHONHOME}/libpython2.5.so
+fi
+
+
+# Command line Parameter --gdb forces running in gdb
+# Setting FO_TRACE to gdb results in other settings, see
+# below
+if [ "$1" = "--gdb" ]; then
+    FO_TRACE="gdb"
+
+    # Don't forget to remove the param
+    shift
+fi
+
+if [ "$1" = "--strace" ]; then
+    TRACEFILE=/tmp/freeorion.trace
+    echo
+    echo "Tracing to ${TRACEFILE}"
+    echo
+    FO_TRACE="strace -f -o ${TRACEFILE}"
+
+    # Don't forget to remove the param
+    shift
+fi
+
+
+
+# Add a parameter FO_GDB_ARGS to support gdb
+# Or warn the user, if he changed FO_GDB_ARGS and has
+# forgotten to end it with --args
+if [ "$FO_TRACE" = "gdb" ]; then
+    if [ "$FO_GDB_ARGS" = "" ]; then
+	FO_GDB_ARGS="--args"
+    else
+	echo "****************************************************"
+	echo "** NOTE         NOTE         NOTE         NOTE    **"
+	echo "Running FO in gdb"
+	echo "If you use FO_GDB_ARGS on your command line, make"
+	echo "sure that you END this variabble with --args."
+	echo "Otherwise gdb will not start."
+	echo
+	echo "Type 'start' when the gdb instance has loaded!"
+	echo	
+    fi
+fi
+
+
+# Support loading libs from application/lib
+export LD_LIBRARY_PATH=./lib:${LD_LIBRARY_PATH}
+
+# Call with settings-dir to avoid conflicting installations
+${FO_TRACE} ${FO_GDB_ARGS} /usr/bin/freeorion.elf  --resource-dir ./default $@
diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD
index 0e24fe037..4975ecdc6 100644
--- a/community/freerdp/PKGBUILD
+++ b/community/freerdp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64460 2012-02-14 00:48:20Z spupykin $
+# $Id: PKGBUILD 70706 2012-05-15 10:37:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
 
 pkgname=freerdp
 pkgver=1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Free RDP client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freerdp.sourceforge.net"
@@ -19,12 +19,12 @@ source=(https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-$pkgver.tar.gz)
 md5sums=('c843185e0ff22ce8409954651718f338')
 
 build() {
-  cd "$srcdir/freerdp-$pkgver"
+  cd `find ${srcdir}/ -type d -name freerdp-\*`
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
   make
 }
 
 package() {
-  cd "$srcdir/freerdp-$pkgver"
+  cd `find ${srcdir}/ -type d -name freerdp-\*`
   make DESTDIR="${pkgdir}" install
 }
diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD
new file mode 100644
index 000000000..db11176b4
--- /dev/null
+++ b/community/gigi/PKGBUILD
@@ -0,0 +1,79 @@
+# $Id: PKGBUILD 70696 2012-05-15 08:07:41Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: fana-m <geminin@gmx.net>
+# Contributor: Andrzej Giniewicz <gginiu@gmail.com>
+# Contributor: Manuel Gaul <inkaine@hotmail.com>
+
+pkgname=gigi
+pkgver=0.8.0
+pkgrel=10
+_fixedrevision=1074
+pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL"
+url="http://gigi.sourceforge.net/"
+arch=('x86_64' 'i686')
+license=('LGPL')
+depends=('boost' 'mesa' 'libpng' 'libjpeg' 'libtiff' 'freetype2' 'ogre' 'sdl' 'ois' 'python')
+makedepends=('subversion' 'cmake' 'setconf' 'doxygen')
+conflicts=('gigi-svn' 'mesa-full')
+
+build() {
+  cd "$srcdir"
+
+  msg2 "Fetching files..."
+  if [ -d gigi/.svn ]; then
+    (cd gigi && svn up -r "$_fixedrevision")
+  else
+    svn co https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/ \
+      --config-dir ./ -r "$_fixedrevision" gigi
+  fi
+
+  rm -rf gigi-build
+  svn export gigi gigi-build
+  cd gigi-build
+
+  msg2 "Patching..."
+  sed -i 's/move_backward(/adobe::move_backward(/g' GG/adobe/vector.hpp
+  sed -i 's/__GNUC_MINOR__ <= 6/__GNUC_MINOR__ <= 999/g' GG/adobe/cmath.hpp
+  sed -i 's/insert(adobe/this->insert(adobe/g' GG/adobe/closed_hash.hpp
+
+  msg2 "Configuring..."
+  setconf cmake/GiGiOgre.pc.in prefix /usr
+  setconf cmake/GiGi.pc.in prefix /usr
+  setconf cmake/GiGiSDL.pc.in prefix /usr
+  cmake \
+    -D CMAKE_INSTALL_PREFIX="$pkgdir"/usr \
+    -D BUILD_TUTORIALS=OFF \
+    -D CPACK_GENERATOR=GiGiDevel \
+    -D CMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
+    .
+
+  msg2 "Building documentation..."
+  cd doc
+  doxygen
+  cd ..
+
+  msg2 "Compiling..."
+  make -j1
+}
+
+package() {
+  cd "$srcdir/gigi-build"
+
+  msg2 "Packaging files..."
+  make install
+
+  msg2 "Fixing documentation..."
+  mkdir -p "$pkgdir/usr/share/doc"
+  mv "$pkgdir/usr/doc" "$pkgdir/usr/share/doc/$pkgname"
+
+  for f in `find "$pkgdir/usr/share/doc" -name "dir_*.html"`; do
+    sed -i "s:$srcdir:/:g" "$f"
+  done
+
+  msg2 "Packaging license..."
+  install -Dm 644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index 938929724..f76929bc1 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69964 2012-04-27 11:53:11Z jconder $
+# $Id: PKGBUILD 70738 2012-05-16 07:55:23Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 _pkgname=gnome-settings-daemon
 pkgname=$_pkgname-updates
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Updates plugin for the GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,19 +15,9 @@ install=$_pkgname.install
 url="http://www.gnome.org"
 source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
         'systemd-fallback.patch'
-        'evironment.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=9d7ea1d0b8b90b55f916751858a210a2e02a06b6'
-        'arguments.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=00681573ad6ebeb127ec72ac61d30d69be6459f8'
-        'mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=053f48b3b1b9a3b2ab0714d470da4354735d0c4b'
-        'glist-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=214a832820f6448f07d438f6686267eaf8301dd1'
-        'mouse-mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=09c215b42312ca5bb63b215c2f95231613b3103d'
         'arch.patch')
-sha256sums=('d5d4a270ec5692cdc56a58cfb57bc7f8fa93374566912a65e78c1c3db7faf4ed'
+sha256sums=('00499118c80474981f3389ef518e2d001f1b1a3b1fb78e54859d59f3bee38ff4'
             '82b721d0e274af15ed2770052d550d3162d2d37e5e9ee5e6fcebac1ed6cb8199'
-	    '1ba33f6eadac4c54f3f08f4bce075d2bef8124f857f5af22eaee010c8d38bc3b'
-	    '884a959b334f864f75dcb4eec8c137785f587c7c2ae57906f8b4e60e04c29246'
-	    '3a3f8b2964406b9b3c85c05f25e677e8c9eaa221779b95826ffbc0474740decc'
-	    'af3bda801befdbd3d318723ae6de3aaf7df1e16bccd84e13f15b57f2dceaefcd'
-	    '43b7397e622a2c19091b3665822e9461067fb6a497b9507418a3bbb100a69e1b'
             '727ab3e8181464af32ba604b2931b77cd6d4fbf34e10bbba99bb213eb992466e')
 
 build() {
@@ -35,11 +25,6 @@ build() {
 
   patch -Np1 -i "$srcdir/arch.patch"
   patch -Np1 -i "$srcdir/systemd-fallback.patch"
-  patch -Np1 -i ../evironment.patch
-  patch -Np1 -i ../arguments.patch
-  patch -Np1 -i ../mem-leak.patch
-  patch -Np1 -i ../glist-leak.patch
-  patch -Np1 -i ../mouse-mem-leak.patch
 
   gnome-autogen.sh --prefix=/usr \
               --sysconfdir=/etc \
diff --git a/community/gnome-web-photo/PKGBUILD b/community/gnome-web-photo/PKGBUILD
index e354d0386..ee29c7b08 100644
--- a/community/gnome-web-photo/PKGBUILD
+++ b/community/gnome-web-photo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68361 2012-03-23 03:17:03Z bgyorgy $
+# $Id: PKGBUILD 70732 2012-05-15 22:59:27Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com>
 # Contributor: Adam <adam@russ.co.il>
 
 pkgname=gnome-web-photo
-pkgver=0.10.5
-pkgrel=2
+pkgver=0.10.6
+pkgrel=1
 pkgdesc="Generate full-size image files and thumbnails from HTML files and web pages"
 arch=('i686' 'x86_64')
 url="http://git.gnome.org/browse/gnome-web-photo/"
@@ -13,7 +13,7 @@ license=('LGPL')
 depends=('libwebkit3')
 makedepends=('intltool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b76a116af977e0b30ed82e50dc5c41827f257502c357eeda42347ebfabcdd7f5')
+sha256sums=('1353fc1abe9fcd38b3e09c6282e43aeb0c306201a4df9e25d4834407ba2cbe7f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 4be7ea328..ab6e73e97 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,44 +1,47 @@
-# $Id: PKGBUILD 70381 2012-05-05 13:14:13Z arodseth $
+# $Id: PKGBUILD 70799 2012-05-16 17:49:57Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Rémy Oudompheng  <remy@archlinux.org>
 # Contributor: Andres Perera <andres87p gmail>
 # Contributor: Matthew Bauer <mjbauer95@gmail.com>
-# Contributor: Christian Himpel <chressie at gmail dot com>
+# Contributor: Christian Himpel <chressie@gmail.com>
 # Contributor: Mike Rosset <mike.rosset@gmail.com>
 # Contributor: Daniel YC Lin <dlin.tw@gmail.com>
 
 pkgname=go
 pkgver=1.0.1
-pkgrel=1
+pkgrel=5
 epoch=2
 pkgdesc='Google Go compiler and tools (release version)'
 arch=('x86_64' 'i686')
 url="http://golang.org/"
 license=('custom')
-depends=('perl' 'ed' 'gawk')
+depends=('perl' 'gawk')
 makedepends=('inetutils')
 options=('!strip' '!emptydirs')
 install=go.install
 source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz"
-        "$pkgname.run"
         "$pkgname.sh")
 sha1sums=('fc8a6d6725f7f2bf7c94685c5fd0880c9b7f67f6'
-          '655754d95688294b0cf2334a1155432884f92859'
-          'a760c32cbad5a013f384a086efb3b8b8fd88794f')
+          '0e8c7edc9d788be3518367bf04bdb5ff8b6bbdcf')
 
 build() {
   cd "$srcdir/$pkgname"
 
-  export GOROOT="$srcdir/$pkgname"
-  export GOOS_FINAL="/usr/lib/go"
+  export GOROOT_FINAL="/usr/lib/go"
   export GOOS=linux
-  export GOBIN="$GOROOT/bin"
-  export PATH="$GOBIN:$PATH"
 
-  mkdir -p "$GOROOT/bin"
-  cd "$GOROOT/src"
+  cd src && bash make.bash
+}
+
+check() {
+  cd "$srcdir/$pkgname"
+
+  export GOROOT="$srcdir/$pkgname"
+  export PATH="$srcdir/$pkgname/bin:$PATH"
 
-  . ./make.bash 
+  # TestSimpleMulticastListener will fail in standard chroot.
+  cd src && bash run.bash --no-rebuild || true
 }
 
 package() {
@@ -62,33 +65,33 @@ package() {
     install -Dm644 "misc/vim/$f" "$pkgdir/usr/share/vim/vimfiles/$f"
   done
 
-  mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}}
+  mkdir -p "$pkgdir/"{etc/profile.d,usr/{share/go,lib/go,lib/go/src}}
 
-  cp -r bin $pkgdir/usr
-  cp -r doc misc -t $pkgdir/usr/share/go
-  ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc
-  cp -r pkg $pkgdir/usr/lib/go
-  cp -r $GOROOT/src/pkg $pkgdir/usr/lib/go/src/ 
-  cp -r $GOROOT/src/cmd $pkgdir/usr/lib/go/src/cmd
-  cp -r $GOROOT/src/lib9 $pkgdir/usr/lib/go/src/ 
-  cp -r $GOROOT/lib $pkgdir/usr/lib/go/ 
+  cp -r doc misc -t "$pkgdir/usr/share/go"
+  ln -s /usr/share/go/doc "$pkgdir/usr/lib/go/doc"
+  cp -r --preserve=timestamps bin "$pkgdir/usr"
+  cp -r --preserve=timestamps pkg "$pkgdir/usr/lib/go"
+  cp -r --preserve=timestamps $GOROOT/src/pkg "$pkgdir/usr/lib/go/src/"
+  cp -r --preserve=timestamps $GOROOT/src/cmd "$pkgdir/usr/lib/go/src/cmd"
+  cp -r --preserve=timestamps $GOROOT/src/lib9 "$pkgdir/usr/lib/go/src/"
+  cp -r --preserve=timestamps $GOROOT/lib "$pkgdir/usr/lib/go/"
 
-  install -Dm644 src/Make.* $pkgdir/usr/lib/go/src
+  install -Dm644 src/Make.* "$pkgdir/usr/lib/go/src"
 
   # Remove object files from target src dir
-  find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete
-  find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete
+  find "$pkgdir/usr/lib/go/src/" -type f -name '*.[ao]' -delete
+  find "$pkgdir/usr/lib/go/src/pkg" -type f -executable -delete
 
   # Headers for C modules
   install -Dm644 src/pkg/runtime/runtime.h \
-    $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h
+    "$pkgdir/usr/lib/go/src/pkg/runtime/runtime.h"
   install -Dm644 src/pkg/runtime/cgocall.h \
-    $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h
+    "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h"
 
-  install $srcdir/go.sh $pkgdir/etc/profile.d/
+  # For packages that source /etc/profile.d/go.sh
+  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
 
-  mv "$pkgdir/usr/bin/go" "$pkgdir/usr/bin/go.elf"
-  install -Dm755 "$srcdir/go.run" "$pkgdir/usr/bin/go"
+  rm -f "$pkgdir/usr/share/go/doc/articles/wiki/get.bin"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/go/go.install b/community/go/go.install
index decdeccf5..25b9690ac 100644
--- a/community/go/go.install
+++ b/community/go/go.install
@@ -14,6 +14,12 @@ post_upgrade() {
   # setting the appropriate environment variables.
   #
   ln -sf /usr/bin /usr/lib/go/bin
+
+  # Friendly message to the user
+  echo "Example use of the \"go\" tool as a user:"
+  echo "    mkdir ~/go"
+  echo "    export GOPATH=~/go"
+  echo "    go get website.com/user/module"
 }
 
 post_install() {
diff --git a/community/go/go.sh b/community/go/go.sh
index 8393dc8d2..a0109ba97 100755..100644
--- a/community/go/go.sh
+++ b/community/go/go.sh
@@ -1 +1 @@
-export GOROOT=/usr/lib/go
+export GOPATH=/usr/lib/go/site
diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD
index 8ff73274b..6b8be0415 100644
--- a/community/gsoap/PKGBUILD
+++ b/community/gsoap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64430 2012-02-13 06:18:52Z spupykin $
+# $Id: PKGBUILD 70883 2012-05-18 13:41:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tor Krill <tor@krill.nu>
 # Contributor: Lee.MaRS <leemars@gmail.com>
 
 pkgname=gsoap
-pkgver=2.8.7
+pkgver=2.8.8
 pkgrel=1
 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++"
 url="http://www.cs.fsu.edu/~engelen/soap.html"
@@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs')
 makedepends=('autoconf' 'automake')
 source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip
         LICENSE)
-md5sums=('48a8dfddffd8f10b3ca82a6a9583e206'
+md5sums=('cffb523b66eb36c51ca455645f1cfeb0'
          '27aaa3f5166db94d44044c11a7b2c37b')
 
 build() {
diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD
index 30d7ddca1..358789e62 100644
--- a/community/gtkwave/PKGBUILD
+++ b/community/gtkwave/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69361 2012-04-14 14:13:25Z kkeen $
+# $Id: PKGBUILD 70580 2012-05-12 02:21:28Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Jared Casper <jaredcasper@gmail.com>
 
 pkgname=gtkwave
-pkgver=3.3.35
+pkgver=3.3.36
 pkgrel=1
 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2')
 makedepends=('gperf')
 install='gtkwave.install'
 source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz")
-md5sums=('f7de1e24ca4e3c5396d38dc6232d1f91')
+md5sums=('a4275363369b0b7011afbaa7ec1667e6')
 
 build() {
   cd "${srcdir}/gtkwave-${pkgver}"
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index e0899ca41..b950c18df 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 70021 2012-04-28 09:24:13Z allan $
+# $Id: PKGBUILD 70590 2012-05-12 10:14:49Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: Christer Solskogen (solskogen@carebears.mine.nu)
 
 pkgname=gtranslator
-pkgver=2.91.3
-pkgrel=3
+pkgver=2.91.4
+pkgrel=1
 pkgdesc="An enhanced gettext po file editor for the GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.gnome.org/gtranslator/"
@@ -32,3 +32,4 @@ package() {
 
   make DESTDIR=${pkgdir} install
 }
+sha256sums=('af4ede1495c0c52ecc1e7bd36c8ee6ce0bb35525144d687d1ce7cb4bf6630826')
diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog
index c9b484e39..712c1cb22 100644
--- a/community/gtranslator/gtranslator.changelog
+++ b/community/gtranslator/gtranslator.changelog
@@ -1,3 +1,6 @@
+2011-10-28 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+	* gtranslator 2.91.4-1
+
 2012-04-23 Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 	* gtranslator 2.91.3-2
 	rebuild for gdl 3.4.2
diff --git a/community/guichan/PKGBUILD b/community/guichan/PKGBUILD
index fe5467a56..d948c2b66 100644
--- a/community/guichan/PKGBUILD
+++ b/community/guichan/PKGBUILD
@@ -1,31 +1,32 @@
-# $Id: PKGBUILD 57204 2011-10-23 23:29:35Z andrea $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 70598 2012-05-12 11:22:15Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Bjørn Lindeijer <bjorn@lindeijer.nl>
 
 pkgname=guichan
 pkgver=0.8.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://guichan.sourceforge.net/"
 license=('BSD')
-makedepends=('sdl_image' 'allegro' 'libgl' 'glut')
-conflicts=('guichan-sdl' 'guichan-allegro' 'guichan-opengl' 'guichan-glut')
-provides=('guichan-sdl' 'guichan-allegro' 'guichan-opengl' 'guichan-glut')
-options=(!libtool !strip)
+makedepends=('sdl_image' 'allegro4' 'libgl' 'glut')
+options=('!libtool' '!strip')
 source=(http://guichan.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('af535d7f387e774e3197cef8023ea105')
+sha256sums=('eedf206eae5201eaae027b133226d0793ab9a287bfd74c5f82c7681e3684eeab')
 
 build() {
-    cd $srcdir/$pkgname-$pkgver
-    CXXFLAGS="-g" ./configure --prefix=/usr
-    make
+  cd ${srcdir}/$pkgname-$pkgver
+
+  CXXFLAGS="-g" ./configure --prefix=/usr
+  make
 }
 
 package() {
-    cd $srcdir/$pkgname-$pkgver
-    make prefix=$pkgdir/usr install
+  cd ${srcdir}/$pkgname-$pkgver
+  
+  make prefix=${pkgdir}/usr install
 
-    # Install the license, as required for BSD
-    install -m644 -D COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+# Install the license, as required for BSD
+  install -m644 -D COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/community/hardlink/PKGBUILD b/community/hardlink/PKGBUILD
new file mode 100644
index 000000000..edf5d6973
--- /dev/null
+++ b/community/hardlink/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 70897 2012-05-18 22:12:06Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+
+pkgname=hardlink
+pkgver=0.2.0
+pkgrel=1
+pkgdesc='Replace file copies using hardlinks'
+arch=('i686' 'x86_64')
+url='http://jak-linux.org/projects/hardlink/'
+license=('custom: MIT')
+depends=('glibc' 'pcre')
+source=("http://jak-linux.org/projects/hardlink/hardlink_$pkgver.tar.gz")
+md5sums=('4c1621ee7850a1c8b316735a7bced993')
+
+build() {
+  cd $pkgname-$pkgver
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  # install icense
+  install -Dm 644 debian/copyright "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index a52740de9..54ca1c75b 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 67614 2012-03-13 14:20:23Z spupykin $
+# $Id: PKGBUILD 70872 2012-05-18 10:00:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hostapd
-pkgver=0.7.3
-pkgrel=8
+pkgver=1.0
+pkgrel=1
 pkgdesc="daemon for wireless software access points"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hostap.epitest.fi/hostapd/"
@@ -25,25 +25,19 @@ backup=('etc/hostapd/hostapd.conf'
 	'etc/hostapd/wired.conf')
 install=hostapd.install
 source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz
-	hostap_allow-linking-with-libnl-3.2.patch
 	config
 	hostapd
 	hostapd.conf.d)
-md5sums=('91a7c8d0f090b7104152d3455a84c112'
-         'e904e62b12c5d64132dd9441e8b45dce'
+md5sums=('236247a7bbd4f60d5fa3e99849d1ffc9'
          '5d7ee10b04e33f22c37be56a4c33dddb'
          'd570327c385f34a4af24d3a0d61cea19'
          'f169534b0f59b341f6df1a21e0344511')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch"
-
-  cd hostapd
+  cd "$srcdir/$pkgname-$pkgver"/hostapd
   cp "$srcdir/config" ./.config
-
   sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf
-
+  export CFLAGS="$CFLAGS `pkg-config --cflags libnl-3.0`"
   make
 }
 
diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD
index 2ec9ba308..5b24c72be 100644
--- a/community/hubbub/PKGBUILD
+++ b/community/hubbub/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 59698 2011-11-29 12:42:33Z arodseth $
+# $Id: PKGBUILD 70911 2012-05-18 23:52:08Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
+
 pkgname=hubbub
-pkgver=0.1.1
-pkgrel=2
+pkgver=0.1.2
+pkgrel=1
 pkgdesc="HTML5 compliant parsing library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netsurf-browser.org/projects/hubbub/"
 license=('MIT')
 depends=('libparserutils')
 source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz")
-md5sums=('98f49be58e228010c88381bc39f39e19')
+sha256sums=('95a1d5a71055b28a8e4ce4dc8516b8f0ed691c5ee03525bf73600495657f1b52')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/i3lock/PKGBUILD b/community/i3lock/PKGBUILD
index 761ace052..9c66826b2 100644
--- a/community/i3lock/PKGBUILD
+++ b/community/i3lock/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 68957 2012-04-06 14:24:01Z ttopper $
+# $Id: PKGBUILD 70687 2012-05-14 17:17:38Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3lock
 pkgver=2.4
-pkgrel=1
+pkgrel=3
 pkgdesc="An improved screenlocker based upon XCB and PAM"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://i3wm.org/i3lock/"
 license=('MIT')
 groups=("i3")
-depends=('xcb-util-image' 'xcb-util-keysyms' 'pam' 'libev' 'libx11')
+depends=('xcb-util-image' 'xcb-util-keysyms' 'pam' 'libev' 'cairo')
 options=('docs')
+backup=("etc/pam.d/i3lock")
 source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2")
 md5sums=('728e2654d886ef97449708f0135e9fa5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make NOLIBCAIRO=y
+  make
   gzip i3lock.1
 }
 
diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD
index 88d8d46aa..1bfc6a24e 100644
--- a/community/i3status/PKGBUILD
+++ b/community/i3status/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 70239 2012-05-02 17:41:16Z ttopper $
+# $Id: PKGBUILD 70601 2012-05-12 12:03:50Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3status
-pkgver=2.5
+pkgver=2.5.1
 pkgrel=1
 pkgdesc="Generates status bar to use with dzen2 or xmobar"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ backup=('etc/i3status.conf')
 install=i3status.install
 options=('docs')
 source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2")
-md5sums=('6c3c1d91fae1dc939a517bc3b853f65f')
+md5sums=('28c27fc0c2294e12ae6ae390f3d89973')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index bd9501371..10b0f1561 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 68868 2012-04-04 11:24:37Z stativ $
+# $Id: PKGBUILD 70885 2012-05-18 16:05:18Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=11.1.1
-_pkgver=117.117
+pkgver=11.1.2
+_pkgver=117.418
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,7 +10,7 @@ url="http://www.jetbrains.org/"
 license=('apache')
 depends=('glibc')
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('09f814cc26b6c98d6e5f0fdf2aaa293c')
+md5sums=('eae2d36d088677e1d5670986da311f85')
 
 build() {
   cd "$srcdir"
diff --git a/community/iperf/PKGBUILD b/community/iperf/PKGBUILD
new file mode 100644
index 000000000..71a359d8d
--- /dev/null
+++ b/community/iperf/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 70860 2012-05-18 02:29:56Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Dale Blount <dale@archlinux.org>
+
+pkgname=iperf
+pkgver=2.0.5
+pkgrel=5
+pkgdesc='A tool to measure maximum TCP bandwidth'
+arch=('i686' 'x86_64')
+license=('custom')
+url='http://iperf.sourceforge.net'
+depends=('gcc-libs')
+source=("http://downloads.sourceforge.net/iperf/iperf-$pkgver.tar.gz"
+        'iperf.rc'
+        'iperf.conf'
+        'iperf.service'
+        'client.cpp.patch')
+md5sums=('44b5536b67719f4250faed632a3cd016'
+         'e99dc0d41eb800970390dd149d70b544'
+         'c75cb18434c6bf19fdc89b9caa766d7d'
+         'b0c1165e21fb686e449c6bab9852be31'
+         '82ce63c87cc8bb2f0f94069857ac14a9')
+
+build() {
+  cd $pkgname-$pkgver
+  # fix FS#25159
+  patch -Np1 -i "$srcdir/client.cpp.patch"
+  ./configure --prefix=/usr \
+              --enable-ipv6 \
+              --enable-multicast \
+              --enable-threads
+  make
+}
+
+package() {
+  pushd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/iperf/LICENSE"
+  popd
+  # install initscripts
+  install -Dm755 iperf.rc "$pkgdir/etc/rc.d/iperf"
+  install -Dm644 iperf.conf "$pkgdir/etc/conf.d/iperf"
+  install -Dm644 iperf.service "$pkgdir/usr/lib/systemd/system/iperf.service"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/iperf/client.cpp.patch b/community/iperf/client.cpp.patch
new file mode 100644
index 000000000..85f89e765
--- /dev/null
+++ b/community/iperf/client.cpp.patch
@@ -0,0 +1,17 @@
+--- a/src/Client.cpp	2010-04-01 22:23:17.000000000 +0200
++++ b/src/Client.cpp	2011-07-19 11:03:42.000000000 +0200
+@@ -212,10 +212,10 @@
+     char* readAt = mBuf;
+ 
+ #if HAVE_THREAD
+-    if ( !isUDP( mSettings ) ) {
+-	RunTCP();
+-	return;
+-    }
++//    if ( !isUDP( mSettings ) ) {
++//	RunTCP();
++//	return;
++//    }
+ #endif
+     
+     // Indicates if the stream is readable 
diff --git a/community/iperf/iperf.conf b/community/iperf/iperf.conf
new file mode 100644
index 000000000..0685ff011
--- /dev/null
+++ b/community/iperf/iperf.conf
@@ -0,0 +1,7 @@
+# vim:set ts=2 sw=2 ft=sh noet:
+
+# daemon pid file
+#PIDFILE='/run/iperf.pid'
+
+# daemon options. treated as an array.
+#DAEMON_OPTS='--port 5001'
diff --git a/community/iperf/iperf.rc b/community/iperf/iperf.rc
new file mode 100644
index 000000000..617b666ad
--- /dev/null
+++ b/community/iperf/iperf.rc
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# You can use this script to run iperf as tcp and udp.
+# Copy and rename this script to /etc/rc.d/iperf-udp and copy config file to
+# /etc/conf.d/iperf-udp and add -u to daemon options
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+[[ -r /etc/conf.d/${0##*/} ]] && . /etc/conf.d/${0##*/}
+
+DAEMON=${DAEMON:-/usr/bin/iperf}
+PIDFILE=${PIDFILE:-/run/${0##*/}.pid}
+DAEMON_OPTS="--server $DAEMON_OPTS"
+
+# check pid
+[[ -r "$PIDFILE" ]] &&
+	read PID < "$PIDFILE" && [[ -n $PID ]] && kill -0 $PID &>/dev/null || unset PID
+
+case "$1" in
+	start)
+		stat_busy "Starting ${0##*/} daemon"
+		[[ -z $PID ]] &&
+			{ $DAEMON $DAEMON_OPTS </dev/null &>/dev/null & } &&
+			echo "$!" > "$PIDFILE" &&
+			disown %% &&
+			add_daemon ${0##*/} &&
+			stat_done &&
+			exit 0
+		stat_fail
+	;;
+  stop)
+		stat_busy "Stopping ${0##*/} daemon"
+		[[ -n $PID ]] && kill $PID &> /dev/null &&
+			rm_daemon ${0##*/} &&
+			rm -f "$PIDFILE" &&
+			stat_done &&
+			exit 0
+		stat_fail
+	;;
+  restart)
+		$0 stop
+		$0 start
+		exit 0
+	;;
+  *)
+		echo "usage: ${0##*/} {start|stop|restart}" >&2
+	;;
+esac
+
+exit 1
+
+# vim:set ts=2 sw=2 ft=sh noet:
diff --git a/community/iperf/iperf.service b/community/iperf/iperf.service
new file mode 100644
index 000000000..1bdcf86e9
--- /dev/null
+++ b/community/iperf/iperf.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Iperf Server
+
+[Service]
+ExecStart=/usr/bin/iperf -s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD
index ac95e6229..76c732531 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -1,17 +1,26 @@
-# $Id: PKGBUILD 62118 2012-01-16 09:00:54Z seblu $
+# $Id: PKGBUILD 70556 2012-05-11 12:51:57Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgname=ipset
-pkgver=6.11
+pkgver=6.12.1
 pkgrel=1
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64')
 url='http://ipset.netfilter.org'
 license=('GPL2')
 depends=('libmnl')
-makedepends=('linux-headers')
-source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2")
-md5sums=('bfcc92e30a0fcf10ae6e7c4affa03c84')
+backup=('etc/ipset.conf' "etc/conf.d/$pkgname")
+options=('!libtool')
+source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
+        "$pkgname.conf"
+        "$pkgname.rc"
+        "$pkgname.systemd"
+        "$pkgname.service")
+md5sums=('80df500a4d93cb14e1373ae290716cda'
+         '61963bda45c002fb37977e58bb5b829c'
+         '888bf1eadffcc076b9e97de02e2147c8'
+         'c5f38e5f3027066c1491a563e734796e'
+         'b9ff3bd7b959cb1b97b8c492b52b8377')
 
 build() {
   cd $pkgname-$pkgver
@@ -22,6 +31,20 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
+  # install doc
+  install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+  install -m644 README UPGRADE ChangeLog "$pkgdir/usr/share/doc/$pkgname"
+  # install initscripts
+  cd ..
+  install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+  install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname"
+  # install systemd service
+  install -Dm 755 $pkgname.systemd \
+    "$pkgdir/usr/lib/systemd/scripts/$pkgname"
+  install -Dm 644 $pkgname.service \
+    "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  # default config file
+  install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ipset/ipset.conf b/community/ipset/ipset.conf
new file mode 100644
index 000000000..686931f4c
--- /dev/null
+++ b/community/ipset/ipset.conf
@@ -0,0 +1,3 @@
+# vim:set ts=2 sw=2 ft=sh et:
+
+IPSET_CONF='/etc/ipset.conf'
diff --git a/community/ipset/ipset.rc b/community/ipset/ipset.rc
new file mode 100644
index 000000000..1d5f7df8b
--- /dev/null
+++ b/community/ipset/ipset.rc
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/ipset
+
+case "$1" in
+  start)
+    stat_busy 'Loading IP Sets'
+    if [[ -f $IPSET_CONF ]] && ipset restore < "$IPSET_CONF"; then
+      add_daemon ipset
+      stat_done
+    else
+      stat_fail
+    fi
+    ;;
+  stop)
+    status 'Clearing IP Sets' ipset destroy
+    rm_daemon ipset
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  save)
+    stat_busy 'Saving IP Sets'
+    if ipset save > "$IPSET_CONF" 2>/dev/null; then
+      stat_done
+    else
+      stat_fail
+    fi
+    ;;
+  *)
+    echo "usage: ${0##*/} {start|stop|restart|save}"
+esac
+exit 0
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ipset/ipset.service b/community/ipset/ipset.service
new file mode 100644
index 000000000..0e0dd4ff7
--- /dev/null
+++ b/community/ipset/ipset.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=IP Sets
+
+[Service]
+Type=oneshot
+ExecStart=/usr/lib/systemd/scripts/ipset start
+ExecStop=/usr/sbin/ipset destroy
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+Before=iptables.service
diff --git a/community/ipset/ipset.systemd b/community/ipset/ipset.systemd
new file mode 100644
index 000000000..36df5124a
--- /dev/null
+++ b/community/ipset/ipset.systemd
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+. /etc/conf.d/ipset
+
+[[ -f $IPSET_CONF ]] || exit 1
+ipset restore < "$IPSET_CONF"
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD
index 68c61dcec..93eec8d18 100644
--- a/community/kdenlive/PKGBUILD
+++ b/community/kdenlive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65323 2012-02-21 01:34:56Z spupykin $
+# $Id: PKGBUILD 70710 2012-05-15 11:27:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zuf <kontakt.zuf@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=kdenlive
-pkgver=0.8.2.1
-pkgrel=2
+pkgver=0.9
+pkgrel=1
 pkgdesc="A non-linear video editor for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdenlive.org/"
@@ -13,11 +13,15 @@ license=('GPL')
 depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz'
 	 'libqzeitgeist')
 makedepends=('automoc4' 'cmake' 'gettext' 'mesa')
+optdepends=('recordmydesktop'
+	    'dvdauthor'
+	    'mkisolinux'
+	    'xine-ui')
 install=kdenlive.install
 options=('docs')
-source=("http://downloads.sourceforge.net/kdenlive/kdenlive-${pkgver}.tar.gz"
+source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.gz
 	glu.patch)
-md5sums=('96b39531eba98c77546e7eba45a744ce'
+md5sums=('8ceb59444df9aa950fd6bc7300c4a90d'
          'fd6c5fe46419ee505c562363d41f6e9f')
 
 build() {
diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD
index f3342df96..f43f06d89 100644
--- a/community/kid3/PKGBUILD
+++ b/community/kid3/PKGBUILD
@@ -1,30 +1,28 @@
-# $Id: PKGBUILD 67670 2012-03-13 17:34:12Z lcarlier $
+# $Id: PKGBUILD 70622 2012-05-13 09:46:34Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 
 pkgname=kid3
-pkgver=2.0.1
+pkgver=2.1
 pkgrel=2
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kid3.sourceforge.net/"
 license=('GPL')
-depends=('id3lib' 'qt' 'tunepimp' 'kdelibs')
+depends=('chromaprint' 'id3lib' 'qt' 'tunepimp' 'kdelibs')
 makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl')
 options=('!makeflags')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('32c3bdf5a3f170076e46c5f3b9523f688e8ea6265d22d2264c1bcd318da9f32e')
+sha256sums=('8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225')
 
 build() {
   cd ${srcdir}
 
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
+  cmake ../${pkgname}-${pkgver} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
   make
 }
 
diff --git a/community/kid3/kid3.changelog b/community/kid3/kid3.changelog
index 824a2406a..8c440c611 100644
--- a/community/kid3/kid3.changelog
+++ b/community/kid3/kid3.changelog
@@ -1,3 +1,6 @@
+2012-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* kid3 2.1-1
+
 2011-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* kid3 2.0.1-1
 
diff --git a/community/lazarus/ChangeLog b/community/lazarus/ChangeLog
index 0a843b0ec..1e4776b1d 100644
--- a/community/lazarus/ChangeLog
+++ b/community/lazarus/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-15  BlackIkeEagle
+	* fix lazcontrols failure
+	  see: http://doublecmd.sourceforge.net/mantisbt/view.php?id=347
+	* add compiled files again
+
+2012-05-08  BlackIkeEagle
+	* fix FS#29807
+	* should not have removed Makefiles
+
 2012-04-30  BlackIkeEagle
 	* split pkgbuild
 	* lazarus (can be used for compiling)
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index f38913c75..04c191398 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70224 2012-05-02 13:40:21Z idevolder $
+# $Id: PKGBUILD 70866 2012-05-18 06:01:51Z ebelanger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Adam (byte/jra) <j_adam@web.de>
 # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
@@ -6,18 +6,27 @@
 pkgbase=lazarus
 pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt')
 pkgver=0.9.30.4
-pkgrel=2
+pkgrel=5
 url='http://www.lazarus.freepascal.org/'
 license=('GPL2' 'MPL' 'custom:LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync')
 options=('!emptydirs' '!makeflags')
-source=(http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2)
-md5sums=('ebd40cdfdfc4b66d1ced7a0d48d6da84')
+source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2"
+  'lazcontrols2.diff'
+)
+md5sums=('ebd40cdfdfc4b66d1ced7a0d48d6da84'
+  '288bca6ad5ade79deec34c3602daaaa9'
+)
 
 build() {
   cd $srcdir/${pkgbase}
 
+  ( # patch lazcontrols
+    cd components/lazcontrols
+    patch -p0 -i "$srcdir/lazcontrols2.diff"
+  )
+
   # build gtk2 ide
   make FPC=/usr/bin/fpc LCL_PLATFORM=gtk2 clean bigide
   # move gtk binaries
@@ -51,11 +60,10 @@ package_lazarus() {
     --exclude="*.rst"   --exclude=".#*" \
     --exclude="*.~*"    --exclude="*.bak" \
     --exclude="*.orig"  --exclude="*.rej" \
-    --exclude=".xvpics" --exclude="*.compiled" \
+    --exclude=".xvpics" \
     --exclude="killme*" --exclude=".gdb_hist*" \
     --exclude="debian"  --exclude="COPYING*" \
-    --exclude="*.app"   --exclude="Makefile*" \
-    --exclude="tools/install" \
+    --exclude="*.app"   --exclude="tools/install" \
     . "$pkgdir"/usr/lib/lazarus
 
   #remove some stuff, not needed or for in other package
diff --git a/community/lazarus/lazcontrols2.diff b/community/lazarus/lazcontrols2.diff
new file mode 100644
index 000000000..4748ae380
--- /dev/null
+++ b/community/lazarus/lazcontrols2.diff
@@ -0,0 +1,46 @@
+Index: Makefile.fpc
+===================================================================
+--- Makefile.fpc	(wersja 37097)
++++ Makefile.fpc	(kopia robocza)
+@@ -51,6 +51,6 @@
+         -$(DEL) $(COMPILER_UNITTARGETDIR)/lazcontrols$(PPUEXT)
+ 
+ compiled:
+-        $(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/LazControls.compiled
++        $(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/LazControls.compiled
+ 
+ all: cleartarget $(COMPILER_UNITTARGETDIR) lazcontrols$(PPUEXT) compiled
+Index: Makefile.compiled
+===================================================================
+--- Makefile.compiled	(wersja 37097)
++++ Makefile.compiled	(kopia robocza)
+@@ -1,5 +1,5 @@
+ <?xml version="1.0"?>
+ <CONFIG>
+   <Makefile Value="True"/>
+-  <Params Value=" -MObjFPC -Scghi -O1 -gl -vewnhi -l -Fu../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fi. -dLCL -dLCL%(LCL_PLATFORM)"/>
++  <Params Value=" -MObjFPC -Scghi -O1 -gl -vewnhi -l -Fu../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../packager/units/%(CPU_TARGET)-%(OS_TARGET);.;.;lib/%(CPU_TARGET)-%(OS_TARGET) -Fi. -dLCL -dLCL%(LCL_PLATFORM) lazcontrols.pas"/>
+ </CONFIG>
+Index: Makefile
+===================================================================
+--- Makefile	(wersja 37097)
++++ Makefile	(kopia robocza)
+@@ -2961,5 +2961,5 @@
+ cleartarget:
+ 	-$(DEL) $(COMPILER_UNITTARGETDIR)/lazcontrols$(PPUEXT)
+ compiled:
+-	$(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/LazControls.compiled
++	$(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/LazControls.compiled
+ all: cleartarget $(COMPILER_UNITTARGETDIR) lazcontrols$(PPUEXT) compiled
+Index: lazcontrols.lpk
+===================================================================
+--- lazcontrols.lpk	(wersja 37097)
++++ lazcontrols.lpk	(kopia robocza)
+@@ -10,6 +10,7 @@
+         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+       </SearchPaths>
+       <Other>
++        <CustomOptions Value="$(IDEBuildOptions)"/>
+         <CompilerPath Value="$(CompPath)"/>
+       </Other>
+     </CompilerOptions>
diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD
index 6a2af7230..fc9c0f46c 100644
--- a/community/libcec/PKGBUILD
+++ b/community/libcec/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 68568 2012-03-28 10:28:32Z idevolder $
+# $Id: PKGBUILD 70691 2012-05-14 21:28:54Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: Philippe Cherel <philippe.cherel@mayenne.org>
 
 pkgname=libcec
-pkgver=1.5.2
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter"
 arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ url="https://github.com/Pulse-Eight/libcec"
 license=('GPL')
 depends=('udev')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver")
-_srcfolder=Pulse-Eight-libcec-00a02d1
-sha256sums=('93990024d01da7c66e2c78ca23919fd83137f6b944a2dc82fb5cc6d58a46742f')
+_srcfolder=Pulse-Eight-libcec-e14b158
+sha256sums=('2d853df4478a9b93ef699c7038cf78a97741b1a594996d1df644f2d5e51d6969')
 options=(!libtool)
 
 build() {
diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD
index b54f06cbc..30f881397 100644
--- a/community/libcss/PKGBUILD
+++ b/community/libcss/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64859 2012-02-18 18:11:23Z arodseth $
+# $Id: PKGBUILD 70909 2012-05-18 23:49:56Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libcss
-pkgver=0.1.1
+pkgver=0.1.2
 pkgrel=1
 pkgdesc="CSS parser and selection engine"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url="http://www.netsurf-browser.org/projects/libcss/"
 license=('MIT')
 depends=('libparserutils' 'libwapcaplet')
 source=("http://www.netsurf-browser.org/projects/releases/libcss-$pkgver-src.tar.gz")
-sha256sums=('383c424c1f7134be67e22a7a633e31d47ba6b87aba835a4e73eca893aa01c0a0')
+sha256sums=('92c112a059bc5ae490392439401005b47ca5c270f891f6317b64aac738ae1f5e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libquvi/PKGBUILD b/community/libquvi/PKGBUILD
index 968433a92..d9a21c4c2 100644
--- a/community/libquvi/PKGBUILD
+++ b/community/libquvi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 66396 2012-02-24 12:56:50Z lfleischer $
+# $Id: PKGBUILD 70444 2012-05-07 08:28:44Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=libquvi
-pkgver=0.4.0
-pkgrel=3
+pkgver=0.4.1
+pkgrel=1
 pkgdesc='Library for parsing video download links.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://quvi.sourceforge.net/'
@@ -11,8 +11,9 @@ license=('LGPL')
 depends=('libquvi-scripts' 'curl' 'lua')
 conflicts=('quvi<0.4.0')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.gz")
-md5sums=('85c47035105b6b523a28793d4f6da9f1')
+source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.gz"{,.sig})
+md5sums=('a5fa8860c23655a529b3166f6e25c83a'
+         'cc7f15518f8ab2fc134bc64f0e9d584b')
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 184aa6a1f..9f1501a8b 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69468 2012-04-16 15:11:07Z spupykin $
+# $Id: PKGBUILD 70825 2012-05-17 09:48:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=0.9.11
-pkgrel=2
+pkgver=0.9.12
+pkgrel=3
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
@@ -12,8 +12,8 @@ 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' 'netcf' 'libnl1')
-makedepends=('pkgconfig' 'lvm2')
+	 'iproute2' 'netcf' 'libnl')
+makedepends=('pkgconfig' 'lvm2' 'linux-api-headers')
 optdepends=('bridge-utils: for briged networking (default)'
 	    'dnsmasq: for NAT/DHCP for guests'
 	    'kvm'
@@ -35,18 +35,14 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd-guests.rc.d
 	libvirtd-guests.conf.d
 	openbsd-netcat-default.patch
-	unixperms.patch
-	yajl-2.x.patch
-	"libvirt-qemu-ssh-user.patch::http://libvirt.org/git/?p=libvirt.git;a=patch;h=4eb1c2560d1ab8bae620788d343e9e7b32ddc066")
-md5sums=('6e9fab115075a8fd21d9bd0d7e558a52'
+	libvirt-libnl3.patch)
+md5sums=('5e842bc55733ceba60c64767580ff3e4'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '8297b1be794a24cc77f66af9380ace59'
          'bc2971dacdbac967fc3474e50affc345'
          'b0be50eb9dfe4d133decf23b60880f7d'
-         'db95aecdf2ccf3693fef5821cdcb7eba'
-         '5745bb8d0b254abb7a3528c66e03b0f9'
-         '40f6ad1d227ae2c41b4a83f7a3165ffb')
+         'ba27fbcd989de8d84cfff98326f10c54')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -58,13 +54,12 @@ build() {
     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
-  [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/libvirt-qemu-ssh-user.patch
+
+  patch -Np1 -i ${srcdir}/libvirt-libnl3.patch
+  aclocal
+  automake --add-missing || true
+  autoreconf
 
   export LDFLAGS=-lX11
   export RADVD=/usr/sbin/radvd
diff --git a/community/libvirt/libvirt-libnl3.patch b/community/libvirt/libvirt-libnl3.patch
new file mode 100644
index 000000000..1e5f141b9
--- /dev/null
+++ b/community/libvirt/libvirt-libnl3.patch
@@ -0,0 +1,111 @@
+diff -wbBur libvirt-0.9.12/configure.ac libvirt-0.9.12.my/configure.ac
+--- libvirt-0.9.12/configure.ac	2012-05-14 06:15:40.000000000 +0400
++++ libvirt-0.9.12.my/configure.ac	2012-05-17 13:18:22.000000000 +0400
+@@ -71,7 +71,7 @@
+ LIBCURL_REQUIRED="7.18.0"
+ OPENWSMAN_REQUIRED="2.2.3"
+ LIBPCAP_REQUIRED="1.0.0"
+-LIBNL_REQUIRED="1.1"
++LIBNL_REQUIRED="3.2"
+ LIBSSH2_REQUIRED="1.0"
+ LIBBLKID_REQUIRED="2.17"
+ DBUS_REQUIRED="1.0.0"
+@@ -2652,21 +2652,9 @@
+     PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [
+         have_libnl=yes
+         AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-3.0])
+-        AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is available])
+         PKG_CHECK_MODULES([LIBNL_ROUTE3], [libnl-route-3.0])
+         LIBNL_CFLAGS="$LIBNL_CFLAGS $LIBNL_ROUTE3_CFLAGS"
+         LIBNL_LIBS="$LIBNL_LIBS $LIBNL_ROUTE3_LIBS"
+-    ], [PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [
+-            have_libnl=yes
+-            AC_DEFINE_UNQUOTED([HAVE_LIBNL], [1],
+-             [whether the netlink library is available])
+-            AC_DEFINE_UNQUOTED([HAVE_LIBNL1], [1],
+-             [whether the netlink v1 library is available])
+-        ], [
+-            if test "$with_macvtap" = "yes"; then
+-                AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support])
+-            fi
+-        ])
+     ])
+ fi
+ AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"])
+diff -wbBur libvirt-0.9.12/daemon/Makefile.am libvirt-0.9.12.my/daemon/Makefile.am
+--- libvirt-0.9.12/daemon/Makefile.am	2012-04-20 08:25:25.000000000 +0400
++++ libvirt-0.9.12.my/daemon/Makefile.am	2012-05-17 13:18:22.000000000 +0400
+@@ -96,6 +96,7 @@
+ 	$(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \
+ 	$(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \
+ 	$(WARN_CFLAGS) \
++	$(LIBNL_CFLAGS) \
+ 	$(COVERAGE_CFLAGS) \
+ 	-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \
+ 	-DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\""
+diff -wbBur libvirt-0.9.12/src/Makefile.am libvirt-0.9.12.my/src/Makefile.am
+--- libvirt-0.9.12/src/Makefile.am	2012-05-05 16:53:48.000000000 +0400
++++ libvirt-0.9.12.my/src/Makefile.am	2012-05-17 13:18:22.000000000 +0400
+@@ -16,6 +16,7 @@
+ 
+ AM_CFLAGS =	$(DRIVER_MODULE_CFLAGS)				\
+ 		$(LIBXML_CFLAGS)				\
++                $(LIBNL_CFLAGS)                                 \
+ 		$(WARN_CFLAGS)					\
+ 		$(LOCK_CHECKING_CFLAGS)				\
+ 		$(WIN32_EXTRA_CFLAGS)				\
+diff -wbBur libvirt-0.9.12/src/util/virnetdevmacvlan.c libvirt-0.9.12.my/src/util/virnetdevmacvlan.c
+--- libvirt-0.9.12/src/util/virnetdevmacvlan.c	2012-05-09 05:21:54.000000000 +0400
++++ libvirt-0.9.12.my/src/util/virnetdevmacvlan.c	2012-05-17 13:25:21.000000000 +0400
+@@ -27,6 +27,10 @@
+ 
+ #include <config.h>
+ 
++#include <netlink/msg.h>
++#include <linux/rtnetlink.h>
++#include <linux/if_link.h>
++
+ #include "virnetdevmacvlan.h"
+ #include "virmacaddr.h"
+ #include "util.h"
+diff -wbBur libvirt-0.9.12/src/util/virnetdevvportprofile.c libvirt-0.9.12.my/src/util/virnetdevvportprofile.c
+--- libvirt-0.9.12/src/util/virnetdevvportprofile.c	2012-05-09 05:21:54.000000000 +0400
++++ libvirt-0.9.12.my/src/util/virnetdevvportprofile.c	2012-05-17 13:27:54.000000000 +0400
+@@ -22,6 +22,10 @@
+ 
+ #include <config.h>
+ 
++#include <netlink/msg.h>
++#include <linux/rtnetlink.h>
++#include <linux/if_link.h>
++
+ #include "virnetdevvportprofile.h"
+ #include "virterror_internal.h"
+ 
+diff -wbBur libvirt-0.9.12/src/util/virnetlink.c libvirt-0.9.12.my/src/util/virnetlink.c
+--- libvirt-0.9.12/src/util/virnetlink.c	2012-05-09 16:41:41.000000000 +0400
++++ libvirt-0.9.12.my/src/util/virnetlink.c	2012-05-17 13:38:08.000000000 +0400
+@@ -49,7 +49,7 @@
+ 
+ #define NETLINK_ACK_TIMEOUT_S  2
+ 
+-#if defined(__linux__) && defined(HAVE_LIBNL)
++#if defined(__linux__) && defined(HAVE_LIBNL3)
+ /* State for a single netlink event handle */
+ struct virNetlinkEventHandle {
+     int watch;
+diff -wbBur libvirt-0.9.12/src/util/virnetlink.h libvirt-0.9.12.my/src/util/virnetlink.h
+--- libvirt-0.9.12/src/util/virnetlink.h	2012-05-09 05:21:54.000000000 +0400
++++ libvirt-0.9.12.my/src/util/virnetlink.h	2012-05-17 13:27:37.000000000 +0400
+@@ -23,9 +23,10 @@
+ # include "config.h"
+ # include "internal.h"
+ 
+-# if defined(__linux__) && defined(HAVE_LIBNL)
++# if defined(__linux__) && defined(HAVE_LIBNL3)
+ 
+ #  include <netlink/msg.h>
++#  include <stdint.h>
+ 
+ # else
+ 
diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD
index 088b2800e..32ad0c148 100644
--- a/community/libwapcaplet/PKGBUILD
+++ b/community/libwapcaplet/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 64868 2012-02-18 18:47:16Z arodseth $
+# $Id: PKGBUILD 70913 2012-05-18 23:56:14Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libwapcaplet
-pkgver=0.1.0
-pkgrel=3
+pkgver=0.1.1
+pkgrel=1
 pkgdesc="String internment library with rapid string comparison"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netsurf-browser.org/projects/libwapcaplet/"
 license=('MIT')
 source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz")
-sha256sums=('e58df9d4ee18344946d5c7c17fb99f29269027dafd875e2fe10bb1fb9d7fc1a7')
+sha256sums=('cf05159d7d515523697ce07228cff6a6339dc6bdcfec3e02e3b72d8b773f5258')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver-src"
+  cd "$srcdir/$pkgname-$pkgver"
   
   make PREFIX=/usr COMPONENT_TYPE="lib-shared" 
   make PREFIX=/usr COMPONENT_TYPE="lib-static"
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver-src"
+  cd "$srcdir/$pkgname-$pkgver"
   
   make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" 
   make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
diff --git a/community/libzrtpcpp/PKGBUILD b/community/libzrtpcpp/PKGBUILD
index 2166c1919..4750b60b1 100644
--- a/community/libzrtpcpp/PKGBUILD
+++ b/community/libzrtpcpp/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 66224 2012-02-23 03:37:26Z spupykin $
+# $Id: PKGBUILD 70716 2012-05-15 11:42:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor:
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Michel Brabants <michel.brabants@euphonynet.be>
 
 pkgname=libzrtpcpp
-pkgver=1.4.2
-pkgrel=6
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="An extension to Real-time Transport Protocol (RTP) which describes a method of Diffie-Hellman key agreement for Secure Real-time Transport Protocol (SRTP)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://zfoneproject.com"
 license=('GPL')
-depends=('ccrtp')
-makedepends=('pkgconfig')
+depends=('ccrtp' 'ucommon')
+makedepends=('pkgconfig' 'cmake')
 options=('!libtool')
 source=(ftp://ftp.gnu.org/gnu/ccrtp/$pkgname-$pkgver.tar.gz)
-md5sums=('2360f0f8dc0ddab3e1691ee146c4b92e')
-md5sums=('2360f0f8dc0ddab3e1691ee146c4b92e')
+md5sums=('dc1501e7e8a46a1608fc3820c7476727')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  sed -i 's|lib64|lib|g' CMakeLists.txt
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
   make
 }
 
diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD
index 838c1ce36..ec9f3c8e1 100644
--- a/community/linphone/PKGBUILD
+++ b/community/linphone/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 66218 2012-02-23 03:32:14Z spupykin $
+# $Id: PKGBUILD 70717 2012-05-15 11:51:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=linphone
 pkgver=3.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A Voice-over-IP phone"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/index.php/eng"
 license=('GPL')
 depends=('alsa-lib' 'ffmpeg' 'gtk2' 'libexosip2' 'speex' 'libv4l' 'libglade' 'v4l-utils'
-	 'libpulse' 'libxv' 'mediastreamer' 'ortp')
+	 'libpulse' 'libxv' 'mediastreamer' 'ortp' 'libzrtpcpp')
 makedepends=('pkgconfig' 'perlxml' 'intltool' 'sgmltools-lite')
 optdepends=('pulseaudio')
 options=('!libtool' '!emptydirs')
@@ -24,7 +24,9 @@ build() {
   ./configure --prefix=/usr --disable-static --enable-ipv6 --enable-video \
 	--enable-alsa --enable-pulseaudio --disable-artsc --disable-strict \
 	--libexecdir=/usr/lib/$pkgname \
-	--enable-external-mediastreamer --enable-external-ortp
+	--enable-external-mediastreamer \
+	--enable-external-ortp \
+	--enable-zrtp
   make
 }
 
diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD
index 8e1f0b122..7a9480d86 100644
--- a/community/luajit/PKGBUILD
+++ b/community/luajit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 67115 2012-03-04 14:30:22Z bpiotrowski $
+# $Id: PKGBUILD 70509 2012-05-09 20:30:54Z bpiotrowski $
 # Maintainer:  Chris Brannon <chris@the-brannons.com>
 # Maintainer:  Bartłomiej Piotrowski 
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Anders Bergh <anders1@gmail.com>
 
 pkgname=luajit 
-pkgver=2.0.0b9
+pkgver=2.0.0b10
 pkgrel=1
 pkgdesc="A Just-In-Time Compiler for Lua"
 arch=('i686' 'x86_64')
@@ -13,18 +13,15 @@ url="http://luajit.org/"
 license=('MIT')
 depends=('gcc-libs') 
 source=("http://luajit.org/download/LuaJIT-${pkgver/b/-beta}.tar.gz"
-        "http://luajit.org/download/beta${pkgver: -1}_hotfix1.patch"
         'luaconf.patch'
         'Makefile.patch')
-md5sums=('e7e03e67e2550817358bc28b44270c6d'
-         '4920f04fcef1ce486891509faf26b4f1'
+md5sums=('ed66689b96f7ad7bfeffe0b4ff2d63d4'
          'c8da9c6790e20a12a0e2496f438d9dc3'
          '8997c5e5fa4f6e8e0b86cc6b888de631')
 
 build() { 
   cd "$srcdir/LuaJIT-${pkgver/b/-beta}"
 
-  patch -Np1 -i "$srcdir/beta${pkgver: -1}_hotfix1.patch"
   patch -Np0 -i "$srcdir/luaconf.patch"
   patch -Np0 -i "$srcdir/Makefile.patch"
 
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index 10c69a84f..f47ddd09a 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68758 2012-04-01 15:10:08Z bpiotrowski $
+# $Id: PKGBUILD 70485 2012-05-09 14:58:36Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=9
+pkgrel=10
 pkgdesc="Lightweight Display Manager (part of LXDE)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lxdm/"
@@ -19,18 +19,22 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
         'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
 source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
         glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch
-        lxdm-daemon lxdm-pam)
+        greeter-session.patch lxdm-daemon lxdm-pam)
 md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
          'a1e3c46a8bef691bc544028f5b6cfe22'
          'baed9055e8825a5511712bc095197519'
          'c50dd01b715b0a236407d48066191601'
          'd2e4a4a22ee2aa1a986be154c647b6c6'
+         '28475239d0c8b4fd778ec49f5ec72962'
          '705f394052fdd0dec22e95321d170de0'
          'b20fe3c8487a039050986d60e45233a9')
 
 build() {
   	cd $srcdir/$pkgname-$pkgver
+
   	patch -Np1 -i $srcdir/glib2-2.32.0.patch
+    patch -Np1 -i $srcdir/greeter-session.patch
+
     ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm
 	make
   	
diff --git a/community/lxdm/greeter-session.patch b/community/lxdm/greeter-session.patch
new file mode 100644
index 000000000..f3b94a57a
--- /dev/null
+++ b/community/lxdm/greeter-session.patch
@@ -0,0 +1,13 @@
+diff --git a/src/greeter.c b/src/greeter.c
+index c0c150d..1f6b88e 100644
+--- a/src/greeter.c
++++ b/src/greeter.c
+@@ -114,7 +114,7 @@ static char *get_session_exec(void)
+ 	GtkTreeModel* model;
+ 	GtkTreeIter it;
+ 	gchar *res;
+-	if(!lang)
++	if(!sessions)
+ 		return g_strdup("");
+ 	
+ 	if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it))
diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD
index d098d45df..3c4cc47c2 100755
--- a/community/mathomatic/PKGBUILD
+++ b/community/mathomatic/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70112 2012-04-29 22:28:19Z ttopper $
+# $Id: PKGBUILD 70548 2012-05-11 05:36:19Z ttopper $
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Maintainer:  Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=mathomatic
-pkgver=15.8.3
+pkgver=15.8.4
 pkgrel=1
 pkgdesc="General purpose Computer Algebra System written in C"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial'
             'm4: for complex operations using the matho script' 
             'gnuplot: for plotting')
 source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2)
-md5sums=('df4296e27840ecafe87f16ff9cf181ac')
+md5sums=('9b58f8221e76a80f847f31a67bf01401')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index 8e1242d7b..64fdaf822 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 69842 2012-04-24 15:19:18Z bpiotrowski $
+# $Id: PKGBUILD 70793 2012-05-16 17:08:50Z bpiotrowski $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: rabyte <rabyte.at.gmail.dot.com>
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
 # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 
 pkgname=midori
-pkgver=0.4.5
-pkgrel=2
+pkgver=0.4.6
+pkgrel=1
 pkgdesc="Lightweight web browser based on Gtk WebKit"
 arch=('x86_64' 'i686')
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -16,10 +16,8 @@ depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-util
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
 optdepends=('vala: for use in extensions')
 options=('!emptydirs')
-source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-        0001-Fix-libsoup-version-check-defines.patch)
-sha256sums=('7b57cf3ebb56eef586351f2ae9f71ec9683aedff0b79a071b70b811d9876ff84'
-            '0095c23247c62b6a4b3ab4312f68b49e2d0974ce3fd701a2ce0114817c7bd399')
+source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,9 +26,6 @@ build() {
   export PYTHON=/usr/bin/python2
   sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
   
-  # FS#29468
-  patch -Np1 -i "$srcdir"/0001-Fix-libsoup-version-check-defines.patch
-
   ./configure \
     --prefix=/usr \
     --jobs=${MAKEFLAGS/-j/} \
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index 2114d29e5..03af311c7 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70262 2012-05-03 10:11:50Z spupykin $
+# $Id: PKGBUILD 70495 2012-05-09 17:17:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=minidlna
 pkgver=1.0.24
-pkgrel=3
+pkgrel=4
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/minidlna/"
@@ -28,6 +28,7 @@ md5sums=('be9b4c91e3fcde592dc3f9828098ca0f'
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh
   make
 }
 
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 9e48f12f3..042d07fbc 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 69293 2012-04-12 17:54:48Z tdziedzic $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# $Id: PKGBUILD 70656 2012-05-14 04:57:10Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Mathias Stearn <mathias@10gen.com>
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.0.4
-pkgrel=4
+pkgver=2.0.5
+pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mongodb.org'
@@ -21,7 +22,7 @@ source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
         'mongodb.conf'
         '0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch'
         '0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch')
-md5sums=('099bc701a3d190a040123c58958e8f67'
+md5sums=('06cf5fb887dbbddd70a29c0af08aad4f'
          '9c67e00f4626ad761a8f7d4e037a54d7'
          '4839fe1d638187ca3226e8267b947318'
          'fdbf06b005b3a73a2b6caca257ec8f64'
@@ -35,8 +36,8 @@ build() {
   # 0001 suggested to backport along with 0002
   # 0002 backported for https://jira.mongodb.org/browse/SERVER-5358
   #      also fixes https://bugs.archlinux.org/task/29050
-  patch -Np1 -i ${srcdir}/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
-  patch -Np1 -i ${srcdir}/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
+  #patch -Np1 -i ${srcdir}/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
+  #patch -Np1 -i ${srcdir}/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
 
   # fix python name for smoke tests
   #sed \
diff --git a/community/mosh/PKGBUILD b/community/mosh/PKGBUILD
new file mode 100644
index 000000000..49a766641
--- /dev/null
+++ b/community/mosh/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Christian Neukirchen <chneukirchen@gmail.com>
+# Contributor: Thomas Weißschuh <thomas_weissschuh lavabit.com>
+
+pkgname=mosh
+pkgver=1.2
+pkgrel=1
+pkgdesc='Mobile shell, surviving disconnects with local echo and line editing'
+arch=('x86_64' 'i686')
+url="http://mosh.mit.edu/"
+license=('GPL3')
+depends=('protobuf' 'ncurses' 'zlib' 'openssh' 'perl' 'perl-io-tty')
+#optdepends=('libutempter: record of session in {u,t}wmp (recompile mosh afterwards)')
+conflicts=('mosh-git')
+source=("$pkgname-$pkgver.tgz::https://nodeload.github.com/keithw/mosh/tarball/master")
+sha1sums=('690e301560808f13a8a7b19bd7740d81fecac262')
+
+build() {
+  cd "$srcdir/keithw-mosh-"*
+
+  ./autogen.sh
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/keithw-mosh-"*
+
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/mp3splt-gtk/PKGBUILD b/community/mp3splt-gtk/PKGBUILD
index 67c31d429..47a33bfe0 100644
--- a/community/mp3splt-gtk/PKGBUILD
+++ b/community/mp3splt-gtk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 66640 2012-02-26 16:44:34Z jlichtblau $
+# $Id: PKGBUILD 70795 2012-05-16 17:11:55Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=mp3splt-gtk
-pkgver=0.7.1
+pkgver=0.7.2
 pkgrel=1
 pkgdesc="Split mp3 and ogg files without decoding"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz \
         $pkgname.desktop)
-sha256sums=('b3f54a62dae55cfabab7aff3ae2f5627093dee27675635b04b425f3214bcdd62'
+sha256sums=('58d2e562b004bc99ad206b4a6726126d170dc9093a35689888b010fe663be23a'
             'a50dd43c28a723c824d658b9468ff3719dcc302c57ecb3b122124e63c20800ed')
 
 build() {
diff --git a/community/mp3splt-gtk/mp3splt-gtk.changelog b/community/mp3splt-gtk/mp3splt-gtk.changelog
index c5e4dadc6..50b711d96 100644
--- a/community/mp3splt-gtk/mp3splt-gtk.changelog
+++ b/community/mp3splt-gtk/mp3splt-gtk.changelog
@@ -1,3 +1,6 @@
+2012-05-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* mp3splt-gtk O.7.2-1
+
 2012-02-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* mp3splt-gtk O.7.1-1
 
diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD
index 96a95a43b..d933da1aa 100644
--- a/community/myodbc/PKGBUILD
+++ b/community/myodbc/PKGBUILD
@@ -1,31 +1,33 @@
-# $Id: PKGBUILD 70209 2012-05-02 12:44:37Z spupykin $
+# $Id: PKGBUILD 70836 2012-05-17 14:29:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=myodbc
 pkgver=5.1.11
-pkgrel=1
+pkgrel=3
 pkgdesc="ODBC driver/connector for MySQL"
 arch=(i686 x86_64 'mips64el')
 url="http://dev.mysql.com/downloads/connector/odbc/"
 depends=('unixodbc' 'libmysqlclient')
+makedepends=('cmake')
 license=('GPL')
 options=('libtool')
-source=("http://mysql.skynet.be/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-$pkgver-src.tar.gz"
-	myconf.h.in)
-md5sums=('1d868f404038bbce6623a28255c8a9f7'
-         '6c99c83e309b18d15ef0f07f0b461241')
+source=("http://mysql.skynet.be/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-$pkgver-src.tar.gz")
+md5sums=('1d868f404038bbce6623a28255c8a9f7')
 
 build() {
   cd $srcdir/mysql-connector-odbc-${pkgver}-src
-  cp $srcdir/myconf.h.in driver/myconf.h.in
-  [ -x configure ] || { aclocal; libtoolize; automake --add-missing; autoreconf; }
-  [ -f Makefile ] || CFLAGS="$CFLAGS -DTHREAD" \
-	./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr --with-odbc-ini=/etc/odbc.ini \
-		--with-mysql-path=/usr --without-x --disable-gui --disable-test
+  unset LDFLAGS
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_UNIXODBC=1 .
   make
 }
 
 package() {
   cd $srcdir/mysql-connector-odbc-${pkgver}-src
   make DESTDIR=$pkgdir install
+  pushd $pkgdir/usr
+  rm -rf test
+  install -dm0755 share/mysql-connector-odbc
+  mv ChangeLog COPYING INSTALL Licenses_for_Third-Party_Components.txt README README.debug \
+	share/mysql-connector-odbc/
+  popd
 }
diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index af1a3aabb..984be7fad 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69346 2012-04-14 12:26:30Z jconder $
+# $Id: PKGBUILD 70479 2012-05-09 10:48:34Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -14,7 +14,7 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
 pkgver=0.25
-pkgrel=2
+pkgrel=3
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mythtv.org"
@@ -25,14 +25,17 @@ makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif'
 	     'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath'
 	     'python2-oauth' 'python-imaging' 'python-pycurl' 'taglib' 'zlib')
 source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2"
+        'php54.patch'
         'mtd.rc')
 md5sums=('b3f2768372a38e92ca94841519daa05e'
+         '7a114c1b5a84ab5ee190e63cc9514086'
          '476c12ba074794ad7f4ae092bdf949d6')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
   find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
+  patch -d 'mythweb' -Np0 -i "$srcdir/php54.patch"
   sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php'
   sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp'
 
@@ -115,18 +118,19 @@ package_mythplugins-mythweb() {
   depends=('mythtv')
   optdepends=('lighttpd'
               'php-apache')
+  install='mythplugins-mythweb.install'
 
-  mkdir -p "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions}
-  cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/srv/http/mythweb"
-  chown -R http:http "$pkgdir/srv/http/mythweb"
-  chmod g+rw "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions}
+  mkdir -p "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
+  cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/var/lib/mythtv/mythweb"
+  chown -R http:http "$pkgdir/var/lib/mythtv/mythweb"
+  chmod g+rw "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
 }
 
 package_mythplugins-mythzoneminder() {
   pkgdesc="View CCTV footage from zoneminder in MythTV"
   depends=('mythtv')
-
   install='mythplugins-mythzoneminder.install'
+
   cd "$srcdir/$pkgbase-$pkgver/mythzoneminder"
   make INSTALL_ROOT="$pkgdir" install
 }
diff --git a/community/mythplugins/mythplugins-mythweb.install b/community/mythplugins/mythplugins-mythweb.install
new file mode 100644
index 000000000..2c626c538
--- /dev/null
+++ b/community/mythplugins/mythplugins-mythweb.install
@@ -0,0 +1,4 @@
+post_upgrade() {
+  echo "MythWeb files are now in /var/lib/mythtv/mythweb"
+  echo "Please update your server configuration accordingly"
+}
diff --git a/community/mythplugins/php54.patch b/community/mythplugins/php54.patch
new file mode 100644
index 000000000..afbe8f953
--- /dev/null
+++ b/community/mythplugins/php54.patch
@@ -0,0 +1,35 @@
+*** includes/sorting.php.old	2011-04-03 06:05:31.000000000 -0500
+--- includes/sorting.php	2012-03-27 05:05:51.000000000 -0500
+***************
+*** 123,129 ****
+      function by_user_choice(&$a, &$b) {
+          foreach ($GLOBALS['user_sort_choice'] as $sort) {
+              $function = 'by_'.$sort['field'];
+!             $response = $function(&$a, &$b);
+          // Identical response, go on to the next sort choice
+              if (!$response)
+                  continue;
+--- 123,129 ----
+      function by_user_choice(&$a, &$b) {
+          foreach ($GLOBALS['user_sort_choice'] as $sort) {
+              $function = 'by_'.$sort['field'];
+!             $response = $function($a, $b);
+          // Identical response, go on to the next sort choice
+              if (!$response)
+                  continue;
+*** modules/tv/tmpl/default/schedules.php.old	2011-04-03 06:05:31.000000000 -0500
+--- modules/tv/tmpl/default/schedules.php	2012-03-27 05:37:40.000000000 -0500
+***************
+*** 90,95 ****
+--- 90,100 ----
+  </tr>
+  </thead>
+  <?php
++         // Hack:  Disable warnings about "Creating default
++         // object from empty value" from below line
++         // "$schedule->channel->name = '[ '.t('Any').' ]';"
++         ini_set('error_reporting', E_ERROR);
++ 
+          $prev_group = '';
+          $cur_group  = '';
+          foreach ($the_schedules as $schedule) {
diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD
index 0383ca4da..9c26ba270 100644
--- a/community/netcf/PKGBUILD
+++ b/community/netcf/PKGBUILD
@@ -1,26 +1,32 @@
-# $Id: PKGBUILD 66320 2012-02-23 14:03:54Z allan $
+# $Id: PKGBUILD 70813 2012-05-16 21:38:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com>
 
 pkgname=netcf
-pkgver=0.1.7
-pkgrel=3
+pkgver=0.1.9
+pkgrel=2
 pkgdesc="A library for configuring network interfaces"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="https://fedorahosted.org/netcf/"
-depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl1')
+depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl')
 makedepends=('gcc')
 options=(!libtool)
 source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz"
-        netcf-0.1.7.patch)
-md5sums=('8e313b623c907eb035cf3948b71fecc2'
-         '0e88ee6813219e9e75a943444fe439f5')
+	"netcf-libnl3.patch::https://bugs.archlinux.org/task/29908?getfile=8775")
+md5sums=('4d62010a79d56c12438969da9035b63c'
+         'a509be4b819f669fac21e1eaa621e3e0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/netcf-0.1.7.patch
-  ./configure --prefix=/usr --disable-static
+  patch -Np1 -i ${srcdir}/netcf-libnl3.patch
+  aclocal
+  automake --add-missing || true
+  autoreconf
+#  CFLAGS="`pkg-config --cflags libnl-3.0` -DRTNL_LINK_NOT_FOUND=-1"
+  CFLAGS="-DNETCF_TRANSACTION=\"true\"" ./configure --prefix=/usr \
+	--disable-static \
+	--with-init-script=none
   make
 }
 
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 0dfeed59c..f8a6ba84f 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 70343 2012-05-04 22:20:32Z tdziedzic $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# $Id: PKGBUILD 70788 2012-05-16 16:52:49Z bpiotrowski $
+# Maintainer:  Nartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
 # Contributor: Dongsheng Cai <dongsheng at moodle dot com>
@@ -7,7 +8,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.6.17
+pkgver=0.6.18
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +19,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('55641d5d280cdd4e0c030c203107599d')
+md5sums=('4a3d3123ccc7b9b21c1990fe074e3d14')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD
new file mode 100644
index 000000000..b493ea4c0
--- /dev/null
+++ b/community/onboard/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=onboard
+pkgver=0.97.1
+pkgrel=1
+pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/onboard"
+license=('GPL')
+depends=('python2-cairo' 'dbus-python' 'python2-gobject' 'libwnck3' 'python2-virtkey' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('python-distutils-extra')
+optdepends=('at-spi2-atk: auto-show when editing text'
+            'mousetweaks: hover click with mouse')
+options=('!emptydirs')
+install=$pkgname.install
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
+md5sums=('065dcdf89d5fe145ad7876c5721c0df5')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  sed -i 's/\"python\"/\"python2\"/g' scripts/sokSettings.py
+
+  python2 setup.py install --root=$pkgdir/ --optimize=1
+}
+
+package() {
+  cd "$pkgdir"
+
+  find . -type f -name *.py | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+}
diff --git a/community/onboard/fix_encoding_mismatch.patch b/community/onboard/fix_encoding_mismatch.patch
new file mode 100644
index 000000000..01750598c
--- /dev/null
+++ b/community/onboard/fix_encoding_mismatch.patch
@@ -0,0 +1,187 @@
+Subject: Fix string encodings so as to not have a mismatch without mousetweaks
+Author: marmuta
+Origin: upstream, http://bazaar.launchpad.net/~onboard/onboard/0.91/revision/764
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/958385
+
+---
+ Onboard/Config.py      |    9 +++++----
+ Onboard/ConfigUtils.py |    9 ++++++---
+ Onboard/Exceptions.py  |    5 +++--
+ Onboard/OnboardGtk.py  |    5 +++--
+ Onboard/settings.py    |    7 ++++---
+ Onboard/utils.py       |   16 ++++++++++++++++
+ 6 files changed, 37 insertions(+), 14 deletions(-)
+
+Index: onboard-0.97.0/Onboard/Config.py
+===================================================================
+--- onboard-0.97.0.orig/Onboard/Config.py
++++ onboard-0.97.0/Onboard/Config.py
+@@ -12,7 +12,7 @@
+ 
+ from gi.repository import GLib, Gtk
+ 
+-from Onboard.utils        import show_confirmation_dialog, Version
++from Onboard.utils        import show_confirmation_dialog, Version, unicode_str
+ from Onboard.WindowUtils  import Handle
+ from Onboard.ConfigUtils  import ConfigObject
+ from Onboard.MouseControl import Mousetweaks, ClickMapper
+@@ -209,7 +209,7 @@
+         try:
+             ConfigObject.__init__(self)
+         except SchemaError as e:
+-            _logger.error(str(e))
++            _logger.error(unicode_str(e))
+             sys.exit()
+ 
+         # init paths
+@@ -225,7 +225,8 @@
+             try:
+                 copytree(old_user_dir, user_dir)
+             except OSError as ex: # python >2.5
+-                _logger.error(_("Failed to migrate user directory. ") + str(ex))
++                _logger.error(_("Failed to migrate user directory. ") + \
++                              unicode_str(ex))
+ 
+         # Load system defaults (if there are any, not required).
+         # Used for distribution specific settings, aka branding.
+@@ -347,7 +348,7 @@
+             self.mousetweaks = Mousetweaks()
+             self.children.append(self.mousetweaks)
+         except (SchemaError, ImportError) as e:
+-            _logger.warning(str(e))
++            _logger.warning(unicode_str(e))
+             self.mousetweaks = None
+ 
+         self.clickmapper = ClickMapper()
+Index: onboard-0.97.0/Onboard/ConfigUtils.py
+===================================================================
+--- onboard-0.97.0.orig/Onboard/ConfigUtils.py
++++ onboard-0.97.0/Onboard/ConfigUtils.py
+@@ -22,7 +22,8 @@
+ from gi.repository import Gio
+ 
+ from Onboard.Exceptions import SchemaError
+-from Onboard.utils import pack_name_value_list, unpack_name_value_list
++from Onboard.utils import pack_name_value_list, unpack_name_value_list, \
++                          unicode_str
+ 
+ _CAN_SET_HOOK       = "_can_set_"       # return true if value is valid
+ _GSETTINGS_GET_HOOK = "_gsettings_get_" # retrieve from gsettings
+@@ -388,7 +389,8 @@
+         try:
+             filename = parser.read(paths)
+         except configparser.ParsingError as ex:
+-            _logger.error(_("Failed to read system defaults. " + str(ex)))
++            _logger.error(_("Failed to read system defaults. " + \
++                            unicode_str(ex)))
+ 
+         if not filename:
+             _logger.info(_("No system defaults found."))
+@@ -501,7 +503,8 @@
+                 value = self.settings[self.key]
+ 
+         except KeyError as ex:
+-            _logger.error(_("Failed to get gsettings value. ") + str(ex))
++            _logger.error(_("Failed to get gsettings value. ") + \
++                          unicode_str(ex))
+ 
+         return value
+ 
+Index: onboard-0.97.0/Onboard/Exceptions.py
+===================================================================
+--- onboard-0.97.0.orig/Onboard/Exceptions.py
++++ onboard-0.97.0/Onboard/Exceptions.py
+@@ -4,6 +4,7 @@
+ 
+ from traceback import format_tb
+ import sys
++from Onboard.utils import unicode_str
+ 
+ class ChainableError(Exception):
+     """
+@@ -40,10 +41,10 @@
+     traceback = property(_get_traceback)
+ 
+     def __str__(self):
+-        message = self._message + "\n"
++        message = unicode_str(self._message) + "\n"
+         if self.chained_exception:
+             message += "%s: %s" % (type(self.chained_exception).__name__,
+-                str(self.chained_exception))
++                unicode_str(self.chained_exception))
+         return message
+ 
+ class SVGSyntaxError(ChainableError):
+Index: onboard-0.97.0/Onboard/OnboardGtk.py
+===================================================================
+--- onboard-0.97.0.orig/Onboard/OnboardGtk.py
++++ onboard-0.97.0/Onboard/OnboardGtk.py
+@@ -26,7 +26,8 @@
+ from Onboard.KeyGtk import *
+ from Onboard.KbdWindow import KbdWindow, KbdPlugWindow
+ from Onboard.KeyboardSVG import KeyboardSVG
+-from Onboard.utils       import show_confirmation_dialog, CallOnce, timeit
++from Onboard.utils       import show_confirmation_dialog, CallOnce, timeit, \
++                                unicode_str
+ from Onboard.Appearance import Theme
+ 
+ ### Config Singleton ###
+@@ -485,7 +486,7 @@
+             except virtkey.error as e:
+                 t = time.time()
+                 if t > self._vk_error_time + .2: # rate limit to once per 200ms
+-                    _logger.warning("vk: "+str(e))
++                    _logger.warning("vk: " + unicode_str(e))
+                     self._vk_error_time = t
+ 
+         return self._vk
+Index: onboard-0.97.0/Onboard/settings.py
+===================================================================
+--- onboard-0.97.0.orig/Onboard/settings.py
++++ onboard-0.97.0/Onboard/settings.py
+@@ -24,7 +24,8 @@
+ from Onboard.Appearance  import Theme, ColorScheme
+ from Onboard.Scanner     import ScanMode, ScanDevice
+ from Onboard.utils       import show_ask_string_dialog, \
+-                                show_confirmation_dialog
++                                show_confirmation_dialog, \
++                                unicode_str
+ 
+ from virtkey import virtkey
+ from osk     import Devices
+@@ -400,8 +401,8 @@
+         try:
+             Popen([filename, "universal-access"])
+         except OSError as e:
+-            _logger.warning(_("System settings not found"
+-                              " ({}): {}").format(filename, str(e)))
++            _logger.warning(_("System settings not found ({}): {}") \
++                            .format(filename, unicode_str(e)))
+ 
+     def update_num_resize_handles_combobox(self):
+         self.num_resize_handles_list = Gtk.ListStore(str, int)
+Index: onboard-0.97.0/Onboard/utils.py
+===================================================================
+--- onboard-0.97.0.orig/Onboard/utils.py
++++ onboard-0.97.0/Onboard/utils.py
+@@ -961,4 +961,20 @@
+             return 1
+         return 0
+ 
++def unicode_str(obj, encoding = "utf-8"):
++    """ 
++    Safe str() function that always returns an unicode string.
++    Do nothing if the string was already unicode.
++    """
++    if sys.version_info.major >= 3:  # python 3?
++        return str(obj)
++    
++    if type(obj) == unicode:         # unicode string?
++        return obj
++
++    if hasattr(obj, "__unicode__"):  # Exception object?
++        return unicode(obj)
++
++    return str(obj).decode("utf-8")  # strings, numbers, ...
++
+ 
diff --git a/community/onboard/fix_unicode_translations.patch b/community/onboard/fix_unicode_translations.patch
new file mode 100644
index 000000000..1eaf663cc
--- /dev/null
+++ b/community/onboard/fix_unicode_translations.patch
@@ -0,0 +1,247 @@
+=== modified file 'Onboard/Appearance.py'
+--- Onboard/Appearance.py	2012-02-14 08:16:34 +0000
++++ Onboard/Appearance.py	2012-02-15 23:27:20 +0000
+@@ -11,7 +11,6 @@
+ _logger = logging.getLogger("Appearance")
+ ###############
+ 
+-from gettext import gettext as _
+ from xml.dom import minidom
+ import os
+ import re
+
+=== modified file 'Onboard/Config.py'
+--- Onboard/Config.py	2012-02-15 10:58:02 +0000
++++ Onboard/Config.py	2012-02-15 23:27:20 +0000
+@@ -9,7 +9,6 @@
+ import sys
+ from shutil import copytree
+ from optparse import OptionParser
+-from gettext import gettext as _
+ 
+ from gi.repository import GLib, Gtk
+ 
+
+=== modified file 'Onboard/ConfigUtils.py'
+--- Onboard/ConfigUtils.py	2012-02-08 14:56:38 +0000
++++ Onboard/ConfigUtils.py	2012-02-15 23:27:20 +0000
+@@ -13,7 +13,6 @@
+ import os
+ import sys
+ from ast import literal_eval
+-from gettext import gettext as _
+ try:
+     import configparser
+ except ImportError:
+@@ -418,8 +417,8 @@
+             # convert ini file strings to property values
+             sysdef_gskeys = dict((k.sysdef, k) for k in list(self.gskeys.values()))
+             for sysdef, value in items:
+-                _logger.info(_("Found system default '{}={}'") \
+-                              .format(sysdef, value))
++                _logger.info(_("Found system default '[{}] {}={}'") \
++                              .format(self.sysdef_section, sysdef, value))
+ 
+                 gskey = sysdef_gskeys.get(sysdef, None)
+                 value = self._convert_sysdef_key(gskey, sysdef, value)
+
+=== modified file 'Onboard/IconPalette.py'
+--- Onboard/IconPalette.py	2012-02-15 01:34:13 +0000
++++ Onboard/IconPalette.py	2012-02-15 23:27:20 +0000
+@@ -43,7 +43,6 @@
+ config = Config()
+ ########################
+ 
+-from gettext import gettext as _
+ 
+ class IconPalette(Gtk.Window, WindowRectTracker, WindowManipulator):
+     """
+
+=== modified file 'Onboard/Indicator.py'
+--- Onboard/Indicator.py	2012-02-11 14:07:56 +0000
++++ Onboard/Indicator.py	2012-02-15 23:27:20 +0000
+@@ -18,7 +18,6 @@
+ config = Config()
+ ########################
+ 
+-from gettext import gettext as _
+ 
+ class Indicator(GObject.GObject):
+ 
+
+=== modified file 'Onboard/KbdWindow.py'
+--- Onboard/KbdWindow.py	2012-02-15 10:18:48 +0000
++++ Onboard/KbdWindow.py	2012-02-15 23:27:20 +0000
+@@ -11,7 +11,6 @@
+ from Onboard.WindowUtils import Orientation, WindowRectTracker
+ from Onboard.IconPalette import IconPalette
+ 
+-from gettext import gettext as _
+ 
+ ### Logging ###
+ import logging
+
+=== modified file 'Onboard/Keyboard.py'
+--- Onboard/Keyboard.py	2012-02-14 20:21:02 +0000
++++ Onboard/Keyboard.py	2012-02-15 23:27:20 +0000
+@@ -3,7 +3,6 @@
+ from __future__ import division, print_function, unicode_literals
+ 
+ import sys
+-from gettext import gettext as _
+ 
+ from gi.repository import GObject, Gtk, Gdk
+ 
+
+=== modified file 'Onboard/KeyboardGTK.py'
+--- Onboard/KeyboardGTK.py	2012-02-15 01:33:34 +0000
++++ Onboard/KeyboardGTK.py	2012-02-15 23:27:20 +0000
+@@ -5,7 +5,6 @@
+ 
+ import os
+ import time
+-from gettext import gettext as _
+ 
+ import cairo
+ from gi.repository import GObject, Gdk, Gtk
+
+=== modified file 'Onboard/KeyboardSVG.py'
+--- Onboard/KeyboardSVG.py	2012-02-09 19:18:36 +0000
++++ Onboard/KeyboardSVG.py	2012-02-15 23:27:20 +0000
+@@ -11,7 +11,6 @@
+ import re
+ import sys
+ import shutil
+-from gettext import gettext as _
+ from xml.dom import minidom
+ 
+ from Onboard             import Exceptions
+
+=== modified file 'Onboard/MouseControl.py'
+--- Onboard/MouseControl.py	2012-01-19 08:50:34 +0000
++++ Onboard/MouseControl.py	2012-02-15 23:27:20 +0000
+@@ -5,7 +5,6 @@
+ 
+ from __future__ import division, print_function, unicode_literals
+ 
+-from gettext import gettext as _
+ try:
+     import dbus
+     from dbus.mainloop.glib import DBusGMainLoop
+
+=== modified file 'Onboard/OnboardGtk.py'
+--- Onboard/OnboardGtk.py	2012-02-15 10:58:02 +0000
++++ Onboard/OnboardGtk.py	2012-02-15 23:27:20 +0000
+@@ -13,14 +13,14 @@
+ import signal
+ import gettext
+ import os.path
+-from gettext import gettext as _
+ import virtkey
+-
+ from gi.repository import GObject, Gio, Gdk, Gtk
+ 
++# setup gettext, install _() function for all modules
++app = "onboard"
++gettext.install(app, unicode=True)
+ 
+ from Onboard.Indicator import Indicator
+-
+ from Onboard.Keyboard import Keyboard
+ from Onboard.Scanner import Scanner
+ from Onboard.KeyGtk import *
+@@ -37,11 +37,6 @@
+ import Onboard.KeyCommon
+ import Onboard.utils as utils
+ 
+-#setup gettext
+-app="onboard"
+-gettext.textdomain(app)
+-gettext.bindtextdomain(app)
+-
+ DEFAULT_FONTSIZE = 10
+ 
+ class OnboardGtk(Gtk.Application):
+
+=== modified file 'Onboard/SnippetView.py'
+--- Onboard/SnippetView.py	2012-01-09 22:25:10 +0000
++++ Onboard/SnippetView.py	2012-02-15 23:27:20 +0000
+@@ -4,7 +4,6 @@
+ 
+ from gi.repository import GObject, Gtk
+ 
+-from gettext import gettext as _
+ 
+ from Onboard.utils import show_error_dialog
+ 
+
+=== modified file 'Onboard/TouchHandles.py'
+--- Onboard/TouchHandles.py	2012-02-14 08:32:08 +0000
++++ Onboard/TouchHandles.py	2012-02-15 23:27:20 +0000
+@@ -5,7 +5,6 @@
+ 
+ from math import pi, sqrt, sin, log
+ import cairo
+-from gettext import gettext as _
+ 
+ from Onboard.utils       import Rect
+ from Onboard.WindowUtils import Handle
+
+=== modified file 'Onboard/WindowUtils.py'
+--- Onboard/WindowUtils.py	2012-02-15 10:23:36 +0000
++++ Onboard/WindowUtils.py	2012-02-15 23:27:20 +0000
+@@ -5,7 +5,6 @@
+ 
+ import time
+ from math import sqrt
+-from gettext import gettext as _
+ 
+ from gi.repository import GObject, Gtk, Gdk
+ 
+
+=== modified file 'Onboard/settings.py'
+--- Onboard/settings.py	2012-02-15 10:58:02 +0000
++++ Onboard/settings.py	2012-02-15 23:27:20 +0000
+@@ -11,9 +11,14 @@
+ from subprocess import Popen
+ from xml.parsers.expat import ExpatError
+ from xml.dom import minidom
++import gettext
+ 
+ from gi.repository import GObject, Pango, Gdk, Gtk
+ 
++# setup gettext, install _() function for all modules
++app = "onboard"
++gettext.install(app, unicode=True)
++
+ from Onboard.KeyboardSVG import KeyboardSVG
+ from Onboard.SnippetView import SnippetView
+ from Onboard.Appearance  import Theme, ColorScheme
+@@ -36,14 +41,6 @@
+ config = Config()
+ ########################
+ 
+-#setup gettext
+-import gettext
+-from gettext import gettext as _
+-app = "onboard"
+-gettext.textdomain(app)
+-gettext.bindtextdomain(app)
+-
+-
+ 
+ def LoadUI(filebase):
+     builder = Gtk.Builder()
+
+=== modified file 'Onboard/utils.py'
+--- Onboard/utils.py	2012-02-15 01:33:34 +0000
++++ Onboard/utils.py	2012-02-15 23:27:20 +0000
+@@ -11,7 +11,6 @@
+ from subprocess import Popen
+ from math import pi, sqrt, sin
+ from contextlib import contextmanager
+-from gettext import gettext as _
+ 
+ from gi.repository import GObject, Gtk
+ 
+
diff --git a/community/onboard/onboard.install b/community/onboard/onboard.install
new file mode 100644
index 000000000..aa4c3e059
--- /dev/null
+++ b/community/onboard/onboard.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD
index c01c7e4f1..47a5061e5 100644
--- a/community/open-vm-tools/PKGBUILD
+++ b/community/open-vm-tools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 70349 2012-05-04 23:55:01Z allan $
+# $Id: PKGBUILD 70830 2012-05-17 10:51:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools
 pkgver=2012.03.13
 _pkgsubver=651368
-pkgrel=4
+pkgrel=5
 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/"
@@ -45,6 +45,7 @@ package() {
   cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
 
   make install DESTDIR="$pkgdir"
+  install -Dm0644 vmware-user-suid-wrapper/vmware-user.desktop $pkgdir/usr/share/applications/vmware-user.desktop
   install -D -m 755 scripts/common/vmware-xdg-detect-de "$pkgdir"/usr/bin/vmware-xdg-detect-de
   chmod 07755 "$pkgdir"/usr/bin/vmware-user-suid-wrapper
 
@@ -52,11 +53,11 @@ package() {
   patch -p1 -i "$srcdir"/scripts-network.patch etc/vmware-tools/scripts/vmware/network
   patch -p1 -i "$srcdir"/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network
 
-  install -D -m 755 "$srcdir"/open-vm-tools.rc.d "$pkgdir"/etc/rc.d/open-vm-tools
-  install -D -m 644 "$srcdir"/open-vm-tools.conf.d "$pkgdir"/etc/conf.d/open-vm-tools
-  install -D -m 644 "$srcdir"/tools.conf "$pkgdir"/etc/vmware-tools/tools.conf
-  install -D -m 644 "$srcdir"/xautostart.conf "$pkgdir"/etc/vmware-tools/xautostart.conf
-  install -D -m 644 "$srcdir"/vmware-guestd "$pkgdir"/etc/pam.d/vmware-guestd
+  install -Dm0755 "$srcdir"/open-vm-tools.rc.d "$pkgdir"/etc/rc.d/open-vm-tools
+  install -Dm0644 "$srcdir"/open-vm-tools.conf.d "$pkgdir"/etc/conf.d/open-vm-tools
+  install -Dm0644 "$srcdir"/tools.conf "$pkgdir"/etc/vmware-tools/tools.conf
+  install -Dm0644 "$srcdir"/xautostart.conf "$pkgdir"/etc/vmware-tools/xautostart.conf
+  install -Dm0644 "$srcdir"/vmware-guestd "$pkgdir"/etc/pam.d/vmware-guestd
   rm -rf "$pkgdir"/usr/etc
 
   ln -fs /usr/sbin/mount.vmhgfs "$pkgdir"/sbin/mount.vmhgfs
diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
index 4659f948a..f5d92d960 100644
--- a/community/openbox/PKGBUILD
+++ b/community/openbox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64899 2012-02-18 19:57:32Z bpiotrowski $
+# $Id: PKGBUILD 70588 2012-05-12 09:12:54Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,8 +6,8 @@
 
 pkgname=openbox
 pkgver=3.5.0
-pkgrel=5
-pkgdesc="A window manager for the X11 windowing system"
+pkgrel=7
+pkgdesc="A highly configurable and lightweight X11 window manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openbox.org"
 license=('GPL')
@@ -18,34 +18,40 @@ groups=('lxde')
 install=${pkgname}.install
 options=('!libtool')
 backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml')
-source=("http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz"
-        'which-2.20.patch')
+source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
+        which-2.20.patch
+        movesize.patch
+        title-matching.patch)
 md5sums=('00441b53cf14c03566c8e82643544ff9'
-         '7ca3b5244bb092d46f5bcf1e2bdf4a18')
+         '7ca3b5244bb092d46f5bcf1e2bdf4a18'
+         'e09d77842aac9a0cd7eebe112df88383'
+         '6f99711eee0b1c413dca9fa691917b71')
 
 build() {
-  	cd "${srcdir}"/${pkgname}-${pkgver}
+    cd "${srcdir}"/${pkgname}-${pkgver}
 
-  	# FS#11455
-  	patch -p1 -i "${srcdir}"/which-2.20.patch
-  	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-  		data/autostart/openbox-xdg-autostart
+    patch -Np1 -i "${srcdir}"/which-2.20.patch      # FS#11455
+    patch -Np1 -i "${srcdir}"/movesize.patch        # FS#29812
+    patch -Np0 -i "${srcdir}"/title-matching.patch  # FS#5277 on Openbox bugtracker
+
+    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+            data/autostart/openbox-xdg-autostart
   
-	./configure --prefix=/usr \
-    		--with-x \
-    		--enable-startup-notification \
-    		--sysconfdir=/etc \
-		    --libexecdir=/usr/lib/openbox
+    ./configure --prefix=/usr \
+                --with-x \
+                --enable-startup-notification \
+                --sysconfdir=/etc \
+                --libexecdir=/usr/lib/openbox
   
-	make
+    make
 }
 
 package() {
-  	cd "${srcdir}"/${pkgname}-${pkgver}
-  	make DESTDIR="${pkgdir}" install
+    cd "${srcdir}"/${pkgname}-${pkgver}
+    make DESTDIR="${pkgdir}" install
 
-  	sed -i "s:startkde:/usr/bin/\0:" \
-  		"${pkgdir}"/usr/share/xsessions/openbox-kde.desktop
-  	sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \
-    		"${pkgdir}"/usr/share/xsessions/openbox-gnome.desktop
+    sed -i "s:startkde:/usr/bin/\0:" \
+           "${pkgdir}"/usr/share/xsessions/openbox-kde.desktop
+    sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \
+           "${pkgdir}"/usr/share/xsessions/openbox-gnome.desktop
 }
diff --git a/community/openbox/movesize.patch b/community/openbox/movesize.patch
new file mode 100644
index 000000000..4f0e8595e
--- /dev/null
+++ b/community/openbox/movesize.patch
@@ -0,0 +1,19 @@
+--- openbox-3.5.0/openbox/moveresize.c.orig	2011-08-01 21:14:58.000000000 +0100
++++ openbox-3.5.0/openbox/moveresize.c	2012-03-28 20:04:36.100459920 +0100
+@@ -326,6 +326,16 @@ void moveresize_end(gboolean cancel)
+ #endif
+     }
+ 
++    if (!moveresize_client) {
++        ob_debug("moveresize_end: moveresize_client is NULL!");
++        return;
++    }
++
++    if (!moveresize_in_progress) {
++        ob_debug("moveresize_end: moveresize_in_progress is FALSE!");
++        return;
++    }
++
+     /* don't use client_move() here, use the same width/height as
+        we've been using during the move, otherwise we get different results
+        when moving maximized windows between monitors of different sizes !
diff --git a/community/openbox/title-matching.patch b/community/openbox/title-matching.patch
new file mode 100644
index 000000000..88ed73546
--- /dev/null
+++ b/community/openbox/title-matching.patch
@@ -0,0 +1,11 @@
+--- openbox/client.c    2011-08-01 22:14:58.000000000 +0200
++++ openbox/client.c    2011-10-22 14:59:56.000000000 +0200
+@@ -883,7 +883,7 @@
+                  !g_pattern_match(app->role,
+                                   strlen(self->role), self->role, NULL))
+             match = FALSE;
+-        else if (app->title &&
++        else if (app->title && self->title &&
+                  !g_pattern_match(app->title,
+                                   strlen(self->title), self->title, NULL))
+             match = FALSE;
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index 220375dc6..38fa509ea 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 67809 2012-03-14 13:50:13Z spupykin $
+# $Id: PKGBUILD 70838 2012-05-17 15:56:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=passenger
-pkgver=3.0.11
-pkgrel=2
-_pkgdlnr=75548
+pkgver=3.0.12
+pkgrel=1
+_pkgdlnr=76005
 pkgdesc="mod_rails passenger"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.modrails.com"
 license=('GPL')
-depends=('apache' 'ruby' 'ruby-rack' 'curl')
+depends=('ruby' 'ruby-rack' 'curl')
+makedepends=('apache')
 install=passenger.install
 options=('!emptydirs')
 source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz
-	passenger-install-apache2-module.patch)
-md5sums=('9186d799e065ccad803cbc0289954f40'
-         '3d04eba10c55a955c378678d5df8497f')
+	passenger-install-apache2-module.patch
+	build-fix-git-2012-05-17.diff)
+md5sums=('fedcf948a46b76e00ddd25527dac4b6d'
+         '3d04eba10c55a955c378678d5df8497f'
+         'e2d3409bae3676232f411f03abac440c')
 
 build(){
   cd $srcdir/passenger-$pkgver
-  patch bin/passenger-install-apache2-module <$srcdir/passenger-install-apache2-module.patch
-  ./bin/passenger-install-apache2-module
+#  patch bin/passenger-install-apache2-module <$srcdir/passenger-install-apache2-module.patch
+  patch -p1 <$srcdir/build-fix-git-2012-05-17.diff
+  ./bin/passenger-install-apache2-module -a
   rake nginx
 
   mkdir -p $pkgdir/usr/lib/passenger/
diff --git a/community/passenger/build-fix-git-2012-05-17.diff b/community/passenger/build-fix-git-2012-05-17.diff
new file mode 100644
index 000000000..b9aa6b538
--- /dev/null
+++ b/community/passenger/build-fix-git-2012-05-17.diff
@@ -0,0 +1,547 @@
+diff -wbBur passenger-3.0.12/bin/passenger-install-nginx-module passenger.git/bin/passenger-install-nginx-module
+--- passenger-3.0.12/bin/passenger-install-nginx-module	2012-04-13 12:09:57.000000000 +0400
++++ passenger.git/bin/passenger-install-nginx-module	2012-05-17 19:35:01.000000000 +0400
+@@ -162,7 +162,7 @@
+ 		new_screen
+ 		color_puts "<banner>PCRE (required by Nginx) not installed, downloading it...</banner>"
+ 		
+-		url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
++		url = "http://downloads.sourceforge.net/project/pcre/pcre/#{PREFERRED_PCRE_VERSION}/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
+ 		dirname = "pcre-#{PREFERRED_PCRE_VERSION}"
+ 		tarball = "#{@working_dir}/pcre.tar.gz"
+ 		
+diff -wbBur passenger-3.0.12/build/basics.rb passenger.git/build/basics.rb
+--- passenger-3.0.12/build/basics.rb	2012-04-13 12:09:57.000000000 +0400
++++ passenger.git/build/basics.rb	2012-05-17 19:35:01.000000000 +0400
+@@ -33,7 +33,6 @@
+ require 'phusion_passenger/platform_info/curl'
+ require 'phusion_passenger/platform_info/zlib'
+ require 'phusion_passenger/platform_info/compiler'
+-require 'phusion_passenger/platform_info/documentation_tools'
+ 
+ include PhusionPassenger
+ include PhusionPassenger::PlatformInfo
+diff -wbBur passenger-3.0.12/build/documentation.rb passenger.git/build/documentation.rb
+--- passenger-3.0.12/build/documentation.rb	2012-02-04 02:25:41.000000000 +0400
++++ passenger.git/build/documentation.rb	2012-05-17 19:35:01.000000000 +0400
+@@ -1,5 +1,5 @@
+ #  Phusion Passenger - http://www.modrails.com/
+-#  Copyright (c) 2010 Phusion
++#  Copyright (c) 2010, 2011, 2012 Phusion
+ #
+ #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ #
+@@ -21,25 +21,34 @@
+ #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #  THE SOFTWARE.
+ 
+-ASCIIDOC_FLAGS = "-b html5 -a toc -a theme=flask -a numbered -a toclevels=3 -a icons"
+-
+ desc "Generate all documentation"
+ task :doc => Packaging::ASCII_DOCS
+ 
+ Packaging::ASCII_DOCS.each do |target|
+ 	source = target.sub(/\.html$/, '.txt')
+ 	file target => [source] + Dir["doc/users_guide_snippets/**/*"] do
+-		if PlatformInfo.asciidoc
++		if PlatformInfo.find_command('mizuho')
+ 			if target =~ /apache/i
+-				type = "-a apache"
++				type = "apache"
++				juvia_site_key = "5jpmkyjqlml8rktsfldfpbwth8ig7w9"
+ 			elsif target =~ /nginx/i
+-				type = "-a nginx"
++				type = "nginx"
++				juvia_site_key = "q0ptarhn8o9xanwomq8zkgewbtwffyz"
++			elsif target =~ /standalone/i
++				type = nil
++				juvia_site_key = "amggdy0k65hb4hbjg3dh7pnb9zd8dwy"
+ 			else
+ 				type = nil
++				juvia_site_key = nil
++			end
++			command = "mizuho '#{source}'"
++			command << " -a #{type}" if type
++			if juvia_site_key
++				command << " -c juvia --juvia-url http://juvia.phusion.nl --juvia-site-key #{juvia_site_key}"
+ 			end
+-	  		sh "#{PlatformInfo.asciidoc} #{ASCIIDOC_FLAGS} #{type} '#{source}'"
++			sh(command)
+ 		else
+-			sh "echo 'asciidoc required to build docs' > '#{target}'"
++			sh "echo 'Mizuho required to build docs' > '#{target}'"
+ 		end
+ 	end
+ 	
+diff -wbBur passenger-3.0.12/build/packaging.rb passenger.git/build/packaging.rb
+--- passenger-3.0.12/build/packaging.rb	2012-02-04 02:25:41.000000000 +0400
++++ passenger.git/build/packaging.rb	2012-05-17 19:35:01.000000000 +0400
+@@ -1,5 +1,5 @@
+ #  Phusion Passenger - http://www.modrails.com/
+-#  Copyright (c) 2010 Phusion
++#  Copyright (c) 2010, 2011, 2012 Phusion
+ #
+ #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ #
+@@ -42,7 +42,7 @@
+ 	s.require_paths = ["lib"]
+ 	s.add_dependency 'rake', '>= 0.8.1'
+ 	s.add_dependency 'fastthread', '>= 1.0.1'
+-	s.add_dependency 'daemon_controller', '>= 0.2.5'
++	s.add_dependency 'daemon_controller', '>= 1.0.0'
+ 	s.add_dependency 'rack'
+ 	s.files = FileList[*Packaging::GLOB] - FileList[*Packaging::EXCLUDE_GLOB]
+ 	s.executables = Packaging::USER_EXECUTABLES + Packaging::SUPER_USER_EXECUTABLES
+diff -wbBur passenger-3.0.12/DEVELOPERS.TXT passenger.git/DEVELOPERS.TXT
+--- passenger-3.0.12/DEVELOPERS.TXT	2012-04-13 12:09:57.000000000 +0400
++++ passenger.git/DEVELOPERS.TXT	2012-05-17 19:35:01.000000000 +0400
+@@ -13,6 +13,7 @@
+ * rspec >= 1.1.2
+ * mime-types >= 1.15
+ * sqlite3-ruby
++* daemon_controller >= 1.0.0
+ 
+ The following software is optional:
+ 
+diff -wbBur passenger-3.0.12/doc/Users guide Apache.txt passenger.git/doc/Users guide Apache.txt
+--- passenger-3.0.12/doc/Users guide Apache.txt	2012-02-04 02:25:41.000000000 +0400
++++ passenger.git/doc/Users guide Apache.txt	2012-05-17 19:35:01.000000000 +0400
+@@ -203,15 +203,7 @@
+ 
+ ==== Installing via a native Linux package ====
+ 
+-John Leach from Brightbox has kindly provided an Ubuntu Hardy package for Phusion Passenger. The package is available from the link:http://apt.brightbox.net[Brightbox repository].
+-
+-Please install the native Linux package, e.g.:
+-------------------------------------------------------
+-sudo sh -c 'echo "deb http://apt.brightbox.net hardy main" > /etc/apt/sources.list.d/brightbox.list'
+-sudo sh -c 'wget -q -O - http://apt.brightbox.net/release.asc | apt-key add -'
+-sudo apt-get update
+-sudo apt-get install libapache2-mod-passenger
+-------------------------------------------------------
++John Leach from Brightbox has kindly provided a Ubuntu packages for Phusion Passenger. The package is available from the link:http://wiki.brightbox.co.uk/docs:phusion-passenger[Brightbox repository].
+ 
+ ==== What does the installer do? ====
+ 
+@@ -635,7 +627,7 @@
+         Allow from all
+     </Directory>
+ 
+-    RackBaseURI /rails                    # <-- These lines have
++    RackBaseURI /rack                     # <-- These lines have
+     <Directory /websites/phusion/rails>   # <-- been added.
+         Options -MultiViews               # <--
+     </Directory>                          # <--
+diff -wbBur passenger-3.0.12/ext/boost/config/stdlib/libstdcpp3.hpp passenger.git/ext/boost/config/stdlib/libstdcpp3.hpp
+--- passenger-3.0.12/ext/boost/config/stdlib/libstdcpp3.hpp	2012-02-04 02:25:42.000000000 +0400
++++ passenger.git/ext/boost/config/stdlib/libstdcpp3.hpp	2012-05-17 19:35:01.000000000 +0400
+@@ -31,7 +31,8 @@
+ 
+ #ifdef __GLIBCXX__ // gcc 3.4 and greater:
+ #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
+-        || defined(_GLIBCXX__PTHREADS)
++        || defined(_GLIBCXX__PTHREADS) \
++        || defined(_GLIBCXX_HAS_GTHREADS)
+       //
+       // If the std lib has thread support turned on, then turn it on in Boost
+       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT
+diff -wbBur passenger-3.0.12/ext/boost/exception/detail/error_info_impl.hpp passenger.git/ext/boost/exception/detail/error_info_impl.hpp
+--- passenger-3.0.12/ext/boost/exception/detail/error_info_impl.hpp	2012-02-04 02:25:42.000000000 +0400
++++ passenger.git/ext/boost/exception/detail/error_info_impl.hpp	2012-05-17 19:35:01.000000000 +0400
+@@ -30,7 +30,7 @@
+ 
+             protected:
+ 
+-            ~error_info_base() throw()
++            virtual ~error_info_base() throw()
+                 {
+                 }
+             };
+diff -wbBur passenger-3.0.12/ext/common/StaticString.h passenger.git/ext/common/StaticString.h
+--- passenger-3.0.12/ext/common/StaticString.h	2012-04-13 12:09:57.000000000 +0400
++++ passenger.git/ext/common/StaticString.h	2012-05-17 19:35:01.000000000 +0400
+@@ -25,6 +25,7 @@
+ #ifndef _PASSENGER_STATIC_STRING_H_
+ #define _PASSENGER_STATIC_STRING_H_
+ 
++#include <sys/types.h>
+ #include <string>
+ #include <cstring>
+ #include <cstddef>
+diff -wbBur passenger-3.0.12/ext/common/Watchdog.cpp passenger.git/ext/common/Watchdog.cpp
+--- passenger-3.0.12/ext/common/Watchdog.cpp	2012-04-13 12:09:57.000000000 +0400
++++ passenger.git/ext/common/Watchdog.cpp	2012-05-17 19:35:01.000000000 +0400
+@@ -975,7 +975,7 @@
+ 	} else if (pid == -1) {
+ 		// Error
+ 		e = errno;
+-		throw SystemException("fork() failed", errno);
++		throw SystemException("fork() failed", e);
+ 		
+ 	} else {
+ 		// Parent
+diff -wbBur passenger-3.0.12/ext/nginx/Configuration.c passenger.git/ext/nginx/Configuration.c
+--- passenger-3.0.12/ext/nginx/Configuration.c	2012-04-13 12:09:58.000000000 +0400
++++ passenger.git/ext/nginx/Configuration.c	2012-05-17 19:35:01.000000000 +0400
+@@ -1,7 +1,7 @@
+ /*
+  * Copyright (C) Igor Sysoev
+  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
+- * Copyright (C) 2010 Phusion
++ * Copyright (C) 2010, 2011, 2012 Phusion
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+@@ -335,6 +335,14 @@
+     conf->upstream_config.pass_request_headers = NGX_CONF_UNSET;
+     conf->upstream_config.pass_request_body = NGX_CONF_UNSET;
+ 
++#if (NGX_HTTP_CACHE)
++    conf->upstream_config.cache = NGX_CONF_UNSET_PTR;
++    conf->upstream_config.cache_min_uses = NGX_CONF_UNSET_UINT;
++    conf->upstream_config.cache_bypass = NGX_CONF_UNSET_PTR;
++    conf->upstream_config.no_cache = NGX_CONF_UNSET_PTR;
++    conf->upstream_config.cache_valid = NGX_CONF_UNSET_PTR;
++#endif
++
+     conf->upstream_config.intercept_errors = NGX_CONF_UNSET;
+ 
+     conf->upstream_config.cyclic_temp_file = 0;
+@@ -511,8 +519,8 @@
+ 
+     if (conf->upstream_config.busy_buffers_size < size) {
+         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+-             "\"passenger_busy_buffers_size\" must be equal or bigger than "
+-             "maximum of the value of \"passenger_buffer_size\" and "
++             "\"passenger_busy_buffers_size\" must be equal to or greater "
++             "than the maximum of the value of \"passenger_buffer_size\" and "
+              "one of the \"passenger_buffers\"");
+ 
+         return NGX_CONF_ERROR;
+@@ -542,8 +550,8 @@
+ 
+     if (conf->upstream_config.temp_file_write_size < size) {
+         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+-             "\"passenger_temp_file_write_size\" must be equal or bigger than "
+-             "maximum of the value of \"passenger_buffer_size\" and "
++             "\"passenger_temp_file_write_size\" must be equal to or greater than "
++             "the maximum of the value of \"passenger_buffer_size\" and "
+              "one of the \"passenger_buffers\"");
+ 
+         return NGX_CONF_ERROR;
+@@ -566,8 +574,8 @@
+     {
+         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+              "\"passenger_max_temp_file_size\" must be equal to zero to disable "
+-             "the temporary files usage or must be equal or bigger than "
+-             "maximum of the value of \"passenger_buffer_size\" and "
++             "temporary files usage or must be equal to or greater than "
++             "the maximum of the value of \"passenger_buffer_size\" and "
+              "one of the \"passenger_buffers\"");
+ 
+         return NGX_CONF_ERROR;
+@@ -639,6 +647,14 @@
+         conf->cache_key = prev->cache_key;
+     }
+ 
++    #if NGINX_VERSION_NUM >= 1002000
++    ngx_conf_merge_value(conf->upstream_config.cache_lock,
++                         prev->upstream_config.cache_lock, 0);
++
++    ngx_conf_merge_msec_value(conf->upstream_config.cache_lock_timeout,
++                              prev->upstream_config.cache_lock_timeout, 5000);
++    #endif
++
+ #endif
+ 
+     ngx_conf_merge_value(conf->upstream_config.pass_request_headers,
+@@ -1273,7 +1289,7 @@
+       NULL },
+ 
+     { ngx_string("passenger_pass_header"),
+-      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
++      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+       ngx_conf_set_str_array_slot,
+       NGX_HTTP_LOC_CONF_OFFSET,
+       offsetof(passenger_loc_conf_t, upstream_config.pass_headers),
+diff -wbBur passenger-3.0.12/ext/nginx/ContentHandler.c passenger.git/ext/nginx/ContentHandler.c
+--- passenger-3.0.12/ext/nginx/ContentHandler.c	2012-04-13 12:09:58.000000000 +0400
++++ passenger.git/ext/nginx/ContentHandler.c	2012-05-17 19:35:01.000000000 +0400
+@@ -1,7 +1,7 @@
+ /*
+  * Copyright (C) Igor Sysoev
+  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
+- * Copyright (C) 2010 Phusion
++ * Copyright (C) 2010, 2011, 2012 Phusion
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+@@ -387,8 +387,8 @@
+         app_type_string_len = sizeof("wsgi");
+         break;
+     default:
+-        app_type_string = (const u_char *) "rails";
+-        app_type_string_len = sizeof("rails");
++        app_type_string = (const u_char *) "rack";
++        app_type_string_len = sizeof("rack");
+         break;
+     }
+     
+@@ -931,7 +931,7 @@
+     context = ngx_http_get_module_ctx(r, ngx_http_passenger_module);
+ 
+     if (context == NULL) {
+-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
++        return NGX_ERROR;
+     }
+ 
+     rc = parse_status_line(r, context);
+@@ -952,7 +952,6 @@
+         }
+ #endif
+ 
+-        r->http_version = NGX_HTTP_VERSION_9;
+         u->headers_in.status_n = NGX_HTTP_OK;
+         u->state->status = NGX_HTTP_OK;
+ 
+@@ -966,7 +965,7 @@
+     u->headers_in.status_line.data = ngx_palloc(r->pool,
+                                                 u->headers_in.status_line.len);
+     if (u->headers_in.status_line.data == NULL) {
+-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
++        return NGX_ERROR;
+     }
+ 
+     ngx_memcpy(u->headers_in.status_line.data, context->status_start,
+diff -wbBur passenger-3.0.12/lib/phusion_passenger/dependencies.rb passenger.git/lib/phusion_passenger/dependencies.rb
+--- passenger-3.0.12/lib/phusion_passenger/dependencies.rb	2012-04-13 12:09:58.000000000 +0400
++++ passenger.git/lib/phusion_passenger/dependencies.rb	2012-05-17 19:35:01.000000000 +0400
+@@ -1,5 +1,5 @@
+ #  Phusion Passenger - http://www.modrails.com/
+-#  Copyright (c) 2010 Phusion
++#  Copyright (c) 2010, 2011, 2012 Phusion
+ #
+ #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ #
+@@ -29,7 +29,6 @@
+ require 'phusion_passenger/platform_info/ruby'
+ require 'phusion_passenger/platform_info/linux'
+ require 'phusion_passenger/platform_info/curl'
+-require 'phusion_passenger/platform_info/documentation_tools'
+ 
+ module PhusionPassenger
+ 
+@@ -110,9 +109,9 @@
+ 		return (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7"
+ 	end
+ 	
+-	# Returns whether asciidoc is required in order to be able to package all files
++	# Returns whether Mizuho is required in order to be able to package all files
+ 	# in the packaging list.
+-	def self.asciidoc_required?
++	def self.mizuho_required?
+ 		return Packaging::ASCII_DOCS.any? do |fn|
+ 			!File.exist?("#{SOURCE_ROOT}/#{fn}")
+ 		end
+@@ -579,7 +578,7 @@
+ 	end
+ 	
+ 	Daemon_Controller = Dependency.new do |dep|
+-		dep.name = "daemon_controller >= 0.2.5"
++		dep.name = "daemon_controller >= 1.0.0"
+ 		dep.install_instructions = "Please install RubyGems first, then run " <<
+ 			"<b>#{PlatformInfo.gem_command || "gem"} install daemon_controller</b>"
+ 		dep.define_checker do |result|
+@@ -591,7 +590,7 @@
+ 				require 'daemon_controller'
+ 				begin
+ 					require 'daemon_controller/version'
+-					too_old = DaemonController::VERSION_STRING < '0.2.5'
++					too_old = DaemonController::VERSION_STRING < '1.0.0'
+ 				rescue LoadError
+ 					too_old = true
+ 				end
+@@ -610,23 +609,18 @@
+ 		end
+ 	end
+ 	
+-	AsciiDoc = Dependency.new do |dep|
+-		dep.name = "Asciidoc"
++	Mizuho = Dependency.new do |dep|
++		dep.name = "Mizuho"
+ 		dep.define_checker do |result|
+-			if PlatformInfo.asciidoc.nil?
++			mizuho = PlatformInfo.find_command('mizuho')
++			if mizuho.nil?
+ 				result.not_found
+ 			else
+-				result.found(PlatformInfo.asciidoc)
++				result.found(mizuho)
+ 			end
+ 		end
+-		if RUBY_PLATFORM =~ /darwin/
+-			# Installing asciidoc with source-highlight is too much of a pain on OS X,
+-			# so recommend Mizuho instead.
+ 			dep.website = "http://github.com/FooBarWidget/mizuho"
+ 			dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo.gem_command || "gem"} install mizuho</b>"
+-		else
+-			dep.website = "http://www.methods.co.nz/asciidoc/"
+-		end
+ 	end
+ end
+ 
+diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/command.rb passenger.git/lib/phusion_passenger/standalone/command.rb
+--- passenger-3.0.12/lib/phusion_passenger/standalone/command.rb	2012-04-13 12:09:58.000000000 +0400
++++ passenger.git/lib/phusion_passenger/standalone/command.rb	2012-05-17 19:35:01.000000000 +0400
+@@ -1,5 +1,5 @@
+ #  Phusion Passenger - http://www.modrails.com/
+-#  Copyright (c) 2010 Phusion
++#  Copyright (c) 2010, 2011, 2012 Phusion
+ #
+ #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ #
+@@ -61,13 +61,13 @@
+ 				require 'daemon_controller'
+ 				begin
+ 					require 'daemon_controller/version'
+-					too_old = DaemonController::VERSION_STRING < '0.2.5'
++					too_old = DaemonController::VERSION_STRING < '1.0.0'
+ 				rescue LoadError
+ 					too_old = true
+ 				end
+ 				if too_old
+ 					error "Your version of daemon_controller is too old. " <<
+-					      "You must install 0.2.5 or later. Please upgrade:\n\n" <<
++					      "You must install 1.0.0 or later. Please upgrade:\n\n" <<
+ 					      
+ 					      " sudo gem uninstall FooBarWidget-daemon_controller\n" <<
+ 					      " sudo gem install daemon_controller"
+@@ -210,24 +210,21 @@
+ 		end
+ 	end
+ 	
+-	def ping_nginx
+-		require 'socket' unless defined?(UNIXSocket)
+-		if @options[:socket_file]
+-			UNIXSocket.new(@options[:socket_file])
+-		else
+-			TCPSocket.new(@options[:address], nginx_ping_port)
+-		end
+-	end
+-	
+ 	def create_nginx_controller(extra_options = {})
+ 		require_daemon_controller
++		require 'socket' unless defined?(UNIXSocket)
+ 		@temp_dir        = "/tmp/passenger-standalone.#{$$}"
+ 		@config_filename = "#{@temp_dir}/config"
++		if @options[:socket_file]
++			ping_spec = [:unix, @options[:socket_file]]
++		else
++			ping_spec = [:tcp, @options[:address], nginx_ping_port]
++		end
+ 		opts = {
+ 			:identifier    => 'Nginx',
+ 			:before_start  => method(:write_nginx_config_file),
+ 			:start_command => method(:determine_nginx_start_command),
+-			:ping_command  => method(:ping_nginx),
++			:ping_command  => ping_spec,
+ 			:pid_file      => @options[:pid_file],
+ 			:log_file      => @options[:log_file],
+ 			:timeout       => 25
+diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/runtime_installer.rb passenger.git/lib/phusion_passenger/standalone/runtime_installer.rb
+--- passenger-3.0.12/lib/phusion_passenger/standalone/runtime_installer.rb	2012-04-13 12:09:58.000000000 +0400
++++ passenger.git/lib/phusion_passenger/standalone/runtime_installer.rb	2012-05-17 19:35:01.000000000 +0400
+@@ -91,8 +91,8 @@
+ 		if Dependencies.fastthread_required?
+ 			result << Dependencies::FastThread
+ 		end
+-		if Dependencies.asciidoc_required?
+-			result << Dependencies::AsciiDoc
++		if Dependencies.mizuho_required?
++			result << Dependencies::Mizuho
+ 		end
+ 		return result
+ 	end
+diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/start_command.rb passenger.git/lib/phusion_passenger/standalone/start_command.rb
+--- passenger-3.0.12/lib/phusion_passenger/standalone/start_command.rb	2012-04-13 12:09:58.000000000 +0400
++++ passenger.git/lib/phusion_passenger/standalone/start_command.rb	2012-05-17 19:35:01.000000000 +0400
+@@ -243,15 +243,32 @@
+ 		end
+ 	end
+ 	
+-	def check_port_availability
+-		if !@options[:socket_file]
++	def check_port(address, port)
++		begin
++			socket = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)
++			sockaddr = Socket.pack_sockaddr_in(port, address)
++			begin
++				socket.connect_nonblock(sockaddr)
++			rescue Errno::ENOENT, Errno::EINPROGRESS, Errno::EAGAIN, Errno::EWOULDBLOCK
++				if select(nil, [socket], nil, 0.1)
+ 			begin
+-				TCPSocket.new(@options[:address], @options[:port]).close
+-				port_taken = true
+-			rescue SystemCallError
+-				port_taken = false
++						socket.connect_nonblock(sockaddr)
++					rescue Errno::EISCONN
++					end
++				else
++					raise Errno::ECONNREFUSED
++				end
+ 			end
+-			if port_taken
++			return true
++		rescue Errno::ECONNREFUSED
++			return false
++		ensure
++			socket.close if socket
++		end
++	end
++	
++	def check_port_availability
++		if !@options[:socket_file] && check_port(@options[:address], @options[:port])
+ 				error "The address #{@options[:address]}:#{@options[:port]} is already " <<
+ 				      "in use by another process, perhaps another Phusion Passenger " <<
+ 				      "Standalone instance.\n\n" <<
+@@ -261,7 +278,6 @@
+ 				exit 1
+ 			end
+ 		end
+-	end
+ 	
+ 	def should_watch_logs?
+ 		return !@options[:daemonize] && @options[:log_file] != "/dev/null"
+diff -wbBur passenger-3.0.12/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb passenger.git/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb
+--- passenger-3.0.12/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb	2012-04-13 12:09:58.000000000 +0400
++++ passenger.git/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb	2012-05-17 19:35:01.000000000 +0400
+@@ -1,7 +1,7 @@
+ <red>WARNING:</red> <yellow>Apache doesn't seem to be compiled with the 'prefork', 'worker' or 'event' MPM</yellow>
+ 
+ Phusion Passenger has only been tested on Apache with the 'prefork', the
+-'worker' and the 'worker' MPM. Your Apache installation is compiled with
++'worker' and the 'event' MPM. Your Apache installation is compiled with
+ the '<%= @current_mpm %>' MPM. We recommend you to abort this installer and to recompile
+ Apache with either the 'prefork', the 'worker' or the 'event' MPM.
+ 
+diff -wbBur passenger-3.0.12/lib/phusion_passenger/templates/standalone/config.erb passenger.git/lib/phusion_passenger/templates/standalone/config.erb
+--- passenger-3.0.12/lib/phusion_passenger/templates/standalone/config.erb	2012-04-13 12:09:58.000000000 +0400
++++ passenger.git/lib/phusion_passenger/templates/standalone/config.erb	2012-05-17 19:35:01.000000000 +0400
+@@ -27,7 +27,7 @@
+ master_process on;
+ worker_processes 1;
+ daemon on;
+-error_log '<%= @options[:log_file] %>';
++error_log '<%= @options[:log_file] %>' info;
+ pid '<%= @options[:pid_file] %>';
+ <% if @options[:user] %>user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;<% end %>
+ 
+@@ -36,6 +36,7 @@
+ }
+ 
+ http {
++    log_format debug '[$time_local] $msec  "$request" $status conn=$connection sent=$bytes_sent body_sent=$body_bytes_sent';
+     include '<%= PhusionPassenger::RESOURCES_DIR %>/mime.types';
+     passenger_ruby <%= PlatformInfo.ruby_command %>;
+     passenger_root '<%= passenger_root %>';
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index c27b0d27d..33e2b34fe 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 69962 2012-04-27 10:25:29Z mtorromeo $
+# $Id: PKGBUILD 70768 2012-05-16 14:40:05Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=percona-server
-pkgver=5.5.22_rel25.2
+pkgver=5.5.23_rel25.3
 pkgrel=1
 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server"
 arch=('i686' 'x86_64')
@@ -99,6 +99,6 @@ package() {
 	install -dm700 "${pkgdir}"/var/lib/mysql
 }
 
-md5sums=('2fc67b0e0e31c1a7949beae9399abc33'
+md5sums=('b098914c14256187686db0ccbc46a6d4'
          '243864805611764a7e5883c1dba7afd8'
          '1c949c0dbea5206af0db14942d9927b6')
diff --git a/community/php-geoip/PKGBUILD b/community/php-geoip/PKGBUILD
index 37b59a9be..f3f193205 100644
--- a/community/php-geoip/PKGBUILD
+++ b/community/php-geoip/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57315 2011-10-25 17:20:28Z foutrelis $
+# $Id: PKGBUILD 70501 2012-05-09 18:48:05Z pschmitz $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=php-geoip
 pkgver=1.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="GeoIP module for PHP"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pecl.php.net/package/geoip"
@@ -11,7 +11,7 @@ license=('PHP')
 depends=('php' 'geoip')
 backup=('etc/php/conf.d/geoip.ini')
 source=(http://pecl.php.net/get/geoip-$pkgver.tgz)
-sha1sums=('f8d17da3e192002332ab54b9b4ab0f5deeaf9f15')
+sha256sums=('08beeb2cbe9ab729d06b026795f5b9084aead6a1762493b0be53c4393d68d08a')
 
 build() {
   cd "$srcdir/geoip-$pkgver"
diff --git a/community/php-memcache/PKGBUILD b/community/php-memcache/PKGBUILD
index ac2f91fbc..8e9d67f97 100644
--- a/community/php-memcache/PKGBUILD
+++ b/community/php-memcache/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 64649 2012-02-17 13:33:44Z foutrelis $
+# $Id: PKGBUILD 70503 2012-05-09 18:48:11Z pschmitz $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=php-memcache
 pkgver=3.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Memcache module for PHP"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pecl.php.net/package/memcache"
diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD
index 90338e5ed..fedae5dae 100644
--- a/community/php-memcached/PKGBUILD
+++ b/community/php-memcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69284 2012-04-12 09:18:59Z foutrelis $
+# $Id: PKGBUILD 70505 2012-05-09 18:48:15Z pschmitz $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=php-memcached
 pkgver=2.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="PHP extension for interfacing with memcached via libmemcached library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pecl.php.net/package/memcached"
diff --git a/community/pidgin-otr/PKGBUILD b/community/pidgin-otr/PKGBUILD
index 2a01f18f7..3cfaae4ac 100644
--- a/community/pidgin-otr/PKGBUILD
+++ b/community/pidgin-otr/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57815 2011-11-03 09:57:10Z lfleischer $
+# $Id: PKGBUILD 70766 2012-05-16 13:08:20Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -6,16 +6,17 @@
 # Contributor: Marcel Wysocki <maci@satgnu.net>
 
 pkgname=pidgin-otr
-pkgver=3.2.0
-pkgrel=3
+pkgver=3.2.1
+pkgrel=1
 pkgdesc='Off-the-Record Messaging plugin for Pidgin.'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://www.cypherpunks.ca/otr/'
 depends=('libotr>=3.2.0' 'pidgin' 'perlxml')
+makedepends=('intltool')
 source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz"{,.asc})
-md5sums=('8af70b654b7d7c5a5b7785699ff562f9'
-         '67d711a7a44cef2791f50b319aaf0e0e')
+md5sums=('4c3f73cca729555ff46c09e789ef6896'
+         'e9a6d699768bd888f086e697ad984aa7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD
index 8b75abcdd..84b646d14 100644
--- a/community/pigeonhole/PKGBUILD
+++ b/community/pigeonhole/PKGBUILD
@@ -4,12 +4,12 @@
 # This must be built against the version of dovecot being used,
 # else mail delivery will fail.
 # Specify the version of dovecot to be used here:
-_dcpkgver=2.1.5
+_dcpkgver=2.1.6
 # Make sure to bump pkgrel if changing this.
 
 pkgname=pigeonhole
 pkgver=0.3.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pigeonhole.dovecot.org/"
diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD
index e85e59349..9df9b58d9 100644
--- a/community/powertop/PKGBUILD
+++ b/community/powertop/PKGBUILD
@@ -1,31 +1,29 @@
-# $Id: PKGBUILD 67110 2012-03-04 12:47:55Z stativ $
+# $Id: PKGBUILD 70596 2012-05-12 11:08:44Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Xilon <xilonmu@gmail.com>
 
 pkgname=powertop
-pkgver=1.13
-pkgrel=3
-pkgdesc="Tool that finds the software that makes your laptop use more power than necessary"
+pkgver=2.0
+pkgrel=1
+pkgdesc="A tool to diagnose issues with power consumption and power management"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.lesswatts.org/projects/powertop/"
+url="https://01.org/powertop/"
 license=('GPL2')
-depends=('ncurses')
-source=(http://www.lesswatts.org/projects/powertop/download/$pkgname-$pkgver.tar.gz \
-        powertop-1.13-with-3.0.6.patch)
-md5sums=('78aa17c8f55178004223bf236654298e'
-         '2b4c9d75fb0f5c96bcd549bcbbeb9c9d')
+depends=('libnl' 'ncurses')
+changelog=$pkgname.changelog
+source=(https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.bz2)
+sha256sums=('7af51d320856b3446bcc314c9414385f3b05b9360f650883b0210cd3b12c5c1c')
 
 build() {
-  cd "$srcdir/powertop-$pkgver"
-
-  # fix the reported batery usage on recent kernels
-  patch -Np1 < "$srcdir/powertop-1.13-with-3.0.6.patch" || true
+  cd ${srcdir}/$pkgname-$pkgver
 
+  ./configure --prefix=/usr 
   make
 }
 
 package() {
-  cd "$srcdir/powertop-$pkgver"
-  make DESTDIR="$pkgdir" install
+  cd ${srcdir}/$pkgname-$pkgver
+
+  make DESTDIR=${pkgdir} install
 }
diff --git a/community/powertop/powertop.changelog b/community/powertop/powertop.changelog
new file mode 100644
index 000000000..7e8deb15d
--- /dev/null
+++ b/community/powertop/powertop.changelog
@@ -0,0 +1,2 @@
+2012-05-12 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+	* powertop 2.0-1
diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD
index b1a5972dd..d6590b9c6 100644
--- a/community/pptpd/PKGBUILD
+++ b/community/pptpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 70218 2012-05-02 13:03:21Z spupykin $
+# $Id: PKGBUILD 70497 2012-05-09 17:18:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=pptpd
 pkgver=1.3.4
-pkgrel=6
+pkgrel=7
 pkgdesc="Poptop server"
 arch=(i686 x86_64 'mips64el')
 url="http://poptop.sourceforge.net/"
@@ -11,12 +11,15 @@ license=('GPL')
 depends=(ppp glibc)
 backup=(etc/pptpd.conf)
 source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz
-	pptpd)
+	pptpd
+	unrecognized-opt.patch)
 md5sums=('b38df9c431041922c997c1148bedf591'
-         'e09f81beb5d59a0fdfba94e3a60d992b')
+         'e09f81beb5d59a0fdfba94e3a60d992b'
+         'cfa02c86d0413eb94fac15599986f54c')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  patch -p1 <$srcdir/unrecognized-opt.patch
   autoreconf -i
   ./configure --prefix=/usr --libdir=/usr/lib --exec-prefix=/usr --mandir=/usr/share
   make
diff --git a/community/pptpd/unrecognized-opt.patch b/community/pptpd/unrecognized-opt.patch
new file mode 100644
index 000000000..17ec49e52
--- /dev/null
+++ b/community/pptpd/unrecognized-opt.patch
@@ -0,0 +1,13 @@
+diff -wbBur pptpd-1.3.4/pptpctrl.c pptpd-1.3.4.my/pptpctrl.c
+--- pptpd-1.3.4/pptpctrl.c	2006-12-08 03:01:40.000000000 +0300
++++ pptpd-1.3.4.my/pptpctrl.c	2012-05-09 21:13:30.000000000 +0400
+@@ -759,8 +759,8 @@
+ 			syslog(LOG_DEBUG, "CTRL (PPPD Launcher): remote address = %s", pppaddrs[1]);
+ 	}
+ 	
+-	if (*pppaddrs[0] || *pppaddrs[1]) {
+ 		char pppInterfaceIPs[33];
++	if (*pppaddrs[0] || *pppaddrs[1]) {
+ 		sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
+ 		pppd_argv[an++] = pppInterfaceIPs;
+ 	}
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index 994cf84fa..9dc7f4f2a 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66166 2012-02-23 02:25:30Z spupykin $
+# $Id: PKGBUILD 70828 2012-05-17 10:16:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Dwayne Bent <dbb.0@liqd.org>
 # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
 
 pkgname=prosody
 pkgver=0.8.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://prosody.im/"
@@ -20,11 +20,13 @@ backup=('etc/logrotate.d/prosody'
 source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz"
 	'prosody.rcd'
 	'prosody.logrotated'
-	'fix-config.patch')
+	'fix-config.patch'
+	'prosody.tmpfile.d')
 md5sums=('6e907bf0d0acf24f1011083020ba6ffb'
          'd2b5f9c8e42bb31819e715eb1756ee53'
          '26466fdbea87963a3ca6f48f76fe4a29'
-         '59a1bf2dfd0bd386cef6fa646e2a3752')
+         '59a1bf2dfd0bd386cef6fa646e2a3752'
+         'e2f5a1df410b05696a30dcb058841084')
 
 build() {
     cd "$srcdir/prosody-$pkgver"
@@ -50,5 +52,6 @@ package() {
     install -o root -g root -m 644 "$srcdir/prosody.logrotated" \
         "$pkgdir/etc/logrotate.d/prosody"
 
-    install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+    install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+    install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir//usr/lib/tmpfiles.d/prosody.conf
 }
diff --git a/community/prosody/prosody.tmpfile.d b/community/prosody/prosody.tmpfile.d
new file mode 100644
index 000000000..5f6de657d
--- /dev/null
+++ b/community/prosody/prosody.tmpfile.d
@@ -0,0 +1 @@
+d    /run/prosody 0755 412 412
diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD
index 25bdc0312..672ece806 100644
--- a/community/python-pymongo/PKGBUILD
+++ b/community/python-pymongo/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 60320 2011-12-10 12:45:52Z arodseth $
+# $Id: PKGBUILD 70698 2012-05-15 08:14:57Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
+
 pkgname=python-pymongo
-pkgver=1.9b1
-pkgrel=3
+pkgver=2.2
+pkgrel=1
 pkgdesc="Python driver for MongoDB"
 arch=('x86_64' 'i686' 'mips64el')
 license=("APACHE")
-url="http://pypi.python.org/pypi/pymongo3/"
+url="http://pypi.python.org/pypi/pymongo/"
 depends=('python')
 makedepends=('python-distribute')
-source=("http://pypi.python.org/packages/source/p/pymongo3/pymongo3-$pkgver.tar.gz")
-sha256sums=('dcabaaca2f0067e648c2b081a70564b832de981495ff953597c1e451a7fcac20')
+source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz")
+sha256sums=('ac7952896ecfd5d9b4b9d8bb0077c95a0296ea21374df85e2ca32c237c0be57f')
 
 package() {
-  cd "$srcdir/pymongo3-$pkgver"
+  cd "$srcdir/pymongo-$pkgver"
 
   LANG=en_US.UTF8 python setup.py install --root="$pkgdir" --optimize=1
 }
diff --git a/community/python2-pymongo/PKGBUILD b/community/python2-pymongo/PKGBUILD
index 22e894a3b..eb27d7d31 100644
--- a/community/python2-pymongo/PKGBUILD
+++ b/community/python2-pymongo/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=python2-pymongo
-pkgver=2.1
+pkgver=2.2
 pkgrel=1
 pkgdesc="Python driver for MongoDB"
 license=("APACHE")
@@ -12,7 +12,7 @@ depends=('python2')
 makedepends=('python2-distribute')
 source=(http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz)
 arch=('i686' 'x86_64' 'mips64el')
-md5sums=('40f8c8be0edcea398ba41d5d3ba5e8b0')
+md5sums=('101dd4ae59bdd487f67b3a3968a82c8c')
 
 package() {
   cd $srcdir/pymongo-$pkgver
diff --git a/community/python2-virtkey/PKGBUILD b/community/python2-virtkey/PKGBUILD
new file mode 100644
index 000000000..237f64857
--- /dev/null
+++ b/community/python2-virtkey/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: codl <codl@aquageek.net>
+# Contributor: Megamixman <Megamixman@gmail.com>
+
+pkgname=python2-virtkey
+_pkgname=python-virtkey
+pkgver=0.60.0
+pkgrel=3
+pkgdesc="Python extension for emulating keypresses and getting layout information from the X server"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/python-virtkey"
+license=('LGPL')
+depends=('python2' 'libxtst' 'gtk2')
+replaces=('python-virtkey')
+provides=('python-virtkey')
+source=(http://launchpad.net/$_pkgname/${pkgver%.*}/$pkgver/+download/$_pkgname-$pkgver.tar.gz)
+md5sums=('f4f6776f379bc635a29eac83a14fdde5')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  python2 setup.py build
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  python2 setup.py install --root=$pkgdir/ --optimize=1
+}
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 7d7806da5..7782b4c54 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63396 2012-02-01 14:18:50Z svenstaro $
+# $Id: PKGBUILD 70483 2012-05-09 14:56:54Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -7,8 +7,8 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname="qtcreator"
-pkgver=2.4.1
-_pkgver=2.4.1
+pkgver=2.5.0
+_pkgver=2.5.0
 pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,11 +23,12 @@ optdepends=('qt-doc: for the integrated Qt documentation'
             'openssh-askpass: for ssh support'
             'git: for git support'
             'mercurial: for mercurial support'
-            'bzr: for bazaar support')
+            'bzr: for bazaar support'
+            'valgrind: for analyze support')
 install=qtcreator.install
 source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz"
         'qtcreator.desktop')
-md5sums=('e3a95b86df5ce9151b40cfbb2b8bbf3b'
+md5sums=('31e26cdd1e3eeb8c406382ebe886dcc5'
          'f1f4680b9838ff0b8f4cf11eb850d662')
 
 build() {
diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD
index 5f2bedaa8..6aa010178 100644
--- a/community/quvi/PKGBUILD
+++ b/community/quvi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 59896 2011-12-02 07:00:15Z lfleischer $
+# $Id: PKGBUILD 70446 2012-05-07 08:29:18Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 
 pkgname=quvi
-pkgver=0.4.1
+pkgver=0.4.2
 pkgrel=1
 pkgdesc='Command-line tool for parsing video download links.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('LGPL')
 depends=('libquvi')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('0975e3d8cdf570d2143c49c249e698c5'
-         '53e2e206c17cb6a38c8c6b7b427b8b4a')
+md5sums=('05f1e2c711d1ca9d4bc68b8de553941d'
+         '523b17d5a9024c8b0a1636917d79e792')
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD
index eab94b895..c34f660cc 100644
--- a/community/r8168-lts/PKGBUILD
+++ b/community/r8168-lts/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68866 2012-04-04 09:58:28Z mtorromeo $
+# $Id: PKGBUILD 70870 2012-05-18 08:29:14Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=r8168-lts
 _pkgname=r8168
-pkgver=8.028.00
-pkgrel=4
-pkgdesc="A kernel module for Realtek 8168 network cards for kernel26-lts"
+pkgver=8.030.00
+pkgrel=2
+pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts"
 url="http://www.realtek.com.tw"
 license=("GPL")
 arch=('i686' 'x86_64')
@@ -28,5 +28,5 @@ package() {
 	find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
 }
 
-md5sums=('4cc3c1706f00b55ab9bd6f5e06b758c2')
-sha256sums=('c77873f43693eea5304e17e35ff3d6503f6581e358d28c38927573ea56f4d6a3')
+md5sums=('3205d895dbdc7564ba60b71acb308417')
+sha256sums=('1b2267703c83f1709cad115cc39b11e8c4b64e7944452c684ef2bd86c626d6c4')
diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD
index 965ec606a..5933729b9 100644
--- a/community/remmina/PKGBUILD
+++ b/community/remmina/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 70316 2012-05-04 09:53:40Z spupykin $
+# $Id: PKGBUILD 70791 2012-05-16 16:57:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=remmina
 pkgver=1.0.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Remmina is a remote desktop client written in GTK+. "
 arch=(i686 x86_64 'mips64el')
 url="http://remmina.sourceforge.net/"
 license=('GPL')
-depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp' 'libgnome-keyring')
-makedepends=('intltool' 'pkgconfig' 'cmake'
+depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp')
+makedepends=('intltool' 'pkgconfig' 'cmake' 'libgnome-keyring'
 	     'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib')
 optdepends=('libxkbfile'
 	    'freerdp'
@@ -32,5 +32,9 @@ build() {
   export LDFLAGS="-lX11 -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lpthread -lgnutls"
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_APPINDICATOR=OFF .
   make
+}
+
+package() {
+  cd ${srcdir}/FreeRDP-Remmina-*/
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD
index 8c3ed34d6..653f04467 100644
--- a/community/roxterm/PKGBUILD
+++ b/community/roxterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69819 2012-04-23 17:44:21Z ttopper $
+# $Id: PKGBUILD 70468 2012-05-08 20:11:39Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=roxterm
-pkgver=2.6.2
+pkgver=2.6.3
 pkgrel=1
 pkgdesc="Tabbed, VTE-based terminal emulator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm')
 makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg')
 install=roxterm.install
 source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2")
-sha1sums=('eca312666a1ff1412df2cddf93a12631c01d1a3a')
-md5sums=('5e5dc51b3341855fdb392f736476d89d')
+sha1sums=('f6f64cf35163338e539bdbc952d470b4a9217f9a')
+md5sums=('3089fc54b3c9bb8f8e087280bf96b037')
 
 
 build() {
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 3e9f6ebc8..3cf3c638e 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 66814 2012-02-28 22:45:12Z arodseth $
+# $Id: PKGBUILD 70700 2012-05-15 08:39:01Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
 pkgname=scite
-pkgver=3.0.3
+pkgver=3.1.0
 pkgrel=1
 pkgdesc='Editor with facilities for building and running programs'
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +17,7 @@ makedepends=('setconf')
 backup=('usr/share/scite/SciTEGlobal.properties')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz")
-sha256sums=('0d02b81f6f182366abe8133f4e727d802b756d33e9eeba5fe9ac69c4a17286fd')
+sha256sums=('09b020a331f7c54edd731440fa1c717776021d5dc775e58965f8ef71673202e3')
 
 build() {
   cd "$srcdir"
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index 8711dda85..58124460e 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69744 2012-04-23 09:08:15Z ibiru $
+# $Id: PKGBUILD 70567 2012-05-11 20:13:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=shotwell
-pkgver=0.12.2
+pkgver=0.12.3
 pkgrel=1
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('libgee' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
 makedepends=('intltool' 'vala')
 install=shotwell.install
 source=("http://yorba.org/download/shotwell/0.12/shotwell-${pkgver}.tar.bz2")
-md5sums=('ce3a3204ca3c1dd451ac43e3b80c28d9')
+md5sums=('de0e05350f8a7d557092489baf14d039')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/simh/PKGBUILD b/community/simh/PKGBUILD
index fb4130e97..2c2018374 100644
--- a/community/simh/PKGBUILD
+++ b/community/simh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66322 2012-02-23 14:04:05Z allan $
+# $Id: PKGBUILD 70434 2012-05-06 12:11:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: waterbear <st92.at.freeshell.org>
 
 pkgname=simh
-pkgver=3.8.1
-_pkgver=38-1
-pkgrel=3
+pkgver=3.9.0
+_pkgver=39-0
+pkgrel=1
 pkgdesc="simulator for assorted historical computers, from Altair to VAX"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://simh.trailing-edge.com"
@@ -15,7 +15,7 @@ makedepends=("unzip")
 install=simh.install
 source=("http://simh.trailing-edge.com/sources/simhv${_pkgver}.zip"
 	"LICENSE")
-md5sums=('e15f65a82e21ea49e14b438326d93d5c'
+md5sums=('b80385888f23269abaee0bad7d84ea7c'
          'd56eefa5d020ee2b77d21280fef80e3d')
 
 build() {
diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD
index d27f6865f..9a5e4bcc7 100644
--- a/community/snort/PKGBUILD
+++ b/community/snort/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69276 2012-04-11 23:23:45Z lfleischer $
+# $Id: PKGBUILD 70868 2012-05-18 06:19:27Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 
 pkgname=snort
-pkgver=2.9.2.2
+pkgver=2.9.2.3
 pkgrel=1
 pkgdesc='A lightweight network intrusion detection system.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,7 +24,7 @@ install='snort.install'
 source=("http://www.snort.org/dl/snort-current/${pkgname}-${pkgver}.tar.gz"
         'snort'
         'snort.conf.d')
-md5sums=('4254389550e3be31afebc70e64e6002f'
+md5sums=('9ddb26005d864577fca66a9a1cdfdc8a'
          '361b8b9e40b9af0164f6b3e3da2e8277'
          'b4fb8a68490589cd34df93de7609bfac')
 
diff --git a/community/soundkonverter/PKGBUILD b/community/soundkonverter/PKGBUILD
index e3ccf47d2..8fcdfbc57 100644
--- a/community/soundkonverter/PKGBUILD
+++ b/community/soundkonverter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68236 2012-03-20 07:50:05Z stativ $
+# $Id: PKGBUILD 70533 2012-05-10 17:21:08Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=soundkonverter
-pkgver=1.4.0
+pkgver=1.5.0
 pkgrel=1
 pkgdesc="Front-end to various audio converters"
 arch=('i686' 'x86_64' 'mips64el')
@@ -31,7 +31,7 @@ optdepends=('cdrkit: cdda2wav backend'
             'wavpack: wavpack backend')
 install=$pkgname.install
 source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz")
-md5sums=('4d3d1ccab74c2dd41971c3a4a4e7fb57')
+md5sums=('9cb8dcf64bd257965a227d79e3c6e7fb')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index 5c74ce8df..7c6210b0c 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -1,45 +1,50 @@
-# $Id: PKGBUILD 69659 2012-04-22 00:48:23Z seblu $
+# $Id: PKGBUILD 70896 2012-05-18 22:00:49Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
 # Contributor: Jason Rodriguez <jason-aur@catloaf.net>
 
 pkgname=sslh
-pkgver=1.11
+pkgver=1.13b
 pkgrel=1
 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.rutschle.net/tech/sslh.shtml'
 license=('GPL2')
-backup=('etc/conf.d/sslh')
+depends=('libconfig')
+backup=('etc/conf.d/sslh' 'etc/sslh.conf')
 source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz"
         'sslh.rc'
-        'sslh.conf'
-        'sslh.service')
-md5sums=('4ea599f0fa31ae235646e5a200b8f8fb'
-         'f64da291e97f1a99c33cb6ebf939b95b'
-         'a098fb6b03a3435b223e16aed0e65e0b'
-         'ee8a4fcfc1f6839f7c93deb6f59f7fd6')
+        'sslh.conf')
+md5sums=('fbd8934e6f799437c562866f09afee5b'
+         'c2a0c7c58d091acf5b4672f58066ee8f'
+         'c51c63d2b28080bae4c1c7a0c469bab7')
 
 build() {
-  cd $pkgname-$pkgver
+  #cd $pkgname-$pkgver
+  cd $pkgname-1.13
   # fix archlinux path in manpage
-  sed -i -e "s/init.d/rc.d/" sslh.pod
-  sed -i -e "s+/etc/default+/etc/conf.d+" sslh.pod
-  make
+  sed -i 's/init.d/rc.d/' sslh.pod
+  sed -i 's+/etc/default+/etc/conf.d+' sslh.pod
+  make VERSION=\"v$pkgver\"
 }
 
 package() {
   # install initscripts
   install -Dm 755 sslh.rc "$pkgdir/etc/rc.d/sslh"
   install -Dm 644 sslh.conf "$pkgdir/etc/conf.d/sslh"
-  # install systemd service
-  install -Dm 644 sslh.service "$pkgdir/usr/lib/systemd/system/sslh.service"
   # manually install to have both ssl-fork and ssl-select
-  cd $pkgname-$pkgver
+  #cd $pkgname-$pkgver
+  cd $pkgname-1.13
   install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork"
   install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select"
   ln -s sslh-fork "$pkgdir/usr/bin/sslh"
+  # install manpage
   install -Dm 0644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz"
+  # install example file
+  install -Dm 0644 example.cfg "$pkgdir/etc/sslh.conf"
+  # install systemd service
+  install -Dm 644 scripts/systemd.sslh.service \
+    "$pkgdir/usr/lib/systemd/system/sslh.service"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/sslh/sslh.conf b/community/sslh/sslh.conf
index b22a325ef..d3a46d053 100644
--- a/community/sslh/sslh.conf
+++ b/community/sslh/sslh.conf
@@ -1,3 +1,3 @@
 # vim:set ts=2 sw=2 ft=sh noet:
 
-DAEMON_OPTS='-p 192.168.0.1:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443 -u nobody'
+DAEMON_OPTS='-F /etc/sslh.conf'
diff --git a/community/sslh/sslh.rc b/community/sslh/sslh.rc
index 9c31435a0..456e122f4 100644
--- a/community/sslh/sslh.rc
+++ b/community/sslh/sslh.rc
@@ -4,31 +4,31 @@
 . /etc/rc.d/functions
 . /etc/conf.d/${0##*/}
 
-NAME=sslh
 DAEMON=/usr/bin/sslh
 PID=$(pidof -o %PPID $DAEMON)
+DAEMON_OPTS="--background $DAEMON_OPTS"
 
 case "$1" in
-	start)
-		stat_busy "Starting $NAME daemon"
-		[[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
+  start)
+    stat_busy "Starting ${0##*/} daemon"
+    [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
+    stat_fail
+  ;;
   stop)
-		stat_busy "Stopping $NAME daemon"
-		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
+    stat_busy "Stopping ${0##*/} daemon"
+    [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
+    stat_fail
+  ;;
   restart)
-		$0 stop
-		$0 start
-		exit 0
-	;;
+    $0 stop
+    $0 start
+    exit 0
+  ;;
   *)
-		echo "usage: ${0##*/} {start|stop|restart}" >&2
-	;;
+    echo "usage: ${0##*/} {start|stop|restart}" >&2
+  ;;
 esac
 
 exit 1
 
-# vim:set ts=2 sw=2 ft=sh noet:
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD
index a8c10e9ed..d8580657e 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 67591 2012-03-13 12:49:15Z spupykin $
+# $Id: PKGBUILD 70821 2012-05-17 08:59:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Martin Devera <devik@cdi.cz>
 
 pkgname=sysstat
-pkgver=10.0.4
+pkgver=10.0.5
 pkgrel=1
 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ backup=('etc/conf.d/sysstat'
 	'etc/conf.d/sysstat.ioconf')
 source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
 	sysstat)
-md5sums=('c84fd7774080dae34f47257175a0b187'
+md5sums=('208dd236d726d20591d53d3a20124dd4'
          '3ce41ebf7330aba01e70b38658afed1f')
 
 build() {
diff --git a/community/tig/PKGBUILD b/community/tig/PKGBUILD
index 63f0a5f06..3dda790b9 100644
--- a/community/tig/PKGBUILD
+++ b/community/tig/PKGBUILD
@@ -4,15 +4,15 @@
 # Contributor: Nathan Jones <nathanj@insightbb.com>
 
 pkgname=tig
-pkgver=0.18
-pkgrel=2
+pkgver=1.0
+pkgrel=1
 pkgdesc='Text-mode interface for Git.'
 depends=('git' 'ncurses')
 url='http://jonas.nitro.dk/tig/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('4fa9e33c5daa76b6fed11e068405356f')
+md5sums=('a2d414d1cebbc9cd4f3d545bc6f225c6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/ucommon/PKGBUILD b/community/ucommon/PKGBUILD
new file mode 100644
index 000000000..bb002c30a
--- /dev/null
+++ b/community/ucommon/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 70712 2012-05-15 11:28:13Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Dan Serban
+# Contributors: David Zaragoza, Andrea Scarpino
+
+pkgname=ucommon
+pkgver=5.2.2
+pkgrel=1
+pkgdesc="A light-weight C++ library to facilitate using C++ design patterns"
+arch=(i686 x86_64)
+url=http://ftp.gnu.org/gnu/commoncpp/
+license=(GPL)
+depends=(openssl)
+makedepends=(lynx)
+options=('!libtool')
+source=("http://ftp.gnu.org/pub/gnu/commoncpp/ucommon-$pkgver.tar.gz")
+md5sums=('4739fcd9db006432f1b8e2ea226e414a')
+
+build() {
+  cd $(ls -1d ucommon-*/ | tail -1)
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/uget/PKGBUILD b/community/uget/PKGBUILD
index bf103729d..73c1ba391 100644
--- a/community/uget/PKGBUILD
+++ b/community/uget/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 69404 2012-04-15 22:27:21Z bgyorgy $
+# $Id: PKGBUILD 70730 2012-05-15 22:54:45Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=uget
-pkgver=1.8.1
+pkgver=1.8.2
 pkgrel=1
 pkgdesc="GTK+ download manager featuring download classification and HTML import"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool')
 optdepends=('aria2: alternative backend')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver.tar.gz)
-md5sums=('e3fc14042820f0496f12c85c3847c6f8')
+md5sums=('42be57f08f41ffe4f5c4b60a4e8aa079')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/volumeicon/PKGBUILD b/community/volumeicon/PKGBUILD
index daa61ed5d..574ebfbde 100644
--- a/community/volumeicon/PKGBUILD
+++ b/community/volumeicon/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 64486 2012-02-14 08:50:43Z arodseth $
+# $Id: PKGBUILD 70695 2012-05-15 07:22:05Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Maato <maato softwarebakery com>
 
 pkgname=volumeicon
 pkgver=0.4.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Volume control for your system tray"
 arch=('x86_64' 'i686')
 url="http://softwarebakery.com/maato/volumeicon.html"
 license=('GPL3')
-depends=('gtk2>=2.16.0' 'alsa-lib')
-source=("http://softwarebakery.com/maato/files/volumeicon/$pkgname-$pkgver.tar.gz")
-sha256sums=('32f94adc5f346404ae564405dd483ae4bd04212df08e46f18d369b4ba2cb6590')
+depends=('gtk2>=2.16.0' 'alsa-lib' 'libnotify')
+source=("http://softwarebakery.com/maato/files/volumeicon/$pkgname-$pkgver.tar.gz"
+        "glib.patch")
+sha256sums=('32f94adc5f346404ae564405dd483ae4bd04212df08e46f18d369b4ba2cb6590'
+            'f2ab8b01cd9f554b170a773fa2a88c2874d97eb3fe106d4692595728201abeb0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr
+  patch -p1 < ../glib.patch
+  ./configure \
+    --prefix=/usr \
+    --enable-notify
   make
 }
 
diff --git a/community/volumeicon/glib.patch b/community/volumeicon/glib.patch
new file mode 100644
index 000000000..93e47d2c4
--- /dev/null
+++ b/community/volumeicon/glib.patch
@@ -0,0 +1,14 @@
+--- volumeicon-0.4.6/src/alsa_backend.backup	2012-05-15 09:12:13.469335762 +0200
++++ volumeicon-0.4.6/src/alsa_backend.c	2012-05-15 09:12:31.862905251 +0200
+@@ -22,10 +22,7 @@
+ //##############################################################################
+ 
+ #include <alsa/asoundlib.h>
+-#include <glib/gstring.h>
+-#include <glib/gstdio.h>
+-#include <glib/glist.h>
+-#include <glib/giochannel.h>
++#include <glib.h>
+ 
+ #include "alsa_backend.h"
+ 
diff --git a/community/wmname/PKGBUILD b/community/wmname/PKGBUILD
index 0d72d64c7..778e1f94a 100644
--- a/community/wmname/PKGBUILD
+++ b/community/wmname/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55541 2011-09-14 08:07:38Z andrea $
+# $Id: PKGBUILD 70751 2012-05-16 10:53:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vincent Kriek <vincent@vincentkriek.nl>
 
@@ -6,7 +6,7 @@ pkgname=wmname
 pkgver=0.1
 pkgrel=2
 pkgdesc="An utility to set the name of your window manager"
-url="http://www.suckless.org/programs/wmname.html"
+url="http://tools.suckless.org/wmname"
 license=('custom')
 depends=('libx11')
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/xapian-core/PKGBUILD b/community/xapian-core/PKGBUILD
index 14a00e706..56c0aba25 100644
--- a/community/xapian-core/PKGBUILD
+++ b/community/xapian-core/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68835 2012-04-03 16:30:36Z foutrelis $
+# $Id: PKGBUILD 70569 2012-05-11 20:14:44Z spupykin $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=xapian-core
-pkgver=1.2.9
+pkgver=1.2.10
 pkgrel=1
 pkgdesc='Open source search engine library.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('sh' 'gcc-libs' 'zlib' 'util-linux')
 # xapian config requires libxapian.la
 options=('libtool')
 source=("http://oligarchy.co.uk/xapian/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('909dd02931fe8f37690aa82a4daaa441')
+md5sums=('c773df1aa9a84d3a056863532a7f6519')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD
index 0c25492a4..5a2244bb9 100644
--- a/community/xdebug/PKGBUILD
+++ b/community/xdebug/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68086 2012-03-17 18:57:19Z spupykin $
+# $Id: PKGBUILD 70507 2012-05-09 18:48:25Z pschmitz $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <arch aur at jonw dot org>
 # Contributor: Jonathan Wiersma <arch aur at jonw dot org>
 # Contributor: sracker <smb.sac@gmail.com>
 
 pkgname=xdebug
-pkgver=2.1.4
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="PHP debugging extension"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ backup=('etc/php/conf.d/xdebug.ini')
 source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz
 	xdebug-5.2.ini
 	xdebug.ini)
-md5sums=('0a1339ad8053eface15ed6420a295939'
+md5sums=('27d8ad8224ffab04d12eecb5997a4f5d'
          '6b7fdbbe0bf381bda40e77e29981f439'
          '68de800943369d4c76bdf7eb35c8463b')
 
diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD
index 2fee0ffbe..d2aea71eb 100644
--- a/community/yaz/PKGBUILD
+++ b/community/yaz/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 69774 2012-04-23 09:16:32Z ibiru $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
+# $Id: PKGBUILD 70645 2012-05-13 19:04:54Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 
 pkgname=yaz
-pkgver=4.2.29
+pkgver=4.2.33
 pkgrel=1
 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers"
 arch=('i686' 'x86_64' 'mips64el')
-license=('BSD')
 url="http://www.indexdata.dk/yaz"
+license=('BSD')
 depends=('openssl' 'libxslt' 'icu')
 options=('!libtool')
 source=("http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('584bcf12401f182a42091616c6cf7e0a')
+sha256sums=('77baecaa0b032c0155676e704d39b49415d4793ab65ad6c26e04f6dfb0be1276')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd ${srcdir}/$pkgname-$pkgver
 
   ./configure --prefix=/usr \
               --enable-shared=yaz \
@@ -27,12 +28,9 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd ${srcdir}/$pkgname-$pkgver
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR=${pkgdir} install
 
-  install -Dm644 LICENSE \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index 2c5361a0c..3e93a1ac1 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 153952 2012-03-21 02:16:32Z eric $
+# $Id: PKGBUILD 158669 2012-05-06 12:13:14Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=bash
 _basever=4.2
-_patchlevel=024 #prepare for some patches
+_patchlevel=028 #prepare for some patches
 pkgver=$_basever.$_patchlevel
-pkgrel=2
+pkgrel=1
 pkgdesc="The GNU Bourne Again shell"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -127,4 +127,12 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
          '3fab459b4e09daea529cacad025b13b3'
          'bab99835ad6198cb1109fac89a085262'
          '4ad8d11e72afc6090e701073ff034cf4'
-         '5658ef10c9d0d804126ec1ce700e4e2c')
+         '5658ef10c9d0d804126ec1ce700e4e2c'
+         'c7d2493e44490f01dd20bdc8feb0a6a7'
+         'e4855dbc4b743618b54d408bd5878637'
+         '9f19c199dd8d1fa9254eebe738759272'
+         '600c8e90c2fb13cdbc7aa3f18566df03'
+         'a6ed82daf034587aee2f2581ba5fe829'
+         '821620a0389df723644911c56796ca8c'
+         'da9265aa2527fd4a7481baa3e0550287'
+         '0043f8b75f46f43608a67b863e300fe8')
diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD
index da7ea13a7..cd42a6766 100644
--- a/core/coreutils/PKGBUILD
+++ b/core/coreutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 155401 2012-04-03 11:10:00Z allan $
+# $Id: PKGBUILD 158980 2012-05-14 04:41:15Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=coreutils
-pkgver=8.16
-pkgrel=2
+pkgver=8.17
+pkgrel=1
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -16,12 +16,10 @@ backup=('etc/pam.d/su')
 install=${pkgname}.install
 options=('!emptydirs')
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
-	coreutils-uname.patch
 	coreutils-pam.patch
 	su.pam)
-md5sums=('89b06f91634208dceba7b36ad1f9e8b9'
-         '63158176d5bb005c6871242c940eedf1'
-         'c4fcca138b6abf6d443d48a6f0cd8833'
+md5sums=('bbda656ce8ca2c6903948f9faa204ba3'
+         'ebecd29b095aa21b0b2f833f1ec20d70'
          'aad79a2aa6d566c375d7bdd1b0767278'
          'fa85e5cce5d723275b14365ba71a8aad')
 
@@ -31,9 +29,6 @@ build() {
   # added su wheel group pam patch (from fedora git)
   patch -Np1 -i ${srcdir}/coreutils-pam.patch
 
-  # linux specific uname improvement (from gentoo portage)
-  patch -Np1 -i ${srcdir}/coreutils-uname.patch
-
   autoreconf -v
   ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \
               --enable-install-program=su \
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 09bc23ca6..94d280a9b 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156586 2012-04-21 10:26:57Z allan $
+# $Id: PKGBUILD 158746 2012-05-09 01:14:02Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -10,8 +10,8 @@ else
     pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
 fi
 pkgver=4.7.0
-pkgrel=5
-_snapshot=4.7-20120414
+pkgrel=6
+_snapshot=4.7-20120505
 _libstdcppmanver=20120307		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
@@ -30,7 +30,7 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
 	gcc_pure64.patch
     gcc_mips64el_lib.patch
 	gcc-4.7.0-cloog-0.17.patch)
-md5sums=('9f9d082b64753d5908690500251fc52e'
+md5sums=('8e2df3b9a755c9262db0df019cc3542e'
          '489d2f5311535800a120efd8d18db719'
          'ced48436c1b3c981d721a829f1094de1'
          '474b8f5a7dee6ddd96b95a7240bfb961'
@@ -164,8 +164,8 @@ package_gcc()
   
   make -j1 DESTDIR=${pkgdir} install
 
-  install -d $pkgdir/usr/share/gdb/auto-load
-  mv $pkgdir/usr/{lib/libstdc++.so.6.0.17-gdb.py,share/gdb/auto-load}
+  install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
+  mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py
 
   # unfortunately it is much, much easier to install the lot and clean-up the mess...
   # -f makes rm return 0 if the archive doesn't exist
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 46603ac2c..1e1464ad8 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157381 2012-04-28 09:25:44Z allan $
+# $Id: PKGBUILD 159164 2012-05-16 20:53:29Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=glib2
-pkgver=2.32.1
-pkgrel=3
+pkgver=2.32.3
+pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
 arch=(i686 x86_64 'mips64el')
@@ -16,7 +16,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.ta
         glib2.sh
         glib2.csh
         revert-warn-glib-compile-schemas.patch)
-sha256sums=('484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398'
+sha256sums=('b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d'
             '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
             '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3'
             '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
@@ -24,7 +24,7 @@ sha256sums=('484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398'
 build() {
   cd glib-$pkgver
   patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
       --sysconfdir=/etc \
       --with-pcre=system \
       --disable-fam
@@ -33,13 +33,13 @@ build() {
 
 package() {
   cd glib-$pkgver
-  make DESTDIR="$pkgdir" install
+  make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
 
   install -d "$pkgdir/etc/profile.d"
   install -m755 "$srcdir/glib2.sh" "$pkgdir/etc/profile.d/"
   install -m755 "$srcdir/glib2.csh" "$pkgdir/etc/profile.d/"
 
-  for _i in "$pkgdir/etc/bash_completion.d/"*; do
+  for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do
       chmod -x "$_i"
   done
   sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD
index e2ddd4af4..ae2801d91 100644
--- a/core/gmp/PKGBUILD
+++ b/core/gmp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156203 2012-04-16 03:46:32Z allan $
+# $Id: PKGBUILD 158748 2012-05-09 01:14:08Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gmp
-pkgver=5.0.4
+pkgver=5.0.5
 pkgrel=1
 pkgdesc="A free library for arbitrary precision arithmetic"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ license=('LGPL3')
 options=(!libtool)
 install=gmp.install
 source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.xz{,.sig})
-md5sums=('0881f4ff2617226c673fc534ac39d448'
-         'f9e448fff9eaeccdde6ee1f1df00c988')
+md5sums=('8aef50959acec2a1ad41d144ffe0f3b5'
+         '406e8878aadc51b134d1b3dd845261ee')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD
index aaf9fa824..132a0125a 100644
--- a/core/isl/PKGBUILD
+++ b/core/isl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148648 2012-02-05 03:55:32Z allan $
+# $Id: PKGBUILD 158750 2012-05-09 01:14:11Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=isl
 pkgver=0.09
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kotnet.org/~skimo/isl/"
@@ -26,8 +26,7 @@ check() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make -j1 DESTDIR="$pkgdir/" install
-  
-  # this seems a better place for this file...
-  install -dm755 $pkgdir/usr/share/gdb/auto-load/
-  mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.9.0.0-gdb.py
+
+  install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/
+  mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.9.0.0-gdb.py
 }
diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index 4653a030d..dabdf3cca 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150890 2012-02-23 13:53:57Z allan $
+# $Id: PKGBUILD 159175 2012-05-17 10:12:16Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=iw
-pkgver=3.3
-pkgrel=2
+pkgver=3.4
+pkgrel=1
 pkgdesc="nl80211 based CLI configuration utility for wireless devices"
 arch=("i686" "x86_64" 'mips64el')
 url="http://wireless.kernel.org/en/users/Documentation/iw"
@@ -11,7 +11,7 @@ license=("GPL")
 depends=("libnl")
 makedepends=("kernel-headers")
 source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('567f0d389dd7c9919832101aaa8e3863a463cb505545534eb46b4ddab4400e60')
+sha256sums=('989b5677588e32de6eda97bf978810b366a7620f78f26f9cc61c15bdb434218a')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/core/kmod/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch b/core/kmod/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch
new file mode 100644
index 000000000..30c92b280
--- /dev/null
+++ b/core/kmod/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch
@@ -0,0 +1,35 @@
+From c7d5a60d3df735a3816bbc1ff1b416a803a4f7a6 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Mon, 7 May 2012 19:41:41 -0400
+Subject: [PATCH 1/2] libkmod-file: gracefully handle errors from zlib
+
+zlib won't necessarily set the system errno, and this is particularly
+evident on corrupted data (which results in a double free). Use zlib's
+gzerror to detect the failure, returning a generic EINVAL when zlib
+doesn't provide us with an errno.
+---
+ libkmod/libkmod-file.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/libkmod/libkmod-file.c b/libkmod/libkmod-file.c
+index 46ad8d9..8beb7e3 100644
+--- a/libkmod/libkmod-file.c
++++ b/libkmod/libkmod-file.c
+@@ -199,7 +199,13 @@ static int load_zlib(struct kmod_file *file)
+ 		if (r == 0)
+ 			break;
+ 		else if (r < 0) {
+-			err = -errno;
++			int gzerr;
++			const char *gz_errmsg = gzerror(file->gzf, &gzerr);
++
++			ERR(file->ctx, "gzip: %s\n", gz_errmsg);
++
++			/* gzip might not set errno here */
++			err = gzerr == Z_ERRNO ? -errno : -EINVAL;
+ 			goto error;
+ 		}
+ 		did += r;
+-- 
+1.7.10.1
+
diff --git a/core/kmod/0002-depmod-report-failures-in-loading-symbols.patch b/core/kmod/0002-depmod-report-failures-in-loading-symbols.patch
new file mode 100644
index 000000000..90c58d5da
--- /dev/null
+++ b/core/kmod/0002-depmod-report-failures-in-loading-symbols.patch
@@ -0,0 +1,34 @@
+From 819f79a24d58e3c8429f1631df2f8f85a2f95d4a Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Mon, 7 May 2012 19:41:42 -0400
+Subject: [PATCH 2/2] depmod: report failures in loading symbols
+
+Previously, depmod would relegate failures of kmod_module_get_symbols()
+to debug output, assuming the "error" was simply a lack of symbols.
+Leave the ENOENT return to debug output, but report anything else as a
+real error.
+---
+ tools/kmod-depmod.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
+index e89dff6..bceb407 100644
+--- a/tools/kmod-depmod.c
++++ b/tools/kmod-depmod.c
+@@ -1542,8 +1542,11 @@ static int depmod_load_symbols(struct depmod *depmod)
+ 		struct kmod_list *l, *list = NULL;
+ 		int err = kmod_module_get_symbols(mod->kmod, &list);
+ 		if (err < 0) {
+-			DBG("ignoring %s: no symbols: %s\n",
+-				mod->path, strerror(-err));
++			if (err == -ENOENT)
++				DBG("ignoring %s: no symbols\n", mod->path);
++			else
++				ERR("failed to load symbols from %s: %s\n",
++						mod->path, strerror(-err));
+ 			continue;
+ 		}
+ 		kmod_list_foreach(l, list) {
+-- 
+1.7.10.1
+
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 57a59af85..b3da1f7cd 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157131 2012-04-24 12:21:20Z dreisner $
+# $Id: PKGBUILD 158851 2012-05-12 13:02:54Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=kmod
 pkgver=8
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
@@ -16,17 +16,25 @@ replaces=('module-init-tools')
 source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
         "depmod-search.conf"
         "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch"
-        "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch")
+        "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch"
+        "0001-libkmod-file-gracefully-handle-errors-from-zlib.patch"
+        "0002-depmod-report-failures-in-loading-symbols.patch")
 md5sums=('d4e3d038b5370b1e8ff237c55666aa64'
          'dd62cbf62bd8f212f51ef8c43bec9a77'
          'ba73b9e98db1abbf41274f922fcfbd55'
-         'c9af56636c5667cf4ce3a31ea56e03d9')
+         'c9af56636c5667cf4ce3a31ea56e03d9'
+         '1a877b9863b94f91c8d3aec97c021c6b'
+         '1a9f132779f90556852e70279577ed22')
 
 build() {
   cd "$pkgname-$pkgver"
 
-  patch -p1 -i ../0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
-  patch -p1 -i ../0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
+  patch -Np1 <"$srcdir"/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
+  patch -Np1 <"$srcdir"/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
+
+  # fix crash on corrupted zlib compression
+  patch -Np1 <"$srcdir"/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch
+  patch -Np1 <"$srcdir"/0002-depmod-report-failures-in-loading-symbols.patch
 
   # Architecture-specific test.
   sed -ri 's:(&smodinfo_jonsmodules,):/*\1*/:' testsuite/test-modinfo.c
diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD
index f31c0e142..8ab0ec9dc 100644
--- a/core/libnl/PKGBUILD
+++ b/core/libnl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150892 2012-02-23 13:54:02Z allan $
+# $Id: PKGBUILD 159173 2012-05-17 10:12:14Z thomas $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=libnl
-pkgver=3.2.7
+pkgver=3.2.9
 pkgrel=1
 pkgdesc="Library for applications dealing with netlink sockets"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=(glibc)
 backup=(etc/libnl/classid etc/libnl/pktloc)
 options=(!libtool)
 source=("$url/files/$pkgname-$pkgver.tar.gz")
-md5sums=('6a233a9dffa0ee3a7f6110c95c5410ab')
+sha256sums=('9f23e9460bd9bb7fbe09af5eb281e4a43a26fa245ea864ed5e28fe4e8118af63')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/core/libusb-compat/PKGBUILD b/core/libusb-compat/PKGBUILD
index ff8b34a8b..9ce1c09c1 100644
--- a/core/libusb-compat/PKGBUILD
+++ b/core/libusb-compat/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 142817 2011-11-15 17:24:12Z andrea $
+# $Id: PKGBUILD 158829 2012-05-11 22:12:35Z eric $
 # Maintainer:
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: arjan <arjan@archlinux.org>
 
 pkgname=libusb-compat
-pkgver=0.1.3
-pkgrel=2
+pkgver=0.1.4
+pkgrel=1
 pkgdesc="Library to enable user space application programs to communicate with USB devices"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('libusb' 'sh')
 url="http://libusb.sourceforge.net/"
 license=('LGPL')
-source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2")
+depends=('libusb' 'sh')
 options=('!libtool')
-md5sums=('570ac2ea085b80d1f74ddc7c6a93c0eb')
+source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('2ca521fffadd0c28fdf174e6ec73865b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,5 +23,5 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index b527ea833..ee82195e3 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158626 2012-05-05 03:23:11Z dreisner $
+# $Id: PKGBUILD 159240 2012-05-18 16:47:23Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
-pkgver=3.2.3
-pkgrel=3
+pkgver=3.2.4
+pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -18,8 +18,17 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
         mdadm_install
         mdadm_hook
         mdadm_udev_install
+        mdadm.service
         disable-werror.patch)
 replaces=('raidtools')
+md5sums=('c25007b981e0f5362eacdad385ff0e15'
+         '8333d405f550317c2bacd5510bf1cb60'
+         '00cbed931db4f15b6ce49e3e7d433966'
+         '9b01e96b6c3c218fb61628c9281fe688'
+         'fbb5542d9bdf87441a11dd7e7a0a17f8'
+         '2318b99701dba9b01a6891c62be7bc1c'
+         'aafb5f9ac8437a284cbf948b9b13b179'
+         '4ad87b74a4bc9a34621280abe0e0c3e4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -44,11 +53,6 @@ package() {
   # move /lib/* to /usr/lib/
   mv $pkgdir/lib/udev $pkgdir/usr/lib/
   rm -rf $pkgdir/lib
+  # systemd service file
+  install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service
 }
-md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
-         '8333d405f550317c2bacd5510bf1cb60'
-         '00cbed931db4f15b6ce49e3e7d433966'
-         '9b01e96b6c3c218fb61628c9281fe688'
-         'fbb5542d9bdf87441a11dd7e7a0a17f8'
-         '2318b99701dba9b01a6891c62be7bc1c'
-         '4ad87b74a4bc9a34621280abe0e0c3e4')
diff --git a/core/mdadm/mdadm.service b/core/mdadm/mdadm.service
new file mode 100644
index 000000000..8389715e8
--- /dev/null
+++ b/core/mdadm/mdadm.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=MDADM Event Monitor
+
+[Service]
+ExecStart=/sbin/mdadm --monitor --scan
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD
index 880bb2051..e6749bb8c 100644
--- a/core/mpfr/PKGBUILD
+++ b/core/mpfr/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153420 2012-03-13 08:24:35Z allan $
+# $Id: PKGBUILD 158831 2012-05-11 23:28:49Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=mpfr
 _pkgver=3.1.0
-_patchlevel=p7
+_patchlevel=p10
 pkgver=${_pkgver}.${_patchlevel}
 pkgrel=1
 pkgdesc="Multiple-precision floating-point library"
@@ -18,7 +18,7 @@ source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}
         mpfr-${_pkgver}.${_patchlevel}.patch)
 md5sums=('6e495841bb026481567006cec0f821c3'
          '293374ee4b01527f8f7889fdfa9016f8'
-         'fb1bf603a2ad5e6ecc1903c3c53f5e13')
+         '776954381923739ef0e618d992188535')
 
 build() {
   cd "${srcdir}/${pkgname}-${_pkgver}"
diff --git a/core/mpfr/mpfr-3.1.0.p10.patch b/core/mpfr/mpfr-3.1.0.p10.patch
new file mode 100644
index 000000000..0073be709
--- /dev/null
+++ b/core/mpfr/mpfr-3.1.0.p10.patch
@@ -0,0 +1,1896 @@
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2011-10-05 21:39:57.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2011-10-05 21:39:57.000000000 +0000
+@@ -0,0 +1 @@
++mpfr_unlikely
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2011-10-03 08:17:15.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2011-10-05 21:39:57.000000000 +0000
+@@ -1 +1 @@
+-3.1.0
++3.1.0-p1
+diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
+--- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
+@@ -988,10 +988,11 @@
+  ******************************************************/
+ 
+ /* Theses macros help the compiler to determine if a test is
+- * likely or unlikely. */
++   likely or unlikely. The !! is necessary in case x is larger
++   than a long. */
+ #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
+ # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
+-# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
++# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
+ #else
+ # define MPFR_LIKELY(x) (x)
+ # define MPFR_UNLIKELY(x) (x)
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0"
++#define MPFR_VERSION_STRING "3.1.0-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2011-10-05 21:39:57.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0";
++  return "3.1.0-p1";
+ }
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2011-10-14 10:43:32.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2011-10-14 10:43:32.000000000 +0000
+@@ -0,0 +1 @@
++lib-search-path
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2011-10-05 21:39:57.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2011-10-14 10:43:32.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p1
++3.1.0-p2
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p1"
++#define MPFR_VERSION_STRING "3.1.0-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2011-10-05 21:39:57.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2011-10-14 10:43:32.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p1";
++  return "3.1.0-p2";
+ }
+diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am
+--- mpfr-3.1.0-a/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
++++ mpfr-3.1.0-b/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
+@@ -65,8 +65,24 @@
+ TESTS = $(check_PROGRAMS)
+ TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
+ 
+-# Option to prevent libtool from generating wrapper scripts for the tests.
++# The -no-install option prevents libtool from generating wrapper scripts
++# for the tests.
+ # This is useful to easily run the test scripts under valgrind or gdb.
+ # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
+ # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
+-AM_LDFLAGS = -no-install
++#
++# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
++# library is already installed in the corresponding lib directory: its
++# purpose is to make sure that the local .libs comes first in the library
++# search path (otherwise the tests are linked against the old MPFR library
++# by the LINK command -- see the generated Makefile). See:
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
++# and
++#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
++#
++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
+diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in
+--- mpfr-3.1.0-a/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
++++ mpfr-3.1.0-b/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
+@@ -1124,11 +1124,27 @@
+ TESTS = $(check_PROGRAMS)
+ TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
+ 
+-# Option to prevent libtool from generating wrapper scripts for the tests.
++# The -no-install option prevents libtool from generating wrapper scripts
++# for the tests.
+ # This is useful to easily run the test scripts under valgrind or gdb.
+ # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
+ # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
+-AM_LDFLAGS = -no-install
++#
++# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
++# library is already installed in the corresponding lib directory: its
++# purpose is to make sure that the local .libs comes first in the library
++# search path (otherwise the tests are linked against the old MPFR library
++# by the LINK command -- see the generated Makefile). See:
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
++# and
++#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
++#
++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
+ all: all-am
+ 
+ .SUFFIXES:
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2011-11-03 15:15:11.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2011-11-03 15:15:11.000000000 +0000
+@@ -0,0 +1 @@
++vasprintf
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2011-10-14 10:43:32.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2011-11-03 15:15:11.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p2
++3.1.0-p3
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p2"
++#define MPFR_VERSION_STRING "3.1.0-p3"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c
+--- mpfr-3.1.0-a/src/vasprintf.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/vasprintf.c	2011-11-03 15:15:11.000000000 +0000
+@@ -1178,7 +1178,7 @@
+   mpfr_exp_t exp;
+   char * str;
+   const int spec_g = (spec.spec == 'g' || spec.spec == 'G');
+-  const int keep_trailing_zeros = spec_g && spec.alt;
++  const int keep_trailing_zeros = !spec_g || spec.alt;
+ 
+   /* WARNING: an empty precision field is forbidden (it means precision = 6
+      and it should have been changed to 6 before the function call) */
+@@ -1356,7 +1356,7 @@
+   else
+     /* 1 <= |p| */
+     {
+-      size_t nsd;  /* Number of significant digits */
++      size_t str_len;
+ 
+       /* Determine the position of the most significant decimal digit. */
+       exp = floor_log10 (p);
+@@ -1365,12 +1365,10 @@
+         /* P is too large to print all its integral part digits */
+         return -1;
+ 
+-      np->ip_size = exp + 1;
+-
+-      nsd = spec.prec + np->ip_size;
+       if (dec_info == NULL)
+-        {
+-          str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode);
++        { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */
++          str =
++            mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode);
+           register_string (np->sl, str);
+         }
+       else
+@@ -1379,81 +1377,60 @@
+           str = dec_info->str;
+         }
+       np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */
++      str_len = strlen (str);
++
++      /* integral part */
++      if (exp > str_len)
++        /* mpfr_get_str gives no trailing zero when p is rounded up to the next
++           power of 10 (p integer, so no fractional part) */
++        {
++          np->ip_trailing_zeros = exp - str_len;
++          np->ip_size = str_len;
++        }
++      else
++        np->ip_size = exp;
+ 
+       if (spec.group)
+         /* thousands separator in integral part */
+         np->thousands_sep = MPFR_THOUSANDS_SEPARATOR;
+ 
+-      if (nsd == 0 || (spec_g && !spec.alt))
+-        /* compute how much non-zero digits in integral and fractional
+-           parts */
++      /* fractional part */
++      str += np->ip_size;
++      str_len -= np->ip_size;
++      if (!keep_trailing_zeros)
++        /* remove trailing zeros, if any */
+         {
+-          size_t str_len;
+-          str_len = strlen (str); /* note: the sign has been skipped */
+-
+-          if (exp > str_len)
+-            /* mpfr_get_str doesn't give the trailing zeros when p is a
+-               multiple of 10 (p integer, so no fractional part) */
+-            {
+-              np->ip_trailing_zeros = exp - str_len;
+-              np->ip_size = str_len;
+-              if (spec.alt)
+-                np->point = MPFR_DECIMAL_POINT;
+-            }
+-          else
+-            /* str may contain some digits which are in fractional part */
++          char *ptr = str + str_len - 1; /* pointer to the last digit of
++                                            str */
++          while ((*ptr == '0') && (str_len != 0))
+             {
+-              char *ptr;
+-
+-              ptr = str + str_len - 1; /* points to the end of str */
+-              str_len -= np->ip_size;  /* number of digits in fractional
+-                                          part */
+-
+-              if (!keep_trailing_zeros)
+-                /* remove trailing zeros, if any */
+-                {
+-                  while ((*ptr == '0') && (str_len != 0))
+-                    {
+-                      --ptr;
+-                      --str_len;
+-                    }
+-                }
+-
+-              if (str_len > INT_MAX)
+-                /* too many digits in fractional part */
+-                return -1;
+-
+-              if (str_len != 0)
+-                /* some digits in fractional part */
+-                {
+-                  np->point = MPFR_DECIMAL_POINT;
+-                  np->fp_ptr = str + np->ip_size;
+-                  np->fp_size = str_len;
+-                }
++              --ptr;
++              --str_len;
+             }
+         }
+-      else
+-        /* spec.prec digits in fractional part */
++
++      if (str_len > 0)
++        /* some nonzero digits in fractional part */
+         {
+-          if (np->ip_size == exp - 1)
+-            /* the absolute value of the number has been rounded up to a power
+-               of ten.
+-               Insert an additional zero in integral part and put the rest of
+-               them in fractional part. */
+-            np->ip_trailing_zeros = 1;
++          if (str_len > INT_MAX)
++            /* too many digits in fractional part */
++            return -1;
+ 
+-          if (spec.prec != 0)
+-            {
+-              MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp);
+-              MPFR_ASSERTD (np->ip_size + spec.prec == nsd);
++          np->point = MPFR_DECIMAL_POINT;
++          np->fp_ptr = str;
++          np->fp_size = str_len;
++        }
+ 
+-              np->point = MPFR_DECIMAL_POINT;
+-              np->fp_ptr = str + np->ip_size;
+-              np->fp_size = spec.prec;
+-            }
+-          else if (spec.alt)
+-            np->point = MPFR_DECIMAL_POINT;
++      if (keep_trailing_zeros && str_len < spec.prec)
++        /* add missing trailing zeros */
++        {
++          np->point = MPFR_DECIMAL_POINT;
++          np->fp_trailing_zeros = spec.prec - np->fp_size;
+         }
++
++      if (spec.alt)
++        /* add decimal point even if no digits follow it */
++        np->point = MPFR_DECIMAL_POINT;
+     }
+ 
+   return 0;
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2011-10-14 10:43:32.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2011-11-03 15:15:11.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p2";
++  return "3.1.0-p3";
+ }
+diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c
+--- mpfr-3.1.0-a/tests/tsprintf.c	2011-10-03 08:17:14.000000000 +0000
++++ mpfr-3.1.0-b/tests/tsprintf.c	2011-11-03 15:15:11.000000000 +0000
+@@ -475,6 +475,18 @@
+   check_sprintf ("-1.", "%- #0.1RG", x);
+ 
+   /* precision zero */
++  mpfr_set_d (x, 9.5, MPFR_RNDN);
++  check_sprintf ("9",    "%.0RDf", x);
++  check_sprintf ("10",    "%.0RUf", x);
++
++  mpfr_set_d (x, 19.5, MPFR_RNDN);
++  check_sprintf ("19",    "%.0RDf", x);
++  check_sprintf ("20",    "%.0RUf", x);
++
++  mpfr_set_d (x, 99.5, MPFR_RNDN);
++  check_sprintf ("99",    "%.0RDf", x);
++  check_sprintf ("100",   "%.0RUf", x);
++
+   mpfr_set_d (x, -9.5, MPFR_RNDN);
+   check_sprintf ("-10",    "%.0RDf", x);
+   check_sprintf ("-10",    "%.0RYf", x);
+@@ -1078,6 +1090,23 @@
+   mpfr_clear (x);
+ }
+ 
++static void
++bug20111102 (void)
++{
++  mpfr_t t;
++  char s[100];
++
++  mpfr_init2 (t, 84);
++  mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN);
++  mpfr_sprintf (s, "%.20RNg", t);
++  if (strcmp (s, "1000") != 0)
++    {
++      printf ("Error in bug20111102, expected 1000, got %s\n", s);
++      exit (1);
++    }
++  mpfr_clear (t);
++}
++
+ /* In particular, the following test makes sure that the rounding
+  * for %Ra and %Rb is not done on the MPFR number itself (as it
+  * would overflow). Note: it has been reported on comp.std.c that
+@@ -1161,6 +1190,7 @@
+   locale = setlocale (LC_ALL, "C");
+ #endif
+ 
++  bug20111102 ();
+   native_types ();
+   hexadecimal ();
+   binary ();
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2011-11-28 12:22:52.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2011-11-28 12:22:52.000000000 +0000
+@@ -0,0 +1 @@
++gmp41compat
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2011-11-03 15:15:11.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2011-11-28 12:22:52.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p3
++3.1.0-p4
+diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info
+--- mpfr-3.1.0-a/doc/mpfr.info	2011-10-03 09:43:04.000000000 +0000
++++ mpfr-3.1.0-b/doc/mpfr.info	2011-11-28 12:22:52.000000000 +0000
+@@ -2994,11 +2994,12 @@
+ 
+    * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1.  Their
+      behavior no longer depends on the platform (assuming this is also
+-     true for GMP's random generator).  As a consequence, the returned
+-     values can be different between MPFR 3.1 and previous MPFR
+-     versions.  Note: as the reproducibility of these functions was not
+-     specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded
+-     as backward incompatible with previous versions.
++     true for GMP's random generator, which is not the case between GMP
++     4.1 and 4.2 if `gmp_randinit_default' is used).  As a consequence,
++     the returned values can be different between MPFR 3.1 and previous
++     MPFR versions.  Note: as the reproducibility of these functions
++     was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_
++     regarded as backward incompatible with previous versions.
+ 
+ 
+ 
+@@ -4239,13 +4240,13 @@
+ Node: Type and Macro Changes129308
+ Node: Added Functions132029
+ Node: Changed Functions134972
+-Node: Removed Functions139167
+-Node: Other Changes139579
+-Node: Contributors141108
+-Node: References143574
+-Node: GNU Free Documentation License145315
+-Node: Concept Index167758
+-Node: Function and Type Index173677
++Node: Removed Functions139253
++Node: Other Changes139665
++Node: Contributors141194
++Node: References143660
++Node: GNU Free Documentation License145401
++Node: Concept Index167844
++Node: Function and Type Index173763
+ 
+ End Tag Table
+ 
+diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi
+--- mpfr-3.1.0-a/doc/mpfr.texi	2011-10-03 08:17:14.000000000 +0000
++++ mpfr-3.1.0-b/doc/mpfr.texi	2011-11-28 12:22:52.000000000 +0000
+@@ -3466,8 +3466,9 @@
+ a lack of specification.
+ 
+ @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1.
+-Their behavior no longer depends on the platform (assuming this is also
+-true for GMP's random generator).  As a consequence, the returned values
++Their behavior no longer depends on the platform (assuming this is also true
++for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if
++@code{gmp_randinit_default} is used).  As a consequence, the returned values
+ can be different between MPFR 3.1 and previous MPFR versions.
+ Note: as the reproducibility of these functions was not specified
+ before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p3"
++#define MPFR_VERSION_STRING "3.1.0-p4"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2011-11-03 15:15:11.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2011-11-28 12:22:52.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p3";
++  return "3.1.0-p4";
+ }
+diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c
+--- mpfr-3.1.0-a/tests/trandom.c	2011-10-03 08:17:14.000000000 +0000
++++ mpfr-3.1.0-b/tests/trandom.c	2011-11-28 12:22:52.000000000 +0000
+@@ -114,21 +114,29 @@
+   mpfr_t x;
+   gmp_randstate_t s;
+ 
++#if __MPFR_GMP(4,2,0)
++# define C1 "0.895943"
++# define C2 "0.848824"
++#else
++# define C1 "0.479652"
++# define C2 "0.648529"
++#endif
++
+   gmp_randinit_default (s);
+   gmp_randseed_ui (s, 42);
+   mpfr_init2 (x, 17);
+   mpfr_urandomb (x, s);
+-  if (mpfr_cmp_str1 (x, "0.895943") != 0)
++  if (mpfr_cmp_str1 (x, C1) != 0)
+     {
+-      printf ("Error in bug20100914, expected 0.895943, got ");
++      printf ("Error in bug20100914, expected " C1 ", got ");
+       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
+       printf ("\n");
+       exit (1);
+     }
+   mpfr_urandomb (x, s);
+-  if (mpfr_cmp_str1 (x, "0.848824") != 0)
++  if (mpfr_cmp_str1 (x, C2) != 0)
+     {
+-      printf ("Error in bug20100914, expected 0.848824, got ");
++      printf ("Error in bug20100914, expected " C2 ", got ");
+       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
+       printf ("\n");
+       exit (1);
+diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c
+--- mpfr-3.1.0-a/tests/turandom.c	2011-10-03 08:17:14.000000000 +0000
++++ mpfr-3.1.0-b/tests/turandom.c	2011-11-28 12:22:52.000000000 +0000
+@@ -160,23 +160,29 @@
+   mpfr_t x;
+   gmp_randstate_t s;
+ 
++#if __MPFR_GMP(4,2,0)
++# define C1 "0.8488312"
++# define C2 "0.8156509"
++#else
++# define C1 "0.6485367"
++# define C2 "0.9362717"
++#endif
++
+   gmp_randinit_default (s);
+   gmp_randseed_ui (s, 42);
+   mpfr_init2 (x, 17);
+   mpfr_urandom (x, s, MPFR_RNDN);
+-  /* the following values are obtained on a 32-bit computer, we should get
+-     the same values on a 64-bit computer */
+-  if (mpfr_cmp_str1 (x, "0.8488312") != 0)
++  if (mpfr_cmp_str1 (x, C1) != 0)
+     {
+-      printf ("Error in bug20100914, expected 0.8488312, got ");
++      printf ("Error in bug20100914, expected " C1 ", got ");
+       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
+       printf ("\n");
+       exit (1);
+     }
+   mpfr_urandom (x, s, MPFR_RNDN);
+-  if (mpfr_cmp_str1 (x, "0.8156509") != 0)
++  if (mpfr_cmp_str1 (x, C2) != 0)
+     {
+-      printf ("Error in bug20100914, expected 0.8156509, got ");
++      printf ("Error in bug20100914, expected " C2 ", got ");
+       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
+       printf ("\n");
+       exit (1);
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2012-02-24 12:44:49.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2012-02-24 12:44:49.000000000 +0000
+@@ -0,0 +1 @@
++logging-freeze
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2011-11-28 12:22:52.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2012-02-24 12:44:49.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p4
++3.1.0-p5
+diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c
+--- mpfr-3.1.0-a/src/add_d.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/add_d.c	2012-02-24 12:44:49.000000000 +0000
+@@ -34,7 +34,7 @@
+     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
+       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
+      ("a[%Pu]=%.*Rg inexact=%d",
+-      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
++      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
+ 
+   MPFR_SAVE_EXPO_MARK (expo);
+ 
+diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c
+--- mpfr-3.1.0-a/src/add_ui.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/add_ui.c	2012-02-24 12:44:49.000000000 +0000
+@@ -29,7 +29,7 @@
+   MPFR_LOG_FUNC
+     (("x[%Pu]=%.*Rg u=%d rnd=%d",
+       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
+-     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y));
++     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y));
+ 
+   if (MPFR_LIKELY(u != 0) )  /* if u=0, do nothing */
+     {
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p4"
++#define MPFR_VERSION_STRING "3.1.0-p5"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/mul_d.c mpfr-3.1.0-b/src/mul_d.c
+--- mpfr-3.1.0-a/src/mul_d.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/mul_d.c	2012-02-24 12:44:49.000000000 +0000
+@@ -34,7 +34,7 @@
+     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
+       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
+      ("a[%Pu]=%.*Rg inexact=%d",
+-      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
++      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
+ 
+   MPFR_SAVE_EXPO_MARK (expo);
+ 
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2011-11-28 12:22:52.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2012-02-24 12:44:49.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p4";
++  return "3.1.0-p5";
+ }
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2012-02-24 13:50:05.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2012-02-24 13:50:05.000000000 +0000
+@@ -0,0 +1 @@
++logging-varfmt
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2012-02-24 12:44:49.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2012-02-24 13:50:05.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p5
++3.1.0-p6
+diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
+--- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-02-24 13:50:05.000000000 +0000
+@@ -1592,7 +1592,7 @@
+   do                                                                    \
+     if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) &&                        \
+         (mpfr_log_current <= mpfr_log_level))                           \
+-      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__,          \
++      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__,          \
+                  #x, mpfr_get_prec (x), mpfr_log_prec, x);              \
+   while (0)
+ 
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 13:50:05.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p5"
++#define MPFR_VERSION_STRING "3.1.0-p6"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2012-02-24 12:44:49.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2012-02-24 13:50:05.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p5";
++  return "3.1.0-p6";
+ }
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2012-03-08 15:17:03.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2012-03-08 15:17:03.000000000 +0000
+@@ -0,0 +1 @@
++large-prec
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2012-02-24 13:50:05.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2012-03-08 15:17:03.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p6
++3.1.0-p7
+diff -Naurd mpfr-3.1.0-a/src/add1.c mpfr-3.1.0-b/src/add1.c
+--- mpfr-3.1.0-a/src/add1.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/add1.c	2012-03-08 15:17:03.000000000 +0000
+@@ -44,12 +44,12 @@
+   bq = MPFR_PREC(b);
+   cq = MPFR_PREC(c);
+ 
+-  an = (aq-1)/GMP_NUMB_BITS+1; /* number of limbs of a */
++  an = MPFR_PREC2LIMBS (aq); /* number of limbs of a */
+   aq2 = (mpfr_prec_t) an * GMP_NUMB_BITS;
+   sh = aq2 - aq;                  /* non-significant bits in low limb */
+ 
+-  bn = (bq-1)/GMP_NUMB_BITS+1; /* number of limbs of b */
+-  cn = (cq-1)/GMP_NUMB_BITS+1; /* number of limbs of c */
++  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
++  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
+ 
+   ap = MPFR_MANT(a);
+   bp = MPFR_MANT(b);
+@@ -124,7 +124,7 @@
+       dif = aq2 - diff_exp;
+       /* dif is the number of bits of c which overlap with a' */
+ 
+-      difn = (dif-1)/GMP_NUMB_BITS + 1;
++      difn = MPFR_PREC2LIMBS (dif);
+       /* only the highest difn limbs from c have to be considered */
+       if (MPFR_UNLIKELY(difn > cn))
+         {
+diff -Naurd mpfr-3.1.0-a/src/add1sp.c mpfr-3.1.0-b/src/add1sp.c
+--- mpfr-3.1.0-a/src/add1sp.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/add1sp.c	2012-03-08 15:17:03.000000000 +0000
+@@ -107,7 +107,7 @@
+ 
+   /* Read prec and num of limbs */
+   p = MPFR_PREC(b);
+-  n = (p+GMP_NUMB_BITS-1)/GMP_NUMB_BITS;
++  n = MPFR_PREC2LIMBS (p);
+   MPFR_UNSIGNED_MINUS_MODULO(sh, p);
+   bx = MPFR_GET_EXP(b);
+   d = (mpfr_uexp_t) (bx - MPFR_GET_EXP(c));
+diff -Naurd mpfr-3.1.0-a/src/agm.c mpfr-3.1.0-b/src/agm.c
+--- mpfr-3.1.0-a/src/agm.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/agm.c	2012-03-08 15:17:03.000000000 +0000
+@@ -91,7 +91,7 @@
+   q = MPFR_PREC(r);
+   p = q + MPFR_INT_CEIL_LOG2(q) + 15;
+   MPFR_ASSERTD (p >= 7); /* see algorithms.tex */
+-  s = (p - 1) / GMP_NUMB_BITS + 1;
++  s = MPFR_PREC2LIMBS (p);
+ 
+   /* b (op2) and a (op1) are the 2 operands but we want b >= a */
+   compare = mpfr_cmp (op1, op2);
+@@ -285,7 +285,7 @@
+ 
+       /* Next iteration */
+       MPFR_ZIV_NEXT (loop, p);
+-      s = (p - 1) / GMP_NUMB_BITS + 1;
++      s = MPFR_PREC2LIMBS (p);
+     }
+   MPFR_ZIV_FREE (loop);
+ 
+diff -Naurd mpfr-3.1.0-a/src/eq.c mpfr-3.1.0-b/src/eq.c
+--- mpfr-3.1.0-a/src/eq.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/eq.c	2012-03-08 15:17:03.000000000 +0000
+@@ -56,8 +56,8 @@
+   if (uexp != vexp)
+     return 0; /* no bit agree */
+ 
+-  usize = (MPFR_PREC(u) - 1) / GMP_NUMB_BITS + 1;
+-  vsize = (MPFR_PREC(v) - 1) / GMP_NUMB_BITS + 1;
++  usize = MPFR_LIMB_SIZE (u);
++  vsize = MPFR_LIMB_SIZE (v);
+ 
+   if (vsize > usize) /* exchange u and v */
+     {
+diff -Naurd mpfr-3.1.0-a/src/exp.c mpfr-3.1.0-b/src/exp.c
+--- mpfr-3.1.0-a/src/exp.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/exp.c	2012-03-08 15:17:03.000000000 +0000
+@@ -133,7 +133,7 @@
+               mp_size_t yn;
+               int sh;
+ 
+-              yn = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
++              yn = MPFR_LIMB_SIZE (y);
+               sh = (mpfr_prec_t) yn * GMP_NUMB_BITS - MPFR_PREC(y);
+               MPFR_MANT(y)[0] += MPFR_LIMB_ONE << sh;
+               inexact = 1;
+diff -Naurd mpfr-3.1.0-a/src/get_d.c mpfr-3.1.0-b/src/get_d.c
+--- mpfr-3.1.0-a/src/get_d.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/get_d.c	2012-03-08 15:17:03.000000000 +0000
+@@ -100,7 +100,7 @@
+           nbits += (1021 + e);
+           MPFR_ASSERTD (nbits >= 1);
+         }
+-      np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
++      np = MPFR_PREC2LIMBS (nbits);
+       MPFR_ASSERTD ( np <= MPFR_LIMBS_PER_DOUBLE );
+       carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
+                                 nbits, rnd_mode);
+diff -Naurd mpfr-3.1.0-a/src/get_flt.c mpfr-3.1.0-b/src/get_flt.c
+--- mpfr-3.1.0-a/src/get_flt.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/get_flt.c	2012-03-08 15:17:03.000000000 +0000
+@@ -92,7 +92,7 @@
+           nbits += (125 + e);
+           MPFR_ASSERTD (nbits >= 1);
+         }
+-      np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
++      np = MPFR_PREC2LIMBS (nbits);
+       MPFR_ASSERTD(np <= MPFR_LIMBS_PER_FLT);
+       carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
+                                 nbits, rnd_mode);
+diff -Naurd mpfr-3.1.0-a/src/get_str.c mpfr-3.1.0-b/src/get_str.c
+--- mpfr-3.1.0-a/src/get_str.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/get_str.c	2012-03-08 15:17:03.000000000 +0000
+@@ -2351,7 +2351,7 @@
+ 
+       /* the first digit will contain only r bits */
+       prec = (m - 1) * pow2 + r; /* total number of bits */
+-      n = (prec - 1) / GMP_NUMB_BITS + 1;
++      n = MPFR_PREC2LIMBS (prec);
+ 
+       MPFR_TMP_MARK (marker);
+       x1 = MPFR_TMP_LIMBS_ALLOC (n + 1);
+@@ -2417,12 +2417,12 @@
+       exact = 1;
+ 
+       /* number of limbs */
+-      n = 1 + (prec - 1) / GMP_NUMB_BITS;
++      n = MPFR_PREC2LIMBS (prec);
+ 
+       /* a will contain the approximation of the mantissa */
+       a = MPFR_TMP_LIMBS_ALLOC (n);
+ 
+-      nx = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
++      nx = MPFR_LIMB_SIZE (x);
+ 
+       if ((mpfr_exp_t) m == g) /* final exponent is 0, no multiplication or
+                                 division to perform */
+diff -Naurd mpfr-3.1.0-a/src/init2.c mpfr-3.1.0-b/src/init2.c
+--- mpfr-3.1.0-a/src/init2.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/init2.c	2012-03-08 15:17:03.000000000 +0000
+@@ -51,7 +51,7 @@
+      which both have an odd mantissa */
+   MPFR_ASSERTN(p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
+ 
+-  xsize = (mp_size_t) ((p - 1) / GMP_NUMB_BITS) + 1;
++  xsize = MPFR_PREC2LIMBS (p);
+   tmp   = (mpfr_limb_ptr) (*__gmp_allocate_func)(MPFR_MALLOC_SIZE(xsize));
+ 
+   MPFR_PREC(x) = p;                /* Set prec */
+diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c
+--- mpfr-3.1.0-a/src/lngamma.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/lngamma.c	2012-03-08 15:17:03.000000000 +0000
+@@ -67,7 +67,7 @@
+ 
+   /* Now, the unit bit is represented. */
+ 
+-  prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
++  prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
+   /* number of represented fractional bits (including the trailing 0's) */
+ 
+   x0 = *(MPFR_MANT (x) + prec / GMP_NUMB_BITS);
+diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
+--- mpfr-3.1.0-a/src/mpfr-impl.h	2012-02-24 13:50:05.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-03-09 12:06:26.000000000 +0000
+@@ -646,10 +646,24 @@
+  **************** mpfr_t properties *******************
+  ******************************************************/
+ 
++/* In the following macro, p is usually a mpfr_prec_t, but this macro
++   works with other integer types (without integer overflow). Checking
++   that p >= 1 in debug mode is useful here because this macro can be
++   used on a computed precision (in particular, this formula does not
++   work for a degenerate case p = 0, and could give different results
++   on different platforms). But let us not use an assertion checking
++   in the MPFR_LAST_LIMB() and MPFR_LIMB_SIZE() macros below to avoid
++   too much expansion for assertions (in practice, this should be a
++   problem just when testing MPFR with the --enable-assert configure
++   option and the -ansi -pedantic-errors gcc compiler flags). */
++#define MPFR_PREC2LIMBS(p) \
++  (MPFR_ASSERTD ((p) >= 1), ((p) - 1) / GMP_NUMB_BITS + 1)
++
+ #define MPFR_PREC(x)      ((x)->_mpfr_prec)
+ #define MPFR_EXP(x)       ((x)->_mpfr_exp)
+ #define MPFR_MANT(x)      ((x)->_mpfr_d)
+-#define MPFR_LIMB_SIZE(x) ((MPFR_PREC((x))-1)/GMP_NUMB_BITS+1)
++#define MPFR_LAST_LIMB(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS)
++#define MPFR_LIMB_SIZE(x) (MPFR_LAST_LIMB (x) + 1)
+ 
+ 
+ /******************************************************
+@@ -749,7 +763,8 @@
+ #define MPFR_IS_FP(x)       (!MPFR_IS_NAN(x) && !MPFR_IS_INF(x))
+ #define MPFR_IS_SINGULAR(x) (MPFR_EXP(x) <= MPFR_EXP_INF)
+ #define MPFR_IS_PURE_FP(x)  (!MPFR_IS_SINGULAR(x) && \
+-  (MPFR_ASSERTD (MPFR_MANT(x)[MPFR_LIMB_SIZE(x)-1] & MPFR_LIMB_HIGHBIT), 1))
++  (MPFR_ASSERTD ((MPFR_MANT(x)[MPFR_LAST_LIMB(x)]  \
++                  & MPFR_LIMB_HIGHBIT) != 0), 1))
+ 
+ #define MPFR_ARE_SINGULAR(x,y) \
+   (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)) || MPFR_UNLIKELY(MPFR_IS_SINGULAR(y)))
+@@ -1061,7 +1076,7 @@
+ /* Set a number to 1 (Fast) - It doesn't check if 1 is in the exponent range */
+ #define MPFR_SET_ONE(x)                                               \
+ do {                                                                  \
+-  mp_size_t _size = MPFR_LIMB_SIZE(x) - 1;                            \
++  mp_size_t _size = MPFR_LAST_LIMB(x);                                \
+   MPFR_SET_POS(x);                                                    \
+   MPFR_EXP(x) = 1;                                                    \
+   MPN_ZERO ( MPFR_MANT(x), _size);                                    \
+@@ -1213,8 +1228,8 @@
+     _destp = MPFR_MANT (dest);                                              \
+     if (MPFR_UNLIKELY (_destprec >= _srcprec))                              \
+       {                                                                     \
+-        _srcs  = (_srcprec  + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
+-        _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS - _srcs;       \
++        _srcs  = MPFR_PREC2LIMBS (_srcprec);                                \
++        _dests = MPFR_PREC2LIMBS (_destprec) - _srcs;                       \
+         MPN_COPY (_destp + _dests, srcp, _srcs);                            \
+         MPN_ZERO (_destp, _dests);                                          \
+         inexact = 0;                                                        \
+@@ -1227,8 +1242,8 @@
+         mp_limb_t _rb, _sb, _ulp;                                           \
+                                                                             \
+         /* Compute Position and shift */                                    \
+-        _srcs  = (_srcprec  + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
+-        _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
++        _srcs  = MPFR_PREC2LIMBS (_srcprec);                                \
++        _dests = MPFR_PREC2LIMBS (_destprec);                               \
+         MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec);                        \
+         _sp = (srcp) + _srcs - _dests;                                      \
+                                                                             \
+@@ -1372,7 +1387,7 @@
+       if (MPFR_LIKELY (MPFR_PREC (dest) == MPFR_PREC (src)))            \
+         {                                                               \
+           MPN_COPY (MPFR_MANT (dest), MPFR_MANT (src),                  \
+-                    (MPFR_PREC (src) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); \
++                    MPFR_LIMB_SIZE (src));                              \
+           inexact = 0;                                                  \
+         }                                                               \
+       else                                                              \
+@@ -1682,7 +1697,7 @@
+  MPFR_ASSERTD (_prec >= MPFR_PREC_MIN);                                 \
+  if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX))                             \
+    mpfr_abort_prec_max ();                                              \
+- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;     \
++ _size = MPFR_PREC2LIMBS (_prec);                                       \
+  if (MPFR_UNLIKELY (_size * (num) > MPFR_GROUP_STATIC_SIZE))            \
+    {                                                                    \
+      (g).alloc = (num) * _size * sizeof (mp_limb_t);                    \
+@@ -1733,7 +1748,7 @@
+  MPFR_ASSERTD (_prec >= MPFR_PREC_MIN);                                 \
+  if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX))                             \
+    mpfr_abort_prec_max ();                                              \
+- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;     \
++ _size = MPFR_PREC2LIMBS (_prec);                                       \
+  (g).alloc = (num) * _size * sizeof (mp_limb_t);                        \
+  if (MPFR_LIKELY (_oalloc == 0))                                        \
+    (g).mant = (mp_limb_t *) (*__gmp_allocate_func) ((g).alloc);         \
+@@ -1886,7 +1901,7 @@
+        MPFR_NORETURN_ATTR;
+ 
+ __MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t,
+-                                                unsigned long));
++                                                mpfr_prec_t));
+ 
+ __MPFR_DECLSPEC mpz_t* mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*,
+                                                             unsigned long));
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2012-02-24 13:50:05.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2012-03-08 15:17:03.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p6"
++#define MPFR_VERSION_STRING "3.1.0-p7"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/mul.c mpfr-3.1.0-b/src/mul.c
+--- mpfr-3.1.0-a/src/mul.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/mul.c	2012-03-08 15:17:03.000000000 +0000
+@@ -93,15 +93,15 @@
+ 
+   ax = MPFR_GET_EXP (b) + MPFR_GET_EXP (c);
+ 
+-  bq = MPFR_PREC(b);
+-  cq = MPFR_PREC(c);
++  bq = MPFR_PREC (b);
++  cq = MPFR_PREC (c);
+ 
+-  MPFR_ASSERTD(bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
++  MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
+ 
+-  bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
+-  cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
++  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
++  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
+   k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
+-  tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
++  tn = MPFR_PREC2LIMBS (bq + cq);
+   /* <= k, thus no int overflow */
+   MPFR_ASSERTD(tn <= k);
+ 
+@@ -292,12 +292,12 @@
+   bq = MPFR_PREC (b);
+   cq = MPFR_PREC (c);
+ 
+-  MPFR_ASSERTD (bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
++  MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
+ 
+-  bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
+-  cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
++  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
++  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
+   k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
+-  tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
++  tn = MPFR_PREC2LIMBS (bq + cq);
+   MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */
+ 
+   /* Check for no size_t overflow*/
+diff -Naurd mpfr-3.1.0-a/src/pow.c mpfr-3.1.0-b/src/pow.c
+--- mpfr-3.1.0-a/src/pow.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/pow.c	2012-03-08 15:17:03.000000000 +0000
+@@ -136,7 +136,7 @@
+      (b) all the 'z' bits are zero
+   */
+ 
+-  prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
++  prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
+   /* number of z+0 bits */
+ 
+   yn = prec / GMP_NUMB_BITS;
+diff -Naurd mpfr-3.1.0-a/src/print_raw.c mpfr-3.1.0-b/src/print_raw.c
+--- mpfr-3.1.0-a/src/print_raw.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/print_raw.c	2012-03-08 15:17:03.000000000 +0000
+@@ -84,7 +84,7 @@
+   int i;
+   mpfr_prec_t count = 0;
+   char c;
+-  mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
++  mp_size_t n = MPFR_PREC2LIMBS (r);
+ 
+   printf("%s ", str);
+   for(n-- ; n>=0 ; n--)
+@@ -109,7 +109,7 @@
+   int i;
+   mpfr_prec_t count = 0;
+   char c;
+-  mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
++  mp_size_t n = MPFR_PREC2LIMBS (r);
+ 
+   for(n-- ; n>=0 ; n--)
+     {
+diff -Naurd mpfr-3.1.0-a/src/round_prec.c mpfr-3.1.0-b/src/round_prec.c
+--- mpfr-3.1.0-a/src/round_prec.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/round_prec.c	2012-03-08 15:17:03.000000000 +0000
+@@ -55,12 +55,12 @@
+ 
+   MPFR_ASSERTN(prec >= MPFR_PREC_MIN && prec <= MPFR_PREC_MAX);
+ 
+-  nw = 1 + (prec - 1) / GMP_NUMB_BITS; /* needed allocated limbs */
++  nw = MPFR_PREC2LIMBS (prec); /* needed allocated limbs */
+ 
+   /* check if x has enough allocated space for the significand */
+   /* Get the number of limbs from the precision.
+      (Compatible with all allocation methods) */
+-  ow = (MPFR_PREC (x) + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
++  ow = MPFR_LIMB_SIZE (x);
+   if (nw > ow)
+     {
+       /* FIXME: Variable can't be created using custom allocation,
+diff -Naurd mpfr-3.1.0-a/src/round_raw_generic.c mpfr-3.1.0-b/src/round_raw_generic.c
+--- mpfr-3.1.0-a/src/round_raw_generic.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/round_raw_generic.c	2012-03-08 15:17:03.000000000 +0000
+@@ -80,7 +80,7 @@
+       (xprec <= yprec || MPFR_IS_LIKE_RNDZ (rnd_mode, neg)))
+     return 0;
+ 
+-  xsize = (xprec-1)/GMP_NUMB_BITS + 1;
++  xsize = MPFR_PREC2LIMBS (xprec);
+   nw = yprec / GMP_NUMB_BITS;
+   rw = yprec & (GMP_NUMB_BITS - 1);
+ 
+diff -Naurd mpfr-3.1.0-a/src/set.c mpfr-3.1.0-b/src/set.c
+--- mpfr-3.1.0-a/src/set.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/set.c	2012-03-08 15:17:03.000000000 +0000
+@@ -48,8 +48,7 @@
+       /* Same precision and b is not singular:
+        * just copy the mantissa, and set the exponent and the sign
+        * The result is exact. */
+-      MPN_COPY (MPFR_MANT (a), MPFR_MANT (b),
+-                (MPFR_PREC (b) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS);
++      MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), MPFR_LIMB_SIZE (b));
+       MPFR_RET (0);
+     }
+   else
+diff -Naurd mpfr-3.1.0-a/src/set_f.c mpfr-3.1.0-b/src/set_f.c
+--- mpfr-3.1.0-a/src/set_f.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/set_f.c	2012-03-08 15:17:03.000000000 +0000
+@@ -43,7 +43,7 @@
+   if (SIZ(x) * MPFR_FROM_SIGN_TO_INT(MPFR_SIGN(y)) < 0)
+     MPFR_CHANGE_SIGN (y);
+ 
+-  sy = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
++  sy = MPFR_LIMB_SIZE (y);
+   my = MPFR_MANT(y);
+   mx = PTR(x);
+ 
+diff -Naurd mpfr-3.1.0-a/src/set_prec.c mpfr-3.1.0-b/src/set_prec.c
+--- mpfr-3.1.0-a/src/set_prec.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/set_prec.c	2012-03-08 15:17:03.000000000 +0000
+@@ -32,7 +32,7 @@
+   MPFR_ASSERTN (p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
+ 
+   /* Calculate the new number of limbs */
+-  xsize = (p - 1) / GMP_NUMB_BITS + 1;
++  xsize = MPFR_PREC2LIMBS (p);
+ 
+   /* Realloc only if the new size is greater than the old */
+   xoldsize = MPFR_GET_ALLOC_SIZE (x);
+diff -Naurd mpfr-3.1.0-a/src/setmax.c mpfr-3.1.0-b/src/setmax.c
+--- mpfr-3.1.0-a/src/setmax.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/setmax.c	2012-03-08 15:17:03.000000000 +0000
+@@ -32,7 +32,7 @@
+   mp_limb_t *xp;
+ 
+   MPFR_SET_EXP (x, e);
+-  xn = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
++  xn = MPFR_LIMB_SIZE (x);
+   sh = (mpfr_prec_t) xn * GMP_NUMB_BITS - MPFR_PREC(x);
+   xp = MPFR_MANT(x);
+   xp[0] = MP_LIMB_T_MAX << sh;
+diff -Naurd mpfr-3.1.0-a/src/sqr.c mpfr-3.1.0-b/src/sqr.c
+--- mpfr-3.1.0-a/src/sqr.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/sqr.c	2012-03-08 15:17:03.000000000 +0000
+@@ -56,11 +56,11 @@
+   ax = 2 * MPFR_GET_EXP (b);
+   bq = MPFR_PREC(b);
+ 
+-  MPFR_ASSERTD (2 * bq > bq); /* PREC_MAX is /2 so no integer overflow */
++  MPFR_ASSERTN (2 * (mpfr_uprec_t) bq <= MPFR_PREC_MAX);
+ 
+-  bn = MPFR_LIMB_SIZE(b); /* number of limbs of b */
+-  tn = 1 + (2 * bq - 1) / GMP_NUMB_BITS; /* number of limbs of square,
+-                                               2*bn or 2*bn-1 */
++  bn = MPFR_LIMB_SIZE (b); /* number of limbs of b */
++  tn = MPFR_PREC2LIMBS (2 * bq); /* number of limbs of square,
++                                    2*bn or 2*bn-1 */
+ 
+   if (MPFR_UNLIKELY(bn > MPFR_SQR_THRESHOLD))
+     return mpfr_mul (a, b, b, rnd_mode);
+diff -Naurd mpfr-3.1.0-a/src/stack_interface.c mpfr-3.1.0-b/src/stack_interface.c
+--- mpfr-3.1.0-a/src/stack_interface.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/stack_interface.c	2012-03-08 15:17:03.000000000 +0000
+@@ -26,7 +26,7 @@
+ size_t
+ mpfr_custom_get_size (mpfr_prec_t prec)
+ {
+-  return (prec + GMP_NUMB_BITS -1) / GMP_NUMB_BITS * BYTES_PER_MP_LIMB;
++  return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB;
+ }
+ 
+ #undef mpfr_custom_init
+diff -Naurd mpfr-3.1.0-a/src/strtofr.c mpfr-3.1.0-b/src/strtofr.c
+--- mpfr-3.1.0-a/src/strtofr.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/strtofr.c	2012-03-08 15:17:03.000000000 +0000
+@@ -467,7 +467,7 @@
+       /* Set y to the value of the ~prec most significant bits of pstr->mant
+          (as long as we guarantee correct rounding, we don't need to get
+          exactly prec bits). */
+-      ysize = (prec - 1) / GMP_NUMB_BITS + 1;
++      ysize = MPFR_PREC2LIMBS (prec);
+       /* prec bits corresponds to ysize limbs */
+       ysize_bits = ysize * GMP_NUMB_BITS;
+       /* and to ysize_bits >= prec > MPFR_PREC (x) bits */
+diff -Naurd mpfr-3.1.0-a/src/sub1sp.c mpfr-3.1.0-b/src/sub1sp.c
+--- mpfr-3.1.0-a/src/sub1sp.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/sub1sp.c	2012-03-08 15:17:03.000000000 +0000
+@@ -155,8 +155,8 @@
+   MPFR_ASSERTD(MPFR_IS_PURE_FP(c));
+ 
+   /* Read prec and num of limbs */
+-  p = MPFR_PREC(b);
+-  n = (p-1)/GMP_NUMB_BITS+1;
++  p = MPFR_PREC (b);
++  n = MPFR_PREC2LIMBS (p);
+ 
+   /* Fast cmp of |b| and |c|*/
+   bx = MPFR_GET_EXP (b);
+diff -Naurd mpfr-3.1.0-a/src/urandomb.c mpfr-3.1.0-b/src/urandomb.c
+--- mpfr-3.1.0-a/src/urandomb.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/urandomb.c	2012-03-08 15:17:03.000000000 +0000
+@@ -31,13 +31,20 @@
+    a sufficient number of limbs */
+ void
+ mpfr_rand_raw (mpfr_limb_ptr mp, gmp_randstate_t rstate,
+-               unsigned long int nbits)
++               mpfr_prec_t nbits)
+ {
+   mpz_t z;
+ 
++  MPFR_ASSERTN (nbits >= 1);
+   /* To be sure to avoid the potential allocation of mpz_urandomb */
+-  ALLOC(z) = SIZ(z) = ((nbits - 1) / GMP_NUMB_BITS) + 1;
++  ALLOC(z) = SIZ(z) = MPFR_PREC2LIMBS (nbits);
+   PTR(z)   = mp;
++#if __MPFR_GMP(5,0,0)
++  /* Check for integer overflow (unless mp_bitcnt_t is signed,
++     but according to the GMP manual, this shouldn't happen).
++     Note: mp_bitcnt_t has been introduced in GMP 5.0.0. */
++  MPFR_ASSERTN ((mp_bitcnt_t) -1 < 0 || nbits <= (mp_bitcnt_t) -1);
++#endif
+   mpz_urandomb (z, rstate, nbits);
+ }
+ 
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2012-02-24 13:50:05.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2012-03-08 15:17:03.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p6";
++  return "3.1.0-p7";
+ }
+diff -Naurd mpfr-3.1.0-a/tests/tinits.c mpfr-3.1.0-b/tests/tinits.c
+--- mpfr-3.1.0-a/tests/tinits.c	2011-10-03 08:17:14.000000000 +0000
++++ mpfr-3.1.0-b/tests/tinits.c	2012-03-08 15:17:03.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears.
++/* Test file for mpfr_init2, mpfr_inits, mpfr_inits2 and mpfr_clears.
+ 
+ Copyright 2003, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Contributed by the Arenaire and Caramel projects, INRIA.
+@@ -20,18 +20,43 @@
+ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
+ 
++#include <stdlib.h>
++
+ #include "mpfr-test.h"
+ 
+ int
+ main (void)
+ {
+   mpfr_t a, b, c;
++  long large_prec;
+ 
+   tests_start_mpfr ();
++
+   mpfr_inits (a, b, c, (mpfr_ptr) 0);
+   mpfr_clears (a, b, c, (mpfr_ptr) 0);
+   mpfr_inits2 (200, a, b, c, (mpfr_ptr) 0);
+   mpfr_clears (a, b, c, (mpfr_ptr) 0);
++
++  /* test for precision 2^31-1, see
++     https://gforge.inria.fr/tracker/index.php?func=detail&aid=13918 */
++  large_prec = 2147483647;
++  if (getenv ("MPFR_CHECK_LARGEMEM") != NULL)
++    {
++      /* We assume that the precision won't be increased internally. */
++      if (large_prec > MPFR_PREC_MAX)
++        large_prec = MPFR_PREC_MAX;
++      mpfr_inits2 (large_prec, a, b, (mpfr_ptr) 0);
++      mpfr_set_ui (a, 17, MPFR_RNDN);
++      mpfr_set (b, a, MPFR_RNDN);
++      if (mpfr_get_ui (a, MPFR_RNDN) != 17)
++        {
++          printf ("Error in mpfr_init2 with precision 2^31-1\n");
++          exit (1);
++        }
++      mpfr_clears (a, b, (mpfr_ptr) 0);
++    }
++
+   tests_end_mpfr ();
++
+   return 0;
+ }
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2012-03-12 11:59:47.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2012-03-12 11:59:47.000000000 +0000
+@@ -0,0 +1 @@
++__gmp_const
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2012-03-08 15:17:03.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2012-03-12 11:59:47.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p7
++3.1.0-p8
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2012-03-08 15:17:03.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2012-03-12 11:59:47.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p7"
++#define MPFR_VERSION_STRING "3.1.0-p8"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+@@ -39,6 +39,18 @@
+ # include <gmp.h>
+ #endif
+ 
++/* GMP's internal __gmp_const macro has been removed on 2012-03-04:
++     http://gmplib.org:8000/gmp/rev/d287cfaf6732
++   const is standard and now assumed to be available. If the __gmp_const
++   definition is no longer present in GMP, this probably means that GMP
++   assumes that const is available; thus let's define it to const.
++   Note: this is a temporary fix that can be backported to previous MPFR
++   versions. In the future, __gmp_const should be replaced by const like
++   in GMP. */
++#ifndef __gmp_const
++# define __gmp_const const
++#endif
++
+ /* Avoid some problems with macro expansion if the user defines macros
+    with the same name as keywords. By convention, identifiers and macro
+    names starting with mpfr_ are reserved by MPFR. */
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2012-03-08 15:17:03.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2012-03-12 11:59:47.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p7";
++  return "3.1.0-p8";
+ }
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2012-04-27 01:13:15.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2012-04-27 01:13:15.000000000 +0000
+@@ -0,0 +1 @@
++gamma-underflow
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2012-03-12 11:59:47.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2012-04-27 01:13:15.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p8
++3.1.0-p9
+diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c
+--- mpfr-3.1.0-a/src/gamma.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/gamma.c	2012-04-27 01:13:15.000000000 +0000
+@@ -296,7 +296,7 @@
+       /* we want an upper bound for x * [log(2-x)-1].
+          since x < 0, we need a lower bound on log(2-x) */
+       mpfr_ui_sub (xp, 2, x, MPFR_RNDD);
+-      mpfr_log2 (xp, xp, MPFR_RNDD);
++      mpfr_log (xp, xp, MPFR_RNDD);
+       mpfr_sub_ui (xp, xp, 1, MPFR_RNDD);
+       mpfr_mul (xp, xp, x, MPFR_RNDU);
+ 
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2012-03-12 11:59:47.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2012-04-27 01:13:15.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p8"
++#define MPFR_VERSION_STRING "3.1.0-p9"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2012-03-12 11:59:47.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2012-04-27 01:13:15.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p8";
++  return "3.1.0-p9";
+ }
+diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c
+--- mpfr-3.1.0-a/tests/tgamma.c	2011-10-03 08:17:14.000000000 +0000
++++ mpfr-3.1.0-b/tests/tgamma.c	2012-04-27 01:13:15.000000000 +0000
+@@ -478,6 +478,36 @@
+   mpfr_clear (x);
+ }
+ 
++/* bug found by Giridhar Tammana */
++static void
++test20120426 (void)
++{
++  mpfr_t xa, xb;
++  int i;
++  mpfr_exp_t emin;
++
++  mpfr_init2 (xa, 53);
++  mpfr_init2 (xb, 53);
++  mpfr_set_d (xb, -168.5, MPFR_RNDN);
++  emin = mpfr_get_emin ();
++  mpfr_set_emin (-1073);
++  i = mpfr_gamma (xa, xb, MPFR_RNDN);
++  i = mpfr_subnormalize (xa, i, MPFR_RNDN); /* new ternary value */
++  mpfr_set_str (xb, "-9.5737343987585366746184749943e-304", 10, MPFR_RNDN);
++  if (!((i > 0) && (mpfr_cmp (xa, xb) == 0)))
++    {
++      printf ("Error in test20120426, i=%d\n", i);
++      printf ("expected ");
++      mpfr_print_binary (xb); putchar ('\n');
++      printf ("got      ");
++      mpfr_print_binary (xa); putchar ('\n');
++      exit (1);
++    }
++  mpfr_set_emin (emin);
++  mpfr_clear (xa);
++  mpfr_clear (xb);
++}
++
+ static void
+ exprange (void)
+ {
+@@ -821,6 +851,7 @@
+   gamma_integer ();
+   test20071231 ();
+   test20100709 ();
++  test20120426 ();
+ 
+   data_check ("data/gamma", mpfr_gamma, "mpfr_gamma");
+ 
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2012-05-07 18:52:45.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2012-05-07 18:52:45.000000000 +0000
+@@ -0,0 +1 @@
++gamma-overunderflow
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2012-04-27 01:13:15.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2012-05-07 18:52:45.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p9
++3.1.0-p10
+diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c
+--- mpfr-3.1.0-a/src/gamma.c	2012-04-27 01:13:15.000000000 +0000
++++ mpfr-3.1.0-b/src/gamma.c	2012-05-07 18:52:45.000000000 +0000
+@@ -100,7 +100,8 @@
+   mpfr_t xp, GammaTrial, tmp, tmp2;
+   mpz_t fact;
+   mpfr_prec_t realprec;
+-  int compared, inex, is_integer;
++  int compared, is_integer;
++  int inex = 0;  /* 0 means: result gamma not set yet */
+   MPFR_GROUP_DECL (group);
+   MPFR_SAVE_EXPO_DECL (expo);
+   MPFR_ZIV_DECL (loop);
+@@ -377,6 +378,15 @@
+       mpfr_mul (GammaTrial, tmp2, xp, MPFR_RNDN); /* Pi*(2-x), error (1+u)^2 */
+       err_g = MPFR_GET_EXP(GammaTrial);
+       mpfr_sin (GammaTrial, GammaTrial, MPFR_RNDN); /* sin(Pi*(2-x)) */
++      /* If tmp is +Inf, we compute exp(lngamma(x)). */
++      if (mpfr_inf_p (tmp))
++        {
++          inex = mpfr_explgamma (gamma, x, &expo, tmp, tmp2, rnd_mode);
++          if (inex)
++            goto end;
++          else
++            goto ziv_next;
++        }
+       err_g = err_g + 1 - MPFR_GET_EXP(GammaTrial);
+       /* let g0 the true value of Pi*(2-x), g the computed value.
+          We have g = g0 + h with |h| <= |(1+u^2)-1|*g.
+@@ -411,11 +421,16 @@
+       if (MPFR_LIKELY (MPFR_CAN_ROUND (GammaTrial, realprec - err_g,
+                                        MPFR_PREC(gamma), rnd_mode)))
+         break;
++
++    ziv_next:
+       MPFR_ZIV_NEXT (loop, realprec);
+     }
++
++ end:
+   MPFR_ZIV_FREE (loop);
+ 
+-  inex = mpfr_set (gamma, GammaTrial, rnd_mode);
++  if (inex == 0)
++    inex = mpfr_set (gamma, GammaTrial, rnd_mode);
+   MPFR_GROUP_CLEAR (group);
+   mpz_clear (fact);
+ 
+diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c
+--- mpfr-3.1.0-a/src/lngamma.c	2012-03-08 15:17:03.000000000 +0000
++++ mpfr-3.1.0-b/src/lngamma.c	2012-05-07 18:52:45.000000000 +0000
+@@ -49,9 +49,72 @@
+     mpfr_set_ui_2exp (s, 9, -1, MPFR_RNDN); /* 4.5 */
+ }
+ 
+-#ifndef IS_GAMMA
++#ifdef IS_GAMMA
++
++/* This function is called in case of intermediate overflow/underflow.
++   The s1 and s2 arguments are temporary MPFR numbers, having the
++   working precision. If the result could be determined, then the
++   flags are updated via pexpo, y is set to the result, and the
++   (non-zero) ternary value is returned. Otherwise 0 is returned
++   in order to perform the next Ziv iteration. */
+ static int
+-unit_bit (mpfr_srcptr (x))
++mpfr_explgamma (mpfr_ptr y, mpfr_srcptr x, mpfr_save_expo_t *pexpo,
++                mpfr_ptr s1, mpfr_ptr s2, mpfr_rnd_t rnd)
++{
++  mpfr_t t1, t2;
++  int inex1, inex2, sign;
++  MPFR_BLOCK_DECL (flags1);
++  MPFR_BLOCK_DECL (flags2);
++  MPFR_GROUP_DECL (group);
++
++  MPFR_BLOCK (flags1, inex1 = mpfr_lgamma (s1, &sign, x, MPFR_RNDD));
++  MPFR_ASSERTN (inex1 != 0);
++  /* s1 = RNDD(lngamma(x)), inexact */
++  if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags1)))
++    {
++      if (MPFR_SIGN (s1) > 0)
++        {
++          MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_OVERFLOW);
++          return mpfr_overflow (y, rnd, sign);
++        }
++      else
++        {
++          MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_UNDERFLOW);
++          return mpfr_underflow (y, rnd == MPFR_RNDN ? MPFR_RNDZ : rnd, sign);
++        }
++    }
++
++  mpfr_set (s2, s1, MPFR_RNDN);     /* exact */
++  mpfr_nextabove (s2);              /* v = RNDU(lngamma(z0)) */
++
++  if (sign < 0)
++    rnd = MPFR_INVERT_RND (rnd);  /* since the result with be negated */
++  MPFR_GROUP_INIT_2 (group, MPFR_PREC (y), t1, t2);
++  MPFR_BLOCK (flags1, inex1 = mpfr_exp (t1, s1, rnd));
++  MPFR_BLOCK (flags2, inex2 = mpfr_exp (t2, s2, rnd));
++  /* t1 is the rounding with mode 'rnd' of a lower bound on |Gamma(x)|,
++     t2 is the rounding with mode 'rnd' of an upper bound, thus if both
++     are equal, so is the wanted result. If t1 and t2 differ or the flags
++     differ, at some point of Ziv's loop they should agree. */
++  if (mpfr_equal_p (t1, t2) && flags1 == flags2)
++    {
++      MPFR_ASSERTN ((inex1 > 0 && inex2 > 0) || (inex1 < 0 && inex2 < 0));
++      mpfr_set4 (y, t1, MPFR_RNDN, sign);  /* exact */
++      if (sign < 0)
++        inex1 = - inex1;
++      MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, flags1);
++    }
++  else
++    inex1 = 0;  /* couldn't determine the result */
++  MPFR_GROUP_CLEAR (group);
++
++  return inex1;
++}
++
++#else
++
++static int
++unit_bit (mpfr_srcptr x)
+ {
+   mpfr_exp_t expo;
+   mpfr_prec_t prec;
+@@ -75,6 +138,7 @@
+ 
+   return (x0 >> (prec % GMP_NUMB_BITS)) & 1;
+ }
++
+ #endif
+ 
+ /* lngamma(x) = log(gamma(x)).
+@@ -99,12 +163,14 @@
+   mpfr_t s, t, u, v, z;
+   unsigned long m, k, maxm;
+   mpz_t *INITIALIZED(B);  /* variable B declared as initialized */
+-  int inexact, compared;
++  int compared;
++  int inexact = 0;  /* 0 means: result y not set yet */
+   mpfr_exp_t err_s, err_t;
+   unsigned long Bm = 0; /* number of allocated B[] */
+   unsigned long oldBm;
+   double d;
+   MPFR_SAVE_EXPO_DECL (expo);
++  MPFR_ZIV_DECL (loop);
+ 
+   compared = mpfr_cmp_ui (z0, 1);
+ 
+@@ -122,7 +188,7 @@
+   if (MPFR_EXP(z0) <= - (mpfr_exp_t) MPFR_PREC(y))
+     {
+       mpfr_t l, h, g;
+-      int ok, inex2;
++      int ok, inex1, inex2;
+       mpfr_prec_t prec = MPFR_PREC(y) + 14;
+       MPFR_ZIV_DECL (loop);
+ 
+@@ -157,14 +223,14 @@
+           mpfr_sub (h, h, g, MPFR_RNDD);
+           mpfr_mul (g, z0, z0, MPFR_RNDU);
+           mpfr_add (h, h, g, MPFR_RNDU);
+-          inexact = mpfr_prec_round (l, MPFR_PREC(y), rnd);
++          inex1 = mpfr_prec_round (l, MPFR_PREC(y), rnd);
+           inex2 = mpfr_prec_round (h, MPFR_PREC(y), rnd);
+           /* Caution: we not only need l = h, but both inexact flags should
+              agree. Indeed, one of the inexact flags might be zero. In that
+              case if we assume lngamma(z0) cannot be exact, the other flag
+              should be correct. We are conservative here and request that both
+              inexact flags agree. */
+-          ok = SAME_SIGN (inexact, inex2) && mpfr_cmp (l, h) == 0;
++          ok = SAME_SIGN (inex1, inex2) && mpfr_cmp (l, h) == 0;
+           if (ok)
+             mpfr_set (y, h, rnd); /* exact */
+           mpfr_clear (l);
+@@ -172,8 +238,9 @@
+           mpfr_clear (g);
+           if (ok)
+             {
++              MPFR_ZIV_FREE (loop);
+               MPFR_SAVE_EXPO_FREE (expo);
+-              return mpfr_check_range (y, inexact, rnd);
++              return mpfr_check_range (y, inex1, rnd);
+             }
+           /* since we have log|gamma(x)| = - log|x| - gamma*x + O(x^2),
+              if x ~ 2^(-n), then we have a n-bit approximation, thus
+@@ -205,9 +272,10 @@
+          thus lngamma(x) = log(Pi*(x-1)/sin(Pi*(2-x))) - lngamma(2-x) */
+ 
+       w = precy + MPFR_INT_CEIL_LOG2 (precy);
++      w += MPFR_INT_CEIL_LOG2 (w) + 14;
++      MPFR_ZIV_INIT (loop, w);
+       while (1)
+         {
+-          w += MPFR_INT_CEIL_LOG2 (w) + 14;
+           MPFR_ASSERTD(w >= 3);
+           mpfr_set_prec (s, w);
+           mpfr_set_prec (t, w);
+@@ -288,7 +356,9 @@
+                                   + (rnd == MPFR_RNDN)))
+                 goto end;
+             }
++          MPFR_ZIV_NEXT (loop, w);
+         }
++      MPFR_ZIV_FREE (loop);
+     }
+ 
+   /* now z0 > 1 */
+@@ -298,10 +368,10 @@
+   /* since k is O(w), the value of log(z0*...*(z0+k-1)) is about w*log(w),
+      so there is a cancellation of ~log(w) in the argument reconstruction */
+   w = precy + MPFR_INT_CEIL_LOG2 (precy);
+-
+-  do
++  w += MPFR_INT_CEIL_LOG2 (w) + 13;
++  MPFR_ZIV_INIT (loop, w);
++  while (1)
+     {
+-      w += MPFR_INT_CEIL_LOG2 (w) + 13;
+       MPFR_ASSERTD (w >= 3);
+ 
+       /* argument reduction: we compute gamma(z0 + k), where the series
+@@ -441,6 +511,15 @@
+ #ifdef IS_GAMMA
+       err_s = MPFR_GET_EXP(s);
+       mpfr_exp (s, s, MPFR_RNDN);
++      /* If s is +Inf, we compute exp(lngamma(z0)). */
++      if (mpfr_inf_p (s))
++        {
++          inexact = mpfr_explgamma (y, z0, &expo, s, t, rnd);
++          if (inexact)
++            goto end0;
++          else
++            goto ziv_next;
++        }
+       /* before the exponential, we have s = s0 + h where
+          |h| <= (2m+48)*ulp(s), thus exp(s0) = exp(s) * exp(-h).
+          For |h| <= 1/4, we have |exp(h)-1| <= 1.2*|h| thus
+@@ -480,16 +559,26 @@
+       err_s = (err_t == err_s) ? 1 + err_s : ((err_t > err_s) ? err_t : err_s);
+       err_s += 1 - MPFR_GET_EXP(s);
+ #endif
++      if (MPFR_LIKELY (MPFR_CAN_ROUND (s, w - err_s, precy, rnd)))
++        break;
++#ifdef IS_GAMMA
++    ziv_next:
++#endif
++      MPFR_ZIV_NEXT (loop, w);
+     }
+-  while (MPFR_UNLIKELY (!MPFR_CAN_ROUND (s, w - err_s, precy, rnd)));
+ 
++#ifdef IS_GAMMA
++ end0:
++#endif
+   oldBm = Bm;
+   while (Bm--)
+     mpz_clear (B[Bm]);
+   (*__gmp_free_func) (B, oldBm * sizeof (mpz_t));
+ 
+  end:
+-  inexact = mpfr_set (y, s, rnd);
++  if (inexact == 0)
++    inexact = mpfr_set (y, s, rnd);
++  MPFR_ZIV_FREE (loop);
+ 
+   mpfr_clear (s);
+   mpfr_clear (t);
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2012-04-27 01:13:15.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2012-05-07 18:52:45.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p9"
++#define MPFR_VERSION_STRING "3.1.0-p10"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2012-04-27 01:13:15.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2012-05-07 18:52:45.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p9";
++  return "3.1.0-p10";
+ }
+diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c
+--- mpfr-3.1.0-a/tests/tgamma.c	2012-04-27 01:13:15.000000000 +0000
++++ mpfr-3.1.0-b/tests/tgamma.c	2012-05-07 18:52:45.000000000 +0000
+@@ -838,6 +838,175 @@
+     exit (1);
+ }
+ 
++/* Test mpfr_gamma in precision p1 by comparing it with exp(lgamma(x))
++   computing with a working precision p2. Assume that x is not an
++   integer <= 2. */
++static void
++exp_lgamma (mpfr_t x, mpfr_prec_t p1, mpfr_prec_t p2)
++{
++  mpfr_t yd, yu, zd, zu;
++  int inexd, inexu, sign;
++  int underflow = -1, overflow = -1;  /* -1: we don't know */
++  int got_underflow, got_overflow;
++
++  if (mpfr_integer_p (x) && mpfr_cmp_si (x, 2) <= 0)
++    {
++      printf ("Warning! x is an integer <= 2 in exp_lgamma: ");
++      mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); putchar ('\n');
++      return;
++    }
++  mpfr_inits2 (p2, yd, yu, (mpfr_ptr) 0);
++  inexd = mpfr_lgamma (yd, &sign, x, MPFR_RNDD);
++  mpfr_set (yu, yd, MPFR_RNDN);  /* exact */
++  if (inexd)
++    mpfr_nextabove (yu);
++  mpfr_clear_flags ();
++  mpfr_exp (yd, yd, MPFR_RNDD);
++  if (! mpfr_underflow_p ())
++    underflow = 0;
++  if (mpfr_overflow_p ())
++    overflow = 1;
++  mpfr_clear_flags ();
++  mpfr_exp (yu, yu, MPFR_RNDU);
++  if (mpfr_underflow_p ())
++    underflow = 1;
++  if (! mpfr_overflow_p ())
++    overflow = 0;
++  if (sign < 0)
++    {
++      mpfr_neg (yd, yd, MPFR_RNDN);  /* exact */
++      mpfr_neg (yu, yu, MPFR_RNDN);  /* exact */
++      mpfr_swap (yd, yu);
++    }
++  /* yd < Gamma(x) < yu (strict inequalities since x != 1 and x != 2) */
++  mpfr_inits2 (p1, zd, zu, (mpfr_ptr) 0);
++  mpfr_clear_flags ();
++  inexd = mpfr_gamma (zd, x, MPFR_RNDD);  /* zd <= Gamma(x) < yu */
++  got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p ();
++  got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p ();
++  if (! mpfr_less_p (zd, yu) || inexd > 0 ||
++      got_underflow != underflow ||
++      got_overflow != overflow)
++    {
++      printf ("Error in exp_lgamma on x = ");
++      mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
++      printf ("yu = ");
++      mpfr_dump (yu);
++      printf ("zd = ");
++      mpfr_dump (zd);
++      printf ("got inexd = %d, expected <= 0\n", inexd);
++      printf ("got underflow = %d, expected %d\n", got_underflow, underflow);
++      printf ("got overflow = %d, expected %d\n", got_overflow, overflow);
++      exit (1);
++    }
++  mpfr_clear_flags ();
++  inexu = mpfr_gamma (zu, x, MPFR_RNDU);  /* zu >= Gamma(x) > yd */
++  got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p ();
++  got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p ();
++  if (! mpfr_greater_p (zu, yd) || inexu < 0 ||
++      got_underflow != underflow ||
++      got_overflow != overflow)
++    {
++      printf ("Error in exp_lgamma on x = ");
++      mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
++      printf ("yd = ");
++      mpfr_dump (yd);
++      printf ("zu = ");
++      mpfr_dump (zu);
++      printf ("got inexu = %d, expected >= 0\n", inexu);
++      printf ("got underflow = %d, expected %d\n", got_underflow, underflow);
++      printf ("got overflow = %d, expected %d\n", got_overflow, overflow);
++      exit (1);
++    }
++  if (mpfr_equal_p (zd, zu))
++    {
++      if (inexd != 0 || inexu != 0)
++        {
++          printf ("Error in exp_lgamma on x = ");
++          mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
++          printf ("zd = zu, thus exact, but inexd = %d and inexu = %d\n",
++                  inexd, inexu);
++          exit (1);
++        }
++      MPFR_ASSERTN (got_underflow == 0);
++      MPFR_ASSERTN (got_overflow == 0);
++    }
++  else if (inexd == 0 || inexu == 0)
++    {
++      printf ("Error in exp_lgamma on x = ");
++          mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
++          printf ("zd != zu, thus inexact, but inexd = %d and inexu = %d\n",
++                  inexd, inexu);
++          exit (1);
++    }
++  mpfr_clears (yd, yu, zd, zu, (mpfr_ptr) 0);
++}
++
++static void
++exp_lgamma_tests (void)
++{
++  mpfr_t x;
++  mpfr_exp_t emin, emax;
++  int i;
++
++  emin = mpfr_get_emin ();
++  emax = mpfr_get_emax ();
++  set_emin (MPFR_EMIN_MIN);
++  set_emax (MPFR_EMAX_MAX);
++
++  mpfr_init2 (x, 96);
++  for (i = 3; i <= 8; i++)
++    {
++      mpfr_set_ui (x, i, MPFR_RNDN);
++      exp_lgamma (x, 53, 64);
++      mpfr_nextbelow (x);
++      exp_lgamma (x, 53, 64);
++      mpfr_nextabove (x);
++      mpfr_nextabove (x);
++      exp_lgamma (x, 53, 64);
++    }
++  mpfr_set_str (x, "1.7", 10, MPFR_RNDN);
++  exp_lgamma (x, 53, 64);
++  mpfr_set_str (x, "-4.6308260837372266e+07", 10, MPFR_RNDN);
++  exp_lgamma (x, 53, 64);
++  mpfr_set_str (x, "-90.6308260837372266e+15", 10, MPFR_RNDN);
++  exp_lgamma (x, 53, 64);
++  /* The following test gives a large positive result < +Inf */
++  mpfr_set_str (x, "1.2b13fc45a92dea1@14", 16, MPFR_RNDN);
++  exp_lgamma (x, 53, 64);
++  /* Idem for a large negative result > -Inf */
++  mpfr_set_str (x, "-1.2b13fc45a92de81@14", 16, MPFR_RNDN);
++  exp_lgamma (x, 53, 64);
++  /* The following two tests trigger an endless loop in r8186
++     on 64-bit machines (64-bit exponent). The second one (due
++     to undetected overflow) is a direct consequence of the
++     first one, due to the call of Gamma(2-x) if x < 1. */
++  mpfr_set_str (x, "1.2b13fc45a92dec8@14", 16, MPFR_RNDN);
++  exp_lgamma (x, 53, 64);
++  mpfr_set_str (x, "-1.2b13fc45a92dea8@14", 16, MPFR_RNDN);
++  exp_lgamma (x, 53, 64);
++  /* Similar tests (overflow threshold) for 32-bit machines. */
++  mpfr_set_str (x, "2ab68d8.657542f855111c61", 16, MPFR_RNDN);
++  exp_lgamma (x, 12, 64);
++  mpfr_set_str (x, "-2ab68d6.657542f855111c61", 16, MPFR_RNDN);
++  exp_lgamma (x, 12, 64);
++  /* The following test is an overflow on 32-bit and 64-bit machines.
++     Revision r8189 fails on 64-bit machines as the flag is unset. */
++  mpfr_set_str (x, "1.2b13fc45a92ded8@14", 16, MPFR_RNDN);
++  exp_lgamma (x, 53, 64);
++  /* On the following tests, with r8196, one gets an underflow on
++     32-bit machines, while a normal result is expected (see FIXME
++     in gamma.c:382). */
++  mpfr_set_str (x, "-2ab68d6.657542f855111c6104", 16, MPFR_RNDN);
++  exp_lgamma (x, 12, 64);  /* failure on 32-bit machines */
++  mpfr_set_str (x, "-12b13fc45a92deb.1c6c5bc964", 16, MPFR_RNDN);
++  exp_lgamma (x, 12, 64);  /* failure on 64-bit machines */
++  mpfr_clear (x);
++
++  set_emin (emin);
++  set_emax (emax);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -852,6 +1021,7 @@
+   test20071231 ();
+   test20100709 ();
+   test20120426 ();
++  exp_lgamma_tests ();
+ 
+   data_check ("data/gamma", mpfr_gamma, "mpfr_gamma");
+ 
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 5b616b90b..03cf93533 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 157379 2012-04-28 09:02:47Z pierre $
+# $Id: PKGBUILD 158833 2012-05-11 23:33:03Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=openssl
-_ver=1.0.1b
+_ver=1.0.1c
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
@@ -19,7 +19,7 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
         'fix-manpages.patch'
         'no-rpath.patch'
         'ca-dir.patch')
-md5sums=('a1da58ce63baef3812004714fa302c47'
+md5sums=('ae412727c8c15b67880aef7bd2999b2e'
          '5bbc0655bda2af95bc8eb568963ce8ba'
          'dc78d3d06baffc16217519242ce92478'
          '3bf51be3a1bbd262be46dc619f92aa90')
diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD
index 8401ed2a9..3684991a4 100644
--- a/core/xinetd/PKGBUILD
+++ b/core/xinetd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142541 2011-11-11 21:16:44Z tpowa $
+# $Id: PKGBUILD 159242 2012-05-18 16:47:27Z tpowa $
 # Maintainer:
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=xinetd
-pkgver=2.3.14
-pkgrel=8
+pkgver=2.3.15
+pkgrel=1
 pkgdesc="A secure replacement for inetd"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xinetd.org/"
@@ -15,12 +15,14 @@ source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz
         xinetd.conf
         xinetd
         servers
-        services)
-md5sums=('567382d7972613090215c6c54f9b82d9'
+        services
+        xinetd.service)
+md5sums=('77358478fd58efa6366accae99b8b04c'
          'f109f699a07bc8cfb5791060f5e87f9e'
          'ea37a2794f202e6b953d9b6956dad16a'
          '21f47b4aa20921cfaddddd9f9a407f81'
-         '9fa2061dc7dd738c8424251deb86f81e')
+         '9fa2061dc7dd738c8424251deb86f81e'
+         '4473d8b2b6c984626d9f73a0b89711ee')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -39,6 +41,8 @@ package() {
   install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers
   install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services
 
+  # install systemd files
+  install -Dm644 $srcdir/xinetd.service $pkgdir/usr/lib/systemd/system/xinetd.service
   # install license
   install -Dm644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
 }
diff --git a/core/xinetd/xinetd.service b/core/xinetd/xinetd.service
new file mode 100644
index 000000000..ac80139e2
--- /dev/null
+++ b/core/xinetd/xinetd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=A secure replacement for inetd
+After=network.service
+
+[Service]
+ExecStart=/usr/sbin/xinetd -dontfork
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index c9aebed00..877efd21e 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158550 2012-05-04 21:06:52Z heftig $
+# $Id: PKGBUILD 159201 2012-05-17 21:37:52Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=accountsservice
-pkgver=0.6.20
+pkgver=0.6.21
 pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64 'mips64el')
@@ -12,14 +12,14 @@ depends=('glib2' 'polkit' 'libsystemd')
 makedepends=('intltool' 'gobject-introspection' 'vala')
 options=('!libtool')
 source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.xz)
-md5sums=('0f26a90677e15c5cb38cf28261a3b434')
+md5sums=('b501d48963b70983170983258c19cc2c')
 
 build() {
   cd $pkgname-$pkgver
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/accountsservice \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --localstatedir=/var --disable-static
+    --localstatedir=/var --disable-static --enable-systemd
   make
 }
 
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 2054fd42b..50d074343 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,28 +1,23 @@
-# $Id: PKGBUILD 155990 2012-04-10 22:28:11Z giovanni $
+# $Id: PKGBUILD 159168 2012-05-17 06:43:10Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10771
+pkgver=10788
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
-source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2"
-        'gcc4.7.patch')
-md5sums=('0439a71048c7dbdf912d19979dc0faad'
-         '0498a6795f4ac3a3e8bbcf51a5026820')
+source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
+md5sums=('a8b68be7382f64ffe32314935461cd78')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
 
-  # Fix gcc-4.7 build
-  patch -Np1 -i "${srcdir}/gcc4.7.patch"
-
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
               --enable-cas \
diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD
index 52e386797..dbb1fe20a 100644
--- a/extra/apr/PKGBUILD
+++ b/extra/apr/PKGBUILD
@@ -1,24 +1,22 @@
-# $Id: PKGBUILD 149942 2012-02-11 23:30:26Z allan $
+# $Id: PKGBUILD 158966 2012-05-13 20:20:53Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr
-pkgver=1.4.5
-pkgrel=2.1
+pkgver=1.4.6
+pkgrel=1
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://apr.apache.org/"
-depends=('util-linux-ng>=2.16')
+depends=('util-linux')
 options=('!libtool')
 license=('APACHE')
 source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2)
-md5sums=('8b53f5a5669d0597f2da889a2f576eb6')
+md5sums=('ffee70a111fd07372982b0550bbb14b7')
 
 build() {
   cd "${srcdir}/apr-${pkgver}"
-  export apr_cv_accept4=no
-
   ./configure --prefix=/usr --includedir=/usr/include/apr-1 \
     --with-installbuilddir=/usr/share/apr-1/build \
     --enable-nonportable-atomics \
diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD
index 1a88bcd61..97f8963f8 100644
--- a/extra/at-spi2-core/PKGBUILD
+++ b/extra/at-spi2-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156705 2012-04-23 09:03:33Z ibiru $
+# $Id: PKGBUILD 159068 2012-05-15 11:36:43Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-core
-pkgver=2.4.1
+pkgver=2.4.2
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2' 'libxtst')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5a1d8026bbe1d40d1f5a2c956d10b9ed39766f7880a73d80f37aa6e48c6c11e5')
+sha256sums=('61d926ffc49c7f9236580468c5c9dabda16cec37ef3aee78ca6f2751595518fd')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD
index 05411ed7e..6735106c1 100644
--- a/extra/cairo-perl/PKGBUILD
+++ b/extra/cairo-perl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 143687 2011-11-28 11:39:04Z jgc $
+# $Id: PKGBUILD 158976 2012-05-13 21:18:20Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cairo-perl
-pkgver=1.081
+pkgver=1.082
 pkgrel=1
 pkgdesc="Perl wrappers for cairo"
 arch=(i686 x86_64 'mips64el')
@@ -11,11 +11,14 @@ url="http://gtk2-perl.sourceforge.net/"
 options=('!emptydirs')
 depends=('cairo' 'perl')
 makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz)
-md5sums=('52c712b0f749f2fe232ae6e18880fe7d')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz
+        testsuite.patch)
+md5sums=('cfd61e519ff20023979c255d4040fe06'
+         '6a3ceac304a5a53f8fdd5652d98f6855')
 
 build() {
   cd "${srcdir}/Cairo-${pkgver}"
+  patch -Np1 -i "${srcdir}/testsuite.patch"
   perl Makefile.PL INSTALLDIRS=vendor
   make
 }
diff --git a/extra/cairo-perl/testsuite.patch b/extra/cairo-perl/testsuite.patch
new file mode 100644
index 000000000..59cb58f28
--- /dev/null
+++ b/extra/cairo-perl/testsuite.patch
@@ -0,0 +1,135 @@
+From 21dd8a0600cbfac46723c7745b377fce94c8bdc3 Mon Sep 17 00:00:00 2001
+From: Torsten Schönfeld <kaffeetisch@gmx.de>
+Date: Sat, 31 Mar 2012 10:34:11 +0000
+Subject: Fix compiling and testing against older versions of cairo
+
+---
+(limited to 't/CairoPath.t')
+
+diff --git a/t/CairoPath.t b/t/CairoPath.t
+index e515172..770e464 100644
+--- a/t/CairoPath.t
++++ b/t/CairoPath.t
+@@ -11,11 +11,17 @@ use strict;
+ use warnings;
+ use Cairo;
+ 
+-use Test::More tests => 6;
++use Test::More;
+ 
+ use constant IMG_WIDTH => 256;
+ use constant IMG_HEIGHT => 256;
+ 
++if (Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 4, 0)) {
++  plan tests => 6;
++} else {
++  plan skip_all => 'path behavior not predictable on cairo < 1.4';
++}
++
+ my $surf = Cairo::ImageSurface->create ('rgb24', IMG_WIDTH, IMG_HEIGHT);
+ my $cr = Cairo::Context->create ($surf);
+ 
+--
+cgit v0.9.0.2
+From a1cd2e45b4ee49a724ae5d7e854ad9829eebf00d Mon Sep 17 00:00:00 2001
+From: Torsten Schönfeld <kaffeetisch@gmx.de>
+Date: Sat, 07 Apr 2012 18:01:31 +0000
+Subject: Make t/CairoPath.t more robust
+
+The end of a path that took a round trip into cairo and back might differ
+for different versions of cairo.  Hence, compare only the beginning with
+the expected path.
+---
+diff --git a/t/CairoPath.t b/t/CairoPath.t
+index 770e464..27a3aad 100644
+--- a/t/CairoPath.t
++++ b/t/CairoPath.t
+@@ -11,17 +11,11 @@ use strict;
+ use warnings;
+ use Cairo;
+ 
+-use Test::More;
++use Test::More tests => 18;
+ 
+ use constant IMG_WIDTH => 256;
+ use constant IMG_HEIGHT => 256;
+ 
+-if (Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 4, 0)) {
+-  plan tests => 6;
+-} else {
+-  plan skip_all => 'path behavior not predictable on cairo < 1.4';
+-}
+-
+ my $surf = Cairo::ImageSurface->create ('rgb24', IMG_WIDTH, IMG_HEIGHT);
+ my $cr = Cairo::Context->create ($surf);
+ 
+@@ -40,14 +34,7 @@ my $expected_path = [
+ ];
+ 
+ my $path = $cr->copy_path;
+-is_deeply ($path, $expected_path);
+-
+-sub paths_agree {
+-  my ($cr, $path, $expected_path) = @_;
+-  $cr->new_path;
+-  $cr->append_path ($path);
+-  is_deeply ($cr->copy_path, $expected_path);
+-}
++paths_agree ($path, $expected_path);
+ 
+ # Modifying single point values.
+ foreach ($path, $expected_path) {
+@@ -57,21 +44,21 @@ foreach ($path, $expected_path) {
+   $_->[2]{points}[2][0] = 99;
+   $_->[2]{points}[2][1] = 1010;
+ }
+-paths_agree ($cr, $path, $expected_path);
++path_round_trip_ok ($cr, $path, $expected_path);
+ 
+ # Modifying single points.
+ foreach ($path, $expected_path) {
+   $_->[1]{points}[0] = [333, 444];
+   $_->[2]{points}[2] = [77, 88];
+ }
+-paths_agree ($cr, $path, $expected_path);
++path_round_trip_ok ($cr, $path, $expected_path);
+ 
+ # Replacing all points.
+ foreach ($path, $expected_path) {
+   $_->[1]{points} = [[3333, 4444]];
+   $_->[2]{points} = [[55, 66], [77, 88], [99, 1010]];
+ }
+-paths_agree ($cr, $path, $expected_path);
++path_round_trip_ok ($cr, $path, $expected_path);
+ 
+ # Replacing and adding path segments.
+ my @cloned_path = @{$path};
+@@ -86,9 +73,24 @@ foreach (\@cloned_path, $expected_path) {
+     type => 'line-to',
+     points => [[23, 42]] };
+ }
+-paths_agree ($cr, \@cloned_path, $expected_path);
++path_round_trip_ok ($cr, \@cloned_path, $expected_path);
+ 
+ # Passing bare arrays into Cairo.
+ $cr->new_path;
+ $cr->append_path ($expected_path);
+-is_deeply ($cr->copy_path, $expected_path);
++paths_agree ($cr->copy_path, $expected_path);
++
++sub path_round_trip_ok {
++  my ($cr, $path, $expected_path) = @_;
++  $cr->new_path;
++  $cr->append_path ($path);
++  paths_agree ($cr->copy_path, $expected_path);
++}
++
++sub paths_agree {
++  my ($path, $expected_path) = @_;
++  # Only the first three entries seem to be reliable across cairo versions.
++  for (0..2) {
++    is_deeply ($path->[$_], $expected_path->[$_]);
++  }
++}
+--
+cgit v0.9.0.2
diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD
index 652d2da9d..5ce2c5fa9 100644
--- a/extra/cairo/PKGBUILD
+++ b/extra/cairo/PKGBUILD
@@ -1,38 +1,57 @@
-# $Id: PKGBUILD 148684 2012-02-05 11:46:48Z ibiru $
+# $Id: PKGBUILD 158854 2012-05-12 13:09:25Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo
-pkgver=1.10.2
-pkgrel=3
+#_gitdate=20120426
+#_gitver=957a9cc619965178a8927d114fe852034fc2385c
+pkgver=1.12.2
+pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL' 'MPL')
 url="http://cairographics.org/"
 depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh')
+makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc') # 'libdrm')
+optdepends=('xcb-util: for XCB backend') # really needed?
+provides=('cairo-xcb')
+replaces=('cairo-xcb')
 options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.gz
-        cairo-1.10.0-buggy_gradients.patch)
-sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e'
-          '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
+        #$pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz 
+        cairo-1.10.0-buggy_gradients.patch
+        #git_fixes.patch 
+)
+md5sums=('87649eb75789739d517c743e94879e51'
+         '9b323790dab003e228c6955633cb888e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch"
+  #cd ${srcdir}/${pkgname}-${_gitver}
+  patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
+  # status is 2012-04-26 last commit: image: Fix typo in _blit_spans()
+  #patch -Np1 -i ${srcdir}/git_fixes.patch
+  autoreconf -vfi
+  #./autogen.sh --prefix=/usr \
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--disable-static \
-	--enable-tee
+	--enable-tee \
+	--disable-xlib-xcb \
+	# --enable-test-surfaces \ takes ages
+	#--enable-drm # breaks build
   make
 }
 
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 Skipped
-}
+#check() {
+#  #cd "$srcdir/$pkgname-$pkgver"
+#  cd $srcdir/$pkgname-${_gitver}
+#  make -k check || /bin/true # 165 Passed, 316 Failed [3 crashed, 10 expected], 23 Skipped
+#}
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
+  #cd $srcdir/$pkgname-${_gitver}
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/cairo/git_fixes.patch b/extra/cairo/git_fixes.patch
new file mode 100644
index 000000000..6ad8979eb
--- /dev/null
+++ b/extra/cairo/git_fixes.patch
@@ -0,0 +1,1086 @@
+From ede11b2954db19e3ca9d31cef7d04a7bf0e42ddc Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad@behdad.org>
+Date: Sun, 25 Mar 2012 18:37:14 +0000
+Subject: Fix math in comments
+
+---
+diff --git a/src/cairo-arc.c b/src/cairo-arc.c
+index dc07fee..6977e88 100644
+--- a/src/cairo-arc.c
++++ b/src/cairo-arc.c
+@@ -139,7 +139,7 @@ _arc_segments_needed (double	      angle,
+ 
+    From that paper, a very practical value of h is:
+ 
+-	h = 4/3 * tan(angle/4)
++	h = 4/3 * R * tan(angle/4)
+ 
+    This value does not give the spline with minimal error, but it does
+    provide a very good approximation, (6th-order convergence), and the
+--
+cgit v0.9.0.2-2-gbebe
+From fba21ef2a4c4eb343668267fda713aedbb6af2a4 Mon Sep 17 00:00:00 2001
+From: Henry (Yu) Song <hsong@sisa.samsung.com>
+Date: Tue, 27 Mar 2012 21:25:37 +0000
+Subject: gl: use font's antialias option to check whether it needs mask
+
+There is need to loop over number of glyphs to check wether the glyph
+image is a ARGB32 as the font's antialias option can be used for checking.
+If antialias is SUBPIXEL or BEST, the glyph surface will be ARGB32,
+otherwise it will be A8 format. Therefore we will only be using
+component-alpha at SUBPIXEL (or better) font quality and only then need
+a mask for multiple pass glyph composition.
+---
+diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c
+index 832956f..9756ea4 100644
+--- a/src/cairo-gl-glyphs.c
++++ b/src/cairo-gl-glyphs.c
+@@ -427,23 +427,15 @@ _cairo_gl_composite_glyphs (void			*_dst,
+ 
+     TRACE ((stderr, "%s\n", __FUNCTION__));
+ 
+-    /* If any of the glyphs are component alpha, we have to go through a mask,
+-     * since only _cairo_gl_surface_composite() currently supports component
+-     * alpha.
++    /* If any of the glyphs require component alpha, we have to go through
++     * a mask, since only _cairo_gl_surface_composite() currently supports
++     * component alpha.
+      */
+-    if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER) {
+-	for (i = 0; i < info->num_glyphs; i++) {
+-	    cairo_scaled_glyph_t *scaled_glyph;
+-
+-	    if (_cairo_scaled_glyph_lookup (info->font, info->glyphs[i].index,
+-					    CAIRO_SCALED_GLYPH_INFO_SURFACE,
+-					    &scaled_glyph) == CAIRO_INT_STATUS_SUCCESS &&
+-		scaled_glyph->surface->format == CAIRO_FORMAT_ARGB32)
+-	    {
+-		info->use_mask = TRUE;
+-		break;
+-	    }
+-	}
++    if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER &&
++	(info->font->options.antialias == CAIRO_ANTIALIAS_SUBPIXEL ||
++	 info->font->options.antialias == CAIRO_ANTIALIAS_BEST))
++    {
++	info->use_mask = TRUE;
+     }
+ 
+     if (info->use_mask) {
+--
+cgit v0.9.0.2-2-gbebe
+From d304f0e57be8036719c3709e2419487326369105 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed, 28 Mar 2012 23:32:36 +0000
+Subject: composite-rectangles: Trim extents for SOURCE and CLEAR to the mask
+
+The SOURCE and CLEAR are the odd pair in Cairo's range of operators that
+are bound by the shape/mask, but are unbound by the source. This
+regularly leads to bugs as only track the bound/unbound rectangles and
+confuse the meaning when bound only by the mask.
+
+What is required is that the unbound extents in this case is only
+trimmed by the mask (the bounded extents are still the intersection of
+all).
+
+Fixes bug-source-cu
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/cairo-composite-rectangles.c b/src/cairo-composite-rectangles.c
+index 106571e..8c5cd5a 100644
+--- a/src/cairo-composite-rectangles.c
++++ b/src/cairo-composite-rectangles.c
+@@ -147,8 +147,12 @@ _cairo_composite_rectangles_intersect (cairo_composite_rectangles_t *extents,
+     if (! ret && extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK)
+ 	return CAIRO_INT_STATUS_NOTHING_TO_DO;
+ 
+-    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
++    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
+ 	extents->unbounded = extents->bounded;
++    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
++	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
++	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
++    }
+ 
+     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
+     if (_cairo_clip_is_all_clipped (extents->clip))
+@@ -199,8 +203,12 @@ _cairo_composite_rectangles_intersect_source_extents (cairo_composite_rectangles
+ 	rect.height == extents->bounded.height)
+ 	return CAIRO_INT_STATUS_SUCCESS;
+ 
+-    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
++    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
+ 	extents->unbounded = extents->bounded;
++    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
++	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
++	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
++    }
+ 
+     clip = extents->clip;
+     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
+@@ -253,8 +261,12 @@ _cairo_composite_rectangles_intersect_mask_extents (cairo_composite_rectangles_t
+ 	mask.height == extents->bounded.height)
+ 	return CAIRO_INT_STATUS_SUCCESS;
+ 
+-    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
++    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
+ 	extents->unbounded = extents->bounded;
++    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
++	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
++	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
++    }
+ 
+     clip = extents->clip;
+     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
+--
+cgit v0.9.0.2-2-gbebe
+From af6e084dd78fcbb8ecce46c57f655f5e24343b8c Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu, 29 Mar 2012 13:48:24 +0000
+Subject: cairoint: Mark PDF surface as requiring the deflate stream output
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/cairoint.h b/src/cairoint.h
+index 9a8003e..9f20d51 100644
+--- a/src/cairoint.h
++++ b/src/cairoint.h
+@@ -73,7 +73,10 @@
+ #include "cairo-compiler-private.h"
+ #include "cairo-error-private.h"
+ 
+-#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_SCRIPT_SURFACE || CAIRO_HAS_XML_SURFACE
++#if CAIRO_HAS_PDF_SURFACE    || \
++    CAIRO_HAS_PS_SURFACE     || \
++    CAIRO_HAS_SCRIPT_SURFACE || \
++    CAIRO_HAS_XML_SURFACE
+ #define CAIRO_HAS_DEFLATE_STREAM 1
+ #endif
+ 
+@@ -84,7 +87,9 @@
+ #define CAIRO_HAS_FONT_SUBSET 1
+ #endif
+ 
+-#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_PDF_SURFACE || CAIRO_HAS_FONT_SUBSET
++#if CAIRO_HAS_PS_SURFACE  || \
++    CAIRO_HAS_PDF_SURFACE || \
++    CAIRO_HAS_FONT_SUBSET
+ #define CAIRO_HAS_PDF_OPERATORS 1
+ #endif
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From a965b0f95fdeb567f7ccb51f7c8c47735a61e2d9 Mon Sep 17 00:00:00 2001
+From: Henry (Yu) Song <hsong@sisa.samsung.com>
+Date: Thu, 29 Mar 2012 01:08:51 +0000
+Subject: gl: fix y-axis origin when map_to_image() for non texture GL surface
+
+We need to fix y-axis origin when map a GL surface to image surface for
+non-texture GL surface.
+
+Test cases: extended-blend-alpha-mask, extended-blend-mask.
+Although the image outputs is not right, but the image on the first grid
+(upper-left corner) is correct comparing to image output.
+---
+diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
+index 8bbf939..32ecf63 100644
+--- a/src/cairo-gl-surface.c
++++ b/src/cairo-gl-surface.c
+@@ -985,6 +985,7 @@ _cairo_gl_surface_map_to_image (void      *abstract_surface,
+     unsigned int cpp;
+     cairo_bool_t invert;
+     cairo_status_t status;
++    int y;
+ 
+     /* Want to use a switch statement here but the compiler gets whiny. */
+     if (surface->base.content == CAIRO_CONTENT_COLOR_ALPHA) {
+@@ -1065,7 +1066,12 @@ _cairo_gl_surface_map_to_image (void      *abstract_surface,
+ 	glPixelStorei (GL_PACK_ROW_LENGTH, image->stride / cpp);
+     if (invert)
+ 	glPixelStorei (GL_PACK_INVERT_MESA, 1);
+-    glReadPixels (extents->x, extents->y,
++
++    y = extents->y;
++    if (! _cairo_gl_surface_is_texture (surface))
++	y = surface->height - extents->y - extents->height;
++
++    glReadPixels (extents->x, y,
+ 		  extents->width, extents->height,
+ 		  format, type, image->data);
+     if (invert)
+--
+cgit v0.9.0.2-2-gbebe
+From c77112c5464d7ff21052527f82f4d729cc509291 Mon Sep 17 00:00:00 2001
+From: Uli Schlachter <psychon@znc.in>
+Date: Mon, 02 Apr 2012 18:43:00 +0000
+Subject: xcb: Fix SHM in _get_image()
+
+Commit 2283ab9 introduced a logic error. Instead of falling back to the non-SHM
+path when getting the image via SHM failed, we now did the fallback when getting
+the image via SHM worked (which means that the SHM operation was a waste of
+time).
+
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+---
+diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
+index fff4f52..6bedbda 100644
+--- a/src/cairo-xcb-surface.c
++++ b/src/cairo-xcb-surface.c
+@@ -367,7 +367,7 @@ _get_image (cairo_xcb_surface_t		 *surface,
+     if (use_shm) {
+ 	image = _get_shm_image (surface, x, y, width, height);
+ 	if (image) {
+-	    if (image->status) {
++	    if (image->status == CAIRO_STATUS_SUCCESS) {
+ 		_cairo_xcb_connection_release (connection);
+ 		return image;
+ 	    }
+--
+cgit v0.9.0.2-2-gbebe
+From cc247c346b75353f16ab40ac74c54cdd9663d16b Mon Sep 17 00:00:00 2001
+From: Henry (Yu) Song <hsong@sisa.samsung.com>
+Date: Mon, 02 Apr 2012 21:29:47 +0000
+Subject: gl: Remove an unused variable
+
+---
+diff --git a/src/cairo-gl-gradient.c b/src/cairo-gl-gradient.c
+index b364b92..ce7c0dd 100644
+--- a/src/cairo-gl-gradient.c
++++ b/src/cairo-gl-gradient.c
+@@ -207,7 +207,6 @@ _cairo_gl_gradient_create (cairo_gl_context_t           *ctx,
+     cairo_status_t status;
+     int tex_width;
+     void *data;
+-    cairo_gl_dispatch_t *dispatch = &ctx->dispatch;
+ 
+     if ((unsigned int) ctx->max_texture_size / 2 <= n_stops)
+ 	return CAIRO_INT_STATUS_UNSUPPORTED;
+--
+cgit v0.9.0.2-2-gbebe
+From 7a262fd398c8a1f3c9052e8d9ec459e27ff91b4d Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Wed, 04 Apr 2012 10:23:09 +0000
+Subject: fix bug in _cairo_image_analyze_color
+
+---
+diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
+index 8208a15..e860e1b 100644
+--- a/src/cairo-image-surface.c
++++ b/src/cairo-image-surface.c
+@@ -1130,9 +1130,12 @@ _cairo_image_analyze_color (cairo_image_surface_t      *image)
+     if (image->color != CAIRO_IMAGE_UNKNOWN_COLOR)
+ 	return image->color;
+ 
+-    if (image->format == CAIRO_FORMAT_A1 || image->format == CAIRO_FORMAT_A8)
++    if (image->format == CAIRO_FORMAT_A1)
+ 	return image->color = CAIRO_IMAGE_IS_MONOCHROME;
+ 
++    if (image->format == CAIRO_FORMAT_A8)
++	return image->color = CAIRO_IMAGE_IS_GRAYSCALE;
++
+     if (image->format == CAIRO_FORMAT_ARGB32) {
+ 	image->color = CAIRO_IMAGE_IS_MONOCHROME;
+ 	for (y = 0; y < image->height; y++) {
+--
+cgit v0.9.0.2-2-gbebe
+From 70b2856ed3d31b41e69b3d82fb9c5c11c2b3d3d4 Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Thu, 05 Apr 2012 23:43:35 +0000
+Subject: type1-subset: use fallback font if glyph widths are calculated
+
+Bug 48349 has a pdf file with a Type 1 font where the glyph widths are
+of the form:
+
+34 9302 19 div hsbw
+---
+diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
+index 607ac8e..ba1008a 100644
+--- a/src/cairo-type1-subset.c
++++ b/src/cairo-type1-subset.c
+@@ -751,6 +751,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
+ 	    command = *p++;
+ 	    switch (command) {
+ 		case TYPE1_CHARSTRING_COMMAND_HSBW:
++		     if (! last_op_was_integer)
++			  return CAIRO_INT_STATUS_UNSUPPORTED;
++
+ 		    font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
+ 		    font->build_stack.sp = 0;
+ 		    last_op_was_integer = FALSE;
+@@ -797,6 +800,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
+ 			    break;
+ 
+ 			case TYPE1_CHARSTRING_COMMAND_SBW:
++			     if (! last_op_was_integer)
++				  return CAIRO_INT_STATUS_UNSUPPORTED;
++
+ 			    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
+ 			    font->build_stack.sp = 0;
+ 			    last_op_was_integer = FALSE;
+--
+cgit v0.9.0.2-2-gbebe
+From a6d955fcc46ae2da8d6f3b2cadeae64c03066461 Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Thu, 05 Apr 2012 23:53:50 +0000
+Subject: fix indentation in cairo_type1_font_subset_parse_charstring
+
+---
+diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
+index ba1008a..ddef8ae 100644
+--- a/src/cairo-type1-subset.c
++++ b/src/cairo-type1-subset.c
+@@ -1,3 +1,4 @@
++/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */
+ /* cairo - a vector graphics library with display and print output
+  *
+  * Copyright © 2006 Red Hat, Inc
+@@ -750,86 +751,79 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
+         if (*p < 32) {
+ 	    command = *p++;
+ 	    switch (command) {
+-		case TYPE1_CHARSTRING_COMMAND_HSBW:
+-		     if (! last_op_was_integer)
+-			  return CAIRO_INT_STATUS_UNSUPPORTED;
++	    case TYPE1_CHARSTRING_COMMAND_HSBW:
++		if (! last_op_was_integer)
++		    return CAIRO_INT_STATUS_UNSUPPORTED;
++
++		font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
++		font->build_stack.sp = 0;
++		last_op_was_integer = FALSE;
++		break;
++
++	    case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
++		if (font->subset_subrs  &&
++		    last_op_was_integer &&
++		    font->build_stack.top_value >= 0    &&
++		    font->build_stack.top_value < font->num_subrs)
++		{
++		    subr_num = font->build_stack.top_value;
++		    font->subrs[subr_num].used = TRUE;
++		    last_op_was_integer = FALSE;
++		    status = cairo_type1_font_subset_parse_charstring (font,
++								       glyph,
++								       font->subrs[subr_num].subr_string,
++								       font->subrs[subr_num].subr_length);
++		} else {
++		    font->subset_subrs = FALSE;
++		}
++		break;
++
++	    case TYPE1_CHARSTRING_COMMAND_ESCAPE:
++		command = command << 8 | *p++;
++		switch (command) {
++		case TYPE1_CHARSTRING_COMMAND_SEAC:
++		    /* The seac command takes five integer arguments.  The
++		     * last two are glyph indices into the PS standard
++		     * encoding give the names of the glyphs that this
++		     * glyph is composed from.  All we need to do is to
++		     * make sure those glyphs are present in the subset
++		     * under their standard names. */
++		    status = use_standard_encoding_glyph (font, font->build_stack.stack[3]);
++		    if (unlikely (status))
++			return status;
++
++		    status = use_standard_encoding_glyph (font, font->build_stack.stack[4]);
++		    if (unlikely (status))
++			return status;
+ 
+-		    font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
+ 		    font->build_stack.sp = 0;
+ 		    last_op_was_integer = FALSE;
+ 		    break;
+ 
+-		case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
+-		    if (font->subset_subrs  &&
+-			last_op_was_integer &&
+-			font->build_stack.top_value >= 0    &&
+-			font->build_stack.top_value < font->num_subrs)
+-		    {
+-			subr_num = font->build_stack.top_value;
+-			font->subrs[subr_num].used = TRUE;
+-			last_op_was_integer = FALSE;
+-			status = cairo_type1_font_subset_parse_charstring (font,
+-									   glyph,
+-									   font->subrs[subr_num].subr_string,
+-									   font->subrs[subr_num].subr_length);
+-		    } else {
+-			font->subset_subrs = FALSE;
+-		    }
++		case TYPE1_CHARSTRING_COMMAND_SBW:
++		    if (! last_op_was_integer)
++			return CAIRO_INT_STATUS_UNSUPPORTED;
++
++		    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
++		    font->build_stack.sp = 0;
++		    last_op_was_integer = FALSE;
+ 		    break;
+ 
+-		case TYPE1_CHARSTRING_COMMAND_ESCAPE:
+-		    command = command << 8 | *p++;
+-		    switch (command) {
+-			case TYPE1_CHARSTRING_COMMAND_SEAC:
+-			    /* The seac command takes five integer arguments.  The
+-			     * last two are glyph indices into the PS standard
+-			     * encoding give the names of the glyphs that this
+-			     * glyph is composed from.  All we need to do is to
+-			     * make sure those glyphs are present in the subset
+-			     * under their standard names. */
+-			    status = use_standard_encoding_glyph (font, font->build_stack.stack[3]);
+-			    if (unlikely (status))
+-				return status;
+-
+-			    status = use_standard_encoding_glyph (font, font->build_stack.stack[4]);
+-			    if (unlikely (status))
+-				return status;
+-
+-			    font->build_stack.sp = 0;
+-			    last_op_was_integer = FALSE;
+-			    break;
+-
+-			case TYPE1_CHARSTRING_COMMAND_SBW:
+-			     if (! last_op_was_integer)
+-				  return CAIRO_INT_STATUS_UNSUPPORTED;
+-
+-			    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
+-			    font->build_stack.sp = 0;
+-			    last_op_was_integer = FALSE;
+-			    break;
+-
+-			case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
+-			    for (i = 0; i < font->build_stack.sp; i++)
+-				font->ps_stack.other_subr_args[i] = font->build_stack.stack[i];
+-			    font->ps_stack.num_other_subr_args = font->build_stack.sp;
+-			    font->ps_stack.cur_other_subr_arg = 0;
+-			    font->build_stack.sp = 0;
+-			    last_op_was_integer = FALSE;
+-			    break;
+-
+-			case TYPE1_CHARSTRING_COMMAND_POP:
+-			    if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) {
+-				font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++];
+-				last_op_was_integer = TRUE;
+-			    } else {
+-				font->subset_subrs = FALSE;
+-			    }
+-			    break;
+-
+-			default:
+-			    font->build_stack.sp = 0;
+-			    last_op_was_integer = FALSE;
+-			    break;
++		case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
++		    for (i = 0; i < font->build_stack.sp; i++)
++			font->ps_stack.other_subr_args[i] = font->build_stack.stack[i];
++		    font->ps_stack.num_other_subr_args = font->build_stack.sp;
++		    font->ps_stack.cur_other_subr_arg = 0;
++		    font->build_stack.sp = 0;
++		    last_op_was_integer = FALSE;
++		    break;
++
++		case TYPE1_CHARSTRING_COMMAND_POP:
++		    if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) {
++			font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++];
++			last_op_was_integer = TRUE;
++		    } else {
++			font->subset_subrs = FALSE;
+ 		    }
+ 		    break;
+ 
+@@ -837,6 +831,13 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
+ 		    font->build_stack.sp = 0;
+ 		    last_op_was_integer = FALSE;
+ 		    break;
++		}
++		break;
++
++	    default:
++		font->build_stack.sp = 0;
++		last_op_was_integer = FALSE;
++		break;
+ 	    }
+         } else {
+             /* integer argument */
+--
+cgit v0.9.0.2-2-gbebe
+From 8886220b5027296f5b3b95e9c2f93509108d3b9e Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri, 06 Apr 2012 00:13:53 +0000
+Subject: type1-subset: if font name is prefixed with a subset tag, strip it off
+
+---
+diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
+index ddef8ae..e507abe 100644
+--- a/src/cairo-type1-subset.c
++++ b/src/cairo-type1-subset.c
+@@ -381,6 +381,7 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font)
+ {
+     const char *start, *end, *segment_end;
+     char *s;
++    int i;
+ 
+     segment_end = font->header_segment + font->header_segment_size;
+     start = find_token (font->header_segment, segment_end, "/FontName");
+@@ -406,6 +407,16 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font)
+ 	return CAIRO_INT_STATUS_UNSUPPORTED;
+     }
+ 
++    /* If font name is prefixed with a subset tag, strip it off. */
++    if (strlen(start) > 7 && start[6] == '+') {
++	for (i = 0; i < 6; i++) {
++	    if (start[i] < 'A' || start[i] > 'Z')
++		break;
++	}
++	if (i == 6)
++	    start += 7;
++    }
++
+     font->base.base_font = strdup (start);
+     free (s);
+     if (unlikely (font->base.base_font == NULL))
+--
+cgit v0.9.0.2-2-gbebe
+From 8657ca10e34b0034602680b4304d47ecf90ccbfd Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri, 06 Apr 2012 11:50:40 +0000
+Subject: fix _cairo_pattern_get_ink_extents to work with snapshot recording surfaces
+
+It had caused pdf bbox sizes to regress to page size bboxes.
+---
+diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
+index 27ba004..5b3e177 100644
+--- a/src/cairo-pattern.c
++++ b/src/cairo-pattern.c
+@@ -37,6 +37,7 @@
+ #include "cairo-path-private.h"
+ #include "cairo-pattern-private.h"
+ #include "cairo-recording-surface-private.h"
++#include "cairo-surface-snapshot-private.h"
+ 
+ #include <float.h>
+ 
+@@ -3666,6 +3667,9 @@ _cairo_pattern_get_ink_extents (const cairo_pattern_t         *pattern,
+ 	    (const cairo_surface_pattern_t *) pattern;
+ 	cairo_surface_t *surface = surface_pattern->surface;
+ 
++	if (_cairo_surface_is_snapshot (surface))
++	    surface = _cairo_surface_snapshot_get_target (surface);
++
+ 	if (_cairo_surface_is_recording (surface)) {
+ 	    cairo_matrix_t imatrix;
+ 	    cairo_box_t box;
+--
+cgit v0.9.0.2-2-gbebe
+From 6f28f0b33cb12f3b2dd48c87da0018bd00c17107 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun, 08 Apr 2012 10:28:59 +0000
+Subject: stroke: Fix misuse of half_line_x for vertical caps on dashes
+
+A typo using half_line_x instead of half_line_y when emitting dashed
+segments of the rectilinear stroke.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/cairo-path-stroke-boxes.c b/src/cairo-path-stroke-boxes.c
+index 3e8c5a4..cc9dd19 100644
+--- a/src/cairo-path-stroke-boxes.c
++++ b/src/cairo-path-stroke-boxes.c
+@@ -342,15 +342,15 @@ _cairo_rectilinear_stroker_emit_segments_dashed (cairo_rectilinear_stroker_t *st
+ 		    box.p1.x = box.p2.x - half_line_x;
+ 		}
+ 		if (out_slope.dy >= 0)
+-		    box.p1.y -= half_line_x;
++		    box.p1.y -= half_line_y;
+ 		if (out_slope.dy <= 0)
+-		    box.p2.y += half_line_x;
++		    box.p2.y += half_line_y;
+ 	    } else {
+ 		if (box.p1.y <= box.p2.y) {
+ 		    box.p1.y = box.p2.y;
+-		    box.p2.y += half_line_x;
++		    box.p2.y += half_line_y;
+ 		} else {
+-		    box.p1.y = box.p2.y - half_line_x;
++		    box.p1.y = box.p2.y - half_line_y;
+ 		}
+ 		if (out_slope.dx >= 0)
+ 		    box.p1.x -= half_line_x;
+--
+cgit v0.9.0.2-2-gbebe
+From 113ec6bf0c8ed1ff12293d1ed2a2de9bd5b9904b Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun, 08 Apr 2012 16:58:13 +0000
+Subject: traps: Clip the trapezoid extents against the clip extents
+
+Just in case the clip polygon turns out to be much larger than the
+operation extents (silly us for not reducing it correctly) and lead to
+catastrophe, such as:
+
+Program received signal SIGSEGV, Segmentation fault.
+pixman_fill_sse2 (bits=<optimized out>, stride=4, bpp=8, x=0, y=0,
+width=3, height=-34811, data=0) at pixman-sse2.c:3369
+3369		    *(uint16_t *)d = data;
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/cairo-traps-compositor.c b/src/cairo-traps-compositor.c
+index 284a0be..c49e208 100644
+--- a/src/cairo-traps-compositor.c
++++ b/src/cairo-traps-compositor.c
+@@ -218,8 +218,13 @@ combine_clip_as_traps (const cairo_traps_compositor_t *compositor,
+     _cairo_traps_fini (&traps);
+     cairo_surface_destroy (src);
+ 
+-    if (status == CAIRO_INT_STATUS_SUCCESS &&
+-	(fixup.width < extents->width || fixup.height < extents->height)) {
++    if (unlikely (status))
++	return status;
++
++    if (! _cairo_rectangle_intersect (&fixup, extents))
++	return CAIRO_STATUS_SUCCESS;
++
++    if (fixup.width < extents->width || fixup.height < extents->height) {
+ 	cairo_boxes_t clear;
+ 
+ 	_cairo_boxes_init (&clear);
+--
+cgit v0.9.0.2-2-gbebe
+From de61681574eb7d6e0e497ea7f25797e3d9b20ac4 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon, 09 Apr 2012 11:47:34 +0000
+Subject: build: Disable -Wset-but-unused-variable
+
+This is too noisy in the current build, and masking more important
+warnings.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
+index 3eb0104..f1b17f4 100644
+--- a/build/configure.ac.warnings
++++ b/build/configure.ac.warnings
+@@ -21,6 +21,9 @@ MAYBE_WARN="-Wall -Wextra \
+ -Wno-missing-field-initializers -Wno-unused-parameter \
+ -Wno-attributes -Wno-long-long -Winline"
+ 
++# -Wunused-but-set-variable is too noisy at present
++NO_WARN="-Wno-unused-but-set-variable"
++
+ dnl Sun Studio 12 likes to rag at us for abusing enums like
+ dnl having cairo_status_t variables hold cairo_int_status_t
+ dnl values.  It's bad, we know.  Now please be quiet.
+@@ -34,6 +37,8 @@ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
+ dnl Also to turn various gcc/glibc-specific preprocessor checks
+ MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
+ 
++MAYBE_WARN="$MAYBE_WARN $NO_WARN"
++
+ # invalidate cached value if MAYBE_WARN has changed
+ if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then
+ 	unset cairo_cv_warn_cflags
+--
+cgit v0.9.0.2-2-gbebe
+From 7cb5053c0694992320b5f7ea3b91ea497431813b Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon, 09 Apr 2012 11:49:20 +0000
+Subject: analysis: Apply the integer translation to the bbox as well
+
+The bbox is used to compute the ink extents (and so the pattern extents
+of a recording surface) and if given an integer translation we failed to
+transform the bbox into the target space.
+
+Fixes mask (pdf).
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c
+index b8abe02..8878f62 100644
+--- a/src/cairo-analysis-surface.c
++++ b/src/cairo-analysis-surface.c
+@@ -220,6 +220,14 @@ _add_operation (cairo_analysis_surface_t *surface,
+ 	if (_cairo_matrix_is_integer_translation (&surface->ctm, &tx, &ty)) {
+ 	    rect->x += tx;
+ 	    rect->y += ty;
++
++	    tx = _cairo_fixed_from_int (tx);
++	    bbox.p1.x += tx;
++	    bbox.p2.x += tx;
++
++	    ty = _cairo_fixed_from_int (ty);
++	    bbox.p1.y += ty;
++	    bbox.p2.y += ty;
+ 	} else {
+ 	    _cairo_matrix_transform_bounding_box_fixed (&surface->ctm,
+ 							&bbox, NULL);
+--
+cgit v0.9.0.2-2-gbebe
+From 038e4991912656a3239ca82d60056ca129016ba6 Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Mon, 09 Apr 2012 08:31:44 +0000
+Subject: pdf: avoid unnecessary use of patterns in mask groups
+
+---
+diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
+index 4930e72..78537ce 100644
+--- a/src/cairo-pdf-surface.c
++++ b/src/cairo-pdf-surface.c
+@@ -5703,56 +5703,68 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t	*surface,
+     if (unlikely (status))
+ 	return status;
+ 
+-    pattern_res.id = 0;
+-    gstate_res.id = 0;
+-    status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL,
+-						 &pattern_res, &gstate_res);
+-    if (unlikely (status))
+-	return status;
+-
+-    if (gstate_res.id != 0) {
+-	smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
+-	if (unlikely (smask_group == NULL))
+-	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+-
+-	smask_group->width = group->width;
+-	smask_group->height = group->height;
+-	smask_group->operation = PDF_PAINT;
+-	smask_group->source = cairo_pattern_reference (group->mask);
+-	smask_group->source_res = pattern_res;
+-	status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
+-	if (unlikely (status)) {
+-	    _cairo_pdf_smask_group_destroy (smask_group);
+-	    return status;
+-	}
+-
+-	status = _cairo_pdf_surface_add_smask (surface, gstate_res);
+-	if (unlikely (status))
+-	    return status;
+-
+-	status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
++    if (_can_paint_pattern (group->mask)) {
++	_cairo_output_stream_printf (surface->output, "q\n");
++	status = _cairo_pdf_surface_paint_pattern (surface,
++						   group->mask,
++						   &group->extents,
++						   FALSE);
+ 	if (unlikely (status))
+ 	    return status;
+ 
+-	_cairo_output_stream_printf (surface->output,
+-				     "q /s%d gs /x%d Do Q\n",
+-				     gstate_res.id,
+-				     smask_group->group_res.id);
++	_cairo_output_stream_printf (surface->output, "Q\n");
+     } else {
+-	status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE);
++	pattern_res.id = 0;
++	gstate_res.id = 0;
++	status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL,
++						     &pattern_res, &gstate_res);
+ 	if (unlikely (status))
+ 	    return status;
+ 
+-	_cairo_output_stream_printf (surface->output,
+-				     "%f %f %f %f re f\n",
+-				     bbox.p1.x,
+-				     bbox.p1.y,
+-				     bbox.p2.x - bbox.p1.x,
+-				     bbox.p2.y - bbox.p1.y);
++	if (gstate_res.id != 0) {
++	    smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
++	    if (unlikely (smask_group == NULL))
++		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+ 
+-	status = _cairo_pdf_surface_unselect_pattern (surface);
+-	if (unlikely (status))
+-	    return status;
++	    smask_group->width = group->width;
++	    smask_group->height = group->height;
++	    smask_group->operation = PDF_PAINT;
++	    smask_group->source = cairo_pattern_reference (group->mask);
++	    smask_group->source_res = pattern_res;
++	    status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
++	    if (unlikely (status)) {
++		_cairo_pdf_smask_group_destroy (smask_group);
++		return status;
++	    }
++
++	    status = _cairo_pdf_surface_add_smask (surface, gstate_res);
++	    if (unlikely (status))
++		return status;
++
++	    status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
++	    if (unlikely (status))
++		return status;
++
++	    _cairo_output_stream_printf (surface->output,
++					 "q /s%d gs /x%d Do Q\n",
++					 gstate_res.id,
++					 smask_group->group_res.id);
++	} else {
++	    status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE);
++	    if (unlikely (status))
++		return status;
++
++	    _cairo_output_stream_printf (surface->output,
++					 "%f %f %f %f re f\n",
++					 bbox.p1.x,
++					 bbox.p1.y,
++					 bbox.p2.x - bbox.p1.x,
++					 bbox.p2.y - bbox.p1.y);
++
++	    status = _cairo_pdf_surface_unselect_pattern (surface);
++	    if (unlikely (status))
++		return status;
++	}
+     }
+ 
+     status = _cairo_pdf_surface_close_group (surface, &mask_group);
+@@ -5764,54 +5776,66 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t	*surface,
+     if (unlikely (status))
+ 	return status;
+ 
+-    pattern_res.id = 0;
+-    gstate_res.id = 0;
+-    status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL,
+-						 &pattern_res, &gstate_res);
+-    if (unlikely (status))
+-	return status;
+-
+-    if (gstate_res.id != 0) {
+-	smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
+-	if (unlikely (smask_group == NULL))
+-	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+-
+-	smask_group->operation = PDF_PAINT;
+-	smask_group->source = cairo_pattern_reference (group->source);
+-	smask_group->source_res = pattern_res;
+-	status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
+-	if (unlikely (status)) {
+-	    _cairo_pdf_smask_group_destroy (smask_group);
+-	    return status;
+-	}
+-
+-	status = _cairo_pdf_surface_add_smask (surface, gstate_res);
+-	if (unlikely (status))
+-	    return status;
+-
+-	status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
++    if (_can_paint_pattern (group->source)) {
++	_cairo_output_stream_printf (surface->output, "q\n");
++	status = _cairo_pdf_surface_paint_pattern (surface,
++						   group->source,
++						   &group->extents,
++						   FALSE);
+ 	if (unlikely (status))
+ 	    return status;
+ 
+-	_cairo_output_stream_printf (surface->output,
+-				     "q /s%d gs /x%d Do Q\n",
+-				     gstate_res.id,
+-				     smask_group->group_res.id);
++	_cairo_output_stream_printf (surface->output, "Q\n");
+     } else {
+-	status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE);
++	pattern_res.id = 0;
++	gstate_res.id = 0;
++	status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL,
++						     &pattern_res, &gstate_res);
+ 	if (unlikely (status))
+ 	    return status;
+ 
+-	_cairo_output_stream_printf (surface->output,
+-				     "%f %f %f %f re f\n",
+-				     bbox.p1.x,
+-				     bbox.p1.y,
+-				     bbox.p2.x - bbox.p1.x,
+-				     bbox.p2.y - bbox.p1.y);
++	if (gstate_res.id != 0) {
++	    smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
++	    if (unlikely (smask_group == NULL))
++		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+ 
+-	status = _cairo_pdf_surface_unselect_pattern (surface);
+-	if (unlikely (status))
+-	    return status;
++	    smask_group->operation = PDF_PAINT;
++	    smask_group->source = cairo_pattern_reference (group->source);
++	    smask_group->source_res = pattern_res;
++	    status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
++	    if (unlikely (status)) {
++		_cairo_pdf_smask_group_destroy (smask_group);
++		return status;
++	    }
++
++	    status = _cairo_pdf_surface_add_smask (surface, gstate_res);
++	    if (unlikely (status))
++		return status;
++
++	    status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
++	    if (unlikely (status))
++		return status;
++
++	    _cairo_output_stream_printf (surface->output,
++					 "q /s%d gs /x%d Do Q\n",
++					 gstate_res.id,
++					 smask_group->group_res.id);
++	} else {
++	    status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE);
++	    if (unlikely (status))
++		return status;
++
++	    _cairo_output_stream_printf (surface->output,
++					 "%f %f %f %f re f\n",
++					 bbox.p1.x,
++					 bbox.p1.y,
++					 bbox.p2.x - bbox.p1.x,
++					 bbox.p2.y - bbox.p1.y);
++
++	    status = _cairo_pdf_surface_unselect_pattern (surface);
++	    if (unlikely (status))
++		return status;
++	}
+     }
+ 
+     status = _cairo_pdf_surface_close_group (surface, NULL);
+--
+cgit v0.9.0.2-2-gbebe
+From 9fcbe25c2dcf831783bb0fd20af9754c0b5c409b Mon Sep 17 00:00:00 2001
+From: Maarten Bosmans <mkbosmans@gmail.com>
+Date: Mon, 09 Apr 2012 19:33:50 +0000
+Subject: Protect code using dlfcn.h with CAIRO_HAS_DLSYM
+
+---
+diff --git a/configure.ac b/configure.ac
+index cedfebe..5d2e6ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,6 +52,7 @@ AM_CONDITIONAL(CAIRO_HAS_DL, test "x$have_dl" = "xyes")
+ if test "x$have_dlsym" = "xyes"; then
+   AC_DEFINE([CAIRO_HAS_DLSYM], 1, [Define to 1 if dlsym is available])
+ fi
++AM_CONDITIONAL(CAIRO_HAS_DLSYM, test "x$have_dlsym" = "xyes")
+ 
+ dnl ===========================================================================
+ 
+diff --git a/util/Makefile.am b/util/Makefile.am
+index f202f35..82d0a80 100644
+--- a/util/Makefile.am
++++ b/util/Makefile.am
+@@ -12,20 +12,24 @@ endif
+ 
+ if CAIRO_HAS_TRACE
+ SUBDIRS += cairo-trace
++if CAIRO_HAS_DLSYM
+ if CAIRO_HAS_SCRIPT_SURFACE
+ if CAIRO_HAS_TEE_SURFACE
+ SUBDIRS += cairo-fdr
+ endif
+ endif
+ endif
++endif
+ 
+ if BUILD_SPHINX
++if CAIRO_HAS_DLSYM
+ if CAIRO_HAS_SCRIPT_SURFACE
+ if CAIRO_HAS_TEE_SURFACE
+ SUBDIRS += cairo-sphinx
+ endif
+ endif
+ endif
++endif
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/src \
+ 	      -I$(top_builddir)/src \
+--
+cgit v0.9.0.2-2-gbebe
+From c7b86ab97be1d3d3ccf43b652832f148a2fcf290 Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Tue, 10 Apr 2012 13:04:05 +0000
+Subject: any2ppm: fix missing enumeration warning
+
+---
+diff --git a/test/any2ppm.c b/test/any2ppm.c
+index 6b61c47..2403347 100644
+--- a/test/any2ppm.c
++++ b/test/any2ppm.c
+@@ -193,6 +193,7 @@ write_ppm (cairo_surface_t *surface, int fd)
+ 	break;
+     case CAIRO_FORMAT_A1:
+     case CAIRO_FORMAT_RGB16_565:
++    case CAIRO_FORMAT_RGB30:
+     case CAIRO_FORMAT_INVALID:
+     default:
+ 	return "unhandled image format";
+--
+cgit v0.9.0.2-2-gbebe
+From 09de481ce5f6ed1c38c0d5bf3af7c60642c4c947 Mon Sep 17 00:00:00 2001
+From: Gilles Espinasse <g.esp@free.fr>
+Date: Sat, 07 Apr 2012 21:09:51 +0000
+Subject: Cosmetic configure fix
+
+'how to allow undefined symbols in shared libraries' test should use CAIRO_CC_TRY_FLAG_SILENT or configure display is a bit out of order like this
+
+checking how to allow undefined symbols in shared libraries used by test suite... checking whether gcc supports -Wl,--allow-shlib-undefined... yes
+-Wl,--allow-shlib-undefined
+
+Signed-off-by: Gilles Espinasse <g.esp@free.fr>
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+---
+diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
+index f1b17f4..3b2c6f3 100644
+--- a/build/configure.ac.warnings
++++ b/build/configure.ac.warnings
+@@ -89,7 +89,7 @@ AC_DEFINE_UNQUOTED([WARN_UNUSED_RESULT], [$cairo_cv_warn_unused_result],
+ 
+ dnl check linker flags
+ AC_CACHE_CHECK([how to allow undefined symbols in shared libraries used by test suite], cairo_cv_test_undefined_ldflags,
+-	       [CAIRO_CC_TRY_FLAG([-Wl,--allow-shlib-undefined], [],
++	       [CAIRO_CC_TRY_FLAG_SILENT([-Wl,--allow-shlib-undefined], [],
+ 				  [cairo_cv_test_undefined_ldflags="-Wl,--allow-shlib-undefined]")])
+ CAIRO_TEST_UNDEFINED_LDFLAGS="$cairo_cv_test_undefined_ldflags"
+ AC_SUBST(CAIRO_TEST_UNDEFINED_LDFLAGS)
+--
+cgit v0.9.0.2-2-gbebe
+From 07fc63676dfdaa57ed919ad7be8f59c97c615473 Mon Sep 17 00:00:00 2001
+From: Uli Schlachter <psychon@znc.in>
+Date: Wed, 11 Apr 2012 19:37:55 +0000
+Subject: xlib: Disable fallback compositor with xlib-xcb
+
+When xlib-xcb is enabled, this is just dead code which is never used. Thus, this
+shouldn't hurt. However, this does include cairo-xlib-private.h. Shouldn't be a
+problem? Well, that header contains static inline functions which some compiler
+on Solaris will emit even when they are unused.
+
+This brings us to the real problem: That static inline function refers to a
+function which isn't compiled with xlib-xcb and thus linking fails with
+undefined symbols.
+
+This can be reproduced with GCC by adding a call to
+_cairo_xlib_screen_put_gc(NULL, NULL, 0, 0); to
+_cairo_xlib_fallback_compositor_get.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48489
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+---
+diff --git a/src/cairo-xlib-fallback-compositor.c b/src/cairo-xlib-fallback-compositor.c
+index 5391926..7d45cd1 100644
+--- a/src/cairo-xlib-fallback-compositor.c
++++ b/src/cairo-xlib-fallback-compositor.c
+@@ -42,6 +42,8 @@
+ 
+ #include "cairoint.h"
+ 
++#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS
++
+ #include "cairo-xlib-private.h"
+ 
+ #include "cairo-compositor-private.h"
+@@ -52,3 +54,5 @@ _cairo_xlib_fallback_compositor_get (void)
+     /* XXX Do something interesting here to mitigate fallbacks ala xcb */
+     return &_cairo_fallback_compositor;
+ }
++
++#endif /* !CAIRO_HAS_XLIB_XCB_FUNCTIONS */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/ccrtp/PKGBUILD b/extra/ccrtp/PKGBUILD
new file mode 100644
index 000000000..5901e29ed
--- /dev/null
+++ b/extra/ccrtp/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 159161 2012-05-16 20:49:22Z andrea $
+# Maintainer:
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Jeff Mickey <jeff@archlinux.org>
+# Contributor: John Proctor <jproctor@prium.net>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+
+pkgname=ccrtp
+pkgver=2.0.3
+pkgrel=2
+pkgdesc="An implementation of RTP, the real-time transport protocol from the IETF"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/ccrtp/"
+license=('GPL' 'custom')
+depends=('ucommon' 'libgcrypt')
+options=('!libtool')
+install=$pkgname.install
+source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('0d57da1b8e212fb634b8951067fbc1e0'
+         '127fa3b293f7a7c3be1d2891c4544453')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 COPYING.addendum "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/extra/ccrtp/ccrtp.install b/extra/ccrtp/ccrtp.install
new file mode 100644
index 000000000..51b971c5c
--- /dev/null
+++ b/extra/ccrtp/ccrtp.install
@@ -0,0 +1,22 @@
+infodir=usr/share/info
+filelist=(ccrtp.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
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index 0629617f9..bcc99ded7 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156720 2012-04-23 09:04:00Z ibiru $
+# $Id: PKGBUILD 159049 2012-05-15 11:05:32Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64 'mips64el')
@@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/projects/cheese/"
 install=cheese.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b7a07c45217bdea6b9bc3ad56c19b5b7de4ddf939074efe94add7afb66a26dd0')
+sha256sums=('730083e1fb7da1fc8c38978cbb957ff2128d6f132132b3863bd60c0963a120e0')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index 8c9b3dcf8..f8b72b637 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,17 +1,20 @@
-# $Id: PKGBUILD 151756 2012-03-02 08:44:51Z tpowa $
+# $Id: PKGBUILD 158736 2012-05-08 14:32:25Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=cifs-utils
-pkgver=5.3
-pkgrel=2
+pkgver=5.4
+pkgrel=1
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64 'mips64el')
 url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 license=('GPL')
 depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient')
-source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
+source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2
+        mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+   # add fedora build patch
+  patch -Np1 -i ../mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch
   ./configure --prefix=/usr
   make
 }
@@ -22,4 +25,5 @@ package() {
   # set mount.cifs uid, to enable none root mounting form fstab
   chmod +s $pkgdir/sbin/mount.cifs
 }
-md5sums=('e1a428558a96d2d28ccdaacdc47ea0b7')
+md5sums=('dde98336c833b59777114145cb8f3c64'
+         'b1b0a5a21aedd5421ff6e1e1a8720771')
diff --git a/extra/cifs-utils/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch b/extra/cifs-utils/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch
new file mode 100644
index 000000000..8ca3b2674
--- /dev/null
+++ b/extra/cifs-utils/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch
@@ -0,0 +1,72 @@
+From 900875dbda261dd8a9283bdda3c3dbe551fe0f7c Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@samba.org>
+Date: Wed, 18 Apr 2012 21:41:05 -0400
+Subject: [PATCH] mount.cifs: fix up some -D_FORTIFY_SOURCE=2 warnings
+
+...and add -D_FORTIFY_SOURCE=2 to the default $CFLAGS.
+
+Signed-off-by: Jeff Layton <jlayton@samba.org>
+---
+ Makefile.am  |    2 +-
+ mount.cifs.c |   10 ++++++----
+ mtab.c       |    4 +++-
+ 3 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d95142a..05729ca 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CFLAGS = -Wall -Wextra -Werror
++AM_CFLAGS = -Wall -Wextra -Werror -D_FORTIFY_SOURCE=2
+ ACLOCAL_AMFLAGS = -I aclocal
+ 
+ root_sbindir = $(ROOTSBINDIR)
+diff --git a/mount.cifs.c b/mount.cifs.c
+index f0b073e..4f1ea40 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -928,9 +928,9 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info)
+ 				}
+ 			} else {
+ 				/* domain/username%password */
+-				const int max = MAX_DOMAIN_SIZE +
+-						MAX_USERNAME_SIZE +
+-						MOUNT_PASSWD_SIZE + 2;
++				const unsigned int max = MAX_DOMAIN_SIZE +
++							 MAX_USERNAME_SIZE +
++							 MOUNT_PASSWD_SIZE + 2;
+ 				if (strnlen(value, max + 1) >= max + 1) {
+ 					fprintf(stderr, "username too long\n");
+ 					return EX_USAGE;
+@@ -1603,8 +1603,10 @@ add_mtab(char *devname, char *mountpoint, unsigned long flags, const char *fstyp
+ 	mountent.mnt_passno = 0;
+ 	rc = addmntent(pmntfile, &mountent);
+ 	if (rc) {
++		int ignore __attribute__((unused));
++
+ 		fprintf(stderr, "unable to add mount entry to mtab\n");
+-		ftruncate(fd, statbuf.st_size);
++		ignore = ftruncate(fd, statbuf.st_size);
+ 		rc = EX_FILEIO;
+ 	}
+ 	tmprc = my_endmntent(pmntfile, statbuf.st_size);
+diff --git a/mtab.c b/mtab.c
+index de545b7..3d42ac0 100644
+--- a/mtab.c
++++ b/mtab.c
+@@ -271,8 +271,10 @@ my_endmntent(FILE *stream, off_t size)
+ 
+ 	/* truncate file back to "size" -- best effort here */
+ 	if (rc) {
++		int ignore __attribute__((unused));
++
+ 		rc = errno;
+-		ftruncate(fd, size);
++		ignore = ftruncate(fd, size);
+ 	}
+ 
+ 	endmntent(stream);
+-- 
+1.7.7.6
+
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 583913187..bab18a03e 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 157092 2012-04-23 16:33:36Z andyrtr $
+# $Id: PKGBUILD 158862 2012-05-12 13:27:15Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
 
 pkgname=dovecot
-pkgver=2.1.5
+pkgver=2.1.6
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,8 +20,8 @@ provides=('imap-server' 'pop3-server')
 options=('!libtool')
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh)
-md5sums=('c857e3442f2f14b3e46f1154b13b0b4b'
-         '4ef0a9647b82e0a1bdc667492a151881'
+md5sums=('56d2a8d5273d39caa41d6a8dd9f4442c'
+         'f4eed12984b9ddf6eea37fc9f1828af8'
          '587159e84e2da6f83d70b3c706ba87cc')
 
 build() {
diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD
index 2bef35dd2..b6c7ed050 100644
--- a/extra/eclipse/PKGBUILD
+++ b/extra/eclipse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151734 2012-03-01 20:07:28Z ibiru $
+# $Id: PKGBUILD 159243 2012-05-18 17:00:08Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Andrew Wright <andreww@photism.org>
@@ -7,12 +7,12 @@
 
 pkgname=eclipse
 pkgver=3.7.2
-pkgrel=2
+pkgrel=3
 _date=201202080800
 pkgdesc="An IDE for Java and other languages"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://eclipse.org"
-depends=('java-environment' 'gtk2' 'unzip' 'libwebkit')
+depends=('java-environment' 'gtk2' 'unzip' 'libwebkit' 'libxtst')
 install=${pkgname}.install
 makedepends=('zip')
 conflicts=('xulrunner')
diff --git a/extra/eclipse/eclipse.install b/extra/eclipse/eclipse.install
index c3485476c..a2930a4ff 100644
--- a/extra/eclipse/eclipse.install
+++ b/extra/eclipse/eclipse.install
@@ -3,9 +3,9 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  post-install $1
+  post_install
 }
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 5b732426c..09fa101ed 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156740 2012-04-23 09:04:26Z ibiru $
+# $Id: PKGBUILD 159026 2012-05-15 10:34:53Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ options=('!libtool')
 groups=('gnome-extra')
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b12493f47b932dcd3d8b5101d414a00447a6eea60a575db7211ee24cfe8c4565')
+sha256sums=('e68936811d52c0b5419c93a87a81429b09f944d3f6cd65eb1554e6c7d489de32')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 80d988280..517a7c258 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156754 2012-04-23 09:04:48Z ibiru $
+# $Id: PKGBUILD 159017 2012-05-15 10:21:45Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ install=$pkgname.install
 url="http://www.gnome.org"
 license=('GPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('378c4eedb11ea359c49734393ba764ac1f1230b298c36d2256129dae00c78298')
+sha256sums=('9020337a8ce02ae13c2bcbab80784bfbc6b73803d91a3cacc6362426036f6285')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index ced4764e0..4ecbd6dfe 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156756 2012-04-23 09:04:52Z ibiru $
+# $Id: PKGBUILD 159021 2012-05-15 10:24:00Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=evolution-ews
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
 makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('afa56ce08a8bfb9878f5303308aa5c68eab4ffe67a70ba3bd54b0c4f868053ef')
+sha256sums=('789fd8e6611b94974cf3224a4286ee2fb1431a69d766358ecfe48bf7518fd857')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/evolution-groupwise/PKGBUILD b/extra/evolution-groupwise/PKGBUILD
index 95c25b3ae..d03a37c2c 100644
--- a/extra/evolution-groupwise/PKGBUILD
+++ b/extra/evolution-groupwise/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156760 2012-04-23 09:04:57Z ibiru $
+# $Id: PKGBUILD 159019 2012-05-15 10:23:24Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=evolution-groupwise
-pkgver=3.4.0
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="GroupWise connector for evolution"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ makedepends=(intltool evolution)
 optdepends=('evolution: evolution plugin')
 options=(!libtool)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b5e882811d10411249accb4ce1131d2e2d336d357b68a8f5dcfe7576b320c717')
+sha256sums=('e26e08eb065df21118c92f29be4cfa2ce2faa52c950210e15a3efbdc9cace2aa')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 1f2f03177..d3f53926f 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156752 2012-04-23 09:04:45Z ibiru $
+# $Id: PKGBUILD 159018 2012-05-15 10:22:47Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('43311bc38302fc26efff98852d72981b791941622d32a2e6e346377341c1814d')
+sha256sums=('aa08c5e5abf75b3d617d6ab17d16c5a5b1775558a3cd4415554d5bcd78d1914d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD
index 2c15d7d4a..fd64605c5 100644
--- a/extra/fcitx/PKGBUILD
+++ b/extra/fcitx/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 157020 2012-04-23 09:27:29Z ibiru $
+# $Id: PKGBUILD 158796 2012-05-10 06:10:24Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: csslayer <wengxt AT gmail com>
 
 pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
-pkgver=4.2.2
+pkgver=4.2.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
-makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu')
+makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu')
 source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz)
-sha1sums=('09d2e7110f652027ea7c285c5845070f8a353f38')
+sha1sums=('8cd33487d1d6ad9c9c63743af8d76e667de4b859')
 
 build() {
   cd "${srcdir}"
@@ -21,11 +21,17 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DENABLE_OPENCC=OFF \
+    -DENABLE_TEST=ON \
     -DENABLE_GTK3_IM_MODULE=ON \
     -DENABLE_QT_IM_MODULE=ON
   make
 }
 
+check() {
+  cd "${srcdir}"/build
+  make test
+}
+
 package_fcitx() {
   pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
   depends=('dbus-core' 'pango' 'libxinerama' 'gtk-update-icon-cache' \
@@ -40,7 +46,7 @@ package_fcitx() {
 
 package_fcitx-gtk2() {
   pkgdesc='GTK2 IM Module for fcitx'
-  depends=('gtk2' 'dbus-glib' 'fcitx')
+  depends=('gtk2' 'fcitx')
   install=fcitx-gtk2.install
 
   cd "${srcdir}"/build/src/frontend/gtk2
@@ -49,7 +55,7 @@ package_fcitx-gtk2() {
 
 package_fcitx-gtk3() {
   pkgdesc='GTK3 IM Module for fcitx'
-  depends=('gtk3' 'dbus-glib' 'fcitx')
+  depends=('gtk3' 'fcitx')
   install=fcitx-gtk3.install
 
   cd "${srcdir}"/build/src/frontend/gtk3
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index f3061e903..ac4623450 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153659 2012-03-17 13:50:07Z ibiru $
+# $Id: PKGBUILD 158782 2012-05-09 17:58:43Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=20120317
+pkgver=20120509
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ if [ "${CARCH}" != "mips64el" ]; then
 fi
 #git clone git://git.videolan.org/ffmpeg.git
 source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz)
-md5sums=('2a2ef83ae73713fcef6bba8c430665ce')
+md5sums=('a35359e424608f369d380f03e4dc9966')
 
 build() {
   cd "$pkgname"
diff --git a/extra/gcalctool/PKGBUILD b/extra/gcalctool/PKGBUILD
index 69f419f23..b911bf9b9 100644
--- a/extra/gcalctool/PKGBUILD
+++ b/extra/gcalctool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156768 2012-04-23 09:05:08Z ibiru $
+# $Id: PKGBUILD 159075 2012-05-15 11:46:29Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gcalctool
-pkgver=6.4.1.1
+pkgver=6.4.2.1
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ options=(!emptydirs)
 url="http://www.gnome.org"
 install=gcalctool.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6c166b1d0fec157e523caf82d6357c4a2f572cb21729272c9975003661b8c84e')
+sha256sums=('d79f7272534fc33357acc4438fe7746fa125fb05c45dfdb468a193b7490ca1f8')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD
index 7ff77b8f8..b475a051f 100644
--- a/extra/ghex/PKGBUILD
+++ b/extra/ghex/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156784 2012-04-23 09:05:34Z ibiru $
+# $Id: PKGBUILD 159036 2012-05-15 10:48:47Z heftig $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=ghex
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="A simple binary editor for the Gnome desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('intltool' 'gnome-doc-utils')
 options=('!libtool' '!emptydirs')
 install=ghex.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('59e409cc629fddeb06552c505b60be1d20274cea75eb22f1d65d7ca0aaf1e64d')
+sha256sums=('8696babf56a24be01cbf856c6fbad6f1d0e10c44736957625f9535430dfee692')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 4d6d06c80..0a09ff856 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158077 2012-05-02 14:24:00Z dan $
+# $Id: PKGBUILD 158835 2012-05-12 03:22:50Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.10.1
+pkgver=1.7.10.2
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -99,7 +99,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-sha1sums=('870361f93fad7999f121bc7bc91a743feda68bdb'
-          '5bff761bc40a6b3cfe35ba824357dcf611dbd5d2'
+sha1sums=('e4b7f746ff4e356baaddcad0b2911376efde031b'
+          '6cc3f80185bdd1a608cf373b05313b2adc82b898'
           'f2b41828bd912b72e2cb3e14677739c4f370de66'
           '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD
index 60303906d..c8b68a936 100644
--- a/extra/glade/PKGBUILD
+++ b/extra/glade/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156788 2012-04-23 09:05:39Z ibiru $
+# $Id: PKGBUILD 158695 2012-05-07 14:01:07Z ibiru $
 # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=glade
-pkgver=3.12.0
+pkgver=3.12.1
 pkgrel=1
 pkgdesc="User interface builder for GTK+ and GNOME."
 arch=(i686 x86_64 mips64el)
@@ -14,7 +14,7 @@ options=('!libtool')
 url="http://glade.gnome.org/"
 install=glade.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('70a820a0007fa3ed7761c92b011fe35ac1532038cab2f9ab30f4d29d5799d44d')
+sha256sums=('27e89fb743adb9996c418aa70cde8ce3c0769103f3691cc8011e6c6846600e76')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index 3acb6696e..e9e6da327 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156790 2012-04-23 09:05:42Z ibiru $
+# $Id: PKGBUILD 159094 2012-05-15 14:33:52Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=glib-networking
-pkgver=2.32.1
+pkgver=2.32.3
 pkgrel=1
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool')
 options=('!libtool')
 install=glib-networking.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('051ab469356327404dc53ae36dda5b85b99a12e5573a838d927abb49e58fa950')
+sha256sums=('39fe23e86a57bb7a8a67c65668394ad0fbe2d43960c1f9d68311d5d13ef1e5cf')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD
index 762697f54..0fdeb3684 100644
--- a/extra/glib-perl/PKGBUILD
+++ b/extra/glib-perl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143682 2011-11-28 11:19:06Z jgc $
+# $Id: PKGBUILD 159216 2012-05-18 10:00:28Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=glib-perl
-pkgver=1.241
+pkgver=1.242
 pkgrel=1
 pkgdesc="Perl wrappers for glib 2.x, including GObject"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ options=('!emptydirs')
 depends=('glib2>=2.24.1' 'perl>=5.14')
 makedepends=('perl-extutils-depends>=0.302' 'perl-extutils-pkgconfig>=1.12')
 source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz)
-md5sums=('412118238a372041b130c27d7992f5c3')
+md5sums=('59c176888e8ef8139c4e1b8c2d45f1d0')
 
 build() {
   cd "${srcdir}/Glib-${pkgver}"
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
index 4d855ad76..569f24473 100644
--- a/extra/glsof/PKGBUILD
+++ b/extra/glsof/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 147275 2012-01-25 16:46:28Z eric $
+# $Id: PKGBUILD 159121 2012-05-16 06:34:12Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glsof
-pkgver=1.8.0
-_fmver=1.8.0
+pkgver=2.0
+_fmver=2.0
 _qver=1.0.0
 pkgrel=1
 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
@@ -11,28 +11,26 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://glsof.sourceforge.net/"
 license=('GPL3')
 depends=('sh' 'java-runtime' 'lsof')
-source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}.tar.gz)
-if [ "$CARCH" = "i686" ]; then
-  source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \
-          glsof-filemonitor glsof-queries)
-  sha1sums=('a70c8d3877c13af8bd8e7e319a1709c1b90eedc6'
-            'd5a17d66dd02cd78bad5ffdda0b936c7848e4890'
-            '197b58f40880995d6442fd42a58fa1f4594fd19d'
-            '2797c326904af16a254c3e39b8c529ea14ef37e5')
-elif [ "$CARCH" = "x86_64" ]; then
-  source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \
-          glsof-filemonitor glsof-queries)
-  sha1sums=('a70c8d3877c13af8bd8e7e319a1709c1b90eedc6'
-            'c5dd12e9b2860f1c427ed7cd482e898978051d2c'
-            '197b58f40880995d6442fd42a58fa1f4594fd19d'
-            '2797c326904af16a254c3e39b8c529ea14ef37e5')
-fi
+source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}.tar.gz \
+        http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \
+        http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \
+        glsof-filemonitor glsof-queries)
+sha1sums=('4bb1ca87aa8aedcf793cd704d4ea5dfec5c53bb1'
+          'd5a17d66dd02cd78bad5ffdda0b936c7848e4890'
+          'c5dd12e9b2860f1c427ed7cd482e898978051d2c'
+          '197b58f40880995d6442fd42a58fa1f4594fd19d'
+          '2797c326904af16a254c3e39b8c529ea14ef37e5')
 
 package() {
   cd "${srcdir}"
   install -D -m755 glsof-filemonitor "${pkgdir}/usr/bin/glsof-filemonitor"
   install -D -m755 glsof-queries "${pkgdir}/usr/bin/glsof-queries"
   install -D -m644 filemonitor/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar"
-  install -D -m644 queries_linux??/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar"
-  install -D -m644 queries_linux??/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf"
+  if [ "$CARCH" = "i686" ]; then
+    install -D -m644 queries_linux32/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar"
+    install -D -m644 queries_linux32/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf"
+  elif [ "$CARCH" = "x86_64" ]; then
+    install -D -m644 queries_linux64/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar"
+    install -D -m644 queries_linux64/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf"
+  fi
 }
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index 22ae2a81a..c3ff6c03a 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156803 2012-04-23 09:06:07Z ibiru $
+# $Id: PKGBUILD 159023 2012-05-15 10:27:36Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
-pkgver=3.4.0
-pkgrel=2
+pkgver=3.4.2
+pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
 url="http://projects.gnome.org/gnome-color-manager/"
@@ -15,7 +15,7 @@ install=gnome-color-manager.install
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fcca7292d14dcffea01463bb24833346b415ee189611821399ca96d6638d812d')
+sha256sums=('ad69ac0ac242be0ad5b7966e0c2978a9a1440e52ee816993e4a8eb2cf6f0c922')
 
 build(){
   cd $pkgname-$pkgver
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index 0b6c2fe47..f091ab1e8 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 156808 2012-04-23 09:06:19Z ibiru $
+# $Id: PKGBUILD 159092 2012-05-15 14:29:58Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="The Control Center for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
          'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3'
          'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower'
-         'libsystemd' 'cheese')
+         'libsystemd')
 optdepends=('mesa-demos: provides glxinfo for graphics information'
             'apg: adds password generation for user accounts'
             'gnome-color-manager: for color management tasks')
@@ -22,7 +22,7 @@ license=('GPL')
 options=('!libtool' '!emptydirs')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         systemd-fallback.patch)
-sha256sums=('c6ce4ecf5b747aa33a5904b053c1c4fd18a39ddcd0908463558e8b4b40ec3fd1'
+sha256sums=('efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a'
             '5fa706de582228df36dfc13eb37470e543b2f228f1fc4ad27e35a781a8779b39')
 
 build() {
@@ -32,7 +32,8 @@ build() {
   gnome-autogen.sh --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-systemd --with-libsocialweb \
-      --disable-update-mimedb
+      --disable-update-mimedb \
+      --without-cheese
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656229
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index afb43a012..127b500a2 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156810 2012-04-23 09:06:23Z ibiru $
+# $Id: PKGBUILD 159034 2012-05-15 10:45:52Z heftig $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 epoch=1
 pkgdesc="Library with common API for various GNOME modules"
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7b36f16eeb36bb8feec9f51b53b50036df8d75d5b1c91e28b036e85b17fdb974')
+sha256sums=('7565e0a822132ea7b699cb8c64d42b57081ddefd0b5d911f4f4209be0c755952')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD
index 8d3edbfda..543823b90 100644
--- a/extra/gnome-documents/PKGBUILD
+++ b/extra/gnome-documents/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157395 2012-04-28 09:26:35Z allan $
+# $Id: PKGBUILD 159057 2012-05-15 11:15:31Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-documents
-pkgver=0.4.1
-pkgrel=2
+pkgver=0.4.2
+pkgrel=1
 pkgdesc="Documents Manager for GNOME"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
@@ -15,7 +15,7 @@ optdepends=('unoconv: Support for Libreoffice document types')
 options=('!libtool')
 install=gnome-documents.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2b2c6b15ed9e6a46602977f1e8dc15e6655c171df8ede6a3f8a749ed6682da46')
+sha256sums=('8c345ccf2e71cfc22d3f1118e7c8676e1a657c8a3fd4052c719be1b4a311ac8c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD
index a67fcd51a..8db44e775 100644
--- a/extra/gnome-games/PKGBUILD
+++ b/extra/gnome-games/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156820 2012-04-23 09:06:47Z ibiru $
+# $Id: PKGBUILD 159079 2012-05-15 11:54:56Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-games
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Some Games for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ install=gnome-games.install
 url="http://www.gnome.org"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('01726b0631205ccbd9f02938f7ccb1d7bd0c4c001cb4596f871fed7c3afc25d4')
+sha256sums=('25676285fad33a39da7fc26b5b1dc751c7981ae778b8fe82e8b7c0a367e5117c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD
index 45c8537de..8cdb469b8 100644
--- a/extra/gnome-menus/PKGBUILD
+++ b/extra/gnome-menus/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156829 2012-04-23 09:07:05Z ibiru $
+# $Id: PKGBUILD 159030 2012-05-15 10:41:25Z heftig $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-menus
-pkgver=3.4.0
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="GNOME menu specifications"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL' 'LGPL')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         menus.patch)
-sha256sums=('199ce6bce3e24cbab8aed7f3488e7557a8f365314eae354aa2b50727b2f11f86'
+sha256sums=('fa8b98eb5c62da20f1fb4f6e251f819d78c925006b00d2f63005a6418aa81e63'
             'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc')
 
 build() {
diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD
index adafa2cbc..24e0702de 100644
--- a/extra/gnome-online-accounts/PKGBUILD
+++ b/extra/gnome-online-accounts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156833 2012-04-23 09:07:10Z ibiru $
+# $Id: PKGBUILD 159045 2012-05-15 11:00:06Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-accounts
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="GNOME service to access online accounts"
 arch=(i686 x86_64 mips64el)
@@ -13,7 +13,7 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 options=(!libtool)
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d5636b8da29aae04757ca528de65e3617d85696bd7e434c48dbd1199c105f4ae')
+sha256sums=('b349ea12fbb564c8a71574b47d8949974cf42f959d7da212ef8933a5eb1d7945')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD
index 09f3040ad..bf045cbcf 100644
--- a/extra/gnome-panel/PKGBUILD
+++ b/extra/gnome-panel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157064 2012-04-23 10:29:05Z ibiru $
+# $Id: PKGBUILD 159040 2012-05-15 10:55:32Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-panel
-pkgver=3.4.1
-pkgrel=2
+pkgver=3.4.2.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 pkgdesc="The GNOME Panel"
@@ -14,8 +14,8 @@ install=gnome-panel.install
 groups=('gnome')
 provides=("gnome-panel-bonobo=${pkgver}")
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('513be6e709db88babac9f3ce9e517cb597d8c89569e5c9aaa957b74e0765a77f')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('188ea2b93e4c8116e187abac3ecf590429ff8366ef4b610fab438bd338d857d2')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD
index 2004e59ed..b917c1628 100644
--- a/extra/gnome-session/PKGBUILD
+++ b/extra/gnome-session/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156845 2012-04-23 09:07:26Z ibiru $
+# $Id: PKGBUILD 159032 2012-05-15 10:44:22Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-session
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64 'mips64el')
@@ -16,7 +16,7 @@ install=gnome-session.install
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0ad29c2c3158b9e0109d3463e587fe09f312b810a9db51775750b9af8ce457aa')
+sha256sums=('6c2cbc86b63bb4869f4f95e7771ec6eee0c02965b732d634de5c8122607c4356')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 895650283..062fc1d8e 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157198 2012-04-25 14:06:29Z ibiru $
+# $Id: PKGBUILD 159086 2012-05-15 13:54:36Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon
-pkgver=3.4.1
-pkgrel=2
+pkgver=3.4.2
+pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,29 +15,14 @@ install=gnome-settings-daemon.install
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        systemd-fallback.patch
-        evironment.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=9d7ea1d0b8b90b55f916751858a210a2e02a06b6
-        arguments.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=00681573ad6ebeb127ec72ac61d30d69be6459f8
-        mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=053f48b3b1b9a3b2ab0714d470da4354735d0c4b
-        glist-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=214a832820f6448f07d438f6686267eaf8301dd1
-        mouse-mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=09c215b42312ca5bb63b215c2f95231613b3103d)
-sha256sums=('d5d4a270ec5692cdc56a58cfb57bc7f8fa93374566912a65e78c1c3db7faf4ed'
-            '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008'
-            '1ba33f6eadac4c54f3f08f4bce075d2bef8124f857f5af22eaee010c8d38bc3b'
-            '884a959b334f864f75dcb4eec8c137785f587c7c2ae57906f8b4e60e04c29246'
-            '3a3f8b2964406b9b3c85c05f25e677e8c9eaa221779b95826ffbc0474740decc'
-            'af3bda801befdbd3d318723ae6de3aaf7df1e16bccd84e13f15b57f2dceaefcd'
-            '43b7397e622a2c19091b3665822e9461067fb6a497b9507418a3bbb100a69e1b')
+        systemd-fallback.patch)
+sha256sums=('00499118c80474981f3389ef518e2d001f1b1a3b1fb78e54859d59f3bee38ff4'
+            '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008')
 
 build() {
   cd $pkgname-$pkgver
 
   patch -Np1 -i ../systemd-fallback.patch
-  patch -Np1 -i ../evironment.patch
-  patch -Np1 -i ../arguments.patch
-  patch -Np1 -i ../mem-leak.patch
-  patch -Np1 -i ../glist-leak.patch
-  patch -Np1 -i ../mouse-mem-leak.patch
 
   gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index 19ed406b9..703592460 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156857 2012-04-23 09:07:41Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 159060 2012-05-15 11:23:35Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-themes-standard
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Default themes for the GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ replaces=('gnome-themes')
 conflicts=('gnome-themes')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0096f3d8ba5416e77a5b4d398140a7f53480ee706740cb698df3f5267540169f')
+sha256sums=('aa29d23708e3357775fb7ea2de14b90551a2c732fce297f3372dae005374c3a8')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 85b90ae82..7e3da5f1f 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150341 2012-02-17 03:33:20Z bisson $
+# $Id: PKGBUILD 158786 2012-05-09 18:48:24Z pierre $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
 pkgver=2.28.0
-pkgrel=8
+pkgrel=9
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index 0ac0bd635..9c601d462 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 157098 2012-04-23 20:32:20Z ibiru $
+# $Id: PKGBUILD 159064 2012-05-15 11:33:08Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gthumb
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://live.gnome.org/gthumb"
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk'
-         'gstreamer0.10-base')
+         'gstreamer0.10-base' 'gsettings-desktop-schemas')
 makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome'
              'brasero' 'librsvg' 'libopenraw' 'liboauth')
 optdepends=('libopenraw: read RAW files'
@@ -23,7 +23,7 @@ optdepends=('libopenraw: read RAW files'
 options=('!libtool' '!emptydirs')
 install=gthumb.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5b6116a69897ee9aeba8db3d1ac800e9a62308738367533268acea40519f58b4')
+sha256sums=('1fb2939e4896a012c7d0320a31e3c6139214218e9f6ec39c6370febeda94725c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index af3455eb8..0bdb78742 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158335 2012-05-03 17:45:08Z heftig $
+# $Id: PKGBUILD 158899 2012-05-12 20:17:26Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.4.2
-pkgrel=2
+pkgver=3.4.3
+pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
@@ -15,7 +15,7 @@ backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
         settings.ini wacom.patch)
-sha256sums=('b1ab72bc61434418160ff0c7edfd93c74758ed8a35e2ed3d07e3e218c2705480'
+sha256sums=('846010442a96590469cde16ed6a1fdfe09397e435165459f04d31cfa5713799f'
             'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
             '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5')
 build() {
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index 5a7a167d2..b12826bbb 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156876 2012-04-23 09:08:07Z ibiru $
+# $Id: PKGBUILD 159016 2012-05-15 10:21:03Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtkhtml4
 _pkgbasename=gtkhtml
-pkgver=4.4.1
+pkgver=4.4.2
 pkgrel=1
 pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool')
 url="http://www.gnome.org"
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('2fb3286c5ab8b6349a694156f803e1162c5a234d30548eb0afdf82e139923236')
+sha256sums=('96b0d561a697c0b85dbe0e6a0d220012765a3aa4f2a9e8ffddd520891094e694')
 
 build() {
     cd "$_pkgbasename-$pkgver"
diff --git a/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch b/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch
new file mode 100644
index 000000000..06bce4a0f
--- /dev/null
+++ b/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch
@@ -0,0 +1,35 @@
+From 9ec36544203d4c1b98aa843c2c3ff0a4f725da68 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam.thursfield@codethink.co.uk>
+Date: Thu, 03 May 2012 19:04:20 +0000
+Subject: Bug 672582 - Fix selection behavior inside <iframe>
+
+Since kinetic scrolling was introduced in Gtk+, GtkScrolledWindow
+has had its own GdkWindow. This means we need to use the allocation
+of the GtkScrolledWindow rather than its child GtkHTML widget when we
+want to translate pointer coordinates relative to the iframe, because
+a widget's GtkAllocation is relative to the parent GdkWindow.
+
+(cherry picked from commit 7b7b37745d2f46914be314e4d7aef7a575529345)
+---
+diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
+index 697b16e..6284855 100644
+--- a/gtkhtml/gtkhtml.c
++++ b/gtkhtml/gtkhtml.c
+@@ -1823,9 +1823,14 @@ shift_to_iframe_parent (GtkWidget *widget,
+                         gint *y)
+ {
+ 	while (GTK_HTML (widget)->iframe_parent) {
++		GtkWidget *scrolled_window;
+ 		GtkAllocation allocation;
+ 
+-		gtk_widget_get_allocation (widget, &allocation);
++		scrolled_window = gtk_widget_get_parent (widget);
++
++		g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), widget);
++
++		gtk_widget_get_allocation (scrolled_window, &allocation);
+ 
+ 		if (x)
+ 			*x += allocation.x - GTK_HTML (widget)->engine->x_offset;
+--
+cgit v0.9.0.2
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index fbe8be2c0..20a09d5cf 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156880 2012-04-23 09:08:12Z ibiru $
+# $Id: PKGBUILD 159069 2012-05-15 11:37:21Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection' 'glade')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('8387b33c61efffcafed99ae896aed224a1ea8b3af45677c5d57e0d1842f6ffc1')
+sha256sums=('5a5712591b2b6487818ac4aadd965fc8397af23d8fd7c5bdd1460c6326a8f4ce')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gupnp-igd/PKGBUILD b/extra/gupnp-igd/PKGBUILD
new file mode 100644
index 000000000..8e08e3a17
--- /dev/null
+++ b/extra/gupnp-igd/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 159125 2012-05-16 11:29:35Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Contributor: William Díaz <wdiaz [at] archlinux [dot] us>
+
+pkgname=gupnp-igd
+pkgver=0.2.1
+pkgrel=3
+pkgdesc="A library to handle UPnP IGD port mapping"
+arch=('i686' 'x86_64')
+url="http://www.gupnp.org"
+license=('LGPL')
+depends=('gupnp' 'python2-gobject2')
+makedepends=('gettext')
+options=('!libtool' '!makeflags')
+source=(http://www.gupnp.org/sites/all/files/sources/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('409cb45e495dfa61c4ce4a74f8ba06f2784c39e2')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  PYTHON=python2 ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 2929c1c63..d81cdf577 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 157347 2012-04-27 16:15:04Z ibiru $
+# $Id: PKGBUILD 159195 2012-05-17 15:22:23Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.12.2
+pkgver=1.12.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2')
 url="http://www.gnome.org"
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('998b9d0089d21e451e455b6bc5f421eb08bcb3e5ff0aceda98e424cc42ef6616')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)   
+sha256sums=('38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2')
 
 build() {
   cd "$pkgbase-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gvfs \
-      --with-bash-completion-dir=/etc/bash_completion.d
+      --with-bash-completion-dir=/usr/share/bash-completion/completions
   make
 }
 
diff --git a/extra/gvfs/gvfs-1.12.2-afp-g_clear_object.patch b/extra/gvfs/gvfs-1.12.2-afp-g_clear_object.patch
new file mode 100644
index 000000000..09e11d888
--- /dev/null
+++ b/extra/gvfs/gvfs-1.12.2-afp-g_clear_object.patch
@@ -0,0 +1,35 @@
+From 01161473ed33ee682f340e6f12edcba5334475e0 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Mon, 30 Apr 2012 06:09:30 -0400
+Subject: [PATCH] afp: Use g_clear_object properly
+
+g_clear_object expects the address of a pointer. A recent
+change in its definition makes gcc complain about this.
+(cherry picked from commit 7fe5deeae25f2396027f667d8960d2ec84c64716)
+---
+ daemon/gvfsafpvolume.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/gvfsafpvolume.c b/daemon/gvfsafpvolume.c
+index 3fd33f2..5207459 100644
+--- a/daemon/gvfsafpvolume.c
++++ b/daemon/gvfsafpvolume.c
+@@ -1082,7 +1082,7 @@ create_directory_get_filedir_parms_cb (GObject *source_object, GAsyncResult *res
+   return;
+ 
+ error:
+-  g_clear_object (info);
++  g_clear_object (&info);
+   g_simple_async_result_take_error (simple, err);
+   g_simple_async_result_complete (simple);
+   g_object_unref (simple);
+@@ -3033,4 +3033,4 @@ g_vfs_afp_volume_read_from_fork_finish (GVfsAfpVolume  *volume,
+     *bytes_read = g_simple_async_result_get_op_res_gssize (simple);
+   
+   return TRUE;
+-}
+\ No newline at end of file
++}
+-- 
+1.7.8.6
+
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index d2d9e817d..91235bdd7 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156886 2012-04-23 09:08:21Z ibiru $
+# $Id: PKGBUILD 159211 2012-05-18 09:16:01Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Art Gramlich <art@gramlich-net.com>
 
 pkgname=icu
 pkgver=49.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="International Components for Unicode library"
 arch=(i686 x86_64 'mips64el')
 url="http://www.icu-project.org/"
@@ -12,14 +12,18 @@ license=('custom:"icu"')
 depends=('gcc-libs' 'sh')
 source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
 	    http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
-	    icu.8198.revert.icu5431.patch)
+	    icu.8198.revert.icu5431.patch
+	    fix_broken_regex.diff)
 md5sums=('7c53f83e0327343f4060c0eb83842daf'
-         'ebd5470fc969c75e52baf4af94a9ee82')
+         'ebd5470fc969c75e52baf4af94a9ee82'
+         '5bbcd600fdf9b35cbd89a06cab522f3f')
 
 build() {
   cd ${srcdir}/icu/source
   # fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200
   patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch
+  # patch broken regex  - https://bugs.archlinux.org/task/29700 / http://bugs.icu-project.org/trac/ticket/9276
+  patch -Np0 -i ${srcdir}/fix_broken_regex.diff
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--mandir=/usr/share/man
diff --git a/extra/icu/fix_broken_regex.diff b/extra/icu/fix_broken_regex.diff
new file mode 100644
index 000000000..8161a1107
--- /dev/null
+++ b/extra/icu/fix_broken_regex.diff
@@ -0,0 +1,35 @@
+--- i18n/regexcmp.cpp
++++ i18n/regexcmp.cpp
+@@ -3307,8 +3307,29 @@
+ 
+         case URX_STRING_I:
+-            // TODO:  Is the case-folded string the longest?
+-            //        If so we can optimize this the same as URX_STRING.
+-            loc++;
+-            currentLen = INT32_MAX;
++            // TODO:  This code assumes that any user string that matches will be no longer
++            //        than our compiled string, with case insensitive matching.
++            //        Our compiled string has been case-folded already.
++            //
++            //        Any matching user string will have no more code points than our
++            //        compiled (folded) string.  Folding may add code points, but
++            //        not remove them.
++            //
++            //        There is a potential problem if a supplemental code point 
++            //        case-folds to a BMP code point.  In this case our compiled string
++            //        could be shorter (in code units) than a matching user string.
++            //
++            //        At this time (Unicode 6.1) there are no such characters, and this case
++            //        is not being handled.  A test, intltest regex/Bug9283, will fail if
++            //        any problematic characters are added to Unicode.
++            //
++            //        If this happens, we can make a set of the BMP chars that the
++            //        troublesome supplementals fold to, scan our string, and bump the
++            //        currentLen one extra for each that is found.
++            //
++            {
++                loc++;
++                int32_t stringLenOp = (int32_t)fRXPat->fCompiledPat->elementAti(loc);
++                currentLen = safeIncrement(currentLen, URX_VAL(stringLenOp));
++            }
+             break;
diff --git a/extra/ifplugd/PKGBUILD b/extra/ifplugd/PKGBUILD
index 1e7d6ad04..1487fbef6 100644
--- a/extra/ifplugd/PKGBUILD
+++ b/extra/ifplugd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 157472 2012-04-28 18:54:17Z dreisner $
+# $Id: PKGBUILD 158689 2012-05-07 09:54:25Z dreisner $
 # Contributor: Manolis Tzanidakis
 # Contributor: kevin <kevin@archlinux.org>
 # Maintainer: 
 
 pkgname=ifplugd
 pkgver=0.28
-pkgrel=10
+pkgrel=11
 pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://0pointer.de/lennart/projects/ifplugd"
@@ -15,7 +15,7 @@ backup=('etc/ifplugd/ifplugd.conf' 'etc/ifplugd/ifplugd.action')
 options=('!makeflags')
 source=($url/${pkgname}-${pkgver}.tar.gz 'ifplugd' 'ifplugd.action' 'ifplugd-0.28-interface.patch' 'ifdown.01-route.sh' 'ifup.01-route.sh' 'ifup.02-ntpdate.sh')
 md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3'
-         'ef27f40434ca85ccaf57a7e388eb001e'
+         '2281cd3eda9e3403857863e1a1bc00be'
          '6f98767c4ea2cf0580f73ced81efd21a'
          '54eb22844b5aeed161c0b80aa9008570'
          'd6ce6c7bd481a0b3944c944c5b277c0b'
diff --git a/extra/ifplugd/ifplugd b/extra/ifplugd/ifplugd
index 667fc1f53..f7c34ade5 100644
--- a/extra/ifplugd/ifplugd
+++ b/extra/ifplugd/ifplugd
@@ -16,9 +16,11 @@ PID=$(pidof -o %PPID ifplugd)
 [[ -r $cfg ]] && . "$cfg"
 
 # discover interfaces to monitor
-# (replacing INTERFACES with net_ifs, since AL
+# (replacing INTERFACES with NET_IFS, since AL
 # already uses it in /etc/rc.conf)
-if [[ -z $net_ifs ]]; then
+if [[ $NET_IFS ]]; then
+  net_ifs=($NET_IFS)
+else
   net_ifs=(/sys/class/net/!(lo))
   net_ifs=("${net_ifs[@]##*/}")
 fi
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 08a2aaac4..01a15a47e 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158377 2012-05-03 22:30:58Z andrea $
+# $Id: PKGBUILD 158761 2012-05-09 08:46:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -29,7 +29,8 @@ backup=('usr/share/config/kdm/kdmrc'
 options=('emptydirs')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+        'fix-krunner-crash.patch')
 sha1sums=('23dbd023f76769ba6ea77dbc11314eca504ad3d2'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           '712a90999bd429883dcef5dcaf288aace332ced8'
@@ -37,13 +38,16 @@ sha1sums=('23dbd023f76769ba6ea77dbc11314eca504ad3d2'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
+          'd509dac592bd8b310df27991b208c95b6d907514'
+          'f898561d2b32dead8195f0610141edf7d423d46c')
 
 build() {
 	cd "${srcdir}"/${_pkgname}-${pkgver}
 	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
 	patch -p0 -i "${srcdir}"/fixpath.patch
 	patch -p0 -i "${srcdir}"/terminate-server.patch
+	
+    patch -p1 -i "${srcdir}"/fix-krunner-crash.patch
 
 	cd "${srcdir}"
 	mkdir build
diff --git a/extra/kdebase-workspace/fix-krunner-crash.patch b/extra/kdebase-workspace/fix-krunner-crash.patch
new file mode 100644
index 000000000..2bdf0b512
--- /dev/null
+++ b/extra/kdebase-workspace/fix-krunner-crash.patch
@@ -0,0 +1,13 @@
+diff --git a/libs/plasmagenericshell/panelshadows.cpp b/libs/plasmagenericshell/panelshadows.cpp
+index ee55571..2f45153 100644
+--- a/libs/plasmagenericshell/panelshadows.cpp
++++ b/libs/plasmagenericshell/panelshadows.cpp
+@@ -122,7 +122,7 @@ void PanelShadows::Private::initPixmap(const QString &element)
+ {
+ #ifdef Q_WS_X11
+     QPixmap pix = q->pixmap(element);
+-    if (pix.handle() == 0) {
++    if (!pix.isNull() && pix.handle() == 0) {
+         Pixmap xPix = XCreatePixmap(QX11Info::display(), QX11Info::appRootWindow(), pix.width(), pix.height(), 32);
+         QPixmap tempPix = QPixmap::fromX11Pixmap(xPix, QPixmap::ExplicitlyShared);
+         tempPix.fill(Qt::transparent);
diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD
index 07bd4b966..a78e6df33 100644
--- a/extra/kdenetwork/PKGBUILD
+++ b/extra/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158485 2012-05-03 22:34:22Z andrea $
+# $Id: PKGBUILD 159199 2012-05-17 19:03:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,7 +11,7 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
 pkgver=4.8.3
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index d5915b8dc..c3fe6981b 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158355 2012-05-03 22:30:17Z andrea $
+# $Id: PKGBUILD 159144 2012-05-16 19:52:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
 pkgver=4.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc='KDE PIM Runtime Environment'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -12,16 +12,20 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdepimlibs' 'kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('f1c6691522113887dc5f098678ccbbacfecb9390')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
+        'fix-carddav-support.patch')
+sha1sums=('f1c6691522113887dc5f098678ccbbacfecb9390'
+          '1362bc04e82a3fdf870578c051a2e16170c43e86')
 
 build() {
+    cd "${srcdir}"/${pkgname}-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-carddav-support.patch
+
     cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	make
 }
diff --git a/extra/kdepim-runtime/fix-carddav-support.patch b/extra/kdepim-runtime/fix-carddav-support.patch
new file mode 100644
index 000000000..25c281307
--- /dev/null
+++ b/extra/kdepim-runtime/fix-carddav-support.patch
@@ -0,0 +1,26 @@
+commit bec63a313160ec6dc1833029d5e99746779ed3f4
+Author: Gregory Oestreicher <greg@kamago.net>
+Date:   Tue May 15 21:19:17 2012 +0200
+
+    Add a prop-filter in the CardDAV requests
+    
+    BUG: 299482
+    FIXED-IN: 4.8.4
+
+diff --git a/resources/dav/protocols/carddavprotocol.cpp b/resources/dav/protocols/carddavprotocol.cpp
+index 38eca17..9c58653 100644
+--- a/resources/dav/protocols/carddavprotocol.cpp
++++ b/resources/dav/protocols/carddavprotocol.cpp
+@@ -35,6 +35,12 @@ CarddavProtocol::CarddavProtocol()
+   propElement.appendChild( document.createElementNS( "DAV:", "resourcetype" ) );
+   propElement.appendChild( document.createElementNS( "DAV:", "getetag" ) );
+ 
++  QDomElement filterElement = document.createElementNS( "urn:ietf:params:xml:ns:carddav", "filter" );
++  queryElement.appendChild( filterElement );
++  QDomElement propfilterElement = document.createElementNS( "urn:ietf:params:xml:ns:carddav", "prop-filter" );
++  propfilterElement.setAttribute( "name", "FN" );
++  filterElement.appendChild( propfilterElement );
++
+   mItemsQueries << document;
+ }
+ 
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 236d31b6e..d163a353c 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=0.9.0.1
+pkgver=0.9.0.2
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic
             'openconnect: Cisco AnyConnect compatible VPN client')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2")
-sha1sums=('75e16397d00de06947fa183f09632caed11d8857')
+sha1sums=('58b530d0dc97cc742f24413a54c58f20318cfa14')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libcaca/PKGBUILD b/extra/libcaca/PKGBUILD
index 21e6e12ae..cce8347dd 100644
--- a/extra/libcaca/PKGBUILD
+++ b/extra/libcaca/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 150463 2012-02-18 00:19:31Z allan $
+# $Id: PKGBUILD 158970 2012-05-13 20:58:29Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libcaca
-pkgver=0.99.beta17
-pkgrel=2
+pkgver=0.99.beta18
+pkgrel=1
 pkgdesc="Color AsCii Art library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-url="http://libcaca.zoy.org/"
+url="http://caca.zoy.org/wiki/libcaca"
 depends=('imlib2' 'ncurses')
 options=(!libtool !emptydirs)
 source=(http://libcaca.zoy.org/files/libcaca/${pkgname}-${pkgver}.tar.gz)
-md5sums=('790d6e26b7950e15909fdbeb23a7ea87')
+md5sums=('93d35dbdb0527d4c94df3e9a02e865cc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libdrm-new/COPYING b/extra/libdrm-new/COPYING
new file mode 100644
index 000000000..6e74c337c
--- /dev/null
+++ b/extra/libdrm-new/COPYING
@@ -0,0 +1,48 @@
+ Copyright 2005 Adam Jackson.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation on the rights to use, copy, modify, merge,
+ publish, distribute, sub license, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT.  IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------------------
+
+ Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT.  IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
+ SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
diff --git a/extra/libdrm-new/PKGBUILD b/extra/libdrm-new/PKGBUILD
new file mode 100644
index 000000000..32a85fcd1
--- /dev/null
+++ b/extra/libdrm-new/PKGBUILD
@@ -0,0 +1,53 @@
+#Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=libdrm-new
+pkgname=(libdrm-new libdrm-nouveau)
+pkgver=2.4.34
+pkgrel=1
+pkgdesc="Userspace interface to kernel DRM services"
+arch=(i686 x86_64)
+license=('custom')
+depends=('glibc' 'libpciaccess')
+makedepends=('cairo' 'valgrind')
+options=('!libtool' '!emptydirs')
+url="http://dri.freedesktop.org/"
+source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2
+        no-pthread-stubs.patch
+        COPYING
+)
+sha1sums=('861757baff4b37e564e13f5350c1b5d01c66a181'
+          '2a5410baa3e6e078f9378ce486a88f41d22fd838'
+          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
+
+build() {
+  cd "libdrm-$pkgver"
+  patch -Np1 -i "$srcdir/no-pthread-stubs.patch"
+
+  #libtoolize --force
+  autoreconf --force --install
+  ./configure --prefix=/usr \
+      --disable-libkms \
+      --disable-intel \
+      --disable-radeon 
+  make
+}
+
+package_libdrm-new() {
+  pkgdesc="Userspace interface to kernel DRM services - used as makedepends for xf86-video-nouveau"
+  conflicts=('libdrm')
+  provides=("libdrm=$pkgver")
+  cd "libdrm-$pkgver"
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir"/usr/lib/libdrm_nouveau.so.2*
+}
+
+package_libdrm-nouveau() {
+  pkgdesc="Userspace interface to kernel DRM services for nouveau - used as depends for xf86-video-nouveau"
+  depends=(libdrm)
+  cd "libdrm-$pkgver"
+  make DESTDIR="$pkgdir" install-libdrm_laLTLIBRARIES
+  make -C nouveau DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" uninstall-libdrm_laLTLIBRARIES
+  rm "$pkgdir"/usr/include/libdrm/nouveau.h  "$pkgdir"/usr/lib/pkgconfig/libdrm_nouveau.pc  "$pkgdir"/usr/lib/libdrm_nouveau.so
+}
diff --git a/extra/libdrm-new/no-pthread-stubs.patch b/extra/libdrm-new/no-pthread-stubs.patch
new file mode 100644
index 000000000..6745f4bc4
--- /dev/null
+++ b/extra/libdrm-new/no-pthread-stubs.patch
@@ -0,0 +1,70 @@
+diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
+--- libdrm-2.4.34.orig/configure.ac	2012-05-12 14:54:06.375335490 +0000
++++ libdrm-2.4.34/configure.ac	2012-05-12 14:54:32.075142065 +0000
+@@ -47,10 +47,6 @@
+ LT_INIT([disable-static])
+ 
+ 
+-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
+-AC_SUBST(PTHREADSTUBS_CFLAGS)
+-AC_SUBST(PTHREADSTUBS_LIBS)
+-
+ pkgconfigdir=${libdir}/pkgconfig
+ AC_SUBST(pkgconfigdir)
+ AC_ARG_ENABLE([udev],
+diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
+--- libdrm-2.4.34.orig/intel/Makefile.am	2012-05-12 14:54:06.372001955 +0000
++++ libdrm-2.4.34/intel/Makefile.am	2012-05-12 14:55:24.164745055 +0000
+@@ -26,7 +26,6 @@
+ 	$(WARN_CFLAGS) \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/intel \
+-	$(PTHREADSTUBS_CFLAGS) \
+ 	$(PCIACCESS_CFLAGS) \
+ 	$(VALGRIND_CFLAGS) \
+ 	-I$(top_srcdir)/include/drm
+@@ -35,7 +34,6 @@
+ libdrm_intel_ladir = $(libdir)
+ libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+ libdrm_intel_la_LIBADD = ../libdrm.la \
+-	@PTHREADSTUBS_LIBS@ \
+ 	@PCIACCESS_LIBS@ \
+ 	@CLOCK_LIB@
+ 
+diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
+--- libdrm-2.4.34.orig/nouveau/Makefile.am	2012-05-12 14:54:06.331998148 +0000
++++ libdrm-2.4.34/nouveau/Makefile.am	2012-05-12 14:56:00.941132085 +0000
+@@ -2,14 +2,13 @@
+ 	$(WARN_CFLAGS) \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/nouveau \
+-	$(PTHREADSTUBS_CFLAGS) \
+ 	-I$(top_srcdir)/include/drm \
+ 	-DDEBUG
+ 
+ libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
+ libdrm_nouveau_ladir = $(libdir)
+ libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
+-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_nouveau_la_LIBADD = ../libdrm.la
+ 
+ libdrm_nouveau_la_SOURCES = nouveau.c \
+ 			    pushbuf.c \
+diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
+--- libdrm-2.4.34.orig/radeon/Makefile.am	2012-05-12 14:54:06.365334765 +0000
++++ libdrm-2.4.34/radeon/Makefile.am	2012-05-12 14:55:48.084557437 +0000
+@@ -26,13 +26,12 @@
+ 	$(WARN_CFLAGS) \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/radeon \
+-	$(PTHREADSTUBS_CFLAGS) \
+ 	-I$(top_srcdir)/include/drm
+ 
+ libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
+ libdrm_radeon_ladir = $(libdir)
+ libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_radeon_la_LIBADD = ../libdrm.la
+ 
+ libdrm_radeon_la_SOURCES = \
+ 	radeon_bo_gem.c \
diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD
index e05ad6885..163d15e4f 100644
--- a/extra/libmp3splt/PKGBUILD
+++ b/extra/libmp3splt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 151286 2012-02-25 12:53:00Z pierre $
+# $Id: PKGBUILD 159128 2012-05-16 12:24:49Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libmp3splt
-pkgver=0.7.1
+pkgver=0.7.2
 pkgrel=1
 pkgdesc="Library for splitting mp3 and ogg files without decoding"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,6 @@ depends=('libmad' 'libvorbis' 'libid3tag' 'pcre' 'libltdl')
 makedepends=('libtool' 'git')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz")
-md5sums=('62025951f483334f14f1b9be58162094')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -26,3 +25,4 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir/ install
 }
+md5sums=('848817d1d980729aec99bbc62caddd76')
diff --git a/extra/libmusicbrainz4/PKGBUILD b/extra/libmusicbrainz4/PKGBUILD
index 39997a54d..d37f07528 100644
--- a/extra/libmusicbrainz4/PKGBUILD
+++ b/extra/libmusicbrainz4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158018 2012-05-01 04:13:37Z eric $
+# $Id: PKGBUILD 159207 2012-05-18 00:45:43Z eric $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Max Fehrm max.fehrm@gmail.com
 
 pkgname=libmusicbrainz4
-pkgver=4.0.1
+pkgver=4.0.3
 pkgrel=1
 pkgdesc="Library That Provides Access to the MusicBrainz Server"
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ url="http://musicbrainz.org/"
 license=('LGPL2.1')
 depends=('neon')
 makedepends=('cmake')
-source=(https://github.com/downloads/musicbrainz/libmusicbrainz/libmusicbrainz-$pkgver.tar.gz)
-sha1sums=('fbc71eaa994b62bdf9c3de7367d3fc595f2e4ba3')
+source=(https://github.com/downloads/metabrainz/libmusicbrainz/libmusicbrainz-$pkgver.tar.gz)
+md5sums=('19b43a543d338751e9dc524f6236892b')
 
 build() {
   cd libmusicbrainz-$pkgver
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index a4381fd6c..c7b3e1968 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157024 2012-04-23 09:27:44Z ibiru $
+# $Id: PKGBUILD 158917 2012-05-13 06:19:42Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -16,8 +16,8 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-pdfimport'
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-report-builder')
-_LOver=3.5.2.2
-pkgver=3.5.2
+_LOver=3.5.3.2
+pkgver=3.5.3
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
@@ -45,7 +45,7 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
+	${_additional_source_url}/2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -76,7 +76,7 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
 	buildfix_icu49.diff
 	libreoffice-common.sh libreoffice-common.csh)
-noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
+noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
@@ -104,11 +104,11 @@ noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
 	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('a21156d5657b8619a523ffdc5cc0003e'
-         '3c064a24191274fcd8fd466ce9d5dc42'
-         '17ebcd0d25e716d3905b1a905907fd67'
+md5sums=('d22cd79e7463ac4caf0a4b47d78a82ac'
+         '3455f3f523d739aa391b5a5bf04ff958'
+         '945fbf7888c464f4e1cf7282d370b257'
          '18f577b374d60b3c760a3a3350407632'
-         'd28864eb2b59bb57b034c0d4662a3cee'
+         '2fa6028324347860e684e75310818d43'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -138,8 +138,8 @@ md5sums=('a21156d5657b8619a523ffdc5cc0003e'
          '60ce5dc9bd098f95c2e621a930c98dd9'
          '661a52a02a31b3afbe4b3b3146061afd'
          '9734ea20c9f67e1b6e1c5a1247fbd3ff'
-         '32fcd844935434807e68d7bd06b94f09'
-         '06a45184aefe078c4314e002ba666b52')
+         'f0e72d0e1bc93a50a3aa9d31350b156c'
+         '867c682b45f477f916786e00c45d7ab7')
 
 build() {
 
diff --git a/extra/libreoffice/libreoffice-common.csh b/extra/libreoffice/libreoffice-common.csh
index 625917add..af31d4432 100644
--- a/extra/libreoffice/libreoffice-common.csh
+++ b/extra/libreoffice/libreoffice-common.csh
@@ -1 +1 @@
-setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program
+#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program
diff --git a/extra/libreoffice/libreoffice-common.sh b/extra/libreoffice/libreoffice-common.sh
index ea04b2e6d..ee405b1aa 100644
--- a/extra/libreoffice/libreoffice-common.sh
+++ b/extra/libreoffice/libreoffice-common.sh
@@ -1 +1 @@
-export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program"
+#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program"
diff --git a/extra/libsrtp/PKGBUILD b/extra/libsrtp/PKGBUILD
new file mode 100644
index 000000000..13f8142c3
--- /dev/null
+++ b/extra/libsrtp/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 159152 2012-05-16 20:08:38Z andrea $
+# Maintainer:
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Yejun Yang <yejunx AT gmail DOT com>
+# Contributor: Michal Krenek <mikos@sg1.cz>
+
+pkgname=libsrtp
+pkgver=1.4.4
+pkgrel=2
+pkgdesc="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+url="http://srtp.sourceforge.net/srtp.html"
+arch=('i686' 'x86_64')
+license=('BSD')
+source=("http://downloads.sourceforge.net/srtp/srtp-${pkgver}.tgz")
+md5sums=('9b449edb011c934ca97009e7e0566d22')
+
+build() {
+  cd "${srcdir}"/srtp
+  ./configure --prefix=/usr
+  make CFLAGS="${CFLAGS} -fPIC"
+}
+
+package() {
+  cd "${srcdir}"/srtp
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm0644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/extra/libunistring/PKGBUILD b/extra/libunistring/PKGBUILD
new file mode 100644
index 000000000..5cbc2003a
--- /dev/null
+++ b/extra/libunistring/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Emmanuel 'guinness' Boudreault
+# Contributor: Patrick McCarty <pnorcks at gmail dot com>
+
+pkgname=libunistring
+pkgver=0.9.3
+pkgrel=5
+pkgdesc="Library for manipulating Unicode strings and C strings."
+url="http://www.gnu.org/software/libunistring/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('glibc')
+install=${pkgname}.install
+options=('!libtool')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('db8eca3b64163abadf8c40e5cecc261f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libunistring/libunistring.install b/extra/libunistring/libunistring.install
new file mode 100644
index 000000000..58dd2ef8e
--- /dev/null
+++ b/extra/libunistring/libunistring.install
@@ -0,0 +1,22 @@
+infodir=usr/share/info
+filelist=(libunistring.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
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD
index 5ce12bee4..c3c807c50 100644
--- a/extra/libvncserver/PKGBUILD
+++ b/extra/libvncserver/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 145736 2011-12-29 15:45:13Z andrea $
+# $Id: PKGBUILD 158727 2012-05-08 13:54:05Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libvncserver
-pkgver=0.9.8.2
+pkgver=0.9.9
 pkgrel=1
 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvncserver.sourceforge.net/"
 license=('GPL')
-depends=('libjpeg' 'gnutls' 'libgcrypt')
+depends=('libjpeg' 'gnutls' 'libgcrypt' 'openssl')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz")
-md5sums=('dfed1dcc25cb338c7fdbcda2c3df7f50')
+md5sums=('70422169b122765693d2a294d13e3714')
 
 build() {
   cd "${srcdir}/LibVNCServer-${pkgver}"
diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD
index 4c1dd8889..93d3a494f 100644
--- a/extra/libvpx/PKGBUILD
+++ b/extra/libvpx/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 149274 2012-02-06 17:33:28Z ibiru $
+# $Id: PKGBUILD 158895 2012-05-12 18:37:10Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=libvpx
-pkgver=1.0.0
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="The VP8 Codec SDK"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ depends=('glibc')
 makedepends=('yasm')
 source=(http://webm.googlecode.com/files/$pkgname-v$pkgver.tar.bz2
         mips64el.patch)
-sha1sums=('2919e11074fef72fc61ef1a75160050ffaad6074'
+sha1sums=('356af5f770c50cd021c60863203d8f30164f6021'
           '4fd775826a4d737102f831c451235a58947f2cde')
 
 build() {
@@ -33,7 +33,7 @@ build() {
 }
 
 package() {
-    cd "$srcdir/$pkgname-v$pkgver"
+    cd "$pkgname-v$pkgver"
     make DIST_DIR="$pkgdir/usr" install
     install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD
index f9ca3f615..9254e289b 100644
--- a/extra/libwnck3/PKGBUILD
+++ b/extra/libwnck3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156926 2012-04-23 09:09:12Z ibiru $
+# $Id: PKGBUILD 159042 2012-05-15 10:57:35Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libwnck3
 _pkgbasename=libwnck
-pkgver=3.4.0
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Window Navigator Construction Kit (GTK+3)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org/"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('34a97edf601ee066204bb640b23f58d6897e0f559ce1816b3c1d206d70ea62ad')
+sha256sums=('1d055d0d7bd1069d97416985d11241eaea48aedb4311a22ff0d3404871707051')
 
 build() {
     cd "$_pkgbasename-$pkgver"
diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD
index 4f70b7654..90b195551 100644
--- a/extra/libxi/PKGBUILD
+++ b/extra/libxi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153296 2012-03-12 20:52:30Z andyrtr $
+# $Id: PKGBUILD 158868 2012-05-12 16:25:29Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxi
-pkgver=1.6.0
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="X11 Input extension library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'xorg-util-macros')
 options=(!libtool)
 license=('custom')
 source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
-sha1sums=('b7edf48f93e8abd13ca688fa7f597452c4b74346')
+sha1sums=('4b53b41fdaa3acc86606c696c68d5eed11454612')
 
 build() {
   cd "${srcdir}/libXi-${pkgver}"
diff --git a/extra/libzrtpcpp/PKGBUILD b/extra/libzrtpcpp/PKGBUILD
new file mode 100644
index 000000000..77579187a
--- /dev/null
+++ b/extra/libzrtpcpp/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 159158 2012-05-16 20:39:07Z andrea $
+# Maintainer:
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Jeff Mickey <jeff@archlinux.org>
+# Contributor: Michel Brabants <michel.brabants@euphonynet.be>
+
+pkgname=libzrtpcpp
+pkgver=2.0.0
+pkgrel=2
+pkgdesc="A C++ implementation of Phil Zimmermann's ZRTP specification"
+arch=('i686' 'x86_64')
+url='http://www.gnutelephony.org/index.php/GNU_ZRTP'
+license=('GPL3')
+depends=('ccrtp')
+makedepends=('cmake')
+source=("ftp://ftp.gnu.org/pub/gnu/ccrtp/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('dc1501e7e8a46a1608fc3820c7476727'
+         '7216f652aa2e080de114e02a85127dbc')
+
+build() {
+  sed 's/lib64/lib/g' -i "${srcdir}"/${pkgname}-${pkgver}/CMakeLists.txt
+
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index f750a0926..9e55dd5c8 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158337 2012-05-03 18:12:02Z giovanni $
+# $Id: PKGBUILD 158924 2012-05-13 10:20:49Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.05.03
+pkgver=2012.05.11
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('333ea9577af0871474646720113fef31')
+md5sums=('6ffb354005fe211dd455042f2e0c6564')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mcpp/PKGBUILD b/extra/mcpp/PKGBUILD
index 1e05b23cb..5a0aa05f5 100644
--- a/extra/mcpp/PKGBUILD
+++ b/extra/mcpp/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 137665 2011-09-10 11:18:34Z pierre $
+# $Id: PKGBUILD 159222 2012-05-18 11:58:32Z jgc $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=mcpp
 pkgver=2.7.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Matsui's CPP implementation precisely conformed to standards"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://mcpp.sourceforge.net"
 depends=('glibc')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 
-        'namlen.patch')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        namlen.patch
+        fs28284.patch)
 md5sums=('512de48c87ab023a69250edc7a0c7b05'
-         '0bfc6177a58e912a9e23e368578dd3fe')
+         '0bfc6177a58e912a9e23e368578dd3fe'
+         'ba668fc6996e538f2e0c096f9eb282ce')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/namlen.patch"
+  patch -Np1 -i "${srcdir}/fs28284.patch"
   ./configure --prefix=/usr --enable-mcpplib --disable-static
   make
 }
diff --git a/extra/mcpp/fs28284.patch b/extra/mcpp/fs28284.patch
new file mode 100644
index 000000000..960203cf4
--- /dev/null
+++ b/extra/mcpp/fs28284.patch
@@ -0,0 +1,100 @@
+diff -c -r -N ../mcpp-2.7.2/src/internal.H ./src/internal.H
+*** ../mcpp-2.7.2/src/internal.H	2008-08-27 10:31:16.000000000 -0230
+--- ./src/internal.H	2009-12-17 21:01:35.000000000 -0330
+***************
+*** 390,395 ****
+--- 390,397 ----
+  extern char     identifier[];       /* Lastly scanned name          */
+  extern IFINFO   ifstack[];          /* Information of #if nesting   */
+  extern char     work_buf[];
++ extern FILEINFO * sh_file;
++ extern int      sh_line;
+          /* Temporary buffer for directive line and macro expansion  */
+  
+  /* main.c   */
+***************
+*** 557,562 ****
+  #endif
+  #endif
+  
+! #if HOST_HAVE_STPCPY
+  extern char *   stpcpy( char * dest, const char * src);
+  #endif
+--- 559,564 ----
+  #endif
+  #endif
+  
+! #if HOST_HAVE_STPCPY && !defined(stpcpy)
+  extern char *   stpcpy( char * dest, const char * src);
+  #endif
+diff -c -r -N ../mcpp-2.7.2/src/main.c ./src/main.c
+*** ../mcpp-2.7.2/src/main.c	2008-11-05 05:04:46.000000000 -0330
+--- ./src/main.c	2009-12-17 20:42:42.000000000 -0330
+***************
+*** 326,331 ****
+--- 326,333 ----
+              = FALSE;
+      option_flags.trig = TRIGRAPHS_INIT;
+      option_flags.dig = DIGRAPHS_INIT;
++     sh_file = NULL;
++     sh_line = 0;
+  }
+  
+  int     mcpp_lib_main
+diff -c -r -N ../mcpp-2.7.2/src/support.c ./src/support.c
+*** ../mcpp-2.7.2/src/support.c	2008-06-10 06:02:33.000000000 -0230
+--- ./src/support.c	2009-12-17 20:42:39.000000000 -0330
+***************
+*** 188,194 ****
+      size_t      length
+  )
+  {
+!     if (mem_buf_p->bytes_avail < length) {  /* Need to allocate more memory */
+          size_t size = MAX( BUF_INCR_SIZE, length);
+  
+          if (mem_buf_p->buffer == NULL) {            /* 1st append   */
+--- 188,194 ----
+      size_t      length
+  )
+  {
+!     if (mem_buf_p->bytes_avail < length + 1) {  /* Need to allocate more memory */
+          size_t size = MAX( BUF_INCR_SIZE, length);
+  
+          if (mem_buf_p->buffer == NULL) {            /* 1st append   */
+***************
+*** 1722,1727 ****
+--- 1722,1729 ----
+                      sp -= 2;
+                      while (*sp != '\n')     /* Until end of line    */
+                          mcpp_fputc( *sp++, OUT);
++                     mcpp_fputc( '\n', OUT);
++                     wrong_line = TRUE;
+                  }
+                  goto  end_line;
+              default:                        /* Not a comment        */
+diff -c -r -N ../mcpp-2.7.2/src/system.c ./src/system.c
+*** ../mcpp-2.7.2/src/system.c	2008-11-26 06:23:51.000000000 -0330
+--- ./src/system.c	2009-12-17 20:42:42.000000000 -0330
+***************
+*** 3858,3863 ****
+--- 3858,3866 ----
+  }
+  #endif
+  
++ FILEINFO*       sh_file;
++ int             sh_line;
++ 
+  void    sharp(
+      FILEINFO *  sharp_file,
+      int         flag        /* Flag to append to the line for GCC   */
+***************
+*** 3868,3875 ****
+   * else (i.e. 'sharp_file' is NULL) 'infile'.
+   */
+  {
+-     static FILEINFO *   sh_file;
+-     static int  sh_line;
+      FILEINFO *  file;
+      int         line;
+  
+--- 3871,3876 ----
diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD
index a6475d25c..9de576e21 100644
--- a/extra/misdnuser/PKGBUILD
+++ b/extra/misdnuser/PKGBUILD
@@ -1,20 +1,25 @@
-# $Id: PKGBUILD 156006 2012-04-11 12:11:55Z tomegun $
+# $Id: PKGBUILD 159134 2012-05-16 12:27:20Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=misdnuser
-pkgver=2.0.11
-pkgrel=3
+pkgver=2.0.13_20120513
+pkgrel=1
 pkgdesc="Tools and library for mISDN"
 arch=('i686' 'x86_64')
 url="http://www.misdn.org"
 license=('GPL')
 depends=('isdn4k-utils' 'spandsp')
 backup=('etc/capi20.conf') 
-options=('!libtool')
+options=('!makeflags' '!libtool' '!strip')
 source=(ftp://ftp.archlinux.org/other/misdnuser/${pkgname}-${pkgver}.tar.gz
-        misdncapid.rc)
+        misdncapid.rc
+        mISDNcapid.service
+        mISDNcapid.conf)
 
 build() {
+  # only enable for debugging!
+  #export CFLAGS+=" -g -O0"
+  #export CXXFLAGS+=" -g -O0"
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-capi --enable-softdsp --with-mISDN_group=uucp
   make
@@ -30,6 +35,11 @@ package() {
   rm -r ${pkgdir}/etc/udev/
   # remove temporary dir /var/run/mISDNcapid
   rm -r ${pkgdir}/var
+  # add systemd files
+  install -D -m644 ${srcdir}/mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/mISDNcapid.service
+  install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf
 }
-md5sums=('1c8825afde76e290727240077bbd37ea'
-         '2009563b144de037ecb20f8d727a772e')
+md5sums=('f61339c3a28a370cd971957e6ef07f5c'
+         '2009563b144de037ecb20f8d727a772e'
+         '638b399f7e0937639960c4dfb3d5138e'
+         '42c3b46880a68c3883ee1ed00af34b45')
diff --git a/extra/misdnuser/mISDNcapid.conf b/extra/misdnuser/mISDNcapid.conf
new file mode 100644
index 000000000..7607e262d
--- /dev/null
+++ b/extra/misdnuser/mISDNcapid.conf
@@ -0,0 +1 @@
+D /var/run/mISDNcapid 0755 root root -
diff --git a/extra/misdnuser/mISDNcapid.service b/extra/misdnuser/mISDNcapid.service
new file mode 100644
index 000000000..b2b08a0a5
--- /dev/null
+++ b/extra/misdnuser/mISDNcapid.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=mISDN CAPI daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/mISDNcapid
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD
index 77e114cfb..e25cc2ffc 100644
--- a/extra/mousetweaks/PKGBUILD
+++ b/extra/mousetweaks/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=mousetweaks
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=mousetweaks.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('92571119dd0ee0c74e508bb8155b7b894c5185da52753fa431bb12e9bfe10c6f')
+sha256sums=('7f8a6ae627edae12e0d5b92926c33191bfa504c1ccaf51195051681aedfa700c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/mp3splt/PKGBUILD b/extra/mp3splt/PKGBUILD
index 352e93e43..13d295278 100644
--- a/extra/mp3splt/PKGBUILD
+++ b/extra/mp3splt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 151288 2012-02-25 12:55:39Z pierre $
+# $Id: PKGBUILD 159130 2012-05-16 12:25:44Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=mp3splt
-pkgver=2.4.1
+pkgver=2.4.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Commandline tool for splitting mp3 and ogg files without decoding"
@@ -11,7 +11,6 @@ url="http://mp3splt.sourceforge.net"
 depends=('libmp3splt')
 source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz")
 options=('!libtool')
-md5sums=('aed4a94f996abcdb07679206a600fc5b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -23,3 +22,4 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir/ install
 }
+md5sums=('f4c5c42f9dec9fb72b7f6ffeacd82906')
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index f1327deb8..53e73640f 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158020 2012-05-01 05:58:27Z eric $
+# $Id: PKGBUILD 158903 2012-05-12 20:49:50Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=mpg123
-pkgver=1.14.0
+pkgver=1.14.2
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,8 +17,8 @@ conflicts=('mpg321')
 provides=('mpg321')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('49a3d6791cc948336aa34914582f97ac6bb2a8ff'
-          '85386be9450abd66d8738f5cf1adc82aa8f5fb53')
+sha1sums=('887a453e49e3d49d539a712ee66a8d9da16e3325'
+          '878c6ca9e8fb9f29f34953d8fe39d01411086baf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 43461bfb6..cba826fb8 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156076 2012-04-13 07:51:21Z andrea $
+# $Id: PKGBUILD 158713 2012-05-08 07:40:05Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.23
+pkgver=5.5.24
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf')
-md5sums=('b614481967dc146c148027b598397b54'
+md5sums=('dc84f8a0305e054c859533944e79f803'
          '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD
index fa082fcdc..e5320d666 100644
--- a/extra/nautilus-sendto/PKGBUILD
+++ b/extra/nautilus-sendto/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156940 2012-04-23 09:09:31Z ibiru $
+# $Id: PKGBUILD 159024 2012-05-15 10:28:10Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Tor Krill <tor@krill.nu>
 
 pkgname=nautilus-sendto
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="Nautilus context menu for sending files."
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,11 @@ url="http://download.gnome.org/sources/nautilus-sendto/"
 license=('GPL')
 groups=('gnome-extra')
 depends=('evolution-data-server' 'nautilus' 'dconf')
-makedepends=('pidgin' 'gajim' 'gettext' 'intltool')
+makedepends=('pidgin' 'gajim' 'gettext' 'intltool' 'gupnp')
 options=('!libtool' '!emptydirs')
 install=nautilus-sendto.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('03265d7063212717773bd6a1f85c25ec24066ca8424b658c5fa30ec0fb074b44')
+sha256sums=('bafbfbfe66c9817b099c8b57f41341e0be4e94ae846a9a1ae84d7bcbc339c2cf')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index b6c7c8c43..331f57b04 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156938 2012-04-23 09:09:28Z ibiru $
+# $Id: PKGBUILD 159065 2012-05-15 11:33:48Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nautilus
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="GNOME file manager"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=nautilus.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('02581c9475e9c4250960555b248378a6a1c63a5c029728ec48347c78ca77392d')
+sha256sums=('752afa41189b0b6c73dc3769cd885e184c29d6d394345ec05cd48b0004e0f452')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/nautilus/samba-crash.patch b/extra/nautilus/samba-crash.patch
new file mode 100644
index 000000000..b10d39008
--- /dev/null
+++ b/extra/nautilus/samba-crash.patch
@@ -0,0 +1,32 @@
+From 4e59e4cfc7bc68534664d9f72d0c7ea680b79db3 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Fri, 04 May 2012 18:38:43 +0000
+Subject: places-sidebar: don't double unref GMount objects
+
+Fixes a lot of reported crashers with NFS/Samba volumes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=674659
+---
+diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
+index 61f3658..672a4b0 100644
+--- a/src/nautilus-places-sidebar.c
++++ b/src/nautilus-places-sidebar.c
+@@ -774,7 +774,7 @@ update_places (NautilusPlacesSidebar *sidebar)
+ 		root = g_mount_get_default_location (mount);
+ 
+ 		if (!g_file_is_native (root)) {
+-			network_mounts = g_list_prepend (network_mounts, g_object_ref (mount));
++			network_mounts = g_list_prepend (network_mounts, mount);
+ 			continue;
+ 		}
+ 
+@@ -856,7 +856,6 @@ update_places (NautilusPlacesSidebar *sidebar)
+ 			   name, icon, mount_uri,
+ 			   NULL, NULL, mount, 0, tooltip);
+ 		g_object_unref (root);
+-		g_object_unref (mount);
+ 		g_object_unref (icon);
+ 		g_free (name);
+ 		g_free (mount_uri);
+--
+cgit v0.9.0.2
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index d6e7a3f35..bacb9b298 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156015 2012-04-11 14:16:02Z tomegun $
+# $Id: PKGBUILD 158725 2012-05-08 12:53:46Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Bächler <thomas.archlinux.org>
@@ -6,7 +6,7 @@
 pkgbase=ntfs-3g_ntfsprogs
 pkgname=('ntfs-3g' 'ntfsprogs')
 pkgver=2012.1.15
-pkgrel=2
+pkgrel=3
 url="http://www.tuxera.com"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -20,7 +20,7 @@ build() {
   cd "$srcdir/$pkgbase-$pkgver"
   ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \
     --with-fuse=external --disable-static \
-    --mandir=/usr/share/man
+    --enable-posix-acls --mandir=/usr/share/man
   make
 }
 
@@ -33,9 +33,13 @@ package_ntfs-3g() {
   done
 
   mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/
-  rm -rf "$pkgdir"/lib
+  mv "$pkgdir"/bin/* "$pkgdir"/usr/bin/
+  rm -rf "$pkgdir"/{lib,{s,}bin}
 
-  ln -s /bin/ntfs-3g "$pkgdir/sbin/mount.ntfs"
+  cd "$pkgdir"/usr/bin
+  ln -s ntfs-3g mount.ntfs
+  ln -s ntfs-3g mount.ntfs-3g
+  ln -s lowntfs-3g mount.lowntfs-3g
 }
 
 package_ntfsprogs() {
@@ -44,4 +48,7 @@ package_ntfsprogs() {
 
   cd "$srcdir/$pkgbase-$pkgver/ntfsprogs"
   make DESTDIR="$pkgdir" install
+
+  mv "$pkgdir"/sbin/* "$pkgdir"/usr/bin/
+  rm -rf "$pkgdir"/sbin
 }
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index 664358563..5807ad4a0 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157433 2012-04-28 09:58:35Z andyrtr $
+# $Id: PKGBUILD 158856 2012-05-12 13:09:28Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.12
-pkgrel=2
+pkgver=3.5.0.13
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/"
 license=('GPL')
@@ -14,7 +14,7 @@ makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from
              )
 source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
         nx-x11.ld.so.conf.d)
-md5sums=('a2011e034a318016cf2260c30a567301'
+md5sums=('2c80e570d35a25989f8606e1f3620026'
          'f2ec60c7e2d81bef2f7292d2b33681a6')
 
 build() {
diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD
index 4b9bbf1f2..13b72b32a 100644
--- a/extra/openconnect/PKGBUILD
+++ b/extra/openconnect/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 145723 2011-12-28 18:31:54Z ibiru $
+# $Id: PKGBUILD 158780 2012-05-09 17:43:27Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=openconnect
-pkgver=3.15
+pkgver=3.18
 pkgrel=1
 epoch=1
 pkgdesc="Open client for Cisco AnyConnect VPN"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.infradead.org/openconnect.html"
-depends=('libxml2' 'openssl' 'libproxy')
+depends=('libxml2' 'openssl' 'libproxy' 'vpnc')
 makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('94245f4bac42a288100becab0b4ca29a')
+md5sums=('5a440ad946cfec0f1ee7ee5519081cf1')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   ./configure --prefix=/usr \
       --disable-static
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
index 44352b095..6468fdba8 100644
--- a/extra/openjdk6/PKGBUILD
+++ b/extra/openjdk6/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 152644 2012-03-07 19:17:54Z andyrtr $
+# $Id: PKGBUILD 158936 2012-05-13 13:26:46Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=('openjdk6' 'openjdk6-src')
 pkgbase="openjdk6"
 _javaver=6
-_icedteaver=1.11.1
+_icedteaver=1.11.2
 _openjdk_version=b24
 _openjdk_date=14_nov_2011
 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=3
+pkgrel=1
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
 	     'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt' #'xalan-java' 
-	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6')
+	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6' 'inetutils')
 options=('!emptydirs') # 'force') # force needed for hg shots
 source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz{,.sig}
 	http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
@@ -32,14 +32,14 @@ noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
 	jaxp144_03.zip
 	jdk6-jaxws2_1_6-2011_06_13.zip
 	jdk6-jaf-b20.zip)
-sha256sums=('bafb0e21e1edf5ee22871b13dbc0a8a0d3efd894551fb91d5f59783069b6912c'
-            '695f6eddaf274a01be8cf0d7a429d268a49db4799aa0d69063061fd73105ef0b'
+sha256sums=('078637dc8323951b18cbb2aac56fd2f24baaa81f0757391aaa17e1b7577e9ce5'
+            '1c4b7ae37498c61b18ac5fcf04b3322b4b82afe7e959e5949f05bf252cdf73c7'
             'f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227'
             'c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012'
             '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
             '78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012'
-            'ad9a23a14893dab3770744cdf684ffc7a7025eeb7149840faefea82e2a8ed3fa'
-            '6384026ee4854a4ebcd5203845f0a56126aaf34517e99cfbc16c3ea353c55fe5'
+            'f5f59e121f7645ebc449bb13569fd924cbab3194e41db901f4fbe9dbd45720c5'
+            '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9'
             '26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd'
@@ -64,6 +64,7 @@ build() {
   autoreconf -i
 
   export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff"
+#  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/nonreparenting-wm.diff"
 
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
diff --git a/extra/openjdk6/fix_corba_cmds_path.diff b/extra/openjdk6/fix_corba_cmds_path.diff
index 842657880..7a3db9567 100644
--- a/extra/openjdk6/fix_corba_cmds_path.diff
+++ b/extra/openjdk6/fix_corba_cmds_path.diff
@@ -1,6 +1,6 @@
 --- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
 +++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
-@@ -86,10 +86,10 @@
+@@ -76,7 +76,7 @@
  CHMOD          = $(UTILS_COMMAND_PATH)chmod
  CMP            = $(UTILS_USR_BIN_PATH)cmp
  COMM           = $(UTILS_USR_BIN_PATH)comm
@@ -8,21 +8,17 @@
 +COMPRESS       = $(UTILS_COMMAND_PATH)compress
  CP             = $(UTILS_COMMAND_PATH)cp
  CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -136,7 +136,7 @@
+ CUT            = $(UTILS_USR_BIN_PATH)cut
+@@ -125,7 +125,7 @@
+ TAIL           = $(UTILS_USR_BIN_PATH)tail
  TAR            = $(UTILS_COMMAND_PATH)tar
  TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
+-TOUCH          = $(UTILS_COMMAND_PATH)touch
++TOUCH          = $(UTILS_USR_BIN_PATH)touch
+ TR             = $(UTILS_USR_BIN_PATH)tr
  TRUE           = $(UTILS_COMMAND_PATH)true
  UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-@@ -186,7 +186,7 @@
+@@ -176,7 +176,7 @@
    # others have it in /usr/bin.
    SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
  		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
diff --git a/extra/openjdk6/fix_jdk_cmds_path.diff b/extra/openjdk6/fix_jdk_cmds_path.diff
index 7e16e1744..bd37dd4ba 100644
--- a/extra/openjdk6/fix_jdk_cmds_path.diff
+++ b/extra/openjdk6/fix_jdk_cmds_path.diff
@@ -1,6 +1,6 @@
 --- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:33:23.000000000 +0300
 +++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2008-04-14 15:37:34.000000000 +0300
-@@ -76,10 +76,10 @@
+@@ -89,7 +89,7 @@
  CHMOD          = $(UTILS_COMMAND_PATH)chmod
  CMP            = $(UTILS_USR_BIN_PATH)cmp
  COMM           = $(UTILS_USR_BIN_PATH)comm
@@ -8,21 +8,17 @@
 +COMPRESS       = $(UTILS_COMMAND_PATH)compress
  CP             = $(UTILS_COMMAND_PATH)cp
  CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -126,7 +126,7 @@
+ CUT            = $(UTILS_USR_BIN_PATH)cut
+@@ -137,7 +137,7 @@
+ TAIL           = $(UTILS_USR_BIN_PATH)tail
  TAR            = $(UTILS_COMMAND_PATH)tar
  TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
+-TOUCH          = $(UTILS_COMMAND_PATH)touch
++TOUCH          = $(UTILS_USR_BIN_PATH)touch
+ TR             = $(UTILS_USR_BIN_PATH)tr
  TRUE           = $(UTILS_COMMAND_PATH)true
  UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-@@ -173,7 +173,7 @@
+@@ -178,7 +178,7 @@
    BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
                         $(wildcard $(UTILS_USR_BIN_PATH)basename))
  
diff --git a/extra/ortp/PKGBUILD b/extra/ortp/PKGBUILD
index a3133b506..42af0a7ba 100644
--- a/extra/ortp/PKGBUILD
+++ b/extra/ortp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150809 2012-02-23 01:26:10Z andrea $
+# $Id: PKGBUILD 159150 2012-05-16 20:08:01Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
@@ -6,24 +6,31 @@
 
 pkgname=ortp
 pkgver=0.20.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Real-time Transport Protocol (RTP) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/index.php/eng/code_review/ortp"
 license=('LGPL')
-depends=('glibc')
+depends=('libzrtpcpp' 'libsrtp')
 options=('!libtool')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig})
+source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig}
+        'libzrtpcpp2.patch')
 md5sums=('b3f2f02fc5b7ba7e294806c81d419f3c'
-         'c5d39f9ad14fe252db9a96f616308b0b')
+         'c5d39f9ad14fe252db9a96f616308b0b'
+         'a37392fd9889711ac2f0fed2e388fbd8')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -p1 -i "${srcdir}"/libzrtpcpp2.patch
+
+  ./configure --prefix=/usr \
+    --enable-zrtp \
+    --disable-strict
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/ortp/libzrtpcpp2.patch b/extra/ortp/libzrtpcpp2.patch
new file mode 100644
index 000000000..c433c314d
--- /dev/null
+++ b/extra/ortp/libzrtpcpp2.patch
@@ -0,0 +1,69 @@
+Only in ortp-0.20.0.my/build: Makefile
+Only in ortp-0.20.0.my/build/win32native: Makefile
+Only in ortp-0.20.0.my/build/wince: Makefile
+Only in ortp-0.20.0.my/build/winmob: Makefile
+Only in ortp-0.20.0.my: config.log
+Only in ortp-0.20.0.my: config.status
+Only in ortp-0.20.0.my: doc
+Only in ortp-0.20.0.my/include: Makefile
+Only in ortp-0.20.0.my/include/ortp: Makefile
+Only in ortp-0.20.0.my: libtool
+Only in ortp-0.20.0.my: Makefile
+Only in ortp-0.20.0.my: ortp-config.h
+Only in ortp-0.20.0.my: ortp.defs
+Only in ortp-0.20.0.my: ortp.pc
+Only in ortp-0.20.0.my/src: avprofile.lo
+Only in ortp-0.20.0.my/src: b64.lo
+Only in ortp-0.20.0.my/src: .deps
+Only in ortp-0.20.0.my/src: event.lo
+Only in ortp-0.20.0.my/src: jitterctl.lo
+Only in ortp-0.20.0.my/src: libortp.la
+Only in ortp-0.20.0.my/src: .libs
+Only in ortp-0.20.0.my/src: Makefile
+Only in ortp-0.20.0.my/src: netsim.lo
+Only in ortp-0.20.0.my/src: ortp.lo
+Only in ortp-0.20.0.my/src: ortp_srtp.lo
+Only in ortp-0.20.0.my/src: payloadtype.lo
+Only in ortp-0.20.0.my/src: port.lo
+Only in ortp-0.20.0.my/src: posixtimer.lo
+Only in ortp-0.20.0.my/src: rtcp.lo
+Only in ortp-0.20.0.my/src: rtcpparse.lo
+Only in ortp-0.20.0.my/src: rtpparse.lo
+Only in ortp-0.20.0.my/src: rtpsession_inet.lo
+Only in ortp-0.20.0.my/src: rtpsession.lo
+Only in ortp-0.20.0.my/src: rtpsignaltable.lo
+Only in ortp-0.20.0.my/src: rtptimer.lo
+Only in ortp-0.20.0.my/src: scheduler.lo
+Only in ortp-0.20.0.my/src: sessionset.lo
+Only in ortp-0.20.0.my/src: str_utils.lo
+Only in ortp-0.20.0.my/src: stun.lo
+Only in ortp-0.20.0.my/src: stun_udp.lo
+Only in ortp-0.20.0.my/src: telephonyevents.lo
+Only in ortp-0.20.0.my/src/tests: .deps
+Only in ortp-0.20.0.my/src/tests: Makefile
+Only in ortp-0.20.0.my/src/tests/win_receiver: Makefile
+Only in ortp-0.20.0.my/src/tests/win_sender: Makefile
+Only in ortp-0.20.0.my/src: utils.lo
+diff -wbBur ortp-0.20.0/src/zrtp.c ortp-0.20.0.my/src/zrtp.c
+--- ortp-0.20.0/src/zrtp.c	2012-02-22 20:19:51.000000000 +0400
++++ ortp-0.20.0.my/src/zrtp.c	2012-05-16 19:11:25.000000000 +0400
+@@ -837,7 +837,7 @@
+ 	userData->session=s;
+ 	ortp_zrtp_configure(context);
+ 	ortp_message("Initialized ZRTP context");
+-	zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData, 0);
++	zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData);
+ 	return ortp_zrtp_configure_context(userData,s,params);
+ }
+ 
+@@ -867,7 +867,7 @@
+ 	userData->session=s;
+ 	ortp_zrtp_configure(context);
+ 	
+-	zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData, 0);
++	zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData);
+ 
+ 	ortp_message("setting zrtp_setMultiStrParams");
+ 	zrtp_setMultiStrParams(context,multiparams,length);
+Only in ortp-0.20.0.my/src: zrtp.lo
+Only in ortp-0.20.0.my: stamp-h1
diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD
index 1ce8ead12..35431731a 100644
--- a/extra/oxygen-gtk2/PKGBUILD
+++ b/extra/oxygen-gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156129 2012-04-14 10:02:24Z andrea $
+# $Id: PKGBUILD 159000 2012-05-14 18:17:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk2
-pkgver=1.2.3
+pkgver=1.2.4
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ conflicts=('oxygen-gtk')
 replaces=('oxygen-gtk')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('e829b07082280bc0744623ae477b550e')
+md5sums=('107c56ae519483fcb747b751680bbf37')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD
index 09bf2af92..9eb7fbe9b 100644
--- a/extra/oxygen-gtk3/PKGBUILD
+++ b/extra/oxygen-gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156131 2012-04-14 10:03:39Z andrea $
+# $Id: PKGBUILD 159002 2012-05-14 18:18:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=oxygen-gtk3
-pkgver=1.0.3
+pkgver=1.0.4
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('gtk3' 'dbus-glib')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('a60a0548826916313197943e89a08455')
+md5sums=('793786ee97f2d0601ed50a82fc95db25')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/perl-async-interrupt/PKGBUILD b/extra/perl-async-interrupt/PKGBUILD
index 33fa2afb4..02bbe8fd5 100644
--- a/extra/perl-async-interrupt/PKGBUILD
+++ b/extra/perl-async-interrupt/PKGBUILD
@@ -1,45 +1,44 @@
-# Packager: Justin Davis <jrcd83@gmail.com>
-# $Id: PKGBUILD 146271 2012-01-07 18:45:53Z juster $
+# Packager: Justin Davis (juster) <jrcd83@gmail.com>
+# $Id: PKGBUILD 159110 2012-05-15 18:35:31Z juster $
 
 pkgname=perl-async-interrupt
-pkgver=1.05
+_ver=1.1
+pkgver=1.10
 pkgrel=1
-pkgdesc="allow C/XS libraries to interrupt perl asynchronously"
+pkgdesc='allow C/XS libraries to interrupt perl asynchronously'
 arch=(i686 x86_64)
 license=(PerlArtistic GPL)
 options=(!emptydirs)
-depends=('perl-common-sense')
+depends=(perl-common-sense)
 url=https://metacpan.org/release/Async-Interrupt
-source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Async-Interrupt-${pkgver}.tar.gz")
-md5sums=(48efb6982dab8d33241061dba65776a8)
-sha512sums=(8b7c74f03b36e1d0ab40124a36c073daa06ea68d6087d809f5c9d60ca07a14505d67599f24d73f1ec5eb13259a732b0c67a07a2fff47f35e04c6b8a50c526d91)
-_distdir="${srcdir}/Async-Interrupt-${pkgver}"
+source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Async-Interrupt-$_ver.tar.gz")
+md5sums=(18f19b1537ecf5d6195a6a243110e64b)
+sha512sums=(e8e62efc053c8103f509c08a19bfa0fefbfe760ca4e1e4670187de4ed4fbdec2e5a9a19bba1696cd2b721ad7fa6d4b723c24e342118b69dc8b7b1597f5e1385e)
+_dir="$srcdir/Async-Interrupt-$_ver"
 
-build() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
-      PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-      MODULEBUILDRC=/dev/null
+build()
+(
+  cd "$_dir"
+  export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps
+  unset PERL5LIB PERL_MM_OPT
+  /usr/bin/perl Makefile.PL
+  make
+)
 
-    cd "$_distdir"
-    /usr/bin/perl Makefile.PL
-    make
-  )
-}
+check()
+(
+  cd "$_dir"
+  export PERL_MM_USE_DEFAULT=1
+  unset PERL5LIB
+  make test
+)
 
-check() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    cd "$_distdir"
-    make test
-  )
-}
-
-package() {
-    cd "$_distdir"
-    make DESTDIR="$pkgdir" install
-    find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-}
+package()
+(
+  cd "$_dir"
+  make install INSTALLDIRS=vendor DESTDIR="$pkgdir"
+  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+)
 
 # Local Variables:
 # mode: shell-script
diff --git a/extra/perl-ev/PKGBUILD b/extra/perl-ev/PKGBUILD
index 0c3ea8dd3..b2fd09e9c 100644
--- a/extra/perl-ev/PKGBUILD
+++ b/extra/perl-ev/PKGBUILD
@@ -1,45 +1,43 @@
-# Packager: Justin Davis <jrcd83@gmail.com>
-# $Id: PKGBUILD 146268 2012-01-07 18:43:52Z juster $
+# Packager: Justin Davis (juster) <jrcd83@gmail.com>
+# $Id: PKGBUILD 159113 2012-05-15 18:43:42Z juster $
 
 pkgname=perl-ev
-pkgver=4.03
+pkgver=4.11
 pkgrel=1
-pkgdesc="perl interface to libev, a high performance full-featured event loop"
-arch=('i686' 'x86_64' 'mips64el')
+pkgdesc='perl interface to libev, a high performance full-featured event loop'
+arch=(i686 x86_64 'mips64el')
 license=(PerlArtistic GPL)
 options=(!emptydirs)
-depends=('perl-common-sense')
+depends=(perl-common-sense)
 url=https://metacpan.org/release/EV
-source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/EV-${pkgver}.tar.gz")
-md5sums=(33088705bc34bf66bccde50205c15e9f)
-sha512sums=(fecf2014e89c37ca90d61e432d4020b4c59af3877e1c423693f4a86ed0c66325053737ad1c4e20c2c85b1ca65717c811f54fc596da32a853ad142bd7f60c8e03)
-_distdir="${srcdir}/EV-${pkgver}"
+source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/EV-$pkgver.tar.gz")
+md5sums=(405c6d74f9dff12918b12560c1a57877)
+sha512sums=(6aca3eeb617a313de7947b760558c12ed85af4fa8efd5bb4fd8bc2f271b4556312989aebf77cda4e212fd3b1351c268624aeaf2b1cf700507ff46c0c9dcc9db8)
+_dir="$srcdir/EV-$pkgver"
 
-build() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
-      PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-      MODULEBUILDRC=/dev/null
+build()
+(
+  cd "$_dir"
+  export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps
+  unset PERL5LIB PERL_MM_OPT
+  /usr/bin/perl Makefile.PL
+  make
+)
 
-    cd "$_distdir"
-    /usr/bin/perl Makefile.PL
-    make
-  )
-}
+check()
+(
+  cd "$_dir"
+  export PERL_MM_USE_DEFAULT=1
+  unset PERL5LIB
+  make test
+)
 
-check() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    cd "$_distdir"
-    make test
-  )
-}
-
-package() {
-    cd "$_distdir"
-    make DESTDIR="$pkgdir" install
-    find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-}
+package()
+(
+  cd "$_dir"
+  make install INSTALLDIRS=vendor DESTDIR="$pkgdir"
+  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+)
 
 # Local Variables:
 # mode: shell-script
diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD
index 3e2013369..6125d8117 100644
--- a/extra/php-apc/PKGBUILD
+++ b/extra/php-apc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156069 2012-04-12 18:41:47Z pierre $
+# $Id: PKGBUILD 158790 2012-05-09 18:48:32Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-apc
 pkgver=3.1.10
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code'
 url='http://pecl.php.net/package/APC'
diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD
new file mode 100644
index 000000000..12c602b92
--- /dev/null
+++ b/extra/php-xcache/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: $
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=php-xcache
+pkgver=2.0.0
+pkgrel=3
+arch=('i686' 'x86_64')
+pkgdesc='A PHP opcode cacher'
+url='http://xcache.lighttpd.net/'
+depends=('php')
+license=('custom')
+source=("http://xcache.lighttpd.net/pub/Releases/${pkgver}/xcache-${pkgver}.tar.bz2"
+        'xcache.ini')
+backup=('etc/php/conf.d/xcache.ini')
+md5sums=('0e30cdff075c635e475d70a5c37d0252'
+         'bba7ead3e592a7980aa91a8600973587')
+
+build() {
+	cd $srcdir/xcache-$pkgver
+	phpize
+	./configure --prefix=/usr
+	make
+}
+
+# check() {
+# 	cd $srcdir/xcache-$pkgver
+# 	make test
+# }
+
+package() {
+	cd $srcdir/xcache-$pkgver
+	make INSTALL_ROOT=$pkgdir install
+
+	install -Dm644 $srcdir/xcache.ini $pkgdir/etc/php/conf.d/xcache.ini
+
+	install -dm755 $pkgdir/usr/share/php-xcache/admin
+	install -m644 admin/* $pkgdir/usr/share/php-xcache/admin/
+
+	install -Dm644 COPYING $pkgdir/usr/share/licenses/php-xcache/COPYING
+}
diff --git a/extra/php-xcache/xcache.ini b/extra/php-xcache/xcache.ini
new file mode 100644
index 000000000..c2677a5ca
--- /dev/null
+++ b/extra/php-xcache/xcache.ini
@@ -0,0 +1,3 @@
+;zend_extension=/usr/lib/php/modules/xcache.so
+xcache.size=64M
+xcache.var_size=64M
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 32068ea90..d01d75bb5 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158338 2012-05-03 18:28:53Z pierre $
+# $Id: PKGBUILD 158788 2012-05-09 18:48:29Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,44 +21,35 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.12
-_suhosinver=5.3.9-0.9.10
+pkgver=5.4.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('PHP')
 url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
+makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
              'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
              'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
              'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
-        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
-        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
-        'logrotate.d.php-fpm' 'suhosin.patch')
-md5sums=('cf02c29be279c506cbd4ffc2819d7c82'
-         'c099b3d7eac95018ababd41ded7f3066'
-         'c15d18f846be1d69144a5d0056ee6506'
-         'ffc338e8ce2a990f6f2a486355bbab65'
+        'logrotate.d.php-fpm')
+md5sums=('51f9488bf8682399b802c48656315cac'
+         '0b0bc7a917fc592bdf11dcd3c5c255e9'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          'b01be5f816988fcee7e78225836e5e27'
-         '740ec5fe2ecfd9d7febd4081c90ec65b'
-         '07c4e412909ac65a44ec90e7a2c4bade'
-         '07ca7da608553b4cb92797e655eb94f1')
+         '59b3a25f9eb3afc02f1adf9ee699808c'
+         '07c4e412909ac65a44ec90e7a2c4bade')
 
 build() {
 	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
+		--config-cache \
 		--prefix=/usr \
 		--sysconfdir=/etc/php \
 		--localstatedir=/var \
 		--with-layout=GNU \
 		--with-config-file-path=/etc/php \
 		--with-config-file-scan-dir=/etc/php/conf.d \
-		--enable-inline-optimization \
-		--disable-debug \
 		--disable-rpath \
-		--disable-static \
-		--enable-shared \
 		--mandir=/usr/share/man \
 		--without-pear \
 		"
@@ -70,36 +61,31 @@ build() {
 		--enable-ftp=shared \
 		--enable-gd-native-ttf \
 		--enable-intl=shared \
-		--enable-json=shared \
-		--enable-mbregex \
 		--enable-mbstring \
-		--enable-pdo \
 		--enable-phar=shared \
 		--enable-posix=shared \
-		--enable-session \
 		--enable-shmop=shared \
 		--enable-soap=shared \
 		--enable-sockets=shared \
-		--enable-sqlite-utf8 \
 		--enable-sysvmsg=shared \
 		--enable-sysvsem=shared \
 		--enable-sysvshm=shared \
-		--enable-xml \
 		--enable-zip=shared \
 		--with-bz2=shared \
 		--with-curl=shared \
 		--with-db4=/usr \
 		--with-enchant=shared,/usr \
-		--with-freetype-dir=shared,/usr \
+		--with-freetype-dir=/usr \
 		--with-gd=shared \
-		--with-gdbm=shared \
+		--with-gdbm \
 		--with-gettext=shared \
 		--with-gmp=shared \
 		--with-iconv=shared \
 		--with-icu-dir=/usr \
-		--with-imap-ssl=shared \
+		--with-imap-ssl \
 		--with-imap=shared \
-		--with-jpeg-dir=shared,/usr \
+		--with-jpeg-dir=/usr \
+		--with-vpx-dir=/usr \
 		--with-ldap=shared \
 		--with-ldap-sasl \
 		--with-mcrypt=shared \
@@ -115,19 +101,15 @@ build() {
 		--with-pdo-pgsql=shared \
 		--with-pdo-sqlite=shared,/usr \
 		--with-pgsql=shared \
-		--with-png-dir=shared,/usr \
+		--with-png-dir=/usr \
 		--with-pspell=shared \
-		--with-regex=php \
 		--with-snmp=shared \
 		--with-sqlite3=shared,/usr \
-		--with-sqlite=shared \
 		--with-tidy=shared \
 		--with-unixODBC=shared,/usr \
 		--with-xmlrpc=shared \
 		--with-xsl=shared \
 		--with-zlib \
-		--without-db2 \
-		--without-db3 \
 		"
 
 	EXTENSION_DIR=/usr/lib/php/modules
@@ -135,14 +117,8 @@ build() {
 	PEAR_INSTALLDIR=/usr/share/pear
 	export PEAR_INSTALLDIR
 
-	# fix the suhosin patch
-	patch -i ${srcdir}/suhosin.patch
-
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
-	# apply suhosin patch
-	patch -F3 -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
-
 	# adjust paths
 	patch -p0 -i ${srcdir}/php.ini.patch
 	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
@@ -280,11 +256,8 @@ package_php-pear() {
 	backup=('etc/php/pear.conf')
 
 	cd ${srcdir}/build-pear
-	make -j1 install-pear INSTALL_ROOT=${pkgdir}
-	local i
-	while read i; do
-		[ ! -e "$i" ] || rm -rf "$i"
-	done < <(find ${pkgdir} -name '.*')
+	make install-pear INSTALL_ROOT=${pkgdir}
+	rm -rf ${pkgdir}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
 }
 
 package_php-enchant() {
@@ -294,7 +267,7 @@ package_php-enchant() {
 }
 
 package_php-gd() {
-	depends=('php' 'libpng' 'libjpeg' 'freetype2')
+	depends=('php' 'libpng' 'libjpeg' 'freetype2' 'libvpx')
 	pkgdesc='gd module for PHP'
 	install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
 }
diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch
index b923edb38..4e0f4a888 100644
--- a/extra/php/php-fpm.conf.in.patch
+++ b/extra/php/php-fpm.conf.in.patch
@@ -1,5 +1,5 @@
 --- sapi/fpm/php-fpm.conf.in	2011-10-08 23:04:10.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2012-01-11 10:50:14.905161442 +0100
++++ sapi/fpm/php-fpm.conf.in	2012-03-01 19:50:48.549947258 +0100
 @@ -12,7 +12,7 @@
  ; Relative path can also be used. They will be prefixed by:
  ;  - the global prefix if it's been set (-p arguement)
@@ -26,7 +26,7 @@
 +;listen = 127.0.0.1:9000
 +listen = /var/run/php-fpm/php-fpm.sock
  
- ; Set listen(2) backlog. A value of '-1' means unlimited.
+ ; Set listen(2) backlog.
  ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
 @@ -151,9 +152,9 @@
  ; BSD-derived systems allow connections regardless of permissions. 
diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch
index 3dc5b6560..bbaae2152 100644
--- a/extra/php/php.ini.patch
+++ b/extra/php/php.ini.patch
@@ -1,6 +1,6 @@
---- php.ini-production	2011-12-15 11:31:02.000000000 +0100
-+++ php.ini-production	2012-01-11 10:43:02.069936043 +0100
-@@ -376,7 +376,7 @@
+--- php.ini-production	2012-03-29 06:17:59.000000000 +0200
++++ php.ini-production	2012-03-30 10:46:21.181340861 +0200
+@@ -305,7 +305,7 @@
  ; or per-virtualhost web server configuration file. This directive is
  ; *NOT* affected by whether Safe Mode is turned On or Off.
  ; http://php.net/open-basedir
@@ -9,7 +9,7 @@
  
  ; This directive allows you to disable certain functions for security reasons.
  ; It receives a comma-delimited list of function names. This directive is
-@@ -793,7 +793,7 @@
+@@ -702,7 +702,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -18,7 +18,7 @@
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -816,7 +816,7 @@
+@@ -725,7 +725,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -27,7 +27,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -950,53 +950,49 @@
+@@ -859,51 +859,47 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -55,7 +55,6 @@
 -;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
 -;extension=php_openssl.dll
 -;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
 -;extension=php_pdo_mysql.dll
 -;extension=php_pdo_oci.dll
 -;extension=php_pdo_odbc.dll
@@ -71,7 +70,6 @@
 -
 -;extension=php_soap.dll
 -;extension=php_sockets.dll
--;extension=php_sqlite.dll
 -;extension=php_sqlite3.dll
 -;extension=php_sybase_ct.dll
 -;extension=php_tidy.dll
@@ -92,7 +90,6 @@
 +;extension=iconv.so
 +;extension=imap.so
 +;extension=intl.so
-+extension=json.so
 +;extension=ldap.so
 +;extension=mcrypt.so
 +;extension=mssql.so
@@ -113,7 +110,6 @@
 +;extension=soap.so
 +;extension=sockets.so
 +;extension=sqlite3.so
-+;extension=sqlite.so
 +;extension=sysvmsg.so
 +;extension=sysvsem.so
 +;extension=sysvshm.so
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index c3bd974da..cdc06f895 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156957 2012-04-23 09:10:00Z ibiru $
+# $Id: PKGBUILD 158683 2012-05-07 06:27:02Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,8 +6,8 @@
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.3
-pkgrel=2
+pkgver=2.10.4
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
 license=('GPL')
@@ -16,21 +16,12 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool'
              'networkmanager')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        port-to-farstream-v3.patch)
-sha256sums=('0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b'
-            '4c11c10da01855afe865408f29f514672b736830105523fe48aa74676d5052ca')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha256sums=('8fbef835c8dfa2281532ad7064d664477d72015d6dcd4345362dcfe658aaee0e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Apply patch for farsight -> farstream transition
-  # http://developer.pidgin.im/ticket/14936
-  patch -Np1 -i "$srcdir/port-to-farstream-v3.patch"
-
-  # The farstream patch changes configure.ac
-  autoreconf -vi
-
   # Use Python 2
   sed -i 's/env python$/&2/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}
@@ -54,9 +45,7 @@ package_pidgin(){
   depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
            'gstreamer0.10' 'hicolor-icon-theme')
   optdepends=('aspell: for spelling correction'
-              'ca-certificates: SSL CA certificates'
-              'gstreamer0.10-good-plugins: video and voice support'
-              'tk: Tcl/Tk scripting support')
+              'gstreamer0.10-good-plugins: video and voice support')
   install=pidgin.install
 
   cd "$srcdir/pidgin-$pkgver"
@@ -79,7 +68,9 @@ package_libpurple(){
   pkgdesc="IM library extracted from Pidgin"
   depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss')
   optdepends=('avahi: Bonjour protocol support'
-              'dbus-python: for purple-remote and purple-url-handler')
+              'ca-certificates: SSL CA certificates'
+              'dbus-python: for purple-remote and purple-url-handler'
+              'tk: Tcl/Tk scripting support')
 
   cd "$srcdir/pidgin-$pkgver"
 
@@ -91,9 +82,6 @@ package_libpurple(){
 package_finch(){
   pkgdesc="A ncurses-based messaging client"
   depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10')
-  optdepends=('avahi: Bonjour protocol support'
-              'ca-certificates: SSL CA certificates'
-              'tk: Tcl/Tk scripting support')
 
   cd "$srcdir/pidgin-$pkgver"
 
diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD
index 08e6aa3e2..e95a35d00 100644
--- a/extra/polkit/PKGBUILD
+++ b/extra/polkit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 148549 2012-02-03 16:19:24Z ibiru $
+# $Id: PKGBUILD 158972 2012-05-13 21:06:37Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=polkit
-pkgver=0.104
+pkgver=0.105
 pkgrel=1
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 arch=(i686 x86_64 'mips64el')
@@ -12,17 +12,21 @@ depends=('glib2' 'pam' 'expat')
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
 replaces=('policykit')
 options=('!libtool')
-source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz
+source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
         polkit.pam)
-md5sums=('e380b4c6fb1e7bccf854e92edc0a8ce1'
+md5sums=('9c29e1b6c214f0bd6f1d4ee303dfaed9'
          '6564f95878297b954f0572bc1610dd15')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
       --disable-static --enable-gtk-doc
   make
+}
+
+package() {
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
   install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1"
diff --git a/extra/polkit/systemd-fallback.patch b/extra/polkit/systemd-fallback.patch
new file mode 100644
index 000000000..f89ce10ae
--- /dev/null
+++ b/extra/polkit/systemd-fallback.patch
@@ -0,0 +1,1571 @@
+diff -u -rN polkit-0.104/configure.ac polkit-0.104-systemd-fallback/configure.ac
+--- polkit-0.104/configure.ac	2012-01-03 17:25:49.000000000 +0100
++++ polkit-0.104-systemd-fallback/configure.ac	2012-03-06 15:45:55.275860194 +0100
+@@ -160,14 +160,14 @@
+               [enable_systemd=auto])
+ if test "$enable_systemd" != "no"; then
+   PKG_CHECK_MODULES(SYSTEMD,
+-                    [libsystemd-login],
++                    [libsystemd-login libsystemd-daemon],
+                     have_systemd=yes,
+                     have_systemd=no)
+   if test "$have_systemd" = "yes"; then
+     SESSION_TRACKING=systemd
+   else
+     if test "$enable_systemd" = "yes"; then
+-      AC_MSG_ERROR([systemd support requested but libsystemd-login1 library not found])
++      AC_MSG_ERROR([systemd support requested but systemd libraries not found])
+     fi
+   fi
+ fi
+diff -u -rN polkit-0.104/src/polkit/Makefile.am polkit-0.104-systemd-fallback/src/polkit/Makefile.am
+--- polkit-0.104/src/polkit/Makefile.am	2012-01-03 16:03:47.000000000 +0100
++++ polkit-0.104-systemd-fallback/src/polkit/Makefile.am	2012-03-06 15:19:25.108853325 +0100
+@@ -79,15 +79,8 @@
+ 	polkitimplicitauthorization.c		polkitimplicitauthorization.h		\
+ 	polkittemporaryauthorization.c		polkittemporaryauthorization.h		\
+ 	polkitpermission.c			polkitpermission.h			\
+-        $(NULL)
+-
+-if HAVE_SYSTEMD
+-libpolkit_gobject_1_la_SOURCES += \
+-	polkitunixsession-systemd.c		polkitunixsession.h
+-else
+-libpolkit_gobject_1_la_SOURCES += \
+ 	polkitunixsession.c			polkitunixsession.h
+-endif
++        $(NULL)
+ 
+ libpolkit_gobject_1_la_CFLAGS =                                        	\
+         -D_POLKIT_COMPILATION                                  		\
+diff -u -rN polkit-0.104/src/polkit/polkitunixsession.c polkit-0.104-systemd-fallback/src/polkit/polkitunixsession.c
+--- polkit-0.104/src/polkit/polkitunixsession.c	2011-10-18 19:02:27.000000000 +0200
++++ polkit-0.104-systemd-fallback/src/polkit/polkitunixsession.c	2012-03-06 15:17:29.829788021 +0100
+@@ -23,12 +23,18 @@
+ #  include "config.h"
+ #endif
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include "polkitunixsession.h"
+ #include "polkitsubject.h"
+ #include "polkiterror.h"
+ #include "polkitprivate.h"
+ 
++#ifdef HAVE_SYSTEMD
++#  include <systemd/sd-daemon.h>
++#  include <systemd/sd-login.h>
++#endif
++
+ /**
+  * SECTION:polkitunixsession
+  * @title: PolkitUnixSession
+@@ -364,34 +370,44 @@
+   PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
+   GDBusConnection *connection;
+   GVariant *result;
+-  gboolean ret;
+-
+-  ret = FALSE;
++  gboolean ret = FALSE;
+ 
+-  connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
+-  if (connection == NULL)
+-    goto out;
+-
+-  result = g_dbus_connection_call_sync (connection,
+-                                        "org.freedesktop.ConsoleKit",           /* name */
+-                                        session->session_id,                    /* object path */
+-                                        "org.freedesktop.ConsoleKit.Session",   /* interface name */
+-                                        "GetUser",                              /* method */
+-                                        NULL, /* parameters */
+-                                        G_VARIANT_TYPE ("(u)"),
+-                                        G_DBUS_CALL_FLAGS_NONE,
+-                                        -1,
+-                                        cancellable,
+-                                        error);
+-  if (result == NULL)
+-    goto out;
++#ifdef HAVE_SYSTEMD
++  uid_t uid;
++  
++  if (sd_booted () > 0)
++    {
++      if (sd_session_get_uid (session->session_id, &uid) == 0)
++        ret = TRUE;
++    }
++  else
++#endif
++    {
++      connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
++      if (connection == NULL)
++        goto out;
++
++      result = g_dbus_connection_call_sync (connection,
++                                            "org.freedesktop.ConsoleKit",           /* name */
++                                            session->session_id,                    /* object path */
++                                            "org.freedesktop.ConsoleKit.Session",   /* interface name */
++                                            "GetUser",                              /* method */
++                                            NULL, /* parameters */
++                                            G_VARIANT_TYPE ("(u)"),
++                                            G_DBUS_CALL_FLAGS_NONE,
++                                            -1,
++                                            cancellable,
++                                            error);
++      if (result == NULL)
++        goto out;
+ 
+-  ret = TRUE;
+-  g_variant_unref (result);
++      ret = TRUE;
++      g_variant_unref (result);
+ 
+- out:
+-  if (connection != NULL)
+-    g_object_unref (connection);
++     out:
++      if (connection != NULL)
++        g_object_unref (connection);
++    }
+   return ret;
+ }
+ 
+@@ -470,12 +486,9 @@
+                                    GError       **error)
+ {
+   PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable);
+-  GDBusConnection *connection;
++  GDBusConnection *connection = NULL;
+   GVariant *result;
+-  gboolean ret;
+-
+-  connection = NULL;
+-  ret = FALSE;
++  gboolean ret = FALSE;
+ 
+   if (session->session_id != NULL)
+     {
+@@ -484,33 +497,56 @@
+       goto out;
+     }
+ 
+-  connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
+-  if (connection == NULL)
+-    goto out;
++#ifdef HAVE_SYSTEMD
++  char *s;
++  
++  if (sd_booted () > 0)
++    {
++      if (sd_pid_get_session (session->pid, &s) == 0)
++        {
++          session->session_id = g_strdup (s);
++          free (s);
++          ret = TRUE;
++          goto out;
++        }
++      
++      g_set_error (error,
++                   POLKIT_ERROR,
++                   POLKIT_ERROR_FAILED,
++                   "No session for pid %d",
++                   (gint) session->pid);
++    }
++  else
++#endif
++    { 
++      connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
++      if (connection == NULL)
++        goto out;
++
++      result = g_dbus_connection_call_sync (connection,
++                                            "org.freedesktop.ConsoleKit",           /* name */
++                                            "/org/freedesktop/ConsoleKit/Manager",  /* object path */
++                                            "org.freedesktop.ConsoleKit.Manager",   /* interface name */
++                                            "GetSessionForUnixProcess",             /* method */
++                                            g_variant_new ("(u)", session->pid),    /* parameters */
++                                            G_VARIANT_TYPE ("(o)"),
++                                            G_DBUS_CALL_FLAGS_NONE,
++                                            -1,
++                                            cancellable,
++                                            error);
++      if (result == NULL)
++        goto out;
+ 
+-  result = g_dbus_connection_call_sync (connection,
+-                                        "org.freedesktop.ConsoleKit",           /* name */
+-                                        "/org/freedesktop/ConsoleKit/Manager",  /* object path */
+-                                        "org.freedesktop.ConsoleKit.Manager",   /* interface name */
+-                                        "GetSessionForUnixProcess",             /* method */
+-                                        g_variant_new ("(u)", session->pid),    /* parameters */
+-                                        G_VARIANT_TYPE ("(o)"),
+-                                        G_DBUS_CALL_FLAGS_NONE,
+-                                        -1,
+-                                        cancellable,
+-                                        error);
+-  if (result == NULL)
+-    goto out;
++      g_variant_get (result, "(o)", &session->session_id);
++      g_variant_unref (result);
+ 
+-  g_variant_get (result, "(o)", &session->session_id);
+-  g_variant_unref (result);
++      ret = TRUE;
++    }
+ 
+-  ret = TRUE;
+ 
+  out:
+   if (connection != NULL)
+     g_object_unref (connection);
+-
+   return ret;
+ }
+ 
+diff -u -rN polkit-0.104/src/polkit/polkitunixsession-systemd.c polkit-0.104-systemd-fallback/src/polkit/polkitunixsession-systemd.c
+--- polkit-0.104/src/polkit/polkitunixsession-systemd.c	2012-01-03 16:03:47.000000000 +0100
++++ polkit-0.104-systemd-fallback/src/polkit/polkitunixsession-systemd.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,481 +0,0 @@
+-/*
+- * Copyright (C) 2011 Red Hat, Inc.
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General
+- * Public License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307, USA.
+- *
+- * Author: Matthias Clasen
+- */
+-
+-#ifdef HAVE_CONFIG_H
+-#  include "config.h"
+-#endif
+-
+-#include <string.h>
+-#include "polkitunixsession.h"
+-#include "polkitsubject.h"
+-#include "polkiterror.h"
+-#include "polkitprivate.h"
+-
+-#include <systemd/sd-login.h>
+-
+-/**
+- * SECTION:polkitunixsession
+- * @title: PolkitUnixSession
+- * @short_description: Unix sessions
+- *
+- * An object that represents an user session.
+- *
+- * The session id is an opaque string obtained from ConsoleKit.
+- */
+-
+-/**
+- * PolkitUnixSession:
+- *
+- * The #PolkitUnixSession struct should not be accessed directly.
+- */
+-struct _PolkitUnixSession
+-{
+-  GObject parent_instance;
+-
+-  gchar *session_id;
+-
+-  gint pid;
+-};
+-
+-struct _PolkitUnixSessionClass
+-{
+-  GObjectClass parent_class;
+-};
+-
+-enum
+-{
+-  PROP_0,
+-  PROP_SESSION_ID,
+-  PROP_PID,
+-};
+-
+-static void subject_iface_init        (PolkitSubjectIface *subject_iface);
+-static void initable_iface_init       (GInitableIface *initable_iface);
+-static void async_initable_iface_init (GAsyncInitableIface *async_initable_iface);
+-
+-G_DEFINE_TYPE_WITH_CODE (PolkitUnixSession, polkit_unix_session, G_TYPE_OBJECT,
+-                         G_IMPLEMENT_INTERFACE (POLKIT_TYPE_SUBJECT, subject_iface_init)
+-                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init)
+-                         G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init)
+-                         );
+-
+-static void
+-polkit_unix_session_init (PolkitUnixSession *session)
+-{
+-}
+-
+-static void
+-polkit_unix_session_finalize (GObject *object)
+-{
+-  PolkitUnixSession *session = POLKIT_UNIX_SESSION (object);
+-
+-  g_free (session->session_id);
+-
+-  if (G_OBJECT_CLASS (polkit_unix_session_parent_class)->finalize != NULL)
+-    G_OBJECT_CLASS (polkit_unix_session_parent_class)->finalize (object);
+-}
+-
+-static void
+-polkit_unix_session_get_property (GObject    *object,
+-                                  guint       prop_id,
+-                                  GValue     *value,
+-                                  GParamSpec *pspec)
+-{
+-  PolkitUnixSession *session = POLKIT_UNIX_SESSION (object);
+-
+-  switch (prop_id)
+-    {
+-    case PROP_SESSION_ID:
+-      g_value_set_string (value, session->session_id);
+-      break;
+-
+-    default:
+-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+-      break;
+-    }
+-}
+-
+-static void
+-polkit_unix_session_set_property (GObject      *object,
+-                                  guint         prop_id,
+-                                  const GValue *value,
+-                                  GParamSpec   *pspec)
+-{
+-  PolkitUnixSession *session = POLKIT_UNIX_SESSION (object);
+-
+-  switch (prop_id)
+-    {
+-    case PROP_SESSION_ID:
+-      polkit_unix_session_set_session_id (session, g_value_get_string (value));
+-      break;
+-
+-    case PROP_PID:
+-      session->pid = g_value_get_int (value);
+-      break;
+-
+-    default:
+-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+-      break;
+-    }
+-}
+-
+-static void
+-polkit_unix_session_class_init (PolkitUnixSessionClass *klass)
+-{
+-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+-
+-  gobject_class->finalize     = polkit_unix_session_finalize;
+-  gobject_class->get_property = polkit_unix_session_get_property;
+-  gobject_class->set_property = polkit_unix_session_set_property;
+-
+-  /**
+-   * PolkitUnixSession:session-id:
+-   *
+-   * The UNIX session id.
+-   */
+-  g_object_class_install_property (gobject_class,
+-                                   PROP_SESSION_ID,
+-                                   g_param_spec_string ("session-id",
+-                                                        "Session ID",
+-                                                        "The UNIX session ID",
+-                                                        NULL,
+-                                                        G_PARAM_CONSTRUCT |
+-                                                        G_PARAM_READWRITE |
+-                                                        G_PARAM_STATIC_NAME |
+-                                                        G_PARAM_STATIC_BLURB |
+-                                                        G_PARAM_STATIC_NICK));
+-
+-
+-  /**
+-   * PolkitUnixSession:pid:
+-   *
+-   * The UNIX process id to look up the session.
+-   */
+-  g_object_class_install_property (gobject_class,
+-                                   PROP_PID,
+-                                   g_param_spec_int ("pid",
+-                                                     "Process ID",
+-                                                     "Process ID to use for looking up the session",
+-                                                     0,
+-                                                     G_MAXINT,
+-                                                     0,
+-                                                     G_PARAM_CONSTRUCT_ONLY |
+-                                                     G_PARAM_WRITABLE |
+-                                                     G_PARAM_STATIC_NAME |
+-                                                     G_PARAM_STATIC_BLURB |
+-                                                     G_PARAM_STATIC_NICK));
+-
+-}
+-
+-/**
+- * polkit_unix_session_get_session_id:
+- * @session: A #PolkitUnixSession.
+- *
+- * Gets the session id for @session.
+- *
+- * Returns: The session id for @session. Do not free this string, it
+- * is owned by @session.
+- **/
+-const gchar *
+-polkit_unix_session_get_session_id (PolkitUnixSession *session)
+-{
+-  g_return_val_if_fail (POLKIT_IS_UNIX_SESSION (session), NULL);
+-  return session->session_id;
+-}
+-
+-/**
+- * polkit_unix_session_set_session_id:
+- * @session: A #PolkitUnixSession.
+- * @session_id: The session id.
+- *
+- * Sets the session id for @session to @session_id.
+- **/
+-void
+-polkit_unix_session_set_session_id (PolkitUnixSession *session,
+-                                    const gchar       *session_id)
+-{
+-  g_return_if_fail (POLKIT_IS_UNIX_SESSION (session));
+-  /*g_return_if_fail (session_id != NULL);*/
+-  g_free (session->session_id);
+-  session->session_id = g_strdup (session_id);
+-}
+-
+-/**
+- * polkit_unix_session_new:
+- * @session_id: The session id.
+- *
+- * Creates a new #PolkitUnixSession for @session_id.
+- *
+- * Returns: (transfer full): A #PolkitUnixSession. Free with g_object_unref().
+- **/
+-PolkitSubject *
+-polkit_unix_session_new (const gchar *session_id)
+-{
+-  return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_SESSION,
+-                                       "session-id", session_id,
+-                                       NULL));
+-}
+-
+-/**
+- * polkit_unix_session_new_for_process:
+- * @pid: The process id of the process to get the session for.
+- * @cancellable: (allow-none): A #GCancellable or %NULL.
+- * @callback: A #GAsyncReadyCallback to call when the request is satisfied
+- * @user_data: The data to pass to @callback.
+- *
+- * Asynchronously creates a new #PolkitUnixSession object for the
+- * process with process id @pid.
+- *
+- * When the operation is finished, @callback will be invoked in the
+- * <link linkend="g-main-context-push-thread-default">thread-default
+- * main loop</link> of the thread you are calling this method
+- * from. You can then call
+- * polkit_unix_session_new_for_process_finish() to get the result of
+- * the operation.
+- *
+- * This method constructs the object asynchronously, for the synchronous and blocking version
+- * use polkit_unix_session_new_for_process_sync().
+- **/
+-void
+-polkit_unix_session_new_for_process (gint                pid,
+-                                     GCancellable       *cancellable,
+-                                     GAsyncReadyCallback callback,
+-                                     gpointer            user_data)
+-{
+-  g_async_initable_new_async (POLKIT_TYPE_UNIX_SESSION,
+-                              G_PRIORITY_DEFAULT,
+-                              cancellable,
+-                              callback,
+-                              user_data,
+-                              "pid", pid,
+-                              NULL);
+-}
+-
+-/**
+- * polkit_unix_session_new_for_process_finish:
+- * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to polkit_unix_session_new_for_process().
+- * @error: (allow-none): Return location for error.
+- *
+- * Finishes constructing a #PolkitSubject for a process id.
+- *
+- * Returns: (transfer full) (allow-none): A #PolkitUnixSession for the @pid passed to
+- *     polkit_unix_session_new_for_process() or %NULL if @error is
+- *     set. Free with g_object_unref().
+- **/
+-PolkitSubject *
+-polkit_unix_session_new_for_process_finish (GAsyncResult   *res,
+-                                            GError        **error)
+-{
+-  GObject *object;
+-  GObject *source_object;
+-
+-  source_object = g_async_result_get_source_object (res);
+-  g_assert (source_object != NULL);
+-
+-  object = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object),
+-                                        res,
+-                                        error);
+-  g_object_unref (source_object);
+-
+-  if (object != NULL)
+-    return POLKIT_SUBJECT (object);
+-  else
+-    return NULL;
+-}
+-
+-
+-/**
+- * polkit_unix_session_new_for_process_sync:
+- * @pid: The process id of the process to get the session for.
+- * @cancellable: (allow-none): A #GCancellable or %NULL.
+- * @error: (allow-none): Return location for error.
+- *
+- * Creates a new #PolkitUnixSession for the process with process id @pid.
+- *
+- * This is a synchronous call - the calling thread is blocked until a
+- * reply is received. For the asynchronous version, see
+- * polkit_unix_session_new_for_process().
+- *
+- * Returns: (allow-none) (transfer full): A #PolkitUnixSession for
+- * @pid or %NULL if @error is set. Free with g_object_unref().
+- **/
+-PolkitSubject *
+-polkit_unix_session_new_for_process_sync (gint           pid,
+-                                          GCancellable  *cancellable,
+-                                          GError       **error)
+-{
+-  return POLKIT_SUBJECT (g_initable_new (POLKIT_TYPE_UNIX_SESSION,
+-                                         cancellable,
+-                                         error,
+-                                         "pid", pid,
+-                                         NULL));
+-}
+-
+-static guint
+-polkit_unix_session_hash (PolkitSubject *subject)
+-{
+-  PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
+-
+-  return g_str_hash (session->session_id);
+-}
+-
+-static gboolean
+-polkit_unix_session_equal (PolkitSubject *a,
+-                           PolkitSubject *b)
+-{
+-  PolkitUnixSession *session_a;
+-  PolkitUnixSession *session_b;
+-
+-  session_a = POLKIT_UNIX_SESSION (a);
+-  session_b = POLKIT_UNIX_SESSION (b);
+-
+-  return g_strcmp0 (session_a->session_id, session_b->session_id) == 0;
+-}
+-
+-static gchar *
+-polkit_unix_session_to_string (PolkitSubject *subject)
+-{
+-  PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
+-
+-  return g_strdup_printf ("unix-session:%s", session->session_id);
+-}
+-
+-static gboolean
+-polkit_unix_session_exists_sync (PolkitSubject   *subject,
+-                                    GCancellable    *cancellable,
+-                                    GError         **error)
+-{
+-  PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
+-  gboolean ret;
+-  uid_t uid;
+-
+-  ret = FALSE;
+-
+-  if (!sd_session_get_uid (session->session_id, &uid))
+-    ret = FALSE;
+-
+-  return ret;
+-}
+-
+-static void
+-exists_in_thread_func (GSimpleAsyncResult *res,
+-                       GObject            *object,
+-                       GCancellable       *cancellable)
+-{
+-  GError *error;
+-  error = NULL;
+-  if (!polkit_unix_session_exists_sync (POLKIT_SUBJECT (object),
+-                                        cancellable,
+-                                        &error))
+-    {
+-      g_simple_async_result_set_from_error (res, error);
+-      g_error_free (error);
+-    }
+-}
+-
+-static void
+-polkit_unix_session_exists (PolkitSubject       *subject,
+-                            GCancellable        *cancellable,
+-                            GAsyncReadyCallback  callback,
+-                            gpointer             user_data)
+-{
+-  GSimpleAsyncResult *simple;
+-
+-  g_return_if_fail (POLKIT_IS_UNIX_SESSION (subject));
+-
+-  simple = g_simple_async_result_new (G_OBJECT (subject),
+-                                      callback,
+-                                      user_data,
+-                                      polkit_unix_session_exists);
+-  g_simple_async_result_run_in_thread (simple,
+-                                       exists_in_thread_func,
+-                                       G_PRIORITY_DEFAULT,
+-                                       cancellable);
+-  g_object_unref (simple);
+-}
+-
+-static gboolean
+-polkit_unix_session_exists_finish (PolkitSubject  *subject,
+-                                      GAsyncResult   *res,
+-                                      GError        **error)
+-{
+-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
+-  gboolean ret;
+-
+-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == polkit_unix_session_exists);
+-
+-  ret = FALSE;
+-
+-  if (g_simple_async_result_propagate_error (simple, error))
+-    goto out;
+-
+-  ret = g_simple_async_result_get_op_res_gboolean (simple);
+-
+- out:
+-  return ret;
+-}
+-
+-static void
+-subject_iface_init (PolkitSubjectIface *subject_iface)
+-{
+-  subject_iface->hash          = polkit_unix_session_hash;
+-  subject_iface->equal         = polkit_unix_session_equal;
+-  subject_iface->to_string     = polkit_unix_session_to_string;
+-  subject_iface->exists        = polkit_unix_session_exists;
+-  subject_iface->exists_finish = polkit_unix_session_exists_finish;
+-  subject_iface->exists_sync   = polkit_unix_session_exists_sync;
+-}
+-
+-static gboolean
+-polkit_unix_session_initable_init (GInitable     *initable,
+-                                   GCancellable  *cancellable,
+-                                   GError       **error)
+-{
+-  PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable);
+-  gboolean ret;
+-
+-  ret = FALSE;
+-
+-  if (session->session_id != NULL)
+-    {
+-      /* already set, nothing to do */
+-      ret = TRUE;
+-      goto out;
+-    }
+-
+-  if (!sd_pid_get_session (session->pid, &session->session_id))
+-    ret = TRUE;
+-
+-out:
+-  return ret;
+-}
+-
+-static void
+-initable_iface_init (GInitableIface *initable_iface)
+-{
+-  initable_iface->init = polkit_unix_session_initable_init;
+-}
+-
+-static void
+-async_initable_iface_init (GAsyncInitableIface *async_initable_iface)
+-{
+-  /* use default implementation to run GInitable code in a thread */
+-}
+diff -u -rN polkit-0.104/src/polkitbackend/Makefile.am polkit-0.104-systemd-fallback/src/polkitbackend/Makefile.am
+--- polkit-0.104/src/polkitbackend/Makefile.am	2012-01-03 16:03:47.000000000 +0100
++++ polkit-0.104-systemd-fallback/src/polkitbackend/Makefile.am	2012-03-06 15:44:15.380014886 +0100
+@@ -41,15 +41,8 @@
+ 	polkitbackendconfigsource.h		polkitbackendconfigsource.c		\
+ 	polkitbackendactionlookup.h		polkitbackendactionlookup.c		\
+ 	polkitbackendlocalauthorizationstore.h	polkitbackendlocalauthorizationstore.c	\
+-        $(NULL)
+-
+-if HAVE_SYSTEMD
+-libpolkit_backend_1_la_SOURCES += \
+-	polkitbackendsessionmonitor.h		polkitbackendsessionmonitor-systemd.c
+-else
+-libpolkit_backend_1_la_SOURCES += \
+ 	polkitbackendsessionmonitor.h		polkitbackendsessionmonitor.c
+-endif
++        $(NULL)
+ 
+ libpolkit_backend_1_la_CFLAGS =                                        	\
+         -D_POLKIT_COMPILATION                                  		\
+diff -u -rN polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor.c polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor.c
+--- polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor.c	2011-10-18 19:02:27.000000000 +0200
++++ polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor.c	2012-03-06 15:43:49.353562242 +0100
+@@ -26,6 +26,12 @@
+ #include <string.h>
+ #include <glib/gstdio.h>
+ 
++#ifdef HAVE_SYSTEMD
++#  include <systemd/sd-daemon.h>
++#  include <systemd/sd-login.h>
++#  include <stdlib.h>
++#endif
++
+ #include <polkit/polkit.h>
+ #include "polkitbackendsessionmonitor.h"
+ 
+@@ -39,6 +45,88 @@
+  * The #PolkitBackendSessionMonitor class is a utility class to track and monitor sessions.
+  */
+ 
++#ifdef HAVE_SYSTEMD
++typedef struct
++{
++  GSource source;
++  GPollFD pollfd;
++  sd_login_monitor *monitor;
++} SdSource;
++
++static gboolean
++sd_source_prepare (GSource *source,
++                   gint    *timeout)
++{
++  *timeout = -1;
++  return FALSE;
++}
++
++static gboolean
++sd_source_check (GSource *source)
++{
++  SdSource *sd_source = (SdSource *)source;
++
++  return sd_source->pollfd.revents != 0;
++}
++
++static gboolean
++sd_source_dispatch (GSource     *source,
++                    GSourceFunc  callback,
++                    gpointer     user_data)
++
++{
++  SdSource *sd_source = (SdSource *)source;
++  gboolean ret;
++
++  g_warn_if_fail (callback != NULL);
++
++  ret = (*callback) (user_data);
++
++  sd_login_monitor_flush (sd_source->monitor);
++
++  return ret;
++}
++
++static void
++sd_source_finalize (GSource *source)
++{
++  SdSource *sd_source = (SdSource*)source;
++
++  sd_login_monitor_unref (sd_source->monitor);
++}
++
++static GSourceFuncs sd_source_funcs = {
++  sd_source_prepare,
++  sd_source_check,
++  sd_source_dispatch,
++  sd_source_finalize
++};
++
++static GSource *
++sd_source_new (void)
++{
++  GSource *source;
++  SdSource *sd_source;
++  int ret;
++
++  source = g_source_new (&sd_source_funcs, sizeof (SdSource));
++  sd_source = (SdSource *)source;
++
++  if ((ret = sd_login_monitor_new (NULL, &sd_source->monitor)) < 0)
++    {
++      g_printerr ("Error getting login monitor: %d", ret);
++    }
++  else
++    {
++      sd_source->pollfd.fd = sd_login_monitor_get_fd (sd_source->monitor);
++      sd_source->pollfd.events = G_IO_IN;
++      g_source_add_poll (source, &sd_source->pollfd);
++    }
++
++  return source;
++}
++#endif /* HAVE_SYSTEMD */
++
+ struct _PolkitBackendSessionMonitor
+ {
+   GObject parent_instance;
+@@ -48,6 +136,10 @@
+   GKeyFile *database;
+   GFileMonitor *database_monitor;
+   time_t database_mtime;
++  
++#ifdef HAVE_SYSTEMD
++  GSource *sd_source;
++#endif
+ };
+ 
+ struct _PolkitBackendSessionMonitorClass
+@@ -162,6 +254,18 @@
+   g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0);
+ }
+ 
++#ifdef HAVE_SYSTEMD
++static gboolean
++sessions_changed (gpointer user_data)
++{
++  PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data);
++
++  g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0);
++
++  return TRUE;
++}
++#endif
++
+ static void
+ polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor)
+ {
+@@ -176,31 +280,47 @@
+       g_error_free (error);
+     }
+ 
+-  error = NULL;
+-  if (!ensure_database (monitor, &error))
+-    {
+-      g_printerr ("Error loading " CKDB_PATH ": %s", error->message);
+-      g_error_free (error);
+-    }
++#ifdef HAVE_SYSTEMD
++  monitor->sd_source = NULL;
++  
++  if (sd_booted () > 0)
++    {
++      monitor->sd_source = sd_source_new ();
++      g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
++      g_source_attach (monitor->sd_source, NULL);
+ 
+-  error = NULL;
+-  file = g_file_new_for_path (CKDB_PATH);
+-  monitor->database_monitor = g_file_monitor_file (file,
+-                                                   G_FILE_MONITOR_NONE,
+-                                                   NULL,
+-                                                   &error);
+-  g_object_unref (file);
+-  if (monitor->database_monitor == NULL)
+-    {
+-      g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message);
+-      g_error_free (error);
++      monitor->database = NULL;
++      monitor->database_monitor = NULL;
+     }
+   else
++#endif
+     {
+-      g_signal_connect (monitor->database_monitor,
+-                        "changed",
+-                        G_CALLBACK (on_file_monitor_changed),
+-                        monitor);
++      error = NULL;
++      if (!ensure_database (monitor, &error))
++        {
++          g_printerr ("Error loading " CKDB_PATH ": %s", error->message);
++          g_error_free (error);
++        }
++
++      error = NULL;
++      file = g_file_new_for_path (CKDB_PATH);
++      monitor->database_monitor = g_file_monitor_file (file,
++                                                       G_FILE_MONITOR_NONE,
++                                                       NULL,
++                                                       &error);
++      g_object_unref (file);
++      if (monitor->database_monitor == NULL)
++        {
++          g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message);
++          g_error_free (error);
++        }
++      else
++        {
++          g_signal_connect (monitor->database_monitor,
++                            "changed",
++                            G_CALLBACK (on_file_monitor_changed),
++                            monitor);
++        }
+     }
+ }
+ 
+@@ -212,6 +332,14 @@
+   if (monitor->system_bus != NULL)
+     g_object_unref (monitor->system_bus);
+ 
++#ifdef HAVE_SYSTEMD
++  if (monitor->sd_source != NULL)
++    {
++      g_source_destroy (monitor->sd_source);
++      g_source_unref (monitor->sd_source);
++    }
++#endif
++
+   if (monitor->database_monitor != NULL)
+     g_object_unref (monitor->database_monitor);
+ 
+@@ -328,22 +456,38 @@
+     }
+   else if (POLKIT_IS_UNIX_SESSION (subject))
+     {
+-      if (!ensure_database (monitor, error))
++#ifdef HAVE_SYSTEMD
++      if (monitor->sd_source != NULL)
+         {
+-          g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": ");
+-          goto out;
++          if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0)
++            {
++              g_set_error (error,
++                           POLKIT_ERROR,
++                           POLKIT_ERROR_FAILED,
++                           "Error getting uid for session");
++              goto out;
++            }
+         }
+-
+-      group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)));
+-      local_error = NULL;
+-      uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error);
+-      if (local_error != NULL)
++      else
++#endif
+         {
+-          g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": ");
++          if (!ensure_database (monitor, error))
++            {
++              g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": ");
++              goto out;
++            }
++
++          group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)));
++          local_error = NULL;
++          uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error);
++          if (local_error != NULL)
++            {
++              g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": ");
++              g_free (group);
++              goto out;
++            }
+           g_free (group);
+-          goto out;
+         }
+-      g_free (group);
+ 
+       ret = polkit_unix_user_new (uid);
+     }
+@@ -373,29 +517,46 @@
+ 
+   if (POLKIT_IS_UNIX_PROCESS (subject))
+     {
+-      const gchar *session_id;
+-      GVariant *result;
+-      result = g_dbus_connection_call_sync (monitor->system_bus,
+-                                            "org.freedesktop.ConsoleKit",
+-                                            "/org/freedesktop/ConsoleKit/Manager",
+-                                            "org.freedesktop.ConsoleKit.Manager",
+-                                            "GetSessionForUnixProcess",
+-                                            g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))),
+-                                            G_VARIANT_TYPE ("(o)"),
+-                                            G_DBUS_CALL_FLAGS_NONE,
+-                                            -1, /* timeout_msec */
+-                                            NULL, /* GCancellable */
+-                                            error);
+-      if (result == NULL)
+-        goto out;
+-      g_variant_get (result, "(&o)", &session_id);
+-      session = polkit_unix_session_new (session_id);
+-      g_variant_unref (result);
++#ifdef HAVE_SYSTEMD
++      if (monitor->sd_source != NULL)
++        {
++          gchar *session_id;
++          pid_t pid;
++
++          pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject));
++          if (sd_pid_get_session (pid, &session_id) < 0)
++            goto out;
++
++          session = polkit_unix_session_new (session_id);
++          free (session_id);
++        }
++      else
++#endif
++        {
++          const gchar *session_id;
++          GVariant *result;
++          result = g_dbus_connection_call_sync (monitor->system_bus,
++                                                "org.freedesktop.ConsoleKit",
++                                                "/org/freedesktop/ConsoleKit/Manager",
++                                                "org.freedesktop.ConsoleKit.Manager",
++                                                "GetSessionForUnixProcess",
++                                                g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))),
++                                                G_VARIANT_TYPE ("(o)"),
++                                                G_DBUS_CALL_FLAGS_NONE,
++                                                -1, /* timeout_msec */
++                                                NULL, /* GCancellable */
++                                                error);
++          if (result == NULL)
++            goto out;
++          g_variant_get (result, "(&o)", &session_id);
++          session = polkit_unix_session_new (session_id);
++          g_variant_unref (result);
++        }
+     }
+   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
+     {
+       guint32 pid;
+-      const gchar *session_id;
++      gchar *session_id;
+       GVariant *result;
+ 
+       result = g_dbus_connection_call_sync (monitor->system_bus,
+@@ -414,22 +575,35 @@
+       g_variant_get (result, "(u)", &pid);
+       g_variant_unref (result);
+ 
+-      result = g_dbus_connection_call_sync (monitor->system_bus,
+-                                            "org.freedesktop.ConsoleKit",
+-                                            "/org/freedesktop/ConsoleKit/Manager",
+-                                            "org.freedesktop.ConsoleKit.Manager",
+-                                            "GetSessionForUnixProcess",
+-                                            g_variant_new ("(u)", pid),
+-                                            G_VARIANT_TYPE ("(o)"),
+-                                            G_DBUS_CALL_FLAGS_NONE,
+-                                            -1, /* timeout_msec */
+-                                            NULL, /* GCancellable */
+-                                            error);
+-      if (result == NULL)
+-        goto out;
+-      g_variant_get (result, "(&o)", &session_id);
+-      session = polkit_unix_session_new (session_id);
+-      g_variant_unref (result);
++#ifdef HAVE_SYSTEMD
++      if (monitor->sd_source != NULL)
++        {
++          if (sd_pid_get_session (pid, &session_id) < 0)
++            goto out;
++
++          session = polkit_unix_session_new (session_id);
++          free (session_id);
++        }
++      else
++#endif
++        {
++          result = g_dbus_connection_call_sync (monitor->system_bus,
++                                                "org.freedesktop.ConsoleKit",
++                                                "/org/freedesktop/ConsoleKit/Manager",
++                                                "org.freedesktop.ConsoleKit.Manager",
++                                                "GetSessionForUnixProcess",
++                                                g_variant_new ("(u)", pid),
++                                                G_VARIANT_TYPE ("(o)"),
++                                                G_DBUS_CALL_FLAGS_NONE,
++                                                -1, /* timeout_msec */
++                                                NULL, /* GCancellable */
++                                                error);
++          if (result == NULL)
++            goto out;
++          g_variant_get (result, "(&o)", &session_id);
++          session = polkit_unix_session_new (session_id);
++          g_variant_unref (result);
++        }
+     }
+   else
+     {
+@@ -490,7 +664,22 @@
+ polkit_backend_session_monitor_is_session_local  (PolkitBackendSessionMonitor *monitor,
+                                                   PolkitSubject               *session)
+ {
+-  return get_boolean (monitor, session, "is_local");
++#ifdef HAVE_SYSTEMD
++  if (monitor->sd_source != NULL)
++    {
++      char *seat;
++
++      if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat))
++        {
++          free (seat);
++          return TRUE;
++        }
++
++      return FALSE;
++    }
++  else
++#endif
++    return get_boolean (monitor, session, "is_local");
+ }
+ 
+ 
+@@ -498,6 +687,11 @@
+ polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor,
+                                                   PolkitSubject               *session)
+ {
+-  return get_boolean (monitor, session, "is_active");
++#ifdef HAVE_SYSTEMD
++  if (monitor->sd_source != NULL)
++    return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
++  else
++#endif
++    return get_boolean (monitor, session, "is_active");
+ }
+ 
+diff -u -rN polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor-systemd.c polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
+--- polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor-systemd.c	2012-01-03 16:03:47.000000000 +0100
++++ polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor-systemd.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,414 +0,0 @@
+-/*
+- * Copyright (C) 2011 Red Hat, Inc.
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General
+- * Public License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307, USA.
+- *
+- * Author: Matthias Clasen
+- */
+-
+-#include "config.h"
+-#include <errno.h>
+-#include <pwd.h>
+-#include <grp.h>
+-#include <string.h>
+-#include <glib/gstdio.h>
+-#include <systemd/sd-login.h>
+-#include <stdlib.h>
+-
+-#include <polkit/polkit.h>
+-#include "polkitbackendsessionmonitor.h"
+-
+-/* <internal>
+- * SECTION:polkitbackendsessionmonitor
+- * @title: PolkitBackendSessionMonitor
+- * @short_description: Monitor sessions
+- *
+- * The #PolkitBackendSessionMonitor class is a utility class to track and monitor sessions.
+- */
+-
+-typedef struct
+-{
+-  GSource source;
+-  GPollFD pollfd;
+-  sd_login_monitor *monitor;
+-} SdSource;
+-
+-static gboolean
+-sd_source_prepare (GSource *source,
+-                   gint    *timeout)
+-{
+-  *timeout = -1;
+-  return FALSE;
+-}
+-
+-static gboolean
+-sd_source_check (GSource *source)
+-{
+-  SdSource *sd_source = (SdSource *)source;
+-
+-  return sd_source->pollfd.revents != 0;
+-}
+-
+-static gboolean
+-sd_source_dispatch (GSource     *source,
+-                    GSourceFunc  callback,
+-                    gpointer     user_data)
+-
+-{
+-  SdSource *sd_source = (SdSource *)source;
+-  gboolean ret;
+-
+-  g_warn_if_fail (callback != NULL);
+-
+-  ret = (*callback) (user_data);
+-
+-  sd_login_monitor_flush (sd_source->monitor);
+-
+-  return ret;
+-}
+-
+-static void
+-sd_source_finalize (GSource *source)
+-{
+-  SdSource *sd_source = (SdSource*)source;
+-
+-  sd_login_monitor_unref (sd_source->monitor);
+-}
+-
+-static GSourceFuncs sd_source_funcs = {
+-  sd_source_prepare,
+-  sd_source_check,
+-  sd_source_dispatch,
+-  sd_source_finalize
+-};
+-
+-static GSource *
+-sd_source_new (void)
+-{
+-  GSource *source;
+-  SdSource *sd_source;
+-  int ret;
+-
+-  source = g_source_new (&sd_source_funcs, sizeof (SdSource));
+-  sd_source = (SdSource *)source;
+-
+-  if ((ret = sd_login_monitor_new (NULL, &sd_source->monitor)) < 0)
+-    {
+-      g_printerr ("Error getting login monitor: %d", ret);
+-    }
+-  else
+-    {
+-      sd_source->pollfd.fd = sd_login_monitor_get_fd (sd_source->monitor);
+-      sd_source->pollfd.events = G_IO_IN;
+-      g_source_add_poll (source, &sd_source->pollfd);
+-    }
+-
+-  return source;
+-}
+-
+-struct _PolkitBackendSessionMonitor
+-{
+-  GObject parent_instance;
+-
+-  GDBusConnection *system_bus;
+-
+-  GSource *sd_source;
+-};
+-
+-struct _PolkitBackendSessionMonitorClass
+-{
+-  GObjectClass parent_class;
+-
+-  void (*changed) (PolkitBackendSessionMonitor *monitor);
+-};
+-
+-
+-enum
+-{
+-  CHANGED_SIGNAL,
+-  LAST_SIGNAL,
+-};
+-
+-static guint signals[LAST_SIGNAL] = {0};
+-
+-G_DEFINE_TYPE (PolkitBackendSessionMonitor, polkit_backend_session_monitor, G_TYPE_OBJECT);
+-
+-/* ---------------------------------------------------------------------------------------------------- */
+-
+-static gboolean
+-sessions_changed (gpointer user_data)
+-{
+-  PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data);
+-
+-  g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0);
+-
+-  return TRUE;
+-}
+-
+-
+-static void
+-polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor)
+-{
+-  GError *error;
+-
+-  error = NULL;
+-  monitor->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
+-  if (monitor->system_bus == NULL)
+-    {
+-      g_printerr ("Error getting system bus: %s", error->message);
+-      g_error_free (error);
+-    }
+-
+-  monitor->sd_source = sd_source_new ();
+-  g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
+-  g_source_attach (monitor->sd_source, NULL);
+-}
+-
+-static void
+-polkit_backend_session_monitor_finalize (GObject *object)
+-{
+-  PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (object);
+-
+-  if (monitor->system_bus != NULL)
+-    g_object_unref (monitor->system_bus);
+-
+-  if (monitor->sd_source != NULL)
+-    {
+-      g_source_destroy (monitor->sd_source);
+-      g_source_unref (monitor->sd_source);
+-    }
+-
+-  if (G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize != NULL)
+-    G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize (object);
+-}
+-
+-static void
+-polkit_backend_session_monitor_class_init (PolkitBackendSessionMonitorClass *klass)
+-{
+-  GObjectClass *gobject_class;
+-
+-  gobject_class = G_OBJECT_CLASS (klass);
+-
+-  gobject_class->finalize = polkit_backend_session_monitor_finalize;
+-
+-  /**
+-   * PolkitBackendSessionMonitor::changed:
+-   * @monitor: A #PolkitBackendSessionMonitor
+-   *
+-   * Emitted when something changes.
+-   */
+-  signals[CHANGED_SIGNAL] = g_signal_new ("changed",
+-                                          POLKIT_BACKEND_TYPE_SESSION_MONITOR,
+-                                          G_SIGNAL_RUN_LAST,
+-                                          G_STRUCT_OFFSET (PolkitBackendSessionMonitorClass, changed),
+-                                          NULL,                   /* accumulator      */
+-                                          NULL,                   /* accumulator data */
+-                                          g_cclosure_marshal_VOID__VOID,
+-                                          G_TYPE_NONE,
+-                                          0);
+-}
+-
+-PolkitBackendSessionMonitor *
+-polkit_backend_session_monitor_new (void)
+-{
+-  PolkitBackendSessionMonitor *monitor;
+-
+-  monitor = POLKIT_BACKEND_SESSION_MONITOR (g_object_new (POLKIT_BACKEND_TYPE_SESSION_MONITOR, NULL));
+-
+-  return monitor;
+-}
+-
+-/* ---------------------------------------------------------------------------------------------------- */
+-
+-GList *
+-polkit_backend_session_monitor_get_sessions (PolkitBackendSessionMonitor *monitor)
+-{
+-  /* TODO */
+-  return NULL;
+-}
+-
+-/* ---------------------------------------------------------------------------------------------------- */
+-
+-/**
+- * polkit_backend_session_monitor_get_user:
+- * @monitor: A #PolkitBackendSessionMonitor.
+- * @subject: A #PolkitSubject.
+- * @error: Return location for error.
+- *
+- * Gets the user corresponding to @subject or %NULL if no user exists.
+- *
+- * Returns: %NULL if @error is set otherwise a #PolkitUnixUser that should be freed with g_object_unref().
+- */
+-PolkitIdentity *
+-polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor  *monitor,
+-                                                     PolkitSubject                *subject,
+-                                                     GError                      **error)
+-{
+-  PolkitIdentity *ret;
+-  guint32 uid;
+-
+-  ret = NULL;
+-
+-  if (POLKIT_IS_UNIX_PROCESS (subject))
+-    {
+-      uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject));
+-      if ((gint) uid == -1)
+-        {
+-          g_set_error (error,
+-                       POLKIT_ERROR,
+-                       POLKIT_ERROR_FAILED,
+-                       "Unix process subject does not have uid set");
+-          goto out;
+-        }
+-      ret = polkit_unix_user_new (uid);
+-    }
+-  else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
+-    {
+-      GVariant *result;
+-
+-      result = g_dbus_connection_call_sync (monitor->system_bus,
+-                                            "org.freedesktop.DBus",
+-                                            "/org/freedesktop/DBus",
+-                                            "org.freedesktop.DBus",
+-                                            "GetConnectionUnixUser",
+-                                            g_variant_new ("(s)", polkit_system_bus_name_get_name (POLKIT_SYSTEM_BUS_NAME (subject))),
+-                                            G_VARIANT_TYPE ("(u)"),
+-                                            G_DBUS_CALL_FLAGS_NONE,
+-                                            -1, /* timeout_msec */
+-                                            NULL, /* GCancellable */
+-                                            error);
+-      if (result == NULL)
+-        goto out;
+-      g_variant_get (result, "(u)", &uid);
+-      g_variant_unref (result);
+-
+-      ret = polkit_unix_user_new (uid);
+-    }
+-  else if (POLKIT_IS_UNIX_SESSION (subject))
+-    {
+-
+-      if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0)
+-        {
+-          g_set_error (error,
+-                       POLKIT_ERROR,
+-                       POLKIT_ERROR_FAILED,
+-                       "Error getting uid for session");
+-          goto out;
+-        }
+-
+-      ret = polkit_unix_user_new (uid);
+-    }
+-
+- out:
+-  return ret;
+-}
+-
+-/**
+- * polkit_backend_session_monitor_get_session_for_subject:
+- * @monitor: A #PolkitBackendSessionMonitor.
+- * @subject: A #PolkitSubject.
+- * @error: Return location for error.
+- *
+- * Gets the session corresponding to @subject or %NULL if no session exists.
+- *
+- * Returns: %NULL if @error is set otherwise a #PolkitUnixSession that should be freed with g_object_unref().
+- */
+-PolkitSubject *
+-polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMonitor *monitor,
+-                                                        PolkitSubject               *subject,
+-                                                        GError                     **error)
+-{
+-  PolkitSubject *session;
+-
+-  session = NULL;
+-
+-  if (POLKIT_IS_UNIX_PROCESS (subject))
+-    {
+-      gchar *session_id;
+-      pid_t pid;
+-
+-      pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject));
+-      if (sd_pid_get_session (pid, &session_id) < 0)
+-        goto out;
+-
+-      session = polkit_unix_session_new (session_id);
+-      free (session_id);
+-    }
+-  else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
+-    {
+-      guint32 pid;
+-      gchar *session_id;
+-      GVariant *result;
+-
+-      result = g_dbus_connection_call_sync (monitor->system_bus,
+-                                            "org.freedesktop.DBus",
+-                                            "/org/freedesktop/DBus",
+-                                            "org.freedesktop.DBus",
+-                                            "GetConnectionUnixProcessID",
+-                                            g_variant_new ("(s)", polkit_system_bus_name_get_name (POLKIT_SYSTEM_BUS_NAME (subject))),
+-                                            G_VARIANT_TYPE ("(u)"),
+-                                            G_DBUS_CALL_FLAGS_NONE,
+-                                            -1, /* timeout_msec */
+-                                            NULL, /* GCancellable */
+-                                            error);
+-      if (result == NULL)
+-        goto out;
+-      g_variant_get (result, "(u)", &pid);
+-      g_variant_unref (result);
+-
+-      if (sd_pid_get_session (pid, &session_id) < 0)
+-        goto out;
+-
+-      session = polkit_unix_session_new (session_id);
+-      free (session_id);
+-    }
+-  else
+-    {
+-      g_set_error (error,
+-                   POLKIT_ERROR,
+-                   POLKIT_ERROR_NOT_SUPPORTED,
+-                   "Cannot get user for subject of type %s",
+-                   g_type_name (G_TYPE_FROM_INSTANCE (subject)));
+-    }
+-
+- out:
+-
+-  return session;
+-}
+-
+-gboolean
+-polkit_backend_session_monitor_is_session_local (PolkitBackendSessionMonitor *monitor,
+-                                                 PolkitSubject               *session)
+-{
+-  char *seat;
+-
+-  if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat))
+-    {
+-      free (seat);
+-      return TRUE;
+-    }
+-
+-  return FALSE;
+-}
+-
+-
+-gboolean
+-polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor,
+-                                                  PolkitSubject               *session)
+-{
+-  return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
+-}
+-
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index 939f7fc4b..bac4ca39f 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153271 2012-03-12 19:10:06Z jgc $
+# $Id: PKGBUILD 158944 2012-05-13 14:56:03Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
 pkgver=0.18.4
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64 mips64el)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 9ab731477..945cd757a 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,5 +1,5 @@
-# $Id: PKGBUILD 157751 2012-04-29 06:33:27Z allan $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 158827 2012-05-11 21:11:56Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -7,23 +7,24 @@
 pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
-pkgver=1.1
-pkgrel=4
-arch=(i686 x86_64 mips64el)
-url="http://pulseaudio.org/"
+pkgver=2.0
+pkgrel=1
+arch=(i686 x86_64)
+url="http://www.freedesktop.org/wiki/Software/PulseAudio"
 license=(GPL LGPL)
 makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
-             speex tdb udev dbus-core xcb-util avahi bluez gconf intltool jack
-             openssl fftw orc json-c gtk2)
-[ "$CARCH" = "mips64el" ] || makedepends+=(lirc-utils)
+             speex tdb udev dbus-core avahi bluez gconf intltool jack
+             openssl fftw orc json-c gtk2 webrtc-audio-processing
+             libsystemd)
+[ "$CARCH" != "mips64el" ] && makedepends+=(lirc-utils)
 options=(!emptydirs !libtool)
 source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
-        $pkgbase.xinit)
-sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee'
+        pulseaudio.xinit)
+sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061'
             'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf')
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
@@ -44,7 +45,7 @@ build() {
 
 package_pulseaudio() {
   depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb udev fftw orc
-           libsamplerate)
+           libsamplerate webrtc-audio-processing libsystemd)
   optdepends=('avahi: zeroconf support'
               'bluez: bluetooth support'
               'gconf: configuration through gconf (paprefs)'
@@ -55,7 +56,7 @@ package_pulseaudio() {
   backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
   install=pulseaudio.install
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
   make -j1 DESTDIR="$pkgdir" install
 
   # Lower resample quality, saves CPU
@@ -80,15 +81,20 @@ package_pulseaudio() {
 
 ### Split libpulse
 
-  mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib,share/man/man5}}
+  mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib/pulseaudio,share/man/man5}}
 
   mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf
 
-  mv "$pkgdir"/usr/lib/libpulse{,dsp,-simple,-mainloop-glib}.so* \
-     "$pkgdir"/usr/lib/libpulsecommon-*.so \
+  mv "$pkgdir"/usr/lib/libpulse{,-simple,-mainloop-glib}.so* \
      "$srcdir/libpulse/usr/lib"
 
+  mv "$pkgdir"/usr/lib/pulseaudio/libpulsedsp.so \
+     "$pkgdir"/usr/lib/pulseaudio/libpulsecommon-*.so \
+     "$srcdir/libpulse/usr/lib/pulseaudio"
+
+  mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/cmake
   mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig
+
   mv {"$pkgdir","$srcdir/libpulse"}/usr/include
 
   mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index db9df4f35..16420af96 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 157407 2012-04-28 09:26:56Z allan $
+# $Id: PKGBUILD 159046 2012-05-15 11:01:15Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.2.2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="https://live.gnome.org/PyGObject"
 license=('LGPL')
 makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool')
-sha256sums=('1a2140c4c4ce0c1a5d7abe74eeb7a7040f426cb17943c3ae7e57695b355151c3')
+sha256sums=('4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0')
 
 build() {
   cp -a "$pkgbase-$pkgver" python2-build
diff --git a/extra/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD
index b8aa6dfb5..b8a3ed497 100644
--- a/extra/pygobject2/PKGBUILD
+++ b/extra/pygobject2/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 157409 2012-04-28 09:27:01Z allan $
+# $Id: PKGBUILD 158678 2012-05-06 22:44:32Z bisson $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pygtk.org/"
 license=('LGPL')
 makedepends=('python' 'python2')
 source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
+        python2-fix-type.patch
         python3-fix-build.patch
         python3-fix-maketrans.patch)
 options=('!libtool')
 sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
+            'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea'
             'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
             '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
 
@@ -32,6 +34,7 @@ build() {
   (
     cd "pygobject-${pkgver}"
     #patches available in 2.28 branch but unreleased.
+    patch -Np1 -i "${srcdir}/python2-fix-type.patch"
     patch -Np1 -i "${srcdir}/python3-fix-build.patch"
     patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
 
diff --git a/extra/pygobject2/python2-fix-type.patch b/extra/pygobject2/python2-fix-type.patch
new file mode 100644
index 000000000..78e7ddfd5
--- /dev/null
+++ b/extra/pygobject2/python2-fix-type.patch
@@ -0,0 +1,50 @@
+From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Mon, 12 Mar 2012 16:44:14 -0400
+Subject: gio-types.defs: change some enums to flags
+
+These flags types were originally incorrectly handled in glib as being
+enums.  That bug was fixed, but they're still enums here, leading to
+warnings about the mismatch.
+
+Change them to flags.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=668522
+---
+ gio/gio-types.defs |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gio/gio-types.defs b/gio/gio-types.defs
+index 331e0bc..7eee5c8 100644
+--- a/gio/gio-types.defs
++++ b/gio/gio-types.defs
+@@ -526,7 +526,7 @@
+   )
+ )
+ 
+-(define-enum MountMountFlags
++(define-flags MountMountFlags
+   (in-module "gio")
+   (c-name "GMountMountFlags")
+   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
+@@ -545,7 +545,7 @@
+   )
+ )
+ 
+-(define-enum DriveStartFlags
++(define-flags DriveStartFlags
+   (in-module "gio")
+   (c-name "GDriveStartFlags")
+   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
+@@ -770,7 +770,7 @@
+   )
+ )
+ 
+-(define-enum SocketMsgFlags
++(define-flags SocketMsgFlags
+   (in-module "gio")
+   (c-name "GSocketMsgFlags")
+   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
+-- 
+1.7.9.1
+
diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
index 826b062c7..46ced3666 100644
--- a/extra/qemu-kvm/PKGBUILD
+++ b/extra/qemu-kvm/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 158632 2012-05-05 03:24:58Z allan $
+# $Id: PKGBUILD 158721 2012-05-08 10:22:47Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu-kvm
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64 'mips64el')
 license=('GPL2' 'LGPL2.1')
 url="http://www.linux-kvm.org"
-depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'libpulse')
-makedepends=('git' 'iasl' 'texi2html' 'perl' 'python2')
+depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'libpulse' 'seabios')
+makedepends=('texi2html' 'perl' 'python2')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu-kvm.install
 conflicts=('qemu')
@@ -29,26 +29,13 @@ build()
                 --audio-card-list=ac97,sb16,es1370,hda \
                 --enable-docs
     make
-
-    # Use latest seabios version
-    # https://bugs.archlinux.org/task/27616
-    cd "${srcdir}/"
-    git clone git://git.seabios.org/seabios.git
-    cd seabios
-    #find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-    sed -i -e 's/python/python2/g' Makefile
-    make clean
-    make
 }
 
 package()
 {
     cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
-    
-    # Use latest seabios version
-    # https://bugs.archlinux.org/task/27616
-    cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
+    rm "${pkgdir}/usr/share/qemu/bios.bin"
 
     # symbolic link for backwards compatibility
     ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu-kvm"
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index f5e145be5..4d7de3849 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 158630 2012-05-05 03:24:55Z allan $
+# $Id: PKGBUILD 158723 2012-05-08 10:41:26Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
-makedepends=('iasl' 'git' 'texi2html' 'perl' 'python2')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse')
+makedepends=('texi2html' 'perl' 'python2')
+depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu.install
 source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz
@@ -24,22 +24,12 @@ build()
               --audio-card-list=ac97,sb16,es1370,hda \
               --enable-docs
               make
-  # Use latest seabios version
-  # https://bugs.archlinux.org/task/27616
-  cd "${srcdir}/"
-  git clone git://git.seabios.org/seabios.git
-  cd seabios
-  #find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-  make clean
-  make PYTHON=python2
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  # Use latest seabios version
-  # https://bugs.archlinux.org/task/27616
-  cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
+  rm "${pkgdir}/usr/share/qemu/bios.bin"
 
   install -D -m644 "${srcdir}/65-kvm.rules" \
                    "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index bb080bc93..0423c974b 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 142547 2011-11-11 23:39:40Z schiv $
+# $Id: PKGBUILD 159220 2012-05-18 11:33:18Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=rosegarden
-pkgver=11.11
+pkgver=12.04
 pkgrel=1
 pkgdesc="MIDI/audio sequencer and notation editor"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,7 @@ optdepends=('lilypond: notation display'
 [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('1db7bb5289f08e634e2f1207ae163ad7')
+md5sums=('b11f4fcad69df45365d2125181524559')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index 35a9ab373..48ec49afa 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,62 +1,50 @@
-# $Id: PKGBUILD 148930 2012-02-05 11:56:28Z ibiru $
+# $Id: PKGBUILD 159123 2012-05-16 10:08:44Z tpowa $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Hugo Ideler <hugoideler@dse.nl>
 
 pkgname=slim
-pkgver=1.3.2
-pkgrel=7
+pkgver=1.3.3
+pkgrel=3
 pkgdesc='Desktop-independent graphical login manager for X11'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://slim.berlios.de/'
 license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
+depends=('consolekit' 'pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
+makedepends=('cmake' 'freeglut')
 backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
 source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'rc.d'
         'pam.d'
         'logrotate'
+        'slim.service'
         'ptr_pam.patch'
-        'no-host.patch'
-        'restart.patch'
-        'sigterm.patch'
         'session-name.patch'
-        'tty-slowness.patch'
-        'slim-1.3.2-libpng15.patch')
-sha1sums=('e421d5487732c8317f8f591906661e014b036358'
-          '6fe0ba83509af634bce47be34e30995965bffc79'
-          'a0e991ef0ac5120465a3be014a26e70ba073b6ae'
-          'b969cc902c1d9915a5609141a652c77b2732407b'
-          '640668c984a13593a1bfba8d3b503c005d5f401e'
-          'b86eddd083fb9f6259e46c735f55ebe76c655bd3'
-          '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435'
-          '0b35048723c527fb824c5e0f9b9064f751871785'
-          'fdd35562ce010babaeb793f92f9906fdcdaf3f9f'
-          '213fefe8533c845ea8c40585b6a8097820d5e5d2'
-          '3cd674e548f4e0aadbbd32a67b4efd1ed263afef')
+        'fix-numlock-1.3.3.patch')
+
 
 install=install
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i -e 's/png12/png15/g' Makefile
+        cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM
-	patch -p1 -i ../no-host.patch # cf patch: do not set PAM host
-	patch -p1 -i ../restart.patch # cf patch: restart X server if killed
-	patch -p1 -i ../sigterm.patch # FS#23984: do not wait for input when SIGTERM'd
 	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
-	patch -p1 -i ../tty-slowness.patch # FS#18313: fix sluggish TTY after slim start
-	patch -p0 -i ../slim-1.3.2-libpng15.patch
-
-	make USE_PAM=1
+        patch -p1 -i ../fix-numlock-1.3.3.patch # FS#29818: fix numlock handling
+        cd ${srcdir}
+        mkdir build
+        cd build
+        cmake ../${pkgbase}-${pkgver} \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_SKIP_RPATH=ON \
+                -DCMAKE_INSTALL_PREFIX=/usr \
+                -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes
+	make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" MANDIR=/usr/share/man install
+        cd  ${srcdir}/build/
+	make DESTDIR="${pkgdir}" install
 
 	install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim
 	install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim
@@ -65,4 +53,14 @@ package() {
 	# Provide sane defaults
 	sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf
 	sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf
+        # install systemd files
+        install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service
 }
+md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8'
+         'd8ea9c4dee2811524b67f4f666311a1f'
+         'ebfff3417058619a1328284ae0e2f48e'
+         '43da096480bf72c3ccec8ad8400f34f0'
+         'aef560f5a765582b2a7fc1fac5b323a7'
+         'ae4b237d472ec5d373e30080aa0ff804'
+         'ebcb6829028615686de7b64ceeaaf8ed'
+         '6c29c93370e44ed310ff30132424b619')
diff --git a/extra/slim/fix-numlock-1.3.3.patch b/extra/slim/fix-numlock-1.3.3.patch
new file mode 100644
index 000000000..179fffcbf
--- /dev/null
+++ b/extra/slim/fix-numlock-1.3.3.patch
@@ -0,0 +1,46 @@
+--- trunk/app.cpp	2012/02/21 23:57:28	211
++++ trunk/app.cpp	2012/04/16 23:28:34	212
+@@ -332,6 +332,15 @@
+             Login();
+         }
+     }
++
++    // Set NumLock
++    string numlock = cfg->getOption("numlock");
++    if (numlock == "on") {
++        NumLock::setOn(Dpy);
++    } else if (numlock == "off") {
++        NumLock::setOff(Dpy);
++    }
++    
+     // Start looping
+     int panelclosed = 1;
+     Panel::ActionType Action;
+@@ -971,13 +980,6 @@
+         break;
+     }
+ 
+-    string numlock = cfg->getOption("numlock");
+-    if (numlock == "on") {
+-        NumLock::setOn(Dpy);
+-    } else if (numlock == "off") {
+-        NumLock::setOff(Dpy);
+-    }
+-    
+     delete args;
+ 
+     serverStarted = true;
+--- trunk/numlock.cpp	2012/02/21 23:57:28	211
++++ trunk/numlock.cpp	2012/04/16 23:28:34	212
+@@ -68,9 +68,9 @@
+         return;
+ 
+     if( flag == true )
+-        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
+-    else
+         XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, mask);
++    else
++        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
+ }
+ 
+ void NumLock::setOn(Display *dpy) {
diff --git a/extra/slim/pam.d b/extra/slim/pam.d
index 78a981f74..4a6b53d0f 100644
--- a/extra/slim/pam.d
+++ b/extra/slim/pam.d
@@ -7,4 +7,3 @@ password        required        pam_unix.so
 session         required        pam_limits.so
 session         required        pam_unix.so
 session         optional        pam_loginuid.so
-session         optional        pam_ck_connector.so
diff --git a/extra/slim/slim.service b/extra/slim/slim.service
new file mode 100644
index 000000000..26093a8bf
--- /dev/null
+++ b/extra/slim/slim.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SLiM Simple Login Manager
+Requires=dev-tty7.device
+After=dev-tty7.device systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/slim -nodaemon
+
+[Install]
+WantedBy=graphical.target
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index 2cb8208de..be35ca25c 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151914 2012-03-04 09:57:03Z andrea $
+# $Id: PKGBUILD 159138 2012-05-16 18:32:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=soprano
-pkgver=2.7.5
-pkgrel=1.1
+pkgver=2.7.6
+pkgrel=1
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://soprano.sourceforge.net/'
@@ -13,7 +13,7 @@ depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso')
 makedepends=('cmake' 'openjdk6' 'doxygen')
 [ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('9d881ce405354da4f7c2eeee386e2859')
+md5sums=('8eee947956134ea4aa2d1e94ddbd551e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index f8eb10608..544efc0a7 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 155832 2012-04-07 07:57:39Z andyrtr $
+# $Id: PKGBUILD 159008 2012-05-14 20:33:16Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl')
-_amalgamationver=3071100
+_amalgamationver=3071200
 _amalgamationver2=${_amalgamationver/00/}
 #pkgver=${_amalgamationver2//0/.}
-pkgver=3.7.11
-pkgrel=2
+pkgver=3.7.12
+pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with
 	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
 	license.txt)
 options=('!libtool' '!emptydirs')
-md5sums=('0552d71bda98ebdcaea305cd6058221b'
+md5sums=('28842cb51a699c0b554120bafe6418ff'
          'c1cdbc5544034d9012e421e75a5e4890')
 
 build() {
diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD
index 992b6bceb..fa8a2da1a 100644
--- a/extra/taglib/PKGBUILD
+++ b/extra/taglib/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 154265 2012-03-25 08:45:02Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 158844 2012-05-12 11:47:35Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=taglib
-pkgver=1.7.1
+pkgver=1.7.2
 pkgrel=1
 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +15,6 @@ makedepends=('cmake' 'pkg-config')
 options=('!libtool')
 source=("http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz"
         'ape-idev2.patch')
-sha1sums=('bafe0958eb884981cade83d45c18ee34165479b8'
-          '9bdae5c2da6bb4e1a2ea38a5a587773b850c3518')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
@@ -36,3 +35,5 @@ package() {
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
 }
+md5sums=('b0a9e797d3833fb933c7c3176de3d720'
+         'c7c165d99acf01456351ba39ff7056cb')
diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD
index 18ffc0fba..ff1c9339c 100644
--- a/extra/telepathy-qt/PKGBUILD
+++ b/extra/telepathy-qt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-qt
 pkgver=0.9.1
 pkgrel=1
 pkgdesc="A library for Qt-based Telepathy clients"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/"
 license=('LGPL')
 options=('!libtool')
diff --git a/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch b/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch
new file mode 100644
index 000000000..7f3b033bd
--- /dev/null
+++ b/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch
@@ -0,0 +1,29 @@
+From 797d2b3792a0d4c4260075c2b05a1aba63715363 Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru@archlinux.org>
+Date: Wed, 9 May 2012 17:34:10 +0000
+Subject: [PATCH] Check for gio to avoid linking issue
+
+/usr/bin/ld: note: 'g_inet_address_new_from_string' is defined in DSO
+/usr/lib/libgio-2.0.so.0 so try adding it to the linker command line
+
+Signed-off-by: Ionut Biru <ibiru@archlinux.org>
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2a6cb2a..461d464 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,7 +62,7 @@ dnl GTK docs
+ GTK_DOC_CHECK
+ 
+ dnl Check for Glib 
+-PKG_CHECK_MODULES(GLIB, gobject-2.0 >= 2.30, have_glib=yes, have_glib=no)
++PKG_CHECK_MODULES(GLIB, [gobject-2.0 >= 2.30, gio-2.0 >= 2.30], have_glib=yes, have_glib=no)
+ 
+ if test x$have_glib = xno ; then
+     AC_MSG_ERROR([GLib development libraries not found])
+-- 
+1.7.10.1
+
diff --git a/extra/telepathy-rakia/PKGBUILD b/extra/telepathy-rakia/PKGBUILD
index 4504a2256..12338fa1f 100644
--- a/extra/telepathy-rakia/PKGBUILD
+++ b/extra/telepathy-rakia/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 151254 2012-02-25 10:06:13Z ibiru $
+# $Id: PKGBUILD 158778 2012-05-09 17:40:49Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=telepathy-rakia
-pkgver=0.7.3
+pkgver=0.7.4
 pkgrel=1
 pkgdesc="SIP connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,16 +13,20 @@ makedepends=('libxslt' 'python2')
 install=telepathy-rakia.install
 groups=('telepathy')
 replaces=('telepathy-sofiasip')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('dea76f93fe6234d18c6c7746c9ce0d6e')
+source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
+        0001-Check-for-gio-to-avoid-linking-issue.patch)
+md5sums=('f9f47f18db033afe29fd6963c7748e37'
+         '6d0372c4c8a22bf9682e4b45ee614d5c')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
+  patch -Np1 -i $srcdir/0001-Check-for-gio-to-avoid-linking-issue.patch
+  autoreconf -fi
   ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD
index f97f95e57..7382964c3 100644
--- a/extra/tomboy/PKGBUILD
+++ b/extra/tomboy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156986 2012-04-23 09:10:39Z ibiru $
+# $Id: PKGBUILD 159073 2012-05-15 11:45:24Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=tomboy
-pkgver=1.10.1
+pkgver=1.10.2
 pkgrel=1
 pkgdesc="Desktop note-taking application for Linux and Unix"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs' '!makeflags')
 groups=('gnome-extra')
 install=tomboy.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('85bc277b278fe6aaa38fc0ec8b1777804ea0de647111a5065d43614d1ad10077')
+sha256sums=('b118ad9fbbd6134e00a56f0c251586464afbbd6b9e12265c7de979ed8ef78213')
 
 build() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD
index 7ea181bc6..48ca94a6f 100644
--- a/extra/totem-plparser/PKGBUILD
+++ b/extra/totem-plparser/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156990 2012-04-23 09:10:44Z ibiru $
+# $Id: PKGBUILD 159096 2012-05-15 14:38:49Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=totem-plparser
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 url="http://www.gnome.org"
 pkgdesc="Totem playlist parser library"
@@ -13,7 +13,7 @@ depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz)
-sha256sums=('00b5b6c7a7a3679a1e4b03146eab71cb387a71f5c0c8c16a7c24697b9f56a192')
+sha256sums=('7b336f599610898beca8238408c9c8e1f1f264602cefb2d1f5601acf9a261ecd')
 
 build() {
   cd totem-pl-parser-$pkgver
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index b1adc4e06..da36a746e 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 157429 2012-04-28 09:27:53Z allan $
+# $Id: PKGBUILD 159098 2012-05-15 15:11:50Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
-pkgver=3.4.1
-pkgrel=2
+pkgver=3.4.2
+pkgrel=1
 pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,7 @@ makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulru
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
         browser-plugins.ini)
-sha256sums=('eadf138068c2e31bf8fe31b3d63536cb0fe32f834fcf4fbfb453a3fff5eec7ef'
+sha256sums=('e1532b471a14612b5f44d29b8392716c1123f4d874cd9d01e06a11f32637341e'
             'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e')
 
 build() {
diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD
new file mode 100644
index 000000000..e9e78bdc0
--- /dev/null
+++ b/extra/ucommon/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 159166 2012-05-16 20:55:54Z andrea $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=ucommon
+pkgver=5.2.2
+pkgrel=2
+pkgdesc="A light-weight C++ library to facilitate using C++ design patterns"
+arch=('i686' 'x86_64')
+url="http://www.gnutelephony.org/index.php/GNU_uCommon_C++"
+license=('GPL3' 'LGPL3')
+depends=('openssl')
+options=('!libtool')
+source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('4739fcd9db006432f1b8e2ea226e414a'
+         'adb2349cffe80678e39a96c6ab5c5a5b')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 516e1a993..8a3fc5f79 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157798 2012-04-29 16:19:15Z tdziedzic $
+# $Id: PKGBUILD 158968 2012-05-13 20:52:23Z tdziedzic $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,20 +6,23 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=495
-__hgrev=a104dae7f903
+_patchlevel=515
+__hgrev=8201108e9cf0
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:vim')
 url="http://www.vim.org"
 makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
-source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz{,.sig}
-        pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
-        vimrc archlinux.vim gvim.desktop)
-sha1sums=('4181e211d0150cda9b3dbd815ec4aa14a6d28196'
-          '039f92d62556a7ccc48ef4ded3c5e02578470b05'
+source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
+        "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig"
+        'pythoncomplete.vim::http://www.vim.org/scripts/download_script.php?src_id=10872'
+        'vimrc'
+        'archlinux.vim'
+        'gvim.desktop')
+sha1sums=('10d7642d5062effdb51f53952622f9338003bbbf'
+          '0c1c584c1a2a2a279507f793cd5eff82863c625b'
           '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
           '3494baf53a63581ba69f86a81293640ff681c5c5'
           '25dd3c2ce436e73a367c8f73b68f7f6889682437'
@@ -48,7 +51,7 @@ mksource() {
   rm ${pkgname}-${pkgver}/{.hgignore,.hgtags}
   tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
   rm -r ${pkgname}-${pkgver}
-# gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
+  #gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
 }
 
 build() {
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index f4c46ae7f..e70a1d06e 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156998 2012-04-23 09:10:54Z ibiru $
+# $Id: PKGBUILD 159052 2012-05-15 11:08:33Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=vinagre
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh' 'itstool')
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5b79bbdafe57e1ceaeddfc1091a9f02aa6e3a54e55ffd2517be512d35e89654f')
+sha256sums=('31dfc98fef91cf692a90880377f8abf95dcf6a7d3512441655bc66b969f50d85')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index 931db3f1f..cf39b8d98 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157000 2012-04-23 09:10:56Z ibiru $
+# $Id: PKGBUILD 159053 2012-05-15 11:09:08Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ url="http://www.gnome.org"
 options=(!emptydirs)
 install=vino.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('85011594e9b5c4c5449c049e7c3563538c7a80dafecbb5891720b22290b83cb8')
+sha256sums=('b58f7f7e1ce207246dfe98ff777c665cbcbc52abab0cbafc0a1b4f5fc5b3e0c8')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD
index 4529ddacc..3f5b56b2c 100644
--- a/extra/vpnc/PKGBUILD
+++ b/extra/vpnc/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 154323 2012-03-26 10:17:14Z dreisner $
+# $Id: PKGBUILD 158810 2012-05-10 18:37:11Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=vpnc
 _vpncver=0.5.3
+_git=1b65c39e3cdebb89ce5c75f05d44a0519a67ede6
 pkgver=$_vpncver.svn516
-pkgrel=1
+pkgrel=2
 pkgdesc="VPN client for cisco3000 VPN Concentrators"
 url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
 license=('GPL')
@@ -13,9 +14,11 @@ depends=('libgcrypt' 'openssl' 'iproute2')
 optdepends=('openresolv: Let vpnc manage resolv.conf')
 arch=('i686' 'x86_64' 'mips64el')
 source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz"
+        "http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/$_git:/vpnc-script"
         'vpnc.conf')
 backup=('etc/vpnc/default.conf')
 md5sums=('2118c5ccc464250c0892be57dbfabdf7'
+         '6293c15ef6e7a3365ed7add5e336b806'
          'a3f4e0cc682f437e310a1c86ae198e45')
 
 mktarball() {
@@ -52,4 +55,5 @@ package() {
   make DESTDIR="$pkgdir" PREFIX=/usr install
 
   install -Dm644 "$srcdir"/vpnc.conf "$pkgdir"/etc/vpnc/default.conf
+  install -Dm755 "$srcdir"/vpnc-script "$pkgdir"/etc/vpnc/vpnc-script
 }
diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD
index 95801df8c..2eaa31f62 100644
--- a/extra/watchdog/PKGBUILD
+++ b/extra/watchdog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141081 2011-10-23 14:16:24Z thomas $
+# $Id: PKGBUILD 158941 2012-05-13 14:21:11Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=watchdog
-pkgver=5.9
-pkgrel=2
+pkgver=5.12
+pkgrel=1
 pkgdesc="Watchdog daemon"
 arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/watchdog"
@@ -15,16 +15,16 @@ backup=(etc/watchdog.conf
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         watchdog.sh
         watchdog.cf
-        watchdog-5.9-use-oom_score_adj.patch)
-md5sums=('d7cae3c9829f5d9a680764f314234867'
+        watchdog-5.12-fix-oom-in-wd_keepalive.patch)
+md5sums=('cea28bea70e54f3625062bc808aef9af'
          '854451f554718b55186599faaa8d85f6'
          '01c1e2e13f515131180b4ebe9b8b7cc3'
-         '9a1ab454e42a7f2969ef6bf2da8a4543')
+         'c90c2686975b5254f82b3de683f1f442')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
-  patch -p1 -i "${srcdir}"/watchdog-5.9-use-oom_score_adj.patch
+  patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch
   ./configure \
 	--prefix=/usr \
 	--mandir=/usr/share/man \
diff --git a/extra/watchdog/watchdog-5.12-fix-oom-in-wd_keepalive.patch b/extra/watchdog/watchdog-5.12-fix-oom-in-wd_keepalive.patch
new file mode 100644
index 000000000..dfc06b867
--- /dev/null
+++ b/extra/watchdog/watchdog-5.12-fix-oom-in-wd_keepalive.patch
@@ -0,0 +1,11 @@
+diff -Nur watchdog-5.12.orig/src/wd_keepalive.c watchdog-5.12/src/wd_keepalive.c
+--- watchdog-5.12.orig/src/wd_keepalive.c	2012-04-05 12:16:33.000000000 +0200
++++ watchdog-5.12/src/wd_keepalive.c	2012-05-13 16:15:36.786543263 +0200
+@@ -26,6 +26,7 @@
+ #include <sys/mman.h>
+ #include <sys/ioctl.h>
+ #include <sys/wait.h>
++#include <linux/oom.h>
+ #include <linux/watchdog.h>
+ #include <libgen.h>
+ #include <string.h>
diff --git a/extra/webrtc-audio-processing/PKGBUILD b/extra/webrtc-audio-processing/PKGBUILD
new file mode 100644
index 000000000..d091b96bc
--- /dev/null
+++ b/extra/webrtc-audio-processing/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 158825 2012-05-11 21:11:52Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=webrtc-audio-processing
+pkgver=0.1
+pkgrel=1
+_gitrev=9413986
+pkgdesc="AudioProcessing library based on Google's implementation of WebRTC"
+arch=(i686 x86_64)
+url="http://freedesktop.org/software/pulseaudio/webrtc-audio-processing"
+license=(custom)
+depends=(gcc-libs)
+options=(!libtool)
+source=("$url/$pkgname-$pkgver.tar.xz")
+sha256sums=('ed4b52f9c2688b97628035a5565377d74704d7c04de4254a768df3342c7afedc')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 PATENTS "$pkgdir/usr/share/licenses/$pkgname/PATENTS"
+}
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index 265a3e919..f905ded78 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 157345 2012-04-27 12:08:41Z andyrtr $
+# $Id: PKGBUILD 158878 2012-05-12 16:51:09Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-input-synaptics
-pkgver=1.5.99.904
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="Synaptics driver for notebook touchpads"
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,7 +22,7 @@ options=(!libtool)
 backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         10-synaptics.conf)
-sha1sums=('4853bd933fa41b83ff513262cdf6e5b89f22d64b'
+sha1sums=('963276a5dd240e84efff28d516f8d23cfeedaa13'
           '68e1f4ef5e1038231d210eb422fa4d18c5922f0f')
 
 build() {
diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index 970044037..88c4fc79a 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158636 2012-05-05 03:31:18Z allan $
+# $Id: PKGBUILD 158905 2012-05-12 20:58:34Z andyrtr $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: M Rawash <mrawash@gmail.com>
 
 pkgname=xf86-input-wacom
-pkgver=0.14.0
-pkgrel=2
+pkgver=0.15.0
+pkgrel=1
 pkgdesc="X.Org Wacom tablet driver"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linuxwacom.sourceforge.net/"
@@ -17,8 +17,8 @@ conflicts=('xorg-server<1.12.0')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         70-wacom.rules)
-md5sums=('23d19a2b50a86b848df17297c745144f'
-         '10db4f8272286690255c1bcc18bfdd92')
+sha1sums=('6e8e4fa2ccc2448cae97119c6f2842fe283f9b29'
+          '7cebb94459f9cf49693e65215f3af59cea5e2b73')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-apm/PKGBUILD b/extra/xf86-video-apm/PKGBUILD
index 3cf6acff0..2914e15fc 100644
--- a/extra/xf86-video-apm/PKGBUILD
+++ b/extra/xf86-video-apm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153319 2012-03-12 20:53:08Z andyrtr $
+# $Id: PKGBUILD 158880 2012-05-12 17:20:17Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-apm
-pkgver=1.2.3
-pkgrel=5
+pkgver=1.2.4
+pkgrel=1
 pkgdesc="X.org Alliance ProMotion video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -13,14 +13,11 @@ makedepends=('xorg-server-devel>=1.11.99.902')
 conflicts=('xorg-server<1.11.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        apm-1.2.3-git.patch)
-sha1sums=('1fa7180cf985a74132f8d5b39a0bf9df08713fac'
-          'ad9468519eb959bb879ba4e4993d6a83848d5c6f')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('d792ba6e8c39e60e00e0790b4e08f551044b2f7c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/apm-1.2.3-git.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch b/extra/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch
new file mode 100644
index 000000000..bcfbf94db
--- /dev/null
+++ b/extra/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch
@@ -0,0 +1,571 @@
+From 837149c63929d7d5a8ef6f8204d396f8e6d5acd7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net>
+Date: Fri, 13 Apr 2012 11:12:51 +0200
+Subject: [PATCH 1/4] Poor man's acceleration of solid pictures for R3xx-R7xx
+
+The patch below implements basic acceleration of solid pictures via
+scratch 1x1 pixmaps. It seems to at least alleviate some of the
+corruption and performance issues exposed by Cairo 1.12, and should also
+improve performance for other toolkits/apps using solid pictures.
+
+If there are no objections to this approach, maybe someone else can beat
+me to extending this for Evergreen+ and R1/2xx.
+---
+ src/r600_exa.c          |  160 ++++++++++++++++++++++++++--------------------
+ src/radeon_exa_render.c |  115 ++++++++++++++++++++--------------
+ src/radeon_exa_shared.c |   19 ++++++
+ src/radeon_exa_shared.h |    1 +
+ 4 files changed, 179 insertions(+), 116 deletions(-)
+
+diff --git a/src/r600_exa.c b/src/r600_exa.c
+index e1eb62f..c3ae553 100644
+--- a/src/r600_exa.c
++++ b/src/r600_exa.c
+@@ -901,17 +901,8 @@ static Bool R600CheckCompositeTexture(PicturePtr pPict,
+ 				      int op,
+ 				      int unit)
+ {
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+     unsigned int i;
+-    int max_tex_w, max_tex_h;
+-
+-    max_tex_w = 8192;
+-    max_tex_h = 8192;
+-
+-    if ((w > max_tex_w) || (h > max_tex_h))
+-	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
+ 
+     for (i = 0; i < sizeof(R600TexFormats) / sizeof(R600TexFormats[0]); i++) {
+ 	if (R600TexFormats[i].fmt == pPict->format)
+@@ -951,9 +942,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
+     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+     struct radeon_accel_state *accel_state = info->accel_state;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+-    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
++    unsigned int repeatType;
+     unsigned int i;
+     tex_resource_t  tex_res;
+     tex_sampler_t   tex_samp;
+@@ -969,9 +958,16 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
+     }
+ 
+     /* Texture */
++    if (pPict->pDrawable) {
++	tex_res.w               = pPict->pDrawable->width;
++	tex_res.h               = pPict->pDrawable->height;
++	repeatType              = pPict->repeat ? pPict->repeatType : RepeatNone;
++    } else {
++	tex_res.w               = 1;
++	tex_res.h               = 1;
++	repeatType              = RepeatNormal;
++    }
+     tex_res.id                  = unit;
+-    tex_res.w                   = w;
+-    tex_res.h                   = h;
+     tex_res.pitch               = accel_state->src_obj[unit].pitch;
+     tex_res.depth               = 0;
+     tex_res.dim                 = SQ_TEX_DIM_2D;
+@@ -1170,24 +1166,24 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
+ 	vs_alu_consts[0] = xFixedToFloat(pPict->transform->matrix[0][0]);
+ 	vs_alu_consts[1] = xFixedToFloat(pPict->transform->matrix[0][1]);
+ 	vs_alu_consts[2] = xFixedToFloat(pPict->transform->matrix[0][2]);
+-	vs_alu_consts[3] = 1.0 / w;
++	vs_alu_consts[3] = 1.0 / tex_res.w;
+ 
+ 	vs_alu_consts[4] = xFixedToFloat(pPict->transform->matrix[1][0]);
+ 	vs_alu_consts[5] = xFixedToFloat(pPict->transform->matrix[1][1]);
+ 	vs_alu_consts[6] = xFixedToFloat(pPict->transform->matrix[1][2]);
+-	vs_alu_consts[7] = 1.0 / h;
++	vs_alu_consts[7] = 1.0 / tex_res.h;
+     } else {
+ 	accel_state->is_transform[unit] = FALSE;
+ 
+ 	vs_alu_consts[0] = 1.0;
+ 	vs_alu_consts[1] = 0.0;
+ 	vs_alu_consts[2] = 0.0;
+-	vs_alu_consts[3] = 1.0 / w;
++	vs_alu_consts[3] = 1.0 / tex_res.w;
+ 
+ 	vs_alu_consts[4] = 0.0;
+ 	vs_alu_consts[5] = 1.0;
+ 	vs_alu_consts[6] = 0.0;
+-	vs_alu_consts[7] = 1.0 / h;
++	vs_alu_consts[7] = 1.0 / tex_res.h;
+     }
+ 
+     /* VS alu constants */
+@@ -1202,33 +1198,30 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+ {
+     uint32_t tmp1;
+     PixmapPtr pSrcPixmap, pDstPixmap;
+-    int max_tex_w, max_tex_h, max_dst_w, max_dst_h;
+ 
+     /* Check for unsupported compositing operations. */
+     if (op >= (int) (sizeof(R600BlendOp) / sizeof(R600BlendOp[0])))
+ 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
+ 
+-    if (!pSrcPicture->pDrawable)
+-	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
++    if (pSrcPicture->pDrawable) {
++	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
+ 
+-    max_tex_w = 8192;
+-    max_tex_h = 8192;
+-    max_dst_w = 8192;
+-    max_dst_h = 8192;
++	if (pSrcPixmap->drawable.width >= 8192 ||
++	    pSrcPixmap->drawable.height >= 8192) {
++	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
++			     pSrcPixmap->drawable.width,
++			     pSrcPixmap->drawable.height));
++	}
+ 
+-    if (pSrcPixmap->drawable.width >= max_tex_w ||
+-	pSrcPixmap->drawable.height >= max_tex_h) {
+-	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
+-			 pSrcPixmap->drawable.width,
+-			 pSrcPixmap->drawable.height));
+-    }
++	if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
++	    return FALSE;
++    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+ 
+     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
+ 
+-    if (pDstPixmap->drawable.width >= max_dst_w ||
+-	pDstPixmap->drawable.height >= max_dst_h) {
++    if (pDstPixmap->drawable.width >= 8192 ||
++	pDstPixmap->drawable.height >= 8192) {
+ 	RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n",
+ 			 pDstPixmap->drawable.width,
+ 			 pDstPixmap->drawable.height));
+@@ -1237,38 +1230,35 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+     if (pMaskPicture) {
+ 	PixmapPtr pMaskPixmap;
+ 
+-	if (!pMaskPicture->pDrawable)
+-	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
++	if (pMaskPicture->pDrawable) {
++	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+ 
+-	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+-
+-	if (pMaskPixmap->drawable.width >= max_tex_w ||
+-	    pMaskPixmap->drawable.height >= max_tex_h) {
+-	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
+-			     pMaskPixmap->drawable.width,
+-			     pMaskPixmap->drawable.height));
+-	}
++	    if (pMaskPixmap->drawable.width >= 8192 ||
++		pMaskPixmap->drawable.height >= 8192) {
++	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
++			       pMaskPixmap->drawable.width,
++			       pMaskPixmap->drawable.height));
++	    }
+ 
+-	if (pMaskPicture->componentAlpha) {
+-	    /* Check if it's component alpha that relies on a source alpha and
+-	     * on the source value.  We can only get one of those into the
+-	     * single source value that we get to blend with.
+-	     */
+-	    if (R600BlendOp[op].src_alpha &&
+-		(R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
+-		(BLEND_ZERO << COLOR_SRCBLEND_shift)) {
+-		RADEON_FALLBACK(("Component alpha not supported with source "
+-				 "alpha and source value blending.\n"));
++	    if (pMaskPicture->componentAlpha) {
++		/* Check if it's component alpha that relies on a source alpha and
++		 * on the source value.  We can only get one of those into the
++		 * single source value that we get to blend with.
++		 */
++		if (R600BlendOp[op].src_alpha &&
++		    (R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
++		    (BLEND_ZERO << COLOR_SRCBLEND_shift)) {
++		    RADEON_FALLBACK(("Component alpha not supported with source "
++				     "alpha and source value blending.\n"));
++		}
+ 	    }
+-	}
+ 
+-	if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
+-	    return FALSE;
++	    if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
++		return FALSE;
++	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+     }
+ 
+-    if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
+-	return FALSE;
+-
+     if (!R600GetDestFormat(pDstPicture, &tmp1))
+ 	return FALSE;
+ 
+@@ -1280,7 +1270,8 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
+ 				 PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ 				 PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+     struct radeon_accel_state *accel_state = info->accel_state;
+     uint32_t dst_format;
+@@ -1288,15 +1279,21 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
+     shader_config_t vs_conf, ps_conf;
+     struct r600_accel_object src_obj, mask_obj, dst_obj;
+ 
+-    if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8)
++    if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8))
+ 	return FALSE;
+ 
++    if (!pSrc) {
++	pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color);
++	if (!pSrc)
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++    }
++
+ #if defined(XF86DRM_MODE)
+     if (info->cs) {
+ 	src_obj.offset = 0;
+ 	dst_obj.offset = 0;
+-	src_obj.bo = radeon_get_pixmap_bo(pSrc);
+ 	dst_obj.bo = radeon_get_pixmap_bo(pDst);
++	src_obj.bo = radeon_get_pixmap_bo(pSrc);
+ 	dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst);
+ 	src_obj.tiling_flags = radeon_get_pixmap_tiling(pSrc);
+ 	dst_obj.surface = radeon_get_pixmap_surface(pDst);
+@@ -1322,7 +1319,16 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
+     dst_obj.bpp = pDst->drawable.bitsPerPixel;
+     dst_obj.domain = RADEON_GEM_DOMAIN_VRAM;
+ 
+-    if (pMask) {
++    if (pMaskPicture) {
++	if (!pMask) {
++	    pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color);
++	    if (!pMask) {
++		if (!pSrcPicture->pDrawable)
++		    pScreen->DestroyPixmap(pSrc);
++		RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++	    }
++	}
++
+ #if defined(XF86DRM_MODE)
+ 	if (info->cs) {
+ 	    mask_obj.offset = 0;
+@@ -1509,11 +1515,9 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
+     return TRUE;
+ }
+ 
+-static void R600DoneComposite(PixmapPtr pDst)
++static void R600FinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst,
++				struct radeon_accel_state *accel_state)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+-    RADEONInfoPtr info = RADEONPTR(pScrn);
+-    struct radeon_accel_state *accel_state = info->accel_state;
+     int vtx_size;
+ 
+     if (accel_state->vsync)
+@@ -1527,6 +1531,22 @@ static void R600DoneComposite(PixmapPtr pDst)
+     r600_finish_op(pScrn, vtx_size);
+ }
+ 
++static void R600DoneComposite(PixmapPtr pDst)
++{
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++    RADEONInfoPtr info = RADEONPTR(pScrn);
++    struct radeon_accel_state *accel_state = info->accel_state;
++
++    R600FinishComposite(pScrn, pDst, accel_state);
++
++    if (!accel_state->src_pic->pDrawable)
++	pScreen->DestroyPixmap(accel_state->src_pix);
++
++    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
++	pScreen->DestroyPixmap(accel_state->msk_pix);
++}
++
+ static void R600Composite(PixmapPtr pDst,
+ 			  int srcX, int srcY,
+ 			  int maskX, int maskY,
+@@ -1543,7 +1563,7 @@ static void R600Composite(PixmapPtr pDst,
+ 
+ #ifdef XF86DRM_MODE
+     if (info->cs && CS_FULL(info->cs)) {
+-	R600DoneComposite(info->accel_state->dst_pix);
++	R600FinishComposite(pScrn, pDst, info->accel_state);
+ 	radeon_cs_flush_indirect(pScrn);
+ 	R600PrepareComposite(info->accel_state->composite_op,
+ 			     info->accel_state->src_pic,
+diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
+index e5c231f..b6cc9e4 100644
+--- a/src/radeon_exa_render.c
++++ b/src/radeon_exa_render.c
+@@ -299,8 +299,8 @@ static Bool RADEONSetupSourceTile(PicturePtr pPict,
+     if (repeatType == RepeatNormal || repeatType == RepeatReflect) {
+ 	Bool badPitch = needMatchingPitch && !RADEONPitchMatches(pPix);
+ 	
+-	int w = pPict->pDrawable->width;
+-	int h = pPict->pDrawable->height;
++	int w = pPict->pDrawable ? pPict->pDrawable->width : 1;
++	int h = pPict->pDrawable ? pPict->pDrawable->height : 1;
+ 	
+ 	if (pPict->transform) {
+ 	    if (badPitch)
+@@ -1112,23 +1112,8 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
+     ScreenPtr pScreen = pDstPict->pDrawable->pScreen;
+     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+-
+     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+     int i;
+-    int max_tex_w, max_tex_h;
+-
+-    if (is_r500) {
+-	max_tex_w = 4096;
+-	max_tex_h = 4096;
+-    } else {
+-	max_tex_w = 2048;
+-	max_tex_h = 2048;
+-    }
+-
+-    if ((w > max_tex_w) || (h > max_tex_h))
+-	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
+ 
+     for (i = 0; i < sizeof(R300TexFormats) / sizeof(R300TexFormats[0]); i++)
+     {
+@@ -1139,7 +1124,7 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
+ 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
+ 			 (int)pPict->format));
+ 
+-    if (!RADEONCheckTexturePOT(pPict, unit == 0)) {
++    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) {
+ 	if (info->cs) {
+     		struct radeon_exa_pixmap_priv *driver_priv;
+ 		PixmapPtr pPix;
+@@ -1181,15 +1166,23 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
+ {
+     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
+     uint32_t txfilter, txformat0, txformat1, txoffset, txpitch, us_format = 0;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
++    int w, h;
+     int i, pixel_shift, out_size = 6;
+-    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
++    unsigned int repeatType;
+     struct radeon_exa_pixmap_priv *driver_priv;
+     ACCEL_PREAMBLE();
+ 
+     TRACE;
+ 
++    if (pPict->pDrawable) {
++	w = pPict->pDrawable->width;
++	h = pPict->pDrawable->height;
++	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
++    } else {
++	w = h = 1;
++	repeatType = RepeatNormal;
++    }
++
+     txpitch = exaGetPixmapPitch(pPix);
+     txoffset = 0;
+ 
+@@ -1394,11 +1387,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
+ 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
+ 
+-    if (!pSrcPicture->pDrawable)
+-	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
+-
+     if (IS_R500_3D) {
+ 	max_tex_w = 4096;
+ 	max_tex_h = 4096;
+@@ -1416,13 +1404,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+ 	}
+     }
+ 
+-    if (pSrcPixmap->drawable.width > max_tex_w ||
+-	pSrcPixmap->drawable.height > max_tex_h) {
+-	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
+-			 pSrcPixmap->drawable.width,
+-			 pSrcPixmap->drawable.height));
+-    }
+-
+     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
+ 
+     if (pDstPixmap->drawable.width > max_dst_w ||
+@@ -1432,20 +1413,32 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+ 			 pDstPixmap->drawable.height));
+     }
+ 
++    if (pSrcPicture->pDrawable) {
++	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
++
++	if (pSrcPixmap->drawable.width > max_tex_w ||
++	    pSrcPixmap->drawable.height > max_tex_h) {
++	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
++			     pSrcPixmap->drawable.width,
++			     pSrcPixmap->drawable.height));
++	}
++    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
++
+     if (pMaskPicture) {
+ 	PixmapPtr pMaskPixmap;
+ 
+-	if (!pMaskPicture->pDrawable)
+-	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
++	if (pMaskPicture->pDrawable) {
++	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+ 
+-	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+-
+-	if (pMaskPixmap->drawable.width > max_tex_w ||
+-	    pMaskPixmap->drawable.height > max_tex_h) {
+-	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
+-			     pMaskPixmap->drawable.width,
+-			     pMaskPixmap->drawable.height));
+-	}
++	    if (pMaskPixmap->drawable.width > max_tex_w ||
++		pMaskPixmap->drawable.height > max_tex_h) {
++	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
++			       pMaskPixmap->drawable.width,
++			       pMaskPixmap->drawable.height));
++	    }
++	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+ 
+ 	if (pMaskPicture->componentAlpha) {
+ 	    /* Check if it's component alpha that relies on a source alpha and
+@@ -1479,7 +1472,8 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
+ 				PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ 				PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+-    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    RINFO_FROM_SCREEN(pScreen);
+     uint32_t dst_format, dst_pitch;
+     uint32_t txenable, colorpitch;
+     uint32_t blendcntl, output_fmt;
+@@ -1508,9 +1502,24 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
+     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
+ 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
+ 
++    if (!pSrc) {
++	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
++	if (!pSrc)
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++    }
++
+     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, TRUE, FALSE))
+ 	return FALSE;
+ 
++    if (pMaskPicture && !pMask) {
++	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
++	if (!pMask) {
++	    if (!pSrcPicture->pDrawable)
++		pScreen->DestroyPixmap(pSrc);
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++	}
++    }
++
+     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
+ 			     pSrc, pMask, pDst);
+ 
+@@ -2132,7 +2141,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
+     return TRUE;
+ }
+ 
+-static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
++static void FUNC_NAME(RadeonFinishComposite)(PixmapPtr pDst)
+ {
+     RINFO_FROM_SCREEN(pDst->drawable.pScreen);
+     ACCEL_PREAMBLE();
+@@ -2179,6 +2188,20 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
+     LEAVE_DRAW(0);
+ }
+ 
++static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
++{
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    RINFO_FROM_SCREEN(pScreen);
++    struct radeon_accel_state *accel_state = info->accel_state;
++
++    FUNC_NAME(RadeonFinishComposite)(pDst);
++
++    if (!accel_state->src_pic->pDrawable)
++	pScreen->DestroyPixmap(accel_state->src_pix);
++
++    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
++	pScreen->DestroyPixmap(accel_state->msk_pix);
++}
+ 
+ #ifdef ACCEL_CP
+ 
+@@ -2257,7 +2280,7 @@ static void FUNC_NAME(RadeonCompositeTile)(ScrnInfoPtr pScrn,
+     if ((info->cs && CS_FULL(info->cs)) ||
+ 	(!info->cs && (info->cp->indirectBuffer->used + 4 * 32) >
+ 	 info->cp->indirectBuffer->total)) {
+-	FUNC_NAME(RadeonDoneComposite)(info->accel_state->dst_pix);
++	FUNC_NAME(RadeonFinishComposite)(info->accel_state->dst_pix);
+ 	if (info->cs)
+ 	    radeon_cs_flush_indirect(pScrn);
+ 	else
+diff --git a/src/radeon_exa_shared.c b/src/radeon_exa_shared.c
+index be1d2fa..28dc335 100644
+--- a/src/radeon_exa_shared.c
++++ b/src/radeon_exa_shared.c
+@@ -126,6 +126,25 @@ Bool RADEONCheckBPP(int bpp)
+ 	return FALSE;
+ }
+ 
++PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid)
++{
++    PixmapPtr pPix = pScreen->CreatePixmap(pScreen, 1, 1, 32, 0);
++    struct radeon_bo *bo;
++
++    exaMoveInPixmap(pPix);
++    bo = radeon_get_pixmap_bo(pPix);
++
++    if (radeon_bo_map(bo, 1)) {
++	pScreen->DestroyPixmap(pPix);
++	return NULL;
++    }
++
++    memcpy(bo->ptr, &solid, 4);
++    radeon_bo_unmap(bo);
++
++    return pPix;
++}
++
+ static Bool radeon_vb_get(ScrnInfoPtr pScrn)
+ {
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+diff --git a/src/radeon_exa_shared.h b/src/radeon_exa_shared.h
+index 7b8b5ca..60a1045 100644
+--- a/src/radeon_exa_shared.h
++++ b/src/radeon_exa_shared.h
+@@ -40,6 +40,7 @@ extern void RADEONVlineHelperClear(ScrnInfoPtr pScrn);
+ extern void RADEONVlineHelperSet(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2);
+ extern Bool RADEONValidPM(uint32_t pm, int bpp);
+ extern Bool RADEONCheckBPP(int bpp);
++extern PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid);
+ 
+ #define RADEON_TRACE_FALL 0
+ #define RADEON_TRACE_DRAW 0
+-- 
+1.7.7.5
+
diff --git a/extra/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch b/extra/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch
new file mode 100644
index 000000000..e6b5433e1
--- /dev/null
+++ b/extra/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch
@@ -0,0 +1,290 @@
+From 761ef4b340e689490a76ec5ce520c858335e2106 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Sat, 14 Apr 2012 08:53:39 -0400
+Subject: [PATCH] poor man's solid picture support for evergreen
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ src/evergreen_exa.c |  163 ++++++++++++++++++++++++++++++---------------------
+ 1 files changed, 95 insertions(+), 68 deletions(-)
+
+diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
+index cee3ec2..61b47a4 100644
+--- a/src/evergreen_exa.c
++++ b/src/evergreen_exa.c
+@@ -748,17 +748,8 @@ static Bool EVERGREENCheckCompositeTexture(PicturePtr pPict,
+ 					   int op,
+ 					   int unit)
+ {
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+     unsigned int i;
+-    int max_tex_w, max_tex_h;
+-
+-    max_tex_w = 16384;
+-    max_tex_h = 16384;
+-
+-    if ((w > max_tex_w) || (h > max_tex_h))
+-	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
+ 
+     for (i = 0; i < sizeof(EVERGREENTexFormats) / sizeof(EVERGREENTexFormats[0]); i++) {
+ 	if (EVERGREENTexFormats[i].fmt == pPict->format)
+@@ -798,9 +789,16 @@ static void EVERGREENXFormSetup(PicturePtr pPict, PixmapPtr pPix,
+     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+     struct radeon_accel_state *accel_state = info->accel_state;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+     int const_offset = unit * 8;
++    int w, h;
++
++    if (pPict->pDrawable) {
++	w = pPict->pDrawable->width;
++	h = pPict->pDrawable->height;
++    } else {
++	w = 1;
++	h = 1;
++    }
+ 
+     if (pPict->transform != 0) {
+ 	accel_state->is_transform[unit] = TRUE;
+@@ -837,9 +835,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
+     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+     struct radeon_accel_state *accel_state = info->accel_state;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+-    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
++    unsigned int repeatType;
+     unsigned int i;
+     tex_resource_t  tex_res;
+     tex_sampler_t   tex_samp;
+@@ -854,9 +850,17 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
+     }
+ 
+     /* Texture */
++    if (pPict->pDrawable) {
++	tex_res.w               = pPict->pDrawable->width;
++	tex_res.h               = pPict->pDrawable->height;
++	repeatType              = pPict->repeat ? pPict->repeatType : RepeatNone;
++    } else {
++	tex_res.w               = 1;
++	tex_res.h               = 1;
++	repeatType              = RepeatNormal;
++    }
++
+     tex_res.id                  = unit;
+-    tex_res.w                   = w;
+-    tex_res.h                   = h;
+     tex_res.pitch               = accel_state->src_obj[unit].pitch;
+     tex_res.depth               = 0;
+     tex_res.dim                 = SQ_TEX_DIM_2D;
+@@ -1054,33 +1058,30 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture,
+ {
+     uint32_t tmp1;
+     PixmapPtr pSrcPixmap, pDstPixmap;
+-    int max_tex_w, max_tex_h, max_dst_w, max_dst_h;
+ 
+     /* Check for unsupported compositing operations. */
+     if (op >= (int) (sizeof(EVERGREENBlendOp) / sizeof(EVERGREENBlendOp[0])))
+ 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
+ 
+-    if (!pSrcPicture->pDrawable)
+-	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
++    if (pSrcPicture->pDrawable) {
++	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
+ 
+-    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
+-
+-    max_tex_w = 8192;
+-    max_tex_h = 8192;
+-    max_dst_w = 8192;
+-    max_dst_h = 8192;
++	if (pSrcPixmap->drawable.width >= 16384 ||
++	    pSrcPixmap->drawable.height >= 16384) {
++	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
++			     pSrcPixmap->drawable.width,
++			     pSrcPixmap->drawable.height));
++	}
+ 
+-    if (pSrcPixmap->drawable.width >= max_tex_w ||
+-	pSrcPixmap->drawable.height >= max_tex_h) {
+-	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
+-			 pSrcPixmap->drawable.width,
+-			 pSrcPixmap->drawable.height));
+-    }
++	if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
++	    return FALSE;
++    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+ 
+     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
+ 
+-    if (pDstPixmap->drawable.width >= max_dst_w ||
+-	pDstPixmap->drawable.height >= max_dst_h) {
++    if (pDstPixmap->drawable.width >= 16384 ||
++	pDstPixmap->drawable.height >= 16384) {
+ 	RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n",
+ 			 pDstPixmap->drawable.width,
+ 			 pDstPixmap->drawable.height));
+@@ -1089,38 +1090,35 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture,
+     if (pMaskPicture) {
+ 	PixmapPtr pMaskPixmap;
+ 
+-	if (!pMaskPicture->pDrawable)
+-	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
++	if (pMaskPicture->pDrawable) {
++	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+ 
+-	if (pMaskPixmap->drawable.width >= max_tex_w ||
+-	    pMaskPixmap->drawable.height >= max_tex_h) {
+-	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
+-			     pMaskPixmap->drawable.width,
+-			     pMaskPixmap->drawable.height));
+-	}
++	    if (pMaskPixmap->drawable.width >= 16384 ||
++		pMaskPixmap->drawable.height >= 16384) {
++	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
++			       pMaskPixmap->drawable.width,
++			       pMaskPixmap->drawable.height));
++	    }
+ 
+-	if (pMaskPicture->componentAlpha) {
+-	    /* Check if it's component alpha that relies on a source alpha and
+-	     * on the source value.  We can only get one of those into the
+-	     * single source value that we get to blend with.
+-	     */
+-	    if (EVERGREENBlendOp[op].src_alpha &&
+-		(EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
+-		(BLEND_ZERO << COLOR_SRCBLEND_shift)) {
+-		RADEON_FALLBACK(("Component alpha not supported with source "
+-				 "alpha and source value blending.\n"));
++	    if (pMaskPicture->componentAlpha) {
++		/* Check if it's component alpha that relies on a source alpha and
++		 * on the source value.  We can only get one of those into the
++		 * single source value that we get to blend with.
++		 */
++		if (EVERGREENBlendOp[op].src_alpha &&
++		    (EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
++		    (BLEND_ZERO << COLOR_SRCBLEND_shift)) {
++		    RADEON_FALLBACK(("Component alpha not supported with source "
++				     "alpha and source value blending.\n"));
++		}
+ 	    }
+-	}
+ 
+-	if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
+-	    return FALSE;
++	    if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
++		return FALSE;
++	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+     }
+ 
+-    if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
+-	return FALSE;
+-
+     if (!EVERGREENGetDestFormat(pDstPicture, &tmp1))
+ 	return FALSE;
+ 
+@@ -1132,7 +1130,8 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
+ 				      PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ 				      PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+     struct radeon_accel_state *accel_state = info->accel_state;
+     uint32_t dst_format;
+@@ -1142,13 +1141,19 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
+     struct r600_accel_object src_obj, mask_obj, dst_obj;
+     float *cbuf;
+ 
+-    if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8)
++    if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8))
+ 	return FALSE;
+ 
++    if (!pSrc) {
++	pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color);
++	if (!pSrc)
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++    }
++
+     src_obj.offset = 0;
+     dst_obj.offset = 0;
+-    src_obj.bo = radeon_get_pixmap_bo(pSrc);
+     dst_obj.bo = radeon_get_pixmap_bo(pDst);
++    src_obj.bo = radeon_get_pixmap_bo(pSrc);
+     dst_obj.surface = radeon_get_pixmap_surface(pDst);
+     src_obj.surface = radeon_get_pixmap_surface(pSrc);
+     dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst);
+@@ -1166,7 +1171,15 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
+     dst_obj.bpp = pDst->drawable.bitsPerPixel;
+     dst_obj.domain = RADEON_GEM_DOMAIN_VRAM;
+ 
+-    if (pMask) {
++    if (pMaskPicture) {
++	if (!pMask) {
++	    pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color);
++	    if (!pMask) {
++		if (!pSrcPicture->pDrawable)
++		    pScreen->DestroyPixmap(pSrc);
++		RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++	    }
++	}
+ 	mask_obj.offset = 0;
+ 	mask_obj.bo = radeon_get_pixmap_bo(pMask);
+ 	mask_obj.tiling_flags = radeon_get_pixmap_tiling(pMask);
+@@ -1363,11 +1376,9 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
+     return TRUE;
+ }
+ 
+-static void EVERGREENDoneComposite(PixmapPtr pDst)
++static void EVERGREENFinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst,
++				     struct radeon_accel_state *accel_state)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+-    RADEONInfoPtr info = RADEONPTR(pScrn);
+-    struct radeon_accel_state *accel_state = info->accel_state;
+     int vtx_size;
+ 
+     if (accel_state->vsync)
+@@ -1381,6 +1392,22 @@ static void EVERGREENDoneComposite(PixmapPtr pDst)
+     evergreen_finish_op(pScrn, vtx_size);
+ }
+ 
++static void EVERGREENDoneComposite(PixmapPtr pDst)
++{
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++    RADEONInfoPtr info = RADEONPTR(pScrn);
++    struct radeon_accel_state *accel_state = info->accel_state;
++
++    EVERGREENFinishComposite(pScrn, pDst, accel_state);
++
++    if (!accel_state->src_pic->pDrawable)
++	pScreen->DestroyPixmap(accel_state->src_pix);
++
++    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
++	pScreen->DestroyPixmap(accel_state->msk_pix);
++}
++
+ static void EVERGREENComposite(PixmapPtr pDst,
+ 			       int srcX, int srcY,
+ 			       int maskX, int maskY,
+@@ -1393,7 +1420,7 @@ static void EVERGREENComposite(PixmapPtr pDst,
+     float *vb;
+ 
+     if (CS_FULL(info->cs)) {
+-	EVERGREENDoneComposite(info->accel_state->dst_pix);
++	EVERGREENFinishComposite(pScrn, pDst, info->accel_state);
+ 	radeon_cs_flush_indirect(pScrn);
+ 	EVERGREENPrepareComposite(info->accel_state->composite_op,
+ 				  info->accel_state->src_pic,
+-- 
+1.7.7.5
+
diff --git a/extra/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch b/extra/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch
new file mode 100644
index 000000000..3a2779446
--- /dev/null
+++ b/extra/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch
@@ -0,0 +1,182 @@
+From f36b911ecc31f689ddceeeb11d10eb7cb4a3428d Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Fri, 13 Apr 2012 13:24:46 -0400
+Subject: [PATCH 2/3] poor man's solid picture support for r100
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ src/radeon_exa_render.c |  101 +++++++++++++++++++++++++++--------------------
+ 1 files changed, 58 insertions(+), 43 deletions(-)
+
+diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
+index b6cc9e4..451a625 100644
+--- a/src/radeon_exa_render.c
++++ b/src/radeon_exa_render.c
+@@ -338,17 +338,8 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict,
+ 				      int unit)
+ {
+     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+     int i;
+ 
+-    /* r100 limit should be 2048, there are issues with 2048
+-     * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
+-     */
+-
+-    if ((w > 2047) || (h > 2047))
+-	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
+-
+     for (i = 0; i < sizeof(R100TexFormats) / sizeof(R100TexFormats[0]); i++) {
+ 	if (R100TexFormats[i].fmt == pPict->format)
+ 	    break;
+@@ -357,7 +348,7 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict,
+ 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
+ 			(int)pPict->format));
+ 
+-    if (!RADEONCheckTexturePOT(pPict, unit == 0))
++    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0))
+ 	return FALSE;
+ 
+     if (pPict->filter != PictFilterNearest &&
+@@ -392,15 +383,24 @@ static Bool FUNC_NAME(R100TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
+ {
+     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
+     uint32_t txfilter, txformat, txoffset, txpitch;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+-    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+-    Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
+-	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
+-    int i;
++    unsigned int repeatType;
++    Bool repeat;
++    int i, w, h;
+     struct radeon_exa_pixmap_priv *driver_priv;
+     ACCEL_PREAMBLE();
+ 
++    if (pPict->pDrawable) {
++	w = pPict->pDrawable->width;
++	h = pPict->pDrawable->height;
++	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
++    } else {
++	w = h = 1;
++	repeatType = RepeatNormal;
++    }
++
++    repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
++	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
++
+     txpitch = exaGetPixmapPitch(pPix);
+     txoffset = 0;
+ 
+@@ -510,22 +510,6 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture,
+     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
+ 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
+ 
+-    if (!pSrcPicture->pDrawable)
+-	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-    /* r100 limit should be 2048, there are issues with 2048
+-     * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
+-     */
+-
+-    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
+-
+-    if (pSrcPixmap->drawable.width > 2047 ||
+-	pSrcPixmap->drawable.height > 2047) {
+-	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
+-			 pSrcPixmap->drawable.width,
+-			 pSrcPixmap->drawable.height));
+-    }
+-
+     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
+ 
+     if (pDstPixmap->drawable.width > 2047 ||
+@@ -535,20 +519,35 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture,
+ 			 pDstPixmap->drawable.height));
+     }
+ 
++    if (pSrcPicture->pDrawable) {
++	/* r100 limit should be 2048, there are issues with 2048
++	 * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
++	 */
++	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
++
++	if (pSrcPixmap->drawable.width > 2047 ||
++	    pSrcPixmap->drawable.height > 2047) {
++	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
++			     pSrcPixmap->drawable.width,
++			     pSrcPixmap->drawable.height));
++	}
++    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
++
+     if (pMaskPicture) {
+ 	PixmapPtr pMaskPixmap;
+ 
+-	if (!pMaskPicture->pDrawable)
+-	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
++	if (pMaskPicture->pDrawable) {
++	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+ 
+-	if (pMaskPixmap->drawable.width > 2047 ||
+-	    pMaskPixmap->drawable.height > 2047) {
+-	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
+-			     pMaskPixmap->drawable.width,
+-			     pMaskPixmap->drawable.height));
+-	}
++	    if (pMaskPixmap->drawable.width > 2047 ||
++		pMaskPixmap->drawable.height > 2047) {
++		RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
++				 pMaskPixmap->drawable.width,
++				 pMaskPixmap->drawable.height));
++	    }
++	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+ 
+ 	if (pMaskPicture->componentAlpha) {
+ 	    /* Check if it's component alpha that relies on a source alpha and
+@@ -624,7 +623,8 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op,
+ 					    PixmapPtr pMask,
+ 					    PixmapPtr pDst)
+ {
+-    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    RINFO_FROM_SCREEN(pScreen);
+     uint32_t dst_format, dst_pitch, colorpitch;
+     uint32_t pp_cntl, blendcntl, cblend, ablend;
+     int pixel_shift;
+@@ -648,12 +648,27 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op,
+ 
+     CHECK_OFFSET(pDst, 0x0f, "destination");
+ 
++    if (!pSrc) {
++	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
++	if (!pSrc)
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++    }
++
+     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
+ 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
+ 
+     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE))
+ 	return FALSE;
+ 
++    if (pMaskPicture && !pMask) {
++	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
++	if (!pMask) {
++	    if (!pSrcPicture->pDrawable)
++		pScreen->DestroyPixmap(pSrc);
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++	}
++    }
++
+     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
+ 			     pSrc, pMask, pDst);
+ 
+-- 
+1.7.7.5
+
diff --git a/extra/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch b/extra/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch
new file mode 100644
index 000000000..0a448fc93
--- /dev/null
+++ b/extra/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch
@@ -0,0 +1,179 @@
+From c5c8310858f8018a1754f2457d7b102dc7d62b23 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Fri, 13 Apr 2012 13:28:10 -0400
+Subject: [PATCH 3/3] poor man's solid picture support for r200
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ src/radeon_exa_render.c |  101 +++++++++++++++++++++++++++--------------------
+ 1 files changed, 58 insertions(+), 43 deletions(-)
+
+diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
+index 451a625..7f1a3ff 100644
+--- a/src/radeon_exa_render.c
++++ b/src/radeon_exa_render.c
+@@ -756,17 +756,8 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict,
+ 				      int unit)
+ {
+     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+     int i;
+ 
+-    /* r200 limit should be 2048, there are issues with 2048
+-     * see bug 19269
+-     */
+-
+-    if ((w > 2047) || (h > 2047))
+-	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
+-
+     for (i = 0; i < sizeof(R200TexFormats) / sizeof(R200TexFormats[0]); i++)
+     {
+ 	if (R200TexFormats[i].fmt == pPict->format)
+@@ -776,7 +767,7 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict,
+ 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
+ 			 (int)pPict->format));
+ 
+-    if (!RADEONCheckTexturePOT(pPict, unit == 0))
++    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0))
+ 	return FALSE;
+ 
+     if (pPict->filter != PictFilterNearest &&
+@@ -809,15 +800,24 @@ static Bool FUNC_NAME(R200TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
+ {
+     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
+     uint32_t txfilter, txformat, txoffset, txpitch;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+-    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+-    Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
+-	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
+-    int i;
++    unsigned int repeatType;
++    Bool repeat;
++    int i, w, h;
+     struct radeon_exa_pixmap_priv *driver_priv;
+     ACCEL_PREAMBLE();
+ 
++    if (pPict->pDrawable) {
++	w = pPict->pDrawable->width;
++	h = pPict->pDrawable->height;
++	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
++    } else {
++	w = h = 1;
++	repeatType = RepeatNormal;
++    }
++
++    repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
++	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
++
+     txpitch = exaGetPixmapPitch(pPix);
+ 
+     txoffset = 0;
+@@ -926,22 +926,6 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
+ 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
+ 
+-    if (!pSrcPicture->pDrawable)
+-	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-    /* r200 limit should be 2048, there are issues with 2048
+-     * see bug 19269
+-     */
+-
+-    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
+-
+-    if (pSrcPixmap->drawable.width > 2047 ||
+-	pSrcPixmap->drawable.height > 2047) {
+-	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
+-			 pSrcPixmap->drawable.width,
+-			 pSrcPixmap->drawable.height));
+-    }
+-
+     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
+ 
+     if (pDstPixmap->drawable.width > 2047 ||
+@@ -951,20 +935,35 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+ 			 pDstPixmap->drawable.height));
+     }
+ 
++    if (pSrcPicture->pDrawable) {
++	/* r200 limit should be 2048, there are issues with 2048
++	 * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
++	 */
++	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
++
++	if (pSrcPixmap->drawable.width > 2047 ||
++	    pSrcPixmap->drawable.height > 2047) {
++	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
++			     pSrcPixmap->drawable.width,
++			     pSrcPixmap->drawable.height));
++	}
++    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
++
+     if (pMaskPicture) {
+ 	PixmapPtr pMaskPixmap;
+ 
+-	if (!pMaskPicture->pDrawable)
+-	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
++	if (pMaskPicture->pDrawable) {
++	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+ 
+-	if (pMaskPixmap->drawable.width > 2047 ||
+-	    pMaskPixmap->drawable.height > 2047) {
+-	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
+-			     pMaskPixmap->drawable.width,
+-			     pMaskPixmap->drawable.height));
+-	}
++	    if (pMaskPixmap->drawable.width > 2047 ||
++		pMaskPixmap->drawable.height > 2047) {
++		RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
++				 pMaskPixmap->drawable.width,
++				 pMaskPixmap->drawable.height));
++	    }
++	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+ 
+ 	if (pMaskPicture->componentAlpha) {
+ 	    /* Check if it's component alpha that relies on a source alpha and
+@@ -997,7 +996,8 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
+ 				PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ 				PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+-    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    RINFO_FROM_SCREEN(pScreen);
+     uint32_t dst_format, dst_pitch;
+     uint32_t pp_cntl, blendcntl, cblend, ablend, colorpitch;
+     int pixel_shift;
+@@ -1024,9 +1024,24 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
+     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
+ 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
+ 
++    if (!pSrc) {
++	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
++	if (!pSrc)
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++    }
++
+     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE))
+ 	return FALSE;
+ 
++    if (pMaskPicture && !pMask) {
++	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
++	if (!pMask) {
++	    if (!pSrcPicture->pDrawable)
++		pScreen->DestroyPixmap(pSrc);
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++	}
++    }
++
+     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
+ 			     pSrc, pMask, pDst);
+ 
+-- 
+1.7.7.5
+
diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD
index 09c47f815..a6d670028 100644
--- a/extra/xf86-video-ati/PKGBUILD
+++ b/extra/xf86-video-ati/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 154644 2012-03-30 13:39:00Z andyrtr $
+# $Id: PKGBUILD 159235 2012-05-18 15:27:54Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-ati
-pkgver=6.14.4
-pkgrel=2
+pkgver=6.14.99
+_gitdate=20120517
+pkgrel=0.${_gitdate}
 pkgdesc="X.org ati video driver"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
@@ -14,17 +15,46 @@ makedepends=('xorg-server-devel>=1.11.99.902' 'xf86driproto' 'mesa' 'glproto')
 conflicts=('xorg-server<1.11.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('75ad000bc00599e1797134f2d20d3094cba6af92')
+source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+		${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2::http://cgit.freedesktop.org/xorg/driver/xf86-video-ati/snapshot/xf86-video-ati-3fb694b308ebadd1b849836059b6b56bb19385f7.tar.gz
+        git_fixes.diff
+        0000-poor-man-s-solid-picture-support-for-r300-r600.patch
+        0001-poor-man-s-solid-picture-support-for-evergreen.patch
+        0002-poor-man-s-solid-picture-support-for-r100.patch
+        0003-poor-man-s-solid-picture-support-for-r200.patch)
+sha1sums=('75ad000bc00599e1797134f2d20d3094cba6af92'
+          '8b774e2f0310075cff2b7d874b0bed38d6245769'
+          '787f88c428f56ca6e96ba5eaf043a30bddfd0e23'
+          '69359a6623fe0f2214790c8ad40cac1a680a3825'
+          'c0709ab82728e34838a8aeead7d1b79b7faf09bd'
+          '77a519e250c27a9fb94eeb52da655eed7c5f2eca')
+sha1sums=('80c12b88e193354af204b13689b2fae922922c6c'
+          '8b774e2f0310075cff2b7d874b0bed38d6245769'
+          '787f88c428f56ca6e96ba5eaf043a30bddfd0e23'
+          '69359a6623fe0f2214790c8ad40cac1a680a3825'
+          'c0709ab82728e34838a8aeead7d1b79b7faf09bd'
+          '77a519e250c27a9fb94eeb52da655eed7c5f2eca')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-dri
+  #cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}*
+  #patch -Np1 -i ${srcdir}/git_fixes.diff
+  
+  # fix rendering issues with recent cairo - testing attemp taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266
+  # and http://lists.x.org/archives/xorg-driver-ati/2012-April/022724.html
+#  patch -Np1 -i ${srcdir}/0000-poor-man-s-solid-picture-support-for-r300-r600.patch
+#  patch -Np1 -i ${srcdir}/0001-poor-man-s-solid-picture-support-for-evergreen.patch
+#  patch -Np1 -i ${srcdir}/0002-poor-man-s-solid-picture-support-for-r100.patch
+#  patch -Np1 -i ${srcdir}/0003-poor-man-s-solid-picture-support-for-r200.patch
+
+  ./autogen.sh --prefix=/usr --enable-dri
+#  ./configure --prefix=/usr --enable-dri
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  #cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${srcdir}/${pkgname}*
   make "DESTDIR=${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xf86-video-ati/git_fixes.diff b/extra/xf86-video-ati/git_fixes.diff
new file mode 100644
index 000000000..0c4518319
--- /dev/null
+++ b/extra/xf86-video-ati/git_fixes.diff
@@ -0,0 +1,33 @@
+From d282719a9c2fb0ee32830aa75b8dfbb9392954ed Mon Sep 17 00:00:00 2001
+From: Jerome Glisse <jglisse@redhat.com>
+Date: Wed, 04 Apr 2012 21:08:30 +0000
+Subject: r6xx-r9xx: force 1D tiling for buffer with height < 64
+
+Due to some old kernel issue, height is 8 aligned insided the ddx
+For buffer with height btw 57 & 63 this lead ddx to believe it can
+allocate a 2D tiled surface while mesa will not align height and
+will assume 1D tiled leading to disagreement and rendering issue.
+This patch force buffer with height < 64 to be 1D tiled.
+
+Signed-off-by: Jerome Glisse <jglisse@redhat.com>
+---
+diff --git a/src/radeon_exa.c b/src/radeon_exa.c
+index 99a5806..270dad4 100644
+--- a/src/radeon_exa.c
++++ b/src/radeon_exa.c
+@@ -511,6 +511,13 @@ void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
+ 			surface.last_level = 0;
+ 			surface.bpe = cpp;
+ 			surface.nsamples = 1;
++			if (height < 64) {
++				/* disable 2d tiling for small surface to work around
++				 * the fact that ddx align height to 8 pixel for old
++				 * obscure reason i can't remember
++				 */
++				tiling &= ~RADEON_TILING_MACRO;
++			}
+ 			surface.flags = RADEON_SURF_SCANOUT;
+ 			surface.flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE);
+ 			surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR, MODE);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-i740/PKGBUILD b/extra/xf86-video-i740/PKGBUILD
index 04217ad7e..6e796ce50 100644
--- a/extra/xf86-video-i740/PKGBUILD
+++ b/extra/xf86-video-i740/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153340 2012-03-12 20:53:33Z andyrtr $
+# $Id: PKGBUILD 158884 2012-05-12 17:37:01Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-i740
-pkgver=1.3.2
-pkgrel=8
+pkgver=1.3.3
+pkgrel=1
 pkgdesc="X.org Intel i740 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.903')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('aadd2168153f780c487778e5fdda5473ed4b243d')
+sha1sums=('885660aad0d558ae0fb69f3b639c03f084a7a615')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index ad44b5329..b0459b075 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156183 2012-04-15 12:22:45Z jgc $
+# $Id: PKGBUILD 158952 2012-05-13 15:44:53Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.18.0
-pkgrel=3
+pkgver=2.19.0
+pkgrel=1
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -13,26 +13,11 @@ makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glpro
 conflicts=('xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch
-        0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch
-        0003-uxa-Remove-hook-for-CompositeRectangles.patch
-        0004-uxa-Remove-broken-render-glyphs-to-dst.patch
-        0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch)
-sha1sums=('77fae98e73414140bf214dca5da32bcf079c4463'
-          '8b46a5120c8c0b94fcd75801e5ce91d6baccd1ac'
-          'd959c66ab40f521bfe4df66b6f43c98b13f59283'
-          '5525715f1bbf80edfc34d55946b0528f6b8dbf75'
-          '3e54a4b3911e004d29b6a8e07adb7c16eba5bc4f'
-          '32e2e5a53926ce29290bf6454e7dcdbd18e91d5e')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch"
-  patch -Np1 -i "${srcdir}/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch"
-  patch -Np1 -i "${srcdir}/0003-uxa-Remove-hook-for-CompositeRectangles.patch"
-  patch -Np1 -i "${srcdir}/0004-uxa-Remove-broken-render-glyphs-to-dst.patch"
-  patch -Np1 -i "${srcdir}/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch"
   ./configure --prefix=/usr --enable-dri
   make
 }
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index 048771a53..8e2dffd5d 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 153350 2012-03-12 20:53:45Z andyrtr $
+# $Id: PKGBUILD 158956 2012-05-13 15:53:05Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=xf86-video-nouveau
-_gitdate=20120210
+_gitdate=20120512
 pkgver=0.0.16_git${_gitdate} # see configure.ac
 pkgrel=1
 pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/wiki/"
 license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
-depends=('libdrm' 'udev')
-optdepends=('nouveau-dri:	experimental gallium3d features')
-makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto')
+depends=('libdrm-nouveau' 'udev')
+optdepends=('nouveau-dri:       experimental gallium3d features')
+makedepends=('xorg-server-devel' 'libdrm-new' 'xf86driproto')
 conflicts=('xorg-server<1.11.99.902')
 options=('!libtool')
 install=$pkgname.install
 source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('f35c12d64542d0ea792a9e5af63a2e5a')
+md5sums=('3e27e283219936d64c194eca24cd81cd')
 
 # source PKGBUILD && mksource
 mksource() {
diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD
index 72dc5b204..7a494f861 100644
--- a/extra/xf86-video-openchrome/PKGBUILD
+++ b/extra/xf86-video-openchrome/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153354 2012-03-12 20:53:50Z andyrtr $
+# $Id: PKGBUILD 159185 2012-05-17 13:29:35Z andyrtr $
 # Contributor: Paul Mattal <paul@mattal.com>
 # Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
 
 pkgname=xf86-video-openchrome
-pkgver=0.2.905
+pkgver=0.2.906
 pkgrel=1
 pkgdesc="X.Org Openchrome drivers"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ replaces=('openchrome' 'xf86-video-via')
 options=('!libtool' '!emptydirs' '!makeflags')
 conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.11.99.902' 'unichrome-dri')
 source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('51871431a4a9204ab8ec79335c0cc041')
+sha1sums=('1c49bf722326442393288db490ff48d437e337f9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-s3/PKGBUILD b/extra/xf86-video-s3/PKGBUILD
index 613fd4831..8c9a6b8a7 100644
--- a/extra/xf86-video-s3/PKGBUILD
+++ b/extra/xf86-video-s3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155417 2012-04-03 11:24:01Z jgc $
+# $Id: PKGBUILD 158890 2012-05-12 18:14:42Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-s3
-pkgver=0.6.3
-pkgrel=8
+pkgver=0.6.4
+pkgrel=1
 pkgdesc="X.org S3 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -13,15 +13,13 @@ makedepends=('xorg-server-devel>=1.12.0')
 conflicts=('xorg-server<1.12.0')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
-md5sums=('5eb06d88533fb327d067928faeb20860'
-         '8b3033b16ee826a9e0870dd80717eafd')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('9170e57f966d810fdfc2de4473a7c8e814019c31')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  autoreconf -fi
+  #patch -Np1 -i "${srcdir}/git-fixes.patch"
+  #autoreconf -fi
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-s3virge/PKGBUILD b/extra/xf86-video-s3virge/PKGBUILD
index d49bde15d..31239166c 100644
--- a/extra/xf86-video-s3virge/PKGBUILD
+++ b/extra/xf86-video-s3virge/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 155419 2012-04-03 11:32:17Z jgc $
+# $Id: PKGBUILD 158928 2012-05-13 11:52:51Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-s3virge
-pkgver=1.10.4
-pkgrel=8
+pkgver=1.10.5
+pkgrel=1
 pkgdesc="X.org S3 Virge video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -14,15 +14,15 @@ makedepends=('pkgconfig' 'xorg-server-devel>=1.12.0')
 conflicts=('xorg-server<1.12.0')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
-md5sums=('6517bbbf808c700502d51acdc44662f8'
-         '2dba8e574d08c71c9f748ff341358050')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+        #git-fixes.patch)
+sha1sums=('ca8aa877ae118b017d5b06951bc1c3b7690ba709')
+
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  autoreconf -fi
+  #patch -Np1 -i "${srcdir}/git-fixes.patch"
+  #autoreconf -fi
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xfce4-battery-plugin/PKGBUILD b/extra/xfce4-battery-plugin/PKGBUILD
index 434f599dd..33634f8af 100644
--- a/extra/xfce4-battery-plugin/PKGBUILD
+++ b/extra/xfce4-battery-plugin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158010 2012-04-30 23:47:39Z eric $
+# $Id: PKGBUILD 158992 2012-05-14 14:50:58Z foutrelis $
 # Maintainer: aurelien <aurelien@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-battery-plugin
-pkgver=1.0.2
+pkgver=1.0.4
 pkgrel=1
 pkgdesc="A battery monitor plugin for the Xfce panel"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,10 +15,11 @@ makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('333313ae07bac68e29d4c1543e425fd1f3b539d61f7bc471a189ddb475bbb978')
+sha256sums=('2682d634f30511d09e65f70b3cb3bd7748cc684a745a252c47c4118b3adf6dd6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/xfce4-diskperf-plugin/PKGBUILD b/extra/xfce4-diskperf-plugin/PKGBUILD
index 6d5e40c4f..24dbea676 100644
--- a/extra/xfce4-diskperf-plugin/PKGBUILD
+++ b/extra/xfce4-diskperf-plugin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157916 2012-04-30 05:16:21Z foutrelis $
+# $Id: PKGBUILD 158990 2012-05-14 14:45:50Z foutrelis $
 # Maintainer:
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-diskperf-plugin
-pkgver=2.5.2
+pkgver=2.5.3
 pkgrel=1
 pkgdesc="Plugin for the Xfce4 panel displaying instant disk/partition performance"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('xfce4-panel')
 makedepends=('intltool')
 options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a67e1a692f5dad0a8403899d514f29cde2c9d50d692e15ccd367f925adaed36d')
+sha256sums=('418a250fe8d48f1fd87658206a8e6762032d35dc1b2e98e27d309a35f873f9b6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-genmon-plugin/PKGBUILD b/extra/xfce4-genmon-plugin/PKGBUILD
index 4ed4fe61a..a67ddcbd3 100644
--- a/extra/xfce4-genmon-plugin/PKGBUILD
+++ b/extra/xfce4-genmon-plugin/PKGBUILD
@@ -1,33 +1,38 @@
-# $Id: PKGBUILD 157859 2012-04-30 04:20:27Z foutrelis $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 158882 2012-05-12 17:34:09Z foutrelis $
+# Maintainer:
+# Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-genmon-plugin
-pkgver=3.3.1
-pkgrel=2
+pkgver=3.4.0
+pkgrel=1
 pkgdesc="plugin that monitors customizable programs stdout for the Xfce4 panel"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4')
+depends=('xfce4-panel')
 makedepends=('intltool')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/3.3/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e0022e15d4211a87c17d9f252b68e1d3')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/3.4/$pkgname-$pkgver.tar.bz2)
+sha256sums=('b0a5337b49c85623dc89f3c9e47c7374b1d466af2418033d2d6dfc57a9790387')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+  cd "$srcdir/$pkgname-3.4"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-3.4"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-mount-plugin/PKGBUILD b/extra/xfce4-mount-plugin/PKGBUILD
index d0d64df76..048eca5cf 100644
--- a/extra/xfce4-mount-plugin/PKGBUILD
+++ b/extra/xfce4-mount-plugin/PKGBUILD
@@ -1,34 +1,38 @@
-# $Id: PKGBUILD 157865 2012-04-30 04:20:35Z foutrelis $
+# $Id: PKGBUILD 158994 2012-05-14 14:53:48Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-mount-plugin
-pkgver=0.6.3
-pkgrel=2
+pkgver=0.6.4
+pkgrel=1
 pkgdesc="Plugin for the Xfce4 panel to mount and unmount volumes"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
 url="http://xfce-goodies.berlios.de/"
+license=('GPL')
 groups=('xfce4-goodies')
 depends=('xfce4-panel')
 makedepends=('intltool')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('bbc031f8518dc873d3a3ef42b3e228eeb0c9bb86')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('541d7af84d7d0b00ae547aa1f438e2fac51ee4195c4d0a17173c4f72accb227d')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-mount-plugin/xfce4-mount-plugin.install b/extra/xfce4-mount-plugin/xfce4-mount-plugin.install
index 21b79d2d4..e4f8fd06c 100644
--- a/extra/xfce4-mount-plugin/xfce4-mount-plugin.install
+++ b/extra/xfce4-mount-plugin/xfce4-mount-plugin.install
@@ -3,9 +3,11 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-mpc-plugin/PKGBUILD b/extra/xfce4-mpc-plugin/PKGBUILD
index 6f8870a15..10ff8f927 100644
--- a/extra/xfce4-mpc-plugin/PKGBUILD
+++ b/extra/xfce4-mpc-plugin/PKGBUILD
@@ -1,35 +1,40 @@
-# $Id: PKGBUILD 157867 2012-04-30 04:20:37Z foutrelis $
+# $Id: PKGBUILD 158996 2012-05-14 14:55:55Z foutrelis $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: aurelien <aurelien@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-mpc-plugin
-pkgver=0.4.0
-pkgrel=2
+pkgver=0.4.3
+pkgrel=1
 pkgdesc="A plugin to control the music player daemon from the xfce4-panel"
 arch=('i686' 'x86_64' 'mips64el')
-license=('BSD')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
+license=('BSD')
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libmpd>=0.16.1')
 makedepends=('intltool')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ae9b285e24385e27cfd797ab605a1b7f')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('54a44ff121df3416f19cce8ac52821c302aff877a8543bcb863167b26ff17af5')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-sensors-plugin/PKGBUILD b/extra/xfce4-sensors-plugin/PKGBUILD
index 4de1809c9..8471cc584 100644
--- a/extra/xfce4-sensors-plugin/PKGBUILD
+++ b/extra/xfce4-sensors-plugin/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 157883 2012-04-30 04:21:17Z foutrelis $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# $Id: PKGBUILD 159140 2012-05-16 19:30:19Z foutrelis $
+# Maintainer:
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Merk Matthias <macem@chello.at>
 
 pkgname=xfce4-sensors-plugin
-pkgver=1.2.3
-pkgrel=5
+pkgver=1.2.5
+pkgrel=1
 pkgdesc="A lm_sensors plugin for the Xfce panel"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
+license=('GPL2')
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'lm_sensors' 'libnotify' 'hddtemp' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnu-netcat')
+depends=('xfce4-panel' 'lm_sensors' 'libnotify' 'hicolor-icon-theme')
+makedepends=('intltool' 'hddtemp' 'gnu-netcat')
+optdepends=('hddtemp: for monitoring the temperature of hard drives')
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.2/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3dd27348f7b38b55e53aa8d851cdb80e090b8830ca9e705bf32641679f08d326')
+sha256sums=('6b3c12917116c0610c0ca0824357afcc4ab4553301241e27aa9665159b834c1e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin.install b/extra/xfce4-sensors-plugin/xfce4-sensors-plugin.install
index ef6375367..e4f8fd06c 100644
--- a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin.install
+++ b/extra/xfce4-sensors-plugin/xfce4-sensors-plugin.install
@@ -1,25 +1,13 @@
-post_common() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
 post_install() {
-  post_common
-
-  echo '> Make sure the hddtemp daemon is running, otherwise xfce4-sensors will'
-  echo '> crash on start.'
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
-  post_common
-
-  if (($(vercmp $2 1.2.3-4) < 0)); then
-    echo '> Make sure the hddtemp daemon is running, otherwise xfce4-sensors will'
-    echo '> crash on start.'
-  fi
+  post_install
 }
 
 post_remove() {
-  post_common
+  post_install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-smartbookmark-plugin/PKGBUILD b/extra/xfce4-smartbookmark-plugin/PKGBUILD
index 6c03b094d..041af6211 100644
--- a/extra/xfce4-smartbookmark-plugin/PKGBUILD
+++ b/extra/xfce4-smartbookmark-plugin/PKGBUILD
@@ -1,36 +1,45 @@
-# $Id: PKGBUILD 157889 2012-04-30 04:21:24Z foutrelis $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 159006 2012-05-14 20:21:29Z foutrelis $
+# Maintainer:
+# Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-smartbookmark-plugin
 pkgver=0.4.4
-pkgrel=2
-pkgdesc="Plugin for the Xfce4 panel that let you quicksearch from selected websites"
+pkgrel=3
+pkgdesc="Plugin for the Xfce4 panel that lets you quicksearch from selected websites"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
+license=('GPL2')
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxfcegui4')
 makedepends=('intltool' 'libxt')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2
-	xfce4-smartbookmark-plugin-archlinux.patch)
-md5sums=('273e38306a82f14e1b8c2c5db912f6c3'
-         '323ac898cfcfdb078f67f9ecd1905aec')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.4/$pkgname-$pkgver.tar.bz2
+        xfce4-smartbookmark-plugin-archlinux.patch
+        use-exo-open-instead-of-xfbrowser4.patch)
+sha256sums=('6c77e8fee0ec4dcee7aa34d94377e068a522b1ea650823422f2f5cca8126f2ed'
+            'a126b086811b60a8f3cd1a2b818cb6b9a9c6e959e00db1499b114fa8803325e6'
+            '436f7cda2b2bdfee61ac3d887d17dc91094526fec8713ab84fda249850525aac')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/xfce4-smartbookmark-plugin-archlinux.patch"
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Np0 -i "$srcdir/xfce4-smartbookmark-plugin-archlinux.patch"
+  patch -Np1 -i "$srcdir/use-exo-open-instead-of-xfbrowser4.patch"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-smartbookmark-plugin/use-exo-open-instead-of-xfbrowser4.patch b/extra/xfce4-smartbookmark-plugin/use-exo-open-instead-of-xfbrowser4.patch
new file mode 100644
index 000000000..254382182
--- /dev/null
+++ b/extra/xfce4-smartbookmark-plugin/use-exo-open-instead-of-xfbrowser4.patch
@@ -0,0 +1,37 @@
+--- xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c	
++++ xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c	
+@@ -75,18 +75,27 @@ XFCE_PANEL_PLUGIN_REGISTER_INTERNAL(smar
+ 
+ static gboolean do_search(const char *url, const char *keyword)
+ {
++    gchar *argv[] = { "exo-open", "--launch", "WebBrowser", NULL, NULL };
++    gchar *complete_url;
++    gboolean retval;
++    GError *error = NULL;
++
+     DBG ("Do search");
+-    gchar *execute;
+-    gboolean success;
+-    execute = g_strconcat("xfbrowser4  \"", url, NULL);//works better for me
+-    //execute = g_strconcat("x-www-browser \"", url, NULL);
+-    execute = g_strconcat(execute, keyword, NULL);
+-    execute = g_strconcat(execute, "\"", NULL);
+ 
+-    success = exec_command(execute);
+-    g_free(execute);
++    complete_url = g_strconcat(url, keyword, NULL);
++    argv[3] = complete_url;
++
++    retval = g_spawn_async(NULL, (gchar **)argv, NULL,
++        G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL, &error);
++
++    g_free(complete_url);
++
++    if (!retval) {
++        xfce_err("%s", error->message);
++        g_error_free(error);
++    }
+ 
+-    return success;
++    return retval;
+ }
diff --git a/extra/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff b/extra/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
new file mode 100644
index 000000000..12c110151
--- /dev/null
+++ b/extra/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
@@ -0,0 +1,116 @@
+--- xorg-server-1.12.1/exa/exa_glyphs.c	2012-03-30 04:57:25.000000000 +0200
++++ xorg-server-1.12.1/exa_glyphs.c.new	2012-04-15 11:48:51.683214230 +0200
+@@ -686,6 +686,7 @@
+     PixmapPtr pMaskPixmap = 0;
+     PicturePtr pMask = NULL;
+     ScreenPtr pScreen = pDst->pDrawable->pScreen;
++    ExaScreenPriv(pScreen);
+     int width = 0, height = 0;
+     int x, y;
+     int first_xOff = list->xOff, first_yOff = list->yOff;
+@@ -697,7 +698,6 @@
+     ExaGlyphBuffer buffer;
+ 
+     if (maskFormat) {
+-        ExaScreenPriv(pScreen);
+         GCPtr pGC;
+         xRectangle rect;
+ 
+@@ -719,22 +719,20 @@
+                                                 maskFormat->depth,
+                                                 CREATE_PIXMAP_USAGE_SCRATCH);
+         if (!pMaskPixmap)
+-            return;
++	    goto fallback;
+         component_alpha = NeedsComponent(maskFormat->format);
+         pMask = CreatePicture(0, &pMaskPixmap->drawable,
+                               maskFormat, CPComponentAlpha, &component_alpha,
+                               serverClient, &error);
+-        if (!pMask ||
+-            (!component_alpha && pExaScr->info->CheckComposite &&
+-             !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask)))
++        (*pScreen->DestroyPixmap) (pMaskPixmap);
++	if (!pMask)
++	    goto fallback;
++
++	if (!component_alpha && pExaScr->info->CheckComposite &&
++	    !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask))
+         {
+             PictFormatPtr argbFormat;
+ 
+-            (*pScreen->DestroyPixmap) (pMaskPixmap);
+-
+-            if (!pMask)
+-                return;
+-
+             /* The driver can't seem to composite to a8, let's try argb (but
+              * without component-alpha) */
+             FreePicture((pointer) pMask, (XID) 0);
+@@ -748,15 +746,25 @@
+                                                     maskFormat->depth,
+                                                     CREATE_PIXMAP_USAGE_SCRATCH);
+             if (!pMaskPixmap)
+-                return;
++	    goto fallback;
+ 
+             pMask = CreatePicture(0, &pMaskPixmap->drawable, maskFormat, 0, 0,
+                                   serverClient, &error);
+-            if (!pMask) {
+-                (*pScreen->DestroyPixmap) (pMaskPixmap);
+-                return;
+-            }
++            (*pScreen->DestroyPixmap) (pMaskPixmap);
++	    if (!pMask)
++	    goto fallback;
+         }
++	  
++	if (pExaScr->info->CheckComposite &&
++	    (!(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask) ||
++	     (!(*pExaScr->info->CheckComposite) (op, pSrc, pMask, pDst) &&
++	      (op != PictOpOver ||
++	       !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, pMask, pDst) ||
++	       !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, pMask, pDst))))) {
++	    FreePicture ((pointer) pMask, (XID) 0);
++	    goto fallback;
++	}
++
+         pGC = GetScratchGC(pMaskPixmap->drawable.depth, pScreen);
+         ValidateGC(&pMaskPixmap->drawable, pGC);
+         rect.x = 0;
+@@ -769,6 +777,13 @@
+         y = -extents.y1;
+     }
+     else {
++    	if (pExaScr->info->CheckComposite &&
++	    !(*pExaScr->info->CheckComposite) (op, pSrc, NULL, pDst) &&
++	    (op != PictOpOver ||
++	     !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, NULL, pDst) ||
++	     !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, NULL, pDst)))
++	    goto fallback;
++
+         x = 0;
+         y = 0;
+     }
+@@ -834,6 +849,10 @@
+                          xSrc + x - first_xOff,
+                          ySrc + y - first_yOff, 0, 0, x, y, width, height);
+         FreePicture((pointer) pMask, (XID) 0);
+-        (*pScreen->DestroyPixmap) (pMaskPixmap);
+     }
++    
++    return;
++
++fallback:
++    ExaCheckGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
+ }
+--- xorg-server-1.12.1/exa/exa_render.c	2012-03-30 04:57:25.000000000 +0200
++++ xorg-server-1.12.1/exa_render.c.new	2012-04-15 11:50:35.272482047 +0200
+@@ -878,7 +878,7 @@
+     Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
+     RegionRec region;
+ 
+-    if (pExaScr->swappedOut)
++    if (pExaScr->fallback_counter || pExaScr->swappedOut)
+         goto fallback;
+ 
+     /* Remove repeat in source if useless */
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index ebad4ce88..f7b20cd68 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156103 2012-04-14 07:35:46Z andyrtr $
+# $Id: PKGBUILD 159237 2012-05-18 15:27:59Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.12.1
-pkgrel=1
+pkgver=1.12.1.901
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -17,18 +17,21 @@ options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
         autoconfig-sis.patch
-        #git-fixes.patch
+        EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
+        git-fixes.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf
 	loongson.patch)
-sha1sums=('922b963901f4711449b53fb32ce3e14f5b642766'
+sha1sums=('bb9985bae271aa896de7fa12e49a0dbd8e244d2c'
           '63836e5cfb4ae7353fb2e31239a544409c7ead32'
           '175de5630b43dbc97778adfba5563b7fdd77f11f'
+          '4acb39587f73bcbb9a331377d6ef99cb73eb95a8'
+          '526cbffbc742dc3449065e3501d290a607d80aa3'
           'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
           '6838fc00ef4618c924a77e0fb03c05346080908a'
           '993798f3d22ad672d769dae5f48d1fa068d5578f'
-          '1c23eec101ba547ebf2923bd36f958cd21e7ed94')
+          'ac016ff8e3adfbd584fe16a770f6891724e254f4')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -39,8 +42,13 @@ build() {
   # Use unofficial imedia SiS driver for supported SiS devices
   patch -Np0 -i "${srcdir}/autoconfig-sis.patch"
 
-  # Add post-release patches from 1.11 branch
-#  patch -Np1 -i "${srcdir}/git-fixes.patch"
+  # fix glitches and crashes with EXA and cairo 1.12
+  # taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266
+  # and reworked for 1.12.1 changes
+#  patch -Np1 -i ${srcdir}/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
+
+  # Add post-release patches from 1.12 branch
+  patch -Np1 -i ${srcdir}/git-fixes.patch
 
   # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html
   patch -Np1 -i "${srcdir}/loongson.patch"
diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch
index 27da61eca..f6ca2426b 100644
--- a/extra/xorg-server/git-fixes.patch
+++ b/extra/xorg-server/git-fixes.patch
@@ -1,161 +1,1717 @@
-From 89626304ea1ad316c5b7145a40f09377148cff21 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Thu, 20 Oct 2011 13:43:01 +0000
-Subject: xf86Crtc: handle no outputs with no modes harder.
+From b5bf0ac5405eab77f26bb2f8726644232af17178 Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@keithp.com>
+Date: Wed, 11 Apr 2012 16:28:21 +0000
+Subject: hw/xfree86: Spurious ');' in xf86vmode.c messed up indentation badly
 
-If you started an X server with no connected outputs, we pick a default
-1024x768 mode, however if you then ran an xvidmode using app against that
-server it would segfault the server due to not finding any valid modes.
+Inside the unfinished XF86VIDMODE_EVENTS #ifdef block the
+function definition for xf86VidModeNotifyEvent had an extra ');'
+before the prototype argument declarations. This was harmless for the
+compiler as the code never gets used, but completely messed up the
+file re-indentation. This patch removes the spurious characters in
+preparation for re-indenting the file.
 
-This was due to the no output mode set code, only adding the modes to the
-scrn->modes once, when something called randr 1.2 xf86SetScrnInfoModes would
-get called and remove all the modes and we'd end up with 0.
-
-This change fixes xf86SetScrnInfoModes to always report a scrn mode of at
-least 1024x768, and pushes the initial configuration to just call it instead
-of setting up the mode itself.
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=746926
+Signed-off-by: Keith Packard <keithp@keithp.com>
+(cherry picked from commit 592bd0ae2b60cd6f6afd3efc40f5f659b12900b4)
+---
+diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
+index 6e2a8e9..9f64f8e 100644
+--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
++++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
+@@ -75,7 +75,7 @@ static unsigned char XF86VidModeReqCode = 0;
+ #ifdef XF86VIDMODE_EVENTS
+ static int XF86VidModeEventBase = 0;
+ 
+-static void SXF86VidModeNotifyEvent();
++static void SXF86VidModeNotifyEvent(
+ xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent *        /* to */
+     );
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From 3ad72a80088fe3236f38bd0696b04f399e24fe3d Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@keithp.com>
+Date: Wed, 11 Apr 2012 16:33:54 +0000
+Subject: hw/xfree86: Re-indent xf86vmode.c
 
-I've seen other bugs like this on other distros so it might also actually fix them.
+This is the result of re-running the 'x-indent.sh' script over
+xf86vmode.c to clean up the disaster caused by broken syntax in the
+file.
 
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Reviewed-by: Keith Packard <keithp@keithp.com>
 Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit 17416e88dcfcc584fe5f87580d5d2b719b3521c3)
+(cherry picked from commit 9779b904c7c0b49c74054c22c420012c40595cdc)
 ---
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index d75cd77..8906806 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1915,19 +1915,25 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn)
- 		break;
+diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
+index 9f64f8e..68c4b58 100644
+--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
++++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
+@@ -75,8 +75,7 @@ static unsigned char XF86VidModeReqCode = 0;
+ #ifdef XF86VIDMODE_EVENTS
+ static int XF86VidModeEventBase = 0;
+ 
+-static void SXF86VidModeNotifyEvent(
+-xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent *        /* to */
++static void SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent *    /* to */
+     );
+ 
+ static RESTYPE EventType;       /* resource type for event masks */
+@@ -117,20 +116,22 @@ static DevPrivateKeyRec ScreenPrivateKeyRec;
+ #define DEBUG_P(x) /**/
+ #endif
+     static int
+- ClientMajorVersion(ClientPtr client) {
++ClientMajorVersion(ClientPtr client)
++{
+     VidModePrivPtr pPriv;
+ 
+-     pPriv = VM_GETPRIV(client);
++    pPriv = VM_GETPRIV(client);
+     if (!pPriv)
+-         return 0;
++        return 0;
+     else
+-         return pPriv->major;
++        return pPriv->major;
+ }
++
+ #ifdef XF86VIDMODE_EVENTS
+ static void
+- CheckScreenPrivate(pScreen)
++CheckScreenPrivate(pScreen)
+ ScreenPtr
+-    pScreen;
++ pScreen;
+ {
+     SetupScreen(pScreen);
+ 
+@@ -142,9 +143,10 @@ ScreenPtr
+     }
+ }
+ 
+-static XF86VidModeScreenPrivatePtr MakeScreenPrivate(pScreen)
++static XF86VidModeScreenPrivatePtr
++MakeScreenPrivate(pScreen)
+ ScreenPtr
+-    pScreen;
++ pScreen;
+ {
+     SetupScreen(pScreen);
+ 
+@@ -160,18 +162,22 @@ ScreenPtr
+ }
+ 
+ static unsigned long
+- getEventMask(ScreenPtr pScreen, ClientPtr client) {
++getEventMask(ScreenPtr pScreen, ClientPtr client)
++{
+     SetupScreen(pScreen);
+     XF86VidModeEventPtr pEv;
+ 
+     if (!pPriv)
+-         return 0;
++        return 0;
+     for (pEv = pPriv->events; pEv; pEv = pEv->next)
+         if (pEv->client == client)
+             return pEv->mask;
+-     return 0;
+-} static Bool
+- setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) {
++    return 0;
++}
++
++static Bool
++setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask)
++{
+     SetupScreen(pScreen);
+     XF86VidModeEventPtr pEv, *pPrev;
+ 
+@@ -181,7 +187,8 @@ static unsigned long
+         pPriv = MakeScreenPrivate(pScreen);
+         if (!pPriv)
+             return FALSE;
+-    } for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
++    }
++    for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
+         if (pEv->client == client)
+             break;
+     if (mask == 0) {
+@@ -208,38 +215,43 @@ static unsigned long
+ }
+ 
+ static int
+- XF86VidModeFreeEvents(pointer value, XID id) {
++XF86VidModeFreeEvents(pointer value, XID id)
++{
+     XF86VidModeEventPtr pOld = (XF86VidModeEventPtr) value;
+     ScreenPtr pScreen = pOld->screen;
+-     SetupScreen(pScreen);
++
++    SetupScreen(pScreen);
+     XF86VidModeEventPtr pEv, *pPrev;
+ 
+     if (!pPriv)
+-         return TRUE;
++        return TRUE;
+     for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
+         if (pEv == pOld)
+             break;
+     if (!pEv)
+-         return TRUE;
++        return TRUE;
+     *pPrev = pEv->next;
+-     free(pEv);
+-     CheckScreenPrivate(pScreen);
+-     return TRUE;
+-} static void
+- SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced) {
++    free(pEv);
++    CheckScreenPrivate(pScreen);
++    return TRUE;
++}
++
++static void
++SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced)
++{
+     XF86VidModeScreenPrivatePtr pPriv;
+     XF86VidModeEventPtr pEv;
+     unsigned long mask;
+     xXF86VidModeNotifyEvent ev;
+     int kind;
+ 
+-     UpdateCurrentTimeIf();
+-     mask = XF86VidModeNotifyMask;
+-     pScreen = screenInfo.screens[pScreen->myNum];
+-     pPriv = GetScreenPrivate(pScreen);
++    UpdateCurrentTimeIf();
++    mask = XF86VidModeNotifyMask;
++    pScreen = screenInfo.screens[pScreen->myNum];
++    pPriv = GetScreenPrivate(pScreen);
+     if (!pPriv)
+-         return;
+-     kind = XF86VidModeModeChange;
++        return;
++    kind = XF86VidModeModeChange;
+     for (pEv = pPriv->events; pEv; pEv = pEv->next) {
+         if (!(pEv->mask & mask))
+             continue;
+@@ -251,8 +263,10 @@ static int
+         ev.forced = forced;
+         WriteEventsToClient(pEv->client, 1, (xEvent *) &ev);
+ }} static void
+- SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from,
+-                         xXF86VidModeNotifyEvent * to) {
++
++SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from,
++                        xXF86VidModeNotifyEvent * to)
++{
+     to->type = from->type;
+     to->state = from->state;
+     cpswaps(from->sequenceNumber, to->sequenceNumber);
+@@ -264,29 +278,31 @@ static int
+ #endif
+ 
+ static int
+- ProcXF86VidModeQueryVersion(ClientPtr client) {
++ProcXF86VidModeQueryVersion(ClientPtr client)
++{
+     xXF86VidModeQueryVersionReply rep;
+ 
+-     DEBUG_P("XF86VidModeQueryVersion");
++    DEBUG_P("XF86VidModeQueryVersion");
+ 
+-     REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq);
+-     rep.type = X_Reply;
+-     rep.length = 0;
+-     rep.sequenceNumber = client->sequence;
+-     rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION;
+-     rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION;
++    REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq);
++    rep.type = X_Reply;
++    rep.length = 0;
++    rep.sequenceNumber = client->sequence;
++    rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION;
++    rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION;
+     if (client->swapped) {
+         swaps(&rep.sequenceNumber);
+         swapl(&rep.length);
+         swaps(&rep.majorVersion);
+         swaps(&rep.minorVersion);
+-    } WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply),
+-                    (char *) &rep);
++    }
++    WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply), (char *) &rep);
+     return Success;
+ }
+ 
+ static int
+- ProcXF86VidModeGetModeLine(ClientPtr client) {
++ProcXF86VidModeGetModeLine(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetModeLineReq);
+     xXF86VidModeGetModeLineReply rep;
+     xXF86OldVidModeGetModeLineReply oldrep;
+@@ -294,11 +310,11 @@ static int
+     int dotClock;
+     int ver;
+ 
+-     DEBUG_P("XF86VidModeGetModeline");
++    DEBUG_P("XF86VidModeGetModeline");
+ 
+-     ver = ClientMajorVersion(client);
+-     REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
+-     rep.type = X_Reply;
++    ver = ClientMajorVersion(client);
++    REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
++    rep.type = X_Reply;
+     if (ver < 2) {
+         rep.length = bytes_to_int32(SIZEOF(xXF86OldVidModeGetModeLineReply) -
+                                     SIZEOF(xGenericReply));
+@@ -386,7 +402,8 @@ static int
+ }
+ 
+ static int
+- ProcXF86VidModeGetAllModeLines(ClientPtr client) {
++ProcXF86VidModeGetAllModeLines(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetAllModeLinesReq);
+     xXF86VidModeGetAllModeLinesReply rep;
+     xXF86VidModeModeInfo mdinf;
+@@ -395,38 +412,39 @@ static int
+     int modecount, dotClock;
+     int ver;
+ 
+-     DEBUG_P("XF86VidModeGetAllModelines");
++    DEBUG_P("XF86VidModeGetAllModelines");
+ 
+-     REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
++    REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
+ 
+     if (stuff->screen >= screenInfo.numScreens)
+-         return BadValue;
++        return BadValue;
+ 
+-     ver = ClientMajorVersion(client);
++    ver = ClientMajorVersion(client);
+ 
+-     modecount = VidModeGetNumOfModes(stuff->screen);
++    modecount = VidModeGetNumOfModes(stuff->screen);
+     if (modecount < 1)
+-         return VidModeErrorBase + XF86VidModeExtensionDisabled;
++        return VidModeErrorBase + XF86VidModeExtensionDisabled;
+ 
+     if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock))
+-         return BadValue;
++        return BadValue;
+ 
+-     rep.type = X_Reply;
+-     rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) -
++    rep.type = X_Reply;
++    rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) -
+         SIZEOF(xGenericReply);
+     if (ver < 2)
+-         rep.length += modecount * sizeof(xXF86OldVidModeModeInfo);
++        rep.length += modecount * sizeof(xXF86OldVidModeModeInfo);
+     else
+-         rep.length += modecount * sizeof(xXF86VidModeModeInfo);
+-     rep.length >>= 2;
+-     rep.sequenceNumber = client->sequence;
+-     rep.modecount = modecount;
++        rep.length += modecount * sizeof(xXF86VidModeModeInfo);
++    rep.length >>= 2;
++    rep.sequenceNumber = client->sequence;
++    rep.modecount = modecount;
+     if (client->swapped) {
+         swaps(&rep.sequenceNumber);
+         swapl(&rep.length);
+         swapl(&rep.modecount);
+-    } WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply),
+-                    (char *) &rep);
++    }
++    WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply),
++                  (char *) &rep);
+ 
+     do {
+         mdinf.dotclock = dotClock;
+@@ -492,7 +510,8 @@ static int
+      && VidModeGetModeValue(mode, VIDMODE_FLAGS)  == stuff->flags )
+ 
+ static int
+- ProcXF86VidModeAddModeLine(ClientPtr client) {
++ProcXF86VidModeAddModeLine(ClientPtr client)
++{
+     REQUEST(xXF86VidModeAddModeLineReq);
+     xXF86OldVidModeAddModeLineReq *oldstuff =
+         (xXF86OldVidModeAddModeLineReq *) client->requestBuffer;
+@@ -502,9 +521,9 @@ static int
+     int dotClock;
+     int ver;
+ 
+-     DEBUG_P("XF86VidModeAddModeline");
++    DEBUG_P("XF86VidModeAddModeline");
+ 
+-     ver = ClientMajorVersion(client);
++    ver = ClientMajorVersion(client);
+     if (ver < 2) {
+         /* convert from old format */
+         stuff = &newstuff;
+@@ -533,7 +552,8 @@ static int
+         stuff->after_vsyncend = oldstuff->after_vsyncend;
+         stuff->after_vtotal = oldstuff->after_vtotal;
+         stuff->after_flags = oldstuff->after_flags;
+-    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
++    }
++    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+         ErrorF("AddModeLine - scrn: %d clock: %ld\n",
+                (int) stuff->screen, (unsigned long) stuff->dotclock);
+         ErrorF("AddModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
+@@ -654,7 +674,8 @@ static int
+ }
+ 
+ static int
+- ProcXF86VidModeDeleteModeLine(ClientPtr client) {
++ProcXF86VidModeDeleteModeLine(ClientPtr client)
++{
+     REQUEST(xXF86VidModeDeleteModeLineReq);
+     xXF86OldVidModeDeleteModeLineReq *oldstuff =
+         (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer;
+@@ -663,9 +684,9 @@ static int
+     int len, dotClock;
+     int ver;
+ 
+-     DEBUG_P("XF86VidModeDeleteModeline");
++    DEBUG_P("XF86VidModeDeleteModeline");
+ 
+-     ver = ClientMajorVersion(client);
++    ver = ClientMajorVersion(client);
+     if (ver < 2) {
+         /* convert from old format */
+         stuff = &newstuff;
+@@ -683,7 +704,8 @@ static int
+         stuff->vtotal = oldstuff->vtotal;
+         stuff->flags = oldstuff->flags;
+         stuff->privsize = oldstuff->privsize;
+-    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
++    }
++    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+         ErrorF("DeleteModeLine - scrn: %d clock: %ld\n",
+                (int) stuff->screen, (unsigned long) stuff->dotclock);
+         ErrorF("                 hdsp: %d hbeg: %d hend: %d httl: %d\n",
+@@ -777,7 +799,8 @@ static int
+ }
+ 
+ static int
+- ProcXF86VidModeModModeLine(ClientPtr client) {
++ProcXF86VidModeModModeLine(ClientPtr client)
++{
+     REQUEST(xXF86VidModeModModeLineReq);
+     xXF86OldVidModeModModeLineReq *oldstuff =
+         (xXF86OldVidModeModModeLineReq *) client->requestBuffer;
+@@ -786,9 +809,9 @@ static int
+     int len, dotClock;
+     int ver;
+ 
+-     DEBUG_P("XF86VidModeModModeline");
++    DEBUG_P("XF86VidModeModModeline");
+ 
+-     ver = ClientMajorVersion(client);
++    ver = ClientMajorVersion(client);
+     if (ver < 2) {
+         /* convert from old format */
+         stuff = &newstuff;
+@@ -805,7 +828,8 @@ static int
+         stuff->vtotal = oldstuff->vtotal;
+         stuff->flags = oldstuff->flags;
+         stuff->privsize = oldstuff->privsize;
+-    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
++    }
++    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+         ErrorF("ModModeLine - scrn: %d hdsp: %d hbeg: %d hend: %d httl: %d\n",
+                (int) stuff->screen, stuff->hdisplay, stuff->hsyncstart,
+                stuff->hsyncend, stuff->htotal);
+@@ -903,7 +927,8 @@ static int
+ }
+ 
+ static int
+- ProcXF86VidModeValidateModeLine(ClientPtr client) {
++ProcXF86VidModeValidateModeLine(ClientPtr client)
++{
+     REQUEST(xXF86VidModeValidateModeLineReq);
+     xXF86OldVidModeValidateModeLineReq *oldstuff =
+         (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer;
+@@ -913,9 +938,9 @@ static int
+     int len, status, dotClock;
+     int ver;
+ 
+-     DEBUG_P("XF86VidModeValidateModeline");
++    DEBUG_P("XF86VidModeValidateModeline");
+ 
+-     ver = ClientMajorVersion(client);
++    ver = ClientMajorVersion(client);
+     if (ver < 2) {
+         /* convert from old format */
+         stuff = &newstuff;
+@@ -933,7 +958,8 @@ static int
+         stuff->vtotal = oldstuff->vtotal;
+         stuff->flags = oldstuff->flags;
+         stuff->privsize = oldstuff->privsize;
+-    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
++    }
++    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+         ErrorF("ValidateModeLine - scrn: %d clock: %ld\n",
+                (int) stuff->screen, (unsigned long) stuff->dotclock);
+         ErrorF("                   hdsp: %d hbeg: %d hend: %d httl: %d\n",
+@@ -1022,7 +1048,8 @@ static int
+ }
+ 
+ static int
+- ProcXF86VidModeSwitchMode(ClientPtr client) {
++ProcXF86VidModeSwitchMode(ClientPtr client)
++{
+     REQUEST(xXF86VidModeSwitchModeReq);
+ 
+     DEBUG_P("XF86VidModeSwitchMode");
+@@ -1035,8 +1062,11 @@ static int
+     VidModeZoomViewport(stuff->screen, (short) stuff->zoom);
+ 
+     return Success;
+-} static int
+- ProcXF86VidModeSwitchToMode(ClientPtr client) {
++}
++
++static int
++ProcXF86VidModeSwitchToMode(ClientPtr client)
++{
+     REQUEST(xXF86VidModeSwitchToModeReq);
+     xXF86OldVidModeSwitchToModeReq *oldstuff =
+         (xXF86OldVidModeSwitchToModeReq *) client->requestBuffer;
+@@ -1045,9 +1075,9 @@ static int
+     int len, dotClock;
+     int ver;
+ 
+-     DEBUG_P("XF86VidModeSwitchToMode");
++    DEBUG_P("XF86VidModeSwitchToMode");
+ 
+-     ver = ClientMajorVersion(client);
++    ver = ClientMajorVersion(client);
+     if (ver < 2) {
+         /* convert from old format */
+         stuff = &newstuff;
+@@ -1065,7 +1095,8 @@ static int
+         stuff->vtotal = oldstuff->vtotal;
+         stuff->flags = oldstuff->flags;
+         stuff->privsize = oldstuff->privsize;
+-    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
++    }
++    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+         ErrorF("SwitchToMode - scrn: %d clock: %ld\n",
+                (int) stuff->screen, (unsigned long) stuff->dotclock);
+         ErrorF("               hdsp: %d hbeg: %d hend: %d httl: %d\n",
+@@ -1138,7 +1169,8 @@ static int
+ }
+ 
+ static int
+- ProcXF86VidModeLockModeSwitch(ClientPtr client) {
++ProcXF86VidModeLockModeSwitch(ClientPtr client)
++{
+     REQUEST(xXF86VidModeLockModeSwitchReq);
+ 
+     REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq);
+@@ -1152,53 +1184,57 @@ static int
+         return VidModeErrorBase + XF86VidModeZoomLocked;
+ 
+     return Success;
+-} static int
+- ProcXF86VidModeGetMonitor(ClientPtr client) {
++}
++
++static int
++ProcXF86VidModeGetMonitor(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetMonitorReq);
+     xXF86VidModeGetMonitorReply rep;
+     CARD32 *hsyncdata, *vsyncdata;
+     int i, nHsync, nVrefresh;
+     pointer monitor;
+ 
+-     DEBUG_P("XF86VidModeGetMonitor");
++    DEBUG_P("XF86VidModeGetMonitor");
+ 
+-     REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
++    REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
+ 
+     if (stuff->screen >= screenInfo.numScreens)
+-         return BadValue;
++        return BadValue;
+ 
+     if (!VidModeGetMonitor(stuff->screen, &monitor))
+-         return BadValue;
++        return BadValue;
+ 
+-     nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i;
+-     nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i;
++    nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i;
++    nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i;
+ 
+-     rep.type = X_Reply;
++    rep.type = X_Reply;
+     if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VENDOR, 0)).ptr)
+-         rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor,
+-                                                                    VIDMODE_MON_VENDOR,
+-                                                                    0)).ptr);
++        rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor,
++                                                                   VIDMODE_MON_VENDOR,
++                                                                   0)).ptr);
+     else
+-         rep.vendorLength = 0;
++        rep.vendorLength = 0;
+     if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_MODEL, 0)).ptr)
+-         rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor,
+-                                                                   VIDMODE_MON_MODEL,
+-                                                                   0)).ptr);
++        rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor,
++                                                                  VIDMODE_MON_MODEL,
++                                                                  0)).ptr);
+     else
+-         rep.modelLength = 0;
+-     rep.length =
++        rep.modelLength = 0;
++    rep.length =
+         bytes_to_int32(SIZEOF(xXF86VidModeGetMonitorReply) -
+                        SIZEOF(xGenericReply) + (nHsync +
+                                                 nVrefresh) * sizeof(CARD32) +
+                        pad_to_int32(rep.vendorLength) +
+                        pad_to_int32(rep.modelLength));
+-     rep.sequenceNumber = client->sequence;
+-     rep.nhsync = nHsync;
+-     rep.nvsync = nVrefresh;
+-     hsyncdata = malloc(nHsync * sizeof(CARD32));
++    rep.sequenceNumber = client->sequence;
++    rep.nhsync = nHsync;
++    rep.nvsync = nVrefresh;
++    hsyncdata = malloc(nHsync * sizeof(CARD32));
+     if (!hsyncdata) {
+         return BadAlloc;
+-    } vsyncdata = malloc(nVrefresh * sizeof(CARD32));
++    }
++    vsyncdata = malloc(nVrefresh * sizeof(CARD32));
+ 
+     if (!vsyncdata) {
+         free(hsyncdata);
+@@ -1208,19 +1244,18 @@ static int
+     for (i = 0; i < nHsync; i++) {
+         hsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor,
+                                                                 VIDMODE_MON_HSYNC_LO,
+-                                                                i)).
+-            f | (unsigned
+-                 short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI,
+-                                                i)).f << 16;
++                                                                i)).f |
++            (unsigned
++             short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI,
++                                            i)).f << 16;
+     }
+     for (i = 0; i < nVrefresh; i++) {
+         vsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor,
+                                                                 VIDMODE_MON_VREFRESH_LO,
+-                                                                i)).
+-            f | (unsigned
+-                 short) (VidModeGetMonitorValue(monitor,
+-                                                VIDMODE_MON_VREFRESH_HI,
+-                                                i)).f << 16;
++                                                                i)).f |
++            (unsigned
++             short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VREFRESH_HI,
++                                            i)).f << 16;
+     }
+ 
+     if (client->swapped) {
+@@ -1249,38 +1284,40 @@ static int
+ }
+ 
+ static int
+- ProcXF86VidModeGetViewPort(ClientPtr client) {
++ProcXF86VidModeGetViewPort(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetViewPortReq);
+     xXF86VidModeGetViewPortReply rep;
+     int x, y;
+ 
+-     DEBUG_P("XF86VidModeGetViewPort");
++    DEBUG_P("XF86VidModeGetViewPort");
+ 
+-     REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
++    REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
+ 
+     if (stuff->screen >= screenInfo.numScreens)
+-         return BadValue;
++        return BadValue;
+ 
+-     rep.type = X_Reply;
+-     rep.length = 0;
+-     rep.sequenceNumber = client->sequence;
++    rep.type = X_Reply;
++    rep.length = 0;
++    rep.sequenceNumber = client->sequence;
+ 
+-     VidModeGetViewPort(stuff->screen, &x, &y);
+-     rep.x = x;
+-     rep.y = y;
++    VidModeGetViewPort(stuff->screen, &x, &y);
++    rep.x = x;
++    rep.y = y;
+ 
+     if (client->swapped) {
+         swaps(&rep.sequenceNumber);
+         swapl(&rep.length);
+         swapl(&rep.x);
+         swapl(&rep.y);
+-    } WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply),
+-                    (char *) &rep);
++    }
++    WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply), (char *) &rep);
+     return Success;
+ }
+ 
+ static int
+- ProcXF86VidModeSetViewPort(ClientPtr client) {
++ProcXF86VidModeSetViewPort(ClientPtr client)
++{
+     REQUEST(xXF86VidModeSetViewPortReq);
+ 
+     DEBUG_P("XF86VidModeSetViewPort");
+@@ -1294,8 +1331,11 @@ static int
+         return BadValue;
+ 
+     return Success;
+-} static int
+- ProcXF86VidModeGetDotClocks(ClientPtr client) {
++}
++
++static int
++ProcXF86VidModeGetDotClocks(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetDotClocksReq);
+     xXF86VidModeGetDotClocksReply rep;
+     int n;
+@@ -1304,31 +1344,33 @@ static int
+     int *Clocks = NULL;
+     Bool ClockProg;
+ 
+-     DEBUG_P("XF86VidModeGetDotClocks");
++    DEBUG_P("XF86VidModeGetDotClocks");
+ 
+-     REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
++    REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
+ 
+     if (stuff->screen >= screenInfo.numScreens)
+-         return BadValue;
++        return BadValue;
+ 
+-     numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg);
++    numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg);
+ 
+-     rep.type = X_Reply;
+-     rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply)
+-                                 - SIZEOF(xGenericReply) + numClocks);
+-     rep.sequenceNumber = client->sequence;
+-     rep.clocks = numClocks;
+-     rep.maxclocks = MAXCLOCKS;
+-     rep.flags = 0;
++    rep.type = X_Reply;
++    rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply)
++                                - SIZEOF(xGenericReply) + numClocks);
++    rep.sequenceNumber = client->sequence;
++    rep.clocks = numClocks;
++    rep.maxclocks = MAXCLOCKS;
++    rep.flags = 0;
+ 
+     if (!ClockProg) {
+         Clocks = malloc(numClocks * sizeof(int));
+         if (!Clocks)
+-             return BadValue;
++            return BadValue;
+         if (!VidModeGetClocks(stuff->screen, Clocks)) {
+             free(Clocks);
+             return BadValue;
+-    }} if (ClockProg) {
++        }
++    }
++    if (ClockProg) {
+         rep.flags |= CLKFLAG_PROGRAMABLE;
      }
+     if (client->swapped) {
+@@ -1356,7 +1398,8 @@ static int
+ }
+ 
+ static int
+- ProcXF86VidModeSetGamma(ClientPtr client) {
++ProcXF86VidModeSetGamma(ClientPtr client)
++{
+     REQUEST(xXF86VidModeSetGammaReq);
+ 
+     DEBUG_P("XF86VidModeSetGamma");
+@@ -1372,79 +1415,89 @@ static int
+         return BadValue;
+ 
+     return Success;
+-} static int
+- ProcXF86VidModeGetGamma(ClientPtr client) {
++}
++
++static int
++ProcXF86VidModeGetGamma(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetGammaReq);
+     xXF86VidModeGetGammaReply rep;
+     float red, green, blue;
+ 
+-     DEBUG_P("XF86VidModeGetGamma");
++    DEBUG_P("XF86VidModeGetGamma");
+ 
+-     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
++    REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
+ 
+     if (stuff->screen >= screenInfo.numScreens)
+-         return BadValue;
++        return BadValue;
+ 
+-     rep.type = X_Reply;
+-     rep.length = 0;
+-     rep.sequenceNumber = client->sequence;
++    rep.type = X_Reply;
++    rep.length = 0;
++    rep.sequenceNumber = client->sequence;
+     if (!VidModeGetGamma(stuff->screen, &red, &green, &blue))
+-         return BadValue;
+-     rep.red = (CARD32) (red * 10000.);
+-     rep.green = (CARD32) (green * 10000.);
+-     rep.blue = (CARD32) (blue * 10000.);
++        return BadValue;
++    rep.red = (CARD32) (red * 10000.);
++    rep.green = (CARD32) (green * 10000.);
++    rep.blue = (CARD32) (blue * 10000.);
+     if (client->swapped) {
+         swaps(&rep.sequenceNumber);
+         swapl(&rep.length);
+         swapl(&rep.red);
+         swapl(&rep.green);
+         swapl(&rep.blue);
+-    } WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep);
++    }
++    WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep);
+ 
+     return Success;
+ }
+ 
+ static int
+- ProcXF86VidModeSetGammaRamp(ClientPtr client) {
++ProcXF86VidModeSetGammaRamp(ClientPtr client)
++{
+     CARD16 *r, *g, *b;
+     int length;
+-     REQUEST(xXF86VidModeSetGammaRampReq);
++
++    REQUEST(xXF86VidModeSetGammaRampReq);
+ 
+     if (stuff->screen >= screenInfo.numScreens)
+-         return BadValue;
++        return BadValue;
+ 
+     if (stuff->size != VidModeGetGammaRampSize(stuff->screen))
+-         return BadValue;
++        return BadValue;
+ 
+-     length = (stuff->size + 1) & ~1;
++    length = (stuff->size + 1) & ~1;
+ 
+-     REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6);
++    REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6);
+ 
+-     r = (CARD16 *) &stuff[1];
+-     g = r + length;
+-     b = g + length;
++    r = (CARD16 *) &stuff[1];
++    g = r + length;
++    b = g + length;
+ 
+     if (!VidModeSetGammaRamp(stuff->screen, stuff->size, r, g, b))
+-         return BadValue;
++        return BadValue;
+ 
+-     return Success;
+-} static int
+- ProcXF86VidModeGetGammaRamp(ClientPtr client) {
++    return Success;
++}
++
++static int
++ProcXF86VidModeGetGammaRamp(ClientPtr client)
++{
+     CARD16 *ramp = NULL;
+     int length;
+     size_t ramplen = 0;
+     xXF86VidModeGetGammaRampReply rep;
+-     REQUEST(xXF86VidModeGetGammaRampReq);
++
++    REQUEST(xXF86VidModeGetGammaRampReq);
+ 
+     if (stuff->screen >= screenInfo.numScreens)
+-         return BadValue;
++        return BadValue;
+ 
+     if (stuff->size != VidModeGetGammaRampSize(stuff->screen))
+-         return BadValue;
++        return BadValue;
+ 
+-     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
++    REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
+ 
+-     length = (stuff->size + 1) & ~1;
++    length = (stuff->size + 1) & ~1;
+ 
+     if (stuff->size) {
+         ramplen = length * 3 * sizeof(CARD16);
+@@ -1455,7 +1508,9 @@ static int
+                                  ramp, ramp + length, ramp + (length * 2))) {
+             free(ramp);
+             return BadValue;
+-    }} rep.type = X_Reply;
++        }
++    }
++    rep.type = X_Reply;
+     rep.length = (length >> 1) * 3;
+     rep.sequenceNumber = client->sequence;
+     rep.size = stuff->size;
+@@ -1476,47 +1531,53 @@ static int
+ }
+ 
+ static int
+- ProcXF86VidModeGetGammaRampSize(ClientPtr client) {
++ProcXF86VidModeGetGammaRampSize(ClientPtr client)
++{
+     xXF86VidModeGetGammaRampSizeReply rep;
+-     REQUEST(xXF86VidModeGetGammaRampSizeReq);
++
++    REQUEST(xXF86VidModeGetGammaRampSizeReq);
+ 
+     if (stuff->screen >= screenInfo.numScreens)
+-         return BadValue;
++        return BadValue;
+ 
+-     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
++    REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
  
--    if (scrn->modes != NULL) {
--	/* For some reason, scrn->modes is circular, unlike the other mode
--	 * lists.  How great is that?
--	 */
--	for (last = scrn->modes; last && last->next; last = last->next)
--	    ;
--	last->next = scrn->modes;
--	scrn->modes->prev = last;
--	if (mode) {
--	    while (scrn->modes != mode)
--		scrn->modes = scrn->modes->next;
--	}
-+    if (!scrn->modes) {
-+	scrn->modes = xf86ModesAdd(scrn->modes,
-+				   xf86CVTMode(scrn->display->virtualX,
-+					       scrn->display->virtualY,
-+					       60, 0, 0));
-+    }
-+
-+    /* For some reason, scrn->modes is circular, unlike the other mode
-+     * lists.  How great is that?
-+     */
-+    for (last = scrn->modes; last && last->next; last = last->next)
-+	;
-+    last->next = scrn->modes;
-+    scrn->modes->prev = last;
-+    if (mode) {
-+	while (scrn->modes != mode)
-+	    scrn->modes = scrn->modes->next;
+-     rep.type = X_Reply;
+-     rep.length = 0;
+-     rep.sequenceNumber = client->sequence;
+-     rep.size = VidModeGetGammaRampSize(stuff->screen);
++    rep.type = X_Reply;
++    rep.length = 0;
++    rep.sequenceNumber = client->sequence;
++    rep.size = VidModeGetGammaRampSize(stuff->screen);
+     if (client->swapped) {
+         swaps(&rep.sequenceNumber);
+         swapl(&rep.length);
+         swaps(&rep.size);
+-    } WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply),
+-                    (char *) &rep);
++    }
++    WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply),
++                  (char *) &rep);
+ 
+     return Success;
+ }
+ 
+ static int
+- ProcXF86VidModeGetPermissions(ClientPtr client) {
++ProcXF86VidModeGetPermissions(ClientPtr client)
++{
+     xXF86VidModeGetPermissionsReply rep;
+-     REQUEST(xXF86VidModeGetPermissionsReq);
++
++    REQUEST(xXF86VidModeGetPermissionsReq);
+ 
+     if (stuff->screen >= screenInfo.numScreens)
+-         return BadValue;
++        return BadValue;
+ 
+-     REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
++    REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
+ 
+-     rep.type = X_Reply;
+-     rep.length = 0;
+-     rep.sequenceNumber = client->sequence;
+-     rep.permissions = XF86VM_READ_PERMISSION;
++    rep.type = X_Reply;
++    rep.length = 0;
++    rep.sequenceNumber = client->sequence;
++    rep.permissions = XF86VM_READ_PERMISSION;
+     if (xf86GetVidModeEnabled() &&
+         (xf86GetVidModeAllowNonLocal() || LocalClient(client))) {
+         rep.permissions |= XF86VM_WRITE_PERMISSION;
+-    } if (client->swapped) {
++    }
++    if (client->swapped) {
+         swaps(&rep.sequenceNumber);
+         swapl(&rep.length);
+         swapl(&rep.permissions);
+@@ -1528,21 +1589,23 @@ static int
+ }
+ 
+ static int
+- ProcXF86VidModeSetClientVersion(ClientPtr client) {
++ProcXF86VidModeSetClientVersion(ClientPtr client)
++{
+     REQUEST(xXF86VidModeSetClientVersionReq);
+ 
+     VidModePrivPtr pPriv;
+ 
+-     DEBUG_P("XF86VidModeSetClientVersion");
++    DEBUG_P("XF86VidModeSetClientVersion");
+ 
+-     REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
++    REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
+ 
+     if ((pPriv = VM_GETPRIV(client)) == NULL) {
+         pPriv = malloc(sizeof(VidModePrivRec));
+         if (!pPriv)
+             return BadAlloc;
+         VM_SETPRIV(client, pPriv);
+-    } pPriv->major = stuff->major;
++    }
++    pPriv->major = stuff->major;
+ 
+     pPriv->minor = stuff->minor;
+ 
+@@ -1550,85 +1613,103 @@ static int
+ }
+ 
+ static int
+- ProcXF86VidModeDispatch(ClientPtr client) {
++ProcXF86VidModeDispatch(ClientPtr client)
++{
+     REQUEST(xReq);
+     switch (stuff->data) {
+     case X_XF86VidModeQueryVersion:
+         return ProcXF86VidModeQueryVersion(client);
+-        case X_XF86VidModeGetModeLine:return ProcXF86VidModeGetModeLine(client);
+-        case X_XF86VidModeGetMonitor:return ProcXF86VidModeGetMonitor(client);
+-        case X_XF86VidModeGetAllModeLines:return
+-            ProcXF86VidModeGetAllModeLines(client);
+-        case X_XF86VidModeValidateModeLine:return
+-            ProcXF86VidModeValidateModeLine(client);
+-        case X_XF86VidModeGetViewPort:return ProcXF86VidModeGetViewPort(client);
+-        case X_XF86VidModeGetDotClocks:return
+-            ProcXF86VidModeGetDotClocks(client);
+-        case X_XF86VidModeSetClientVersion:return
+-            ProcXF86VidModeSetClientVersion(client);
+-        case X_XF86VidModeGetGamma:return ProcXF86VidModeGetGamma(client);
+-        case X_XF86VidModeGetGammaRamp:return
+-            ProcXF86VidModeGetGammaRamp(client);
+-        case X_XF86VidModeGetGammaRampSize:return
+-            ProcXF86VidModeGetGammaRampSize(client);
+-        case X_XF86VidModeGetPermissions:return
+-            ProcXF86VidModeGetPermissions(client);
+-        default:if (!xf86GetVidModeEnabled())
++    case X_XF86VidModeGetModeLine:
++        return ProcXF86VidModeGetModeLine(client);
++    case X_XF86VidModeGetMonitor:
++        return ProcXF86VidModeGetMonitor(client);
++    case X_XF86VidModeGetAllModeLines:
++        return ProcXF86VidModeGetAllModeLines(client);
++    case X_XF86VidModeValidateModeLine:
++        return ProcXF86VidModeValidateModeLine(client);
++    case X_XF86VidModeGetViewPort:
++        return ProcXF86VidModeGetViewPort(client);
++    case X_XF86VidModeGetDotClocks:
++        return ProcXF86VidModeGetDotClocks(client);
++    case X_XF86VidModeSetClientVersion:
++        return ProcXF86VidModeSetClientVersion(client);
++    case X_XF86VidModeGetGamma:
++        return ProcXF86VidModeGetGamma(client);
++    case X_XF86VidModeGetGammaRamp:
++        return ProcXF86VidModeGetGammaRamp(client);
++    case X_XF86VidModeGetGammaRampSize:
++        return ProcXF86VidModeGetGammaRampSize(client);
++    case X_XF86VidModeGetPermissions:
++        return ProcXF86VidModeGetPermissions(client);
++    default:
++        if (!xf86GetVidModeEnabled())
+             return VidModeErrorBase + XF86VidModeExtensionDisabled;
+         if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) {
+             switch (stuff->data) {
+             case X_XF86VidModeAddModeLine:
+                 return ProcXF86VidModeAddModeLine(client);
+-                case X_XF86VidModeDeleteModeLine:return
+-                    ProcXF86VidModeDeleteModeLine(client);
+-                case X_XF86VidModeModModeLine:return
+-                    ProcXF86VidModeModModeLine(client);
+-                case X_XF86VidModeSwitchMode:return
+-                    ProcXF86VidModeSwitchMode(client);
+-                case X_XF86VidModeSwitchToMode:return
+-                    ProcXF86VidModeSwitchToMode(client);
+-                case X_XF86VidModeLockModeSwitch:return
+-                    ProcXF86VidModeLockModeSwitch(client);
+-                case X_XF86VidModeSetViewPort:return
+-                    ProcXF86VidModeSetViewPort(client);
+-                case X_XF86VidModeSetGamma:return
+-                    ProcXF86VidModeSetGamma(client);
+-                case X_XF86VidModeSetGammaRamp:return
+-                    ProcXF86VidModeSetGammaRamp(client);
+-                default:return BadRequest;
+-        }}
++            case X_XF86VidModeDeleteModeLine:
++                return ProcXF86VidModeDeleteModeLine(client);
++            case X_XF86VidModeModModeLine:
++                return ProcXF86VidModeModModeLine(client);
++            case X_XF86VidModeSwitchMode:
++                return ProcXF86VidModeSwitchMode(client);
++            case X_XF86VidModeSwitchToMode:
++                return ProcXF86VidModeSwitchToMode(client);
++            case X_XF86VidModeLockModeSwitch:
++                return ProcXF86VidModeLockModeSwitch(client);
++            case X_XF86VidModeSetViewPort:
++                return ProcXF86VidModeSetViewPort(client);
++            case X_XF86VidModeSetGamma:
++                return ProcXF86VidModeSetGamma(client);
++            case X_XF86VidModeSetGammaRamp:
++                return ProcXF86VidModeSetGammaRamp(client);
++            default:
++                return BadRequest;
++            }
++        }
+         else
+-             return VidModeErrorBase + XF86VidModeClientNotLocal;
++            return VidModeErrorBase + XF86VidModeClientNotLocal;
      }
+ }
+ 
+ static int
+- SProcXF86VidModeQueryVersion(ClientPtr client) {
++SProcXF86VidModeQueryVersion(ClientPtr client)
++{
+     REQUEST(xXF86VidModeQueryVersionReq);
+     swaps(&stuff->length);
+     return ProcXF86VidModeQueryVersion(client);
+-} static int
+- SProcXF86VidModeGetModeLine(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetModeLine(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetModeLineReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
+     swaps(&stuff->screen);
+     return ProcXF86VidModeGetModeLine(client);
+-} static int
+- SProcXF86VidModeGetAllModeLines(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetAllModeLines(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetAllModeLinesReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
+     swaps(&stuff->screen);
+     return ProcXF86VidModeGetAllModeLines(client);
+-} static int
+- SProcXF86VidModeAddModeLine(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeAddModeLine(ClientPtr client)
++{
+     xXF86OldVidModeAddModeLineReq *oldstuff =
+         (xXF86OldVidModeAddModeLineReq *) client->requestBuffer;
+     int ver;
+ 
+-     REQUEST(xXF86VidModeAddModeLineReq);
+-     ver = ClientMajorVersion(client);
++    REQUEST(xXF86VidModeAddModeLineReq);
++    ver = ClientMajorVersion(client);
+     if (ver < 2) {
+         swaps(&oldstuff->length);
+         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq);
+@@ -1666,13 +1747,14 @@ static int
+ }
+ 
+ static int
+- SProcXF86VidModeDeleteModeLine(ClientPtr client) {
++SProcXF86VidModeDeleteModeLine(ClientPtr client)
++{
+     xXF86OldVidModeDeleteModeLineReq *oldstuff =
+         (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer;
+     int ver;
+ 
+-     REQUEST(xXF86VidModeDeleteModeLineReq);
+-     ver = ClientMajorVersion(client);
++    REQUEST(xXF86VidModeDeleteModeLineReq);
++    ver = ClientMajorVersion(client);
+     if (ver < 2) {
+         swaps(&oldstuff->length);
+         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq);
+@@ -1710,13 +1792,14 @@ static int
+ }
+ 
+ static int
+- SProcXF86VidModeModModeLine(ClientPtr client) {
++SProcXF86VidModeModModeLine(ClientPtr client)
++{
+     xXF86OldVidModeModModeLineReq *oldstuff =
+         (xXF86OldVidModeModModeLineReq *) client->requestBuffer;
+     int ver;
+ 
+-     REQUEST(xXF86VidModeModModeLineReq);
+-     ver = ClientMajorVersion(client);
++    REQUEST(xXF86VidModeModModeLineReq);
++    ver = ClientMajorVersion(client);
+     if (ver < 2) {
+         swaps(&oldstuff->length);
+         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq);
+@@ -1754,13 +1837,14 @@ static int
+ }
+ 
+ static int
+- SProcXF86VidModeValidateModeLine(ClientPtr client) {
++SProcXF86VidModeValidateModeLine(ClientPtr client)
++{
+     xXF86OldVidModeValidateModeLineReq *oldstuff =
+         (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer;
+     int ver;
+ 
+-     REQUEST(xXF86VidModeValidateModeLineReq);
+-     ver = ClientMajorVersion(client);
++    REQUEST(xXF86VidModeValidateModeLineReq);
++    ver = ClientMajorVersion(client);
+     if (ver < 2) {
+         swaps(&oldstuff->length);
+         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq);
+@@ -1798,44 +1882,60 @@ static int
+ }
+ 
+ static int
+- SProcXF86VidModeSwitchMode(ClientPtr client) {
++SProcXF86VidModeSwitchMode(ClientPtr client)
++{
+     REQUEST(xXF86VidModeSwitchModeReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeSwitchModeReq);
+     swaps(&stuff->screen);
+     swaps(&stuff->zoom);
+     return ProcXF86VidModeSwitchMode(client);
+-} static int
+- SProcXF86VidModeSwitchToMode(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeSwitchToMode(ClientPtr client)
++{
+     REQUEST(xXF86VidModeSwitchToModeReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeSwitchToModeReq);
+     swapl(&stuff->screen);
+     return ProcXF86VidModeSwitchToMode(client);
+-} static int
+- SProcXF86VidModeLockModeSwitch(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeLockModeSwitch(ClientPtr client)
++{
+     REQUEST(xXF86VidModeLockModeSwitchReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq);
+     swaps(&stuff->screen);
+     swaps(&stuff->lock);
+     return ProcXF86VidModeLockModeSwitch(client);
+-} static int
+- SProcXF86VidModeGetMonitor(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetMonitor(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetMonitorReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
+     swaps(&stuff->screen);
+     return ProcXF86VidModeGetMonitor(client);
+-} static int
+- SProcXF86VidModeGetViewPort(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetViewPort(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetViewPortReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
+     swaps(&stuff->screen);
+     return ProcXF86VidModeGetViewPort(client);
+-} static int
+- SProcXF86VidModeSetViewPort(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeSetViewPort(ClientPtr client)
++{
+     REQUEST(xXF86VidModeSetViewPortReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeSetViewPortReq);
+@@ -1843,23 +1943,32 @@ static int
+     swapl(&stuff->x);
+     swapl(&stuff->y);
+     return ProcXF86VidModeSetViewPort(client);
+-} static int
+- SProcXF86VidModeGetDotClocks(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetDotClocks(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetDotClocksReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
+     swaps(&stuff->screen);
+     return ProcXF86VidModeGetDotClocks(client);
+-} static int
+- SProcXF86VidModeSetClientVersion(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeSetClientVersion(ClientPtr client)
++{
+     REQUEST(xXF86VidModeSetClientVersionReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
+     swaps(&stuff->major);
+     swaps(&stuff->minor);
+     return ProcXF86VidModeSetClientVersion(client);
+-} static int
+- SProcXF86VidModeSetGamma(ClientPtr client) {
++}
 +
-     scrn->currentMode = scrn->modes;
- #ifdef XFreeXDGA
-     if (scrn->pScreen)
-@@ -2529,16 +2535,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
- 			      width, height);
++static int
++SProcXF86VidModeSetGamma(ClientPtr client)
++{
+     REQUEST(xXF86VidModeSetGammaReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeSetGammaReq);
+@@ -1868,120 +1977,145 @@ static int
+     swapl(&stuff->green);
+     swapl(&stuff->blue);
+     return ProcXF86VidModeSetGamma(client);
+-} static int
+- SProcXF86VidModeGetGamma(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetGamma(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetGammaReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
+     swaps(&stuff->screen);
+     return ProcXF86VidModeGetGamma(client);
+-} static int
+- SProcXF86VidModeSetGammaRamp(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeSetGammaRamp(ClientPtr client)
++{
+     int length;
+-     REQUEST(xXF86VidModeSetGammaRampReq);
+-     swaps(&stuff->length);
+-     REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq);
+-     swaps(&stuff->size);
+-     swaps(&stuff->screen);
+-     length = ((stuff->size + 1) & ~1) * 6;
+-     REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
+-     SwapRestS(stuff);
+-     return ProcXF86VidModeSetGammaRamp(client);
+-} static int
+- SProcXF86VidModeGetGammaRamp(ClientPtr client) {
++
++    REQUEST(xXF86VidModeSetGammaRampReq);
++    swaps(&stuff->length);
++    REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq);
++    swaps(&stuff->size);
++    swaps(&stuff->screen);
++    length = ((stuff->size + 1) & ~1) * 6;
++    REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
++    SwapRestS(stuff);
++    return ProcXF86VidModeSetGammaRamp(client);
++}
++
++static int
++SProcXF86VidModeGetGammaRamp(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetGammaRampReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
+     swaps(&stuff->size);
+     swaps(&stuff->screen);
+     return ProcXF86VidModeGetGammaRamp(client);
+-} static int
+- SProcXF86VidModeGetGammaRampSize(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetGammaRampSize(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetGammaRampSizeReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
+     swaps(&stuff->screen);
+     return ProcXF86VidModeGetGammaRampSize(client);
+-} static int
+- SProcXF86VidModeGetPermissions(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetPermissions(ClientPtr client)
++{
+     REQUEST(xXF86VidModeGetPermissionsReq);
+     swaps(&stuff->length);
+     REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
+     swaps(&stuff->screen);
+     return ProcXF86VidModeGetPermissions(client);
+-} static int
+- SProcXF86VidModeDispatch(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeDispatch(ClientPtr client)
++{
+     REQUEST(xReq);
+     switch (stuff->data) {
+     case X_XF86VidModeQueryVersion:
+         return SProcXF86VidModeQueryVersion(client);
+-        case X_XF86VidModeGetModeLine:return
+-            SProcXF86VidModeGetModeLine(client);
+-        case X_XF86VidModeGetMonitor:return SProcXF86VidModeGetMonitor(client);
+-        case X_XF86VidModeGetAllModeLines:return
+-            SProcXF86VidModeGetAllModeLines(client);
+-        case X_XF86VidModeGetViewPort:return
+-            SProcXF86VidModeGetViewPort(client);
+-        case X_XF86VidModeValidateModeLine:return
+-            SProcXF86VidModeValidateModeLine(client);
+-        case X_XF86VidModeGetDotClocks:return
+-            SProcXF86VidModeGetDotClocks(client);
+-        case X_XF86VidModeSetClientVersion:return
+-            SProcXF86VidModeSetClientVersion(client);
+-        case X_XF86VidModeGetGamma:return SProcXF86VidModeGetGamma(client);
+-        case X_XF86VidModeGetGammaRamp:return
+-            SProcXF86VidModeGetGammaRamp(client);
+-        case X_XF86VidModeGetGammaRampSize:return
+-            SProcXF86VidModeGetGammaRampSize(client);
+-        case X_XF86VidModeGetPermissions:return
+-            SProcXF86VidModeGetPermissions(client);
+-        default:if (!xf86GetVidModeEnabled())
++    case X_XF86VidModeGetModeLine:
++        return SProcXF86VidModeGetModeLine(client);
++    case X_XF86VidModeGetMonitor:
++        return SProcXF86VidModeGetMonitor(client);
++    case X_XF86VidModeGetAllModeLines:
++        return SProcXF86VidModeGetAllModeLines(client);
++    case X_XF86VidModeGetViewPort:
++        return SProcXF86VidModeGetViewPort(client);
++    case X_XF86VidModeValidateModeLine:
++        return SProcXF86VidModeValidateModeLine(client);
++    case X_XF86VidModeGetDotClocks:
++        return SProcXF86VidModeGetDotClocks(client);
++    case X_XF86VidModeSetClientVersion:
++        return SProcXF86VidModeSetClientVersion(client);
++    case X_XF86VidModeGetGamma:
++        return SProcXF86VidModeGetGamma(client);
++    case X_XF86VidModeGetGammaRamp:
++        return SProcXF86VidModeGetGammaRamp(client);
++    case X_XF86VidModeGetGammaRampSize:
++        return SProcXF86VidModeGetGammaRampSize(client);
++    case X_XF86VidModeGetPermissions:
++        return SProcXF86VidModeGetPermissions(client);
++    default:
++        if (!xf86GetVidModeEnabled())
+             return VidModeErrorBase + XF86VidModeExtensionDisabled;
+         if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) {
+             switch (stuff->data) {
+             case X_XF86VidModeAddModeLine:
+                 return SProcXF86VidModeAddModeLine(client);
+-                case X_XF86VidModeDeleteModeLine:return
+-                    SProcXF86VidModeDeleteModeLine(client);
+-                case X_XF86VidModeModModeLine:return
+-                    SProcXF86VidModeModModeLine(client);
+-                case X_XF86VidModeSwitchMode:return
+-                    SProcXF86VidModeSwitchMode(client);
+-                case X_XF86VidModeSwitchToMode:return
+-                    SProcXF86VidModeSwitchToMode(client);
+-                case X_XF86VidModeLockModeSwitch:return
+-                    SProcXF86VidModeLockModeSwitch(client);
+-                case X_XF86VidModeSetViewPort:return
+-                    SProcXF86VidModeSetViewPort(client);
+-                case X_XF86VidModeSetGamma:return
+-                    SProcXF86VidModeSetGamma(client);
+-                case X_XF86VidModeSetGammaRamp:return
+-                    SProcXF86VidModeSetGammaRamp(client);
+-                default:return BadRequest;
+-        }}
++            case X_XF86VidModeDeleteModeLine:
++                return SProcXF86VidModeDeleteModeLine(client);
++            case X_XF86VidModeModModeLine:
++                return SProcXF86VidModeModModeLine(client);
++            case X_XF86VidModeSwitchMode:
++                return SProcXF86VidModeSwitchMode(client);
++            case X_XF86VidModeSwitchToMode:
++                return SProcXF86VidModeSwitchToMode(client);
++            case X_XF86VidModeLockModeSwitch:
++                return SProcXF86VidModeLockModeSwitch(client);
++            case X_XF86VidModeSetViewPort:
++                return SProcXF86VidModeSetViewPort(client);
++            case X_XF86VidModeSetGamma:
++                return SProcXF86VidModeSetGamma(client);
++            case X_XF86VidModeSetGammaRamp:
++                return SProcXF86VidModeSetGammaRamp(client);
++            default:
++                return BadRequest;
++            }
++        }
+         else
+-             return VidModeErrorBase + XF86VidModeClientNotLocal;
++            return VidModeErrorBase + XF86VidModeClientNotLocal;
+     }
+ }
+ 
+ void
+- XFree86VidModeExtensionInit(void) {
++XFree86VidModeExtensionInit(void)
++{
+     ExtensionEntry *extEntry;
+     ScreenPtr pScreen;
+     int i;
+     Bool enabled = FALSE;
+ 
+-     DEBUG_P("XFree86VidModeExtensionInit");
++    DEBUG_P("XFree86VidModeExtensionInit");
+ 
+     if (!dixRegisterPrivateKey(&VidModeClientPrivateKeyRec, PRIVATE_CLIENT, 0))
+-         return;
++        return;
+ #ifdef XF86VIDMODE_EVENTS
+     if (!dixRegisterPrivateKey(&ScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
+-         return;
++        return;
+ #endif
+ 
+ #ifdef XF86VIDMODE_EVENTS
+-     EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent");
++    EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent");
+ #endif
+ 
+     for (i = 0; i < screenInfo.numScreens; i++) {
+@@ -1990,8 +2124,8 @@ void
+             enabled = TRUE;
      }
+     /* This means that the DDX doesn't want the vidmode extension enabled */
+-        if (!enabled)
+-         return;
++    if (!enabled)
++        return;
  
--    if (have_outputs) {
--	/* Mirror output modes to scrn mode list */
--	xf86SetScrnInfoModes (scrn);
--    } else {
--	/* Clear any existing modes from scrn->modes */
--	while (scrn->modes != NULL)
--	    xf86DeleteMode(&scrn->modes, scrn->modes);
--	scrn->modes = xf86ModesAdd(scrn->modes,
--				   xf86CVTMode(width, height, 60, 0, 0));
--    }
-+    xf86SetScrnInfoModes (scrn);
- 
-     success = TRUE;
-  bailout:
+     if (
+ #ifdef XF86VIDMODE_EVENTS
 --
 cgit v0.9.0.2-2-gbebe
-From 97f2ae60fc0cc755abd8b88df826fcb1a20464fe Mon Sep 17 00:00:00 2001
-From: Christopher Yeleighton <giecrilj@stegny.2a.pl>
-Date: Tue, 25 Oct 2011 01:47:06 +0000
-Subject: Bug 38420: Xvfb crashes in miInitVisuals() when started with depth=2
+From 15607cf2dc87405606b20113011f1ebd97637d32 Mon Sep 17 00:00:00 2001
+From: Daniel Kurtz <djkurtz@chromium.org>
+Date: Thu, 12 Apr 2012 00:11:10 +0000
+Subject: dix: don't BUG_WARN for button events from button-only device
 
-https://bugs.freedesktop.org/show_bug.cgi?id=38420
+Events from button-only devices still need coordinates, and they get them
+from scale_to_desktop().  Therefore, a dev without valuators is not a bug.
+However, a dev with valuators, but less than two of them still is a bug.
 
-Exit with fatal error message, not segfault.
+This was noticed when unplugging a "Creative Technology SB Arena Headset",
+which has some BTNs and some KEYs, but no REL or ABS valuators.
+It emits [BTN_3] = 0 on unplug, which would trigger the BUG_WARN.
 
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit 7d50211ab57a35910d79fc3f67ae89aff91fa995)
+Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
+Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+(cherry picked from commit c5a45b0f7658c77725adce2b64a0fbd62f208328)
 ---
-diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
-index 31ed505..dce3f84 100644
---- a/hw/vfb/InitOutput.c
-+++ b/hw/vfb/InitOutput.c
-@@ -864,6 +864,8 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
- 				   (1 << DirectColor)),
- 				  10, TrueColor, 0x3ff00000, 0x000ffc00, 0x000003ff);
- 	break;
-+    default:
-+	return FALSE;
-     }
+diff --git a/dix/getevents.c b/dix/getevents.c
+index 4e0af45..9dc9617 100644
+--- a/dix/getevents.c
++++ b/dix/getevents.c
+@@ -842,7 +842,7 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask,
+     ScreenPtr scr = miPointerGetScreen(dev);
+     double x, y;
  
-     miSetPixmapDepths ();
+-    BUG_WARN(!dev->valuator || dev->valuator->numAxes < 2);
++    BUG_WARN(dev->valuator && dev->valuator->numAxes < 2);
+     if (!dev->valuator || dev->valuator->numAxes < 2) {
+         /* if we have no axes, last.valuators must be in screen coords
+          * anyway */
 --
 cgit v0.9.0.2-2-gbebe
-From 34bb83b9df20ff63dbb147ed661f39efb8bae8e4 Mon Sep 17 00:00:00 2001
+From f8d2ca759ad37d5e99d462f21a2259ce17bb1a00 Mon Sep 17 00:00:00 2001
 From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 24 Oct 2011 02:00:32 +0000
-Subject: dix: block signals when closing all devices
+Date: Wed, 18 Apr 2012 05:56:37 +0000
+Subject: dix: indentation fix
 
-When closing down all devices, we manually unset master for all attached
-devices, but the device's sprite info still points to the master's sprite
-info. This leaves us a window where the master is freed already but the
-device isn't yet. A signal during that window causes dereference of the
-already freed spriteInfo in mieqEnqueue's EnqueueScreen macro.
-
-Simply block signals when removing all devices. It's not like we're really
-worrying about high-responsive input at this stage.
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+(cherry picked from commit ebf214876a4885a98ded4f5525925b69005fae05)
+---
+diff --git a/dix/dispatch.c b/dix/dispatch.c
+index 9a2e22f..d971805 100644
+--- a/dix/dispatch.c
++++ b/dix/dispatch.c
+@@ -416,8 +416,8 @@ Dispatch(void)
+                 if (XSERVER_REQUEST_START_ENABLED())
+                     XSERVER_REQUEST_START(LookupMajorName(client->majorOp),
+                                           client->majorOp,
+-                                          ((xReq *) client->requestBuffer)->
+-                                          length, client->index,
++                                          ((xReq *) client->requestBuffer)->length,
++                                          client->index,
+                                           client->requestBuffer);
+ #endif
+                 if (result > (maxBigRequestSize << 2))
+--
+cgit v0.9.0.2-2-gbebe
+From f012f0c48dedba4df69cc1a1ecdf8ee5d37daca9 Mon Sep 17 00:00:00 2001
+From: Michal Suchanek <hramrach@gmail.com>
+Date: Thu, 26 Apr 2012 13:11:20 +0000
+Subject: dmx: Annotate dmxlog.c with _X_ATTRIBUTE_PRINTF and _X_NORETURN
 
-https://bugzilla.redhat.com/show_bug.cgi?id=737031
+and fix resulting printf warning in dmxLogVisual
 
+Signed-off-by: Michal Suchanek <hramrach@gmail.com>
+Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Julien Cristau <jcristau@debian.org>
-(cherry picked from commit d7c44a7c9760449bef263413ad3b20f19b1dc95a)
+(cherry picked from commit d662fa2450856777b59c4b62b912395a8bfd52fd)
+---
+diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c
+index b56bb93..151f672 100644
+--- a/hw/dmx/dmxlog.c
++++ b/hw/dmx/dmxlog.c
+@@ -86,6 +86,8 @@ ErrorF(const char *format, ...)
+ 
+ /** Provide an VFatalError function when used stand-alone. */
+ static void
++VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN;
++static void
+ VFatalError(const char *format, va_list args)
+ {
+     vfprintf(stderr, format, args);     /* RATS: We assume the format string
+@@ -104,7 +106,9 @@ VErrorF(const char *format, va_list args)
+ }
+ #else
+ /** This function was removed between XFree86 4.3.0 and XFree86 4.4.0. */
+-extern void AbortServer(void);
++extern void AbortServer(void) _X_NORETURN;
++static void
++VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN;
+ static void
+ VFatalError(const char *format, va_list args)
+ {
+@@ -166,6 +170,8 @@ dmxHeader(dmxLogLevel logLevel, DMXInputInfo * dmxInput,
+ /* Prints the error message with the appropriate low-level X output
+  * routine. */
+ static void
++dmxMessage(dmxLogLevel logLevel, const char *format, va_list args) _X_ATTRIBUTE_PRINTF(2, 0);
++static void
+ dmxMessage(dmxLogLevel logLevel, const char *format, va_list args)
+ {
+     if (logLevel == dmxFatal || logLevel >= dmxCurrentLogLevel) {
+@@ -303,10 +309,11 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual)
+         class = "DirectColor";
+         break;
+     }
++#define VisualLogFormat "0x%02lx %s %2db %db/rgb %3d 0x%04lx 0x%04lx 0x%04lx%s\n"
+ 
+     if (dmxScreen) {
+         dmxLogOutput(dmxScreen,
+-                     "0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n",
++                     VisualLogFormat,
+                      vi->visualid, class, vi->depth, vi->bits_per_rgb,
+                      vi->colormap_size,
+                      vi->red_mask, vi->green_mask, vi->blue_mask,
+@@ -314,7 +321,7 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual)
+     }
+     else {
+         dmxLog(dmxInfo,
+-               "  0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n",
++               "  " VisualLogFormat,
+                vi->visualid, class, vi->depth, vi->bits_per_rgb,
+                vi->colormap_size,
+                vi->red_mask, vi->green_mask, vi->blue_mask,
+diff --git a/hw/dmx/dmxlog.h b/hw/dmx/dmxlog.h
+index 4d4cd26..162484b 100644
+--- a/hw/dmx/dmxlog.h
++++ b/hw/dmx/dmxlog.h
+@@ -55,18 +55,23 @@ typedef enum {
+ /* Logging functions used by Xserver/hw/dmx routines. */
+ extern dmxLogLevel dmxSetLogLevel(dmxLogLevel newLevel);
+ extern dmxLogLevel dmxGetLogLevel(void);
+-extern void dmxLog(dmxLogLevel logLevel, const char *format, ...);
+-extern void dmxLogCont(dmxLogLevel logLevel, const char *format, ...);
++extern void dmxLog(dmxLogLevel logLevel, const char *format,
++                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
++extern void dmxLogCont(dmxLogLevel logLevel, const char *format,
++                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
+ extern const char *dmxEventName(int type);
+ 
+ #ifndef DMX_LOG_STANDALONE
+-extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format, ...);
++extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format,
++                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
+ extern void dmxLogOutputCont(DMXScreenInfo * dmxScreen, const char *format,
+-                             ...);
++                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
+ extern void dmxLogOutputWarning(DMXScreenInfo * dmxScreen, const char *format,
+-                                ...);
+-extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format, ...);
+-extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format, ...);
++                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
++extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format,
++                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
++extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format,
++                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
+ extern void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv);
+ extern void dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi,
+                          int defaultVisual);
+--
+cgit v0.9.0.2-2-gbebe
+From 58dfb13953af71021317b9d85230b1163198f031 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu, 10 May 2012 07:53:20 +0000
+Subject: Revert "dix: when disabling a device, release all buttons and keys"
+
+This reverts commit 90299556db24543bb7365e8c2897deca3aa219e7.
+
+The commit being reverted triggered a segfault on server shutdown when a
+device posts raw events after the root windows are forced to NULL.
+
+https://lists.debian.org/debian-x/2012/05/msg00240.html
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 ---
 diff --git a/dix/devices.c b/dix/devices.c
-index 0ccf252..cbdd4ea 100644
+index d0e99bd..0125504 100644
 --- a/dix/devices.c
 +++ b/dix/devices.c
-@@ -982,6 +982,8 @@ CloseDownDevices(void)
- {
-     DeviceIntPtr dev;
- 
-+    OsBlockSignals();
-+
-     /* Float all SDs before closing them. Note that at this point resources
-      * (e.g. cursors) have been freed already, so we can't just call
-      * AttachDevice(NULL, dev, NULL). Instead, we have to forcibly set master
-@@ -1004,6 +1006,8 @@ CloseDownDevices(void)
-     inputInfo.keyboard = NULL;
-     inputInfo.pointer = NULL;
-     XkbDeleteRulesDflts();
-+
-+    OsReleaseSignals();
- }
+@@ -432,8 +432,6 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
+     if (*prev != dev)
+         return FALSE;
  
- /**
+-    ReleaseButtonsAndKeys(dev);
+-
+     /* float attached devices */
+     if (IsMaster(dev)) {
+         for (other = inputInfo.devices; other; other = other->next) {
 --
 cgit v0.9.0.2-2-gbebe
diff --git a/extra/xorg-server/loongson.patch b/extra/xorg-server/loongson.patch
index b6c9692fc..ba4811ccf 100644
--- a/extra/xorg-server/loongson.patch
+++ b/extra/xorg-server/loongson.patch
@@ -1,34 +1,34 @@
-diff -ru xorg-server-1.11.2.orig/hw/xfree86/dri/sarea.h xorg-server-1.11.2/hw/xfree86/dri/sarea.h
---- xorg-server-1.11.2.orig/hw/xfree86/dri/sarea.h	2011-12-07 16:47:06.971237310 +0100
-+++ xorg-server-1.11.2/hw/xfree86/dri/sarea.h	2011-12-07 16:48:40.132392770 +0100
-@@ -42,6 +42,8 @@
+diff -ru xorg-server-1.12.1.orig/hw/xfree86/dri/sarea.h xorg-server-1.12.1/hw/xfree86/dri/sarea.h
+--- xorg-server-1.12.1.orig/hw/xfree86/dri/sarea.h	2012-05-17 20:42:38.676378113 +0200
++++ xorg-server-1.12.1/hw/xfree86/dri/sarea.h	2012-05-17 20:45:49.936966941 +0200
+@@ -41,6 +41,8 @@
  /* SAREA area needs to be at least a page */
  #if defined(__alpha__)
  #define SAREA_MAX 			0x2000
 +#elif defined(__mips__)
 +#define SAREA_MAX                      0x4000
  #elif defined(__ia64__)
- #define SAREA_MAX			0x10000		/* 64kB */
+ #define SAREA_MAX			0x10000 /* 64kB */
  #else
-diff -ru xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c
---- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c	2011-12-07 16:47:06.967237429 +0100
-+++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c	2011-12-07 16:52:33.200881187 +0100
-@@ -493,9 +493,10 @@
+diff -ru xorg-server-1.12.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.12.1/hw/xfree86/os-support/linux/lnx_video.c
+--- xorg-server-1.12.1.orig/hw/xfree86/os-support/linux/lnx_video.c	2012-05-17 20:42:38.672349775 +0200
++++ xorg-server-1.12.1/hw/xfree86/os-support/linux/lnx_video.c	2012-05-17 20:47:23.059649687 +0200
+@@ -484,9 +484,10 @@
  Bool
  xf86EnableIO(void)
  {
 -#if defined(__powerpc__)
 +#if defined(__powerpc__) || defined(__mips__)
- 	int fd;
- 	unsigned int ioBase_phys;
-+	extern unsigned int IOPortBase;
+     int fd;
+     unsigned int ioBase_phys;
++    extern unsigned int IOPortBase;
  #endif
  
- 	if (ExtendedEnabled)
-@@ -520,6 +521,21 @@
+     if (ExtendedEnabled)
+@@ -511,6 +512,21 @@
  #endif
- 	}
- 	close(fd);
+     }
+     close(fd);
 +#elif defined(__mips__)
 +	fd = open("/dev/mem", O_RDWR);
 +	IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
@@ -45,5 +45,5 @@ diff -ru xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-se
 +		"xf86EnableIOPorts: map iobase (%x)\n",
 +		IOPortBase);
  #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
-         if (ioperm(0, 1024, 1) || iopl(3)) {
-                 if (errno == ENODEV)
+     if (ioperm(0, 1024, 1) || iopl(3)) {
+         if (errno == ENODEV)
diff --git a/extra/xorg-xinput/PKGBUILD b/extra/xorg-xinput/PKGBUILD
index 5e794b340..73f274258 100644
--- a/extra/xorg-xinput/PKGBUILD
+++ b/extra/xorg-xinput/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156282 2012-04-16 15:19:19Z andyrtr $
+# $Id: PKGBUILD 159187 2012-05-17 13:48:28Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xinput
-pkgver=1.5.99.901
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="Small commandline tool to configure devices"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ depends=('libx11' 'libxi>=1.5.99.2' 'xorg-xrandr' 'libxinerama')
 makedepends=('xorg-util-macros' 'inputproto')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xinput-${pkgver}.tar.bz2)
-sha1sums=('bc99cddeac306a23ad96f35d8ff3314d7e45d460')
+sha256sums=('4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e')
 
 build() {
   cd "${srcdir}/xinput-${pkgver}"
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 4f4e269a8..b46b7f463 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 147119 2012-01-22 10:53:02Z andyrtr $
+# $Id: PKGBUILD 158920 2012-05-13 08:00:04Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=278
+pkgver=279
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('3eeddfe35cb0a2db1924cfe0c20be443'
+md5sums=('42a76a871c1d640719702801a0795d72'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {
@@ -55,4 +55,6 @@ package() {
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 "${srcdir}/LICENSE" \
       "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -m755 -d ${pkgdir}/usr/share/applications
+  install -m644 ${srcdir}/${pkgname}-${pkgver}/{xterm,uxterm}.desktop ${pkgdir}/usr/share/applications/
 }
diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index 2ece9d487..b1ff07df2 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157006 2012-04-23 09:11:04Z ibiru $
+# $Id: PKGBUILD 159197 2012-05-17 16:15:13Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=yelp
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 install=yelp.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0485c170210b681a07b709fad7c43010cd683f33f7cb5a62eb05fcccf2507184')
+sha256sums=('33f573da4d0b766aba7ebfab14470694e3245dffb2b63153f34bf8240b13c3a3')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/testing/ntfs-3g_ntfsprogs/PKGBUILD b/testing/ntfs-3g_ntfsprogs/PKGBUILD
deleted file mode 100644
index d1084ddee..000000000
--- a/testing/ntfs-3g_ntfsprogs/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 158659 2012-05-05 16:20:23Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Thomas Bächler <thomas.archlinux.org>
-
-pkgbase=ntfs-3g_ntfsprogs
-pkgname=('ntfs-3g' 'ntfsprogs')
-pkgver=2012.1.15
-pkgrel=3
-url="http://www.tuxera.com"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('glibc' 'fuse')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz)
-sha1sums=('8d55cf49afde172fefa369a0a85289e09c4d7bbb')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \
-    --with-fuse=external --disable-static \
-    --enable-posix-acls --mandir=/usr/share/man
-  make
-}
-
-package_ntfs-3g() {
-  pkgdesc="Stable read and write NTFS driver"
-
-  for DIR in src libntfs-3g include; do
-    cd "$srcdir/$pkgbase-$pkgver/$DIR"
-    make DESTDIR="$pkgdir" install
-  done
-
-  mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/
-  mv "$pkgdir"/bin/* "$pkgdir"/usr/bin/
-  rm -rf "$pkgdir"/{lib,{s,}bin}
-
-  cd "$pkgdir"/usr/bin
-  ln -s ntfs-3g mount.ntfs
-  ln -s ntfs-3g mount.ntfs-3g
-  ln -s lowntfs-3g mount.lowntfs-3g
-}
-
-package_ntfsprogs() {
-  pkgdesc="NTFS filesystem utilities"
-  depends=('util-linux' 'ntfs-3g')
-
-  cd "$srcdir/$pkgbase-$pkgver/ntfsprogs"
-  make DESTDIR="$pkgdir" install
-
-  mv "$pkgdir"/sbin/* "$pkgdir"/usr/bin/
-  rm -rf "$pkgdir"/sbin
-}