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

Conflicts:
	core/gnupg/PKGBUILD
	core/openldap/PKGBUILD
	gnome-unstable/evince/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/farstream/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-menus/PKGBUILD
	gnome-unstable/gnome-panel/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/libgnomekbd/PKGBUILD
	gnome-unstable/libwacom/PKGBUILD
	gnome-unstable/libwnck3/PKGBUILD
	gnome-unstable/network-manager-applet/PKGBUILD
	gnome-unstable/networkmanager-openconnect/PKGBUILD
	gnome-unstable/networkmanager-openvpn/PKGBUILD
	gnome-unstable/networkmanager-pptp/PKGBUILD
	gnome-unstable/networkmanager-vpnc/PKGBUILD
	gnome-unstable/networkmanager/PKGBUILD
	gnome-unstable/pidgin/PKGBUILD
	testing/gnupg/PKGBUILD

26 files changed, 1120 insertions, 83 deletions

diff --git a/community/coq/PKGBUILD b/community/coq/PKGBUILD
index 3c8c707c3..fa18fdb02 100644
--- a/community/coq/PKGBUILD
+++ b/community/coq/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: George Giorgidze <giorgidze@gmail.com>
 
 pkgname=coq
-pkgver=8.3pl3
-pkgrel=3
+pkgver=8.3pl4
+pkgrel=1
 pkgdesc='Formal proof management system.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://coq.inria.fr/'
@@ -11,18 +11,12 @@ license=('GPL')
 options=('!emptydirs')
 depends=('gtk2' 'lablgtk2' 'ocaml')
 makedepends=('camlp5-transitional' 'netpbm' 'hevea')
-source=("http://coq.inria.fr/distrib/V${pkgver}/files/coq-${pkgver}.tar.gz"
-        'camlp5-latest-fix.diff')
-md5sums=('37e9a52110a025128667c03fed75f9c2'
-         '76c55f67f86a3f4b782bbba02ba8893f')
+source=("http://coq.inria.fr/distrib/V${pkgver}/files/coq-${pkgver}.tar.gz")
+md5sums=('88e2ce021b09eca207e3119d5202a695')
 
 build() {
   cd coq-${pkgver}
 
-  # fix compilation bug, remove next bump
-  # https://coq.inria.fr/bugs/show_bug.cgi?id=2728
-  patch -Np0 -i ${srcdir}/camlp5-latest-fix.diff
-
   ./configure \
     -prefix '/usr' \
     -mandir '/usr/share/man' \
diff --git a/community/kwalletcli/PKGBUILD b/community/kwalletcli/PKGBUILD
new file mode 100644
index 000000000..803b85750
--- /dev/null
+++ b/community/kwalletcli/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Jens Adam (byte/jra) <j_adam@web.de>
+
+pkgname=kwalletcli
+pkgver=2.11
+pkgrel=1
+pkgdesc="Command-Line Interface for the KDE Wallet"
+url="http://www.mirbsd.org/kwalletcli.htm"
+license=('custom:MirOS' 'LGPL3')
+arch=('i686' 'x86_64')
+depends=('kdebase-runtime' 'mksh')
+optdepends=('gnupg2' 'openssh' 'pinentry')
+source=("http://www.mirbsd.org/MirOS/dist/hosted/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('bf5c0bc1608041dd637f0e8e5e4f8586')
+
+build() {
+  cd "${srcdir}"/${pkgname}
+  KDE_VER=4 KDE_INCS="-I/usr/include/Qt -I/usr/include/QtCore" make -e
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}
+  install -d "${pkgdir}"/usr/{bin,share/man/man1}
+  for F in kwalletaskpass kwalletcli kwalletcli_getpin pinentry-kwallet; do
+    install ${F} "${pkgdir}"/usr/bin/${F}
+    install -m644 ${F}.1 "${pkgdir}"/usr/share/man/man1/${F}.1
+  done
+  install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENCE
+}
diff --git a/community/librep/PKGBUILD b/community/librep/PKGBUILD
index b28daec9a..151440742 100644
--- a/community/librep/PKGBUILD
+++ b/community/librep/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 64157 2012-02-09 14:54:32Z arodseth $
+# $Id: PKGBUILD 68538 2012-03-27 07:09:16Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: stefan-husmann@t-online.de
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
+
 pkgname=librep
-pkgver=0.92.1b
-pkgrel=3
+pkgver=0.92.2
+pkgrel=1
 pkgdesc="Lisp system for Sawfish"
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +14,7 @@ depends=('gmp' 'gdbm' 'libffi')
 install=$pkgname.install
 options=('!emptydirs' '!libtool')
 source=("http://download.tuxfamily.org/$pkgname/$pkgname-$pkgver.tar.xz")
-sha256sums=('aedca2716252a1ff2256aca321cce35646b795840b65a3c481708c04a6fd7e3e')
+sha256sums=('a54422b42a34bc9d659130b83d2315ae3c3cb74ab6c2a6052459011d05f38740')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
index 4010182cb..fe9d12b10 100644
--- a/community/root/PKGBUILD
+++ b/community/root/PKGBUILD
@@ -2,14 +2,14 @@
 # Contributor: Sebastian Voecking <voeck@web.de>
 
 pkgname=root
-pkgver=5.32.01
+pkgver=5.32.02
 pkgrel=1
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://root.cern.ch'
 license=('LGPL2.1')
 depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient'
-         'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme')
+         'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme' 'gtk-update-icon-cache')
 makedepends=('fftw')
 install='root.install'
 options=('!emptydirs')
@@ -17,7 +17,7 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
         'root.sh'
         'rootd'
         'root.xml')
