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

Conflicts: community/esmtp/PKGBUILD community/geany-plugins/PKGBUILD community/giggle/PKGBUILD community/guichan/PKGBUILD community/mxml/PKGBUILD community/ruby-gtk2/PKGBUILD core/libtool/PKGBUILD core/mkinitcpio-busybox/PKGBUILD core/udev/PKGBUILD extra/audacious/PKGBUILD extra/conky/PKGBUILD extra/gnome-control-center/PKGBUILD extra/gtk2/PKGBUILD extra/gtk3/PKGBUILD extra/gvfs/PKGBUILD extra/kdeutils/PKGBUILD extra/kino/PKGBUILD extra/mkvtoolnix/PKGBUILD extra/poppler/PKGBUILD extra/postfix/PKGBUILD extra/pulseaudio/PKGBUILD extra/qtcurve-gtk2/PKGBUILD extra/transmission/PKGBUILD extra/xfburn/PKGBUILD extra/xfce4-xkb-plugin/PKGBUILD extra/xorg-server/PKGBUILD extra/yelp/PKGBUILD kde-unstable/calligra/PKGBUILD multilib/lib32-gtk2/PKGBUILD multilib/lib32-libpulse/PKGBUILD multilib/libtool-multilib/PKGBUILD multilib/wine/PKGBUILD multilib/wine/wine.install
author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-10-28 11:35:50 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-10-28 11:35:50 -0300
commit: 8856e6fe26ce35b4caf6beeac324f583ec1b6133 (patch)
tree: c42a03e2b7610a39d167af36357607399aa40045 /extra
parent: 5100458465d1ed420073c3213349bf430075ddbc (diff)
parent: 0424b5fc47f106db6498c4cda3476e1d49fe0f82 (diff)
144 files changed, 1649 insertions, 865 deletions
diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD
index a71edea4e..22eb0e4b1 100644
--- a/extra/aisleriot/PKGBUILD
+++ b/extra/aisleriot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139215 2011-10-01 18:55:37Z ibiru $
+# $Id: PKGBUILD 140834 2011-10-20 05:41:34Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=aisleriot
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="GNOME Solitaire card games"
 arch=(mips64el)
@@ -14,7 +14,7 @@ makedepends=(gnome-doc-utils intltool itstool)
 options=('!emptydirs' '!libtool')
 install=aisleriot.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('dba561dc35641cb393626151cf048f407c47960c7a254f378b986ab95d899d85')
+sha256sums=('86bbc131daf97d14f1587216d3e4c73db35126dddf393bfef4f7a67822f96529')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD
index fa829a121..70cb9519f 100644
--- a/extra/allegro/PKGBUILD
+++ b/extra/allegro/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 140688 2011-10-18 03:46:08Z eric $
+# $Id: PKGBUILD 141200 2011-10-25 22:29:00Z eric $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: arjan <arjan@archlinux.org>
 
 pkgname=allegro
 pkgver=5.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Portable library mainly aimed at video game and multimedia programming"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://alleg.sourceforge.net/"
 license=('custom')
 depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg')
-makedepends=('cmake' 'mesa')
+makedepends=('cmake' 'mesa' 'freetype2')
 source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz)
 md5sums=('e2e314ee7116c7efddd0497d6c885e46')
 
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index f16153495..4baf7e714 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139217 2011-10-01 18:55:41Z ibiru $
+# $Id: PKGBUILD 140836 2011-10-20 05:41:37Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgname=anjuta
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ url="http://anjuta.sourceforge.net/"
 install=anjuta.install
 source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('2ff968af17e9202fcdb12c47aadaa9d3cb4b98d78c22db8a0cedcb4bf0a81fb8')
+sha256sums=('1e59aed63312e293c55f2934c4766411e9908fa512dd86e1422e3d906fe75613')
 
 build() {
   cd "${srcdir}/anjuta-${pkgver}"
diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD
index 07037b49c..bd62ef75f 100644
--- a/extra/at-spi2-atk/PKGBUILD
+++ b/extra/at-spi2-atk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139223 2011-10-01 18:55:48Z ibiru $
+# $Id: PKGBUILD 140838 2011-10-20 05:41:39Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-atk
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,9 +12,8 @@ depends=('at-spi2-core' 'libx11' 'atk' 'dconf')
 makedepends=('intltool')
 install=at-spi2-atk.install
 options=('!libtool')
-groups=('gnome')
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('7fd0e043d2a32f06cab1ca116f36114d9b0c482ca421e26b1d565687db171150')
+sha256sums=('6677def34b16c9a28d6ad96473ea56a3c0e13aa968e584df004cd44c8691ea1a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD
index 58c7a2793..872d9006c 100644
--- a/extra/at-spi2-core/PKGBUILD
+++ b/extra/at-spi2-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139225 2011-10-01 18:55:51Z ibiru $
+# $Id: PKGBUILD 140840 2011-10-20 05:41:41Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-core
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2' 'libxtst')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9b3f645560749067ea250c26b281248e3eb912316323a02d358fc2be5dea3848')
+sha256sums=('2a4129420decca3657e163a4dbb1a3cb28acafe32ea1292417fdd81084d48fac')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/atkmm/PKGBUILD b/extra/atkmm/PKGBUILD
index 806c39d81..9bc7244d4 100644
--- a/extra/atkmm/PKGBUILD
+++ b/extra/atkmm/PKGBUILD
@@ -3,15 +3,15 @@
 
 pkgbase=atkmm
 pkgname=(atkmm atkmm-docs)
-pkgver=2.22.5
+pkgver=2.22.6
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('atk' 'glibmm' 'glibmm-docs' 'libsigc++')
 license=('LGPL')
 options=('!libtool' '!emptydirs')
 url="http://gtkmm.sourceforge.net/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.22/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('61e03e5e67952c8fd9919049fae680bd0f2a1547344394f36b98b05b34b7be6c')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.22/${pkgbase}-${pkgver}.tar.xz)
+sha256sums=('0a74295106b9e3ae552b169eb4e098b8b825c4115045b9d5134a6c79a238aeb6')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 0df8b5229..8af53c3d5 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 138257 2011-09-19 16:24:40Z bisson $
+# $Id: PKGBUILD 141068 2011-10-23 03:27:31Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=3.0.3
+pkgver=3.0.4
 pkgrel=1
 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality'
-arch=('i686' 'x86_64' 'mips64el')
 url='http://audacious-media-player.org/'
 license=('GPL3')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
          'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils')
-optdepends=('unzip: zipped skins support')
+optdepends=('p7zip-libre: zipped skins support')
 source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('713cc7ee277ca548ea143b4ec3bd40bcacdb327f')
+sha1sums=('d4bb828e4ead275bded85cf8b0aa258c347106cb')
 
 provides=('audacious-player')
 replaces=('audacious-player')
diff --git a/extra/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD
index 478c142dc..dddf5cf4b 100644
--- a/extra/bigloo/PKGBUILD
+++ b/extra/bigloo/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 138164 2011-09-17 22:07:10Z andrea $
+# $Id: PKGBUILD 140975 2011-10-20 08:57:44Z eric $
 # Maintainer: Jürgen Hötzel <juergen@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=bigloo
-_pkgver=3.6a
+_pkgver=3.7a-2
 pkgver=${_pkgver/-/_}
-pkgrel=3
+pkgrel=1
 pkgdesc="Fast scheme compiler"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www-sop.inria.fr/mimosa/fp/Bigloo/"
 license=('GPL' 'LGPL')
-depends=('openssl' 'sqlite3')
+depends=('openssl' 'sqlite3' 'alsa-lib')
 makedepends=('java-environment' 'emacs' 'zip')
 optdepends=('emacs')
 options=('!makeflags')
 install=bigloo.install
 source=(ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${pkgname}${_pkgver}.tar.gz)
-md5sums=('484c09cd0e0f84c96999d889de35cd1e')
+md5sums=('1a692b950843e36910e13e0e91f90534')
 
 build() {
   cd "${srcdir}/${pkgname}${_pkgver}"
@@ -33,6 +33,11 @@ build() {
   make build compile-bee
 }
 
+check() {
+  cd "${srcdir}/${pkgname}${_pkgver}"
+  make test
+}
+
 package() {
   cd "${srcdir}/${pkgname}${_pkgver}"
   make DESTDIR="${pkgdir}" install install-bee
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index 85354f042..806a08c5e 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 138476 2011-09-24 16:46:30Z stephane $
+# $Id: PKGBUILD 140830 2011-10-20 05:01:46Z eric $
 # Contributor: John Sowiak <john@archlinux.org>
 # Maintainer: tobias <tobias@archlinux.org>
 
@@ -12,8 +12,8 @@
 _svn=false
 
 pkgname=blender
-pkgver=2.59
-pkgrel=3
+pkgver=2.60
+pkgrel=1
 epoch=2
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,12 +21,12 @@ 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' 'libsamplerate' 'ffmpeg')
-makedepends=('cmake') # 'subversion'
+         'freetype2' 'openal' 'libsndfile' 'ffmpeg')
+makedepends=('cmake')
 install=blender.install
 if [ $_svn = false ]; then
   source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe')
+  md5sums=('2951df9d5f004c5e0375b53969205a38')
 else
   source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
   md5sums=('7579d1139d0d6025df8afcfca64a65c4')
@@ -34,6 +34,7 @@ fi
 
 # source PKGBUILD && mksource
 mksource() {
+  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
   _svnver=38016
   _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
   _svnmod="$pkgname-$pkgver"
diff --git a/extra/blender/blender.install b/extra/blender/blender.install
index f4d7cc443..724bfce00 100644
--- a/extra/blender/blender.install
+++ b/extra/blender/blender.install
@@ -5,13 +5,9 @@ post_install() {
 }
 
 post_upgrade() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  post_install
 }
 
 post_remove() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  post_install
 }
diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD
index ea9b5a6cc..0feb4c2bc 100644
--- a/extra/caribou/PKGBUILD
+++ b/extra/caribou/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 139466 2011-10-01 23:23:01Z ibiru $
+# $Id: PKGBUILD 140843 2011-10-20 05:41:46Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Adam Hani Schakaki <krzd@krzd.net>
 
 pkgname=caribou
-pkgver=0.4.0
-pkgrel=2
+pkgver=0.4.1
+pkgrel=1
 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard."
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/Caribou"
 license=('LGPL')
 depends=('at-spi2-atk' 'pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool') 
+makedepends=('gnome-doc-utils' 'intltool')
 install=caribou.install
 options=(!libtool !emptydirs)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz)
