Fri Feb 3 23:15:07 UTC 2012

31 files changed, 637 insertions, 97 deletions

diff --git a/community-testing/amsn/PKGBUILD b/community-testing/amsn/PKGBUILD
index 7a617d3d5..2b2c84101 100644
--- a/community-testing/amsn/PKGBUILD
+++ b/community-testing/amsn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63376 2012-01-31 17:40:02Z jelle $
+# $Id: PKGBUILD 63431 2012-02-02 21:11:19Z jelle $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jeff Mickey <j@codemac.net>
diff --git a/community/dos2unix/PKGBUILD b/community/dos2unix/PKGBUILD
index 5c7dd4848..569a63161 100644
--- a/community/dos2unix/PKGBUILD
+++ b/community/dos2unix/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Gerson E. Ruotolo <gersonruotolo@globo.com>
 
 pkgname=dos2unix
-pkgver=5.3.1
-pkgrel=3
+pkgver=5.3.2
+pkgrel=1
 pkgdesc='Text file format converter'
 arch=('i686' 'x86_64')
 url='http://waterlan.home.xs4all.nl/dos2unix.html'
@@ -13,7 +13,7 @@ depends=('glibc')
 makedepends=('perl')
 conflicts=('hd2u')
 source=("http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('438c48ebd6891b80b58de14c022ca69e')
+md5sums=('aa2768f3e1223f0e8f30e6449d398872')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/drbd/01-remove-old-sanity-check.diff b/community/drbd/01-remove-old-sanity-check.diff
new file mode 100644
index 000000000..04edb7571
--- /dev/null
+++ b/community/drbd/01-remove-old-sanity-check.diff
@@ -0,0 +1,24 @@
+From: Lars Ellenberg <lars.ellenberg@linbit.com>
+Date: Thu, 3 Nov 2011 09:40:43 +0000 (+0100)
+Subject: build: remove old sanity check to allow build against linux 3.1
+X-Git-Url: http://git.drbd.org/gitweb.cgi?p=drbd-8.3.git;a=commitdiff_plain;h=790c26b09519b9e02b3a7cf7897fb17c2ae339bf
+
+build: remove old sanity check to allow build against linux 3.1
+---
+
+diff --git a/drbd/Makefile b/drbd/Makefile
+index 0985340..7a09603 100644
+--- a/drbd/Makefile
++++ b/drbd/Makefile
+@@ -90,11 +90,6 @@ else
+     endif
+   endif
+ 
+-  KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3)
+-  ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
+-    $(error "won't compile with this kernel version")
+-  endif
+-
+   .PHONY: drbd.o default all greeting clean kbuild install dep tags
+ 
+   drbd.o: greeting kbuild
diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD
new file mode 100644
index 000000000..68d7dea8a
--- /dev/null
+++ b/community/drbd/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 63408 2012-02-02 10:00:55Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+
+pkgname=drbd
+pkgver=8.3.11
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='Userland tools for drbd block devices'
+url='http://www.drbd.org'
+license=('GPL2')
+source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz"
+        "$pkgname.rc"
+        '01-remove-old-sanity-check.diff')
+backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
+md5sums=('e47a35a80143b72e9708844efbe2e608'
+         '19236c6fe7a8c9191d67a4df15892b78'
+         '24144d23b31f9ce66929fe989247c779')
+
+build() {
+  cd $pkgname-$pkgver
+  # patch bad sanity check in makefile
+  patch -p1 -i ../01-remove-old-sanity-check.diff
+  ./configure \
+    --prefix=/usr \
+    --localstatedir=/var \
+    --sysconfdir=/etc \
+    --with-distro=generic \
+    --with-utils \
+    --with-bashcompletion \
+    --with-udev \
+    --without-km \
+    --without-rgmanager \
+    --without-pacemaker \
+    --without-heartbeat \
+    --without-xen \
+    --with-initdir=/etc/rc.d
+    #--with-legacy_utils \
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # move udev files to the right place
+  install -d -m 755 "$pkgdir/lib"
+  mv "$pkgdir/etc/udev" "$pkgdir/lib"
+
+  # remove /var/lock
+  rmdir "$pkgdir/var/lock"
+
+  # replace 
+  install -D -m 755 "$srcdir/$pkgname.rc" "$pkgdir/etc/rc.d/$pkgname"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/drbd/drbd.rc b/community/drbd/drbd.rc
new file mode 100644
index 000000000..7aca1f394
--- /dev/null
+++ b/community/drbd/drbd.rc
@@ -0,0 +1,58 @@
+#!/bin/bash
+# Written by Sébastien Luttringer
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DRBDADM='/sbin/drbdadm'
+PROC_DRBD='/proc/drbd'
+
+check_config() {
+  # check if module is loaded
+  if [[ ! -e $PROC_DRBD ]]; then
+    echo "Missing $PROC_DRBD. Try to load drbd module!"
+    stat_fail
+    exit 1
+  fi
+  # check if config is correct
+  if ! $DRBDADM dump &>/dev/null; then
+      echo 'Invalid configuration'
+      stat_fail
+      exit 1
+  fi
+}
+
+case "$1" in
+  start)
+    stat_busy 'Starting DRBD resources'
+    # check module and config
+    check_config
+    # load config
+    $DRBDADM adjust all 2>/dev/null || { stat_fail; exit 1; }
+    # User interruptible version of wait-connect all
+    $DRBDADM wait-con-int 2>/dev/null || { stat_fail; exit 1; }
+    # Become primary if configured
+    $DRBDADM sh-b-pri all 2>/dev/nul l|| { stat_fail; exit 1; }
+    add_daemon drbd
+    stat_done
+    ;;
+  stop)
+    stat_busy 'Stopping DRBD resources'
+    # check module and config
+    check_config
+    # disconnect and detach all resources
+    $DRBDADM down all 2>/dev/null || { stat_fail; exit 1; }
+    rm_daemon drbd
+    stat_done
+    ;;
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+
+exit 0
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD
index c2e105479..af16ee713 100644
--- a/community/luakit/PKGBUILD
+++ b/community/luakit/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=luakit
 pkgver=2011.07.22