-md5sums=('c8f28bb483e0b32208fb153c1ea6af7c'
+md5sums=('614a00632ab11fb33d2002800aabdcc7'
          '0e883ad44f99da9bc7c23bc102800b62'
          'efd06bfa230cc2194b38e0c8939e72af'
          'e2cf69b204192b5889ceb5b4dedc66f7')
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index aa4bcb6e4..bfd16e6d8 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
 
 pkgname=stone-soup
-pkgver=0.10.0
+pkgver=0.10.1
 pkgrel=1
 pkgdesc='An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting'
 arch=('i686' 'x86_64' 'mips64el')
@@ -61,5 +61,5 @@ build() {
 }
 
 # vim: ts=4:sw=4:expandtab
-md5sums=('ca360fa13f730f501a0a31b187eeca46'
+md5sums=('3afd529a30d73c9ab896e1704c4215a5'
          'afdacb4c39342e75674efb88eeb3da21')
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index 9f4eec24e..9af3a3f56 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -5,19 +5,19 @@
 
 pkgname=sxiv
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='simple x image viewer'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 install=sxiv.install
 url='https://github.com/muennich/sxiv'
-depends=('libx11' 'xproto' 'imlib2' 'desktop-file-utils')
+depends=('libx11' 'xproto' 'imlib2' 'giflib' 'desktop-file-utils')
 source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz"
         'sxiv.desktop'
 	    'config.h')
 md5sums=('c887e0af1e4d5a101b285a46d288c419'
          '1dda85ff6bed4de337f8fb303075ed11'
-         '78c71ef924095d7d6fb75222047de0bd')
+         '67c470b605eae732aed4a8119a70832b')
 
 build() {
   	cd "sxiv-${pkgver}"
diff --git a/community/sxiv/config.h b/community/sxiv/config.h
index 777cb805a..f84629cb4 100644
--- a/community/sxiv/config.h
+++ b/community/sxiv/config.h
@@ -7,7 +7,7 @@
 /* load all frames from gif files and support gif animations?
  * (requires giflib [-lgif] to be installed)
  */
-#define GIF_SUPPORT  0
+#define GIF_SUPPORT  1
 
 #endif
 #ifdef _WINDOW_CONFIG
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD
index d3c490d20..7b2003a56 100644
--- a/core/gnupg/PKGBUILD
+++ b/core/gnupg/PKGBUILD
@@ -1,36 +1,44 @@
-# $Id: PKGBUILD 148992 2012-02-05 12:21:23Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
+# $Id: PKGBUILD 154386 2012-03-27 12:00:15Z bisson $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+
 pkgname=gnupg
-pkgver=1.4.12
-pkgrel=1
-pkgdesc="GNU Privacy Guard - a PGP replacement tool"
+pkgver=2.0.18
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL3')
-depends=('zlib' 'bzip2' 'libldap>=2.4.18' 'libusb-compat' 'curl>=7.16.2' 'readline>=6.0.00')
-source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2)
-install=gnupg.install
-url="http://www.gnupg.org/"
-md5sums=('ce3742e5c7912559cab7894ad8ba7f6b')
+optdepends=('curl: gpg2keys_curl'
+            'libldap: gpg2keys_ldap'
+            'libusb-compat: scdaemon'
+            'texinfo: documentation')
+makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr')
+install=${pkgname}.install
+source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2{,.sig})
+sha1sums=('5ec2f718760cc3121970a140aeea004b64545c46'
+          'c1b15a6c204434081e2bd8249dde233b6c88c4d0')
+
+conflicts=('gnupg2')
+provides=("gnupg2=${pkgver}")
+replaces=('gnupg2')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--libexecdir=/usr/lib \
-	--enable-noexecstack
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
   make
-  #ln -s ${pkgname}-${pkgver}/scripts .. # seems obsolete now
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check #All 27 tests passed
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
 }
 
-package () {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  
-  # fix fileconflict with gnupg2 pkg
-  rm ${pkgdir}/usr/share/man/man1/gpg-zip.1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+  ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
 }
diff --git a/core/gnupg/gnupg.install b/core/gnupg/gnupg.install
index 5a6704716..0a6f3d518 100644
--- a/core/gnupg/gnupg.install
+++ b/core/gnupg/gnupg.install
@@ -1,10 +1,10 @@
 info_dir=/usr/share/info
-info_files=(gnupg1.info)
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
   for f in ${info_files[@]}; do
-    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+    usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null
   done
 }
 
