Thu Oct 20 23:14:58 UTC 2011

47 files changed, 1359 insertions, 163 deletions

diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD
index 10c60f529..8619bbbc8 100644
--- a/community/cherokee/PKGBUILD
+++ b/community/cherokee/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56833 2011-10-14 14:02:14Z foutrelis $
+# $Id: PKGBUILD 57044 2011-10-19 09:24:20Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=cherokee
-pkgver=1.2.100
-pkgrel=2
+pkgver=1.2.101
+pkgrel=1
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 arch=('i686' 'x86_64')
 url="http://www.cherokee-project.com/"
@@ -26,13 +26,11 @@ options=('!libtool')
 source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz
         cherokee.rc
         cherokee.logrotate
-        fix-ctk-path-handler-match.patch
-        cherokee-admin-socket-bind.patch)
-sha1sums=('2ed95504c7f156227f9b688a901608be21cf3dff'
+        fix-ctk-path-handler-match.patch)
+sha1sums=('b27f149c7d7111207ac8c3cd8a4856c05490d136'
           '85e24ccc94e6e97858226222ac62cca79c17bc80'
           '266064ab6d3ebd206d7207e1d97b003d2021b2e4'
-          '6d64371dfb23f43c29a24e37e7ae99e08a0c84cc'
-          '3c0b407e7282542657125d7cfb1c64eb3521ed8c')
+          '6d64371dfb23f43c29a24e37e7ae99e08a0c84cc')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD
index 842d04da9..42edd6cb8 100644
--- a/community/distcc/PKGBUILD
+++ b/community/distcc/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 55020 2011-08-31 13:12:35Z spupykin $
+# $Id: PKGBUILD 57046 2011-10-19 10:30:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=distcc
 pkgver=3.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A distributed C, C++, Obj C compiler"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/distcc/"
 license=('GPL')
-depends=('gcc' 'popt')
+depends=('gcc' 'popt' 'avahi')
 makedepends=('gtk2' 'pkgconfig' 'python2')
 optdepends=('gtk2: for distccmon-gnome'
 	    'python2')
@@ -26,9 +26,11 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   [ -f Makefile ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-              --with-gtk \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man
+	--with-gtk \
+	--sysconfdir=/etc \
+	--mandir=/usr/share/man \
+#	--without-avahi \
+
   make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python2
 }
 
diff --git a/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
new file mode 100644
index 000000000..e077a15cf
--- /dev/null
+++ b/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
@@ -0,0 +1,60 @@
+From d30496f52b85f82947bd07b9bd60f8482843ece8 Mon Sep 17 00:00:00 2001
+From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e>
+Date: Tue, 5 Jul 2011 09:23:38 +0000
+Subject: [PATCH 1/2] When using Poppler 0.17.0, I needed to swap the blue and
+ red channels, otherwise the colors (other than black
+ and white) looked wierd.
+
+git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@367 cb4bfb15-1111-0410-82e2-95233c8f1c7e
+---
+ src/PDFDocument.cxx |   20 ++++++++++++++++++++
+ 1 files changed, 20 insertions(+), 0 deletions(-)
+
+diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx
+index df5d75f..63b3513 100644
+--- a/src/PDFDocument.cxx
++++ b/src/PDFDocument.cxx
+@@ -20,6 +20,7 @@
+ #include <time.h>
+ #include <poppler.h>
+ #include <unistd.h>
++#include <algorithm>
+ #include "epdfview.h"
+ 
+ using namespace ePDFView;
+@@ -33,6 +34,24 @@ static PageLayout convertPageLayout (gint pageLayout);
+ static PageMode convertPageMode (gint pageMode);
+ static gchar *getAbsoluteFileName (const gchar *fileName);
+ 
++namespace
++{
++    void
++    convert_bgra_to_rgba (guint8 *data, int width, int height)
++    {
++        using std::swap;
++
++        for (int y = 0; y < height; y++)
++        {
++            for (int x = 0; x < width; x++)
++            {
++                swap(data[0], data[2]);
++                data += 4;
++            }
++        }
++    }
++}
++
+ ///
+ /// @brief Constructs a new PDFDocument object.
+ ///
+@@ -650,6 +669,7 @@ PDFDocument::renderPage (gint pageNum)
+         poppler_page_render (page, context);
+         cairo_destroy(context);
+         cairo_surface_destroy (surface);
++        convert_bgra_to_rgba(renderedPage->getData (), width, height);
+ #else // !HAVE_POPPLER_0_17_0
+         // Create the pixbuf from the data and render to it.
+         GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data (renderedPage->getData (),
+-- 
+1.7.7
+
diff --git a/community/epdfview/PKGBUILD b/community/epdfview/PKGBUILD
index fb88c3d81..9beb8974c 100644
--- a/community/epdfview/PKGBUILD
+++ b/community/epdfview/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56941 2011-10-17 08:20:15Z ibiru $
+# $Id: PKGBUILD 57042 2011-10-19 06:13:49Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Tom K <tomk@runbox.com>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 
 pkgname=epdfview
 pkgver=0.1.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A free lightweight PDF document viewer."
 url="http://www.emma-soft.com/projects/epdfview/"
 arch=('i686' 'x86_64')
@@ -14,14 +14,17 @@ depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2')
 makedepends=('pkgconfig')
 install='epdfview.install'
 source=("http://www.emma-soft.com/projects/${pkgname}/chrome/site/releases/${pkgname}-${pkgver}.tar.bz2"
-        "${pkgname}.desktop.patch")
+        "${pkgname}.desktop.patch"
+        "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch")
 md5sums=('e50285b01612169b2594fea375f53ae4'
-         'fbf22bbabdbb7544db615ac5775d57e2')
+         'fbf22bbabdbb7544db615ac5775d57e2'
+         '7f9ea101a41f5b4e999fd024f423d41f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -Np0 -i "${srcdir}/${pkgname}.desktop.patch"
+  patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD
index f5fb0b6c6..f10780c27 100644
--- a/community/gpsbabel/PKGBUILD
+++ b/community/gpsbabel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56961 2011-10-17 10:14:20Z spupykin $
+# $Id: PKGBUILD 57048 2011-10-19 10:30:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gpsbabel
 pkgver=1.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats"
 arch=('i686' 'x86_64')
 url="http://www.gpsbabel.org"
@@ -14,8 +14,10 @@ depends=('libusb-compat' 'expat')
 makedepends=('fop' 'qt' 'libxml2' 'libxslt')
 optdepends=('qt')
 options=('docs')
-source=(gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz)
-md5sums=('76ea9f7852be2e98aa18976c4697ca93')
+source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz"
+	"gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD")
+md5sums=('76ea9f7852be2e98aa18976c4697ca93'
+         '7bdbd243e29a8831842d31c079f04c45')
 
 build() {
   cd $srcdir/gpsbabel-$pkgver
@@ -31,6 +33,8 @@ package() {
 
   # GUI
   install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin
+  install -Dm644 gui/images/appicon.png $pkgdir/usr/share/pixmaps/gpsbabel.png
+  install -Dm644 $srcdir/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop
 
   # Header install
   mkdir -p $pkgdir/usr/include/gpsbabel
diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD
index 040763b2d..8b58c7f3e 100644
--- a/community/haskell-hslogger/PKGBUILD
+++ b/community/haskell-hslogger/PKGBUILD
@@ -1,41 +1,41 @@
-# $Id: PKGBUILD 50273 2011-06-27 12:56:55Z vegai $
+# $Id: PKGBUILD 57050 2011-10-19 10:31:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
 
 _hkgname=hslogger
 pkgname=haskell-hslogger
-pkgver=1.1.0
-pkgrel=6
+pkgver=1.1.5
+pkgrel=1
 pkgdesc="Versatile logging framework"
-url="http://hackage.haskell.org/package/${_hkgname}"
+url="http://hackage.haskell.org/package/hslogger"
 license=('LGPL')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
+depends=('ghc' 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
 options=('strip')
 install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-md5sums=('8039e079338dae19e1273bbd73332014')
+source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz)
+md5sums=('cd3dfd6f88176bd53b333ea29130a857')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \
+  cd ${srcdir}/hslogger-${pkgver}
+  runhaskell Setup configure -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \
 	--enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \
 	--enable-library-profiling
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
+  _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
+  depends=("ghc=${_ghcver}" 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
 
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
+  cd ${srcdir}/hslogger-${pkgver}
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/hslogger
+  runhaskell Setup copy --destdir=${pkgdir}
 }
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index fc2610b7d..00e8f4774 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -1,10 +1,12 @@
+# $Id: PKGBUILD 57055 2011-10-19 13:43:09Z 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.13
-pkgrel=1
+pkgrel=2
 pkgdesc='Validating, recursive, and caching DNS resolver'
 arch=('i686' 'x86_64')
 url='http://unbound.net/'
@@ -19,7 +21,7 @@ source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
         'rc.d')
 sha1sums=('834ccfd1cb41a44f53b33f8338a8f9cc68febaf7'
           '5d473ec2943fd85367cdb653fcd58e186f07383f'
-          'a0c8c496d71d43ed9e09b170d3df836dfb096480')
+          'dc96e772f467b32555df21d16fdb15e98194c228')
 
 install=install
 
