Tue Oct 4 23:14:30 UTC 2011

author: root <root@rshg054.dnsready.net> 2011-10-04 23:14:30 +0000
committer: root <root@rshg054.dnsready.net> 2011-10-04 23:14:30 +0000
commit: 3567a49f79d2dbf828b723ab54982fa6c7ea1c80 (patch)
tree: 15fc309d3681df4da7a56189050fd5aa16fa9794
parent: 57d05f7209f022aa99a8850aafbeec4cb85c3b5b (diff)
140 files changed, 4238 insertions, 346 deletions
diff --git a/community-staging/libgexiv2/PKGBUILD b/community-staging/libgexiv2/PKGBUILD
new file mode 100644
index 000000000..e62d02948
--- /dev/null
+++ b/community-staging/libgexiv2/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 56205 2011-10-03 12:12:51Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=libgexiv2
+pkgver=0.3.1
+pkgrel=1
+pkgdesc="GObject-based wrapper around the Exiv2 library."
+arch=('i686' 'x86_64')
+url="http://trac.yorba.org/wiki/gexiv2"
+license=('GPL2')
+depends=('exiv2' 'glib2')
+options=('!libtool')
+source=(http://yorba.org/download/gexiv2/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('828894bb4bcb4625820b8c0c468417e9cd8c5c2f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-staging/luminancehdr/PKGBUILD b/community-staging/luminancehdr/PKGBUILD
new file mode 100644
index 000000000..c0203a584
--- /dev/null
+++ b/community-staging/luminancehdr/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 56253 2011-10-03 20:21:53Z ebelanger $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Contributor: Dmitry N. Shilov <stormblast@land.ru>
+
+pkgname=luminancehdr
+pkgver=2.1.0
+pkgrel=2
+pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
+arch=('i686' 'x86_64')
+url='http://qtpfsgui.sourceforge.net/'
+license=('GPL')
+depends=('exiv2' 'fftw' 'gsl' 'hicolor-icon-theme' 'libraw' 'libtiff' 'openexr' 'qt')
+optdepends=('hugin: align image stack functionality')
+install=$pkgname.install
+changelog=$pkgname.changelog
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/sourceforge/qtpfsgui/luminance-hdr-${pkgver}.tar.gz)
+sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac')
+
+build() {
+  cd "${srcdir}/luminance-hdr-${pkgver}"
+
+  if [ ${CARCH} = i686 ]; then
+    sed -i 's/ -msse2//' project.pro
+  fi
+
+  lrelease project.pro
+  qmake PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/luminance-hdr-${pkgver}"
+
+  make INSTALL_ROOT="${pkgdir}" install
+}
diff --git a/community-staging/luminancehdr/luminancehdr.changelog b/community-staging/luminancehdr/luminancehdr.changelog
new file mode 100644
index 000000000..378053ef5
--- /dev/null
+++ b/community-staging/luminancehdr/luminancehdr.changelog
@@ -0,0 +1,33 @@
+2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* luminancehdr 2.1.0-1
+
+2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* luminancehdr 2.0.2-1
+
+2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* exiv2 0.20 rebuild
+
+2010-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 2.0.1
+
+2010-06-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Package renamed to LuminanceHDR
+	* Update to major release 2.0.0
+
+2010-03-09 Andrea Scarpino <andrea@archlinux.org>
+	* exiv2 0.19 rebuild
+
+2009-11-02 Biru Ionut <ionut@archlinux.ro>
+	* add translation and fix segfault on old i686 procesors
+
+2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release v1.9.3
+
+2009-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Minor version (v1.9.2-3) update caused by exiv2 upgrade.
+
+2008-11-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Minor version (v1.9.2-2) update caused by openexr upgrade.
+
+2008-09-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Package moved to [community]
diff --git a/community-staging/luminancehdr/luminancehdr.install b/community-staging/luminancehdr/luminancehdr.install
new file mode 100644
index 000000000..279762804
--- /dev/null
+++ b/community-staging/luminancehdr/luminancehdr.install
@@ -0,0 +1,12 @@
+post_install() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}
diff --git a/community-staging/shotwell/PKGBUILD b/community-staging/shotwell/PKGBUILD
new file mode 100644
index 000000000..e24a323c7
--- /dev/null
+++ b/community-staging/shotwell/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 56227 2011-10-03 15:36:43Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
+
+pkgname=shotwell
+pkgver=0.11.2
+pkgrel=2
+pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
+arch=('i686' 'x86_64')
+url="http://yorba.org/shotwell/"
+license=('LGPL2.1')
+depends=('gconf' 'libgee' 'libgphoto2' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw'
+	 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf')
+makedepends=('intltool' 'vala')
+install=shotwell.install
+source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2"
+	"http://arch.p5n.pp.ru/~sergej/dl/shotwell-gtk3.patch.gz")
+md5sums=('bbb479eaa4bbcf67d8ff454b406ed249'
+         'e9ac0d9d818242220f0f788c493e453d')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 <$srcdir/shotwell-gtk3.patch
+  ./configure --prefix=/usr \
+	--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
+	--disable-schemas-install \
+	--disable-desktop-update \
+	--disable-icon-update
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  rm -f $pkgdir/usr/share/glib-2.0/schemas/gschemas.compiled
+}
diff --git a/community-staging/shotwell/shotwell.install b/community-staging/shotwell/shotwell.install
new file mode 100644
index 000000000..bab8ecd29
--- /dev/null
+++ b/community-staging/shotwell/shotwell.install
@@ -0,0 +1,17 @@
+pkgname=shotwell
+
+post_install() {
+  gtk-update-icon-cache -fq -t usr/share/icons/hicolor
+  update-desktop-database -q
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+  gtk-update-icon-cache -fq -t usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index 935654838..d8346219c 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 56112 2011-10-01 19:02:07Z ibiru $
+# $Id: PKGBUILD 56182 2011-10-03 06:12:55Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 pkgname=gnome-packagekit
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
 arch=('i686' 'x86_64')
 url='http://www.packagekit.org/'
 license=('GPL')
-depends=('dconf' 'desktop-file-utils' 'gnome-menus' 'gtk3'
-         'hicolor-icon-theme' 'libnotify' 'packagekit')
+depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify'
+         'packagekit')
 makedepends=('gconf' 'gtk-doc' 'intltool' 'libcanberra' 'upower')
 optdepends=('gnome-settings-daemon-updates: update and message notifications')
 options=('!emptydirs' '!libtool')
diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD
index 7036b3242..f7adf9934 100644
--- a/community/hubbub/PKGBUILD
+++ b/community/hubbub/PKGBUILD
@@ -1,28 +1,32 @@
-# $Id: PKGBUILD 52652 2011-07-26 19:12:51Z ebelanger $
+# $Id: PKGBUILD 56215 2011-10-03 14:01:41Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
 pkgname=hubbub
-pkgver=0.1.0
+pkgver=0.1.1
 pkgrel=1
 pkgdesc="HTML5 compliant parsing library"
-arch=('i686' 'x86_64')
-url="http://www.netsurf-browser.org/projects/hubbub"
+arch=('x86_64' 'i686')
+url="http://www.netsurf-browser.org/projects/hubbub/"
 license=('MIT')
-depends=('glibc' 'libparserutils')
+depends=('libparserutils')
 source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz")
-md5sums=('9d7bb287bd5f993902c577ce3503f6d5')
+md5sums=('98f49be58e228010c88381bc39f39e19')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-src"
-  sed -i 's/-Werror//' Makefile
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  sed -i 's:-Werror::' Makefile
   make PREFIX=/usr COMPONENT_TYPE="lib-shared"
   make PREFIX=/usr COMPONENT_TYPE="lib-static"
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-src"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared"   
   make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static"
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ldns/PKGBUILD b/community/ldns/PKGBUILD
index df63e9f89..6e28bc429 100644
--- a/community/ldns/PKGBUILD
+++ b/community/ldns/PKGBUILD
@@ -1,9 +1,11 @@
+# $Id: PKGBUILD 56190 2011-10-03 10:19:02Z bisson $
+
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: jiribb <jiribb@gmail.com> and <mathieui> <mathieui@mathieui.net>
 # Contributor: mathieui <mathieui@mathieui.net>
 
 pkgname=ldns
-pkgver=1.6.10
+pkgver=1.6.11
 pkgrel=1
 pkgdesc='Fast DNS library with DNSSEC support, including tools such as Drill'
 arch=('i686' 'x86_64')
@@ -14,24 +16,36 @@ makedepends=('libpcap')
 optdepends=('libpcap: ldns-dpa tool')
 options=('!libtool')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('7798a32c6f50a4fb7d56ddf772163dc1cb79c1a4')
+sha1sums=('2c4537eee39a1af63e8dde4f35498ce78c968c1f')
 
 build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
 	_conf='--prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-static=no --disable-rpath'
+	_tmp="$(mktemp -d)"
 
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure $_conf
+	./configure ${_conf}
+	make
+	make DESTDIR="${_tmp}" install
+
+	cd drill
+	./configure ${_conf} --with-ldns="${_tmp}"
+	make
+
+	cd ../examples
+	./configure ${_conf} --with-ldns="${_tmp}"
 	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
 	make DESTDIR="${pkgdir}" install
 	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 	cd drill
-	./configure $_conf --with-ldns="${pkgdir}"
-	make
 	make DESTDIR="${pkgdir}" install
 
 	cd ../examples
-	./configure $_conf --with-ldns="${pkgdir}"
-	make
 	make DESTDIR="${pkgdir}" install
 }
diff --git a/community/libgda4/PKGBUILD b/community/libgda4/PKGBUILD
index 9c2580c99..eabda7cc4 100644
--- a/community/libgda4/PKGBUILD
+++ b/community/libgda4/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56164 2011-10-02 14:06:33Z jelle $
+# $Id: PKGBUILD 56183 2011-10-03 07:07:15Z jelle $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
diff --git a/community/libparserutils/PKGBUILD b/community/libparserutils/PKGBUILD
index 9c7f3358e..e9cd85e1b 100644
--- a/community/libparserutils/PKGBUILD
+++ b/community/libparserutils/PKGBUILD
@@ -1,31 +1,32 @@
-# $Id: PKGBUILD 52548 2011-07-26 04:43:08Z bfanella $
+# $Id: PKGBUILD 56213 2011-10-03 13:57:53Z arodseth $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
 pkgname=libparserutils
-pkgver=0.1.0
-pkgrel=2
+pkgver=0.1.1
+pkgrel=1
 pkgdesc="Library for building efficient parsers"
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 url="http://www.netsurf-browser.org/projects/libparserutils"
 license=('MIT')
 source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz")
-md5sums=('eb415317925a0fb12a4ff8f849d2fe92')
+depends=('glibc')
+md5sums=('4f228516863de33f33f7f4258315867e')
 
 build() {
-	cd "${srcdir}"/${pkgname}-${pkgver}-src
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	sed 's/-Wall/ /' -i Makefile
+	sed 's:-Wall::' -i Makefile
 	make PREFIX=/usr COMPONENT_TYPE="lib-shared"
 	make PREFIX=/usr COMPONENT_TYPE="lib-static"
 }
 
 package() {
-	cd "${srcdir}"/${pkgname}-${pkgver}-src
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared" 
 	make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static"
-	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
-
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD
index 26c4a07da..39097ffc6 100644
--- a/community/libzen/PKGBUILD
+++ b/community/libzen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 50993 2011-07-04 11:24:03Z spupykin $
+# $Id: PKGBUILD 56229 2011-10-03 15:41:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: hydro <hydro@freenet.de>
 
 pkgname=libzen
-pkgver=0.4.20
+pkgver=0.4.22
 pkgrel=1
 pkgdesc="shared library for libmediainfo and mediainfo"
 arch=('i686' 'x86_64')
@@ -13,14 +13,13 @@ depends=('gcc-libs')
 makedepends=('libtool' 'automake' 'autoconf')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2)
-md5sums=('8211cc2ca8500c6af14600363be064d5')
+md5sums=('f44a39e783ceafe71cd3e7dde8a81e22')
 
 build() {
   cd $srcdir/ZenLib/Project/GNU/Library
-  sh ./autogen
-  ./configure --prefix=/usr --enable-shared
+  [ -x configure ] || sh ./autogen
+  [ -f Makefile ] || ./configure --prefix=/usr --enable-shared
   make clean
-  sed -i '1,1i#include <stdlib.h>' ../../../Source/ZenLib/Thread.h
   make
 }
 
