Mon Mar 19 00:01:09 UTC 2012

61 files changed, 1994 insertions, 346 deletions

diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD
index e57e82843..fb206952e 100644
--- a/community/blender/PKGBUILD
+++ b/community/blender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67172 2012-03-05 08:56:35Z ibiru $
+# $Id: PKGBUILD 68036 2012-03-17 05:43:38Z svenstaro $
 # Contributor: John Sowiak <john@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
@@ -14,15 +14,16 @@ _svn=false
 
 pkgname=blender
 pkgver=2.62
-pkgrel=2
+pkgrel=3
 epoch=3
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.blender.org"
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
-         'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'openimageio')
+depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils'
+         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew'
+         'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada'
+         'openimageio' 'libsndfile' 'jack')
 makedepends=('cmake' 'boost' 'cuda-toolkit')
 optdepends=('cuda-toolkit: cycles renderer cuda support')
 options=(!strip)
@@ -64,6 +65,7 @@ build() {
     -DWITH_OPENCOLLADA:BOOL=ON \
     -DOPENIMAGEIO_ROOT_DIR:STRING=/usr \
     -DWITH_GAMEENGINE:BOOL=ON \
+    -DWITH_JACK:BOOL=ON \
     -DWITH_PLAYER:BOOL=ON \
     -DWITH_BUILTIN_GLEW:BOOL=OFF \
     -DWITH_CODEC_FFMPEG:BOOL=ON \
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index ba1159032..ad529b974 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56110 2011-10-01 19:01:59Z ibiru $
+# $Id: PKGBUILD 68092 2012-03-17 19:45:14Z giovanni $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 _pkgname=gnome-settings-daemon
 pkgname=$_pkgname-updates
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Updates plugin for the GNOME Settings daemon"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org"
diff --git a/community/gnome-settings-daemon-updates/gnome-settings-daemon.install b/community/gnome-settings-daemon-updates/gnome-settings-daemon.install
index 24072f316..326aa98a2 100644
--- a/community/gnome-settings-daemon-updates/gnome-settings-daemon.install
+++ b/community/gnome-settings-daemon-updates/gnome-settings-daemon.install
@@ -1,5 +1,5 @@
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  glib-compile-schemas usr/share/glib-2.0/schemas
 }
 
 post_upgrade() {
diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD
index 90208050a..f6d86b4ad 100644
--- a/community/libmediainfo/PKGBUILD
+++ b/community/libmediainfo/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 58331 2011-11-11 18:59:34Z spupykin $
+# $Id: PKGBUILD 68074 2012-03-17 18:50:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  hydro <hydro@freenet.de>
 
 pkgname=libmediainfo
-pkgver=0.7.51
+pkgver=0.7.54
 pkgrel=1
 pkgdesc="shared library for mediainfo"
 arch=('i686' 'x86_64')
 url="http://mediainfo.sourceforge.net"
 license=('GPL')
-depends=( 'curl' 'libmms>=0.5-2' 'libzen>=0.4.15')
+depends=( 'curl' 'libmms' 'libzen')
 makedepends=('libtool' 'automake' 'autoconf')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2
 	libmediainfo-0.7.50-libmms.patch)
