Thu Apr 19 00:01:30 UTC 2012

author: root <root@rshg054.dnsready.net> 2012-04-19 00:01:30 +0000
committer: root <root@rshg054.dnsready.net> 2012-04-19 00:01:30 +0000
commit: fe675be3a5f22b4397ea55959bb3c47b4c1b8288 (patch)
tree: 2d8d385678576c75dc561c6fc2c194df7aad2b9b
parent: 637c1cfdcd258a870ad5367cbf47a8a2799039c7 (diff)
94 files changed, 1881 insertions, 281 deletions
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 4d17051c1..67c869c37 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 65291 2012-02-20 15:31:22Z stephane $
+# $Id: PKGBUILD 69536 2012-04-18 02:12:09Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=cppcheck
-pkgver=1.53
+pkgver=1.54
 pkgrel=1
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('pcre')
 makedepends=('docbook-xsl')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('e1c8431cab1ef07c725f1556bdb0fc5d3e912c9f')
+sha1sums=('f63abbd9bda7179c3ce3a399123bd7fb476e4537')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD
index 53062db49..76e4f4d65 100644
--- a/community/deja-dup/PKGBUILD
+++ b/community/deja-dup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 68348 2012-03-22 18:06:16Z bgyorgy $
+# $Id: PKGBUILD 69507 2012-04-17 14:32:37Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=deja-dup
-pkgver=22.0
+pkgver=22.1
 pkgrel=1
 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('nautilus: backup extension')
 options=('!libtool')
 install=$pkgname.install
 source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz)
-md5sums=('b8a71a26cdf3c460a9e5104212527d29')
+md5sums=('cbf7af6f0392ab9ef355a3aeb74c8a79')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/fwbuilder/PKGBUILD b/community/fwbuilder/PKGBUILD
new file mode 100644
index 000000000..ae559607c
--- /dev/null
+++ b/community/fwbuilder/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id
+# Maintainer: Kevin Piche <kevin@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgname=fwbuilder
+pkgver=5.1.0.3599
+pkgrel=1
+pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms"
+url="http://www.fwbuilder.org/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libxslt' 'net-snmp' 'qt')
+conflicts=('libfwbuilder')
+install=fwbuilder.install
+source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/${pkgver%.*}/fwbuilder-${pkgver}.tar.gz"
+		'fwbuilder-gcc47.patch')
+sha256sums=('452514a1ec0be1416bfca93603e6c89deb91d1a3a19671c64b5a8868a3743daf'
+			'd7c602d5b99c6e40403c0b02e34abf15de83802257ca5ce80ad53d486b692f27')
+
+build() {
+  cd "${srcdir}/fwbuilder-${pkgver}"
+  patch -p1 -i "$srcdir/fwbuilder-gcc47.patch"
+  ./autogen.sh
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/fwbuilder-${pkgver}"
+  make INSTALL_ROOT="${pkgdir}" install
+}
diff --git a/community/fwbuilder/fwbuilder-gcc47.patch b/community/fwbuilder/fwbuilder-gcc47.patch
new file mode 100644
index 000000000..59cd64a6f
--- /dev/null
+++ b/community/fwbuilder/fwbuilder-gcc47.patch
@@ -0,0 +1,13 @@
+Only in fwbuilder-5.0.1.3592: patches
+Only in fwbuilder-5.0.1.3592: .pc
+diff -upr fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h /var/tmp/build-root/home/abuild/rpmbuild/BUILD/fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h
+--- fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h	2011-12-08 02:02:07.000000000 +0100
++++ /var/tmp/build-root/home/abuild/rpmbuild/BUILD/fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h	2012-03-17 22:29:16.317275376 +0100
+@@ -31,6 +31,7 @@
+ 
+ #include <time.h> //for time_t definition
+ #include <pthread.h>
++#include <unistd.h>
+ 
+ #include <string>
+ #include <queue>
diff --git a/community/fwbuilder/fwbuilder.install b/community/fwbuilder/fwbuilder.install
new file mode 100644
index 000000000..45f0c2242
--- /dev/null
+++ b/community/fwbuilder/fwbuilder.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
+
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index ad7fa29f4..0652947d2 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: PKGBUILD 69505 2012-04-17 12:51:53Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=keepalived
 pkgver=1.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Failover and monitoring daemon for LVS clusters'
 arch=('i686' 'x86_64')
 url='http://www.keepalived.org/'
@@ -13,10 +13,12 @@ backup=('etc/keepalived/keepalived.conf' 'etc/conf.d/keepalived')
 depends=('openssl' 'popt' 'libnl1')
 source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
         'keepalived.rc'
+        'keepalived.service'
         'keepalived.conf'
         'ip_vs_moved.patch')
 md5sums=('f68327ca142616a8463d2d105db122cd'
          'baeb62a682c2b59d732cea84bf52cc87'
+         '7a327df915700dcd45a049d099c9c42b'
          '9c8142da8730ad27a345587dea83ced7'
          '87ee19c85adaedd3eb11bea8a5865d47')
 
@@ -37,8 +39,11 @@ package() {
   mv "$pkgdir/etc/keepalived/samples" "$pkgdir/usr/share/$pkgname/samples"
 
   # add initscripts
-  install -D -m 755 ../$pkgname.rc "${pkgdir}/etc/rc.d/$pkgname"
-  install -D -m 644 ../$pkgname.conf "${pkgdir}/etc/conf.d/$pkgname"
+  cd ..
+  install -D -m 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+  install -D -m 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname"
+  install -D -m 644 $pkgname.service \
+    "$pkgdir/usr/lib/systemd/system/$pkgname.service"
 
 }
 