@@ -15,7 +15,7 @@ post_upgrade() {
 pre_remove() {
   [ -x usr/bin/install-info ] || return 0
   for f in ${info_files[@]}; do
-    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+    usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null
   done
 }
 # vim:set ts=2 sw=2 et:
diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD
index 76e2dc8a8..a88dfbdc1 100644
--- a/core/gpgme/PKGBUILD
+++ b/core/gpgme/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 146733 2012-01-16 22:51:33Z dreisner $
+# $Id: PKGBUILD 154388 2012-03-27 12:00:19Z bisson $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=gpgme
 pkgver=1.3.1
-pkgrel=2
+pkgrel=4
 pkgdesc="A C wrapper library for GnuPG"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnupg.org/related_software/gpgme/"
 license=('GPL')
-depends=('libgpg-error' 'pth' 'gnupg' 'gnupg2')
+depends=('libgpg-error' 'pth' 'gnupg>=2')
 install=${pkgname}.install
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index 06fe1c2c3..282e07e24 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 146451 2012-01-11 15:21:08Z stephane $
+# $Id: PKGBUILD 154404 2012-03-27 21:06:23Z eric $
 # Maintainer:
 
 pkgbase=openldap
 pkgname=('libldap' 'openldap')
-pkgver=2.4.28
-pkgrel=2
+pkgver=2.4.30
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openldap.org/"
 license=('custom')
-makedepends=('libfetch' 'libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
+makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
-        slapd slapd.default ntlm.patch)
-sha1sums=('d888beae1723002a5a2ff5509d3040df40885774'
+        slapd slapd.default
+        ntlm.patch
+        mutex-end-of-struct-sigsegv.patch)
+sha1sums=('7447e89b9a5199f9bb2231bda42c308a1b6513d9'
           'bd1ea19256d3d467f1f803e0f4046ef50f17628f'
           'd89b8a533045123f1ab46c9c430cf132d58a20a4'
-          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
+          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
+          '694269dad78c7a806649c2d7f57bb7e503df3af1')
 
 build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
   patch -Np1 -i "${srcdir}"/ntlm.patch
+  patch -Np1 -i "${srcdir}"/mutex-end-of-struct-sigsegv.patch
+
   sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in
   sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
   sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf
@@ -30,7 +35,8 @@ build() {
     --enable-ipv6 --enable-syslog --enable-local \
     --enable-bdb --enable-hdb \
     --enable-crypt --enable-dynamic \
-    --with-threads  --disable-wrappers \
+    --with-threads --disable-wrappers \
+    --without-fetch \
     --enable-spasswd --with-cyrus-sasl \
     --enable-overlays=mod --enable-modules=yes
   make
@@ -43,7 +49,7 @@ check() {
 
 package_libldap() {
   pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
-  depends=('libsasl' 'libfetch' 'e2fsprogs')
+  depends=('libsasl' 'e2fsprogs')
   backup=('etc/openldap/ldap.conf')
   options=('!libtool')
 
diff --git a/core/openldap/mutex-end-of-struct-sigsegv.patch b/core/openldap/mutex-end-of-struct-sigsegv.patch
new file mode 100644
index 000000000..e8996386a
--- /dev/null
+++ b/core/openldap/mutex-end-of-struct-sigsegv.patch
@@ -0,0 +1,293 @@
+ libraries/libldap/init.c     |    8 ++-
+ libraries/libldap/ldap-int.h |  198 ++++++++++++++++++++++--------------------
+ 2 files changed, 110 insertions(+), 96 deletions(-)
+
+diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
+index 39292d2..9d37e64 100644
+--- a/libraries/libldap/init.c
++++ b/libraries/libldap/init.c
+@@ -36,7 +36,13 @@
+ #include "lutil.h"
+ 
+ struct ldapoptions ldap_int_global_options =
+-	{ LDAP_UNINITIALIZED, LDAP_DEBUG_NONE LDAP_LDO_MUTEX_NULLARG };  
++	{ LDAP_UNINITIALIZED, LDAP_DEBUG_NONE
++		LDAP_LDO_NULLARG
++		LDAP_LDO_CONNECTIONLESS_NULLARG
++		LDAP_LDO_TLS_NULLARG
++		LDAP_LDO_SASL_NULLARG
++		LDAP_LDO_GSSAPI_NULLARG
++		LDAP_LDO_MUTEX_NULLARG };
+ 
+ #define ATTR_NONE	0
+ #define ATTR_BOOL	1
+diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
+index f8e6126..ac6c9e5 100644
+--- a/libraries/libldap/ldap-int.h
++++ b/libraries/libldap/ldap-int.h
+@@ -185,29 +185,59 @@ struct ldapoptions {
+ #define LDAP_TRASHED_SESSION	0xFF
+ 	int   ldo_debug;
+ 
+-#ifdef LDAP_R_COMPILE
+-	ldap_pvt_thread_mutex_t	ldo_mutex;
+-#define LDAP_LDO_MUTEX_NULLARG	, LDAP_PVT_MUTEX_NULL
+-#else
+-#define LDAP_LDO_MUTEX_NULLARG
+-#endif
++	ber_int_t		ldo_version;
++	ber_int_t		ldo_deref;
++	ber_int_t		ldo_timelimit;
++	ber_int_t		ldo_sizelimit;
++
++	/* per API call timeout */
++	struct timeval		ldo_tm_api;
++	struct timeval		ldo_tm_net;
++
++	LDAPURLDesc *ldo_defludp;
++	int		ldo_defport;
++	char*	ldo_defbase;
++	char*	ldo_defbinddn;	/* bind dn */
++
++	/*
++	 * Per connection tcp-keepalive settings (Linux only,
++	 * ignored where unsupported)
++	 */
++	ber_int_t ldo_keepalive_idle;
++	ber_int_t ldo_keepalive_probes;
++	ber_int_t ldo_keepalive_interval;
++
++	int		ldo_refhoplimit;	/* limit on referral nesting */
++
++	/* LDAPv3 server and client controls */
++	LDAPControl	**ldo_sctrls;
++	LDAPControl **ldo_cctrls;
++
++	/* LDAP rebind callback function */
++	LDAP_REBIND_PROC *ldo_rebind_proc;
++	void *ldo_rebind_params;
++	LDAP_NEXTREF_PROC *ldo_nextref_proc;
++	void *ldo_nextref_params;
++	LDAP_URLLIST_PROC *ldo_urllist_proc;
++	void *ldo_urllist_params;
++
++	/* LDAP connection callback stack */
++	ldaplist *ldo_conn_cbs;
++
++	LDAP_BOOLEANS ldo_booleans;	/* boolean options */
++
++#define LDAP_LDO_NULLARG	,0,0,0,0 ,{0},{0} ,0,0,0,0, 0,0,0,0, 0,0, 0,0,0,0,0,0, 0, 0
+ 
+ #ifdef LDAP_CONNECTIONLESS
+ #define	LDAP_IS_UDP(ld)		((ld)->ld_options.ldo_is_udp)
+ 	void*			ldo_peer;	/* struct sockaddr* */
+ 	char*			ldo_cldapdn;
+ 	int			ldo_is_udp;
++#define	LDAP_LDO_CONNECTIONLESS_NULLARG	,0,0,0
++#else
++#define	LDAP_LDO_CONNECTIONLESS_NULLARG
+ #endif
+ 
+-	/* per API call timeout */
+-	struct timeval		ldo_tm_api;
+-	struct timeval		ldo_tm_net;
+-
+-	ber_int_t		ldo_version;
+-	ber_int_t		ldo_deref;
+-	ber_int_t		ldo_timelimit;
+-	ber_int_t		ldo_sizelimit;
+-
+ #ifdef HAVE_TLS
+    	/* tls context */
+    	void		*ldo_tls_ctx;
+@@ -226,16 +256,12 @@ struct ldapoptions {
+    	int			ldo_tls_mode;
+    	int			ldo_tls_require_cert;
+ 	int			ldo_tls_impl;
+-#ifdef HAVE_OPENSSL_CRL
+    	int			ldo_tls_crlcheck;
+-#endif
++#define LDAP_LDO_TLS_NULLARG ,0,0,0,{0,0,0,0,0,0,0,0,0},0,0,0,0
++#else
++#define LDAP_LDO_TLS_NULLARG
+ #endif
+ 
+-	LDAPURLDesc *ldo_defludp;
+-	int		ldo_defport;
+-	char*	ldo_defbase;
+-	char*	ldo_defbinddn;	/* bind dn */
+-
+ #ifdef HAVE_CYRUS_SASL
+ 	char*	ldo_def_sasl_mech;		/* SASL Mechanism(s) */
+ 	char*	ldo_def_sasl_realm;		/* SASL realm */
+@@ -244,6 +270,9 @@ struct ldapoptions {
+ 
+ 	/* SASL Security Properties */
+ 	struct sasl_security_properties	ldo_sasl_secprops;
++#define LDAP_LDO_SASL_NULLARG ,0,0,0,0,{0}
++#else
++#define LDAP_LDO_SASL_NULLARG
+ #endif
+ 
+ #ifdef HAVE_GSSAPI
+@@ -253,34 +282,17 @@ struct ldapoptions {
+ #define LDAP_GSSAPI_OPT_DO_NOT_FREE_GSS_CONTEXT	0x0001
+ #define LDAP_GSSAPI_OPT_ALLOW_REMOTE_PRINCIPAL	0x0002
+ 	unsigned ldo_gssapi_options;
++#define LDAP_LDO_GSSAPI_NULLARG ,0,0
++#else
++#define LDAP_LDO_GSSAPI_NULLARG
+ #endif
+ 
+-	/*
+-	 * Per connection tcp-keepalive settings (Linux only,
+-	 * ignored where unsupported)
+-	 */
+-	ber_int_t ldo_keepalive_idle;
+-	ber_int_t ldo_keepalive_probes;
+-	ber_int_t ldo_keepalive_interval;
+-
+-	int		ldo_refhoplimit;	/* limit on referral nesting */
+-
+-	/* LDAPv3 server and client controls */
+-	LDAPControl	**ldo_sctrls;
+-	LDAPControl **ldo_cctrls;
+-
+-	/* LDAP rebind callback function */
+-	LDAP_REBIND_PROC *ldo_rebind_proc;
+-	void *ldo_rebind_params;
+-	LDAP_NEXTREF_PROC *ldo_nextref_proc;
+-	void *ldo_nextref_params;
+-	LDAP_URLLIST_PROC *ldo_urllist_proc;
+-	void *ldo_urllist_params;
+-
+-	/* LDAP connection callback stack */
+-	ldaplist *ldo_conn_cbs;
+-
+-	LDAP_BOOLEANS ldo_booleans;	/* boolean options */
++#ifdef LDAP_R_COMPILE
++	ldap_pvt_thread_mutex_t	ldo_mutex;
++#define LDAP_LDO_MUTEX_NULLARG	, LDAP_PVT_MUTEX_NULL
++#else
++#define LDAP_LDO_MUTEX_NULLARG
++#endif
+ };
+ 
+ 
+@@ -375,6 +387,46 @@ struct ldap_common {
+ 	Sockbuf		*ldc_sb;	/* socket descriptor & buffer */
+ #define ld_sb			ldc->ldc_sb
+ 
++	unsigned short	ldc_lberoptions;
++#define	ld_lberoptions		ldc->ldc_lberoptions
++
++	/* protected by msgid_mutex */
++	ber_len_t		ldc_msgid;
++#define	ld_msgid		ldc->ldc_msgid
++
++	/* do not mess with these */
++	/* protected by req_mutex */
++	LDAPRequest	*ldc_requests;	/* list of outstanding requests */
++	/* protected by res_mutex */
++	LDAPMessage	*ldc_responses;	/* list of outstanding responses */
++#define	ld_requests		ldc->ldc_requests
++#define	ld_responses		ldc->ldc_responses
++
++	/* protected by abandon_mutex */
++	ber_len_t	ldc_nabandoned;
++	ber_int_t	*ldc_abandoned;	/* array of abandoned requests */
++#define	ld_nabandoned		ldc->ldc_nabandoned
++#define	ld_abandoned		ldc->ldc_abandoned
++
++	/* unused by libldap */
++	LDAPCache	*ldc_cache;	/* non-null if cache is initialized */
++#define	ld_cache		ldc->ldc_cache
++
++	/* do not mess with the rest though */
++
++	/* protected by conn_mutex */
++	LDAPConn	*ldc_defconn;	/* default connection */
++#define	ld_defconn		ldc->ldc_defconn
++	LDAPConn	*ldc_conns;	/* list of server connections */
++#define	ld_conns		ldc->ldc_conns
++	void		*ldc_selectinfo;/* platform specifics for select */
++#define	ld_selectinfo		ldc->ldc_selectinfo
++
++	/* ldap_common refcnt - free only if 0 */
++	/* protected by ldc_mutex */
++	unsigned int		ldc_refcnt;
++#define	ld_ldcrefcnt		ldc->ldc_refcnt
++
+ 	/* protected by ldo_mutex */
+ 	struct ldapoptions ldc_options;
+ #define ld_options		ldc->ldc_options
+@@ -403,66 +455,22 @@ struct ldap_common {
+ #define ld_urllist_params	ld_options.ldo_urllist_params
+ 
+ #define ld_version		ld_options.ldo_version
+-#ifdef LDAP_R_COMPILE
+-#define	ld_ldopts_mutex		ld_options.ldo_mutex
+-#endif
+-
+-	unsigned short	ldc_lberoptions;
+-#define	ld_lberoptions		ldc->ldc_lberoptions
+-
+-	/* protected by msgid_mutex */
+-	ber_len_t		ldc_msgid;
+-#define	ld_msgid		ldc->ldc_msgid
+-
+-	/* do not mess with these */
+-	/* protected by req_mutex */
+-	LDAPRequest	*ldc_requests;	/* list of outstanding requests */
+-	/* protected by res_mutex */
+-	LDAPMessage	*ldc_responses;	/* list of outstanding responses */
+-#define	ld_requests		ldc->ldc_requests
+-#define	ld_responses		ldc->ldc_responses
+ 
+ #ifdef LDAP_R_COMPILE
++	ldap_pvt_thread_mutex_t	ldc_mutex;
+ 	ldap_pvt_thread_mutex_t	ldc_msgid_mutex;
+ 	ldap_pvt_thread_mutex_t	ldc_conn_mutex;
+ 	ldap_pvt_thread_mutex_t	ldc_req_mutex;
+ 	ldap_pvt_thread_mutex_t	ldc_res_mutex;
+ 	ldap_pvt_thread_mutex_t	ldc_abandon_mutex;
++#define	ld_ldopts_mutex		ld_options.ldo_mutex
++#define	ld_ldcmutex		ldc->ldc_mutex
+ #define	ld_msgid_mutex		ldc->ldc_msgid_mutex
+ #define	ld_conn_mutex		ldc->ldc_conn_mutex
+ #define	ld_req_mutex		ldc->ldc_req_mutex
+ #define	ld_res_mutex		ldc->ldc_res_mutex
+ #define	ld_abandon_mutex	ldc->ldc_abandon_mutex
+ #endif
+-
+-	/* protected by abandon_mutex */
+-	ber_len_t	ldc_nabandoned;
+-	ber_int_t	*ldc_abandoned;	/* array of abandoned requests */
+-#define	ld_nabandoned		ldc->ldc_nabandoned
+-#define	ld_abandoned		ldc->ldc_abandoned
+-
+-	/* unused by libldap */
+-	LDAPCache	*ldc_cache;	/* non-null if cache is initialized */
+-#define	ld_cache		ldc->ldc_cache
+-
+-	/* do not mess with the rest though */
+-
+-	/* protected by conn_mutex */
+-	LDAPConn	*ldc_defconn;	/* default connection */
+-#define	ld_defconn		ldc->ldc_defconn
+-	LDAPConn	*ldc_conns;	/* list of server connections */
+-#define	ld_conns		ldc->ldc_conns
+-	void		*ldc_selectinfo;/* platform specifics for select */
+-#define	ld_selectinfo		ldc->ldc_selectinfo
+-
+-	/* ldap_common refcnt - free only if 0 */
+-#ifdef LDAP_R_COMPILE
+-	ldap_pvt_thread_mutex_t	ldc_mutex;
+-#define	ld_ldcmutex		ldc->ldc_mutex
+-#endif
+-	/* protected by ldc_mutex */
+-	unsigned int		ldc_refcnt;
+-#define	ld_ldcrefcnt		ldc->ldc_refcnt
+ };
+ 
+ struct ldap {
diff --git a/extra/bootchart/PKGBUILD b/extra/bootchart/PKGBUILD
new file mode 100644
index 000000000..5eb0b3d28
--- /dev/null
+++ b/extra/bootchart/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 154392 2012-03-27 12:40:40Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+pkgname="bootchart"
+pkgver=1.15
+pkgrel=1
+pkgdesc="a 'startup' graphing tool"
+url="https://meego.gitorious.org/meego-developer-tools/bootchart"
+license=('GPL2')
+arch=(i686 x86_64)
+depends=('glibc')
+source=("http://foo-projects.org/~sofar/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+	'build.patch')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -p1 -i ../build.patch
+
+  make
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('e24cad9db140521fca5193a88589e669'
+         '5546709bc77b775290cb54a29affa6ec')
diff --git a/extra/bootchart/build.patch b/extra/bootchart/build.patch
new file mode 100644
index 000000000..82c6e1bfd
--- /dev/null
+++ b/extra/bootchart/build.patch
@@ -0,0 +1,34 @@
+From 4fe62e6b4c072676d246be02ba92a1df3a9d0feb Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Fri, 16 Mar 2012 01:34:10 +0100
+Subject: [PATCH] Makefile: move binary and avoid empty dirs
+
+Install to /usr/bin by default, and don't install an empty /etc.
+---
+ Makefile |   10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 566a848..c017509 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,12 +6,10 @@ CC := gcc
+ all: bootchartd
+ 
+ install: bootchartd
+-	mkdir -p $(DESTDIR)/sbin
+-	mkdir -p $(DESTDIR)/etc
+-	mkdir -p $(DESTDIR)/usr/share/doc/bootchart/
+-	install -m0755 bootchartd $(DESTDIR)/sbin/
+-	install -m0644 bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/
+-	install -m0644 README COPYING $(DESTDIR)/usr/share/doc/bootchart/
++	install -d $(DESTDIR)/usr/bin
++	install -d $(DESTDIR)/usr/share/doc/bootchart
++	install -m0755 bootchartd $(DESTDIR)/usr/bin/
++	install -m0644 README COPYING bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/
+ 
+ OBJS := log.o svg.o bootchart.o
+ 
+-- 
+1.7.9.4
+
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 9a99d37db..b90c55b5e 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153414 2012-03-13 02:15:42Z dan $
+# $Id: PKGBUILD 154397 2012-03-27 14:31:30Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.9.4
+pkgver=1.7.9.5
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -64,8 +64,8 @@ package() {
     INSTALLDIRS=vendor DESTDIR="$pkgdir" install 
 
   # bash completion
-  mkdir -p "$pkgdir"/etc/bash_completion.d/
-  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git 
+  mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
+  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git 
   # more contrib stuff
   cp -a ./contrib $pkgdir/usr/share/git/ 
   # scripts are for python 2.x
@@ -92,7 +92,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-sha1sums=('05d2ff75ffd3356516d096f992b4fb3b8b6c0079'
-          '833dc143d2d296754d681c57b41a008ff433b225'
+sha1sums=('33f5a5b0b6c8f8addbbec0b042731c44fd79f90c'
+          '37a162c22127adc82ce9fb75aacddb6428c565da'
           'f2b41828bd912b72e2cb3e14677739c4f370de66'
           '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index b49bdd3b6..61b170148 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 146574 2012-01-13 19:50:27Z ibiru $
+# $Id: PKGBUILD 154405 2012-03-27 21:06:46Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume at alaux dot net>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=(wireshark-cli wireshark-gtk)
 pkgbase=wireshark
-pkgver=1.6.5
+pkgver=1.6.6
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua')
 url="http://www.wireshark.org/"
 options=(!libtool)
-source=(http://www.wireshark.org/download/src/$pkgbase-$pkgver.tar.bz2)
-md5sums=('794948a10d387fc8e37d824ea11dbac9')
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+md5sums=('61145ccd7684b3cfb159fc902fedfecf')
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   ./configure \
       --prefix=/usr \
@@ -30,14 +30,14 @@ package_wireshark-cli() {
   install=wireshark.install
   conflicts=(wireshark)
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="${pkgdir}" install
 
   #wireshark uid group is 150
-  chgrp 150 "$pkgdir/usr/bin/dumpcap"
-  chmod 754 "$pkgdir/usr/bin/dumpcap"
-  rm "$pkgdir/usr/bin/wireshark"
+  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
+  chmod 754 "${pkgdir}/usr/bin/dumpcap"
+  rm "${pkgdir}/usr/bin/wireshark"
 }
 
 package_wireshark-gtk() {
@@ -47,11 +47,11 @@ package_wireshark-gtk() {
   replaces=(wireshark)
   conflicts=(wireshark)
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  install -Dm755 .libs/wireshark "$pkgdir/usr/bin/wireshark"
+  install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
   for d in 16 32 48; do
-      install -Dm644 image/hi${d}-app-wireshark.png "$pkgdir/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
+      install -Dm644 image/hi${d}-app-wireshark.png "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
   done
-  install -Dm644 wireshark.desktop "$pkgdir/usr/share/applications/wireshark.desktop"
+  install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
 }
diff --git a/gnome-unstable/evolution-ews/PKGBUILD b/gnome-unstable/evolution-ews/PKGBUILD
new file mode 100644
index 000000000..63b730d33
--- /dev/null
+++ b/gnome-unstable/evolution-ews/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 154373 2012-03-27 11:38:10Z heftig $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=evolution-ews
+pkgver=3.4.0
+pkgrel=1
+pkgdesc="MS Exchange integration through Exchange Web Services"
+arch=('i686' 'x86_64')
+license=('LGPL2.1')
+url="http://www.gnome.org"
+depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
+makedepends=('intltool' 'evolution')
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('2bc20f65fc645f0a76d218d483650f9c9cc75ce3104ad849af6e7eec2d5a7f72')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/evolution --disable-static
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-unstable/evolution-exchange/PKGBUILD b/gnome-unstable/evolution-exchange/PKGBUILD
new file mode 100644
index 000000000..414a126ac
--- /dev/null
+++ b/gnome-unstable/evolution-exchange/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 154369 2012-03-27 11:36:53Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=evolution-exchange
+pkgver=3.4.0
+pkgrel=1
+pkgdesc="Ximian Connector Exchange plugin for Evolution"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.ximian.com"
+depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
+makedepends=('intltool' 'evolution')
+options=('!libtool' '!emptydirs')
+install=evolution-exchange.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('7bfdf2fb44e691e7eb611aa0d1129cbacf43f7a2477fdae87f06368eecc89fb4')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/evolution --disable-static \
+      --with-libdb=/usr --with-krb5=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-exchange-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f $pkgdir/etc/gconf/schemas/*.schemas
+}
diff --git a/gnome-unstable/evolution-exchange/evolution-exchange.install b/gnome-unstable/evolution-exchange/evolution-exchange.install
new file mode 100644
index 000000000..1179887f9
--- /dev/null
+++ b/gnome-unstable/evolution-exchange/evolution-exchange.install
@@ -0,0 +1,17 @@
+pkgname=evolution-exchange
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
diff --git a/gnome-unstable/evolution-groupwise/PKGBUILD b/gnome-unstable/evolution-groupwise/PKGBUILD
new file mode 100644
index 000000000..7841c3f88
--- /dev/null
+++ b/gnome-unstable/evolution-groupwise/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 154370 2012-03-27 11:37:28Z heftig $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: György Balló <ballogy@freestart.hu>
+
+pkgname=evolution-groupwise
+pkgver=3.4.0
+pkgrel=1
+pkgdesc="GroupWise connector for evolution"
+arch=(i686 x86_64)
+url="http://projects.gnome.org/evolution/"
+license=(LGPL)
+depends=('evolution-data-server' 'gtkhtml4')
+makedepends=(intltool evolution)
+optdepends=('evolution: evolution plugin')
+options=(!libtool)
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('b5e882811d10411249accb4ce1131d2e2d336d357b68a8f5dcfe7576b320c717')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var  --disable-static
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+}
+
diff --git a/gnome-unstable/farstream/vp8.patch b/gnome-unstable/farstream/vp8.patch
new file mode 100644
index 000000000..67009a8ad
--- /dev/null
+++ b/gnome-unstable/farstream/vp8.patch
@@ -0,0 +1,12 @@
+diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences
+--- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences	2012-03-20 12:12:22.644324485 +0100
++++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences	2012-03-21 09:32:04.468634455 +0100
+@@ -41,6 +41,8 @@ feedback:nack/pli=
+ [video/H263]
+ feedback:nack/pli=
+ 
++[video/VP8-DRAFT-IETF-01]
++
+ [video/THEORA]
+ #feedback:tfrc=
+ feedback:nack/pli=
diff --git a/gnome-unstable/pidgin/port-to-farstream-v3.patch b/gnome-unstable/pidgin/port-to-farstream-v3.patch
new file mode 100644
index 000000000..93e29af50
--- /dev/null
+++ b/gnome-unstable/pidgin/port-to-farstream-v3.patch
@@ -0,0 +1,447 @@
+diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac
+--- pidgin-2.10.1.orig/configure.ac	2011-12-06 10:44:32.000000000 +0200
++++ pidgin-2.10.1/configure.ac	2012-03-10 18:21:12.000000000 +0200
+@@ -780,18 +780,18 @@ else
+ fi
+ 
+ dnl #######################################################################
+-dnl # Check for Farsight
++dnl # Check for Farstream
+ dnl #######################################################################
+-AC_ARG_ENABLE(farsight,
+-	[AC_HELP_STRING([--disable-farsight], [compile without farsight support])],
+-	enable_farsight="$enableval", enable_farsight="yes")
+-if test "x$enable_farsight" != "xno"; then
+-	PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [
+-		AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video])
+-		AC_SUBST(FARSIGHT_CFLAGS)
+-		AC_SUBST(FARSIGHT_LIBS)
++AC_ARG_ENABLE(farstream,
++	[AC_HELP_STRING([--disable-farstream], [compile without farstream support])],
++	enable_farstream="$enableval", enable_farstream="yes")
++if test "x$enable_farstream" != "xno"; then
++	PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [
++		AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video])
++		AC_SUBST(FARSTREAM_CFLAGS)
++		AC_SUBST(FARSTREAM_LIBS)
+ 	], [
+-		enable_farsight="no"
++		enable_farstream="no"
+ 	])
+ fi
+ 
+@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv,
+ 	[AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
+ 	enable_vv="$enableval", enable_vv="yes")
+ if test "x$enable_vv" != "xno"; then
+-	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then
++	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then
+ 		AC_DEFINE(USE_VV, 1, [Use voice and video])
+ 	else
+ 		enable_vv="no"
+ 		if test "x$force_deps" = "xyes"; then
+ 			AC_MSG_ERROR([
+ Dependencies for voice/video were not met.
+-Install the necessary gstreamer and farsight packages first.
++Install the necessary gstreamer and farstream packages first.
+ Or use --disable-vv if you do not need voice/video support.
+ 			])
+ 		fi
+ 	fi
+ fi
+-AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno")
++AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno")
+ 
+ dnl #######################################################################
+ dnl # Check for Internationalized Domain Name support
+diff -upr pidgin-2.10.1.orig/libpurple/Makefile.am pidgin-2.10.1/libpurple/Makefile.am
+--- pidgin-2.10.1.orig/libpurple/Makefile.am	2011-12-06 10:44:33.000000000 +0200
++++ pidgin-2.10.1/libpurple/Makefile.am	2012-03-10 18:21:19.000000000 +0200
+@@ -306,7 +306,7 @@ libpurple_la_LIBADD = \
+ 	$(LIBXML_LIBS) \
+ 	$(NETWORKMANAGER_LIBS) \
+ 	$(INTLLIBS) \
+-	$(FARSIGHT_LIBS) \
++	$(FARSTREAM_LIBS) \
+ 	$(GSTREAMER_LIBS) \
+ 	$(GSTINTERFACES_LIBS) \
+ 	$(IDN_LIBS) \
+@@ -322,7 +322,7 @@ AM_CPPFLAGS = \
+ 	$(DEBUG_CFLAGS) \
+ 	$(DBUS_CFLAGS) \
+ 	$(LIBXML_CFLAGS) \
+-	$(FARSIGHT_CFLAGS) \
++	$(FARSTREAM_CFLAGS) \
+ 	$(GSTREAMER_CFLAGS) \
+ 	$(GSTINTERFACES_CFLAGS) \
+ 	$(IDN_CFLAGS) \
+diff -upr pidgin-2.10.1.orig/libpurple/media/backend-fs2.c pidgin-2.10.1/libpurple/media/backend-fs2.c
+--- pidgin-2.10.1.orig/libpurple/media/backend-fs2.c	2011-12-06 10:44:33.000000000 +0200
++++ pidgin-2.10.1/libpurple/media/backend-fs2.c	2012-03-10 18:21:19.000000000 +0200
+@@ -1,5 +1,5 @@
+ /**
+- * @file backend-fs2.c Farsight 2 backend for media API
++ * @file backend-fs2.c Farstream backend for media API
+  * @ingroup core
+  */
+ 
+@@ -34,8 +34,9 @@
+ #include "network.h"
+ #include "media-gst.h"
+ 
+-#include <gst/farsight/fs-conference-iface.h>
+-#include <gst/farsight/fs-element-added-notifier.h>
++#include <farstream/fs-conference.h>
++#include <farstream/fs-element-added-notifier.h>
++#include <farstream/fs-utils.h>
+ 
+ /** @copydoc _PurpleMediaBackendFs2Class */
+ typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class;
+@@ -112,6 +113,8 @@ struct _PurpleMediaBackendFs2Stream
+ 	gchar *participant;
+ 	FsStream *stream;
+ 
++        gboolean supports_add;
++
+ 	GstElement *src;
+ 	GstElement *tee;
+ 	GstElement *volume;
+@@ -147,6 +150,8 @@ struct _PurpleMediaBackendFs2Private
+ 	FsConference *conference;
+ 	gchar *conference_type;
+ 
++        FsElementAddedNotifier *notifier;
++
+ 	GHashTable *sessions;
+ 	GHashTable *participants;
+ 
+@@ -212,6 +217,11 @@ purple_media_backend_fs2_dispose(GObject
+ 
+ 	purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n");
+ 
++	if (priv->notifier) {
++		g_object_unref(priv->notifier);
++		priv->notifier = NULL;
++	}
++
+ 	if (priv->confbin) {
+ 		GstElement *pipeline;
+ 
+@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus,
+ 			priv->conference != FS_CONFERENCE(src))
+ 		return;
+ 
+-	if (gst_structure_has_name(msg->structure, "farsight-error")) {
++	if (gst_structure_has_name(msg->structure, "farstream-error")) {
+ 		FsError error_no;
+ 		gst_structure_get_enum(msg->structure, "error-no",
+ 				FS_TYPE_ERROR, (gint*)&error_no);
+@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus,
+ 						" strict."));
+ 				purple_media_end(priv->media, NULL, NULL);
+ 				break;
+-			case FS_ERROR_UNKNOWN_CNAME:
+-			/*
+-			 * Unknown CName is only a problem for the
+-			 * multicast transmitter which isn't used.
+-			 * It is also deprecated.
+-			 */
+-				break;
+ 			default:
+ 				purple_debug_error("backend-fs2",
+-						"farsight-error: %i: %s\n",
++						"farstream-error: %i: %s\n",
+ 						error_no,
+ 					  	gst_structure_get_string(
+ 						msg->structure, "error-msg"));
+@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus,
+ 
+ 		if (FS_ERROR_IS_FATAL(error_no)) {
+ 			purple_media_error(priv->media, _("A non-recoverable "
+-					"Farsight2 error has occurred."));
++					"Farstream error has occurred."));
+ 			purple_media_end(priv->media, NULL, NULL);
+ 		}
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-new-local-candidate")) {
++			"farstream-new-local-candidate")) {
+ 		const GValue *value;
+ 		FsStream *stream;
+ 		FsCandidate *local_candidate;
+@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus,
+ 				session->id, name, candidate);
+ 		g_object_unref(candidate);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-local-candidates-prepared")) {
++			"farstream-local-candidates-prepared")) {
+ 		const GValue *value;
+ 		FsStream *stream;
+ 		FsParticipant *participant;
+@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus,
+ 		g_signal_emit_by_name(self, "candidates-prepared",
+ 				session->id, name);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-new-active-candidate-pair")) {
++			"farstream-new-active-candidate-pair")) {
+ 		const GValue *value;
+ 		FsStream *stream;
+ 		FsCandidate *local_candidate;
+@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus,
+ 		g_object_unref(lcandidate);
+ 		g_object_unref(rcandidate);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-recv-codecs-changed")) {
++			"farstream-recv-codecs-changed")) {
+ 		const GValue *value;
+ 		GList *codecs;
+ 		FsCodec *codec;
+@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus,
+ 		codec = codecs->data;
+ 
+ 		purple_debug_info("backend-fs2",
+-				"farsight-recv-codecs-changed: %s\n",
++				"farstream-recv-codecs-changed: %s\n",
+ 				codec->encoding_name);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-component-state-changed")) {
++			"farstream-component-state-changed")) {
+ 		const GValue *value;
+ 		FsStreamState fsstate;
+ 		guint component;
+@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus,
+ 		}
+ 
+ 		purple_debug_info("backend-fs2",
+-				"farsight-component-state-changed: "
++				"farstream-component-state-changed: "
+ 				"component: %u state: %s\n",
+ 				component, state);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-send-codec-changed")) {
++			"farstream-send-codec-changed")) {
+ 		const GValue *value;
+ 		FsCodec *codec;
+ 		gchar *codec_str;
+@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus,
+ 		codec_str = fs_codec_to_string(codec);
+ 
+ 		purple_debug_info("backend-fs2",
+-				"farsight-send-codec-changed: codec: %s\n",
++				"farstream-send-codec-changed: codec: %s\n",
+ 				codec_str);
+ 
+ 		g_free(codec_str);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-codecs-changed")) {
++			"farstream-codecs-changed")) {
+ 		const GValue *value;
+ 		FsSession *fssession;
+ 		GList *sessions;
+@@ -1220,8 +1223,12 @@ stream_info_cb(PurpleMedia *media, Purpl
+ 				purple_media_is_initiator(media, sid, name))
+ 			return;
+ 
+-		fs_stream_set_remote_candidates(stream->stream,
+-				stream->remote_candidates, &err);
++		if (stream->supports_add)
++		  fs_stream_add_remote_candidates(stream->stream,
++			  	stream->remote_candidates, &err);
++		else
++		  fs_stream_force_remote_candidates(stream->stream,
++			  	stream->remote_candidates, &err);
+ 
+ 		if (err == NULL)
+ 			return;
+@@ -1301,6 +1308,7 @@ init_conference(PurpleMediaBackendFs2 *s
+ 	GstElement *pipeline;
+ 	GstBus *bus;
+ 	gchar *name;
++	GKeyFile *default_props;
+ 
+ 	priv->conference = FS_CONFERENCE(
+ 			gst_element_factory_make(priv->conference_type, NULL));
+@@ -1343,6 +1351,14 @@ init_conference(PurpleMediaBackendFs2 *s
+ 		return FALSE;
+ 	}
+ 
++	default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference));
++	if (default_props != NULL) {
++		priv->notifier = fs_element_added_notifier_new();
++		fs_element_added_notifier_add(priv->notifier,
++					      GST_BIN(priv->confbin));
++		fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props);
++	}
++
+ 	g_signal_connect(G_OBJECT(bus), "message",
+ 			G_CALLBACK(gst_bus_cb), self);
+ 	gst_object_unref(bus);
+@@ -1559,7 +1575,7 @@ create_session(PurpleMediaBackendFs2 *se
+ 	 * receiving the src-pad-added signal.
+ 	 * Only works for non-multicast FsRtpSessions.
+ 	 */
+-	if (is_nice || !strcmp(transmitter, "rawudp"))
++	if (!!strcmp(transmitter, "multicast"))
+ 		g_object_set(G_OBJECT(session->session),
+ 				"no-rtcp-timeout", 0, NULL);
+ 
+@@ -1612,7 +1628,7 @@ create_participant(PurpleMediaBackendFs2
+ 	GError *err = NULL;
+ 
+ 	participant = fs_conference_new_participant(
+-			priv->conference, name, &err);
++			priv->conference, &err);
+ 
+ 	if (err) {
+ 		purple_debug_error("backend-fs2",
+@@ -1622,6 +1638,12 @@ create_participant(PurpleMediaBackendFs2
+ 		return FALSE;
+ 	}
+ 
++	if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant),
++					 "cname")) {
++	  g_object_set(participant, "cname", name, NULL);
++	}
++
++
+ 	if (!priv->participants) {
+ 		purple_debug_info("backend-fs2",
+ 				"Creating hash table for participants\n");
+@@ -1786,6 +1808,40 @@ create_stream(PurpleMediaBackendFs2 *sel
+ 		}
+ 	}
+ 
++
++	session = get_session(self, sess_id);
++
++	if (session == NULL) {
++		purple_debug_error("backend-fs2",
++				"Couldn't find session to create stream.\n");
++		return FALSE;
++	}
++
++	participant = get_participant(self, who);
++
++	if (participant == NULL) {
++		purple_debug_error("backend-fs2", "Couldn't find "
++				"participant to create stream.\n");
++		return FALSE;
++	}
++
++	fsstream = fs_session_new_stream(session->session, participant,
++			initiator == TRUE ? type_direction :
++			(type_direction & FS_DIRECTION_RECV), &err);
++
++	if (fsstream == NULL) {
++		if (err) {
++			purple_debug_error("backend-fs2",
++					"Error creating stream: %s\n",
++					err && err->message ?
++					err->message : "NULL");
++			g_error_free(err);
++		} else
++			purple_debug_error("backend-fs2",
++					"Error creating stream\n");
++		return FALSE;
++	}
++
+ 	memcpy(_params, params, sizeof(GParameter) * num_params);
+ 
+ 	/* set the controlling mode parameter */
+@@ -1840,45 +1896,22 @@ create_stream(PurpleMediaBackendFs2 *sel
+ 		_num_params++;
+ 	}
+ 
+-	session = get_session(self, sess_id);
+ 
+-	if (session == NULL) {
+-		purple_debug_error("backend-fs2",
+-				"Couldn't find session to create stream.\n");
+-		return FALSE;
+-	}
+-
+-	participant = get_participant(self, who);
+-
+-	if (participant == NULL) {
+-		purple_debug_error("backend-fs2", "Couldn't find "
+-				"participant to create stream.\n");
+-		return FALSE;
++	if(!fs_stream_set_transmitter(fsstream, transmitter,
++				      _params, _num_params, &err)) {
++	     purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message);
++	     g_clear_error(&err);
++	     g_free(_params);
++	     return FALSE;
+ 	}
+-
+-	fsstream = fs_session_new_stream(session->session, participant,
+-			initiator == TRUE ? type_direction :
+-			(type_direction & FS_DIRECTION_RECV), transmitter,
+-			_num_params, _params, &err);
+ 	g_free(_params);
+ 
+-	if (fsstream == NULL) {
+-		if (err) {
+-			purple_debug_error("backend-fs2",
+-					"Error creating stream: %s\n",
+-					err && err->message ?
+-					err->message : "NULL");
+-			g_error_free(err);
+-		} else
+-			purple_debug_error("backend-fs2",
+-					"Error creating stream\n");
+-		return FALSE;
+-	}
+ 
+ 	stream = g_new0(PurpleMediaBackendFs2Stream, 1);
+ 	stream->participant = g_strdup(who);
+ 	stream->session = session;
+ 	stream->stream = fsstream;
++	stream->supports_add = !strcmp(transmitter, "nice");
+ 
+ 	priv->streams =	g_list_append(priv->streams, stream);
+ 
+@@ -1991,7 +2024,11 @@ purple_media_backend_fs2_add_remote_cand
+ 	if (purple_media_is_initiator(priv->media, sess_id, participant) ||
+ 			purple_media_accepted(
+ 			priv->media, sess_id, participant)) {
+-		fs_stream_set_remote_candidates(stream->stream,
++  	        if (stream->supports_add)
++		     fs_stream_add_remote_candidates(stream->stream,
++				stream->remote_candidates, &err);
++		else
++		     fs_stream_force_remote_candidates(stream->stream,
+ 				stream->remote_candidates, &err);
+ 
+ 		if (err) {
+diff -upr pidgin-2.10.1.orig/libpurple/media.c pidgin-2.10.1/libpurple/media.c
+--- pidgin-2.10.1.orig/libpurple/media.c	2011-12-06 10:44:33.000000000 +0200
++++ pidgin-2.10.1/libpurple/media.c	2012-03-10 18:21:19.000000000 +0200
+@@ -1067,7 +1067,6 @@ purple_media_add_stream(PurpleMedia *med
+ {
+ #ifdef USE_VV
+ 	PurpleMediaSession *session;
+-	PurpleMediaStream *stream = NULL;
+ 
+ 	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+ 
+@@ -1103,7 +1102,7 @@ purple_media_add_stream(PurpleMedia *med
+ 	}
+ 
+ 	if (purple_media_get_stream(media, sess_id, who) == NULL) {
+-		stream = purple_media_insert_stream(session, who, initiator);
++		purple_media_insert_stream(session, who, initiator);
+ 
+ 		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
+ 				0, PURPLE_MEDIA_STATE_NEW,
+diff -upr pidgin-2.10.1.orig/libpurple/mediamanager.c pidgin-2.10.1/libpurple/mediamanager.c
+--- pidgin-2.10.1.orig/libpurple/mediamanager.c	2011-12-06 10:44:33.000000000 +0200
++++ pidgin-2.10.1/libpurple/mediamanager.c	2012-03-10 18:27:05.000000000 +0200
+@@ -39,7 +39,7 @@
+ #ifdef USE_VV
+ #include <media/backend-fs2.h>
+ 
+-#include <gst/farsight/fs-element-added-notifier.h>
++#include <farstream/fs-element-added-notifier.h>
+ #include <gst/interfaces/xoverlay.h>
+ 
+ /** @copydoc _PurpleMediaManagerPrivate */
diff --git a/testing/expat/CVE-2009-3560.patch b/testing/expat/CVE-2009-3560.patch
new file mode 100644
index 000000000..5fe9c36c8
--- /dev/null
+++ b/testing/expat/CVE-2009-3560.patch
@@ -0,0 +1,13 @@
+diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c
+--- trunk~/lib/xmlparse.c	2007-05-08 04:25:35.000000000 +0200
++++ trunk/lib/xmlparse.c	2009-12-29 21:57:22.141732904 +0100
+@@ -3703,6 +3703,9 @@
+         return XML_ERROR_UNCLOSED_TOKEN;
+       case XML_TOK_PARTIAL_CHAR:
+         return XML_ERROR_PARTIAL_CHAR;
++      case -XML_TOK_PROLOG_S:
++        tok = -tok;
++        break;
+       case XML_TOK_NONE:
+ #ifdef XML_DTD
+         /* for internal PE NOT referenced between declarations */
diff --git a/testing/expat/CVE-2009-3720.patch b/testing/expat/CVE-2009-3720.patch
new file mode 100644
index 000000000..65d16431f
--- /dev/null
+++ b/testing/expat/CVE-2009-3720.patch
@@ -0,0 +1,12 @@
+diff -urNad trunk~/lib/xmltok_impl.c trunk/lib/xmltok_impl.c
+--- trunk~/lib/xmltok_impl.c	2006-11-26 18:34:46.000000000 +0100
++++ trunk/lib/xmltok_impl.c	2009-10-22 21:42:41.000000000 +0200
+@@ -1744,7 +1744,7 @@
+                        const char *end,
+                        POSITION *pos)
+ {
+-  while (ptr != end) {
++  while (ptr < end) {
+     switch (BYTE_TYPE(enc, ptr)) {
+ #define LEAD_CASE(n) \
+     case BT_LEAD ## n: \
diff --git a/testing/expat/PKGBUILD b/testing/expat/PKGBUILD
new file mode 100644
index 000000000..b727138dc
--- /dev/null
+++ b/testing/expat/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 154410 2012-03-28 00:03:38Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Committer: Judd Vinet <jvinet@zeroflux.org>
+
+pkgname=expat
+pkgver=2.1.0
+pkgrel=1
+pkgdesc="An XML parser library"
+arch=('i686' 'x86_64')
+url="http://expat.sourceforge.net/"
+license=('custom')
+depends=('glibc')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz)
+md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
diff --git a/testing/gnupg/install b/testing/gnupg/install
new file mode 100644
index 000000000..3a5dc9fd6
--- /dev/null
+++ b/testing/gnupg/install
@@ -0,0 +1,20 @@
+info_dir=/usr/share/info
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    usr/bin/install-info ${info_dir}/$f ${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
+    usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null
+  done
+}