-sha256sums=('9d9aeab26956371e9a8e807e2554be5ca08e32f6a27632598065cf2e85e66d16')
+sha256sums=('d4d2328e0eadbf037f7e0ec146e835097fe56cb2b940985655e649c5556e4ed1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index ca3e41400..c0a9544e0 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139231 2011-10-01 18:56:02Z ibiru $
+# $Id: PKGBUILD 140845 2011-10-20 05:41:48Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/projects/cheese/"
 install=cheese.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('04e32ea45cf7a441dccf72ab08a765b268371878728336b762fb625dd02ad32b')
+sha256sums=('0abc54aeaf1cec931b8a6e148f40341be4b2bc0e9a1164eba4fef7989499059c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index 1ddff2183..e0525fa43 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139233 2011-10-01 18:56:07Z ibiru $
+# $Id: PKGBUILD 140847 2011-10-20 05:41:50Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=clutter
-pkgver=1.8.0
+pkgver=1.8.2
 pkgrel=1
 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ license=('LGPL')
 depends=('cogl>=1.8.0' 'mesa' 'json-glib' 'atk' 'libxi')
 makedepends=('gobject-introspection' 'mesa')
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('c8bd379154d40400b19932934dfa05e8a02057bbff2455f09afda7aa6c4b5ef8')
+sha256sums=('dc899f26448f31cb31e72d80650b8c8ae05acacd5b5d5a44798eabaca0ddfa2f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD
index 84718b6dd..e8d745d94 100644
--- a/extra/cogl/PKGBUILD
+++ b/extra/cogl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139237 2011-10-01 18:56:15Z ibiru $
+# $Id: PKGBUILD 140849 2011-10-20 05:41:52Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cogl
-pkgver=1.8.0
+pkgver=1.8.2
 pkgrel=1
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 arch=(mips64el)
@@ -12,7 +12,7 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
 makedepends=('mesa' 'gobject-introspection')
 options=(!libtool)
 source=(http://download.gnome.org/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz)
-sha256sums=('b1551c129d5570b63e7130971622fc2ab8d4ecbf0dc1773df1c54fa9c1cb0a2c')
+sha256sums=('ec26fd90c4ba5643875b5f3a04b4ab14b24f0d618ba3d239d61e773c3e3ca8c7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
index 48fb72e1a..4f1af6db7 100644
--- a/extra/conky/PKGBUILD
+++ b/extra/conky/PKGBUILD
@@ -1,32 +1,33 @@
-# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
+# $Id: PKGBUILD 141204 2011-10-26 00:39:40Z bisson $
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: James Rayner <james@archlinux.org>
 # Contributor: Partha Chowdhury <kira.laucas@gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=conky
-pkgver=1.8.1
-pkgrel=3
-pkgdesc='An advanced, highly configurable system monitor for X based on torsmo'
-arch=('i686' 'x86_64' 'mips64el')
+pkgver=1.8.2git20111026
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
-license=('custom')
-replaces=('torsmo')
-makedepends=('pkg-config')
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64' 'mips64el')
+options=('!emptydirs')
+makedepends=('pkg-config' 'docbook2x')
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2')
 backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'current-power.patch')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('735861b284ad4feb86a9febaf4e457a4fcc7b39b')
 
-sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f'
-          '2eeef0cc5a0b612826b2a7f0b43b7a3b7e10bf0b')
+# git clone git://git.omp.am/conky.git; cd conky; git archive --prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz > ../${pkgname}-${pkgver}.tar.xz
+
+replaces=('torsmo')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	patch -p1 < ../current-power.patch # See FS#21984
+	sh autogen.sh
 
-	./configure \
+	CPPFLAGS="$CXXFLAGS" LIBS="$LDFLAGS" ./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-ibm \
diff --git a/extra/conky/PKGBUILD.cmake b/extra/conky/PKGBUILD.cmake
new file mode 100644
index 000000000..7f980868f
--- /dev/null
+++ b/extra/conky/PKGBUILD.cmake
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: James Rayner <james@archlinux.org>
+# Contributor: Partha Chowdhury <kira.laucas@gmail.com>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=conky
+pkgver=1.8.2git20111021
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64')
+makedepends=('pkg-config' 'cmake' 'git' 'docbook2x')
+depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage' 'imlib2' 'lua')
+
+replaces=('torsmo')
+
+build() {
+	cd "${srcdir}"
+
+	cd conky && { git pull origin; cd ..; } || git clone git://git.omp.am/conky.git
+	rm -fr build; mkdir build; cd build
+
+	cmake \
+		-D CMAKE_BUILD_TYPE:STRING="Release" \
+		-D MAINTAINER_MODE:BOOL=ON \
+		-D BUILD_CURL:BOOL=ON \
+		-D BUILD_IMLIB2:BOOL=ON \
+		-D BUILD_LUA_IMLIB2:BOOL=OFF \
+		-D BUILD_MYSQL:BOOL=OFF \
+		-D BUILD_RSS:BOOL=ON \
+		-D BUILD_WEATHER_METAR:BOOL=ON \
+		-D BUILD_WEATHER_XOAP:BOOL=ON \
+		-D BUILD_WLAN:BOOL=ON \
+		-D CMAKE_INSTALL_PREFIX:PATH=/usr \
+		../conky
+
+	make
+}
+
+package() {
+	cd "${srcdir}/build"
+	make DESTDIR="${pkgdir}" install
+	install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+	install -m644 ../conky/{COPYING,LICENSE}* "${pkgdir}/usr/share/licenses/${pkgname}"
+}
diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD
index baeddbc94..59eb011b1 100644
--- a/extra/dcraw/PKGBUILD
+++ b/extra/dcraw/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 125668 2011-05-27 23:18:08Z eric $
+# $Id: PKGBUILD 141206 2011-10-26 08:04:28Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=dcraw
-pkgver=9.08
+pkgver=9.11
 pkgrel=1
 pkgdesc="A command line based converter for digicams raw output"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cybercom.net/~dcoffin/dcraw/"
 license=('custom')
-depends=('lcms')
+depends=('lcms' 'jasper')
 source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz
         license.txt)
-md5sums=('eb1d365c27495a513c0768b2f696ba66'
-         '110b4604a6dacd5537339c4082e9e12a')
-sha1sums=('1282402201ca48f922d9167ad078aa58cb18593e'
+sha1sums=('79dc403d6b629df6dac3218ad33dc89c4a86c234'
           '502c8f0ac7434d48f5dcb2eefe7599627cb69454')
 
 build() {
   cd "${srcdir}/${pkgname}"
-  gcc ${CFLAGS} -O3 -o dcraw dcraw.c -lm -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\"
+  gcc ${CFLAGS} -O3 -o dcraw dcraw.c \
+    -Wall -Wno-unused-result -Wno-array-bounds \
+    -lm -ljasper -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\"
 }
 
 package() {
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index 1b584820d..7a68faa04 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140810 2011-10-19 16:21:22Z dreisner $
+# $Id: PKGBUILD 141089 2011-10-23 16:20:24Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -19,7 +19,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
         'dnsmasq.confd'
         'rc.dnsmasq'
         'dnsmasq.service')
-md5sums=('29d43f182ecad06d64b3598c02380a80'
+md5sums=('b5757ef2d7b651748eeebb88af29d7d6'
          '66479e99123faeab83ebaed709ef95b5'
          '9f180cc236808bbd02ca8652fd2e8217'
          'f329d86f8ba1cd85f9b6ee59e0ce3791')
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 6576f1976..e59d233d7 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 140214 2011-10-09 19:40:31Z ibiru $
+# $Id: PKGBUILD 141134 2011-10-24 16:36:03Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.2.0.1
+pkgver=3.2.1.1
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Empathy"
 license=('GPL2')
-depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring' 'libcanberra' 'iso-codes' 'networkmanager')
+depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring'
+'libcanberra' 'iso-codes' 'networkmanager')
 makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto')
 optdepends=('telepathy-gabble: XMPP/Jabber support'
             'telepathy-butterfly: MSN support'
@@ -20,7 +21,7 @@ options=('!libtool')
 groups=('gnome-extra')
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b11f6f980ce7ae75ddcdbe14bded86c0cc5970181e2257026610a025b75f5512')
+sha256sums=('2b4ce3184fcd8c2260654f925e4055a7e02513c5eefa4745bcdf82c9039b7681')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD
index 8800d6d31..e07ca0bca 100644
--- a/extra/eog-plugins/PKGBUILD
+++ b/extra/eog-plugins/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139249 2011-10-01 18:56:37Z ibiru $
+# $Id: PKGBUILD 140977 2011-10-20 11:11:57Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=eog-plugins
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Plugins for Eye of Gnome"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ install=eog-plugins.install
 options=('!libtool')
 groups=(gnome-extra)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('49a78e862a1967733b439ca4a4cde42084e8d4b1947c4a5ddb1b3581bec64dc0')
+sha256sums=('f78ac3e72a6f04d9fa4b1a9f973967ae9530b3265abd4b78180730d23c295d9c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index b0b7c2c88..26a877beb 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139247 2011-10-01 18:56:34Z ibiru $
+# $Id: PKGBUILD 140853 2011-10-20 05:41:57Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=eog
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('79184d0cf420d4b8c1d1de92c30f1d95afc7cd686876e07b20cb82a2ec20d8e3')
+sha256sums=('ae20715790796061e51132804f5925c5a61a1e615527c7c746cd8b76a8f97c89')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index ccc751b2f..a47982e99 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139251 2011-10-01 18:56:40Z ibiru $
+# $Id: PKGBUILD 140855 2011-10-20 05:41:59Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME web browser based on the WebKit rendering engine."
@@ -14,14 +14,11 @@ makedepends=('intltool' 'gnome-doc-utils' 'startup-notification')
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-       fix_crash::http://git.gnome.org/browse/epiphany/patch/?id=1cb7fb1109aecedd224d03fda202165adf3423a7)
-sha256sums=('e5402cb8b52d3de5c09feb01bbf28a1bd3c20f260a2e0956c9d132f41040e5d2'
-            'ef1423bfaea72c44bd1bc1cc49d06e98dab89235fab2ad5dcd89d87b4d62cb4f')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix_crash"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --disable-scrollkeeper \
diff --git a/extra/erlang/PKGBUILD b/extra/erlang/PKGBUILD
index 3a9533fdd..12150c3c6 100644
--- a/extra/erlang/PKGBUILD
+++ b/extra/erlang/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 110837 2011-02-22 18:42:08Z vesa $
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+# $Id: PKGBUILD 140857 2011-10-20 05:42:01Z ibiru $
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com>
 
 pkgname=erlang
-pkgver=R14B
-pkgrel=2
+pkgver=R14B04
+pkgrel=1
 pkgdesc="A small concurrent functional programming language developed by Ericsson."
 arch=(i686 x86_64 'mips64el')
 url="http://www.erlang.org/index.html"
 license=('custom')
 depends=('ncurses' 'glibc')
-makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc')
+makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc' 'mesa')
 optdepends=('wxgtk: for wx support' 'unixodbc: database')
 
 options=('!makeflags')
@@ -22,14 +23,11 @@ build() {
   ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk)
   ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk)
 
-  # fix for #17001
-  sed -i 's|WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`|WX_LIBS="`$WX_CONFIG_WITH_ARGS --libs` -lGLU"|' lib/wx/configure || return 1
-
-  sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure || return 1
+  sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure
 
-  CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --enable-ethread-pre-pentium4-compatibility enable_ethread_pre_pentium4_compatibilit=yes --prefix=/usr --enable-smp-support --enable-threads || return 1
-  make || return 1
-  make INSTALL_PREFIX="$pkgdir" install || return 1
+  CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs
+  make
+  make INSTALL_PREFIX="$pkgdir" install
 
 # fix prefix
   cd "$pkgdir"
@@ -37,22 +35,22 @@ build() {
       usr/lib/erlang/bin/start \
       usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \
       usr/lib/erlang/erts-${ERTSVERSION}/bin/start \
-      usr/lib/erlang/releases/RELEASES ;do 
-    sed -i "s#$pkgdir##" $i || return 1
+      usr/lib/erlang/releases/RELEASES ;do
+    sed -i "s#$pkgdir##" $i
   done
 
 # fix symlinks
   cd "$pkgdir/usr/lib/erlang/bin"
-  ln -sf ../erts-${ERTSVERSION}/bin/epmd 
+  ln -sf ../erts-${ERTSVERSION}/bin/epmd
 
   cd "$pkgdir/usr/bin"
   for file in *; do
-    ln -sfv ../lib/erlang/bin/$file || return 1
+    ln -sfv ../lib/erlang/bin/$file
   done
 
-  ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call" || return 1
+  ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call"
 
-# install documentation 
+# install documentation
   install -d "$pkgdir/usr/share/doc/erlang"
   install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang"
   cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
@@ -60,5 +58,5 @@ build() {
   install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
 
 }
-md5sums=('5292a04556d17ad528d570e02357dfbb'
-         '011530a24fbcc194be9bd01f779325a2')
+md5sums=('4b469729f103f52702bfb1fb24529dc0'
+         'f31e72518daae4007f595c0b224dd59f')
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index dfb163f9c..cf1cbcd38 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 140567 2011-10-17 08:14:39Z jgc $
+# $Id: PKGBUILD 140859 2011-10-20 05:42:04Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.2.1
+pkgrel=1
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme'
-         't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
+depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
 makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection')
 optdepends=('texlive-bin: DVI support')
 groups=('gnome-extra')
 install=evince.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('a9bc17e7f99489354cc66ffede68466ea0a9c52664b18198291c3a40d0150235')
+sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 308c9d890..e70bce5d4 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139257 2011-10-01 18:56:49Z ibiru $
+# $Id: PKGBUILD 140863 2011-10-20 05:42:08Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.2.1
+pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
@@ -12,7 +12,7 @@ options=('!libtool')
 url="http://www.gnome.org"
 license=('GPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('de2a75e5256143ed7eb273a78a45ff2ba8af81c894dbf17c5dade5be349fc427')
+sha256sums=('0091e41e87d589a984c6d089919fece2d28101df5b37e4b2d8615efdf60a09c3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD
index c0b698272..2a6e166fc 100644
--- a/extra/evolution-exchange/PKGBUILD
+++ b/extra/evolution-exchange/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139259 2011-10-01 18:56:51Z ibiru $
+# $Id: PKGBUILD 140865 2011-10-20 05:42:10Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-exchange
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Ximian Connector Exchange plugin for Evolution"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 install=evolution-exchange.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f61a5e5e5a51a6bc45c0df20d7a99a8c5361fac07eb9eadc15dd5329af1f1f29')
+sha256sums=('d9bebd1ab252e8568409fb1c50ba5a8f0c8236a8abf72ba697c95f9134d4cd9c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evolution-groupwise/PKGBUILD b/extra/evolution-groupwise/PKGBUILD
index 5a79f4628..786ecc16a 100644
--- a/extra/evolution-groupwise/PKGBUILD
+++ b/extra/evolution-groupwise/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140166 2011-10-08 08:16:17Z ibiru $
+# $Id: PKGBUILD 140867 2011-10-20 05:42:12Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=evolution-groupwise
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="GroupWise connector for evolution"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ makedepends=(intltool evolution)
 optdepends=('evolution: evolution plugin')
 options=(!libtool)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=(7c3dec3c4561931dfbc9313949dee68c4f935583fae8323ab4ca87b23b5aabb3)
+sha256sums=('3a5a1590b92144e465b09abc0fdaefc6d6bf9a5465d0b07e01171ddfef4aebbf')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -27,6 +27,6 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index daf315c25..394ef098a 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139255 2011-10-01 18:56:46Z ibiru $
+# $Id: PKGBUILD 140861 2011-10-20 05:42:06Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('538883531aa64bec1b43c73db9cf1b59573d10adc4d8dca6401e4bffa90f246d')
+sha256sums=('244d4fcf57d59b3fe0bcedddc65da5f508b253cb64159e6ddb2bddedf8d7e19a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD
index db5811f80..e6a5d5ab2 100644
--- a/extra/exo/PKGBUILD
+++ b/extra/exo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 127211 2011-06-11 09:02:27Z andyrtr $
+# $Id: PKGBUILD 141087 2011-10-23 16:12:32Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=exo
 pkgver=0.6.2
-pkgrel=1
+pkgrel=3
 pkgdesc="Extensions to Xfce by os-cillation"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL')
@@ -28,7 +28,6 @@ build() {
 	--libexecdir=/usr/lib/xfce4 \
 	--localstatedir=/var  \
 	--disable-static \
-	--enable-gio-unix \
 	--enable-python \
 	--enable-gtk-doc \
 	--disable-debug
diff --git a/extra/exo/exo.install b/extra/exo/exo.install
index 3525fa4a2..17ca8f78a 100644
--- a/extra/exo/exo.install
+++ b/extra/exo/exo.install
@@ -1,6 +1,5 @@
 post_install() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  usr/bin/gio-querymodules usr/lib/gio/modules
 }
 
 post_upgrade() {
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index a91686c88..1b508835d 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139263 2011-10-01 18:56:56Z ibiru $
+# $Id: PKGBUILD 140871 2011-10-20 05:42:16Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=folks
-pkgver=0.6.3.2
+pkgver=0.6.4.1
 pkgrel=1
 pkgdesc="Library to aggregates people into metacontacts"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialw
 makedepends=('gobject-introspection' 'vala' 'intltool')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e04d80e4bab12d85a254a22a6b5b8fab88d14d1c2f7b732e40299960c7c32414')
+sha256sums=('b6cd5e982f4496cbe6370ca31cc85dcdeb6efccc95c1d940e654f8226cd95578')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD
index 3fc7ee10d..e08d033e3 100644
--- a/extra/freetype2/PKGBUILD
+++ b/extra/freetype2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 133922 2011-07-30 12:02:55Z ibiru $
+# $Id: PKGBUILD 141107 2011-10-24 08:04:06Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=freetype2
-pkgver=2.4.6
+pkgver=2.4.7
 pkgrel=1
 pkgdesc="TrueType font rendering library"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
         freetype-2.3.0-enable-spr.patch
         freetype-2.2.1-enable-valid.patch)
-md5sums=('5e6510613f612809d2d7862592b92ab7'
+md5sums=('dbadce8f0c5e70a0b7c51eadf2dd9394'
          '816dc8619a6904a7385769433c0a8653'
          '214119610444c9b02766ccee5e220680')
 
diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD
index 1722f517c..374660ce8 100644
--- a/extra/gconf/PKGBUILD
+++ b/extra/gconf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139267 2011-10-01 18:57:03Z ibiru $
+# $Id: PKGBUILD 141222 2011-10-26 16:28:37Z ibiru $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gconf
-pkgver=3.2.0
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="A configuration database system"
 arch=(i686 x86_64 'mips64el')
@@ -17,7 +17,7 @@ source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-${pkgver}.tar.xz
         gconfpkg
         gconf-reload.patch
         01_xml-gettext-domain.patch)
-sha256sums=('f371745529d7ed209b0b222f33f5996231cc153e901aea3ce0ad0a46b5a96d0b'
+sha256sums=('bca02495552b40d2f3867b66d490283481417ec0e489ba0cbff9e0f48b82822d'
             'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
             'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
             '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index 61725c08e..72a36a17e 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139472 2011-10-02 01:28:00Z ibiru $
+# $Id: PKGBUILD 140873 2011-10-20 05:42:19Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdm
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.2.1.1
+pkgrel=1
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -16,27 +16,24 @@ depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'me
 makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection')
 optdepends=('gnome-shell: new login interface')
 install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz
         fix_external_program_directories.patch
         gdm-vt-allocation-hack.patch
         gdm
-        gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam
-        check-for-shell.patch::http://git.gnome.org/browse/gdm/patch/?id=64e6b10f98fe7226a2f41807268dae3afa80236d)
-sha256sums=('f827f5500827acef94ad2d60f02ec489bc35cb6392d8f4a60ec814599c2991b7'
+        gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam)
+sha256sums=('85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd'
             '2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363'
             '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
             '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
             'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
             '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
-            '0dbb37b4e2a2a2dd2305f0f69cf32d63d353d34aacaf805d2c2ec52fbe558bb4'
+            '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c'
             'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
-            '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834'
-            'ae54f11e593e97e031d2dd7b33ce9899038356cef87b354f3c4c596a3153155d')
+            '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/check-for-shell.patch"
   patch -Np1 -i "${srcdir}/fix_external_program_directories.patch"
   patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch"
 
diff --git a/extra/gdm/gdm-password.pam b/extra/gdm/gdm-password.pam
index 7beda835a..aa4d4dd47 100644
--- a/extra/gdm/gdm-password.pam
+++ b/extra/gdm/gdm-password.pam
@@ -14,7 +14,7 @@ password        required        pam_unix.so
 
 session         required        pam_loginuid.so
 -session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
+session         optional        pam_keyinit.so force revoke
 session         required        pam_limits.so
 session         required        pam_unix.so
 session         optional        pam_gnome_keyring.so auto_start
diff --git a/extra/gdm/gdm.install b/extra/gdm/gdm.install
index b9732be50..fda42d319 100644
--- a/extra/gdm/gdm.install
+++ b/extra/gdm/gdm.install
@@ -9,6 +9,7 @@ post_install() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   gconfpkg --install ${pkgname}
   glib-compile-schemas usr/share/glib-2.0/schemas
+  dconf update
 }
 
 pre_remove() {
@@ -23,6 +24,7 @@ post_upgrade() {
 
 post_remove() {
   glib-compile-schemas usr/share/glib-2.0/schemas
+  dconf update
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   getent passwd gdm >/dev/null 2>&1 && userdel gdm
   getent group gdm >/dev/null 2>&1 && groupdel gdm
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index a7934cd27..ad8f4860a 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139273 2011-10-01 18:57:12Z ibiru $
+# $Id: PKGBUILD 140875 2011-10-20 05:42:21Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('a3f62b20816a3f902bb811cc14ae01111e27ce266e49d39f5854fd45b2895348')
+sha256sums=('bdde2dae05bf08e67088c441eac3456d6861b5076d5f00d4c381291ef4c85651')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index c6d138e8b..5d9e5cdbb 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139595 2011-10-03 14:35:14Z dan $
+# $Id: PKGBUILD 141151 2011-10-24 22:00:23Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.7
+pkgver=1.7.7.1
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -80,11 +80,11 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-md5sums=('5d645884e688921e773186783b65ce33'
-         '2ee47bd79dfd391bc7d1b466539b9734'
+md5sums=('7cfb3e7ea585037272a7ad8e35f4ac0a'
+         'b6ec6c3a08855b7393284675643be95c'
          '8e2648910fd5dd4f1c41d3c7fa9e9156'
          '2e42bf97779a1c6411d89043334c9e78')
-sha256sums=('5a977bc01e4989b9928345e99aab15ce896cf5897c6e32eb449538574df377f6'
-            'dde1ffaee0d90cce80f98126c5d9013c6687dc6f0b26bd12d61e229346701ecb'
+sha256sums=('6a7909226b2b249c7970b0d36054dbcfe58e6558cc4d671ea1f5ac6a69d8cf4f'
+            '28904942a0e91d601d731a9fe0bf26c2fe595d8a69a9c2a4da3ec66286c50db5'
             '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598'
             'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68')
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index cc7b36ef6..c09e20c45 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139279 2011-10-01 18:57:20Z ibiru $
+# $Id: PKGBUILD 140877 2011-10-20 05:42:23Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=glib-networking
-pkgver=2.30.0
+pkgver=2.30.1
 pkgrel=1
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool')
 options=('!libtool')
 install=glib-networking.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('e28ca1e354d6519efb5c9c01c1f10e8a1a196710dfbcc5ea8f8aade3244e108c')
+sha256sums=('5acc7e76cb66734379d9ad983985c671af12591b84e93cd698fe8ea25d29f7d3')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD
index 34e939187..87dca22fc 100644
--- a/extra/gnome-applets/PKGBUILD
+++ b/extra/gnome-applets/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139281 2011-10-01 18:57:22Z ibiru $
+# $Id: PKGBUILD 140879 2011-10-20 05:42:26Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-applets
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="GNOME Applets"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
 groups=(gnome)
 install=gnome-applets.install
 source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('18e41753d98644689126c3f237f4bf2e1b973cac15544166cef299ba6faa95ef')
+sha256sums=('cba1dff05bf2aad57f0df2ea746a9bf1c3483a0388a70bf501f61d95b1017dc1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index 031264334..e4c84cba3 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139284 2011-10-01 18:57:27Z ibiru $
+# $Id: PKGBUILD 140881 2011-10-20 05:42:28Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-bluetooth
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
         61-gnome-bluetooth-rfkill.rules)
-sha256sums=('7f8f35baf4a785a4d966257c31ce6ee8eb4fe21bc83b26cadc55c244f583bbca'
+sha256sums=('f67abc26e2a8003b5e3b58e1541ed3955e0ea05a08bfaa8d5dc4b2133d948df0'
             'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474')
 
 build() {
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index 324206a95..887d73675 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139883 2011-10-05 19:06:43Z andrea $
+# $Id: PKGBUILD 140883 2011-10-20 05:42:30Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.2.1
+pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
 url="http://projects.gnome.org/gnome-color-manager/"
@@ -14,7 +14,7 @@ install=gnome-color-manager.install
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2d03a7c1f308ab6e2ad89acc39f1f8a67fd0ff1cf3435f5f2269f7a422209273')
+sha256sums=('bc4651b58a4dc4b812803e8f81520488e6b452969028f04987cb463b8e218436')
 
 build(){
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD
index c9bcbfa68..ccbdbcb4e 100644
--- a/extra/gnome-contacts/PKGBUILD
+++ b/extra/gnome-contacts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139288 2011-10-01 18:57:32Z ibiru $
+# $Id: PKGBUILD 141004 2011-10-21 08:06:14Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-contacts
-pkgver=3.2.0.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="Contacts Manager for GNOME"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop')
 makedepends=('intltool' 'vala')
 install=
 source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('2d8e2a325ecc661805f6e7c6339b3876e766c1e227ff084dc02a7535e5983641')
+sha256sums=('9dfd56a40f3b89512a09d9e54c18227ae4bfe9b4cff87a72f7e17f6a35367d88')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index 6360bb938..991bc2a65 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 139290 2011-10-01 18:57:35Z ibiru $
+# $Id: PKGBUILD 140887 2011-10-20 05:42:34Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="The Control Center for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'gnome-online-accounts' 'network-manager-applet')
 optdepends=('mesa-demos-libre: provides glxinfo for graphics information'
-            'apg: adds password generation for user accounts')
+            'apg: adds password generation for user accounts'
+            'gnome-color-manager: for color management tasks')
 makedepends=('gnome-doc-utils' 'intltool')
 url="http://www.gnome.org"
 groups=('gnome')
@@ -16,7 +17,7 @@ install=gnome-control-center.install
 license=('GPL')
 options=('!libtool' '!emptydirs')
 source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('06c927dcbee2bf63e4960441ccb9bea55d12aa83078e5d71e9832d52fd1966aa')
+sha256sums=('bf354ea096ee7501cbdf53c42386355f19975b4206995e6110c180e7cb74a088')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index dc3c88a51..1faf9806b 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139292 2011-10-01 18:57:38Z ibiru $
+# $Id: PKGBUILD 140889 2011-10-20 05:42:36Z ibiru $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Library with common API for various GNOME modules"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('c5e8ba08f3c7ba12b5f4062c9b5bcef58383d1e3ec26161eb8bcf49dfea62ff5')
+sha256sums=('4cb00d22360f9ae4bc3fb79efe7868fd54fcbfcd4f7050c71fc97699ec3a86a2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD
index 1837e56bc..94d5475bc 100644
--- a/extra/gnome-documents/PKGBUILD
+++ b/extra/gnome-documents/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139294 2011-10-01 18:57:41Z ibiru $
+# $Id: PKGBUILD 140891 2011-10-20 05:42:38Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=gnome-documents
-pkgver=0.2.0
-pkgrel=2
+pkgver=0.2.1
+pkgrel=1
 pkgdesc="Documents Manager for GNOME"
 arch=(i686 x86_64)
 url="http://www.gnome.org"
@@ -15,7 +15,7 @@ optdepends=('unoconv: Support for Libreoffice document types')
 options=('!libtool')
 install=gnome-documents.install
 source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('51c171a6b8a36ebe0b251d0b4d0acb360b5d7738fe8106006ea5504c03ad4932')
+sha256sums=('f04356d6620a3fa47cfdb4b72c80ac3748ca229fe24b57ccf229536afa934f52')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD
index 2f02992f5..fb899dd13 100644
--- a/extra/gnome-games/PKGBUILD
+++ b/extra/gnome-games/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139296 2011-10-01 18:57:45Z ibiru $
+# $Id: PKGBUILD 140893 2011-10-20 05:42:40Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-games
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.2.1
+pkgrel=1
 pkgdesc="Some Games for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -14,7 +14,7 @@ install=gnome-games.install
 url="http://www.gnome.org"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d8595b09ecbb3c94cd4a655f5fb56cd585fd9441038ad334cba29b92d592279d')
+sha256sums=('b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 673fca110..fe639422f 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 139301 2011-10-01 18:57:53Z ibiru $
+#$Id: PKGBUILD 140897 2011-10-20 05:42:44Z ibiru $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('5bd7dbe18f983aae237517d1eb4b070295c7b848d16c2a9d0a8a6046ea0801bc')
+sha256sums=('49872dad0c22e495f65be226d6effa053605df9cdc7cb06781aa37d3ff36b8a9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD
index c89add260..7edd769fe 100644
--- a/extra/gnome-online-accounts/PKGBUILD
+++ b/extra/gnome-online-accounts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139305 2011-10-01 18:58:00Z ibiru $
+# $Id: PKGBUILD 140899 2011-10-20 05:42:46Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-accounts
-pkgver=3.2.0.1
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="GNOME service to access online accounts"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 options=(!libtool)
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('b53e1429930294872b64987bf18e8f2cf07adaac5b1a8c9c15d2fb95ea1e8b2b')
+sha256sums=('549c210c358fd05598a00cb7a8d8f5b0fd6e18f7cb321c3c1641fb18f1312234')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD
index addb04676..d627522a0 100644
--- a/extra/gnome-panel/PKGBUILD
+++ b/extra/gnome-panel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139307 2011-10-01 18:58:03Z ibiru $
+# $Id: PKGBUILD 140901 2011-10-20 05:42:50Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-panel
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -16,7 +16,7 @@ replaces=('gnome-panel-bonobo')
 provides=("gnome-panel-bonobo=${pkgver}")
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('83daffb85db57609330da488c5344e3121ed74cd809701a11109ecd7c97bde0f')
+sha256sums=('ae5ed578f9f54ad763bf5e46fd5431cdbc06fa2eefea03b390c90a3ffb18870d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD
index 16f44063a..0d91ed969 100644
--- a/extra/gnome-power-manager/PKGBUILD
+++ b/extra/gnome-power-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139313 2011-10-01 18:58:13Z ibiru $
+# $Id: PKGBUILD 140903 2011-10-20 05:42:55Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-power-manager
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Power management tools."
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ options=(!emptydirs)
 install=gnome-power-manager.install
 groups=(gnome-extra)
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d66f97f6cff716dd3c612f1a17b0e2b5dfb138deb92ea3d0a782a0144a7eab95')
+sha256sums=('11bc604dd237e28eb08a67e6d507c3edebb96a43a3483390bd0c8100a206dbdb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD
index b1ac14f85..1e098f700 100644
--- a/extra/gnome-session/PKGBUILD
+++ b/extra/gnome-session/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139317 2011-10-01 18:58:19Z ibiru $
+# $Id: PKGBUILD 140905 2011-10-20 05:42:59Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-session
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ install=gnome-session.install
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4b23d95b1ee622c7d1d600d3a88c8ded787d9a49567b0235208d2e600f131e3e')
+sha256sums=('a87dcf57fec83cc8fad4e7b84542c5005a70a2107d184f247f0b112f07a043b3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index a69a3ff75..377a7c9bb 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139631 2011-10-03 21:04:24Z ibiru $
+# $Id: PKGBUILD 140969 2011-10-20 06:58:10Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-settings-daemon
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=2
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,13 +16,16 @@ groups=('gnome')
 replaces=(gnome-settings-daemon-pulse)
 conflicts=(gnome-settings-daemon-pulse)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-fix_color_crash.patch)
-sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b'
-            'b249d21702d4cf9a3a8dc177ba17c00d33e8e742e548811552d79ddeff1e91e3')
+        upower.patch)
+sha256sums=('1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d'
+            'f7a66e9ff7f415be34873fd6d03843a20732158bd65b382b114d100aaddeb223')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/fix_color_crash.patch"
+
+  # Fix suspend via key
+  patch -Np1 -i "$srcdir/upower.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \
       --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids
diff --git a/extra/gnome-settings-daemon/upower.patch b/extra/gnome-settings-daemon/upower.patch
new file mode 100644
index 000000000..36dad59e3
--- /dev/null
+++ b/extra/gnome-settings-daemon/upower.patch
@@ -0,0 +1,28 @@
+diff -u -r gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c
+--- gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c	2011-10-20 08:19:31.818642262 +0200
++++ gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c	2011-10-20 08:23:55.127492221 +0200
+@@ -2066,15 +2066,15 @@
+                           (GAsyncReadyCallback) power_keyboard_ready_cb,
+                           manager);
+ 
+-        g_dbus_proxy_new (manager->priv->connection,
+-                          G_DBUS_PROXY_FLAGS_NONE,
+-                          NULL,
+-                          "org.freedesktop.UPower",
+-                          "/org/freedesktop/UPower",
+-                          "org.freedesktop.UPower",
+-                          NULL,
+-                          (GAsyncReadyCallback) upower_ready_cb,
+-                          manager);
++        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
++                                  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
++                                  NULL,
++                                  "org.freedesktop.UPower",
++                                  "/org/freedesktop/UPower",
++                                  "org.freedesktop.UPower",
++                                  NULL,
++                                  (GAsyncReadyCallback) upower_ready_cb,
++                                  manager);
+ }
+ 
+ static void
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index caf138427..3116f3315 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139662 2011-10-04 16:16:39Z ibiru $
+# $Id: PKGBUILD 140909 2011-10-20 05:43:08Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.2.1
+pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/GnomeShell"
@@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('55f8237f4ca517bcfa02bbf88fbcb9afcdc9b252fb9612b84a65409a1f144324')
+sha256sums=('ac05e3133bd279c84812d8d3d8e362f8b33563cdc3e7a6aefa9c0b1c2aeab0eb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD
index 229fe1b37..7f26b0a44 100644
--- a/extra/gnome-system-monitor/PKGBUILD
+++ b/extra/gnome-system-monitor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139324 2011-10-01 18:58:30Z ibiru $
+# $Id: PKGBUILD 140912 2011-10-20 05:43:17Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-system-monitor.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('169c82bd1744adba1a4e3f384c06d9ff48aefac5d0f56e8ac4ad48b6f7f5810c')
+sha256sums=('f9ecca05609c0ff346727e0f24e32ba5284aea47dfe958e2b6d4a7912e5c1180')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index cae5ded12..c4ee90d1c 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139326 2011-10-01 18:58:34Z ibiru $
+# $Id: PKGBUILD 140914 2011-10-20 05:43:22Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('42ca48cff087de770d4783b19653794e82285334144b30557948f852521299b1')
+sha256sums=('c36a6bce466447526cb73779ee8e861f079e86cef68a50f7c8fbed540d5f373e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index b9f7c6a4d..a6d46c6ab 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139328 2011-10-01 18:58:37Z ibiru $
+# $Id: PKGBUILD 140916 2011-10-20 05:43:25Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=gnome-themes-standard
-pkgver=3.2.0.2
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Default themes for the GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ groups=('gnome')
 replaces=('gnome-themes')
 conflicts=('gnome-themes')
 source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-${pkgver}.tar.xz)
-sha256sums=('49b8177fcc6693690eceef207f78173f0ca34bdef873a6c1fed90bef28791bc1')
+sha256sums=('ab9e7f6001f4f18420df6a66407ace4340ee815b31e571bc55de7983370e26f3')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD
index 82c43da59..f860a5fad 100644
--- a/extra/gnome-user-share/PKGBUILD
+++ b/extra/gnome-user-share/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 117703 2011-04-04 16:40:52Z ibiru $
+# $Id: PKGBUILD 140919 2011-10-20 05:43:32Z ibiru $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-user-share
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="Easy to use user-level file sharing for GNOME."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
 license=('GPL')
-depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra')
+depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'libunique3')
 makedepends=('intltool' 'gnome-doc-utils' 'nautilus')
 options=('!emptydirs' '!libtool')
 install=gnome-user-share.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1987d08ebb88bd3fecd7c76d2d9549dba2c7132a7c2b3cfe68fdc2a24260fafe')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9d1188c316e536ad6f84b595f118040474f8b9017acd492e80bce30d0c5d54ea')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-utils/PKGBUILD b/extra/gnome-utils/PKGBUILD
index b3354b31f..50c0ecbb1 100644
--- a/extra/gnome-utils/PKGBUILD
+++ b/extra/gnome-utils/PKGBUILD
@@ -1,8 +1,8 @@
-#  $Id: PKGBUILD 139332 2011-10-01 18:58:41Z ibiru $
+#  $Id: PKGBUILD 140921 2011-10-20 05:43:36Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-utils
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files"
 arch=(i686 x86_64 mips64el)
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-utils.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('532e071ad772afa9bcd116144bc6b644c8af3daf2eb3f76f6fa306aced1ef5f8')
+sha256sums=('3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD
index 5bbd882c0..37e19bfb2 100644
--- a/extra/gnucash/PKGBUILD
+++ b/extra/gnucash/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 139548 2011-10-03 12:22:55Z jgc $
+# $Id: PKGBUILD 141031 2011-10-22 05:09:05Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Mark Schneider <queueRAM@gmail.com>
 
 pkgname=gnucash
-pkgver=2.4.7
-pkgrel=2
+pkgver=2.4.8
+pkgrel=1
 pkgdesc="A personal and small-business financial-accounting application"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnucash.org"
 license=("GPL")
-depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'hicolor-icon-theme' 
-         'libdbi-drivers' 'aqbanking' 'desktop-file-utils')
+depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils')
 makedepends=('intltool')
 optdepends=('evince: for print preview'
             'perl-finance-quote: for stock information lookups'
@@ -18,8 +17,7 @@ optdepends=('evince: for print preview'
 options=('!libtool' '!makeflags')
 install=gnucash.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0f85c8bfd165b2605a7853f579808823')
-sha1sums=('e99dd56949de27c19d9c3413d30c87a0f74e8ff9')
+sha1sums=('cdd8793bc8e8cbb433a0237007023f4973a51781')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD
index b57eefce4..6c9daaaa4 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 139613 2011-10-03 19:05:35Z heftig $
+# $Id: PKGBUILD 141116 2011-10-24 10:42:39Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=grilo-plugins
 pkgver=0.1.17
-pkgrel=2
+pkgrel=3
 pkgdesc="Plugins for Grilo"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64')
 license=('LGPL')
 depends=('grilo')
-makedepends=('gupnp-av' 'libgdata' 'quvi' 'sqlite3' 'gmime' 'libgcrypt' 'rest' 'libtracker-sparql')
+makedepends=('gupnp-av' 'libgdata' 'libquvi' 'sqlite3' 'gmime' 'libgcrypt'
+             'rest' 'libtracker-sparql')
 optdepends=('gupnp-av: uPnP plugin'
             'libgdata: Youtube plugin'
-            'quvi: Youtube plugin'
+            'libquvi: Youtube plugin'
             'sqlite3: Podcasts plugin'
             'gmime: Podcasts plugin'
             'sqlite3: Bookmarks plugin'
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index 432627371..ef7f376cc 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139885 2011-10-05 19:06:47Z andrea $
+# $Id: PKGBUILD 141228 2011-10-26 22:25:00Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gthumb
-pkgver=2.13.91
-pkgrel=2
+pkgver=2.14.0
+pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -15,7 +15,7 @@ optdepends=('gstreamer0.10-base: video support')
 options=('!libtool' '!emptydirs')
 install=gthumb.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b1f7686572829cf5cadae58e7d45e43a056f19929fd6d80d7ff9ac7c53bbfe90')
+sha256sums=('9db3e4f714d62b91185e4f8edbee2c98a85bd76f0d4b82a7d7868a9b86ae10a2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 7337b409c..198a7c697 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 136812 2011-09-01 19:14:23Z ibiru $
+# $Id: PKGBUILD 140923 2011-10-20 05:43:38Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.6
-pkgrel=2
+pkgver=2.24.7
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -12,17 +12,13 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc
 options=('!libtool' '!docs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-        xid-collision-debug.patch
-        gtk2-dont-ellipsize-filters.diff)
-sha256sums=('8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '90a9d50c1407ab87f6fa9ae131c2663477540419955b0ba39520a18882afceb8')
+        xid-collision-debug.patch)
+sha256sums=('1fdc7605501bd2932ef9a3c4c3c9a406e505f18667aea9e73af650da28fff994'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
 build() {
     cd "${srcdir}/gtk+-${pkgver}"
     patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
-    #https://bugzilla.gnome.org/show_bug.cgi?id=657949
-    patch -Np1 -i "${srcdir}/gtk2-dont-ellipsize-filters.diff"
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
@@ -36,7 +32,7 @@ build() {
 }
 
 package_gtk2() {
-    pkgdesc="The GTK+ Toolkit (v2)"
+    pkgdesc="GTK+ is a multi-platform toolkit (v2)"
     install=gtk2.install
     depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
     backup=(etc/gtk-2.0/gtkrc)
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index 2c9844ed0..dcea02a80 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139599 2011-10-03 17:26:32Z ibiru $
+# $Id: PKGBUILD 140925 2011-10-20 05:43:41Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.2.0
-pkgrel=2
-pkgdesc="The GTK+ Toolkit (v3)"
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="GTK+ is a multi-platform toolkit (v3)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 install=gtk3.install
@@ -14,15 +14,12 @@ options=('!libtool' '!docs')
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-${pkgver}.tar.xz
-        settings.ini
-        a11y.patch::http://git.gnome.org/browse/gtk+/patch/?id=e248c6812e8e33150d61074471ef0330668aed45)
-sha256sums=('bce3c1a9be6afd7552c795268656d8fdd09c299765a7faaf5a76498bb82ed44c'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            '0ae5f9c3553f9fc6c515343de96046c17544654936b17c09330443ed44778cb2')
+        settings.ini)
+sha256sums=('f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3'
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
 
 build() {
     cd "${srcdir}/gtk+-${pkgver}"
-    patch -Np1 -i "${srcdir}/a11y.patch"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index 332d577d9..7ffd4199c 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139348 2011-10-01 18:59:07Z ibiru $
+# $Id: PKGBUILD 140927 2011-10-20 05:43:44Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtkhtml4
 _pkgbasename=gtkhtml
-pkgver=4.2.0
+pkgver=4.2.1
 pkgrel=1
 pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool')
 url="http://www.gnome.org"
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz)
-sha256sums=('a4e50ac159fe49ddac07a3d0fba386ac90b404afce770a89e6077580578c38af')
+sha256sums=('e72fb264bae45f2a340818c645248c29eaa2acf3d2bb3c2316ae296a0d438558')
 
 build() {
     cd "${srcdir}/${_pkgbasename}-${pkgver}"
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index aa8d3101c..0ddf24551 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140208 2011-10-09 15:35:36Z ibiru $
+# $Id: PKGBUILD 140929 2011-10-20 05:43:47Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.xz)
-sha256sums=('979e967a3e8d64512db5f7466ce71431e0fa8a77958275369fd9061e068585a4')
+sha256sums=('52447d85b57b1413e699a4a27a8c4ba7df737347e9f5b4c5406e6393ca02982c')
 
 build() {
   cd "${srcdir}/$_pkgbasename-${pkgver}"
diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD
index e90b0a97a..0a0575363 100644
--- a/extra/gucharmap/PKGBUILD
+++ b/extra/gucharmap/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139354 2011-10-01 18:59:17Z ibiru $
+# $Id: PKGBUILD 140931 2011-10-20 05:43:50Z ibiru $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gucharmap
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Gnome Unicode Charmap"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
 options=('!libtool' '!emptydirs')
 install=gucharmap.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('42aacc32beeb0ebb24db519aaceeb184e4212fdd7732bd7b0f6a15f00afc9501')
+sha256sums=('b06f376e5baaa41f0236d659bd6d03e3b38759198257a60affb6ddb2e111beff')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 34790722a..eea981de0 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,19 +1,17 @@
-# $Id: PKGBUILD 139360 2011-10-01 18:59:26Z ibiru $
+# $Id: PKGBUILD 140933 2011-10-20 05:43:53Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.10.0
-pkgrel=2
+pkgver=1.10.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2'
-             'libarchive' 'libgdu' 'pkgconfig' 'intltool'
-             'libimobiledevice' 'avahi' 'dconf')
+makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf')
 url="http://www.gnome.org"
 options=(!libtool)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('50970f9f9052ecb6ab83860b366c718994bf618695010c11e1391ca886f71db8')
+sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD
index 19a5223fe..26916756b 100644
--- a/extra/hplip/PKGBUILD
+++ b/extra/hplip/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 139476 2011-10-02 02:49:32Z eric $
+# $Id: PKGBUILD 140998 2011-10-21 02:57:10Z eric $
 # Maintainer : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
 
 pkgname=hplip
-pkgver=3.11.7
-pkgrel=2
+pkgver=3.11.10
+pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hplipopensource.com"
 license=('GPL')
-makedepends=('python2-qt' 'python2-gobject2' 'pkg-config' 'sane' 'rpcbind' 'cups')
 depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-	'libcups>=1.3.10-3' 'net-snmp>=5.7.1' 'libusb-compat')
+	 'net-snmp>=5.7.1')
+makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
 optdepends=('cups: for printing support'
             'dbus-python: for dbus support'
             'sane: for scanner support'
@@ -19,22 +19,25 @@ optdepends=('cups: for printing support'
             'python-notify: for Desktop notification support'
             'rpcbind: for network support'
             'python2-qt: for running hp-toolbox'
-            'pygobject: for running hp-toolbox'
+            'python2-gobject2: for running hp-toolbox'
             'hplip-plugin: binary blobs for specific devices')
 replaces=('hpijs')
 options=('!libtool')
 install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
-        hplip-cups-1.5.0-compatibility.patch)
-md5sums=('5cb89a00b0c680d8bf9bf4b4f1f863b1'
-         'f4422ee0dc842e1a53b75c24f468d65c'
-         'a767000ce920e9f7f6a5b0a8e4392ef9')
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('6143f30f3b6905ef22105176a3b80db0'
+         '396bbd8c5cc92aa8295e5bcb508692f3')
 
 build() {
  cd "$srcdir/$pkgname-$pkgver"
- patch -p1 -i "$srcdir/hplip-cups-1.5.0-compatibility.patch"
  export PYTHON=python2
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
+ # fix sysfs rules
+ sed -i -e "s|SYSFS|ATTR|g" \
+        -e "s|sysfs|attr|g" \
+   data/rules/56-hpmud_support.rules
+
  ./configure --prefix=/usr \
              --enable-qt4 \
              --enable-foomatic-rip-hplip-install \
@@ -51,21 +54,7 @@ build() {
 
 package() {
  cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
-
- rm -rf "$pkgdir/etc/sane.d"
- # remove autostart of hp-daemon
- rm -r "$pkgdir/etc/xdg"
- # move udev rules to /lib/udev/rules.d
- mkdir -p "$pkgdir/lib/udev/rules.d"
- mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/"
- rm -r "$pkgdir/etc/udev"
- # remove lp user, it's not used on archlinux
- sed -i 's|OWNER="lp", ||g' "$pkgdir/lib/udev/rules.d/40-hplip.rules"
- # fix sysfs rules
- sed -i -e "s|SYSFS|ATTR|g" \
-        -e "s|sysfs|attr|g" \
-        -e 's|"bin/sh|"/bin/sh|g' \
-   "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules"
+ make rulesdir=/lib/udev/rules.d  DESTDIR="$pkgdir/" install
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
 }
-
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
new file mode 100644
index 000000000..5aa4b468f
--- /dev/null
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -0,0 +1,97 @@
+# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgbase=icedtea-web-java7
+pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
+pkgver=1.1.3
+#_date=20110925
+#pkgrel=0.${_date}.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://icedtea.classpath.org/wiki/IcedTea-Web"
+license=('GPL2')
+makedepends=('jdk7-openjdk' 'zip' 'xulrunner')
+source=(#ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz
+	http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
+	#http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz
+md5sums=('0e2e653c7436d81edcbc1d4255571ab6')
+sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37')
+
+_javaver=7
+_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+mksource() {
+  mkdir /tmp/${pkgbase}-${_date}
+  pushd /tmp/${pkgbase}-${_date}
+  hg clone http://icedtea.classpath.org/hg/icedtea-web ${pkgbase}-${_date}
+  rm -rf ${pkgbase}-${_date}/.hg*
+  tar -cvJf /tmp/${pkgbase}-${_date}/${pkgbase}-${_date}.tar.xz *
+  popd
+}
+
+build() {
+  cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
+
+  #. /etc/profile.d/jre.sh
+  . /etc/profile.d/jre7-openjdk.sh
+  #. /etc/profile.d/jdk.sh
+  . /etc/profile.d/jdk7-openjdk.sh
+  
+  autoreconf --force --install
+  
+  ./configure --prefix=${_jvmdir} \
+      --datarootdir=/usr/share \
+      --with-jdk-home=${_jvmdir}
+  make
+}
+
+check() {
+  cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
+  make -k check
+}
+
+
+package_icedtea-web-java7() {
+
+  pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
+  depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
+  install=${pkgname}.install
+
+  cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
+  # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
+  make DESTDIR="${pkgdir}" install-exec-local install-data-local
+
+  # Install desktop files.
+  install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
+  install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
+  install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications
+  # remove splitted doc files
+  rm -rf ${pkgdir}/usr/share/doc
+
+  # link binaries into /usr/bin + jre/bin
+  install -m755 -d ${pkgdir}/usr/bin
+  install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
+  pushd ${pkgdir}/${_jvmdir}/bin
+  for file in *; do
+    ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
+    ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
+  done
+  popd
+
+  # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
+  install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
+  ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
+}
+
+package_icedtea-web-java7-doc() {
+
+  pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
+
+  cd "${srcdir}"/icedtea-web* #${pkgbase}-${_date}"
+#  install -m755 -d ${pkgdir}/${_jvmdir}/jre/lib
+  make DESTDIR="${pkgdir}" install-data-local
+  # remove javaws about and man page
+  rm -rf ${pkgdir}/usr/lib
+  rm -rf ${pkgdir}/usr/share/man
+  rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
+}
diff --git a/extra/icedtea-web-java7/icedtea-web-java7.install b/extra/icedtea-web-java7/icedtea-web-java7.install
new file mode 100644
index 000000000..80312d4a6
--- /dev/null
+++ b/extra/icedtea-web-java7/icedtea-web-java7.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
new file mode 100644
index 000000000..84488e042
--- /dev/null
+++ b/extra/java7-openjdk/PKGBUILD
@@ -0,0 +1,263 @@
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
+
+pkgname=('jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src')
+pkgbase=java7-openjdk
+_java_ver=7
+_openjdk_build=b147
+_openjdk_date=27_jun_2011
+_icedtea_ver=2.0
+_date=20110922
+
+# check "${srcdir}/icedtea7"/Makefile.am
+_CORBA_CHANGESET=4d9e4fb8af09
+_HOTSPOT_CHANGESET=b28ae681bae0
+_JAXP_CHANGESET=948e734135ea
+_JAXWS_CHANGESET=a2ebfdc9db7e
+_JDK_CHANGESET=2054526dd141
+_LANGTOOLS_CHANGESET=9b85f1265346
+_OPENJDK_CHANGESET=0a76e5390e68
+
+pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://icedtea.classpath.org"
+license=('custom')
+makedepends=('libcups' 'libxp' 'libxtst' 'libxi' 'libxt' 'libxslt' 'freetype2' #'eclipse-ecj' only for bootstrapping
+             'alsa-lib' 'xalan-java' 'glib2' 'gtk2' 'apache-ant>=1.6.5' 'giflib'
+             'libjpeg>=6b' 'zlib' 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'lcms2')
+source=( #ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz
+        http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
+        http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz			# openjdk.tar.gz
+        http://icedtea.classpath.org/hg/icedtea7-forest/corba/archive/${_CORBA_CHANGESET}.tar.gz		# corba.tar.gz
+        http://icedtea.classpath.org/hg/icedtea7-forest/jaxp/archive/${_JAXP_CHANGESET}.tar.gz			# jaxp.tar.gz
+        http://icedtea.classpath.org/hg/icedtea7-forest/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz		# jaxws.tar.gz
+        http://icedtea.classpath.org/hg/icedtea7-forest/jdk/archive/${_JDK_CHANGESET}.tar.gz			# jdk.tar.gz
+        http://icedtea.classpath.org/hg/icedtea7-forest/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz        # langtools.tar.gz
+        http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz	        # hotspot.tar.gz
+        fontconfig-paths.diff
+        fix_corba_cmds_path.diff
+        openjdk7_fix_jdk_cmds_path.diff
+        openjdk7_nonreparenting-wm.diff
+        jdk7-openjdk.profile
+        jdk7-openjdk.profile.csh
+        jre7-openjdk.profile
+        jre7-openjdk.profile.csh
+        jconsole.desktop
+        policytool.desktop)
+
+#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
+
+noextract=("${_OPENJDK_CHANGESET}.tar.gz"
+           "${_CORBA_CHANGESET}.tar.gz"
+           "${_JAXP_CHANGESET}.tar.gz"
+           "${_JAXWS_CHANGESET}.tar.gz"
+           "${_JDK_CHANGESET}.tar.gz"
+           "${_LANGTOOLS_CHANGESET}.tar.gz"
+           "${_HOTSPOT_CHANGESET}.tar.gz")
+md5sums=('752721a037a625001fad7a5fc2013f60'
+         'ffb12013564794e9abbffbbbd0c58502'
+         '8f8d222d0a6d363d06b40576da5f1ea2'
+         '4abf34372e34cccd74ad337e487ed790'
+         'f2f40590a83889b8aa1d4631b705092d'
+         'd3beed0118bbd93d4651af762eb748c7'
+         'c8617700b4bd6cd5de1257bc36509bed'
+         'f10b711b0c784df8707808d9d0f52abd'
+         'ee1afda124d5927345014ab382ef581e'
+         'f7e7a212e50abb56a6ef1a2b1bd27405'
+         'c195c4865b84d9e2e0fd71ac6d88eadb'
+         '203640d6e79e41b0065e016818c17ccd'
+         'b7b8996448c7b4fa7dd2d744488ed3bd'
+         'cdabafad0ec413d9a983888bf445a443'
+         '612b0fec7e0943c37a6de77c43622007'
+         '62443459da0cb28181feb260dc0e5ce7'
+         '8e346f19a69b11b8dc4fcd8ea9d9d8f1'
+         'b6357228d29836504a90abe006d86e56')
+
+# source PKGBUILD && mksource
+#makedepends+=('mercurial')
+mksource() {
+  mkdir /tmp/icedtea7-${_date}
+  pushd /tmp/icedtea7-${_date}
+  hg -v clone http://icedtea.classpath.org/hg/icedtea7
+  rm -rf icedtea7/.hg*
+  tar -cvJf /tmp/icedtea7-${_date}/icedtea7-${_date}-hg.tar.xz *
+  popd
+}
+
+build() {
+  cd "${srcdir}/icedtea-${_icedtea_ver}"
+
+  unset JAVA_HOME
+  unset CLASSPATH
+  # default is to build with first found java-environment found in our repos - is jdk7-openjdk
+  [ -f /etc/profile.d/jdk7.sh ] && . /etc/profile.d/jdk7.sh
+  
+  unset MAKEFLAGS
+  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
+  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
+
+  . /etc/profile.d/apache-ant.sh
+
+  cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
+  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff"
+
+  # Bootstrap IcedTea with ecj and a GNU Classpath-based JDK:
+#  autoreconf --force --install
+
+  ./configure \
+        --disable-bootstrap \
+        --with-parallel-jobs="${MAKEFLAGS/-j}" \
+        --disable-tests \
+        --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-${CARCH} \
+        --with-jdk-home=${JAVA_HOME} \
+        --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \
+        --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \
+        --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \
+        --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \
+        --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \
+        --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \
+        --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
+        --enable-pulse-java \
+#        --with-rhino #--help
+
+        #--with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \
+        #--with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \
+        #--with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \
+
+#     --enable-systemtap      Enable inclusion of SystemTap trace support
+#     --enable-nss            Enable inclusion of NSS security provider
+#     --with-abs-install-dir  The absolute path where the j2sdk-image dir will be installed
+  
+  make
+}
+
+check() {
+  cd "${srcdir}/icedtea-${_icedtea_ver}"
+  make -k check
+}
+
+package_jre7-openjdk() {
+  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment"
+  depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst'
+           'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng' 'gsettings-desktop-schemas')
+  optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
+             'alsa-lib: for sound'
+             'giflib: for gif format support')
+  provides=('java-runtime=7')
+  conflicts=('java-runtime')
+#  replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
+  backup=(etc/profile.d/jre7.sh)
+  install=jre7-openjdk.install
+
+  _jvmdir=/usr/lib/jvm/java-7-openjdk
+
+  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
+
+  install -d -m755 ${pkgdir}/${_jvmdir}/jre/
+  cp -a bin lib ${pkgdir}/${_jvmdir}/jre
+
+  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \
+     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src
+  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \
+     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc
+  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
+  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
+
+  # Install man pages
+  pushd ../../j2re-image/man
+  install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/
+  install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1
+  install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1
+  popd
+
+  # Install icons and menu entries
+  for s in 16 24 32 48 ; do
+    install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/
+    install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
+                  ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png
+  done
+
+  # Link binaries into /usr/bin
+  pushd ${pkgdir}/${_jvmdir}/jre/bin
+  install -m755 -d ${pkgdir}/usr/bin/
+  for file in *; do
+    ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
+  done
+  popd
+
+  # Link JKS keystore from ca-certificates-java
+  rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts
+  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts"
+
+  # Set some variables
+  install -m755 -d ${pkgdir}/etc/profile.d/
+  install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jre.sh
+  install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jre.csh
+
+  # Install license
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/
+  install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
+                 ${pkgdir}/usr/share/licenses/${pkgbase}
+}
+
+package_jdk7-openjdk() {
+  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK"
+  depends=('jre7-openjdk')
+  provides=('java-environment=7')
+  conflicts=('java-environment')
+  #  replaces=('openjdk6')
+  backup=(etc/profile.d/jdk7.sh)
+
+  _jvmdir=/usr/lib/jvm/java-7-openjdk
+
+  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
+
+  # Main files
+  install -m755 -d ${pkgdir}/${_jvmdir}/
+
+  cp -a demo include lib sample ${pkgdir}/${_jvmdir}
+
+  # 'bin' files
+  pushd bin
+  install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \
+                   ${pkgdir}/usr/bin/ \
+                   ${pkgdir}/usr/share/man/{,ja/}man1/
+
+  # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
+  for b in $(ls | grep -v java-rmi.cgi); do
+    if [ -e ../jre/bin/${b} ]; then
+      # Provide a link of the jre binary in the jdk/bin/ directory
+      ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b}
+    else
+      # Copy binary to jdk/bin/
+      install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b}
+      # Copy man page
+      install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1
+      install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1
+      # Link from /bin/
+      ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b}
+    fi
+  done
+  popd
+
+  # Handling 'java-rmi.cgi' separately
+  install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi
+
+  # Desktop files
+  install -m755 -d ${pkgdir}/usr/share/applications/
+  install -m644 ${srcdir}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications/
+
+  # Set some variables
+  install -m755 -d ${pkgdir}/etc/profile.d/
+  install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh
+  install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh
+}
+
+package_openjdk7-src() {
+  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
+
+  install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
+             ${pkgdir}/${_jvmdir}/src.zip
+}
diff --git a/extra/java7-openjdk/fix_corba_cmds_path.diff b/extra/java7-openjdk/fix_corba_cmds_path.diff
new file mode 100644
index 000000000..842657880
--- /dev/null
+++ b/extra/java7-openjdk/fix_corba_cmds_path.diff
@@ -0,0 +1,33 @@
+--- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
++++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
+@@ -86,10 +86,10 @@
+ CHMOD          = $(UTILS_COMMAND_PATH)chmod
+ CMP            = $(UTILS_USR_BIN_PATH)cmp
+ COMM           = $(UTILS_USR_BIN_PATH)comm
+-COMPRESS       = $(UTILS_USR_BIN_PATH)compress
++COMPRESS       = $(UTILS_COMMAND_PATH)compress
+ CP             = $(UTILS_COMMAND_PATH)cp
+ CPIO           = $(UTILS_COMMAND_PATH)cpio
+-CUT            = $(UTILS_USR_BIN_PATH)cut
++CUT            = $(UTILS_COMMAND_PATH)cut
+ DATE           = $(UTILS_COMMAND_PATH)date
+ DF             = $(UTILS_COMMAND_PATH)df
+ DIFF           = $(UTILS_USR_BIN_PATH)diff
+@@ -136,7 +136,7 @@
+ TAR            = $(UTILS_COMMAND_PATH)tar
+ TEST           = $(UTILS_USR_BIN_PATH)test
+ TOUCH          = $(UTILS_COMMAND_PATH)touch
+-TR             = $(UTILS_USR_BIN_PATH)tr
++TR             = $(UTILS_COMMAND_PATH)tr
+ TRUE           = $(UTILS_COMMAND_PATH)true
+ UNAME          = $(UTILS_COMMAND_PATH)uname
+ UNIQ           = $(UTILS_USR_BIN_PATH)uniq
+@@ -186,7 +186,7 @@
+   # others have it in /usr/bin.
+   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
+ 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
+-  NAWK           = $(USRBIN_PATH)gawk
++  NAWK           = $(UTILS_COMMAND_PATH)gawk
+   # Intrinsic unix command, with backslash-escaped character interpretation
+   ECHO           = /bin/echo -e
+   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/extra/java7-openjdk/fontconfig-paths.diff b/extra/java7-openjdk/fontconfig-paths.diff
new file mode 100644
index 000000000..fa08db629
--- /dev/null
+++ b/extra/java7-openjdk/fontconfig-paths.diff
@@ -0,0 +1,134 @@
+--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2009-05-29 22:45:23.024341869 +0000
++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new	2009-05-29 22:55:13.681366890 +0000
+@@ -275,73 +275,61 @@
+ 
+ # Font File Names
+ 
+-filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
+-filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
+-filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
+-filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
+-
+-filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
+-filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
+-filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
+-filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
+-
+-filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
+-filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
+-filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
+-filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
+-
+-filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
+-filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
+-filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
+-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
+-
+-filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
+-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
+-filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
+-filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
+-filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
+-filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
+-filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
+-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
+-filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
+-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
+-filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
+-filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
+-filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
+-
+-filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
+-filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
+-filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
+-filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
+-#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
+-filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
+-filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
+-filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
+-filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
+-filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
+-
+-filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
+-filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
+-filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
+-filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
+-filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
+-filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
+-filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
+-filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
+-filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
+-filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
+-filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
+-filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
+-
+-# AWT X11 font paths
+-awtfontpath.latin-1=/usr/share/fonts/X11/Type1
+-awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
+-awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
+-awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
+-awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
+-awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
+-awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
+-awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
+-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
+-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
+-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
++filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
++filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
++filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
++filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
++
++filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
++filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
++filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
++filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
++
++filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
++filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
++filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
++filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
++
++filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
++filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
++filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
++filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
++
++filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
++filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
++filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
++filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
++filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
++filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
++filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
++filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
++filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
++filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
++filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
++filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
++filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
++
++filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
++filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
++filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
++filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
++#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
++filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
++filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
++filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
++filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
++filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
++
++filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
++filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
++filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
++filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
++filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
++filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
++filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
++filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
++filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
++filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
++filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
++filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
++
diff --git a/extra/java7-openjdk/jconsole.desktop b/extra/java7-openjdk/jconsole.desktop
new file mode 100644
index 000000000..ffbdd42ad
--- /dev/null
+++ b/extra/java7-openjdk/jconsole.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=OpenJDK Monitoring & Management Console
+Comment=Monitor and manage OpenJDK applications
+Exec=/usr/bin/jconsole
+Icon=java
+Terminal=false
+Type=Application
+StartupWMClass=sun-tools-jconsole-JConsole
+Categories=Development;Monitor;Java;
+Version=1.0
diff --git a/extra/java7-openjdk/jdk7-openjdk.profile b/extra/java7-openjdk/jdk7-openjdk.profile
new file mode 100644
index 000000000..91265cc86
--- /dev/null
+++ b/extra/java7-openjdk/jdk7-openjdk.profile
@@ -0,0 +1,6 @@
+export J2SDKDIR=/usr/lib/jvm/java-7-openjdk
+export J2REDIR=$J2SDKDIR/jre
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
+
+# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING'
+# in /etc/profile.d/jre7.sh
diff --git a/extra/java7-openjdk/jdk7-openjdk.profile.csh b/extra/java7-openjdk/jdk7-openjdk.profile.csh
new file mode 100644
index 000000000..cc7dc8ab1
--- /dev/null
+++ b/extra/java7-openjdk/jdk7-openjdk.profile.csh
@@ -0,0 +1 @@
+setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk"
diff --git a/extra/java7-openjdk/jre7-openjdk.install b/extra/java7-openjdk/jre7-openjdk.install
new file mode 100644
index 000000000..d311e6e44
--- /dev/null
+++ b/extra/java7-openjdk/jre7-openjdk.install
@@ -0,0 +1,24 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+    /usr/sbin/init-jks-keystore
+  fi
+  echo "when you use a non-reparenting window manager"
+  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
+  echo "/etc/profile.d/jre7.sh"
+#  update-desktop-database -q
+}
+
+post_upgrade() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+    /usr/sbin/init-jks-keystore
+  fi
+#  update-desktop-database -q
+}
+
+
+post_remove() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+#  update-desktop-database -q
+}
diff --git a/extra/java7-openjdk/jre7-openjdk.profile b/extra/java7-openjdk/jre7-openjdk.profile
new file mode 100644
index 000000000..c86ce857a
--- /dev/null
+++ b/extra/java7-openjdk/jre7-openjdk.profile
@@ -0,0 +1,5 @@
+export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre
+export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre}
+
+# enable this for non-reparenting window managers
+#export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/extra/java7-openjdk/jre7-openjdk.profile.csh b/extra/java7-openjdk/jre7-openjdk.profile.csh
new file mode 100644
index 000000000..a9aed27d1
--- /dev/null
+++ b/extra/java7-openjdk/jre7-openjdk.profile.csh
@@ -0,0 +1,5 @@
+setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre"
+setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre"
+
+# enable this for non-reparenting window managers
+#setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
new file mode 100644
index 000000000..c68bd4441
--- /dev/null
+++ b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
@@ -0,0 +1,24 @@
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2011-08-06 15:46:01.000000000 +0200
++++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2011-08-06 15:59:26.000000000 +0200
+@@ -91,10 +91,10 @@
+ CHMOD          = $(UTILS_COMMAND_PATH)chmod
+ CMP            = $(UTILS_USR_BIN_PATH)cmp
+ COMM           = $(UTILS_USR_BIN_PATH)comm
+-COMPRESS       = $(UTILS_USR_BIN_PATH)compress
++COMPRESS       = $(UTILS_COMMAND_PATH)compress
+ CP             = $(UTILS_COMMAND_PATH)cp
+ CPIO           = $(UTILS_COMMAND_PATH)cpio
+-CUT            = $(UTILS_USR_BIN_PATH)cut
++CUT            = $(UTILS_COMMAND_PATH)cut
+ DATE           = $(UTILS_COMMAND_PATH)date
+ DF             = $(UTILS_COMMAND_PATH)df
+ DIFF           = $(UTILS_USR_BIN_PATH)diff
+@@ -141,7 +141,7 @@
+ TAR            = $(UTILS_COMMAND_PATH)tar
+ TEST           = $(UTILS_USR_BIN_PATH)test
+ TOUCH          = $(UTILS_COMMAND_PATH)touch
+-TR             = $(UTILS_USR_BIN_PATH)tr
++TR             = $(UTILS_COMMAND_PATH)tr
+ TRUE           = $(UTILS_COMMAND_PATH)true
+ UNAME          = $(UTILS_COMMAND_PATH)uname
+ UNIQ           = $(UTILS_USR_BIN_PATH)uniq
diff --git a/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff
new file mode 100644
index 000000000..ba1a588e1
--- /dev/null
+++ b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff
@@ -0,0 +1,58 @@
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig	2011-08-07 18:45:05.000000000 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java	2011-08-07 18:45:54.000000000 +0200
+@@ -102,7 +102,8 @@
+         METACITY_WM = 11,
+         COMPIZ_WM = 12,
+         LG3D_WM = 13,
+-        MUTTER_WM = 14;
++        MUTTER_WM = 14,
++        OTHER_NONREPARENTING_WM = 15;
+     public String toString() {
+         switch  (WMID) {
+           case NO_WM:
+@@ -576,7 +577,7 @@
+     // TODO: according to wikipedia, compiz is now reparenting. This should
+     // probably be updated.
+     static boolean isNonReparentingWM() {
+-        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM);
++        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
+     }
+ 
+     /*
+@@ -762,9 +763,17 @@
+              * supports WIN or _NET wm spec.
+              */
+             else if (l_net_protocol.active()) {
+-                awt_wmgr = XWM.OTHER_WM;
++                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
++                } else {
++                    awt_wmgr = XWM.OTHER_WM;
++		}
+             } else if (win.active()) {
+-                awt_wmgr = XWM.OTHER_WM;
++                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
++                } else {
++                    awt_wmgr = XWM.OTHER_WM;
++		}
+             }
+             /*
+              * Check for legacy WMs.
+@@ -775,6 +784,8 @@
+                 awt_wmgr = XWM.MOTIF_WM;
+             } else if (isOpenLook()) {
+                 awt_wmgr = XWM.OPENLOOK_WM;
++            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
+             } else {
+                 awt_wmgr = XWM.OTHER_WM;
+             }
+@@ -1289,6 +1300,7 @@
+                   res = new Insets(28, 6, 6, 6);
+                   break;
+               case NO_WM:
++              case OTHER_NONREPARENTING_WM:
+               case LG3D_WM:
+                   res = zeroInsets;
+                   break;
diff --git a/extra/java7-openjdk/policytool.desktop b/extra/java7-openjdk/policytool.desktop
new file mode 100644
index 000000000..702b44a6f
--- /dev/null
+++ b/extra/java7-openjdk/policytool.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=OpenJDK Policy Tool
+Comment=Manage OpenJDK policy files
+Exec=/usr/bin/policytool
+Icon=java
+Terminal=false
+Type=Application
+StartupWMClass=sun-security-tools-PolicyTool
+Categories=Development;Java;
+Version=1.0
diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD
index 9aedb3d7d..92672f290 100644
--- a/extra/json-glib/PKGBUILD
+++ b/extra/json-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139365 2011-10-01 18:59:34Z ibiru $
+# $Id: PKGBUILD 141211 2011-10-26 14:49:31Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=json-glib
-pkgver=0.14.0
+pkgver=0.14.2
 pkgrel=1
 pkgdesc="JSON library built on GLib"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('glib2')
 makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.14/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('821e90196673408a9293845e37ef572826a960a101096db9bcba45cf4c4afc56')
+sha256sums=('b816a5fa3e5664b08679a6972a6e5693d6cc1990ff4a6f94c07554db96be94a7')
 
 build(){
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 99f3206f2..72c6296a0 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=0.9.0beta1
-_commit=90c59c37c68920a44860ff5b8f7bcc146850efcf
+pkgver=0.9.0beta2
+_pkgver=0.8.90
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,14 +17,14 @@ makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info'
 optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers'
             'openconnect: Cisco AnyConnect compatible VPN client')
 install=${pkgname}.install
-source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-md5sums=('d6100be03b9114bffc079ef4b690a33e')
+source=("ftp://ftp.kde.org/pub/kde/unstable/networkmanagement/${_pkgver}/src/networkmanagement-${_pkgver}.tar.bz2")
+sha1sums=('9336049eb00f5e4fe7434e710eeb0bdfc22e0984')
 
 build() {
   cd "${srcdir}"
   mkdir build
   cd build
-  cmake ../networkmanagement \
+  cmake ../networkmanagement-${_pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
   make
diff --git a/extra/kdeutils/CVE-2011-2725.patch b/extra/kdeutils/CVE-2011-2725.patch
new file mode 100644
index 000000000..986bebc90
--- /dev/null
+++ b/extra/kdeutils/CVE-2011-2725.patch
@@ -0,0 +1,20 @@
+--- a/part/part.cpp
++++ b/part/part.cpp
+@@ -558,8 +558,15 @@ void Part::slotPreviewExtracted(KJob *jo
+     if (!job->error()) {
+         const ArchiveEntry& entry =
+             m_model->entryForIndex(m_view->selectionModel()->currentIndex());
+-        const QString fullName =
+-            m_previewDir->name() + QLatin1Char( '/' ) + entry[ FileName ].toString();
++
++        QString fullName =
++            m_previewDir->name() + QLatin1Char('/') + entry[FileName].toString();
++
++        // Make sure a maliciously crafted archive with parent folders named ".." do
++        // not cause the previewed file path to be located outside the temporary
++        // directory, resulting in a directory traversal issue.
++        fullName.remove(QLatin1String("../"));
++
+         ArkViewer::view(fullName, widget());
+     } else {
+         KMessageBox::error(widget(), job->errorString());
diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD
index 80e63bfc3..f6c50a7b8 100644
--- a/extra/kdeutils/PKGBUILD
+++ b/extra/kdeutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140028 2011-10-05 19:12:50Z andrea $
+# $Id: PKGBUILD 140971 2011-10-20 07:26:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -17,7 +17,7 @@ pkgname=('kdeutils-ark'
          'kdeutils-superkaramba'
          'kdeutils-sweeper')
 pkgver=4.7.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -25,17 +25,31 @@ groups=('kde' 'kdeutils')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
 	'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
 	'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('52ce9b6b5f2c20475f46b6f7378ca4c530df37b4')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+        'CVE-2011-2725.patch')
+sha1sums=('52ce9b6b5f2c20475f46b6f7378ca4c530df37b4'
+          'bc7428edb6851b4f3dc772bc88ace576379e93f2')
 
 build() {
-	cd ${srcdir}
+    cd "${srcdir}"/${pkgbase}-${pkgver}/ark
+    patch -p1 -i "${srcdir}"/CVE-2011-2725.patch
+
+    # Use Python2
+    cd "${srcdir}"/${pkgbase}-${pkgver}
+    sed -i 's|/usr/bin/python|/usr/bin/python2|' \
+      kcharselect/kcharselect-generate-datafile.py \
+      superkaramba/examples/richtext/rtext.py
+    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+      printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
+
+	cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_PREFIX=/usr \
+        -DPYTHON_EXECUTABLE=/usr/bin/python2
 	make
 }
 
@@ -159,9 +173,6 @@ package_kdeutils-printer-applet() {
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/printer-applet/doc
 	make DESTDIR=$pkgdir install
-
-    # Use the python2 executable
-    find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
 }
 
 package_kdeutils-superkaramba() {
diff --git a/extra/kino/PKGBUILD b/extra/kino/PKGBUILD
index a32733fd7..432c6b015 100644
--- a/extra/kino/PKGBUILD
+++ b/extra/kino/PKGBUILD
@@ -1,26 +1,37 @@
-# $Id: PKGBUILD 56265 2009-10-20 20:59:02Z giovanni $
+# $Id: PKGBUILD 141101 2011-10-23 23:38:04Z andrea $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=kino
 pkgver=1.3.4
-pkgrel=2
-pkgdesc="A non-linear DV editor."
+pkgrel=4
+pkgdesc="A non-linear DV editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kinodv.org/"
 license=('GPL')
 depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm')
-makedepends=('intltool')
+makedepends=('intltool' 'v4l-utils')
 options=('!libtool')
 install=kino.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('52f8ce690e45a089e3edc6c7af61a05c')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'videodev-header.patch')
+md5sums=('52f8ce690e45a089e3edc6c7af61a05c'
+         '940404c0eec3c9d954c289ceb52d15a6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -p1 -i "${srcdir}"/videodev-header.patch
+
   ./configure --prefix=/usr \
               --with-udev-rules-dir=/lib/udev/rules.d
-  make || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  chown root:root -R $pkgdir/usr/share/kino/help
+
+  # Fix permissions
+  chown -R root:root "${pkgdir}/usr/share/kino/help"
 }
diff --git a/extra/kino/kino.install b/extra/kino/kino.install
index 7dc309965..83b78df92 100644
--- a/extra/kino/kino.install
+++ b/extra/kino/kino.install
@@ -1,14 +1,13 @@
 post_install() {
-  echo "update desktop mime database..."
   update-mime-database usr/share/mime 1> /dev/null
   update-desktop-database -q
 }
+
 post_upgrade() {
   post_install $1
 }
 
 post_remove() {
-  echo "update desktop mime database..."
   update-mime-database usr/share/mime 1> /dev/null
   update-desktop-database -q
 }
diff --git a/extra/kino/videodev-header.patch b/extra/kino/videodev-header.patch
new file mode 100644
index 000000000..01394fc47
--- /dev/null
+++ b/extra/kino/videodev-header.patch
@@ -0,0 +1,26 @@
+Index: kino-1.3.4/ffmpeg/libavdevice/v4l.c
+===================================================================
+--- kino-1.3.4.orig/ffmpeg/libavdevice/v4l.c	2011-04-11 15:12:41.915593967 +0200
++++ kino-1.3.4/ffmpeg/libavdevice/v4l.c	2011-04-11 15:13:05.825593979 +0200
+@@ -26,7 +26,7 @@
+ #include <sys/mman.h>
+ #include <sys/time.h>
+ #define _LINUX_TIME_H 1
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #include <time.h>
+ 
+ typedef struct {
+Index: kino-1.3.4/src/v4l.h
+===================================================================
+--- kino-1.3.4.orig/src/v4l.h	2011-04-11 15:12:41.895593967 +0200
++++ kino-1.3.4/src/v4l.h	2011-04-11 15:12:57.555593975 +0200
+@@ -40,7 +40,7 @@
+ 
+ #define _DEVICE_H_
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ 
+ #include "displayer.h"
+ 
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index c9f882744..3c71a1460 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 138121 2011-09-17 02:03:36Z allan $
+# $Id: PKGBUILD 141035 2011-10-22 08:18:19Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.3.2
+pkgver=4.3.3
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('autoconf')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
 source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('18f5c5b351cfad0a0ab069592effd664')
+md5sums=('91757a201c1030714ac1996f27437cc7')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -27,4 +27,4 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   rm -rf ${pkgdir}/usr/lib
-}
-\ No newline at end of file
+}
diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD
index 8c0e0c460..53b0aed9f 100644
--- a/extra/libgda/PKGBUILD
+++ b/extra/libgda/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139371 2011-10-01 18:59:41Z ibiru $
+# $Id: PKGBUILD 141224 2011-10-26 20:11:17Z heftig $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=libgda
-pkgver=4.99.4
+pkgver=5.0.0
 pkgrel=1
 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
 arch=(i686 x86_64 'mips64el')
@@ -12,12 +12,12 @@ depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup'
          'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring'
          'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2'
          'iso-codes' 'openssl' 'libgcrypt' 'libldap')
-makedepends=('intltool' 'gobject-introspection' 'java-environment' 'gtk-doc')
+makedepends=('intltool' 'gobject-introspection' 'openjdk6' 'gtk-doc')
 options=('!libtool')
 url="http://www.gnome-db.org"
 install=libgda.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('efef38c0318d156ba3263416355847af961f561660793cb670633e056018beac')
+sha256sums=('b8f14505d8e921b97b20a0ff99e10c611bd57c317b0f081e7f76bc2c87ae1fea')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index 4fd3a2540..e98bc6ae5 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139379 2011-10-01 18:59:56Z ibiru $
+# $Id: PKGBUILD 141132 2011-10-24 16:18:24Z ibiru $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 
 pkgname=libgweather
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Provides access to weather information from the net"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ url="http://www.gnome.org/"
 install=libgweather.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
         gettext-not-xml.patch)
-sha256sums=('7fdae4aad787759ed0d0124d66991311a24c8c9a3c9a46c56f62e4cc4575aea9'
+sha256sums=('495f6d0f79947d6e601db3220360b1fcd6ae43608cd1571be5bcd5c05b7388d5'
             '5b6bf182294b8974a89492237d98b60678b83efcf31de8a0ca1bebd90f3356a3')
 
 build() {
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index ef0cd3637..353bc6673 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139387 2011-10-01 19:00:12Z ibiru $
+# $Id: PKGBUILD 140935 2011-10-20 05:43:56Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libsoup
 pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.36.0
+pkgver=2.36.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -11,7 +11,7 @@ makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('db06af0f8c887abde427e5418e0e74bd39837a0f48a4161ff29607dfcd6b36ca')
+sha256sums=('73722407ff5fa7fcff2dae384aa04d85e7900c0e3fed46389f1289a1409e1f65')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD
index 8e363599a..e9e202629 100644
--- a/extra/libwnck3/PKGBUILD
+++ b/extra/libwnck3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139391 2011-10-01 19:00:17Z ibiru $
+# $Id: PKGBUILD 140937 2011-10-20 05:43:59Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libwnck3
 _pkgbasename=libwnck
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Window Navigator Construction Kit (GTK+3)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org/"
 source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz)
-sha256sums=('7cb92e6dbe8f20f4dba327fa078fb3caa35c0ae89445bbbdf1e7a17e5116f542')
+sha256sums=('eaba586d8e092770e45ab8a3073eb57b5386e1ea7512b5424fa558906f26a3da')
 
 build() {
     cd "${srcdir}/${_pkgbasename}-${pkgver}"
diff --git a/extra/liquidwar/PKGBUILD b/extra/liquidwar/PKGBUILD
index 5f12019fc..1b7022396 100644
--- a/extra/liquidwar/PKGBUILD
+++ b/extra/liquidwar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140692 2011-10-18 03:46:14Z eric $
+# $Id: PKGBUILD 141061 2011-10-22 20:45:31Z eric $
 # Maintainer: Jeff Mickey <jeff@archlinux.org>
 
 pkgname=liquidwar
 pkgver=5.6.4
-pkgrel=5
+pkgrel=6
 pkgdesc="A unique multiplayer wargame"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ufoot.org/liquidwar/"
@@ -12,12 +12,14 @@ depends=('allegro4')
 makedepends=('python2')
 install=liquidwar.install
 source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz
-        http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig)
+        http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig liquidwar-5.6.4-ovflfix.patch)
 sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6'
-          'a262967d60e0f04ac5b99693144ef6b0038bb6c4')
+          'a262967d60e0f04ac5b99693144ef6b0038bb6c4'
+          'e2102792c54a01b7cd14adb6d72404044175ec7e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch"
   sed -i 's/python/python2/' doc/Makefile.in
   [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm"
   LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
diff --git a/extra/liquidwar/liquidwar-5.6.4-ovflfix.patch b/extra/liquidwar/liquidwar-5.6.4-ovflfix.patch
new file mode 100644
index 000000000..446385624
--- /dev/null
+++ b/extra/liquidwar/liquidwar-5.6.4-ovflfix.patch
@@ -0,0 +1,18 @@
+--- src/wwwsrv.c.old	2010-10-26 14:16:31.000000000 +0200
++++ src/wwwsrv.c	2010-10-26 14:17:35.000000000 +0200
+@@ -100,12 +100,12 @@
+ 
+   data->privacy = privacy;
+   data->log = log;
+-  strncpy (data->metaserver, metaserver, URL_SIZE);
++  strncpy (data->metaserver, metaserver, sizeof(data->metaserver));
+   data->port = port;
+   data->busy_players = busy_players;
+   data->max_players = max_players;
+-  strncpy (data->password, password, URL_SIZE);
+-  strncpy (data->comment, comment, URL_SIZE);
++  strncpy (data->password, password, sizeof(data->password));
++  strncpy (data->comment, comment, sizeof(data->comment));
+ }
+ 
+ /*------------------------------------------------------------------*/
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 3b9cc46f2..74ea2529f 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 138700 2011-09-27 16:47:11Z giovanni $
+# $Id: PKGBUILD 141079 2011-10-23 13:48:14Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2011.09.19
+pkgver=2011.10.18
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('7834800179503377d7142b4bfbbf0dca')
+md5sums=('fefff83a134a5561395b11057ad2fc09')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index a344cf176..1d1ff869f 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 140216 2011-10-09 20:54:01Z giovanni $
+# $Id: PKGBUILD 141066 2011-10-23 00:15:19Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
-pkgname=mkvtoolnix
+pkgbase=mkvtoolnix
+pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
 pkgver=5.0.1
-pkgrel=1
-pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-depends=('file' 'boost-libs' 'libmatroska' 'lzo2' 'expat' 'flac' 'libvorbis')
-makedepends=('boost' 'ruby')
-source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2")
+makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'\
+             'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
+source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
 md5sums=('93fbbe946de6013eca699c0c2a93a4e9')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   # Disable automagic curl dep used for online update checking
   sed -i -e '/curl/d' configure.in
@@ -26,13 +26,43 @@ build() {
   autoreconf
 
   ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib \
-              --disable-gui
+              --with-boost-libdir=/usr/lib
   rake
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+package_mkvtoolnix-cli() {
+  pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
+  depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2')
+  provides=('mkvtoolnix')
+  conflicts=('mkvtoolnix')
+  replaces=('mkvtoolnix')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  rake DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/bin/mmg
+  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/applications
+  rm -rf "${pkgdir}"/usr/share/icons
+  rm -rf "${pkgdir}"/usr/share/mime
+}
+
+package_mkvtoolnix-gtk() {
+  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
+  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils')
+  install=mkvtoolnix.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   rake DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/bin/mkv*
+  rm -rf "${pkgdir}"/usr/share/doc
+  rm -rf "${pkgdir}"/usr/share/locale
+  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
+  rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
+  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
+  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
 }
diff --git a/extra/mkvtoolnix/mkvtoolnix.install b/extra/mkvtoolnix/mkvtoolnix.install
new file mode 100644
index 000000000..74d9eb2ef
--- /dev/null
+++ b/extra/mkvtoolnix/mkvtoolnix.install
@@ -0,0 +1,14 @@
+post_install() {
+   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+   if [ -f usr/bin/update-mime-database ]; then
+      update-mime-database usr/share/mime &> /dev/null
+   fi
+}
+
+post_upgrade() {
+   post_install
+}
+
+pre_remove() {
+   post_install
+}
diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD
index f11ba1f1f..0a65e8f60 100644
--- a/extra/mousetweaks/PKGBUILD
+++ b/extra/mousetweaks/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=mousetweaks
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=mousetweaks.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('65aeb0fb2c2eb5f0b06ec3aa8de5b3e2ccab02edd3a4a30adb7ef224baa74649')
+sha256sums=('6c1ec6780c8dcaa1e3a6a462f7870c4c91574067a4936727a40b011d46d47734')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 79276ebb6..68a57c53e 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 136986 2011-09-04 17:03:38Z angvp $
+# $Id: PKGBUILD 141091 2011-10-23 16:35:52Z dreisner $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=mpd
-pkgver=0.16.4
+pkgver=0.16.5
 pkgrel=1
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,13 +17,14 @@ depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'f
 makedepends=('pkgconfig' 'doxygen')
 install=${pkgname}.install
 changelog=ChangeLog
-source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
+source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2"
 'mpd') 
-md5sums=('ddac46eb7d976c5cc6f9bac9e4e100f1'
+md5sums=('f7564cff12035f6a1112cce770655df7'
          'e5669c2bff4031928531e52475addeb1')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
+
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --enable-lastfm \
@@ -32,15 +33,18 @@ build() {
     --enable-documentation \
     --disable-libwrap \
     --disable-cue \
-    --disable-sidplay 
+    --disable-sidplay \
+    --with-systemdsystemunitdir=/lib/systemd/system
+
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
 
-  # set ours dirs in mpd.conf file
+  # set our dirs in mpd.conf file
   sed -i 's|^music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example
   sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example
   sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example
@@ -50,8 +54,8 @@ package() {
   sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example
   sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example
 
-  install -Dm644 doc/mpdconf.example ${pkgdir}/usr/share/mpd/mpd.conf.example
+  install -Dm644 "doc/mpdconf.example" "$pkgdir/usr/share/mpd/mpd.conf.example"
 
-  install -Dm755 ${srcdir}/mpd ${pkgdir}/etc/rc.d/mpd
-  install -d ${pkgdir}/var/{lib/mpd/playlists,log/mpd}
+  install -Dm755 "$srcdir/mpd" "$pkgdir/etc/rc.d/mpd"
+  install -d "$pkgdir"/var/{lib/mpd/playlists,log/mpd}
 }
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 815858fe1..2cb667f70 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139397 2011-10-01 19:00:26Z ibiru $
+# $Id: PKGBUILD 140941 2011-10-20 05:44:03Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64 'mips64el')
@@ -16,7 +16,7 @@ groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=mutter.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('225edd0dd1cdcc44e3220075728a07de7bafb8aa7e798583aa7602dcd45237c3')
+sha256sums=('d6135d5e6c0852f7dc996798e9455fc2e9cbe6d2672f3750fc9b8d27ab141294')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 6613c1aad..af721f337 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 138094 2011-09-16 08:53:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 141055 2011-10-22 18:07:50Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.16
+pkgver=5.5.17
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf')
-md5sums=('462ab3752dd666ec06ca32f92673b59e'
+md5sums=('dcb6a06e68c5e8f30f57b15300730c9c'
          '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
@@ -102,7 +102,7 @@ package_mysql(){
   pkgdesc="A fast SQL database server"
   backup=('etc/mysql/my.cnf')
   install=mysql.install
-  depends=('mysql-clients' 'net-tools')
+  depends=('mysql-clients')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
   options=('emptydirs')
 
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index e4bb5007c..f66533aaa 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 139401 2011-10-01 19:00:31Z ibiru $
+# $Id: PKGBUILD 140943 2011-10-20 05:44:06Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nautilus
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="GNOME file manager"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql')
+depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify')
 makedepends=('intltool' 'gobject-introspection')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=nautilus.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('0eefea717d0b8fa360a50c493875cd146de05cc61b67b426d770ab5ba57541cd')
+sha256sums=('c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/notification-daemon/PKGBUILD b/extra/notification-daemon/PKGBUILD
index 5fe3c71da..e382d9c4e 100644
--- a/extra/notification-daemon/PKGBUILD
+++ b/extra/notification-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137530 2011-09-08 19:55:05Z ibiru $
+# $Id: PKGBUILD 140945 2011-10-20 05:44:08Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 
 pkgname=notification-daemon
-pkgver=0.7.2
+pkgver=0.7.3
 pkgrel=1
 pkgdesc="Notification daemon for the desktop notifications framework"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ groups=('gnome')
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool' '!emptydirs')
 source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('74ccbedfe25c9559278ba35ef716125ada9ba0074fe7321a2271abfed5990661')
+sha256sums=('c40931557c42cd12fdb04ab531fd7d5c5766641e76babdbff6079a6d88342704')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD
index a36a57435..9be938be0 100644
--- a/extra/openconnect/PKGBUILD
+++ b/extra/openconnect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 138456 2011-09-23 18:49:28Z ibiru $
+# $Id: PKGBUILD 141220 2011-10-26 15:42:44Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=openconnect
-pkgver=3.12
+pkgver=3.13
 pkgrel=1
 epoch=1
 pkgdesc="Open client for Cisco AnyConnect VPN"
@@ -10,9 +10,10 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.infradead.org/openconnect.html"
 depends=('libxml2' 'openssl' 'libproxy')
+makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2f4fceb3f921ca8deb3a7cbd19a5e008')
+md5sums=('4364a779bfce66de243f39eeb7a39c1f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/oprofile/PKGBUILD b/extra/oprofile/PKGBUILD
index e5004d6ca..d069bf092 100644
--- a/extra/oprofile/PKGBUILD
+++ b/extra/oprofile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137218 2011-09-06 19:49:42Z eric $
+# $Id: PKGBUILD 141099 2011-10-23 23:25:40Z eric $
 # Maintainer : Aaron Griffin <aaron@archlinux.org>
 
 pkgname=oprofile
 pkgver=0.9.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://oprofile.sourceforge.net"
@@ -29,7 +29,7 @@ package() {
   install -d "$pkgdir/var/lib/oprofile"
 
 # installing development libraries - FS#20089
-  install -m644 libutil/op_types.h libop/op_sample_file.h libutil/op_list.h libop/op_events.h libop/op_cpu_type.h libop/op_config.h libdb/odb.h "$pkgdir/usr/include"
+  install -m644 libop/op_*.h libregex/op_*.h libutil/op_*.h libutil++/op_*.h libdb/odb.h "$pkgdir/usr/include"
   install -m644 libop/libop.a libdb/libodb.a "$pkgdir/usr/lib/"
   install -m644 libabi/libabi.a "$pkgdir/usr/lib/libopabi.a"
   install -m644 libutil/libutil.a "$pkgdir/usr/lib/liboputil.a"
diff --git a/extra/pangomm/PKGBUILD b/extra/pangomm/PKGBUILD
index b0c654815..ffa00e5d3 100644
--- a/extra/pangomm/PKGBUILD
+++ b/extra/pangomm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 138625 2011-09-27 13:05:44Z ibiru $
+# $Id: PKGBUILD 141215 2011-10-26 14:54:11Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pangomm
 pkgname=('pangomm' 'pangomm-docs')
-pkgver=2.28.3
+pkgver=2.28.4
 pkgrel=1
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -11,7 +11,7 @@ makedepends=('pango' 'glibmm' 'glibmm-docs' 'cairomm' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.xz)
 options=('!libtool')
 url="http://gtkmm.sourceforge.net/"
-sha256sums=('cf6eb58d58dc92df5c94012299e2c4f556ae55b4bafdf8f3768f74b7d60be0c3')
+sha256sums=('778dcb66a793cbfd52a9f92ee5a71b888c3603a913fc1ddc48a30204de6d6c82')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/polkit-gnome/PKGBUILD b/extra/polkit-gnome/PKGBUILD
index 6da4e07c2..47c0062f7 100644
--- a/extra/polkit-gnome/PKGBUILD
+++ b/extra/polkit-gnome/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139416 2011-10-01 19:00:54Z ibiru $
+# $Id: PKGBUILD 140948 2011-10-20 05:44:11Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: onestep_ua <onestep@ukr.net>
 
 pkgname=polkit-gnome
-pkgver=0.103
+pkgver=0.104
 pkgrel=1
 pkgdesc="PolicyKit integration for the GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=(!libtool)
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz
         polkit-gnome-authentication-agent-1.desktop)
-sha256sums=('e12712010c76dd7031f83d932253c53940821f5e47303b02fd70d66062ce396b'
+sha256sums=('5a59d47cbc87e3e5ac24e5e28b4fa9fc07d6d0096e53fa53d8e6b3fd06854d94'
             'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de')
 
 build() {
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index 4a60a554c..0dc121bbf 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 140587 2011-10-17 08:15:19Z jgc $
+# $Id: PKGBUILD 141011 2011-10-21 10:45:03Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
 pkgver=0.18.0
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64 mips64el)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
 options=('!libtool' '!emptydirs')
 url="http://poppler.freedesktop.org/"
-source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz)
-md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77')
+source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
+       fix_cairo.patch::http://cgit.freedesktop.org/poppler/poppler/patch/?id=66ab373365b8f9060ff3d117bb677520e32c7e8e)
+md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77'
+         '8f4a296fdd98446858d5ea74d7c496ab')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
   sed -i -e '/AC_PATH_XTRA/d' configure.ac
   autoreconf
+
+  patch -Np1 -i "${srcdir}/fix_cairo.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-cairo-output \
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index f5ee29640..6fe88d6a2 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 136958 2011-09-03 21:03:54Z bisson $
+# $Id: PKGBUILD 141172 2011-10-25 11:07:35Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
+# Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=postfix
-pkgver=2.8.5
+pkgver=2.8.6
 pkgrel=1
-pkgdesc='Secure, fast, easy to administer alternative to Sendmail'
+pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
-arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db')
 backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
         'aliases.patch' \
         'rc.d')
-sha1sums=('49ef711c80b5a3434258ab24ae00940932503e80'
+sha1sums=('32613ad01cad10ae04aad626f9a69ac9126b3d28'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
 
@@ -60,5 +60,5 @@ package() {
 	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 	cd "${pkgdir}"
-	patch -p0 < "${srcdir}"/aliases.patch
+	patch -p0 -i "${srcdir}"/aliases.patch
 }
diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index b01befd3c..724d02fd6 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140517 2011-10-16 08:44:24Z heftig $
+# $Id: PKGBUILD 140984 2011-10-20 15:35:19Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -7,8 +7,8 @@
 pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
-pkgver=1.0
-pkgrel=4
+pkgver=1.1
+pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://pulseaudio.org/"
 license=(GPL LGPL)
@@ -18,18 +18,13 @@ makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
 [ "$CARCH" = "mips64el" ] || makedepends+=(lirc-utils)
 options=(!emptydirs !libtool !makeflags)
 source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
-        $pkgbase.xinit version-number.patch dont-require-dbus.patch)
-sha256sums=('e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be'
-            'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf'
-            '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530'
-            '68c8ddf7ddb4035405ec61e7aa72e88f1430a30f75a36f31761fbfffa8f7dad4')
+        $pkgbase.xinit)
+sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee'
+            'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
 
-  patch -Np1 -i "$srcdir/version-number.patch"
-  patch -Np1 -i "$srcdir/dont-require-dbus.patch"
-
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
@@ -44,7 +39,8 @@ build() {
 }
 
 package_pulseaudio() {
-  depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc)
+  depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc
+           libsamplerate)
   optdepends=('avahi: zeroconf support'
               'bluez: bluetooth support'
               'gconf: configuration through gconf (paprefs)'
@@ -97,7 +93,7 @@ package_pulseaudio() {
 
 package_libpulse() {
   pkgdesc="$pkgdesc (client library)"
-  depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsamplerate json-c)
+  depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsndfile json-c)
   optdepends=('alsa-plugins: ALSA support'
               'avahi: zeroconf support')
   backup=(etc/pulse/client.conf)
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 0a2c96287..44cf408a9 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139423 2011-10-01 19:01:08Z ibiru $
+# $Id: PKGBUILD 141033 2011-10-22 07:52:40Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url="https://live.gnome.org/PyGObject"
@@ -11,7 +11,7 @@ license=('LGPL')
 makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
 options=('!libtool')
-sha256sums=('ccb2cc765c11724fd3025569a7a7a72bf7c981365107ff5bd15499640d6adda1')
+sha256sums=('e1eccc37afd2d4cbeb329b92ce3d71287d662dc2fec430c08a0471153e52a462')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/qtcurve-gtk2/PKGBUILD b/extra/qtcurve-gtk2/PKGBUILD
index ed5fb8b2a..93e1e3106 100644
--- a/extra/qtcurve-gtk2/PKGBUILD
+++ b/extra/qtcurve-gtk2/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 140659 2011-10-17 19:15:55Z ronald $
+# $Id: PKGBUILD 141029 2011-10-22 02:18:45Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qtcurve-gtk2
-pkgver=1.8.11
+pkgver=1.8.12
 pkgrel=1
+pkgdesc="A configurable set of widget styles for KDE and Gtk"
 arch=('i686' 'x86_64' 'mips64el')
-groups=('qtcurve')
+url="http://www.kde-look.org/content/show.php?content=40492"
 license=('GPL')
-pkgdesc='A configurable set of widget styles for KDE and Gtk'
-url='http://www.kde-look.org/content/show.php?content=40492'
 depends=('gtk2')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('cmake')
+groups=('qtcurve')
 options=('!libtool')
 source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2")
-sha1sums=('113f2e7f5925323acbcf63977e4c71e60678b69c')
+sha1sums=('3b107aee1cf7dbd3ac47c693e82cd877a0fe2d5f')
 
 build() {
 	cd "${srcdir}"
diff --git a/extra/quodlibet/PKGBUILD b/extra/quodlibet/PKGBUILD
index f49e53fac..96e5e179d 100644
--- a/extra/quodlibet/PKGBUILD
+++ b/extra/quodlibet/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 134307 2011-08-02 21:13:14Z eric $
+# $Id: PKGBUILD 140990 2011-10-20 22:44:26Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=quodlibet
-pkgver=2.3.1
+pkgver=2.3.2
 pkgrel=1
 pkgdesc="An audio player written in pygtk"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,8 +21,7 @@ optdepends=('gstreamer0.10-ffmpeg: for ffmpeg (ASF/WMA) support '
             'media-player-info: for media devices support')
 options=('!makeflags')
 source=(http://quodlibet.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('354b411bd68b3ae4a687c35f6666265b')
-sha1sums=('2521011633d0195084e5937eeeb01c0efefa69b1')
+sha1sums=('21bc5fb988ca6c09959fc7212c05272a126a5be5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD
index 7caacdfef..9e75c2104 100644
--- a/extra/ristretto/PKGBUILD
+++ b/extra/ristretto/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140478 2011-10-15 10:11:04Z andyrtr $
+# $Id: PKGBUILD 141037 2011-10-22 08:22:04Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=ristretto
-pkgver=0.1.1
+pkgver=0.2.0
 pkgrel=1
 pkgdesc="Ristretto is a image viewer for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,9 +13,9 @@ depends=('libxfce4ui' 'libexif' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('intltool' 'gettext' 'pkg-config')
 options=('!libtool')
 groups=('xfce4-goodies')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
+source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2)
 install=ristretto.install
-md5sums=('4b0f58c00ef99f13ebf134979ee76980')
+md5sums=('85e9b3d83309cdd84898f35b8d223121')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index 80ea1a4b9..4dac5ba85 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140590 2011-10-17 08:52:42Z heftig $
+# $Id: PKGBUILD 140951 2011-10-20 05:44:14Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michel Brabants <michel.linux@tiscali.be>
 
 pkgname=seahorse
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.2.1
+pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -18,7 +18,7 @@ groups=('gnome-extra')
 install=seahorse.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         seahorse-ssh-askpass.sh)
-sha256sums=('ef76aed10bac519fa854a869dc713cd7b49a41fbd2085647067444595302b6f7'
+sha256sums=('84f1df80055ca66179a023130e179de44053e7df91c1f6c7fd536563fac832b2'
             '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb')
 
 build() {
diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD
index 49419846b..d2258230d 100644
--- a/extra/smartmontools/PKGBUILD
+++ b/extra/smartmontools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 127374 2011-06-14 00:06:39Z giovanni $
+# $Id: PKGBUILD 141049 2011-10-22 14:30:55Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Jani Talikka <jani.talikka@gmail.com>
 # Contributor: Ralf Barth <archlinux.org@haggy.org>
 
 pkgname=smartmontools
-pkgver=5.41
+pkgver=5.42
 pkgrel=1
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives."
 url="http://smartmontools.sourceforge.net"
@@ -17,7 +17,7 @@ backup=('etc/smartd.conf'
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \
         smartd.conf
         smartd.rc)
-md5sums=('4577886bea79d4ff12bd9a7d323ce692'
+md5sums=('4460bf9a79a1252ff5c00ba52cf76b2a'
          '28c1b80c41dac52d433961dcfb4f70e0'
          'fb30e07f87f2c1d99532e018291ad3e8')
 
diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD
index 854c11cc9..689723fa3 100644
--- a/extra/smb4k/PKGBUILD
+++ b/extra/smb4k/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136927 2011-09-03 00:05:20Z giovanni $
+# $Id: PKGBUILD 141128 2011-10-24 13:35:44Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com>
 
 pkgname=smb4k
-pkgver=0.10.73
+pkgver=0.10.90
 pkgrel=1
 pkgdesc="A KDE program that browses samba shares"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('GPL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'docbook-xsl')
 install=smb4k.install
-source=("http://download.berlios.de/smb4k/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8f161a1b1146dc44217826901deb35c8')
+source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28development%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('6e166eead700e0a21d4f324be4471e11')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/smb4k/smb4k.install b/extra/smb4k/smb4k.install
index c5e097f49..91d7da03d 100644
--- a/extra/smb4k/smb4k.install
+++ b/extra/smb4k/smb4k.install
@@ -1,14 +1,10 @@
-# $Id: smb4k.install,v 1.2 2009/02/23 03:09:26 travis Exp $
-# arg 1:  the new package version
 post_install() {
     echo "==> Note: To enable mounting and unmounting of smb/cifs shares as"
     echo "==> user, you will need to issue the following command as root:"
-    echo "# chmod +s \$(which mount.cifs) \$(which umount.cifs)"
+    echo "# chmod +s \$(which mount.cifs)"
     echo "==> These command will need to be re-run every upgrade of smbclient"
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
     post_install $1 
 }
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index 743cf732c..9523fa924 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134583 2011-08-06 08:22:40Z andrea $
+# $Id: PKGBUILD 141136 2011-10-24 17:18:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=soprano
-pkgver=2.7.0
+pkgver=2.7.2
 pkgrel=1
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso')
 makedepends=('cmake' 'openjdk6' 'doxygen')
 [ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('52f216c82e731499bb25bf3b4cf0eecb')
+md5sums=('0cc853aee90e40db49ac7cb25cdf3619')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD
index e4aafe2e3..721620a38 100644
--- a/extra/sushi/PKGBUILD
+++ b/extra/sushi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139431 2011-10-01 19:01:21Z ibiru $
+# $Id: PKGBUILD 140953 2011-10-20 05:44:16Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=sushi
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=1
 pkgdesc="A quick previewer for Nautilus"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtkso
 makedepends=('intltool' 'gobject-introspection')
 options=(!libtool)
 source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('cdefa909afe31403c118f5c4f356dcb4787161f5a4f4ee92054f84b4c13eb59b')
+sha256sums=('b18d166a52738bceeca178318212ef4bd6a5562122f105df40bcd436621cbdb1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index df4a775e3..476f33695 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140532 2011-10-16 19:26:18Z ibiru $
+# $Id: PKGBUILD 141174 2011-10-25 11:30:46Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 
 pkgname=telepathy-glib
-pkgver=0.16.0
+pkgver=0.16.1
 pkgrel=1
 pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 depends=('dbus-glib')
 makedepends=('libxslt' 'vala' 'gobject-introspection')
 source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('071ed1b34ace45109188df73933609e4')
+md5sums=('22dd16bdf4f987c602c719a1efc3d268')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 7519cf400..0eccfcb05 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139443 2011-10-01 19:01:43Z ibiru $
+# $Id: PKGBUILD 140955 2011-10-20 05:44:18Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.2.1
+pkgrel=1
 pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulru
 }
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('97277b6746bdbfa7de185fa20602bfb5c72b77169f346311001d4013a93f9139')
+sha256sums=('e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -45,7 +45,8 @@ package_totem() {
               'libepc: Publish Playlist plugin'
               'libgdata: YouTube Browser plugin'
               'bluez: Bemused plugin'
-              'grilo-plugins: Browse sidebar (remote media)')
+              'grilo-plugins: Browse sidebar (remote media)'
+              'pyxdg: opensubtitles plugin')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
@@ -60,7 +61,7 @@ package_totem() {
 }
 
 package_totem-plugin() {
-  pkgdesc="Totem mozilla/firefox plugin"
+  pkgdesc="Totem plugin for web browsers"
   depends=("totem=${pkgver}")
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 329ce8e55..7494ce1fc 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 140581 2011-10-17 08:15:06Z jgc $
+# $Id: PKGBUILD 141014 2011-10-21 15:49:31Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=0.12.5
+pkgver=0.12.6
 _tver=${pkgver%.*}
 pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
@@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('5fddbda9df10fada07f335751370e46b5e2b5ef971d4da8efd47ea795d7b5c5b')
+sha256sums=('4dc5fe0fe97d4095653935969b12c15888e620e5b6ef135331ce7f55af3654b8')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 5a6c35916..76b7e4407 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 140241 2011-10-10 15:24:45Z ibiru $
+# $Id: PKGBUILD 141093 2011-10-23 18:45:30Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.41
-pkgrel=2
+pkgver=2.42
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.transmissionbt.com/"
 license=('MIT')
-makedepends=('gtk2' 'intltool' 'curl' 'qt' 'libevent')
+makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
 source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.xz
         transmissiond transmissiond.conf)
-md5sums=('0d0a061dfb92c0cb359dc531d5da0a94'
+md5sums=('50f6dd76c5c01f45d5ed20783c686815'
          '08875299e3fbb68fc546c1f350ac1f06'
          'be39806c35b7544856fa4070b00fc960')
 build() {
@@ -43,7 +43,7 @@ package_transmission-cli() {
 
 package_transmission-gtk() {
   pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)"
-  depends=('curl' 'libevent' 'gtk2' 'desktop-file-utils' 'hicolor-icon-theme')
+  depends=('curl' 'libevent' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
   optdepends=('notification-daemon: Desktop notification support'
   	      'transmission-cli: daemon and web support')
   install=transmission-gtk.install
diff --git a/extra/truecrypt/PKGBUILD b/extra/truecrypt/PKGBUILD
index f6272e2a9..ff3a03d79 100644
--- a/extra/truecrypt/PKGBUILD
+++ b/extra/truecrypt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130364 2011-07-06 02:01:03Z paul $
+# $Id: PKGBUILD 141202 2011-10-25 22:33:47Z eric $
 # Maintainer: Paul Mattal <paul.archlinux.org>
 
 pkgname=truecrypt
-pkgver=7.0a
-pkgrel=3
+pkgver=7.1
+pkgrel=1
 pkgdesc="Free open-source cross-platform disk encryption software"
 url="http://www.truecrypt.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,33 +15,36 @@ conflicts=('truecrypt-utils')
 replaces=('truecrypt-utils')
 # N.B. Truecrypt's web-based source download is incompatible with
 # makepkg. Source has been placed on ftp.archlinux.org instead
-source=('ftp://ftp.archlinux.org/other/tc/truecrypt-7.0a.tar.gz' \
+source=(ftp://ftp.archlinux.org/other/tc/truecrypt-${pkgver}.tar.gz{,.sig} \
         'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \
         "${pkgname}.desktop" \
 	"${pkgname}-arch-detection.patch") 
+md5sums=('a8268630a870faff07af940f63fb29eb'
+         'ddee7c4b2419ecb44b02c8294a08fbed'
+         'ce6a707b79411e82e8e558aa03e764b0'
+         '183b9bf04a943454d4e216130bcbac01'
+         '00ea70fa8437de877b31b027ac2b4060')
 
 build() {
-  export PKCS11_INC="${srcdir}/pkcs-2.20"
-
-  cd ${srcdir}/${pkgname}-${pkgver}-source || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}-source"
 
   # Work around buggy CPU type detection
-  patch -Np1 -i ../${pkgname}-arch-detection.patch || return 1
+  patch -Np1 -i ../${pkgname}-arch-detection.patch
   
   # Build
-  make || return 1
+  make PKCS11_INC="${srcdir}/pkcs-2.20"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-source"
 
   # Install Binary
-  install -D -m755 Main/${pkgname} ${pkgdir}/usr/bin/${pkgname} || return 1
+  install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}"
 
   # Install Desktop file and Icon
-  install -D -m644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1
-  install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm ${pkgdir}/usr/share/pixmaps/truecrypt.xpm || return 1
+  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/truecrypt.xpm"
 
   # Install License
-  install -D -m644 License.txt ${pkgdir}/usr/share/licenses/${pkgname}/License.txt || return 1
+  install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt"
 }
-md5sums=('0a61616bc5c5ad90e876b4014c004ac9'
-         'ce6a707b79411e82e8e558aa03e764b0'
-         '183b9bf04a943454d4e216130bcbac01'
-         '00ea70fa8437de877b31b027ac2b4060')
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index 8fbcfcc5a..a8bf6cf0e 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 139451 2011-10-01 19:01:59Z ibiru $
+# $Id: PKGBUILD 140957 2011-10-20 05:44:20Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=vinagre
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.2.1
+pkgrel=1
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -18,7 +18,7 @@ makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh')
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9ba0d13000d81d0e47f456b138f52ef2cb7a603c71381993952acc87c25e2e61')
+sha256sums=('077dc011d048e9ed7a683ed74dc027c5c7e47d0b95b99acb493bf99fff22369c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index c154f2fbd..13592bdf8 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139453 2011-10-01 19:02:04Z ibiru $
+# $Id: PKGBUILD 140959 2011-10-20 05:44:23Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
 options=(!emptydirs)
 install=vino.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2b22737aa84c15b07815d47392f9a6ef4cf6f9410cf7024bbae538496e2eda37')
+sha256sums=('b8c5a59914886b8676fb512da380114adb896264c46a36d3f123cf459ba799df')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD
index 610261ccd..87ae483fc 100644
--- a/extra/vte3/PKGBUILD
+++ b/extra/vte3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139455 2011-10-01 19:02:07Z ibiru $
+# $Id: PKGBUILD 140961 2011-10-20 05:44:24Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=vte3
 pkgname=(vte3 vte-common)
-pkgver=0.30.0
+pkgver=0.30.1
 pkgrel=1
 pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs')
 makedepends=('intltool' 'gobject-introspection' 'gtk3')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-${pkgver}.tar.xz)
-sha256sums=('4b4e13b46e026f1ba088a5bdf9786a339fedb88438f0e094bc7afe5e376be410')
+sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64')
 
 build() {
   cd "${srcdir}/vte-${pkgver}"
diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD
index b19995eaf..95801df8c 100644
--- a/extra/watchdog/PKGBUILD
+++ b/extra/watchdog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 111485 2011-02-27 10:22:27Z thomas $
+# $Id: PKGBUILD 141081 2011-10-23 14:16:24Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=watchdog
 pkgver=5.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Watchdog daemon"
 arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/watchdog"
@@ -14,14 +14,17 @@ backup=(etc/watchdog.conf
         etc/conf.d/wd_keepalive)
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         watchdog.sh
-        watchdog.cf)
+        watchdog.cf
+        watchdog-5.9-use-oom_score_adj.patch)
 md5sums=('d7cae3c9829f5d9a680764f314234867'
          '854451f554718b55186599faaa8d85f6'
-         '01c1e2e13f515131180b4ebe9b8b7cc3')
+         '01c1e2e13f515131180b4ebe9b8b7cc3'
+         '9a1ab454e42a7f2969ef6bf2da8a4543')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}"/${pkgname}-${pkgver}
 
+  patch -p1 -i "${srcdir}"/watchdog-5.9-use-oom_score_adj.patch
   ./configure \
 	--prefix=/usr \
 	--mandir=/usr/share/man \
@@ -31,14 +34,14 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make install DESTDIR=${pkgdir}
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make install DESTDIR="${pkgdir}"
   for fil in watchdog wd_keepalive ; do
-	install -D -m755 ${srcdir}/watchdog.sh ${pkgdir}/etc/rc.d/${fil}
-	install -D -m644 ${srcdir}/watchdog.cf ${pkgdir}/etc/conf.d/${fil}
+	install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil}
+	install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil}
   done
 
-  sed -i 's/watchdog/wd_keepalive/g' ${pkgdir}/etc/rc.d/wd_keepalive
-  sed -i 's/watchdog/wd_keepalive/g' ${pkgdir}/etc/conf.d/wd_keepalive
-  sed -i 's/Watchdog/Simple Watchdog/' ${pkgdir}/etc/rc.d/wd_keepalive
+  sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/rc.d/wd_keepalive
+  sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/conf.d/wd_keepalive
+  sed -i 's/Watchdog/Simple Watchdog/' "${pkgdir}"/etc/rc.d/wd_keepalive
 }
diff --git a/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch b/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch
new file mode 100644
index 000000000..90508d777
--- /dev/null
+++ b/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch
@@ -0,0 +1,91 @@
+diff -ur watchdog-5.9.orig/src/watchdog.c watchdog-5.9/src/watchdog.c
+--- watchdog-5.9.orig/src/watchdog.c	2010-06-16 15:45:51.000000000 +0200
++++ watchdog-5.9/src/watchdog.c	2011-10-23 15:51:58.631689778 +0200
+@@ -636,7 +636,7 @@
+ 
+     /* allocate some memory to store a filename, this is needed later on even
+      * if the system runs out of memory */
+-    filename_buf = (char*)malloc(max(strlen(logdir) + sizeof("/repair-bin.stdout") + 1, strlen("/proc//oom_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1));
++    filename_buf = (char*)malloc(max(strlen(logdir) + sizeof("/repair-bin.stdout") + 1, strlen("/proc//oom_score_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1));
+     if (!filename_buf) {
+ 	error(progname);
+         exit(1);
+@@ -886,11 +886,19 @@
+ #endif
+ 
+     /* tell oom killer to not kill this process */
+-    sprintf(filename_buf, "/proc/%d/oom_adj", pid);
++    sprintf(filename_buf, "/proc/%d/oom_score_adj", pid);
+     fp = fopen(filename_buf, "w");
+     if (fp != NULL) {
+-	fprintf(fp, "-17\n");
+-	(void) fclose(fp);
++        fprintf(fp, "-1000\n");
++        (void) fclose(fp);
++    }
++    else {
++        sprintf(filename_buf, "/proc/%d/oom_adj", pid);
++        fp = fopen(filename_buf, "w");
++        if (fp != NULL) {
++            fprintf(fp, "-17\n");
++            (void) fclose(fp);
++        }
+     }
+ 
+     /* main loop: update after <tint> seconds */
+diff -ur watchdog-5.9.orig/src/wd_keepalive.c watchdog-5.9/src/wd_keepalive.c
+--- watchdog-5.9.orig/src/wd_keepalive.c	2010-06-16 15:45:49.000000000 +0200
++++ watchdog-5.9/src/wd_keepalive.c	2011-10-23 15:50:43.061563281 +0200
+@@ -212,7 +212,7 @@
+     FILE *fp;
+     char *configfile = CONFIG_FILENAME;
+     char *filename_buf;
+-    pid_t child_pid;
++    pid_t pid, child_pid;
+     int count = 0;
+     int c;
+     /* allow all options watchdog understands too */
+@@ -284,7 +284,7 @@
+ 
+     /* allocate some memory to store a filename, this is needed later on even
+      * if the system runs out of memory */
+-    filename_buf = (char*)malloc(strlen("/proc//oom_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1);
++    filename_buf = (char*)malloc(strlen("/proc//oom_score_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1);
+     if (!filename_buf) {
+         error(progname);
+         exit(1);
+@@ -363,9 +363,10 @@
+ #endif
+ 
+     /* tuck my process id away */
++    pid = getpid();
+     fp = fopen(KA_PIDFILE, "w");
+     if ( fp != NULL ) {
+-        fprintf(fp, "%d\n", getpid());
++        fprintf(fp, "%d\n", pid);
+         (void) fclose(fp);
+     }
+ 
+@@ -403,12 +404,20 @@
+ #endif
+ 
+     /* tell oom killer to not kill this process */
+-    sprintf(filename_buf, "/proc/%d/oom_adj", getpid());
++    sprintf(filename_buf, "/proc/%d/oom_score_adj", pid);
+     fp = fopen(filename_buf, "w");
+     if (fp != NULL) {
+-        fprintf(fp, "-17\n");
++        fprintf(fp, "-1000\n");
+         (void) fclose(fp);
+     }
++    else {
++        sprintf(filename_buf, "/proc/%d/oom_adj", pid);
++        fp = fopen(filename_buf, "w");
++        if (fp != NULL) {
++            fprintf(fp, "-17\n");
++            (void) fclose(fp);
++        }
++    }
+ 
+     /* main loop: update after <tint> seconds */
+     while ( _running ) {
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index cc551e671..09e7c3a69 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135812 2011-08-18 15:04:52Z andyrtr $
+# $Id: PKGBUILD 141059 2011-10-22 19:05:29Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
-pkgver=0.3.5
-pkgrel=3
+pkgver=0.3.6
+pkgrel=1
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.weechat.org/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
 optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
 options=('!libtool')
 source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('0d2a089bfbfa550e0c65618a171fb3c4')
+md5sums=('db2392b8e31738f79f0898f77eda8daa')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index 7916e1320..ac95cae6c 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108896 2011-02-04 18:32:02Z giovanni $
+# $Id: PKGBUILD 141085 2011-10-23 14:30:06Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=whois
-pkgver=5.0.11
+pkgver=5.0.12
 pkgrel=1
 pkgdesc="The whois client by Marco d'Itri"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('libidn')
 makedepends=('perl')
 source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.gz")
-md5sums=('942e2d90b0bcd7d22765c8e3344fe118')
+md5sums=('1147b6a993af384ba341cb91666c7e97')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xfburn/PKGBUILD b/extra/xfburn/PKGBUILD
index 2e7aec3bf..3566c2582 100755
--- a/extra/xfburn/PKGBUILD
+++ b/extra/xfburn/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 119475 2011-04-11 17:44:33Z andyrtr $
+# $Id: PKGBUILD 141077 2011-10-23 09:32:55Z andyrtr $
 # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
 # Contributor: Alois Nespor alois.nespor@gmail.com
 
 pkgname=xfburn
 pkgver=0.4.3
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="a simple CD/DVD burning tool based on libburnia libraries"
 url="http://goodies.xfce.org/projects/applications/xfburn"
@@ -14,11 +14,17 @@ install=${pkgname}.install
 depends=('libburn>=1.0.6.pl00' 'libisofs>=1.0.6' 'libxfcegui4>=4.8.1' 'exo>=0.6.0' 'gstreamer0.10-base>=0.10.26'
          'hicolor-icon-theme' 'desktop-file-utils' 'librsvg')
 makedepends=('intltool')
-source=(http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2)
-md5sums=('147cdc2d909e751125be16103b8dc81f')
+source=(http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2
+	fix_empty_dir_segfault.diff)
+md5sums=('147cdc2d909e751125be16103b8dc81f'
+         '82a85be2442c42ab93de95e21c6c11b0')
 
 build() { 
   cd ${srcdir}/$pkgname-$pkgver
+
+  # fix https://bugs.archlinux.org/task/26121
+  patch -Np0 -i ${srcdir}/fix_empty_dir_segfault.diff
+  
   ./configure --prefix=/usr \
 	--enable-gstreamer \
 	--enable-dbus \
diff --git a/extra/xfburn/fix_empty_dir_segfault.diff b/extra/xfburn/fix_empty_dir_segfault.diff
new file mode 100644
index 000000000..af3fe07c8
--- /dev/null
+++ b/extra/xfburn/fix_empty_dir_segfault.diff
@@ -0,0 +1,48 @@
+--- xfburn/xfburn-data-composition.c	2011-02-17 16:37:03.000000000 +0100
++++ xfburn/xfburn-data-composition_patched.c	2011-02-17 16:40:40.000000000 +0100
+@@ -1874,26 +1874,29 @@
+           g_error ("Failed adding %s as a node to the image: code %X!", src, r);
+       }
+ 
+-      basename = g_path_get_basename (src);
++      /* Check names only for items not manually created (#613563) */
++      if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) {
++        basename = g_path_get_basename (src);
++
++        /* check if the file has been renamed */
++        if (strcmp (basename, name) != 0) {
++          /* rename the iso_node */
++          r = iso_node_set_name (node, name);
++
++          if (r == 0) {
++            /* The first string is the renamed name, the second one the original name */
++            xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src);
++
++            g_free (basename);
++            g_free (name);
++            g_free (src);
+ 
+-      /* check if the file has been renamed */
+-      if (strcmp (basename, name) != 0) {
+-        /* rename the iso_node */
+-        r = iso_node_set_name (node, name);
+-
+-        if (r == 0) {
+-          /* The first string is the renamed name, the second one the original name */
+-          xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src);
+-
+-          g_free (basename);
+-          g_free (name);
+-          g_free (src);
+-
+-          continue;
++            continue;
++          }
+         }
++        g_free (basename);
+       }
+ 
+-      g_free (basename);
+       g_free (name);
+       g_free (src);
+
diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD
index df9b426b5..2a516c7fc 100644
--- a/extra/xfce4-xkb-plugin/PKGBUILD
+++ b/extra/xfce4-xkb-plugin/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 126312 2011-06-04 15:24:03Z andyrtr $
+# $Id: PKGBUILD 141039 2011-10-22 08:26:43Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-xkb-plugin
-pkgver=0.5.4.1
+pkgver=0.5.4.2
 pkgrel=1
 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
 groups=('xfce4-goodies')
@@ -14,7 +14,7 @@ depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg')
 makedepends=('intltool')
 options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('8512c0b180004e1150d8c05255c202d8')
+md5sums=('b79f7c65f8155cb77d99dcf9716bb38b')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 29fa8a40d..94ee20a94 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140277 2011-10-11 21:28:03Z jgc $
+# $Id: PKGBUILD 141122 2011-10-24 13:18:15Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.11.1
-pkgrel=2
+pkgver=1.11.1.901
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -18,11 +18,11 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('ed0358b61294f1283aad42cf1e609752ceeffafd'
+sha1sums=('bc72d860c34868aa6b1823230cb7f13136ceb092'
           '0249b892f27243d8fe6fe6d226bf4c2391cedf49'
           '962fecc159c128728f14e8ba231c5b00391ff4ac'
           'd9f7d9553e772c2682c15079019d30c658a4f83b'
-          'd73125bf93aea09b0beb55e75c510b9f72f5d21a'
+          'cd9291fe1fa1b497aa74675afeeb025fe6b23b95'
           'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
           '6838fc00ef4618c924a77e0fb03c05346080908a'
           '993798f3d22ad672d769dae5f48d1fa068d5578f')
@@ -42,7 +42,7 @@ build() {
   # Add post-release patches from 1.11 branch
   patch -Np1 -i "${srcdir}/git-fixes.patch"
 
-  autoreconf
+  autoreconf -fi
   ./configure --prefix=/usr \
       --enable-ipv6 \
       --enable-dri \
diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch
index 3c59c27c9..a62524bdb 100644
--- a/extra/xorg-server/git-fixes.patch
+++ b/extra/xorg-server/git-fixes.patch
@@ -1,288 +1,56 @@
-From bd6ea85209e5ab80375d4ec9994d10a89fd1374a Mon Sep 17 00:00:00 2001
-From: Jamey Sharp <jamey@minilop.net>
-Date: Wed, 15 Sep 2010 01:35:21 +0000
-Subject: Fix pixmap double-frees on error paths.
-
-If AddResource fails, it will automatically free the object that was
-passed to it by calling the appropriate deleteFunc; and of course
-FreeResource also calls the deleteFunc. In both cases it's wrong to call
-the destroy hook manually.
-
-Commit by Jamey Sharp and Josh Triplett.
-
-Signed-off-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Josh Triplett <josh@joshtriplett.org>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
-(cherry picked from commit 0f380a5005f800572773cd4667ce43c7459cc467)
----
-diff --git a/Xext/shm.c b/Xext/shm.c
-index b08af82..4141a8f 100644
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -991,7 +991,6 @@ CreatePmap:
- 	    pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
- 	    pMap->drawable.id = newPix->info[j].id;
- 	    if (!AddResource(newPix->info[j].id, RT_PIXMAP, (pointer)pMap)) {
--		(*pScreen->DestroyPixmap)(pMap);
- 		result = BadAlloc;
- 		break;
- 	    }
-@@ -1002,10 +1001,8 @@ CreatePmap:
-     }
- 
-     if(result == BadAlloc) {
--	while(j--) {
--	    (*pScreen->DestroyPixmap)(pMap);
-+	while(j--)
- 	    FreeResource(newPix->info[j].id, RT_NONE);
--	}
- 	free(newPix);
-     } else 
- 	AddResource(stuff->pid, XRT_PIXMAP, newPix);
-@@ -1110,7 +1107,6 @@ CreatePmap:
- 	{
- 	    return Success;
- 	}
--	pDraw->pScreen->DestroyPixmap(pMap);
-     }
-     return BadAlloc;
- }
-diff --git a/dix/dispatch.c b/dix/dispatch.c
-index 192c8c3..f8200b1 100644
---- a/dix/dispatch.c
-+++ b/dix/dispatch.c
-@@ -1419,7 +1419,6 @@ CreatePmap:
- 	}
- 	if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap))
- 	    return Success;
--	(*pDraw->pScreen->DestroyPixmap)(pMap);
-     }
-     return BadAlloc;
- }
---
-cgit v0.9.0.2-2-gbebe
-From 347f5610ca023fb31485aa19c20607af8bf9c834 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Tue, 30 Aug 2011 22:46:52 +0000
-Subject: Xi: Fix passive XI2 ungrabs on XIAll[Master]Devices
-
-The corresponding DeviceIntPtr wasn't being gotten properly,
-resulting in BadDevice from dixLookupDevice().
-
-Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit f52d5cd374563544dafe29587411f345e31bbdf8)
----
-diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
-index ae43433..5cdd8ac 100644
---- a/Xi/xipassivegrab.c
-+++ b/Xi/xipassivegrab.c
-@@ -261,9 +261,16 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
-     REQUEST(xXIPassiveUngrabDeviceReq);
-     REQUEST_AT_LEAST_SIZE(xXIPassiveUngrabDeviceReq);
- 
--    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
--    if (rc != Success)
--	return rc;
-+    if (stuff->deviceid == XIAllDevices)
-+        dev = inputInfo.all_devices;
-+    else if (stuff->deviceid == XIAllMasterDevices)
-+        dev = inputInfo.all_master_devices;
-+    else
-+    {
-+        rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
-+        if (rc != Success)
-+	    return rc;
-+    }
- 
-     if (stuff->grab_type != XIGrabtypeButton &&
-         stuff->grab_type != XIGrabtypeKeycode &&
---
-cgit v0.9.0.2-2-gbebe
-From e9ae33316012ffe9acfeeb7303ab3392c2ca2a2b Mon Sep 17 00:00:00 2001
-From: Sam Spilsbury <sam.spilsbury@canonical.com>
-Date: Wed, 14 Sep 2011 01:58:34 +0000
-Subject: Remove the SendEvent bit (0x80) before doing range checks on event type.
-
-Some extension libraries may set this bit before converting the event to
-wire protocol and as such range checking the event will cause an invalid
-BadValue error to result. As the documentation suggests the the bit
-should be "forced on", remove it before doing range checks and continue
-to force it on in the server.
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit 2d2dce558d24eeea0eb011ec9ebaa6c5c2273c39)
----
-diff --git a/dix/events.c b/dix/events.c
-index 8a4c6b9..9e58edb 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -5224,6 +5224,8 @@ CloseDownEvents(void)
-     InputEventList = NULL;
- }
- 
-+#define SEND_EVENT_BIT 0x80
-+
- /**
-  * Server-side protocol handling for SendEvent request.
-  *
-@@ -5241,6 +5243,16 @@ ProcSendEvent(ClientPtr client)
- 
-     REQUEST_SIZE_MATCH(xSendEventReq);
- 
-+    /* libXext and other extension libraries may set the bit indicating
-+     * that this event came from a SendEvent request so remove it
-+     * since otherwise the event type may fail the range checks
-+     * and cause an invalid BadValue error to be returned.
-+     *
-+     * This is safe to do since we later add the SendEvent bit (0x80)
-+     * back in once we send the event to the client */
-+
-+    stuff->event.u.u.type &= ~(SEND_EVENT_BIT);
-+
-     /* The client's event type must be a core event type or one defined by an
- 	extension. */
- 
-@@ -5298,7 +5310,7 @@ ProcSendEvent(ClientPtr client)
- 	client->errorValue = stuff->propagate;
- 	return BadValue;
-     }
--    stuff->event.u.u.type |= 0x80;
-+    stuff->event.u.u.type |= SEND_EVENT_BIT;
-     if (stuff->propagate)
-     {
- 	for (;pWin; pWin = pWin->parent)
---
-cgit v0.9.0.2-2-gbebe
-From b45e22675364915c32560c26404cf30d77ab68aa Mon Sep 17 00:00:00 2001
-From: Alan Hourihane <alanh@vmware.com>
-Date: Wed, 05 Oct 2011 02:42:46 +0000
-Subject: dixfonts: Don't overwrite local c variable until new_closure is safely initialized.
-
-Signed-off-by: Alan Hourihane <alanh@vmware.com>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-(cherry picked from commit 7a33c5b934382b5554f41ab1502514e91c9bc52e)
+From f80d23357874db19bc124dee70239fb182977883 Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon, 17 Oct 2011 20:26:12 +0000
+Subject: Fix CVE-2011-4028: File disclosure vulnerability.
+
+use O_NOFOLLOW to open the existing lock file, so symbolic links
+aren't followed, thus avoid revealing if it point to an existing
+file.
+
+Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+(cherry picked from commit 6ba44b91e37622ef8c146d8f2ac92d708a18ed34)
 ---
-diff --git a/dix/dixfonts.c b/dix/dixfonts.c
-index fbac124..d2bcb84 100644
---- a/dix/dixfonts.c
-+++ b/dix/dixfonts.c
-@@ -1302,31 +1302,30 @@ doPolyText(ClientPtr client, PTclosurePtr c)
- 			goto bail;
- 		    }
- 		    *new_closure = *c;
--		    c = new_closure;
- 
--		    len = c->endReq - c->pElt;
--		    c->data = malloc(len);
--		    if (!c->data)
-+		    len = new_closure->endReq - new_closure->pElt;
-+		    new_closure->data = malloc(len);
-+		    if (!new_closure->data)
- 		    {
--			free(c);
-+			free(new_closure);
- 			err = BadAlloc;
- 			goto bail;
- 		    }
--		    memmove(c->data, c->pElt, len);
--		    c->pElt = c->data;
--		    c->endReq = c->pElt + len;
-+		    memmove(new_closure->data, new_closure->pElt, len);
-+		    new_closure->pElt = new_closure->data;
-+		    new_closure->endReq = new_closure->pElt + len;
- 
- 		    /* Step 2 */
- 
--		    pGC = GetScratchGC(c->pGC->depth, c->pGC->pScreen);
-+		    pGC = GetScratchGC(new_closure->pGC->depth, new_closure->pGC->pScreen);
- 		    if (!pGC)
- 		    {
--			free(c->data);
--			free(c);
-+			free(new_closure->data);
-+			free(new_closure);
- 			err = BadAlloc;
- 			goto bail;
- 		    }
--		    if ((err = CopyGC(c->pGC, pGC, GCFunction |
-+		    if ((err = CopyGC(new_closure->pGC, pGC, GCFunction |
- 				      GCPlaneMask | GCForeground |
- 				      GCBackground | GCFillStyle |
- 				      GCTile | GCStipple |
-@@ -1337,15 +1336,16 @@ doPolyText(ClientPtr client, PTclosurePtr c)
- 				      Success)
- 		    {
- 			FreeScratchGC(pGC);
--			free(c->data);
--			free(c);
-+			free(new_closure->data);
-+			free(new_closure);
- 			err = BadAlloc;
- 			goto bail;
- 		    }
-+		    c = new_closure;
- 		    origGC = c->pGC;
- 		    c->pGC = pGC;
- 		    ValidateGC(c->pDraw, c->pGC);
--		    
-+
- 		    ClientSleep(client, (ClientSleepProcPtr)doPolyText, c);
- 
- 		    /* Set up to perform steps 3 and 4 */
---
-cgit v0.9.0.2-2-gbebe
-From bec15eb73a17fb47963ff6b747ea504f7dc05deb Mon Sep 17 00:00:00 2001
-From: Kirill Elagin <kirelagin@gmail.com>
-Date: Tue, 04 Oct 2011 19:02:20 +0000
-Subject: Fix server crash due to invalid images
-
-See https://bugs.freedesktop.org/show_bug.cgi?id=39383
-
-Signed-off-by: Kirill Elagin <kirelagin@gmail.com>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-(cherry picked from commit 53611213396479abfdce0f7752681572e0d26d78)
----
-diff --git a/fb/fbpict.c b/fb/fbpict.c
-index d1fd0cb..57c93fd 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
-@@ -163,7 +163,9 @@ create_bits_picture (PicturePtr pict,
- 	(pixman_format_code_t)pict->format,
- 	pixmap->drawable.width, pixmap->drawable.height,
- 	(uint32_t *)bits, stride * sizeof (FbStride));
--    
-+
-+    if (!image)
-+	return NULL;
-     
- #ifdef FB_ACCESS_WRAPPER
- #if FB_SHIFT==5
+diff --git a/os/utils.c b/os/utils.c
+index 36cb46f..9e0acb6 100644
+--- a/os/utils.c
++++ b/os/utils.c
+@@ -316,7 +316,7 @@ LockServer(void)
+       /*
+        * Read the pid from the existing file
+        */
+-      lfd = open(LockFile, O_RDONLY);
++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
+       if (lfd < 0) {
+         unlink(tmp);
+         FatalError("Can't read lock file %s\n", LockFile);
 --
 cgit v0.9.0.2-2-gbebe
-From 65469f5ea98074ab27ce0a2d482157b9d5c2cbc7 Mon Sep 17 00:00:00 2001
-From: vdb@picaros.org <vdb@picaros.org>
-Date: Sat, 17 Sep 2011 16:55:47 +0000
-Subject: Fix a rare memory leak
-
-Signed-off-by: Servaas Vandenberghe <vdb@picaros.org>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-(cherry picked from commit e4cddf509e1729e8ff40354275b65455111ad2bd)
+From 12f65819ffb04103f170ecd7e281348de618fc4c Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon, 17 Oct 2011 20:27:35 +0000
+Subject: Fix CVE-2011-4029: File permission change vulnerability.
+
+Use fchmod() to change permissions of the lock file instead
+of chmod(), thus avoid the race that can be exploited to set
+a symbolic link to any file or directory in the system.
+
+Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+(cherry picked from commit b67581cf825940fdf52bf2e0af4330e695d724a4)
 ---
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index c2814d4..3fae039 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -133,6 +133,7 @@ xf86CrtcCreate (ScrnInfoPtr		scrn,
- 	crtcs = malloc((xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr));
-     if (!crtcs)
-     {
-+	free(crtc->gamma_red);
- 	free(crtc);
- 	return NULL;
-     }
+diff --git a/os/utils.c b/os/utils.c
+index 9e0acb6..d9aa65e 100644
+--- a/os/utils.c
++++ b/os/utils.c
+@@ -295,7 +295,7 @@ LockServer(void)
+     FatalError("Could not create lock file in %s\n", tmp);
+   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
+   (void) write(lfd, pid_str, 11);
+-  (void) chmod(tmp, 0444);
++  (void) fchmod(lfd, 0444);
+   (void) close(lfd);
+ 
+   /*
 --
 cgit v0.9.0.2-2-gbebe
diff --git a/extra/xorg-sessreg/PKGBUILD b/extra/xorg-sessreg/PKGBUILD
index 9b1f56573..e7b850a1d 100644
--- a/extra/xorg-sessreg/PKGBUILD
+++ b/extra/xorg-sessreg/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113683 2011-03-10 14:43:23Z jgc $
+# $Id: PKGBUILD 141120 2011-10-24 12:17:34Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-sessreg
-pkgver=1.0.6
-pkgrel=2
+pkgver=1.0.7
+pkgrel=1
 pkgdesc="Register X sessions in system utmp/utmpx databases"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('glibc')
 makedepends=('xorg-util-macros' 'xproto')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/sessreg-${pkgver}.tar.bz2)
-sha1sums=('6f260f1ddc366da070a6d60301b9fb64a99c119a')
+sha256sums=('8734ee580264ab92e984d8f84611dada89906d6b548334a5e7d4b0ddba7c2e52')
 
 build() {
   cd "${srcdir}/sessreg-${pkgver}"
diff --git a/extra/xorg-xdpyinfo/PKGBUILD b/extra/xorg-xdpyinfo/PKGBUILD
index 084e22b54..48c4b5ae9 100644
--- a/extra/xorg-xdpyinfo/PKGBUILD
+++ b/extra/xorg-xdpyinfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113736 2011-03-10 15:06:24Z jgc $
+# $Id: PKGBUILD 141118 2011-10-24 12:15:25Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xdpyinfo
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="Display information utility for X"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 'l
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2)
-sha1sums=('5d53cd31afd40bdc4575b5347f2cda67f135f5f2')
+sha256sums=('23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f')
 
 build() {
   cd "${srcdir}/xdpyinfo-${pkgver}"
diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index 7fa89decf..bcc94143e 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -1,13 +1,12 @@
-# $Id: PKGBUILD 139457 2011-10-01 19:02:12Z ibiru $
+# $Id: PKGBUILD 140963 2011-10-20 05:44:26Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=yelp
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib'
-         'xz' 'bzip2' 'desktop-file-utils' 'dconf')
+depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' 'desktop-file-utils' 'dconf')
 makedepends=('intltool' 'gtk-doc')
 groups=('gnome')
 license=('GPL')
@@ -15,7 +14,7 @@ options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 install=yelp.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6c33bb608614cc81b1c6d9009621a0618beb39e75bf14da0f091871edcd03172')
+sha256sums=('f22cc5e24df4349bffc42a75844615d86924f6b3f4a1951e0240a03a1a40981d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-10-28 11:35:50 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-10-28 11:35:50 -0300
commit	8856e6fe26ce35b4caf6beeac324f583ec1b6133 (patch)
tree	c42a03e2b7610a39d167af36357607399aa40045 /extra
parent	5100458465d1ed420073c3213349bf430075ddbc (diff)
parent	0424b5fc47f106db6498c4cda3476e1d49fe0f82 (diff)