diff --git a/community/lout/PKGBUILD b/community/lout/PKGBUILD
new file mode 100644
index 000000000..71aa6f957
--- /dev/null
+++ b/community/lout/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 56257 2011-10-04 00:41:28Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: catwell <catwell@archlinux.us>
+
+pkgname=lout
+pkgver=3.39
+pkgrel=1
+pkgdesc="A lightweight document formatting system."
+arch=('i686' 'x86_64')
+url="http://lout.wiki.sourceforge.net/"
+license=('GPL')
+depends=('glibc')
+install=lout.install
+source=(http://mirrors.ctan.org/support/$pkgname/$pkgname-$pkgver.tar.gz makefile.arch lout.install)
+md5sums=('151e1fba676c7052936ccc1bcd9663a9'
+         '088a29ca16477a9a30da9fafc9391de8'
+         'bc6c8df650fe75dd3c51d0c047c56f30')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  cp ../makefile.arch .
+  make -f makefile.arch PKGDIR="$pkgdir" install
+}
+
diff --git a/community/lout/lout.install b/community/lout/lout.install
new file mode 100755
index 000000000..f05b4b601
--- /dev/null
+++ b/community/lout/lout.install
@@ -0,0 +1,9 @@
+post_install()
+{
+  /usr/bin/lout -x -s /usr/lib/lout/include/init
+}
+
+post_upgrade()
+{
+ post_install $1
+}
diff --git a/community/lout/makefile.arch b/community/lout/makefile.arch
new file mode 100644
index 000000000..e0cb63322
--- /dev/null
+++ b/community/lout/makefile.arch
@@ -0,0 +1,45 @@
+# Makefile for lout 3.38 on Arch Linux.
+# catwell <catwell@archlinux.us>
+
+PKGDIR = /
+COPTS = -ansi -pedantic -O3
+
+CFLAGS = -DOS_UNIX=1 -DOS_DOS=0 -DOS_MAC=0 -DDB_FIX=0 -DUSE_STAT=1 \
+  -DSAFE_DFT=0 -DCOLLATE=1 -DLIB_DIR=\"/usr/lib/lout\" -DFONT_DIR=\"font\" \
+  -DMAPS_DIR=\"maps\" -DINCL_DIR=\"include\" -DDATA_DIR=\"data\" -DHYPH_DIR=\"hyph\" \
+  -DLOCALE_DIR=\"locale\" -DCHAR_IN=1 -DCHAR_OUT=0 -DLOCALE_ON=0 \
+  -DASSERT_ON=1 $(COPTS) -DDEBUG_ON=0 -DPDF_COMPRESSION=1 -I/usr/lib/
+
+OBJS = z01.o z02.o z03.o z04.o z05.o z06.o z07.o z08.o \
+  z09.o z10.o z11.o z12.o z13.o z14.o z15.o z16.o \
+  z17.o z18.o z19.o z20.o z21.o z22.o z23.o z24.o \
+  z25.o z26.o z27.o z28.o z29.o z30.o z31.o z32.o \
+  z33.o z34.o z35.o z36.o z37.o z38.o z39.o z40.o \
+  z41.o z42.o z43.o z44.o z45.o z46.o z47.o z48.o \
+  z49.o z50.o z51.o z52.o
+
+arch: $(OBJS)
+	gcc -o lout $(OBJS) /usr/lib/libz.a -lm
+	gcc -o prg2lout prg2lout.c
+
+$(OBJS): externs.h
+
+externs.h:
+
+install: arch
+	# lout
+	install -Dm0755 lout $(PKGDIR)/usr/bin/lout
+	set include data hyph font maps; \
+	for i; do \
+	  install -d $(PKGDIR)/usr/lib/lout/$$i; \
+	  install -m0644 -t $(PKGDIR)/usr/lib/lout/$$i/ $$i/*; \
+	done
+	# prg2lout
+	install -Dm0755 prg2lout $(PKGDIR)/usr/bin/prg2lout
+	# man
+	sed -i -e "s@<BINDIR>@/usr/bin@" -e "s@<LIBDIR>@/usr/lib/lout@" \
+	  -e "s@<LOUTDOCDIR>@/usr/doc/lout@" -e "s@<MANDIR>@/usr/share/man/man1@" \
+	man/lout.1
+	install -Dm0644 man/lout.1 $(PKGDIR)/usr/share/man/man1/lout.1
+	install -Dm0644 man/prg2lout.1 $(PKGDIR)/usr/share/man/man1/prg2lout.1  
+
diff --git a/community/mingw32-binutils/PKGBUILD b/community/mingw32-binutils/PKGBUILD
index 2ead06c5e..579c48920 100644
--- a/community/mingw32-binutils/PKGBUILD
+++ b/community/mingw32-binutils/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 36142 2010-12-27 16:21:38Z spupykin $
+# $Id: PKGBUILD 56192 2011-10-03 10:54:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ondrej Jirman <megous@megous.com>
 # Contributor: mosra <mosra@centrum.cz>
 
 pkgname=mingw32-binutils
-pkgver=2.21
+pkgver=2.21.53
 pkgrel=1
+_uprel=1
 arch=(i686 x86_64)
 url="https://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GNU-Binutils/"
 pkgdesc="A set of programs to assemble and manipulate binary and object files (mingw)"
 depends=('glibc' 'zlib')
 license=(GPL)
-source=(https://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GNU-Binutils/binutils-$pkgver/binutils-$pkgver-2-mingw32-src.tar.lzma)
-md5sums=('f75122b3d253cc9054dc82d90c10455a')
+source=(https://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GNU-Binutils/binutils-$pkgver/binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma)
+md5sums=('e7f6602056f594acc9a4a559909d4649')
 
 build() {
-  tar --lzma -xf binutils-$pkgver-2-mingw32-src.tar.lzma
+  tar --lzma -xf binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma
   cd $srcdir/binutils-$pkgver
   ./configure \
     --target=i486-mingw32 \
diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD
index 43ef4c491..4cfca514e 100644
--- a/community/mingw32-gcc-base/PKGBUILD
+++ b/community/mingw32-gcc-base/PKGBUILD
@@ -1,40 +1,43 @@
-# $Id: PKGBUILD 23584 2010-08-13 11:57:37Z spupykin $
+# $Id: PKGBUILD 56196 2011-10-03 10:57:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ondrej Jirman <megous@megous.com>
 
 pkgname=mingw32-gcc-base
-pkgver=4.5.0
-_w32apiver=3.14
-_runtimever=3.18
-pkgrel=3
+pkgver=4.6.1
+_w32apiver=3.17
+_runtimever=3.20
+_uprel=2
+_upw32rel=1
+pkgrel=1
 arch=(i686 x86_64)
 pkgdesc="A C cross-compiler for building Windows executables on Linux"
 depends=(mingw32-binutils)
 makedepends=(p7zip mingw32-runtime mingw32-w32api)
 conflicts=(mingw32-gcc)
-options=(!strip force)
+options=(!strip)
 license=(GPL LGPL)
 url="http://mingw.sf.net"
-source=(gcc-$pkgver-1-mingw32-src.tar.xz::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-1/gcc-$pkgver-1-mingw32-src.tar.lzma
-	http://switch.dl.sf.net/sourceforge/mingw/w32api-${_w32apiver}-mingw32-src.tar.gz
-	http://switch.dl.sf.net/sourceforge/mingw/mingwrt-${_runtimever}-mingw32-src.tar.gz)
-md5sums=('f279430018dc379b8184c0a18b280298'
-         'c31baedaf2a8d38874e056a112a4fbc8'
-         '34b54cb3379f871f0dcd5c20b69b0350')
+source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma
+	http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma
+	http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz)
+md5sums=('f8b09b7e51223e1ae1c1e466af3ac82e'
+         '89e5800096aa334009f98e7c1743d825'
+         '26c0886cc60729b94956cc6d81cd076c')
 
 build()
 {
   if [ $NOEXTRACT -ne 1 ]; then
   # prepare headers
   mkdir -p $srcdir/mingw/include/
-  cp -r $srcdir/w32api-${_w32apiver}-mingw32/include/* \
+  cp -r $srcdir/w32api-${_w32apiver}-${_upw32rel}-mingw32/include/* \
     $srcdir/mingwrt-${_runtimever}-mingw32/include/* \
     $srcdir/mingw/include/
 
   unset CFLAGS CXXFLAGS
 
-  tar xJf gcc-$pkgver-1-mingw32-src.tar.xz
-  tar xjf gcc-$pkgver.tar.bz2
+#  tar xJf gcc-$pkgver-${_uprel}-mingw32-src.tar.xz
+  cd $srcdir
+  tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2
 
   mkdir -p $srcdir/build
   cd $srcdir/build
@@ -55,14 +58,13 @@ build()
     --disable-libssp \
     --disable-libgomp \
     --with-build-sysroot=$srcdir \
-    --with-headers=$srcdir/include \
-    || return 1
+    --with-headers=$srcdir/include
   else
     cd $srcdir/build
   fi
 
-  make || return 1
-  make install DESTDIR=$pkgdir || return 1
+  make
+  make install DESTDIR=$pkgdir
 
   cd $pkgdir
   rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \
diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD
index da32ebb86..ba58fdddd 100644
--- a/community/mingw32-gcc/PKGBUILD
+++ b/community/mingw32-gcc/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 50734 2011-06-30 10:31:04Z spupykin $
+# $Id: PKGBUILD 56194 2011-10-03 10:55:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ondrej Jirman <megous@megous.com>
 
 pkgname=mingw32-gcc
-pkgver=4.5.2
-pkgrel=4
+pkgver=4.6.1
+pkgrel=1
+_uprel=2
 arch=(i686 x86_64)
 pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux"
 depends=('mingw32-pthreads' 'mingw32-runtime' 'mingw32-binutils' 'mingw32-w32api'
@@ -14,13 +15,12 @@ provides=('mingw32-gcc-base')
 options=(!strip)
 url="http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/"
 license=(GPL LGPL)
-source=(gcc-$pkgver-1-mingw32-src.tar.xz::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-1/gcc-$pkgver-1-mingw32-src.tar.lzma)
-md5sums=('6df4174d78285ec58910f86217b8acb1')
+source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-1/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma)
+md5sums=('f8b09b7e51223e1ae1c1e466af3ac82e')
 
 build()
 {
-  [ $NOEXTRACT -eq 1 ] || tar xJf gcc-$pkgver-1-mingw32-src.tar.xz
-  [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver.tar.bz2
+  [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2
 
   mkdir -p $srcdir/build
   cd $srcdir/build
@@ -56,9 +56,11 @@ build()
   make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install
 
   msg "fixes"
+  cd $pkgdir/usr/i486-mingw32/lib
   mkdir -p $pkgdir/usr/i486-mingw32/bin/
-  mv $pkgdir/usr/bin/*.dll $pkgdir/usr/i486-mingw32/bin/
-  mv $pkgdir/*.dll $pkgdir/usr/i486-mingw32/bin/
+  for i in `ls -1 *.dll`; do
+    ln -s ../lib/$i $pkgdir/usr/i486-mingw32/bin/$i
+  done
 
   cd $pkgdir
   rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \
diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD
index bebd0c820..12a07818c 100644
--- a/community/mtpaint/PKGBUILD
+++ b/community/mtpaint/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 55362 2011-09-10 10:56:06Z pschmitz $
-# Maintainer:
+# $Id: PKGBUILD 56207 2011-10-03 12:32:35Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: yosh64 <yosh64.at.gmail.dot.com>
-
-
 pkgname=mtpaint
 pkgver=3.31
-pkgrel=5
-pkgdesc="A simple GTK2 painting program designed for creating icons and pixel based artwork."
-arch=('i686' 'x86_64')
-url="http://mtpaint.sourceforge.net"
-license=('GPL')
-depends=('gtk2' 'giflib' 'openjpeg')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        libpng14.patch)
+pkgrel=6
+pkgdesc="A simple GTK2 painting program designed for creating icons and pixel based artwork"
+arch=('x86_64' 'i686')
+url="http://mtpaint.sourceforge.net/"
+license=('GPL3')
+depends=('gtk2' 'giflib' 'openjpeg' 'bzip2' 'desktop-file-utils' 'glib2' 'freetype2')
+install=mtpaint.install
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+        "libpng14.patch"
+        "mtpaint.install")
 md5sums=('fbe34eb25f96b6092403115f1f6ab387'
-         'f84245ae1e26bd734740306b09024bb8')
+         'f84245ae1e26bd734740306b09024bb8'
+         '1bd546a8efeae01e8fd8a5c7f213012e')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -29,4 +30,9 @@ package() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 
 	make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING \
+    "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
+
+# vim:set ts=2 sw=2 et:
+
diff --git a/community/mtpaint/mtpaint.install b/community/mtpaint/mtpaint.install
new file mode 100644
index 000000000..b44de11aa
--- /dev/null
+++ b/community/mtpaint/mtpaint.install
@@ -0,0 +1,14 @@
+post_install() {
+	post_upgrade
+}
+
+post_upgrade() {
+	echo "Updating desktop database"
+	update-desktop-database -q
+}
+
+post_remove() {
+	post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD
index 18fa5992a..3b9e35c4f 100644
--- a/community/netsurf/PKGBUILD
+++ b/community/netsurf/PKGBUILD
@@ -1,26 +1,45 @@
-# $Id: PKGBUILD 52915 2011-07-29 20:04:25Z ebelanger $
+# $Id: PKGBUILD 56237 2011-10-03 16:13:35Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Georgij Kondratjev <smpuj@bk.ru>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 pkgname=netsurf
-pkgver=2.7
+pkgver=2.8
 pkgrel=1
 pkgdesc="Lightweight, fast web browser"
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 url="http://www.netsurf-browser.org/"
 license=('GPL')
-depends=('libmng' 'librsvg' 'curl' 'libglade' 'libcss' 'libnsgif' 'libnsbmp' 'hubbub')
-makedepends=('lcms')
-source=("http://www.netsurf-browser.org/downloads/releases/${pkgname}-${pkgver}-src.tar.gz")
-md5sums=('52939f2e2319269d7d758ec665f6cb8e')
+depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub')
+makedepends=('re2c' 'lcms')
+provides=('netsurf')
+conflicts=('netsurf')
+install=("${pkgname}.install")
+source=("${pkgname}.desktop"
+        "${pkgname}.install"
+        "http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
+        "http://www.netsurf-browser.org/downloads/releases/${pkgname}-${pkgver}-src.tar.gz")
+md5sums=('85e0af265e77607596fd90db9ac707ad'
+         '69445d7ccf7df8c7ff134f04f36342b0'
+         '4f28912e5df4b826b819e175265bcc9c'
+         '49c41f281f3e9ca28a24da505fad2e3a')
 
 build() {
   cd "${srcdir}/${pkgname}"
+
   make PREFIX=/usr TARGET=gtk
 }
 
 package() {
   cd "${srcdir}/${pkgname}"
+
   make install PREFIX=/usr DESTDIR="${pkgdir}"
+  install -Dm644 "../icon_48x48_netsurf.png" \
+    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -Dm644 "../${pkgname}.desktop" \
+    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 COPYING \
+    "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/netsurf/netsurf.desktop b/community/netsurf/netsurf.desktop
new file mode 100644
index 000000000..aca4deefc
--- /dev/null
+++ b/community/netsurf/netsurf.desktop
@@ -0,0 +1,127 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Netsurf
+Name[ar]=صافي تصفح
+Name[ast]=Netsurf
+Name[ca]=Netsurf
+Name[cs]=Netsurf
+Name[da]=Netsurf
+Name[de]=Netsurf
+Name[el]=καθαρού σερφ
+Name[en_GB]=Netsurf
+Name[es]=Netsurf
+Name[et]=Netsurf
+Name[fi]=Netsurf
+Name[fr]=Netsurf
+Name[gl]=Netsurf
+Name[he]=Netsurf
+Name[hr]=Netsurf
+Name[hu]=Netsurf
+Name[id]=Netsurf
+Name[it]=Netsurf
+Name[ja]=Netsurf
+Name[ko]=인터넷 서핑
+Name[lt]=Netsurf
+Name[nl]=Netsurf
+Name[no]=Netsurf
+Name[pl]=Netsurf
+Name[pt]=Netsurf
+Name[pt_BR]=Netsurf
+Name[ro]=Netsurf
+Name[ru]=Netsurf
+Name[sk]=Netsurf
+Name[sr]=нетсурф
+Name[sr@latin]=Netsurf
+Name[sv]=Netsurf
+Name[tr]=Netsurf
+Name[ug]=Netsurf
+Name[uk]=Інтернет серфінгу
+Name[zh_CN]=Netsurf 网冲浪
+Name[zh_TW]=Netsurf 網衝浪
+GenericName=Web Browser
+GenericName[ar]=متصفح الوب
+GenericName[ast]=Restolador
+GenericName[ca]=Navegador web
+GenericName[cs]=Internetový prohlížeč
+GenericName[da]=Webbrowser
+GenericName[de]=Internetbetrachter
+GenericName[el]=Περιηγητής Ιστού
+GenericName[en_GB]=Web Browser
+GenericName[es]=Navegador web
+GenericName[et]=Veebibrauser
+GenericName[fi]=Verkkoselain
+GenericName[fr]=Navigateur Internet
+GenericName[gl]=Navegador web
+GenericName[he]=דפדפן
+GenericName[hr]=Web preglednik
+GenericName[hu]=Webböngésző
+GenericName[id]=Peramban Web
+GenericName[it]=Browser web
+GenericName[ja]=ウェブブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[lt]=Interneto naršyklė
+GenericName[nl]=Webbrowser
+GenericName[no]=Nettleser
+GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ
+GenericName[pl]=Przeglądarka internetowa
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador web
+GenericName[ro]=Navigator web
+GenericName[ru]=Интернет-обозреватель
+GenericName[sk]=Internetový prehliadač
+GenericName[sr]=Интернет прегледник
+GenericName[sr@latin]=Internet preglednik
+GenericName[sv]=Webbläsare
+GenericName[tr]=Web Tarayıcı
+GenericName[ug]=توركۆرگۈ
+GenericName[uk]=Переглядач Веб
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_TW]=網頁瀏覽器
+Comment=Lightweight web browser
+Comment[ar]=منصفح الوب الخفيف
+Comment[ast]=Restolador llixeru
+Comment[ca]=Navegador web lleuger
+Comment[cs]=Odlehčený prohlížeč
+Comment[da]=Letvægtig webbrowser
+Comment[de]=Schlanker Internetbetrachter
+Comment[el]=Ελαφρύς περιηγητής ιστού
+Comment[en_GB]=Lightweight web browser
+Comment[es]=Navegador web ligero
+Comment[et]=Kergekaaluline veebibrauser
+Comment[fi]=Kevyt verkkoselain
+Comment[fr]=Navigateur Internet léger
+Comment[gl]=Navegador web lixeiro
+Comment[he]=דפדפן קל משקל
+Comment[hr]=Lagani web preglednik
+Comment[hu]=Könnyűsúlyú webböngésző
+Comment[id]=Peramban web ringan
+Comment[it]=Browser web leggero
+Comment[ja]=軽量級ウェブブラウザ
+Comment[ko]=가벼운 웹 브라우저
+Comment[lt]=Paprasta interneto naršyklė
+Comment[nl]=Lichtgewicht webbrowser
+Comment[no]=Lettvektig nettleser
+Comment[pa]=ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ
+Comment[pl]=Umożliwia przeglądanie zawartości sieci internetowej
+Comment[pt]=Navegador Web rápido
+Comment[pt_BR]=Navegador web leve
+Comment[ro]=Mic navigator web
+Comment[ru]=Легковесный Интернет-обозреватель
+Comment[sk]=Ľahký internetový prehliadač
+Comment[sr]=Једноставан Интернет прегледник
+Comment[sr@latin]=Jednostavan Internet preglednik
+Comment[sv]=Resurssnål webbläsare
+Comment[tr]=Hafif web tarayıcı 
+Comment[ug]=يېنىك توركۆرگۈ
+Comment[uk]=Легкий переглядач Веб
+Comment[zh_CN]=轻量级网页浏览器
+Comment[zh_TW]=輕量級網頁瀏覽器
+Categories=GTK;Network;WebBrowser;
+MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo;
+Exec=netsurf %U
+Icon=netsurf
+Terminal=false
+StartupNotify=true
+X-Osso-Type=application/x-executable
+X-Osso-Service=netsurf
diff --git a/community/netsurf/netsurf.install b/community/netsurf/netsurf.install
new file mode 100644
index 000000000..fb5b06997
--- /dev/null
+++ b/community/netsurf/netsurf.install
@@ -0,0 +1,20 @@
+post_install() {
+  echo "Updating icon cache"
+  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
+	echo "Updating mime entries"
+	update-desktop-database -q
+}
+
+post_upgrade() {
+  echo "Updating icon cache"
+  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
+	echo "Updating mime entries"
+	update-desktop-database -q
+}
+
+post_remove() {
+  echo "Updating icon cache"
+  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
+	echo "Updating mime entries"
+	update-desktop-database -q
+}
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index c03032002..e5d40753d 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56085 2011-09-30 23:18:02Z spupykin $
+# $Id: PKGBUILD 56187 2011-10-03 07:27:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
@@ -11,7 +11,7 @@ _user=http
 _group=http
 
 pkgname=nginx
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
 arch=('i686' 'x86_64')
@@ -34,7 +34,7 @@ backup=("etc/nginx/conf/fastcgi.conf"
 changelog=changelog
 source=(http://nginx.org/download/nginx-$pkgver.tar.gz
 	nginx)
-md5sums=('2a63d20301b924fa44c7d02586ae7ade'
+md5sums=('1049e5fc6e80339f6ba8668fadfb75f9'
          '0e8032d3ba26c3276e8c7c30588d375f')
 
 build() {
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 4fd24a269..ebcbab11a 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 55934 2011-09-26 09:37:58Z spupykin $
+# $Id: PKGBUILD 56203 2011-10-03 11:01:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
 pkgver=2.2.14
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64')
 url="http://redis.io/"
@@ -19,7 +19,7 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.logrotate")
 md5sums=('3605e3d4c9465fdfefa2e96f3a408ef5'
-         'bf61968d18d0e42529880f5c488ea9ed'
+         '9726d06d0a0c60cb5d55a31b3dc1e55d'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
 build() {
diff --git a/community/redis/redis.d b/community/redis/redis.d
index 333f45d6b..3294963ed 100644
--- a/community/redis/redis.d
+++ b/community/redis/redis.d
@@ -1,53 +1,65 @@
 #!/bin/bash
 
+daemon_name=redis
+
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`cat /var/run/redis.pid 2>/dev/null`
+REDISPORT=6379
+EXEC=/usr/bin/redis-server
+CLIEXEC=/usr/bin/redis-cli
+PIDFILE=/var/run/redis.pid
+WORKDIR=/var/lib/redis
+CONF="/etc/redis.conf"
+
 case "$1" in
   start)
-    stat_busy "Starting Redis Server"
-    [ -d /var/lib/redis ] || { mkdir /var/lib/redis; }
-    if [ -z "$PID" ]; then
-        /usr/bin/redis-server /etc/redis.conf >/dev/null
-        RESULT=$?
-    else
-        REDIS_PID=`pidof redis-server`
-        if [ -z "$REDIS_PID" ]; then
-            /usr/bin/redis-server /etc/redis.conf >/dev/null
-            RESULT=$?
-        elif [ `pidof redis-server` -eq $PID ]; then
-            RESULT=1
-        else
-            /usr/bin/redis-server /etc/redis.conf >/dev/null
-            RESULT=$?
-        fi
-    fi
+    stat_busy "Starting $daemon_name"
+    [ -d $WORKDIR ] || mkdir $WORKDIR
 
-    if [ $RESULT -gt 0 ]; then
+    if [ -f $PIDFILE ]; then
       stat_fail
+      exit 1
     else
-      add_daemon redis
-      stat_done
+      $EXEC $CONF >/dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        add_daemon $daemon_name
+        stat_done
+      fi
     fi
     ;;
+
   stop)
-    stat_busy "Stopping Redis Server"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
+    stat_busy "Stopping $daemon_name"
+
+    if [ ! -f $PIDFILE ]; then
       stat_fail
+      exit 1
     else
-      rm /var/run/redis.pid
-      rm_daemon redis
-      stat_done
+      PID=$(cat $PIDFILE)
+      $CLIEXEC -p $REDISPORT shutdown
+      [ -d /proc/${PID} ] && sleep 1
+      [ -d /proc/${PID} ] && sleep 5
+      [ -d /proc/${PID} ] && kill -9 $PID
+      [ -d /proc/${PID} ] && stat_fail || { stat_done; rm_daemon $daemon_name; }
     fi
     ;;
+
   restart)
     $0 stop
     sleep 1
     $0 start
     ;;
+
+  status)
+    stat_busy "Checking $daemon_name status";
+    ck_status $daemon_name
+    ;;
+
   *)
-    echo "usage: $0 {start|stop|restart}"
+    echo "usage: $0 {start|stop|restart|status}"  
 esac
 exit 0
diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index 19feb931e..be383a4e1 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 131824 2011-07-15 23:53:22Z dan $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 139637 2011-10-04 00:28:34Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=inetutils
 pkgver=1.8
-pkgrel=3
+pkgrel=5
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/inetutils/"
 license=('GPL')
+groups=('base')
 depends=('readline' 'ncurses' 'pam')
 provides=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
 conflicts=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
@@ -16,16 +17,20 @@ backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
         'etc/xinetd.d/rexec' 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
 options=('!emptydirs')
 install=inetutils.install
-source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz \
-        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rexec.xinetd rlogin.xinetd rsh.xinetd)
-md5sums=('ad8fdcdf1797b9ca258264a6b04e48fd' 'c167200f6faeb64659e69ced2a9d672a'\
-         'e6e6e5990a2e8159a276fef8fbf54c04' '8596208d119045543c5fb644e1d713d5'\
-         '2c3655985cf122591d71d031af84ff90' 'c490ea36751ac5f1d61d2c014959a3d1'\
-         'c25d8382a994de84d9c6962d804f689b' 'c3aa508a9d1293a787341108cd49c1b7')
-sha1sums=('598445859b511f73681e4d74a41d65cd6ae0f83e' '84dc802b5e57b5e04c847572225a3b9612017155'\
-         '68a590083b45997dfdb80e666b2de762f494ba74' 'bfad98a4a62f1fff8779f076c6019ed07f9111af'\
-         '27d99b910eec0fc26bd79ccc2c1de26608330298' '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605'\
-         '81f10b3b688e3952f793b35bcef63b5bf257a92b' '81f4a8da823cf0bb14284fc71ee6108849691eda')
+source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \
+        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rexec.xinetd rlogin.xinetd rsh.xinetd \
+        dnsdomainname domainname)
+sha1sums=('598445859b511f73681e4d74a41d65cd6ae0f83e'
+          'c439b577214017be9cccd1b2fbba048964386a0e'
+          '84dc802b5e57b5e04c847572225a3b9612017155'
+          '68a590083b45997dfdb80e666b2de762f494ba74'
+          'bfad98a4a62f1fff8779f076c6019ed07f9111af'
+          '27d99b910eec0fc26bd79ccc2c1de26608330298'
+          '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605'
+          '81f10b3b688e3952f793b35bcef63b5bf257a92b'
+          '81f4a8da823cf0bb14284fc71ee6108849691eda'
+          'ac69756d6cc50157d430d863db04a5aac4688380'
+          'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -38,13 +43,12 @@ build() {
     --enable-rlogin --enable-rlogind \
     --enable-rsh --enable-rshd \
     --enable-rexec --enable-rexecd \
-    --enable-rcp \
+    --enable-rcp --enable-hostname \
     --disable-tftp --disable-tftpd \
     --disable-ping --disable-ping6 \
     --disable-logger --disable-syslogd \
     --disable-inetd --disable-whois \
-    --disable-uucpd --disable-hostname \
-    --disable-ifconfig --disable-traceroute
+    --disable-uucpd --disable-ifconfig --disable-traceroute
   make
 }
 
@@ -52,6 +56,12 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
+  install -d "${pkgdir}/bin"
+  ln -s /usr/bin/hostname "${pkgdir}/bin/hostname"
+  install -D -m755 "${srcdir}/domainname" "${pkgdir}/bin/domainname"
+  install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
+  echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/domainname.1"
+  echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1"
   install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd"
   install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd"
   install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
diff --git a/core/inetutils/dnsdomainname b/core/inetutils/dnsdomainname
new file mode 100644
index 000000000..4bba209fe
--- /dev/null
+++ b/core/inetutils/dnsdomainname
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/hostname -y "$@"
diff --git a/core/inetutils/domainname b/core/inetutils/domainname
new file mode 100644
index 000000000..a1b8a8c31
--- /dev/null
+++ b/core/inetutils/domainname
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/hostname -d "$@"
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index 94356ab28..b86c0a91c 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 133509 2011-07-28 19:16:56Z stephane $
+# $Id: PKGBUILD 139635 2011-10-03 23:42:42Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=krb5
 pkgver=1.9.1
-pkgrel=3
+pkgrel=4
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64')
 url="http://web.mit.edu/kerberos/"
@@ -17,11 +17,13 @@ backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
 source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
         krb5-kadmind
         krb5-kdc
-        krb5-1.9.1-config-script.patch)
+        krb5-1.9.1-config-script.patch
+        krb5-1.9.1-canonicalize-fallback.patch)
 sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
           '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
           '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
-          '8d1ec8bdb39fec230caace112d1a41ad792f7d97')
+          '7342410760cf44bfa01bb99bb4c49e12496cb46f'
+          '238c268fa6cb42fc7324ab54db9abda5cd77f833')
 options=('!emptydirs')
 
 build() {
@@ -30,14 +32,21 @@ build() {
 
    # - Make krb5-config suppress CFLAGS output when called with --libs
    #   cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
-   #      http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-buildconf.patch
    #
    # - Omit extra libraries because their interfaces are not exposed to applications
    #   by libkrb5, unless do_deps is set to 1, which indicates that the caller
    #   wants the whole list.
-   #   cf http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-nodeplibs.patch
+   #
+   #   Patch from upstream : 
+   #   http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236
    patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
 
+   # FS#25515
+   patch -Np2 -i ${srcdir}/krb5-1.9.1-canonicalize-fallback.patch
+
+   # FS#25384
+   sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
+
    export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
    export CPPFLAGS+=" -I/usr/include/et"
    ./configure --prefix=/usr \
@@ -69,5 +78,8 @@ package() {
    install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d
    install -m 755 ../../krb5-kadmind  "${pkgdir}"/etc/rc.d
 
+   install -dm 755 "${pkgdir}"/usr/share/aclocal
+   install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal
+
    install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/core/krb5/krb5-1.9.1-canonicalize-fallback.patch b/core/krb5/krb5-1.9.1-canonicalize-fallback.patch
new file mode 100644
index 000000000..e5a38498f
--- /dev/null
+++ b/core/krb5/krb5-1.9.1-canonicalize-fallback.patch
@@ -0,0 +1,58 @@
+diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c
+--- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c	2011-02-09 16:55:36.000000000 -0500
++++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c	2011-09-26 18:42:01.465190278 -0400
+@@ -470,13 +470,10 @@
+ 
+ /***** STATE_REFERRALS *****/
+ 
+-/*
+- * Possibly retry a request in the fallback realm after a referral request
+- * failure in the local realm.  Expects ctx->reply_code to be set to the error
+- * from a referral request.
+- */
++/* Possibly try a non-referral request after a referral request failure.
++ * Expects ctx->reply_code to be set to the error from a referral request. */
+ static krb5_error_code
+-try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx)
++try_fallback(krb5_context context, krb5_tkt_creds_context ctx)
+ {
+     krb5_error_code code;
+     char **hrealms;
+@@ -485,9 +482,10 @@
+     if (ctx->referral_count > 1)
+         return ctx->reply_code;
+ 
+-    /* Only fall back if the original request used the referral realm. */
++    /* If the request used a specified realm, make a non-referral request to
++     * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */
+     if (!krb5_is_referral_realm(&ctx->req_server->realm))
+-        return ctx->reply_code;
++        return begin_non_referral(context, ctx);
+ 
+     if (ctx->server->length < 2) {
+         /* We need a type/host format principal to find a fallback realm. */
+@@ -500,10 +498,10 @@
+     if (code != 0)
+         return code;
+ 
+-    /* Give up if the fallback realm isn't any different. */
++    /* If the fallback realm isn't any different, use the existing TGT. */
+     if (data_eq_string(ctx->server->realm, hrealms[0])) {
+         krb5_free_host_realm(context, hrealms);
+-        return ctx->reply_code;
++        return begin_non_referral(context, ctx);
+     }
+ 
+     /* Rewrite server->realm to be the fallback realm. */
+@@ -540,9 +538,9 @@
+     krb5_error_code code;
+     const krb5_data *referral_realm;
+ 
+-    /* Possibly retry with the fallback realm on error. */
++    /* Possibly try a non-referral fallback request on error. */
+     if (ctx->reply_code != 0)
+-        return try_fallback_realm(context, ctx);
++        return try_fallback(context, ctx);
+ 
+     if (krb5_principal_compare(context, ctx->reply_creds->server,
+                                ctx->server)) {
diff --git a/core/krb5/krb5-1.9.1-config-script.patch b/core/krb5/krb5-1.9.1-config-script.patch
index 96ee6b001..a72a75edf 100644
--- a/core/krb5/krb5-1.9.1-config-script.patch
+++ b/core/krb5/krb5-1.9.1-config-script.patch
@@ -1,25 +1,27 @@
 diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in
 --- krb5-1.9.1.ori/src/krb5-config.in	2010-01-19 13:44:57.000000000 -0500
-+++ krb5-1.9.1/src/krb5-config.in	2011-07-28 14:32:00.546990621 -0400
++++ krb5-1.9.1/src/krb5-config.in	2011-09-26 18:27:09.018487087 -0400
 @@ -186,7 +186,7 @@
  	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
  	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
  	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
 -	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
-+       -e 's#\$(CFLAGS)##'`
++	    -e 's#\$(CFLAGS)##'`
  
      if test $library = 'kdb'; then
  	lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
-@@ -214,7 +214,11 @@
+@@ -214,9 +214,13 @@
      fi
  
      if test $library = 'krb5'; then
 -	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
-+       if test 0$do_deps -eq 1 ; then
-+	        lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
-+       else
-+           lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
-+       fi
++	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
      fi
  
++    # If we ever support a flag to generate output suitable for static
++    # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB"
++    # here.
++
      echo $lib_flags
+ fi
+ 
diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD
index 6a81124ea..e48e2fc5a 100644
--- a/core/net-tools/PKGBUILD
+++ b/core/net-tools/PKGBUILD
@@ -1,28 +1,30 @@
-# $Id: PKGBUILD 127037 2011-06-10 00:48:19Z bisson $
-# Maintainer: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 139639 2011-10-04 00:28:38Z eric $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
 pkgname=net-tools
-pkgver=1.60
-pkgrel=18
+pkgver=1.60.20110819cvs
+pkgrel=1
 pkgdesc="Configuration tools for Linux networking"
 arch=(i686 x86_64)
-license=('GPL')
+license=('GPL2')
 url="http://www.tazenda.demon.co.uk/phil/net-tools"
 depends=('glibc')
-source=(http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
-  net-tools.patch gcc340.patch net-tools-1.60-2.6-compilefix.patch
+
+# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
+# use cvs checkout instead
+source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2
   net-tools-1.60-miiioctl.patch
-  net-tools-1.60-nameif.patch
   net-tools-1.60-nameif_strncpy.patch)
 options=(!makeflags)
 install=net-tools.install
+sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf'
+          '654a96bc6575efb4a2e04b49de45d448d240eb6e'
+          '7888000d8fe867e58b5b00fe2bcf6c3041d716b4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ../net-tools.patch
-  patch -Np1 -i ../net-tools-1.60-2.6-compilefix.patch
   patch -Np1 -i ../net-tools-1.60-miiioctl.patch
-  patch -Np1 -i ../gcc340.patch
-  patch -Np1 -i ${srcdir}/net-tools-1.60-nameif.patch
   patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch
   yes "" | make
 }
@@ -34,11 +36,8 @@ package() {
   # the following is provided by yp-tools
   rm "${pkgdir}"/bin/{nis,yp}domainname
   rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1
+
+  # hostname is provided by inetutils
+  rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname}
+  rm -rf "${pkgdir}"/usr/share/man/man1
 }
-md5sums=('888774accab40217dde927e21979c165'
-         '7ef8d0c6818faa0fdeea94970a20e3fb'
-         'b52d899cba9956bb0055150506f41ac1'
-         '51de6eabe2d6d6dc860f72c41cee636b'
-         'c16109863bc63f3dad4ef35305a340bb'
-         '29a32617382fab1735acba4d920f1fcd'
-         'e66466b9304dac85eb42b32f1ec3b284')
diff --git a/core/net-tools/net-tools-1.60-miiioctl.patch b/core/net-tools/net-tools-1.60-miiioctl.patch
index 4859273ed..6c7f0693d 100644
--- a/core/net-tools/net-tools-1.60-miiioctl.patch
+++ b/core/net-tools/net-tools-1.60-miiioctl.patch
@@ -1,17 +1,17 @@
---- net-tools-1.60/include/mii.h.bar	Tue Jul 31 11:49:39 2001
-+++ net-tools-1.60/include/mii.h	Tue Jul 31 11:49:33 2001
-@@ -11,11 +11,9 @@
- 
+--- net-tools-1.60.20110819cvs/include/mii.h	2011-08-19 10:14:00.743873299 +0200
++++ net-tools-1.60.20110819cvs/include/mii.h.new	2011-08-19 10:28:26.500524160 +0200
+@@ -14,11 +14,9 @@
  /* network interface ioctl's for MII commands */
  #ifndef SIOCGMIIPHY
+ #warning "SIOCGMIIPHY is not defined by your kernel source"
 -#define SIOCGMIIPHY (SIOCDEVPRIVATE)	/* Read from current PHY */
 -#define SIOCGMIIREG (SIOCDEVPRIVATE+1) 	/* Read any PHY register */
 -#define SIOCSMIIREG (SIOCDEVPRIVATE+2) 	/* Write any PHY register */
 -#define SIOCGPARAMS (SIOCDEVPRIVATE+3) 	/* Read operational parameters */
 -#define SIOCSPARAMS (SIOCDEVPRIVATE+4) 	/* Set operational parameters */
-+#define SIOCGMIIPHY 0x8947 	/* Read from current PHY */
-+#define SIOCGMIIREG 0x8948 	/* Read any PHY register */
-+#define SIOCSMIIREG 0x8949 	/* Write any PHY register */
++#define SIOCGMIIPHY 0x8947     /* Read from current PHY */
++#define SIOCGMIIREG 0x8948     /* Read any PHY register */
++#define SIOCSMIIREG 0x8949     /* Write any PHY register */
  #endif
  
  #include <linux/types.h>
diff --git a/core/net-tools/net-tools.patch b/core/net-tools/net-tools.patch
index 87e062eb2..8af2d2159 100644
--- a/core/net-tools/net-tools.patch
+++ b/core/net-tools/net-tools.patch
@@ -1,25 +1,3 @@
-diff -Naur net-tools-1.60-orig/config.in net-tools-1.60/config.in
---- net-tools-1.60-orig/config.in	2000-05-21 07:32:12.000000000 -0700
-+++ net-tools-1.60/config.in	2004-05-31 12:36:00.000000000 -0700
-@@ -49,7 +49,7 @@
- * 
- bool 'UNIX protocol family' HAVE_AFUNIX y
- bool 'INET (TCP/IP) protocol family' HAVE_AFINET y
--bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n
-+bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y
- bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y
- bool 'Appletalk DDP protocol family' HAVE_AFATALK y
- bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y
-@@ -86,6 +86,6 @@
- *
- *           Other Features.
- *
--bool 'IP Masquerading support' HAVE_FW_MASQUERADE n
--bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n
--bool 'Build mii-tool' HAVE_MII n
-+bool 'IP Masquerading support' HAVE_FW_MASQUERADE y
-+bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y
-+bool 'Build mii-tool' HAVE_MII y
 diff -Naur net-tools-1.60-orig/mii-tool.c net-tools-1.60/mii-tool.c
 --- net-tools-1.60-orig/mii-tool.c	2000-05-21 07:31:17.000000000 -0700
 +++ net-tools-1.60/mii-tool.c	2004-05-31 12:35:21.000000000 -0700
diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD
index 69974e508..2bb71bb52 100644
--- a/extra/abiword/PKGBUILD
+++ b/extra/abiword/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 135772 2011-08-18 15:03:53Z andyrtr $
+# $Id: PKGBUILD 139550 2011-10-03 12:22:58Z jgc $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Maël Lavault <moimael@neuf.fr>
 
 pkgbase=abiword
 pkgname=('abiword' 'abiword-plugins')
 pkgver=2.8.6
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.abisource.com"
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index 7b342e38e..998557870 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 139211 2011-10-01 18:55:32Z ibiru $
+# $Id: PKGBUILD 139555 2011-10-03 12:43:44Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=clutter-gst
-pkgver=1.4.0
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="GStreamer bindings for clutter"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ depends=('clutter' 'gstreamer0.10-base' 'libxdamage')
 makedepends=('gobject-introspection' 'gtk-doc')
 options=('!libtool')
 source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d47b771e1453eec4848bac8d58258058a435319d925b22256a28d348bc8d5270')
+sha256sums=('48f623a08a6793ab688ef6b899a2d889ef68053718ba44aac7997a1f9f619e7e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/cups-pdf/PKGBUILD b/extra/cups-pdf/PKGBUILD
index aef413f1b..c0700820d 100644
--- a/extra/cups-pdf/PKGBUILD
+++ b/extra/cups-pdf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121266 2011-04-29 22:22:36Z andyrtr $
+# $Id: PKGBUILD 139594 2011-10-03 14:30:44Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: Thomas Baechler <thomas.baechler@rwth-aachen.de>
 
 pkgname=cups-pdf
-pkgver=2.5.1
+pkgver=2.6.0
 pkgrel=1
 pkgdesc="PDF printer for cups"
 arch=(i686 x86_64)
@@ -13,7 +13,8 @@ url="http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf"
 license=('GPL2')
 source=(http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/cups-pdf_$pkgver.tar.gz)
 backup=(etc/cups/cups-pdf.conf)
-md5sums=('4b4cf1a249d02a38045db74b5f259aac')
+md5sums=('8ee644c77438aac542301352266db181')
+sha1sums=('45ecff78f26dab6261bbf66978e708d93385ef31')
 
 build() {
   cd $srcdir/$pkgname-$pkgver/src
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 106f55cec..f88924eea 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 138026 2011-09-14 18:37:32Z andrea $
+# $Id: PKGBUILD 139601 2011-10-03 17:47:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=2.1.1
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
              'cmake' 'automoc4' 'doxygen')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8cd3f5f2141bbb54ba2fd80371582c2c')
+md5sums=('be6100de4961a8cb99a8d9d1688a0460')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/enchant/PKGBUILD b/extra/enchant/PKGBUILD
index 2edd15320..a8dc20ddb 100644
--- a/extra/enchant/PKGBUILD
+++ b/extra/enchant/PKGBUILD
@@ -1,17 +1,15 @@
-# $Id: PKGBUILD 127251 2011-06-11 20:47:42Z andrea $
+# $Id: PKGBUILD 139539 2011-10-03 12:17:06Z jgc $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=enchant
 pkgver=1.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A wrapper library for generic spell checking"
 arch=('i686' 'x86_64')
 url="http://www.abisource.com/enchant/"
 license=('LGPL')
-depends=('aspell' 'dbus-glib' 'hunspell')
-makedepends=('hspell')
-optdepends=('hspell: Hebrew dictionary')
+depends=('aspell' 'dbus-glib' 'hunspell' 'hspell')
 options=('!libtool')
 source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('de11011aff801dc61042828041fb59c7')
diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD
index 4c5a23f7e..750e87407 100644
--- a/extra/fakechroot/PKGBUILD
+++ b/extra/fakechroot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 109836 2011-02-13 10:43:46Z allan $
+# $Id: PKGBUILD 139553 2011-10-03 12:37:11Z allan $
 # Maintainer : Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=fakechroot
-pkgver=2.14
+pkgver=2.15
 pkgrel=1
 pkgdesc="Gives a fake chroot environment"
 arch=('i686' 'x86_64')
@@ -12,18 +12,20 @@ license=('LGPL')
 options=('!libtool')
 install=fakechroot.install
 source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz)
-md5sums=('264c4e3f9a2264ab57e286682f9c4ad2')
+md5sums=('ce8bdde1d30274e124e8ecf8f59681ff')
 
-build()
-{
+build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot
   make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make check
 }
   
-package()
-{
+package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   
diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD
index d448e4eb2..fea27eed6 100644
--- a/extra/fcitx/PKGBUILD
+++ b/extra/fcitx/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 137540 2011-09-09 07:00:04Z andrea $
+# $Id: PKGBUILD 139597 2011-10-03 17:18:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: csslayer <wengxt AT gmail com>
 
 pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
-pkgver=4.1.1
+pkgver=4.1.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
 makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu')
 source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('465ede4722d2bb0c7fcf2d1a5206c9ce922902a4')
+sha1sums=('d2d4e725b1c2ed60543d466504954b631d5689e3')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD
index 0c5e2dc3e..fe83158e8 100644
--- a/extra/gdl/PKGBUILD
+++ b/extra/gdl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139269 2011-10-01 18:57:05Z ibiru $
+# $Id: PKGBUILD 139625 2011-10-03 20:22:38Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdl
-pkgver=3.1.5
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="GNOME Docking Library"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('gtk3')
 makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b89a30a7df499f3ee74108bb28ac46a962dc5e94c4e50fe34c8f9cf1580db482')
+sha256sums=('f4839224b7837efb8fbec8666f8a3bb1ce9ea110f06c57a8b9438faa0abab533')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index d93c3b09e..a1f5cef60 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 138474 2011-09-24 15:33:33Z dan $
+# $Id: PKGBUILD 139595 2011-10-03 14:35:14Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.6.4
-_manver=1.7.6.1
+pkgver=1.7.7
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
@@ -24,8 +23,9 @@ replaces=('git-core')
 provides=('git-core')
 backup=('etc/conf.d/git-daemon.conf')
 #source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2"
+#        "http://kernel.org/pub/software/scm/git/git-manpages-$pkgver.tar.bz2"
 source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
-        "http://kernel.org/pub/software/scm/git/git-manpages-$_manver.tar.bz2"
+        "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz"
         git-daemon
         git-daemon.conf)
 changelog=ChangeLog
@@ -80,11 +80,11 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-md5sums=('e0b7afcc0e5e43bbb82f85598ae34bd8'
-         'cae559424a62507cb2c15252d85a158e'
+md5sums=('5d645884e688921e773186783b65ce33'
+         '2ee47bd79dfd391bc7d1b466539b9734'
          '8e2648910fd5dd4f1c41d3c7fa9e9156'
          '2e42bf97779a1c6411d89043334c9e78')
-sha256sums=('c95bb6fdfa8276a6cbc1c3150e56ce3dc2fc29a4bcecd9c246ab9df5d9638ec6'
-            'faece1418e72d90ed9ee65e59fe89489e504db9b76e8325a2505e8fb61598a44'
+sha256sums=('5a977bc01e4989b9928345e99aab15ce896cf5897c6e32eb449538574df377f6'
+            'dde1ffaee0d90cce80f98126c5d9013c6687dc6f0b26bd12d61e229346701ecb'
             '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598'
             'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68')
diff --git a/extra/gnome-media/PKGBUILD b/extra/gnome-media/PKGBUILD
index 8e8d3da64..5697957f8 100644
--- a/extra/gnome-media/PKGBUILD
+++ b/extra/gnome-media/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 111636 2011-02-27 21:57:39Z ibiru $
+# $Id: PKGBUILD 139627 2011-10-03 20:26:30Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-media
 pkgver=2.91.2
-pkgrel=2
+pkgrel=3
 pkgdesc="GNOME Media Tools"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libgnome-media-profiles' 'libcanberra' 'hicolor-icon-theme')
 makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils')
 url="http://www.gnome.org"
-groups=('gnome')
-replaces=('gnome-media-pulse')
+groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 install=gnome-media.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index ab9dbadde..0132134cd 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139319 2011-10-01 18:58:22Z ibiru $
+# $Id: PKGBUILD 139631 2011-10-03 21:04:24Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-settings-daemon
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,11 +15,14 @@ url="http://www.gnome.org"
 groups=('gnome')
 replaces=(gnome-settings-daemon-pulse)
 conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+fix_color_crash.patch)
+sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b'
+            'b249d21702d4cf9a3a8dc177ba17c00d33e8e742e548811552d79ddeff1e91e3')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/fix_color_crash.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \
       --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids
diff --git a/extra/gnome-settings-daemon/fix_color_crash.patch b/extra/gnome-settings-daemon/fix_color_crash.patch
new file mode 100644
index 000000000..24602100f
--- /dev/null
+++ b/extra/gnome-settings-daemon/fix_color_crash.patch
@@ -0,0 +1,186 @@
+From fd4c0057b8e3f72b30acb6f1c82688e29b31c0c0 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 03 Oct 2011 08:52:06 +0000
+Subject: color: Fix a crash if ~/.local is deleted at runtime
+
+Resolves https://bugzilla.gnome.org/show_bug.cgi?id=660664
+---
+diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
+index d325162..3dde406 100644
+--- a/plugins/color/gcm-profile-store.c
++++ b/plugins/color/gcm-profile-store.c
+@@ -254,6 +254,8 @@ gcm_profile_store_process_child (GcmProfileStore *profile_store,
+ 
+         /* check we're not in a loop */
+         helper = gcm_profile_store_find_directory (profile_store, path);
++        if (helper == NULL)
++                goto out;
+         if (helper->depth > GCM_PROFILE_STORE_MAX_RECURSION_LEVELS) {
+                 g_warning ("recursing more than %i levels deep is insane",
+                            GCM_PROFILE_STORE_MAX_RECURSION_LEVELS);
+--
+cgit v0.9.0.2
+From e3313eb16fd2cb25ab3fbc010837b910e525acf6 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 03 Oct 2011 10:02:56 +0000
+Subject: color: Simplify gcm_profile_store_mkdir_with_parents()
+
+No need to check for the path existing,
+g_file_make_directory_with_parents() will do that for us.
+---
+(limited to 'plugins/color/gcm-profile-store.c')
+
+diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
+index 3dde406..d705604 100644
+--- a/plugins/color/gcm-profile-store.c
++++ b/plugins/color/gcm-profile-store.c
+@@ -419,19 +419,12 @@ static gboolean
+ gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error)
+ {
+         gboolean ret;
+-        GFile *file = NULL;
+ 
+         /* ensure destination exists */
+-        ret = g_file_test (filename, G_FILE_TEST_EXISTS);
+-        if (!ret) {
+-                file = g_file_new_for_path (filename);
+-                ret = g_file_make_directory_with_parents (file, NULL, error);
+-                if (!ret)
+-                        goto out;
+-        }
+-out:
+-        if (file != NULL)
+-                g_object_unref (file);
++        file = g_file_new_for_path (filename);
++        ret = g_file_make_directory_with_parents (file, NULL, error);
++        g_object_unref (file);
++
+         return ret;
+ }
+ 
+--
+cgit v0.9.0.2
+From a711ba99fd5a9bc7bf79dcdc763deed39440eb86 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 03 Oct 2011 10:38:36 +0000
+Subject: Make commit e3313eb16fd2cb25ab3fbc010837b910e525acf6 actually compile
+
+---
+(limited to 'plugins/color/gcm-profile-store.c')
+
+diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
+index d705604..0b3cfa0 100644
+--- a/plugins/color/gcm-profile-store.c
++++ b/plugins/color/gcm-profile-store.c
+@@ -419,6 +419,7 @@ static gboolean
+ gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error)
+ {
+         gboolean ret;
++        GFile *file;
+ 
+         /* ensure destination exists */
+         file = g_file_new_for_path (filename);
+--
+cgit v0.9.0.2
+From 42fa1af884fda1590bc7af0f78e4fc70d0eb621b Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 03 Oct 2011 10:34:04 +0000
+Subject: color: Cancel any in-progress directory searching on plugin unload
+
+---
+diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
+index 0b3cfa0..bcb7adc 100644
+--- a/plugins/color/gcm-profile-store.c
++++ b/plugins/color/gcm-profile-store.c
+@@ -34,6 +34,7 @@ struct _GcmProfileStorePrivate
+ {
+         GPtrArray                       *filename_array;
+         GPtrArray                       *directory_array;
++        GCancellable                    *cancellable;
+ };
+ 
+ enum {
+@@ -326,7 +327,7 @@ gcm_profile_store_next_files_cb (GObject *source_object,
+         g_file_enumerator_next_files_async  (enumerator,
+                                              5,
+                                              G_PRIORITY_LOW,
+-                                             NULL,
++                                             profile_store->priv->cancellable,
+                                              gcm_profile_store_next_files_cb,
+                                              user_data);
+ 
+@@ -343,6 +344,7 @@ gcm_profile_store_enumerate_children_cb (GObject *source_object,
+         gchar *path = NULL;
+         GError *error = NULL;
+         GFileEnumerator *enumerator;
++        GcmProfileStore *profile_store = GCM_PROFILE_STORE (user_data);
+ 
+         enumerator = g_file_enumerate_children_finish (G_FILE (source_object),
+                                                        res,
+@@ -360,7 +362,7 @@ gcm_profile_store_enumerate_children_cb (GObject *source_object,
+         g_file_enumerator_next_files_async (enumerator,
+                                             5,
+                                             G_PRIORITY_LOW,
+-                                            NULL,
++                                            profile_store->priv->cancellable,
+                                             gcm_profile_store_next_files_cb,
+                                             user_data);
+         g_object_unref (enumerator);
+@@ -407,7 +409,7 @@ gcm_profile_store_search_path (GcmProfileStore *profile_store, const gchar *path
+                                          G_FILE_ATTRIBUTE_STANDARD_TYPE,
+                                          G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                                          G_PRIORITY_LOW,
+-                                         NULL,
++                                         profile_store->priv->cancellable,
+                                          gcm_profile_store_enumerate_children_cb,
+                                          profile_store);
+ out:
+@@ -416,14 +418,16 @@ out:
+ }
+ 
+ static gboolean
+-gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error)
++gcm_profile_store_mkdir_with_parents (const gchar *filename,
++                                      GCancellable *cancellable,
++                                      GError **error)
+ {
+         gboolean ret;
+         GFile *file;
+ 
+         /* ensure destination exists */
+         file = g_file_new_for_path (filename);
+-        ret = g_file_make_directory_with_parents (file, NULL, error);
++        ret = g_file_make_directory_with_parents (file, cancellable, error);
+         g_object_unref (file);
+ 
+         return ret;
+@@ -438,7 +442,9 @@ gcm_profile_store_search (GcmProfileStore *profile_store)
+ 
+         /* get Linux per-user profiles */
+         path = g_build_filename (g_get_user_data_dir (), "icc", NULL);
+-        ret = gcm_profile_store_mkdir_with_parents (path, &error);
++        ret = gcm_profile_store_mkdir_with_parents (path,
++                                                    profile_store->priv->cancellable,
++                                                    &error);
+         if (!ret) {
+                 g_warning ("failed to create directory on startup: %s", error->message);
+                 g_error_free (error);
+@@ -480,6 +486,7 @@ static void
+ gcm_profile_store_init (GcmProfileStore *profile_store)
+ {
+         profile_store->priv = GCM_PROFILE_STORE_GET_PRIVATE (profile_store);
++        profile_store->priv->cancellable = g_cancellable_new ();
+         profile_store->priv->filename_array = g_ptr_array_new_with_free_func (g_free);
+         profile_store->priv->directory_array = g_ptr_array_new_with_free_func ((GDestroyNotify) gcm_profile_store_helper_free);
+ }
+@@ -490,6 +497,8 @@ gcm_profile_store_finalize (GObject *object)
+         GcmProfileStore *profile_store = GCM_PROFILE_STORE (object);
+         GcmProfileStorePrivate *priv = profile_store->priv;
+ 
++        g_cancellable_cancel (profile_store->priv->cancellable);
++        g_object_unref (profile_store->priv->cancellable);
+         g_ptr_array_unref (priv->filename_array);
+         g_ptr_array_unref (priv->directory_array);
+ 
+--
+cgit v0.9.0.2
diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD
index cd594befa..cca232ee5 100644
--- a/extra/gnucash/PKGBUILD
+++ b/extra/gnucash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 130812 2011-07-08 04:52:51Z eric $
+# $Id: PKGBUILD 139548 2011-10-03 12:22:55Z jgc $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Mark Schneider <queueRAM@gmail.com>
 
 pkgname=gnucash
 pkgver=2.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A personal and small-business financial-accounting application"
 arch=('i686' 'x86_64')
 url="http://www.gnucash.org"
diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD
index 2fd9e4799..51531a917 100644
--- a/extra/gnumeric/PKGBUILD
+++ b/extra/gnumeric/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125165 2011-05-25 19:05:49Z foutrelis $
+# $Id: PKGBUILD 139544 2011-10-03 12:22:49Z jgc $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.10.15
-pkgrel=2
+pkgver=1.10.17
+pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/gnumeric/"
@@ -16,8 +16,8 @@ optdepends=('pygobject: for python plugin support'
             'yelp: for viewing the help manual')
 install=gnumeric.install
 options=('libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4343a8e72bd19380d83ab5d4937388b2327e0dbb6187296e66dc7ca2d2b9025a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('8f105a10dc0dd47e14df2879591d2f28482fd03809fa95977dd4d1470a02f963')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD
index 0352c9453..a7a8f4fe9 100644
--- a/extra/goffice/PKGBUILD
+++ b/extra/goffice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124493 2011-05-22 15:24:56Z ibiru $
+# $Id: PKGBUILD 139546 2011-10-03 12:22:52Z jgc $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=goffice
-pkgver=0.8.15
+pkgver=0.8.17
 pkgrel=1
 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
 arch=('i686' 'x86_64')
@@ -10,12 +10,16 @@ url="http://www.gnome.org"
 license=('GPL')
 options=('!libtool')
 depends=('gtk2' 'gconf' 'libgsf')
-makedepends=('pkgconfig' 'intltool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6a6ddf9821ff1547ef1977c276fa5a7c6842a1b4cb90c923d600283260aecf58')
+makedepends=('pkgconfig' 'intltool' 'gtk-doc')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+        use-apiver-for-dirs.patch)
+sha256sums=('165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15'
+            '4507a49f6ccb13e55c0b3cc6831b7e0dcec7badb58a3661190e843f8607fa270')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/use-apiver-for-dirs.patch"
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static
   make
diff --git a/extra/goffice/use-apiver-for-dirs.patch b/extra/goffice/use-apiver-for-dirs.patch
new file mode 100644
index 000000000..3d0909da3
--- /dev/null
+++ b/extra/goffice/use-apiver-for-dirs.patch
@@ -0,0 +1,32 @@
+--- configure.in.orig	2011-09-07 08:45:49.687783970 +0000
++++ configure.in	2011-09-07 09:12:55.709382840 +0000
+@@ -418,7 +418,7 @@
+ fi
+ 
+ dnl **************************************************
+-AC_SUBST(GETTEXT_PACKAGE, goffice-${VERSION})
++AC_SUBST(GETTEXT_PACKAGE, goffice-${GOFFICE_API_VER})
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+ 	[The package name, for gettext])
+ AM_GLIB_GNU_GETTEXT
+@@ -638,9 +638,9 @@
+ dnl ******************
+ dnl
+ dnl These are changed in goffice.c for WIN32 packages
+-AC_SUBST(goffice_datadir, '${datadir}/goffice/${VERSION}')
+-AC_SUBST(goffice_libdir, '${libdir}/goffice/${VERSION}')
+-AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${VERSION}')
++AC_SUBST(goffice_datadir, '${datadir}/goffice/${GOFFICE_API_VER}')
++AC_SUBST(goffice_libdir, '${libdir}/goffice/${GOFFICE_API_VER}')
++AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${GOFFICE_API_VER}')
+ AC_SUBST(goffice_localedir, '${prefix}/${DATADIRNAME}/locale')
+ dnl
+ AC_SUBST(goffice_plugindir, '${goffice_libdir}/plugins')
+--- libgoffice.pc.in.orig	2010-02-18 22:49:39.000000000 +0000
++++ libgoffice.pc.in	2011-09-07 09:18:53.655992532 +0000
+@@ -11,4 +11,4 @@
+ Libs.private: @EXTRA_LIBS@
+ Cflags: -I${includedir}/libgoffice-@GOFFICE_API_VER@ @EXTRA_INCLUDES@
+ 
+-PluginDir=${libdir}/goffice/@VERSION@/plugins
++PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins
diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD
index 0c352df2a..b57eefce4 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 139338 2011-10-01 18:58:50Z ibiru $
+# $Id: PKGBUILD 139613 2011-10-03 19:05:35Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=grilo-plugins
 pkgver=0.1.17
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugins for Grilo"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64')
 license=('LGPL')
 depends=('grilo')
-makedepends=('gupnp-av' 'libgdata' 'quvi' 'sqlite3' 'gmime' 'libgcrypt' 'rest')
+makedepends=('gupnp-av' 'libgdata' 'quvi' 'sqlite3' 'gmime' 'libgcrypt' 'rest' 'libtracker-sparql')
 optdepends=('gupnp-av: uPnP plugin'
             'libgdata: Youtube plugin'
             'quvi: Youtube plugin'
@@ -18,13 +18,18 @@ optdepends=('gupnp-av: uPnP plugin'
             'sqlite3: Bookmarks plugin'
             'sqlite3: Metadata store plugin'
             'libgcrypt: Vimeo plugin'
-            'rest: Blip.tv plugin')
+            'rest: Blip.tv plugin'
+            'libtracker-sparql: Tracker plugin')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('c77f70c02ab8a9abb7cddc909f90853d13e2a18d4b69db65a411082c3ef79b0a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # support tracker 0.12, already fixed in git master.
+  sed -i 's/sparql-0.11/sparql-0.12/g' configure
+
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
     --enable-shoutcast
   make
diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD
index e37c1ef09..aa78f6b01 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139341 2011-10-01 18:58:54Z ibiru $
+# $Id: PKGBUILD 139610 2011-10-03 19:05:04Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gssdp
-pkgver=0.10.0
+pkgver=0.12.0
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('libsoup')
 makedepends=('gobject-introspection' 'gtk2' 'gtk-doc')
 optdepends=('gtk2: gssdp-device-sniffer')
 options=('!libtool')
-source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz)
-sha256sums=('94de92bb4f7906ed2f047b0146a3b21d53d09908fe1f0149484f61c6afc598ea')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('7f02903989b4ac7cfb7508898706a5b4a01c9ace2f6345bd96bf8a3faa30ae1a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index a4f822080..0e60a45da 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139345 2011-10-01 18:59:03Z ibiru $
+# $Id: PKGBUILD 139599 2011-10-03 17:26:32Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The GTK+ Toolkit (v3)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -14,12 +14,15 @@ options=('!libtool' '!docs')
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-${pkgver}.tar.xz
-        settings.ini)
+        settings.ini
+        a11y.patch::http://git.gnome.org/browse/gtk+/patch/?id=e248c6812e8e33150d61074471ef0330668aed45)
 sha256sums=('bce3c1a9be6afd7552c795268656d8fdd09c299765a7faaf5a76498bb82ed44c'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
+            '0ae5f9c3553f9fc6c515343de96046c17544654936b17c09330443ed44778cb2')
 
 build() {
     cd "${srcdir}/gtk+-${pkgver}"
+    patch -Np1 -i "${srcdir}/a11y.patch"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD
index a2a49d388..16dcc2de5 100644
--- a/extra/gupnp-av/PKGBUILD
+++ b/extra/gupnp-av/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139358 2011-10-01 18:59:22Z ibiru $
+# $Id: PKGBUILD 139612 2011-10-03 19:05:21Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
 # Contributor: Denis Zawada <deno@rootnode.net>
 
 pkgname=gupnp-av
-pkgver=0.8.0
+pkgver=0.10.1
 pkgrel=1
 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ license=('LGPL')
 depends=('gupnp')
 makedepends=('gobject-introspection' 'gtk-doc')
 options=('!libtool')
-source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz)
-sha256sums=('e6aa032377488cedc4e347519bd30701c583780b7c54f00bab083f2316a93dc9')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('41aeb5d243426b293c315788b41bc79a2be1f466eeff114cf6c89a37140f507e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index 9fcb01a55..5c8810754 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139356 2011-10-01 18:59:21Z ibiru $
+# $Id: PKGBUILD 139611 2011-10-03 19:05:21Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gupnp
-pkgver=0.16.1
+pkgver=0.18.0
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('gssdp')
 makedepends=('gobject-introspection' 'gtk-doc')
 optdepends=('python2: gupnp-binding-tool')
 options=('!libtool')
-source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz)
-sha256sums=('f01a1f4fd36ce161a3df29fa83e1a0a2fb40d3c9f30f6b403e7791688ad24cfe')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('82f4758b26ef0531cf6301f526fe705f06c329eaef403bb30925128fcbb6a71a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -22,7 +22,7 @@ build() {
   sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
+              --disable-static --with-context-manager=linux
   make
 }
 
diff --git a/extra/liblrdf/PKGBUILD b/extra/liblrdf/PKGBUILD
index 17236fa71..49a0fe584 100644
--- a/extra/liblrdf/PKGBUILD
+++ b/extra/liblrdf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130976 2011-07-09 09:47:10Z andyrtr $
+# $Id: PKGBUILD 139617 2011-10-03 19:42:49Z jgc $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=liblrdf
 pkgver=0.4.0
-pkgrel=8
+pkgrel=9
 pkgdesc="A library for the manipulation of RDF file in LADSPA plugins"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/lrdf" #"http://sourceforge.net/projects/lrdf"
@@ -13,16 +13,19 @@ license=('GPL')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/lrdf/${pkgname}-${pkgver}.tar.gz
 	md5.patch
-	raptor2.diff)
+	raptor2.diff
+        pkgconfig-raptor.patch)
 groups=('ladspa-plugins')
 md5sums=('327a5674f671c4b360c6353800226877'
-         'a6d231d052dc188cbc4c1039cf3a2003'
-         '80e938469da06a178e03107ca5b41e55')
+         'a6d231d052dc188cbc4c1039cf3a2003' 
+         '80e938469da06a178e03107ca5b41e55'
+         '982ae1bd4b39c2fb5cba108fbcbfbad1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/md5.patch
-  patch -Np0 -i ${srcdir}/raptor2.diff
+  patch -Np1 -i "${srcdir}/md5.patch"
+  patch -Np0 -i "${srcdir}/raptor2.diff"
+  patch -Np1 -i "${srcdir}/pkgconfig-raptor.patch"
   autoreconf -vfi
   ./configure --prefix=/usr
   make
diff --git a/extra/liblrdf/pkgconfig-raptor.patch b/extra/liblrdf/pkgconfig-raptor.patch
new file mode 100644
index 000000000..c68f1f1b5
--- /dev/null
+++ b/extra/liblrdf/pkgconfig-raptor.patch
@@ -0,0 +1,9 @@
+--- liblrdf-0.4.0/lrdf.pc.in.orig	2011-10-03 19:28:16.702773254 +0000
++++ liblrdf-0.4.0/lrdf.pc.in	2011-10-03 19:28:43.003017477 +0000
+@@ -7,4 +7,5 @@
+ Version: @VERSION@
+ Description: liblrdf, a lightweight RDF library with extensions for LADSPA
+ Libs: -L${libdir} -llrdf
+-Cflags: -I${includedir} 
++Libs.private: @RAPTOR_LIBS@
++Cflags: @RAPTOR_CFLAGS@ -I${includedir} 
diff --git a/extra/libmowgli/PKGBUILD b/extra/libmowgli/PKGBUILD
index c00b18954..c9b11d1c0 100644
--- a/extra/libmowgli/PKGBUILD
+++ b/extra/libmowgli/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 119898 2011-04-16 22:56:08Z bisson $
+# $Id: PKGBUILD 139564 2011-10-03 13:29:22Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Brad Gordon <brad@rpgcyco.net>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libmowgli
-pkgver=0.9.50
+pkgver=0.9.95
 pkgrel=1
 pkgdesc='Performance and usability-oriented extensions to C'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url='http://www.atheme.org/project/mowgli'
 license=('custom')
 depends=('glibc')
 source=("http://distfiles.atheme.org/libmowgli-${pkgver}.tar.bz2")
-sha1sums=('51cac29a5670561e63dd9346820d61e6fd409e88')
+sha1sums=('50d32d4d84f2438382c203bd7c85adc976683c25')
 
 build() {
 	cd "${srcdir}/libmowgli-${pkgver}"
diff --git a/extra/mail-notification/PKGBUILD b/extra/mail-notification/PKGBUILD
index b5b1deeff..edb5a8d03 100644
--- a/extra/mail-notification/PKGBUILD
+++ b/extra/mail-notification/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 119734 2011-04-14 10:44:43Z jgc $
+# $Id: PKGBUILD 139560 2011-10-03 13:09:05Z jgc $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=mail-notification
 pkgver=5.4
-pkgrel=8
+pkgrel=9
 pkgdesc="Tray icon application that informs you if you have new mail"
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/mailnotify/"
 license=('GPL3' 'FDL')
-depends=('cyrus-sasl-plugins' 'gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome')
-makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils')
+depends=('gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome')
+makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils' 'gtk2')
 options=('!libtool' '!emptydirs')
 install=mail-notification.install
-source=(http://savannah.nongnu.org/download/mailnotify/${pkgname}-${pkgver}.tar.bz2
+source=(http://savannah.nongnu.org/download/mailnotify-orig/${pkgname}-${pkgver}.tar.bz2
         dont-update-cache.patch
         remove-ubuntu-special-case.patch
         mail-notification-5.4-evolution.patch
@@ -39,8 +39,8 @@ md5sums=('c8dc33a61251acb5474e56eab6b18f43'
          '31bde95dfd39449959d8b3316f91429c'
          'cdead6a88d1779f69a5f40dc75d5cb84'
          'c7991b831834724eddc1c6802c3e06a6'
-         '49fe910f68393b0f6a1f1bcb7a8bdcd3'
-         '55ed1aeb56ca053cc1a0a6062761c2b4'
+         'b370b1085ebb2814bd5d345a6d2b45ea'
+         '1ba948759110787dd57097cff157b75a'
          '09df61b4dc29c676ac81ff9054e840ac')
 
 build() {
diff --git a/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch b/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch
index 51a0eb519..51938b5fa 100644
--- a/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch
+++ b/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch
@@ -28,6 +28,18 @@
  #include <mail/em-event.h>
  #include <mail/mail-tools.h>
  #include "mn-evolution.h"
+@@ -240,7 +241,11 @@
+ 					       EMEventTargetFolder *folder)
+ {
+   if (evo_server)
++#if EDS_CHECK_VERSION(3,1,0)
++    mn_evolution_server_folder_changed(evo_server, e_mail_folder_uri_build(folder->store, folder->folder_name));
++#else
+     mn_evolution_server_folder_changed(evo_server, folder->uri);
++#endif
+ }
+ 
+ void
 @@ -249,10 +250,16 @@
  {
    if (evo_server)
@@ -38,7 +50,7 @@
 +#else
 +      char *url = mail_tools_folder_to_url(message->folder);
 +#endif
- 
+
 -      url = mail_tools_folder_to_url(message->folder);
        mn_evolution_server_message_reading(evo_server, url);
 +
@@ -68,3 +80,43 @@
  	if (folder)
  	  self_cache_folder(uri, folder);
  	else
+@@ -677,7 +681,12 @@
+     folder = self_lookup_folder(folder_uri, err);
+     if (folder)
+       {
++#if EDS_CHECK_VERSION(3,1,0)
++	*ret = g_strdup(camel_folder_get_display_name(folder));
++#else
+ 	*ret = g_strdup(camel_folder_get_name(folder));
++#endif
++
+ #if EDS_CHECK_VERSION(2,31,0)
+ 	g_object_unref(folder);
+ #else
+@@ -725,8 +734,12 @@
+ 	shell = e_shell_get_default ();
+ 	shell_backend = e_shell_get_backend_by_name (shell, "mail");
+ 
+-	browser = e_mail_browser_new (shell_backend);
++	browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend));
++#if EDS_CHECK_VERSION(3,1,0)
++	e_mail_reader_set_folder (E_MAIL_READER (browser), folder);
++#else
+ 	e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri);
++#endif
+ 	e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
+ 	gtk_widget_show (browser);
+ #else
+--- build/src/mn-evolution-folder-tree-server.c.orig	2011-06-17 22:01:49.226886994 +0200
++++ build/src/mn-evolution-folder-tree-server.c	2011-06-18 00:34:23.046889847 +0200
+@@ -444,7 +444,9 @@
+ {
+ #line 61 "src/mn-evolution-folder-tree-server.gob"
+ 	
+-#if EDS_CHECK_VERSION(2,91,0)
++#if EDS_CHECK_VERSION(3,1,0)
++    selfp->tree = em_folder_tree_new(NULL, NULL);
++#elif EDS_CHECK_VERSION(2,91,0)
+     selfp->session = e_mail_session_new();
+     selfp->tree = em_folder_tree_new(selfp->session);
+ #elif EDS_CHECK_VERSION(2,29,0)
diff --git a/extra/mail-notification/mail-notification-5.4-gtk3-support.patch b/extra/mail-notification/mail-notification-5.4-gtk3-support.patch
index cd19c2e84..6a29f8622 100644
--- a/extra/mail-notification/mail-notification-5.4-gtk3-support.patch
+++ b/extra/mail-notification/mail-notification-5.4-gtk3-support.patch
@@ -20,7 +20,7 @@
 +  jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-3.0 libgnome-2.0 >= 2.14.0 gnome-vfs-2.0 libxml-2.0 libnotify >= 0.4.1");
    jb_require_packages("D-Bus", "dbus", "dbus-glib-1");
  
-   jb_check_packages_for_options("GMime", "gmime", "gmime-2.4",
+   jb_check_packages_for_options("GMime", "gmime", "gmime-2.6",
 --- build/src/mn-file-chooser-button.c.orig	2011-02-02 23:38:01.503049512 +0100
 +++ build/src/mn-file-chooser-button.c	2011-02-02 23:38:16.988222034 +0100
 @@ -358,7 +358,7 @@
@@ -545,7 +545,7 @@
 +    int y;
 +
 +    gtk_widget_get_allocation(widget, &allocation);
-+    y = allocation.y;
++    y = 0;
  
 -    if (! GTK_WIDGET_DRAWABLE(widget))
 +    if (! gtk_widget_is_drawable(widget))
@@ -557,7 +557,7 @@
  	Row *row = g_ptr_array_index(selfp->rows, i);
  	int j;
 -	int x = widget->allocation.x;
-+	int x = allocation.x;
++	int x = 0;
  	int column = 0;
  
  	MN_ARRAY_FOREACH(j, row->cells)
@@ -587,6 +587,20 @@
  #line 109 "mn-tooltips.c"
  #line 308 "src/mn-tooltips.gob"
  static void mn_tooltips_draw_tips (MNTooltips * self);
+@@ -422,7 +422,13 @@
+ 	
+     if (! selfp->window)
+       {
++	GtkStyleContext *ctx;
++
+ 	selfp->window = gtk_window_new(GTK_WINDOW_POPUP);
++
++	ctx = gtk_widget_get_style_context(GTK_WIDGET(selfp->window));
++	gtk_style_context_add_class(ctx, "tooltip");
++
+ 	self_update_screen(self, TRUE);
+ 	gtk_widget_set_app_paintable(selfp->window, TRUE);
+ 	gtk_window_set_resizable(GTK_WINDOW(selfp->window), FALSE);
 @@ -430,7 +430,7 @@
  	gtk_container_set_border_width(GTK_CONTAINER(selfp->window), selfp->border_width);
  
@@ -614,23 +628,32 @@
  {
  #line 600 "mn-tooltips.c"
  #define __GOB_FUNCTION__ "MN:Tooltips::paint_window"
-@@ -608,13 +608,12 @@
+@@ -608,18 +608,13 @@
  	
      GtkRequisition req;
  
 -    gtk_widget_size_request(selfp->window, &req);
 -    gtk_paint_flat_box(selfp->window->style,
 -		       selfp->window->window,
-+    gtk_widget_size_request(GTK_WIDGET(selfp), &req);
-+    gtk_paint_flat_box(gtk_widget_get_style(GTK_WIDGET(selfp)),
-+		       cr,
- 		       GTK_STATE_NORMAL,
- 		       GTK_SHADOW_OUT,
- 		       NULL,
+-		       GTK_STATE_NORMAL,
+-		       GTK_SHADOW_OUT,
+-		       NULL,
 -		       selfp->window,
- 		       "tooltip",
- 		       0,
- 		       0,
+-		       "tooltip",
+-		       0,
+-		       0,
+-		       req.width,
+-		       req.height);
++    gtk_widget_size_request(GTK_WIDGET(selfp->window), &req);
++    gtk_render_background(gtk_widget_get_style_context(GTK_WIDGET(selfp->window)),
++                                                       cr,
++                                                       0,
++                                                       0,
++                                                       req.width,
++                                                       req.height);
+ 
+     return FALSE;
+   }}
 @@ -651,10 +650,11 @@
      gint monitor_num, px, py;
      GdkRectangle monitor;
@@ -1380,3 +1403,14 @@
  #include "mn-util.h"
  #include "mn-conf.h"
  #include "mn-shell.h"
+--- data/mail-notification.desktop.in.orig	2011-07-08 13:46:52.327548264 +0200
++++ data/mail-notification.desktop.in	2011-07-08 13:47:00.732704467 +0200
+@@ -5,7 +5,7 @@
+ _Comment=Get notified when new mail arrives
+ Type=Application
+ Categories=GNOME;GTK;Network;Email;
+-Exec=mail-notification --sm-disable
++Exec=mail-notification
+ Terminal=false
+ StartupNotify=true
+ X-GNOME-DocPath=mail-notification/mail-notification.xml
diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD
index bcf5e453d..e517de22b 100644
--- a/extra/midori/PKGBUILD
+++ b/extra/midori/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 134671 2011-08-07 11:28:53Z andyrtr $
+# $Id: PKGBUILD 139590 2011-10-03 14:23:27Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: rabyte <rabyte.at.gmail.dot.com>
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
 
 pkgname=midori
 pkgver=0.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 arch=('i686' 'x86_64')
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -14,11 +14,19 @@ install=midori.install
 depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss' 'sqlite3' 'glib2')
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
 optdepends=('vala: for use in extensions')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2)
-md5sums=('14aa14ccabf3d003903f1584dab15d7a')
+source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2
+	webkit_search.diff)
+md5sums=('14aa14ccabf3d003903f1584dab15d7a'
+         '293c026e1875145e0df9584e1ff2a70e')
+sha1sums=('c6d1d41f4e3c97bd2839235bd9d7b2a8a408c585'
+          '82bba447bc1aaeabf0ec95f3ddaf5c24dd27474c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  
+  # FS#26207
+  patch -Np1 -i ${srcdir}/webkit_search.diff
+  
   # python2 
   export PYTHON=/usr/bin/python2
   sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
diff --git a/extra/midori/webkit_search.diff b/extra/midori/webkit_search.diff
new file mode 100644
index 000000000..620cdc96f
--- /dev/null
+++ b/extra/midori/webkit_search.diff
@@ -0,0 +1,59 @@
+From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001
+From: Christian Dywan <christian@twotoasts.de>
+Date: Wed, 21 Sep 2011 21:50:51 +0000
+Subject: Use DOM API to get selected text in WebKitGTK+ 1.5.1
+
+Fixes: https://bugs.launchpad.net/midori/+bug/799603
+---
+diff --git a/midori/midori-view.c b/midori/midori-view.c
+index 0d7a96e..e426e7f 100644
+--- a/midori/midori-view.c
++++ b/midori/midori-view.c
+@@ -39,9 +39,11 @@
+     #include <sys/utsname.h>
+ #endif
+ 
++#if !WEBKIT_CHECK_VERSION (1, 5, 1)
+ /* This is unstable API, so we need to declare it */
+ gchar*
+ webkit_web_view_get_selected_text (WebKitWebView* web_view);
++#endif
+ 
+ static void
+ midori_view_construct_web_view (MidoriView* view);
+@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view)
+ gboolean
+ midori_view_has_selection (MidoriView* view)
+ {
++#if WEBKIT_CHECK_VERSION (1, 5, 1)
++    WebKitDOMDocument* doc;
++    WebKitDOMDOMWindow* window;
++    WebKitDOMDOMSelection* selection;
++    WebKitDOMRange* range;
++#endif
++
+     g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
+ 
++
++#if WEBKIT_CHECK_VERSION (1, 5, 1)
++    doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view));
++    window = webkit_dom_document_get_default_view (doc);
++    selection = webkit_dom_dom_window_get_selection (window);
++    if (selection == NULL)
++        return FALSE;
++
++    range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL);
++    if (range == NULL)
++        return FALSE;
++
++    katze_assign (view->selected_text, webkit_dom_range_get_text (range));
++#else
+     katze_assign (view->selected_text, webkit_web_view_get_selected_text (
+         WEBKIT_WEB_VIEW (view->web_view)));
++#endif
++
+     if (view->selected_text && *view->selected_text)
+         return TRUE;
+     else
+--
+cgit 
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index 59de81965..34d7c3c11 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139447 2011-10-01 19:01:50Z ibiru $
+# $Id: PKGBUILD 139536 2011-10-03 11:27:50Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.13
-pkgrel=2
+pkgver=0.9.14
+pkgrel=1
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64')
 url="http://upower.freedesktop.org"
@@ -13,7 +13,7 @@ makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection')
 replaces=('devicekit-power')
 options=('!libtool')
 source=($url/releases/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2c7dd2c26d11da628d68111d50eed51244a8337c1d0830addecd1372a7d44a22')
+sha256sums=('81eb44c0453b264a737d32f763a31d5b1776f050a47d5be85fc5e9caf874a4c5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index 97a0fd198..fc7ebe757 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=file-roller
 pkgname=file-roller-libre
-pkgver=3.0.2
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="Archive manipulator for GNOME"
 arch=('i686' 'x86_64')
@@ -23,8 +23,8 @@ conflicts=("$_pkgname")
 options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('00fc74269978b6e455fea97f22ba81b588bdf3e79548003b75f3328104b418b6')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/libre/file-roller-libre/file-roller.install b/libre/file-roller-libre/file-roller.install
index 182126c39..10a148241 100644
--- a/libre/file-roller-libre/file-roller.install
+++ b/libre/file-roller-libre/file-roller.install
@@ -20,4 +20,3 @@ post_upgrade() {
 post_remove() {
     post_install $1
 }
-
diff --git a/libre/file-roller-libre/rePKGBUILD b/libre/file-roller-libre/rePKGBUILD
index d94638df2..03652ec06 100644
--- a/libre/file-roller-libre/rePKGBUILD
+++ b/libre/file-roller-libre/rePKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 source PKGBUILD
-#CARCH=x86_64
+CARCH=x86_64
 unset build package md5sums source
 _repo=extra       # Put the repo here
 _mirror=ftp://ftp.archlinux.org # Put mirror here
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index af3a0250c..47cc99f42 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -21,7 +21,7 @@
 # * Disabled ContentHandlers and other Google/Yahoo! related services
 
 pkgname=icecat
-pkgver=6.0
+pkgver=7.0
 pkgrel=1
 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
 arch=('i686' 'x86_64' 'mips64el')
@@ -32,7 +32,7 @@ depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss>=3.12.10' 'libxt' 'libxrender'
          'lcms' 'nspr>=4.8.8' 'libevent' 'libpng' 'cairo')
 makedepends=('unzip' 'zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm'
              'mesa' 'autoconf2.13' 'gconf' 'xorg-server-xvfb')
-options=(!buildflags)
+options=(!buildflags !distcc)
 url="http://www.gnu.org/software/gnuzilla/"
 install=icecat.install
 source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
@@ -52,7 +52,7 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
 # Default options
         firefox.js
         region.properties)
-md5sums=('9b752e408717ccb50d50f0bafe18a552'
+md5sums=('f486a11f638e208b45b04c29d41de19b'
          'e7fe1de533599f4ae645ea1661e4006a'
          'e81ad01dbc16ba28bf92ba4b7c309ca7'
          'd93fe402b87cd000a869e1fd6badc6c9'
@@ -88,7 +88,7 @@ build() {
   sed -i 's/@PRE_RELEASE_SUFFIX@//g' \
       browser/base/content/browser.xul
 
-  export LDFLAGS="-Wl,-rpath,/usr/lib/icecat-$pkgver -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-$pkgver"
   export PYTHON="/usr/bin/python2"
 
   # PGO
diff --git a/libre/icecat/firefox-version.patch b/libre/icecat/firefox-version.patch
index 85a8fb18d..a72eab698 100644
--- a/libre/icecat/firefox-version.patch
+++ b/libre/icecat/firefox-version.patch
@@ -5,7 +5,7 @@ diff -Nur mozilla-2.0.orig//browser/installer/Makefile.in mozilla-2.0/browser/in
  
  include $(DEPTH)/config/autoconf.mk
  
-+MOZ_APP_VERSION="4.0"
++MOZ_APP_VERSION="7.0"
 +
  include $(topsrcdir)/config/rules.mk
  
diff --git a/multilib/lib32-gdk-pixbuf2/PKGBUILD b/multilib/lib32-gdk-pixbuf2/PKGBUILD
index 5aeb0f1bc..2e5826a1b 100644
--- a/multilib/lib32-gdk-pixbuf2/PKGBUILD
+++ b/multilib/lib32-gdk-pixbuf2/PKGBUILD
@@ -2,10 +2,10 @@
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 _pkgbasename=gdk-pixbuf2
 pkgname=lib32-$_pkgbasename
-pkgver=2.23.3
-pkgrel=1
+pkgver=2.24.0
+pkgrel=2
 pkgdesc="An image loading library for gtk2 (32-bit)"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.gtk.org/"
 license=('GPL2')
 depends=('lib32-glib2>=2.25.15'
@@ -14,8 +14,8 @@ depends=('lib32-glib2>=2.25.15'
 makedepends=(gcc-multilib)
 options=('!libtool' '!docs')
 install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/2.23/gdk-pixbuf-${pkgver}.tar.bz2)
-sha256sums=('9faba780151c02e13cb2029d512c975e9c41b98cd72de6d2cc50e4af10a5e76a')
+source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-${pkgver}.tar.bz2)
+md5sums=('d8ece3a4ade4a91c768328620e473ab8')
 
 build() {
   export CC="gcc -m32"
diff --git a/multilib/lib32-glib2/PKGBUILD b/multilib/lib32-glib2/PKGBUILD
index 8d06a14fc..3c9e3e1f8 100644
--- a/multilib/lib32-glib2/PKGBUILD
+++ b/multilib/lib32-glib2/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 51310 2011-07-06 22:35:51Z lcarlier $
+# $Id: PKGBUILD 56231 2011-10-03 15:46:17Z bluewind $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
 
 _pkgbasename=glib2
 pkgname=lib32-$_pkgbasename
-pkgver=2.28.8
+pkgver=2.30.0
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
 url="http://www.gtk.org/"
 arch=('x86_64')
 license=('LGPL')
-depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' $_pkgbasename)
-makedepends=('gcc-multilib')
+depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename)
+makedepends=('gcc-multilib' python2)
 options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.xz)
-sha256sums=('4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353')
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz)
+sha256sums=('d64c00b43409eabb89aad78501fcb1a992b002b314a4414a9bd069585cb7cdc1')
 
 build() {
   export CC="gcc -m32"
@@ -36,4 +36,5 @@ package() {
   cd "${pkgdir}"/usr/bin
   mv gio-querymodules gio-querymodules-32
   rm -f gdbus glib* gobject-query gsettings gtester*
+  rm -rf "$pkgdir"/usr/{bin/gdbus-codegen,lib32/gdbus-2.0}
 }
diff --git a/staging/gnome-color-manager/PKGBUILD b/staging/gnome-color-manager/PKGBUILD
new file mode 100644
index 000000000..078ccdffb
--- /dev/null
+++ b/staging/gnome-color-manager/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 139604 2011-10-03 18:33:27Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgname=gnome-color-manager
+pkgver=3.2.0
+pkgrel=2
+pkgdesc="Color profile manager for the GNOME desktop"
+arch=(i686 x86_64)
+url="http://projects.gnome.org/gnome-color-manager/"
+license=(GPL2)
+depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' 'mash')
+makedepends=('intltool' 'gtk-doc')
+install=gnome-color-manager.install
+options=('!libtool' '!emptydirs')
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('2d03a7c1f308ab6e2ad89acc39f1f8a67fd0ff1cf3435f5f2269f7a422209273')
+
+build(){
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # man pages need docbook-sgml, which we don't have
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var \
+      --libexecdir=/usr/lib/gnome-color-manager \
+      --disable-static --disable-man-pages
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/staging/gnome-color-manager/gnome-color-manager.install b/staging/gnome-color-manager/gnome-color-manager.install
new file mode 100644
index 000000000..04fda0ddc
--- /dev/null
+++ b/staging/gnome-color-manager/gnome-color-manager.install
@@ -0,0 +1,19 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall gnome-color-manager
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/staging/gthumb/PKGBUILD b/staging/gthumb/PKGBUILD
new file mode 100644
index 000000000..8e46803cc
--- /dev/null
+++ b/staging/gthumb/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 139528 2011-10-03 09:58:33Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Tobias Kieslich <tobias@justdreams.de>
+
+pkgname=gthumb
+pkgver=2.13.91
+pkgrel=2
+pkgdesc="Image browser and viewer for the GNOME Desktop"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://gthumb.sourceforge.net/"
+depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2')
+makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base')
+optdepends=('gstreamer0.10-base: video support')
+options=('!libtool' '!emptydirs')
+install=gthumb.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('b1f7686572829cf5cadae58e7d45e43a056f19929fd6d80d7ff9ac7c53bbfe90')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gthumb "${pkgdir}"/etc/gconf/schemas/*.schemas
+  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
+}
diff --git a/staging/gthumb/gthumb.install b/staging/gthumb/gthumb.install
new file mode 100644
index 000000000..6046ebb6f
--- /dev/null
+++ b/staging/gthumb/gthumb.install
@@ -0,0 +1,24 @@
+pkgname=gthumb
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD
new file mode 100644
index 000000000..847cedd6d
--- /dev/null
+++ b/staging/kdebase-runtime/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 139520 2011-10-03 08:17:47Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=kdebase-runtime
+pkgver=4.7.1
+pkgrel=2
+pkgdesc="KDE Base Runtime Environment"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL')
+depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
+        'xorg-xauth' 'hicolor-icon-theme')
+makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib')
+optdepends=('htdig: to build the search index in khelpcenter'
+            'rarian: needed by khelpcenter'
+            'gdb: drkonq crash handler')
+install="${pkgname}.install"
+source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2")
+sha1sums=('fc8da236bff699518b54b2fe6bcf8a518206b6e3')
+
+build() {
+    cd "${srcdir}"
+	mkdir build
+	cd build
+	cmake ../kde-runtime-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package() {
+	cd "$srcdir/build"
+	make DESTDIR="$pkgdir" install
+	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
+	ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
+}
diff --git a/staging/kdebase-runtime/kdebase-runtime.install b/staging/kdebase-runtime/kdebase-runtime.install
new file mode 100644
index 000000000..3f06b8deb
--- /dev/null
+++ b/staging/kdebase-runtime/kdebase-runtime.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/staging/kdegraphics-gwenview/PKGBUILD b/staging/kdegraphics-gwenview/PKGBUILD
new file mode 100644
index 000000000..dd0389248
--- /dev/null
+++ b/staging/kdegraphics-gwenview/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 139524 2011-10-03 08:19:21Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-gwenview
+pkgver=4.7.1
+pkgrel=2
+pkgdesc="A fast and easy to use image viewer for KDE"
+url="http://kde.org/applications/graphics/gwenview/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-lib' 'libkipi')
+makedepends=('cmake' 'automoc4')
+optdepends=('kipi-plugins: extra plugins to share photos')
+install=$pkgname.install
+source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2")
+sha1sums=('a58997d7e23f5708ff94d9198258dc0d6e82f8cf')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../gwenview-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/kdegraphics-gwenview/kdegraphics-gwenview.install b/staging/kdegraphics-gwenview/kdegraphics-gwenview.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/staging/kdegraphics-gwenview/kdegraphics-gwenview.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/staging/libkexiv2/PKGBUILD b/staging/libkexiv2/PKGBUILD
new file mode 100644
index 000000000..ebe551942
--- /dev/null
+++ b/staging/libkexiv2/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 139522 2011-10-03 08:18:29Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libkexiv2
+pkgver=4.7.1
+pkgrel=2
+pkgdesc="A library to manipulate pictures metadata"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('c1c1afb6c3928222eb33ce592d77dd6478aa4911')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/strigi/PKGBUILD b/staging/strigi/PKGBUILD
new file mode 100644
index 000000000..e05701d8b
--- /dev/null
+++ b/staging/strigi/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 139526 2011-10-03 08:19:55Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=strigi
+pkgver=0.7.5
+pkgrel=5
+pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
+arch=('i686' 'x86_64')
+url="http://www.vandenoever.info/software/strigi/"
+license=('GPL2')
+depends=('bzip2' 'exiv2' 'libxml2' 'boost-libs')
+makedepends=('qt' 'cmake' 'pkg-config' 'boost')
+optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file'
+            'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK')
+source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('0559e2ab65d187d30916e9ffe36e0fb6')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_INOTIFY=ON \
+    -DENABLE_LOG4CXX=OFF \
+    -DENABLE_FAM=OFF \
+    -DENABLE_CLUCENE=OFF \
+    -DENABLE_CLUCENE_NG=OFF \
+    -DENABLE_FFMPEG=OFF \
+    -DENABLE_XINE=OFF
+  make
+}
+
+package() {
+  cd "${srcdir}/build/libstreams"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/build/libstreamanalyzer"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/build/strigiclient/lib/searchclient/qtdbus"
+  make DESTDIR="${pkgdir}" install
+  
+  cd "${srcdir}/build/strigiutils"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/avidemux/PKGBUILD b/testing/avidemux/PKGBUILD
new file mode 100644
index 000000000..cde42dbd4
--- /dev/null
+++ b/testing/avidemux/PKGBUILD
@@ -0,0 +1,120 @@
+# $Id: PKGBUILD 139585 2011-10-03 14:22:38Z ibiru $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgbase=avidemux
+pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
+pkgver=2.5.5
+pkgrel=4
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://fixounet.free.fr/avidemux/"
+makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
+             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
+             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse')
+source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz
+        avidemux-2.5.4-x264-build115.patch)
+md5sums=('33bbe210c6826cea1987ed18a41d57a7'
+         '24a18b53a58b678b9e87d30566985751')
+
+build() {
+  cd "${srcdir}/${pkgbase}_${pkgver}"
+
+  patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.patch"
+
+  mkdir build
+  cd build
+  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..
+  make
+
+# plugin build expects libraries to be already installed; we fake a prefix
+# in build/ by symlinking all libraries to build/lib/
+  mkdir -p lib
+  cd lib
+  find ../avidemux -name '*.so*' | xargs ln -sft .
+  cd ../../plugins
+  mkdir build
+  cd build
+  cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \
+    -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \
+    -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \
+    -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON ..
+  make
+}
+
+package_avidemux-cli() {
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
+  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx')
+  optdepends=('lame: for the corresponding audio encoder plugin'
+              'faac: for the corresponding audio encoder plugin'
+              'faad2: for the corresponding audio decoder plugin'
+              'opencore-amr: for the corresponding audio decoder plugin'
+              'jack: for the corresponding audio device plugin'
+              'libpulse: for the corresponding audio device plugin'
+              'sdl: for the corresponding audio device plugin'
+              'x264: for the corresponding video encoder plugin'
+              'xvidcore: for the corresponding video encoder plugin')
+  provides=('avidemux')
+  conflicts=('avidemux')
+  replaces=('avidemux')
+
+  cd "${srcdir}/${pkgbase}_${pkgver}/build"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build"
+  make DESTDIR="${pkgdir}" install
+  rm -r "${pkgdir}"/usr/share/avidemux
+  rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
+  rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
+  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
+  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so
+  rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so
+
+  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
+  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
+
+  install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
+  install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
+}
+
+package_avidemux-gtk() {
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
+  depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
+  install=avidemux.install
+
+  cd "${srcdir}/${pkgbase}_${pkgver}"
+  install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
+
+  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
+  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
+
+  install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib"
+  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
+  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
+  install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
+
+  install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
+  sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
+}
+
+package_avidemux-qt() {
+  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
+  depends=("avidemux-cli=${pkgver}" 'qt' 'desktop-file-utils')
+  install=avidemux.install
+
+  cd "${srcdir}/${pkgbase}_${pkgver}"
+  install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
+  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
+  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
+
+  install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib"
+  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
+  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
+  install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
+
+  install -d "${pkgdir}/usr/share/avidemux/i18n"
+  install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
+
+  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+  sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+  sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+}
diff --git a/testing/avidemux/avidemux-2.5.4-x264-build115.patch b/testing/avidemux/avidemux-2.5.4-x264-build115.patch
new file mode 100644
index 000000000..c627667ec
--- /dev/null
+++ b/testing/avidemux/avidemux-2.5.4-x264-build115.patch
@@ -0,0 +1,45 @@
+diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:35:36.000000000 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:40:26.000000000 +0200
+@@ -488,8 +488,10 @@
+ 	printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
+ 	printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
+ 	printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ 	printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
++#elif X264_BUILD > 114
++	printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
+ #endif
+ 	printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
+ #if X264_BUILD > 88
+diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:35:36.000000000 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:43:36.000000000 +0200
+@@ -417,7 +417,7 @@
+ 	_param.b_cabac = cabac;
+ }
+ 
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ unsigned int x264Options::getOpenGopMode(void)
+ {
+ 	return _param.i_open_gop;
+@@ -428,6 +428,17 @@
+ 	if (openGopMode < 3)
+ 		_param.i_open_gop = openGopMode;
+ }
++#elif X264_BUILD > 114
++unsigned int x264Options::getOpenGopMode(void)
++{
++        return _param.b_open_gop;
++}
++ 
++void x264Options::setOpenGopMode(unsigned int openGopMode)
++{
++        if (openGopMode < 3)
++                _param.b_open_gop = openGopMode;
++}
+ #endif
+ 
+ unsigned int x264Options::getInterlaced(void)
diff --git a/testing/avidemux/avidemux.install b/testing/avidemux/avidemux.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/testing/avidemux/avidemux.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/testing/cyrus-sasl/0003_saslauthd_mdoc.patch b/testing/cyrus-sasl/0003_saslauthd_mdoc.patch
new file mode 100644
index 000000000..694f4bb67
--- /dev/null
+++ b/testing/cyrus-sasl/0003_saslauthd_mdoc.patch
@@ -0,0 +1,35 @@
+0003_saslauthd_mdoc.dpatch by  <fabbe@debian.org>
+
+Use the correct path for the saslauthd.conf file, and use another
+date format (cosmetic).
+
+diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc
+--- trunk~/saslauthd/saslauthd.mdoc	2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/saslauthd.mdoc	2006-07-12 15:05:25.000000000 +0300
+@@ -10,7 +10,7 @@
+ .\" manpage in saslauthd.8 whenever you change this source
+ .\" version. Only the pre-formatted manpage is installed.
+ .\"
+-.Dd 10 24 2002
++.Dd October 24 2002
+ .Dt SASLAUTHD 8
+ .Os "CMU-SASL"
+ .Sh NAME
+@@ -216,7 +216,7 @@
+ .Em (All platforms that support OpenLDAP 2.0 or higher)
+ .Pp
+ Authenticate against an ldap server.  The ldap configuration parameters are
+-read from /usr/local/etc/saslauthd.conf.  The location of this file can be
++read from /etc/saslauthd.conf.  The location of this file can be
+ changed with the -O parameter. See the LDAP_SASLAUTHD file included with the
+ distribution for the list of available parameters.
+ .It Li sia
+@@ -249,7 +249,7 @@
+ .Bl -tag -width "/var/run/saslauthd/mux"
+ .It Pa /var/run/saslauthd/mux
+ The default communications socket.
+-.It Pa /usr/local/etc/saslauthd.conf
++.It Pa /etc/saslauthd.conf
+ The default configuration file for ldap support.
+ .El
+ .Sh SEE ALSO
diff --git a/testing/cyrus-sasl/0010_maintainer_mode.patch b/testing/cyrus-sasl/0010_maintainer_mode.patch
new file mode 100644
index 000000000..cf3d02a08
--- /dev/null
+++ b/testing/cyrus-sasl/0010_maintainer_mode.patch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0010_maintainer_mode.dpatch by  <fabbe@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enable maintainer mode to avoid auto* problems.
+
+@DPATCH@
+diff -urNad trunk~/configure.in trunk/configure.in
+--- trunk~/configure.in	2006-05-29 22:52:46.000000000 +0300
++++ trunk/configure.in	2006-11-01 23:24:55.000000000 +0200
+@@ -62,6 +62,8 @@
+ AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22)
+ CMU_INIT_AUTOMAKE
+ 
++AM_MAINTAINER_MODE
++
+ # and include our config dir scripts
+ ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config"
+ 
diff --git a/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch b/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch
new file mode 100644
index 000000000..3805b4857
--- /dev/null
+++ b/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch
@@ -0,0 +1,15 @@
+0011_saslauthd_ac_prog_libtool.dpatch by  <fabbe@debian.org>
+
+Enable libtool use.
+
+diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in
+--- trunk~/saslauthd/configure.in	2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/configure.in	2006-11-01 23:41:51.000000000 +0200
+@@ -25,6 +25,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_LN_S
+ AC_PROG_INSTALL
++AC_PROG_LIBTOOL
+ 
+ dnl Checks for build foo
+ CMU_C___ATTRIBUTE__
diff --git a/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch b/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch
new file mode 100644
index 000000000..d50ec8343
--- /dev/null
+++ b/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch
@@ -0,0 +1,20 @@
+0012_xopen_crypt_prototype.dpatch by  <dannf@debian.org>
+
+When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h>
+will define a correct function prototype for the crypt function.
+This avoids segfaults on architectures where the size of a pointer
+is greater than the size of an integer (ia64 and amd64 are examples).
+This may be detected by looking for build log lines such as the
+following:
+auth_shadow.c:183: warning: implicit declaration of function ‘crypt’
+auth_shadow.c:183: warning: cast to pointer from integer of different
+size
+
+diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c
+--- trunk~/saslauthd/auth_shadow.c	2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/auth_shadow.c	2006-11-08 13:44:23.000000000 +0200
+@@ -1,3 +1,4 @@
++#define _XOPEN_SOURCE
+ #define PWBUFSZ 256 /***SWB***/
+ 
+ /* MODULE: auth_shadow */
diff --git a/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch b/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch
new file mode 100644
index 000000000..e9170cef3
--- /dev/null
+++ b/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch
@@ -0,0 +1,27 @@
+0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam@zoy.org>
+
+pid_file_lock is created with a mask of 644 instead of 0644.
+This patch fixes this octal/decimal confusion as well as the
+(harmless) one in the previous umask() call.
+
+diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c
+--- trunk~/saslauthd/saslauthd-main.c	2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/saslauthd-main.c	2007-06-26 12:07:10.000000000 +0300
+@@ -276,7 +276,7 @@
+ 		exit(1);
+ 	}
+ 
+-	umask(077);
++	umask(0077);
+ 
+ 	pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1;
+ 	if ((pid_file_lock = malloc(pid_file_size)) == NULL) {
+@@ -287,7 +287,7 @@
+ 	strlcpy(pid_file_lock, run_path, pid_file_size);
+ 	strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size);
+ 
+-	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) {
++	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) {
+ 		rc = errno;
+ 		logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock);
+ 		logger(L_ERR, L_FUNC, "open: %s", strerror(rc));
diff --git a/testing/cyrus-sasl/0018_auth_rimap_quotes.patch b/testing/cyrus-sasl/0018_auth_rimap_quotes.patch
new file mode 100644
index 000000000..13fa999f0
--- /dev/null
+++ b/testing/cyrus-sasl/0018_auth_rimap_quotes.patch
@@ -0,0 +1,35 @@
+0016_auth_rimap_quotes.dpatch by  <fabbe@debian.org>
+
+All lines beginning with `## DP:' are a description of the patch.
+Avoid infinite loop when username/password has a double quote character.
+Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13
+
+diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c
+--- etch~/saslauthd/auth_rimap.c	2007-03-29 15:16:20.000000000 +0300
++++ etch/saslauthd/auth_rimap.c	2008-02-13 13:42:53.000000000 +0200
+@@ -162,6 +162,7 @@
+     num_quotes = 0;
+     p1 = s;
+     while ((p1 = strchr(p1, '"')) != NULL) {
++	p1++;
+ 	num_quotes++;
+     }
+     
+@@ -438,7 +439,7 @@
+ 	syslog(LOG_WARNING, "auth_rimap: writev: %m");
+ 	memset(qlogin, 0, strlen(qlogin));
+ 	free(qlogin);
+-	memset(qpass, 0, strlen(qlogin));
++	memset(qpass, 0, strlen(qpass));
+ 	free(qpass);
+ 	(void)close(s);
+ 	return strdup(RESP_IERROR);
+@@ -447,7 +448,7 @@
+     /* don't need these any longer */
+     memset(qlogin, 0, strlen(qlogin));
+     free(qlogin);
+-    memset(qpass, 0, strlen(qlogin));
++    memset(qpass, 0, strlen(qpass));
+     free(qpass);
+ 
+     /* read and parse the LOGIN response */
diff --git a/testing/cyrus-sasl/0019_ldap_deprecated.patch b/testing/cyrus-sasl/0019_ldap_deprecated.patch
new file mode 100644
index 000000000..8825256cb
--- /dev/null
+++ b/testing/cyrus-sasl/0019_ldap_deprecated.patch
@@ -0,0 +1,22 @@
+0019_ldap_deprecated.dpatch by  dann frazier <dannf@debian.org>
+
+The function ldap_get_values, used in saslauthd/lak.c, is deprecated.
+Therefore, its prototype is not included by default when compiling
+against the ldap.h headers. As a result, the compiler cannot know the
+return type of the function at compile time, and will implicitly
+convert to a pointer. This has implications on 64-bit systems.
+This patch sets the deprecation mode on, so that the function prototype
+gets included when compiling.
+(Description by Fabian Fagerholm <fabbe@debian.org>)
+
+diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c
+--- trunk~/saslauthd/lak.c	2006-06-04 12:26:20.000000000 +0300
++++ trunk/saslauthd/lak.c	2008-02-15 14:32:11.000000000 +0200
+@@ -55,6 +55,7 @@
+ #include <openssl/des.h>
+ #endif
+ 
++#define LDAP_DEPRECATED 1
+ #include <ldap.h>
+ #include <lber.h>
+ #include <sasl.h>
diff --git a/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch b/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch
new file mode 100644
index 000000000..a49b553f0
--- /dev/null
+++ b/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch
@@ -0,0 +1,26 @@
+0022_gcc4.4_preprocessor_syntax.dpatch by  <fabbe@paniq.net>
+
+The #elif preprocessor directive requires a test condition.
+GCC 4.4 enforces this rule.
+
+diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c
+--- trunk~/plugins/digestmd5.c	2006-06-04 12:26:19.000000000 +0300
++++ trunk/plugins/digestmd5.c	2009-01-26 13:29:40.000000000 +0200
+@@ -2715,7 +2715,7 @@
+ 	"DIGEST-MD5",			/* mech_name */
+ #ifdef WITH_RC4
+ 	128,				/* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else 
+ 	1,
+@@ -4034,7 +4034,7 @@
+ 	"DIGEST-MD5",
+ #ifdef WITH_RC4				/* mech_name */
+ 	128,				/* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else
+ 	1,
diff --git a/testing/cyrus-sasl/0025_ld_as_needed.patch b/testing/cyrus-sasl/0025_ld_as_needed.patch
new file mode 100644
index 000000000..67b48b4a4
--- /dev/null
+++ b/testing/cyrus-sasl/0025_ld_as_needed.patch
@@ -0,0 +1,27 @@
+Author: Matthias Klose <doko@ubuntu.com>
+Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
+it.
+--- a/saslauthd/Makefile.am
++++ b/saslauthd/Makefile.am
+@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c
+ saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
+ saslauthd_LDADD	= @SASL_KRB_LIB@ \
+ 		  @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
+-		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
++		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
+ 
+ testsaslauthd_SOURCES = testsaslauthd.c utils.c
+ testsaslauthd_LDADD = @LIB_SOCKET@
+--- a/sasldb/Makefile.am
++++ b/sasldb/Makefile.am
+@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a
+ 
+ libsasldb_la_SOURCES = allockey.c sasldb.h
+ EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
+-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
+-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
+ 
+ # Prevent make dist stupidity
+ libsasldb_a_SOURCES =
diff --git a/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch b/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch
new file mode 100644
index 000000000..cc00867ef
--- /dev/null
+++ b/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch
@@ -0,0 +1,14 @@
+Author: Roberto C. Sanchez <roberto@connexer.com>
+Description: Drop gratuitous dependency on krb5support
+--- a/cmulocal/sasl2.m4
++++ b/cmulocal/sasl2.m4
+@@ -112,9 +112,6 @@ if test "$gssapi" != no; then
+   fi
+ 
+   if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
+-    # check for libkrb5support first
+-    AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
+-
+     gss_failed=0
+     AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
+                  ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
diff --git a/testing/cyrus-sasl/0027_db5_support.patch b/testing/cyrus-sasl/0027_db5_support.patch
new file mode 100644
index 000000000..522824074
--- /dev/null
+++ b/testing/cyrus-sasl/0027_db5_support.patch
@@ -0,0 +1,24 @@
+Author: Ondřej Surý <ondrej@debian.org>
+Description: Support newer Berkeley DB versions
+--- a/sasldb/db_berkeley.c
++++ b/sasldb/db_berkeley.c
+@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+--- a/utils/dbconverter-2.c
++++ b/utils/dbconverter-2.c
+@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch b/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch
new file mode 100644
index 000000000..14a322496
--- /dev/null
+++ b/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch
@@ -0,0 +1,134 @@
+--- a/lib/dlopen.c
++++ b/lib/dlopen.c
+@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi
+     return result;
+ }
+ 
+-/* this returns the file to actually open.
+- *  out should be a buffer of size PATH_MAX
+- *  and may be the same as in. */
+-
+-/* We'll use a static buffer for speed unless someone complains */
+-#define MAX_LINE 2048
+-
+-static int _parse_la(const char *prefix, const char *in, char *out) 
+-{
+-    FILE *file;
+-    size_t length;
+-    char line[MAX_LINE];
+-    char *ntmp = NULL;
+-
+-    if(!in || !out || !prefix || out == in) return SASL_BADPARAM;
+-
+-    /* Set this so we can detect failure */
+-    *out = '\0';
+-
+-    length = strlen(in);
+-
+-    if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) {
+-	if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) {
+-	    /* check for a .la file */
+-	    strcpy(line, prefix);
+-	    strcat(line, in);
+-	    length = strlen(line);
+-	    *(line + (length - strlen(SO_SUFFIX))) = '\0';
+-	    strcat(line, LA_SUFFIX);
+-	    file = fopen(line, "r");
+-	    if(file) {
+-		/* We'll get it on the .la open */
+-		fclose(file);
+-		return SASL_FAIL;
+-	    }
+-	}
+-	strcpy(out, prefix);
+-	strcat(out, in);
+-	return SASL_OK;
+-    }
+-
+-    strcpy(line, prefix);
+-    strcat(line, in);
+-
+-    file = fopen(line, "r");
+-    if(!file) {
+-	_sasl_log(NULL, SASL_LOG_WARN,
+-		  "unable to open LA file: %s", line);
+-	return SASL_FAIL;
+-    }
+-    
+-    while(!feof(file)) {
+-	if(!fgets(line, MAX_LINE, file)) break;
+-	if(line[strlen(line) - 1] != '\n') {
+-	    _sasl_log(NULL, SASL_LOG_WARN,
+-		      "LA file has too long of a line: %s", in);
+-	    return SASL_BUFOVER;
+-	}
+-	if(line[0] == '\n' || line[0] == '#') continue;
+-	if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) {
+-	    /* We found the line with the name in it */
+-	    char *end;
+-	    char *start;
+-	    size_t len;
+-	    end = strrchr(line, '\'');
+-	    if(!end) continue;
+-	    start = &line[sizeof("dlname=")-1];
+-	    len = strlen(start);
+-	    if(len > 3 && start[0] == '\'') {
+-		ntmp=&start[1];
+-		*end='\0';
+-		/* Do we have dlname="" ? */
+-		if(ntmp == end) {
+-		    _sasl_log(NULL, SASL_LOG_DEBUG,
+-			      "dlname is empty in .la file: %s", in);
+-		    return SASL_FAIL;
+-		}
+-		strcpy(out, prefix);
+-		strcat(out, ntmp);
+-	    }
+-	    break;
+-	}
+-    }
+-    if(ferror(file) || feof(file)) {
+-	_sasl_log(NULL, SASL_LOG_WARN,
+-		  "Error reading .la: %s\n", in);
+-	fclose(file);
+-	return SASL_FAIL;
+-    }
+-    fclose(file);
+-
+-    if(!(*out)) {
+-	_sasl_log(NULL, SASL_LOG_WARN,
+-		  "Could not find a dlname line in .la file: %s", in);
+-	return SASL_FAIL;
+-    }
+-
+-    return SASL_OK;
+-}
+ #endif /* DO_DLOPEN */
+ 
+ /* loads a plugin library */
+@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_
+ 		if (length + pos>=PATH_MAX) continue; /* too big */
+ 
+ 		if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)),
+-			   SO_SUFFIX)
+-		    && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)),
+-			   LA_SUFFIX))
++			   SO_SUFFIX))
+ 		    continue;
+ 
++		/* We only use .so files for loading plugins */
++
+ 		memcpy(name,dir->d_name,length);
+ 		name[length]='\0';
+ 
+-		result = _parse_la(prefix, name, tmp);
+-		if(result != SASL_OK)
+-		    continue;
+-		
++		/* Create full name with path */
++		strncpy(tmp, prefix, PATH_MAX);
++		strncat(tmp, name, PATH_MAX);
++
+ 		/* skip "lib" and cut off suffix --
+ 		   this only need be approximate */
+ 		strcpy(plugname, name + 3);
diff --git a/testing/cyrus-sasl/PKGBUILD b/testing/cyrus-sasl/PKGBUILD
new file mode 100644
index 000000000..b54f8c797
--- /dev/null
+++ b/testing/cyrus-sasl/PKGBUILD
@@ -0,0 +1,202 @@
+# $Id: PKGBUILD 139621 2011-10-03 19:56:54Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+# This package spans multiple repositories. 
+# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
+
+pkgbase=('cyrus-sasl')
+pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
+#pkgname=libsasl
+pkgver=2.1.23
+pkgrel=8
+pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
+arch=('i686' 'x86_64')
+url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
+license=('custom')
+options=('!makeflags' '!libtool')
+makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
+source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
+        cyrus-sasl-2.1.19-checkpw.c.patch
+        cyrus-sasl-2.1.22-crypt.patch
+        cyrus-sasl-2.1.22-qa.patch
+        cyrus-sasl-2.1.22-automake-1.10.patch
+        cyrus-sasl-2.1.23-authd-fix.patch
+        0003_saslauthd_mdoc.patch
+        0010_maintainer_mode.patch
+        0011_saslauthd_ac_prog_libtool.patch
+        0012_xopen_crypt_prototype.patch
+        0016_pid_file_lock_creation_mask.patch
+        0018_auth_rimap_quotes.patch
+        0019_ldap_deprecated.patch
+        0022_gcc4.4_preprocessor_syntax.patch
+        0025_ld_as_needed.patch
+        0026_drop_krb5support_dependency.patch
+        0027_db5_support.patch
+        0030-dont_use_la_files_for_opening_plugins.patch
+        saslauthd.conf.d
+        saslauthd)
+md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
+         'e27ddff076342e7a3041c4759817d04b'
+         'd7e6886e88af04d05f3dec7f0a59ccf7'
+         '79b8a5e8689989e2afd4b7bda595a7b1'
+         'f4131b077ddb5240b375d749162f1b7a'
+         'c7ad2c70c1ef814eb4b119f316c064f2'
+         'caeeac3feba19cbbd36e7345cc805600'
+         'f45d8b60e8f74dd7f7c2ec1665fa602a'
+         '9d93880514cb5ff5da969f1ceb64a661'
+         'dfdc052a7e678db9f687482c5d52f34e'
+         '4a09f6b24b91f8450892a78e378860da'
+         '213abe7c5dfe0d7f446992787da1e780'
+         '5a0321177ad30cb5518c8b6812e3961a'
+         '0c965748970eea29fa295524821d43f0'
+         '62bf892fe4d1df41ff748e91a1afaf67'
+         'b7848957357e7c02d6490102be496bf9'
+         'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
+         '8e7106f32e495e9ade69014fd1b3352a'
+         '49219af5641150edec288a3fdb65e7c1'
+         '75542f613185d5a90520ad0d7d926a20')
+
+build() {
+  cd "${srcdir}/cyrus-sasl-${pkgver}"
+  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch"
+  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch"
+  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch"
+  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch"
+  patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch"
+  patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch"
+  patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch"
+  patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch"
+  patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch"
+  patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch"
+  patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch"
+  patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch"
+  patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch"
+  patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch"
+  patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch"
+  patch -Np1 -i "${srcdir}/0027_db5_support.patch"
+  patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch"
+
+  rm -f config/config.guess config/config.sub 
+  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
+  rm -fr autom4te.cache
+  libtoolize -c
+  aclocal -I config -I cmulocal
+  automake -a -c
+  autoheader
+  autoconf
+
+  pushd saslauthd
+  rm -f config/config.guess config/config.sub 
+  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
+  rm -fr autom4te.cache
+  libtoolize -c
+  aclocal -I config -I ../cmulocal -I ../config
+  automake -a -c
+  autoheader
+  autoconf
+  popd
+
+  ./configure --prefix=/usr \
+      --mandir=/usr/share/man \
+      --infodir=/usr/share/info \
+      --disable-static \
+      --enable-shared \
+      --enable-alwaystrue \
+      --enable-checkapop \
+      --enable-cram \
+      --enable-digest \
+      --disable-otp \
+      --disable-srp \
+      --disable-srp-setpass \
+      --disable-krb4 \
+      --enable-gssapi \
+      --enable-auth-sasldb \
+      --enable-plain \
+      --enable-anon \
+      --enable-login \
+      --enable-ntlm \
+      --disable-passdss \
+      --enable-sql \
+      --enable-ldapdb \
+      --disable-macos-framework \
+      --with-pam \
+      --with-saslauthd=/var/run/saslauthd \
+      --with-ldap \
+      --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
+      --sysconfdir=/etc \
+      --with-devrandom=/dev/urandom
+  make
+}
+
+package_libsasl() {
+  pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library"
+  depends=('openssl')
+  conflicts=('cyrus-sasl-plugins')
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}"
+  for dir in include lib sasldb plugins utils; do
+    pushd ${dir}
+    make DESTDIR="${pkgdir}" install
+    popd
+  done
+  rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so*
+  rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so*
+  rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so*
+  install -m755 -d "${pkgdir}/usr/share/licenses/libsasl"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/"
+}
+
+package_cyrus-sasl() {
+  depends=("libsasl=${pkgver}-${pkgrel}")
+  pkgdesc="Cyrus saslauthd SASL authentication daemon"
+  backup=('etc/conf.d/saslauthd')
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/etc/rc.d"
+  install -m755 -d "${pkgdir}/etc/conf.d"
+  install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/"
+  install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/"
+}
+
+package_cyrus-sasl-gssapi() {
+  pkgdesc="GSSAPI authentication mechanism for Cyrus SASL"
+  depends=("libsasl=${pkgver}-${pkgrel}" 'krb5')
+  replaces=('cyrus-sasl-plugins')
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  install -m755 -d "${pkgdir}/usr/lib/sasl2"
+  cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/"
+}
+
+package_cyrus-sasl-ldap() {
+  pkgdesc="ldapdb auxprop module for Cyrus SASL"
+  depends=("libsasl=${pkgver}-${pkgrel}" 'libldap')
+  replaces=('cyrus-sasl-plugins')
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  install -m755 -d "${pkgdir}/usr/lib/sasl2"
+  cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/"
+}
+
+package_cyrus-sasl-sql() {
+  pkgdesc="SQL auxprop module for Cyrus SASL"
+  depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient')
+  replaces=('cyrus-sasl-plugins')
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  install -m755 -d "${pkgdir}/usr/lib/sasl2"
+  cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/"
+}
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch
new file mode 100644
index 000000000..f7bf44b79
--- /dev/null
+++ b/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch
@@ -0,0 +1,170 @@
+diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in
+--- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in	2004-07-02 21:40:15.000000000 +0200
++++ ./lib/Makefile.in	2004-09-07 13:21:22.746680576 +0200
+@@ -120,7 +120,7 @@
+ JAVA_TRUE = @JAVA_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = -lcrypt @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_CRYPT = @LIB_CRYPT@
+ LIB_DES = @LIB_DES@
+diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c
+--- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c	2004-03-17 14:58:13.000000000 +0100
++++ ./lib/checkpw.c	2004-09-07 13:21:12.645916147 +0200
+@@ -94,6 +94,23 @@
+ # endif
+ #endif
+ 
++/******************************
++ * crypt(3) patch start       *
++ ******************************/
++char *crypt(const char *key, const char *salt);
++
++/* cleartext password formats */
++#define PASSWORD_FORMAT_CLEARTEXT 1
++#define PASSWORD_FORMAT_CRYPT 2
++#define PASSWORD_FORMAT_CRYPTTRAD 3
++#define PASSWORD_SALT_BUF_LEN 22
++
++/* weeds out crypt(3) password's salt */
++int _sasl_get_salt (char *dest, char *src, int format);
++
++/******************************
++ * crypt(3) patch stop        *
++ ******************************/
+ 
+ /* we store the following secret to check plaintext passwords:
+  *
+@@ -143,7 +160,51 @@
+ 				       "*cmusaslsecretPLAIN",
+ 				       NULL };
+     struct propval auxprop_values[3];
+-    
++
++	/******************************
++	 * crypt(3) patch start       *
++	 * for password format check  *
++	 ******************************/
++    sasl_getopt_t *getopt;
++    void *context;
++    const char *p = NULL;
++	/**
++	 * MD5: 12 char salt
++	 * BLOWFISH: 16 char salt
++	 */
++	char salt[PASSWORD_SALT_BUF_LEN];
++	int password_format;
++
++	/* get password format from auxprop configuration */
++	if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) {
++		getopt(context, NULL, "password_format", &p, NULL);
++	}
++
++	/* set password format */
++	if (p) {
++		/*
++		memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN);
++		strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1));
++		*/
++		/* modern, modular crypt(3) */
++		if (strncmp(p, "crypt", 11) == 0)
++			password_format = PASSWORD_FORMAT_CRYPT;
++		/* traditional crypt(3) */
++		else if (strncmp(p, "crypt_trad", 11) == 0)
++			password_format = PASSWORD_FORMAT_CRYPTTRAD;
++		/* cleartext password */
++		else
++			password_format = PASSWORD_FORMAT_CLEARTEXT;
++	} else {
++		/* cleartext password */
++		password_format = PASSWORD_FORMAT_CLEARTEXT;
++	}
++
++	/******************************
++	 * crypt(3) patch stop        *
++	 * for password format check  *
++	 ******************************/
++
+     if (!conn || !userstr)
+ 	return SASL_BADPARAM;
+ 
+@@ -180,14 +241,31 @@
+ 	goto done;
+     }
+ 
+-    /* At the point this has been called, the username has been canonified
+-     * and we've done the auxprop lookup.  This should be easy. */
+-    if(auxprop_values[0].name
+-       && auxprop_values[0].values
+-       && auxprop_values[0].values[0]
+-       && !strcmp(auxprop_values[0].values[0], passwd)) {
+-	/* We have a plaintext version and it matched! */
+-	return SASL_OK;
++
++	/******************************
++	 * crypt(3) patch start       *
++	 ******************************/	
++
++	/* get salt */
++	_sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format);
++	
++	/* crypt(3)-ed password? */
++	if (password_format != PASSWORD_FORMAT_CLEARTEXT) {
++		/* compare password */
++		if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0)
++			return SASL_OK;
++		else
++			ret = SASL_BADAUTH;
++	}
++	else if (password_format == PASSWORD_FORMAT_CLEARTEXT) {
++		/* compare passwords */
++		if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0)
++			return SASL_OK;
++		else
++			ret = SASL_BADAUTH;
++	/******************************
++	 * crypt(3) patch stop        *
++	 ******************************/
+     } else if(auxprop_values[1].name
+ 	      && auxprop_values[1].values
+ 	      && auxprop_values[1].values[0]) {
+@@ -975,3 +1053,37 @@
+ #endif     
+     { NULL, NULL }
+ };
++
++/* weeds out crypt(3) password's salt */
++int _sasl_get_salt (char *dest, char *src, int format) {
++	int num;	/* how many characters is salt long? */
++	switch (format) {
++		case PASSWORD_FORMAT_CRYPT:
++			/* md5 crypt */
++			if (src[1] == '1')
++				num = 12;
++			/* blowfish crypt */
++			else if (src[1] == '2')
++				num = (src[1] == '2' && src[2] == 'a') ? 17 : 16;
++			/* traditional crypt */
++			else
++				num = 2;
++			break;
++	
++		case PASSWORD_FORMAT_CRYPTTRAD:
++			num = 2;
++			break;
++
++		default:
++			return 1;
++	}
++
++	/* destroy destination */
++	memset(dest, '\0', (num + 1));
++
++	/* copy salt to destination */
++	strncpy(dest, src, num);
++
++	return 1;
++}
++
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch
new file mode 100644
index 000000000..1294cb507
--- /dev/null
+++ b/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch
@@ -0,0 +1,11 @@
+--- saslauthd/configure.in.orig	2006-05-23 15:53:17.000000000 -0700
++++ saslauthd/configure.in	2006-05-23 15:53:33.000000000 -0700
+@@ -77,7 +77,7 @@
+   AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
+   SASL_DB_PATH_CHECK()
+   SASL_DB_CHECK()
+-  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
++  SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB"
+ fi
+ 
+ AC_ARG_ENABLE(httpform, [  --enable-httpform       enable HTTP form authentication [[no]] ],
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch
new file mode 100644
index 000000000..8cd71c0c5
--- /dev/null
+++ b/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch
@@ -0,0 +1,94 @@
+Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was
+originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building
+using automake 1.10.
+
+--- cyrus-sasl-2.1.22/plugins/Makefile.am		2006-05-17 18:46:16.000000000 +0200
++++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110		2007-02-16 15:42:07.000000000 +0100
+@@ -82,73 +82,73 @@
+ 	libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
+ 
+ libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
+-libplain_la_LDFLAGS = -version-info $(plain_version)
++libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version)
+ libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
+ 
+ libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources)
+-libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
++libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version)
+ libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libanonymous_la_LIBADD = $(COMPAT_OBJS)
+ 
+ libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources)
+-libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version)
++libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version)
+ libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS)
+ 
+ libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources)
+-libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
++libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version)
+ libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS)
+ 
+ libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources)
+-libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
++libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version)
+ libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libcrammd5_la_LIBADD = $(COMPAT_OBJS)
+ 
+ libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources)
+-libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
++libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version)
+ libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS)
+ 
+ liblogin_la_SOURCES = login.c login_init.c $(common_sources)
+-liblogin_la_LDFLAGS = -version-info $(login_version)
++liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version)
+ liblogin_la_DEPENDENCIES = $(COMPAT_OBJS)
+ liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
+ 
+ libsrp_la_SOURCES = srp.c srp_init.c $(common_sources)
+-libsrp_la_LDFLAGS = -version-info $(srp_version)
++libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version)
+ libsrp_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS)
+ 
+ libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources)
+-libotp_la_LDFLAGS = -version-info $(otp_version)
++libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version)
+ libotp_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS)
+ 
+ libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources)
+-libntlm_la_LDFLAGS = -version-info $(ntlm_version)
++libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version)
+ libntlm_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
+ 
+ libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources)
+-libpassdss_la_LDFLAGS = -version-info $(passdss_version)
++libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version)
+ libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS)
+ 
+ # Auxprop Plugins
+ libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
+-libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
++libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version)
+ libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
+ 
+ libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
+-libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
++libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version)
+ libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libldapdb_la_LIBADD = $(COMPAT_OBJS)
+ 
+ libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
+-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
++libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
+ libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libsql_la_LIBADD = $(COMPAT_OBJS)
+ 
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch
new file mode 100644
index 000000000..fd356327b
--- /dev/null
+++ b/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch
@@ -0,0 +1,71 @@
+http://bugs.gentoo.org/152544
+
+--- cyrus-sasl-2.1.22/lib/Makefile.am
++++ cyrus-sasl-2.1.22/lib/Makefile.am
+@@ -45,6 +45,7 @@ sasl_version = 2:22:0
+ 
+ INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
+ 
++AM_CFLAGS = -fPIC
+ EXTRA_DIST = windlopen.c staticopen.h NTMakefile
+ EXTRA_LIBRARIES = libsasl2.a
+ noinst_LIBRARIES = @SASL_STATIC_LIBS@
+--- cyrus-sasl-2.1.22/plugins/Makefile.am
++++ cyrus-sasl-2.1.22/plugins/Makefile.am
+@@ -63,6 +63,7 @@ srp_version = 2:22:0
+ 
+ INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
+ AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
++AM_CFLAGS = -fPIC
+ 
+ COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
+ 
+--- cyrus-sasl-2.1.22/sasldb/Makefile.am
++++ cyrus-sasl-2.1.22/sasldb/Makefile.am
+@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
+ 
+ extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
+ 
++AM_CFLAGS = -fPIC
+ EXTRA_DIST = NTMakefile
+ 
+ noinst_LTLIBRARIES = libsasldb.la
+--- cyrus-sasl-2.1.22/utils/Makefile.am
++++ cyrus-sasl-2.1.22/utils/Makefile.am
+@@ -42,7 +42,7 @@
+ #
+ ################################################################
+ 
+-all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
++all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT)
+ all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
+ 
+ sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer
+--- cyrus-sasl-2.1.22/sample/Makefile.am
++++ cyrus-sasl-2.1.22/sample/Makefile.am
+@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c
+ server_SOURCES = server.c common.c common.h
+ client_SOURCES = client.c common.c common.h
+ 
+-server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
+-client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
++server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
++client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
+ 
+-sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
+-sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
++sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
++sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
+ 
+ EXTRA_DIST = NTMakefile
+--- cyrus-sasl-2.1.22/lib/Makefile.am
++++ cyrus-sasl-2.1.22/lib/Makefile.am
+@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la
+ libsasl2_la_SOURCES = $(common_sources) $(common_headers)
+ libsasl2_la_LDFLAGS = -version-info $(sasl_version)
+ libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
+-libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
++libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT)
+ 
+ if MACOSX
+ framedir = /Library/Frameworks/SASL2.framework
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch
new file mode 100644
index 000000000..4f7b04f13
--- /dev/null
+++ b/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch
@@ -0,0 +1,22 @@
+fix missing prototype warnings
+
+--- cyrus-sasl-2.1.22/lib/auxprop.c
++++ cyrus-sasl-2.1.22/lib/auxprop.c
+@@ -43,6 +43,7 @@
+  */
+ 
+ #include <config.h>
++#include <stdio.h>
+ #include <sasl.h>
+ #include <prop.h>
+ #include <ctype.h>
+--- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
++++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
+@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF
+ ******************************************************************/
+ 
+ #include <shadow.h>
++#include <string.h>
+ 
+ extern char *crypt();
+ 
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch
new file mode 100644
index 000000000..f5f372d17
--- /dev/null
+++ b/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch
@@ -0,0 +1,28 @@
+fix warnings:
+
+auth_sasldb.c: In function ‘auth_sasldb’:
+auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’
+
+auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type
+../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’
+
+--- saslauthd/auth_sasldb.c
++++ saslauthd/auth_sasldb.c
+@@ -41,6 +41,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <pwd.h>
++#include <unistd.h>
+ /* END PUBLIC DEPENDENCIES */
+ 
+ #define RETURN(x) return strdup(x)
+@@ -131,7 +132,8 @@
+     /* VARIABLES */
+     char pw[1024];			/* pointer to passwd file entry */
+     sasl_utils_t utils;
+-    int ret, outsize;
++    int ret;
++    size_t outsize;
+     const char *use_realm;
+     char realm_buf[MAXHOSTNAMELEN];
+     /* END VARIABLES */
diff --git a/testing/cyrus-sasl/saslauthd b/testing/cyrus-sasl/saslauthd
new file mode 100644
index 000000000..6afafae0b
--- /dev/null
+++ b/testing/cyrus-sasl/saslauthd
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# source application-specific settings
+[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DAEMON_NAME="saslauthd"
+SASLAUTHD_BIN=/usr/sbin/saslauthd
+SASLAUTHD_RUN=/var/run/saslauthd
+SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid
+
+case "$1" in
+  start)
+    stat_busy "Starting $DAEMON_NAME"
+    [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd
+    if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then
+      add_daemon $DAEMON_NAME
+      stat_done
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping $DAEMON_NAME"
+    [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm_daemon $DAEMON_NAME
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
+# vim: ts=2 sw=2 et ft=sh
diff --git a/testing/cyrus-sasl/saslauthd.conf.d b/testing/cyrus-sasl/saslauthd.conf.d
new file mode 100644
index 000000000..167211290
--- /dev/null
+++ b/testing/cyrus-sasl/saslauthd.conf.d
@@ -0,0 +1 @@
+SASLAUTHD_OPTS="-a pam"
diff --git a/testing/fakeroot/PKGBUILD b/testing/fakeroot/PKGBUILD
new file mode 100644
index 000000000..2e84ce9c0
--- /dev/null
+++ b/testing/fakeroot/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 139541 2011-10-03 12:19:54Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Jochem Kossen <j.kossen@home.nl>
+
+pkgname=fakeroot
+pkgver=1.18.1
+pkgrel=1
+pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://packages.debian.org/fakeroot"
+groups=('base-devel')
+install=fakeroot.install
+depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
+options=('!libtool')
+source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2)
+md5sums=('8eedda3dcb71b6ab6f62297b82ae5ac6')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \
+              --disable-static --with-ipc=sysv
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
+
+  install -dm755 ${pkgdir}/etc/ld.so.conf.d/
+  echo '/usr/lib/libfakeroot' > ${pkgdir}/etc/ld.so.conf.d/fakeroot.conf
+
+  # install README for sysv/tcp usage
+  install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README
+}
diff --git a/testing/fakeroot/fakeroot.install b/testing/fakeroot/fakeroot.install
new file mode 100644
index 000000000..986c91b06
--- /dev/null
+++ b/testing/fakeroot/fakeroot.install
@@ -0,0 +1,14 @@
+post_install() {
+  sbin/ldconfig -r .
+}
+
+post_upgrade() {
+  if [ "$(vercmp $2 1.14.4-2)" -lt 0 ]; then
+    sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf
+  fi
+  sbin/ldconfig -r .
+}
+
+pre_remove() {
+  sbin/ldconfig -r .
+}
diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD
new file mode 100644
index 000000000..2b4de898e
--- /dev/null
+++ b/testing/ffmpeg/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 139579 2011-10-03 14:22:30Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Paul Mattal <paul@archlinux.org>
+
+pkgname=ffmpeg
+pkgver=20111003
+pkgrel=1
+pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
+arch=('i686' 'x86_64')
+url="http://ffmpeg.org/"
+license=('GPL')
+depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump')
+makedepends=('yasm' 'git')
+#git clone git://git.videolan.org/ffmpeg.git
+source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
+md5sums=('38139817bee918a5664c549adb487468')
+
+build() {
+  cd "$srcdir/$pkgname"
+
+  ./configure \
+    --prefix=/usr \
+    --enable-libmp3lame \
+    --enable-libvorbis \
+    --enable-libxvid \
+    --enable-libx264 \
+    --enable-libvpx \
+    --enable-libtheora \
+    --enable-postproc \
+    --enable-shared \
+    --enable-x11grab \
+    --enable-libopencore_amrnb \
+    --enable-libopencore_amrwb \
+    --enable-libschroedinger \
+    --enable-libopenjpeg \
+    --enable-librtmp \
+    --enable-gpl \
+    --enable-version3 \
+    --enable-runtime-cpudetect \
+    --disable-debug
+
+  make
+  make tools/qt-faststart
+  make doc/ff{mpeg,play,server}.1
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+  make DESTDIR="$pkgdir" install install-man
+  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/gstreamer0.10-ugly/PKGBUILD b/testing/gstreamer0.10-ugly/PKGBUILD
new file mode 100644
index 000000000..75c57e041
--- /dev/null
+++ b/testing/gstreamer0.10-ugly/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 139587 2011-10-03 14:22:40Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gstreamer0.10-ugly
+pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
+pkgver=0.10.18
+pkgrel=3
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
+url="http://gstreamer.freedesktop.org/"
+options=(!libtool)
+source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2)
+md5sums=('04a7009a4efea2844075949c111f5e4d')
+
+build() {
+  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-experimental \
+    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
+    --with-package-origin="http://www.archlinux.org/"
+  make
+  sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
+}
+
+package_gstreamer0.10-ugly() {
+  pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
+  depends=('gstreamer0.10-base>=0.10.34')
+  
+  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
+package_gstreamer0.10-ugly-plugins() {
+  pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
+  depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
+  groups=('gstreamer0.10-plugins')
+  replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
+  conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
+
+  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+  make -C ext DESTDIR="${pkgdir}" install
+}
diff --git a/testing/libsasl/0003_saslauthd_mdoc.patch b/testing/libsasl/0003_saslauthd_mdoc.patch
new file mode 100644
index 000000000..694f4bb67
--- /dev/null
+++ b/testing/libsasl/0003_saslauthd_mdoc.patch
@@ -0,0 +1,35 @@
+0003_saslauthd_mdoc.dpatch by  <fabbe@debian.org>
+
+Use the correct path for the saslauthd.conf file, and use another
+date format (cosmetic).
+
+diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc
+--- trunk~/saslauthd/saslauthd.mdoc	2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/saslauthd.mdoc	2006-07-12 15:05:25.000000000 +0300
+@@ -10,7 +10,7 @@
+ .\" manpage in saslauthd.8 whenever you change this source
+ .\" version. Only the pre-formatted manpage is installed.
+ .\"
+-.Dd 10 24 2002
++.Dd October 24 2002
+ .Dt SASLAUTHD 8
+ .Os "CMU-SASL"
+ .Sh NAME
+@@ -216,7 +216,7 @@
+ .Em (All platforms that support OpenLDAP 2.0 or higher)
+ .Pp
+ Authenticate against an ldap server.  The ldap configuration parameters are
+-read from /usr/local/etc/saslauthd.conf.  The location of this file can be
++read from /etc/saslauthd.conf.  The location of this file can be
+ changed with the -O parameter. See the LDAP_SASLAUTHD file included with the
+ distribution for the list of available parameters.
+ .It Li sia
+@@ -249,7 +249,7 @@
+ .Bl -tag -width "/var/run/saslauthd/mux"
+ .It Pa /var/run/saslauthd/mux
+ The default communications socket.
+-.It Pa /usr/local/etc/saslauthd.conf
++.It Pa /etc/saslauthd.conf
+ The default configuration file for ldap support.
+ .El
+ .Sh SEE ALSO
diff --git a/testing/libsasl/0010_maintainer_mode.patch b/testing/libsasl/0010_maintainer_mode.patch
new file mode 100644
index 000000000..cf3d02a08
--- /dev/null
+++ b/testing/libsasl/0010_maintainer_mode.patch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0010_maintainer_mode.dpatch by  <fabbe@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enable maintainer mode to avoid auto* problems.
+
+@DPATCH@
+diff -urNad trunk~/configure.in trunk/configure.in
+--- trunk~/configure.in	2006-05-29 22:52:46.000000000 +0300
++++ trunk/configure.in	2006-11-01 23:24:55.000000000 +0200
+@@ -62,6 +62,8 @@
+ AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22)
+ CMU_INIT_AUTOMAKE
+ 
++AM_MAINTAINER_MODE
++
+ # and include our config dir scripts
+ ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config"
+ 
diff --git a/testing/libsasl/0011_saslauthd_ac_prog_libtool.patch b/testing/libsasl/0011_saslauthd_ac_prog_libtool.patch
new file mode 100644
index 000000000..3805b4857
--- /dev/null
+++ b/testing/libsasl/0011_saslauthd_ac_prog_libtool.patch
@@ -0,0 +1,15 @@
+0011_saslauthd_ac_prog_libtool.dpatch by  <fabbe@debian.org>
+
+Enable libtool use.
+
+diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in
+--- trunk~/saslauthd/configure.in	2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/configure.in	2006-11-01 23:41:51.000000000 +0200
+@@ -25,6 +25,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_LN_S
+ AC_PROG_INSTALL
++AC_PROG_LIBTOOL
+ 
+ dnl Checks for build foo
+ CMU_C___ATTRIBUTE__
diff --git a/testing/libsasl/0012_xopen_crypt_prototype.patch b/testing/libsasl/0012_xopen_crypt_prototype.patch
new file mode 100644
index 000000000..d50ec8343
--- /dev/null
+++ b/testing/libsasl/0012_xopen_crypt_prototype.patch
@@ -0,0 +1,20 @@
+0012_xopen_crypt_prototype.dpatch by  <dannf@debian.org>
+
+When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h>
+will define a correct function prototype for the crypt function.
+This avoids segfaults on architectures where the size of a pointer
+is greater than the size of an integer (ia64 and amd64 are examples).
+This may be detected by looking for build log lines such as the
+following:
+auth_shadow.c:183: warning: implicit declaration of function ‘crypt’
+auth_shadow.c:183: warning: cast to pointer from integer of different
+size
+
+diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c
+--- trunk~/saslauthd/auth_shadow.c	2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/auth_shadow.c	2006-11-08 13:44:23.000000000 +0200
+@@ -1,3 +1,4 @@
++#define _XOPEN_SOURCE
+ #define PWBUFSZ 256 /***SWB***/
+ 
+ /* MODULE: auth_shadow */
diff --git a/testing/libsasl/0016_pid_file_lock_creation_mask.patch b/testing/libsasl/0016_pid_file_lock_creation_mask.patch
new file mode 100644
index 000000000..e9170cef3
--- /dev/null
+++ b/testing/libsasl/0016_pid_file_lock_creation_mask.patch
@@ -0,0 +1,27 @@
+0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam@zoy.org>
+
+pid_file_lock is created with a mask of 644 instead of 0644.
+This patch fixes this octal/decimal confusion as well as the
+(harmless) one in the previous umask() call.
+
+diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c
+--- trunk~/saslauthd/saslauthd-main.c	2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/saslauthd-main.c	2007-06-26 12:07:10.000000000 +0300
+@@ -276,7 +276,7 @@
+ 		exit(1);
+ 	}
+ 
+-	umask(077);
++	umask(0077);
+ 
+ 	pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1;
+ 	if ((pid_file_lock = malloc(pid_file_size)) == NULL) {
+@@ -287,7 +287,7 @@
+ 	strlcpy(pid_file_lock, run_path, pid_file_size);
+ 	strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size);
+ 
+-	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) {
++	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) {
+ 		rc = errno;
+ 		logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock);
+ 		logger(L_ERR, L_FUNC, "open: %s", strerror(rc));
diff --git a/testing/libsasl/0018_auth_rimap_quotes.patch b/testing/libsasl/0018_auth_rimap_quotes.patch
new file mode 100644
index 000000000..13fa999f0
--- /dev/null
+++ b/testing/libsasl/0018_auth_rimap_quotes.patch
@@ -0,0 +1,35 @@
+0016_auth_rimap_quotes.dpatch by  <fabbe@debian.org>
+
+All lines beginning with `## DP:' are a description of the patch.
+Avoid infinite loop when username/password has a double quote character.
+Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13
+
+diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c
+--- etch~/saslauthd/auth_rimap.c	2007-03-29 15:16:20.000000000 +0300
++++ etch/saslauthd/auth_rimap.c	2008-02-13 13:42:53.000000000 +0200
+@@ -162,6 +162,7 @@
+     num_quotes = 0;
+     p1 = s;
+     while ((p1 = strchr(p1, '"')) != NULL) {
++	p1++;
+ 	num_quotes++;
+     }
+     
+@@ -438,7 +439,7 @@
+ 	syslog(LOG_WARNING, "auth_rimap: writev: %m");
+ 	memset(qlogin, 0, strlen(qlogin));
+ 	free(qlogin);
+-	memset(qpass, 0, strlen(qlogin));
++	memset(qpass, 0, strlen(qpass));
+ 	free(qpass);
+ 	(void)close(s);
+ 	return strdup(RESP_IERROR);
+@@ -447,7 +448,7 @@
+     /* don't need these any longer */
+     memset(qlogin, 0, strlen(qlogin));
+     free(qlogin);
+-    memset(qpass, 0, strlen(qlogin));
++    memset(qpass, 0, strlen(qpass));
+     free(qpass);
+ 
+     /* read and parse the LOGIN response */
diff --git a/testing/libsasl/0019_ldap_deprecated.patch b/testing/libsasl/0019_ldap_deprecated.patch
new file mode 100644
index 000000000..8825256cb
--- /dev/null
+++ b/testing/libsasl/0019_ldap_deprecated.patch
@@ -0,0 +1,22 @@
+0019_ldap_deprecated.dpatch by  dann frazier <dannf@debian.org>
+
+The function ldap_get_values, used in saslauthd/lak.c, is deprecated.
+Therefore, its prototype is not included by default when compiling
+against the ldap.h headers. As a result, the compiler cannot know the
+return type of the function at compile time, and will implicitly
+convert to a pointer. This has implications on 64-bit systems.
+This patch sets the deprecation mode on, so that the function prototype
+gets included when compiling.
+(Description by Fabian Fagerholm <fabbe@debian.org>)
+
+diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c
+--- trunk~/saslauthd/lak.c	2006-06-04 12:26:20.000000000 +0300
++++ trunk/saslauthd/lak.c	2008-02-15 14:32:11.000000000 +0200
+@@ -55,6 +55,7 @@
+ #include <openssl/des.h>
+ #endif
+ 
++#define LDAP_DEPRECATED 1
+ #include <ldap.h>
+ #include <lber.h>
+ #include <sasl.h>
diff --git a/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch b/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch
new file mode 100644
index 000000000..a49b553f0
--- /dev/null
+++ b/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch
@@ -0,0 +1,26 @@
+0022_gcc4.4_preprocessor_syntax.dpatch by  <fabbe@paniq.net>
+
+The #elif preprocessor directive requires a test condition.
+GCC 4.4 enforces this rule.
+
+diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c
+--- trunk~/plugins/digestmd5.c	2006-06-04 12:26:19.000000000 +0300
++++ trunk/plugins/digestmd5.c	2009-01-26 13:29:40.000000000 +0200
+@@ -2715,7 +2715,7 @@
+ 	"DIGEST-MD5",			/* mech_name */
+ #ifdef WITH_RC4
+ 	128,				/* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else 
+ 	1,
+@@ -4034,7 +4034,7 @@
+ 	"DIGEST-MD5",
+ #ifdef WITH_RC4				/* mech_name */
+ 	128,				/* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else
+ 	1,
diff --git a/testing/libsasl/0025_ld_as_needed.patch b/testing/libsasl/0025_ld_as_needed.patch
new file mode 100644
index 000000000..67b48b4a4
--- /dev/null
+++ b/testing/libsasl/0025_ld_as_needed.patch
@@ -0,0 +1,27 @@
+Author: Matthias Klose <doko@ubuntu.com>
+Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
+it.
+--- a/saslauthd/Makefile.am
++++ b/saslauthd/Makefile.am
+@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c
+ saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
+ saslauthd_LDADD	= @SASL_KRB_LIB@ \
+ 		  @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
+-		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
++		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
+ 
+ testsaslauthd_SOURCES = testsaslauthd.c utils.c
+ testsaslauthd_LDADD = @LIB_SOCKET@
+--- a/sasldb/Makefile.am
++++ b/sasldb/Makefile.am
+@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a
+ 
+ libsasldb_la_SOURCES = allockey.c sasldb.h
+ EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
+-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
+-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
+ 
+ # Prevent make dist stupidity
+ libsasldb_a_SOURCES =
diff --git a/testing/libsasl/0026_drop_krb5support_dependency.patch b/testing/libsasl/0026_drop_krb5support_dependency.patch
new file mode 100644
index 000000000..cc00867ef
--- /dev/null
+++ b/testing/libsasl/0026_drop_krb5support_dependency.patch
@@ -0,0 +1,14 @@
+Author: Roberto C. Sanchez <roberto@connexer.com>
+Description: Drop gratuitous dependency on krb5support
+--- a/cmulocal/sasl2.m4
++++ b/cmulocal/sasl2.m4
+@@ -112,9 +112,6 @@ if test "$gssapi" != no; then
+   fi
+ 
+   if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
+-    # check for libkrb5support first
+-    AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
+-
+     gss_failed=0
+     AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
+                  ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
diff --git a/testing/libsasl/0027_db5_support.patch b/testing/libsasl/0027_db5_support.patch
new file mode 100644
index 000000000..522824074
--- /dev/null
+++ b/testing/libsasl/0027_db5_support.patch
@@ -0,0 +1,24 @@
+Author: Ondřej Surý <ondrej@debian.org>
+Description: Support newer Berkeley DB versions
+--- a/sasldb/db_berkeley.c
++++ b/sasldb/db_berkeley.c
+@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+--- a/utils/dbconverter-2.c
++++ b/utils/dbconverter-2.c
+@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/testing/libsasl/0030-dont_use_la_files_for_opening_plugins.patch b/testing/libsasl/0030-dont_use_la_files_for_opening_plugins.patch
new file mode 100644
index 000000000..14a322496
--- /dev/null
+++ b/testing/libsasl/0030-dont_use_la_files_for_opening_plugins.patch
@@ -0,0 +1,134 @@
+--- a/lib/dlopen.c
++++ b/lib/dlopen.c
+@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi
+     return result;
+ }
+ 
+-/* this returns the file to actually open.
+- *  out should be a buffer of size PATH_MAX
+- *  and may be the same as in. */
+-
+-/* We'll use a static buffer for speed unless someone complains */
+-#define MAX_LINE 2048
+-
+-static int _parse_la(const char *prefix, const char *in, char *out) 
+-{
+-    FILE *file;
+-    size_t length;
+-    char line[MAX_LINE];
+-    char *ntmp = NULL;
+-
+-    if(!in || !out || !prefix || out == in) return SASL_BADPARAM;
+-
+-    /* Set this so we can detect failure */
+-    *out = '\0';
+-
+-    length = strlen(in);
+-
+-    if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) {
+-	if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) {
+-	    /* check for a .la file */
+-	    strcpy(line, prefix);
+-	    strcat(line, in);
+-	    length = strlen(line);
+-	    *(line + (length - strlen(SO_SUFFIX))) = '\0';
+-	    strcat(line, LA_SUFFIX);
+-	    file = fopen(line, "r");
+-	    if(file) {
+-		/* We'll get it on the .la open */
+-		fclose(file);
+-		return SASL_FAIL;
+-	    }
+-	}
+-	strcpy(out, prefix);
+-	strcat(out, in);
+-	return SASL_OK;
+-    }
+-
+-    strcpy(line, prefix);
+-    strcat(line, in);
+-
+-    file = fopen(line, "r");
+-    if(!file) {
+-	_sasl_log(NULL, SASL_LOG_WARN,
+-		  "unable to open LA file: %s", line);
+-	return SASL_FAIL;
+-    }
+-    
+-    while(!feof(file)) {
+-	if(!fgets(line, MAX_LINE, file)) break;
+-	if(line[strlen(line) - 1] != '\n') {
+-	    _sasl_log(NULL, SASL_LOG_WARN,
+-		      "LA file has too long of a line: %s", in);
+-	    return SASL_BUFOVER;
+-	}
+-	if(line[0] == '\n' || line[0] == '#') continue;
+-	if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) {
+-	    /* We found the line with the name in it */
+-	    char *end;
+-	    char *start;
+-	    size_t len;
+-	    end = strrchr(line, '\'');
+-	    if(!end) continue;
+-	    start = &line[sizeof("dlname=")-1];
+-	    len = strlen(start);
+-	    if(len > 3 && start[0] == '\'') {
+-		ntmp=&start[1];
+-		*end='\0';
+-		/* Do we have dlname="" ? */
+-		if(ntmp == end) {
+-		    _sasl_log(NULL, SASL_LOG_DEBUG,
+-			      "dlname is empty in .la file: %s", in);
+-		    return SASL_FAIL;
+-		}
+-		strcpy(out, prefix);
+-		strcat(out, ntmp);
+-	    }
+-	    break;
+-	}
+-    }
+-    if(ferror(file) || feof(file)) {
+-	_sasl_log(NULL, SASL_LOG_WARN,
+-		  "Error reading .la: %s\n", in);
+-	fclose(file);
+-	return SASL_FAIL;
+-    }
+-    fclose(file);
+-
+-    if(!(*out)) {
+-	_sasl_log(NULL, SASL_LOG_WARN,
+-		  "Could not find a dlname line in .la file: %s", in);
+-	return SASL_FAIL;
+-    }
+-
+-    return SASL_OK;
+-}
+ #endif /* DO_DLOPEN */
+ 
+ /* loads a plugin library */
+@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_
+ 		if (length + pos>=PATH_MAX) continue; /* too big */
+ 
+ 		if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)),
+-			   SO_SUFFIX)
+-		    && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)),
+-			   LA_SUFFIX))
++			   SO_SUFFIX))
+ 		    continue;
+ 
++		/* We only use .so files for loading plugins */
++
+ 		memcpy(name,dir->d_name,length);
+ 		name[length]='\0';
+ 
+-		result = _parse_la(prefix, name, tmp);
+-		if(result != SASL_OK)
+-		    continue;
+-		
++		/* Create full name with path */
++		strncpy(tmp, prefix, PATH_MAX);
++		strncat(tmp, name, PATH_MAX);
++
+ 		/* skip "lib" and cut off suffix --
+ 		   this only need be approximate */
+ 		strcpy(plugname, name + 3);
diff --git a/testing/libsasl/PKGBUILD b/testing/libsasl/PKGBUILD
new file mode 100644
index 000000000..4d207429d
--- /dev/null
+++ b/testing/libsasl/PKGBUILD
@@ -0,0 +1,202 @@
+# $Id: PKGBUILD 139568 2011-10-03 13:37:30Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+# This package spans multiple repositories. 
+# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
+
+#pkgbase=('cyrus-sasl')
+#pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
+pkgname=libsasl
+pkgver=2.1.23
+pkgrel=8
+pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
+arch=('i686' 'x86_64')
+url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
+license=('custom')
+options=('!makeflags' '!libtool')
+makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
+source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
+        cyrus-sasl-2.1.19-checkpw.c.patch
+        cyrus-sasl-2.1.22-crypt.patch
+        cyrus-sasl-2.1.22-qa.patch
+        cyrus-sasl-2.1.22-automake-1.10.patch
+        cyrus-sasl-2.1.23-authd-fix.patch
+        0003_saslauthd_mdoc.patch
+        0010_maintainer_mode.patch
+        0011_saslauthd_ac_prog_libtool.patch
+        0012_xopen_crypt_prototype.patch
+        0016_pid_file_lock_creation_mask.patch
+        0018_auth_rimap_quotes.patch
+        0019_ldap_deprecated.patch
+        0022_gcc4.4_preprocessor_syntax.patch
+        0025_ld_as_needed.patch
+        0026_drop_krb5support_dependency.patch
+        0027_db5_support.patch
+        0030-dont_use_la_files_for_opening_plugins.patch
+        saslauthd.conf.d
+        saslauthd)
+md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
+         'e27ddff076342e7a3041c4759817d04b'
+         'd7e6886e88af04d05f3dec7f0a59ccf7'
+         '79b8a5e8689989e2afd4b7bda595a7b1'
+         'f4131b077ddb5240b375d749162f1b7a'
+         'c7ad2c70c1ef814eb4b119f316c064f2'
+         'caeeac3feba19cbbd36e7345cc805600'
+         'f45d8b60e8f74dd7f7c2ec1665fa602a'
+         '9d93880514cb5ff5da969f1ceb64a661'
+         'dfdc052a7e678db9f687482c5d52f34e'
+         '4a09f6b24b91f8450892a78e378860da'
+         '213abe7c5dfe0d7f446992787da1e780'
+         '5a0321177ad30cb5518c8b6812e3961a'
+         '0c965748970eea29fa295524821d43f0'
+         '62bf892fe4d1df41ff748e91a1afaf67'
+         'b7848957357e7c02d6490102be496bf9'
+         'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
+         '8e7106f32e495e9ade69014fd1b3352a'
+         '49219af5641150edec288a3fdb65e7c1'
+         '75542f613185d5a90520ad0d7d926a20')
+
+build() {
+  cd "${srcdir}/cyrus-sasl-${pkgver}"
+  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch"
+  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch"
+  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch"
+  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch"
+  patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch"
+  patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch"
+  patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch"
+  patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch"
+  patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch"
+  patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch"
+  patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch"
+  patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch"
+  patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch"
+  patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch"
+  patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch"
+  patch -Np1 -i "${srcdir}/0027_db5_support.patch"
+  patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch"
+
+  rm -f config/config.guess config/config.sub 
+  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
+  rm -fr autom4te.cache
+  libtoolize -c
+  aclocal -I config -I cmulocal
+  automake -a -c
+  autoheader
+  autoconf
+
+  pushd saslauthd
+  rm -f config/config.guess config/config.sub 
+  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
+  rm -fr autom4te.cache
+  libtoolize -c
+  aclocal -I config -I ../cmulocal -I ../config
+  automake -a -c
+  autoheader
+  autoconf
+  popd
+
+  ./configure --prefix=/usr \
+      --mandir=/usr/share/man \
+      --infodir=/usr/share/info \
+      --disable-static \
+      --enable-shared \
+      --enable-alwaystrue \
+      --enable-checkapop \
+      --enable-cram \
+      --enable-digest \
+      --disable-otp \
+      --disable-srp \
+      --disable-srp-setpass \
+      --disable-krb4 \
+      --enable-gssapi \
+      --enable-auth-sasldb \
+      --enable-plain \
+      --enable-anon \
+      --enable-login \
+      --enable-ntlm \
+      --disable-passdss \
+      --enable-sql \
+      --enable-ldapdb \
+      --disable-macos-framework \
+      --with-pam \
+      --with-saslauthd=/var/run/saslauthd \
+      --with-ldap \
+      --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
+      --sysconfdir=/etc \
+      --with-devrandom=/dev/urandom
+  make
+}
+
+package_libsasl() {
+  pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library"
+  depends=('openssl')
+  conflicts=('cyrus-sasl-plugins')
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}"
+  for dir in include lib sasldb plugins utils; do
+    pushd ${dir}
+    make DESTDIR="${pkgdir}" install
+    popd
+  done
+  rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so*
+  rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so*
+  rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so*
+  install -m755 -d "${pkgdir}/usr/share/licenses/libsasl"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/"
+}
+
+package_cyrus-sasl() {
+  depends=("libsasl=${pkgver}-${pkgrel}")
+  pkgdesc="Cyrus saslauthd SASL authentication daemon"
+  backup=('etc/conf.d/saslauthd')
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/etc/rc.d"
+  install -m755 -d "${pkgdir}/etc/conf.d"
+  install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/"
+  install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/"
+}
+
+package_cyrus-sasl-gssapi() {
+  pkgdesc="GSSAPI authentication mechanism for Cyrus SASL"
+  depends=("libsasl=${pkgver}-${pkgrel}" 'krb5')
+  replaces=('cyrus-sasl-plugins')
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  install -m755 -d "${pkgdir}/usr/lib/sasl2"
+  cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/"
+}
+
+package_cyrus-sasl-ldap() {
+  pkgdesc="ldapdb auxprop module for Cyrus SASL"
+  depends=("libsasl=${pkgver}-${pkgrel}" 'libldap')
+  replaces=('cyrus-sasl-plugins')
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  install -m755 -d "${pkgdir}/usr/lib/sasl2"
+  cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/"
+}
+
+package_cyrus-sasl-sql() {
+  pkgdesc="SQL auxprop module for Cyrus SASL"
+  depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient')
+  replaces=('cyrus-sasl-plugins')
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  install -m755 -d "${pkgdir}/usr/lib/sasl2"
+  cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/"
+}
diff --git a/testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch b/testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch
new file mode 100644
index 000000000..f7bf44b79
--- /dev/null
+++ b/testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch
@@ -0,0 +1,170 @@
+diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in
+--- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in	2004-07-02 21:40:15.000000000 +0200
++++ ./lib/Makefile.in	2004-09-07 13:21:22.746680576 +0200
+@@ -120,7 +120,7 @@
+ JAVA_TRUE = @JAVA_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = -lcrypt @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_CRYPT = @LIB_CRYPT@
+ LIB_DES = @LIB_DES@
+diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c
+--- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c	2004-03-17 14:58:13.000000000 +0100
++++ ./lib/checkpw.c	2004-09-07 13:21:12.645916147 +0200
+@@ -94,6 +94,23 @@
+ # endif
+ #endif
+ 
++/******************************
++ * crypt(3) patch start       *
++ ******************************/
++char *crypt(const char *key, const char *salt);
++
++/* cleartext password formats */
++#define PASSWORD_FORMAT_CLEARTEXT 1
++#define PASSWORD_FORMAT_CRYPT 2
++#define PASSWORD_FORMAT_CRYPTTRAD 3
++#define PASSWORD_SALT_BUF_LEN 22
++
++/* weeds out crypt(3) password's salt */
++int _sasl_get_salt (char *dest, char *src, int format);
++
++/******************************
++ * crypt(3) patch stop        *
++ ******************************/
+ 
+ /* we store the following secret to check plaintext passwords:
+  *
+@@ -143,7 +160,51 @@
+ 				       "*cmusaslsecretPLAIN",
+ 				       NULL };
+     struct propval auxprop_values[3];
+-    
++
++	/******************************
++	 * crypt(3) patch start       *
++	 * for password format check  *
++	 ******************************/
++    sasl_getopt_t *getopt;
++    void *context;
++    const char *p = NULL;
++	/**
++	 * MD5: 12 char salt
++	 * BLOWFISH: 16 char salt
++	 */
++	char salt[PASSWORD_SALT_BUF_LEN];
++	int password_format;
++
++	/* get password format from auxprop configuration */
++	if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) {
++		getopt(context, NULL, "password_format", &p, NULL);
++	}
++
++	/* set password format */
++	if (p) {
++		/*
++		memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN);
++		strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1));
++		*/
++		/* modern, modular crypt(3) */
++		if (strncmp(p, "crypt", 11) == 0)
++			password_format = PASSWORD_FORMAT_CRYPT;
++		/* traditional crypt(3) */
++		else if (strncmp(p, "crypt_trad", 11) == 0)
++			password_format = PASSWORD_FORMAT_CRYPTTRAD;
++		/* cleartext password */
++		else
++			password_format = PASSWORD_FORMAT_CLEARTEXT;
++	} else {
++		/* cleartext password */
++		password_format = PASSWORD_FORMAT_CLEARTEXT;
++	}
++
++	/******************************
++	 * crypt(3) patch stop        *
++	 * for password format check  *
++	 ******************************/
++
+     if (!conn || !userstr)
+ 	return SASL_BADPARAM;
+ 
+@@ -180,14 +241,31 @@
+ 	goto done;
+     }
+ 
+-    /* At the point this has been called, the username has been canonified
+-     * and we've done the auxprop lookup.  This should be easy. */
+-    if(auxprop_values[0].name
+-       && auxprop_values[0].values
+-       && auxprop_values[0].values[0]
+-       && !strcmp(auxprop_values[0].values[0], passwd)) {
+-	/* We have a plaintext version and it matched! */
+-	return SASL_OK;
++
++	/******************************
++	 * crypt(3) patch start       *
++	 ******************************/	
++
++	/* get salt */
++	_sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format);
++	
++	/* crypt(3)-ed password? */
++	if (password_format != PASSWORD_FORMAT_CLEARTEXT) {
++		/* compare password */
++		if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0)
++			return SASL_OK;
++		else
++			ret = SASL_BADAUTH;
++	}
++	else if (password_format == PASSWORD_FORMAT_CLEARTEXT) {
++		/* compare passwords */
++		if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0)
++			return SASL_OK;
++		else
++			ret = SASL_BADAUTH;
++	/******************************
++	 * crypt(3) patch stop        *
++	 ******************************/
+     } else if(auxprop_values[1].name
+ 	      && auxprop_values[1].values
+ 	      && auxprop_values[1].values[0]) {
+@@ -975,3 +1053,37 @@
+ #endif     
+     { NULL, NULL }
+ };
++
++/* weeds out crypt(3) password's salt */
++int _sasl_get_salt (char *dest, char *src, int format) {
++	int num;	/* how many characters is salt long? */
++	switch (format) {
++		case PASSWORD_FORMAT_CRYPT:
++			/* md5 crypt */
++			if (src[1] == '1')
++				num = 12;
++			/* blowfish crypt */
++			else if (src[1] == '2')
++				num = (src[1] == '2' && src[2] == 'a') ? 17 : 16;
++			/* traditional crypt */
++			else
++				num = 2;
++			break;
++	
++		case PASSWORD_FORMAT_CRYPTTRAD:
++			num = 2;
++			break;
++
++		default:
++			return 1;
++	}
++
++	/* destroy destination */
++	memset(dest, '\0', (num + 1));
++
++	/* copy salt to destination */
++	strncpy(dest, src, num);
++
++	return 1;
++}
++
diff --git a/testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch b/testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch
new file mode 100644
index 000000000..1294cb507
--- /dev/null
+++ b/testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch
@@ -0,0 +1,11 @@
+--- saslauthd/configure.in.orig	2006-05-23 15:53:17.000000000 -0700
++++ saslauthd/configure.in	2006-05-23 15:53:33.000000000 -0700
+@@ -77,7 +77,7 @@
+   AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
+   SASL_DB_PATH_CHECK()
+   SASL_DB_CHECK()
+-  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
++  SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB"
+ fi
+ 
+ AC_ARG_ENABLE(httpform, [  --enable-httpform       enable HTTP form authentication [[no]] ],
diff --git a/testing/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch b/testing/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch
new file mode 100644
index 000000000..8cd71c0c5
--- /dev/null
+++ b/testing/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch
@@ -0,0 +1,94 @@
+Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was
+originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building
+using automake 1.10.
+
+--- cyrus-sasl-2.1.22/plugins/Makefile.am		2006-05-17 18:46:16.000000000 +0200
++++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110		2007-02-16 15:42:07.000000000 +0100
+@@ -82,73 +82,73 @@
+ 	libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
+ 
+ libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
+-libplain_la_LDFLAGS = -version-info $(plain_version)
++libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version)
+ libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
+ 
+ libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources)
+-libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
++libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version)
+ libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libanonymous_la_LIBADD = $(COMPAT_OBJS)
+ 
+ libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources)
+-libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version)
++libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version)
+ libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS)
+ 
+ libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources)
+-libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
++libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version)
+ libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS)
+ 
+ libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources)
+-libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
++libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version)
+ libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libcrammd5_la_LIBADD = $(COMPAT_OBJS)
+ 
+ libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources)
+-libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
++libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version)
+ libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS)
+ 
+ liblogin_la_SOURCES = login.c login_init.c $(common_sources)
+-liblogin_la_LDFLAGS = -version-info $(login_version)
++liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version)
+ liblogin_la_DEPENDENCIES = $(COMPAT_OBJS)
+ liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
+ 
+ libsrp_la_SOURCES = srp.c srp_init.c $(common_sources)
+-libsrp_la_LDFLAGS = -version-info $(srp_version)
++libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version)
+ libsrp_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS)
+ 
+ libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources)
+-libotp_la_LDFLAGS = -version-info $(otp_version)
++libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version)
+ libotp_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS)
+ 
+ libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources)
+-libntlm_la_LDFLAGS = -version-info $(ntlm_version)
++libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version)
+ libntlm_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
+ 
+ libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources)
+-libpassdss_la_LDFLAGS = -version-info $(passdss_version)
++libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version)
+ libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS)
+ 
+ # Auxprop Plugins
+ libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
+-libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
++libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version)
+ libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
+ 
+ libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
+-libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
++libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version)
+ libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libldapdb_la_LIBADD = $(COMPAT_OBJS)
+ 
+ libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
+-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
++libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
+ libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libsql_la_LIBADD = $(COMPAT_OBJS)
+ 
diff --git a/testing/libsasl/cyrus-sasl-2.1.22-crypt.patch b/testing/libsasl/cyrus-sasl-2.1.22-crypt.patch
new file mode 100644
index 000000000..fd356327b
--- /dev/null
+++ b/testing/libsasl/cyrus-sasl-2.1.22-crypt.patch
@@ -0,0 +1,71 @@
+http://bugs.gentoo.org/152544
+
+--- cyrus-sasl-2.1.22/lib/Makefile.am
++++ cyrus-sasl-2.1.22/lib/Makefile.am
+@@ -45,6 +45,7 @@ sasl_version = 2:22:0
+ 
+ INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
+ 
++AM_CFLAGS = -fPIC
+ EXTRA_DIST = windlopen.c staticopen.h NTMakefile
+ EXTRA_LIBRARIES = libsasl2.a
+ noinst_LIBRARIES = @SASL_STATIC_LIBS@
+--- cyrus-sasl-2.1.22/plugins/Makefile.am
++++ cyrus-sasl-2.1.22/plugins/Makefile.am
+@@ -63,6 +63,7 @@ srp_version = 2:22:0
+ 
+ INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
+ AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
++AM_CFLAGS = -fPIC
+ 
+ COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
+ 
+--- cyrus-sasl-2.1.22/sasldb/Makefile.am
++++ cyrus-sasl-2.1.22/sasldb/Makefile.am
+@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
+ 
+ extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
+ 
++AM_CFLAGS = -fPIC
+ EXTRA_DIST = NTMakefile
+ 
+ noinst_LTLIBRARIES = libsasldb.la
+--- cyrus-sasl-2.1.22/utils/Makefile.am
++++ cyrus-sasl-2.1.22/utils/Makefile.am
+@@ -42,7 +42,7 @@
+ #
+ ################################################################
+ 
+-all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
++all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT)
+ all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
+ 
+ sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer
+--- cyrus-sasl-2.1.22/sample/Makefile.am
++++ cyrus-sasl-2.1.22/sample/Makefile.am
+@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c
+ server_SOURCES = server.c common.c common.h
+ client_SOURCES = client.c common.c common.h
+ 
+-server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
+-client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
++server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
++client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
+ 
+-sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
+-sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
++sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
++sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
+ 
+ EXTRA_DIST = NTMakefile
+--- cyrus-sasl-2.1.22/lib/Makefile.am
++++ cyrus-sasl-2.1.22/lib/Makefile.am
+@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la
+ libsasl2_la_SOURCES = $(common_sources) $(common_headers)
+ libsasl2_la_LDFLAGS = -version-info $(sasl_version)
+ libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
+-libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
++libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT)
+ 
+ if MACOSX
+ framedir = /Library/Frameworks/SASL2.framework
diff --git a/testing/libsasl/cyrus-sasl-2.1.22-qa.patch b/testing/libsasl/cyrus-sasl-2.1.22-qa.patch
new file mode 100644
index 000000000..4f7b04f13
--- /dev/null
+++ b/testing/libsasl/cyrus-sasl-2.1.22-qa.patch
@@ -0,0 +1,22 @@
+fix missing prototype warnings
+
+--- cyrus-sasl-2.1.22/lib/auxprop.c
++++ cyrus-sasl-2.1.22/lib/auxprop.c
+@@ -43,6 +43,7 @@
+  */
+ 
+ #include <config.h>
++#include <stdio.h>
+ #include <sasl.h>
+ #include <prop.h>
+ #include <ctype.h>
+--- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
++++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
+@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF
+ ******************************************************************/
+ 
+ #include <shadow.h>
++#include <string.h>
+ 
+ extern char *crypt();
+ 
diff --git a/testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch b/testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch
new file mode 100644
index 000000000..f5f372d17
--- /dev/null
+++ b/testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch
@@ -0,0 +1,28 @@
+fix warnings:
+
+auth_sasldb.c: In function ‘auth_sasldb’:
+auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’
+
+auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type
+../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’
+
+--- saslauthd/auth_sasldb.c
++++ saslauthd/auth_sasldb.c
+@@ -41,6 +41,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <pwd.h>
++#include <unistd.h>
+ /* END PUBLIC DEPENDENCIES */
+ 
+ #define RETURN(x) return strdup(x)
+@@ -131,7 +132,8 @@
+     /* VARIABLES */
+     char pw[1024];			/* pointer to passwd file entry */
+     sasl_utils_t utils;
+-    int ret, outsize;
++    int ret;
++    size_t outsize;
+     const char *use_realm;
+     char realm_buf[MAXHOSTNAMELEN];
+     /* END VARIABLES */
diff --git a/testing/libsasl/saslauthd b/testing/libsasl/saslauthd
new file mode 100644
index 000000000..6afafae0b
--- /dev/null
+++ b/testing/libsasl/saslauthd
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# source application-specific settings
+[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DAEMON_NAME="saslauthd"
+SASLAUTHD_BIN=/usr/sbin/saslauthd
+SASLAUTHD_RUN=/var/run/saslauthd
+SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid
+
+case "$1" in
+  start)
+    stat_busy "Starting $DAEMON_NAME"
+    [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd
+    if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then
+      add_daemon $DAEMON_NAME
+      stat_done
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping $DAEMON_NAME"
+    [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm_daemon $DAEMON_NAME
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
+# vim: ts=2 sw=2 et ft=sh
diff --git a/testing/libsasl/saslauthd.conf.d b/testing/libsasl/saslauthd.conf.d
new file mode 100644
index 000000000..167211290
--- /dev/null
+++ b/testing/libsasl/saslauthd.conf.d
@@ -0,0 +1 @@
+SASLAUTHD_OPTS="-a pam"
diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD
new file mode 100644
index 000000000..d76bbc55c
--- /dev/null
+++ b/testing/mpfr/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 139633 2011-10-03 23:32:17Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
+
+pkgname=mpfr
+_pkgver=3.1.0
+pkgver=${_pkgver}
+#_patchlevel=p4
+#pkgver=${_pkgver}.${_patchlevel}
+pkgrel=2
+pkgdesc="Multiple-precision floating-point library"
+arch=('i686' 'x86_64')
+url="http://www.mpfr.org/"
+license=('LGPL')
+depends=('gmp>=5.0')
+options=('!libtool')
+install=mpfr.install
+source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz)
+md5sums=('6e495841bb026481567006cec0f821c3')
+
+build() {
+  cd "${srcdir}/${pkgname}-${_pkgver}"
+  #patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch
+  ./configure --prefix=/usr --enable-thread-safe --enable-shared
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${_pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${_pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install
new file mode 100644
index 000000000..d6dd0475b
--- /dev/null
+++ b/testing/mpfr/mpfr.install
@@ -0,0 +1,20 @@
+info_dir=usr/share/info
+info_files=(mpfr.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
diff --git a/testing/opal/PKGBUILD b/testing/opal/PKGBUILD
new file mode 100644
index 000000000..b1c1dcdf7
--- /dev/null
+++ b/testing/opal/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 139583 2011-10-03 14:22:35Z ibiru $
+# Maintainer: Jan de Groot <jan@archlinux.org>
+# Contributor: Tom K <tomk@runbox.com>
+pkgname=opal
+pkgver=3.10.2
+pkgrel=2
+pkgdesc="Open Phone Abstraction Library"
+arch=(i686 x86_64)
+url="http://www.ekiga.org"
+license=('GPL')
+depends=('ptlib' 'libtheora' 'x264' 'speex')
+makedepends=('ffmpeg')
+options=(!makeflags)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('8e227978263c07502b2bc4c9de0e71be1b95d673fe858bfd907910adfb2eb205')
+
+build() {
+  cd "${srcdir}/opal-${pkgver}"
+  CXXFLAGS="$CXXFLAGS -fpermissive" \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/opal-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/rubberband/PKGBUILD b/testing/rubberband/PKGBUILD
new file mode 100644
index 000000000..b9549213f
--- /dev/null
+++ b/testing/rubberband/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 139630 2011-10-03 20:52:06Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Felipe Machado aka arch_audio <machado.felipe@gmail.com>
+
+pkgname=rubberband
+pkgver=1.6.0
+pkgrel=2
+pkgdesc="Time-stretching and pitch-shifting audio library and utility"
+arch=('i686' 'x86_64')
+url="http://www.breakfastquay.com/rubberband/"
+license=('GPL')
+depends=('libsamplerate' 'fftw' 'vamp-plugin-sdk')
+makedepends=('ladspa')
+source=("http://code.breakfastquay.com/attachments/download/16/$pkgname-$pkgver.tar.bz2"
+        'gcc46.patch'
+        'vectorops.patch')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # fix gcc 4.6 compatibility
+  patch -Np1 -i "$srcdir/gcc46.patch"
+
+  # fix bug exposed by gcc 4.6
+  # see https://bugs.archlinux.org/task/26140
+  patch -Np1 -i "$srcdir/vectorops.patch"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
+md5sums=('28e3dc1f5ae694d6846bcb0ef3d597fc'
+         '7c2f404975da6052f6b80eac12efbeb4'
+         '4bdc9689179d3a2cf64172f0f911701d')
diff --git a/testing/rubberband/gcc46.patch b/testing/rubberband/gcc46.patch
new file mode 100644
index 000000000..38ac76d42
--- /dev/null
+++ b/testing/rubberband/gcc46.patch
@@ -0,0 +1,10 @@
+--- rubberband-1.6.0.orig/rubberband/RubberBandStretcher.h
++++ rubberband-1.6.0/rubberband/RubberBandStretcher.h
+@@ -21,6 +21,7 @@
+ 
+ #include <vector>
+ #include <map>
++#include <cstddef>
+ 
+ /**
+  * @mainpage RubberBand
diff --git a/testing/rubberband/vectorops.patch b/testing/rubberband/vectorops.patch
new file mode 100644
index 000000000..cae961591
--- /dev/null
+++ b/testing/rubberband/vectorops.patch
@@ -0,0 +1,13 @@
+--- a/src/system/VectorOps.h    Mon Mar 21 21:51:33 2011 +0000
++++ b/src/system/VectorOps.h    Sun Oct 02 21:12:42 2011 +0100
+@@ -84,8 +84,8 @@
+ }
+
+ template<typename T>
+-inline void v_move(T *const R__ dst,
+-                   const T *const R__ src,
++inline void v_move(T *const dst,
++                   const T *const src,
+                    const int count)
+ {
+     memmove(dst, src, count * sizeof(T));
diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD
new file mode 100644
index 000000000..871aa83eb
--- /dev/null
+++ b/testing/vlc/PKGBUILD
@@ -0,0 +1,73 @@
+# $Id: PKGBUILD 139589 2011-10-03 14:22:44Z ibiru $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
+
+pkgname=vlc
+pkgver=1.1.11
+pkgrel=5
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+arch=('i686' 'x86_64')
+url="http://www.videolan.org/vlc/"
+license=('GPL')
+depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
+         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
+         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
+         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
+         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
+         'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
+makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify'
+             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
+             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
+             'lirc-utils' 'gnutls' 'libcaca')
+optdepends=('avahi: for service discovery using bonjour protocol'
+            'libnotify: for notification plugin'
+            'ncurses: for ncurses interface support'
+            'libdvdcss: for decoding encrypted DVDs'
+            'lirc-utils: for lirc plugin'
+            'libavc1394: for devices using the 1394ta AV/C'
+            'libdc1394: for IEEE 1394 plugin'
+            'kdelibs: KDE Solid hardware integration'
+            'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)'
+            'libpulse: PulseAudio support')
+conflicts=('vlc-plugin')
+replaces=('vlc-plugin')
+backup=('usr/share/vlc/http/.hosts'
+        'usr/share/vlc/http/dialogs/.hosts'
+        'usr/share/vlc/lua/http/.hosts'
+        'usr/share/vlc/lua/http/dialogs/.hosts')
+options=('!libtool')
+install=vlc.install
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('a64846d6f21ea179ae8e8bfb6f9447fe')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
+
+  ./configure --prefix=/usr \
+              --disable-rpath \
+              --enable-faad \
+              --enable-v4l \
+              --enable-snapshot \
+              --enable-dbus-control \
+              --enable-nls \
+              --enable-lirc \
+              --enable-pvr \
+              --enable-ncurses \
+              --with-live555-tree=/usr/lib/live \
+              --enable-upnp \
+              --enable-realrtsp
+  make
+}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}/" install
+
+  for res in 16 32 48 128; do
+    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
+        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
+  done
+}
diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install
new file mode 100644
index 000000000..4a1091bc5
--- /dev/null
+++ b/testing/vlc/vlc.install
@@ -0,0 +1,18 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_remove() {
+    rm -f usr/lib/vlc/plugins/plugins-*.dat
+}
+
+post_remove() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
diff --git a/testing/x264/PKGBUILD b/testing/x264/PKGBUILD
new file mode 100644
index 000000000..e76355a09
--- /dev/null
+++ b/testing/x264/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 139577 2011-10-03 14:22:28Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
+# Contributor: Paul Mattal <paul@archlinux.org>
+
+pkgname=x264
+pkgver=20111001
+pkgrel=1
+pkgdesc="free library for encoding H264/AVC video streams"
+arch=('i686' 'x86_64')
+url="http://www.videolan.org/developers/x264.html"
+license=('GPL')
+depends=('glibc')
+makedepends=('yasm')
+source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
+md5sums=('dd67dca96ac79e7cb963bfcbf68e017b')
+
+build() {
+    cd "$srcdir/$pkgname-snapshot-$pkgver-2245"
+
+    ./configure --enable-shared
+
+    make
+    make DESTDIR="$pkgdir" \
+      bindir=/usr/bin \
+      libdir=/usr/lib \
+      includedir=/usr/include \
+      install
+}
+
+# vim:set ts=2 sw=2 et:
author	root <root@rshg054.dnsready.net>	2011-10-04 23:14:30 +0000
committer	root <root@rshg054.dnsready.net>	2011-10-04 23:14:30 +0000
commit	3567a49f79d2dbf828b723ab54982fa6c7ea1c80 (patch)
tree	15fc309d3681df4da7a56189050fd5aa16fa9794
parent	57d05f7209f022aa99a8850aafbeec4cb85c3b5b (diff)