-pkgrel=2
-pkgdesc='luakit is a highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit."Stable" release'
+pkgrel=4
+pkgdesc='Highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit. "Stable" release.'
 arch=('i686' 'x86_64')
 url='http://www.luakit.org/projects/luakit'
 license=('GPL3')
-depends=('libwebkit' 'luafilesystem' 'libunique')
+depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils')
 makedepends=('git' 'help2man')
-options=(!makeflags)  
+options=(!makeflags)
 conflicts=('luakit-git' 'luakit-develop-git')
 install='luakit.install'
 source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}-r1")
@@ -19,6 +19,9 @@ md5sums=('4937deb6bc81416e2deb037f4a5763e4')
 build() {
   cd mason-larobina-luakit-*
 
+  # Add missing library to PKGS in config.mk
+  sed -i 's|PKGS := .*|& javascriptcoregtk-1.0|' config.mk
+
   make PREFIX=/usr DESTDIR=${pkgdir} all
 }
 
diff --git a/community/luakit/luakit.install b/community/luakit/luakit.install
index c80d7609f..2c37d0597 100644
--- a/community/luakit/luakit.install
+++ b/community/luakit/luakit.install
@@ -4,7 +4,11 @@ post_install() {
   echo 'Or edit in place for global changes.'
   echo 'You NEED to replace local configs after each update'
 }
- 
+
 post_upgrade() {
-  post_install ${1}
+  update-desktop-database -q
+}
+
+post_remove() {
+  post_upgrade
 }
diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD
index cfd72dee2..6228acf07 100644
--- a/community/mashup/PKGBUILD
+++ b/community/mashup/PKGBUILD
@@ -2,16 +2,16 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=mashup
-pkgver=3.3
+pkgver=3.5
 pkgrel=1
 pkgdesc="Adjusting images on a sheet of paper for printing"
 url="http://kornelix.squarespace.com/$pkgname"
 arch=('i686' 'x86_64')
 license=('GPL3')
-depends=('gtk2')
+depends=('gtk3')
 replaces=('printoxx')
 source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('0d8286747d5cd1a65907c7d70c7a99e5')
+md5sums=('9ce1e5b734a149e84e4dae366dc2c1c1')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 217b6651d..ec3def46c 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.6.9
+pkgver=0.6.10
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('c2d2aee123a141ba8431855f1d9c8200')
+md5sums=('8a74fd5d48c2c7c64abc60b2b8f3fbc7')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/pigz/PKGBUILD b/community/pigz/PKGBUILD
index b379fe2ea..cc1e07c26 100755
--- a/community/pigz/PKGBUILD
+++ b/community/pigz/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=pigz
-pkgver=2.1.7
+pkgver=2.2.3
 pkgrel=1
 pkgdesc="Parallel implementation of the gzip file compressor"
 arch=('i686' 'x86_64')
@@ -11,28 +11,28 @@ url="http://www.zlib.net/pigz/"
 license=('custom')
 depends=('zlib')
 source=(http://www.zlib.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('a09e1097fdc05ac0fff763bdb4d2d5e4')
+md5sums=('8330a6c6a3e5f1954687aaba4b973a6f')
 
 build() {
-  cd "${srcdir}/$pkgname"
-  sed -i s/"CFLAGS=".*/"CFLAGS=${CFLAGS}"/g Makefile 
+  cd "${srcdir}/$pkgname-$pkgver"
+  #sed -i s/"CFLAGS=".*/"CFLAGS=${CFLAGS}"/g Makefile 
   make
 }
 
 package() {
-  cd "${srcdir}/$pkgname"
+  cd "${srcdir}/$pkgname-$pkgver"
 
-  install -Dm755 "${srcdir}"/${pkgname}/${pkgname} \
+  install -Dm755 "${srcdir}"/${pkgname}-$pkgver/${pkgname} \
     "${pkgdir}"/usr/bin/${pkgname} 
 
   pushd "${pkgdir}"/usr/bin
     ln -s pigz unpigz 
   popd
 
-  install -Dm644 "${srcdir}"/${pkgname}/${pkgname}.1 \
+  install -Dm644 "${srcdir}"/${pkgname}-$pkgver/${pkgname}.1 \
     "${pkgdir}"/usr/share/man/man1/${pkgname}.1
-  install -Dm644 "${srcdir}"/${pkgname}/${pkgname}.pdf \
+  install -Dm644 "${srcdir}"/${pkgname}-$pkgver/${pkgname}.pdf \
     "${pkgdir}"/usr/share/doc/${pkgname}/${pkgname}.pdf
-  install -Dm644 "${srcdir}"/${pkgname}/README \
+  install -Dm644 "${srcdir}"/${pkgname}-$pkgver/README \
     "${pkgdir}"/usr/share/licenses/${pkgname}/README
 }
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index 7e1d7006d..ce2265250 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 62237 2012-01-18 17:30:42Z bpiotrowski $
+# $Id: PKGBUILD 63424 2012-02-02 19:11:13Z bpiotrowski $
 # Maintainer:  Mateusz Herych <heniekk@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Vasco Costa <vasco.costa@meiodigital.com>
 
 pkgname=pokerth
 _realname=PokerTH
-pkgver=0.9.1
+pkgver=0.9.2
 pkgrel=1
 pkgdesc="Poker game written in C++/QT4"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls'
          'qt' 'sdl_mixer' 'libircclient' 'tinyxml')
 makedepends=('boost')
 source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2)
