Merge branch 'master' of gitpar:abslibre-mips64el

Conflicts: libre/linux-libre/PKGBUILD libre/linux-libre/linux-libre.install libre/metalog/PKGBUILD
author: Joshua Ismael Haase Hernández <hahj87@gmail.com> 2011-12-25 13:37:35 -0600
committer: Joshua Ismael Haase Hernández <hahj87@gmail.com> 2011-12-25 13:37:35 -0600
commit: d4891d626bd0699dafdcfa776ad0ee48df04f2d4 (patch)
tree: 215f7e117f4e146389e96b8b976591b101845667 /extra
parent: 14f1f7de0e32b27172968722644d5dbced226f52 (diff)
parent: c46511670fc7e857a314c0e9e974be610065ab98 (diff)
120 files changed, 2865 insertions, 1532 deletions
diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD
index cee35d88c..8572d79b1 100644
--- a/extra/acpid/PKGBUILD
+++ b/extra/acpid/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 143248 2011-11-24 01:29:25Z eric $
+# $Id: PKGBUILD 145167 2011-12-18 19:59:26Z eric $
 # Maintainer:
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.13
+pkgver=2.0.14
 pkgrel=1
 pkgdesc="A daemon for delivering ACPI power management events with netlink support"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz"
         'anything'
         'handler.sh'
         'acpid.conf.d')
-md5sums=('5bbbb9a320192df1cdd8d0e9a0196379'
+md5sums=('14fc1eabc3489f3ded9347fcd55f158a'
          'd69203a032c4583f9abaafcf21a7ed84'
          '2d37b98d6e74bab815604b8b48c6cfd4'
          'd411b758e8531adee191b66bcbc2892d'
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index cf0bb42f2..b38398183 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 142612 2011-11-12 17:15:02Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 145092 2011-12-16 20:04:34Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.4.3
-pkgrel=3
+pkgver=2.5.0
+pkgrel=1
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64" 'mips64el')
 url="http://amarok.kde.org"
@@ -21,7 +22,7 @@ optdepends=("libgpod: support for Apple iPod audio devices"
             "libmygpo-qt: gpodder.net Internet Service")
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('24e8141bcbd065448911fa872c50197d')
+sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index 8194873dc..59c337604 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143806 2011-11-29 13:33:24Z stephane $
+# $Id: PKGBUILD 145331 2011-12-21 20:47:10Z andrea $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr-util
 pkgver=1.3.12
-pkgrel=3
+pkgrel=4
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://apr.apache.org/"
diff --git a/extra/arora/PKGBUILD b/extra/arora/PKGBUILD
index d1606a56b..5ae5a77ba 100644
--- a/extra/arora/PKGBUILD
+++ b/extra/arora/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 110242 2011-02-18 07:44:40Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 145325 2011-12-21 20:47:00Z andrea $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=arora
 pkgver=0.11.0
-pkgrel=2
-pkgdesc='A cross platform web browser built using Qt and WebKit'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.arora-browser.org'
+pkgrel=3
+pkgdesc='Lightweight cross-platform Web browser'
+url='http://www.arora-browser.org/'
 license=('GPL')
-depends=('qt' 'desktop-file-utils')
-install='arora.install'
-source=("http://arora.googlecode.com/files/arora-${pkgver}.tar.gz")
-md5sums=('64334ce4198861471cad9316d841f0cb')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('qtwebkit' 'desktop-file-utils')
+source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31')
 
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+install=install
 
-	qmake PREFIX="/usr" "CONFIG-=debug" -r
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	qmake PREFIX='/usr' 'CONFIG-=debug' -r
 	make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	make INSTALL_ROOT=${pkgdir} install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/extra/arora/install b/extra/arora/install
new file mode 100644
index 000000000..6c87527e2
--- /dev/null
+++ b/extra/arora/install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 80773fdf5..ce21d53a7 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 134029 2011-08-01 10:30:12Z andrea $
+# $Id: PKGBUILD 145250 2011-12-20 08:51:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
 pkgver=4.96
-pkgrel=1
+pkgrel=3
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,12 +24,13 @@ replaces=('bluez-libs' 'bluez-utils')
 options=('!libtool' 'emptydirs')
 backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
         'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
-source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
+#source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'bluetooth.conf.d'
         'rc.bluetooth')
 md5sums=('255c3dda8b93210ab0dcf8d04ddaf69f'
-         '8f60a5eb9d84b9c64c478d63e1c24b10'
-         'ca4c39eb4bb201bd2eacad01492cd735')
+         '7412982b440f29fa7f76a41a87fef985'
+         '8f9498707f809506928b2e480d3b6789')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -49,8 +50,7 @@ build() {
     --enable-pand \
     --enable-dund \
     --enable-cups \
-    --enable-udevrules \
-    --enable-configfiles
+    --enable-wiimote
   make
 }
 
@@ -70,9 +70,14 @@ package() {
   install -Dm644 ${srcdir}/bluetooth.conf.d \
     ${pkgdir}/etc/conf.d/bluetooth
 
-  install -Dm755 test/simple-agent ${pkgdir}/usr/bin/bluez-simple-agent
+  # FS#27630
+  install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent
+  install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device
+  install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input
   sed -i 's#/usr/bin/python#/usr/bin/python2#' \
-    ${pkgdir}/usr/bin/bluez-simple-agent
+    "${pkgdir}"/usr/bin/bluez-simple-agent \
+    "${pkgdir}"/usr/bin/bluez-test-device \
+    "${pkgdir}"/usr/bin/bluez-test-input
 
   # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html
   rm "${pkgdir}"/lib/udev/rules.d/97-bluetooth.rules
diff --git a/extra/bluez/bluetooth.conf.d b/extra/bluez/bluetooth.conf.d
index 6648740eb..1c1e02589 100644
--- a/extra/bluez/bluetooth.conf.d
+++ b/extra/bluez/bluetooth.conf.d
@@ -25,6 +25,6 @@
 #RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
 
 # Options for hidd, dund and pand (default: none)
-#HIDD_OPTIONS=""
+HIDD_OPTIONS="--server"
 #DUND_OPTIONS=""
 #PAND_OPTIONS=""
diff --git a/extra/bluez/rc.bluetooth b/extra/bluez/rc.bluetooth
index 096242011..a46ee2abb 100644
--- a/extra/bluez/rc.bluetooth
+++ b/extra/bluez/rc.bluetooth
@@ -46,7 +46,7 @@ case "$1" in
     fi
     if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then
       stat_append " $HIDD_NAME"
-      $HIDD_EXEC $HIDD_OPTIONS --server
+      $HIDD_EXEC $HIDD_OPTIONS
     fi
     if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then
       stat_append " $RFCOMM_NAME"
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index 7ed8bfb8b..022cd0e7d 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 140665 2011-10-17 22:40:35Z bisson $
+# $Id: PKGBUILD 145066 2011-12-16 09:17:40Z bisson $
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=clamav
 pkgver=0.97.3
-pkgrel=1.1
+pkgrel=2
 pkgdesc='Anti-virus toolkit for Unix'
-arch=('i686' 'x86_64' 'mips64el')
-depends=('bzip2' 'zlib' 'libtool')
-options=('!libtool')
+url='http://www.clamav.net/'
 license=('GPL')
+options=('!libtool')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('bzip2' 'libltdl')
 backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
-url='http://www.clamav.net/'
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'rc.d'
         'conf.d'
         'logrotate'
         'config.patch')
 sha1sums=('263c7b8b7dc1536652ab64e32263d1c60e138655'
-          '7f15f0b13a1c11235bc99ef0add01efd8a442f07'
+          '50cfe02c97e4297a0efd25b23142408380305d30'
           'cb116cdab49a810381a515cbcfb6a6c148547f07'
           'be3310d2b41a68ce06e33c84ab68ffe59fdce104'
           '701a61571788d10ff7af01597785835c6bfea918')
diff --git a/extra/clamav/install b/extra/clamav/install
index 9116dc394..144134dde 100644
--- a/extra/clamav/install
+++ b/extra/clamav/install
@@ -2,8 +2,8 @@ post_install() {
 	getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null
 	getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null
 
-	install -d /var/{log,run}/clamav
-	chown clamav:root /var/{log,run}/clamav
+	install -d /var/log/clamav
+	chown clamav:root /var/log/clamav
 	chown -R clamav:clamav /var/lib/clamav
 }
 
diff --git a/extra/clamav/rc.d b/extra/clamav/rc.d
index 8e9c6afa9..04e959903 100644
--- a/extra/clamav/rc.d
+++ b/extra/clamav/rc.d
@@ -3,70 +3,65 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-# source application-specific settings
-[ -f /etc/conf.d/clamav ] && . /etc/conf.d/clamav
+[[ -f /etc/conf.d/clamav ]] && . /etc/conf.d/clamav
+[[ -d /var/run/clamav ]] || install -d -o clamav -g root /var/run/clamav
 
-PID_FC=`pidof -o %PPID /usr/bin/freshclam`
-PID_CD=`pidof -o %PPID /usr/sbin/clamd`
+PID_FC=$(pidof -o %PPID /usr/bin/freshclam)
+PID_CD=$(pidof -o %PPID /usr/sbin/clamd)
 
 case "$1" in
-  start)
-    # if clamd isn't started first, notifyclamd fails at times
-    if [ "$START_CLAMD" == "yes" ]; then
-       stat_busy "Starting ClamD"
-       [ -z "$PID_CD" ] && /usr/sbin/clamd
-       if [ $? -gt 0 ]; then
-          stat_fail
-       else
-          add_daemon clamav
-          stat_done
-       fi
-    fi
+	start)
+		if [[ $START_CLAMD = yes ]]; then
+			stat_busy "Starting ClamD"
+			[[ -z $PID_CD ]] && /usr/sbin/clamd
+			if [[ $? -gt 0 ]]; then
+					stat_fail
+			else
+					add_daemon clamav
+					stat_done
+			fi
+		fi
+		sleep 1
+		if [[ $START_FRESHCLAM = yes ]]; then
+			stat_busy "Starting FreshClam"
+			[[ -z $PID_FC ]] && /usr/bin/freshclam -p /var/run/clamav/freshclam.pid -d $FRESHCLAM_OPTS
+			if [[ $? -gt 0 ]]; then
+					stat_fail
+			else
+					add_daemon clamav
+					stat_done
+			fi
+		fi
+	;;
+	stop)
+		if [[ $START_CLAMD = yes ]]; then
+			stat_busy "Stopping ClamD"
+			[[ -n $PID_CD ]] && kill $PID_CD &> /dev/null
+				if [[ $? -gt 0 ]]; then
+					stat_fail
+				else
+					rm_daemon clamav
+					stat_done
+				fi
+		fi
 
-    # give clamd enough time to start
-    sleep 1
-
-    if [ "$START_FRESHCLAM" == "yes" ]; then 
-       stat_busy "Starting FreshClam"
-       [ -z "$PID_FC" ] && /usr/bin/freshclam -p /var/run/clamav/freshclam.pid -d $FRESHCLAM_OPTS
-       if [ $? -gt 0 ]; then
-          stat_fail
-       else
-          add_daemon clamav
-          stat_done
-       fi
-    fi
-    ;;
-  stop)
-    if [ "$START_CLAMD" == "yes" ]; then
-       stat_busy "Stopping ClamD"
-   	[ -n "$PID_CD" ] && kill $PID_CD &> /dev/null
-        if [ $? -gt 0 ]; then
-           stat_fail
-        else
-           rm_daemon clamav
-           stat_done
-        fi
-    fi
-
-    if [ "$START_FRESHCLAM" == "yes" ]; then 
-       stat_busy "Stopping FreshClam"
-       [ -n "$PID_FC" ] && kill $PID_FC &> /dev/null
-       if [ $? -gt 0 ]; then
-          stat_fail
-       else
-          rm_daemon clamav
-          stat_done
-       fi
-    fi
-    ;;
-  restart)
-    $0 stop
-    # will not start if not fully stopped, so sleep
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
+		if [[ $START_FRESHCLAM = yes ]]; then
+			stat_busy "Stopping FreshClam"
+			[[ -n $PID_FC ]] && kill $PID_FC &> /dev/null
+			if [[ $? -gt 0 ]]; then
+					stat_fail
+			else
+					rm_daemon clamav
+					stat_done
+			fi
+		fi
+	;;
+	restart)
+		$0 stop
+		sleep 2
+		$0 start
+		;;
+	*)
+		echo "usage: $0 {start|stop|restart}"	
 esac
 exit 0
diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD
index 969aae275..5c717c0cc 100644
--- a/extra/claws-mail-extra-plugins/PKGBUILD
+++ b/extra/claws-mail-extra-plugins/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 139484 2011-10-02 07:11:06Z andyrtr $
+# $Id: PKGBUILD 145087 2011-12-16 15:46:57Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Mildred <mildred593 at online dot fr>
 
 pkgname=claws-mail-extra-plugins
-pkgver=3.7.10
-pkgrel=2
+pkgver=3.8.0
+pkgrel=1
 pkgdesc="Extra plugins for claws-mail"
 url="http://www.claws-mail.org/plugins.php?branch=EXT"
 license=('GPL3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('claws-mail>=3.7.10')
+depends=('claws-mail>=3.8.0')
 makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7'
              'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1'
              'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata')
@@ -32,26 +32,17 @@ conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
            'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
 replaces=('sylpheed-claws-extra-plugins')
 options=('!libtool' '!strip')