-md5sums=('eb377eebb40d64bf980c857f36cc5b51'
+md5sums=('4d936fc2122ad1199e3185d2d6053715'
          '2f4b21cc250f663d52b497dedb963e3b')
 
 build() {
diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD
index 4f4fd5d7f..fd77c2bba 100644
--- a/community/libzen/PKGBUILD
+++ b/community/libzen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58333 2011-11-11 19:01:15Z spupykin $
+# $Id: PKGBUILD 68076 2012-03-17 18:51:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: hydro <hydro@freenet.de>
 
 pkgname=libzen
-pkgver=0.4.23
+pkgver=0.4.25
 pkgrel=1
 pkgdesc="shared library for libmediainfo and mediainfo"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('gcc-libs')
 makedepends=('libtool' 'automake' 'autoconf')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2)
-md5sums=('00e622cf33eeb134a785463fbf49d227')
+md5sums=('f30a139d506170aeeb3bc47d15e10fae')
 
 build() {
   cd $srcdir/ZenLib/Project/GNU/Library
@@ -28,9 +28,9 @@ package() {
   make DESTDIR=$pkgdir install
   install -dm 755 $pkgdir/usr/include/ZenLib
   install -m 644 $srcdir/ZenLib/Source/ZenLib/*.h $pkgdir/usr/include/ZenLib
-  for i in Base64 HTTP_Client Format/Html Format/Http TinyXml; do
-    install -dm 755 $pkgdir/usr/include/ZenLib/$i
-    install -m 644 $srcdir/ZenLib/Source/ZenLib/$i/*.h $pkgdir/usr/include/ZenLib/$i
+  for i in HTTP_Client Format/Html Format/Http; do
+    install -dm0755 $pkgdir/usr/include/ZenLib/$i
+    install -m0644 $srcdir/ZenLib/Source/ZenLib/$i/*.h $pkgdir/usr/include/ZenLib/$i
   done
   install -dm 755 $pkgdir/usr/lib/pkgconfig
   install -m 644 $srcdir/ZenLib/Project/GNU/Library/libzen.pc $pkgdir/usr/lib/pkgconfig
diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD
index dc318cecf..ff010adb3 100644
--- a/community/linux-tools/PKGBUILD
+++ b/community/linux-tools/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 65741 2012-02-22 12:12:10Z seblu $
+# $Id: PKGBUILD 68094 2012-03-17 19:58:42Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=linux-tools
 pkgname=('perf' 'cpupower')
 pkgver=3.2
-kernver=${pkgver}.7
+kernver=${pkgver}.11
 [[ ${kernver##*rc} != $kernver ]] && testing='testing'
-pkgrel=3
+pkgrel=4
 license=('GPL2')
 arch=('i686' 'x86_64')
 url='http://www.kernel.org'
@@ -18,7 +18,7 @@ source=("http://ftp.kernel.org/pub/linux/kernel/v3.0/$testing/linux-$kernver.tar
         'cpupower.rc'
         'cpupower.conf'
         'cpupower.service') 
-md5sums=('66966f6c1c4b0279c5563eabdafbb044'
+md5sums=('0e3d5a3dab51b3c36940461582bc06df'
          '26af384ca282bc0dc38ff65acc7bb4b9'
          '857ccdd0598511e3bf4b63522754dc48'
          '20870541e88109d2f153be3c58a277f1')
diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD
index d2a10bc10..63c9fbf79 100644
--- a/community/mediainfo-gui/PKGBUILD
+++ b/community/mediainfo-gui/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 58337 2011-11-11 19:02:47Z spupykin $
+# $Id: PKGBUILD 68080 2012-03-17 18:53:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: hydro <hydro@freenet.de>
 
 pkgname=mediainfo-gui
-pkgver=0.7.51
+pkgver=0.7.54
 pkgrel=1
 pkgdesc="GUI for mediainfo"
 arch=('i686' 'x86_64')
 url="http://mediainfo.sourceforge.net"
 license=('GPL')
-depends=('libmediainfo>=0.7.35' 'wxgtk')
+depends=('libmediainfo' 'wxgtk')
 makedepends=('libtool' 'automake' 'autoconf')
 install=mediainfo-gui.install
 source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2)
-md5sums=('b06dc34481ce2971c28e517b146888e8')
+md5sums=('c851998158213a6b837048d67e1c2b9a')
 
 build() {
   cd $srcdir/MediaInfo/Project/GNU/GUI
@@ -25,9 +25,9 @@ build() {
 package() {
   cd $srcdir/MediaInfo/Project/GNU/GUI
   make DESTDIR=$pkgdir install
-  install -D -m 644 $srcdir/MediaInfo/Source/Ressource/Image/MediaInfo.png \
+  install -D -m 644 $srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png \
                     $pkgdir/usr/share/icons/hicolor/128x128/apps/mediainfo.png
-  install -D -m 644 $srcdir/MediaInfo/Source/Ressource/Image/MediaInfo.png \
+  install -D -m 644 $srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png \
                     $pkgdir/usr/share/pixmaps/mediainfo-gui.png
   install -D -m 644 $srcdir/MediaInfo/Project/GNU/GUI/mediainfo-gui.desktop \
                     $pkgdir/usr/share/applications/mediainfo-gui.desktop
diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD
index 326c00e48..b1dea9d3a 100644
--- a/community/mediainfo/PKGBUILD
+++ b/community/mediainfo/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 58335 2011-11-11 19:02:05Z spupykin $
+# $Id: PKGBUILD 68078 2012-03-17 18:52:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: hydro <hydro@freenet.de>
 
 pkgname=mediainfo
-pkgver=0.7.51
+pkgver=0.7.54
 pkgrel=1
 pkgdesc="supplies technical and tag information about a video or audio file"
 arch=('i686' 'x86_64')
 url="http://mediainfo.sourceforge.net"
 license=('GPL')
-depends=('libmediainfo>=0.7.35')
+depends=('libmediainfo')
 makedepends=('libtool' 'automake' 'autoconf')
 source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2)
-md5sums=('b06dc34481ce2971c28e517b146888e8')
+md5sums=('c851998158213a6b837048d67e1c2b9a')
 
 build() {
   cd $srcdir/MediaInfo/Project/GNU/CLI
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index 1d63d33c5..105dd0636 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 67665 2012-03-13 16:41:27Z spupykin $
+# $Id: PKGBUILD 68084 2012-03-17 18:56:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools-modules
-pkgver=2011.12.20
-_pkgsubver=562307
-pkgrel=7
+pkgver=2012.03.13
+_pkgsubver=651368
+pkgrel=1
 pkgdesc="kernel modules for the open source implementation of VMware Tools"
 arch=('i686' 'x86_64')
 url="http://open-vm-tools.sourceforge.net/"
@@ -16,7 +16,7 @@ install=$pkgname.install
 options=('!strip')
 source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz"
 	"modprobe.conf")
-md5sums=('529c15cb6cfa2972a96664c504dee560'
+md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7'
          'ac9b8e3cb798f5056ca92767ec705117')
 
 build() {
diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD
index 8f9711567..37c82a9e9 100644
--- a/community/open-vm-tools/PKGBUILD
+++ b/community/open-vm-tools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 62772 2012-01-26 14:44:28Z spupykin $
+# $Id: PKGBUILD 68082 2012-03-17 18:55:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools
-pkgver=2011.12.20
-_pkgsubver=562307
-pkgrel=2
+pkgver=2012.03.13
+_pkgsubver=651368
+pkgrel=1
 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/"
@@ -24,8 +24,8 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}
 	tools.conf
 	vmware-guestd
 	xautostart.conf)
-md5sums=('529c15cb6cfa2972a96664c504dee560'
-         '06f7448e274db2a911f582e276088fc9'
+md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7'
+         'b8f68fef3d388489e40dba581b6da18a'
          '199508b0d3fe6fa9b726d09170bf51f1'
          '8c333a979578bdc0c3134c1dd6bb7353'
          '79b0a14d86191fee70a4639da8bd7785'
diff --git a/community/open-vm-tools/scripts-network.patch b/community/open-vm-tools/scripts-network.patch
index 13ea7f565..44c7e6dcb 100644
--- a/community/open-vm-tools/scripts-network.patch
+++ b/community/open-vm-tools/scripts-network.patch
@@ -1,5 +1,5 @@
---- network.org	2010-04-28 10:21:14.000000000 +0000
-+++ network	2010-04-28 10:24:00.000000000 +0000
+--- network.org	2012-03-17 22:20:11.000000000 +0400
++++ network	2012-03-17 22:18:47.000000000 +0400
 @@ -34,51 +34,6 @@
  
  
@@ -17,47 +17,57 @@
 -#
 -
 -find_networking_script() {
--    local script="error"
--    for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
--        if [ -d "$dir/rc0.d" ] &&
--	    [ -d "$dir/rc1.d" ] &&
--	    [ -d "$dir/rc2.d" ] &&
--	    [ -d "$dir/rc3.d" ] &&
--	    [ -d "$dir/rc4.d" ] &&
--	    [ -d "$dir/rc5.d" ] &&
--	    [ -d "$dir/rc6.d" ]; then
+-   local script="error"
+-   for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
+-      if [ -d "$dir/rc0.d" ] &&
+-         [ -d "$dir/rc1.d" ] &&
+-         [ -d "$dir/rc2.d" ] &&
+-         [ -d "$dir/rc3.d" ] &&
+-         [ -d "$dir/rc4.d" ] &&
+-         [ -d "$dir/rc5.d" ] &&
+-         [ -d "$dir/rc6.d" ]; then
 -
--	    # Now find the appropriate networking script.
--	    if [ -d "$dir/init.d" ]; then
--		if [ -x "$dir/init.d/network" ]; then
--		    script="$dir/init.d/network"
--		elif [ -x "$dir/init.d/networking" ]; then
--		    script="$dir/init.d/networking"
--		fi
--	    else
--		if [ -x "$dir/network" ]; then
--		    script="$dir/network"
--		elif [ -x "$dir/networking" ]; then
--		    script="$dir/networking"
--		fi
--	    fi
--        fi
--    done
+-         # Now find the appropriate networking script.
+-         if [ -d "$dir/init.d" ]; then
+-            if [ -x "$dir/init.d/network" ]; then
+-               script="$dir/init.d/network"
+-            elif [ -x "$dir/init.d/networking" ]; then
+-               script="$dir/init.d/networking"
+-            fi
+-         else
+-            if [ -x "$dir/network" ]; then
+-               script="$dir/network"
+-            elif [ -x "$dir/networking" ]; then
+-               script="$dir/networking"
+-            fi
+-         fi
+-      fi
+-   done
 -
--    echo "$script"
+-   echo "$script"
 -}
 -
 -
 -#
- # save_active_NIC_list --
+ # run_network_script --
  #
- #    Records a list of every active NIC to /var/run/vmware-active-nics.
-@@ -205,7 +160,7 @@
-    exitCode=0
-    activeList=/var/run/vmware-active-nics
+ # Finds out how to run the system's script used to control networking, and
+@@ -87,17 +42,7 @@
+ #
+ run_network_script()
+ {
+-   script=`find_networking_script`
+-   [ "$script" != "error" ] || Panic "Cannot find system networking script."
+-
+-   # Using SysV "service" if it exists, otherwise fall back to run the script directly
+-   service=`which service 2>/dev/null`
+-   if [ $? = 0 -a -n "$service" ]; then
+-      serviceName=`basename "$script"`
+-      "$service" "$serviceName" "$1"
+-   else
+-      "$script" "$1"
+-   fi
++  /etc/rc.d/network "$1"
+ }
  
--   networkScript=`find_networking_script`
-+   networkScript=/etc/rc.d/network
-    [ "$networkScript" != "error" ] || Panic "Cannot find system networking script."
  
-    # XXX Are these really necessary?  If so, we should have seen customer
diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
index 837fbf183..c3a38cdf8 100644
--- a/community/openimageio/PKGBUILD
+++ b/community/openimageio/PKGBUILD
@@ -1,47 +1,39 @@
-# $Id: PKGBUILD 67891 2012-03-15 20:13:49Z svenstaro $
+# $Id: PKGBUILD 68034 2012-03-17 05:42:53Z svenstaro $
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
-_pkg=OpenImageIO
 pkgname=openimageio
+_pkgname=OpenImageIO
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
 arch=(i686 x86_64)
 url="http://www.openimageio.org/"
 license=('custom')
 depends=('openexr' 'boost-libs' 'jasper' 'glew')
 makedepends=('cmake' 'qt' 'python2' 'boost')
-optdepends=('qt: iv image viewer' 'python2: bindings support')
-options=(!buildflags)
+optdepends=('qt: iv image viewer'
+            'python2: bindings support')
 source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}")
 md5sums=('5b74d7bda23f4b0e33c5104fd8dbdf79')
 
 build() {
-  cd "$srcdir"/$_pkg*
+  cd "$srcdir"/$_pkgname*/src
 
-  # strange bug on i686, see https://github.com/OpenImageIO/oiio/issues/204
-  [[ $CARCH == "i686" ]] && make debug || make
+  [[ -d build ]] && rm -r build
+  mkdir build && cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+  make
 }
 
 package() {
-  cd "$srcdir"/$_pkg*/dist/*
+  cd "$srcdir"/$_pkgname*/src/build
 
-  # prepare dirs
-  install -d "$pkgdir"/usr/{share/doc/$_pkg,lib/python2.7/site-packages}
+  make DESTDIR=$pkgdir install
 
-  # bin
-  cp -r bin include lib "$pkgdir/usr"
+  mv $pkgdir/usr/lib/python $pkgdir/usr/lib/python2.7
 
-  # docs
-  cp -r doc/* "$pkgdir/usr/share/doc/$_pkg"
-
-  # python module
-  cp -r python/* "$pkgdir/usr/lib/python2.7/site-packages"
-
-  pwd
-  cd ../..
   # license
-  pwd
+  cd ../..
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/pigz/PKGBUILD b/community/pigz/PKGBUILD
index cc1e07c26..6a80d70cb 100755
--- a/community/pigz/PKGBUILD
+++ b/community/pigz/PKGBUILD
@@ -1,9 +1,10 @@
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# $Id: PKGBUILD 68038 2012-03-17 08:29:09Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski
 # Contributor: Laszlo Papp <djszapi2@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=pigz
-pkgver=2.2.3
+pkgver=2.2.4
 pkgrel=1
 pkgdesc="Parallel implementation of the gzip file compressor"
 arch=('i686' 'x86_64')
@@ -11,11 +12,10 @@ url="http://www.zlib.net/pigz/"
 license=('custom')
 depends=('zlib')
 source=(http://www.zlib.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('8330a6c6a3e5f1954687aaba4b973a6f')
+md5sums=('9df2a3c742524446fa4e797c17e8fd85')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
-  #sed -i s/"CFLAGS=".*/"CFLAGS=${CFLAGS}"/g Makefile 
   make
 }
 
diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD
index a062110dc..0d96246c0 100644
--- a/community/python-psutil/PKGBUILD
+++ b/community/python-psutil/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66402 2012-02-24 13:09:02Z seblu $
+# $Id: PKGBUILD 68068 2012-03-17 16:12:56Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=python-psutil
 pkgname=('python-psutil' 'python2-psutil')
 pkgver=0.4.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://code.google.com/p/psutil/'
 license=('custom: BSD')
@@ -13,16 +13,11 @@ source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz")
 sha1sums=('2705862e00280a7fa76cfb687dbd61623d5e236e')
 
 build() {
-  'cp' -a psutil-$pkgver psutil2-$pkgver
-  # build python
   cd psutil-$pkgver
-  python setup.py build
-  
-  cd ../psutil2-$pkgver
-  # change python interpreter
-  find -name '*.py' -exec \
-     sed -i '1s,^#!/usr/bin/env python$,#!/usr/bin/python2,' {} \; -print
-  python2 setup.py build
+  python setup.py build --build-lib=build/python
+  python2 setup.py build --build-lib=build/python2
+  find build/python2 -type f -exec \
+    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
 }
 
 package_python-psutil() {
@@ -30,16 +25,18 @@ package_python-psutil() {
   depends=('glibc' 'python')
 
   cd psutil-$pkgver
-  python setup.py install --root="$pkgdir"
+  python setup.py build --build-lib=build/python \
+                  install --root="$pkgdir" --optimize=1
   install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE
 }
 
 package_python2-psutil() {
-  pkgdesc='A cross-platform process and system utilities module for Python 2'
+  pkgdesc='A cross-platform process and system utilities module for Python2'
   depends=('glibc' 'python2')
 
-  cd psutil2-$pkgver
-  python2 setup.py install --root="$pkgdir"
+  cd psutil-$pkgver
+  python2 setup.py build --build-lib=build/python2 \
+                   install --root="$pkgdir" --optimize=1
   install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE
 }
 
diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD
index 80a3d47f2..04e7ad56b 100644
--- a/community/quassel/PKGBUILD
+++ b/community/quassel/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 57415 2011-10-27 10:22:06Z lcarlier $
+# $Id: PKGBUILD 68048 2012-03-17 13:06:01Z giovanni $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=quassel
 pkgver=0.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="QT4 irc client with a separated core"
 arch=('i686' 'x86_64')
 url="http://quassel-irc.org/"
 license=('GPL')
-depends=('kdelibs' 'oxygen-icons' 'hicolor-icon-theme')
+depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
-install=$pkgname.install
+install=quassel.install
 backup=(etc/conf.d/quassel)
-source=(http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2
-        rc.$pkgname
-        $pkgname.conf)
+source=("http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2"
+        'rc.quassel'
+        'quassel.conf')
 sha256sums=('9e78dbc28bfeda2ed66fa3082392951cbd002f851ef1a7f1228988bb18c7c98d'
             '845e621448a51ec181554e9327bfcc3a3de1501ae8f70410f0b9b8991ac171b0'
             'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
diff --git a/community/quesoglc/PKGBUILD b/community/quesoglc/PKGBUILD
index 8e12b892d..8154f6f14 100644
--- a/community/quesoglc/PKGBUILD
+++ b/community/quesoglc/PKGBUILD
@@ -1,28 +1,29 @@
+# $Id: PKGBUILD 68088 2012-03-17 19:29:26Z giovanni $
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Markus Pargmann
 
 pkgname=quesoglc
 pkgver=0.7.2
-pkgrel=1
-pkgdesc='The OpenGL Character Renderer (GLC) is a state machine that provides OpenGL programs with character rendering services via an application programming interface (API).'
+pkgrel=2
+pkgdesc="A free implementation of the OpenGL Character Renderer (GLC)"
 arch=('i686' 'x86_64')
-url='http://quesoglc.sourceforge.net/'
-license=('GPL')
-depends=('freetype2' 'fontconfig' 'freeglut' 'fribidi' 'mesa')
+url="http://quesoglc.sourceforge.net/"
+license=('LGPL2.1')
+depends=('fontconfig' 'freeglut' 'fribidi' 'glew')
+makedepends=('pkg-config')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('c2697a92e2cc00c537626020e4108a4e')
 
 build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure \
-    --prefix=/usr
+  cd "${pkgname}-${pkgver}"
 
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd "${pkgname}-${pkgver}"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/shell-fm/PKGBUILD b/community/shell-fm/PKGBUILD
index d54031f18..88cfe9926 100644
--- a/community/shell-fm/PKGBUILD
+++ b/community/shell-fm/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 15370 2010-04-10 21:42:26Z andrea $
+# $Id: PKGBUILD 68046 2012-03-17 12:04:37Z giovanni $
 # Maintainer: Daenyth
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 
 pkgname=shell-fm
-pkgver=0.7
-pkgrel=3
+pkgver=0.8
+pkgrel=1
 pkgdesc="A console based player for the streams provided by Last.FM"
 arch=('i686' 'x86_64')
 url="http://github.com/jkramer/$pkgname"
 license=('GPL')
 depends=('libmad' 'libao' 'taglib')
-source=($pkgname-$pkgver.tar.gz::http://github.com/jkramer/$pkgname/tarball/v$pkgver
-        as-needed.diff::http://bugs.gentoo.org/attachment.cgi?id=205574)
-md5sums=('3f83866622a892ee89685f1ed079eefd'
-         'e49d91e2ee7145d8cfce8d43d0ef37c6')
+source=($pkgname-$pkgver.tar.gz::http://github.com/jkramer/$pkgname/tarball/v$pkgver)
+md5sums=('ce5c45ead71a299edbff280d4007ad99')
 
 build() {
   cd "$srcdir"/jkramer-$pkgname-*
 
-  patch -Np1 < "$srcdir/as-needed.diff" || return 1
+  make
+}
+
+package() {
+  cd "$srcdir"/jkramer-$pkgname-*
 
-  make || return 1
   make DESTDIR="$pkgdir" install
 
   cd "$pkgdir/usr"
diff --git a/community/shfs-utils/PKGBUILD b/community/shfs-utils/PKGBUILD
index 13477b23d..b939c8f7c 100644
--- a/community/shfs-utils/PKGBUILD
+++ b/community/shfs-utils/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 24961 2010-08-29 19:56:51Z jlichtblau $
+# $Id: PKGBUILD 68044 2012-03-17 11:53:37Z giovanni $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
 
 pkgname=shfs-utils
 pkgver=0.35
-pkgrel=3
+pkgrel=4
 pkgdesc="SHell FileSystem Linux utils"
 url="http://shfs.sourceforge.net/"
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('glibc' 'openssh')
 makedepends=('patch')
-source=(http://downloads.sourceforge.net/sourceforge/shfs/shfs-$pkgver.tar.gz \
-        $pkgname-make.patch)
+source=("http://downloads.sourceforge.net/sourceforge/shfs/shfs-$pkgver.tar.gz"
+        'shfs-utils-make.patch')
 md5sums=('016f49d71bc32eee2b5d11fc1600cfbe'
          '49fb94b139bc69927815127f0bf85159')
 
 build() {
-  cd ${srcdir}/shfs-$pkgver
+  cd "${srcdir}/shfs-${pkgver}"
 
-  patch -Np0 -i ${srcdir}/$pkgname-make.patch
-  make utils
+  patch -Np0 -i "${srcdir}/$pkgname-make.patch"
+  make -j1 utils
 }
 
 package() {
-  cd ${srcdir}/shfs-$pkgver
+  cd "${srcdir}/shfs-${pkgver}"
 
-  make ROOT=${pkgdir} utils-install
+  make -j1 ROOT="${pkgdir}" utils-install
 }
diff --git a/community/trickle/PKGBUILD b/community/trickle/PKGBUILD
index 5b9844932..da1146356 100644
--- a/community/trickle/PKGBUILD
+++ b/community/trickle/PKGBUILD
@@ -1,22 +1,30 @@
-# $Id: PKGBUILD 39246 2011-02-07 19:18:47Z tdziedzic $
+# $Id: PKGBUILD 68040 2012-03-17 11:08:43Z giovanni $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor Romain Bouchaud-Leduc <r0m1.bl@camaris.org>
 
 pkgname=trickle
 pkgver=1.07
-pkgrel=5
-pkgdesc="Trickle - lightweight userspace bandwidth shaper"
+pkgrel=6
+pkgdesc="Lightweight userspace bandwidth shaper"
 arch=('i686' 'x86_64')
 url="http://monkey.org/~marius/trickle"
 license=('BSD')
-depends=("libevent")
-source=("http://monkey.org/~marius/trickle/$pkgname-$pkgver.tar.gz")
+depends=('libevent')
+source=("http://monkey.org/~marius/trickle/${pkgname}-${pkgver}.tar.gz")
 md5sums=('860ebc4abbbd82957c20a28bd9390d7d')
 
 build() {
-	cd $startdir/src/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man
-	sed -i "s|.*in_addr_t.*||g" config.h
-	make || return 1
-	make DESTDIR=$startdir/pkg install
-	install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+              --mandir=/usr/share/man
+  sed -i "s|.*in_addr_t.*||g" config.h
+  make -j1
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD
index d414b935c..1eab91ed8 100644
--- a/community/xdebug/PKGBUILD
+++ b/community/xdebug/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 65011 2012-02-20 01:39:51Z spupykin $
+# $Id: PKGBUILD 68086 2012-03-17 18:57:19Z spupykin $
 # 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.3
-pkgrel=2
+pkgver=2.1.4
+pkgrel=1
 pkgdesc="PHP debugging extension"
 arch=('i686' 'x86_64')
 url="http://www.xdebug.org"
@@ -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=('779f4a66acdccd673553769e403674c4'
+md5sums=('0a1339ad8053eface15ed6420a295939'
          '6b7fdbbe0bf381bda40e77e29981f439'
          '68de800943369d4c76bdf7eb35c8463b')
 
diff --git a/cross/README b/cross/README
index 004f01114..a77b1eb5c 100644
--- a/cross/README
+++ b/cross/README
@@ -7,6 +7,7 @@
 * cross-$target-gcc-core-shared
 * $target-glibc
 * $target-gcc
+* $target-glibc with BOOTSTRAPING=false
 
 cross-* packages are used to bootstrap the full toolchain for the first time,
 you'll only need binutils, linux-api-headers, glibc and gcc once you're done.
diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD
index ca0ca775e..2eb018125 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD
+++ b/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD
@@ -54,7 +54,6 @@ build() {
         --enable-cloog-backend=isl \
         --with-libelf \
         --enable-lto \
-        --with-host-libstdcxx="-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lpwl" \
         --enable-target-optspace \
         --disable-libgomp \
         --disable-libmudflap \
diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
index 831236d42..47ef81fe1 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
+++ b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
@@ -49,7 +49,6 @@ build() {
         --with-ppl \
         --enable-cloog-backend=isl \
         --enable-lto \
-        --with-host-libstdcxx="-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lpwl" \
         --enable-target-optspace \
         --disable-libgomp \
         --disable-libmudflap \
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
index 7fed7839a..9b03da6d7 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
+++ b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
@@ -44,6 +44,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgname}-${pkgver}_${_glibcdate}.
         locale-gen)
 md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          'a006504b83553d0b554cf8badff005b6'
+         '39f80ba6bcda6b010a66f9c61e9a0017'
          '4dadb9203b69a3210d53514bb46f41c3'
          '0c5540efc51c0b93996c51b57a8540ae'
          '40cd342e21f71f5e49e32622b25acc52'
@@ -188,6 +189,7 @@ package() {
 # This will help gcc-shared to find headers for libgcc2
   msg2 "Symlinking headers"
 #  rm -r ${pkgdir}${_sysroot}/include
+  mkdir -p ${pkgdir}${_sysroot}/lib/
   ln -s ${_sysroot}/usr/include ${pkgdir}${_sysroot}/include
   ln -s ${_sysroot}/usr/lib/crt1.o ${pkgdir}${_sysroot}/lib/
   ln -s ${_sysroot}/usr/lib/crti.o ${pkgdir}${_sysroot}/lib/
@@ -195,20 +197,3 @@ package() {
   ln -s ${_sysroot}/usr/lib/libc.so ${pkgdir}${_sysroot}/lib/
 
 }
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
-         '98d028ee63fca2821414ebcac0af0e5b'
-         '39f80ba6bcda6b010a66f9c61e9a0017'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         '3c219ddfb619b6df903cac4cc42c611d'
-         '7ae3e426251ae33e73dbad71f9c91378'
-         'dc7550e659ddd685bd78a930d15a01f2'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
diff --git a/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD b/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
index 18de66776..9f13285b4 100644
--- a/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
+++ b/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
@@ -69,6 +69,7 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '3c219ddfb619b6df903cac4cc42c611d'
          '7ae3e426251ae33e73dbad71f9c91378'
          'dc7550e659ddd685bd78a930d15a01f2'
+         '39f80ba6bcda6b010a66f9c61e9a0017'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -219,7 +220,7 @@ package() {
 # Fix libc.so to find correct libraries
   if ${BOOTSTRAPING}; then
       sed -i "s|/lib|${_sysroot}&|g" ${pkgdir}${_sysroot}/usr/lib/libc.so
-      sed -i "s|/lib|${_sysroot}&|g" ${pkgdir}${_sysroot}/usr/lib/libpthreads.so
+      sed -i "s|/lib|${_sysroot}&|g" ${pkgdir}${_sysroot}/usr/lib/libpthread.so
   fi
 
   install -dm755 ${pkgdir}${_sysroot}/etc/rc.d
@@ -240,15 +241,6 @@ package() {
       ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}${_sysroot}/etc/locale.gen
   sed -i "s|^|#|g" ${pkgdir}${_sysroot}/etc/locale.gen
 
-  if [[ ${CARCH} = "x86_64" ]]; then
-    # fix for the linker
-    sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}${_sysroot}/bin/ldd
-    # Comply with multilib binaries, they look for the linker in /lib64
-    mkdir ${pkgdir}${_sysroot}/lib64
-    cd ${pkgdir}${_sysroot}/lib64
-    ln -v -s ../lib/ld* .
-  fi
-  
   # Do not strip the following files for improved debugging support
   # ("improved" as in not breaking gdb and valgrind...):
   #   ld-${pkgver}.so
@@ -274,36 +266,3 @@ package() {
 #                     lib/{libmemusage,libpcprofile,libSegFault}.so \
 #                     usr/lib/{pt_chown,{audit,gconv}/*.so}
 }
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
-         '98d028ee63fca2821414ebcac0af0e5b'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         '3c219ddfb619b6df903cac4cc42c611d'
-         '7ae3e426251ae33e73dbad71f9c91378'
-         'dc7550e659ddd685bd78a930d15a01f2'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
-         '98d028ee63fca2821414ebcac0af0e5b'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         '3c219ddfb619b6df903cac4cc42c611d'
-         '7ae3e426251ae33e73dbad71f9c91378'
-         'dc7550e659ddd685bd78a930d15a01f2'
-         '39f80ba6bcda6b010a66f9c61e9a0017'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD
index ad0edc057..7dcccc1c7 100644
--- a/extra/fetchmail/PKGBUILD
+++ b/extra/fetchmail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 138318 2011-09-20 04:51:36Z eric $
+# $Id: PKGBUILD 153691 2012-03-18 02:01:54Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=fetchmail
 pkgver=6.3.21
-pkgrel=2
+pkgrel=3
 pkgdesc="A remote-mail retrieval utility"
 arch=('i686' 'x86_64')
 url="http://fetchmail.berlios.de/"
@@ -15,12 +15,10 @@ optdepends=('tk: for using fetchmailconf'
 backup=('etc/conf.d/fetchmail')
 options=('!makeflags')
 install=fetchmail.install
-source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2
+source=(http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz{,.asc}
         fetchmail.rc fetchmail.conf)
-md5sums=('0ad8eac47e85bd0ae63870daa09992af'
-         '89fdde15bf81b3a5c065949322b5d138'
-         '8fcd6a22dfbc247755fdd050c5c5c4d3')
-sha1sums=('e32a0d40ec133d651782543ecd7bc9bbee52dff7'
+sha1sums=('4f1e5f2e1a616d4007da1de9c976c2c1fb5dcb81'
+          'bc8c68ec0d71b97d3168981cbaa4b04ab8e56059'
           '910ec21ad0a619db67e4665189dc46d2a0634ea5'
           '30401729386d6f774c6c36ab8530842166de54a8')
 
@@ -36,5 +34,5 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
   install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
-  install -d "${pkgdir}/var/lib/fetchmail"
+  install -d -o 90 -g nobody "${pkgdir}/var/lib/fetchmail"
 }
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 809df96f0..b3a701783 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149381 2012-02-07 10:39:41Z ibiru $
+# $Id: PKGBUILD 153659 2012-03-17 13:50:07Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=20120127
-pkgrel=3
+pkgver=20120317
+pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64')
 url="http://ffmpeg.org/"
@@ -14,10 +14,10 @@ depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx openc
 makedepends=('yasm' 'git' 'libvdpau')
 #git clone git://git.videolan.org/ffmpeg.git
 source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz)
-md5sums=('dc706cdb31801b4746f37459b0c38b7e')
+md5sums=('2a2ef83ae73713fcef6bba8c430665ce')
 
 build() {
-  cd "$srcdir/$pkgname"
+  cd "$pkgname"
 
   ./configure \
     --prefix=/usr \
@@ -50,7 +50,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname"
+  cd "$pkgname"
   make DESTDIR="$pkgdir" install install-man
   install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
 }
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index e2964e9ef..15476f37e 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 151785 2012-03-02 19:31:37Z andyrtr $
+# $Id: PKGBUILD 153658 2012-03-17 12:17:23Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.15
+pkgver=3.0.17
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.11')
 makedepends=('valgrind' 'strace')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('37bdac12b5c039c7a8738b5d85eda968'
-         '594eb29cbc3147dc0b6b529ebe96bd33')
+md5sums=('5e87bd73a237749e2acbbb7161f11d5e'
+         '28138f27cdc9e735b73955080c46c876')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/ode/PKGBUILD b/extra/ode/PKGBUILD
index 6beb9b1e6..5cd492894 100644
--- a/extra/ode/PKGBUILD
+++ b/extra/ode/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 152962 2012-03-10 20:34:51Z giovanni $
+# $Id: PKGBUILD 153667 2012-03-17 17:53:37Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Adam Griffiths <adam_griffithsAATTdart.net.au>
 
 pkgname=ode
 pkgver=0.12
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source, high performance library for simulating rigid body dynamics"
 arch=('i686' 'x86_64')
 url="http://www.ode.org"
@@ -18,7 +18,8 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
-              --enable-shared
+              --enable-shared \
+              --enable-libccd
   make
 }
 
diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD
index 298cc2008..dc0a5aaf7 100644
--- a/extra/perl-dbd-sqlite/PKGBUILD
+++ b/extra/perl-dbd-sqlite/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 125249 2011-05-25 19:15:53Z foutrelis $
+# $Id: PKGBUILD 153674 2012-03-17 19:39:43Z eric $
 # Contributor: Tom Killian <tomk@runbox.com>
 # Contributor: francois at archlinux dot org
 
 pkgname=perl-dbd-sqlite
 _cpanname=DBD-SQLite
-pkgver=1.31
-pkgrel=2
+pkgver=1.35
+pkgrel=1
 pkgdesc="Self-contained RDBMS in a DBI driver"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/${_cpanname}"
@@ -13,12 +13,16 @@ license=('GPL' 'PerlArtistic')
 depends=('perl-dbi>=1.61' 'sqlite3')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz)
-md5sums=('67b3575104efd606c8093bc416e3338d')
+md5sums=('d9752e4a26fa54e74aa893dafd02ceda')
 
 build() {
   cd "${srcdir}/${_cpanname}-${pkgver}"
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+check() {
+  cd "${srcdir}/${_cpanname}-${pkgver}"
   make test
 }
 
diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD
index 42f7a5770..f52d506b3 100644
--- a/extra/perl-dbi/PKGBUILD
+++ b/extra/perl-dbi/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 124915 2011-05-25 07:47:08Z foutrelis $
+# $Id: PKGBUILD 153672 2012-03-17 19:13:48Z eric $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor:  Matt Thompson <mattt@defunct.ca>
 
 pkgname=perl-dbi
 _realname=DBI
-pkgver=1.616
-pkgrel=2
+pkgver=1.618
+pkgrel=1
 pkgdesc="Database independent interface for Perl"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL' 'PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl>=5.12.1')
-options=(!emptydirs)
+options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz)
-md5sums=('799313e54a693beb635b47918458f7c4')
+md5sums=('5ad29b56f7457f22bd1ca1c871b30719')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
@@ -21,6 +21,10 @@ build() {
   # install module in vendor directories.
   perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+check() {
+  cd "${srcdir}/${_realname}-${pkgver}"
   make test
 }
 
diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD
index 7e3b0a701..82ed98477 100644
--- a/extra/perl-html-parser/PKGBUILD
+++ b/extra/perl-html-parser/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 125261 2011-05-25 19:17:47Z foutrelis $
+# $Id: PKGBUILD 153676 2012-03-17 19:52:14Z eric $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Manolis Tzanidakis
 # Contributor: Firmicus <francois.archlinux.org> 
 
 pkgname=perl-html-parser
 _realname=HTML-Parser
-pkgver=3.68
-pkgrel=2
+pkgver=3.69
+pkgrel=1
 pkgdesc="Perl HTML parser class"
 arch=('i686' 'x86_64')
 license=('PerlArtistic')
@@ -14,13 +14,17 @@ url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl-html-tagset' 'perl>=5.12.1')
 options=(!emptydirs)
 source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz)
-md5sums=('5550b2da7aa94341f1e8a17a4ac20c68')
+md5sums=('d22cc6468ce670a56034be907e4e7c54')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
   # install module in vendor directories.
   perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+check() {
+  cd "${srcdir}/${_realname}-${pkgver}"
   make test
 }
 
diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD
index 1a4f7c0cc..e1024c6c1 100644
--- a/extra/perl-net-dns/PKGBUILD
+++ b/extra/perl-net-dns/PKGBUILD
@@ -1,33 +1,38 @@
-# $Id: PKGBUILD 125273 2011-05-25 19:19:34Z foutrelis $
+# $Id: PKGBUILD 153680 2012-03-17 20:08:26Z eric $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Manolis Tzanidakis
 
 pkgname=perl-net-dns
 _realname=Net-DNS
-pkgver=0.66
-pkgrel=4
+pkgver=0.68
+pkgrel=1
 pkgdesc="Perl Module: Interface to the DNS resolver."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl-digest-hmac' 'perl-net-ip' 'perl>=5.10.0')
+options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/O/OL/OLAF/${_realname}-$pkgver.tar.gz)
-options=(!emptydirs)
+md5sums=('05c0f6955747758bb5c9578d9bc6c3a5')
 
 build() {
-  cd $srcdir/${_realname}-${pkgver}
+  cd "$srcdir/${_realname}-${pkgver}"
   # install module in vendor directories.
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
+check() {
+  cd "$srcdir/${_realname}-${pkgver}"
+  make test
+}
+
 package() {
-  cd $srcdir/${_realname}-${pkgver}
-  make install DESTDIR=${pkgdir}
+  cd "$srcdir/${_realname}-${pkgver}"
+  make install DESTDIR="${pkgdir}"
 
   # remove perllocal.pod and .packlist
-  find ${pkgdir} -name perllocal.pod -delete
-  find ${pkgdir} -name .packlist -delete
+  find "${pkgdir}" -name perllocal.pod -delete
+  find "${pkgdir}" -name .packlist -delete
 }
 # vim: ts=2 sw=2 et ft=sh
-md5sums=('1635d876324e3c2f6e277d5778bfe94c')
diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD
index c2ab5a4f8..e1f29bada 100644
--- a/extra/perl-yaml-syck/PKGBUILD
+++ b/extra/perl-yaml-syck/PKGBUILD
@@ -1,37 +1,41 @@
-# $Id: PKGBUILD 125297 2011-05-25 19:24:39Z foutrelis $
+# $Id: PKGBUILD 153683 2012-03-17 20:26:21Z eric $
 # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
 # Maintainer: kevin <kevin@archlinux.org>
 
 pkgname=perl-yaml-syck
 _realname=YAML-Syck
-pkgver=1.17
-pkgrel=2
+pkgver=1.20
+pkgrel=1
 pkgdesc="Fast, lightweight YAML loader and dumper"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl>=5.10.0')
 options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/A/AV/AVAR/${_realname}-$pkgver.tar.gz)
-md5sums=('f788529ad4b2c2fd037ccdfd5e7a88ab')
+source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz)
+md5sums=('8f6d04ee5817b8479e1234264a8d458d')
 
 build() {
-  cd  ${srcdir}/${_realname}-$pkgver
+  cd "${srcdir}/${_realname}-$pkgver"
 
   # install module in vendor directories.
   perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+check() {
+  cd "${srcdir}/${_realname}-$pkgver"
   make test
 }
 
 package() {
-  cd  ${srcdir}/${_realname}-$pkgver
-  make install DESTDIR=${pkgdir}
+  cd "${srcdir}/${_realname}-$pkgver"
+  make install DESTDIR="${pkgdir}"
 
   # remove perllocal.pod and .packlist
-  find ${pkgdir} -name perllocal.pod -delete
-  find ${pkgdir} -name .packlist -delete
+  find "${pkgdir}" -name perllocal.pod -delete
+  find "${pkgdir}" -name .packlist -delete
 
   # license.
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD
index b1d9e01d6..02febf216 100644
--- a/extra/xf86-video-sisimedia/PKGBUILD
+++ b/extra/xf86-video-sisimedia/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 142261 2011-11-07 13:08:57Z jgc $
+# $Id: PKGBUILD 153653 2012-03-17 10:02:45Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sisimedia
 pkgver=0.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org SiS 671 video driver"
 arch=(i686 x86_64)
 url="http://www.linuxconsulting.ro/xorg-drivers/"
 license=('custom')
-depends=('glibc' 'sis-dri')
-makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
-conflicts=('xorg-server<1.11.0')
+depends=('libdrm')
+makedepends=('xorg-server-devel>=1.12.0' 'xf86dgaproto' 'xf86driproto' 'glproto')
+conflicts=('xorg-server<1.12.0')
 options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2
         xf86-video-sis-0.9.1-20102701.patch
@@ -28,6 +28,12 @@ source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-
         0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch
         0005-Correct-bounds-check-of-blitClip-array-access.patch
         xserver19.patch
+        xserver112.patch
+        pciTag-removal-workaround.patch
+        Untangle-XF86DRI.patch
+        swap-func-rename.patch
+        xf86MapDomainMemory-pci_device_map_legacy.patch
+        sync-with-freedesktop.patch
         fix-xv-crash.patch
         COPYING)
 sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
@@ -46,6 +52,12 @@ sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
           '5e288526bfa2c534f1feabdb571da16da8a1c7a6'
           'e86d702cb0b5e9bf43ff732696229965e176db7c'
           'b5f260bed7e705808ec05620316e503ed5d52ee5'
+          'ca25df590590284161cd68440fc4f0cfeb8618b2'
+          'ce60625b915e8bd82a6ab2c78e52eb589f27a083'
+          '963ef59ecd0ca478434623efb68fce9ee832501d'
+          '5f686c54383c6677b043c6ca0b565b023c1907f9'
+          '4ea8d76b3e74172109e7013a2931e571d3a2f4e1'
+          '1d29504466840d2fbe1fc355d78666c1a9cd9b76'
           '1fdd74a2aef9455ac5c37d1fe0146d81aa905d2d'
           'a64e244f274bcb155f892d0488a1a4b1b2f7d70d')
 
@@ -66,6 +78,12 @@ build() {
   patch -Np1 -i "${srcdir}/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch"
   patch -Np1 -i "${srcdir}/0005-Correct-bounds-check-of-blitClip-array-access.patch"
   patch -Np1 -i "${srcdir}/xserver19.patch"
+  patch -Np1 -i "${srcdir}/xserver112.patch"
+  patch -Np1 -i "${srcdir}/pciTag-removal-workaround.patch"
+  patch -Np1 -i "${srcdir}/Untangle-XF86DRI.patch"
+  patch -Np1 -i "${srcdir}/swap-func-rename.patch"
+  patch -Np1 -i "${srcdir}/xf86MapDomainMemory-pci_device_map_legacy.patch"
+  patch -Np1 -i "${srcdir}/sync-with-freedesktop.patch"
   patch -Np0 -i "${srcdir}/fix-xv-crash.patch"
 
   sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am
@@ -74,7 +92,7 @@ build() {
 
   autoreconf -fi
 
-  ./configure --prefix=/usr --enable-dri
+  ./configure --prefix=/usr --disable-dri
   make
   make DESTDIR="${pkgdir}" install
 
diff --git a/extra/xf86-video-sisimedia/Untangle-XF86DRI.patch b/extra/xf86-video-sisimedia/Untangle-XF86DRI.patch
new file mode 100644
index 000000000..55b9c9deb
--- /dev/null
+++ b/extra/xf86-video-sisimedia/Untangle-XF86DRI.patch
@@ -0,0 +1,186 @@
+diff -aur xf86-video-sis-0.9.1.pristine/configure.ac xf86-video-sis-0.9.1.new/configure.ac
+--- xf86-video-sis-0.9.1.pristine/configure.ac	2012-03-17 04:52:35.410417514 +1100
++++ xf86-video-sis-0.9.1.new/configure.ac	2012-03-17 04:55:05.949412228 +1100
+@@ -97,8 +97,8 @@
+ AM_CONDITIONAL(DRI, test x$DRI = xyes)
+ if test "$DRI" = yes; then
+         PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
+-        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
+-        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
++        AC_DEFINE(SISDRI,1,[Enable DRI driver support])
++        AC_DEFINE(SISDRI_DEVEL,1,[Enable developmental DRI driver support])
+ fi
+ 
+ # technically this should be a configure flag.  meh.
+diff -aur xf86-video-sis-0.9.1.pristine/src/sis_driver.c xf86-video-sis-0.9.1.new/src/sis_driver.c
+--- xf86-video-sis-0.9.1.pristine/src/sis_driver.c	2012-03-17 04:52:35.380417061 +1100
++++ xf86-video-sis-0.9.1.new/src/sis_driver.c	2012-03-17 04:57:54.118679619 +1100
+@@ -115,7 +115,7 @@
+ #endif
+ 
+ 
+-#ifdef XF86DRI
++#ifdef SISDRI
+ #include "dri.h"
+ #endif
+ 
+@@ -5779,7 +5779,7 @@
+     }
+ 
+     /* Load the dri and glx modules if requested. */
+-#ifdef XF86DRI
++#ifdef SISDRI
+     if(pSiS->loadDRI) {
+        if(!xf86LoaderCheckSymbol("DRIScreenInit")) {
+ 	  if(xf86LoadSubModule(pScrn, "dri")) {
+@@ -9469,7 +9469,7 @@
+ 
+     pSiS->cmdQueueLen = 0; /* Force an EngineIdle() at start */
+ 
+-#ifdef XF86DRI
++#ifdef SISDRI
+     if(pSiS->loadDRI) {
+ #ifdef SISDUALHEAD
+        /* No DRI in dual head mode */
+@@ -9802,7 +9802,7 @@
+ #endif
+ 
+    /* Finish DRI initialisation */
+-#ifdef XF86DRI
++#ifdef SISDRI
+     if(pSiS->loadDRI) {
+        if(pSiS->directRenderingEnabled) {
+           /* Now that mi, drm and others have done their thing,
+@@ -10359,7 +10359,7 @@
+     }
+ /* Mark for 3D full-screen bug */
+ /*
+-#ifdef XF86DRI    
++#ifdef SISDRI    
+     if(pSiS->directRenderingEnabled) {       
+ 	DRILock(screenInfo.screens[scrnIndex], DRM_LOCK_QUIESCENT);
+     }
+@@ -10388,7 +10388,7 @@
+ #endif
+ /* Mark for 3D full-screen bug */
+ /*
+-#ifdef XF86DRI
++#ifdef SISDRI
+     if(pSiS->directRenderingEnabled) {
+        DRIUnlock(screenInfo.screens[scrnIndex]);
+     }
+@@ -10601,7 +10601,7 @@
+ 
+ /* Mark for 3D full-screen bug */
+ /*
+-#ifdef XF86DRI
++#ifdef SISDRI
+     if(pSiS->directRenderingEnabled) {
+        DRIUnlock(screenInfo.screens[scrnIndex]);
+     }
+@@ -10629,7 +10629,7 @@
+ {
+     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr pSiS = SISPTR(pScrn);
+-#ifdef XF86DRI
++#ifdef SISDRI
+     ScreenPtr pScreen;
+ 
+     if(pSiS->directRenderingEnabled) {
+@@ -10715,7 +10715,7 @@
+        SiSCtrlExtUnregister(pSiS, pScrn->scrnIndex);
+     }
+ 
+-#ifdef XF86DRI
++#ifdef SISDRI
+     if(pSiS->directRenderingEnabled) {
+        SISDRICloseScreen(pScreen);
+        pSiS->directRenderingEnabled = FALSE;
+diff -aur xf86-video-sis-0.9.1.pristine/src/sis.h xf86-video-sis-0.9.1.new/src/sis.h
+--- xf86-video-sis-0.9.1.pristine/src/sis.h	2012-03-17 04:52:35.357083354 +1100
++++ xf86-video-sis-0.9.1.new/src/sis.h	2012-03-17 04:56:36.814150836 +1100
+@@ -215,7 +215,13 @@
+ 
+ #undef SISHAVEDRMWRITE
+ #undef SISNEWDRI
+-#ifdef XF86DRI
++
++/* if the server was built without DRI support, force-disable DRI */
++#ifndef XF86DRI
++#undef SISDRI
++#endif
++
++#ifdef SISDRI
+ #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,3,0)
+ #define SISHAVEDRMWRITE
+ #endif
+@@ -229,7 +235,7 @@
+ #include "dri.h"
+ #include "GL/glxint.h"
+ #include "sis_dri.h"
+-#endif /* XF86DRI */
++#endif /* SISDRI */
+ 
+ #include "sis_config.h"
+ 
+@@ -884,7 +890,7 @@
+     ScrnInfoPtr		pScrn_2;
+     UChar		*BIOS;
+     struct SiS_Private	*SiS_Pr;
+-#ifdef XF86DRI
++#ifdef SISDRI
+     SISAGPHTYPE		agpHandle;
+     ULong		agpAddr;
+     UChar		*agpBase;
+@@ -1291,7 +1297,7 @@
+     unsigned int	cmdQueueSize_div2;
+     unsigned int	cmdQueueSize_div4;
+     unsigned int	cmdQueueSize_4_3;
+-#ifdef XF86DRI
++#ifdef SISDRI
+     SISAGPHTYPE		agpHandle;
+     ULong		agpAddr;
+     UChar 		*agpBase;
+@@ -1351,7 +1357,7 @@
+     /* DRI */
+     Bool		loadDRI;
+     Bool		DRIEnabled;
+-#ifdef XF86DRI
++#ifdef SISDRI
+     Bool		directRenderingEnabled;
+     DRIInfoPtr 		pDRIInfo;
+     int			drmSubFD;
+diff -aur xf86-video-sis-0.9.1.pristine/src/sis_hwmc.c xf86-video-sis-0.9.1.new/src/sis_hwmc.c
+--- xf86-video-sis-0.9.1.pristine/src/sis_hwmc.c        2012-03-17 04:52:35.330416274 +1100
++++ xf86-video-sis-0.9.1.new/src/sis_hwmc.c     2012-03-17 05:22:17.014636372 +1100
+@@ -53,7 +53,9 @@
+ #include "regionstr.h"
+ 
+ #include "sis.h"
++#ifdef SISDRI
+ #include "sis_dri.h"
++#endif
+ 
+ #include "xf86xv.h"
+ #include "xf86xvmc.h"
+diff -aur xf86-video-sis-0.9.1/src/sis_opt.c xf86-video-sis-0.9.1.new/src/sis_opt.c
+--- xf86-video-sis-0.9.1/src/sis_opt.c	2012-03-17 07:36:12.285566154 +1100
++++ xf86-video-sis-0.9.1.new/src/sis_opt.c	2012-03-17 07:34:59.451106475 +1100
+@@ -494,7 +494,7 @@
+     pSiS->ShadowFB = FALSE;
+     pSiS->loadDRI = FALSE;
+     pSiS->DRIEnabled = FALSE;
+-#ifdef XF86DRI
++#ifdef SISDRI
+     pSiS->agpWantedPages = AGP_PAGES;
+ #endif
+     pSiS->VESA = -1;
+@@ -2160,7 +2160,7 @@
+     }
+ 
+ 
+-#ifdef XF86DRI
++#ifdef SISDRI
+     /* DRI */
+     from = X_DEFAULT;
+     if(xf86GetOptValBool(pSiS->Options, OPTION_DRI, &pSiS->loadDRI)) {
diff --git a/extra/xf86-video-sisimedia/pciTag-removal-workaround.patch b/extra/xf86-video-sisimedia/pciTag-removal-workaround.patch
new file mode 100644
index 000000000..b41f3c71b
--- /dev/null
+++ b/extra/xf86-video-sisimedia/pciTag-removal-workaround.patch
@@ -0,0 +1,39 @@
+diff -aur xf86-video-sis-0.9.1.pristine/src/sispcirename.h xf86-video-sis-0.9.1.new/src/sispcirename.h
+--- xf86-video-sis-0.9.1.pristine/src/sispcirename.h	2012-03-17 04:45:58.280942665 +1100
++++ xf86-video-sis-0.9.1.new/src/sispcirename.h	2012-03-17 04:48:28.539933065 +1100
+@@ -29,11 +29,35 @@
+ #ifndef SISPCIRENAME_H
+ #define SISPCIRENAME_H
+ 
++#include <stdint.h>
++
+ enum region_type {
+     REGION_MEM,
+     REGION_IO 
+ };
+ 
++#if (defined(__alpha__) || defined(__ia64__)) && defined (linux)
++#define PCI_DOM_MASK 0x01fful
++#else
++#define PCI_DOM_MASK 0x0ffu
++#endif
++
++#ifndef PCI_DOM_MASK
++# define PCI_DOM_MASK 0x0ffu
++#endif
++#define PCI_DOMBUS_MASK (((PCI_DOM_MASK) << 8) | 0x0ffu)
++
++static inline uint32_t
++pciTag(int busnum, int devnum, int funcnum)
++{
++ uint32_t tag;
++ tag = (busnum & (PCI_DOMBUS_MASK)) << 16;
++ tag |= (devnum & 0x00001fu) << 11;
++ tag |= (funcnum & 0x000007u) << 8;
++
++ return tag;
++}
++
+ #ifndef XSERVER_LIBPCIACCESS
+ 
+ /* pciVideoPtr */
diff --git a/extra/xf86-video-sisimedia/swap-func-rename.patch b/extra/xf86-video-sisimedia/swap-func-rename.patch
new file mode 100644
index 000000000..e22b38896
--- /dev/null
+++ b/extra/xf86-video-sisimedia/swap-func-rename.patch
@@ -0,0 +1,256 @@
+diff -aur xf86-video-sis-0.9.1.pristine/src/sis.h xf86-video-sis-0.9.1.new/src/sis.h
+--- xf86-video-sis-0.9.1.pristine/src/sis.h	2012-03-17 05:32:39.414261430 +1100
++++ xf86-video-sis-0.9.1.new/src/sis.h	2012-03-17 05:28:34.100467696 +1100
+@@ -35,6 +35,10 @@
+ #ifndef _SIS_H_
+ #define _SIS_H_
+ 
++// XXX!!!
++#define _swapl(x, n) swapl(x)
++#define _swaps(x, n) swaps(x)
++
+ #define SISDRIVERVERSIONYEAR    6
+ #define SISDRIVERVERSIONMONTH   10
+ #define SISDRIVERVERSIONDAY     17
+diff -aur xf86-video-sis-0.9.1.pristine/src/sis_mergedfb.c xf86-video-sis-0.9.1.new/src/sis_mergedfb.c
+--- xf86-video-sis-0.9.1.pristine/src/sis_mergedfb.c	2012-03-17 05:42:19.423231119 +1100
++++ xf86-video-sis-0.9.1.new/src/sis_mergedfb.c	2012-03-17 06:01:18.070840068 +1100
+@@ -2472,10 +2472,10 @@
+     rep.majorVersion = SIS_XINERAMA_MAJOR_VERSION;
+     rep.minorVersion = SIS_XINERAMA_MINOR_VERSION;
+     if(client->swapped) {
+-       swaps(&rep.sequenceNumber, n);
+-       swapl(&rep.length, n);
+-       swaps(&rep.majorVersion, n);
+-       swaps(&rep.minorVersion, n);
++       _swaps(&rep.sequenceNumber, n);
++       _swapl(&rep.length, n);
++       _swaps(&rep.majorVersion, n);
++       _swaps(&rep.minorVersion, n);
+     }
+     WriteToClient(client, sizeof(xPanoramiXQueryVersionReply), (char *)&rep);
+     return (client->noClientException);
+@@ -2498,9 +2498,9 @@
+     rep.sequenceNumber = client->sequence;
+     rep.state = !SiSnoPanoramiXExtension;
+     if(client->swapped) {
+-       swaps (&rep.sequenceNumber, n);
+-       swapl (&rep.length, n);
+-       swaps (&rep.state, n);
++       _swaps (&rep.sequenceNumber, n);
++       _swapl (&rep.length, n);
++       //_swaps (&rep.state, n); // XXX???
+     }
+     WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *)&rep);
+     return client->noClientException;
+@@ -2523,9 +2523,9 @@
+     rep.sequenceNumber = client->sequence;
+     rep.ScreenCount = SiSXineramaNumScreens;
+     if(client->swapped) {
+-       swaps(&rep.sequenceNumber, n);
+-       swapl(&rep.length, n);
+-       swaps(&rep.ScreenCount, n);
++       _swaps(&rep.sequenceNumber, n);
++       _swapl(&rep.length, n);
++       //_swaps(&rep.ScreenCount, n); // XXX???
+     }
+     WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
+     return client->noClientException;
+@@ -2549,10 +2549,10 @@
+     rep.width  = SiSXineramadataPtr[stuff->screen].width;
+     rep.height = SiSXineramadataPtr[stuff->screen].height;
+     if(client->swapped) {
+-       swaps(&rep.sequenceNumber, n);
+-       swapl(&rep.length, n);
+-       swaps(&rep.width, n);
+-       swaps(&rep.height, n);
++       _swaps(&rep.sequenceNumber, n);
++       _swapl(&rep.length, n);
++       _swapl(&rep.width, n);
++       _swapl(&rep.height, n);
+     }
+     WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
+     return client->noClientException;
+@@ -2571,9 +2571,9 @@
+     rep.state = !SiSnoPanoramiXExtension;
+     if(client->swapped) {
+        register int n;
+-       swaps(&rep.sequenceNumber, n);
+-       swapl(&rep.length, n);
+-       swapl(&rep.state, n);
++       _swaps(&rep.sequenceNumber, n);
++       _swapl(&rep.length, n);
++       _swapl(&rep.state, n);
+     }
+     WriteToClient(client, sizeof(xXineramaIsActiveReply), (char *) &rep);
+     return client->noClientException;
+@@ -2592,9 +2592,9 @@
+     rep.length = rep.number * sz_XineramaScreenInfo >> 2;
+     if(client->swapped) {
+        register int n;
+-       swaps(&rep.sequenceNumber, n);
+-       swapl(&rep.length, n);
+-       swapl(&rep.number, n);
++       _swaps(&rep.sequenceNumber, n);
++       _swapl(&rep.length, n);
++       _swapl(&rep.number, n);
+     }
+     WriteToClient(client, sizeof(xXineramaQueryScreensReply), (char *)&rep);
+ 
+@@ -2609,10 +2609,10 @@
+ 	  scratch.height = SiSXineramadataPtr[i].height;
+ 	  if(client->swapped) {
+ 	     register int n;
+-	     swaps(&scratch.x_org, n);
+-	     swaps(&scratch.y_org, n);
+-	     swaps(&scratch.width, n);
+-	     swaps(&scratch.height, n);
++	     _swaps(&scratch.x_org, n);
++	     _swaps(&scratch.y_org, n);
++	     _swaps(&scratch.width, n);
++	     _swaps(&scratch.height, n);
+ 	  }
+ 	  WriteToClient(client, sz_XineramaScreenInfo, (char *)&scratch);
+        }
+@@ -2763,7 +2763,7 @@
+ {
+     REQUEST(xPanoramiXQueryVersionReq);
+     register int n;
+-    swaps(&stuff->length,n);
++    _swaps(&stuff->length,n);
+     REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
+     return SiSProcXineramaQueryVersion(client);
+ }
+@@ -2773,7 +2773,7 @@
+ {
+     REQUEST(xPanoramiXGetStateReq);
+     register int n;
+-    swaps (&stuff->length, n);
++    _swaps (&stuff->length, n);
+     REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
+     return SiSProcXineramaGetState(client);
+ }
+@@ -2783,7 +2783,7 @@
+ {
+     REQUEST(xPanoramiXGetScreenCountReq);
+     register int n;
+-    swaps (&stuff->length, n);
++    _swaps (&stuff->length, n);
+     REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
+     return SiSProcXineramaGetScreenCount(client);
+ }
+@@ -2793,7 +2793,7 @@
+ {
+     REQUEST(xPanoramiXGetScreenSizeReq);
+     register int n;
+-    swaps (&stuff->length, n);
++    _swaps (&stuff->length, n);
+     REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
+     return SiSProcXineramaGetScreenSize(client);
+ }
+@@ -2803,7 +2803,7 @@
+ {
+     REQUEST(xXineramaIsActiveReq);
+     register int n;
+-    swaps (&stuff->length, n);
++    _swaps (&stuff->length, n);
+     REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
+     return SiSProcXineramaIsActive(client);
+ }
+@@ -2813,7 +2813,7 @@
+ {
+     REQUEST(xXineramaQueryScreensReq);
+     register int n;
+-    swaps (&stuff->length, n);
++    _swaps (&stuff->length, n);
+     REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
+     return SiSProcXineramaQueryScreens(client);
+ }
+@@ -2823,8 +2823,8 @@
+ {
+     REQUEST(xXineramaSelectInputReq);
+     register int n;
+-    swaps(&stuff->length, n);
+-    swapl(&stuff->window, n);
++    _swaps(&stuff->length, n);
++    _swapl(&stuff->window, n);
+     return SiSProcXineramaSelectInput(client);
+ }
+ 
+diff -aur xf86-video-sis-0.9.1.pristine/src/sis_utility.c xf86-video-sis-0.9.1.new/src/sis_utility.c
+--- xf86-video-sis-0.9.1.pristine/src/sis_utility.c	2012-03-17 07:34:54.727700088 +1100
++++ xf86-video-sis-0.9.1.new/src/sis_utility.c	2012-03-17 08:06:48.570630477 +1100
+@@ -2059,11 +2059,11 @@
+     rep.sequenceNumber = client->sequence;
+     rep.majorVersion = SISCTRL_MAJOR_VERSION;
+     rep.minorVersion = SISCTRL_MINOR_VERSION;
+-    if(client->swapped) {
+-        swaps(&rep.sequenceNumber, n);
+-        swapl(&rep.length, n);
+-        swaps(&rep.majorVersion, n);
+-        swaps(&rep.minorVersion, n);
++    if(client->swapped) {
++        _swaps(&rep.sequenceNumber, n);
++        _swapl(&rep.length, n);
++        _swaps(&rep.majorVersion, n);
++        _swaps(&rep.minorVersion, n);
+     }
+     WriteToClient(client, sizeof(xSiSCtrlQueryVersionReply), (char *)&rep);
+     return (client->noClientException);
+@@ -2103,16 +2103,16 @@
+     rep.length = (sizeof(xSiSCtrlCommandReply) - sizeof(xGenericReply)) >> 2;
+     rep.sequenceNumber = client->sequence;
+ 
+-    if(client->swapped) {
+-       swaps(&rep.sequenceNumber, n);
+-       swapl(&rep.length, n);
+-       swapl(&rep.screen, n);
+-       swapl(&rep.sdc_id, n);
+-       swapl(&rep.sdc_command, n);
+-       swapl(&rep.sdc_result_header, n);
++    if(client->swapped) {
++       _swaps(&rep.sequenceNumber, n);
++       _swapl(&rep.length, n);
++       _swapl(&rep.screen, n);
++       _swapl(&rep.sdc_id, n);
++       _swapl(&rep.sdc_command, n);
++       _swapl(&rep.sdc_result_header, n);
+        for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
+-	  swapl(&rep.sdc_parm[i], n);
+-	  swapl(&rep.sdc_result[i], n);
++	  _swapl(&rep.sdc_parm[i], n);
++	  _swapl(&rep.sdc_result[i], n);
+        }
+     }
+     WriteToClient(client, sizeof(xSiSCtrlCommandReply), (char *)&rep);
+@@ -2139,7 +2139,7 @@
+ {
+     REQUEST(xSiSCtrlQueryVersionReq);
+     register int n;
+-    swaps(&stuff->length, n);
++    _swaps(&stuff->length, n);
+     REQUEST_SIZE_MATCH(xSiSCtrlQueryVersionReq);
+     return SiSProcSiSCtrlQueryVersion(client);
+ }
+@@ -2150,14 +2150,14 @@
+     REQUEST(xSiSCtrlCommandReq);
+     register int n;
+     int i;
+-    swaps(&stuff->length, n);
+-    swapl(&stuff->screen, n);
+-    swapl(&stuff->sdc_id, n);
+-    swapl(&stuff->sdc_command, n);
+-    swapl(&stuff->sdc_result_header, n);
++    _swaps(&stuff->length, n);
++    _swapl(&stuff->screen, n);
++    _swapl(&stuff->sdc_id, n);
++    _swapl(&stuff->sdc_command, n);
++    _swapl(&stuff->sdc_result_header, n);
+     for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
+-       swapl(&stuff->sdc_parm[i], n);
+-       swapl(&stuff->sdc_result[i], n);
++       _swapl(&stuff->sdc_parm[i], n);
++       _swapl(&stuff->sdc_result[i], n);
+     }
+     REQUEST_SIZE_MATCH(xSiSCtrlCommandReq);
+     return SiSProcSiSCtrlCommand(client);
diff --git a/extra/xf86-video-sisimedia/sync-with-freedesktop.patch b/extra/xf86-video-sisimedia/sync-with-freedesktop.patch
new file mode 100644
index 000000000..eb15814ff
--- /dev/null
+++ b/extra/xf86-video-sisimedia/sync-with-freedesktop.patch
@@ -0,0 +1,63 @@
+diff -daur xf86-video-sis-0.9.1.pristine/configure.ac xf86-video-sis-0.9.1.new/configure.ac
+--- xf86-video-sis-0.9.1.pristine/configure.ac	2012-03-17 14:38:50.324387997 +1100
++++ xf86-video-sis-0.9.1.new/configure.ac	2012-03-17 15:02:13.142748894 +1100
+@@ -21,7 +21,7 @@
+ # Process this file with autoconf to produce a configure script
+ 
+ # Initialize Autoconf
+-AC_PREREQ(2.60)
++AC_PREREQ([2.60])
+ AC_INIT([xf86-video-sis],
+         0.9.1,
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+@@ -31,7 +31,7 @@
+ AC_CONFIG_AUX_DIR(.)
+ 
+ # Initialize Automake
+-AM_INIT_AUTOMAKE([dist-bzip2])
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+@@ -40,10 +40,9 @@
+ XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-# Checks for programs.
++# Initialize libtool
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
+ XORG_PROG_RAWCPP
+ 
+ AH_TOP([#include "xorg-server.h"])
+@@ -76,9 +75,6 @@
+ 
+ # Checks for libraries.
+ 
+-# Checks for header files.
+-AC_HEADER_STDC
+-
+ if test "$DRI" != no; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+@@ -123,8 +119,6 @@
+ fi
+ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+ 
+-AC_SUBST([DRI_CFLAGS])
+-AC_SUBST([XORG_CFLAGS])
+ AC_SUBST([moduledir])
+ 
+ DRIVER_NAME=sis
+diff -daur xf86-video-sis-0.9.1.pristine/Makefile.am xf86-video-sis-0.9.1.new/Makefile.am
+--- xf86-video-sis-0.9.1.pristine/Makefile.am	2012-03-17 14:38:50.304387685 +1100
++++ xf86-video-sis-0.9.1.new/Makefile.am	2012-03-17 15:01:44.442304963 +1100
+@@ -18,7 +18,6 @@
+ #  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.
+ 
+-AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = src man
+ 
+ if BUILD_LINUXDOC
diff --git a/extra/xf86-video-sisimedia/xf86MapDomainMemory-pci_device_map_legacy.patch b/extra/xf86-video-sisimedia/xf86MapDomainMemory-pci_device_map_legacy.patch
new file mode 100644
index 000000000..7a39cf2df
--- /dev/null
+++ b/extra/xf86-video-sisimedia/xf86MapDomainMemory-pci_device_map_legacy.patch
@@ -0,0 +1,205 @@
+diff -aur xf86-video-sis-0.9.1.pristine/configure.ac xf86-video-sis-0.9.1.new/configure.ac
+--- xf86-video-sis-0.9.1.pristine/configure.ac	2012-03-17 08:23:42.346308237 +1100
++++ xf86-video-sis-0.9.1.new/configure.ac	2012-03-17 08:40:04.821501949 +1100
+@@ -20,20 +20,26 @@
+ #
+ # Process this file with autoconf to produce a configure script
+ 
+-AC_PREREQ(2.57)
++# Initialize Autoconf
++AC_PREREQ(2.60)
+ AC_INIT([xf86-video-sis],
+         0.9.1,
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+         xf86-video-sis)
+-
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AM_CONFIG_HEADER([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
++# Initialize Automake
+ AM_INIT_AUTOMAKE([dist-bzip2])
+-
+ AM_MAINTAINER_MODE
+ 
++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
++m4_ifndef([XORG_MACROS_VERSION],
++          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
++XORG_MACROS_VERSION(1.8)
++XORG_DEFAULT_OPTIONS
++
+ # Checks for programs.
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+@@ -66,7 +72,7 @@
+                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+                   HAVE_XEXTPROTO_71="no")
+ AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
+ 
+ # Checks for libraries.
+ 
+@@ -104,6 +110,19 @@
+ # technically this should be a configure flag.  meh.
+ AC_DEFINE(XF86EXA, 1, [Build support for Exa])
+ 
++SAVE_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
++AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
++              [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
++              [#include "xorg-server.h"])
++CPPFLAGS="$SAVE_CPPFLAGS"
++
++if test "x$XSERVER_LIBPCIACCESS" = xyes; then
++    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901])
++    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
++fi
++AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
++
+ AC_SUBST([DRI_CFLAGS])
+ AC_SUBST([XORG_CFLAGS])
+ AC_SUBST([moduledir])
+diff -aur xf86-video-sis-0.9.1.pristine/src/sis_vga.c xf86-video-sis-0.9.1.new/src/sis_vga.c
+--- xf86-video-sis-0.9.1.pristine/src/sis_vga.c	2012-03-17 08:23:42.329641291 +1100
++++ xf86-video-sis-0.9.1.new/src/sis_vga.c	2012-03-17 08:28:25.020679715 +1100
+@@ -1740,8 +1740,8 @@
+ 
+ #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
+ #if XSERVER_LIBPCIACCESS
+-    pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
+-			pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize);
++    (void) pci_device_map_legacy(pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize,
++                                 PCI_DEV_MAP_FLAG_WRITABLE, &pSiS->VGAMemBase);
+ #else
+     pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
+ 			pSiS->PciTag, pSiS->VGAMapPhys, pSiS->VGAMapSize);
+@@ -1761,7 +1761,12 @@
+ 
+     if(pSiS->VGAMemBase == NULL) return;
+ 
++#if XSERVER_LIBPCIACCESS
++    (void) pci_device_unmap_legacy(pSiS->PciInfo, pSiS->VGAMemBase, pSiS->VGAMapSize);
++#else
+     xf86UnMapVidMem(pScrn->scrnIndex, pSiS->VGAMemBase, pSiS->VGAMapSize);
++#endif
++
+     pSiS->VGAMemBase = NULL;
+ }
+ #endif
+diff -daur xf86-video-sis-0.9.1.pristine/src/sis_driver.c xf86-video-sis-0.9.1.new/src/sis_driver.c
+--- xf86-video-sis-0.9.1.pristine/src/sis_driver.c	2012-03-17 08:23:42.336308093 +1100
++++ xf86-video-sis-0.9.1.new/src/sis_driver.c	2012-03-17 09:35:33.766316476 +1100
+@@ -6014,7 +6014,11 @@
+         if(pSiSEnt->MapCountIOPBase) {
+ 	    pSiSEnt->MapCountIOPBase--;
+ 	    if((pSiSEnt->MapCountIOPBase == 0) || (pSiSEnt->forceUnmapIOPBase)) {
+-		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOPBase, 2048);
++#if XSERVER_LIBPCIACCESS
++                (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiSEnt->IOPBase, 2048);
++#else
++                xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOPBase, 2048);
++#endif
+ 		pSiSEnt->IOPBase = NULL;
+ 		pSiSEnt->MapCountIOPBase = 0;
+ 		pSiSEnt->forceUnmapIOPBase = FALSE;
+@@ -6023,7 +6027,11 @@
+ 	}
+     } else {
+ #endif
++#if XSERVER_LIBPCIACCESS
++        (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiS->IOPBase, 2048);
++#else
+ 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOPBase, 2048);
++#endif
+ 	pSiS->IOPBase = NULL;
+ #ifdef SISDUALHEAD
+     }
+@@ -6248,7 +6256,11 @@
+         if(pSiSEnt->MapCountIOBase) {
+ 	    pSiSEnt->MapCountIOBase--;
+ 	    if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) {
++#if XSERVER_LIBPCIACCESS
++                (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
++#else
+ 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
++#endif
+ 		pSiSEnt->IOBase = NULL;
+ 		pSiSEnt->MapCountIOBase = 0;
+ 		pSiSEnt->forceUnmapIOBase = FALSE;
+@@ -6259,7 +6271,11 @@
+ 	if(pSiSEnt->MapCountIOBaseDense) {
+ 	    pSiSEnt->MapCountIOBaseDense--;
+ 	    if((pSiSEnt->MapCountIOBaseDense == 0) || (pSiSEnt->forceUnmapIOBaseDense)) {
++#if XSERVER_LIBPCIACCESS
++                (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
++#else
+ 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
++#endif
+ 		pSiSEnt->IOBaseDense = NULL;
+ 		pSiSEnt->MapCountIOBaseDense = 0;
+ 		pSiSEnt->forceUnmapIOBaseDense = FALSE;
+@@ -6270,7 +6286,11 @@
+ 	if(pSiSEnt->MapCountFbBase) {
+ 	    pSiSEnt->MapCountFbBase--;
+ 	    if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) {
++#if XSERVER_LIBPCIACCESS
++                (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize);
++#else
+ 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize);
++#endif
+ 		pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL;
+ 		pSiSEnt->MapCountFbBase = 0;
+ 		pSiSEnt->forceUnmapFbBase = FALSE;
+@@ -6280,13 +6300,25 @@
+ 	}
+     } else {
+ #endif
++#if XSERVER_LIBPCIACCESS
++        (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024));
++#else
+ 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024));
++#endif
+ 	pSiS->IOBase = NULL;
+ #ifdef __alpha__
++#if XSERVER_LIBPCIACCESS
++        (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024));
++#else
+ 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024));
++#endif
+ 	pSiS->IOBaseDense = NULL;
+ #endif
++#if XSERVER_LIBPCIACCESS
++        (void) pci_device_unmap_legacy(pSiS->PciInfo, (pointer)pSiS->RealFbBase, pSiS->FbMapSize);
++#else
+ 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->RealFbBase, pSiS->FbMapSize);
++#endif
+ 	pSiS->FbBase = pSiS->RealFbBase = NULL;
+ #ifdef SISDUALHEAD
+     }
+@@ -10940,7 +10972,13 @@
+ 
+ #ifdef SIS_USE_BIOS_SCRATCH
+     if(SISPTR(pScrn)->Primary) {
++
++#if XSERVER_LIBPCIACCESS
++       (void) pci_device_map_legacy(SISPTR(pScrn)->PciInfo, 0, 0x2000, 1, &base); // HA HA HA MAGIC NUMBER
++#else
+        base = xf86MapVidMem(pScrn->scrnIndex, VIDMEM_MMIO, 0, 0x2000);
++#endif
++
+        if(!base) {
+           SISErrorLog(pScrn, "(Could not map BIOS scratch area)\n");
+           return ret;
+@@ -10953,7 +10991,11 @@
+           *(base + offset) = value;
+        }
+ 
++#if XSERVER_LIBPCIACCESS
++       (void) pci_device_unmap_legacy(SISPTR(pScrn)->PciInfo, base, 0x2000);
++#else
+        xf86UnMapVidMem(pScrn->scrnIndex, base, 0x2000);
++#endif
+     }
+ #endif
+     return ret;
diff --git a/extra/xf86-video-sisimedia/xserver112.patch b/extra/xf86-video-sisimedia/xserver112.patch
new file mode 100644
index 000000000..f0dff46b5
--- /dev/null
+++ b/extra/xf86-video-sisimedia/xserver112.patch
@@ -0,0 +1,12 @@
+diff -aur xf86-video-sis-0.9.1.pristine/src/sis_driver.c xf86-video-sis-0.9.1.new/src/sis_driver.c
+--- xf86-video-sis-0.9.1.pristine/src/sis_driver.c      2012-03-17 03:06:21.148507957 +1100
++++ xf86-video-sis-0.9.1.new/src/sis_driver.c   2012-03-17 03:18:57.373535928 +1100
+@@ -3278,7 +3278,7 @@
+     pSiS->pInt = NULL;
+ 
+     /* Save PCI Domain Base */
+-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
++#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) || GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12
+     pSiS->IODBase = 0;
+ #else
+     pSiS->IODBase = pScrn->domainIOBase;
diff --git a/extra/xfce4-dev-tools/PKGBUILD b/extra/xfce4-dev-tools/PKGBUILD
index 0b56b17ac..7d7c1cfc6 100644
--- a/extra/xfce4-dev-tools/PKGBUILD
+++ b/extra/xfce4-dev-tools/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142012 2011-11-04 02:41:52Z eric $
+# $Id: PKGBUILD 153687 2012-03-17 20:59:01Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfce4-dev-tools
-pkgver=4.9.0
+pkgver=4.9.1
 pkgrel=1
 pkgdesc="Xfce developer tools"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="http://www.xfce.org/"
 depends=('gtk-doc' 'automake' 'automake' 'make' 'intltool' 'pkg-config')
 options=('!libtool')
 source=(http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('325047a072f5599ec7fda9f970c47091')
+sha1sums=('ba309d1286a2be964613e3eb19b08e2aced97bcc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/gnome-unstable/networkmanager/PKGBUILD b/gnome-unstable/networkmanager/PKGBUILD
index e16115947..c143e534e 100644
--- a/gnome-unstable/networkmanager/PKGBUILD
+++ b/gnome-unstable/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152314 2012-03-06 16:24:59Z heftig $
+# $Id: PKGBUILD 153665 2012-03-17 17:50:52Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 # Contributor: Tor Krill <tor@krill.nu>
@@ -7,14 +7,14 @@
 
 pkgname=networkmanager
 pkgver=0.9.3.995
-pkgrel=1
+pkgrel=2
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
 depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd'
          'libsystemd' 'libsoup')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
+makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc')
 optdepends=('modemmanager: for modem management service'
             'dhclient: alternative DHCP/DHCPv6 client'
             'iptables: Connection sharing'
@@ -24,20 +24,23 @@ optdepends=('modemmanager: for modem management service'
 options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz
+#source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz
+source=(http://cgit.freedesktop.org/NetworkManager/NetworkManager/snapshot/NetworkManager-master.tar.xz
         NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch systemd-fallback.patch)
-sha256sums=('67b9005190f01e1cd7d91b9cc87f3068255f2a7eae80ccba78c6e5c99df2ae15'
+sha256sums=('2338b6814c57368176636a13a2ed0c676c7760b9b81a3392deac8cf9c57c5700'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
             '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
             '5e9bbd8a84883037d27a71ea9969d0cb03f09ca238fa733381bcf136bbc340a5')
 
 build() {
-  cd NetworkManager-${pkgver}
+  cd NetworkManager-master
 
   patch -Np1 -i ../disable_set_hostname.patch
   patch -Np1 -i ../dnsmasq-path.patch
   patch -Np1 -i ../systemd-fallback.patch
+  gtkdocize
+  autopoint --force
   AUTOPOINT='intltoolize --automake --copy' autoreconf -f -i
 
   ./configure \
@@ -62,7 +65,7 @@ build() {
 }
 
 package() {
-  cd NetworkManager-${pkgver}
+  cd NetworkManager-master
   make DESTDIR="${pkgdir}" install
 
   install -m644 ../NetworkManager.conf "${pkgdir}/etc/NetworkManager/"
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index 20f6ece4b..ffc0ec5f4 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -1,11 +1,12 @@
 # $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $
 #mips64el Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
-# Maintainer: Henry Jensen <hjensen@connochaetos.org>
+# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgname=sdl-libre
-pkgver=1.2.14
-pkgrel=7.1
+pkgver=1.2.15
+pkgrel=1
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org"
@@ -13,32 +14,29 @@ license=('LGPL')
 provides=("sdl=${pkgver}")
 conflicts=('sdl')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa')
+makedepends=('alsa-lib' 'mesa' 'libpulse')
 replaces=('sdl')
 options=('!libtool')
-source=(http://repo.parabolagnulinux.org/other/SDL-${pkgver}-libre.tar.gz
-        sdl-1.2.14-joystick-crash.diff
+source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
         sdl-1.2.14-fix-mouse-clicking.patch
-        sdl-1.2.14-fix-disappearing-cursor.patch
+        sdl-1.2.14-disable-mmx.patch
         no-riva-accel.patch)
-md5sums=('b8ac7254fe5425a0fb238fb535d3d14c'
-         '9d8890b3817736a5d365f7497f096634'
+md5sums=('9d96df8417572a2afb781a7c4c811a85'
          '04d8c179f125e04bcd4c9d60e013c2d7'
-         'a6cf3e71b653aa97d0d8ae6c0a789807'
+         'e5c16b7611f62c7cb25f0534eff68852'
          'eb2f5899db608ad27b379faa5e0beb80')
 
 build() {
-  cd ${srcdir}/SDL-${pkgver}-libre
-  patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff
+  cd ${srcdir}/SDL-${pkgver}
   patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
-  patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch
+  patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
   patch -Np0 -i $srcdir/no-riva-accel.patch
   ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
-              --with-x --disable-rpath
+              --with-x --disable-rpath --disable-static
   make
 }
 
 package() {
-  cd ${srcdir}/SDL-${pkgver}-libre
+  cd ${srcdir}/SDL-${pkgver}
   make DESTDIR=${pkgdir} install
 }
diff --git a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch
new file mode 100644
index 000000000..1bb6e0e47
--- /dev/null
+++ b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch
@@ -0,0 +1,13 @@
+# and another one from FS#26020
+
+--- a/src/video/SDL_yuv_sw.c    2009-10-13 06:07:15.000000000 +0700
++++ b/src/video/SDL_yuv_sw.c    2011-09-20 19:26:30.247742620 +0700
+@@ -89,6 +89,8 @@
+ #include "SDL_yuvfuncs.h"
+ #include "SDL_yuv_sw_c.h"
+ 
++#undef __OPTIMIZE__
++
+ /* The functions used to manipulate software video overlays */
+ static struct private_yuvhwfuncs sw_yuvfuncs = {
+ 	SDL_LockYUV_SW,
diff --git a/multilib-testing/lib32-libdrm/PKGBUILD b/multilib-testing/lib32-libdrm/PKGBUILD
index c2a1bd2ec..703f55e9f 100644
--- a/multilib-testing/lib32-libdrm/PKGBUILD
+++ b/multilib-testing/lib32-libdrm/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 64044 2012-02-08 21:25:06Z lcarlier $
+# $Id: PKGBUILD 68056 2012-03-17 15:05:46Z lcarlier $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 _pkgbasename=libdrm
 pkgname=lib32-$_pkgbasename
-pkgver=2.4.31
+pkgver=2.4.32
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services (32-bit)"
 arch=(x86_64)
@@ -15,8 +16,8 @@ url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2
         no-pthread-stubs.patch)
 #	git_fixes.diff)
-md5sums=('b8cf744ec113c6028fe0975b1133b649'
-         '0c423f6f886a3a8d6a8834224de95bcf')
+sha1sums=('4aab6cc1c0d2a4822ffd83bd3da0e7a5479bf842'
+          '1a9000f4c94d5bd13555e13e6e51716bf92a0eb8')
 
 build() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
diff --git a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch b/multilib-testing/lib32-libdrm/no-pthread-stubs.patch
index 6ad4a48ee..721626c0a 100644
--- a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch
+++ b/multilib-testing/lib32-libdrm/no-pthread-stubs.patch
@@ -9,9 +9,9 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
 -AC_SUBST(PTHREADSTUBS_CFLAGS)
 -AC_SUBST(PTHREADSTUBS_LIBS)
 -
- PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
- AC_SUBST(PCIACCESS_CFLAGS)
- AC_SUBST(PCIACCESS_LIBS)
+ pkgconfigdir=${libdir}/pkgconfig
+ AC_SUBST(pkgconfigdir)
+ AC_ARG_ENABLE([udev],
 --- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
 +++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
 @@ -26,7 +26,6 @@
diff --git a/multilib/lib32-libxcb/PKGBUILD b/multilib/lib32-libxcb/PKGBUILD
index 00b8598d7..f0be70aa0 100644
--- a/multilib/lib32-libxcb/PKGBUILD
+++ b/multilib/lib32-libxcb/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 67504 2012-03-12 21:20:30Z lcarlier $
+# $Id: PKGBUILD 68090 2012-03-17 19:44:28Z lcarlier $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
+
 _pkgbasename=libxcb
 pkgname=lib32-$_pkgbasename
 pkgver=1.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library (32-bit)"
 arch=(x86_64)
 url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.7' 'lib32-libxdmcp' 'lib32-libxau'
-         $_pkgbasename)
+depends=('lib32-libxdmcp' 'lib32-libxau' $_pkgbasename)
 makedepends=('pkgconfig' 'libxslt' 'python2' 'gcc-multilib'
              'autoconf')
 options=('!libtool')
@@ -21,6 +21,7 @@ sha1sums=('98199b6054750a06cddd4e77baa4354af547ce6f'
 
 build() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
   patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch"
 
   export CC="gcc -m32"
@@ -32,6 +33,7 @@ build() {
 
 package() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
 
   rm -rf "${pkgdir}"/usr/{include,share}
diff --git a/multilib/lib32-util-linux/PKGBUILD b/multilib/lib32-util-linux/PKGBUILD
index cdd799467..ddddb6f6f 100644
--- a/multilib/lib32-util-linux/PKGBUILD
+++ b/multilib/lib32-util-linux/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 60379 2011-12-12 14:54:24Z dreisner $
+# $Id: PKGBUILD 68069 2012-03-17 16:13:59Z lcarlier $
 # Maintainer: judd <jvinet@zeroflux.org>
 
 _pkgbasename=util-linux
 pkgname=lib32-$_pkgbasename
-pkgver=2.20.1
+pkgver=2.21
 pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux (32-bit)"
-url="http://userweb.kernel.org/~kzak/util-linux-ng/"
+url='http://www.kernel.org/pub/linux/utils/util-linux/'
 arch=('x86_64')
 depends=('lib32-glibc' "$_pkgbasename")
 makedepends=('gcc-multilib')
@@ -15,8 +15,8 @@ conflicts=('lib32-util-linux-ng')
 replaces=('lib32-util-linux-ng')
 license=('GPL2')
 options=('!libtool' '!emptydirs')
-source=(ftp://ftp.infradead.org/pub/$_pkgbasename/v2.20/$_pkgbasename-$pkgver.tar.bz2)
-md5sums=('079b37517fd4e002a2e6e992e8b4e361')
+source=("ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/util-linux-$pkgver.tar.xz")
+md5sums=('208aa058f4117759d2939d1be7d662fc')
 
 shopt -s extglob
 
diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD
index 01eb92c74..574686bde 100644
--- a/multilib/wine/PKGBUILD
+++ b/multilib/wine/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 67294 2012-03-07 18:47:13Z svenstaro $
+# $Id: PKGBUILD 68032 2012-03-17 04:54:08Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=wine
-pkgver=1.4
+pkgver=1.5.0
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
-md5sums=('6594ab86a4b1fb2c09dadfb4ea7fc4af')
+md5sums=('c9242ff56223186124c1d42ceb03afe4')
 
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
diff --git a/multilib/wine_gecko/PKGBUILD b/multilib/wine_gecko/PKGBUILD
index b9572f7cd..8d742ef0f 100644
--- a/multilib/wine_gecko/PKGBUILD
+++ b/multilib/wine_gecko/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 58906 2011-11-20 00:25:05Z heftig $
+# $Id: PKGBUILD 68053 2012-03-17 14:50:10Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Nicky726 (Nicky726 <at> gmail <dot> com)
 # Contributor: Allan McRae (allan <at> archlinux <dot> org)
 # Contributor: Alexander 'bas' Brovikov (bas <at> it-core <dot> org)
 
 pkgname=wine_gecko
-pkgver=1.4
+pkgver=1.5
 pkgrel=1
 pkgdesc="Wine's built-in replacement for Microsoft's Internet Explorer"
 arch=(i686 x86_64)
 url="http://wiki.winehq.org/Gecko"
 license=(MPL)
-depends=('wine>=1.3.33')
+depends=('wine>=1.5')
 source=(http://downloads.sourceforge.net/project/wine/Wine%20Gecko/$pkgver/$pkgname-$pkgver-x86{,_64}.msi)
-md5sums=('700aaa08724be1992cffed7b87e79a44'
-         '7b4811f667fd01d300fdff68420a9c72')
+md5sums=('ffb862e3e5f66555e058b7a29a1c62ff'
+         'd244f8a4b7a5d5a6b0698306091eb7e7')
 
 if [[ $CARCH == i686 ]]; then
   # Strip x86_64 msi
diff --git a/testing/libdrm/COPYING b/testing/libdrm/COPYING
new file mode 100644
index 000000000..6e74c337c
--- /dev/null
+++ b/testing/libdrm/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/testing/libdrm/PKGBUILD b/testing/libdrm/PKGBUILD
new file mode 100644
index 000000000..bfd29c1ca
--- /dev/null
+++ b/testing/libdrm/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 153651 2012-03-17 08:41:21Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=libdrm
+pkgver=2.4.32
+pkgrel=1
+pkgdesc="Userspace interface to kernel DRM services"
+arch=(i686 x86_64)
+license=('custom')
+depends=('glibc' 'libpciaccess')
+makedepends=('cairo' 'valgrind')
+options=('!libtool')
+url="http://dri.freedesktop.org/"
+source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        no-pthread-stubs.patch
+        COPYING
+#	git_fixes.diff
+)
+sha1sums=('4aab6cc1c0d2a4822ffd83bd3da0e7a5479bf842'
+          '825ff5e0c4238b31bdea52f104bfec8949270e25'
+          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
+
+  # git fixes - currently none
+#  patch -Np1 -i ${srcdir}/git_fixes.diff
+  
+  #libtoolize --force
+  autoreconf --force --install
+  ./configure --prefix=/usr \
+      --enable-udev \
+      --enable-intel \
+      --enable-radeon \
+      --enable-vmwgfx-experimental-api \
+      --enable-nouveau-experimental-api
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -k check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/testing/libdrm/git_fixes.diff b/testing/libdrm/git_fixes.diff
new file mode 100644
index 000000000..dc80155f2
--- /dev/null
+++ b/testing/libdrm/git_fixes.diff
@@ -0,0 +1,13 @@
+diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
+index 19441f3..eb9dd32 100644
+--- a/intel/intel_bufmgr_gem.c
++++ b/intel/intel_bufmgr_gem.c
+@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem)
+ 				      bufmgr_gem->vma_cache.next,
+ 				      vma_list);
+ 		assert(bo_gem->map_count == 0);
+-		DRMLISTDEL(&bo_gem->vma_list);
++		DRMLISTDELINIT(&bo_gem->vma_list);
+ 
+ 		if (bo_gem->mem_virtual) {
+ 			munmap(bo_gem->mem_virtual, bo_gem->bo.size);
diff --git a/testing/libdrm/no-pthread-stubs.patch b/testing/libdrm/no-pthread-stubs.patch
new file mode 100644
index 000000000..5430244f9
--- /dev/null
+++ b/testing/libdrm/no-pthread-stubs.patch
@@ -0,0 +1,66 @@
+diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
+--- libdrm-2.4.0/configure.ac	2008-10-09 21:57:09.000000000 +0200
++++ libdrm-2.4.0-nostubs/configure.ac	2008-10-21 10:48:24.000000000 +0200
+@@ -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],
+--- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
++++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
+@@ -26,7 +26,6 @@
+ 	$(WARN_CFLAGS) \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/intel \
+-	$(PTHREADSTUBS_CFLAGS) \
+ 	$(PCIACCESS_CFLAGS) \
+ 	-I$(top_srcdir)/include/drm
+ 
+@@ -34,7 +33,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@
+ 
+--- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
++++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +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 \
+--- libdrm-2.4.16/nouveau/Makefile.am	2009-11-20 23:54:36.000000000 +0000
++++ libdrm-2.4.16/nouveau/Makefile.am.new	2009-12-07 08:13:01.489072320 +0000
+@@ -2,13 +2,12 @@
+ 	$(WARN_CFLAGS) \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/nouveau \
+-	$(PTHREADSTUBS_CFLAGS) \
+ 	-I$(top_srcdir)/include/drm
+ 
+ libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
+ libdrm_nouveau_ladir = $(libdir)
+ libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_nouveau_la_LIBADD = ../libdrm.la
+ 
+ libdrm_nouveau_la_SOURCES = \
+ 			    nouveau_device.c \
diff --git a/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD
new file mode 100644
index 000000000..4b9f1ca54
--- /dev/null
+++ b/testing/openldap/PKGBUILD
@@ -0,0 +1,102 @@
+# $Id: PKGBUILD 153670 2012-03-17 18:34:49Z eric $
+# Maintainer:
+
+pkgbase=openldap
+pkgname=('libldap' 'openldap')
+pkgver=2.4.30
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.openldap.org/"
+license=('custom')
+makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
+source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
+        slapd slapd.default
+        ntlm.patch
+        mutex-end-of-struct-sigsegv.patch)
+sha1sums=('7447e89b9a5199f9bb2231bda42c308a1b6513d9'
+          'bd1ea19256d3d467f1f803e0f4046ef50f17628f'
+          'd89b8a533045123f1ab46c9c430cf132d58a20a4'
+          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
+          '694269dad78c7a806649c2d7f57bb7e503df3af1')
+
+build() {
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  patch -Np1 -i "${srcdir}"/ntlm.patch
+  patch -Np1 -i "${srcdir}"/mutex-end-of-struct-sigsegv.patch
+
+  sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in
+  sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
+  sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf
+  sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
+
+  LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" 
+  ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
+    --sysconfdir=/etc --localstatedir=/var/lib/openldap \
+    --enable-ipv6 --enable-syslog --enable-local \
+    --enable-bdb --enable-hdb \
+    --enable-crypt --enable-dynamic \
+    --with-threads --disable-wrappers \
+    --without-fetch \
+    --enable-spasswd --with-cyrus-sasl \
+    --enable-overlays=mod --enable-modules=yes
+  make
+}
+
+check() {
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  make test
+}
+
+package_libldap() {
+  pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
+  depends=('libsasl' 'e2fsprogs')
+  backup=('etc/openldap/ldap.conf')
+  options=('!libtool')
+
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  for dir in include libraries doc/man/man3 ; do
+    pushd ${dir}
+    make DESTDIR="${pkgdir}" install
+    popd
+  done
+  install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5
+  
+# get rid of duplicate default conf files
+  rm "${pkgdir}"/etc/openldap/*.default
+
+  ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2
+  ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2
+
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_openldap() {
+  pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
+  depends=("libldap>=${pkgver}" 'libltdl' 'util-linux')
+  backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd')
+  options=('!libtool' 'emptydirs')
+  install=openldap.install
+
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  for dir in clients servers doc/man/man{1,5,8} ; do
+    pushd ${dir}
+    make DESTDIR="${pkgdir}" install
+    popd
+  done
+  rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
+  rm -r "${pkgdir}"/run
+
+# get rid of duplicate default conf files
+  rm "${pkgdir}"/etc/openldap/*.default
+
+  ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd
+
+  chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
+  chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
+
+  install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap
+  install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
+  install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd
+  install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/testing/openldap/mutex-end-of-struct-sigsegv.patch b/testing/openldap/mutex-end-of-struct-sigsegv.patch
new file mode 100644
index 000000000..e8996386a
--- /dev/null
+++ b/testing/openldap/mutex-end-of-struct-sigsegv.patch
@@ -0,0 +1,293 @@
+ libraries/libldap/init.c     |    8 ++-
+ libraries/libldap/ldap-int.h |  198 ++++++++++++++++++++++--------------------
+ 2 files changed, 110 insertions(+), 96 deletions(-)
+
+diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
+index 39292d2..9d37e64 100644
+--- a/libraries/libldap/init.c
++++ b/libraries/libldap/init.c
+@@ -36,7 +36,13 @@
+ #include "lutil.h"
+ 
+ struct ldapoptions ldap_int_global_options =
+-	{ LDAP_UNINITIALIZED, LDAP_DEBUG_NONE LDAP_LDO_MUTEX_NULLARG };  
++	{ LDAP_UNINITIALIZED, LDAP_DEBUG_NONE
++		LDAP_LDO_NULLARG
++		LDAP_LDO_CONNECTIONLESS_NULLARG
++		LDAP_LDO_TLS_NULLARG
++		LDAP_LDO_SASL_NULLARG
++		LDAP_LDO_GSSAPI_NULLARG
++		LDAP_LDO_MUTEX_NULLARG };
+ 
+ #define ATTR_NONE	0
+ #define ATTR_BOOL	1
+diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
+index f8e6126..ac6c9e5 100644
+--- a/libraries/libldap/ldap-int.h
++++ b/libraries/libldap/ldap-int.h
+@@ -185,29 +185,59 @@ struct ldapoptions {
+ #define LDAP_TRASHED_SESSION	0xFF
+ 	int   ldo_debug;
+ 
+-#ifdef LDAP_R_COMPILE
+-	ldap_pvt_thread_mutex_t	ldo_mutex;
+-#define LDAP_LDO_MUTEX_NULLARG	, LDAP_PVT_MUTEX_NULL
+-#else
+-#define LDAP_LDO_MUTEX_NULLARG
+-#endif
++	ber_int_t		ldo_version;
++	ber_int_t		ldo_deref;
++	ber_int_t		ldo_timelimit;
++	ber_int_t		ldo_sizelimit;
++
++	/* per API call timeout */
++	struct timeval		ldo_tm_api;
++	struct timeval		ldo_tm_net;
++
++	LDAPURLDesc *ldo_defludp;
++	int		ldo_defport;
++	char*	ldo_defbase;
++	char*	ldo_defbinddn;	/* bind dn */
++
++	/*
++	 * Per connection tcp-keepalive settings (Linux only,
++	 * ignored where unsupported)
++	 */
++	ber_int_t ldo_keepalive_idle;
++	ber_int_t ldo_keepalive_probes;
++	ber_int_t ldo_keepalive_interval;
++
++	int		ldo_refhoplimit;	/* limit on referral nesting */
++
++	/* LDAPv3 server and client controls */
++	LDAPControl	**ldo_sctrls;
++	LDAPControl **ldo_cctrls;
++
++	/* LDAP rebind callback function */
++	LDAP_REBIND_PROC *ldo_rebind_proc;
++	void *ldo_rebind_params;
++	LDAP_NEXTREF_PROC *ldo_nextref_proc;
++	void *ldo_nextref_params;
++	LDAP_URLLIST_PROC *ldo_urllist_proc;
++	void *ldo_urllist_params;
++
++	/* LDAP connection callback stack */
++	ldaplist *ldo_conn_cbs;
++
++	LDAP_BOOLEANS ldo_booleans;	/* boolean options */
++
++#define LDAP_LDO_NULLARG	,0,0,0,0 ,{0},{0} ,0,0,0,0, 0,0,0,0, 0,0, 0,0,0,0,0,0, 0, 0
+ 
+ #ifdef LDAP_CONNECTIONLESS
+ #define	LDAP_IS_UDP(ld)		((ld)->ld_options.ldo_is_udp)
+ 	void*			ldo_peer;	/* struct sockaddr* */
+ 	char*			ldo_cldapdn;
+ 	int			ldo_is_udp;
++#define	LDAP_LDO_CONNECTIONLESS_NULLARG	,0,0,0
++#else
++#define	LDAP_LDO_CONNECTIONLESS_NULLARG
+ #endif
+ 
+-	/* per API call timeout */
+-	struct timeval		ldo_tm_api;
+-	struct timeval		ldo_tm_net;
+-
+-	ber_int_t		ldo_version;
+-	ber_int_t		ldo_deref;
+-	ber_int_t		ldo_timelimit;
+-	ber_int_t		ldo_sizelimit;
+-
+ #ifdef HAVE_TLS
+    	/* tls context */
+    	void		*ldo_tls_ctx;
+@@ -226,16 +256,12 @@ struct ldapoptions {
+    	int			ldo_tls_mode;
+    	int			ldo_tls_require_cert;
+ 	int			ldo_tls_impl;
+-#ifdef HAVE_OPENSSL_CRL
+    	int			ldo_tls_crlcheck;
+-#endif
++#define LDAP_LDO_TLS_NULLARG ,0,0,0,{0,0,0,0,0,0,0,0,0},0,0,0,0
++#else
++#define LDAP_LDO_TLS_NULLARG
+ #endif
+ 
+-	LDAPURLDesc *ldo_defludp;
+-	int		ldo_defport;
+-	char*	ldo_defbase;
+-	char*	ldo_defbinddn;	/* bind dn */
+-
+ #ifdef HAVE_CYRUS_SASL
+ 	char*	ldo_def_sasl_mech;		/* SASL Mechanism(s) */
+ 	char*	ldo_def_sasl_realm;		/* SASL realm */
+@@ -244,6 +270,9 @@ struct ldapoptions {
+ 
+ 	/* SASL Security Properties */
+ 	struct sasl_security_properties	ldo_sasl_secprops;
++#define LDAP_LDO_SASL_NULLARG ,0,0,0,0,{0}
++#else
++#define LDAP_LDO_SASL_NULLARG
+ #endif
+ 
+ #ifdef HAVE_GSSAPI
+@@ -253,34 +282,17 @@ struct ldapoptions {
+ #define LDAP_GSSAPI_OPT_DO_NOT_FREE_GSS_CONTEXT	0x0001
+ #define LDAP_GSSAPI_OPT_ALLOW_REMOTE_PRINCIPAL	0x0002
+ 	unsigned ldo_gssapi_options;
++#define LDAP_LDO_GSSAPI_NULLARG ,0,0
++#else
++#define LDAP_LDO_GSSAPI_NULLARG
+ #endif
+ 
+-	/*
+-	 * Per connection tcp-keepalive settings (Linux only,
+-	 * ignored where unsupported)
+-	 */
+-	ber_int_t ldo_keepalive_idle;
+-	ber_int_t ldo_keepalive_probes;
+-	ber_int_t ldo_keepalive_interval;
+-
+-	int		ldo_refhoplimit;	/* limit on referral nesting */
+-
+-	/* LDAPv3 server and client controls */
+-	LDAPControl	**ldo_sctrls;
+-	LDAPControl **ldo_cctrls;
+-
+-	/* LDAP rebind callback function */
+-	LDAP_REBIND_PROC *ldo_rebind_proc;
+-	void *ldo_rebind_params;
+-	LDAP_NEXTREF_PROC *ldo_nextref_proc;
+-	void *ldo_nextref_params;
+-	LDAP_URLLIST_PROC *ldo_urllist_proc;
+-	void *ldo_urllist_params;
+-
+-	/* LDAP connection callback stack */
+-	ldaplist *ldo_conn_cbs;
+-
+-	LDAP_BOOLEANS ldo_booleans;	/* boolean options */
++#ifdef LDAP_R_COMPILE
++	ldap_pvt_thread_mutex_t	ldo_mutex;
++#define LDAP_LDO_MUTEX_NULLARG	, LDAP_PVT_MUTEX_NULL
++#else
++#define LDAP_LDO_MUTEX_NULLARG
++#endif
+ };
+ 
+ 
+@@ -375,6 +387,46 @@ struct ldap_common {
+ 	Sockbuf		*ldc_sb;	/* socket descriptor & buffer */
+ #define ld_sb			ldc->ldc_sb
+ 
++	unsigned short	ldc_lberoptions;
++#define	ld_lberoptions		ldc->ldc_lberoptions
++
++	/* protected by msgid_mutex */
++	ber_len_t		ldc_msgid;
++#define	ld_msgid		ldc->ldc_msgid
++
++	/* do not mess with these */
++	/* protected by req_mutex */
++	LDAPRequest	*ldc_requests;	/* list of outstanding requests */
++	/* protected by res_mutex */
++	LDAPMessage	*ldc_responses;	/* list of outstanding responses */
++#define	ld_requests		ldc->ldc_requests
++#define	ld_responses		ldc->ldc_responses
++
++	/* protected by abandon_mutex */
++	ber_len_t	ldc_nabandoned;
++	ber_int_t	*ldc_abandoned;	/* array of abandoned requests */
++#define	ld_nabandoned		ldc->ldc_nabandoned
++#define	ld_abandoned		ldc->ldc_abandoned
++
++	/* unused by libldap */
++	LDAPCache	*ldc_cache;	/* non-null if cache is initialized */
++#define	ld_cache		ldc->ldc_cache
++
++	/* do not mess with the rest though */
++
++	/* protected by conn_mutex */
++	LDAPConn	*ldc_defconn;	/* default connection */
++#define	ld_defconn		ldc->ldc_defconn
++	LDAPConn	*ldc_conns;	/* list of server connections */
++#define	ld_conns		ldc->ldc_conns
++	void		*ldc_selectinfo;/* platform specifics for select */
++#define	ld_selectinfo		ldc->ldc_selectinfo
++
++	/* ldap_common refcnt - free only if 0 */
++	/* protected by ldc_mutex */
++	unsigned int		ldc_refcnt;
++#define	ld_ldcrefcnt		ldc->ldc_refcnt
++
+ 	/* protected by ldo_mutex */
+ 	struct ldapoptions ldc_options;
+ #define ld_options		ldc->ldc_options
+@@ -403,66 +455,22 @@ struct ldap_common {
+ #define ld_urllist_params	ld_options.ldo_urllist_params
+ 
+ #define ld_version		ld_options.ldo_version
+-#ifdef LDAP_R_COMPILE
+-#define	ld_ldopts_mutex		ld_options.ldo_mutex
+-#endif
+-
+-	unsigned short	ldc_lberoptions;
+-#define	ld_lberoptions		ldc->ldc_lberoptions
+-
+-	/* protected by msgid_mutex */
+-	ber_len_t		ldc_msgid;
+-#define	ld_msgid		ldc->ldc_msgid
+-
+-	/* do not mess with these */
+-	/* protected by req_mutex */
+-	LDAPRequest	*ldc_requests;	/* list of outstanding requests */
+-	/* protected by res_mutex */
+-	LDAPMessage	*ldc_responses;	/* list of outstanding responses */
+-#define	ld_requests		ldc->ldc_requests
+-#define	ld_responses		ldc->ldc_responses
+ 
+ #ifdef LDAP_R_COMPILE
++	ldap_pvt_thread_mutex_t	ldc_mutex;
+ 	ldap_pvt_thread_mutex_t	ldc_msgid_mutex;
+ 	ldap_pvt_thread_mutex_t	ldc_conn_mutex;
+ 	ldap_pvt_thread_mutex_t	ldc_req_mutex;
+ 	ldap_pvt_thread_mutex_t	ldc_res_mutex;
+ 	ldap_pvt_thread_mutex_t	ldc_abandon_mutex;
++#define	ld_ldopts_mutex		ld_options.ldo_mutex
++#define	ld_ldcmutex		ldc->ldc_mutex
+ #define	ld_msgid_mutex		ldc->ldc_msgid_mutex
+ #define	ld_conn_mutex		ldc->ldc_conn_mutex
+ #define	ld_req_mutex		ldc->ldc_req_mutex
+ #define	ld_res_mutex		ldc->ldc_res_mutex
+ #define	ld_abandon_mutex	ldc->ldc_abandon_mutex
+ #endif
+-
+-	/* protected by abandon_mutex */
+-	ber_len_t	ldc_nabandoned;
+-	ber_int_t	*ldc_abandoned;	/* array of abandoned requests */
+-#define	ld_nabandoned		ldc->ldc_nabandoned
+-#define	ld_abandoned		ldc->ldc_abandoned
+-
+-	/* unused by libldap */
+-	LDAPCache	*ldc_cache;	/* non-null if cache is initialized */
+-#define	ld_cache		ldc->ldc_cache
+-
+-	/* do not mess with the rest though */
+-
+-	/* protected by conn_mutex */
+-	LDAPConn	*ldc_defconn;	/* default connection */
+-#define	ld_defconn		ldc->ldc_defconn
+-	LDAPConn	*ldc_conns;	/* list of server connections */
+-#define	ld_conns		ldc->ldc_conns
+-	void		*ldc_selectinfo;/* platform specifics for select */
+-#define	ld_selectinfo		ldc->ldc_selectinfo
+-
+-	/* ldap_common refcnt - free only if 0 */
+-#ifdef LDAP_R_COMPILE
+-	ldap_pvt_thread_mutex_t	ldc_mutex;
+-#define	ld_ldcmutex		ldc->ldc_mutex
+-#endif
+-	/* protected by ldc_mutex */
+-	unsigned int		ldc_refcnt;
+-#define	ld_ldcrefcnt		ldc->ldc_refcnt
+ };
+ 
+ struct ldap {
diff --git a/testing/openldap/ntlm.patch b/testing/openldap/ntlm.patch
new file mode 100644
index 000000000..6804b610d
--- /dev/null
+++ b/testing/openldap/ntlm.patch
@@ -0,0 +1,230 @@
+Patch from evolution-exchange (2.10.3).  The ldap_ntlm_bind function is
+actually called by evolution-data-server, checked at version 1.12.2.
+Without this patch, the Exchange addressbook integration uses simple binds
+with cleartext passwords.
+
+Russ checked with openldap-software for upstream's opinion on this patch
+on 2007-12-21.  Upstream had never received it as a patch submission and
+given that it's apparently only for older Exchange servers that can't do
+SASL and DIGEST-MD5, it's not very appealing.
+
+Bug#457374 filed against evolution-data-server asking if this support is
+still required on 2007-12-21.
+
+Index: trunk/include/ldap.h
+===================================================================
+--- trunk.orig/include/ldap.h
++++ trunk/include/ldap.h
+@@ -2461,5 +2461,25 @@
+ 	LDAPControl	**ctrls,
+ 	LDAPDerefRes	**drp ));
+ 
++/*
++ * hacks for NTLM
++ */
++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
++#define LDAP_AUTH_NTLM_RESPONSE  ((ber_tag_t) 0x8bU)
++LDAP_F( int )
++ldap_ntlm_bind LDAP_P((
++      LDAP    *ld,
++      LDAP_CONST char *dn,
++      ber_tag_t tag,
++      struct berval *cred,
++      LDAPControl **sctrls,
++      LDAPControl **cctrls,
++      int   *msgidp ));
++LDAP_F( int )
++ldap_parse_ntlm_bind_result LDAP_P((
++      LDAP    *ld,
++      LDAPMessage *res,
++      struct berval *challenge));
++
+ LDAP_END_DECL
+ #endif /* _LDAP_H */
+Index: trunk/libraries/libldap/ntlm.c
+===================================================================
+--- /dev/null
++++ trunk/libraries/libldap/ntlm.c
+@@ -0,0 +1,138 @@
++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
++/*
++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
++ */
++
++/* Mostly copied from sasl.c */
++
++#include "portable.h"
++
++#include <stdlib.h>
++#include <stdio.h>
++
++#include <ac/socket.h>
++#include <ac/string.h>
++#include <ac/time.h>
++#include <ac/errno.h>
++
++#include "ldap-int.h"
++
++int
++ldap_ntlm_bind(
++ LDAP    *ld,
++ LDAP_CONST char *dn,
++ ber_tag_t tag,
++ struct berval *cred,
++ LDAPControl **sctrls,
++ LDAPControl **cctrls,
++ int   *msgidp )
++{
++ BerElement  *ber;
++ int rc;
++ ber_int_t id;
++
++ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
++
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( msgidp != NULL );
++
++ if( msgidp == NULL ) {
++   ld->ld_errno = LDAP_PARAM_ERROR;
++   return ld->ld_errno;
++ }
++
++ /* create a message to send */
++ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
++   ld->ld_errno = LDAP_NO_MEMORY;
++   return ld->ld_errno;
++ }
++
++ assert( LBER_VALID( ber ) );
++
++ LDAP_NEXT_MSGID( ld, id );
++ rc = ber_printf( ber, "{it{istON}" /*}*/,
++      id, LDAP_REQ_BIND,
++      ld->ld_version, dn, tag,
++      cred );
++
++ /* Put Server Controls */
++ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
++   ber_free( ber, 1 );
++   return ld->ld_errno;
++ }
++
++ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
++   ld->ld_errno = LDAP_ENCODING_ERROR;
++   ber_free( ber, 1 );
++   return ld->ld_errno;
++ }
++
++ /* send the message */
++ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
++
++ if(*msgidp < 0)
++   return ld->ld_errno;
++
++ return LDAP_SUCCESS;
++}
++
++int
++ldap_parse_ntlm_bind_result(
++ LDAP    *ld,
++ LDAPMessage *res,
++ struct berval *challenge)
++{
++ ber_int_t errcode;
++ ber_tag_t tag;
++ BerElement  *ber;
++ ber_len_t len;
++
++ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
++
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( res != NULL );
++
++ if ( ld == NULL || res == NULL ) {
++   return LDAP_PARAM_ERROR;
++ }
++
++ if( res->lm_msgtype != LDAP_RES_BIND ) {
++   ld->ld_errno = LDAP_PARAM_ERROR;
++   return ld->ld_errno;
++ }
++
++ if ( ld->ld_error ) {
++   LDAP_FREE( ld->ld_error );
++   ld->ld_error = NULL;
++ }
++ if ( ld->ld_matched ) {
++   LDAP_FREE( ld->ld_matched );
++   ld->ld_matched = NULL;
++ }
++
++ /* parse results */
++
++ ber = ber_dup( res->lm_ber );
++
++ if( ber == NULL ) {
++   ld->ld_errno = LDAP_NO_MEMORY;
++   return ld->ld_errno;
++ }
++
++ tag = ber_scanf( ber, "{ioa" /*}*/,
++      &errcode, challenge, &ld->ld_error );
++ ber_free( ber, 0 );
++
++ if( tag == LBER_ERROR ) {
++   ld->ld_errno = LDAP_DECODING_ERROR;
++   return ld->ld_errno;
++ }
++
++ ld->ld_errno = errcode;
++
++ return( ld->ld_errno );
++}
++
+Index: trunk/libraries/libldap/Makefile.in
+===================================================================
+--- trunk.orig/libraries/libldap/Makefile.in
++++ trunk/libraries/libldap/Makefile.in
+@@ -27,7 +27,7 @@
+ 	init.c options.c print.c string.c util-int.c schema.c \
+ 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ 	tls2.c tls_o.c tls_g.c tls_m.c \
+-	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ 	assertion.c deref.c ldif.c fetch.c
+ 
+ OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
+@@ -40,7 +40,7 @@
+ 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+-	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ 	assertion.lo deref.lo ldif.lo fetch.lo
+ 
+ LDAP_INCDIR= ../../include       
+Index: trunk/libraries/libldap_r/Makefile.in
+===================================================================
+--- trunk.orig/libraries/libldap_r/Makefile.in
++++ trunk/libraries/libldap_r/Makefile.in
+@@ -29,7 +29,7 @@
+ 	init.c options.c print.c string.c util-int.c schema.c \
+ 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ 	tls2.c tls_o.c tls_g.c tls_m.c \
+-	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ 	assertion.c deref.c ldif.c fetch.c
+ SRCS	= threads.c rdwr.c rmutex.c tpool.c rq.c \
+ 	thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
+@@ -47,7 +47,7 @@
+ 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+-	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ 	assertion.lo deref.lo ldif.lo fetch.lo
+ 
+ LDAP_INCDIR= ../../include       
diff --git a/testing/openldap/openldap.install b/testing/openldap/openldap.install
new file mode 100644
index 000000000..cf3cb9f25
--- /dev/null
+++ b/testing/openldap/openldap.install
@@ -0,0 +1,20 @@
+post_install(){
+  groupadd -g 439 ldap &>/dev/null
+  useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
+  chown -R ldap:ldap var/lib/openldap &>/dev/null
+}
+
+post_upgrade(){
+  getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null
+  getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
+  chown -R ldap:ldap var/lib/openldap &>/dev/null
+}
+
+post_remove(){
+  if getent passwd ldap >/dev/null 2>&1; then
+    userdel ldap
+  fi
+  if getent group ldap >/dev/null 2>&1; then
+    groupdel ldap
+  fi
+}
diff --git a/testing/openldap/slapd b/testing/openldap/slapd
new file mode 100755
index 000000000..4f212da66
--- /dev/null
+++ b/testing/openldap/slapd
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd
+
+PID=`pidof -o %PPID /usr/sbin/slapd`
+case "$1" in
+  start)
+    stat_busy "Starting OpenLDAP"
+    [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap
+    if [ -z "$PID" ]; then
+      if [ -z "$SLAPD_SERVICES" ]; then
+        /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS
+      else
+        /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS
+      fi
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        stat_done
+      fi
+      add_daemon slapd
+    else
+      stat_fail
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping OpenLDAP"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm -f /run/openldap/slapd.pid
+      rm -f /run/openldap/slapd.args
+      rm_daemon slapd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/testing/openldap/slapd.default b/testing/openldap/slapd.default
new file mode 100644
index 000000000..72ae2a6a7
--- /dev/null
+++ b/testing/openldap/slapd.default
@@ -0,0 +1,6 @@
+# slapd normally serves ldap only on all TCP-ports 389. slapd can also
+# service requests on TCP-port 636 (ldaps) and requests via unix
+# sockets.
+# Example usage:
+#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///"
+SLAPD_OPTIONS=""