diff --git a/community/unbound/rc.d b/community/unbound/rc.d
index f392450ae..b5b6466de 100644
--- a/community/unbound/rc.d
+++ b/community/unbound/rc.d
@@ -21,6 +21,12 @@ stop)
 	&& { rm_daemon $name; stat_done; } \
 	|| { stat_fail; exit 1; }
 	;;
+reload)
+	stat_busy "Reloading $name daemon"
+	[[ -n "$PID" ]] && kill -SIGHUP $PID &>/dev/null \
+	&& { stat_done; } \
+	|| { stat_fail; exit 1; }
+	;;
 restart)
 	$0 stop
 	sleep 2
diff --git a/core/libevent/PKGBUILD b/core/libevent/PKGBUILD
index 53e35fb32..fefac11ee 100644
--- a/core/libevent/PKGBUILD
+++ b/core/libevent/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136737 2011-08-31 19:39:15Z eric $
+# $Id: PKGBUILD 140822 2011-10-19 21:36:39Z eric $
 # Maintainer: 
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=libevent
-pkgver=2.0.13
+pkgver=2.0.15
 pkgrel=1
 pkgdesc="An event notification library"
 arch=('i686' 'x86_64')
@@ -12,8 +12,9 @@ license=('GPL2')
 depends=('openssl')
 optdepends=('python2: to use event_rpcgen.py')
 options=('!libtool')