-source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2
-	webkit1.6.1.patch)
-md5sums=('fe782b2d4762c9727e22c1bb7979f7d6'
-         '8b94fa44072331b9c3926607eb42ba26')
-sha1sums=('c5200936cb4811022774e960dc3f43d19eb320cf'
-          '8efd800617406dfe58a14422f243a678c582a90d')
+source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2)
+md5sums=('0783008baff9e09cb21ffc8947e9f2ee')
 
 build() {
   cd "$srcdir/claws-mail-extra-plugins-$pkgver"
 
-  # fix for new webkit api
-  pushd fancy*
-  patch -Np0 -i ${srcdir}/webkit1.6.1.patch
-  popd
-
   # fix for python2
   export PYTHON="/usr/bin/python2"
 
   # fix gdata plugin build
-  sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.2/configure
+  sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.3/configure
  
   for dir in */; do
     [[ $dir != geolocation_plugin-* ]] && (
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index 20396ee35..6fb5cf1c8 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144878 2011-12-08 21:06:16Z andyrtr $
+# $Id: PKGBUILD 145085 2011-12-16 15:46:54Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=claws-mail
-pkgver=3.7.10
-pkgrel=2
+pkgver=3.8.0
+pkgrel=1
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -19,16 +19,11 @@ replaces=('sylpheed-claws')
 provides=('claws')
 options=(!libtool)
 install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2
-	gnutls_buildfix.patch)
-md5sums=('fcf58dcff52f0908ff3bc368d820408b'
-         '372bf7a9da58ae49d9da50f79db69fb6')
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('df9f1657d7f34959a2205344d952c2e3')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
-  # fix build with latest gnutls
-  patch -Np1 -i ${srcdir}/gnutls_buildfix.patch
   
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
 
diff --git a/extra/convertlit/PKGBUILD b/extra/convertlit/PKGBUILD
index 4c7477666..95217f5fc 100644
--- a/extra/convertlit/PKGBUILD
+++ b/extra/convertlit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=convertlit
 pkgver=1.8
 pkgrel=6
 pkgdesc="An extractor/converter for .LIT eBooks"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.convertlit.com/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index b7b23fc58..7b6cbc29a 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 119729 2011-04-14 10:22:18Z daniel $
+# $Id: PKGBUILD 145313 2011-12-21 18:57:01Z daniel $
 # Maintainer: Daniel Isenmann <daniel @archlinux.org>
 
 pkgbase=dhcp
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.1.1
-_pkgver=4.2.1-P1
+pkgver=4.2.3.2
+_pkgver=4.2.3-P1
 
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
-source=(ftp://ftp.isc.org/isc/${pkgbase}/${pkgbase}-${_pkgver}.tar.gz
+source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz
         dhcp4 dhcp6 dhcp
         dhcp-4.1.1-missing-ipv6-not-fatal.patch
         dhclient-script-pathFixes.patch)
-md5sums=('22e6f1eff6d5cfe2621a06cc62ba5b70'
+md5sums=('04599f1557a5cafd10d7745267a68c8b'
          'c49b1497837ba56c54e401a66e1bab9b'
          '12c2f3ae47ed23eb698eb7f1bfd80f20'
          '8f357e46e1efcbb746f38737a3f977a2'
          'fd64aeb4f399dcc41ea43089a3811094'
-         'ddcc5cd576ec631ade6c4da21952b50b')
+         '541b415a25a169eaf64b681405f79a80')
 
 build() {
   cd ${srcdir}/${pkgbase}-${_pkgver}
@@ -66,7 +66,7 @@ package_dhcp(){
 
 package_dhclient(){
   pkgdesc="dhclient is standalone client from the dhcp package"
-  depends=('bash' 'iproute2')
+  depends=('bash' 'iproute2' 'net-tools')
 
   cd ${srcdir}/${pkgbase}-${_pkgver}
   make -C client DESTDIR=${pkgdir} install
diff --git a/extra/dhcp/dhclient-script-pathFixes.patch b/extra/dhcp/dhclient-script-pathFixes.patch
index e19c328d2..a4143ddde 100644
--- a/extra/dhcp/dhclient-script-pathFixes.patch
+++ b/extra/dhcp/dhclient-script-pathFixes.patch
@@ -1,5 +1,5 @@
---- linux	2009-04-21 16:21:09.000000000 +0200
-+++ linux_new	2010-06-30 19:06:20.000000000 +0200
+--- linux	2011-05-18 20:01:54.000000000 +0000
++++ linux_new	2011-12-21 18:45:41.487171012 +0000
 @@ -23,7 +23,7 @@
  # of the $1 in its args.
  
@@ -9,7 +9,7 @@
  
  make_resolv_conf() {
    if [ x"$new_domain_name_servers" != x ]; then
-@@ -112,9 +112,9 @@
+@@ -122,9 +122,9 @@
  if [ x$reason = xPREINIT ]; then
    if [ x$alias_ip_address != x ]; then
      # Bring down alias interface. Its routes will disappear too.
@@ -21,7 +21,7 @@
  
    # We need to give the kernel some time to get the interface up.
    sleep 1
-@@ -141,32 +141,32 @@
+@@ -151,25 +151,25 @@
    if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
  		[ x$alias_ip_address != x$old_ip_address ]; then
      # Possible new alias. Remove old alias.
@@ -50,6 +50,24 @@
 -      route add default gw $router $metric_arg dev $interface
 +      /sbin/route add default gw $router $metric_arg dev $interface
      done
+   else
+     # we haven't changed the address, have we changed other options           
+@@ -177,21 +177,21 @@
+     if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
+       # if we've changed routers delete the old and add the new.
+       for router in $old_routers; do
+-        route del default gw $router
++        /sbin/route del default gw $router
+       done
+       for router in $new_routers; do
+         if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+-	  route add -host $router dev $interface
++	  /sbin/route add -host $router dev $interface
+ 	fi
+-	route add default gw $router $metric_arg dev $interface
++	/sbin/route add default gw $router $metric_arg dev $interface
+       done
+     fi
    fi
    if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
     then
@@ -62,7 +80,7 @@
    fi
    make_resolv_conf
    exit_with_hooks 0
-@@ -176,42 +176,42 @@
+@@ -201,42 +201,42 @@
     || [ x$reason = xSTOP ]; then
    if [ x$alias_ip_address != x ]; then
      # Turn off alias interface.
diff --git a/extra/erlang/PKGBUILD b/extra/erlang/PKGBUILD
index 12150c3c6..27ec63f41 100644
--- a/extra/erlang/PKGBUILD
+++ b/extra/erlang/PKGBUILD
@@ -1,32 +1,43 @@
-# $Id: PKGBUILD 140857 2011-10-20 05:42:01Z ibiru $
+# $Id: PKGBUILD 145333 2011-12-21 20:47:12Z andrea $
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com>
 
 pkgname=erlang
 pkgver=R14B04
-pkgrel=1
+pkgrel=2
 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' 'mesa')
+makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa')
 optdepends=('wxgtk: for wx support' 'unixodbc: database')
 
 options=('!makeflags')
 source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz
 	http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz)
+md5sums=('4b469729f103f52702bfb1fb24529dc0'
+         'f31e72518daae4007f595c0b224dd59f')
+
+# please check these deps reported by namcap when you do the next build:
+#erlang E: Dependency java-environment detected and not included (found class files usr/lib/erlang/lib/jinterface-1.5.4/priv/OtpErlang.jar, usr/lib/erlang/lib/ic-4.2.27/priv/ic.jar)
+#erlang E: Dependency mesa detected and not included (libraries ['usr/lib/libGLU.so.1'] needed in files ['usr/lib/erlang/lib/wx-0.99/priv/erl_gl.so'])
+
 
 build() {
   cd "$srcdir/otp_src_${pkgver/./-}"
-  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)
+  export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk)
+  export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk)
 
   sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure
 
   CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs
   make
+}
+
+package() {
+  cd "$srcdir/otp_src_${pkgver/./-}"
   make INSTALL_PREFIX="$pkgdir" install
 
 # fix prefix
@@ -58,5 +69,3 @@ build() {
   install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
 
 }
-md5sums=('4b469729f103f52702bfb1fb24529dc0'
-         'f31e72518daae4007f595c0b224dd59f')
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index 6f6d25f5e..76bb37128 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142520 2011-11-11 10:53:28Z ibiru $
+# $Id: PKGBUILD 145054 2011-12-15 21:54:15Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=folks
-pkgver=0.6.5
+pkgver=0.6.6
 pkgrel=1
 pkgdesc="Library to aggregates people into metacontacts"
 arch=(i686 x86_64 'mips64el')
@@ -11,8 +11,8 @@ license=('LGPL2.1')
 depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb')
 makedepends=('gobject-introspection' 'intltool')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('86fd13cb32f3e85a96f9bc999616307323c967baddca3f9f3b402f23629bd5ee')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz)
+sha256sums=('3dd6a2983969a6369c6b0e25f28ec92415b5570dd6c89b25385807ecc4aeb0a8')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index 55401aa90..8f6b8da88 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 124359 2011-05-20 08:42:23Z bisson $
+# $Id: PKGBUILD 145161 2011-12-18 12:09:19Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=fontforge
-pkgver=20110222
+pkgver=20111214
 pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://fontforge.sourceforge.net'
+url='http://fontforge.sourceforge.net/'
 license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2')
+depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro')
 options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_full-${pkgver}.tar.bz2")
-sha1sums=('8fada07647f102351bb1d7d1c4da487356e7142f')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('55c3f00c0b486492ba071fc479e1feb426562e2b')
+
+# git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	sed -i 's/python /python2 /g' Makefile.dynamic.in
-	export CFLAGS="${CFLAGS// -O2 / -O1 }" # on i686, -O2 yields FS#20430
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD
index 360dcb568..6bddbf690 100644
--- a/extra/freetds/PKGBUILD
+++ b/extra/freetds/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=freetds
 pkgver=0.91
-pkgrel=1
+pkgrel=2
 pkgdesc='Library for accessing Sybase and MS SQL Server databases'
 url='http://www.freetds.org'
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,12 +17,12 @@ source=("ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/${pkgname}-${pkgve
 md5sums=('b14db5823980a32f0643d1a84d3ec3ad')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr --sysconfdir=/etc/freetds --mandir=/usr/share/man --enable-msdblib --with-tdsver=7.0
 	make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 4c322fb2c..eb145f5c0 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145012 2011-12-14 10:17:16Z bisson $
+# $Id: PKGBUILD 145112 2011-12-17 04:54:41Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=2.5.4
+pkgver=2.6.0
 pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 url='http://hyperrate.com/dir.php?eid=67'
@@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
         'qt4-lib64.patch')
-sha1sums=('4c0d3582eb370b4e295268801806c3bdd47a6940'
+sha1sums=('4abef8d37492b68d54ba40420f65d04779ee2ec5'
           '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc')
 
 install=install
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 4aacf4e32..7452d0fd5 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 136355 2011-08-27 09:31:43Z ibiru $
+# $Id: PKGBUILD 145133 2011-12-17 10:30:04Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=gdk-pixbuf2
-pkgver=2.24.0
+pkgver=2.24.1
 pkgrel=1
 pkgdesc="An image loading library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,22 +11,23 @@ depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
 makedepends=('gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-${pkgver}.tar.xz)
-sha256sums=('67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7')
+source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-$pkgver.tar.xz)
+sha256sums=('da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1')
 
 build() {
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
+  cd "$srcdir/gdk-pixbuf-$pkgver"
 
   ./configure --prefix=/usr \
     --without-libjasper \
+    --with-x11 \
     --with-included-loaders=png
   make
 }
 
 package() {
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
+  cd "$srcdir/gdk-pixbuf-$pkgver"
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/gimp-devel/PKGBUILD b/extra/gimp-devel/PKGBUILD
index 2b80e462a..1492fb5a7 100644
--- a/extra/gimp-devel/PKGBUILD
+++ b/extra/gimp-devel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140571 2011-10-17 08:14:44Z jgc $
+# $Id: PKGBUILD 145035 2011-12-15 15:03:12Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gimp-devel
-pkgver=2.7.3
-pkgrel=2
+pkgver=2.7.4
+pkgrel=1
 pkgdesc="GNU Image Manipulation Program (Development Version)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gimp.org/"
@@ -21,10 +21,8 @@ conflicts=('gimp')
 provides=("gimp=${pkgver}")
 install=gimp-devel.install
 source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl)
-md5sums=('851b55dc4af966e62ef5c8b679bcc623'
+md5sums=('bda95a29c3483b8ff458b06b1543f867'
          'bb27bc214261d36484093e857f015f38')
-sha1sums=('bea6edc3423774ace8dd86222314f4ef2278cdd8'
-          '110ce9798173b19a662d086ed7b882b4729f06cf')
 
 build() {
   cd "${srcdir}/gimp-${pkgver}"
@@ -34,6 +32,11 @@ build() {
   make
 }
 
+#check() {
+#  cd "${srcdir}/gimp-${pkgver}"
+#  make check
+#}
+
 package() {
   cd "${srcdir}/gimp-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index d20eeb882..149eb4bc9 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144099 2011-12-03 18:17:43Z dan $
+# $Id: PKGBUILD 145348 2011-12-22 00:36:32Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.8
+pkgver=1.7.8.1
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -80,7 +80,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-sha1sums=('7453e737e008f7319a5eca24a9ef3c5fb1f13398'
-          '93315f7f51d7f27d3e421c9b0d64afa27f3d16df'
+sha1sums=('198e23e6e50245331590a6159ccdbdbe1792422c'
+          'b49ce0b4da4f85671693c9b2c6f6a8b8ee65c809'
           'f2b41828bd912b72e2cb3e14677739c4f370de66'
           '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index 96177510c..b55be0e9b 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142226 2011-11-06 17:01:40Z ibiru $
+# $Id: PKGBUILD 145137 2011-12-17 18:24:13Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gmime
-pkgver=2.4.28
+pkgver=2.4.29
 pkgrel=1
 pkgdesc="Core mime parsing library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,24 +14,24 @@ makedepends=('gtk-sharp-2' 'pkgconfig')
 [ "$CARCH" = "mips64el" ] && \
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8487faf949ca60c7fb814338e6457d4b4260fcba361158667e1f3fe3e7cce13e')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('c85dd7b2ac19754bf687fe8653c3631415b3a2ce70b4365268f03a1bd002ffa5')
 
 build() {
   # get rid of that .wapi errors in fakeroot
-  export MONO_SHARED_DIR="${srcdir}/weird"
-  mkdir -p "${MONO_SHARED_DIR}"
+  export MONO_SHARED_DIR="$srcdir/weird"
+  mkdir -p "$MONO_SHARED_DIR"
 
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 
   # These are gmime alternatives for the same shareutils tools
-  mv "${pkgdir}/usr/bin/uuencode" "${pkgdir}/usr/bin/guuencode"
-  mv "${pkgdir}/usr/bin/uudecode" "${pkgdir}/usr/bin/guudecode"
+  mv "$pkgdir/usr/bin/uuencode" "$pkgdir/usr/bin/guuencode"
+  mv "$pkgdir/usr/bin/uudecode" "$pkgdir/usr/bin/guudecode"
 }
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 9274a5956..a755d7963 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 142880 2011-11-17 18:34:39Z ibiru $
+#$Id: PKGBUILD 145317 2011-12-21 19:21:50Z ibiru $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
 pkgver=3.2.2
-pkgrel=1
+pkgrel=3
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
@@ -13,11 +13,14 @@ groups=('gnome')
 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=('f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        silence_no_socket_to_connect.patch)
+sha256sums=('f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3'
+            '4cf3965e9beea747a7916682d37f36bc481bee10247788d4dd53f6e27fe5c041')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/silence_no_socket_to_connect.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-keyring \
@@ -27,6 +30,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/gnome-keyring/gnome-keyring.install b/extra/gnome-keyring/gnome-keyring.install
index e899ab5a2..9635ee505 100644
--- a/extra/gnome-keyring/gnome-keyring.install
+++ b/extra/gnome-keyring/gnome-keyring.install
@@ -11,5 +11,8 @@ post_upgrade() {
 }
 
 post_remove() {
-    post_install $1
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+    update-mime-database /usr/share/mime 1> /dev/null
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
 }
diff --git a/extra/gnome-keyring/silence_no_socket_to_connect.patch b/extra/gnome-keyring/silence_no_socket_to_connect.patch
new file mode 100644
index 000000000..e6eba7855
--- /dev/null
+++ b/extra/gnome-keyring/silence_no_socket_to_connect.patch
@@ -0,0 +1,717 @@
+From 5ca7387952f99bf318d337df2d853f5bc3c0ddd2 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw@collabora.co.uk>
+Date: Mon, 19 Dec 2011 12:08:51 +0000
+Subject: rpc-layer: Correctly handle case where gnome-keyring-daemon not running
+
+ * In the gnome-keyring-pkcs11.so module return stand in info
+   when the gnome-keyring-daemon info is not running.
+ * In addition no slots will be listed
+
+https://bugzilla.gnome.org/show_bug.cgi?id=665961
+---
+diff --git a/pkcs11/rpc-layer/gkm-rpc-module.c b/pkcs11/rpc-layer/gkm-rpc-module.c
+index ea939a7..b95bee1 100644
+--- a/pkcs11/rpc-layer/gkm-rpc-module.c
++++ b/pkcs11/rpc-layer/gkm-rpc-module.c
+@@ -228,10 +228,8 @@ call_connect (CallState *cs)
+ 	assert (cs->socket == -1);
+ 	assert (cs->call_status == CALL_INVALID);
+ 
+-	if (!pkcs11_socket_path) {
+-		warning (("no socket to connect to"));
++	if (!pkcs11_socket_path)
+ 		return CKR_DEVICE_REMOVED;
+-	}
+ 
+ 	debug (("connecting to: %s", pkcs11_socket_path));
+ 
+@@ -968,13 +966,14 @@ proto_read_sesssion_info (GkmRpcMessage *msg, CK_SESSION_INFO_PTR info)
+  * CALL MACROS
+  */
+ 
+-#define BEGIN_CALL(call_id) \
++#define BEGIN_CALL_OR(call_id, if_no_daemon) \
+ 	debug ((#call_id ": enter")); \
+ 	return_val_if_fail (pkcs11_initialized, CKR_CRYPTOKI_NOT_INITIALIZED); \
+ 	{  \
+ 		CallState *_cs; \
+ 		CK_RV _ret = CKR_OK; \
+ 		_ret = call_lookup (&_cs); \
++		if (_ret == CKR_DEVICE_REMOVED) return (if_no_daemon); \
+ 		if (_ret != CKR_OK) return _ret; \
+ 		_ret = call_prepare (_cs, GKM_RPC_CALL_##call_id); \
+ 		if (_ret != CKR_OK) goto _cleanup;
+@@ -1198,16 +1197,18 @@ rpc_C_Initialize (CK_VOID_PTR init_args)
+ 			}
+ 		}
+ 
+-		/* Call through and initialize the daemon */
+-		ret = call_lookup (&cs);
+-		if (ret == CKR_OK) {
+-			ret = call_prepare (cs, GKM_RPC_CALL_C_Initialize);
+-			if (ret == CKR_OK)
+-				if (!gkm_rpc_message_write_byte_array (cs->req, GKM_RPC_HANDSHAKE, GKM_RPC_HANDSHAKE_LEN))
+-					ret = CKR_HOST_MEMORY;
+-			if (ret == CKR_OK)
+-				ret = call_run (cs);
+-			call_done (cs, ret);
++		/* Call through and initialize the daemon if available */
++		if (pkcs11_socket_path != NULL) {
++			ret = call_lookup (&cs);
++			if (ret == CKR_OK) {
++				ret = call_prepare (cs, GKM_RPC_CALL_C_Initialize);
++				if (ret == CKR_OK)
++					if (!gkm_rpc_message_write_byte_array (cs->req, GKM_RPC_HANDSHAKE, GKM_RPC_HANDSHAKE_LEN))
++						ret = CKR_HOST_MEMORY;
++				if (ret == CKR_OK)
++					ret = call_run (cs);
++				call_done (cs, ret);
++			}
+ 		}
+ 
+ done:
+@@ -1232,7 +1233,7 @@ static CK_RV
+ rpc_C_Finalize (CK_VOID_PTR reserved)
+ {
+ 	CallState *cs;
+-	CK_RV ret;
++	CK_RV ret = CKR_OK;
+ 
+ 	debug (("C_Finalize: enter"));
+ 	return_val_if_fail (pkcs11_initialized, CKR_CRYPTOKI_NOT_INITIALIZED);
+@@ -1240,17 +1241,18 @@ rpc_C_Finalize (CK_VOID_PTR reserved)
+ 
+ 	pthread_mutex_lock (&init_mutex);
+ 
+-		ret = call_lookup (&cs);
+-		if (ret == CKR_OK) {
+-			ret = call_prepare (cs, GKM_RPC_CALL_C_Finalize);
++		if (pkcs11_socket_path != NULL) {
++			ret = call_lookup (&cs);
+ 			if (ret == CKR_OK) {
+-				ret = call_run (cs);
++				ret = call_prepare (cs, GKM_RPC_CALL_C_Finalize);
++				if (ret == CKR_OK)
++					ret = call_run (cs);
++				call_done (cs, ret);
+ 			}
+-			call_done (cs, ret);
+-		}
+ 
+-		if (ret != CKR_OK)
+-			warning (("finalizing the daemon returned an error: %d", ret));
++			if (ret != CKR_OK)
++				warning (("finalizing the daemon returned an error: %d", ret));
++		}
+ 
+ 		/* This should stop all other calls in */
+ 		pkcs11_initialized = 0;
+@@ -1265,11 +1267,26 @@ rpc_C_Finalize (CK_VOID_PTR reserved)
+ }
+ 
+ static CK_RV
++fill_stand_in_info (CK_INFO_PTR info)
++{
++	static CK_INFO stand_in_info = {
++		{ CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR },
++		"GNOME Keyring                   ",
++		0,
++		"GNOME Keyring (without daemon)  ",
++		{ 1, 1 },
++	};
++	memcpy (info, &stand_in_info, sizeof (CK_INFO));
++	return CKR_OK;
++
++}
++
++static CK_RV
+ rpc_C_GetInfo (CK_INFO_PTR info)
+ {
+ 	return_val_if_fail (info, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_GetInfo);
++	BEGIN_CALL_OR (C_GetInfo, fill_stand_in_info (info));
+ 	PROCESS_CALL;
+ 		OUT_INFO (info);
+ 	END_CALL;
+@@ -1287,7 +1304,7 @@ rpc_C_GetSlotList (CK_BBOOL token_present, CK_SLOT_ID_PTR slot_list, CK_ULONG_PT
+ {
+ 	return_val_if_fail (count, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_GetSlotList);
++	BEGIN_CALL_OR (C_GetSlotList, (*count = 0, CKR_OK));
+ 		IN_BYTE (token_present);
+ 		IN_ULONG_BUFFER (slot_list, count);
+ 	PROCESS_CALL;
+@@ -1300,7 +1317,7 @@ rpc_C_GetSlotInfo (CK_SLOT_ID id, CK_SLOT_INFO_PTR info)
+ {
+ 	return_val_if_fail (info, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_GetSlotInfo);
++	BEGIN_CALL_OR (C_GetSlotInfo, CKR_SLOT_ID_INVALID);
+ 		IN_ULONG (id);
+ 	PROCESS_CALL;
+ 		OUT_SLOT_INFO (info);
+@@ -1312,7 +1329,7 @@ rpc_C_GetTokenInfo (CK_SLOT_ID id, CK_TOKEN_INFO_PTR info)
+ {
+ 	return_val_if_fail (info, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_GetTokenInfo);
++	BEGIN_CALL_OR (C_GetTokenInfo, CKR_SLOT_ID_INVALID);
+ 		IN_ULONG (id);
+ 	PROCESS_CALL;
+ 		OUT_TOKEN_INFO (info);
+@@ -1325,7 +1342,7 @@ rpc_C_GetMechanismList (CK_SLOT_ID id, CK_MECHANISM_TYPE_PTR mechanism_list,
+ {
+ 	return_val_if_fail (count, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_GetMechanismList);
++	BEGIN_CALL_OR (C_GetMechanismList, CKR_SLOT_ID_INVALID);
+ 		IN_ULONG (id);
+ 		IN_ULONG_BUFFER (mechanism_list, count);
+ 	PROCESS_CALL;
+@@ -1340,7 +1357,7 @@ rpc_C_GetMechanismInfo (CK_SLOT_ID id, CK_MECHANISM_TYPE type,
+ {
+ 	return_val_if_fail (info, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_GetMechanismInfo);
++	BEGIN_CALL_OR (C_GetMechanismInfo, CKR_SLOT_ID_INVALID);
+ 		IN_ULONG (id);
+ 		IN_MECHANISM_TYPE (type);
+ 	PROCESS_CALL;
+@@ -1352,7 +1369,7 @@ static CK_RV
+ rpc_C_InitToken (CK_SLOT_ID id, CK_UTF8CHAR_PTR pin, CK_ULONG pin_len,
+                  CK_UTF8CHAR_PTR label)
+ {
+-	BEGIN_CALL (C_InitToken);
++	BEGIN_CALL_OR (C_InitToken, CKR_SLOT_ID_INVALID);
+ 		IN_ULONG (id);
+ 		IN_BYTE_ARRAY (pin, pin_len);
+ 		IN_STRING (label);
+@@ -1365,7 +1382,7 @@ rpc_C_WaitForSlotEvent (CK_FLAGS flags, CK_SLOT_ID_PTR slot, CK_VOID_PTR reserve
+ {
+ 	return_val_if_fail (slot, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_WaitForSlotEvent);
++	BEGIN_CALL_OR (C_WaitForSlotEvent, CKR_DEVICE_REMOVED);
+ 		IN_ULONG (flags);
+ 	PROCESS_CALL;
+ 		OUT_ULONG (slot);
+@@ -1378,7 +1395,7 @@ rpc_C_OpenSession (CK_SLOT_ID id, CK_FLAGS flags, CK_VOID_PTR user_data,
+ {
+ 	return_val_if_fail (session, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_OpenSession);
++	BEGIN_CALL_OR (C_OpenSession, CKR_SLOT_ID_INVALID);
+ 		IN_ULONG (id);
+ 		IN_ULONG (flags);
+ 	PROCESS_CALL;
+@@ -1389,7 +1406,7 @@ rpc_C_OpenSession (CK_SLOT_ID id, CK_FLAGS flags, CK_VOID_PTR user_data,
+ static CK_RV
+ rpc_C_CloseSession (CK_SESSION_HANDLE session)
+ {
+-	BEGIN_CALL (C_CloseSession);
++	BEGIN_CALL_OR (C_CloseSession, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 	PROCESS_CALL;
+ 	END_CALL;
+@@ -1398,7 +1415,7 @@ rpc_C_CloseSession (CK_SESSION_HANDLE session)
+ static CK_RV
+ rpc_C_CloseAllSessions (CK_SLOT_ID id)
+ {
+-	BEGIN_CALL (C_CloseAllSessions);
++	BEGIN_CALL_OR (C_CloseAllSessions, CKR_SLOT_ID_INVALID);
+ 		IN_ULONG (id);
+ 	PROCESS_CALL;
+ 	END_CALL;
+@@ -1407,7 +1424,7 @@ rpc_C_CloseAllSessions (CK_SLOT_ID id)
+ static CK_RV
+ rpc_C_GetFunctionStatus (CK_SESSION_HANDLE session)
+ {
+-	BEGIN_CALL (C_GetFunctionStatus);
++	BEGIN_CALL_OR (C_GetFunctionStatus, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 	PROCESS_CALL;
+ 	END_CALL;
+@@ -1416,7 +1433,7 @@ rpc_C_GetFunctionStatus (CK_SESSION_HANDLE session)
+ static CK_RV
+ rpc_C_CancelFunction (CK_SESSION_HANDLE session)
+ {
+-	BEGIN_CALL (C_CancelFunction);
++	BEGIN_CALL_OR (C_CancelFunction, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 	PROCESS_CALL;
+ 	END_CALL;
+@@ -1427,7 +1444,7 @@ rpc_C_GetSessionInfo(CK_SESSION_HANDLE session, CK_SESSION_INFO_PTR info)
+ {
+ 	return_val_if_fail (info, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_GetSessionInfo);
++	BEGIN_CALL_OR (C_GetSessionInfo, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 	PROCESS_CALL;
+ 		OUT_SESSION_INFO (info);
+@@ -1438,7 +1455,7 @@ static CK_RV
+ rpc_C_InitPIN (CK_SESSION_HANDLE session, CK_UTF8CHAR_PTR pin,
+                CK_ULONG pin_len)
+ {
+-	BEGIN_CALL (C_InitPIN);
++	BEGIN_CALL_OR (C_InitPIN, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (pin, pin_len);
+ 	PROCESS_CALL;
+@@ -1449,7 +1466,7 @@ static CK_RV
+ rpc_C_SetPIN (CK_SESSION_HANDLE session, CK_UTF8CHAR_PTR old_pin,
+               CK_ULONG old_pin_len, CK_UTF8CHAR_PTR new_pin, CK_ULONG new_pin_len)
+ {
+-	BEGIN_CALL (C_SetPIN);
++	BEGIN_CALL_OR (C_SetPIN, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (old_pin, old_pin_len);
+ 		IN_BYTE_ARRAY (new_pin, old_pin_len);
+@@ -1463,7 +1480,7 @@ rpc_C_GetOperationState (CK_SESSION_HANDLE session, CK_BYTE_PTR operation_state,
+ {
+ 	return_val_if_fail (operation_state_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_GetOperationState);
++	BEGIN_CALL_OR (C_GetOperationState, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_BUFFER (operation_state, operation_state_len);
+ 	PROCESS_CALL;
+@@ -1476,7 +1493,7 @@ rpc_C_SetOperationState (CK_SESSION_HANDLE session, CK_BYTE_PTR operation_state,
+                          CK_ULONG operation_state_len, CK_OBJECT_HANDLE encryption_key,
+                          CK_OBJECT_HANDLE authentication_key)
+ {
+-	BEGIN_CALL (C_SetOperationState);
++	BEGIN_CALL_OR (C_SetOperationState, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (operation_state, operation_state_len);
+ 		IN_ULONG (encryption_key);
+@@ -1489,7 +1506,7 @@ static CK_RV
+ rpc_C_Login (CK_SESSION_HANDLE session, CK_USER_TYPE user_type,
+              CK_UTF8CHAR_PTR pin, CK_ULONG pin_len)
+ {
+-	BEGIN_CALL (C_Login);
++	BEGIN_CALL_OR (C_Login, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_ULONG (user_type);
+ 		IN_BYTE_ARRAY (pin, pin_len);
+@@ -1500,7 +1517,7 @@ rpc_C_Login (CK_SESSION_HANDLE session, CK_USER_TYPE user_type,
+ static CK_RV
+ rpc_C_Logout (CK_SESSION_HANDLE session)
+ {
+-	BEGIN_CALL (C_Logout);
++	BEGIN_CALL_OR (C_Logout, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 	PROCESS_CALL;
+ 	END_CALL;
+@@ -1512,7 +1529,7 @@ rpc_C_CreateObject (CK_SESSION_HANDLE session, CK_ATTRIBUTE_PTR template,
+ {
+ 	return_val_if_fail (new_object, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_CreateObject);
++	BEGIN_CALL_OR (C_CreateObject, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_ATTRIBUTE_ARRAY (template, count);
+ 	PROCESS_CALL;
+@@ -1527,7 +1544,7 @@ rpc_C_CopyObject (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object,
+ {
+ 	return_val_if_fail (new_object, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_CopyObject);
++	BEGIN_CALL_OR (C_CopyObject, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_ULONG (object);
+ 		IN_ATTRIBUTE_ARRAY (template, count);
+@@ -1540,7 +1557,7 @@ rpc_C_CopyObject (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object,
+ static CK_RV
+ rpc_C_DestroyObject (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object)
+ {
+-	BEGIN_CALL (C_DestroyObject);
++	BEGIN_CALL_OR (C_DestroyObject, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_ULONG (object);
+ 	PROCESS_CALL;
+@@ -1553,7 +1570,7 @@ rpc_C_GetObjectSize (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object,
+ {
+ 	return_val_if_fail (size, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_GetObjectSize);
++	BEGIN_CALL_OR (C_GetObjectSize, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_ULONG (object);
+ 	PROCESS_CALL;
+@@ -1565,7 +1582,7 @@ static CK_RV
+ rpc_C_GetAttributeValue (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object,
+                          CK_ATTRIBUTE_PTR template, CK_ULONG count)
+ {
+-	BEGIN_CALL (C_GetAttributeValue);
++	BEGIN_CALL_OR (C_GetAttributeValue, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_ULONG (object);
+ 		IN_ATTRIBUTE_BUFFER (template, count);
+@@ -1578,7 +1595,7 @@ static CK_RV
+ rpc_C_SetAttributeValue (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object,
+                          CK_ATTRIBUTE_PTR template, CK_ULONG count)
+ {
+-	BEGIN_CALL (C_SetAttributeValue);
++	BEGIN_CALL_OR (C_SetAttributeValue, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_ULONG (object);
+ 		IN_ATTRIBUTE_ARRAY (template, count);
+@@ -1590,7 +1607,7 @@ static CK_RV
+ rpc_C_FindObjectsInit (CK_SESSION_HANDLE session, CK_ATTRIBUTE_PTR template,
+                        CK_ULONG count)
+ {
+-	BEGIN_CALL (C_FindObjectsInit);
++	BEGIN_CALL_OR (C_FindObjectsInit, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_ATTRIBUTE_ARRAY (template, count);
+ 	PROCESS_CALL;
+@@ -1606,7 +1623,7 @@ rpc_C_FindObjects (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE_PTR objects,
+ 
+ 	return_val_if_fail (count, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_FindObjects);
++	BEGIN_CALL_OR (C_FindObjects, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_ULONG_BUFFER (objects, address_of_max_count);
+ 	PROCESS_CALL;
+@@ -1618,7 +1635,7 @@ rpc_C_FindObjects (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE_PTR objects,
+ static CK_RV
+ rpc_C_FindObjectsFinal (CK_SESSION_HANDLE session)
+ {
+-	BEGIN_CALL (C_FindObjectsFinal);
++	BEGIN_CALL_OR (C_FindObjectsFinal, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 	PROCESS_CALL;
+ 	END_CALL;
+@@ -1628,7 +1645,7 @@ static CK_RV
+ rpc_C_EncryptInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
+                    CK_OBJECT_HANDLE key)
+ {
+-	BEGIN_CALL (C_EncryptInit);
++	BEGIN_CALL_OR (C_EncryptInit, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_MECHANISM (mechanism);
+ 		IN_ULONG (key);
+@@ -1642,7 +1659,7 @@ rpc_C_Encrypt (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len,
+ {
+ 	return_val_if_fail (encrypted_data_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_Encrypt);
++	BEGIN_CALL_OR (C_Encrypt, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (data, data_len);
+ 		IN_BYTE_BUFFER (encrypted_data, encrypted_data_len);
+@@ -1658,7 +1675,7 @@ rpc_C_EncryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part,
+ {
+ 	return_val_if_fail (encrypted_part_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_EncryptUpdate);
++	BEGIN_CALL_OR (C_EncryptUpdate, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (part, part_len);
+ 		IN_BYTE_BUFFER (encrypted_part, encrypted_part_len);
+@@ -1673,7 +1690,7 @@ rpc_C_EncryptFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR last_part,
+ {
+ 	return_val_if_fail (last_part_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_EncryptFinal);
++	BEGIN_CALL_OR (C_EncryptFinal, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_BUFFER (last_part, last_part_len);
+ 	PROCESS_CALL;
+@@ -1685,7 +1702,7 @@ static CK_RV
+ rpc_C_DecryptInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
+                    CK_OBJECT_HANDLE key)
+ {
+-	BEGIN_CALL (C_DecryptInit);
++	BEGIN_CALL_OR (C_DecryptInit, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_MECHANISM (mechanism);
+ 		IN_ULONG (key);
+@@ -1699,7 +1716,7 @@ rpc_C_Decrypt (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_data,
+ {
+ 	return_val_if_fail (data_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_Decrypt);
++	BEGIN_CALL_OR (C_Decrypt, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (enc_data, enc_data_len);
+ 		IN_BYTE_BUFFER (data, data_len);
+@@ -1714,7 +1731,7 @@ rpc_C_DecryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_part,
+ {
+ 	return_val_if_fail (part_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_DecryptUpdate);
++	BEGIN_CALL_OR (C_DecryptUpdate, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (enc_part, enc_part_len);
+ 		IN_BYTE_BUFFER (part, part_len);
+@@ -1729,7 +1746,7 @@ rpc_C_DecryptFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR last_part,
+ {
+ 	return_val_if_fail (last_part_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_DecryptFinal);
++	BEGIN_CALL_OR (C_DecryptFinal, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_BUFFER (last_part, last_part_len);
+ 	PROCESS_CALL;
+@@ -1740,7 +1757,7 @@ rpc_C_DecryptFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR last_part,
+ static CK_RV
+ rpc_C_DigestInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism)
+ {
+-	BEGIN_CALL (C_DigestInit);
++	BEGIN_CALL_OR (C_DigestInit, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_MECHANISM (mechanism);
+ 	PROCESS_CALL;
+@@ -1753,7 +1770,7 @@ rpc_C_Digest (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len,
+ {
+ 	return_val_if_fail (digest_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_Digest);
++	BEGIN_CALL_OR (C_Digest, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (data, data_len);
+ 		IN_BYTE_BUFFER (digest, digest_len);
+@@ -1765,7 +1782,7 @@ rpc_C_Digest (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len,
+ static CK_RV
+ rpc_C_DigestUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_len)
+ {
+-	BEGIN_CALL (C_DigestUpdate);
++	BEGIN_CALL_OR (C_DigestUpdate, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (part, part_len);
+ 	PROCESS_CALL;
+@@ -1775,7 +1792,7 @@ rpc_C_DigestUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_l
+ static CK_RV
+ rpc_C_DigestKey (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE key)
+ {
+-	BEGIN_CALL (C_DigestKey);
++	BEGIN_CALL_OR (C_DigestKey, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_ULONG (key);
+ 	PROCESS_CALL;
+@@ -1788,7 +1805,7 @@ rpc_C_DigestFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR digest,
+ {
+ 	return_val_if_fail (digest_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_DigestFinal);
++	BEGIN_CALL_OR (C_DigestFinal, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_BUFFER (digest, digest_len);
+ 	PROCESS_CALL;
+@@ -1800,7 +1817,7 @@ static CK_RV
+ rpc_C_SignInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
+                 CK_OBJECT_HANDLE key)
+ {
+-	BEGIN_CALL (C_SignInit);
++	BEGIN_CALL_OR (C_SignInit, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_MECHANISM (mechanism);
+ 		IN_ULONG (key);
+@@ -1814,7 +1831,7 @@ rpc_C_Sign (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len,
+ {
+ 	return_val_if_fail (signature_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_Sign);
++	BEGIN_CALL_OR (C_Sign, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (data, data_len);
+ 		IN_BYTE_BUFFER (signature, signature_len);
+@@ -1828,7 +1845,7 @@ rpc_C_SignUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_len
+ {
+ 	return_val_if_fail (part_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_SignUpdate);
++	BEGIN_CALL_OR (C_SignUpdate, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (part, part_len);
+ 	PROCESS_CALL;
+@@ -1841,7 +1858,7 @@ rpc_C_SignFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR signature,
+ {
+ 	return_val_if_fail (signature_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_SignFinal);
++	BEGIN_CALL_OR (C_SignFinal, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_BUFFER (signature, signature_len);
+ 	PROCESS_CALL;
+@@ -1853,7 +1870,7 @@ static CK_RV
+ rpc_C_SignRecoverInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
+                        CK_OBJECT_HANDLE key)
+ {
+-	BEGIN_CALL (C_SignRecoverInit);
++	BEGIN_CALL_OR (C_SignRecoverInit, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_MECHANISM (mechanism);
+ 		IN_ULONG (key);
+@@ -1867,7 +1884,7 @@ rpc_C_SignRecover (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_le
+ {
+ 	return_val_if_fail (signature_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_SignRecover);
++	BEGIN_CALL_OR (C_SignRecover, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (data, data_len);
+ 		IN_BYTE_BUFFER (signature, signature_len);
+@@ -1880,7 +1897,7 @@ static CK_RV
+ rpc_C_VerifyInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
+                   CK_OBJECT_HANDLE key)
+ {
+-	BEGIN_CALL (C_VerifyInit);
++	BEGIN_CALL_OR (C_VerifyInit, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_MECHANISM (mechanism);
+ 		IN_ULONG (key);
+@@ -1892,7 +1909,7 @@ static CK_RV
+ rpc_C_Verify (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len,
+               CK_BYTE_PTR signature, CK_ULONG signature_len)
+ {
+-	BEGIN_CALL (C_Verify);
++	BEGIN_CALL_OR (C_Verify, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (data, data_len);
+ 		IN_BYTE_ARRAY (signature, signature_len);
+@@ -1903,7 +1920,7 @@ rpc_C_Verify (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len,
+ static CK_RV
+ rpc_C_VerifyUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_len)
+ {
+-	BEGIN_CALL (C_VerifyUpdate);
++	BEGIN_CALL_OR (C_VerifyUpdate, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (part, part_len);
+ 	PROCESS_CALL;
+@@ -1914,7 +1931,7 @@ static CK_RV
+ rpc_C_VerifyFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR signature,
+                    CK_ULONG signature_len)
+ {
+-	BEGIN_CALL (C_VerifyFinal);
++	BEGIN_CALL_OR (C_VerifyFinal, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (signature, signature_len);
+ 	PROCESS_CALL;
+@@ -1925,7 +1942,7 @@ static CK_RV
+ rpc_C_VerifyRecoverInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
+                          CK_OBJECT_HANDLE key)
+ {
+-	BEGIN_CALL (C_VerifyRecoverInit);
++	BEGIN_CALL_OR (C_VerifyRecoverInit, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_MECHANISM (mechanism);
+ 		IN_ULONG (key);
+@@ -1939,7 +1956,7 @@ rpc_C_VerifyRecover (CK_SESSION_HANDLE session, CK_BYTE_PTR signature,
+ {
+ 	return_val_if_fail (data_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_VerifyRecover);
++	BEGIN_CALL_OR (C_VerifyRecover, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (signature, signature_len);
+ 		IN_BYTE_BUFFER (data, data_len);
+@@ -1955,7 +1972,7 @@ rpc_C_DigestEncryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part,
+ {
+ 	return_val_if_fail (enc_part_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_DigestEncryptUpdate);
++	BEGIN_CALL_OR (C_DigestEncryptUpdate, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (part, part_len);
+ 		IN_BYTE_BUFFER (enc_part, enc_part_len);
+@@ -1971,7 +1988,7 @@ rpc_C_DecryptDigestUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_part,
+ {
+ 	return_val_if_fail (part_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_DecryptDigestUpdate);
++	BEGIN_CALL_OR (C_DecryptDigestUpdate, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (enc_part, enc_part_len);
+ 		IN_BYTE_BUFFER (part, part_len);
+@@ -1987,7 +2004,7 @@ rpc_C_SignEncryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part,
+ {
+ 	return_val_if_fail (enc_part_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_SignEncryptUpdate);
++	BEGIN_CALL_OR (C_SignEncryptUpdate, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (part, part_len);
+ 		IN_BYTE_BUFFER (enc_part, enc_part_len);
+@@ -2003,7 +2020,7 @@ rpc_C_DecryptVerifyUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_part,
+ {
+ 	return_val_if_fail (part_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_DecryptVerifyUpdate);
++	BEGIN_CALL_OR (C_DecryptVerifyUpdate, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (enc_part, enc_part_len);
+ 		IN_BYTE_BUFFER (part, part_len);
+@@ -2017,7 +2034,7 @@ rpc_C_GenerateKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
+                    CK_ATTRIBUTE_PTR template, CK_ULONG count,
+                    CK_OBJECT_HANDLE_PTR key)
+ {
+-	BEGIN_CALL (C_GenerateKey);
++	BEGIN_CALL_OR (C_GenerateKey, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_MECHANISM (mechanism);
+ 		IN_ATTRIBUTE_ARRAY (template, count);
+@@ -2032,7 +2049,7 @@ rpc_C_GenerateKeyPair (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
+                        CK_ATTRIBUTE_PTR priv_template, CK_ULONG priv_count,
+                        CK_OBJECT_HANDLE_PTR pub_key, CK_OBJECT_HANDLE_PTR priv_key)
+ {
+-	BEGIN_CALL (C_GenerateKeyPair);
++	BEGIN_CALL_OR (C_GenerateKeyPair, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_MECHANISM (mechanism);
+ 		IN_ATTRIBUTE_ARRAY (pub_template, pub_count);
+@@ -2050,7 +2067,7 @@ rpc_C_WrapKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
+ {
+ 	return_val_if_fail (wrapped_key_len, CKR_ARGUMENTS_BAD);
+ 
+-	BEGIN_CALL (C_WrapKey);
++	BEGIN_CALL_OR (C_WrapKey, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_MECHANISM (mechanism);
+ 		IN_ULONG (wrapping_key);
+@@ -2067,7 +2084,7 @@ rpc_C_UnwrapKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
+                  CK_ULONG wrapped_key_len, CK_ATTRIBUTE_PTR template,
+                  CK_ULONG count, CK_OBJECT_HANDLE_PTR key)
+ {
+-	BEGIN_CALL (C_UnwrapKey);
++	BEGIN_CALL_OR (C_UnwrapKey, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_MECHANISM (mechanism);
+ 		IN_ULONG (unwrapping_key);
+@@ -2083,7 +2100,7 @@ rpc_C_DeriveKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
+                  CK_OBJECT_HANDLE base_key, CK_ATTRIBUTE_PTR template,
+                  CK_ULONG count, CK_OBJECT_HANDLE_PTR key)
+ {
+-	BEGIN_CALL (C_DeriveKey);
++	BEGIN_CALL_OR (C_DeriveKey, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_MECHANISM (mechanism);
+ 		IN_ULONG (base_key);
+@@ -2096,7 +2113,7 @@ rpc_C_DeriveKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism,
+ static CK_RV
+ rpc_C_SeedRandom (CK_SESSION_HANDLE session, CK_BYTE_PTR seed, CK_ULONG seed_len)
+ {
+-	BEGIN_CALL (C_SeedRandom);
++	BEGIN_CALL_OR (C_SeedRandom, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+ 		IN_BYTE_ARRAY (seed, seed_len);
+ 	PROCESS_CALL;
+@@ -2107,9 +2124,9 @@ static CK_RV
+ rpc_C_GenerateRandom (CK_SESSION_HANDLE session, CK_BYTE_PTR random_data,
+                       CK_ULONG random_len)
+ {
+-	BEGIN_CALL (C_GenerateRandom);
++	CK_ULONG_PTR address = &random_len;
++	BEGIN_CALL_OR (C_GenerateRandom, CKR_SESSION_HANDLE_INVALID);
+ 		IN_ULONG (session);
+-    CK_ULONG_PTR address = &random_len;
+ 		IN_BYTE_BUFFER (random_data, address);
+ 	PROCESS_CALL;
+ 		OUT_BYTE_ARRAY (random_data, address);
+--
+cgit v0.9.0.2
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 13e2761f2..798aee88a 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142708 2011-11-13 11:53:41Z andyrtr $
+# $Id: PKGBUILD 145025 2011-12-15 06:57:18Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.8
+pkgver=3.0.9
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
 [ "$CARCH" = "mips64el" ] || makedepends=('valgrind')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('bce40a4e9bec343b266707eb9819132b')
+md5sums=('7e5d749f28eda1c781c89a2e520913c8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 3109c2cc4..a4d55309d 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 141724 2011-11-02 15:23:08Z giovanni $
+# $Id: PKGBUILD 145062 2011-12-16 00:18:01Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
-pkgver=0.10.0
+pkgver=0.11.0
 pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions'
 install=gparted.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'org.archlinux.pkexec.gparted.policy')
-md5sums=('d5b339eb5bef7a99ff73f750834b37b9'
+md5sums=('93db664bad4c5f0c9a1384b7eac7df5c'
          '27c264cfad8fa413d75954dda7a2dd50')
 
 build() {
diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD
index 27566f053..4100b803c 100644
--- a/extra/gtk-xfce-engine/PKGBUILD
+++ b/extra/gtk-xfce-engine/PKGBUILD
@@ -1,34 +1,37 @@
-# $Id: PKGBUILD 138198 2011-09-18 14:40:18Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 145294 2011-12-21 11:46:17Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=gtk-xfce-engine
-pkgver=2.9.0
+pkgver=2.99.0
 pkgrel=1
-pkgdesc="A port of Xfce engine to GTK+-2.0"
+pkgdesc="Xfce Gtk+-2.0 and Gtk+-3.0 engines"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
 url="http://www.xfce.org/"
+license=('GPL2')
 groups=('xfce4')
-depends=("gtk2>=2.14.7")
+depends=('gtk2' 'gtk3')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/$pkgname/2.9/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e2bc76ab5093ff8472e728e6d6ad5da2')
-sha1sums=('ce0ef1220c98dddabaf7917f8d98579dd65f5009')
+source=(http://archive.xfce.org/src/xfce/$pkgname/2.99/$pkgname-$pkgver.tar.bz2)
+sha256sums=('27bee5a68527d214cfda9b99d4ba68d39b6d341202bc728d0ddd170a73cde154')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index d120c46b6..ba82cf2a1 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144950 2011-12-11 21:22:27Z ibiru $
+# $Id: PKGBUILD 145269 2011-12-20 21:38:03Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.2.2
-pkgrel=4
+pkgver=3.2.3
+pkgrel=1
 pkgdesc="GTK+ is a multi-platform toolkit (v3)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
@@ -14,18 +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
-        filechooserdefault_do_not_unref_value_twice.patch
-        moveresize.patch)
-sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            '0d6b04d5fc12b7c08e0cff4b94d001d5c167a944b72579fb14fd6de2ee4ad9e6'
-            '627f430ccecc95ec61d9a83607469e71e95568c077f7bda849a7fe1c02d0bea7')
+        settings.ini)
+sha256sums=('e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d'
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
 
 build() {
     cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -i "$srcdir/filechooserdefault_do_not_unref_value_twice.patch"
-    patch -Np1 -i "$srcdir/moveresize.patch"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
diff --git a/extra/gtkimageview/PKGBUILD b/extra/gtkimageview/PKGBUILD
index 587d7cddf..c1a8a58f6 100644
--- a/extra/gtkimageview/PKGBUILD
+++ b/extra/gtkimageview/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 143749 2011-11-28 20:31:19Z giovanni $
+# $Id: PKGBUILD 145169 2011-12-18 22:03:46Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan Blazek <appolito@gmail.com>
 # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
 
 pkgname=gtkimageview
 pkgver=1.6.4
-pkgrel=2
-pkgdesc="Simple image viewer widget for GTK"
+pkgrel=3
+pkgdesc="Simple image viewer widget for GTK2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.bjourne.webfactional.com/"
 license=('LGPL2.1')
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD
index a67585373..4197ac22d 100644
--- a/extra/imlib2/PKGBUILD
+++ b/extra/imlib2/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=imlib2
 pkgver=1.4.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
 url="http://sourceforge.net/projects/enlightenment/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD
index 67bcb8355..477a12170 100644
--- a/extra/jack/PKGBUILD
+++ b/extra/jack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144303 2011-12-04 16:54:45Z schiv $
+# $Id: PKGBUILD 145264 2011-12-20 18:09:32Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: tobias <tobias@archlinux.net>
 # Contributor: Robert Emil Berge <robert@rebi.no>
@@ -6,7 +6,7 @@
 pkgname=jack
 _longname=jack-audio-connection-kit
 pkgver=0.121.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A low-latency audio server"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
@@ -24,6 +24,7 @@ options=('!libtool')
 provides=("$_longname=$pkgver")
 conflicts=("$_longname")
 replaces=("$_longname")
+install=$pkgname.install
 source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz"
         '99-audio.conf'
         '40-hpet-permissions.rules')
diff --git a/extra/jack/jack.install b/extra/jack/jack.install
new file mode 100644
index 000000000..8be532f6d
--- /dev/null
+++ b/extra/jack/jack.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+	rm -f etc/security/limits.d/99-realtime.conf
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/jasper/PKGBUILD b/extra/jasper/PKGBUILD
index ee6a11d7d..2a505cc4d 100644
--- a/extra/jasper/PKGBUILD
+++ b/extra/jasper/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=jasper
 pkgver=1.900.1
-pkgrel=6
+pkgrel=6.1
 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ece.uvic.ca/~mdadams/jasper/"
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 84488e042..ae3f7e808 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -20,7 +20,7 @@ _LANGTOOLS_CHANGESET=9b85f1265346
 _OPENJDK_CHANGESET=0a76e5390e68
 
 pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
@@ -92,7 +92,7 @@ build() {
   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
+  [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
   
   unset MAKEFLAGS
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
@@ -120,11 +120,8 @@ build() {
         --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 \
+#        --with-rhino #--help
 
 #     --enable-systemtap      Enable inclusion of SystemTap trace support
 #     --enable-nss            Enable inclusion of NSS security provider
@@ -140,15 +137,16 @@ 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'
+  depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libcups' 'gtk2' 'lcms2'
            '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')
+             'giflib: for gif format support'
+             'libpulse: for advanced sound')
   provides=('java-runtime=7')
   conflicts=('java-runtime')
 #  replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
-  backup=(etc/profile.d/jre7.sh)
+  backup=(etc/profile.d/jre.sh etc/profile.d/jre.csh)
   install=jre7-openjdk.install
 
   _jvmdir=/usr/lib/jvm/java-7-openjdk
@@ -208,7 +206,7 @@ package_jdk7-openjdk() {
   provides=('java-environment=7')
   conflicts=('java-environment')
   #  replaces=('openjdk6')
-  backup=(etc/profile.d/jdk7.sh)
+  backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh)
 
   _jvmdir=/usr/lib/jvm/java-7-openjdk
 
diff --git a/extra/java7-openjdk/jre7-openjdk.install b/extra/java7-openjdk/jre7-openjdk.install
index d311e6e44..d19979bf6 100644
--- a/extra/java7-openjdk/jre7-openjdk.install
+++ b/extra/java7-openjdk/jre7-openjdk.install
@@ -5,7 +5,7 @@ post_install() {
   fi
   echo "when you use a non-reparenting window manager"
   echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
-  echo "/etc/profile.d/jre7.sh"
+  echo "/etc/profile.d/jre.sh"
 #  update-desktop-database -q
 }
 
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 3a90fada3..f586f9a5e 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144610 2011-12-08 09:18:08Z andrea $
+# $Id: PKGBUILD 145327 2011-12-21 20:47:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
 pkgver=4.7.4
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -13,7 +13,7 @@ depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
         'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
         'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
-        'docbook-xsl')
+        'docbook-xsl' 'qtwebkit')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install='kdelibs.install'
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 5d7af71ac..7bf9e755a 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -17,7 +17,7 @@ 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=("ftp://ftp.kde.org/pub/kde/unstable/networkmanagement/${_pkgver}/src/networkmanagement-${_pkgver}.tar.bz2")
+source=("http://download.kde.org/unstable/networkmanagement/${_pkgver}/src/networkmanagement-${_pkgver}.tar.bz2")
 sha1sums=('f46274c4cca722f37eef7418144c0c04bfe21e24')
 
 build() {
diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD
index a2450f3ac..edd6adaf0 100644
--- a/extra/kismet/PKGBUILD
+++ b/extra/kismet/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=kismet
 pkgver=2011_03_R2
 _realver="${pkgver//_/-}"
-pkgrel=2
+pkgrel=2.1
 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kismetwireless.net/"
@@ -33,7 +33,8 @@ build() {
 
     ./configure --prefix=/usr \
                 --sysconfdir=/etc \
-                --localstatedir=/var
+                --localstatedir=/var \
+		--build=$CHOST --host=$CHOST
     make dep
     make
 
diff --git a/extra/kmod/PKGBUILD b/extra/kmod/PKGBUILD
new file mode 100644
index 000000000..3b17c9f26
--- /dev/null
+++ b/extra/kmod/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 145285 2011-12-21 02:42:53Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+
+pkgname=kmod
+pkgver=2
+pkgrel=2
+pkgdesc="A set of tools to handle common tasks with Linux kernel modules"
+arch=('i686' 'x86_64')
+url="http://git.profusion.mobi/cgit.cgi/kmod.git"
+license=('GPL2')
+depends=('glibc' 'zlib')
+options=('!libtool')
+source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz")
+md5sums=('6017364434377f6724f749d7a28c5d7a')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure --enable-zlib
+  make
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
+
+# vim: ft=sh syn=sh et
diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD
index cc44ba19b..02cdb957a 100644
--- a/extra/kwebkitpart/PKGBUILD
+++ b/extra/kwebkitpart/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 140401 2011-10-12 18:43:47Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 145323 2011-12-21 20:46:58Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kwebkitpart
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A WebKit browser component for KDE"
 url="http://opendesktop.org/content/show.php?content=127960"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,14 +11,14 @@ license=('LGPL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=${pkgname}.git&a=snapshot&h=d2aba2aa0664fde17f29d526226576aa6b956ee1&fmt=tbz2")
-md5sums=('d87b69fc4945aa9159908f842c3f9e2e')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('e736d7b26cf6e3c0eed837837b3f032b')
 
 build() {
   cd "${srcdir}"
   mkdir build
   cd build
-  cmake ../${pkgname} \
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
   make
diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD
index c818e5e30..29b19d6b5 100644
--- a/extra/lcms2/PKGBUILD
+++ b/extra/lcms2/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 127369 2011-06-13 20:26:40Z eric $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 145076 2011-12-16 15:20:33Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=lcms2
-pkgver=2.2
+pkgver=2.3
 pkgrel=1
 pkgdesc="Small-footprint color management engine, version 2"
-arch=(i686 x86_64 mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
-depends=('libtiff>=3.9.4')
+depends=('libtiff')
 url="http://www.littlecms.com"
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/lcms/$pkgname-$pkgver.tar.gz)
-md5sums=('aaf33c7c25675e6163189ba488ae20f5')
+source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('67d5fabda2f5777ca8387766539b9c871d993133')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm 644 COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/libcdio/PKGBUILD b/extra/libcdio/PKGBUILD
index 40ef4c2f9..419d33b11 100644
--- a/extra/libcdio/PKGBUILD
+++ b/extra/libcdio/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libcdio
 pkgver=0.82
-pkgrel=1
+pkgrel=1.1
 pkgdesc="GNU Compact Disc Input and Control Library"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL3')
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index ec440bca1..1b517cee5 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144919 2011-12-10 10:45:30Z andyrtr $
+# $Id: PKGBUILD 145190 2011-12-19 12:35:11Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.28
+pkgver=2.4.29
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64 'mips64el')
@@ -14,23 +14,18 @@ url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         no-pthread-stubs.patch
         COPYING
-	git_fixes.diff 
-	#missing files from http://cgit.freedesktop.org/mesa/drm/snapshot/drm-902ee661f1864aaf8325621085f6a1b5a6a3673a.tar.bz2 - https://bugs.freedesktop.org/show_bug.cgi?id=43538
-	rbo.h list.h)
-md5sums=('6488f64119c6439fa4038e9cd7b30b67'
+	git_fixes.diff)
+md5sums=('96d5e3e9edd55f4b016fe3b5dd0a1953'
          'c722c8406507b7e3a8da7a3030d1d9cf'
          'ba65e71c481b94ef0fb6c23c7f21ffa1'
-         '671b87f9670e709e54a19cd292c6330d'
-         '073846ea43fb4d6130062c1897d92e40'
-         'ce867d3331862c2b87d1a37461b42dbe')
+         'aebd5336568090b8ec084fabcfb08071')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
 
-  # add a missing file in the release tarball
+  # git fixes - currently none
   patch -Np1 -i ${srcdir}/git_fixes.diff
-  cp ${srcdir}/{rbo,list}.h "${srcdir}/${pkgname}-${pkgver}"/tests/radeon/
   
   #libtoolize --force
   autoreconf --force --install
diff --git a/extra/libdrm/git_fixes.diff b/extra/libdrm/git_fixes.diff
index 5ebcb606a..dc80155f2 100644
--- a/extra/libdrm/git_fixes.diff
+++ b/extra/libdrm/git_fixes.diff
@@ -1,19 +1,13 @@
-From 902ee661f1864aaf8325621085f6a1b5a6a3673a Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 05 Dec 2011 21:24:48 +0000
-Subject: test/radeon: add missing files for dist
-
----
-diff --git a/tests/radeon/Makefile.am b/tests/radeon/Makefile.am
-index 021ca72..1775669 100644
---- a/tests/radeon/Makefile.am
-+++ b/tests/radeon/Makefile.am
-@@ -9,4 +9,6 @@ noinst_PROGRAMS = \
+diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
+index 19441f3..eb9dd32 100644
+--- a/intel/intel_bufmgr_gem.c
++++ b/intel/intel_bufmgr_gem.c
+@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem)
+ 				      bufmgr_gem->vma_cache.next,
+ 				      vma_list);
+ 		assert(bo_gem->map_count == 0);
+-		DRMLISTDEL(&bo_gem->vma_list);
++		DRMLISTDELINIT(&bo_gem->vma_list);
  
- radeon_ttm_SOURCES = \
- 	rbo.c \
-+	rbo.h \
-+	list.h \
- 	radeon_ttm.c
---
-cgit v0.9.0.2-2-gbebe
+ 		if (bo_gem->mem_virtual) {
+ 			munmap(bo_gem->mem_virtual, bo_gem->bo.size);
diff --git a/extra/libdv/PKGBUILD b/extra/libdv/PKGBUILD
index 1b6756520..2c77ecc71 100644
--- a/extra/libdv/PKGBUILD
+++ b/extra/libdv/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libdv
 pkgver=1.0.0
-pkgrel=3
+pkgrel=3.1
 pkgdesc="The Quasar DV codec (libdv) is a software codec for DV video"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libdv.sourceforge.net/"
diff --git a/extra/libdvdnav/PKGBUILD b/extra/libdvdnav/PKGBUILD
index 03cf079da..8198e638e 100644
--- a/extra/libdvdnav/PKGBUILD
+++ b/extra/libdvdnav/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 144385 2011-12-05 13:01:06Z jgc $
+# $Id: PKGBUILD 145184 2011-12-19 11:48:47Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan <arjan@archlinux.org>
 # contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libdvdnav
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The library for xine-dvdnav plugin."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-url="http://http://dvdnav.mplayerhq.hu/"
+url="http://dvdnav.mplayerhq.hu/"
 depends=('libdvdread')
 options=(!libtool)
 source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD
index d5343da70..7eb4462be 100644
--- a/extra/libgsf/PKGBUILD
+++ b/extra/libgsf/PKGBUILD
@@ -1,61 +1,29 @@
-# $Id: PKGBUILD 124392 2011-05-20 13:18:16Z heftig $
+# $Id: PKGBUILD 145205 2011-12-19 17:59:06Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
-pkgbase=libgsf
-pkgname=('libgsf' 'libgsf-gnome')
-pkgver=1.14.21
-pkgrel=1
-arch=(i686 x86_64 'mips64el')
+pkgname=libgsf
+pkgver=1.14.22
+pkgrel=2
+arch=('i686' 'x86_64' 'mips64el')
+pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
 url="http://www.gnome.org/"
 license=('GPL' 'LGPL')
-makedepends=('libxml2' 'glib2' 'bzip2' 'intltool' 'pkgconfig'
-             'python2' 'libbonobo' 'gconf' 'pygtk')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/1.14/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db')
+options=('!libtool')
+depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
+conflicts=("libgsf-gnome<$pkgver")
+makedepends=('intltool' 'pygtk')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
+sha256sums=('a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --mandir=/usr/share/man --disable-static
+  cd "$srcdir/$pkgname-$pkgver"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static
   make
 }
 
 package_libgsf() {
-  pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
-  depends=('libxml2' 'glib2' 'bzip2')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-  rm -f "${pkgdir}/usr/share/man/man1/gsf-office-thumbnailer.1"
-  rm -f "${pkgdir}/usr/lib/libgsf-gnome"*
-  rm -rf "${pkgdir}/usr/include/libgsf-1/gsf-gnome/"
-  rm -rf "${pkgdir}/etc/gconf"
-  rm -f "${pkgdir}/usr/lib/pkgconfig/libgsf-gnome-1.pc"
-  rm -f "${pkgdir}/usr/bin/gsf-office-thumbnailer"
-  rm -f "${pkgdir}"/usr/lib/python*/site-packages/gsf/gnomemodule.so
-}
-
-package_libgsf-gnome() {
-  pkgdesc="Libgsf GNOME components"
-  depends=("libgsf=${pkgver}" 'libbonobo' 'gconf')
-  install=libgsf-gnome.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gsf DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  make -C gsf-gnome DESTDIR="${pkgdir}" install
-  make -C thumbnailer DESTDIR="${pkgdir}" install
-  make -C python DESTDIR="${pkgdir}" install
-  make -C doc DESTDIR="${pkgdir}" install-manpageDATA
-
-  rm -f "${pkgdir}/usr/share/man/man1/gsf.1"
-  rm -f "${pkgdir}/usr/share/man/man1/gsf-vba-dump.1"
-  rm -f "${pkgdir}"/usr/lib/python*/site-packages/gsf/_*
-  rm -f "${pkgdir}"/usr/lib/libgsf-1.so*
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 libgsf-gnome-1.pc "${pkgdir}/usr/lib/pkgconfig/"
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/libgsf-gnome.schemas" --domain libgsf "${pkgdir}/etc/gconf/schemas/"*.schemas
-  rm -f "${pkgdir}/etc/gconf/schemas/"*.schemas
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index 330136d46..8a601edea 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 129225 2011-06-26 02:06:08Z allan $
+# $Id: PKGBUILD 145273 2011-12-21 01:12:32Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
 
 pkgname=libjpeg-turbo
 pkgver=1.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libjpeg-turbo.virtualgl.org/"
@@ -19,16 +19,22 @@ source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.
 md5sums=('03b9c1406c7bfdc204313c2917ce6962')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $srcdir/$pkgname-$pkgver
 
   ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
   make
 }
 
+check() {
+  cd $srcdir/$pkgname-$pkgver
+  
+  make test
+}
+
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $srcdir/$pkgname-$pkgver
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR=$pkgdir/ install
   
   # provide jpegint.h as it is required by various software
   install -m644 jpegint.h $pkgdir/usr/include/
@@ -38,5 +44,5 @@ package() {
   rm $pkgdir/usr/include/turbojpeg.h
   rm $pkgdir/usr/bin/jpgtest
   
-  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE"
+  install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE
 }
diff --git a/extra/liboauth/PKGBUILD b/extra/liboauth/PKGBUILD
index a316de674..0f63f68c4 100644
--- a/extra/liboauth/PKGBUILD
+++ b/extra/liboauth/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 139509 2011-10-02 17:00:45Z heftig $
+# $Id: PKGBUILD 145266 2011-12-20 18:56:18Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Martin Häger <martin.haeger@gmail.com>
 
 pkgname=liboauth
-pkgver=0.9.4
-pkgrel=2
+pkgver=0.9.6
+pkgrel=1
 pkgdesc='C library implementing OAuth Core RFC 5849'
 arch=(mips64el)
 url='http://liboauth.sourceforge.net'
@@ -13,7 +13,7 @@ license=('MIT')
 depends=('curl')
 options=('!libtool')
 source=("$url/pool/$pkgname-$pkgver.tar.gz")
-sha256sums=('77e372359caca5375fbcc63ac638f349e6c93c98d291992d8ebb9bb8291ca549')
+sha256sums=('9fa0f9d86ac4fbdd8c17d4c242ceef33096e8cf3b1834d9198ccc0cbf8b0f207')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index aea20a745..0e437f36c 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142694 2011-11-12 21:17:53Z ibiru $
+# $Id: PKGBUILD 145337 2011-12-21 20:47:18Z andrea $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -37,7 +37,7 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-wiki-publisher')
 _LOver=3.4.4.2
 pkgver=3.4.4
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
@@ -45,7 +45,7 @@ license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'p7zip-libre' 'xulrunner' 'unixodbc' 'boost'
-             'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
+             'gperf' 'poppler>=0.18.1' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
              'vigra' 'libldap' 'libmythes' 'libwpg' 'imagemagick'
              'gstreamer0.10-base'
               #'saxon' - currently broken 
@@ -61,8 +61,8 @@ makedepends=( # makedepends
 
 [ "${CARCH}" != "mips64el" ] && makedepends+=('hsqldb-java' 'apache-ant' 'beanshell' 'junit' 'mesa' 'java-environment' 'libgl' 'lucene')
 
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
+#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://hg.services.openoffice.org/binaries"
 source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
@@ -106,7 +106,8 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	vbahelper.visibility.patch
 	scp2-more-reasonable-file-access-rights.diff
 	oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
-	RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7)
+	RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7
+	gcc462_buildfix.diff)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
@@ -203,7 +204,8 @@ md5sums=('be8b13f83045f0a53b69fe76d6d72e9c'
          '43b145db28e6c0d73578ae6fd35e510d'
          '37638431e7e40baf2e47966ebb9bc0e9'
          '3c6c62e77c30649a3dfe73512947cc9a'
-         'eb35d4c715e0dfc23bbc706996033829')
+         'eb35d4c715e0dfc23bbc706996033829'
+         '10600d04ee81014bc9b5cc04e615d799')
 
 build() {
 
@@ -240,6 +242,8 @@ build() {
 	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
 	patch -Np1 -i ${srcdir}/oracle-recognition.diff
 	patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff
+	# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=43139
+	patch -Np1 -i ${srcdir}/gcc462_buildfix.diff
         # Checks if --hash-style is accepted, not if --hash-style=both is accepted.
         [ "${CARCH}" = "mips64el" ] && sed -i 's/--hash-style=both/--hash-style=sysv/' ${srcdir}/build/solenv/gbuild/platform/unxgcc.mk
 	
diff --git a/extra/libreoffice/PKGBUILD.next_stable b/extra/libreoffice/PKGBUILD.next_stable
new file mode 100644
index 000000000..1005760ac
--- /dev/null
+++ b/extra/libreoffice/PKGBUILD.next_stable
@@ -0,0 +1,924 @@
+# $Id: PKGBUILD 142692 2011-11-12 20:22:14Z ibiru $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+pkgbase="libreoffice"
+pkgname=('libreoffice-common'
+	'libreoffice-base'
+	'libreoffice-calc'
+	'libreoffice-draw'
+	'libreoffice-gnome'
+	'libreoffice-impress'
+	'libreoffice-kde4'
+	'libreoffice-math'
+	'libreoffice-sdk'
+	'libreoffice-sdk-doc'
+	'libreoffice-writer'
+	'libreoffice-en-US'
+	#'libreoffice-extension-barcode' # 
+#	'libreoffice-extension-diagram'
+#	'libreoffice-extension-google-docs'
+#	'libreoffice-extension-hunart'
+	#'libreoffice-extension-lightproof' # no source integration
+	#'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity
+#	'libreoffice-extension-nlpsolver'
+#	'libreoffice-extension-ct2n'
+#	'libreoffice-extension-numbertext'	
+#	'libreoffice-extension-oooblogger'
+	'libreoffice-extension-pdfimport'
+	'libreoffice-extension-presenter-screen'
+	'libreoffice-extension-presentation-minimizer'
+	'libreoffice-extension-report-builder'
+#	'libreoffice-extension-scripting-beanshell'
+#	'libreoffice-extension-scripting-javascript'
+#	'libreoffice-extension-scripting-python'
+#	'libreoffice-extension-typo'
+#	'libreoffice-extension-validator'
+#	'libreoffice-extension-watch-window'
+#	'libreoffice-extension-wiki-publisher'
+)
+_LOver=3.5.0.0
+pkgver=3.5.0beta1
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('LGPL3')
+url="http://www.libreoffice.org/"
+makedepends=( # makedepends
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' #'xulrunner' 
+             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
+             'beanshell'  'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' # 'libldap' 
+             'mesa' 'gstreamer0.10-base' 'java-environment' 'zenity' # for build icon :D
+              #'saxon' - currently broken 
+             # the depends from libreoffice main pkg
+             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
+             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'librsvg'
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
+             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script
+	     'ttf-dejavu') # to satisfy regression tests
+
+# http://download.documentfoundation.org/mirrors/all.html
+# http://wiki.documentfoundation.org/Mirrors
+
+#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
+_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+_additional_source_url="http://dev-www.libreoffice.org/src"
+source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.bz2
+	${_additional_source_url}/8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2
+	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+	${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+	${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+	${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+#	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+	${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+	${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
+	${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
+	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+#	${_additional_source_url}/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
+#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/4a433efb6d385264ebc1d5513782d51c-SmART_0.9.4.oxt
+#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
+#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
+#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
+#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
+#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
+#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
+#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
+#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
+#	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
+#	buildfix_boost.diff
+#	buildfix_ct2n.diff
+#	vbahelper.visibility.patch
+#	scp2-more-reasonable-file-access-rights.diff
+#	oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
+#	RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7
+)
+
+noextract=(8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2
+	185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+	e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
+	7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
+	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+#	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+	#4a433efb6d385264ebc1d5513782d51c-SmART_0.9.4.oxt
+	#7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
+	#41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
+	#451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
+	#bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
+	#23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
+	#b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
+	#b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
+	#9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
+	#dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
+	#b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
+)
+md5sums=('bf6ce92d8d69f1dec4836a7249e10436'
+         'a0b19441245d7627c299d7014d110b32'
+         'b9dee0572120c87906ed6e2fb4696b69'
+         '8f107ffb3fc9d9b920b7bbd0bc79c7e8'
+         '1f24ab1d39f4a51faf22244c94a6203f'
+         '35c94d2df8893241173de1d16b6034c0'
+         '798b2ffdc8bcfe7bca2cf92b62caf685'
+         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
+         'ada24d37d8d638b3d8a9985e80bc2978'
+         '2a177023f9ea8ec8bd00837605c5df1b'
+         'a7983f859eafb2677d7ff386a023bc40'
+         '3c219630e4302863a9a83d0efde889db'
+         '2ae988b339daec234019a7066f96733e'
+         '2c9b0f83ed5890af02c0df1c1776f39b'
+         'af3c3acf618de6108d65fcdc92b492e1'
+         'eeb2c7ddf0d302fba4bfc6e97eac9624'
+         '39bb3fcea1514f1369fcfc87542390fd'
+         '3404ab6b1792ae5f16bbd603bd1e1d03'
+         '97b2d4dba862397f446b217e2b623e71'
+         'f94d9870737518e3b597f9265f4e9803'
+         '8ce2fcd72becf06c41f7201d15373ed9'
+         'd8bd5eed178db6e2b18eeed243f85aa8'
+         '3bdf40c0d199af31923e900d082ca2dd'
+         'ace6ab49184e329db254e454a010f56d'
+         'db60e4fde8dd6d6807523deb71ee34dc'
+         'ba2930200c9f019c2d93a8c88c651a0f'
+         '0ff7d225d087793c8c2c680d77aac3e7'
+         'e1c178b18f130b40494561f02bc1a948'
+         '7c2549f6b0a8bb604e6c4c729ffdcfe6'
+         '185d60944ea767075d27247c3162b3bc')
+
+build() {
+
+	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
+	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
+	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
+
+        cd ${srcdir}/libreoffice-core-$_LOver
+
+	# move external sources into place
+	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
+	for source in "${noextract[@]}"; do
+	  ln -s ${srcdir}/$source .
+	done
+	popd
+	
+	ln -s ../libreoffice-help-$_LOver/helpcontent2 .
+	ln -s ../libreoffice-translations-$_LOver/translations .
+
+#	ln -s ${srcdir}/ext_sources/*Barcode* solver/unxlngx6.pro/bin/Barcode.oxt
+#	ln -s ${srcdir}/ext_sources/*SmART*   solver/unxlngx6.pro/bin/SmART.oxt
+#	ln -s ${srcdir}/ext_sources/*gdocs*   solver/unxlngx6.pro/bin/gdocs.oxt
+#	ln -s ${srcdir}/ext_sources/*hunart*  solver/unxlngx6.pro/bin/hunart.oxt
+#	ln -s ${srcdir}/ext_sources/*numbertext* solver/unxlngx6.pro/bin/numbertext.oxt
+#	ln -s ${srcdir}/ext_sources/*oooblogger* solver/unxlngx6.pro/bin/oooblogger.oxt
+#	ln -s ${srcdir}/ext_sources/*typo* solver/unxlngx6.pro/bin/typo.oxt
+#	ln -s ${srcdir}/ext_sources/*Validator* solver/unxlngx6.pro/bin/Validator.oxt
+#	ln -s ${srcdir}/ext_sources/*WatchWindow* solver/unxlngx6.pro/bin/WatchWindow.oxt
+
+	# buildfixes & bugfixes
+	#patch -Np1 -i ${srcdir}/buildfix_boost.diff
+#	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
+#	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
+#	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
+#	patch -Np1 -i ${srcdir}/oracle-recognition.diff
+#	patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff
+	
+	# unset C(XX)FLAGS
+	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
+#	unset CFLAGS
+#	unset CXXFLAGS
+
+	#use the CFLAGS but remove the LibO overridden ones
+	for i in $CFLAGS; do
+		case "$i" in
+			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
+		esac
+        ARCH_FLAGS="$ARCH_FLAGS $i"
+	done
+	
+	# python2 fix
+	export PYTHON=python2
+
+	# http://wiki.documentfoundation.org/Development/How_to_build/Configure_options
+
+#	if [ "$CARCH" = "x86_64" ]; then
+#	      EXTRAOPTS="--without-stlport"
+#	 else 
+#	      EXTRAOPTS="--with-stlport" # --without-system-boost"
+#	      # # avoid problems with ixion for now
+#	      sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
+#	fi
+
+	# needed for 0003-distro-install-fix-en-US-only-installation.patch
+#	autoconf -f
+
+	# non-SMP test build
+#	export MAKEFLAGS="-j1"
+	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+		--with-unix-wrapper="libreoffice" \
+		--enable-split-app-modules \
+		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
+		--with-external-tar="${srcdir}/ext_sources" \
+		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
+		--libdir=/usr/lib --mandir=/usr/share/man \
+		--disable-verbose \
+		--with-lang="" \
+		--enable-crashdump \
+		--enable-dbus \
+		--enable-evolution2\
+		--enable-gio\
+		--disable-gnome-vfs\
+		--disable-kde\
+		--enable-kde4\
+		--enable-gtk3 \
+		--enable-lockdown\
+		--enable-mergelibs \
+		--enable-opengl \
+		--enable-odk\
+		--enable-opengl\
+		--disable-ext-lightproof \
+		--disable-ext-mysql-connector \
+		--with-system-mysql \
+		--enable-librsvg=system \
+		--without-fonts\
+		--without-afms\
+		--without-ppds\
+		--without-system-libwps\
+		--without-system-mdds\
+		--without-myspell-dicts \
+		--without-system-libvisio \
+		--without-system-libcmis \
+		--without-system-sampleicc \
+		--without-system-libexttextcat \
+		--with-system-dicts \
+		--with-external-dict-dir=/usr/share/hunspell \
+		--with-external-hyph-dir=/usr/share/hyphen \
+		--with-external-thes-dir=/usr/share/mythes \
+		--with-system-beanshell \
+		--with-system-cppunit\
+		--with-system-graphite\
+		--with-system-libwpg \
+		--with-system-libwps \
+		--with-system-redland\
+		--without-system-saxon\
+		--disable-mozilla \
+		--without-system-mozilla \
+		--without-system-mozilla-headers \
+		--with-ant-home="/usr/share/java/apache-ant"\
+		--with-system-boost\
+		--with-system-cairo\
+		--with-system-libs\
+		--with-system-mythes\
+		--with-system-headers\
+		--with-system-hsqldb \
+		--with-alloc=system\
+		--with-system-lucene\
+		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
+		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
+		--with-java-target-version=1.5 \
+		$EXTRAOPTS|| return 1
+
+#		--enable-ext-barcode \
+#		--enable-ext-diagram \
+#		--enable-ext-google-docs \
+#		--enable-ext-hunart \
+#		--enable-ext-nlpsolver \
+#		--enable-ext-ct2n \
+#		--enable-ext-numbertext \
+#		--enable-ext-oooblogger \
+#		--enable-ext-pdfimport \
+#		--enable-ext-presenter-console \
+#		--enable-ext-presenter-minimizer \
+#		--enable-ext-report-builder \
+#		--enable-ext-scripting-beanshell \
+#		--enable-ext-scripting-javascript \
+#		--enable-ext-typo \
+#		--enable-ext-validator \
+#		--enable-ext-watch-window \
+#		--enable-ext-wiki-publisher \
+
+#		--disable-mozilla \
+#		--enable-ldap \
+#		--with-openldap\
+	
+#		--with-system-mozilla\
+
+#--with-install-dirname="${pkgbase}" 
+#		--enable-cairo\
+#		--enable-ext-scripting-python \
+#		--with-system-libtextcat \
+#		--with-external-libtextcat-data \
+#		--with-system-xrender-headers\
+
+
+
+
+
+#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
+
+#--with-servlet-api-jar=JARFILE 
+# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
+#		--with-system-saxon\
+#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
+
+	touch src.downloaded
+	#./download
+	unset MAKEFLAGS
+	./bootstrap
+	make
+	
+	# fake installation to create split file lists
+	mkdir $srcdir/fakeinstall
+	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
+}
+
+#check() {
+#	cd ${srcdir}/build
+#	make check
+#}
+
+package_libreoffice-common() {
+
+ pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
+ install=${pkgbase}.install
+ depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
+          'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6" 'librsvg'
+          'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
+          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script 
+	  #'java-runtime' 
+          #'saxon'
+ optdepends=('libreoffice-langpack: additional language support'
+             'java-runtime:     adds java support'
+             'libcups:          adds printing support'
+             'gconf:            adds additional gnome support'
+             'nss:              adds support for signed files/macros'
+             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
+             'poppler:          for shipped pdfimport extension'
+             'libmythes:        for use in thesaurus'
+             'hsqldb-java:      default database format for OpenOffice.org'
+             'beanshell:        interactive java -- good for prototyping /macros'
+             'vigra:            C++ computer vision library, usable in Basebmp'
+             'libmspack:        library for Microsoft compression formats for use in FontOOo'
+             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
+             #'libldap:          to get profiles via ldap'
+             'lucene:           full-text search engine library for Java needed in the help section'
+             'sane:             for scanner access'
+             'unixodbc:         adds ODBC database support'
+             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
+ backup=(etc/libreoffice/sofficerc
+         etc/libreoffice/bootstraprc
+         etc/libreoffice/psprint.conf)
+ groups=('libreoffice')
+ provides=('go-openoffice')
+ conflicts=('go-openoffice')
+ replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+ 
+ #	# remove version in menu entry and make it visible
+#	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
+#	echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
+
+ # put configuration files into place
+ install -dm755 ${pkgdir}/etc/libreoffice
+ install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
+ install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
+ # install dummy links to make them found by LibO
+ cd ${pkgdir}/usr/lib/libreoffice/program/
+ ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
+ cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
+ ln -vsf /etc/libreoffice/psprint.conf .
+
+ #fix http://bugs.archlinux.org/task/17656
+ find ${pkgdir} -perm 444 -exec ls -lh {} \;
+ find ${pkgdir} -perm 444 -exec chmod 644 {} \;
+ find ${pkgdir} -perm 555 -exec ls -lh {} \;
+ find ${pkgdir} -perm 555 -exec chmod 755 {} \;
+}
+
+package_libreoffice-base() {
+ pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-calc() {
+ pkgdesc="Spreadsheet application for LibreOffice."
+ depends=('libreoffice-common' 'lpsolve' )
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-draw() {
+ pkgdesc="Drawing Application for LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-gnome() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
+ depends=('libreoffice-common' 'dbus-glib' 'gtk3')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-impress() {
+ pkgdesc="Presentation Application for LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=('mesa:             for the OGLTrans extension')
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-kde4() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
+ depends=('libreoffice-common' 'kdelibs')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-math() {
+ pkgdesc="Equation Editor Applicationfor LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-sdk() {
+ pkgdesc="Software Development Kit for LibreOffice."
+ depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+ 
+ # fix ArchLinux LibreOffice installation paths	
+ sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
+        -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/sdk," \
+        -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
+        -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \
+        -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
+        -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
+        -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
+        -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
+        -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
+        -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
+        -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
+        -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{csh,sh}.in
+}
+
+package_libreoffice-sdk-doc() {
+ pkgdesc="Software Development Kit documentation for LibreOffice"
+ depends=('libreoffice-common' 'libreoffice-sdk')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+
+ #fix permissions
+ find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
+}
+
+package_libreoffice-writer() {
+ pkgdesc="Word Processor Applicationfor LibreOffice."
+ depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
+ optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-en-US() {
+  pkgdesc="English (US) language pack for LibreOffice"
+  #arch=('any')
+  provides=('openoffice-en-US' 'libreoffice-langpack')
+  replaces=(openoffice-en-US)
+  conflicts=(openoffice-en-US)
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-extension-barcode() {
+
+ pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw "
+ #arch=('any')
+ depends=('libreoffice-common')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
+	chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
+}
+
+package_libreoffice-extension-diagram() {
+
+ pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
+}
+
+package_libreoffice-extension-google-docs() {
+
+ pkgdesc="Google Documents extension for LibreOffice"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs
+}
+
+package_libreoffice-extension-hunart() {
+
+ pkgdesc="Hungarian cross-reference toolbar extension"
+ #arch=('any')
+ depends=('libreoffice-common')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
+}
+
+#package_libreoffice-extension-lightproof() {
+
+# pkgdesc="Lightproof extension for LibreOffice"
+ #arch=('any')
+# depends=('libreoffice-common')
+# groups=('libreoffice-extensions')
+
+#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+#	unzip -q ${srcdir}/${pkgbase}-libreoffice-core-$_LOver-${_LOver}/libreoffice-core-$_LOver/libreoffice-${_LOver}/solver/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof
+#}
+
+#package_libreoffice-extension-mysql-connector() {
+
+# pkgdesc="MySQL Connector extension for LibreOffice"
+ #arch=('any')
+# depends=('libreoffice-common')
+# groups=('libreoffice-extensions')
+
+#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector
+#}
+
+package_libreoffice-extension-nlpsolver() {
+
+ pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
+}
+
+package_libreoffice-extension-ct2n() {
+
+ pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
+ #arch=('any')
+ depends=('libreoffice-common')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
+}
+
+package_libreoffice-extension-numbertext() {
+
+ pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
+ #arch=('any')
+ depends=('libreoffice-common')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
+}
+
+package_libreoffice-extension-oooblogger() {
+
+ pkgdesc="An extensions for blogging"
+ #arch=('any')
+ depends=('libreoffice-common' 'coreutils' 'python')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger
+}
+
+package_libreoffice-extension-pdfimport() {
+
+ pkgdesc="This extension allows you to import and modify PDF documents"
+ depends=('libreoffice-common' 'poppler')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
+}
+
+package_libreoffice-extension-presenter-screen() {
+
+ pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
+}
+
+package_libreoffice-extension-presentation-minimizer() {
+
+ pkgdesc="This extension reduce the file size of the current presentation"
+ depends=('libreoffice-common' 'gcc-libs')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
+}
+
+package_libreoffice-extension-report-builder() {
+
+ pkgdesc="This extension creates smart-looking database reports"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
+}
+
+package_libreoffice-extension-scripting-beanshell() {
+
+ pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell
+}
+
+package_libreoffice-extension-scripting-javascript() {
+
+ pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript
+}
+
+package_libreoffice-extension-scripting-python() {
+
+ pkgdesc="LibreOffice extension - Enables support for scripts in Python"
+ depends=('libreoffice-common' 'python')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
+}
+
+package_libreoffice-extension-typo() {
+
+ pkgdesc="Typography toolbar extension"
+ #arch=('any')
+ depends=('libreoffice-common')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
+	find ${pkgdir} -type d -exec chmod 755 {} \;
+	#chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
+}
+
+package_libreoffice-extension-validator() {
+
+ pkgdesc="Validator extension for LibreOffice"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator
+}
+
+package_libreoffice-extension-wiki-publisher() {
+
+ pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+}
+
+package_libreoffice-extension-watch-window() {
+
+ pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen."
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
+}
diff --git a/extra/libreoffice/gcc462_buildfix.diff b/extra/libreoffice/gcc462_buildfix.diff
new file mode 100644
index 000000000..c19e520dc
--- /dev/null
+++ b/extra/libreoffice/gcc462_buildfix.diff
@@ -0,0 +1,138 @@
+--- ./framework/source/accelerators/acceleratorcache.cxx.orig	2011-12-15 15:08:41.329168423 -0200
++++ ./framework/source/accelerators/acceleratorcache.cxx	2011-12-15 15:17:59.473190664 -0200
+@@ -61,7 +61,7 @@ AcceleratorCache::AcceleratorCache()
+ AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy)
+     : ThreadHelpBase(&Application::GetSolarMutex())
+ {
+-    m_lCommand2Keys = rCopy.m_lCommand2Keys;
++    m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys);
+     m_lKey2Commands = rCopy.m_lKey2Commands;
+ }
+ 
+@@ -78,7 +78,7 @@ void AcceleratorCache::takeOver(const Ac
+     // SAFE -> ----------------------------------
+     WriteGuard aWriteLock(m_aLock);
+     
+-    m_lCommand2Keys = rCopy.m_lCommand2Keys;
++    m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys);
+     m_lKey2Commands = rCopy.m_lKey2Commands;
+     
+     aWriteLock.unlock();
+--- ./framework/source/loadenv/loadenv.cxx.orig	2011-12-15 15:08:15.771487938 -0200
++++ ./framework/source/loadenv/loadenv.cxx	2011-12-15 15:19:06.038358483 -0200
+@@ -255,7 +255,8 @@ void LoadEnv::initializeLoading(const ::
+     // take over all new parameters.
+     m_xTargetFrame.clear();
+     m_xBaseFrame                    = xBaseFrame        ;
+-    m_lMediaDescriptor              = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
++    ::comphelper::MediaDescriptor tmp = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
++    m_lMediaDescriptor              =  tmp;
+     m_sTarget                       = sTarget           ;
+     m_nSearchFlags                  = nSearchFlags      ;
+     m_eFeature                      = eFeature          ;
+--- ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx.orig	2011-12-15 15:08:49.033072112 -0200
++++ ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx	2011-12-15 15:11:07.209344668 -0200
+@@ -175,6 +175,15 @@ namespace framework
+                 sal_Int16                                                         nElementType;
+                 UIElementDataHashMap                                              aElementsHashMap;
+                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
++                UIElementType& operator=(const UIElementType& rRight) {
++                        bModified = rRight.bModified;
++                        bLoaded = rRight.bLoaded;
++                        bDefaultLayer = rRight.bDefaultLayer;
++                        nElementType = rRight.nElementType;
++                        aElementsHashMap = rRight.aElementsHashMap;
++                        xStorage = rRight.xStorage;
++                        return *this;
++                };
+             };
+ 
+             typedef ::std::vector< UIElementType > UIElementTypesVector;
+--- ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx.orig	2011-12-19 11:10:56.000000000 +0000
++++ ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx	2011-12-19 11:12:06.000000000 +0000
+@@ -185,6 +185,15 @@ namespace framework
+                 sal_Int16                                                         nElementType;
+                 UIElementDataHashMap                                              aElementsHashMap;
+                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
++		UIElementType& operator=(const UIElementType& rRight) {
++			bModified = rRight.bModified;
++			bLoaded = rRight.bLoaded;
++			bDefaultLayer = rRight.bDefaultLayer;
++			nElementType = rRight.nElementType;
++			aElementsHashMap = rRight.aElementsHashMap;
++			xStorage = rRight.xStorage;
++			return *this;
++		};
+             };
+ 
+             typedef ::std::vector< UIElementType > UIElementTypesVector;
+--- ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx.orig	2011-12-19 11:14:17.000000000 +0000
++++ ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx	2011-12-19 11:15:16.000000000 +0000
+@@ -171,6 +171,15 @@ namespace framework
+                 sal_Int16                                                         nElementType;
+                 UIElementDataHashMap                                              aElementsHashMap;
+                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
++                UIElementType& operator=(const UIElementType& rRight) {
++                        bModified = rRight.bModified;
++                        bLoaded = rRight.bLoaded;
++                        bDefaultLayer = rRight.bDefaultLayer;
++                        nElementType = rRight.nElementType;
++                        aElementsHashMap = rRight.aElementsHashMap;
++                        xStorage = rRight.xStorage;
++                        return *this;
++                };
+             };
+ 
+             typedef ::std::vector< UIElementType > UIElementTypesVector;
+
+--- ./padmin/source/prtsetup.cxx.orig	2011-12-15 15:09:05.133870823 -0200
++++ ./padmin/source/prtsetup.cxx	2011-12-15 15:13:55.626239170 -0200
+@@ -813,7 +813,7 @@ extern "C" {
+ 
+         if( aDialog.Execute() )
+         {
+-            rJobData = aDialog.getSetup();
++            rJobData = const_cast< ::psp::PrinterInfo & > ( aDialog.getSetup() );
+             nRet = 1;
+         }
+ 
+--- ./sfx2/source/doc/guisaveas.cxx.orig	2011-12-15 15:08:58.332955848 -0200
++++ ./sfx2/source/doc/guisaveas.cxx	2011-12-15 15:12:39.953185212 -0200
+@@ -731,7 +731,7 @@ sal_Int8 ModelData_Impl::CheckFilter( co
+         if ( aFilterName.getLength() )
+             m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps;
+ 
+-        aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps );
++        aFiltPropsHM <<  aFilterProps;
+         nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 );
+     }
+ 
+--- ./framework/inc/classes/filtercachedata.hxx.orig	2011-12-17 13:14:22.102898902 +0000
++++ ./framework/inc/classes/filtercachedata.hxx	2011-12-17 13:17:51.524424012 +0000
+@@ -230,7 +230,7 @@
+         {
+             bPreferred			= rCopy.bPreferred		;
+             sName				= rCopy.sName			;
+-            lUINames			= rCopy.lUINames		;
++            lUINames			= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
+             sMediaType			= rCopy.sMediaType		;
+             sClipboardFormat	= rCopy.sClipboardFormat;
+             nDocumentIconID		= rCopy.nDocumentIconID	;
+@@ -298,7 +298,7 @@
+             nOrder              = rCopy.nOrder              ;
+             sName				= rCopy.sName				;
+             sType				= rCopy.sType				;
+-            lUINames			= rCopy.lUINames			;
++            lUINames			= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
+             sDocumentService	= rCopy.sDocumentService	;
+             sFilterService		= rCopy.sFilterService		;
+             sUIComponent        = rCopy.sUIComponent        ;
+@@ -405,7 +405,7 @@
+         inline Loader& impl_copy( const Loader& rCopy )
+         {
+             sName       = rCopy.sName       ;
+-            lUINames	= rCopy.lUINames	;
++            lUINames	= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
+             lTypes		= rCopy.lTypes		;
+             return (*this);
+         }
diff --git a/extra/libspiro/PKGBUILD b/extra/libspiro/PKGBUILD
new file mode 100644
index 000000000..d27e6b9c1
--- /dev/null
+++ b/extra/libspiro/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 145163 2011-12-18 12:09:22Z bisson $
+# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=libspiro
+pkgver=20071029
+pkgrel=2
+pkgdesc='Simplifies the drawing of beautiful curves'
+url='http://libspiro.sourceforge.net/'
+license=('GPL')
+options=('!libtool')
+arch=('i686' 'x86_64')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_src-${pkgver}.tar.bz2")
+sha1sums=('d8b407b835b35289af2914877a4c6000b4fdd382')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD
index 8c5197122..90eee20de 100644
--- a/extra/libxi/PKGBUILD
+++ b/extra/libxi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 130682 2011-07-07 17:24:45Z andyrtr $
+# $Id: PKGBUILD 145122 2011-12-17 08:47:23Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxi
-pkgver=1.4.3
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="X11 Input extension library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ options=(!libtool)
 license=('custom')
 source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2
         XExtInt-align-classes-n32.diff)
-sha1sums=('c66cfdee74e8d169a7992b5f257395e653ca761b'
+sha1sums=('e4ca1b45368214ba246bfad398ea087125c79f31'
           '30931831efa9a7f8a888f41bb9284fa32f2e2392')
 
 build() {
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 0cb1b9276..131e85cfc 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143810 2011-11-29 13:33:30Z stephane $
+# $Id: PKGBUILD 145165 2011-12-18 18:44:31Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
-pkgver=1.4.29
-pkgrel=3
+pkgver=1.4.30
+pkgrel=1
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,14 +16,14 @@ optdepends=('libxml2: mod_webdav'
             'sqlite3: mod_webdav')
 backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
 options=('!libtool' 'emptydirs')
-source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2"
-        "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2.asc"
+source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
+        "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
         'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
-md5sums=('e6e67b09986cb504db630b5a86b2dd76'
-         'de2afb4ed6a088fd7fa5f13c387a08f0'
-         '268386e71f5748dc1d887b9a0ab65589'
-         '913e2157fa78d990c32146f387d44c2b'
-         'acdaa94299e6299cb5085e6d88babeca')
+sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b'
+            '941ab747aeb97ca111fb670d21eefecdf745debc5e139bc5bd6881ee66b2742a'
+            'ceff3a88e876f6104c094379d507b89bc504777d0f98a0930406a70624fcf024'
+            '6c5892830e77731d27e3ebb64a0d87ab9139c68eb703aec6741c591814cef26f'
+            '44267e8b670faaf5712ad0bc9fd84b8c52281ddd22ef2c22d4b474dbb1cf5d2a')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
diff --git a/extra/m17n-lib/PKGBUILD b/extra/m17n-lib/PKGBUILD
index 0afbbe4e3..78a23f76a 100644
--- a/extra/m17n-lib/PKGBUILD
+++ b/extra/m17n-lib/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=m17n-lib
 pkgver=1.6.3
-pkgrel=1
+pkgrel=1.1
 pkgdesc='Multilingual text processing library (runtimes)'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.m17n.org/m17n-lib/'
diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD
index 7bc946085..e8fd07bd8 100644
--- a/extra/midori/PKGBUILD
+++ b/extra/midori/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142825 2011-11-16 00:02:11Z eric $
+# $Id: PKGBUILD 145174 2011-12-19 00:22:14Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: rabyte <rabyte.at.gmail.dot.com>
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
 
 pkgname=midori
-pkgver=0.4.2
+pkgver=0.4.3
 pkgrel=1
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-util
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
 optdepends=('vala: for use in extensions')
 source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-md5sums=('4ec9c3daa332ebe865cba6aa8256ef63')
+md5sums=('900037557b82818d79d2dd1c5a7d7fd2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index c45eb034c..873ba0163 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 144061 2011-12-02 20:54:42Z ibiru $
+# $Id: PKGBUILD 145175 2011-12-19 00:22:15Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.1.0
-pkgrel=1
+pkgver=5.2.0
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 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=('fed878893a7f292969e8bd81c7ab9209')
+md5sums=('53445217c42736d5932082e5596c20d4')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -56,6 +56,7 @@ package_mkvtoolnix-cli() {
   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/man/uk/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/applications
   rm -rf "${pkgdir}"/usr/share/icons
   rm -rf "${pkgdir}"/usr/share/mime
@@ -79,4 +80,5 @@ package_mkvtoolnix-gtk() {
   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*
+  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
 }
diff --git a/extra/mono-tools/PKGBUILD b/extra/mono-tools/PKGBUILD
index d3d6ec685..e1b29235a 100644
--- a/extra/mono-tools/PKGBUILD
+++ b/extra/mono-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 111524 2011-02-27 11:44:42Z daniel $
+# $Id: PKGBUILD 145315 2011-12-21 19:09:51Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Brice Carpentier <brice@dlfp.org>
 
@@ -11,28 +11,28 @@
 
 pkgname=mono-tools
 pkgver=2.10
-pkgrel=1
+pkgrel=2
 pkgdesc="collection of testing and development tools for use with mono (including monodoc browser)"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.mono-project.com/"
-depends=('mono>=2.10.1' 'desktop-file-utils' 'gnome-desktop-sharp>=2.26.0' 'gluezilla')
-makedepends=('gecko-sharp-2.0>=0.13')
+depends=('libgnome-sharp' 'gtkhtml-sharp')
+makedepends=('gconf-sharp')
 install=$pkgname.install
-source=(http://ftp.novell.com/pub/mono/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('da178df2c119c696c08c09dc9eb01994')
 
 build() {
  # get rid of that .wapi errors; thanks to brice
   export MONO_SHARED_DIR="${startdir}/src/weird"
   mkdir -p "${MONO_SHARED_DIR}"
-
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
-  #sed -i 's:^Exec=.*$:Exec=/usr/bin/monodoc:' docbrowser/monodoc.desktop.in
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make GACUTIL="/usr/bin/gacutil /root ${startdir}/pkg/usr/lib" DESTDIR=${startdir}/pkg install || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  autoreconf -fi 
+  ./configure --prefix=/usr
+  make
 }
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make GACUTIL="/usr/bin/gacutil /root $pkgdir/usr/lib" DESTDIR="$pkgdir" install
+ }
diff --git a/extra/mono-tools/mono-tools.install b/extra/mono-tools/mono-tools.install
index 03f6f2f7e..d4891227b 100644
--- a/extra/mono-tools/mono-tools.install
+++ b/extra/mono-tools/mono-tools.install
@@ -1,9 +1,6 @@
 post_install() {
-  # diable for a while maybe we can implement something in pacman to make it faster
-  #echo "creating index ... this could take a up to several minutes ..."
-  #monodoc --make-search-index > /dev/null  2>&1
-  echo "update desktop mime database..."
-  update-desktop-database -q
+  echo "update icon cache..." 
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 
@@ -23,8 +20,8 @@ post_remove() {
   echo "removing index..."
   rm -f  /usr/lib/monodoc/monodoc.index
   rm -rf /usr/lib/monodoc/search_index
-  echo "update desktop mime database..."
-  update-desktop-database -q
+  echo "update icon cache..."
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 # vim: ft=sh
diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD
index 6b4b6f09f..89a1ccaac 100644
--- a/extra/monodevelop-debugger-gdb/PKGBUILD
+++ b/extra/monodevelop-debugger-gdb/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=monodevelop-debugger-gdb
-pkgver=2.8.4.2
+pkgver=2.8.5
 pkgrel=1
 pkgdesc="Mono Debugger support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://monodevelop.com"
 license=('GPL')
-depends=('monodevelop>=2.8.4.2' 'gdb')
+depends=('monodevelop>=2.8.5' 'gdb')
 makedepends=('mono')
 source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('4c081b6d85ffe36389a3b06da37dcbe4')
+md5sums=('57e7c32ba204e69f7d0d3c56e202d0ed')
 
 build() {
   export MONO_SHARED_DIR="${srcdir}/.wabi"
diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD
index a00ba49aa..56d0b0861 100644
--- a/extra/monodevelop/PKGBUILD
+++ b/extra/monodevelop/PKGBUILD
@@ -3,17 +3,17 @@
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=monodevelop
-pkgver=2.8.4.2
+pkgver=2.8.5
 pkgrel=1
 pkgdesc="An IDE primarily designed for C# and other .NET languages"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.monodevelop.org"
+arch=('i686' 'x86_64')
+url="http://www.monodevelop.com"
 license=('GPL')
 depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.10')
 options=(!makeflags)
 install=monodevelop.install
 source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('276fb75e2ffa4cf41fd609caa74dc276')
+md5sums=('c1d6a32330b4c22980052009de702483')
 
 build() {
   export MONO_SHARED_DIR=$srcdir/src/.wabi
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index 9fdcc0f24..7a8d322d5 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 138102 2011-09-16 12:01:21Z ibiru $
+# $Id: PKGBUILD 145236 2011-12-19 19:17:54Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
-pkgver=3.12.11
-pkgrel=3
+pkgver=3.13.1
+pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64 'mips64el')
 url="http://www.mozilla.org/projects/security/pki/nss/"
@@ -13,26 +13,22 @@ depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh')
 makedepends=('perl')
 replaces=('nss-nspr')
 options=('!strip')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
+source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_WITH_CKBI_1_88_RTM/src/${pkgname}-${pkgver}.with.ckbi.1.88.tar.gz
         nss-no-rpath.patch
         nss.pc.in
         nss-config.in
-        distrust-diginotar.patch
         add_spi+cacert_ca_certs.patch
         ssl-renegotiate-transitional.patch)
-md5sums=('ca0ca058380be200cf247ea2496b5352'
-         'e5c97db0c884d5f4cfda21e562dc9bba'
-         'c547b030c57fe1ed8b77c73bf52b3ded'
-         '46bee81908f1e5b26d6a7a2e14c64d9f'
-         'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf'
-         'ba2357c5b9881bfd7d54b037954ba0ff'
-         'd83c7b61abb7e9f8f7bcd157183d1ade')
+sha1sums=('ebc0258c8d1a3c2fe80941bd991b766552464fc6'
+          'c8fcdb153af9d39689243119adb475905a657284'
+          'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
+          'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
+          '11e4980911a1fe7142264e9b783b89abdc750c5d'
+          '8a964a744ba098711b80c0d279a2993524e8eb92')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
-  # Distrust DigiNotar root CA - backported from CVS (https://bugzilla.mozilla.org/show_bug.cgi?id=682927)
-  patch -Np0 -i "${srcdir}/distrust-diginotar.patch"
-  # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian
+  # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only
   patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
   # Adds transitional SSL renegotiate support - patch from Debian
   patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
@@ -43,6 +39,10 @@ build() {
   sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
       -i security/coreconf/rules.mk
 
+  # Generate certdata.c from certdata.txt
+  cd security/nss/lib/ckfw/builtins
+  make generate
+
   cd "${srcdir}/${pkgname}-${pkgver}"
   export BUILD_OPT=1
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
diff --git a/extra/nss/add_spi+cacert_ca_certs.patch b/extra/nss/add_spi+cacert_ca_certs.patch
index 0af0deab7..7126a1281 100644
--- a/extra/nss/add_spi+cacert_ca_certs.patch
+++ b/extra/nss/add_spi+cacert_ca_certs.patch
@@ -3,597 +3,14 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Adds the SPI Inc. and CAcert.org CA certificates
 
-Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.c
-===================================================================
---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.c	2011-08-12 12:29:13.000000000 +0200
-+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.c	2011-08-12 12:29:29.056420467 +0200
-@@ -1045,6 +1045,24 @@
- static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = {
-  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
- };
-+static const CK_ATTRIBUTE_TYPE nss_builtins_types_328 [] = {
-+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
-+};
-+static const CK_ATTRIBUTE_TYPE nss_builtins_types_329 [] = {
-+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
-+};
-+static const CK_ATTRIBUTE_TYPE nss_builtins_types_330 [] = {
-+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
-+};
-+static const CK_ATTRIBUTE_TYPE nss_builtins_types_331 [] = {
-+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
-+};
-+static const CK_ATTRIBUTE_TYPE nss_builtins_types_332 [] = {
-+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
-+};
-+static const CK_ATTRIBUTE_TYPE nss_builtins_types_333 [] = {
-+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
-+};
- #ifdef DEBUG
- static const NSSItem nss_builtins_items_0 [] = {
-   { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-@@ -21910,6 +21928,531 @@
-   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
-+static const NSSItem nss_builtins_items_328 [] = {
-+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 },
-+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
-+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
-+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
-+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
-+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
-+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
-+"\100\143\141\143\145\162\164\056\157\162\147"
-+, (PRUint32)123 },
-+  { (void *)"0", (PRUint32)2 },
-+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
-+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
-+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
-+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
-+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
-+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
-+"\100\143\141\143\145\162\164\056\157\162\147"
-+, (PRUint32)123 },
-+  { (void *)"\002\001\000"
-+, (PRUint32)3 },
-+  { (void *)"\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000"
-+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
-+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
-+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
-+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
-+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
-+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
-+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
-+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
-+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063"
-+"\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060"
-+"\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016"
-+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
-+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
-+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
-+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
-+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
-+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
-+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
-+"\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110"
-+"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002"
-+"\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007"
-+"\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002"
-+"\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011"
-+"\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315"
-+"\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230"
-+"\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272"
-+"\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016"
-+"\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052"
-+"\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262"
-+"\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140"
-+"\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150"
-+"\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273"
-+"\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022"
-+"\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234"
-+"\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334"
-+"\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070"
-+"\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232"
-+"\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044"
-+"\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355"
-+"\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252"
-+"\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352"
-+"\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276"
-+"\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306"
-+"\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320"
-+"\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167"
-+"\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335"
-+"\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324"
-+"\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246"
-+"\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106"
-+"\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272"
-+"\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334"
-+"\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304"
-+"\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060"
-+"\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265"
-+"\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071"
-+"\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230"
-+"\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260"
-+"\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016"
-+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
-+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
-+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
-+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
-+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
-+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
-+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
-+"\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001"
-+"\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037"
-+"\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160"
-+"\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157"
-+"\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006"
-+"\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164"
-+"\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164"
-+"\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060"
-+"\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045"
-+"\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162"
-+"\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077"
-+"\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102"
-+"\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165"
-+"\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164"
-+"\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040"
-+"\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167"
-+"\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006"
-+"\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001"
-+"\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201"
-+"\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275"
-+"\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234"
-+"\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323"
-+"\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073"
-+"\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140"
-+"\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353"
-+"\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160"
-+"\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334"
-+"\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231"
-+"\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116"
-+"\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145"
-+"\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031"
-+"\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363"
-+"\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330"
-+"\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367"
-+"\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260"
-+"\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223"
-+"\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335"
-+"\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026"
-+"\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005"
-+"\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361"
-+"\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371"
-+"\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246"
-+"\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206"
-+"\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153"
-+"\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344"
-+"\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143"
-+"\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362"
-+"\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226"
-+"\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175"
-+"\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305"
-+"\103"
-+, (PRUint32)1857 }
-+};
-+static const NSSItem nss_builtins_items_329 [] = {
-+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 },
-+  { (void *)"\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106"
-+"\166\316\217\063"
-+, (PRUint32)20 },
-+  { (void *)"\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153"
-+, (PRUint32)16 },
-+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
-+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
-+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
-+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
-+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
-+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
-+"\100\143\141\143\145\162\164\056\157\162\147"
-+, (PRUint32)123 },
-+  { (void *)"\002\001\000"
-+, (PRUint32)3 },
-+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-+};
-+static const NSSItem nss_builtins_items_330 [] = {
-+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 },
-+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-+  { (void *)"\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143"
-+"\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004"
-+"\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101"
-+"\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004"
-+"\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040"
-+"\063\040\122\157\157\164"
-+, (PRUint32)86 },
-+  { (void *)"0", (PRUint32)2 },
-+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
-+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
-+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
-+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
-+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
-+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
-+"\100\143\141\143\145\162\164\056\157\162\147"
-+, (PRUint32)123 },
-+  { (void *)"\002\001\001"
-+, (PRUint32)3 },
-+  { (void *)"\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001"
-+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
-+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
-+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
-+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
-+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
-+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
-+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
-+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
-+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065"
-+"\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060"
-+"\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022"
-+"\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156"
-+"\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164"
-+"\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157"
-+"\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143"
-+"\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164"
-+"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001"
-+"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001"
-+"\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335"
-+"\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175"
-+"\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163"
-+"\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144"
-+"\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001"
-+"\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171"
-+"\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313"
-+"\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011"
-+"\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353"
-+"\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277"
-+"\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331"
-+"\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205"
-+"\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073"
-+"\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161"
-+"\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371"
-+"\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047"
-+"\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252"
-+"\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102"
-+"\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064"
-+"\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133"
-+"\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242"
-+"\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137"
-+"\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325"
-+"\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150"
-+"\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230"
-+"\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140"
-+"\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347"
-+"\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321"
-+"\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206"
-+"\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257"
-+"\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164"
-+"\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373"
-+"\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003"
-+"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006"
-+"\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006"
-+"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072"
-+"\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162"
-+"\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034"
-+"\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162"
-+"\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003"
-+"\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001"
-+"\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002"
-+"\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101"
-+"\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160"
-+"\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206"
-+"\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241"
-+"\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072"
-+"\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135"
-+"\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253"
-+"\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364"
-+"\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172"
-+"\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302"
-+"\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214"
-+"\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074"
-+"\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154"
-+"\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025"
-+"\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352"
-+"\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231"
-+"\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213"
-+"\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325"
-+"\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242"
-+"\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214"
-+"\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027"
-+"\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057"
-+"\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224"
-+"\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134"
-+"\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356"
-+"\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005"
-+"\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355"
-+"\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143"
-+"\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123"
-+"\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243"
-+"\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005"
-+"\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156"
-+"\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317"
-+"\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360"
-+"\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101"
-+"\322\156\245\033\231\047\200\347\013\251\250\000"
-+, (PRUint32)1548 }
-+};
-+static const NSSItem nss_builtins_items_331 [] = {
-+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 },
-+  { (void *)"\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304"
-+"\030\116\052\055"
-+, (PRUint32)20 },
-+  { (void *)"\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266"
-+, (PRUint32)16 },
-+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
-+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
-+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
-+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
-+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
-+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
-+"\100\143\141\143\145\162\164\056\157\162\147"
-+, (PRUint32)123 },
-+  { (void *)"\002\001\001"
-+, (PRUint32)3 },
-+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-+};
-+static const NSSItem nss_builtins_items_332 [] = {
-+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 },
-+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-+  { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123"
-+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141"
-+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144"
-+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125"
-+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040"
-+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162"
-+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157"
-+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004"
-+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101"
-+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163"
-+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147"
-+, (PRUint32)191 },
-+  { (void *)"0", (PRUint32)2 },
-+  { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123"
-+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141"
-+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144"
-+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125"
-+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040"
-+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162"
-+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157"
-+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004"
-+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101"
-+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163"
-+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147"
-+, (PRUint32)191 },
-+  { (void *)"\002\011\000\350\216\266\311\370\052\024\050"
-+, (PRUint32)11 },
-+  { (void *)"\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000"
-+"\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206"
-+"\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003"
-+"\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010"
-+"\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125"
-+"\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163"
-+"\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167"
-+"\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151"
-+"\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003"
-+"\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061"
-+"\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146"
-+"\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061"
-+"\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026"
-+"\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151"
-+"\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063"
-+"\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060"
-+"\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125"
-+"\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023"
-+"\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004"
-+"\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061"
-+"\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141"
-+"\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143"
-+"\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125"
-+"\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036"
-+"\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151"
-+"\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045"
-+"\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150"
-+"\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156"
-+"\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110"
-+"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002"
-+"\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051"
-+"\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074"
-+"\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271"
-+"\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240"
-+"\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321"
-+"\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265"
-+"\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175"
-+"\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375"
-+"\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161"
-+"\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342"
-+"\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172"
-+"\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056"
-+"\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247"
-+"\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310"
-+"\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361"
-+"\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356"
-+"\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110"
-+"\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151"
-+"\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316"
-+"\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307"
-+"\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320"
-+"\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205"
-+"\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123"
-+"\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154"
-+"\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275"
-+"\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356"
-+"\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250"
-+"\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204"
-+"\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147"
-+"\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305"
-+"\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057"
-+"\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124"
-+"\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060"
-+"\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161"
-+"\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122"
-+"\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346"
-+"\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102"
-+"\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061"
-+"\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016"
-+"\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025"
-+"\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141"
-+"\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037"
-+"\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040"
-+"\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061"
-+"\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141"
-+"\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103"
-+"\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157"
-+"\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015"
-+"\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100"
-+"\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216"
-+"\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377"
-+"\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206"
-+"\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035"
-+"\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102"
-+"\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151"
-+"\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164"
-+"\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102"
-+"\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141"
-+"\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055"
-+"\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206"
-+"\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057"
-+"\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143"
-+"\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125"
-+"\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164"
-+"\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016"
-+"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015"
-+"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002"
-+"\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162"
-+"\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030"
-+"\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255"
-+"\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065"
-+"\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014"
-+"\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306"
-+"\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051"
-+"\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017"
-+"\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302"
-+"\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213"
-+"\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017"
-+"\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162"
-+"\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152"
-+"\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357"
-+"\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266"
-+"\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104"
-+"\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177"
-+"\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253"
-+"\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206"
-+"\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217"
-+"\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265"
-+"\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225"
-+"\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140"
-+"\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207"
-+"\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252"
-+"\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340"
-+"\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254"
-+"\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275"
-+"\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132"
-+"\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151"
-+"\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005"
-+"\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004"
-+"\243\140"
-+, (PRUint32)2066 }
-+};
-+static const NSSItem nss_builtins_items_333 [] = {
-+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+  { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 },
-+  { (void *)"\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044"
-+"\251\220\103\034"
-+, (PRUint32)20 },
-+  { (void *)"\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170"
-+, (PRUint32)16 },
-+  { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123"
-+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141"
-+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144"
-+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125"
-+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040"
-+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162"
-+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157"
-+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004"
-+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101"
-+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163"
-+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147"
-+, (PRUint32)191 },
-+  { (void *)"\002\011\000\350\216\266\311\370\052\024\050"
-+, (PRUint32)11 },
-+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-+};
- 
- builtinsInternalObject
- nss_builtins_data[] = {
-@@ -22244,11 +22787,17 @@
-   { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
-   { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} },
-   { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} },
--  { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }
-+  { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} },
-+  { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} },
-+  { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} },
-+  { 11, nss_builtins_types_330, nss_builtins_items_330, {NULL} },
-+  { 13, nss_builtins_types_331, nss_builtins_items_331, {NULL} },
-+  { 11, nss_builtins_types_332, nss_builtins_items_332, {NULL} },
-+  { 13, nss_builtins_types_333, nss_builtins_items_333, {NULL} }
- };
- const PRUint32
- #ifdef DEBUG
--  nss_builtins_nObjects = 327+1;
-+  nss_builtins_nObjects = 333+1;
- #else
--  nss_builtins_nObjects = 327;
-+  nss_builtins_nObjects = 333;
- #endif /* DEBUG */
 Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
 ===================================================================
---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2011-08-12 12:25:29.000000000 +0200
-+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2011-08-12 12:29:25.460425941 +0200
-@@ -22589,3 +22589,558 @@
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
- CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+--- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2011-11-05 17:03:08.370363036 +0100
++++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2011-11-05 17:03:28.082392262 +0100
+@@ -23580,3 +23580,557 @@
+ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
  CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
+ 
 +#
 +# Certificate "CAcert.org Class 1 Root CA"
 +#
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 4ded98b7e..e4f416b5c 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144087 2011-12-03 09:31:31Z schiv $
+# $Id: PKGBUILD 145287 2011-12-21 06:58:54Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
@@ -7,7 +7,7 @@ pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.3.1_a
 _realver=2.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
diff --git a/extra/openslp/PKGBUILD b/extra/openslp/PKGBUILD
index 347c5d823..97e007cfd 100644
--- a/extra/openslp/PKGBUILD
+++ b/extra/openslp/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=openslp
 pkgver=1.2.1
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Open-source implementation of Service Location Protocol"
 arch=(i686 x86_64 'mips64el')
 url="http://www.openslp.org"
diff --git a/extra/oxygen-gtk/PKGBUILD b/extra/oxygen-gtk/PKGBUILD
index d6af29ab2..c499cd651 100644
--- a/extra/oxygen-gtk/PKGBUILD
+++ b/extra/oxygen-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142925 2011-11-18 11:11:32Z andrea $
+# $Id: PKGBUILD 145044 2011-12-15 21:12:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk
-pkgver=1.1.5
+pkgver=1.1.6
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('gtk2')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('d20902809e634c820bebdfea49de19a1')
+md5sums=('714cd895e276cfd20a43b406a78ae6af')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index cc259d36f..a257a5c38 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,33 +1,30 @@
-# $Id: PKGBUILD 141341 2011-10-29 16:03:56Z andrea $
+# $Id: PKGBUILD 145248 2011-12-20 07:59:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon
-pkgver=4.5.1
-pkgrel=2
+pkgver=4.6.0
+pkgrel=1
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
-url="http://phonon.kde.org"
+url='http://phonon.kde.org/'
 license=('LGPL')
 pkgdesc="The multimedia framework for KDE"
 depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist')
 optdepends=('pulseaudio: PulseAudio support')
 makedepends=('cmake' 'automoc4' 'pulseaudio')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-       'libqzeitgeist08.patch')
-md5sums=('3df071b7f9996afcd67b18958955ecdd'
-         '99de3dc908277199b502e54613925ff6')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}"/libqzeitgeist08.patch
-
   cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON
+    -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
+    -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer
   make
 }
 
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 1a7a82bca..86b76f2fa 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143816 2011-11-29 13:33:39Z stephane $
+# $Id: PKGBUILD 145339 2011-12-21 20:47:24Z andrea $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -23,7 +23,7 @@ pkgname=('php'
          'php-xsl')
 pkgver=5.3.8
 _suhosinver=5.3.7-0.9.10
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64' 'mips64el')
 license=('PHP')
 url='http://www.php.net'
diff --git a/extra/polkit-kde/PKGBUILD b/extra/polkit-kde/PKGBUILD
index f81499717..3804d6b2e 100644
--- a/extra/polkit-kde/PKGBUILD
+++ b/extra/polkit-kde/PKGBUILD
@@ -7,24 +7,24 @@ pkgver=0.99.0
 pkgrel=1
 pkgdesc='Daemon providing a polkit authentication UI for KDE'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
+url='https://projects.kde.org/projects/extragear/base/polkit-kde-agent-1'
 license=('GPL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
-source=("ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/${pkgname}-agent-1-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/apps/KDE4.x/admin/${pkgname}-agent-1-${pkgver}.tar.bz2")
 md5sums=('a02d3fddc6270a88bceaf3ba604c92f8')
 
 build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgname}-agent-1-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-agent-1-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
 }
 
 package() {
-	cd ${srcdir}/build
-	make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/polkit-qt/PKGBUILD b/extra/polkit-qt/PKGBUILD
index 4701bf6e6..f2494ddc3 100644
--- a/extra/polkit-qt/PKGBUILD
+++ b/extra/polkit-qt/PKGBUILD
@@ -3,28 +3,28 @@
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=polkit-qt
-pkgver=0.99.0
+pkgver=0.103.0
 pkgrel=1
 pkgdesc='A library that allows developers to access PolicyKit API with a nice Qt-style API'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
+url='https://projects.kde.org/projects/kdesupport/polkit-qt-1'
 license=('LGPL')
 depends=('polkit' 'qt')
 makedepends=('cmake' 'automoc4')
-source=("ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2")
-md5sums=('1c5b4113a2a167624b5f716b4f03a219')
+source=("http://download.kde.org/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2")
+md5sums=('a105e233e6733fb072c9080cd7ae1af2')
 
 build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgname}-1-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-1-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
 }
 
 package() {
-	cd ${srcdir}/build
-	make DESTDIR=$pkgdir install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index 9984494bd..fc76c3f2f 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142670 2011-11-12 17:46:43Z ibiru $
+# $Id: PKGBUILD 145182 2011-12-19 11:45:17Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.18.1
+pkgver=0.18.2
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 license=('GPL')
@@ -14,9 +14,9 @@ _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
         http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
         git-fixes.patch)
-md5sums=('d30e883a27423c936ef338ce1d967e2d'
+md5sums=('38616927823ef01937aab26872e957e4'
          '9dc64c254a31e570507bdd4ad4ba629a'
-         'a73ba6515aa73cb20c480692da52c79e')
+         'af56b7b1b24a08f7498a0c7f5e862b93')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -39,7 +39,7 @@ check() {
   cd "${srcdir}"
   ln -sf test-${_testtag} test
   cd ${pkgbase}-${pkgver}
-  LANG=en_US.UTF-8 make check
+  LANG=en_US.UTF8 make check
 }
 
 package_poppler() {
diff --git a/extra/poppler/git-fixes.patch b/extra/poppler/git-fixes.patch
index a18a31aec..24a66b84f 100644
--- a/extra/poppler/git-fixes.patch
+++ b/extra/poppler/git-fixes.patch
@@ -1,107 +1,110 @@
-From e4a2adb02969e872e37e408ced4c39131c6751ea Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun, 30 Oct 2011 15:02:19 +0000
-Subject: pdftocairo: Make sure beginDocument() is always called
+From 74f4299e8f9e2d204979479f6579dd784db678a4 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 04 Dec 2011 16:29:45 +0000
+Subject: Do not fail if we are trying to save a file with Encrypt but that we have not modified at all
 
-This fixes a crash when rendering only odd/even pages in a printing
-format.
+Fixes KDE bug #288045
+(cherry picked from commit 63c942a45227ef28fb94ef4765171d9812fffafa)
 ---
-diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
-index e458ee5..1b67c90 100644
---- a/utils/pdftocairo.cc
-+++ b/utils/pdftocairo.cc
-@@ -903,6 +903,10 @@ int main(int argc, char *argv[]) {
-     lastPage = firstPage;
-   }
+diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
+index 01d2759..2758206 100644
+--- a/poppler/PDFDoc.cc
++++ b/poppler/PDFDoc.cc
+@@ -707,35 +707,44 @@ int PDFDoc::saveAs(GooString *name, PDFWriteMode mode) {
+ 
+ int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) {
  
-+  // Make sure firstPage is always used so that beginDocument() is called
-+  if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1))
-+    firstPage++;
+-  // we don't support files with Encrypt at the moment
++  // find if we have updated objects
++  GBool updated = gFalse;
++  for(int i=0; i<xref->getNumObjects(); i++) {
++    if (xref->getEntry(i)->updated) {
++      updated = gTrue;
++      break;
++    }
++  }
 +
-   cairoOut = new CairoOutputDev();
-   cairoOut->startDoc(doc->getXRef(), doc->getCatalog());
-   if (sz != 0)
---
-cgit v0.9.0.2-2-gbebe
-From 61b1556d1c62bf090b2eadf93e4e7d0aff7b8015 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun, 30 Oct 2011 15:08:46 +0000
-Subject: pdftocairo: Use fisrtPage instead of uninitialized pg variable
-
-This fixes an error in my previous commit.
----
-diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
-index 1b67c90..d0d1ec6 100644
---- a/utils/pdftocairo.cc
-+++ b/utils/pdftocairo.cc
-@@ -904,7 +904,7 @@ int main(int argc, char *argv[]) {
++  // we don't support rewriting files with Encrypt at the moment
+   Object obj;
+   xref->getTrailerDict()->getDict()->lookupNF("Encrypt", &obj);
+   if (!obj.isNull())
+   {
+     obj.free();
+-    return errEncrypted;
++    if (!updated && mode == writeStandard) {
++      // simply copy the original file
++      saveWithoutChangesAs (outStr);
++    } else {
++      return errEncrypted;
++    }
    }
+-  obj.free();
++  else
++  {
++    obj.free();
  
-   // Make sure firstPage is always used so that beginDocument() is called
--  if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1))
-+  if ((printOnlyEven && firstPage % 2 == 0) || (printOnlyOdd && firstPage % 2 == 1))
-     firstPage++;
+-  if (mode == writeForceRewrite) {
+-    saveCompleteRewrite(outStr);
+-  } else if (mode == writeForceIncremental) {
+-    saveIncrementalUpdate(outStr); 
+-  } else { // let poppler decide
+-    // find if we have updated objects
+-    GBool updated = gFalse;
+-    for(int i=0; i<xref->getNumObjects(); i++) {
+-      if (xref->getEntry(i)->updated) {
+-        updated = gTrue;
+-        break;
++    if (mode == writeForceRewrite) {
++      saveCompleteRewrite(outStr);
++    } else if (mode == writeForceIncremental) {
++      saveIncrementalUpdate(outStr); 
++    } else { // let poppler decide
++      if(updated) { 
++        saveIncrementalUpdate(outStr);
++      } else {
++        // simply copy the original file
++        saveWithoutChangesAs (outStr);
+       }
+     }
+-    if(updated) { 
+-      saveIncrementalUpdate(outStr);
+-    } else {
+-      // simply copy the original file
+-      saveWithoutChangesAs (outStr);
+-    }
+   }
  
-   cairoOut = new CairoOutputDev();
+   return errNone;
 --
 cgit v0.9.0.2-2-gbebe
-From ebf7fbc74da10d1bc423d33b26e30166870642e4 Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter@math.unl.edu>
-Date: Tue, 01 Nov 2011 08:40:53 +0000
-Subject: Fix pkg-config files
+From 03544e2f602319f0b381f5f357e14cc2cc77d2c1 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Tue, 06 Dec 2011 22:21:15 +0000
+Subject: include strings.h as we use memcpy
 
-We were using $FOO_REQUIRED instead of @FOO_REQUIRED@
+Fixes bug 43558
+(cherry picked from commit 388d72ac27ae98fe3a1ebd21760f2b0fa0249a9b)
 ---
-diff --git a/configure.ac b/configure.ac
-index 3a120ca..c4f5b92 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then
-   POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
- 
-   GLIB_REQUIRED=2.18
-+  AC_SUBST(GLIB_REQUIRED)
-   AC_ARG_ENABLE(poppler-glib,
- 	        AC_HELP_STRING([--disable-poppler-glib],
- 		               [Don't compile poppler glib wrapper.]),
-diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in
-index 55a2278..5fcb6f2 100644
---- a/poppler-glib-uninstalled.pc.in
-+++ b/poppler-glib-uninstalled.pc.in
-@@ -1,7 +1,7 @@
- Name: poppler-glib
- Description: GLib wrapper for poppler - uninstalled
- Version: @VERSION@
--Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
-+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
- 
- Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la
- Cflags: -I${pc_top_builddir}/${pcfiledir}/glib
-diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake
-index 3264ed6..e15e669 100644
---- a/poppler-glib.pc.cmake
-+++ b/poppler-glib.pc.cmake
-@@ -6,7 +6,7 @@ includedir=${prefix}/include
- Name: poppler-glib
- Description: GLib wrapper for poppler
- Version: @POPPLER_VERSION@
--Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
-+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
- @PC_REQUIRES_PRIVATE@
+diff --git a/goo/PNGWriter.cc b/goo/PNGWriter.cc
+index f88c3a7..1fb8cab 100644
+--- a/goo/PNGWriter.cc
++++ b/goo/PNGWriter.cc
+@@ -6,7 +6,7 @@
+ //
+ // Copyright (C) 2009 Warren Toomey <wkt@tuhs.org>
+ // Copyright (C) 2009 Shen Liang <shenzhuxi@gmail.com>
+-// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
++// Copyright (C) 2009, 2011 Albert Astals Cid <aacid@kde.org>
+ // Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
+ // Copyright (C) 2010, 2011 Adrian Johnson <ajohnson@redneon.com>
+ // Copyright (C) 2011 Thomas Klausner <wiz@danbala.tuwien.ac.at>
+@@ -19,6 +19,7 @@
  
- Libs: -L${libdir} -lpoppler-glib
-diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in
-index 04d9bb9..9ba8978 100644
---- a/poppler-glib.pc.in
-+++ b/poppler-glib.pc.in
-@@ -6,7 +6,7 @@ includedir=@includedir@
- Name: poppler-glib
- Description: GLib wrapper for poppler
- Version: @VERSION@
--Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
-+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
- @PC_REQUIRES_PRIVATE@
+ #include <zlib.h>
+ #include <stdlib.h>
++#include <string.h>
  
- Libs: -L${libdir} -lpoppler-glib
+ #include "poppler/Error.h"
+ #include "goo/gmem.h"
 --
 cgit v0.9.0.2-2-gbebe
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 44cf408a9..30d565001 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 141033 2011-10-22 07:52:40Z ibiru $
+# $Id: PKGBUILD 145056 2011-12-15 22:17:57Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url="https://live.gnome.org/PyGObject"
 license=('LGPL')
 makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool')
-sha256sums=('e1eccc37afd2d4cbeb329b92ce3d71287d662dc2fec430c08a0471153e52a462')
+sha256sums=('088b1e682be02a969a0a3f2e650e4fe72bb3638ee8229819841d3e8f4cde2d7c')
 
 build() {
-  cd "${srcdir}"
-  cp -a "${pkgbase}-${pkgver}" python2-build
+  cd "$srcdir"
+  cp -a "$pkgbase-$pkgver" python2-build
   mkdir devel
 
   (
@@ -26,7 +26,7 @@ build() {
   )
 
   (
-    cd "${pkgbase}-${pkgver}"
+    cd "$pkgbase-$pkgver"
     ./configure --prefix=/usr
     make
   )
@@ -34,26 +34,26 @@ build() {
 
 package_python-gobject() {
   pkgdesc="Python 3 bindings for GObject"
-  depends=('gobject-introspection' 'python-cairo' "pygobject-devel=${pkgver}")
+  depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver")
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/{include,lib/pkgconfig}
+  cd "$srcdir/$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install
+  rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
 }
 
 package_python2-gobject() {
   pkgdesc="Python 2 bindings for GObject"
-  depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=${pkgver}")
+  depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver")
 
-  cd "${srcdir}/python2-build"
-  make DESTDIR="${pkgdir}" install
-  mv "${pkgdir}"/usr/{include,lib/pkgconfig} "${srcdir}/devel"
+  cd "$srcdir/python2-build"
+  make DESTDIR="$pkgdir" install
+  mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
 }
 
 package_pygobject-devel() {
   pkgdesc="Development files for the pygobject bindings"
-  cd "${srcdir}/devel"
-  mkdir -p "${pkgdir}"/usr/{include,lib}
-  mv include "${pkgdir}/usr/"
-  mv pkgconfig "${pkgdir}/usr/lib/"
+  cd "$srcdir/devel"
+  mkdir -p "$pkgdir"/usr/{include,lib}
+  mv include "$pkgdir/usr/"
+  mv pkgconfig "$pkgdir/usr/lib/"
 }
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index bce8baf82..f3523f20f 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141387 2011-10-30 11:14:12Z andrea $
+# $Id: PKGBUILD 145329 2011-12-21 20:47:08Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
@@ -7,12 +7,12 @@
 pkgbase=pyqt
 pkgname=('pyqt' 'python2-pyqt')
 pkgver=4.8.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
 makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
-             'python-opengl' 'qt-assistant-compat')
+             'python-opengl' 'qt-assistant-compat' 'qtwebkit')
 source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
 md5sums=('9bfd7b08b8e438b83cc50d5c58191f97')
 
@@ -44,21 +44,21 @@ build() {
 }
 
 package_pyqt(){
-  pkgdesc="A set of Python bindings for the Qt toolkit"
-  depends=('qt' 'python-sip')
+  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
+  depends=('qtwebkit' 'python-sip')
   optdepends=('phonon: enable audio and video in PyQt applications'
               'qscintilla: QScintilla API'
               'qt-assistant-compat: add PyQt online help in Qt Assistant')
   replaces=('python-qt')
   provides=('python-qt')
-  
+
   cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 }
 
 package_python2-pyqt(){
-  pkgdesc="PyQt: A set of Python2 bindings for the Qt toolkit"
+  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
   depends=('pyqt' 'python2-sip' 'dbus-python')
   optdepends=('phonon: enable audio and video in PyQt applications'
               'python-opengl: enable OpenGL 3D graphics in PyQt applications'
@@ -66,6 +66,7 @@ package_python2-pyqt(){
               'qt-assistant-compat: add PyQt online help in Qt Assistant')
   replaces=('python2-qt')
   provides=('python2-qt')
+  options=('!emptydirs')
 
   cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
index 819226d3c..35c6bdc20 100644
--- a/extra/qemu-kvm/PKGBUILD
+++ b/extra/qemu-kvm/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 141295 2011-10-28 08:03:30Z tpowa $
+# $Id: PKGBUILD 145070 2011-12-16 11:39:16Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu-kvm
-pkgver=0.15.1
+pkgver=1.0
 pkgrel=1
 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64 'mips64el')
 license=('GPL2' 'LGPL2.1')
 url="http://www.linux-kvm.org"
-depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng')
+depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'libpulse')
 makedepends=('texi2html' 'perl' 'python2')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu-kvm.install
@@ -25,7 +25,7 @@ build()
     ./configure --prefix=/usr \
                 --python=/usr/bin/python2 \
                 --sysconfdir=/etc \
-                --audio-drv-list=alsa,sdl,oss \
+                --audio-drv-list=alsa,sdl,oss,pa \
                 --audio-card-list=ac97,sb16,es1370,hda \
                 --enable-docs
     make
@@ -54,5 +54,5 @@ package()
       esac
     done
 }
-md5sums=('8800a7d6b3aa4a168ea7f78dc66c0320'
+md5sums=('00a825db46a70ba8ef9fc95da9cc7c1e'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index b949c6ee0..9946907c5 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 141293 2011-10-28 08:03:28Z tpowa $
+# $Id: PKGBUILD 145072 2011-12-16 12:11:13Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
-pkgver=0.15.1
+pkgver=1.0
 pkgrel=1
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
 makedepends=('texi2html' 'perl' 'python2')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl')
+depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl' 'libpulse')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu.install
 source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz
@@ -19,7 +19,7 @@ build()
 {
   cd ${srcdir}/${pkgname}-${pkgver}
   sed -i -e 's/lib64/lib/g' x86_64.ld
-  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \
+  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
               --python=/usr/bin/python2 \
               --audio-card-list=ac97,sb16,es1370,hda \
               --enable-docs
@@ -40,5 +40,5 @@ package() {
     done
 
 }
-md5sums=('34f17737baaf1b3495c89cd6d4a607ed'
+md5sums=('a64b36067a191451323b0d34ebb44954'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 1bb8ceb2b..b2fd9eac9 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,94 +1,68 @@
-# $Id: PKGBUILD 137970 2011-09-13 10:37:07Z andrea $
+# $Id: PKGBUILD 145319 2011-12-21 20:46:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
-pkgver=4.7.4
-pkgrel=3
+pkgver=4.8.0
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
-url='http://qt.nokia.com/'
+url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
 makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
     'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
     'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
     'mysql' 'unixodbc' 'cups' 'gtk2')
 options=('!libtool')
-_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
-source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
+_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
+source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-        'qtconfig.desktop'
-        'blacklist-diginotar-certs.diff')
-md5sums=('9831cf1dfa8d0689a06c2c54c5c65aaf'
+        'qtconfig.desktop')
+md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
          'fc211414130ab2764132e7370f8e5caa'
          '85179f5e0437514f8639957e1d8baf62'
          'f11852b97583610f3dbb669ebc3e21bc'
-         '6b771c8a81dd90b45e8a79afa0e5bbfd'
-         'd875a2a7639de3bd63dc519c13b4d069')
+         '6b771c8a81dd90b45e8a79afa0e5bbfd')
 
 build() {
-	unset QMAKESPEC
-	export QT4DIR=$srcdir/$_pkgfqn
-	export PATH=${QT4DIR}/bin:${PATH}
-	export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+  cd "${srcdir}"/${_pkgfqn}
 
-# Disable precompiled headers for mips64el
-  [ "$CARCH" = "mips64el" ] && {
-    export CXXFLAGS="$CXXFLAGS -fpermissive"
-    extra="-no-pch"
-  }
+  export QT4DIR="${srcdir}"/${_pkgfqn}
+  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
-    # FS#24601
-    export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+  [ "${CARCH}" = "mips64el" ] && export CXXFLAGS="${CXXFLAGS} -fpermissive"
 
-	cd $srcdir/$_pkgfqn
+  sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf
+  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
+  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
 
-    patch -p1 -i "${srcdir}"/blacklist-diginotar-certs.diff
-
-    sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
-	sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
-	sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
-
-	./configure -confirm-license -opensource \
-		-prefix /usr \
-		-docdir /usr/share/doc/qt \
-		-plugindir /usr/lib/qt/plugins \
-		-importdir /usr/lib/qt/imports \
-		-datadir /usr/share/qt \
-		-translationdir /usr/share/qt/translations \
-		-sysconfdir /etc \
-		-examplesdir /usr/share/doc/qt/examples \
-		-demosdir /usr/share/doc/qt/demos \
-		-largefile \
-		-plugin-sql-{psql,mysql,sqlite,odbc} \
-		-system-sqlite \
-		-xmlpatterns \
-		-no-phonon \
-		-no-phonon-backend \
-		-svg \
-		-webkit \
-		-script \
-		-scripttools \
-		-system-zlib \
-		-system-libtiff \
-		-system-libpng \
-		-system-libmng \
-		-system-libjpeg \
-		-nomake demos \
-		-nomake examples \
-		-nomake docs \
-		-no-rpath \
-		-openssl-linked \
-		-silent \
-		-optimized-qmake \
-		-dbus \
-		-reduce-relocations \
-		-no-separate-debug-info \
-		-gtkstyle \
-		-opengl \
-		-no-openvg \
-		-glib $extra
-	make
+  ./configure -confirm-license -opensource \
+    -prefix /usr \
+    -docdir /usr/share/doc/qt \
+    -plugindir /usr/lib/qt/plugins \
+    -importdir /usr/lib/qt/imports \
+    -datadir /usr/share/qt \
+    -translationdir /usr/share/qt/translations \
+    -sysconfdir /etc \
+    -examplesdir /usr/share/doc/qt/examples \
+    -demosdir /usr/share/doc/qt/demos \
+    -plugin-sql-{psql,mysql,sqlite,odbc} \
+    -system-sqlite \
+    -no-phonon \
+    -no-phonon-backend \
+    -no-webkit \
+    -graphicssystem raster \
+    -openssl-linked \
+    -nomake demos \
+    -nomake examples \
+    -nomake docs \
+    -silent \
+    -no-rpath \
+    -optimized-qmake \
+    -reduce-relocations \
+    -dbus-linked \
+    -no-openvg
+  make
 }
 
 package_qt() {
@@ -97,51 +71,58 @@ package_qt() {
       'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
       'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
     optdepends=('postgresql-libs: PostgreSQL driver'
-	  'libmysqlclient: MySQL driver'
-	  'unixodbc: ODBC driver'
-	  'libxinerama: Xinerama support'
-	  'libxcursor: Xcursor support'
-	  'libxfixes: Xfixes support')
+                'libmysqlclient: MySQL driver'
+                'unixodbc: ODBC driver'
+                'libxinerama: Xinerama support'
+                'libxcursor: Xcursor support'
+                'libxfixes: Xfixes support')
     install='qt.install'
-	
-    cd $srcdir/$_pkgfqn
-	make INSTALL_ROOT=$pkgdir install
 
-	# install missing icons and desktop files
-	for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
-		size=$(echo $(basename ${icon}) | cut -d- -f2)
-		install -p -D -m644 ${icon} ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png
-	done
-	install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png
-	install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png
-	install -p -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png
-	install -d ${pkgdir}/usr/share/applications
-	install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/
+    cd "${srcdir}"/${_pkgfqn}
+    make INSTALL_ROOT="${pkgdir}" install
+
+    # install missing icons and desktop files
+    for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
+      size=$(echo $(basename ${icon}) | cut -d- -f2)
+      install -p -D -m644 ${icon} \
+        "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
+    done
+    install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \
+      "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
+    install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \
+      "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
+    install -p -D -m644 tools/designer/src/designer/images/designer.png \
+      "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
+    install -d "${pkgdir}/usr/share/applications"
+    install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \
+      "${pkgdir}/usr/share/applications/"
+
+    # install license addition
+    install -D -m644 LGPL_EXCEPTION.txt \
+      ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
 
-	# install license addition
-	install -D -m644 LGPL_EXCEPTION.txt ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
+    # Fix wrong path in pkgconfig files
+    find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
+      -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
 
-	# Fix wrong path in pkgconfig files
-	find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \
-		-exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
-	# Fix wrong path in prl files
-	find ${pkgdir}/usr/lib -type f -name '*.prl' \
-		-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+    # Fix wrong path in prl files
+    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
 }
 
 package_qt-private-headers(){
     pkgdesc="Qt private headers for development"
     depends=("qt=${pkgver}")
 
-    install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
-    install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script}
+    install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
+    install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script}
     
     for i in QtCore QtDeclarative QtGui QtScript; do
-      cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \
-        ${pkgdir}/usr/include/${i}/
+      cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \
+        "${pkgdir}"/usr/include/${i}/
     done
 
     for i in corelib declarative gui script; do
-      cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/
+      cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/
     done
 }
diff --git a/extra/qt/qt.install b/extra/qt/qt.install
index 81ce5c4b0..5495fb1b5 100644
--- a/extra/qt/qt.install
+++ b/extra/qt/qt.install
@@ -1,12 +1,12 @@
 post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
     update-desktop-database -q
 }
 
 post_upgrade() {
-	post_install
+    post_install
 }
 
 post_remove() {
-	post_install
+    post_install
 }
diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index 47ad18e13..b70ce9348 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -1,55 +1,45 @@
-# $Id: PKGBUILD 123699 2011-05-12 15:47:03Z andrea $
-# Maintainer:
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
+# $Id: PKGBUILD 145341 2011-12-21 20:47:33Z andrea $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=qt3
 pkgver=3.3.8
-pkgrel=20
+pkgrel=21
 pkgdesc="The QT3 gui toolkit"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
 url="http://www.trolltech.com/products/qt/index.html"
-pkgfqn=qt-x11-free-${pkgver}
-install=qt.install
+license=('GPL')
 depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft'
          'libxrandr' 'libmng')
 makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3')
 optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
-source=("ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2"
-        qt3-png14.patch
-        qt.profile
-        qt-copy-kde-patches.tar.bz2
-        qt-patches.tar.bz2
-        utf8-bug-qt3.diff
-	    qt-font-default-subst.diff
-        mysql.patch
-        eastern_asian_languagues.diff
-        qt-odbc.patch
-        gcc-4.6.patch)
-options=(!libtool)
-md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85'
-         '1dc671df42b9030dbdf68bb61cd3375e'
-         'f72d1eb4eb49b9a9467c1f6035194266'
-         'f2a2dbdbfee9422c90efc3ef3f86197c'
-         '2f00e5c0c1e2c2a23dddc982cd79f3e0'
-         'f6b3b39040f2b8f19ba1cf1445468c28'
-         '9370d82e85f2c799335ed0dcc1d53189'
-         '7d40ed1bd40d33d8b9b27a2076a5d22a'
-         '616f1f3029cf8375256ad6a406de3549'
-         '2178ca88dfd75a230918593b30eb0dbe'
-         '75177de5b08e1efd437c887c6e606c5b')
+options=('!libtool')
+install=qt.install
+source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.bz2
+        qt.profile qt3-png14.patch qt-copy-kde-patches.tar.bz2
+        qt-patches.tar.bz2 utf8-bug-qt3.diff qt-font-default-subst.diff
+        mysql.patch eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
+sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7'
+          'd2e257a9011208b2cb81b9cf47915b9a2f9dab83'
+          'c8ea644266f4d6d6be9adf894f03138b8eca3fc2'
+          '9cb2e5bec782069692ee337cfa171539d9d73753'
+          '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
+          'ca5ecb29c7f1c826d48703339a3371038e306bb7'
+          'd928ff55adb52c4bab2fb268df022651551cd70c'
+          'bb6aad81cce143c23ff7840b1d79f6b2007a0c04'
+          '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17'
+          '1346320614f6f86fbeb10b9fbad721dea29f5b61'
+          'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f')
 
 # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
 # other qt-patches come from fedora and gentoo
 
 build() {
   unset QMAKESPEC
-  export QTDIR="${srcdir}"/$pkgfqn
+  export QTDIR="${srcdir}"/qt-x11-free-${pkgver}
   export PATH=${QTDIR}/bin:${PATH}
   export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
   export QMAKESPEC=$QTDIR/mkspecs/linux-g++
-  cd "${srcdir}"/$pkgfqn
+  cd "${srcdir}"/qt-x11-free-${pkgver}
   # apply qt patches from kde.org
   for i in ../qt-copy-kde-patches/*; do
     patch -Np0 -i $i 
@@ -105,30 +95,30 @@ build() {
     -plugin-sql-{mysql,psql,sqlite,odbc}
 
   # fix /opt/qt/lib path
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/src/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/designer/designer/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/designer/editor/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/assistant/lib/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/designer/uilib/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile
 
-  cd "${srcdir}"/$pkgfqn
+  cd "${srcdir}"/qt-x11-free-${pkgver}
   make -C qmake 
-  cd "${srcdir}"/$pkgfqn/plugins/src/sqldrivers/mysql
-  "${srcdir}"/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
-  cd "${srcdir}"/$pkgfqn/plugins/src/sqldrivers/psql
-  "${srcdir}"/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
+  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql
+  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
+  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql
+  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
 
-  cd "${srcdir}"/$pkgfqn
+  cd "${srcdir}"/qt-x11-free-${pkgver}
   # fix the broken makefiles
   #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
   make
 }
 
 package() {
-  cd "${srcdir}"/$pkgfqn
+  cd "${srcdir}"/qt-x11-free-${pkgver}
   make INSTALL_ROOT="${pkgdir}" install
   rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations}
-  sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl
+  sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl
   install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake
   install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh
   ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config 
@@ -136,7 +126,7 @@ package() {
 
   # install man pages
   install -d -m755 "${pkgdir}"/opt/qt/man
-  cp -r "${srcdir}"/$pkgfqn/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/
+  cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/
 
   install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
   echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
new file mode 100644
index 000000000..ad8e6471d
--- /dev/null
+++ b/extra/qtwebkit/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 145321 2011-12-21 20:46:56Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=qtwebkit
+pkgver=2.2.0
+pkgrel=3
+arch=('i686' 'x86_64' 'mips64el')
+url='http://trac.webkit.org/wiki/QtWebKit'
+pkgdesc='An open source web browser engine (Qt port)'
+license=('LGPL2.1' 'GPL3')
+depends=('qt' 'gperf' 'bison' 'phonon' 'gstreamer0.10-base')
+makedepends=('python2' 'mesa' 'chrpath')
+conflicts=('qt<4.8')
+source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz"
+        'python2-path.patch')
+sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7'
+          'b0ef3d5596171e3900a685df9bcfac3068ad6330')
+
+build() {
+  cd "${srcdir}"/QtWebKit-${pkgver}
+
+  patch -p1 -i "${srcdir}"/python2-path.patch
+
+  cd Tools/Scripts
+  ./build-webkit --qt \
+    --prefix=/usr \
+    --makeargs="${MAKEFLAGS}" \
+    --release \
+    --3d-canvas
+}
+
+package() {
+  cd "${srcdir}"/QtWebKit-${pkgver}
+  make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
+
+  # Fix RPATH
+  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so
+}
diff --git a/extra/qtwebkit/python2-path.patch b/extra/qtwebkit/python2-path.patch
new file mode 100644
index 000000000..2e270e6fc
--- /dev/null
+++ b/extra/qtwebkit/python2-path.patch
@@ -0,0 +1,29 @@
+--- QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro~	2011-10-20 22:39:56.044519075 +0000
++++ QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro	2011-10-20 22:41:21.302047082 +0000
+@@ -88,5 +88,5 @@
+ retgen.output = $$JSC_GENERATED_SOURCES_DIR/RegExpJitTables.h
+ retgen.wkScript = $$PWD/create_regex_tables 
+ retgen.input = retgen.wkScript
+-retgen.commands = python $$retgen.wkScript > ${QMAKE_FILE_OUT}
++retgen.commands = python2 $$retgen.wkScript > ${QMAKE_FILE_OUT}
+ addExtraCompiler(retgen)
+--- QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri~	2011-10-20 22:44:23.827225580 +0000
++++ QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri	2011-10-20 22:44:38.550707819 +0000
+@@ -640,7 +640,7 @@
+ inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl
+ inspectorJSON.input = INSPECTOR_JSON
+ inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl
+-inspectorJSON.commands = python $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
++inspectorJSON.commands = python2 $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
+ inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl
+ inspectorJSON.wkAddOutputToSources = false
+ addExtraCompiler(inspectorJSON)
+@@ -723,7 +723,7 @@
+ entities.output = $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp
+ entities.input = HTML_ENTITIES
+ entities.wkScript = $$PWD/html/parser/create-html-entity-table
+-entities.commands = python $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
++entities.commands = python2 $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
+ entities.clean = ${QMAKE_FILE_OUT}
+ entities.depends = $$PWD/html/parser/create-html-entity-table
+ addExtraCompiler(entities)
diff --git a/extra/quota-tools/PKGBUILD b/extra/quota-tools/PKGBUILD
index b7b18e573..02cd679dd 100644
--- a/extra/quota-tools/PKGBUILD
+++ b/extra/quota-tools/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=quota-tools
 pkgver=4.00_pre1 
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Tools to manage kernel-level quotas in Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/linuxquota/"
diff --git a/extra/recode/PKGBUILD b/extra/recode/PKGBUILD
index 24e6e30be..5e5d4b5e9 100644
--- a/extra/recode/PKGBUILD
+++ b/extra/recode/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=recode
 pkgver=3.6
-pkgrel=6
+pkgrel=6.1
 pkgdesc="Converts files between various character sets and usages"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://recode.progiciels-bpi.ca/index.html"
diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD
index c6fe0f765..dda91982a 100644
--- a/extra/redland/PKGBUILD
+++ b/extra/redland/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144346 2011-12-04 21:50:29Z eric $
+# $Id: PKGBUILD 145343 2011-12-21 20:47:36Z andrea $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Francois Charette <francois.archlinux.org> 
 
@@ -6,16 +6,17 @@ pkgbase=redland
 epoch=1
 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
 pkgver=1.0.15
-pkgrel=1
+pkgrel=2
 url="http://librdf.org/"
 license=("GPL")
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
 options=('!libtool')
-source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz
+source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc}
         rpath.diff)
-md5sums=('b0deb87f3c7d3237a3d587c1e0f2f266'
-         'acc85e784f01a656bd56777f95880787')
+sha1sums=('e93d6fafaeebdf9f15a1044be6f4a88270f007af'
+          '3aeef38a7247ae33db6a0a19511ef4132240164b'
+          'f5db05c925b6bcd6402d5abd75c648b137f069c7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -34,7 +35,7 @@ build() {
 
 package_redland() {
  pkgdesc="Library that provides a high-level interface to RDF data"
- depends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'libtool')
+ depends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'libltdl')
  
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD
index 2d997b7ae..55ac92d18 100644
--- a/extra/sg3_utils/PKGBUILD
+++ b/extra/sg3_utils/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=sg3_utils
 pkgver=1.30
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Generic SCSI utilities"
 arch=(i686 x86_64 'mips64el')
 url="http://sg.danny.cz/sg/sg3_utils.html"
diff --git a/extra/skanlite/PKGBUILD b/extra/skanlite/PKGBUILD
index 5b40b1484..a2905c132 100644
--- a/extra/skanlite/PKGBUILD
+++ b/extra/skanlite/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 133044 2011-07-27 07:39:38Z andrea $
+# $Id: PKGBUILD 145180 2011-12-19 08:38:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=skanlite
-pkgver=0.7
-pkgrel=2
+pkgver=0.8
+pkgrel=1
 pkgdesc="Image Scanning Application for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://kde-apps.org/content/show.php?content=109803'
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('kdebase-runtime' 'libksane')
 makedepends=('pkgconfig' 'cmake' 'automoc4')
 source=("http://downloads.sourceforge.net/sanewidget/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('cb256c392210c43d51e317c6a5ba9ad2')
+md5sums=('baa43dbc78be696e121969b0a3d88929')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD
index cede125ec..e95df0362 100644
--- a/extra/smartmontools/PKGBUILD
+++ b/extra/smartmontools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143965 2011-11-30 23:00:34Z giovanni $
+# $Id: PKGBUILD 145192 2011-12-19 12:38:49Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Jani Talikka <jani.talikka@gmail.com>
@@ -6,12 +6,12 @@
 
 pkgname=smartmontools
 pkgver=5.42
-pkgrel=2
+pkgrel=3
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives"
 url="http://smartmontools.sourceforge.net"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('gcc-libs')
+depends=('gcc-libs' 'libcap-ng')
 backup=('etc/smartd.conf'
         'etc/conf.d/smartd')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
@@ -26,7 +26,8 @@ build() {
 
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
-              --enable-drivedb
+              --enable-drivedb \
+              --with-libcap-ng=yes
   make
 }
 
diff --git a/extra/speex/PKGBUILD b/extra/speex/PKGBUILD
index 8acbf9792..a3d004e85 100644
--- a/extra/speex/PKGBUILD
+++ b/extra/speex/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=speex
 pkgver=1.2rc1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A free codec for free speech"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.speex.org/"
diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD
index d9b5ee2db..f0a043b9e 100644
--- a/extra/squid/PKGBUILD
+++ b/extra/squid/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=squid
 pkgver=3.1.16
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A full-featured Web proxy cache server."
 arch=(i686 x86_64 'mips64el')
 url="http://www.squid-cache.org"
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index d329c545e..08f37c7ef 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143691 2011-11-28 12:26:53Z ibiru $
+# $Id: PKGBUILD 145052 2011-12-15 21:38:17Z 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.3
+pkgver=0.16.4
 pkgrel=1
 pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 depends=('dbus-glib')
 makedepends=('libxslt' 'vala' 'gobject-introspection')
 source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('5c0cd5da2ce6257017751573e35c88ee')
+md5sums=('8335f83117323d2c1b8b012c233b7e4e')
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD
index 90f24162e..93f9dd16f 100644
--- a/extra/telepathy-idle/PKGBUILD
+++ b/extra/telepathy-idle/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=telepathy-idle
 pkgver=0.1.11
-pkgrel=1
+pkgrel=1.1
 pkgdesc="An IRC connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
diff --git a/extra/thunar-volman/PKGBUILD b/extra/thunar-volman/PKGBUILD
index 413379a29..b801223a0 100644
--- a/extra/thunar-volman/PKGBUILD
+++ b/extra/thunar-volman/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=thunar-volman
 pkgver=0.6.0
-pkgrel=2
+pkgrel=2.1
 pkgdesc="automatic management for removeable devices in thunar"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
diff --git a/extra/tidyhtml/PKGBUILD b/extra/tidyhtml/PKGBUILD
index d39fda268..f0342dc9c 100644
--- a/extra/tidyhtml/PKGBUILD
+++ b/extra/tidyhtml/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=tidyhtml
 # obtain pkgver from http://tidy.cvs.sourceforge.net/tidy/tidy/src/version.h?view=markup
 pkgver=1.46
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A tool to tidy down your HTML code to a clean style"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tidy.sourceforge.net/"
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index ef949521b..cbeb63099 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 143537 2011-11-26 00:25:40Z heftig $
+# $Id: PKGBUILD 145110 2011-12-17 04:30:48Z 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.8
+pkgver=0.12.9
 _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=('92b18cc381a80d87d52e386f51ca1475b94f82cf5adf668424669c5b63474473')
+sha256sums=('ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD
index 55850a084..f42dd8ab0 100644
--- a/extra/twisted/PKGBUILD
+++ b/extra/twisted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 126682 2011-06-06 14:53:30Z ibiru $
+# $Id: PKGBUILD 145135 2011-12-17 16:20:46Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=twisted
-pkgver=11.0.0
+pkgver=11.1.0
 pkgrel=1
 pkgdesc="Asynchronous networking framework written in Python."
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,21 +14,21 @@ depends=('python2' 'pycrypto' 'zope-interface')
 optdepends=('python2-pyopenssl'
             'python-soappy:for twisted.web.soap')
 install=twisted.install
-source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-${pkgver}.tar.bz2)
-md5sums=('d7f94a1609a1b8f3b8c8d0146d4cfe54')
+source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
+md5sums=('972f3497e6e19318c741bf2900ffe31c')
 
 build() {
-    cd "${srcdir}/Twisted-${pkgver}"
+    cd "$srcdir/Twisted-$pkgver"
     python2 setup.py build
 }
 
 package() {
-    cd "${srcdir}/Twisted-${pkgver}"
-    python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1
-    install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    cd "$srcdir/Twisted-$pkgver"
+    python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+    install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
     sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-        -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py
+        -i "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py
     sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-        -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py
+        -i "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py
 }
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index 6e68c52ef..b891e8a9f 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=udisks
 pkgver=1.0.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
diff --git a/extra/umfpack/PKGBUILD b/extra/umfpack/PKGBUILD
index 7e1772adc..d2e8aa764 100644
--- a/extra/umfpack/PKGBUILD
+++ b/extra/umfpack/PKGBUILD
@@ -10,12 +10,15 @@ _amdver=2.2.1
 _cholmodver=1.7.1
 _colamdver=2.7.2
 _ccolamdver=2.7.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A multifrontal direct solver for unsymmetric linear systems (AMD/${_amdver}, UFConfig/${_ufcgfgver})"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cise.ufl.edu/research/sparse/umfpack"
 license=('LGPL')
 makedepends=('lapack' 'blas')
+noextract=(CHOLMOD-${_cholmodver}.tar.gz
+	COLAMD-${_colamdver}.tar.gz
+	CCOLAMD-${_ccolamdver}.tar.gz)
 source=(http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-$pkgver.tar.gz
 	http://www.cise.ufl.edu/research/sparse/UFconfig/UFconfig-${_ufcfgver}.tar.gz
 	http://www.cise.ufl.edu/research/sparse/amd/AMD-${_amdver}.tar.gz
@@ -35,8 +38,7 @@ build() {
   cd "$srcdir/UMFPACK"
   cp -rf "$srcdir/UFconfig/xerbla" .
   cp -L ../UFconfig.mk $startdir/src/UFconfig
-  [ "${CARCH}" != "i686" ] && CFLAGS="${CFLAGS} -fPIC"
-  sed -ri 's#^((C|F77)FLAGS = ).*#\1'"$CFLAGS"'#' $srcdir/UFconfig/UFconfig.mk
+  [ $CARCH != "i686" ] && sed -i 's#CFLAGS = -O3 -fexceptions#CFLAGS = -O3 -fexceptions -fPIC#' $srcdir/UFconfig/UFconfig.mk
   make library || return 1
   install -d "$pkgdir/usr/lib" "$pkgdir/usr/include"
 
diff --git a/extra/unixodbc/PKGBUILD b/extra/unixodbc/PKGBUILD
index 364881d66..7437a1d03 100644
--- a/extra/unixodbc/PKGBUILD
+++ b/extra/unixodbc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 137809 2011-09-11 11:42:08Z pierre $
+# $Id: PKGBUILD 145345 2011-12-21 20:47:39Z andrea $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=unixodbc
-pkgver=2.3.0
-pkgrel=2.1
+pkgver=2.3.1
+pkgrel=1
 pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
@@ -14,7 +14,7 @@ backup=('etc/odbc.ini' 'etc/odbcinst.ini')
 depends=('readline' 'libltdl')
 options=('!libtool')
 source=("http://www.unixodbc.org/unixODBC-$pkgver.tar.gz")
-md5sums=('f2ad22cbdffe836c58987ed2332c2e99')
+md5sums=('86788d4006620fa1f171c13d07fdcaab')
 
 build() {
     cd ${srcdir}/unixODBC-${pkgver}
diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD
index f824436cd..d2c3f139c 100644
--- a/extra/vcdimager/PKGBUILD
+++ b/extra/vcdimager/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=vcdimager
 pkgver=0.7.24
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vcdimager.org/"
diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD
index 3b4b25f6d..7697cd05e 100644
--- a/extra/vde2/PKGBUILD
+++ b/extra/vde2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 87311 2010-08-12 11:45:43Z tpowa $
+# $Id: PKGBUILD 145068 2011-12-16 10:55:34Z tpowa $
 # Contributor: Sergej Pupykin
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=vde2
-pkgver=2.3.1
+pkgver=2.3.2
 pkgrel=1
 pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
 url="http://sourceforge.net/projects/vde/"
@@ -18,13 +18,17 @@ source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2
         vde.conf
         vde.rc)
 install=vde2.install
-options=(!libtool)
+options=(!libtool !makeflags)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \
              --enable-experimental
-  make 
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver 
   make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install
   install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde
   install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde
@@ -35,7 +39,8 @@ build() {
   # install slirp license
   install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde
 }
-md5sums=('22a7913beb50d6706155fc502ff3cbbe'
+
+md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628'
          '7d9bc56d2e561d849e915000d1c0f269'
          'a920123fc620bcedbccb703a8d1bdc55'
          'cb8ace28e8efd4dad128be4be71b3b07'
diff --git a/extra/vde2/vde2.install b/extra/vde2/vde2.install
index 5005fb448..74e1710ff 100644
--- a/extra/vde2/vde2.install
+++ b/extra/vde2/vde2.install
@@ -8,7 +8,3 @@ post_install() {
 post_upgrade() {
   post_install $1
 }
-
-op=$1
-shift
-$op $*
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index be817dda5..9551054de 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 144439 2011-12-05 19:49:38Z andyrtr $
+# $Id: PKGBUILD 145277 2011-12-21 01:41:22Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
-pkgver=1.1.12
-pkgrel=5
+pkgver=1.1.13
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
@@ -53,18 +53,14 @@ backup=('usr/share/vlc/http/.hosts'
         'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!libtool')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'bp-set-channel-map-pulseaudio-1.0.patch')
-md5sums=('91de1ad308c947e35380f9d747ff5713'
-         'bae24e02207364d76a1a118644de484e')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('9678fb7a04808b6e0de63746d35e4bb1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
 
-  patch -Np1 -i ${srcdir}/bp-set-channel-map-pulseaudio-1.0.patch
-
   if [ "$CARCH" = "mips64el" ]; then
   ./configure --prefix=/usr \
               --disable-rpath \
@@ -80,7 +76,6 @@ build() {
               --enable-upnp \
               --enable-realrtsp
   else
-
   ./configure --prefix=/usr \
               --disable-rpath \
               --enable-faad \
diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD
index 3d25c530a..844367692 100644
--- a/extra/wxmaxima/PKGBUILD
+++ b/extra/wxmaxima/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=wxmaxima
 pkgver=11.08.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wxmaxima.sourceforge.net/"
diff --git a/extra/xdelta/PKGBUILD b/extra/xdelta/PKGBUILD
index c50fe5969..1791df648 100644
--- a/extra/xdelta/PKGBUILD
+++ b/extra/xdelta/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91165 2010-09-23 14:13:09Z allan $
+# $Id: PKGBUILD 145275 2011-12-21 01:19:51Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=xdelta
 pkgver=1.1.4
-pkgrel=3
+pkgrel=4
 pkgdesc="binary file delta generator"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/xdelta/"
diff --git a/extra/xdelta3/PKGBUILD b/extra/xdelta3/PKGBUILD
index a7d6c3533..65dbad1d2 100644
--- a/extra/xdelta3/PKGBUILD
+++ b/extra/xdelta3/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: $
+# $Id: PKGBUILD 145279 2011-12-21 02:07:07Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com>
 # Contributor: Henning Garus <henning.garus@gmail.com>
 
 pkgname=xdelta3
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A diff utility which works with binary files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xdelta.org/"
@@ -15,15 +15,25 @@ optdepends=('python2: for python modules')
 source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz
         xdelta3-makefile.patch)
 md5sums=('5fe038be3a266d2a7913e10d1cec6d88'
-         '378e9a735d92fb2fc695ed9ce2fad2d5')
+         'fa5973870faf7523043c4858ab7c3bdb')
 
 build() {
   cd $srcdir/xdelta$pkgver
+
   patch -Np1 -i $srcdir/xdelta3-makefile.patch
   sed -i "/PYVER = /s/2.6/2.7/" Makefile
   
   make xdelta3
   make xdelta3module.so
+  
+  # for testsuite
+  make xdelta3-debug
+}
+
+check() {
+  cd $srcdir/xdelta$pkgver
+
+  make test
 }
 
 package() {
diff --git a/extra/xdelta3/xdelta3-makefile.patch b/extra/xdelta3/xdelta3-makefile.patch
index 3085d3c29..d5fa12e70 100644
--- a/extra/xdelta3/xdelta3-makefile.patch
+++ b/extra/xdelta3/xdelta3-makefile.patch
@@ -1,7 +1,34 @@
-diff -Naur xdelta3.0v-old/Makefile xdelta3.0v/Makefile
---- xdelta3.0v-old/Makefile	2009-03-12 01:44:51.000000000 +0000
-+++ xdelta3.0v/Makefile	2009-03-14 17:02:33.000000000 +0000
-@@ -200,6 +200,9 @@
+diff -Naur xdelta3.0.0-orig/Makefile xdelta3.0.0/Makefile
+--- xdelta3.0.0-orig/Makefile	2011-01-09 18:29:06.000000000 +1000
++++ xdelta3.0.0/Makefile	2011-12-21 11:53:13.530028738 +1000
+@@ -54,7 +54,7 @@
+ WIXDIR = "/cygdrive/c/Program Files/wix2.0.4820"
+ 
+ # -arch x86_64
+-CFLAGS= -Wall -Wshadow -fno-builtin
++CFLAGS+= -Wall -Wshadow -fno-builtin
+ WFLAGS= -Wextra -Wsign-compare -Wconversion -Wextra -Wno-unused-parameter
+ 
+ # $Format: "REL=$Xdelta3Version$" $
+@@ -126,7 +126,7 @@
+ 	$(WIXDIR)/light.exe xdelta3.wixobj -out xdelta3.msi
+ 
+ xdelta3: $(SOURCES)
+-	$(CC) $(CFLAGS) -O3 xdelta3.c -lm -o xdelta3 \
++	$(CC) $(CFLAGS) -O3 xdelta3.c -lm $(LDFLAGS) -o xdelta3 \
+ 	      -DGENERIC_ENCODE_TABLES=0 \
+ 	      -DREGRESSION_TEST=1 \
+ 	      -DSECONDARY_DJW=1 \
+@@ -137,7 +137,7 @@
+ 	      -DXD3_USE_LARGEFILE64=1
+ 
+ xdelta3-debug: $(SOURCES)
+-	$(CC) -g $(CFLAGS) xdelta3.c -lm -o xdelta3-debug \
++	$(CC) -g $(CFLAGS) xdelta3.c -lm $(LDFLAGS) -o xdelta3-debug \
+ 		-DGENERIC_ENCODE_TABLES=1 \
+ 		-DREGRESSION_TEST=1 \
+ 		-DSECONDARY_DJW=1 \
+@@ -202,6 +202,9 @@
  xdelta3.o: $(SOURCES)
  	$(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o
  
@@ -11,14 +38,14 @@ diff -Naur xdelta3.0v-old/Makefile xdelta3.0v/Makefile
  xdelta3_wrap.o: xdelta3_wrap.c
  	$(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \
  	      -DHAVE_CONFIG_H \
-@@ -218,8 +221,8 @@
+@@ -221,8 +224,8 @@
  	cp $(SWIGTGT) /usr/lib/python$(PYVER)/site-packages
  
  ifeq ("$(DARWIN)", "")
 -xdelta3module.so: xdelta3_wrap.o xdelta3.o
 -	ld -shared xdelta3.o xdelta3_wrap.o \
 +xdelta3module.so: xdelta3_wrap.o xdelta3_PIC.o
-+	cc -shared xdelta3_PIC.o xdelta3_wrap.o \
++	cc $(CFLAGS) $(LDFLAGS) -shared xdelta3_PIC.o xdelta3_wrap.o \
  		-o xdelta3module.so \
  		/usr/lib/libpython$(PYVER).so \
  		-lc
diff --git a/extra/xfwm4/PKGBUILD b/extra/xfwm4/PKGBUILD
index c7f2e6d81..aa611a491 100644
--- a/extra/xfwm4/PKGBUILD
+++ b/extra/xfwm4/PKGBUILD
@@ -1,39 +1,41 @@
-# $Id: PKGBUILD 138685 2011-09-27 16:03:39Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 145260 2011-12-20 17:23:04Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfwm4
-pkgver=4.8.2
+pkgver=4.8.3
 pkgrel=1
 pkgdesc="Xfce window manager"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
 url="http://www.xfce.org/"
+license=('GPL2')
 groups=('xfce4')
-depends=("libxfce4ui" 'libwnck' 'hicolor-icon-theme')
+depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('41b730d5abf39a69fc3b221728ddaa75')
-sha1sums=('7822408eaddd9fc4937d9e6825eda7d56dc46b06')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('0b0e8bea0b257958ad416ab5678cf0cdd7e909943d4d5ab32afc35295a78227e')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
+
   ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--enable-startup-notification \
-	--enable-randr \
-	--enable-compositor \
-	--enable-xsync \
-	--disable-debug
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-startup-notification \
+    --enable-randr \
+    --enable-compositor \
+    --enable-xsync \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfwm4/xfwm4.install b/extra/xfwm4/xfwm4.install
index 21b79d2d4..e4f8fd06c 100644
--- a/extra/xfwm4/xfwm4.install
+++ b/extra/xfwm4/xfwm4.install
@@ -3,9 +3,11 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index c2c9c34a2..510016849 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142918 2011-11-18 09:17:26Z jgc $
+# $Id: PKGBUILD 145131 2011-12-17 09:42:49Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.11.2
-pkgrel=2.1
+pkgver=1.11.3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -15,20 +15,17 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
         autoconfig-sis.patch
         revert-trapezoids.patch
-        git-fixes.patch
+        #git-fixes.patch
         xserver-1.11.2-record-crasher.patch
-        Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf
 	loongson.patch)
-md5sums=('8796fff441e5435ee36a72579008af24'
+md5sums=('a7194c437963627e1db0dd2d6c1a1984'
          '6c7e87d63ac4b535e19a80c89d0cf091'
          'f8194638ca4872c2b0a67862a70bcebf'
          'f6c84f4936f8e00abdfbd9fb4eda83fb'
-         '6fb42ec979ecd6125b6599f54dc00d14'
          '3f9de4dbfee2da90167192d8ca9eb2b4'
-         '47f9b979fe38043b42ff86eeee6fd0d0'
          '52fd3effd80d7bc6c1660d4ecf23d31c'
          '376c70308715cd2643f7bff936d9934b'
          'd4f7dfc6be4ef4e2c6dd7632a9d88abe'
@@ -47,16 +44,12 @@ build() {
   patch -Np1 -i "${srcdir}/revert-trapezoids.patch"
 
   # Add post-release patches from 1.11 branch
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
+#  patch -Np1 -i "${srcdir}/git-fixes.patch"
 
   # From Fedora.
   # Upstream URL: http://patchwork.freedesktop.org/patch/7866/
   patch -Np1 -i "${srcdir}/xserver-1.11.2-record-crasher.patch"
 
-  # From Fedora.
-  # Upstream URL: https://bugs.freedesktop.org/show_bug.cgi?id=42298
-  patch -Np1 -i "${srcdir}/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch"
-
   # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html
   patch -Np1 -i "${srcdir}/loongson.patch"
 
diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD
index e313a264b..982c75feb 100644
--- a/extra/xorg-xinit/PKGBUILD
+++ b/extra/xorg-xinit/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 140273 2011-10-11 21:27:57Z jgc $
+# $Id: PKGBUILD 145242 2011-12-19 22:24:21Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xorg-xinit
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('libx11' 'xorg-xauth')
+depends=('libx11' 'xorg-xauth' 'inetutils')
 makedepends=('xorg-util-macros')
 optdepends=('xorg-twm' 'xterm')
 backup=('etc/skel/.xinitrc'
@@ -18,12 +18,14 @@ backup=('etc/skel/.xinitrc'
         'etc/X11/xinit/xinitrc')
 source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
         06_move_serverauthfile_into_tmp.diff
+        fs25361.patch
         xinitrc
         xsession
         xserverrc)
 options=(!emptydirs)
 md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4'
          'abd072ec435ce084cf4e89c58f83d45c'
+         '73a597d3fb7f5b9487318ac8cfd4bedf'
          'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
          '7873d97db30d6c279ed37e3559e7c59d'
          'c5baef10fdb7239594daee72a94ddab3')
@@ -31,6 +33,7 @@ md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4'
 build() {
   cd "${srcdir}/xinit-${pkgver}"
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
+  patch -Np1 -i "${srcdir}/fs25361.patch"
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
   ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
   make
diff --git a/extra/xorg-xinit/fs25361.patch b/extra/xorg-xinit/fs25361.patch
new file mode 100644
index 000000000..4596122de
--- /dev/null
+++ b/extra/xorg-xinit/fs25361.patch
@@ -0,0 +1,16 @@
+Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
+diff -u xinit.orig/startx.cpp xinit/startx.cpp
+--- xinit.orig/startx.cpp	2011-08-02 18:26:57.161711018 +0400
++++ xinit/startx.cpp	2011-08-02 19:06:39.348816866 +0400
+@@ -290,9 +290,9 @@
+     XCOMM now add the same credentials to the client authority file
+     XCOMM if '$displayname' already exists do not overwrite it as another
+     XCOMM server man need it. Add them to the '$xserverauthfile' instead.
+-    for displayname in $authdisplay $hostname$authdisplay; do
++    for displayname in $authdisplay $hostname/unix$authdisplay; do
+         authcookie=`XAUTH list "$displayname" @@
+-        | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
++        | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
+         if [ "z${authcookie}" = "z" ] ; then
+             XAUTH -q << EOF 
+ add $displayname . $mcookie
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index bc19589f7..504879145 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139849 2011-10-05 10:55:56Z jgc $
+# $Id: PKGBUILD 145186 2011-12-19 11:53:19Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=275
+pkgver=276
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('bbbe6a4566c04656ec21863351570ac8'
+md5sums=('50ca8ee40e8a0992019f8f35042c9abb'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index 53196d886..3bb44bf29 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,25 +1,24 @@
-# $Id: PKGBUILD 142354 2011-11-08 18:38:40Z ibiru $
+# $Id: PKGBUILD 145292 2011-12-21 10:20:13Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
-pkgver=8.0
-_ffoxver=8.0
-pkgrel=2
+pkgver=9.0
+pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
+depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2')
+makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=(http://ftp.gnu.org/gnu/gnuzilla/${_ffoxver}/icecat-${_ffoxver}.tar.xz
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/firefox-$pkgver.source.tar.bz2
         mozconfig
         mips.patch
         mozilla-pkgconfig.patch)
 options=('!emptydirs')
 replaces=('xulrunner-oss')
-md5sums=('9395a5be13da119bd8d53c3225e5d17c'
+md5sums=('d8d0c8c79660752b02d9e9ab69a68f94'
          '8dfb78c5bd0581c8cf4753813132bf0b'
-         '639ea80e823543dd415b90c0ee804186')
+         '27271ce647a83906ef7a24605e840d61')
 
 build() {
   cd "$srcdir/mozilla-release"
@@ -33,7 +32,8 @@ build() {
   #fix libdir/sdkdir - fedora
   patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
+  export PYTHON="/usr/bin/python2"
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
 }
@@ -42,10 +42,17 @@ package() {
   cd "$srcdir/mozilla-release"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
+  rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation}
+  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries"
+  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation"
+
   # add xulrunner library path to ld.so.conf
   install -d $pkgdir/etc/ld.so.conf.d
   echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
 
   chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
   sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
+  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/header.py"
+  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/typelib.py"
+  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpidl.py"
 }
diff --git a/extra/xulrunner/mozilla-pkgconfig.patch b/extra/xulrunner/mozilla-pkgconfig.patch
index 2203efcde..037d4aee0 100644
--- a/extra/xulrunner/mozilla-pkgconfig.patch
+++ b/extra/xulrunner/mozilla-pkgconfig.patch
@@ -1,6 +1,6 @@
-diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-2.0/xulrunner/installer/libxul-embedding.pc.in
---- mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in	2011-03-03 14:12:04.000000000 -0800
-+++ mozilla-2.0/xulrunner/installer/libxul-embedding.pc.in	2011-03-13 03:25:12.350027359 -0700
+diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in
+--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in	2011-12-19 22:11:38.100005674 +0000
++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in	2011-12-19 22:14:35.095147521 +0000
 @@ -6,5 +6,6 @@
  Name: libxul-embedding
  Description: Static library for version-independent embedding of the Mozilla runtime
@@ -8,9 +8,9 @@ diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-2.
 +Requires: %NSPR_NAME% >= %NSPR_VERSION%
  Libs: -L${sdkdir}/lib -lxpcomglue -ldl
  Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
-diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul.pc.in mozilla-2.0/xulrunner/installer/libxul.pc.in
---- mozilla-2.0.orig/xulrunner/installer/libxul.pc.in	2011-03-03 14:12:04.000000000 -0800
-+++ mozilla-2.0/xulrunner/installer/libxul.pc.in	2011-03-13 03:25:28.010027359 -0700
+diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in
+--- mozilla-release.orig/xulrunner/installer/libxul.pc.in	2011-12-19 22:11:38.126672110 +0000
++++ mozilla-release/xulrunner/installer/libxul.pc.in	2011-12-19 22:14:04.375412141 +0000
 @@ -1,5 +1,6 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -18,10 +18,10 @@ diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul.pc.in mozilla-2.0/xulrunne
  includedir=%includedir%
  idldir=%idldir%
  
-diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner/installer/Makefile.in
---- mozilla-2.0.orig/xulrunner/installer/Makefile.in	2011-03-03 14:12:04.000000000 -0800
-+++ mozilla-2.0/xulrunner/installer/Makefile.in	2011-03-13 03:25:55.570027359 -0700
-@@ -121,6 +121,7 @@
+diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in
+--- mozilla-release.orig/xulrunner/installer/Makefile.in	2011-12-19 22:11:38.126672110 +0000
++++ mozilla-release/xulrunner/installer/Makefile.in	2011-12-19 22:18:28.743135321 +0000
+@@ -108,6 +108,7 @@
  	-e "s|%includedir%|$(includedir)|" \
  	-e "s|%idldir%|$(idldir)|" \
  	-e "s|%sdkdir%|$(sdkdir)|" \
@@ -29,29 +29,9 @@ diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner
  	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
  	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
  	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
-diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
---- mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2011-03-03 14:12:04.000000000 -0800
-+++ mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2011-03-13 03:26:18.676694023 -0700
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- 
- Name: mozilla-gtkembedmoz
-diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed.pc.in
---- mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in	2011-03-03 14:12:04.000000000 -0800
-+++ mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed.pc.in	2011-03-13 03:26:41.566694025 -0700
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- 
- Name: mozilla-gtkembedmoz
-diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-js.pc.in mozilla-2.0/xulrunner/installer/mozilla-js.pc.in
---- mozilla-2.0.orig/xulrunner/installer/mozilla-js.pc.in	2011-03-03 14:12:04.000000000 -0800
-+++ mozilla-2.0/xulrunner/installer/mozilla-js.pc.in	2011-03-13 03:27:19.680027357 -0700
+diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in
+--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in	2011-12-19 22:11:38.126672110 +0000
++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in	2011-12-19 22:18:55.569571004 +0000
 @@ -7,4 +7,4 @@
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index d11a75e9f..94123ad2b 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144599 2011-12-07 15:40:43Z pierre $
+# $Id: PKGBUILD 145146 2011-12-18 00:41:44Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zsh
-pkgver=4.3.14
-pkgrel=2
+pkgver=4.3.15
+pkgrel=1
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.zsh.org/'
@@ -13,7 +13,7 @@ install=zsh.install
 source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
         'zprofile')
 backup=('etc/zsh/zprofile')
-md5sums=('1c819a3ff7302b42eba988e333e76109'
+md5sums=('11766b0dd674a513810903cd33ffcac4'
          '24a9335edf77252a7b5f52e079f7aef7')
 
 build() {
author	Joshua Ismael Haase Hernández <hahj87@gmail.com>	2011-12-25 13:37:35 -0600
committer	Joshua Ismael Haase Hernández <hahj87@gmail.com>	2011-12-25 13:37:35 -0600
commit	d4891d626bd0699dafdcfa776ad0ee48df04f2d4 (patch)
tree	215f7e117f4e146389e96b8b976591b101845667 /extra
parent	14f1f7de0e32b27172968722644d5dbced226f52 (diff)
parent	c46511670fc7e857a314c0e9e974be610065ab98 (diff)