-md5sums=('c22ec528ebb47c44b93149b63619004f')
+md5sums=('d1855713756be9072b275ee3754a4ff0')
 
 build() {
   cd "$srcdir/$_realname-$pkgver-src"
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index 3696fde67..d7dfe1f74 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 62794 2012-01-27 01:24:10Z bisson $
+# $Id: PKGBUILD 63410 2012-02-02 10:13:55Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=unbound
-pkgver=1.4.15
+pkgver=1.4.16
 pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='http://unbound.net/'
@@ -18,7 +18,7 @@ backup=('etc/unbound/unbound.conf')
 source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
         'unbound.conf'
         'rc.d')
-sha1sums=('bbda46664ea8391ca7986300ce98a79787c0e322'
+sha1sums=('68ed8737b1a6e3f9a67812f7e962fd6740494c1e'
           '5d473ec2943fd85367cdb653fcd58e186f07383f'
           'dc96e772f467b32555df21d16fdb15e98194c228')
 
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index bb7f1e9ca..b16f64c3d 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 145829 2012-01-02 13:33:45Z bisson $
+# $Id: PKGBUILD 148518 2012-02-03 01:12:43Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=feh
-pkgver=2.2
+pkgver=2.3
 pkgrel=1
 pkgdesc='Fast and light imlib2-based image viewer'
 url='http://feh.finalrewind.org/'
@@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama')
 optdepends=('perl: feh-cam, webcam wrapper for feh')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('655db5f558cdb268ff55cb088994d78331bd39aa')
+sha1sums=('9f42ba920baeb405777f834546223a9ff9eb43e7')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index 35bf8e8ed..dcf320118 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146493 2012-01-11 16:54:55Z giovanni $
+# $Id: PKGBUILD 148480 2012-02-02 09:45:02Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.0.2
+pkgver=2.1
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('226b45f19bebf73446fcd73ccb678c52'
+md5sums=('d2ca44f8d0129ab50639143af99d9363'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/netcdf/PKGBUILD b/extra/netcdf/PKGBUILD
index 326e3483e..2280b03f5 100644
--- a/extra/netcdf/PKGBUILD
+++ b/extra/netcdf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131006 2011-07-09 12:58:02Z ronald $
+# $Id: PKGBUILD 148503 2012-02-02 20:25:58Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=netcdf
 pkgver=4.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library"
 arch=("i686" "x86_64")
 url="http://www.unidata.ucar.edu/downloads/netcdf/index.jsp"
@@ -18,7 +18,7 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-shared --enable-netcdf-4 --enable-dap-netcdf
   make
-  make check
+#  make check
 }
 
 package() {
diff --git a/extra/orage/PKGBUILD b/extra/orage/PKGBUILD
index a5914f3d1..070e9d1a7 100644
--- a/extra/orage/PKGBUILD
+++ b/extra/orage/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 138200 2011-09-18 14:48:57Z andyrtr $
+# $Id: PKGBUILD 148476 2012-02-02 05:16:18Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=orage
-pkgver=4.8.2
+pkgver=4.8.3
 pkgrel=1
 pkgdesc="A simple calendar application with reminders for Xfce"
 arch=('i686' 'x86_64')
@@ -15,11 +15,11 @@ makedepends=('intltool' 'xfce4-dev-tools' 'popt')
 options=('!libtool')
 replaces=('xfcalendar')
 install=${pkgname}.install
-source=(http://archive.xfce.org/src/apps/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('950397c716c31e1aa5db83d35ddf6047')
+source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('f4f89ea1f301514c419e7643661b510132ebb012')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -31,6 +31,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make -j1 DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 DESTDIR="${pkgdir}" install
 }
diff --git a/extra/perl-crypt-openssl-bignum/PKGBUILD b/extra/perl-crypt-openssl-bignum/PKGBUILD
new file mode 100644
index 000000000..a97048a6a
--- /dev/null
+++ b/extra/perl-crypt-openssl-bignum/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 47483 2011-05-23 15:54:16Z tdziedzic $
+# Maintainer: Florian Pritz <bluewind@xinu.at>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=perl-crypt-openssl-bignum
+pkgver=0.04
+pkgrel=6
+pkgdesc="OpenSSL's multiprecision integer arithmetic "
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum"
+depends=('perl' 'openssl')
+license=('GPL')
+options=('!emptydirs')
+source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Bignum-$pkgver.tar.gz)
+md5sums=('9369ef722b0705c0604998559988eb18')
+
+build() {
+  cd  "$srcdir/Crypt-OpenSSL-Bignum-$pkgver"
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+
+check() {
+  cd  "$srcdir/Crypt-OpenSSL-Bignum-$pkgver"
+
+  make test
+}
+
+package() {
+  cd  "$srcdir/Crypt-OpenSSL-Bignum-$pkgver"
+
+  make pure_install doc_install DESTDIR="$pkgdir"
+  find "$pkgdir" -name '.packlist' -delete
+  find "$pkgdir" -name '*.pod' -delete
+}
diff --git a/extra/perl-crypt-openssl-random/PKGBUILD b/extra/perl-crypt-openssl-random/PKGBUILD
new file mode 100644
index 000000000..b193f95c2
--- /dev/null
+++ b/extra/perl-crypt-openssl-random/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 47486 2011-05-23 15:55:23Z tdziedzic $
+# Maintainer: Florian Pritz <bluewind@xinu.at>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=perl-crypt-openssl-random
+pkgver=0.04
+pkgrel=6
+pkgdesc="Interface to OpenSSL PRNG methods"
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/dist/Crypt-OpenSSL-Random"
+depends=('perl' 'openssl')
+license=('GPL')
+options=('!emptydirs')
+source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Random-$pkgver.tar.gz)
+md5sums=('c56ac5dbdd46122eb9b8da59613b7b0a')
+
+build() {
+  cd  "$srcdir/Crypt-OpenSSL-Random-$pkgver"
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd  "$srcdir/Crypt-OpenSSL-Random-$pkgver"
+
+  make test
+}
+
+package() {
+  cd  "$srcdir/Crypt-OpenSSL-Random-$pkgver"
+
+  make pure_install doc_install DESTDIR="$pkgdir"
+  find "$pkgdir" -name '.packlist' -delete
+  find "$pkgdir" -name '*.pod' -delete
+}
diff --git a/extra/perl-crypt-openssl-rsa/PKGBUILD b/extra/perl-crypt-openssl-rsa/PKGBUILD
new file mode 100644
index 000000000..38a159e49
--- /dev/null
+++ b/extra/perl-crypt-openssl-rsa/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 56402 2011-10-07 09:48:12Z spupykin $
+# Maintainer: Florian Pritz <bluewind@xinu.at> 
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=perl-crypt-openssl-rsa
+pkgver=0.28
+pkgrel=2
+pkgdesc="Interface to OpenSSL RSA methods"
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA"
+depends=('perl-crypt-openssl-random' 'perl-crypt-openssl-bignum')
+license=('GPL')
+options=('!emptydirs')
+source=("http://search.cpan.org/CPAN/authors/id/P/PE/PERLER/Crypt-OpenSSL-RSA-$pkgver.tar.gz")
+md5sums=('86217a5036fc63779c30420b5fd84129')
+
+build() {
+  cd  "$srcdir/Crypt-OpenSSL-RSA-$pkgver"
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd  "$srcdir/Crypt-OpenSSL-RSA-$pkgver"
+
+  make test
+}
+
+package() {
+  cd  "$srcdir/Crypt-OpenSSL-RSA-$pkgver"
+  make pure_install doc_install DESTDIR="$pkgdir"
+  find "$pkgdir" -name '.packlist' -delete
+  find "$pkgdir" -name '*.pod' -delete
+}
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 7fe8d6ab4..adafb826c 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146477 2012-01-11 15:22:26Z stephane $
+# $Id: PKGBUILD 148505 2012-02-02 21:11:43Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,8 +21,8 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.9
-_suhosinver=5.3.7-0.9.10
+pkgver=5.3.10
+_suhosinver=5.3.9-0.9.10
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -36,9 +36,9 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm')
-md5sums=('dd3288ed5c08cd61ac5bf619cb357521'
-         '08582e502fed8221c6577042ca45ddb8'
-         '5bf4473f658404aa9a97bf026ecef8e9'
+md5sums=('816259e5ca7d0a7e943e56a3bb32b17f'
+         'c099b3d7eac95018ababd41ded7f3066'
+         'c15d18f846be1d69144a5d0056ee6506'
          'ffc338e8ce2a990f6f2a486355bbab65'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          'b01be5f816988fcee7e78225836e5e27'
@@ -137,7 +137,7 @@ build() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	# apply suhosin patch
-	sed 's/1997-2011/1997-2012/g' ${srcdir}/suhosin-patch-${_suhosinver}.patch | patch -p1
+	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
 
 	# adjust paths
 	patch -p0 -i ${srcdir}/php.ini.patch
diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD
index a2a2cf8b6..e399b0538 100644
--- a/extra/tcpdump/PKGBUILD
+++ b/extra/tcpdump/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145890 2012-01-03 19:57:08Z giovanni $
+# $Id: PKGBUILD 148483 2012-02-02 13:39:36Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=tcpdump
 pkgver=4.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for network monitoring and data acquisition"
 arch=('i686' 'x86_64')
 url="http://www.tcpdump.org"
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index d0448db77..0f423222d 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 145467 2011-12-22 20:32:10Z ibiru $
+# $Id: PKGBUILD 148515 2012-02-02 23:34:39Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
-pkgver=9.0.1
-pkgrel=1
+pkgver=10.0
+pkgrel=0
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2')
 makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/firefox-$pkgver.source.tar.bz2
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
         mozconfig
         mozilla-pkgconfig.patch)
 options=('!emptydirs')
 replaces=('xulrunner-oss')
-md5sums=('7cf2bd379792a9b232267c6a79680566'
+md5sums=('13c61203ccfa583e5a54b4dc22f41233'
          '8dfb78c5bd0581c8cf4753813132bf0b'
          '27271ce647a83906ef7a24605e840d61')
 
@@ -26,6 +26,7 @@ build() {
   #fix libdir/sdkdir - fedora
   patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
 
+
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
   export PYTHON="/usr/bin/python2"
 
diff --git a/testing/feh/PKGBUILD b/testing/feh/PKGBUILD
index 5227a7524..7602f6744 100644
--- a/testing/feh/PKGBUILD
+++ b/testing/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 148093 2012-01-30 18:45:32Z ibiru $
+# $Id: PKGBUILD 148520 2012-02-03 01:14:17Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=feh
-pkgver=2.2
+pkgver=2.3
 pkgrel=2
 pkgdesc='Fast and light imlib2-based image viewer'
 url='http://feh.finalrewind.org/'
@@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama')
 optdepends=('perl: feh-cam, webcam wrapper for feh')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('655db5f558cdb268ff55cb088994d78331bd39aa')
+sha1sums=('9f42ba920baeb405777f834546223a9ff9eb43e7')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/testing/foobillard++/PKGBUILD b/testing/foobillard++/PKGBUILD
new file mode 100644
index 000000000..1debfca9a
--- /dev/null
+++ b/testing/foobillard++/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 148501 2012-02-02 20:08:26Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=foobillard++
+pkgver=3.42beta
+pkgrel=3
+pkgdesc="An OpenGL billiard game"
+arch=('i686' 'x86_64')
+url="http://foobillardplus.sourceforge.net/"
+license=('GPL2')
+depends=('freetype2' 'libpng' 'mesa' 'sdl_net' 'sdl_mixer')
+replaces=('foobillard')
+source=(http://downloads.sourceforge.net/foobillardplus/foobillardplus-${pkgver}.tar.gz)
+sha1sums=('51507efab0f595cfff26149003faf669c0a42f32')
+
+build() {
+  cd "${srcdir}/foobillardplus-${pkgver}"
+  sed -i 's|/opt/foobillardplus/bin/||' foobillardplus.desktop
+  sed -i 's|/opt/foobillardplus/||' foobillardplus.desktop
+  aclocal --force
+  autoconf -f
+  autoheader -f
+  automake -a -c -f 
+  ./configure --prefix=/usr/share
+  make
+}
+
+package() {
+  cd "${srcdir}/foobillardplus-${pkgver}"
+  make DESTDIR="${pkgdir}" datadir="${pkgdir}/usr/share/foobillardplus/data" \
+    prefix="${pkgdir}/usr/share" install
+
+  install -d "${pkgdir}"/usr/{bin,share/{applications,pixmaps}}
+  mv "${pkgdir}"/usr/share/{AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO} "${pkgdir}/usr/share/foobillardplus" 
+  mv "${pkgdir}"/usr/share/foobillardplus.desktop "${pkgdir}"/usr/share/applications
+  mv "${pkgdir}"/usr/share/foobillardplus.{png,xbm} "${pkgdir}"/usr/share/pixmaps
+  ln -s /usr/share/foobillardplus/bin/foobillardplus "${pkgdir}"/usr/bin/foobillardplus
+}
diff --git a/testing/gimp/PKGBUILD b/testing/gimp/PKGBUILD
index ee911ffd7..8f14a02ad 100644
--- a/testing/gimp/PKGBUILD
+++ b/testing/gimp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148115 2012-01-30 18:46:22Z ibiru $
+# $Id: PKGBUILD 148478 2012-02-02 08:21:50Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 
 pkgname=gimp
-pkgver=2.6.11
-pkgrel=8
+pkgver=2.6.12
+pkgrel=1
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64')
 url="http://www.gimp.org/"
@@ -20,20 +20,15 @@ options=('!libtool' '!makeflags')
 conflicts=('gimp-devel')
 install=gimp.install
 source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
-        uri-backend-libcurl.patch gimp-poppler-0.18.patch libpng_compile.patch)
-sha1sums=('2f9d596e727bdbf304fa78257c1731d9faf3934c'
+        uri-backend-libcurl.patch)
+sha1sums=('82964e3d4eb003239f3443a1bccac53f5d780e15'
           '110ce9798173b19a662d086ed7b882b4729f06cf'
-          'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4'
-          '1479a6d80be7adf74f66a3b88057a5029fe892e8'
-          '5ce329d2e2cb136e93f16117fa79ab6e31866f68')
+          'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 < ../uri-backend-libcurl.patch
-  patch -p1 < ../gimp-poppler-0.18.patch
-  patch -p1 < ../libpng_compile.patch
-  PYTHON=/usr/bin/python2 LIBS+="-lgobject-2.0 -lglib-2.0 -lm" \
-    ./configure --prefix=/usr --sysconfdir=/etc \
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
     --enable-mp --enable-gimp-console --enable-gimp-remote \
     --enable-python --with-gif-compression=lzw --with-libcurl \
     --without-aa --without-hal --without-gvfs --without-gnomevfs
diff --git a/testing/libpng/PKGBUILD b/testing/libpng/PKGBUILD
index d0d182d8c..a87bf974f 100644
--- a/testing/libpng/PKGBUILD
+++ b/testing/libpng/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 148211 2012-01-30 18:48:21Z ibiru $
+# $Id: PKGBUILD 148513 2012-02-02 22:26:40Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Travis Willard <travis@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=libpng
-pkgver=1.5.7
+pkgver=1.5.8
 _apngver=1.5.7
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
@@ -16,7 +16,7 @@ depends=('zlib' 'sh')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
         "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('c3ae9ce4e81ec0aafdd4ac961586ee0d'
+md5sums=('0f7ae352beadaff78073733905613041'
          '6c6a674048cec94db1bc35decf0d142c')
 
 build() {
diff --git a/testing/libwebkit/PKGBUILD b/testing/libwebkit/PKGBUILD
index f363e2428..e7b30f287 100644
--- a/testing/libwebkit/PKGBUILD
+++ b/testing/libwebkit/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 148223 2012-01-30 18:48:38Z ibiru $
+# $Id: PKGBUILD 148493 2012-02-02 15:30:16Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.6.3
+pkgrel=1
 pkgdesc="An opensource web content engine"
 arch=('i686' 'x86_64')
 url="http://webkitgtk.org/"
 license=('custom')
 depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant')
-makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
+makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
 options=('!libtool' '!emptydirs')
 install=libwebkit.install
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('c11743694b1b71dad287b2e7a9e73b05')
+source=(http://webkitgtk.org/webkit-$pkgver.tar.xz)
+sha256sums=('12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3')
 
 build() {
-  cd "${srcdir}/webkit-${pkgver}"
+  cd "$srcdir/webkit-$pkgver"
   mkdir build-gtk{2,3}
 
   ( cd build-gtk2 && _build --with-gtk=2.0 )
@@ -27,7 +27,7 @@ build() {
 _build() {
   PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
     --enable-introspection \
-    --with-font-backend=freetype --enable-gtk-doc \
+    --with-font-backend=freetype \
     --with-unicode-backend=icu \
     --enable-spellcheck "$@"
   make all stamp-po
@@ -39,14 +39,14 @@ package_libwebkit() {
 
   cd "$srcdir/webkit-$pkgver/build-gtk2"
   make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit/LICENSE"
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE"
 }
 
 package_libwebkit3() {
   pkgdesc+=" (for GTK3)"
   depends+=(gtk3)
 
-  cd "${srcdir}/webkit-${pkgver}/build-gtk3"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit3/LICENSE"
+  cd "$srcdir/webkit-$pkgver/build-gtk3"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE"
 }
diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD
index 3bace4127..5ad593b08 100644
--- a/testing/php/PKGBUILD
+++ b/testing/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148255 2012-01-30 18:49:23Z ibiru $
+# $Id: PKGBUILD 148508 2012-02-02 21:31:10Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.9
+pkgver=5.3.10
 _suhosinver=5.3.9-0.9.10
 pkgrel=2
 arch=('i686' 'x86_64')
@@ -36,7 +36,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm')
-md5sums=('dd3288ed5c08cd61ac5bf619cb357521'
+md5sums=('816259e5ca7d0a7e943e56a3bb32b17f'
          'c099b3d7eac95018ababd41ded7f3066'
          'c15d18f846be1d69144a5d0056ee6506'
          'ffc338e8ce2a990f6f2a486355bbab65'
diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD
index 4c358d6de..39f54a751 100644
--- a/testing/vlc/PKGBUILD
+++ b/testing/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 148335 2012-01-30 18:51:20Z ibiru $
+# $Id: PKGBUILD 148497 2012-02-02 17:27:11Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=1.1.13
-pkgrel=4
+pkgrel=5
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -39,12 +39,18 @@ backup=('usr/share/vlc/http/.hosts'
         'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!libtool')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('9678fb7a04808b6e0de63746d35e4bb1')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+        'vlc-1.1.13-skin2_theme_loader.patch'
+        'vlc-1.1.13-youtube.patch')
+md5sums=('9678fb7a04808b6e0de63746d35e4bb1'
+         'f7c2ea18da9570d633f5fd834a1f72c8'
+         '26dbd3574219daf4babc2f127a3229bc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/vlc-1.1.13-skin2_theme_loader.patch"
+  patch -Np1 -i "${srcdir}/vlc-1.1.13-youtube.patch"
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
 
   ./configure --prefix=/usr \
diff --git a/testing/vlc/vlc-1.1.13-skin2_theme_loader.patch b/testing/vlc/vlc-1.1.13-skin2_theme_loader.patch
new file mode 100644
index 000000000..5230b6485
--- /dev/null
+++ b/testing/vlc/vlc-1.1.13-skin2_theme_loader.patch
@@ -0,0 +1,29 @@
+--- a/modules/gui/skins2/src/theme_loader.cpp	2012-02-02 17:52:07.000000000 +0100
++++ b/modules/gui/skins2/src/theme_loader.cpp	2012-02-02 17:52:19.000000000 +0100
+@@ -768,7 +768,7 @@
+     {
+         void *toClose = currentGzVp;
+         currentGzVp = NULL;  currentGzFd = -1;
+-        return gzclose( toClose );
++        return gzclose( (gzFile) toClose );
+     }
+     return -1;
+ }
+@@ -777,7 +777,7 @@
+ {
+     if( currentGzVp != NULL && fd != -1 )
+     {
+-        return gzread( currentGzVp, p_buffer, i_length );
++        return gzread( (gzFile) currentGzVp, p_buffer, i_length );
+     }
+     return -1;
+ }
+@@ -786,7 +786,7 @@
+ {
+     if( currentGzVp != NULL && fd != -1 )
+     {
+-        return gzwrite( currentGzVp, const_cast<void*>(p_buffer), i_length );
++        return gzwrite( (gzFile) currentGzVp, const_cast<void*>(p_buffer), i_length );
+     }
+     return -1;
+ }
diff --git a/testing/vlc/vlc-1.1.13-youtube.patch b/testing/vlc/vlc-1.1.13-youtube.patch
new file mode 100644
index 000000000..e1a0f49b4
--- /dev/null
+++ b/testing/vlc/vlc-1.1.13-youtube.patch
@@ -0,0 +1,221 @@
+--- a/share/lua/playlist/youtube.lua	2011-08-06 11:30:49.000000000 +0200
++++ b/share/lua/playlist/youtube.lua	2012-02-02 16:05:32.000000000 +0100
+@@ -1,7 +1,7 @@
+ --[[
+  $Id$
+ 
+- Copyright © 2007-2009 the VideoLAN team
++ Copyright © 2007-2011 the VideoLAN team
+ 
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+@@ -24,13 +24,27 @@
+     return res
+ end
+ 
+-function get_arturl( path, video_id )
+-    if string.match( vlc.path, "iurl=" ) then
+-        return vlc.strings( get_url_param( vlc.path, "iurl" ) )
++function get_arturl()
++    local iurl = get_url_param( vlc.path, "iurl" )
++    if iurl then
++        return iurl
+     end
+-    if not arturl then
+-        return "http://img.youtube.com/vi/"..video_id.."/default.jpg"
++    local video_id = get_url_param( vlc.path, "v" )
++    if not video_id then
++        return nil
++    end
++    return "http://img.youtube.com/vi/"..video_id.."/default.jpg"
++end
++
++function get_prefres()
++    local prefres = -1
++    if vlc.var and vlc.var.inherit then
++        prefres = vlc.var.inherit(nil, "preferred-resolution")
++        if prefres == nil then
++            prefres = -1
++        end
+     end
++    return prefres
+ end
+ 
+ -- Probe function.
+@@ -47,18 +61,17 @@
+             return false
+         end
+     end
+-    return (  string.match( vlc.path, "watch%?v=" ) -- the html page
+-            or string.match( vlc.path, "watch_fullscreen%?video_id=" ) -- the fullscreen page
+-            or string.match( vlc.path, "p.swf" ) -- the (old?) player url
+-            or string.match( vlc.path, "jp.swf" ) -- the (new?) player url (as of 24/08/2007)
+-            or string.match( vlc.path, "player2.swf" ) ) -- another player url
++    return (  string.match( vlc.path, "/watch%?" ) -- the html page
++            or string.match( vlc.path, "/v/" ) -- video in swf player
++            or string.match( vlc.path, "/player2.swf" ) ) -- another player url
+ end
+ 
+ -- Parse function.
+ function parse()
+-    if string.match( vlc.path, "watch%?v=" )
++    if string.match( vlc.path, "/watch%?" )
+     then -- This is the HTML page's URL
+-        -- fmt is the format of the video: 18 is HQ (mp4)
++        -- fmt is the format of the video
++        -- (cf. http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs)
+         fmt = get_url_param( vlc.path, "fmt" )
+         while true do
+             -- Try to find the video's title
+@@ -71,27 +84,42 @@
+             end
+             if string.match( line, "<meta name=\"description\"" ) then
+                -- Don't ask me why they double encode ...
+-                _,_,description = vlc.strings.resolve_xml_special_chars(vlc.strings.resolve_xml_special_chars(string.find( line, "content=\"(.-)\"" )))
++                _,_,description = string.find( line, "content=\"(.-)\"" )
++                description = vlc.strings.resolve_xml_special_chars( description )
++                description = vlc.strings.resolve_xml_special_chars( description )
+             end
+-            if string.match( line, "subscribe_to_user=" ) then
+-                _,_,artist = string.find( line, "subscribe_to_user=([^&]*)" )
++            if string.match( line, "<meta property=\"og:image\"" ) then
++                _,_,arturl = string.find( line, "content=\"(.-)\"" )
+             end
+-            -- CURRENT: var swfConfig = { [a lot of stuff...], "video_id": "OHVvVmUNBFc", "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA"};
+-            -- OLD 1: var swfArgs = {hl:'en',BASE_YT_URL:'http://youtube.com/',video_id:'XPJ7d8dq0t8',l:'292',t:'OEgsToPDskLFdOYrrlDm3FQPoQBYaCP1',sk:'0gnr-AE6QZJEZmCMd3lq_AC'};
+-            -- OLD 2: var swfArgs = { "BASE_YT_URL": "http://youtube.com", "video_id": "OHVvVmUNBFc", "l": 88, "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA", "tk": "mEL4E7PqHeaZp5OG19NQThHt9mXJU4PbRTOw6lz9osHi4Hixp7RE1w=="};
+-            -- OLD 3: 'SWF_ARGS': { [a lot of stuff...], "video_id": "OHVvVmUNBFc", "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA"};
+-            if ( string.match( line, "PLAYER_CONFIG" ) or string.match( line, "swfConfig" ) or string.match( line, "SWF_ARGS" ) or string.match( line, "swfArgs" ) ) and string.match( line, "video_id" ) then
+-                if string.match( line, "BASE_YT_URL" ) then
+-                    _,_,base_yt_url = string.find( line, "\"BASE_YT_URL\": \"(.-)\"" )
++            if string.match( line, " rel=\"author\"" ) then
++                _,_,artist = string.find( line, "href=\"/user/([^\"]*)\"" )
++            end
++            -- JSON parameters, also formerly known as "swfConfig",
++            -- "SWF_ARGS", "swfArgs", "PLAYER_CONFIG" ...
++            if string.match( line, "playerConfig" ) then
++                if not fmt then
++                    prefres = get_prefres()
++                    if prefres >= 0 then
++                        fmt_list = string.match( line, "\"fmt_list\": \"(.-)\"" )
++                        if fmt_list then
++                            for itag,height in string.gmatch( fmt_list, "(%d+)\\/%d+x(%d+)\\/[^,]+" ) do
++                                -- Apparently formats are listed in quality
++                                -- order, so we take the first one that works,
++                                -- or fallback to the lowest quality
++                                fmt = itag
++                                if tonumber(height) <= prefres then
++                                    break
++                                end
++                            end
++                        end
++                    end
+                 end
+-                _,_,t = string.find( line, "\"t\": \"(.-)\"" )
+-                -- vlc.msg.err( t )
+-                -- video_id = string.gsub( line, ".*&video_id:'([^']*)'.*", "%1" )
+-                fmt_url_map = string.match( line, "\"url_encoded_fmt_stream_map\": \"(.-)\"" )
+-                if fmt_url_map then
++
++                url_map = string.match( line, "\"url_encoded_fmt_stream_map\": \"(.-)\"" )
++                if url_map then
+                     -- FIXME: do this properly
+-                    fmt_url_map = string.gsub( fmt_url_map, "\\u0026", "&" )
+-                    for url,itag in string.gmatch( fmt_url_map, "url=([^&,]+).-&itag=(%d+)" ) do
++                    url_map = string.gsub( url_map, "\\u0026", "&" )
++                    for url,itag in string.gmatch( url_map, "url=([^&,]+)[^,]*&itag=(%d+)" ) do
+                         -- Apparently formats are listed in quality order,
+                         -- so we can afford to simply take the first one
+                         if not fmt or tonumber( itag ) == tonumber( fmt ) then
+@@ -101,75 +129,37 @@
+                         end
+                     end
+                 end
+-            -- Also available on non-HTML5 pages: var swfHTML = (isIE) ? "<object [...]><param name=\"flashvars\" value=\"rv.2.thumbnailUrl=http%3A%2F%2Fi4.ytimg.com%2Fvi%2F3MLp7YNTznE%2Fdefault.jpg&rv.7.length_seconds=384 [...] &video_id=OHVvVmUNBFc [...] &t=OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp [...]
+-            elseif string.match( line, "swfHTML" ) and string.match( line, "video_id" ) then
+-                _,_,t = string.find( line, "&t=(.-)&" )
+-            -- Also available in HTML5 pages: videoPlayer.setAvailableFormat("http://v6.lscache4.c.youtube.com/videoplayback?ip=82.0.0.0&sparams=id%2Cexpire%2Cip%2Cipbits%2Citag%2Calgorithm%2Cburst%2Cfactor&algorithm=throttle-factor&itag=45&ipbits=8&burst=40&sver=3&expire=1275688800&key=yt1&signature=6ED860441298D1157FF3013A5D72727F25831F09.4C196BEA9F8F9B83CE678D79AD918B83D5E98B46&factor=1.25&id=7117715cf57d18d4", "video/webm; codecs=&quot;vp8.0, vorbis&quot;", "hd720");
+-            elseif string.match( line, "videoPlayer%.setAvailableFormat" ) then
+-                url,itag = string.match( line, "videoPlayer%.setAvailableFormat%(\"(.-itag=(%d+).-)\",.+%)" )
+-                if url then
+-                    -- For now, WebM formats are listed only in the HTML5
+-                    -- section, that is also only when HTML5 is enabled.
+-                    -- Format 45 is 720p, and 43 is lower resolution.
+-                    if tonumber( itag ) == 45  or ( tonumber( itag ) == 43 and not webm_path ) then
+-                        webm_path = url
+-                    end
+-                    -- Grab something if fmt_url_map failed
+-                    if not path and ( not fmt or tonumber( itag ) == tonumber( fmt ) ) then
+-                        path = url
+-                    end
+-                end
++            -- There is also another version of the parameters, encoded
++            -- differently, as an HTML attribute of an <object> or <embed>
++            -- tag; but we don't need it now
+             end
+         end
+ 
+-        if not video_id then
+-            video_id = get_url_param( vlc.path, "v" )
++        if not path then
++            vlc.msg.err( "Couldn't extract youtube video URL, please check for updates to this script" )
++            return { }
+         end
+-        arturl = get_arturl( vlc.path, video_id )
+ 
+-        if not fmt then
+-            -- Prefer WebM formats if this is an &html5=True URL
+-            html5 = get_url_param( vlc.path, "html5" )
+-            if html5 == "True" and webm_path then
+-                path = webm_path
+-            end
++        if not arturl then
++            arturl = get_arturl()
+         end
+ 
+-        if not path then
+-            if not base_yt_url then
+-                base_yt_url = "http://youtube.com/"
+-            end
+-            if fmt then
+-                format = "&fmt=" .. fmt
+-            else
+-                format = ""
+-            end
+-
+-            if t then
+-                path = base_yt_url .. "get_video?video_id="..video_id.."&t="..t..format
+-            else
+-                -- This shouldn't happen ... but keep it as a backup.
+-                path = "http://www.youtube.com/v/"..video_id
+-            end
+-        end
+         return { { path = path; name = name; description = description; artist = artist; arturl = arturl } }
+     else -- This is the flash player's URL
+-        if string.match( vlc.path, "title=" ) then
+-            name = vlc.strings.decode_uri(get_url_param( vlc.path, "title" ))
+-        end
+         video_id = get_url_param( vlc.path, "video_id" )
+-        arturl = get_arturl( vlc.path, video_id )
++        if not video_id then
++            _,_,video_id = string.find( vlc.path, "/v/([^?]*)" )
++        end
++        if not video_id then
++            vlc.msg.err( "Couldn't extract youtube video URL" )
++            return { }
++        end
+         fmt = get_url_param( vlc.path, "fmt" )
+         if fmt then
+             format = "&fmt=" .. fmt
+         else
+             format = ""
+         end
+-        if not string.match( vlc.path, "t=" ) then
+-            -- This sucks, we're missing "t" which is now mandatory. Let's
+-            -- try using another url
+-            return { { path = "http://www.youtube.com/v/"..video_id; name = name; arturl = arturl } }
+-        end
+-        return { { path = "http://www.youtube.com/get_video.php?video_id="..video_id.."&t="..get_url_param( vlc.path, "t" )..format; name = name; arturl = arturl } }
++        return { { path = "http://www.youtube.com/watch?v="..video_id..format } }
+     end
+ end