-source=("http://www.monkey.org/~provos/libevent-$pkgver-stable.tar.gz")
-md5sums=('af786b4b3f790c9d3279792edf7867fc')
+source=(https://github.com/downloads/libevent/libevent/libevent-$pkgver-stable.tar.gz{,.asc})
+md5sums=('2643abe7ba242df15c08b2cc14ec8759'
+         '56e52e1b6bba54102d278da59af4495e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 484488d4a..a8899d96c 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 137502 2011-09-08 02:26:19Z bisson $
+# $Id: PKGBUILD 140826 2011-10-19 22:29:31Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
 pkgver=5.9p1
-pkgrel=3
+pkgrel=4
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
 depends=('krb5' 'openssl' 'libedit')
+optdepends=('x11-ssh-askpass: input passphrase in X without a terminal')
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
         'sshd.confd'
         'sshd.pam'
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index 8594df43b..65e802c7f 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 140772 2011-10-19 01:14:39Z dreisner $
+# $Id: PKGBUILD 140810 2011-10-19 16:21:22Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=dnsmasq
 pkgver=2.59
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
         'dnsmasq.service')
 md5sums=('29d43f182ecad06d64b3598c02380a80'
          '66479e99123faeab83ebaed709ef95b5'
-         '818c122ea4d81868a75afad109411170'
+         '9f180cc236808bbd02ca8652fd2e8217'
          'f329d86f8ba1cd85f9b6ee59e0ce3791')
 
 build() {
diff --git a/extra/dnsmasq/rc.dnsmasq b/extra/dnsmasq/rc.dnsmasq
index 2ded33695..0ce736ba9 100755
--- a/extra/dnsmasq/rc.dnsmasq
+++ b/extra/dnsmasq/rc.dnsmasq
@@ -4,6 +4,17 @@
 . /etc/rc.d/functions
 . /etc/conf.d/dnsmasq
 
+checkconfig() {
+  local testout
+
+  if ! testout=$(/usr/sbin/dnsmasq --test 2>&1); then
+    echo "$testout"
+    return 1
+  fi
+
+  return 0
+}
+
 pidfile=/run/dnsmasq.pid
 if [[ -r $pidfile ]]; then
   read -r PID < "$pidfile"
@@ -17,7 +28,7 @@ fi
 case $1 in
   start)
     stat_busy "Starting DNS/DHCP daemon"
-    if [[ -z $PID ]] && /usr/sbin/dnsmasq --test &&
+    if [[ -z $PID ]] && checkconfig &&
         /usr/sbin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
                           "--pid-file=$pidfile" \
                           "${DNSMASQ_OPTS[@]}"; then
diff --git a/extra/htop/ChangeLog b/extra/htop/ChangeLog
index ea5776244..df71cf644 100644
--- a/extra/htop/ChangeLog
+++ b/extra/htop/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-19  Andrea Scarpino <andrea@archlinux.org>
+    * Enable cgroup support (FS#26155)
+    * Add lsof and strace optional depends (FS#25778)
+    * Fix crash when column is less than 40 (closes FS#25823)
+
 2011-05-17  Angel Velasquez <angvp@archlinux.org>
 	* Added patch to fix --sort-key (closes FS#23224)
 
diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD
index 75e357adf..11ec58bf5 100644
--- a/extra/htop/PKGBUILD
+++ b/extra/htop/PKGBUILD
@@ -1,35 +1,45 @@
-# $Id: PKGBUILD 124246 2011-05-18 04:38:36Z angvp $
+# $Id: PKGBUILD 140790 2011-10-19 10:00:03Z andrea $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=htop
 pkgver=0.9
-pkgrel=2
+pkgrel=3
 pkgdesc="Interactive process viewer"
 arch=('i686' 'x86_64')
 url="http://htop.sourceforge.net/"
 license=('GPL')
 depends=('ncurses')
 makedepends=('python2')
+optdepends=('lsof' 'strace')
 options=('!emptydirs')
 changelog=ChangeLog
-source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz
-        htop.c.patch)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        'fix-sort-key-bug.patch'
+        'fix-segfault-small-terminal.patch')
 md5sums=('7c5507f35f363f3f40183a2ba3c561f8'
-         '750e8ad8476c5d9738da2a2bc7a7c2b6')
+         '750e8ad8476c5d9738da2a2bc7a7c2b6'
+         'd93e39c9662522367dc3a73cc3057039')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
 	sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure 
 	sed -i 's|python|python2|' scripts/MakeHeader.py
-    patch -Np0 -i $srcdir/htop.c.patch
-	./configure --prefix=/usr --enable-unicode --enable-openvz \
-	    --enable-vserver 
+
+    patch -Np0 -i "${srcdir}/fix-sort-key-bug.patch"
+    patch -p1 -i "${srcdir}/fix-segfault-small-terminal.patch"
+
+	./configure --prefix=/usr \
+      --enable-unicode \
+      --enable-openvz \
+	  --enable-vserver \
+      --enable-cgroup
 	make 
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install 
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install 
 }
diff --git a/extra/htop/fix-segfault-small-terminal.patch b/extra/htop/fix-segfault-small-terminal.patch
new file mode 100644
index 000000000..c55146492
--- /dev/null
+++ b/extra/htop/fix-segfault-small-terminal.patch
@@ -0,0 +1,24 @@
+--- trunk/Meter.c	2011/08/26 20:52:35	229
++++ trunk/Meter.c	2011/08/26 20:55:09	230
+@@ -264,13 +264,19 @@
+    
+    w--;
+    x++;
+-   char bar[w];
++
++   if (w < 1) {
++      attrset(CRT_colors[RESET_COLOR]);
++      return;
++   }
++   char bar[w + 1];
+    
+    int blockSizes[10];
+    for (int i = 0; i < w; i++)
+       bar[i] = ' ';
+ 
+-   sprintf(bar + (w-strlen(buffer)), "%s", buffer);
++   const size_t barOffset = w - MIN(strlen(buffer), w);
++   snprintf(bar + barOffset, w - barOffset + 1, "%s", buffer);
+ 
+    // First draw in the bar[] buffer...
+    double total = 0.0;
diff --git a/extra/htop/fix-sort-key-bug.patch b/extra/htop/fix-sort-key-bug.patch
new file mode 100644
index 000000000..41a2dd377
--- /dev/null
+++ b/extra/htop/fix-sort-key-bug.patch
@@ -0,0 +1,15 @@
+From: Roman Kosenko <madkite@gmail.com>
+Date: Thu, 10 Mar 2011 16:23:53 +0200
+Subject: [PATCH] Fix stupid bug with --sort-key
+
+--- htop.c.old	2010-11-24 20:45:38.000000000 +0200
++++ htop.c	2011-03-10 16:32:18.473716667 +0200
+@@ -282,7 +282,7 @@
+             printVersionFlag();
+             break;
+          case 's':
+-            if (strcmp(optarg, "help")) {
++            if (!strcmp(optarg, "help")) {
+                for (int j = 1; j < LAST_PROCESSFIELD; j++)
+                   printf ("%s\n", Process_fieldNames[j]);
+                exit(0);
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index c25f2f01e..7bcbef6c2 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137542 2011-09-09 07:16:56Z daniel $
+# $Id: PKGBUILD 140778 2011-10-19 07:11:57Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Brice Carpentier <brice@dlfp.org>
 
 pkgname=mono
-pkgver=2.10.5
+pkgver=2.10.6
 pkgrel=1
 pkgdesc="Free implementation of the .NET platform including runtime and compiler"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@ provides=('monodoc')
 conflicts=('monodoc')
 source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         mono.rc.d)
-md5sums=('1954f11932e82b2ae3b64b2ae9344d90'
+md5sums=('c442cef4cd6668b0a1391a661f6815a9'
          '8315e46c6a6e9625502521fc0ad1a322')
 
 build() {
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
index 32ce42ce0..df1688ad1 100644
--- a/extra/openjdk6/PKGBUILD
+++ b/extra/openjdk6/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 132227 2011-07-21 17:20:32Z andyrtr $
+# $Id: PKGBUILD 140782 2011-10-19 08:19:12Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -6,7 +6,7 @@ pkgname=('openjdk6' 'openjdk6-src')
 pkgbase="openjdk6"
 #_date=20100715
 _javaver=6
-_icedteaver=1.10.3
+_icedteaver=1.10.4
 _openjdk_version=b22
 _openjdk_date=28_feb_2011
 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -31,8 +31,11 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar
 	nonreparenting-wm.diff
 	openjdk6.profile
 	openjdk6.profile.csh)
-noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('0a1301785e9826d7c87ed7e8b10a6985'
+noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
+	jaxp144_01.zip
+	jdk6-jaxws-b20.zip
+	jdk6-jaf-b20.zip)
+md5sums=('c381d987f8d2facece8c54e98fd547f8'
          '2d2bbbb0f9b81f1fec41ec730da8a933'
          'ef7a8b3624ea904bf584bc46d79b5e75'
          '91adfd41e6f001add4f92ae31216b1e3'
@@ -168,7 +171,7 @@ package_openjdk6() {
   install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh 
   
   # install license
-  install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_openjdk6-src() {
diff --git a/extra/pth/PKGBUILD b/extra/pth/PKGBUILD
index 3075d939b..7e2e6e5ee 100644
--- a/extra/pth/PKGBUILD
+++ b/extra/pth/PKGBUILD
@@ -1,22 +1,43 @@
-# $Id: PKGBUILD 78043 2010-04-19 08:33:13Z dgriffiths $
+# $Id: PKGBUILD 140804 2011-10-19 15:35:55Z dreisner $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=pth
 pkgver=2.0.7
-pkgrel=3
+pkgrel=4
 pkgdesc="The GNU Portable Threads."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/pth/"
 license=('LGPL')
-depends=('glibc')
+depends=('glibc' 'awk')
 options=('!libtool' '!makeflags')
-source=(ftp://ftp.gnu.org/gnu/pth/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9cb4a25331a4c4db866a31cbe507c793')
+source=(ftp://ftp.gnu.org/gnu/pth/$pkgname-$pkgver.tar.gz{,.sig})
+sha1sums=('9a71915c89ff2414de69fe104ae1016d513afeee'
+          '8cb16dffbf15ba92bda8d08918eaf5995642fc38')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --localstatedir=/var \
+              --mandir=/usr/share/man \
+              --disable-static \
+              --enable-shared \
+              --with-pic
+
+  sed -i "s|awk=''|awk=/bin/awk|g" shtool # "Cannot find a reasonable Awk"
+
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR=${pkgdir} install
 }
diff --git a/extra/x11-ssh-askpass/PKGBUILD b/extra/x11-ssh-askpass/PKGBUILD
new file mode 100644
index 000000000..37b84c4d0
--- /dev/null
+++ b/extra/x11-ssh-askpass/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 140828 2011-10-19 22:29:39Z bisson $
+
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Mike Sampson <mike at sambodata dot com>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Charles Mauch <cmauch@gmail.com>
+
+pkgname=x11-ssh-askpass
+pkgver=1.2.4.1
+pkgrel=3
+pkgdesc='Lightweight passphrase dialog for SSH'
+url='http://www.jmknoble.net/software/x11-ssh-askpass/'
+license=('custom')
+arch=('i686' 'x86_64')
+depends=('libxt')
+makedepends=('imake')
+#source=("${url}${pkgname}-${pkgver}.tar.gz" # httpd only sends half the bits
+source=("http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz"
+        'profile.d')
+sha1sums=('78c992951685d4dbffb77536f37b83ae2a6eafc7'
+          '28be56290d07e2625bc8e81ae8c7ea741d329c51')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	./configure \
+		--mandir=/usr/share/man \
+		--libexecdir=/usr/lib/ssh \
+		--with-app-defaults-dir=/usr/share/X11/app-defaults \
+
+	xmkmf
+	make includes
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install install.man
+	install -Dm755 ../profile.d "${pkgdir}/etc/profile.d/${pkgname}.sh"
+
+	install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+	sed '109,174p;d' README > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/x11-ssh-askpass/profile.d b/extra/x11-ssh-askpass/profile.d
new file mode 100644
index 000000000..955d6ad96
--- /dev/null
+++ b/extra/x11-ssh-askpass/profile.d
@@ -0,0 +1,4 @@
+if [ -f "/usr/lib/ssh/x11-ssh-askpass" ] ; then
+	SSH_ASKPASS="/usr/lib/ssh/x11-ssh-askpass"
+	export SSH_ASKPASS
+fi
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 82bc609db..034d5abeb 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.0
-pkgver=${_basekernel}.6
+pkgver=${_basekernel}.7
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://linux-libre.fsfla.org/"
@@ -29,7 +29,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
 build() {
   cd "${srcdir}/linux-${_basekernel}"
 
-  patch -Np0 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
+  patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
 
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
@@ -275,19 +275,10 @@ package_linux-libre-docs() {
   # remove a file already in linux package
   rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
 }
-
-md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         '8dc6d7d1a0728af0a59d5ba7197c390b'
-         'bb679e0e61c53a8f1a22b8d46f89f47e'
-         '68d2fc73ce1d9057678f91235f6e22c6'
-         'a8a3843046926eb7ab81312cd438c5c5'
-         '04b21c79df0a952c22d681dd4f4562df'
-         '263725f20c0b9eb9c353040792d644e5'
-         '9d3c56a4b999c8bfbd4018089a62f662')
 md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         '8dc6d7d1a0728af0a59d5ba7197c390b'
-         'f50e2627816daaae346394512fa3bda5'
-         'b24eadd33ae95e3c9e14d84e39109976'
+         '8840c46301f6eb425b9ab456d1ca7b7f'
+         '8089b63fdecf93735f178eb2907ce61e'
+         '4cc90e12cab492c1d61183c47683bd52'
          'a8a3843046926eb7ab81312cd438c5c5'
          '04b21c79df0a952c22d681dd4f4562df'
          '263725f20c0b9eb9c353040792d644e5'
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 6f572b0d2..4cc6d10cc 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 3.0.0 Kernel Configuration
+# Linux/i386 3.0 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -514,14 +514,14 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 37e2475d3..de4d3a424 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0 Kernel Configuration
+# Linux/x86_64 3.0 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -69,7 +69,7 @@ CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
-    CONFIG_KERNEL_GZIP=y
+CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_XZ is not set
@@ -497,14 +497,14 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=m
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
diff --git a/social/libpurple-minimal/PKGBUILD b/social/libpurple-minimal/PKGBUILD
new file mode 100644
index 000000000..b0adfd46d
--- /dev/null
+++ b/social/libpurple-minimal/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Magicking <syllaur@gmail.com>
+# Contributors: wzff BluePeppers n0nsense
+pkgname=libpurple-minimal
+pkgver=2.10.0
+pkgrel=2
+pkgdesc="minimal build of the pidgin IM library (no gstreamer, perl and X11 dependencies)"
+arch=('i686' 'x86_64')
+url="http://developer.pidgin.im/wiki/WhatIsLibpurple"
+license=('GPL')
+depends=('glib2' 'gnutls' 'libxml2' 'libidn' 'nss' 'avahi')
+makedepends=('make' 'intltool')
+conflicts=('libpurple')
+provides=("libpurple=${pkgver}")
+source="http://downloads.sourceforge.net/pidgin/pidgin-${pkgver}.tar.gz"
+md5sums=('b92f83f6f075d9cd814d3ccff9fd6cac')
+
+build(){
+	cd $srcdir/pidgin-${pkgver}
+	./configure --prefix=/usr \
+		    --sysconfdir=/etc \
+		    --disable-perl \
+		    --disable-gtkui \
+		    --disable-consoleui \
+		    --disable-sm \
+		    --disable-gestures \
+		    --disable-screensaver \
+		    --disable-startup-notification \
+		    --disable-schemas-install \
+		    --disable-tcl \
+		    --disable-tk \
+		    --disable-nls \
+		    --without-x \
+		    --disable-vv \
+		    --disable-gstreamer \
+		    --disable-meanwhile \
+		    --disable-dbus \
+		    --disable-doxygen \
+            --with-system-ssl-certs=/etc/ssl/certs
+	make -C libpurple
+}
+
+package() {
+	cd $srcdir/pidgin-${pkgver}
+	make -C libpurple DESTDIR=$pkgdir install
+}
+
diff --git a/testing/anjuta/PKGBUILD b/testing/anjuta/PKGBUILD
new file mode 100644
index 000000000..a8d8fcc35
--- /dev/null
+++ b/testing/anjuta/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 140802 2011-10-19 14:21:48Z ibiru $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Harley Laue <losinggeneration@yahoo.com>
+
+pkgname=anjuta
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="GNOME Integrated Development Environment (IDE)"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'python2' 'shared-mime-info' 'desktop-file-utils')
+makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
+url="http://anjuta.sourceforge.net/"
+install=anjuta.install
+source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+options=('!libtool' '!emptydirs')
+sha256sums=('1e59aed63312e293c55f2934c4766411e9908fa512dd86e1422e3d906fe75613')
+
+build() {
+  cd "${srcdir}/anjuta-${pkgver}"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-scrollkeeper
+  make
+}
+
+package(){
+  cd "${srcdir}/anjuta-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  sed -i "1s|#!/usr/bin/python$|&2|" \
+    $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
+}
diff --git a/testing/anjuta/anjuta.install b/testing/anjuta/anjuta.install
new file mode 100644
index 000000000..c6fcfec11
--- /dev/null
+++ b/testing/anjuta/anjuta.install
@@ -0,0 +1,21 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+  update-mime-database usr/share/mime > /dev/null
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall anjuta
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD
new file mode 100644
index 000000000..03c4713e4
--- /dev/null
+++ b/testing/gdm/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 140814 2011-10-19 17:08:25Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gdm
+pkgver=3.2.1.1
+pkgrel=1
+pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org"
+backup=('etc/pam.d/gdm-autologin' 'etc/pam.d/gdm-fingerprint' 'etc/pam.d/gdm' 'etc/pam.d/gdm-password'
+        'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome' 'etc/gdm/custom.conf')
+groups=('gnome-extra')
+options=('!libtool')
+depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
+makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection')
+optdepends=('gnome-shell: new login interface')
+install=gdm.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz
+        fix_external_program_directories.patch
+        gdm-vt-allocation-hack.patch
+        gdm
+        gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam)
+sha256sums=('85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd'
+            '2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363'
+            '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
+            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
+            'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
+            '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
+            'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
+            '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c'
+            'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
+            '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix_external_program_directories.patch"
+  patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch"
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/gdm \
+      --localstatedir=/var \
+      --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
+      --disable-scrollkeeper \
+      --disable-static \
+      --without-tcp-wrappers
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas
+
+  for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do
+      install -m644 "${srcdir}/${i}" "${pkgdir}/etc/pam.d/${i%.pam}"
+  done
+
+  install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm"
+
+  chmod 1770 "${pkgdir}/var/log/gdm"
+  chmod 700 "${pkgdir}/var/lib/gdm/.config/dconf"
+  rm -rf "${pkgdir}/var/run" "${pkgdir}/var/gdm" "${pkgdir}/etc/gconf"
+}
diff --git a/testing/gdm/fix_external_program_directories.patch b/testing/gdm/fix_external_program_directories.patch
new file mode 100644
index 000000000..997ea5405
--- /dev/null
+++ b/testing/gdm/fix_external_program_directories.patch
@@ -0,0 +1,34 @@
+diff -Nur gdm-3.2.0.orig/daemon/gdm-server.c gdm-3.2.0/daemon/gdm-server.c
+--- gdm-3.2.0.orig/daemon/gdm-server.c	2011-10-02 01:13:37.772372528 +0000
++++ gdm-3.2.0/daemon/gdm-server.c	2011-10-02 01:14:58.036444496 +0000
+@@ -131,7 +131,7 @@
+         g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
+ 
+         error = NULL;
+-        command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
++        command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
+                                    server->priv->display_name);
+ 
+         g_debug ("GdmServer: Running helper %s", command);
+diff -Nur gdm-3.2.0.orig/data/gdm-shell.session.in gdm-3.2.0/data/gdm-shell.session.in
+--- gdm-3.2.0.orig/data/gdm-shell.session.in	2011-10-02 01:17:01.394246573 +0000
++++ gdm-3.2.0/data/gdm-shell.session.in	2011-10-02 01:16:22.210552560 +0000
+@@ -1,5 +1,5 @@
+ [GNOME Session]
+ Name=Display Manager
+ RequiredComponents=gnome-shell;gnome-settings-daemon;
+-IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
++IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && /usr/lib/gnome-session/gnome-session-check-accelerated'
+ FallbackSession=gdm-fallback
+diff -Nur gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c
+--- gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c	2011-10-02 01:13:37.775705892 +0000
++++ gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c	2011-10-02 01:14:58.036444496 +0000
+@@ -131,7 +131,7 @@
+         ret = FALSE;
+ 
+         error = NULL;
+-        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error);
++        g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error);
+         if (error != NULL) {
+                 g_warning ("Error starting settings daemon: %s", error->message);
+                 g_error_free (error);
diff --git a/testing/gdm/gdm b/testing/gdm/gdm
new file mode 100755
index 000000000..c3e635a6d
--- /dev/null
+++ b/testing/gdm/gdm
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+    stat_busy "Starting GDM"
+    /usr/sbin/gdm &
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      
+      add_daemon gdm
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping GDM"
+    [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon gdm
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 2
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/testing/gdm/gdm-autologin.pam b/testing/gdm/gdm-autologin.pam
new file mode 100644
index 000000000..c77c78917
--- /dev/null
+++ b/testing/gdm/gdm-autologin.pam
@@ -0,0 +1,18 @@
+#%PAM-1.0
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+
+auth            requisite       pam_permit.so
+
+auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
+auth            required        pam_deny.so
+
+account         required        pam_unix.so
+
+password        required        pam_deny.so
+
+session         required        pam_loginuid.so
+-session        optional        pam_systemd.so
+session         optional        pam_keyinit.so revoke
+session         required        pam_limits.so
+session         required        pam_unix.so
diff --git a/testing/gdm/gdm-fingerprint.pam b/testing/gdm/gdm-fingerprint.pam
new file mode 100644
index 000000000..5b74bf6d6
--- /dev/null
+++ b/testing/gdm/gdm-fingerprint.pam
@@ -0,0 +1,18 @@
+#%PAM-1.0
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+
+auth            requisite       pam_fprintd.so
+
+auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
+auth            required        pam_deny.so
+
+account         required        pam_unix.so
+
+password        required        pam_deny.so
+
+session         required        pam_loginuid.so
+-session        optional        pam_systemd.so
+session         optional        pam_keyinit.so revoke
+session         required        pam_limits.so
+session         required        pam_unix.so
diff --git a/testing/gdm/gdm-password.pam b/testing/gdm/gdm-password.pam
new file mode 100644
index 000000000..aa4d4dd47
--- /dev/null
+++ b/testing/gdm/gdm-password.pam
@@ -0,0 +1,20 @@
+#%PAM-1.0
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+
+auth            requisite       pam_unix.so nullok
+auth            optional        pam_gnome_keyring.so
+
+auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
+auth            required        pam_deny.so
+
+account         required        pam_unix.so
+
+password        required        pam_unix.so
+
+session         required        pam_loginuid.so
+-session        optional        pam_systemd.so
+session         optional        pam_keyinit.so force revoke
+session         required        pam_limits.so
+session         required        pam_unix.so
+session         optional        pam_gnome_keyring.so auto_start
diff --git a/testing/gdm/gdm-smartcard.pam b/testing/gdm/gdm-smartcard.pam
new file mode 100644
index 000000000..baacb8bed
--- /dev/null
+++ b/testing/gdm/gdm-smartcard.pam
@@ -0,0 +1,18 @@
+#%PAM-1.0
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+
+auth            requisite       pam_pkcs11.so wait_for_card card_only
+
+auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
+auth            required        pam_deny.so
+
+account         required        pam_unix.so
+
+password        required        pam_pkcs11.so
+
+session         required        pam_loginuid.so
+-session        optional        pam_systemd.so
+session         optional        pam_keyinit.so revoke
+session         required        pam_limits.so
+session         required        pam_unix.so
diff --git a/testing/gdm/gdm-vt-allocation-hack.patch b/testing/gdm/gdm-vt-allocation-hack.patch
new file mode 100644
index 000000000..56fa5a151
--- /dev/null
+++ b/testing/gdm/gdm-vt-allocation-hack.patch
@@ -0,0 +1,118 @@
+diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
+index 39def47..03488fd 100644
+--- a/daemon/gdm-server.c
++++ b/daemon/gdm-server.c
+@@ -33,6 +33,8 @@
+ #include <grp.h>
+ #include <signal.h>
+ #include <sys/resource.h>
++#include <sys/ioctl.h>
++#include <sys/vt.h>
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
+         return out;
+ }
+ 
++#ifndef O_NOCTTY
++# define O_NOCTTY 0
++#endif
++
++static int
++open_vt (int vtno)
++{
++	char *vtname;
++	int fd;
++
++	vtname = g_strdup_printf ("/dev/tty%d", vtno);
++
++	do {
++		errno = 0;
++		fd = open (vtname, O_RDWR | O_NOCTTY, 0);
++	} while (errno == EINTR);
++
++	g_free (vtname);
++	return fd;
++}
++
++static gint
++find_first_probably_free_vt (void)
++{
++	int fd, fdv;
++	int vtno;
++	unsigned short vtmask;
++	struct vt_stat vtstat;
++	guint v_state;
++
++	fdv = -1;
++
++	do {
++		errno = 0;
++		fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0);
++	} while (errno == EINTR);
++
++	if (fd >= 0) {
++		if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) {
++			v_state = vtstat.v_state;
++		} else {
++			close (fd);
++			v_state = 0;
++			fd = -1;
++		}
++	} else {
++		v_state = 0;
++	}
++
++	if (fd < 0) {
++		do {
++			errno = 0;
++			fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0);
++		} while (errno == EINTR);
++
++		if (fd >= 0) {
++			if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0)
++				v_state = vtstat.v_state;
++		}
++	}
++
++	for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
++		/* Is this console in use? */
++		if (v_state & vtmask)
++			continue;
++
++		/* No, try to open it */
++		fdv = open_vt (vtno);
++		if (fdv >= 0)
++			break;
++
++		/* If we're here, kernel indicated that the console was free,
++		 * but we failed to open it. Just go on to higher VTs. */
++	}
++
++        if (fdv >= 0)
++                close (fdv);
++        else
++		vtno = -1;
++
++	if (fd >= 0)
++		close (fd);
++
++	return vtno;
++}
++
+ char *
+ gdm_server_get_display_device (GdmServer *server)
+ {
+@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer  *server,
+ 
+         if (vtarg != NULL && ! gotvtarg) {
+                 argv[len++] = g_strdup (vtarg);
++        } else if (!query_in_arglist && !gotvtarg) {
++                gint vtnum = find_first_probably_free_vt ();
++
++                if (vtnum > 0)
++                        argv [len++] = g_strdup_printf ("vt%d", vtnum);
+         }
+ 
+         argv[len++] = NULL;
diff --git a/testing/gdm/gdm-welcome.pam b/testing/gdm/gdm-welcome.pam
new file mode 100644
index 000000000..cc3811c19
--- /dev/null
+++ b/testing/gdm/gdm-welcome.pam
@@ -0,0 +1,12 @@
+#%PAM-1.0
+auth            required        pam_env.so
+auth            required        pam_permit.so
+
+account         required        pam_nologin.so
+account         required        pam_unix.so
+
+password        required        pam_deny.so
+
+session         required        pam_loginuid.so
+-session        optional        pam_systemd.so
+session         optional        pam_keyinit.so force revoke
diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install
new file mode 100644
index 000000000..fda42d319
--- /dev/null
+++ b/testing/gdm/gdm.install
@@ -0,0 +1,31 @@
+pkgname=gdm
+
+post_install() {
+  getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
+  getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
+  passwd -l gdm > /dev/null
+  chown -R gdm:gdm /var/lib/gdm > /dev/null
+
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gconfpkg --install ${pkgname}
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  dconf update
+}
+
+pre_remove() {
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    gconfpkg --uninstall ${pkgname}
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  dconf update
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  getent passwd gdm >/dev/null 2>&1 && userdel gdm
+  getent group gdm >/dev/null 2>&1 && groupdel gdm
+}
diff --git a/testing/gdm/gdm.pam b/testing/gdm/gdm.pam
new file mode 100644
index 000000000..655299cb7
--- /dev/null
+++ b/testing/gdm/gdm.pam
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+auth            required        pam_unix.so
+auth            optional        pam_gnome_keyring.so
+account         required        pam_unix.so
+session         required        pam_limits.so
+session         required        pam_unix.so
+session         optional        pam_gnome_keyring.so auto_start
+password        required        pam_unix.so
diff --git a/testing/java7-openjdk/PKGBUILD b/testing/java7-openjdk/PKGBUILD
index 7db99b002..219c5588f 100644
--- a/testing/java7-openjdk/PKGBUILD
+++ b/testing/java7-openjdk/PKGBUILD
@@ -11,31 +11,31 @@ _icedtea_ver=2.0
 _date=20110922
 
 # check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=616c760dc288
-_HOTSPOT_CHANGESET=1dd9b3d73b22
-_JAXP_CHANGESET=c40983d6ae70
-_JAXWS_CHANGESET=83db5e316798
-_JDK_CHANGESET=0cb15650412a
-_LANGTOOLS_CHANGESET=fb7fb3071b64
-_OPENJDK_CHANGESET=3defd24c2671
+_CORBA_CHANGESET=4d9e4fb8af09
+_HOTSPOT_CHANGESET=b28ae681bae0
+_JAXP_CHANGESET=948e734135ea
+_JAXWS_CHANGESET=a2ebfdc9db7e
+_JDK_CHANGESET=2054526dd141
+_LANGTOOLS_CHANGESET=9b85f1265346
+_OPENJDK_CHANGESET=0a76e5390e68
 
 pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=0.20110922.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
-makedepends=('eclipse-ecj' 'libcups' 'libxp' 'libxtst' 'libxi' 'libxt' 'libxslt' 'freetype2'
+makedepends=('libcups' 'libxp' 'libxtst' 'libxi' 'libxt' 'libxslt' 'freetype2' #'eclipse-ecj' only for bootstrapping
              'alsa-lib' 'xalan-java' 'glib2' 'gtk2' 'apache-ant>=1.6.5' 'giflib'
              'libjpeg>=6b' 'zlib' 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'lcms2')
-source=(ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz
+source=( #ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz
+	http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
 	http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz			# openjdk.tar.gz
         http://icedtea.classpath.org/hg/icedtea7-forest/corba/archive/${_CORBA_CHANGESET}.tar.gz		# corba.tar.gz
         http://icedtea.classpath.org/hg/icedtea7-forest/jaxp/archive/${_JAXP_CHANGESET}.tar.gz			# jaxp.tar.gz
         http://icedtea.classpath.org/hg/icedtea7-forest/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz		# jaxws.tar.gz
-        http://icedtea.classpath.org/hg/icedtea7-forest/jdk/archive/${_JDK_CHANGESET}.tar.gz		# jdk.tar.gz
+        http://icedtea.classpath.org/hg/icedtea7-forest/jdk/archive/${_JDK_CHANGESET}.tar.gz			# jdk.tar.gz
         http://icedtea.classpath.org/hg/icedtea7-forest/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz        # langtools.tar.gz
         http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz	        # hotspot.tar.gz
-        http://icedtea.classpath.org/download/drops/{jdk7-jaf-2010_08_19.zip,jdk7-jaxws2_2_4-b03-2011_05_27.zip,jaxp145_01.zip}
         fontconfig-paths.diff
         fix_corba_cmds_path.diff
         openjdk7_fix_jdk_cmds_path.diff
@@ -46,27 +46,6 @@ source=(ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz
         jre7-openjdk.profile.csh
         jconsole.desktop
         policytool.desktop)
-sha1sums=('e569c8a1265d30856caa646d101ce3e1e4a2a69f'
-          '51dafe7367732d58a5ee531f5840fe1ab9c9d2bf'
-          'c246e4a01d11bdbe4fb23f1bd3819456d1446f52'
-          '8a286c9314f47f7bb6c59b8e8b4560db81019a83'
-          'c0e7e9b99d4de220ef3346f3da942a4a39bb8b71'
-          '6a115a71c94b4de1ad4e9c00fe3994bc31acd943'
-          '29f8481fd98d709c72a81d5d742097455f38af7d'
-          'a8a199fb4c908852a0afdd76937ad194191d20f7'
-          '63ea970dcf129fbbba39a132d8f71add19fbf1f0'
-          '539bcf80b9a86c97406a3c79e7d10684b213a4be'
-          '106db88c8e53abb1a064e83d41cc7acd16b7713c'
-          '00ae05d9c8679deb72c0a9008a670daafeb21565'
-          'e551b40820393c4cab3a82154f51b55577644ba1'
-          'fe04691f0a23f43a8d9017f7c5fccd4620bc9019'
-          'ab22e135916786c181be66be39acd7954175bb9c'
-          'b2dbb1a8a7264db229d6888467ed3f2799a007b0'
-          '344f7e911ab52e38f1ff237ed770bec362d79f79'
-          '683cbb342c8d3077b43b31be700864379c0aa54b'
-          '2a12035cc3e586131952cbb78d9885f6dc10d1b2'
-          '2e7827f47b9190dcc0697752b0f799caea872239'
-          '0bc35e5436f1663f5251b8f8c159a04088a09484')
 
 #http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
 
@@ -76,10 +55,25 @@ noextract=("${_OPENJDK_CHANGESET}.tar.gz"
            "${_JAXWS_CHANGESET}.tar.gz"
            "${_JDK_CHANGESET}.tar.gz"
            "${_LANGTOOLS_CHANGESET}.tar.gz"
-           "${_HOTSPOT_CHANGESET}.tar.gz"
-           "jdk7-jaf-2010_08_19.zip"
-           "jdk7-jaxws2_2_4-b03-2011_05_27.zip"
-	   "jaxp145_01.zip")
+           "${_HOTSPOT_CHANGESET}.tar.gz")
+md5sums=('752721a037a625001fad7a5fc2013f60'
+         'ffb12013564794e9abbffbbbd0c58502'
+         '8f8d222d0a6d363d06b40576da5f1ea2'
+         '4abf34372e34cccd74ad337e487ed790'
+         'f2f40590a83889b8aa1d4631b705092d'
+         'd3beed0118bbd93d4651af762eb748c7'
+         'c8617700b4bd6cd5de1257bc36509bed'
+         'f10b711b0c784df8707808d9d0f52abd'
+         'ee1afda124d5927345014ab382ef581e'
+         'f7e7a212e50abb56a6ef1a2b1bd27405'
+         'c195c4865b84d9e2e0fd71ac6d88eadb'
+         '203640d6e79e41b0065e016818c17ccd'
+         'fe39da48a62b1fdd8fc24de0e0c4b525'
+         'cdabafad0ec413d9a983888bf445a443'
+         '612b0fec7e0943c37a6de77c43622007'
+         '62443459da0cb28181feb260dc0e5ce7'
+         '8e346f19a69b11b8dc4fcd8ea9d9d8f1'
+         'b6357228d29836504a90abe006d86e56')
 
 # source PKGBUILD && mksource
 #makedepends+=('mercurial')
@@ -93,27 +87,31 @@ mksource() {
 }
 
 build() {
-  cd "${srcdir}/icedtea7"
+  cd "${srcdir}/icedtea-${_icedtea_ver}"
 
   unset JAVA_HOME
   unset CLASSPATH
+  # default is to build with first found java-environment found in our repos - is jdk7-openjdk
+  [ -f /etc/profile.d/jdk7-openjdk.sh ] && . /etc/profile.d/jdk7-openjdk.sh
+  
   unset MAKEFLAGS
-
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
 
   . /etc/profile.d/apache-ant.sh
 
-  cp ${srcdir}/*.diff ${srcdir}/icedtea7/patches
+  cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
   export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff"
 
   # Bootstrap IcedTea with ecj and a GNU Classpath-based JDK:
-  autoreconf --force --install
+#  autoreconf --force --install
 
   ./configure \
 	--disable-bootstrap \
+	--with-parallel-jobs="${MAKEFLAGS/-j}" \
         --disable-tests \
         --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-${CARCH} \
+	--with-jdk-home=${JAVA_HOME} \
         --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \
         --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \
         --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \
@@ -121,24 +119,23 @@ build() {
         --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \
         --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \
         --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
-        --with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \
-        --with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \
-        --with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \
-        --enable-pulse-java #--help
+        --enable-pulse-java \
+#	--with-rhino #--help
+
+        #--with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \
+        #--with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \
+        #--with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \
 
-#        
 	
 #	  --enable-systemtap      Enable inclusion of SystemTap trace support
 #	  --enable-nss            Enable inclusion of NSS security provider
 #	  --with-abs-install-dir  The absolute path where the j2sdk-image dir will be installed
-
-        
-  #LD_PRELOAD="" 
+  
   make
 }
 
 check() {
-  cd "${srcdir}/icedtea7"
+  cd "${srcdir}/icedtea-${_icedtea_ver}"
   make -k check
 }
 
@@ -146,7 +143,7 @@ package_jre7-openjdk() {
   pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment"
   depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst'
            'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng')
-  optdepends=('icedtea-web: web browser plugin + Java Web Start'
+  optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
              'alsa-lib: for sound'
              'giflib: for gif format support')
   provides=('java-runtime=7')
@@ -157,7 +154,7 @@ package_jre7-openjdk() {
 
   _jvmdir=/usr/lib/jvm/java-7-openjdk
 
-  cd "${srcdir}/icedtea7/openjdk.build/j2sdk-image/jre"
+  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
 
   install -d -m755 ${pkgdir}/${_jvmdir}/jre/
   cp -a bin lib ${pkgdir}/${_jvmdir}/jre
@@ -216,7 +213,7 @@ package_jdk7-openjdk() {
 
   _jvmdir=/usr/lib/jvm/java-7-openjdk
 
-  cd "${srcdir}/icedtea7/openjdk.build/j2sdk-image"
+  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
 
   # Main files
   install -m755 -d ${pkgdir}/${_jvmdir}/
@@ -262,6 +259,6 @@ package_jdk7-openjdk() {
 package_openjdk7-src() {
   pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
 
-  install -D ${srcdir}/icedtea7/openjdk.build/j2sdk-image/src.zip \
+  install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
              ${pkgdir}/${_jvmdir}/src.zip
 }
diff --git a/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD
new file mode 100644
index 000000000..236ae0f44
--- /dev/null
+++ b/testing/libarchive/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 140820 2011-10-19 19:30:28Z dan $
+# Maintainer: Dan McGee <dan@archlinux.org>
+pkgname=libarchive
+pkgver=2.8.5
+pkgrel=2
+pkgdesc="library that can create and read several streaming archive formats"
+arch=('i686' 'x86_64')
+url="http://libarchive.googlecode.com/"
+license=('BSD')
+depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
+source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz"
+        release-2.8-fixes.patch)
+md5sums=('9caf51dcf6213e9c9f5a1c27448b9c90'
+         '14dbbf2d31d68d8eedb93ec5531f3b0c')
+sha256sums=('13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d'
+            'fcadc5ac3020a9fab5922d343baca28f067cc051e9b6f59e480349ba5b0a5060')
+
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np0 < ../release-2.8-fixes.patch
+  ./configure --prefix=/usr --without-xml2
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
+}
diff --git a/testing/libarchive/release-2.8-fixes.patch b/testing/libarchive/release-2.8-fixes.patch
new file mode 100644
index 000000000..c21eeaa7b
--- /dev/null
+++ b/testing/libarchive/release-2.8-fixes.patch
@@ -0,0 +1,234 @@
+Index: build/cmake/config.h.in
+===================================================================
+--- build/cmake/config.h.in	(revision 3670)
++++ build/cmake/config.h.in	(revision 3737)
+@@ -1,5 +1,8 @@
+ /* config.h.  Generated from config.h.cmake by cmake configure */
+ 
++/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */
++#cmakedefine ZLIB_WINAPI 1
++
+ /* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */
+ #cmakedefine ARCHIVE_HASH_MD5_LIBC
+ 
+Index: libarchive/archive_read_support_format_all.c
+===================================================================
+--- libarchive/archive_read_support_format_all.c	(revision 3670)
++++ libarchive/archive_read_support_format_all.c	(revision 3737)
+@@ -1,5 +1,5 @@
+ /*-
+- * Copyright (c) 2003-2007 Tim Kientzle
++ * Copyright (c) 2003-2011 Tim Kientzle
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -39,5 +39,13 @@
+ 	archive_read_support_format_tar(a);
+ 	archive_read_support_format_xar(a);
+ 	archive_read_support_format_zip(a);
++
++	/* Note: We always return ARCHIVE_OK here, even if some of the
++	 * above return ARCHIVE_WARN.  The intent here is to enable
++	 * "as much as possible."  Clients who need specific
++	 * compression should enable those individually so they can
++	 * verify the level of support. */
++	/* Clear any warning messages set by the above functions. */
++	archive_clear_error(a);
+ 	return (ARCHIVE_OK);
+ }
+Index: libarchive/archive_write_disk.c
+===================================================================
+--- libarchive/archive_write_disk.c	(revision 3670)
++++ libarchive/archive_write_disk.c	(revision 3737)
+@@ -1513,6 +1513,22 @@
+ }
+ 
+ #if defined(_WIN32) || defined(__CYGWIN__)
++static int
++guidword(const char *p, int n)
++{
++	int i;
++
++	for (i = 0; i < n; i++) {
++		if ((*p >= '0' && *p <= '9') ||
++		    (*p >= 'a' && *p <= 'f') ||
++		    (*p >= 'A' && *p <= 'F'))
++			p++;
++		else
++			return (-1);
++	}
++	return (0);
++}
++
+ /*
+  * 1. Convert a path separator from '\' to '/' .
+  *    We shouldn't check multi-byte character directly because some
+@@ -1521,26 +1537,92 @@
+  * 2. Replace unusable characters in Windows with underscore('_').
+  * See also : http://msdn.microsoft.com/en-us/library/aa365247.aspx
+  */
+-static void
++static int
+ cleanup_pathname_win(struct archive_write_disk *a)
+ {
+ 	wchar_t wc;
+ 	char *p;
+ 	size_t alen, l;
+ 
+-	alen = 0;
+-	l = 0;
+-	for (p = a->name; *p != '\0'; p++) {
+-		++alen;
+-		if (*p == '\\')
+-			l = 1;
++	p = a->name;
++	/* Skip leading "\\.\" or "\\?\" or "\\?\UNC\" or
++	 * "\\?\Volume{GUID}\"
++	 * (absolute path prefixes used by Windows API) */
++	if ((p[0] == '\\' || p[0] == '/') && (p[1] == '\\' || p[1] == '/' ) &&
++	    (p[2] == '.' || p[2] == '?') && (p[3] ==  '\\' || p[3] == '/'))
++	{
++		/* A path begin with "\\?\UNC\" */
++		if (p[2] == '?' &&
++		    (p[4] == 'U' || p[4] == 'u') &&
++		    (p[5] == 'N' || p[5] == 'n') &&
++		    (p[6] == 'C' || p[6] == 'c') &&
++		    (p[7] == '\\' || p[7] == '/'))
++			p += 8;
++		/* A path begin with "\\?\Volume{GUID}\" */
++		else if (p[2] == '?' &&
++		    (p[4] == 'V' || p[4] == 'v') &&
++		    (p[5] == 'O' || p[5] == 'o') &&
++		    (p[6] == 'L' || p[6] == 'l') &&
++		    (p[7] == 'U' || p[7] == 'u') &&
++		    (p[8] == 'M' || p[8] == 'm') &&
++		    (p[9] == 'E' || p[9] == 'e') &&
++		    p[10] == '{') {
++			if (guidword(p+11, 8) == 0 && p[19] == '-' &&
++			    guidword(p+20, 4) == 0 && p[24] == '-' &&
++			    guidword(p+25, 4) == 0 && p[29] == '-' &&
++			    guidword(p+30, 4) == 0 && p[34] == '-' &&
++			    guidword(p+35, 12) == 0 && p[47] == '}' &&
++			    (p[48] == '\\' || p[48] == '/'))
++				p += 49;
++			else
++				p += 4;
++		/* A path begin with "\\.\PhysicalDriveX" */
++		} else if (p[2] == '.' &&
++		    (p[4] == 'P' || p[4] == 'p') &&
++		    (p[5] == 'H' || p[5] == 'h') &&
++		    (p[6] == 'Y' || p[6] == 'y') &&
++		    (p[7] == 'S' || p[7] == 's') &&
++		    (p[8] == 'I' || p[8] == 'i') &&
++		    (p[9] == 'C' || p[9] == 'c') &&
++		    (p[9] == 'A' || p[9] == 'a') &&
++		    (p[9] == 'L' || p[9] == 'l') &&
++		    (p[9] == 'D' || p[9] == 'd') &&
++		    (p[9] == 'R' || p[9] == 'r') &&
++		    (p[9] == 'I' || p[9] == 'i') &&
++		    (p[9] == 'V' || p[9] == 'v') &&
++		    (p[9] == 'E' || p[9] == 'e') &&
++		    (p[10] >= '0' && p[10] <= '9') &&
++		    p[11] == '\0') {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			    "Path is a physical drive name");
++			return (ARCHIVE_FAILED);
++		} else
++			p += 4;
++	}
++
++	/* Skip leading drive letter from archives created
++	 * on Windows. */
++	if (((p[0] >= 'a' && p[0] <= 'z') ||
++	     (p[0] >= 'A' && p[0] <= 'Z')) &&
++		 p[1] == ':') {
++		if (p[2] == '\0') {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			    "Path is a drive name");
++			return (ARCHIVE_FAILED);
++		}
++		if (p[2] == '\\' || p[2] == '/')
++			p += 3;
++	}
++
++	for (; *p != '\0'; p++) {
+ 		/* Rewrite the path name if its character is a unusable. */
+ 		if (*p == ':' || *p == '*' || *p == '?' || *p == '"' ||
+ 		    *p == '<' || *p == '>' || *p == '|')
+ 			*p = '_';
+ 	}
+-	if (alen == 0 || l == 0)
+-		return;
++	alen = p - a->name;
++	if (alen == 0 || strchr(a->name, '\\') == NULL)
++		return (ARCHIVE_OK);
+ 	/*
+ 	 * Convert path separator.
+ 	 */
+@@ -1560,6 +1642,7 @@
+ 		p += l;
+ 		alen -= l;
+ 	}
++	return (ARCHIVE_OK);
+ }
+ #endif
+ 
+@@ -1583,7 +1666,8 @@
+ 	}
+ 
+ #if defined(_WIN32) || defined(__CYGWIN__)
+-	cleanup_pathname_win(a);
++	if (cleanup_pathname_win(a) != ARCHIVE_OK)
++		return (ARCHIVE_FAILED);
+ #endif
+ 	/* Skip leading '/'. */
+ 	if (*src == '/')
+Index: libarchive/archive_util.c
+===================================================================
+--- libarchive/archive_util.c	(revision 3670)
++++ libarchive/archive_util.c	(revision 3737)
+@@ -155,6 +155,7 @@
+ {
+ 	archive_string_empty(&a->error_string);
+ 	a->error = NULL;
++	a->archive_error_number = 0;
+ }
+ 
+ void
+Index: libarchive/archive_read_extract.c
+===================================================================
+--- libarchive/archive_read_extract.c	(revision 3670)
++++ libarchive/archive_read_extract.c	(revision 3737)
+@@ -108,7 +108,7 @@
+ 	if (r != ARCHIVE_OK)
+ 		/* If _write_header failed, copy the error. */
+  		archive_copy_error(&a->archive, ad);
+-	else if (archive_entry_size(entry) > 0)
++	else if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) > 0)
+ 		/* Otherwise, pour data into the entry. */
+ 		r = copy_data(_a, ad);
+ 	r2 = archive_write_finish_entry(ad);
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 3670)
++++ CMakeLists.txt	(revision 3737)
+@@ -154,6 +154,13 @@
+   SET(HAVE_ZLIB_H 1)
+   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
+   LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
++  IF(WIN32 AND NOT CYGWIN)
++    SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
++    SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
++    CHECK_C_SOURCE_Runs(
++      "#ifndef ZLIB_WINAPI\n#define ZLIB_WINAPI\n#endif\n#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
++      ZLIB_WINAPI)
++  ENDIF(WIN32 AND NOT CYGWIN)
+ ENDIF(ZLIB_FOUND)
+ MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR)
+ MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY)
+
+Property changes on: .
+___________________________________________________________________
+Modified: svn:mergeinfo
+   Merged /trunk:r1989,3247,3722
+
diff --git a/testing/qemu/65-kvm.rules b/testing/qemu/65-kvm.rules
new file mode 100644
index 000000000..c2f7317aa
--- /dev/null
+++ b/testing/qemu/65-kvm.rules
@@ -0,0 +1 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/testing/qemu/PKGBUILD b/testing/qemu/PKGBUILD
new file mode 100644
index 000000000..478935151
--- /dev/null
+++ b/testing/qemu/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 140817 2011-10-19 18:05:05Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=qemu
+pkgver=0.15.1
+pkgrel=1
+pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+url="http://wiki.qemu.org/Index.html"
+makedepends=('texi2html' 'perl' 'python2')
+depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl')
+backup=('etc/qemu/target-x86_64.conf')
+install=qemu.install
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz
+        65-kvm.rules)
+options=(!strip)
+
+build()
+{
+  cd ${srcdir}/${pkgname}-${pkgver}
+  sed -i -e 's/lib64/lib/g' x86_64.ld
+  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \
+              --python=/usr/bin/python2 \
+              --audio-card-list=ac97,sb16,es1370,hda \
+              --enable-docs
+              make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ${srcdir}/65-kvm.rules \
+                   ${pkgdir}/lib/udev/rules.d/65-kvm.rules
+  # strip scripts directory
+    find ${pkgdir}/usr/src/linux-${_kernver}/scripts  -type f -perm -u+w 2>/dev/null | while read binary ; do
+      case "$(file -bi "$binary")" in
+        *application/x-executable*) # Binaries
+        /usr/bin/strip $STRIP_BINARIES "$binary";;
+      esac
+    done
+
+}
+md5sums=('34f17737baaf1b3495c89cd6d4a607ed'
+         'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/testing/qemu/qemu.install b/testing/qemu/qemu.install
new file mode 100644
index 000000000..e16ac027c
--- /dev/null
+++ b/testing/qemu/qemu.install
@@ -0,0 +1,24 @@
+# kvm:  the new package version
+post_install() {
+  #
+  groupadd kvm -f -g 78
+  echo ">>> PLEASE READ FOR KVM USAGE!"
+  echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
+  echo ">>>  Add yourself to the group 'kvm'."
+  echo ">>>  Use 'qemu -enable-kvm' to use KVM."
+  echo ""
+  if [ "$(vercmp $2 0.11)" -lt 0 ]; then
+    echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
+    echo "is no longer supported and will be removed from the repositories. You"
+    echo "can safely uninstall it from your system."
+  fi
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  #
+  groupdel kvm
+}
diff --git a/testing/udev/81-arch.rules b/testing/udev/81-arch.rules
new file mode 100644
index 000000000..6bdf4e249
--- /dev/null
+++ b/testing/udev/81-arch.rules
@@ -0,0 +1,9 @@
+# do not edit this file, it will be overwritten on update
+# this file is going away in the near future
+
+# this might belong in <http://aur.archlinux.org/packages.php?ID=22698>
+# see also /usr/src/*/Documentation/laptops/sonypi.txt
+KERNEL=="sonypi",	MODE="0666"
+
+# this might belong in <https://aur.archlinux.org/packages.php?ID=18393>
+KERNEL=="legousbtower*", MODE="0666"
diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD
new file mode 100644
index 000000000..00ee77d90
--- /dev/null
+++ b/testing/udev/PKGBUILD
@@ -0,0 +1,101 @@
+# $Id: PKGBUILD 140824 2011-10-19 21:51:21Z tomegun $
+# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+# Maintainer: Tom Gundersen <teg@jklm.no>
+
+pkgbase="udev"
+pkgname=('udev' 'udev-compat')
+pkgver=174
+pkgrel=1
+arch=(i686 x86_64)
+url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+license=('GPL')
+groups=('base')
+options=(!makeflags !libtool)
+makedepends=('gobject-introspection' 'gperf')
+#source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2
+source=(http://people.freedesktop.org/~kay/$pkgbase-$pkgver.tar.bz2
+        81-arch.rules)
+
+build() {
+  cd $srcdir/$pkgbase-$pkgver
+
+  ./configure --sysconfdir=/etc\
+              --with-rootlibdir=/lib\
+              --libexecdir=/lib/udev\
+              --sbindir=/sbin\
+              --with-systemdsystemunitdir=/lib/systemd/system\
+              --disable-rule-generator\
+              --enable-udev_acl
+
+  make
+}
+  
+package_udev() {
+  pkgdesc="The userspace dev tools (udev)"
+  depends=('util-linux' 'libusb-compat' 'glib2' 'module-init-tools' 'pciutils')
+  install=udev.install
+  backup=(etc/udev/udev.conf)
+  conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07')
+  replaces=('devfsd')
+  
+  cd $srcdir/$pkgbase-$pkgver
+  make DESTDIR=${pkgdir} install
+  # Install our rule for permissions and symlinks
+  install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules
+
+  # create framebuffer blacklist
+  mkdir -p $pkgdir/lib/modprobe.d/
+  for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do 
+  	echo "blacklist $mod" 
+  done | sort -u > $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf
+
+  # /dev/loop0 is created for convenience, to autoload the module if necessary
+  # may be obsoleted by https://lkml.org/lkml/2011/7/30/111
+  mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0
+  chgrp disk ${pkgdir}/lib/udev/devices/loop0
+
+  # udevd moved, symlink to make life easy for restarting udevd manually
+  ln -s /lib/udev/udevd ${pkgdir}/sbin/udevd
+
+  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
+  for i in $pkgdir/lib/udev/rules.d/*.rules; do
+    sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
+               s#GROUP="tape"#GROUP="storage"#g;
+               s#GROUP="cdrom"#GROUP="optical"#g' $i
+  done
+}
+
+package_udev-compat() {
+  pkgdesc="The userspace dev tools (udev) - additional rules for older kernels"
+  depends=('udev')
+  groups=('')
+  cd $srcdir/$pkgbase-$pkgver
+  install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d
+  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
+  # create static devices in /lib/udev/devices/
+  mkdir -p ${pkgdir}/lib/udev/devices/{pts,shm}
+
+  mknod -m 0600 ${pkgdir}/lib/udev/devices/console c 5 1
+  mknod -m 0666 ${pkgdir}/lib/udev/devices/null c 1 3
+  mknod -m 0660 ${pkgdir}/lib/udev/devices/zero c 1 5
+  mknod -m 0666 ${pkgdir}/lib/udev/devices/kmsg c 1 11
+
+  ln -snf /proc/self/fd ${pkgdir}/lib/udev/devices/fd
+  ln -snf /proc/self/fd/0 ${pkgdir}/lib/udev/devices/stdin
+  ln -snf /proc/self/fd/1 ${pkgdir}/lib/udev/devices/stdout
+  ln -snf /proc/self/fd/2 ${pkgdir}/lib/udev/devices/stderr
+  ln -snf /proc/kcore ${pkgdir}/lib/udev/devices/core
+
+  # these static devices are created for convenience, to autoload the modules if necessary
+  # /dev/net/tun
+  mkdir ${pkgdir}/lib/udev/devices/net
+  mknod -m 0666 ${pkgdir}/lib/udev/devices/net/tun c 10 200
+  # /dev/fuse
+  mknod -m 0666 ${pkgdir}/lib/udev/devices/fuse c 10 229 
+  # /dev/ppp
+  mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0
+}
+md5sums=('3b84706046a33d7a7e00491a1136804d'
+         '3da2bb9891592f9438a07bd641465531')
diff --git a/testing/udev/udev.install b/testing/udev/udev.install
new file mode 100644
index 000000000..2cc8caaa0
--- /dev/null
+++ b/testing/udev/udev.install
@@ -0,0 +1,62 @@
+# arg 1:  the new package version
+# arg 2:  the old package version
+
+post_upgrade() {
+  if [ "$(vercmp $2 174)" -lt 0 ]; then
+    echo "ATTENTION UDEV:"
+    echo "----------"
+    if [ "$(vercmp $2 168)" -lt 0 ]; then
+      echo "Kernel 2.6.32 or newer is now required."
+      echo "  --"
+      echo "OSS emulation modules are not loaded by default, add to rc.conf if needed."
+      echo "  --"
+      echo "Arch specific cd symlinks are now no longer created."
+      echo "  --"
+      echo "cd and net persistent rules will no longer be autogenerated,"
+      echo "see <https://wiki.archlinux.org/index.php/Udev> for details."
+      echo "  --"
+      echo "Errors are now logged (possibly to the console) by default."
+      echo "  --"
+    fi
+    if [ "$(vercmp $2 171)" -lt 0 ]; then
+      echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and"
+      echo "blacklisting in MODULES no longer works."
+      echo "See 'man modprobe.conf' for a replacement to blacklisting."
+      echo "To disable a module mod1 on the kernel command line, use"
+      echo "mod1.disable=1"
+      echo "or"
+      echo "modprobe.blacklist=mod1"
+      echo "  --"
+      echo "The following modules are no longer unconditionally loaded:"
+      echo "  pcspkr irtty-sir analog lp ppdev ide-generic"
+      echo "Add them to MODULES in rc.conf if you need them."
+      echo "  --"
+    fi
+    if [ "$(vercmp $2 172)" -lt 0 ]; then
+      echo "Support for non-devtmpfs self-compiled kernels have been moved to udev-compat."
+      echo "  --"
+      echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
+      echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
+      echo "takes precedence."
+      echo "  --"
+      echo "kbd and rtc devices are no longer world readable."
+      echo "  --"
+      echo "rtc is no longer in the audio group and fb devices are no longer in"
+      echo "the video group, as permissions and ownership of fb devices are controlled"
+      echo "by X."
+      echo "  --"
+    fi
+    echo "We now use upstream rules for assigning devices to the 'disk', 'optical',"
+    echo "'scanner' and 'video' groups. Beware of any changes."
+    echo "  --"
+    echo "We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
+    echo "  --"
+    echo "For security reasons, we no longer add devices to the 'storage' group. Use"
+    echo "udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
+    echo "this functionality back."
+    echo " --"
+    echo "We no longer create the static nodes on install needed for an initrd-less and"
+    echo "devtmpfs-less boot, this only affects fresh installs."
+    echo "---------------"
+  fi
+}