diff --git a/community/keepalived/keepalived.service b/community/keepalived/keepalived.service
new file mode 100644
index 000000000..c20f18695
--- /dev/null
+++ b/community/keepalived/keepalived.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Keepalive Daemon
+
+[Service]
+EnvironmentFile=/etc/conf.d/keepalived
+ExecStart=/usr/sbin/keepalived --dont-fork $DAEMON_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/libcryptui/PKGBUILD b/community/libcryptui/PKGBUILD
index 3e015cecf..cae4d802c 100644
--- a/community/libcryptui/PKGBUILD
+++ b/community/libcryptui/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 69329 2012-04-13 22:06:22Z bgyorgy $
+# $Id: PKGBUILD 69509 2012-04-17 14:38:21Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libcryptui
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="Library for OpenPGP prompts"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('23e84fd9e733e58bd1640b229cfc35830287628125f0f15604ea6aecd606fac7')
+sha256sums=('fad4addf5c5b6588f492a720edce59f925190e4cdf3672984f53b25327f10fd5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index bb3e9d023..558e6dd11 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65327 2012-02-21 01:36:41Z spupykin $
+# $Id: PKGBUILD 69518 2012-04-17 19:42:41Z ebelanger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
 # Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -8,7 +8,7 @@
 pkgbase=mlt
 pkgname=('mlt' 'mlt-python-bindings')
 pkgver=0.7.8
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source multimedia framework"
 arch=('i686' 'x86_64')
 url="http://www.mltframework.org"
@@ -20,7 +20,7 @@ md5sums=('4bdce45d832e065ac4c8c8ca56765e1d')
 
 build() {
   # mlt
-  cd $srcdir/mlt-$pkgver
+  cd "$srcdir/mlt-$pkgver"
 
 #  [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
   SSE2=--disable-sse2
@@ -33,7 +33,7 @@ build() {
   make
 
   # mlt python bindings
-  cd $srcdir/mlt-$pkgver/src/swig/python
+  cd "$srcdir/mlt-$pkgver/src/swig/python"
   sed -i 's_path=`which python_path=`which python2_' build
   sed -i 's_`python -c_`python2 -c_' build
   sed -i 's#python-config#python2-config#' build
@@ -45,16 +45,16 @@ package_mlt() {
   optdepends=('jack' 'libexif' 'qt' 'gtk2' "ladspa")
   conflicts=('mlt++<=0.3.8')
 
-  cd $srcdir/mlt-$pkgver
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/mlt-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
 
 package_mlt-python-bindings() {
   depends=('python2' 'mlt')
 
-  cd $srcdir/mlt-$pkgver/src/swig/python
-  mkdir -p $pkgdir/usr/lib/python2.7/
-  install -m755 mlt.py $pkgdir/usr/lib/python2.7/
-  install -m755 _mlt.so $pkgdir/usr/lib/python2.7/
-  install -m755 mlt_wrap.o $pkgdir/usr/lib/python2.7/
+  cd "$srcdir/mlt-$pkgver/src/swig/python"
+  mkdir -p "$pkgdir/usr/lib/python2.7/"
+  install -m755 mlt.py "$pkgdir/usr/lib/python2.7/"
+  install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/"
+  install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/"
 }
diff --git a/community/odt2txt/PKGBUILD b/community/odt2txt/PKGBUILD
new file mode 100644
index 000000000..8ff16fba4
--- /dev/null
+++ b/community/odt2txt/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 69493 2012-04-17 10:36:52Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Vladimir Chizhov <jagoterr@gmail.com>
+
+pkgname=odt2txt
+pkgver=0.4
+pkgrel=1
+pkgdesc="extracts the text out of OpenDocument Texts"
+url="http://stosberg.net/odt2txt/"
+license=("GPL2")
+arch=('i686' 'x86_64')
+depends=('zlib')
+source=(http://stosberg.net/odt2txt/$pkgname-$pkgver.tar.gz)
+md5sums=('6fe3bd261ce2dde2810244bbe969bbc5')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  make
+  install -Dm755 odt2txt $pkgdir/usr/bin/odt2txt
+  install -Dm644 odt2txt.1 $pkgdir/usr/share/man/man1/odt2txt.1
+}
diff --git a/community/ted/PKGBUILD b/community/ted/PKGBUILD
index 770a39bd4..3b3b2b57c 100644
--- a/community/ted/PKGBUILD
+++ b/community/ted/PKGBUILD
@@ -1,36 +1,40 @@
-# $Id: PKGBUILD 64361 2012-02-11 23:24:27Z allan $
+# $Id: PKGBUILD 69512 2012-04-17 16:00:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ted
-pkgver=2.21
-pkgrel=5
+pkgver=2.22
+pkgrel=1
 pkgdesc="An easy rich text processor (with footnote support)"
 arch=('i686' 'x86_64')
 url="http://www.nllgg.nl/Ted/"
 depends=('bash' 'libtiff' 'libxmu' 'libxpm' 'libpng' 'gtk2')
 license=('GPL')
-source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz 
+source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz
         ted-2.21-libpng15.patch)
-md5sums=('34ae855938a3b364eb587cca504ba356'
+md5sums=('08162c9164dfdde1d46e41ae64df16be'
          '0c339b0fa7aec6b150e07e9027cd360c')
 
 build() {
   cd "$srcdir/Ted-$pkgver"
   sed -i "s|--with-GTK|--with-GTK --prefix=/usr/share|g" Makefile
-  patch -p0 -i ../ted-2.21-libpng15.patch
   make compile.shared
   make package.shared
 }
 
 package() {
-  cd "$srcdir/Ted-$pkgver"
-  mkdir -p "$pkgdir/usr/share/"
-  cd "$pkgdir/usr/share/"
-  tar -zxvf "$srcdir/Ted-$pkgver/tedPackage/ted-$pkgver-linux-$CARCH.tar.gz"
+  # unpack package
+  mkdir -p $pkgdir/usr/share
+  cd "$pkgdir/usr/share"
+  tar xzf $srcdir/Ted-$pkgver/tedPackage/*.tar.gz
+  # move bin/* and share/*
   mv bin ../
-  mkdir -p "$pkgdir/usr/share/man/man1"
+  mv share/* ./
+  rmdir share
+  # move man pages
   cd "$pkgdir/usr/share/Ted/"
+  mkdir -p "$pkgdir/usr/share/man/man1"
   mv Ted.1 rtf2pdf.1 rtf2ps.1 ../../share/man/man1/
+  # fix shell script and move them to /usr/bin
   sed -i "s|usr/local/afm|usr/share/Ted/afm|g" gsafm.sh
   mv *.sh "$pkgdir/usr/bin/"
 }
diff --git a/community/ucarp/PKGBUILD b/community/ucarp/PKGBUILD
index 9b2d22f94..90158ebc1 100644
--- a/community/ucarp/PKGBUILD
+++ b/community/ucarp/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id$ 
+# $Id: PKGBUILD 69498 2012-04-17 12:05:31Z seblu $ 
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgname=ucarp
 pkgver=1.5.2
-pkgrel=2
+pkgrel=3
 pkgdesc='UCARP is a portable implementation of the CARP protocol'
 arch=('i686' 'x86_64')
 url='http://www.ucarp.org/project/ucarp'
 license=('GPL2')
 depends=('libpcap')
 optdepends=('iproute2')
+backup=('etc/conf.d/ucarp')
 source=("http://download.pureftpd.org/pub/ucarp/ucarp-$pkgver.tar.gz"
         'ucarp.rc'
         'ucarp.conf'
+        'ucarp.service'
         'ucarp.8'
         '01-fix-getopt.patch'
         '02-fix-downscript-on-error.c')
 md5sums=('e3caa733316a32c09e5d3817617e9145'
-         'd941d2978c5b43154a29212115729519'
-         '9b27f0cf552511716b1ce3678b7a77ca'
+         '11675170473c7e11131d90c3d64ff333'
+         '79c01b9ba580d2431997efb9df59cf5d'
+         '582d59cd969b6447a710f58bbaf28846'
          '05b64a5daeb7aab45a2a59e0f4d83c8f'
          '3f20699aaf2ef8139dcd337f1e7f06ab'
          '09d26233c37956cf08e629554a91b8cd')
@@ -37,13 +40,6 @@ build() {
 }
 
 package() {
-  # add initscripts
-  install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname"
-  install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname"
-
-  # add manpage
-  install -D -m 644 $pkgname.8 "${pkgdir}/usr/share/man/man8/$pkgname.8"
-
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
@@ -55,6 +51,17 @@ package() {
 
   # install README
   install -D -m 644 README "$pkgdir/usr/share/doc/$pkgname/README"
+
+  # add initscripts
+  cd ..
+  install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname"
+  install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname"
+  install -D -m 644 $pkgname.service \
+    "${pkgdir}/usr/lib/systemd/system/$pkgname.service"
+
+  # add manpage
+  install -D -m 644 $pkgname.8 "${pkgdir}/usr/share/man/man8/$pkgname.8"
+
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ucarp/ucarp.conf b/community/ucarp/ucarp.conf
index 386c1df8f..1fb8eae07 100644
--- a/community/ucarp/ucarp.conf
+++ b/community/ucarp/ucarp.conf
@@ -1,3 +1,3 @@
 # vim:set ts=2 sw=2 ft=sh noet:
 
-DAEMON_OPTS='--daemonize --interface=eth0 --srcip=10.1.1.1 --vhid=1 --pass=mypassword --addr=10.1.1.252 --upscript=/usr/local/sbin/vip-up.sh --downscript=/usr/local/sbin/vip-down.sh'
+DAEMON_OPTS='--interface=eth0 --srcip=10.1.1.1 --vhid=1 --pass=mypassword --addr=10.1.1.252 --upscript=/usr/local/sbin/vip-up.sh --downscript=/usr/local/sbin/vip-down.sh'
diff --git a/community/ucarp/ucarp.rc b/community/ucarp/ucarp.rc
index 33f40268f..f8c9d54f3 100644
--- a/community/ucarp/ucarp.rc
+++ b/community/ucarp/ucarp.rc
@@ -7,6 +7,7 @@
 NAME=ucarp
 DAEMON=/usr/sbin/ucarp
 PID=$(pidof -o %PPID $DAEMON)
+DAEMON_OPTS="--daemonize $DAEMON_OPTS"
 
 case "$1" in
 	start)
diff --git a/community/ucarp/ucarp.service b/community/ucarp/ucarp.service
new file mode 100644
index 000000000..d4afd4d0d
--- /dev/null
+++ b/community/ucarp/ucarp.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=UCARP daemon
+
+[Service]
+EnvironmentFile=/etc/conf.d/ucarp
+ExecStart=/usr/sbin/ucarp $DAEMON_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD
index a1488fcd8..5469f3265 100644
--- a/community/zynaddsubfx/PKGBUILD
+++ b/community/zynaddsubfx/PKGBUILD
@@ -1,36 +1,39 @@
-# $Id: PKGBUILD 66272 2012-02-23 07:06:41Z spupykin $
+# $Id: PKGBUILD 69533 2012-04-17 22:54:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: DonVla <donvla@users.sourceforge.net>
 
 pkgname=zynaddsubfx
-pkgver=2.4.1
-pkgrel=7
-pkgdesc="An opensource software synthesizer capable of making a countless number of instruments."
+pkgver=2.4.2
+pkgrel=1
+pkgdesc="Opensource software synthesizer capable of making a countless number of instruments."
 arch=('i686' 'x86_64')
 url="http://zynaddsubfx.sourceforge.net"
 license=('GPL')
 depends=('fltk' 'libgl' 'fftw' 'lash' 'mxml')
-makedepends=('cmake' 'pkgconfig' 'mesa')
+makedepends=('cmake' 'pkgconfig' 'mesa' 'setconf' 'gendesk')
 options=('!emptydirs')
 source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/ZynAddSubFX-$pkgver.tar.bz2"
-	"$pkgname.desktop"
-	"$pkgname.svg"
 	"http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch"
-	"http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch")
-md5sums=('59eb69ce24d6f8c605f8ba43958d0526'
-         '5da6735ee59fdfa21f171fdc4d6c80cb'
-         '6f7e9c3ce3947088a10c99c46a65431f'
+	"http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch"
+	"$pkgname.svg")
+md5sums=('4e1f15fd872f5cc649fc2217676e248e'
          'eb95d339ff5deac8c6b54965f04a8c60'
-         '49464a33ab9c4250520eda0df7705663')
+         '49464a33ab9c4250520eda0df7705663'
+         '6f7e9c3ce3947088a10c99c46a65431f')
 
 build() {
-  cd "$srcdir/ZynAddSubFX-$pkgver"
+  cd "$srcdir"
+  gendesk
+  setconf "$pkgname.desktop" Icon "$pkgname.svg"
+
+  cd "ZynAddSubFX-$pkgver"
 
   # patches
-  patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch"
-  patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch"
+#  patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch"
+#  patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch"
+  sed -i '1,1i#include <unistd.h>' src/Nio/NulEngine.cpp
 
   [ -d build ] || mkdir build && cd build
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DOutputModule=jack -DGuiModule=fltk ..
diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD
index 974f69b8a..e3a887bb4 100644
--- a/core/libgcrypt/PKGBUILD
+++ b/core/libgcrypt/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 130865 2011-07-08 14:06:03Z andyrtr $
+# $Id: PKGBUILD 156348 2012-04-17 15:57:54Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libgcrypt
 pkgver=1.5.0
-pkgrel=1
+pkgrel=3
 pkgdesc="a general purpose crypto library based on the code used"
 arch=(i686 x86_64)
 url="http://www.gnupg.org"
 license=('LGPL')
-depends=('libgpg-error>=1.9')
+depends=('libgpg-error>=1.10-2')
 options=('!libtool' '!emptydirs')
 install=$pkgname.install
 source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2
@@ -18,24 +18,18 @@ sha1sums=('3e776d44375dc1a710560b98ae8437d5da6e32cf')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  [ "$CARCH" = "i686" ] && EXTRAFLAGS="--disable-aesni-support"
   ./configure --prefix=/usr \
 	--disable-static \
-	--disable-padlock-support $EXTRAFLAGS
+	--disable-padlock-support #$EXTRAFLAGS
   make
 }
 
 check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make -k check
+  make check
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-
-  # Move dynamic libraries to /lib
-  install -d -m755 "${pkgdir}"/lib/
-  mv "${pkgdir}"/usr/lib/libgcrypt.so* "${pkgdir}"/lib/
-  ln -sf /lib/libgcrypt.so "${pkgdir}"/usr/lib/libgcrypt.so
 }
diff --git a/core/libgpg-error/PKGBUILD b/core/libgpg-error/PKGBUILD
index b0cbef1c0..c0cc77f39 100644
--- a/core/libgpg-error/PKGBUILD
+++ b/core/libgpg-error/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 132298 2011-07-22 15:47:59Z andyrtr $
+# $Id: PKGBUILD 156350 2012-04-17 15:57:56Z andyrtr $
 # Maintainer: judd <jvinet@zeroflux.org>
 
 pkgname=libgpg-error
 pkgver=1.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Support library for libgcrypt"
 arch=(i686 x86_64)
 url="http://www.gnupg.org"
@@ -29,9 +29,4 @@ check() {
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}/" install
-
-  # Move dynamic libraries to /lib
-  install -d -m755 "${pkgdir}"/lib/
-  mv "${pkgdir}"/usr/lib/libgpg-error.so* "${pkgdir}"/lib/
-  ln -sf /lib/libgpg-error.so "${pkgdir}"/usr/lib/libgpg-error.so
 }
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index ff9fcc101..b7347da07 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154941 2012-03-31 12:48:22Z pierre $
+# $Id: PKGBUILD 156330 2012-04-17 06:27:45Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=openssl
@@ -6,7 +6,7 @@ _ver=1.0.1
 # use a pacman compatible version scheme
 # pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgver=$_ver
-pkgrel=2
+pkgrel=3
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
 arch=('i686' 'x86_64')
 url='https://www.openssl.org'
@@ -20,13 +20,15 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
         'fix-manpages.patch'
         'no-rpath.patch'
         'ca-dir.patch'
-        'disable-tls12-client.patch')
+        'disable-tls12-client.patch'
+        'vpaes.patch')
 md5sums=('134f168bc2a8333f19f81d684841710b'
          'efbe93c11747fed52e60567819409d8a'
          '5bbc0655bda2af95bc8eb568963ce8ba'
          'dc78d3d06baffc16217519242ce92478'
          '3bf51be3a1bbd262be46dc619f92aa90'
-         '26432b9d7af63c63828b6405c9185400')
+         '26432b9d7af63c63828b6405c9185400'
+         '55ad53e8ec3db1db6978af55e3ce1b5d')
 
 build() {
 	cd $srcdir/$pkgname-$_ver
@@ -48,6 +50,8 @@ build() {
 	patch -p0 -i $srcdir/ca-dir.patch
 	# workaround for PR#2771
 	patch -p1 -i $srcdir/disable-tls12-client.patch
+	# fix for PR#2775
+	patch -p1 -i $srcdir/vpaes.patch
 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
 		shared zlib enable-md2 ${optflags} \
diff --git a/core/openssl/vpaes.patch b/core/openssl/vpaes.patch
new file mode 100644
index 000000000..2688b0c0a
--- /dev/null
+++ b/core/openssl/vpaes.patch
@@ -0,0 +1,69 @@
+Index: openssl/crypto/aes/asm/vpaes-x86.pl
+RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v
+rcsdiff -q -kk '-r1.5.4.4' '-r1.5.4.5' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v' 2>/dev/null
+--- vpaes-x86.pl	2011/12/15 22:20:26	1.5.4.4
++++ vpaes-x86.pl	2012/03/31 16:55:18	1.5.4.5
+@@ -843,6 +843,8 @@
+ 	&mov	($out,&wparam(1));		# out
+ 	&mov	($round,&wparam(2));		# len
+ 	&mov	($key,&wparam(3));		# key
++	&sub	($round,16);
++	&jc	(&label("cbc_abort"));
+ 	&lea	($base,&DWP(-56,"esp"));
+ 	&mov	($const,&wparam(4));		# ivp
+ 	&and	($base,-16);
+@@ -853,7 +855,6 @@
+ 	&mov	(&DWP(48,"esp"),$base);
+ 
+ 	&mov	(&DWP(0,"esp"),$out);		# save out
+-	&sub	($round,16);
+ 	&mov	(&DWP(4,"esp"),$key)		# save key
+ 	&mov	(&DWP(8,"esp"),$const);		# save ivp
+ 	&mov	($out,$round);			# $out works as $len
+@@ -896,6 +897,7 @@
+ 	&mov	($base,&DWP(8,"esp"));		# restore ivp
+ 	&mov	("esp",&DWP(48,"esp"));
+ 	&movdqu	(&QWP(0,$base),"xmm1");		# write IV
++&set_label("cbc_abort");
+ &function_end("${PREFIX}_cbc_encrypt");
+ 
+ &asm_finish();
+Index: openssl/crypto/aes/asm/vpaes-x86_64.pl
+RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v
+rcsdiff -q -kk '-r1.4.4.2' '-r1.4.4.3' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v' 2>/dev/null
+--- vpaes-x86_64.pl	2011/11/14 21:01:17	1.4.4.2
++++ vpaes-x86_64.pl	2012/03/31 16:55:18	1.4.4.3
+@@ -263,7 +263,7 @@
+ 	pshufb  %xmm2,  %xmm4	# 4 = sbou
+ 	pxor	%xmm0,  %xmm4	# 4 = sb1u + k
+ 	movdqa	0x70(%r10), %xmm0	# 0 : sbot
+-	movdqa	.Lk_sr-.Lk_dsbd(%r11), %xmm2
++	movdqa	-0x160(%r11), %xmm2	# .Lk_sr-.Lk_dsbd=-0x160
+ 	pshufb  %xmm3,	%xmm0	# 0 = sb1t
+ 	pxor	%xmm4,	%xmm0	# 0 = A
+ 	pshufb	%xmm2,	%xmm0
+@@ -869,6 +869,8 @@
+ ___
+ ($len,$key)=($key,$len);
+ $code.=<<___;
++	sub	\$16,$len
++	jc	.Lcbc_abort
+ ___
+ $code.=<<___ if ($win64);
+ 	lea	-0xb8(%rsp),%rsp
+@@ -887,7 +889,6 @@
+ $code.=<<___;
+ 	movdqu	($ivp),%xmm6		# load IV
+ 	sub	$inp,$out
+-	sub	\$16,$len
+ 	call	_vpaes_preheat
+ 	cmp	\$0,${enc}d
+ 	je	.Lcbc_dec_loop
+@@ -932,6 +933,7 @@
+ .Lcbc_epilogue:
+ ___
+ $code.=<<___;
++.Lcbc_abort:
+ 	ret
+ .size	${PREFIX}_cbc_encrypt,.-${PREFIX}_cbc_encrypt
+ ___
diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD
index 95a615f00..64c76c5f7 100644
--- a/core/rfkill/PKGBUILD
+++ b/core/rfkill/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 142840 2011-11-16 20:25:37Z dan $
+# $Id: PKGBUILD 156346 2012-04-17 15:19:00Z bisson $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rfkill
 pkgver=0.4
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool for enabling and disabling wireless devices"
 arch=('i686' 'x86_64')
 url="http://linuxwireless.org/en/users/Documentation/rfkill"
 license=('custom')
-depends=('glibc' 'filesystem>=2010.01')
 source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         60-rfkill.rules
         rfkill.conf.d
@@ -31,7 +30,7 @@ package() {
   # License
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   # Udev rule
-  install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/lib/udev/rules.d/60-rfkill.rules"
+  install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
   # Init script
   install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill"
   install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill"
diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index dd1d9e8ec..072fe3411 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -3,29 +3,31 @@
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=cabal-install
-pkgver=0.10.4
-pkgrel=3
+pkgver=0.14.0
+pkgrel=1
 pkgdesc="The command-line interface for Cabal and Hackage."
 url="http://hackage.haskell.org/package/cabal-install"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=('haskell-http=4000.2.2-1' 'haskell-zlib=0.5.3.3-3' 'haskell-mtl=2.0.1.0-4' 'haskell-network=2.3.0.11-1' 'haskell-random=1.0.1.1-1')
 depends=('ghc' 'gmp' 'zlib')
-#source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz)
-# switch back to regular cabal-install once it gets updated...
-source=("http://hackage.haskell.org/packages/archive/cabal-install-ghc74/${pkgver}/cabal-install-ghc74-${pkgver}.tar.gz")
-md5sums=('49b3301cc80775ebf19fe9d949f15df5')
+source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz)
+md5sums=('638514bd1a5792d75866481852148ae5')
 
 build() {
-    cd cabal-install-ghc74-${pkgver}
+    cd cabal-install-${pkgver}
     runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr
     runhaskell Setup build
 }
 
 package() {
-    cd cabal-install-ghc74-${pkgver}
+    cd cabal-install-${pkgver}
     runhaskell Setup copy --destdir=$pkgdir
-    #install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+
+    # rm license installed to wrong location
+    rm -rf ${pkgdir}/usr/share/doc
+
+    install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
     
     # add bash completion
     install -d ${pkgdir}/usr/share/bash-completion/completions
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index 6f7e6b1f1..e4780f99d 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 143020 2011-11-21 02:06:36Z eric $
+# $Id: PKGBUILD 156372 2012-04-17 18:59:36Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=freeciv
-pkgver=2.3.1
+pkgver=2.3.2
 pkgrel=1
 pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
 arch=('i686' 'x86_64')
@@ -12,11 +12,11 @@ depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme')
 options=('!libtool')
 install=freeciv.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('9d9ee9f48f4c945fc6525139d340443d5a25aac4')
+sha1sums=('e6267b5e0483cf9c29d01793d2f9433e73d62191')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-client=gtk --enable-shared
+  ./configure --prefix=/usr --enable-client=gtk2 --enable-shared --without-ggz-client
   make
 }
 
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 99c73191a..67701a11a 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154479 2012-03-29 01:47:21Z eric $
+# $Id: PKGBUILD 156324 2012-04-17 04:29:39Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.6.2
+pkgver=6.7.6.5
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
@@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
              'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('5411be21304520ae6a24d3f3e6d5c60eabdd57af'
+sha1sums=('ecb6d2614ca8f44c1857ff28a88feb083403f7be'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD
index cb2ea2c01..9ed38d8a2 100644
--- a/extra/lua/PKGBUILD
+++ b/extra/lua/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153491 2012-03-14 23:43:56Z eric $
+# $Id: PKGBUILD 156332 2012-04-17 10:35:09Z bluewind $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=lua 
 pkgver=5.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A powerful light-weight programming language designed for extending applications" 
 arch=('i686' 'x86_64')
 url="http://www.lua.org/"
@@ -14,7 +14,7 @@ options=('!makeflags' '!emptydirs')
 source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz
         lua-arch.patch lua-5.1-cflags.diff)
 md5sums=('2e115fe26e435e33b0d5c022e4490567'
-         '6c5953f63904bf20a0183cdab05b80de'
+         'fa25feb70ef9fec975b1c20da5098b3c'
          '249582bf1fd861ccf492d2c35a9fe732')
 
 build() { 
@@ -23,14 +23,14 @@ build() {
   patch -p1 -i "${srcdir}/lua-5.1-cflags.diff"
   export CFLAGS="$CFLAGS -fPIC"
 
-  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \
+  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" \
     INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
     linux
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \
+  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.$pkgver" \
     INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
     install
   install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc"
diff --git a/extra/lua/lua-arch.patch b/extra/lua/lua-arch.patch
index cc1f3ce1b..d8650c3a2 100644
--- a/extra/lua/lua-arch.patch
+++ b/extra/lua/lua-arch.patch
@@ -1,8 +1,7 @@
-diff -ur lua-5.1.orig/etc/lua.pc lua-5.1/etc/lua.pc
---- lua-5.1.orig/etc/lua.pc	2006-03-21 11:51:53.000000000 +0100
-+++ lua-5.1/etc/lua.pc	2006-03-21 11:52:05.000000000 +0100
-@@ -6,7 +6,7 @@
- V= 5.1
+diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc
+--- lua-5.1.4/etc/lua.pc	2008-08-08 14:46:11.000000000 +0200
++++ lua-5.1.4-new/etc/lua.pc	2012-02-23 18:25:34.000000000 +0100
+@@ -8,6 +8,6 @@
  
  # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
 -prefix= /usr/local
@@ -10,11 +9,23 @@ diff -ur lua-5.1.orig/etc/lua.pc lua-5.1/etc/lua.pc
  INSTALL_BIN= ${prefix}/bin
  INSTALL_INC= ${prefix}/include
  INSTALL_LIB= ${prefix}/lib
-diff -ur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
---- lua-5.1.orig/src/Makefile	2006-03-21 11:51:53.000000000 +0100
-+++ lua-5.1/src/Makefile	2006-03-21 11:52:09.000000000 +0100
+diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h
+--- lua-5.1.4/src/luaconf.h	2008-02-11 17:25:08.000000000 +0100
++++ lua-5.1.4-new/src/luaconf.h	2012-02-23 18:25:34.000000000 +0100
+@@ -94,7 +94,7 @@
+ 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+ 
+ #else
+-#define LUA_ROOT	"/usr/local/"
++#define LUA_ROOT	"/usr/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
+ #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
+ #define LUA_PATH_DEFAULT  \
+diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile
+--- lua-5.1.4/src/Makefile	2008-01-19 20:37:58.000000000 +0100
++++ lua-5.1.4-new/src/Makefile	2012-02-23 18:26:43.000000000 +0100
 @@ -23,6 +23,7 @@
- PLATS= aix ansi bsd generic linux macosx mingw posix solaris
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
  
  LUA_A=	liblua.a
 +LUA_SO=	liblua.so
@@ -30,26 +41,26 @@ diff -ur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
  ALL_A= $(LUA_A)
  
  default: $(PLAT)
-@@ -51,6 +52,10 @@
+@@ -51,6 +52,11 @@
  	$(AR) $@ $?
  	$(RANLIB) $@
  
 +$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -shared -ldl -Wl,-soname,liblua.so -o $@.5.1 $? -lm $(MYLDFLAGS)
-+	ln -s $@.5.1 $@
++	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO)
 +
  $(LUA_T): $(LUA_O) $(LUA_A)
  	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
  
-diff -ur lua-5.1.orig/src/luaconf.h lua-5.1/src/luaconf.h
---- lua-5.1.orig/src/luaconf.h	2006-03-21 11:51:53.000000000 +0100
-+++ lua-5.1/src/luaconf.h	2006-03-21 11:52:05.000000000 +0100
-@@ -82,7 +82,7 @@
- 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+--- lua-5.1.4/Makefile	2008-08-12 02:40:48.000000000 +0200
++++ lua-5.1.4-new/Makefile	2012-02-23 19:06:32.000000000 +0100
+@@ -53,7 +53,7 @@
+ all:	$(PLAT)
  
- #else
--#define LUA_ROOT	"/usr/local/"
-+#define LUA_ROOT	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
- #define LUA_PATH_DEFAULT  \
+ $(PLATS) clean:
+-	cd src && $(MAKE) $@
++	cd src && $(MAKE) $@ V=$(V) R=$(R)
+ 
+ test:	dummy
+ 	src/lua test/hello.lua
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index fc0f5dc07..18e554f5f 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 154304 2012-03-26 01:26:00Z eric $
+# $Id: PKGBUILD 156357 2012-04-17 16:57:42Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=mpg123
-pkgver=1.13.7
+pkgver=1.13.8
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64')
@@ -17,8 +17,8 @@ conflicts=('mpg321')
 provides=('mpg321')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('33b71c932b87004f3c8fed527b1f9a4b5f4337b2'
-          '6f7593c0c14647c61cd57d1a03fe89eb6528aebe')
+sha1sums=('ae6fe5f60502fb694527113dd7508ce042b7256b'
+          '6895e5e3120579418007d705836ae1d3b786e771')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index 40aedb9a7..132a89cdf 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149755 2012-02-10 04:38:45Z eric $
+# $Id: PKGBUILD 156376 2012-04-17 19:41:18Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sox
-pkgver=14.3.2
-pkgrel=6
+pkgver=14.4.0
+pkgrel=1
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/"
@@ -17,14 +17,11 @@ optdepends=('libao: for ao plugin'
             'wavpack: for wavpack plugin'
             'libpulse: for pulse plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        sox-14.3.2-ffmpeg.patch)
-sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3'
-          '86caa6aa86a0bf7a048522114d4efd11acbbda70')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch"
   sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in
   ./configure --prefix=/usr --sysconfdir=/etc \
     --with-dyn-default --with-distro="Arch Linux"
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 5f0c234e2..7a1b8cfcc 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 154470 2012-03-28 23:15:22Z eric $
+# $Id: PKGBUILD 156321 2012-04-17 02:30:26Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
 # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.8.4
+pkgver=1.8.5
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
@@ -20,8 +20,8 @@ options=('!libtool' '!emptydirs')
 install=liferea.install
 source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
         remove-non-free-suggestions.patch)
-sha1sums=('f887a3928116f56e1b68719c150d40bd1c3c6dff'
-         '0d68c567c3d37932a49709c58c37c3f138fd19cb')
+sha1sums=('076cde160fff49a4b8c59fdae0571659ce8acd88'
+          '0d68c567c3d37932a49709c58c37c3f138fd19cb')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/staging/gcc/PKGBUILD b/staging/gcc/PKGBUILD
new file mode 100644
index 000000000..34b4c7d90
--- /dev/null
+++ b/staging/gcc/PKGBUILD
@@ -0,0 +1,265 @@
+# $Id: PKGBUILD 156344 2012-04-17 14:16:20Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: libtool requires rebuilt with each new gcc version
+
+pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
+pkgver=4.7.0
+pkgrel=5
+_snapshot=4.7-20120414
+_libstdcppmanver=20120307		# Note: check source directory name when updating this
+pkgdesc="The GNU Compiler Collection"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL' 'custom')
+url="http://gcc.gnu.org"
+makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
+checkdepends=('dejagnu')
+options=('!libtool' '!emptydirs')
+source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
+	gcc_pure64.patch
+	gcc-4.7.0-cloog-0.17.patch)
+md5sums=('9f9d082b64753d5908690500251fc52e'
+         '489d2f5311535800a120efd8d18db719'
+         'ced48436c1b3c981d721a829f1094de1'
+         '575f7d17b022e609447a590e481b18b5')
+
+
+if [ -n "${_snapshot}" ]; then
+  _basedir="${srcdir}/gcc-${_snapshot}"
+else
+  _basedir="${srcdir}/gcc-${pkgver}"
+fi
+
+build() {
+  cd ${_basedir}
+
+  # Do not install libiberty
+  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    patch -p1 -i ${srcdir}/gcc_pure64.patch
+  fi
+
+  # compatibility with latest cloog
+  patch -p1 -i ${srcdir}/gcc-4.7.0-cloog-0.17.patch
+
+  echo ${pkgver} > gcc/BASE-VER
+
+  cd ${srcdir}
+  mkdir gcc-build && cd gcc-build
+
+  ${_basedir}/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --mandir=/usr/share/man --infodir=/usr/share/info \
+      --with-bugurl=https://bugs.archlinux.org/ \
+      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
+      --enable-shared --enable-threads=posix \
+      --with-system-zlib --enable-__cxa_atexit \
+      --disable-libunwind-exceptions --enable-clocale=gnu \
+      --disable-libstdcxx-pch --enable-libstdcxx-time \
+      --enable-gnu-unique-object --enable-linker-build-id \
+      --with-ppl --enable-cloog-backend=isl \
+      --enable-lto --enable-gold --enable-ld=default \
+      --enable-plugin --with-plugin-ld=ld.gold \
+      --with-linker-hash-style=gnu \
+      --disable-multilib --disable-libssp \
+      --disable-build-with-cxx --disable-build-poststage1-with-cxx \
+      --enable-checking=release
+  make
+}
+
+check() {
+  cd gcc-build
+
+  # increase stack size to prevent test failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
+  ulimit -s 32768
+
+  # do not abort on error as some are "expected"
+  make -k check || true
+  ${_basedir}/contrib/test_summary
+}
+
+package_gcc-libs()
+{
+  pkgdesc="Runtime libraries shipped by GCC"
+  groups=('base')
+  depends=('glibc>=2.15')
+  install=gcc-libs.install
+
+  cd gcc-build
+  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
+  for lib in libmudflap libgomp libstdc++-v3/src libitm; do
+    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+  done
+  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
+  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
+  make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info
+
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
+  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
+  make -j1 DESTDIR=${pkgdir} install-target-libobjc
+
+  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
+  rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
+
+  # remove static libraries
+  find ${pkgdir} -name *.a -delete
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc()
+{
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl')
+  groups=('base-devel')
+  install=gcc.install
+
+  cd gcc-build
+  
+  make -j1 DESTDIR=${pkgdir} install
+
+  install -d $pkgdir/usr/share/gdb/auto-load
+  mv $pkgdir/usr/{lib/libstdc++.so.6.0.17-gdb.py,share/gdb/auto-load}
+
+  # unfortunately it is much, much easier to install the lot and clean-up the mess...
+  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
+  rm $pkgdir/usr/lib/*.so*
+  rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
+  rm $pkgdir/usr/lib/libgfortran.spec
+  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
+  rm -r $pkgdir/usr/lib/go
+  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info
+  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
+  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
+  rm $pkgdir/usr/share/man/man3/ffi*
+
+  # many packages require these symlinks
+  install -dm755 ${pkgdir}/lib
+  ln -s /usr/bin/cpp ${pkgdir}/lib/cpp
+  ln -s gcc ${pkgdir}/usr/bin/cc
+
+  # POSIX conformance launcher scripts for c89 and c99
+  cat > $pkgdir/usr/bin/c89 <<"EOF"
+#!/bin/sh
+fl="-std=c89"
+for opt; do
+  case "$opt" in
+    -ansi|-std=c89|-std=iso9899:1990) fl="";;
+    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  cat > $pkgdir/usr/bin/c99 <<"EOF"
+#!/bin/sh
+fl="-std=c99"
+for opt; do
+  case "$opt" in
+    -std=c99|-std=iso9899:1999) fl="";;
+    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
+EOF
+
+  chmod 755 $pkgdir/usr/bin/c{8,9}9
+
+  # install the libstdc++ man pages
+  install -dm755 ${pkgdir}/usr/share/man/man3
+  install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-fortran()
+{
+  pkgdesc="Fortran front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-fortran.install
+
+  cd gcc-build
+  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
+  make -j1 DESTDIR=$pkgdir install-target-libgfortran
+  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
+  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
+  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
+  
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
+  rm ${pkgdir}/usr/share/info/libquadmath.info
+
+  ln -s gfortran ${pkgdir}/usr/bin/f95
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-objc()
+{
+  pkgdesc="Objective-C front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+
+  cd gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libobjc
+  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+
+  # remove libraries included in gcc-libs
+  rm ${pkgdir}/usr/lib/libobjc.so*
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-ada()
+{
+  pkgdesc="Ada front-end for GCC (GNAT)"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-ada.install
+
+  cd gcc-build/gcc
+  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
+  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
+
+  ln -s gcc ${pkgdir}/usr/bin/gnatgcc
+  
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc-go()
+{
+  pkgdesc="Go front-end for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+  install=gcc-go.install
+
+  cd gcc-build
+  make -j1 DESTDIR=$pkgdir install-target-libgo
+  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
+  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
+
+  # Install Runtime Library Exception
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
+}
diff --git a/staging/gcc/gcc-4.7.0-cloog-0.17.patch b/staging/gcc/gcc-4.7.0-cloog-0.17.patch
new file mode 100644
index 000000000..c7146fa04
--- /dev/null
+++ b/staging/gcc/gcc-4.7.0-cloog-0.17.patch
@@ -0,0 +1,24 @@
+diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
+--- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
++++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
+@@ -6049,8 +6049,8 @@
+     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
+ 
+     if test "${cloog_org}" = yes ; then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
+-$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
++$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
+ if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+@@ -6061,8 +6061,7 @@
+ main ()
+ {
+ #if CLOOG_VERSION_MAJOR != 0 \
+-    || CLOOG_VERSION_MINOR != 16 \
+-    || CLOOG_VERSION_REVISION < 1
++    || CLOOG_VERSION_MINOR != 17
+     choke me
+    #endif
+   ;
diff --git a/staging/gcc/gcc-ada.install b/staging/gcc/gcc-ada.install
new file mode 100644
index 000000000..df0553a4f
--- /dev/null
+++ b/staging/gcc/gcc-ada.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/staging/gcc/gcc-fortran.install b/staging/gcc/gcc-fortran.install
new file mode 100644
index 000000000..b15d89a97
--- /dev/null
+++ b/staging/gcc/gcc-fortran.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file="gfortran.info"
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}
diff --git a/staging/gcc/gcc-go.install b/staging/gcc/gcc-go.install
new file mode 100644
index 000000000..7dc50dee5
--- /dev/null
+++ b/staging/gcc/gcc-go.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gccgo.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/staging/gcc/gcc-libs.install b/staging/gcc/gcc-libs.install
new file mode 100644
index 000000000..23553b8f0
--- /dev/null
+++ b/staging/gcc/gcc-libs.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+filelist=(libgomp.info libquadmath.info)
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/staging/gcc/gcc.install b/staging/gcc/gcc.install
new file mode 100644
index 000000000..3407a5e1f
--- /dev/null
+++ b/staging/gcc/gcc.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/staging/gcc/gcc_pure64.patch b/staging/gcc/gcc_pure64.patch
new file mode 100644
index 000000000..a9b09bbcf
--- /dev/null
+++ b/staging/gcc/gcc_pure64.patch
@@ -0,0 +1,26 @@
+diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h
+--- gcc-orig/gcc/config/i386/linux64.h	2011-07-08 01:38:34.000000000 +1000
++++ gcc/gcc/config/i386/linux64.h	2011-07-24 19:48:05.000000000 +1000
+@@ -28,6 +28,6 @@
+ #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
+ #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
+diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64
+--- gcc-orig/gcc/config/i386/t-linux64	2011-07-08 01:38:34.000000000 +1000
++++ gcc/gcc/config/i386/t-linux64	2011-07-24 19:49:41.000000000 +1000
+@@ -34,8 +34,8 @@
+ comma=,
+ MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
+ MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
+-MULTILIB_OSDIRNAMES = m64=../lib64
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+ MULTILIB_OSDIRNAMES+= mx32=../libx32
+ 
+ LIBGCC = stmp-multilib
diff --git a/staging/ppl/PKGBUILD b/staging/ppl/PKGBUILD
new file mode 100644
index 000000000..f0e148f1a
--- /dev/null
+++ b/staging/ppl/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 156342 2012-04-17 14:12:54Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: ezzetabi <ezzetabi at gawab dot com>
+
+pkgname=ppl
+pkgver=0.12.1
+pkgrel=1
+pkgdesc="A modern library for convex polyhedra and other numerical abstractions."
+arch=('i686' 'x86_64')
+url="http://bugseng.com/products/ppl"
+license=('GPL3')
+depends=('gmp>=5.0')
+options=('!docs' '!libtool')
+source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign})
+md5sums=('cec8144f2072ac45a850214cca97d075'
+         '43eeeb147f9d8b3608aead63486c9545')
+
+build() {
+  cd $srcdir/ppl-$pkgver
+  ./configure --prefix=/usr --enable-interfaces="c,cxx"
+  make
+}
+
+check() {
+  cd $srcdir/ppl-$pkgver
+  make check
+}
+
+package() {
+  cd $srcdir/ppl-$pkgver
+  make DESTDIR=$pkgdir install
+}
+
diff --git a/testing/at-spi2-core/PKGBUILD b/testing/at-spi2-core/PKGBUILD
index db5013e39..34ea47e11 100644
--- a/testing/at-spi2-core/PKGBUILD
+++ b/testing/at-spi2-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 155015 2012-04-01 11:30:41Z heftig $
+# $Id: PKGBUILD 156380 2012-04-17 20:01:02Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-core
-pkgver=2.4.0
+pkgver=2.4.1
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2' 'libxtst')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d9d087efe528b392cb7ee27982798126df6ec8c18d5e30c557c8fcc55022c669')
+sha256sums=('5a1d8026bbe1d40d1f5a2c956d10b9ed39766f7880a73d80f37aa6e48c6c11e5')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/testing/brasero/PKGBUILD b/testing/brasero/PKGBUILD
index 3762b7cd9..a9d9b7272 100644
--- a/testing/brasero/PKGBUILD
+++ b/testing/brasero/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 155019 2012-04-01 11:30:47Z heftig $
+# $Id: PKGBUILD 156384 2012-04-17 20:15:51Z ibiru $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=brasero
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="A disc burning application for Gnome"
 arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@ optdepends=('libburn: alternative back-end'
 replaces=('nautilus-cd-burner')
 install=brasero.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e35b739a7db54d21564232303bb9d12609a02976c36cdd8848ff4376a0809198')
+sha256sums=('e4fcd5dca1c7b0a930a43ae59953fa96db3f6beef41ceedb2f0ef8636e26a7a6')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/testing/brasero/brasero.install b/testing/brasero/brasero.install
index b6c57055e..9248062f7 100644
--- a/testing/brasero/brasero.install
+++ b/testing/brasero/brasero.install
@@ -1,14 +1,14 @@
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
   update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
+  update-mime-database /usr/share/mime > /dev/null
 }
 
 post_upgrade() {
-    post_install $1
+    post_install
 }
 
 post_remove() {
-    post_install $1
+    post_install
 }
diff --git a/testing/cheese/PKGBUILD b/testing/cheese/PKGBUILD
index e1a699d80..c11d494ea 100644
--- a/testing/cheese/PKGBUILD
+++ b/testing/cheese/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155024 2012-04-01 11:30:54Z heftig $
+# $Id: PKGBUILD 156387 2012-04-17 20:31:35Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64)
@@ -19,11 +19,10 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/projects/cheese/"
 install=cheese.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('96b0eae8e366e4d44921e148239167fcb6965dbbcb40e406d6a118c75377b41a')
+sha256sums=('b7a07c45217bdea6b9bc3ad56c19b5b7de4ddf939074efe94add7afb66a26dd0')
 
 build() {
   cd $pkgname-$pkgver
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --disable-static --disable-schemas-compile
   make
diff --git a/testing/cheese/cheese.install b/testing/cheese/cheese.install
index c042fba42..f7e8c46ac 100644
--- a/testing/cheese/cheese.install
+++ b/testing/cheese/cheese.install
@@ -1,20 +1,12 @@
-pkgname=cheese
-
 post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-   if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
-       usr/sbin/gconfpkg --uninstall $pkgname
-   fi
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  post_install $1
+  post_install
 }
diff --git a/testing/clutter/PKGBUILD b/testing/clutter/PKGBUILD
index cae262bd6..24dffe9dc 100644
--- a/testing/clutter/PKGBUILD
+++ b/testing/clutter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 155026 2012-04-01 11:30:57Z heftig $
+# $Id: PKGBUILD 156341 2012-04-17 13:51:23Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=clutter
-pkgver=1.10.0
+pkgver=1.10.2
 pkgrel=1
 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ license=('LGPL')
 depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi')
 makedepends=('gobject-introspection' 'mesa')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('51659837c77009cd04d069e480e9131328d6557ad67d1ffdc0dc4ae65a73ee45')
+sha256sums=('d5c11b464d1a80eb6b73dbf7a98532917a055068fec3508f2a849c850e70d5b7')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/testing/eog/PKGBUILD b/testing/eog/PKGBUILD
index 0a99d9d00..f6bed48cc 100644
--- a/testing/eog/PKGBUILD
+++ b/testing/eog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155042 2012-04-01 11:31:19Z heftig $
+# $Id: PKGBUILD 156396 2012-04-17 20:50:49Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=eog
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0710479642078aebb576d07ccc599e9f5ae83f4c738b182867fda59aea359dd2')
+sha256sums=('cf29997ee065341fa323abc849732bfa18ab564cc0d931d61eaa473953d3e216')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD
index 2df092e0b..6e1bff0cb 100644
--- a/testing/gdm/PKGBUILD
+++ b/testing/gdm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156172 2012-04-15 08:17:07Z ibiru $
+# $Id: PKGBUILD 156402 2012-04-17 23:20:57Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdm
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -26,11 +26,11 @@ sha256sums=('6292968dff5fc89877b5e1aaa3c7d1484dd3ed2d4f388e935841d053439be665'
             'f68600ccf80f475deb417d58ab3306c4a1ba4622688e2901996c8549c85a9ee6'
             '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
             '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
-            'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
-            '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
+            '6a8b286d1ffa04150b3cc401f64e6ddec778c7b65f5bfc831031b64345d7e6b2'
+            'dd50f5bd28807a16c5ebe89fc868b7c47fa571138498e879f2b1c9da1ad6eb84'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
-            '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c'
-            'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
+            '1a1e9b3f26de4eb9f45d1e9a0b5d0db902ca734461ba46b4bb620b0298bb98aa'
+            '844d5fae0df59241d34099a3d458289bd95707b2aae976627c663904294043d8'
             '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
 
 build() {
diff --git a/testing/gdm/gdm-autologin.pam b/testing/gdm/gdm-autologin.pam
index c77c78917..bc0193df0 100644
--- a/testing/gdm/gdm-autologin.pam
+++ b/testing/gdm/gdm-autologin.pam
@@ -7,6 +7,8 @@ auth            requisite       pam_permit.so
 auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
 auth            required        pam_deny.so
 
+account         required        pam_access.so
+account         required        pam_time.so
 account         required        pam_unix.so
 
 password        required        pam_deny.so
diff --git a/testing/gdm/gdm-fingerprint.pam b/testing/gdm/gdm-fingerprint.pam
index 5b74bf6d6..38fab5782 100644
--- a/testing/gdm/gdm-fingerprint.pam
+++ b/testing/gdm/gdm-fingerprint.pam
@@ -7,6 +7,8 @@ auth            requisite       pam_fprintd.so
 auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
 auth            required        pam_deny.so
 
+account         required        pam_access.so
+account         required        pam_time.so
 account         required        pam_unix.so
 
 password        required        pam_deny.so
diff --git a/testing/gdm/gdm-password.pam b/testing/gdm/gdm-password.pam
index aa4d4dd47..eed5e1003 100644
--- a/testing/gdm/gdm-password.pam
+++ b/testing/gdm/gdm-password.pam
@@ -8,6 +8,8 @@ auth            optional        pam_gnome_keyring.so
 auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
 auth            required        pam_deny.so
 
+account         required        pam_access.so
+account         required        pam_time.so
 account         required        pam_unix.so
 
 password        required        pam_unix.so
diff --git a/testing/gdm/gdm-smartcard.pam b/testing/gdm/gdm-smartcard.pam
index baacb8bed..c5c29e73f 100644
--- a/testing/gdm/gdm-smartcard.pam
+++ b/testing/gdm/gdm-smartcard.pam
@@ -7,6 +7,8 @@ auth            requisite       pam_pkcs11.so wait_for_card card_only
 auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
 auth            required        pam_deny.so
 
+account         required        pam_access.so
+account         required        pam_time.so
 account         required        pam_unix.so
 
 password        required        pam_pkcs11.so
diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD
index 8d04b1f68..db822149c 100644
--- a/testing/gedit/PKGBUILD
+++ b/testing/gedit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155080 2012-04-01 11:32:21Z heftig $
+# $Id: PKGBUILD 156361 2012-04-17 17:49:09Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a51bb8d60bfd9b37edf04228c7493d256e73a6b5f025f8b4900431673ac34e3f')
+sha256sums=('9b1f0164d6c6bc08e391efde7e6a2aa9290a65bda543fe3a7adc6ef73b722a64')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/testing/gedit/gedit.install b/testing/gedit/gedit.install
index 9d88a1341..606920688 100644
--- a/testing/gedit/gedit.install
+++ b/testing/gedit/gedit.install
@@ -1,11 +1,11 @@
 post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
+    glib-compile-schemas /usr/share/glib-2.0/schemas
     update-desktop-database -q
 }
 
 pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/gedit.schemas ]; then
-        usr/sbin/gconfpkg --uninstall gedit
+    if [ -f /usr/share/gconf/schemas/gedit.schemas ]; then
+        gconfpkg --uninstall gedit
     fi
 }
 
diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD
index 630479036..cd8bd7f6d 100644
--- a/testing/glib-networking/PKGBUILD
+++ b/testing/glib-networking/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 155094 2012-04-01 11:32:42Z heftig $
+# $Id: PKGBUILD 156335 2012-04-17 13:27:36Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=glib-networking
-pkgver=2.32.0
+pkgver=2.32.1
 pkgrel=1
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool')
 options=('!libtool')
 install=glib-networking.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3f399f8a8977bef5b07a89772ab473ee247773ac7362e4ebfb1f4643828838dc')
+sha256sums=('051ab469356327404dc53ae36dda5b85b99a12e5573a838d927abb49e58fa950')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/testing/glib-networking/glib-networking.install b/testing/glib-networking/glib-networking.install
index e1b80c438..8214e1968 100644
--- a/testing/glib-networking/glib-networking.install
+++ b/testing/glib-networking/glib-networking.install
@@ -1,5 +1,5 @@
 post_install() {
-  /usr/bin/gio-querymodules /usr/lib/gio/modules
+  gio-querymodules /usr/lib/gio/modules
 }
 
 post_upgrade() {
diff --git a/testing/gnome-online-accounts/PKGBUILD b/testing/gnome-online-accounts/PKGBUILD
index 5f3e6db28..37de37c92 100644
--- a/testing/gnome-online-accounts/PKGBUILD
+++ b/testing/gnome-online-accounts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 155129 2012-04-01 11:33:35Z heftig $
+# $Id: PKGBUILD 156363 2012-04-17 17:55:12Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-accounts
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="GNOME service to access online accounts"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 options=(!libtool)
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('306a6ebaf4a0349596d1729d263b98fdb8d27d788d61e27d727d03883dccea95')
+sha256sums=('d5636b8da29aae04757ca528de65e3617d85696bd7e434c48dbd1199c105f4ae')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/testing/gnome-screenshot/PKGBUILD b/testing/gnome-screenshot/PKGBUILD
index 48e99f8d3..02d85d0a2 100644
--- a/testing/gnome-screenshot/PKGBUILD
+++ b/testing/gnome-screenshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 155137 2012-04-01 11:33:47Z heftig $
+# $Id: PKGBUILD 156378 2012-04-17 19:57:29Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-screenshot
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="Take pictures of your screen"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('intltool')
 groups=('gnome-extra')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0d04ffdc927557745de03aeef84924b43f3469a445e0afc8ef6050834898ad9c')
+sha256sums=('47c227e43404d6cc101cf473d8f48f7572064b2b10724f2660066f9a4718d488')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/testing/gnome-system-log/PKGBUILD b/testing/gnome-system-log/PKGBUILD
index 49638280f..8ece55902 100644
--- a/testing/gnome-system-log/PKGBUILD
+++ b/testing/gnome-system-log/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 155147 2012-04-01 11:34:02Z heftig $
+# $Id: PKGBUILD 156365 2012-04-17 18:02:38Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-system-log
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="View your system logs"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gnome-doc-utils')
 groups=('gnome-extra')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7eea66e1cef32c0ad7f0027564d371123dfbfb1866fd172d9d498b5dd701528b')
+sha256sums=('288bb4db72d5e86874198f3a879a89cd0ddec373db9838d8ea772df1c5267736')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/testing/gnome-system-monitor/PKGBUILD b/testing/gnome-system-monitor/PKGBUILD
index 8a8f6cffb..07f3a5106 100644
--- a/testing/gnome-system-monitor/PKGBUILD
+++ b/testing/gnome-system-monitor/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 155149 2012-04-01 11:34:05Z heftig $
+# $Id: PKGBUILD 156400 2012-04-17 21:23:12Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd')
-makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool')
+makedepends=('gnome-doc-utils' 'intltool')
 options=(!emptydirs)
 url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-system-monitor.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e62047983f423f4a178f01d860e9b362e8c9757d4bbeadad0f261b97b4433d12')
+sha256sums=('60f53f1b37c717b2f12502bf6f3b4b43c8e8f3d2fb1198ba66bf933ec4c3130b')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/testing/gnome-system-monitor/gnome-system-monitor.install b/testing/gnome-system-monitor/gnome-system-monitor.install
index 70641526f..c25dff2d3 100644
--- a/testing/gnome-system-monitor/gnome-system-monitor.install
+++ b/testing/gnome-system-monitor/gnome-system-monitor.install
@@ -1,19 +1,11 @@
-pkgname=gnome-system-monitor
-
 post_install() {
     glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        gconfpkg --uninstall ${pkgname}
-    fi
-}
-
 post_upgrade() {
-    post_install $1
+    post_install
 }
 
 post_remove() {
-    post_install $1
+    post_install
 }
diff --git a/testing/gobject-introspection/PKGBUILD b/testing/gobject-introspection/PKGBUILD
index 58b78d24a..ed5299eaa 100644
--- a/testing/gobject-introspection/PKGBUILD
+++ b/testing/gobject-introspection/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 155161 2012-04-01 11:34:23Z heftig $
+# $Id: PKGBUILD 156398 2012-04-17 21:03:54Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gobject-introspection
-pkgver=1.32.0
+pkgver=1.32.1
 pkgrel=1
 pkgdesc="Introspection system for GObject-based libraries"
 url="http://live.gnome.org/GObjectInstrospection"
@@ -12,16 +12,16 @@ depends=('glib2' 'python2')
 makedepends=('cairo')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('346a729eb8a2a5dc49197d2195e71295167504cc2671298dfd92a32f8e5a01b3')
+sha256sums=('44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
   sed -i '1s|#!/usr/bin/env python$|&2|' \
diff --git a/testing/gucharmap/PKGBUILD b/testing/gucharmap/PKGBUILD
index c464cd210..61affd78e 100644
--- a/testing/gucharmap/PKGBUILD
+++ b/testing/gucharmap/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155178 2012-04-01 11:34:52Z heftig $
+# $Id: PKGBUILD 156374 2012-04-17 19:32:26Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gucharmap
-pkgver=3.4.0.1
+pkgver=3.4.1.1
 pkgrel=1
 pkgdesc="Gnome Unicode Charmap"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
 options=('!libtool' '!emptydirs')
 install=gucharmap.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('eac2f2281cde5118544bc930b9ce90e68302a8c4ea09755f0db3e2e5e022b23c')
+sha256sums=('52ea80e9e5f01232801dd24f7eb5c70eb36e7a85e429ad9113e8b71234d94c62')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/testing/gucharmap/gucharmap.install b/testing/gucharmap/gucharmap.install
index 9a19b56fc..0a9ddf4c2 100644
--- a/testing/gucharmap/gucharmap.install
+++ b/testing/gucharmap/gucharmap.install
@@ -1,5 +1,5 @@
 post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
diff --git a/testing/libsoup/PKGBUILD b/testing/libsoup/PKGBUILD
index 27452ba7b..6cbb77d52 100644
--- a/testing/libsoup/PKGBUILD
+++ b/testing/libsoup/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 155210 2012-04-01 11:35:42Z heftig $
+# $Id: PKGBUILD 156337 2012-04-17 13:39:07Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libsoup
 pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.38.0
+pkgver=2.38.1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
-makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking')
+makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('8fc1470309aacfc45842ec774b5a5de1848d3d59f7c467efaca555b21bef96ad')
+sha256sums=('71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a')
 
 build() {
   cd "$pkgbase-$pkgver"
@@ -35,7 +35,7 @@ package_libsoup() {
 
 package_libsoup-gnome() {
   pkgdesc="GNOME HTTP Library - GNOME libraries"
-  depends=("libsoup=$pkgver" 'libgnome-keyring')
+  depends=("libsoup=$pkgver" 'libgnome-keyring' 'sqlite')
 
   cd "$pkgbase-$pkgver"
   make DESTDIR="$pkgdir" install
diff --git a/testing/links/PKGBUILD b/testing/links/PKGBUILD
new file mode 100644
index 000000000..40a3510a2
--- /dev/null
+++ b/testing/links/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 156326 2012-04-17 04:51:35Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=links
+pkgver=2.6
+pkgrel=1
+pkgdesc="A text WWW browser, similar to Lynx"
+arch=('i686' 'x86_64')
+url="http://links.twibright.com/"
+license=('GPL')
+depends=('bzip2' 'xz' 'zlib' 'openssl' 'gpm')
+makedepends=('libtiff' 'libpng' 'libxt')
+optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks')
+provides=('links-g')
+conflicts=('links-g')
+replaces=('links-g')
+source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop)
+sha1sums=('228bd726c176ea44d35fa12cafd97aa83214d9dc'
+          'f600e27c2a71184444f7dd07a10230aa44463a02')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  (cd intl; ./gen-intl; ./synclang)
+  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
+    --enable-graphics --with-x --with-fb
+  make
+  mv links xlinks
+
+  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
+    --disable-graphics --without-x  --without-fb
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 xlinks "${pkgdir}/usr/bin/xlinks"
+  ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz"
+
+  install -D -m644 "${srcdir}/links.desktop" "${pkgdir}/usr/share/applications/links.desktop"
+  install -d "${pkgdir}/usr/share/pixmaps"
+  install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm "${pkgdir}/usr/share/pixmaps/"
+
+  install -d "${pkgdir}/usr/share/doc/links/calibration"
+  install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/"
+}
diff --git a/testing/links/links.desktop b/testing/links/links.desktop
new file mode 100644
index 000000000..9d6338a5b
--- /dev/null
+++ b/testing/links/links.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Links
+Exec=xlinks -g
+Icon=links_32x32.xpm
+Type=Application
+Terminal=false
+Categories=Network;WebBrowser;
diff --git a/testing/nautilus/PKGBUILD b/testing/nautilus/PKGBUILD
index ade197593..c95c97384 100644
--- a/testing/nautilus/PKGBUILD
+++ b/testing/nautilus/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 155230 2012-04-01 11:36:11Z heftig $
+# $Id: PKGBUILD 156339 2012-04-17 13:45:02Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nautilus
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="GNOME file manager"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=nautilus.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('abdc8e84a42ab69158beedeec5b2b960a8bf899fb2b40ad162270223e1f243a3')
+sha256sums=('02581c9475e9c4250960555b248378a6a1c63a5c029728ec48347c78ca77392d')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/testing/nautilus/nautilus.install b/testing/nautilus/nautilus.install
index 631e38649..082126d24 100644
--- a/testing/nautilus/nautilus.install
+++ b/testing/nautilus/nautilus.install
@@ -1,14 +1,8 @@
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall nautilus
-  fi
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  update-mime-database /usr/share/mime > /dev/null
 }
 
 post_upgrade() {
diff --git a/testing/procps/PKGBUILD b/testing/procps/PKGBUILD
new file mode 100644
index 000000000..e2561cbbd
--- /dev/null
+++ b/testing/procps/PKGBUILD
@@ -0,0 +1,87 @@
+# $Id: PKGBUILD 156392 2012-04-17 20:37:51Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=procps
+pkgver=3.2.8
+pkgrel=5
+pkgdesc="Utilities for monitoring your system and processes on your system"
+arch=('i686' 'x86_64')
+url="http://procps.sourceforge.net/"
+license=('GPL' 'LGPL')
+groups=('base')
+depends=('ncurses')
+backup=('etc/sysctl.conf')
+source=(http://procps.sourceforge.net/procps-${pkgver}.tar.gz sysctl.conf
+        groff-top-manpage.patch
+        procps-3.2.7-top-manpage.patch
+        procps-3.2.7-free-hlmem.patch
+        procps-3.2.7-ps-man-fmt.patch
+        procps-3.2.7-longcmd.patch
+        procps-3.2.7-psman.patch
+        procps-3.2.7-slabtop-once.patch
+        procps-3.2.7-top-clrscr.patch
+        procps-3.2.7-top-cpu0.patch
+        procps-3.2.7-top-env-cpuloop.patch
+        procps-3.2.7-top-remcpu.patch
+        procps-3.2.7-top-sorthigh.patch
+        procps-3.2.7-watch-unicode.patch
+        procps-3.2.7-w-best.patch
+        procps-3.2.8-gmake-3.82.patch
+        procps-3.2.8-setlocale.patch
+        procps-3.2.8-threads.patch
+        procps-3.2.8-linux-ver-init.patch
+        procps-3.2.8-kernel3-uts.patch)
+sha1sums=('a0c86790569dec26b5d9037e8868ca907acc9829'
+          '9b9a314010d042b5aa487893c06f361531525e6a'
+          'bdd627f602ed2e38994d49309de0edbd90b41aff'
+          '16737700b22eec8f4e8d16bce099f4b1662501e2'
+          'da1b9e61f8df4a8e23a7032b245dd99e32e2c01c'
+          'ba9ad9f0bde3e84484b5a0238e53534438e924be'
+          '1a656d8094be41e019b2a9598b07c8a3d47f9de3'
+          '9944224ed2f5bd7d7fb505127bd71d6f01d88373'
+          '954026785a9e6c90d796e93563fcea2a693691e8'
+          '8582cd15346fa939f3fd01081620de0ffc617335'
+          '80e31310da53baf095e905d94485324932e433df'
+          '15fe886a2b4bed5885e6d457954e1145d1dcd2a2'
+          'bce21809ee0cb917ddf5b0c0bf2a91ea50feb0c6'
+          '1be00d71e8e16ff2d656e5dd1f9988f2f3c0d5a0'
+          '52068a433535ec3d5d974141be3d6d3b6a41725a'
+          '3a8f1ba912112d7520becb28746e97b11d9b0c86'
+          '3a4908ed8dbc936e39cb9094af8098ef9e656581'
+          '09b1f6a3f9691b9f1432549a7a74a90ee5cfbdde'
+          '926b92913201f21c45d48436c0902cffc059ce27'
+          '171d5352940200c209e0c2d43c17f01c02173a66'
+          'e2b2917e5462bd0aa3cb1b62942dbe8e8e81c16b')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ../groff-top-manpage.patch
+  patch -p1 < ../procps-3.2.7-top-manpage.patch
+  patch -p1 < ../procps-3.2.7-free-hlmem.patch
+  patch -p1 < ../procps-3.2.7-ps-man-fmt.patch
+  patch -p1 < ../procps-3.2.7-psman.patch
+  patch -p1 < ../procps-3.2.7-longcmd.patch
+  patch -p1 < ../procps-3.2.7-slabtop-once.patch
+  patch -p1 < ../procps-3.2.7-top-clrscr.patch
+  patch -p1 < ../procps-3.2.7-top-cpu0.patch
+  patch -p1 < ../procps-3.2.7-top-env-cpuloop.patch
+  patch -p1 < ../procps-3.2.7-top-remcpu.patch
+  patch -p1 < ../procps-3.2.7-top-sorthigh.patch
+  patch -p1 < ../procps-3.2.7-watch-unicode.patch
+  patch -p1 < ../procps-3.2.7-w-best.patch
+  patch -p1 < ../procps-3.2.8-gmake-3.82.patch
+  patch -p1 < ../procps-3.2.8-setlocale.patch
+  patch -p1 < ../procps-3.2.8-threads.patch
+  patch -p0 < ../procps-3.2.8-linux-ver-init.patch
+  patch -p1 < ../procps-3.2.8-kernel3-uts.patch
+  sed -i "s:\$(lib64):lib:" Makefile
+  make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" lib="${pkgdir}/usr/lib/" ldconfig=/bin/true install
+  install -D -m644 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.conf"
+  install -d "${pkgdir}/usr/include/proc"
+  install -m644 proc/*.h "${pkgdir}/usr/include/proc"
+}
diff --git a/testing/procps/groff-top-manpage.patch b/testing/procps/groff-top-manpage.patch
new file mode 100644
index 000000000..625053c72
--- /dev/null
+++ b/testing/procps/groff-top-manpage.patch
@@ -0,0 +1,39 @@
+diff -Naur procps-3.2.8-orig//top.1 procps-3.2.8/top.1
+--- procps-3.2.8-orig//top.1	2010-11-19 00:43:13.000000000 -0500
++++ procps-3.2.8/top.1	2010-11-19 00:44:06.000000000 -0500
+@@ -42,7 +42,7 @@
+ .ds EM \ \fB\-\-\ \fR
+ \#                          - these two are for chuckles, makes great grammar
+ .ds Me top
+-.ds ME \fBtop\fR
++.ds MM \fBtop\fR
+ \#                          - other misc strings for consistent usage/emphasis
+ .ds F \fIOff\fR
+ .ds O \fIOn\fR
+@@ -85,7 +85,7 @@
+ .\" ----------------------------------------------------------------------
+ .SH SYNOPSIS
+ .\" ----------------------------------------------------------------------
+-\*(ME \-\fBhv\fR | \-\fBbcHisS\fR \-\fBd\fI delay\fR \-\fBn\fI
++\*(MM \-\fBhv\fR | \-\fBbcHisS\fR \-\fBd\fI delay\fR \-\fBn\fI
+ iterations\fR \-\fBp\fI pid\fR [,\fI pid\fR ...]
+ 
+ The traditional switches '-' and whitespace are optional.
+@@ -94,7 +94,7 @@
+ .\" ----------------------------------------------------------------------
+ .SH DESCRIPTION
+ .\" ----------------------------------------------------------------------
+-The \*(ME program provides a dynamic real-time view of a running system.
++The \*(MM program provides a dynamic real-time view of a running system.
+ It can display\fB system\fR summary information as well as a list of\fB
+ tasks\fR currently being managed by the Linux kernel.
+ The types of system summary information shown and the types, order and
+@@ -104,7 +104,7 @@
+ The program provides a limited interactive interface for process
+ manipulation as well as a much more extensive interface for personal
+ configuration \*(EM encompassing every aspect of its operation.
+-And while \*(ME is referred to throughout this document, you are free
++And while \*(MM is referred to throughout this document, you are free
+ to name the program anything you wish.
+ That new name, possibly an alias, will then be reflected on \*(Me's display
+ and used when reading and writing a \*(CF.
diff --git a/testing/procps/procps-3.2.7-free-hlmem.patch b/testing/procps/procps-3.2.7-free-hlmem.patch
new file mode 100644
index 000000000..c5ef9cc4c
--- /dev/null
+++ b/testing/procps/procps-3.2.7-free-hlmem.patch
@@ -0,0 +1,23 @@
+diff -up procps-3.2.7/free.1.hlmem procps-3.2.7/free.1
+--- procps-3.2.7/free.1.hlmem	2009-02-24 10:54:35.000000000 +0100
++++ procps-3.2.7/free.1	2009-02-24 11:00:26.000000000 +0100
+@@ -7,7 +7,7 @@ free \- Display amount of free and used 
+ .SH SYNOPSIS
+ .BR "free " [ "\-b" " | " "\-k" " | " "\-m" "] [" "\-o" "] [" "\-s"
+ .I delay
+-.RB "] [" "\-t" "] [" "\-V" ]
++.RB "] [" "\-t" "] [" "\-l" "] [" "\-V" "]
+ .SH DESCRIPTION
+ \fBfree\fP displays the total amount of free and used physical and swap 
+ memory in the system, as well as the buffers used by the kernel.
+@@ -28,7 +28,9 @@ may actually specify any floating point 
+ .BR usleep (3)
+ is used for microsecond resolution delay times.
+ .PP
+-The \fB\-V\fP displays version information.
++The \fB-l\fP switch shows detailed low and high memory statistics.
++.PP
++The \fB\-V\fP switch displays version information.
+ .SH FILES
+ .ta
+ .IR /proc/meminfo "\-\- memory information"
diff --git a/testing/procps/procps-3.2.7-longcmd.patch b/testing/procps/procps-3.2.7-longcmd.patch
new file mode 100644
index 000000000..7c4fdca36
--- /dev/null
+++ b/testing/procps/procps-3.2.7-longcmd.patch
@@ -0,0 +1,22 @@
+--- procps-3.2.7/proc/readproc.c.kzak	2006-06-16 10:18:13.000000000 +0200
++++ procps-3.2.7/proc/readproc.c	2006-09-27 11:25:13.000000000 +0200
+@@ -432,14 +432,17 @@
+     if(fd==-1) return NULL;
+ 
+     /* read whole file into a memory buffer, allocating as we go */
+-    while ((n = read(fd, buf, sizeof buf - 1)) > 0) {
++    while ((n = read(fd, buf, sizeof buf - 1)) >= 0) {
+ 	if (n < (int)(sizeof buf - 1))
+ 	    end_of_file = 1;
+-	if (n == 0 && rbuf == 0)
++	if (n == 0 && rbuf == 0) {
++	    close(fd);
+ 	    return NULL;	/* process died between our open and read */
++	}
+ 	if (n < 0) {
+ 	    if (rbuf)
+ 		free(rbuf);
++	    close(fd);
+ 	    return NULL;	/* read error */
+ 	}
+ 	if (end_of_file && buf[n-1])		/* last read char not null */
diff --git a/testing/procps/procps-3.2.7-ps-man-fmt.patch b/testing/procps/procps-3.2.7-ps-man-fmt.patch
new file mode 100644
index 000000000..f3a80dca7
--- /dev/null
+++ b/testing/procps/procps-3.2.7-ps-man-fmt.patch
@@ -0,0 +1,12 @@
+diff -up procps-3.2.7/ps/ps.1.ps-man-fmt procps-3.2.7/ps/ps.1
+--- procps-3.2.7/ps/ps.1.ps-man-fmt	2008-09-01 11:43:18.000000000 +0200
++++ procps-3.2.7/ps/ps.1	2008-09-01 11:43:41.000000000 +0200
+@@ -30,7 +30,7 @@
+ .\" the space needed for the 1st two columns.
+ .\" Making it messy: inches, ens, points, scaled points...
+ .\"
+-.nr ColSize ((\n(.lu-\n(.iu/\n(.Hu-20u)n)
++.nr ColSize ((\n[.l] - \n[.i]) / 1n - 20)
+ .\"
+ .\" This is for command options
+ .nr OptSize (16u)
diff --git a/testing/procps/procps-3.2.7-psman.patch b/testing/procps/procps-3.2.7-psman.patch
new file mode 100644
index 000000000..7ba6cff34
--- /dev/null
+++ b/testing/procps/procps-3.2.7-psman.patch
@@ -0,0 +1,22 @@
+--- procps-3.2.7/ps/ps.1.psman	2007-06-20 08:30:47.000000000 +0200
++++ procps-3.2.7/ps/ps.1	2007-06-20 08:50:10.000000000 +0200
+@@ -21,8 +21,8 @@
+ .\" See /usr/share/groff/current/tmac/an-old.tmac for what these do.
+ .\" Setting them to zero provides extra space, but only do that for
+ .\" plain text output. PostScript and such will remain indented.
+-.if n .nr IN 0n
+-.if n .nr an-prevailing-indent 0n
++.\" .if n .nr IN 0n
++.\" .if n .nr an-prevailing-indent 0n
+ .\"
+ .\"
+ .\" ColSize is used for the format spec table.
+@@ -838,6 +838,8 @@
+ .\" lB1 lB1 lBw(5.5i)
+ .\" lB1 l1  l.
+ .\"
++.RE
++
+ .TS
+ expand;
+ lB1 lB1 lBw(\n[ColSize]n)
diff --git a/testing/procps/procps-3.2.7-slabtop-once.patch b/testing/procps/procps-3.2.7-slabtop-once.patch
new file mode 100644
index 000000000..d3319cfe7
--- /dev/null
+++ b/testing/procps/procps-3.2.7-slabtop-once.patch
@@ -0,0 +1,113 @@
+diff -up procps-3.2.7/slabtop.c.once procps-3.2.7/slabtop.c
+--- procps-3.2.7/slabtop.c.once	2008-12-11 13:24:52.000000000 +0100
++++ procps-3.2.7/slabtop.c	2008-12-11 13:33:12.000000000 +0100
+@@ -268,9 +268,24 @@ static void parse_input(char c)
+ 	}
+ }
+ 
++/*printw or printf depending on the context*/
++static void printwf(int once, const char *s,...)
++{
++va_list va;
++
++va_start(va,s);
++if(once) 
++    vprintf(s,va);
++else     
++    vwprintw(stdscr, s, va);
++va_end(va);
++}
++
++
+ int main(int argc, char *argv[])
+ {
+ 	int o;
++        int once = 0;
+ 	unsigned short old_rows;
+ 	struct slab_info *slab_list = NULL;
+ 
+@@ -307,6 +322,7 @@ int main(int argc, char *argv[])
+ 			break;
+ 		case 'o':
+ 			delay = 0;
++                        once = 1;
+ 			break;
+ 		case 'V':
+ 			display_version();
+@@ -322,12 +338,18 @@ int main(int argc, char *argv[])
+ 	if (tcgetattr(0, &saved_tty) == -1)
+ 		perror("tcgetattr");
+ 
+-	initscr();
+-	term_size(0);
+-	old_rows = rows;
+-	resizeterm(rows, cols);
+-	signal(SIGWINCH, term_size);
+-	signal(SIGINT, sigint_handler);
++        if(!once) {
++            initscr();
++	    term_size(0);
++	    old_rows = rows;
++	    resizeterm(rows, cols);
++	    signal(SIGWINCH, term_size);
++	    signal(SIGINT, sigint_handler); 
++        } else {
++            old_rows = rows;
++            rows = 80;
++            cols = 24;
++        }
+ 
+ 	do {
+ 		struct slab_info *curr;
+@@ -341,12 +363,12 @@ int main(int argc, char *argv[])
+ 			break;
+ 
+ 		if (old_rows != rows) {
+-			resizeterm(rows, cols);
++			if(!once) resizeterm(rows, cols);
+ 			old_rows = rows;
+ 		}
+ 
+ 		move(0,0);
+-		printw(	" Active / Total Objects (%% used)    : %d / %d (%.1f%%)\n"
++		printwf(once,	" Active / Total Objects (%% used)    : %d / %d (%.1f%%)\n"
+ 			" Active / Total Slabs (%% used)      : %d / %d (%.1f%%)\n"
+ 			" Active / Total Caches (%% used)     : %d / %d (%.1f%%)\n"
+ 			" Active / Total Size (%% used)       : %.2fK / %.2fK (%.1f%%)\n"
+@@ -360,15 +382,15 @@ int main(int argc, char *argv[])
+ 
+ 		slab_list = slabsort(slab_list);
+ 
+-		attron(A_REVERSE);
+-		printw(	"%6s %6s %4s %8s %6s %8s %10s %-23s\n",
++		if(!once) attron(A_REVERSE);
++		printwf(once,	"%6s %6s %4s %8s %6s %8s %10s %-23s\n",
+ 			"OBJS", "ACTIVE", "USE", "OBJ SIZE", "SLABS",
+ 			"OBJ/SLAB", "CACHE SIZE", "NAME");
+-		attroff(A_REVERSE);
++		if(!once) attroff(A_REVERSE);
+ 
+ 		curr = slab_list;
+ 		for (i = 0; i < rows - 8 && curr->next; i++) {
+-			printw("%6u %6u %3u%% %7.2fK %6u %8u %9uK %-23s\n",
++			printwf(once, "%6u %6u %3u%% %7.2fK %6u %8u %9uK %-23s\n",
+ 				curr->nr_objs, curr->nr_active_objs, curr->use,
+ 				curr->obj_size / 1024.0, curr->nr_slabs,
+ 				curr->objs_per_slab, (unsigned)(curr->cache_size / 1024),
+@@ -376,7 +398,7 @@ int main(int argc, char *argv[])
+ 			curr = curr->next;
+ 		}
+ 
+-		refresh();
++		if(!once) refresh();
+ 		put_slabinfo(slab_list);
+ 
+ 		FD_ZERO(&readfds);
+@@ -392,6 +414,6 @@ int main(int argc, char *argv[])
+ 
+ 	tcsetattr(0, TCSAFLUSH, &saved_tty);
+ 	free_slabinfo(slab_list);
+-	endwin();
++	if(!once) endwin();
+ 	return 0;
+ }
diff --git a/testing/procps/procps-3.2.7-top-clrscr.patch b/testing/procps/procps-3.2.7-top-clrscr.patch
new file mode 100644
index 000000000..8a0256846
--- /dev/null
+++ b/testing/procps/procps-3.2.7-top-clrscr.patch
@@ -0,0 +1,19 @@
+diff -up procps-3.2.7/top.c.clrscr procps-3.2.7/top.c
+--- procps-3.2.7/top.c.clrscr	2008-04-08 08:49:48.000000000 +0200
++++ procps-3.2.7/top.c	2008-04-08 08:50:07.000000000 +0200
+@@ -2109,6 +2109,7 @@ static void fields_sort (void)
+       *p = x + 'A';
+    Curwin->rc.sortindx = x;
+    putp(Cap_curs_norm);
++   putp(Cap_clr_scr);
+ }
+ 
+ 
+@@ -2134,6 +2135,7 @@ static void fields_toggle (void)
+          *p = i + 'A';
+    }
+    putp(Cap_curs_norm);
++   putp(Cap_clr_scr);
+ }
+ 
+ /*######  Windows/Field Groups support  #################################*/
diff --git a/testing/procps/procps-3.2.7-top-cpu0.patch b/testing/procps/procps-3.2.7-top-cpu0.patch
new file mode 100644
index 000000000..eb81121c5
--- /dev/null
+++ b/testing/procps/procps-3.2.7-top-cpu0.patch
@@ -0,0 +1,20 @@
+--- procps-3.2.7/top.c.orig	2007-09-07 21:28:41.000000000 +0100
++++ procps-3.2.7/top.c	2007-09-07 21:29:15.000000000 +0100
+@@ -959,8 +959,15 @@
+ 
+    // and just in case we're 2.2.xx compiled without SMP support...
+    if (Cpu_tot == 1) {
+-      cpus[1].id = 0;
+-      memcpy(cpus, &cpus[1], sizeof(CPU_t));
++      cpus[0].id = cpus[1].id = 0;
++      cpus[0].u = cpus[1].u;
++      cpus[0].n = cpus[1].n;
++      cpus[0].s = cpus[1].s;
++      cpus[0].i = cpus[1].i;
++      cpus[0].w = cpus[1].w;
++      cpus[0].x = cpus[1].x;
++      cpus[0].y = cpus[1].y;
++      cpus[0].z = cpus[1].z;
+    }
+ 
+    // now value each separate cpu's tics
diff --git a/testing/procps/procps-3.2.7-top-env-cpuloop.patch b/testing/procps/procps-3.2.7-top-env-cpuloop.patch
new file mode 100644
index 000000000..0034dcafb
--- /dev/null
+++ b/testing/procps/procps-3.2.7-top-env-cpuloop.patch
@@ -0,0 +1,84 @@
+diff -up procps-3.2.7/top.c.p15 procps-3.2.7/top.c
+--- procps-3.2.7/top.c.p15	2008-09-01 11:37:51.000000000 +0200
++++ procps-3.2.7/top.c	2008-09-01 11:37:51.000000000 +0200
+@@ -121,6 +121,7 @@ static int No_ksyms = -1,       // set t
+            Batch = 0,           // batch mode, collect no input, dumb output
+            Loops = -1,          // number of iterations, -1 loops forever
+            Secure_mode = 0;     // set if some functionality restricted
++static int CPU_loop = 0;	// wait for reliable CPU data
+ 
+         /* Some cap's stuff to reduce runtime calls --
+            to accomodate 'Batch' mode, they begin life as empty strings */
+@@ -1679,6 +1680,9 @@ static void before (char *me)
+       Fieldstab[P_PPD].fmts = pid_fmt;
+       Fieldstab[P_PPD].head = "       PPID" + 10 - pid_digits;
+    }
++
++   if (( getenv("CPULOOP")) && ( atoi(getenv("CPULOOP")) == 1 )) 
++	   CPU_loop = 1;
+ }
+ 
+ 
+@@ -2978,6 +2981,7 @@ static proc_t **summary_show (void)
+ {
+    static proc_t **p_table = NULL;
+    static CPU_t  *smpcpu = NULL;
++   static int first = 0;
+ 
+    // whoa first time, gotta' prime the pump...
+    if (!p_table) {
+@@ -3025,6 +3029,28 @@ static proc_t **summary_show (void)
+ 
+       smpcpu = cpus_refresh(smpcpu);
+ 
++      if (first==0 && CPU_loop)
++      {
++	 int i;
++	 CPU_t *cpu;
++	 for (i = 0; i < Cpu_tot; i++) {
++           cpu =  &smpcpu[i];
++	   cpu->u_sav = cpu->u;
++	   cpu->s_sav = cpu->s;
++	   cpu->n_sav = cpu->n;
++	   cpu->i_sav = cpu->i;
++	   cpu->w_sav = cpu->w;
++	   cpu->x_sav = cpu->x;
++	   cpu->y_sav = cpu->y;
++	   cpu->z_sav = cpu->z;
++	 }
++         tv.tv_sec = Rc.delay_time;
++         tv.tv_usec = (Rc.delay_time - (int)Rc.delay_time) * 1000000;
++         select(0, NULL, NULL, NULL, &tv);
++
++	 smpcpu = cpus_refresh(smpcpu);
++      }
++
+       if (CHKw(Curwin, View_CPUSUM)) {
+          // display just the 1st /proc/stat line
+          summaryhlp(&smpcpu[Cpu_tot], "Cpu(s):");
+@@ -3050,6 +3076,8 @@ static proc_t **summary_show (void)
+    }
+ 
+    SETw(Curwin, NEWFRAM_cwo);
++
++   first = 1;
+    return p_table;
+ }
+ 
+diff -up procps-3.2.7/top.1.p15 procps-3.2.7/top.1
+--- procps-3.2.7/top.1.p15	2008-09-01 11:37:51.000000000 +0200
++++ procps-3.2.7/top.1	2008-09-01 11:37:51.000000000 +0200
+@@ -1183,6 +1183,13 @@ Then ponder this:
+ Send bug reports to:
+    Albert D\. Cahalan, <albert@users.sf.net>
+ 
++The top command calculates Cpu(s) by looking at the change in CPU time values
++between samples. When you first run it, it has no previous sample to compare
++to, so these initial values are the percentages since boot. It means you need
++at least two loops or you have to ignore summary output from the first loop.
++This is problem for example for batch mode. There is a possible workaround if
++you define the CPULOOP=1 environment variable. The top command will be run one
++extra hidden loop for CPU data before standard output.
+ 
+ .\" ----------------------------------------------------------------------
+ .SH 8. HISTORY Former top
diff --git a/testing/procps/procps-3.2.7-top-manpage.patch b/testing/procps/procps-3.2.7-top-manpage.patch
new file mode 100644
index 000000000..4ce077946
--- /dev/null
+++ b/testing/procps/procps-3.2.7-top-manpage.patch
@@ -0,0 +1,32 @@
+diff -up procps-3.2.7/top.1.cpudesc procps-3.2.7/top.1
+--- procps-3.2.7/top.1.cpudesc	2008-01-18 08:04:19.000000000 +0100
++++ procps-3.2.7/top.1	2008-01-18 08:15:49.000000000 +0100
+@@ -121,6 +121,7 @@
+     2. FIELDS / Columns
+        a. DESCRIPTIONS of Fields
+        b. SELECTING and ORDERING Columns
++       c. SUMMARY Area Fields
+     3. INTERACTIVE Commands
+        a. GLOBAL Commands
+        b. SUMMARY Area Commands
+@@ -540,6 +540,20 @@ You\fI move\fR a field to the\fB left\fR
+ upper case\fR letter and to the\fB right\fR with the\fB lower case\fR
+ letter.
+ 
++.\" ......................................................................
++.SS 2c. SUMMARY Area Fields
++.\" ----------------------------------------------------------------------
++The summary area fields describing CPU statistics are abbreviated.  They provide
++information about times spent in:
++  \fR  us = user mode
++  \fR  sy = system mode
++  \fR  ni = low priority user mode (nice)
++  \fR  id = idle task
++  \fR  wa = I/O waiting
++  \fR  hi = servicing IRQs
++  \fR  si = servicing soft IRQs
++  \fR  st = steal (time given to other DomU instances) 
++
+ 
+ .\" ----------------------------------------------------------------------
+ .SH 3. INTERACTIVE Commands
diff --git a/testing/procps/procps-3.2.7-top-remcpu.patch b/testing/procps/procps-3.2.7-top-remcpu.patch
new file mode 100644
index 000000000..88d14ef0a
--- /dev/null
+++ b/testing/procps/procps-3.2.7-top-remcpu.patch
@@ -0,0 +1,98 @@
+--- procps-3.2.7/top.c.remcpu	2006-07-10 10:41:11.000000000 +0200
++++ procps-3.2.7/top.c	2006-07-10 10:41:35.000000000 +0200
+@@ -912,6 +912,7 @@
+ static CPU_t *cpus_refresh (CPU_t *cpus)
+ {
+    static FILE *fp = NULL;
++   static int cpu_max;
+    int i;
+    int num;
+    // enough for a /proc/stat CPU line (not the intr line)
+@@ -926,24 +927,29 @@
+                can hold tics representing the /proc/stat cpu summary (the first
+                line read) -- that slot supports our View_CPUSUM toggle */
+       cpus = alloc_c((1 + Cpu_tot) * sizeof(CPU_t));
++      cpu_max = Cpu_tot;
+    }
++   else if (cpu_max > Cpu_tot)
++      /* move saved CUPs summary to cpu_max possition */
++      memcpy(&cpus[cpu_max], &cpus[Cpu_tot], sizeof(CPU_t));
++   
+    rewind(fp);
+    fflush(fp);
+ 
+    // first value the last slot with the cpu summary line
+    if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
+-   cpus[Cpu_tot].x = 0;  // FIXME: can't tell by kernel version number
+-   cpus[Cpu_tot].y = 0;  // FIXME: can't tell by kernel version number
+-   cpus[Cpu_tot].z = 0;  // FIXME: can't tell by kernel version number
++   cpus[cpu_max].x = 0;  // FIXME: can't tell by kernel version number
++   cpus[cpu_max].y = 0;  // FIXME: can't tell by kernel version number
++   cpus[cpu_max].z = 0;  // FIXME: can't tell by kernel version number
+    num = sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
+-      &cpus[Cpu_tot].u,
+-      &cpus[Cpu_tot].n,
+-      &cpus[Cpu_tot].s,
+-      &cpus[Cpu_tot].i,
+-      &cpus[Cpu_tot].w,
+-      &cpus[Cpu_tot].x,
+-      &cpus[Cpu_tot].y,
+-      &cpus[Cpu_tot].z
++      &cpus[cpu_max].u,
++      &cpus[cpu_max].n,
++      &cpus[cpu_max].s,
++      &cpus[cpu_max].i,
++      &cpus[cpu_max].w,
++      &cpus[cpu_max].x,
++      &cpus[cpu_max].y,
++      &cpus[cpu_max].z
+    );
+    if (num < 4)
+          std_err("failed /proc/stat read");
+@@ -955,7 +961,7 @@
+    }
+ 
+    // now value each separate cpu's tics
+-   for (i = 0; 1 < Cpu_tot && i < Cpu_tot; i++) {
++   for (i = 0; ; i++) {
+       if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
+       cpus[i].x = 0;  // FIXME: can't tell by kernel version number
+       cpus[i].y = 0;  // FIXME: can't tell by kernel version number
+@@ -964,9 +970,35 @@
+          &cpus[i].id,
+          &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y, &cpus[i].z
+       );
+-      if (num < 4)
+-            std_err("failed /proc/stat read");
++      if (num < 4) {
++	 Cpu_tot = i;
++	 break;
++      }
++      if (i == cpu_max - 1) {
++	 // Bump cpu_max and extend cpus
++	 cpu_max++;
++	 cpus = realloc(cpus, (1 + cpu_max) * sizeof(CPU_t));
++	 if (!cpus) std_err("realloc failed");
++	 memcpy(&cpus[cpu_max], &cpus[cpu_max-1], sizeof(CPU_t));
++      }
++   }
++
++   if (cpu_max > Cpu_tot)
++      memcpy(&cpus[Cpu_tot], &cpus[cpu_max], sizeof(CPU_t));
++
++   // and just in case we're 2.2.xx compiled without SMP support...
++   if (Cpu_tot == 1) {
++      cpus[0].id = cpus[1].id = 0;
++      cpus[0].u = cpus[1].u;
++      cpus[0].n = cpus[1].n;
++      cpus[0].s = cpus[1].s;
++      cpus[0].i = cpus[1].i;
++      cpus[0].w = cpus[1].w;
++      cpus[0].x = cpus[1].x;
++      cpus[0].y = cpus[1].y;
++      cpus[0].z = cpus[1].z;
+    }
++   
+    return cpus;
+ }
+ 
diff --git a/testing/procps/procps-3.2.7-top-sorthigh.patch b/testing/procps/procps-3.2.7-top-sorthigh.patch
new file mode 100644
index 000000000..e17df1e22
--- /dev/null
+++ b/testing/procps/procps-3.2.7-top-sorthigh.patch
@@ -0,0 +1,37 @@
+--- procps-3.2.7/top.c.sorthigh	2007-02-05 09:06:34.000000000 +0100
++++ procps-3.2.7/top.c	2007-02-05 09:09:35.000000000 +0100
+@@ -3121,6 +3121,7 @@
+       unsigned    w = Fieldstab[i].width;
+ 
+       int advance = (x==0) && !Rc.mode_altscr;
++      f += advance;
+ 
+       switch (i) {
+          case P_CMD:
+@@ -3179,7 +3180,7 @@
+             break;
+          case P_PRI:
+             if (unlikely(-99 > p->priority) || unlikely(999 < p->priority)) {
+-               f = "  RT";
++               f = advance ? " RT" : "  RT";
+                MKCOL("");
+             } else
+                MKCOL((int)p->priority);
+@@ -3227,7 +3228,7 @@
+             break;
+          case P_WCH:
+             if (No_ksyms) {
+-               f = " %08lx ";
++               f = advance ? "%08lx " : " %08lx ";
+                MKCOL((long)p->wchan);
+             } else {
+                MKCOL(lookup_wchan(p->wchan, p->XXXID));
+@@ -3236,7 +3237,7 @@
+ 
+         } /* end: switch 'procflag' */
+ 
+-        rp = scat(rp, cbuf+advance);
++        rp = scat(rp, cbuf);
+    } /* end: for 'maxpflgs' */
+ 
+    PUFF(
diff --git a/testing/procps/procps-3.2.7-w-best.patch b/testing/procps/procps-3.2.7-w-best.patch
new file mode 100644
index 000000000..86b3e9328
--- /dev/null
+++ b/testing/procps/procps-3.2.7-w-best.patch
@@ -0,0 +1,16 @@
+--- procps-3.2.7/w.c.kzak	2007-04-02 23:58:30.000000000 +0200
++++ procps-3.2.7/w.c	2007-04-03 00:09:15.000000000 +0200
+@@ -149,11 +149,11 @@
+ 	const proc_t *restrict const tmp = *pptr;
+ 	if(unlikely(tmp->tgid == u->ut_pid)) {
+ 	    *found_utpid = 1;
+-	    best = tmp;
++	    if (!best)
++	         best = tmp;
+ 	}
+ 	if(tmp->tty != line) continue;
+ 	(*jcpu) += tmp->utime + tmp->stime;
+-	secondbest = tmp;
+ 	/* same time-logic here as for "best" below */
+ 	if(!  (secondbest && tmp->start_time <= secondbest->start_time)  ){
+ 	    secondbest = tmp;
diff --git a/testing/procps/procps-3.2.7-watch-unicode.patch b/testing/procps/procps-3.2.7-watch-unicode.patch
new file mode 100644
index 000000000..1b3d97488
--- /dev/null
+++ b/testing/procps/procps-3.2.7-watch-unicode.patch
@@ -0,0 +1,139 @@
+diff -u procps-3.2.7/Makefile procps/Makefile
+--- procps-3.2.7/Makefile	2007-01-16 17:24:49.000000000 +0100
++++ procps/Makefile	2007-01-16 17:29:27.000000000 +0100
+@@ -67,7 +67,7 @@
+ # plus the top-level Makefile to make it work stand-alone.
+ _TARFILES := Makefile
+ 
+-CURSES := -lncurses
++CURSES := -lncursesw
+ 
+ # This seems about right for the dynamic library stuff.
+ # Something like this is probably needed to make the SE Linux
+diff -u procps-3.2.7/watch.c procps/watch.c
+--- procps-3.2.7/watch.c	2007-01-16 17:24:49.000000000 +0100
++++ procps/watch.c	2007-01-16 18:06:57.000000000 +0100
+@@ -28,6 +28,8 @@
+ #include <termios.h>
+ #include <locale.h>
+ #include "proc/procps.h"
++#include <wchar.h>
++#include <wctype.h>
+ 
+ #ifdef FORCE_8BIT
+ #undef isprint
+@@ -137,6 +139,27 @@
+ 	}
+ }
+ 
++static wint_t
++readwc(FILE *stream, mbstate_t *mbs)
++{
++	for (;;) {
++		int chr;
++		char c;
++		wchar_t wc;
++		size_t len;
++
++		chr = getc(stream);
++		if (chr == EOF)
++			return WEOF;
++		c = chr;
++		len = mbrtowc(&wc, &c, 1, mbs);
++		if (len == (size_t)-1)
++			memset(mbs, 0, sizeof(*mbs));
++		else if (len != (size_t)-2)
++			return wc;
++	}
++}
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -243,6 +266,7 @@
+ 		FILE *p;
+ 		int x, y;
+ 		int oldeolseen = 1;
++		mbstate_t mbs;
+ 
+ 		if (screen_size_changed) {
+ 			get_terminal_size();
+@@ -276,49 +300,63 @@
+ 			do_exit(2);
+ 		}
+ 
++		memset(&mbs, 0, sizeof(mbs));
+ 		for (y = show_title; y < height; y++) {
+ 			int eolseen = 0, tabpending = 0;
+ 			for (x = 0; x < width; x++) {
+-				int c = ' ';
+-				int attr = 0;
++				wint_t c = L' ';
++				int attr = 0, c_width;
++				cchar_t cc;
++				wchar_t wstr[2];
+ 
+ 				if (!eolseen) {
+ 					/* if there is a tab pending, just spit spaces until the
+ 					   next stop instead of reading characters */
+ 					if (!tabpending)
+ 						do
+-							c = getc(p);
+-						while (c != EOF && !isprint(c)
+-						       && c != '\n'
+-						       && c != '\t');
+-					if (c == '\n')
++							c = readwc(p, &mbs);
++						while (c != WEOF && !iswprint(c)
++						       && c != L'\n'
++						       && c != L'\t');
++					if (c == L'\n')
+ 						if (!oldeolseen && x == 0) {
+ 							x = -1;
+ 							continue;
+ 						} else
+ 							eolseen = 1;
+-					else if (c == '\t')
++					else if (c == L'\t')
+ 						tabpending = 1;
+-					if (c == EOF || c == '\n' || c == '\t')
+-						c = ' ';
++					if (c == WEOF || c == L'\n' || c == L'\t')
++						c = L' ';
+ 					if (tabpending && (((x + 1) % 8) == 0))
+ 						tabpending = 0;
+ 				}
++				wstr[0] = c;
++				wstr[1] = 0;
++				setcchar (&cc, wstr, 0, 0, NULL);
+ 				move(y, x);
+ 				if (option_differences) {
+-					chtype oldch = inch();
+-					char oldc = oldch & A_CHARTEXT;
++					cchar_t oldc;
++					wchar_t oldwstr[2];
++					attr_t attrs;
++					short colors;
++
++					in_wch(&oldc);
++					getcchar(&oldc, oldwstr, &attrs, &colors, NULL);
+ 					attr = !first_screen
+-					    && ((char)c != oldc
++					    && (wstr[0] != oldwstr[0]
+ 						||
+ 						(option_differences_cumulative
+-						 && (oldch & A_ATTRIBUTES)));
++						 && attrs));
+ 				}
+ 				if (attr)
+ 					standout();
+-				addch(c);
++				add_wch(&cc);
+ 				if (attr)
+ 					standend();
++				c_width = wcwidth(c);
++				if (c_width > 1)
++					x += c_width - 1;
+ 			}
+ 			oldeolseen = eolseen;
+ 		}
diff --git a/testing/procps/procps-3.2.8-gmake-3.82.patch b/testing/procps/procps-3.2.8-gmake-3.82.patch
new file mode 100644
index 000000000..87ab13ea4
--- /dev/null
+++ b/testing/procps/procps-3.2.8-gmake-3.82.patch
@@ -0,0 +1,14 @@
+Index: procps-3.2.8/Makefile
+===================================================================
+--- procps-3.2.8.orig/Makefile
++++ procps-3.2.8/Makefile
+@@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES)
+ # want this rule first, use := on ALL, and ALL not filled in yet
+ all: do_all
+ 
+--include */module.mk
++-include proc/module.mk
++-include ps/module.mk
+ 
+ do_all:    $(ALL)
+ 
diff --git a/testing/procps/procps-3.2.8-kernel3-uts.patch b/testing/procps/procps-3.2.8-kernel3-uts.patch
new file mode 100644
index 000000000..a72ae59e3
--- /dev/null
+++ b/testing/procps/procps-3.2.8-kernel3-uts.patch
@@ -0,0 +1,20 @@
+diff -Naur procps-3.2.8-20110302git.orig/proc/version.c procps-3.2.8-20110302git/proc/version.c
+--- procps-3.2.8-20110302git.orig/proc/version.c	2011-06-10 17:00:33.000000000 +0200
++++ procps-3.2.8-20110302git/proc/version.c	2011-06-10 17:20:17.000000000 +0200
+@@ -38,10 +38,15 @@
+ void init_Linux_version(void) {
+     static struct utsname uts;
+     int x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */
++    int version_string_depth;
+     
+     if (uname(&uts) == -1)	/* failure implies impending death */
+ 	exit(1);
+-    if (sscanf(uts.release, "%d.%d.%d", &x, &y, &z) < 3)
++
++    version_string_depth = sscanf(uts.release, "%d.%d.%d", &x, &y, &z);
++	
++    if ((version_string_depth < 2) ||		 /* Non-standard for all known kernels */
++       ((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */
+ 	fprintf(stderr,		/* *very* unlikely to happen by accident */
+ 		"Non-standard uts for running kernel:\n"
+ 		"release %s=%d.%d.%d gives version code %d\n",
diff --git a/testing/procps/procps-3.2.8-linux-ver-init.patch b/testing/procps/procps-3.2.8-linux-ver-init.patch
new file mode 100644
index 000000000..6d4039c91
--- /dev/null
+++ b/testing/procps/procps-3.2.8-linux-ver-init.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/303120
+
+make sure the linux version constructor runs before the libproc constructor
+since the latter uses variables setup by the former
+
+fix by Chris Coleman
+
+Index: proc/version.c
+===================================================================
+RCS file: /cvsroot/procps/procps/proc/version.c,v
+retrieving revision 1.7
+diff -u -p -r1.7 version.c
+--- proc/version.c	9 Feb 2003 07:27:16 -0000	1.7
++++ proc/version.c	14 Nov 2010 00:22:44 -0000
+@@ -33,7 +33,7 @@ void display_version(void) {
+ 
+ int linux_version_code;
+ 
+-static void init_Linux_version(void) __attribute__((constructor));
++static void init_Linux_version(void) __attribute__((constructor(100)));
+ static void init_Linux_version(void) {
+     static struct utsname uts;
+     int x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */
diff --git a/testing/procps/procps-3.2.8-setlocale.patch b/testing/procps/procps-3.2.8-setlocale.patch
new file mode 100644
index 000000000..c197fd38a
--- /dev/null
+++ b/testing/procps/procps-3.2.8-setlocale.patch
@@ -0,0 +1,66 @@
+diff -Nur procps-3.2.8-orig/proc/sysinfo.c procps-3.2.8/proc/sysinfo.c
+--- procps-3.2.8-orig/proc/sysinfo.c	2008-03-24 05:33:43.000000000 +0100
++++ procps-3.2.8/proc/sysinfo.c	2009-12-18 22:50:52.000000000 +0100
+@@ -74,17 +74,19 @@
+ /***********************************************************************/
+ int uptime(double *restrict uptime_secs, double *restrict idle_secs) {
+     double up=0, idle=0;
+-    char *restrict savelocale;
++    char *savelocale;
+ 
+     FILE_TO_BUF(UPTIME_FILE,uptime_fd);
+-    savelocale = setlocale(LC_NUMERIC, NULL);
++    savelocale = strdup(setlocale(LC_NUMERIC, NULL));
+     setlocale(LC_NUMERIC,"C");
+     if (sscanf(buf, "%lf %lf", &up, &idle) < 2) {
+         setlocale(LC_NUMERIC,savelocale);
++        free(savelocale);
+         fputs("bad data in " UPTIME_FILE "\n", stderr);
+ 	    return 0;
+     }
+     setlocale(LC_NUMERIC,savelocale);
++    free(savelocale);
+     SET_IF_DESIRED(uptime_secs, up);
+     SET_IF_DESIRED(idle_secs, idle);
+     return up;	/* assume never be zero seconds in practice */
+@@ -128,9 +130,9 @@
+   double up_1, up_2, seconds;
+   unsigned long long jiffies;
+   unsigned h;
+-  char *restrict savelocale;
++  char *savelocale;
+ 
+-  savelocale = setlocale(LC_NUMERIC, NULL);
++  savelocale = strdup(setlocale(LC_NUMERIC, NULL));
+   setlocale(LC_NUMERIC, "C");
+   do{
+     FILE_TO_BUF(UPTIME_FILE,uptime_fd);  sscanf(buf, "%lf", &up_1);
+@@ -141,6 +143,7 @@
+     /* uptime(&up_2, NULL); */
+   } while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */
+   setlocale(LC_NUMERIC, savelocale);
++  free(savelocale);
+   jiffies = user_j + nice_j + sys_j + other_j;
+   seconds = (up_1 + up_2) / 2;
+   h = (unsigned)( (double)jiffies/seconds/smp_num_cpus );
+@@ -303,16 +306,18 @@
+ /***********************************************************************/
+ void loadavg(double *restrict av1, double *restrict av5, double *restrict av15) {
+     double avg_1=0, avg_5=0, avg_15=0;
+-    char *restrict savelocale;
++    char *savelocale;
+     
+     FILE_TO_BUF(LOADAVG_FILE,loadavg_fd);
+-    savelocale = setlocale(LC_NUMERIC, NULL);
++    savelocale = strdup(setlocale(LC_NUMERIC, NULL));
+     setlocale(LC_NUMERIC, "C");
+     if (sscanf(buf, "%lf %lf %lf", &avg_1, &avg_5, &avg_15) < 3) {
+ 	fputs("bad data in " LOADAVG_FILE "\n", stderr);
++    free(savelocale);
+ 	exit(1);
+     }
+     setlocale(LC_NUMERIC, savelocale);
++    free(savelocale);
+     SET_IF_DESIRED(av1,  avg_1);
+     SET_IF_DESIRED(av5,  avg_5);
+     SET_IF_DESIRED(av15, avg_15);
diff --git a/testing/procps/procps-3.2.8-threads.patch b/testing/procps/procps-3.2.8-threads.patch
new file mode 100644
index 000000000..2491aa4c0
--- /dev/null
+++ b/testing/procps/procps-3.2.8-threads.patch
@@ -0,0 +1,49 @@
+diff -up procps-3.2.8/top.c.threads procps-3.2.8/top.c
+--- procps-3.2.8/top.c.threads	2009-10-01 07:14:43.000000000 -0400
++++ procps-3.2.8/top.c	2009-10-05 14:05:00.000000000 -0400
+@@ -1138,6 +1138,7 @@ static proc_t **procs_refresh (proc_t **
+ #define ENTsz  sizeof(proc_t)
+    static unsigned savmax = 0;          // first time, Bypass: (i)
+    proc_t *ptsk = (proc_t *)-1;         // first time, Force: (ii)
++   proc_t *saved_ptsk;
+    unsigned curmax = 0;                 // every time  (jeeze)
+    PROCTAB* PT;
+    static int show_threads_was_enabled = 0; // optimization
+@@ -1172,6 +1173,10 @@ static proc_t **procs_refresh (proc_t **
+       while (curmax < savmax) {
+          proc_t *ttsk;
+          if (unlikely(!(ptsk = readproc(PT, NULL)))) break;
++	 if(!show_threads_was_enabled)
++             saved_ptsk = ptsk;
++	 else
++	     saved_ptsk = NULL;
+          show_threads_was_enabled = 1;
+          while (curmax < savmax) {
+             unsigned idx;
+@@ -1189,7 +1194,7 @@ static proc_t **procs_refresh (proc_t **
+             prochlp(ttsk);
+             ++curmax;
+          }
+-         free(ptsk);  // readproc() proc_t not used
++         if(!saved_ptsk) free(ptsk);  // readproc() proc_t not used
+       }
+    }
+ 
+@@ -1208,7 +1213,8 @@ static proc_t **procs_refresh (proc_t **
+    else {                          // show each thread in a process separately
+       while (ptsk) {
+          proc_t *ttsk;
+-         if (likely(ptsk = readproc(PT, NULL))) {
++         if (likely(ptsk = readproc(PT, NULL)) || 
++             unlikely(saved_ptsk && (ptsk = saved_ptsk)) ) {
+             show_threads_was_enabled = 1;
+             while (1) {
+                table = alloc_r(table, (curmax + 1) * PTRsz);
+@@ -1216,6 +1222,7 @@ static proc_t **procs_refresh (proc_t **
+                prochlp(ttsk);
+                table[curmax++] = ttsk;
+             }
++            saved_ptsk = NULL;
+             free(ptsk);   // readproc() proc_t not used
+          }
+       }
diff --git a/testing/procps/sysctl.conf b/testing/procps/sysctl.conf
new file mode 100644
index 000000000..e3ebc7bad
--- /dev/null
+++ b/testing/procps/sysctl.conf
@@ -0,0 +1,13 @@
+#
+# Kernel sysctl configuration
+#
+
+# Disable packet forwarding
+net.ipv4.ip_forward=0
+
+# Disable the magic-sysrq key (console security issues)
+kernel.sysrq = 0
+
+# Enable TCP SYN Cookie Protection
+net.ipv4.tcp_syncookies = 1
+
diff --git a/testing/tomboy/PKGBUILD b/testing/tomboy/PKGBUILD
index e0f09d287..0d3f6ba2e 100644
--- a/testing/tomboy/PKGBUILD
+++ b/testing/tomboy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 155272 2012-04-01 11:37:20Z heftig $
+# $Id: PKGBUILD 156367 2012-04-17 18:12:34Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=tomboy
-pkgver=1.10.0
+pkgver=1.10.1
 pkgrel=1
 pkgdesc="Desktop note-taking application for Linux and Unix"
 arch=('i686' 'x86_64')
@@ -14,13 +14,13 @@ options=('!libtool' '!emptydirs' '!makeflags')
 groups=('gnome-extra')
 install=tomboy.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a0f6550560c03aabb311584694bc2a729e688ad94c5d9999137081edaba0c714')
+sha256sums=('85bc277b278fe6aaa38fc0ec8b1777804ea0de647111a5065d43614d1ad10077')
 
 build() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
   mkdir -p "$MONO_SHARED_DIR"
 
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --disable-update-mimedb
@@ -28,10 +28,10 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
 
   install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy $pkgdir/etc/gconf/schemas/*.schemas
-  rm -f $pkgdir/etc/gconf/schemas/*.schemas
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
 }
diff --git a/testing/tomboy/tomboy.install b/testing/tomboy/tomboy.install
index f8e2e4a07..84e225486 100644
--- a/testing/tomboy/tomboy.install
+++ b/testing/tomboy/tomboy.install
@@ -1,10 +1,10 @@
 pkgname=tomboy
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  gconfpkg --install ${pkgname}
 
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  update-mime-database /usr/share/mime
 }
 
 pre_upgrade() {
@@ -16,10 +16,10 @@ post_upgrade() {
 }
 
 pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  update-mime-database /usr/share/mime
 }
diff --git a/testing/vinagre/PKGBUILD b/testing/vinagre/PKGBUILD
index 37d9c1451..7ae78483d 100644
--- a/testing/vinagre/PKGBUILD
+++ b/testing/vinagre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 155284 2012-04-01 11:37:42Z heftig $
+# $Id: PKGBUILD 156391 2012-04-17 20:37:22Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=vinagre
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64')
@@ -19,11 +19,10 @@ makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh' 'itstool')
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0379e679204e9ddf63670acc9a902e70d7c3d26eb5070ceb5826a6fbbfdf1489')
+sha256sums=('5b79bbdafe57e1ceaeddfc1091a9f02aa6e3a54e55ffd2517be512d35e89654f')
 
 build() {
   cd $pkgname-$pkgver
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
   make
diff --git a/testing/vinagre/vinagre.install b/testing/vinagre/vinagre.install
index 68158ac80..4998e6e8b 100644
--- a/testing/vinagre/vinagre.install
+++ b/testing/vinagre/vinagre.install
@@ -1,16 +1,10 @@
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
   update-mime-database usr/share/mime > /dev/null
 }
 
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.91-2) < 0 )); then
-    usr/sbin/gconfpkg --uninstall vinagre
-  fi
-}
-
 post_upgrade() {
   post_install
 }
diff --git a/testing/vino/PKGBUILD b/testing/vino/PKGBUILD
index 1dbc501ab..cb5d2378f 100644
--- a/testing/vino/PKGBUILD
+++ b/testing/vino/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155286 2012-04-01 11:37:46Z heftig $
+# $Id: PKGBUILD 156394 2012-04-17 20:41:36Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ url="http://www.gnome.org"
 options=(!emptydirs)
 install=vino.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a6b5c3bc185d29ff9861c3519b97973321d1465c8f9e5aa7f93f007cac9d67da')
+sha256sums=('85011594e9b5c4c5449c049e7c3563538c7a80dafecbb5891720b22290b83cb8')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/testing/vino/vino.install b/testing/vino/vino.install
index 469266843..fabaa1ed7 100644
--- a/testing/vino/vino.install
+++ b/testing/vino/vino.install
@@ -1,14 +1,8 @@
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   update-desktop-database -q
 }
 
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall vino
-  fi
-}
-
 post_upgrade() {
   post_install
 }
author	root <root@rshg054.dnsready.net>	2012-04-19 00:01:30 +0000
committer	root <root@rshg054.dnsready.net>	2012-04-19 00:01:30 +0000
commit	fe675be3a5f22b4397ea55959bb3c47b4c1b8288 (patch)
tree	2d8d385678576c75dc561c6fc2c194df7aad2b9b
parent	637c1cfdcd258a870ad5367cbf47a8a2799039c7 (diff)