Tue May 21 00:28:39 PDT 2013

author: root <root@rshg054.dnsready.net> 2013-05-21 00:28:39 -0700
committer: root <root@rshg054.dnsready.net> 2013-05-21 00:28:39 -0700
commit: e3f225daecfd5cfea4af1a4e8ac4b6c46c7ec363 (patch)
tree: b3e36d93c34b5b08544b1698462c06fdb99560b8
parent: 383955a81810f344e11b1472bd4c5069fa77020c (diff)
115 files changed, 1256 insertions, 1716 deletions
diff --git a/community/bonnie++/PKGBUILD b/community/bonnie++/PKGBUILD
index 27e176e37..f45a04241 100644
--- a/community/bonnie++/PKGBUILD
+++ b/community/bonnie++/PKGBUILD
@@ -4,19 +4,20 @@
 
 pkgname=bonnie++
 pkgver=1.03e
-pkgrel=6
+pkgrel=7
 pkgdesc="Based on the Bonnie hard drive benchmark by Tim Bray"
 arch=('i686' 'x86_64')
 url="http://www.coker.com.au/bonnie++/"
 license=('GPL')
 depends=('perl')
-source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz)
-sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb')
+source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz move_away_from_sbin.patch)
+sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb'
+            'c100df652c26f38c950baaf3fe25a74d51ba830066f9d02d273cbb5fc5660814')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr 
   sed -i "s:CFLAGS=-O2  -DNDEBUG \$(WFLAGS) \$(MORECFLAGS):CFLAGS=${CFLAGS}:" Makefile
   make
 }
@@ -24,6 +25,8 @@ build() {
 package() {
   cd $srcdir/${pkgname}-${pkgver}
 
+  # https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/
+  patch -Np1 -i $srcdir/move_away_from_sbin.patch
   make prefix="${pkgdir}/usr" install
 
   install -d $pkgdir/usr/share/doc/bonnie++
diff --git a/community/bonnie++/move_away_from_sbin.patch b/community/bonnie++/move_away_from_sbin.patch
new file mode 100644
index 000000000..18e99e976
--- /dev/null
+++ b/community/bonnie++/move_away_from_sbin.patch
@@ -0,0 +1,14 @@
+diff -aur bonnie++-1.03e/Makefile bonnie++-1.03ef/Makefile
+--- bonnie++-1.03e/Makefile	2013-05-13 08:40:45.122959831 +0000
++++ bonnie++-1.03ef/Makefile	2013-05-13 08:43:20.365248937 +0000
+@@ -33,8 +33,8 @@
+ 	$(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LFLAGS)
+ 
+ install-bin: $(EXES)
+-	mkdir -p $(eprefix)/bin $(eprefix)/sbin
+-	${INSTALL} -s $(EXES) $(eprefix)/sbin
++	mkdir -p $(eprefix)/bin 
++	${INSTALL} -s $(EXES) $(eprefix)/bin
+ 	${INSTALL} $(SCRIPTS) $(eprefix)/bin
+ 
+ install: install-bin
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index 07b3708d9..59f594221 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88406 2013-04-17 07:01:42Z bisson $
+# $Id: PKGBUILD 91248 2013-05-20 14:50:52Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 
 pkgname=collectd
 pkgver=5.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Daemon which collects system performance statistics periodically'
 url='http://collectd.org/'
 arch=('i686' 'x86_64')
@@ -40,12 +40,10 @@ depends=('libltdl' 'iptables')
 
 source=("${url}files/${pkgname}-${pkgver}.tar.gz"
         'libperl.patch'
-        'service'
-        'rc.d')
+        'service')
 sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539'
           '245c098d121a4a05594553583310953b3a2f6461'
-          'b56907f532b9174e1b6995aadb518228d7464d3b'
-          '0f441718d5519cb043b1130e5a1d0379078adbcc')
+          '04f676d0b76c34df0bbf94629813e035b1febe04')
 
 backup=('etc/collectd.conf')
 options=('!libtool')
@@ -63,7 +61,8 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--enable-static=no \
+		--sbindir=/usr/bin \
+		--disable-static \
 		--with-python=/usr/bin/python2
 	make all
 }
@@ -72,7 +71,6 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 	rmdir "${pkgdir}/var/run" # FS#30201
-	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service
 	install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
 }
diff --git a/community/collectd/rc.d b/community/collectd/rc.d
deleted file mode 100644
index 442f2324a..000000000
--- a/community/collectd/rc.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=collectd
-prog="/usr/sbin/collectdmon"
-
-PID=$(pidof -o %PPID $prog)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && $prog \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 2
-	$0 start
-	;;
-reload)
-	stat_busy "Sending SIGHUP to $name daemon"
-	[[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	exit 1
-	;;
-esac
diff --git a/community/collectd/service b/community/collectd/service
index 9581ec0c9..30540645a 100644
--- a/community/collectd/service
+++ b/community/collectd/service
@@ -5,7 +5,7 @@ After=local-fs.target network.target
 [Service]
 Type=forking
 PIDFile=/run/collectdmon.pid
-ExecStart=/usr/sbin/collectdmon
+ExecStart=/usr/bin/collectdmon
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
 
diff --git a/community/compiz-bcop/PKGBUILD b/community/compiz-bcop/PKGBUILD
deleted file mode 100644
index b8af4d326..000000000
--- a/community/compiz-bcop/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 68296 2012-03-21 10:32:03Z pschmitz $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=compiz-bcop
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Compiz option code generator"
-arch=('i686' 'x86_64')
-url="http://www.compiz.org"
-license=('GPL')
-depends=('compiz-core>=0.8.8' 'libxslt')
-makedepends=('intltool' 'pkgconfig')
-conflicts=('compiz-bcop-git')
-source=(http://releases.compiz-fusion.org/$pkgver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('9210bd2a537480bdb11df0e3cc5f6d4548fd12da')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/compiz-fusion-plugins-extra/PKGBUILD b/community/compiz-fusion-plugins-extra/PKGBUILD
deleted file mode 100644
index 459d72d98..000000000
--- a/community/compiz-fusion-plugins-extra/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 68298 2012-03-21 10:33:42Z pschmitz $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=compiz-fusion-plugins-extra
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Compiz Fusion Extra plugins"
-arch=('i686' 'x86_64')
-url="http://www.compiz.org"
-license=('GPL')
-depends=('compiz-core' 'compiz-bcop' 'compiz-fusion-plugins-main' 'libnotify')
-makedepends=('intltool' 'pkg-config' 'gettext' 'gconf')
-groups=('compiz-fusion' 'compiz-fusion-gtk' 'compiz-fusion-kde')
-conflicts=('compiz-fusion-plugins-extra-git')
-options=('!libtool')
-source=(http://releases.compiz-fusion.org/${pkgver}/compiz-plugins-extra-${pkgver}.tar.bz2)
-sha1sums=('ce592993696c0b5d4e0bb13171897b4c25b3844e')
-
-build() {
-  cd "${srcdir}/compiz-plugins-extra-${pkgver}"
-
-  sed -i 's/if text "x$use/if test "x$use/' configure
-  sed -i 's/iconUri, NULL);/iconUri);/' src/notification/notification.c
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "${srcdir}/compiz-plugins-extra-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/compiz-fusion-plugins-main/PKGBUILD b/community/compiz-fusion-plugins-main/PKGBUILD
deleted file mode 100644
index b9d61b9ec..000000000
--- a/community/compiz-fusion-plugins-main/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 68300 2012-03-21 10:35:13Z pschmitz $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=compiz-fusion-plugins-main
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Compiz Fusion Main plugins"
-arch=('i686' 'x86_64')
-url="http://www.compiz.org"
-license=('GPL')
-depends=('compiz-core' 'libjpeg>=7' 'librsvg' 'compiz-bcop' 'libxdamage' 'libxcomposite'
-	'libxinerama' 'startup-notification')
-makedepends=('intltool' 'pkgconfig' 'gettext')
-groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk')
-conflicts=('compiz-fusion-plugins-main-git')
-source=(http://releases.compiz-fusion.org/${pkgver}/compiz-plugins-main-${pkgver}.tar.bz2)
-options=(!libtool)
-sha1sums=('3c99841b744ae6c4a3edf2019626484880607dc6')
-
-build() {
-  cd "${srcdir}/compiz-plugins-main-${pkgver}"
-
-  CPPFLAGS="$CPPFLAGS -I/usr/include/compiz -I/usr/include/startup-notification-1.0 \
-        -I/usr/include/libxml2" ./configure --prefix=/usr --sysconfdir=/etc
-
-  make
-}
-
-package() {
-  cd "${srcdir}/compiz-plugins-main-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/compiz-fusion-plugins-main/magiclamp.patch b/community/compiz-fusion-plugins-main/magiclamp.patch
deleted file mode 100644
index 3a9e4a21e..000000000
--- a/community/compiz-fusion-plugins-main/magiclamp.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/animation/animation.c.orig	2007-12-01 02:22:12.008115484 +0100
-+++ src/animation/animation.c	2007-12-01 02:27:41.541651382 +0100
-@@ -1148,7 +1148,7 @@
-     { "horizontal_folds_zoom_to_taskbar", "bool", 0, 0, 0 },
-     { "magic_lamp_moving_end", "bool", 0, 0, 0 },
-     { "magic_lamp_grid_res", "int", "<min>4</min>", 0, 0 },
--    { "magic_lamp_max_waves", "int", "<min>3</min>", 0, 0 },
-+    { "magic_lamp_max_waves", "int", "<min>0</min>", 0, 0 },
-     { "magic_lamp_amp_min", "float", "<min>200</min>", 0, 0 },
-     { "magic_lamp_amp_max", "float", "<min>200</min>", 0, 0 },
-     { "magic_lamp_open_start_width", "int", "<min>0</min>", 0, 0 },
---- metadata/animation.xml.in.orig	2007-12-01 02:25:24.011432269 +0100
-+++ metadata/animation.xml.in	2007-12-01 02:27:02.724750938 +0100
-@@ -1272,7 +1272,7 @@
- 	    <_short>Magic Lamp Max Waves</_short>
- 	    <_long>The maximum number of waves for Magic Lamp.</_long>
- 	    <default>3</default>
--	    <min>3</min>
-+	    <min>0</min>
- 	    <max>20</max>
- 	  </option>
- 	  <option name="magic_lamp_amp_min" type="float">
---- metadata/animation.xml.orig	2007-12-01 02:25:14.584765435 +0100
-+++ metadata/animation.xml	2007-12-01 02:35:07.068035601 +0100
-@@ -3962,7 +3962,7 @@
- 	    <long xml:lang="pt">Número máximo de ondas para Lâmpada Mágica.</long>
- 	    <long xml:lang="sv">Den Magiska Lampans maximala antal vågor</long>
- 	    <default>3</default>
--	    <min>3</min>
-+	    <min>0</min>
- 	    <max>20</max>
- 	  </option>
- 	  <option type="float" name="magic_lamp_amp_min">
diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD
deleted file mode 100644
index 08ce577bd..000000000
--- a/community/compiz/PKGBUILD
+++ /dev/null
@@ -1,142 +0,0 @@
-# $Id: PKGBUILD 90011 2013-05-06 19:36:27Z foutrelis $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Hussam Al-Tayeb ht990332@gmail.com
-# Contributor: Khashayar Naderehvandi <khashayar [at] naderehvandi [dot] net>
-# Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
-
-pkgbase=compiz
-pkgname=('compiz-core'
-	'compiz-decorator-kde'
-	'compiz-decorator-gtk')
-pkgver=0.8.8
-pkgrel=5
-pkgdesc="Composite manager for Aiglx and Xgl"
-url="http://www.compiz.org/"
-license=('GPL' 'LGPL' 'MIT')
-arch=('i686' 'x86_64')
-groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion')
-makedepends=('intltool' 'gnome-control-center' 'gconf' 'libwnck' 'kdebase-workspace'
- 'startup-notification' 'librsvg' 'libgl' 'dbus' 'glu' 'libxslt' 'fuse' 'metacity')
-options=(!libtool !emptydirs)
-conflicts=('compiz' 'compiz-core-git' 'compiz-git')
-replaces=('compiz')
-source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz
-        compiz-kde-4.8.patch
-        compiz-kde-4.9.patch
-        compiz-kde-4.10.patch
-        compiz-gcc-4.7.patch)
-sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e'
-          '148656352f8a20b3781ee185025c5c8d4b7d720f'
-          '2b6fa7398ccb96172a99f4d12990bbc0491e355c'
-          'f3c97cc9835643d48058682506eac98d6deceeb7'
-          '2138342ae9f253bae003e96e91fdd0bc9918291a')
-
-prepare()
-{
-  cd "$srcdir/compiz-$pkgver"
-
-  patch -p0 -i ../compiz-gcc-4.7.patch
-  patch -p1 -i ../compiz-kde-4.8.patch
-  patch -p1 -i ../compiz-kde-4.9.patch
-  patch -p0 -i ../compiz-kde-4.10.patch
-}
-
-build()
-{
-  cd "$srcdir/compiz-$pkgver"
-
-  ./configure   --prefix=/usr \
-	    --enable-gnome \
-	    --enable-gtk \
-	    --enable-metacity \
-	    --enable-gconf \
-            --with-gconf-schema-file-dir=/etc/gconf/schemas \
-	    --enable-dbus \
-	    --enable-librsvg \
-	    --disable-kde \
-	    --enable-kde4
-
-  make QDBUSXML2CPP=/usr/bin/qdbusxml2cpp-qt4
-}
-
-package_compiz-core()
-{
-
-  pkgdesc="Composite manager for Aiglx and Xgl"
-  depends=('startup-notification' 'librsvg' \
-         'libgl' 'dbus' 'glu' 'libxslt' 'fuse')
-
-  cd "$srcdir/compiz-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # remove stuff which is in one of the decorations
-   rm -rf "$pkgdir"/usr/bin/{gtk-window-decorator,kde4-window-decorator}
-   rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center}
-   rm -rf "${pkgdir}"/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*}
-   rm -rf "${pkgdir}"/etc
-
-  # install MIT license
-  install -Dm644 "$srcdir/compiz-$pkgver/COPYING.MIT" \
-	"$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT"
-}
-
-package_compiz-decorator-gtk()
-{
-  pkgdesc="Compiz decorator for GNOME"
-  depends=('gnome-control-center' 'gconf' 'libwnck' 'compiz-core' 'metacity')
-  install=compiz-decorator-gtk.install
-
-  cd "$srcdir/compiz-$pkgver"
-
-  pushd gtk
-  make DESTDIR="$pkgdir" install
-  install -Dm644 window-decorator/gwd.schemas \
-                "$pkgdir/usr/share/gconf/schemas/gwd.schemas"
-  popd
-
-  for i in dbus gconf ini inotify png regex svg glib kconfig
-  do
-    rm "$srcdir"/compiz-$pkgver/metadata/compiz-$i.schemas
-  done
-
-  gconf-merge-schema \
-    "${pkgdir}"/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \
-        "${srcdir}"/compiz-$pkgver/metadata/*.schemas
-
-  make DESTDIR="$pkgdir" install
-
-  # remove stuff which is in one of the other packages
-   rm -rf "${pkgdir}"/etc
-   rm -rf "$pkgdir"/usr/bin/{compiz,kde4-window-decorator}
-   rm -rf "$pkgdir"/usr/include
-   cd "$pkgdir"/usr/lib
-   rm libdecoration*
-   rm pkgconfig/{compiz-cube.pc,compiz-scale.pc,compiz.pc,libdecoration.pc}
-   cd "${pkgdir}"/usr/lib/compiz
-   rm $(ls --hide=*gconf*)
-   rm -rf "${pkgdir}"/usr/share/{compiz,locale}
-   
-  # install MIT license
-  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
-        "$pkgdir"/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT
-}
-
-package_compiz-decorator-kde()
-{
-  pkgdesc="Compiz decorator for KDE"
-  depends=('kdebase-workspace' 'compiz-core')
-
-  cd "$srcdir"/compiz-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Let's remove stuff that are in compiz-core package or gtk decorator
-  rm -rf "$pkgdir"/usr/{include,lib}
-  rm -rf "$pkgdir"/usr/bin/{compiz,gtk-window-decorator}
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center,locale,compiz}
-
-  # install MIT license
-  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
-        "$pkgdir"/usr/share/licenses/compiz-decorator-kde/COPYING.MIT
-}
-
diff --git a/community/compiz/compiz-decorator-gtk.install b/community/compiz/compiz-decorator-gtk.install
deleted file mode 100644
index b3738fda9..000000000
--- a/community/compiz/compiz-decorator-gtk.install
+++ /dev/null
@@ -1,28 +0,0 @@
-post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/gwd.schemas > /dev/null
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null
-  kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1
-  update-desktop-database -q
-
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/gwd.schemas >/dev/null
-  usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null
-}
-
-post_remove() {
-  kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1
-  update-desktop-database -q
-}
-
diff --git a/community/compiz/compiz-gcc-4.7.patch b/community/compiz/compiz-gcc-4.7.patch
deleted file mode 100644
index 28315baec..000000000
--- a/community/compiz/compiz-gcc-4.7.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- kde/window-decorator-kde4/window.cpp	2010-05-21 11:18:14.000000000 +0000
-+++ kde/window-decorator-kde4/window.cpp	2012-09-12 18:05:00.000000000 +0000
-@@ -59,6 +59,9 @@
- 
- #include "paintredirector.h"
- 
-+// header for gcc-4.7 compatibility
-+#include "unistd.h"
-+
- KWD::Window::Window (WId  parentId,
- 		     WId  clientId,
- 		     WId  frame,
---- configure.ac.orig	2012-09-12 23:39:54.093812000 +0400
-+++ configure.ac	2012-09-12 23:40:37.253686000 +0400
-@@ -72,11 +72,6 @@
-   *) CFLAGS="$CFLAGS -Wnested-externs" ;;
-   esac
- 
--  case " $CFLAGS " in
--  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
--  *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;;
--  esac
--
-   if test "x$enable_ansi" = "xyes"; then
-     case " $CFLAGS " in
-     *[[\ \	]]-ansi[[\ \	]]*) ;;
-@@ -95,11 +90,6 @@
-   *[[\ \	]]-Wall[[\ \	]]*) ;;
-   *) CXXFLAGS="$CXXFLAGS -Wall" ;;
-   esac
--
--  case " $CXXFLAGS " in
--  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
--  *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;;
--  esac
- fi
- 
- AC_C_BIGENDIAN
diff --git a/community/compiz/compiz-kde-4.10.patch b/community/compiz/compiz-kde-4.10.patch
deleted file mode 100644
index a30d54b90..000000000
--- a/community/compiz/compiz-kde-4.10.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- kde/window-decorator-kde4/window.cpp	2012-11-14 10:17:09 +0000
-+++ kde/window-decorator-kde4/window.cpp	2012-11-23 06:43:18 +0000
-@@ -554,6 +554,15 @@
-     showWindowMenu (pos.bottomLeft ());
- }
- 
-+void KWD::Window::showApplicationMenu (const QPoint &p)
-+{
-+}
-+
-+bool KWD::Window::menuAvailable () const
-+{
-+    return false;
-+}
-+
- KWD::Options::MouseCommand
- KWD::Window::buttonToCommand (Qt::MouseButtons button)
- {
-
---- kde/window-decorator-kde4/window.h	2012-09-03 07:19:30 +0000
-+++ kde/window-decorator-kde4/window.h	2012-11-23 06:43:18 +0000
-@@ -92,6 +92,8 @@
- 	virtual void processMousePressEvent (QMouseEvent *);
- 	virtual void showWindowMenu (const QRect &);
- 	virtual void showWindowMenu (const QPoint &);
-+	virtual void showApplicationMenu (const QPoint &);
-+	virtual bool menuAvailable () const;
- 	virtual void performWindowOperation (WindowOperation);
- 	virtual void setMask (const QRegion &, int);
- 	virtual bool isPreview (void) const;
diff --git a/community/compiz/compiz-kde-4.8.patch b/community/compiz/compiz-kde-4.8.patch
deleted file mode 100644
index f22a3fa21..000000000
--- a/community/compiz/compiz-kde-4.8.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp
---- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp	2012-01-29 22:05:54.000000000 -0500
-+++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp	2012-01-29 22:10:38.000000000 -0500
-@@ -986,10 +986,10 @@
- {
-     Atom    atom = Atoms::compizWindowBlurDecor;
-     QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
--    Region  topRegion = NULL;
--    Region  bottomRegion = NULL;
--    Region  leftRegion = NULL;
--    Region  rightRegion = NULL;
-+    ::Region  topRegion = NULL;
-+    ::Region  bottomRegion = NULL;
-+    ::Region  leftRegion = NULL;
-+    ::Region  rightRegion = NULL;
-     int     size = 0;
-     int     w, h;
- 
diff --git a/community/compiz/compiz-kde-4.9.patch b/community/compiz/compiz-kde-4.9.patch
deleted file mode 100644
index 7b56da95c..000000000
--- a/community/compiz/compiz-kde-4.9.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 3c6f698c12f455661807c4115feaa73007fc33d1 Mon Sep 17 00:00:00 2001
-From: Dennis Kasprzyk <onestone@compiz.org>
-Date: Mon, 06 Aug 2012 18:23:17 +0000
-Subject: KDE 4.9 support.
-
-Little modification for compatibility with KDE 4.8 patch was added by Sergey Popov
-
----
-diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp
-index a65f99f..78d1a47 100644
---- a/kde/window-decorator-kde4/window.cpp
-+++ b/kde/window-decorator-kde4/window.cpp
-@@ -768,6 +768,22 @@ KWD::Window::transparentRect () const
-     return QRect ();
- }
- 
-+KDecorationDefines::WindowOperation
-+KWD::Window::buttonToWindowOperation(Qt::MouseButtons button)
-+{
-+    Options::MouseCommand com = buttonToCommand (button);
-+
-+    if (com == Options::MouseOperationsMenu)
-+	return KDecorationDefines::OperationsOp;
-+
-+    return KDecorationDefines::NoOp;
-+}
-+
-+
-+#endif
-+
-+#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80)
-+
- bool
- KWD::Window::isClientGroupActive ()
- {
-@@ -837,19 +853,82 @@ KWD::Window::displayClientMenu (int index, const QPoint& pos)
-     showWindowMenu (pos);
- }
- 
--KDecorationDefines::WindowOperation
--KWD::Window::buttonToWindowOperation(Qt::MouseButtons button)
-+#endif
-+
-+#if KDE_IS_VERSION(4,8,80)
-+QString 
-+KWD::Window::caption(int idx) const
- {
--    Options::MouseCommand com = buttonToCommand (button);
-+    return mName;
-+}
- 
--    if (com == Options::MouseOperationsMenu)
--	return KDecorationDefines::OperationsOp;
-+void
-+KWD::Window::closeTab(long id)
-+{
-+    closeWindow ();
-+}
- 
--    return KDecorationDefines::NoOp;
-+void
-+KWD::Window::closeTabGroup()
-+{
-+    closeWindow ();
-+}
-+
-+long
-+KWD::Window::currentTabId() const
-+{
-+     return (long) mClientId;
-+}
-+
-+QIcon
-+KWD::Window::icon(int idx) const
-+{
-+    QIcon icon (mIcon);
-+    icon.addPixmap (mMiniIcon);
-+    return icon;
-+}
-+
-+void
-+KWD::Window::setCurrentTab(long id)
-+{
-+}
-+
-+void
-+KWD::Window::showWindowMenu(const QPoint& pos, long id)
-+{
-+  showWindowMenu (pos);
-+}
-+
-+void
-+KWD::Window::tab_A_before_B(long A, long B)
-+{
-+}
-+
-+void
-+KWD::Window::tab_A_behind_B(long A, long B)
-+{
-+}
-+
-+int
-+KWD::Window::tabCount() const
-+{
-+    return 1;
-+}
-+
-+long
-+KWD::Window::tabId(int idx) const
-+{
-+    return (long) mClientId;
-+}
-+
-+void
-+KWD::Window::untab(long id, const QRect& newGeom)
-+{
- }
- 
- #endif
- 
-+
- void
- KWD::Window::createDecoration (void)
- {
-@@ -987,14 +1066,14 @@ KWD::Window::updateBlurProperty (int topOffset,
- 				 int leftOffset,
- 				 int rightOffset)
- {
--    Atom    atom = Atoms::compizWindowBlurDecor;
--    QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
--    ::Region  topRegion = NULL;
--    ::Region  bottomRegion = NULL;
--    ::Region  leftRegion = NULL;
--    ::Region  rightRegion = NULL;
--    int     size = 0;
--    int     w, h;
-+    Atom      atom = Atoms::compizWindowBlurDecor;
-+    QRegion   topQRegion, bottomQRegion, leftQRegion, rightQRegion;
-+    _XRegion *topRegion = NULL;
-+    _XRegion *bottomRegion = NULL;
-+    _XRegion *leftRegion = NULL;
-+    _XRegion *rightRegion = NULL;
-+    int       size = 0;
-+    int       w, h;
- 
-     w = mGeometry.width () + mBorder.left + mBorder.right;
-     h = mGeometry.height () + mBorder.top + mBorder.bottom;
-diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h
-index c2b274b..1ddfbd1 100644
---- a/kde/window-decorator-kde4/window.h
-+++ b/kde/window-decorator-kde4/window.h
-@@ -114,7 +114,10 @@ class Window: public QObject, public KDecorationBridgeUnstable {
- 	virtual bool compositingActive () const;
- #if KDE_IS_VERSION(4,3,90)
- 	virtual QRect transparentRect () const;
--
-+	virtual WindowOperation
-+	    buttonToWindowOperation(Qt::MouseButtons button);
-+#endif
-+#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80)
- 	virtual bool isClientGroupActive ();
- 	virtual QList<ClientGroupItem> clientGroupItems () const;
- 	virtual long itemId (int index);
-@@ -126,10 +129,27 @@ class Window: public QObject, public KDecorationBridgeUnstable {
- 	virtual void closeClientGroupItem (int index);
- 	virtual void closeAllInClientGroup ();
- 	virtual void displayClientMenu (int index, const QPoint& pos);
--
--	virtual WindowOperation
--	    buttonToWindowOperation(Qt::MouseButtons button);
-+	
-+#endif
-+#if KDE_IS_VERSION(4,8,80)
-+	using KDecorationBridge::caption;
-+	virtual QString caption(int idx) const;
-+	virtual void closeTab(long id);
-+	virtual void closeTabGroup();
-+	virtual long currentTabId() const;
-+	using KDecorationBridge::icon;
-+	virtual QIcon icon(int idx) const;
-+	virtual void setCurrentTab(long id);
-+	using KDecorationBridge::showWindowMenu;
-+	virtual void showWindowMenu(const QPoint& pos, long id);
-+	virtual void tab_A_before_B(long A, long B);
-+	virtual void tab_A_behind_B(long A, long B);
-+	virtual int tabCount() const;
-+	virtual long tabId(int idx) const;
-+	virtual void untab(long id, const QRect& newGeom);
- #endif
-+	
-+
- 	virtual bool eventFilter (QObject* o, QEvent* e);
- 
- 	void handleActiveChange (void);
---
-cgit v0.8.3.1-30-gff3a
diff --git a/community/compizconfig-backend-gconf/PKGBUILD b/community/compizconfig-backend-gconf/PKGBUILD
deleted file mode 100644
index 8b8c60cb8..000000000
--- a/community/compizconfig-backend-gconf/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 68302 2012-03-21 10:36:50Z pschmitz $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: kasa <biuta.jr@gmail.com>
-
-pkgname=compizconfig-backend-gconf
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Compizconfig backend for gconf"
-arch=('i686' 'x86_64')
-url="http://opencompositing.org"
-license=('GPL')
-depends=('libcompizconfig' 'gconf')
-makedepends=('intltool' 'pkgconfig')
-conflicts=('compizconfig-backend-gconf-git')
-groups=('compiz-fusion-gtk' 'compiz-fusion')
-options=('!libtool')
-source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('3869e83a50e82caa4bfda5474a3bf44095ee78dc')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure \
-    --prefix=/usr \
-    --infodir=/usr/share/info \
-    --mandir=/usr/share/man \
-    --sysconfdir=/etc
-                
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
-                          
diff --git a/community/compizconfig-python/PKGBUILD b/community/compizconfig-python/PKGBUILD
deleted file mode 100644
index d4d65ff95..000000000
--- a/community/compizconfig-python/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 68381 2012-03-23 15:45:56Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=compizconfig-python
-pkgver=0.8.4
-pkgrel=4
-pkgdesc="Compizconfig bindings for python"
-arch=('i686' 'x86_64')
-url="http://opencompositing.org"
-license=('GPL')
-depends=('compiz-core' 'libcompizconfig' 'glib2' 'python2' 'libxrandr')
-makedepends=('intltool' 'pkgconfig' 'pyrex')
-conflicts=('compizconfig-python-git')
-source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('702f83f63ce5dc3c6c1d27e07fb62fc3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  PYTHON=python2 ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD
index cd193ed36..f4becdd48 100644
--- a/community/geany-plugins/PKGBUILD
+++ b/community/geany-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90241 2013-05-09 23:30:17Z arodseth $
+# $Id: PKGBUILD 91272 2013-05-20 19:14:00Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>  
 # Contributor: djgera
@@ -6,12 +6,12 @@
 
 pkgname=geany-plugins
 pkgver=1.23
-pkgrel=2
+pkgrel=3
 pkgdesc='Plugins for Geany'
 arch=('x86_64' 'i686')
 url='http://plugins.geany.org/'
 license=('GPL')
-depends=("geany=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte'
+depends=("geany>=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte'
          'desktop-file-utils' 'gtk-update-icon-cache' 'lua51')
 makedepends=('intltool' 'vala' 'gdb' 'cppcheck')
 optdepends=('hspell: hebrew spell checker')
diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD
index b6a270944..2e689dd5d 100644
--- a/community/geany/PKGBUILD
+++ b/community/geany/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86000 2013-03-10 22:54:45Z arodseth $
+# $Id: PKGBUILD 91268 2013-05-20 18:58:27Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Ionut Biru  <ibiru@archlinux.ro>
@@ -6,7 +6,7 @@
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 
 pkgname=geany
-pkgver=1.23
+pkgver=1.23.1
 pkgrel=1
 pkgdesc='Fast and lightweight IDE'
 arch=('x86_64' 'i686')
@@ -20,7 +20,17 @@ optdepends=('vte: for terminal support'
 install="$pkgname.install"
 options=('!libtool')
 source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2")
-sha256sums=('cdd4a772694803c837ae59e56f7bdc2faba174509317211f522e7d25dfcbe8b0')
+sha256sums=('8815b16e59d8679ec359a1a5754fee05e77f7bca53083c939654bfc77d978fad')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Python2 fix
+	sed -i '0,/on/s//on2/' data/templates/files/main.py
+
+  # Syntax highlighting for PKGBUILD files
+  sed -i 's/Sh=/Sh=PKGBUILD;/' data/filetype_extensions.conf
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,14 +38,8 @@ build() {
   ./configure --prefix=/usr
   make
 
-  # Python2 fix
-	sed -i '0,/on/s//on2/' data/templates/files/main.py
-
   # Fix for FS#10318
   setconf geany.desktop MimeType ''
-
-  # Syntax highlighting for PKGBUILD files
-  sed -i 's/Sh=/Sh=PKGBUILD;/' data/filetype_extensions.conf
 }
 
 package() {
diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD
index 1ac198b22..f3d84a587 100644
--- a/community/golangide/PKGBUILD
+++ b/community/golangide/PKGBUILD
@@ -1,11 +1,11 @@
-#$Id: PKGBUILD 90755 2013-05-13 16:04:18Z arodseth $
+#$Id: PKGBUILD 91294 2013-05-20 20:42:41Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: spambanane <happy.house@gmx.de>
 # Contributor: Matteo <matteo.dek@gmail.com>
 
 pkgname=golangide
 pkgver=18.1
-pkgrel=2
+pkgrel=3
 pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)'
 license=('LGPL')
 arch=('x86_64' 'i686')
@@ -13,17 +13,17 @@ url='https://github.com/visualfc/liteide'
 depends=('go' 'libpng12' 'glib2' 'qt5-base' 'qt5-webkit')
 makedepends=('gendesk')
 options=('!strip')
-source=("$pkgname.tgz::https://github.com/visualfc/liteide/archive/x$pkgver.zip"
+source=("$pkgname.zip::https://github.com/visualfc/liteide/archive/x$pkgver.zip"
         'golangide.png'
         'golangide.sh')
-sha256sums=('d3706ff01ebb501eec4d237f418121bbc4523dac793e6c2430f7b5ac3712ce53'
+sha256sums=('60ab324bffb5ec4e7b1b3f9cae9729c7c6c499df3bb994861de65e473f2d64fe'
             '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697'
             '93ef16d59054ef9b37f8781e90f7d0f83d726779d2029660dfd21e84d808bf04')
 
 prepare() {
   cd "$srcdir"
 
-  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'Golang IDE'
+  gendesk -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc"
   cd "liteide-x$pkgver/build"
   chmod +x build_linux.sh
 }
@@ -43,9 +43,10 @@ build() {
 
 package() {
   msg2 'Creating directories...'
-  mkdir -p "$pkgdir/usr/lib/liteide"
-  mkdir -p "$pkgdir/usr/share/liteide"
-  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
+  mkdir -p \
+    "$pkgdir/usr/lib/liteide" \
+    "$pkgdir/usr/share/liteide" \
+    "$pkgdir/usr/share/doc/$pkgname"
 
   cd "$srcdir/liteide-x$pkgver/build/liteide"
 
@@ -58,8 +59,7 @@ package() {
   cd "$srcdir/liteide-x$pkgver/liteidex"
 
   msg2 'Packaging resources...'
-  cp -r deploy/* "$pkgdir/usr/share/liteide"
-  cp -r os_deploy/* "$pkgdir/usr/share/liteide"
+  cp -r deploy/* os_deploy/* "$pkgdir/usr/share/liteide"
 
   msg2 'Packaging libraries and plugins...'
   cp -r liteide/lib/liteide/* "$pkgdir/usr/lib/liteide"
diff --git a/community/i2c-tools/PKGBUILD b/community/i2c-tools/PKGBUILD
index 679dad5ca..2e15b7557 100644
--- a/community/i2c-tools/PKGBUILD
+++ b/community/i2c-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73640 2012-07-12 13:05:49Z tredaelli $
+# $Id: PKGBUILD 91137 2013-05-20 09:47:55Z jelle $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: DonVla <donvla@users.sourceforge.net>
 
 pkgname=i2c-tools
 pkgver=3.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Heterogeneous set of I2C tools for Linux that used to be part of lm-sensors"
 arch=('i686' 'x86_64')
 url="http://www.lm-sensors.org/wiki/I2CTools"
@@ -25,7 +25,7 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make prefix="${pkgdir}/usr" install
-  install -Dm755 eepromer/eeprog eepromer/eeprom eepromer/eepromer "${pkgdir}/usr/sbin"
+  install -Dm755 eepromer/eeprog eepromer/eeprom eepromer/eepromer "${pkgdir}/usr/bin"
   cd py-smbus
   python2 setup.py install --prefix "${pkgdir}/usr"
   rm -rf "${pkgdir}/usr/include"
diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD
index a75362d7f..772815e49 100644
--- a/community/kmess/PKGBUILD
+++ b/community/kmess/PKGBUILD
@@ -1,22 +1,29 @@
-# $Id: PKGBUILD 67104 2012-03-04 10:22:10Z andrea $
+# $Id: PKGBUILD 91296 2013-05-20 21:10:18Z foutrelis $
 # Maintainer:
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
 
 pkgname=kmess
 pkgver=2.0.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A MSN Messenger client for Linux"
 arch=('i686' 'x86_64')
 url='http://kmess.sourceforge.net/'
 license=('GPL')
 depends=('kdebase-lib')
-makedepends=('automoc4' 'cmake')
+makedepends=('automoc4' 'cmake' 'optipng')
 optdepends=('cabextract: provides winks support')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2")
 md5sums=('a2e57911713308bef81b9347135cc5dd')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix invalid PNG images to work with libpng 1.6
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
 build() {
   cd "${srcdir}"
   mkdir build
diff --git a/community/libcompizconfig/PKGBUILD b/community/libcompizconfig/PKGBUILD
deleted file mode 100644
index 79fc479ed..000000000
--- a/community/libcompizconfig/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 68306 2012-03-21 10:40:24Z pschmitz $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=libcompizconfig
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Compiz configuration system library"
-arch=('i686' 'x86_64')
-url="http://www.compiz.org"
-license=('GPL')
-depends=('compiz-core' 'libxml2' 'libxcomposite' 'libxinerama' 'startup-notification'
-	'libxml++')
-makedepends=('intltool' 'pkgconfig')
-conflicts=('libcompizconfig-git')
-source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-options=('!emptydirs' '!libtool')
-sha1sums=('8ea1f15fd9e1e2eb37a9814646659a31a8018fd8')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  CPPFLAGS="$CPPFLAGS -I/usr/include/compiz -I/usr/include/startup-notification-1.0 \
-	-I/usr/include/libxml2" ./configure --prefix=/usr --sysconfdir=/etc 
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD
index 7a7d8dc62..797a82a98 100644
--- a/community/nsd/PKGBUILD
+++ b/community/nsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83750 2013-02-04 22:23:27Z bisson $
+# $Id: PKGBUILD 91246 2013-05-20 14:50:30Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=nsd
 pkgver=3.2.15
-pkgrel=1
+pkgrel=2
 pkgdesc='Authoritative only, high performance and simple DNS server'
 url='http://www.nlnetlabs.nl/nsd/'
 license=('BSD')
@@ -15,32 +15,25 @@ arch=('i686' 'x86_64')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'service')
 sha1sums=('e31a81ab7877422b34e1f163f9509cd93f395664'
-          '1cfa2d7254139be50f11753d4e07281ed2af36eb')
+          'f35ecb887e86ae0a54ac70aef5a7577fc8761877')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	./configure \
 		--prefix=/ \
-		--exec-prefix=/usr \
+		--sbindir=/usr/bin \
 		--datarootdir=/usr/share \
 		--with-pidfile=/run/nsd.pid \
-		--enable-ratelimit \
-
+		--enable-ratelimit
 	make
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	make DESTDIR="${pkgdir}" install
-
-	install -d "${pkgdir}"/etc/rc.d
-	ln -s ../../usr/sbin/nsdc "${pkgdir}"/etc/rc.d/nsd
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/nsd.service
-
 	rm doc/differences.pdf
 	install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}"
 	install -m644 doc/* "${pkgdir}"/usr/share/doc/"${pkgname}"
diff --git a/community/nsd/service b/community/nsd/service
index 28bb1c5b7..ca423c29c 100644
--- a/community/nsd/service
+++ b/community/nsd/service
@@ -5,9 +5,9 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/run/nsd.pid
-ExecStart=/usr/sbin/nsdc start
-ExecReload=/usr/sbin/nsdc reload
-ExecStop=/usr/sbin/nsdc stop
+ExecStart=/usr/bin/nsdc start
+ExecReload=/usr/bin/nsdc reload
+ExecStop=/usr/bin/nsdc stop
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD
index db92359f5..5b08531df 100644
--- a/community/pdnsd/PKGBUILD
+++ b/community/pdnsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90701 2013-05-13 14:33:26Z spupykin $
+# $Id: PKGBUILD 91143 2013-05-20 09:54:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Henrik Nymann Jensen <h@henriknj.dk>
 
 pkgname=pdnsd
 pkgver=1.2.9.a
 _pkgver=${pkgver/.a/a}
-pkgrel=2
+pkgrel=3
 pkgdesc="Proxy DNS server with permanent caching"
 arch=(i686 x86_64)
 url="http://members.home.nl/p.a.rombouts/pdnsd/"
@@ -17,13 +17,13 @@ md5sums=('2f3e705d59a0f9308ad9504b24400769'
          'fad5e518d126b29fc947941d57a0a494')
 
 build() {
-	cd $srcdir/$pkgname-$_pkgver
-	./configure --prefix=/usr --sysconfdir=/etc
+	cd $srcdir/$pkgname-${_pkgver}
+	./configure --prefix=/usr --sysconfdir=/etc --enable-ipv6
 	make
 }
 
 package() {
-	cd $srcdir/$pkgname-$_pkgver
+	cd $srcdir/$pkgname-${_pkgver}
 	make DESTDIR=$pkgdir install
 	install -Dm0644 $srcdir/service $pkgdir/usr/lib/systemd/system/pdnsd.service
 }
diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD
index 6a21c4821..3eb00faf6 100644
--- a/community/sdcc/PKGBUILD
+++ b/community/sdcc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78263 2012-10-17 10:27:37Z allan $
+# $Id: PKGBUILD 91250 2013-05-20 17:00:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jose Negron <josenj.arch@mailnull.net>
 
 pkgname=sdcc
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.3.0
+pkgrel=1
 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,15 +14,25 @@ optdepends=('python')
 url="http://sdcc.sourceforge.net/"
 options=(!strip)
 source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2)
-md5sums=('0808a9b4109d2ba6046ddd7b679a0012')
+md5sums=('c7c6aa75415580795ecc4fd31948e5ba')
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  sed -i 's|CC -E|CC -O2 -E|g' support/sdbinutils/libiberty/configure
+}
 
 build() {
-  cd $srcdir/$pkgname
+  cd $srcdir/$pkgname-$pkgver
   ./configure \
 	--prefix=/usr \
 	--includedir=/usr/include/sdcc \
 	--libdir=/usr/lib/sdcc
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
   make install DESTDIR=$pkgdir
 
   if [ -d $pkgdir/usr/lib/lib ]; then
diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD
index 7fd8d4357..498d72401 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90725 2013-05-13 14:38:23Z spupykin $
+# $Id: PKGBUILD 91152 2013-05-20 09:56:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Martin Devera <devik@cdi.cz>
 
 pkgname=sysstat
 pkgver=10.1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
 arch=('i686' 'x86_64')
 url="http://pagesperso-orange.fr/sebastien.godard/"
@@ -37,4 +37,5 @@ package() {
   install -D -m 744 cron/sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat
   chown -R root:root $pkgdir
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+  mv $pkgdir/usr/bin/nfsiostat $pkgdir/usr/bin/$pkgname-nfsiostat
 }
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index 067bed6d2..ca9efec0f 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -1,54 +1,48 @@
-# $Id: PKGBUILD 87924 2013-04-08 17:07:36Z bisson $
+# $Id: PKGBUILD 91247 2013-05-20 14:50:41Z 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.20
-pkgrel=1
+pkgrel=2
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='http://unbound.net/'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
-options=('!libtool')
 depends=('openssl' 'ldns')
 makedepends=('expat')
 optdepends=('expat: unbound-anchor')
 backup=('etc/unbound/unbound.conf')
 source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
-        'unbound.service'
-        'unbound.conf'
-        'rc.d')
+        'service'
+        'conf')
 sha1sums=('1752976533be2a4f0c9cdbab9d2cbb67d4f27c43'
-          'a2493cb105ff6aa23d756514badb13b02d37f319'
-          '5d473ec2943fd85367cdb653fcd58e186f07383f'
-          'dc96e772f467b32555df21d16fdb15e98194c228')
+          'b543ae6f8b87423bec095fca6b335a9ee43739a8'
+          '5d473ec2943fd85367cdb653fcd58e186f07383f')
 
+options=('!libtool')
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--enable-static=no \
+		--sbindir=/usr/bin \
+		--disable-static \
 		--disable-rpath \
 		--with-conf-file=/etc/unbound/unbound.conf \
-		--with-pidfile=/run/unbound.pid \
-
+		--with-pidfile=/run/unbound.pid
 	make
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
-	install -D -m644 ../unbound.conf "${pkgdir}/etc/unbound/unbound.conf"
-	install -D -m644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example"
-	install -D -m644 ../unbound.service "${pkgdir}/usr/lib/systemd/system/unbound.service"
+	install -Dm644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example"
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/unbound.service"
+	install -Dm644 ../conf "${pkgdir}/etc/unbound/unbound.conf"
 }
diff --git a/community/unbound/unbound.conf b/community/unbound/conf
index 445bceff1..445bceff1 100644
--- a/community/unbound/unbound.conf
+++ b/community/unbound/conf
diff --git a/community/unbound/rc.d b/community/unbound/rc.d
deleted file mode 100644
index b5b6466de..000000000
--- a/community/unbound/rc.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=unbound
-prog="/usr/sbin/unbound"
-
-PID=$(pidof -o %PPID $prog)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && eval $prog &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { 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
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	exit 1
-	;;
-esac
diff --git a/community/unbound/unbound.service b/community/unbound/service
index 8e59e5a6a..c569602de 100644
--- a/community/unbound/unbound.service
+++ b/community/unbound/service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 PIDFile=/run/unbound.pid
-ExecStart=/usr/sbin/unbound -d
+ExecStart=/usr/bin/unbound -d
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
 
diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD
index eb1e77d9d..b584c0778 100644
--- a/community/uriparser/PKGBUILD
+++ b/community/uriparser/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88337 2013-04-16 13:32:04Z spupykin $
+# $Id: PKGBUILD 91154 2013-05-20 09:57:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar>
 
 pkgname=uriparser
-pkgver=0.7.7
+pkgver=0.7.8
 pkgrel=1
 pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode"
 url="http://sourceforge.net/projects/uriparser/"
@@ -12,7 +12,7 @@ makedepends=(doxygen graphviz)
 arch=('i686' 'x86_64')
 license=("custom")
 source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2)
-md5sums=('2da950ef006be5a842dcc383cbbeaa78')
+md5sums=('1ff590e25e8d9f5eaaa409c741fc387b')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD
index fbb494374..6a6040f5b 100644
--- a/core/gpm/PKGBUILD
+++ b/core/gpm/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 182863 2013-04-15 21:02:26Z eric $
+# $Id: PKGBUILD 186057 2013-05-20 18:53:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gpm
 pkgver=1.20.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A mouse server for the console and xterm"
 arch=('i686' 'x86_64')
 url="http://www.nico.schottelius.org/software/gpm/"
 license=('GPL')
-depends=('ncurses' 'bash')
+depends=('bash')
 options=('!makeflags')
 install=gpm.install
 source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \
         gpm.sh gpm.service)
 sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369'
           '88fe5ff10916c68a87abc8418a56eb0073f69fa9'
-          '20b92360f0ad38a2032fcae37bdbd01b31e43f77')
+          'f9bde96eb9c78da9f225bcf40822647f6592cf23')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make
 }
 
diff --git a/core/gpm/gpm.service b/core/gpm/gpm.service
index 59e837d80..510ee9f85 100644
--- a/core/gpm/gpm.service
+++ b/core/gpm/gpm.service
@@ -3,7 +3,7 @@ Description=Virtual console mouse server
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/gpm -m /dev/input/mice -t imps2
+ExecStart=/usr/bin/gpm -m /dev/input/mice -t imps2
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD
index b283a923c..f673403bb 100644
--- a/core/man-db/PKGBUILD
+++ b/core/man-db/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 166836 2012-09-19 19:45:35Z andyrtr $
+# $Id: PKGBUILD 186047 2013-05-20 18:28:50Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
 
 pkgname=man-db
 pkgver=2.6.3
-pkgrel=1
+pkgrel=3
 pkgdesc="A utility for reading man pages"
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/man-db/"
 license=('GPL' 'LGPL')
 groups=('base')
-depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline')
-optdepends=('less' 'gzip')
+depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline' 'less')
+optdepends=('gzip')
 backup=('etc/man_db.conf'
-	'etc/cron.daily/man-db')
+	    'etc/cron.daily/man-db')
 conflicts=('man')
 provides=('man')
 replaces=('man')
@@ -22,21 +22,26 @@ source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig
         convert-mans man-db.cron.daily)
 options=('!libtool')
 md5sums=('a593a095599ae97bcacf8d038659a146'
-         '64975c20b1a6453f9b860ff7f916bcf1'
+         'SKIP'
          '2b7662a7d5b33fe91f9f3e034361a2f6'
-         'd30c39ae47560304471b5461719e0f03')
+         '934fd047fecb915038bf4bf844ea609c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-	--with-db=gdbm --disable-setuid --enable-mandirs=GNU \
+  ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+	--with-db=gdbm \
+	--disable-setuid \
+	--enable-mandirs=GNU \
 	--with-sections="1 n l 8 3 0 2 5 4 9 6 7"
   make
 }
 
 check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make check
+  make -k check
 }
 
 package() {
diff --git a/core/man-db/man-db.cron.daily b/core/man-db/man-db.cron.daily
index 53e66e1e9..9b4abd894 100755
--- a/core/man-db/man-db.cron.daily
+++ b/core/man-db/man-db.cron.daily
@@ -12,7 +12,7 @@ IONICE_PRIORITY=7
 UPDATEMANDB="/usr/bin/mandb --quiet"
 
 # Update the "whatis" database
-#/usr/sbin/makewhatis -u -w
+#/usr/bin/makewhatis -u -w
 
 # taken from Debian
 # man-db cron daily
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index dac70e5d1..5697f8099 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180812 2013-03-26 12:05:13Z bisson $
+# $Id: PKGBUILD 186025 2013-05-20 14:49:38Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
-pkgver=6.2p1
+pkgver=6.2p2
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
@@ -15,31 +15,28 @@ depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
             'x11-ssh-askpass: input passphrase in X')
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
-        'sshd.close-sessions'
         'sshdgenkeys.service'
         'sshd@.service'
         'sshd.service'
         'sshd.socket'
-        'sshd.confd'
-        'sshd.pam'
-        'sshd')
-sha1sums=('8824708c617cc781b2bb29fa20bd905fd3d2a43d'
-          '954bf1660aa32620c37034320877f4511b767ccb'
+        'sshd.pam')
+sha1sums=('c2b4909eba6f5ec6f9f75866c202db47f3b501ba'
           '6df5be396f8c593bb511a249a1453294d18a01a6'
-          'bd6eae36c7ef9efb7147778baad7858b81f2d660'
-          'f9af4a442b804ab661cec0edb25dd76dee16d8d2'
+          '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
+          '2d87de52a6b2f764180f9f67cb9747392784b4a5'
           'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
-          'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-          'd93dca5ebda4610ff7647187f8928a3de28703f3'
-          '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')
+          'd93dca5ebda4610ff7647187f8928a3de28703f3')
 
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
+
+install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	./configure \
 		--prefix=/usr \
+		--sbindir=/usr/bin \
 		--libexecdir=/usr/lib/ssh \
 		--sysconfdir=/etc/ssh \
 		--with-ldns \
@@ -69,20 +66,14 @@ package() {
 
 	make DESTDIR="${pkgdir}" install
 
-	rm "${pkgdir}"/usr/share/man/man1/slogin.1
-	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
-
+	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1
 	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
 
 	install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
 	install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service
 	install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service
 	install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket
-
-	install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389
-	install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
 	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
-	install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
 
 	install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
 	install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
diff --git a/core/openssh/install b/core/openssh/install
new file mode 100644
index 000000000..6f0cd3703
--- /dev/null
+++ b/core/openssh/install
@@ -0,0 +1,10 @@
+post_upgrade() {
+	if [[ $(vercmp $2 6.2p2) = -1 ]]; then
+		cat <<EOF
+
+==> The sshd daemon has been moved to /usr/bin alongside all binaries.
+==> Please update this path in your scripts if applicable.
+
+EOF
+	fi
+}
diff --git a/core/openssh/sshd b/core/openssh/sshd
deleted file mode 100755
index d60804e84..000000000
--- a/core/openssh/sshd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sshd
-
-PIDFILE=/run/sshd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
-	PID=
-	rm $PIDFILE 2>/dev/null
-fi
-
-case "$1" in
-	start)
-		stat_busy 'Starting Secure Shell Daemon'
-		/usr/bin/ssh-keygen -A
-		[[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			add_daemon sshd
-			stat_done
-		fi
-		;;
-	stop)
-		stat_busy 'Stopping Secure Shell Daemon'
-		[[ ! -z $PID ]] && kill $PID &> /dev/null
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			rm_daemon sshd
-			stat_done
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/core/openssh/sshd.close-sessions b/core/openssh/sshd.close-sessions
deleted file mode 100644
index be2a709fc..000000000
--- a/core/openssh/sshd.close-sessions
+++ /dev/null
@@ -1,17 +0,0 @@
-# Close sshd sessions before shutting down the network; see FS#17389.
-
-sshd_close_sessions () {
-	if ck_daemon sshd; then
-		return
-	fi
-	/etc/rc.d/sshd stop
-	stat_busy "Stopping Secure Shell Sessions"
-	for i in $(pgrep sshd); do
-		if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
-			kill $i
-		fi
-	done &>/dev/null
-	stat_done
-}
-
-add_hook shutdown_start sshd_close_sessions
diff --git a/core/openssh/sshd.confd b/core/openssh/sshd.confd
deleted file mode 100644
index 5ce7c0079..000000000
--- a/core/openssh/sshd.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sshd
-#
-SSHD_ARGS=""
diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service
index 633164e5d..349bde59d 100644
--- a/core/openssh/sshd.service
+++ b/core/openssh/sshd.service
@@ -4,7 +4,7 @@ Wants=sshdgenkeys.service
 After=sshdgenkeys.service
 
 [Service]
-ExecStart=/usr/sbin/sshd -D
+ExecStart=/usr/bin/sshd -D
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=always
diff --git a/core/openssh/sshd@.service b/core/openssh/sshd@.service
index 2fd9b0814..7ce3d37ba 100644
--- a/core/openssh/sshd@.service
+++ b/core/openssh/sshd@.service
@@ -3,6 +3,6 @@ Description=OpenSSH Per-Connection Daemon
 After=sshdgenkeys.service
 
 [Service]
-ExecStart=-/usr/sbin/sshd -i
+ExecStart=-/usr/bin/sshd -i
 StandardInput=socket
 StandardError=syslog
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index 2f6c71ab3..16e781fab 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180917 2013-03-28 02:20:12Z bisson $
+# $Id: PKGBUILD 186026 2013-05-20 14:49:45Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=procps-ng
 pkgver=3.3.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Utilities for monitoring your system and its processes'
 url='http://gitorious.org/procps'
 license=('GPL' 'LGPL')
@@ -23,11 +23,22 @@ replaces=('procps')
 
 options=('!libtool')
 
-build() {
+prepare() {
 	cd "${srcdir}/procps-procps"
 	echo ${pkgver} > .tarball-version
 	./autogen.sh
-	./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib
+}
+
+build() {
+	cd "${srcdir}/procps-procps"
+	./configure \
+		--prefix=/usr \
+		--exec-prefix=/ \
+		--sysconfdir=/etc \
+		--libdir=/usr/lib \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin \
+		--disable-static
 	make
 }
 
@@ -37,6 +48,6 @@ package() {
 	install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf"
 
 	# provided by util-linux
-	rm "${pkgdir}/bin/kill"
+	rm "${pkgdir}/usr/bin/kill"
 	rm "${pkgdir}/usr/share/man/man1/kill.1"
 }
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index f9f628d40..13c7b4ff4 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184361 2013-05-06 19:36:36Z foutrelis $
+# $Id: PKGBUILD 186027 2013-05-20 14:49:50Z bisson $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=7
+pkgrel=9
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -29,31 +29,31 @@ backup=('etc/avahi/hosts'
         'etc/avahi/services/sftp-ssh.service'
         'usr/lib/avahi/service-types.db'
         'usr/share/avahi/service-types')
-source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
-        'rc.d.patch')
-sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
-          '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
+source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz")
+sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684')
 
 conflicts=('howl' 'mdnsresponder')
 provides=('howl' 'mdnsresponder')
 
 install=install
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
+	sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
+}
 
-	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-	patch -p1 -i ../rc.d.patch
-
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	export MOC_QT3=/usr/bin/moc-qt3
 	export MOC_QT4=/usr/bin/moc-qt4
+	export PYTHON=/usr/bin/python2
 
-	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
-	PYTHON=python2 \
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
+		--sbindir=/usr/bin \
 		--disable-static \
 		--disable-monodoc \
 		--enable-compat-libdns_sd \
@@ -70,12 +70,9 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-
-	cd "${pkgdir}"
-	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
-	sed -i 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' etc/avahi/avahi-dnsconfd.action
+	rm -fr "${pkgdir}"/etc/rc.d
 
 	# howl and mdnsresponder compatability
-	(cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
-	(cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
+	cd "${pkgdir}"/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl
+	cd "${pkgdir}"/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc
 }
diff --git a/extra/avahi/rc.d.patch b/extra/avahi/rc.d.patch
deleted file mode 100644
index fd735734b..000000000
--- a/extra/avahi/rc.d.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in
---- old/initscript/archlinux/avahi-daemon.in	2011-06-24 03:07:00.916170590 +0200
-+++ new/initscript/archlinux/avahi-daemon.in	2011-06-24 03:16:32.220596377 +0200
-@@ -33,6 +33,7 @@
- 
- case "$1" in
-     start)
-+        ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; }
-         stat_busy "Starting $DESC"
-         $DAEMON -D > /dev/null 2>&1
-         if [ $? -gt 0 ]; then
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index 92d1eca88..d6bb40f92 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,30 +1,26 @@
-# $Id: PKGBUILD 183595 2013-04-24 06:52:38Z bisson $
+# $Id: PKGBUILD 186028 2013-05-20 14:50:00Z bisson $
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=clamav
 pkgver=0.97.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
 license=('GPL')
 options=('!libtool')
 arch=('i686' 'x86_64')
 depends=('bzip2' 'libltdl')
-backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
+backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'rc.d'
-        'conf.d'
         'service'
         'service.fresh'
         'logrotate'
         'tmpfiles.d'
         'config.patch')
 sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c'
-          'c9d508c1e5972f0f849d8694c1872455fa9e74de'
-          'cb116cdab49a810381a515cbcfb6a6c148547f07'
-          'df522b0488f3901e491f148c9300f6bae348c605'
+          'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb'
           'cda9a087e5593992150cb456e34c5f6f589aca82'
           '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
           'a224ea9b4d0f4f196827347d54bed51e11c197ea'
@@ -41,6 +37,7 @@ build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
 		--prefix=/usr \
+		--sbindir=/usr/bin \
 		--sysconfdir=/etc/clamav \
 		--with-dbdir=/var/lib/clamav \
 		--disable-clamav \
@@ -61,8 +58,6 @@ package() {
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service
 	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
 	install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
-	install -Dm644 ../conf.d "${pkgdir}"/etc/conf.d/clamav
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/clamav
 
 	install -d -o 64 -g 64 "${pkgdir}"/run/clamav
 	install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav
diff --git a/extra/clamav/conf.d b/extra/clamav/conf.d
deleted file mode 100644
index 9cd44d9f8..000000000
--- a/extra/clamav/conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-# clamav startup script config options
-
-# change these to "yes" to start 
-START_FRESHCLAM="no"
-START_CLAMD="no"
-
-# Options to pass to freshclam (man freshclam for more info).
-FRESHCLAM_OPTS="-c 12"
diff --git a/extra/clamav/rc.d b/extra/clamav/rc.d
deleted file mode 100644
index 127c86c0f..000000000
--- a/extra/clamav/rc.d
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav
-
-PID_FC=$(pidof -o %PPID /usr/bin/freshclam)
-PID_CD=$(pidof -o %PPID /usr/sbin/clamd)
-
-case "$1" in
-	start)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Starting ClamD"
-			[[ -z $PID_CD ]] && /usr/sbin/clamd
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-		sleep 1
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Starting FreshClam"
-			[[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	stop)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Stopping ClamD"
-			[[ -n $PID_CD ]] && kill $PID_CD &> /dev/null
-				if [[ $? -gt 0 ]]; then
-					stat_fail
-				else
-					rm_daemon clamav
-					stat_done
-				fi
-		fi
-
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Stopping FreshClam"
-			[[ -n $PID_FC ]] && kill $PID_FC &> /dev/null
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					rm_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 2
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"	
-esac
-exit 0
diff --git a/extra/clamav/service b/extra/clamav/service
index 5bf9eb14e..86608c40e 100644
--- a/extra/clamav/service
+++ b/extra/clamav/service
@@ -4,7 +4,7 @@ Description=clamav daemon
 [Service]
 Type=forking
 PIDFile=/run/clamav/clamd.pid
-ExecStart=/usr/sbin/clamd
+ExecStart=/usr/bin/clamd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index abc48f82d..e61ec921b 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185725 2013-05-17 17:33:15Z andyrtr $
+# $Id: PKGBUILD 186001 2013-05-20 08:28:29Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -8,8 +8,8 @@
 # --->>> remember to rebuild/bump pigeonhole in one step <<<---
 
 pkgname=dovecot
-pkgver=2.2.1
-pkgrel=2
+pkgver=2.2.2
+pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
 url="http://dovecot.org/"
@@ -24,7 +24,7 @@ options=('!libtool')
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
         dovecot.tmpfilesd)
-md5sums=('6628f513ca841846176e81db870052f8'
+md5sums=('e6c011b4bbddf19e79205d012723449a'
          'SKIP'
          '342a28251d40f983c98c0d1f1bf3d07d')
 
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index b9c5774ea..a9f6b1a16 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183346 2013-04-21 22:08:49Z heftig $
+# $Id: PKGBUILD 186006 2013-05-20 08:55:37Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@ options=('!libtool' '!makeflags')
 groups=(gnome)
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('45accc06e9c1711741b0f1476971c7e705b57ea0718a2b10ee66c5dd0397b917')
+sha256sums=('a3e92d317a1a4e9b49988ea48a144bcd6c0257c6331aae2603a544eedf1dc45c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD
index f051c8010..3d41301cc 100644
--- a/extra/fontconfig/PKGBUILD
+++ b/extra/fontconfig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183357 2013-04-21 22:09:09Z heftig $
+# $Id: PKGBUILD 186044 2013-05-20 18:22:18Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=fontconfig
-pkgver=2.10.92
-pkgrel=4
+pkgver=2.10.93
+pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
 url="http://www.fontconfig.org/release/"
@@ -13,7 +13,7 @@ options=('!libtool')
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
         29-replace-bitmap-fonts.conf git_fixes.diff)
-sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22'
+sha256sums=('ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c'
             '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6'
             '7dc98137405ee0e5f98f3266a760a4da27d78e3c2bc7b7ef4db6b481df3c39f0')
 
@@ -24,7 +24,7 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # post release fixes
-  patch -Np1 -i ${srcdir}/git_fixes.diff
+  #patch -Np1 -i ${srcdir}/git_fixes.diff
 
   # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
   libtoolize -f
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index eaf8f656a..1d84e9d56 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185866 2013-05-19 16:28:55Z giovanni $
+# $Id: PKGBUILD 185984 2013-05-20 05:43:08Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
 pkgver=0.16.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64')
 url="http://gparted.sourceforge.net"
@@ -26,9 +26,11 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions'
             'mtools: utilities to access MS-DOS disks')
 install=gparted.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'org.archlinux.pkexec.gparted.policy')
+        'org.archlinux.pkexec.gparted.policy'
+        'gparted_polkit')
 md5sums=('3f399bff031b5ce14d11a8c346f4b89c'
-         '122ed3120c846376bead22b25f6a3b19')
+         '122ed3120c846376bead22b25f6a3b19'
+         '9b70450ef7d17c282e9185e5869a4cec')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -45,14 +47,9 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   # Install policy file
-  install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy"
+  install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" \
+                 "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy"
 
   # Install launcher script
-  echo '#!/bin/sh' > ${pkgdir}/usr/bin/gparted_polkit
-  echo 'if [ $(which pkexec) ]; then' >> ${pkgdir}/usr/bin/gparted_polkit
-  echo '  pkexec --disable-internal-agent "/usr/bin/gparted" "$@"' >> ${pkgdir}/usr/bin/gparted_polkit
-  echo 'else' >> ${pkgdir}/usr/bin/gparted_polkit
-  echo '  /usr/bin/gparted "$@"' >> ${pkgdir}/usr/bin/gparted_polkit
-  echo 'fi' >> ${pkgdir}/usr/bin/gparted_polkit
-  chmod 755 ${pkgdir}/usr/bin/gparted_polkit
+  install -m755 "${srcdir}/gparted_polkit" "${pkgdir}/usr/bin/gparted_polkit"
 }
diff --git a/extra/gparted/gparted.install b/extra/gparted/gparted.install
index e8f6bed8f..1a05f573e 100644
--- a/extra/gparted/gparted.install
+++ b/extra/gparted/gparted.install
@@ -1,14 +1,11 @@
 post_install() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  echo 'If you use a lightweight windowmanager, remember to run'
-  echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
-  echo 'graphical authentication, which may be needed for pkexec to work.'
 }
 
 post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
diff --git a/extra/gparted/gparted_polkit b/extra/gparted/gparted_polkit
new file mode 100644
index 000000000..ebf9b13a3
--- /dev/null
+++ b/extra/gparted/gparted_polkit
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ $(which pkexec) ]; then
+  pkexec --disable-internal-agent "/usr/bin/gparted" "$@"
+else
+  /usr/bin/gparted "$@"
+fi
diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD
index 94073ce8f..7d9238319 100644
--- a/extra/hddtemp/PKGBUILD
+++ b/extra/hddtemp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163630 2012-07-17 14:24:03Z bisson $
+# $Id: PKGBUILD 186029 2013-05-20 14:50:15Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -9,22 +9,17 @@ pkgname=hddtemp
 _origver=0.3-beta15
 _patchver=${_origver}-52
 pkgver=${_patchver//-/.}
-pkgrel=1
+pkgrel=2
 pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information"
 url='https://savannah.nongnu.org/projects/hddtemp/'
 license=('GPL')
 arch=('i686' 'x86_64')
-backup=('etc/conf.d/hddtemp')
 source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${_origver}.tar.bz2"
         "http://ftp.debian.org/debian/pool/main/h/${pkgname}/${pkgname}_${_patchver}.diff.gz"
-        'rc.d'
-        'conf.d'
         'service')
 sha1sums=('65393b0a4d9862c030c81702d95c1acd00da275b'
           'b9bcdd0537c1540e55e5056445b571ea61d5a4a3'
-          '71159486b1505ec6acfb7585e0d8fbe78afe54ec'
-          'd45e3022f614dbf8904ecb1a3e702bb71fcaa808'
-          '501fcf4faf8b2689d010f9cbbf39f917211f611f')
+          '9b02e5bed22f81ceab2b69bae788a9a3aa5c2147')
 
 options=('!libtool')
 
@@ -35,6 +30,7 @@ build() {
 
 	./configure \
 		--prefix=/usr \
+		--sbindir=/usr/bin \
 		--mandir=/usr/share/man \
 		--with-db-path="/usr/share/${pkgname}/hddtemp.db"
 
@@ -48,6 +44,4 @@ package() {
 
 	install -Dm644 "../${pkgname}-${_origver}/debian/hddtemp.db" "${pkgdir}/usr/share/${pkgname}/hddtemp.db"
 	install -Dm644 '../service' "${pkgdir}/usr/lib/systemd/system/hddtemp.service"
-	install -Dm644 '../conf.d' "${pkgdir}/etc/conf.d/hddtemp"
-	install -Dm755 '../rc.d' "${pkgdir}/etc/rc.d/hddtemp"
 }
diff --git a/extra/hddtemp/conf.d b/extra/hddtemp/conf.d
deleted file mode 100644
index 6a1e18e0b..000000000
--- a/extra/hddtemp/conf.d
+++ /dev/null
@@ -1,2 +0,0 @@
-PARAMS="-q -l 127.0.0.1"
-DRIVES="/dev/sda"
diff --git a/extra/hddtemp/rc.d b/extra/hddtemp/rc.d
deleted file mode 100644
index 62f090808..000000000
--- a/extra/hddtemp/rc.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PARAMS=
-DRIVES=
-[ -f /etc/conf.d/hddtemp ] && . /etc/conf.d/hddtemp
-PID=$(pidof -o %PPID /usr/sbin/hddtemp)
-case "$1" in
-  start)
-    stat_busy "Starting HDDTemp"
-    [ -z "$PID" ] && /usr/sbin/hddtemp -d $PARAMS $DRIVES
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon hddtemp
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping HDDTemp"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon hddtemp
-      stat_done
-    fi 
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/hddtemp/service b/extra/hddtemp/service
index bc56d16b0..992b898ad 100644
--- a/extra/hddtemp/service
+++ b/extra/hddtemp/service
@@ -2,8 +2,7 @@
 Description=Hard drive temperature monitor daemon
 
 [Service]
-EnvironmentFile=/etc/conf.d/hddtemp 
-ExecStart=/usr/sbin/hddtemp -dF $PARAMS $DRIVES
+ExecStart=/usr/bin/hddtemp -dF /dev/sda
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff
index 6cac91dd6..bb588a072 100644
--- a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
+++ b/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff
@@ -1,15 +1,18 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2011-08-06 15:46:01.000000000 +0200
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2011-08-06 15:59:26.000000000 +0200
-@@ -91,7 +91,7 @@
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk.orig	2013-05-19 20:01:25.676093296 +0000
++++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2013-05-19 20:01:54.312572109 +0000
+@@ -98,9 +98,9 @@
  CHMOD          = $(UTILS_COMMAND_PATH)chmod
  CMP            = $(UTILS_USR_BIN_PATH)cmp
  COMM           = $(UTILS_USR_BIN_PATH)comm
 -COMPRESS       = $(UTILS_USR_BIN_PATH)compress
 +COMPRESS       = $(UTILS_COMMAND_PATH)compress
  CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
+-CPIO           = $(UTILS_COMMAND_PATH)cpio
++CPIO           = $(UTILS_USR_BIN_PATH)cpio
  CUT            = $(UTILS_USR_BIN_PATH)cut
-@@ -101,13 +101,13 @@
+ DATE           = $(UTILS_COMMAND_PATH)date
+ DF             = $(UTILS_COMMAND_PATH)df
+@@ -108,13 +108,13 @@
  DIRNAME        = $(UTILS_USR_BIN_PATH)dirname
  DUMP           = $(UTILS_CCS_BIN_PATH)dump
  ECHO           = $(UTILS_COMMAND_PATH)echo
@@ -25,7 +28,7 @@
  GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
  # GZIP is used for solaris. Linux and windows use tar czf
  GZIP           = $(UTILS_COMMAND_PATH)gzip
-@@ -140,7 +140,7 @@
+@@ -148,7 +148,7 @@
  TAIL           = $(UTILS_USR_BIN_PATH)tail
  TAR            = $(UTILS_COMMAND_PATH)tar
  TEST           = $(UTILS_USR_BIN_PATH)test
diff --git a/extra/java7-openjdk/fix_corba_cmds_path.diff b/extra/java7-openjdk/02_fix_corba_cmds_path.diff
index 7a3db9567..8a22e3229 100644
--- a/extra/java7-openjdk/fix_corba_cmds_path.diff
+++ b/extra/java7-openjdk/02_fix_corba_cmds_path.diff
@@ -1,15 +1,18 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
-@@ -76,7 +76,7 @@
+--- openjdk/corba/make/common/shared/Defs-utils.gmk.orig	2013-05-19 19:57:58.530784147 +0000
++++ openjdk/corba/make/common/shared/Defs-utils.gmk	2013-05-19 19:58:44.777147938 +0000
+@@ -83,9 +83,9 @@
  CHMOD          = $(UTILS_COMMAND_PATH)chmod
  CMP            = $(UTILS_USR_BIN_PATH)cmp
  COMM           = $(UTILS_USR_BIN_PATH)comm
 -COMPRESS       = $(UTILS_USR_BIN_PATH)compress
 +COMPRESS       = $(UTILS_COMMAND_PATH)compress
  CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
+-CPIO           = $(UTILS_COMMAND_PATH)cpio
++CPIO           = $(UTILS_USR_BIN_PATH)cpio
  CUT            = $(UTILS_USR_BIN_PATH)cut
-@@ -125,7 +125,7 @@
+ DATE           = $(UTILS_COMMAND_PATH)date
+ DF             = $(UTILS_COMMAND_PATH)df
+@@ -131,7 +131,7 @@
  TAIL           = $(UTILS_USR_BIN_PATH)tail
  TAR            = $(UTILS_COMMAND_PATH)tar
  TEST           = $(UTILS_USR_BIN_PATH)test
@@ -18,10 +21,10 @@
  TR             = $(UTILS_USR_BIN_PATH)tr
  TRUE           = $(UTILS_COMMAND_PATH)true
  UNAME          = $(UTILS_COMMAND_PATH)uname
-@@ -176,7 +176,7 @@
+@@ -182,7 +182,7 @@
    # others have it in /usr/bin.
    SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
+                    $(wildcard $(UTILS_USR_BIN_PATH)sort))
 -  NAWK           = $(USRBIN_PATH)gawk
 +  NAWK           = $(UTILS_COMMAND_PATH)gawk
    # Intrinsic unix command, with backslash-escaped character interpretation
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index efdfea91e..0c5e6b813 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185582 2013-05-15 08:29:48Z guillaume $
+# $Id: PKGBUILD 186020 2013-05-20 13:53:06Z guillaume $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.${_updatever}_${_icedtea_ver}
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
@@ -43,8 +43,8 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz			# langtools.tar.gz
         ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz				# hotspot.tar.gz
         fontconfig-paths.diff
-        fix_corba_cmds_path.diff
-        openjdk7_fix_jdk_cmds_path.diff
+        01_fix_openjdk_cmds_path.diff
+        02_fix_corba_cmds_path.diff
         openjdk7_nonreparenting-wm.diff
         jdk7-openjdk.profile
         jdk7-openjdk.profile.csh
@@ -59,8 +59,8 @@ sha256sums=('7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da'
             '2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12'
             'c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
-            'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
+            '583af9025df545264a15665e4c9f981bc7286aaecc6d312dced485102cf5dda9'
+            'd57754ff320475023688bd7c7af38a9ea37e27ed8c1edd3b1572e4d8b41b78d3'
             'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4'
             'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
             '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
@@ -89,7 +89,10 @@ build() {
   . /etc/profile.d/apache-ant.sh
 
   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"
+  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
+                               patches/01_fix_openjdk_cmds_path.diff \
+                               patches/02_fix_corba_cmds_path.diff \
+                               patches/openjdk7_nonreparenting-wm.diff"
 
   if [ "$_bootstrap" = "1" ]; then
      BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
@@ -327,6 +330,9 @@ package_jdk7-openjdk() {
   install -m755 -d ${pkgdir}/etc/profile.d/
   install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh
   install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh
+
+  # Temporarily fixing FS#35141
+  chmod go+r ${pkgdir}/usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar
 }
 
 package_openjdk7-src() {
diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD
index 7b35aeafd..3f7da427f 100644
--- a/extra/konversation/PKGBUILD
+++ b/extra/konversation/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172103 2012-11-28 12:37:26Z stephane $
+# $Id: PKGBUILD 186022 2013-05-20 14:06:29Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: James Rayner <iphitus@gmail.com>
@@ -6,12 +6,12 @@
 
 pkgname=konversation
 pkgver=1.4
-pkgrel=5
+pkgrel=6
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64')
 url="http://konversation.kde.org"
 depends=('kdebase-runtime' 'kdepimlibs')
-makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml')
+makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml' 'optipng')
 optdepends=('python: python scripting support'
             'kdebase-konsole: open a terminal in konversation'
             'qca-ossl: Diffie-Hellman key exchange and Blowfish ECB/CBC support')
@@ -21,6 +21,12 @@ options=('!makeflags')
 source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  # libpng16 fix
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
 build() {
   cd "${srcdir}"
   mkdir build
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index 4f3355d44..7683b72e4 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,32 +1,39 @@
-# $Id: PKGBUILD 181125 2013-03-31 19:16:53Z stephane $
+# $Id: PKGBUILD 186068 2013-05-20 21:46:39Z foutrelis $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=licq
 pkgver=1.7.1
-pkgrel=3
-pkgdesc="Advanced graphical ICQ clone and more for Unix" 
+pkgrel=4
+pkgdesc="Advanced graphical ICQ clone and more for Unix"
 arch=('i686' 'x86_64')
 url="http://www.licq.org"
 license=('GPL')
 depends=('boost-libs' 'gpgme' 'libxss' 'qt4')
-makedepends=('cmake' 'boost')
+makedepends=('cmake' 'boost' 'optipng')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
 md5sums=('701e57efedc2b7ece64c3d2d2e9f9e16')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  mkdir {,plugins/qt4-gui/}build
+
+  # Fix invalid PNG images to work with libpng 1.6
+  # https://github.com/licq-im/licq/pull/32
+  optipng -quiet -force -fix plugins/qt4-gui/share/skins/Mirabilis/*.png
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # licq
-  mkdir build
   cd build
   cmake -DCMAKE_INSTALL_PREFIX=/usr  ..
   make
 
   # qt4-gui
-  cd ../plugins/qt4-gui
-  mkdir build
-  cd build
+  cd ../plugins/qt4-gui/build
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake"  ..
   make
 }
diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD
new file mode 100644
index 000000000..ed7751ba4
--- /dev/null
+++ b/extra/misdnuser/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 186032 2013-05-20 17:17:10Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=misdnuser
+pkgver=2.0.17_20120917
+pkgrel=2
+pkgdesc="Tools and library for mISDN"
+arch=('i686' 'x86_64')
+url="http://www.misdn.org"
+license=('GPL')
+depends=('isdn4k-utils' 'spandsp')
+backup=('etc/capi20.conf') 
+options=('!makeflags' '!libtool' '!strip')
+source=(ftp://ftp.archlinux.org/other/misdnuser/${pkgname}-${pkgver}.tar.gz
+        mISDNcapid.service
+        c2faxrecv-mISDNcapid.service
+        mISDNcapid.conf
+        fix-compile-gcc48.patch)
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  # fix gcc48 compile error
+  patch -Np1 -i ${srcdir}/fix-compile-gcc48.patch
+}
+
+build() {
+  # only enable for debugging!
+  #export CFLAGS+=" -g -O0"
+  #export CXXFLAGS+=" -g -O0"
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  # fix udev rule
+  mkdir -p ${pkgdir}/usr/lib/udev/rules.d
+  mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/usr/lib/udev/rules.d
+  rm -r ${pkgdir}/etc/udev/
+  # add systemd files
+  install -D -m644 ${srcdir}/mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/mISDNcapid.service
+  # mISDNcapid:
+  # tends to crash on avmfritz card, add an extra systemd file for
+  # restarting the services until segfaults are fixed!
+  install -D -m644 ${srcdir}/c2faxrecv-mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/c2faxrecv-mISDNcapid.service
+  install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf
+}
+md5sums=('4cdb52f2c0ff1a1426573ac5ef09e9f8'
+         'bfd47480a54b41394ba5cc3f53587130'
+         '32ead7f063e007c784aa883d441f33c2'
+         '42c3b46880a68c3883ee1ed00af34b45'
+         'b291e9a04378decec33c420a62a5a4b7')
diff --git a/extra/misdnuser/c2faxrecv-mISDNcapid.service b/extra/misdnuser/c2faxrecv-mISDNcapid.service
new file mode 100644
index 000000000..7a98ca435
--- /dev/null
+++ b/extra/misdnuser/c2faxrecv-mISDNcapid.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=mISDN CAPI to fax receive
+Requires=faxq.service mISDNcapid.service
+After=faxq.service mISDNcapid.service
+
+[Service]
+ExecStart=/usr/bin/c2faxrecv
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/misdnuser/fix-compile-gcc48.patch b/extra/misdnuser/fix-compile-gcc48.patch
new file mode 100644
index 000000000..61f52d22e
--- /dev/null
+++ b/extra/misdnuser/fix-compile-gcc48.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://misdn.eu/?p=projects%2FmISDNuser.git;a=blobdiff_plain;f=lib%2Flayer3%2Fq931.c;h=75716fe121a48a3c62fb785af85d856a688889bf;hp=705caf3e167bb5c50828c464151fcfe49af89e64;hb=ec4ac2763f737dc9100f9f4f9e91f4d7064a77b2;hpb=1dc4c24d27ed9c46e2fdbf7fb4b178e549a58e8d
+
+diff --git a/lib/layer3/q931.c b/lib/layer3/q931.c
+index 705caf3..75716fe 100644
+--- a/lib/layer3/q931.c
++++ b/lib/layer3/q931.c
+@@ -357,7 +357,7 @@ mi_encode_hlc(struct l3_msg *l3m, int hlc, int ehlc)
+ 	ie[1] = hlc & 0x7f;
+ 	
+ 	if (ehlc < 0)
+-		ie[1] | 0x80;
++		ie[1] |= 0x80;
+ 	else {
+ 		l = 3;
+ 		ie[2] = 0x80 | (ehlc & 0x7f);
diff --git a/extra/misdnuser/mISDNcapid.conf b/extra/misdnuser/mISDNcapid.conf
new file mode 100644
index 000000000..7607e262d
--- /dev/null
+++ b/extra/misdnuser/mISDNcapid.conf
@@ -0,0 +1 @@
+D /var/run/mISDNcapid 0755 root root -
diff --git a/extra/misdnuser/mISDNcapid.service b/extra/misdnuser/mISDNcapid.service
new file mode 100644
index 000000000..53871dd95
--- /dev/null
+++ b/extra/misdnuser/mISDNcapid.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=mISDN CAPI daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/mISDNcapid
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
index deee9f849..dda8c7062 100644
--- a/extra/pigeonhole/PKGBUILD
+++ b/extra/pigeonhole/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185125 2013-05-11 09:39:44Z andyrtr $
+# $Id: PKGBUILD 186002 2013-05-20 08:28:30Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 # Contributorr: Peter Lewis <plewis@aur.archlinux.org>
@@ -7,13 +7,13 @@
 # This must be built against the version of dovecot being used,
 # else mail delivery will fail.
 # Specify the version of dovecot to be used here:
-_dcpkgver=2.2.1
+_dcpkgver=2.2.2
 # Make sure to bump pkgrel if changing this.
 
 pkgname=pigeonhole
 pkgver=0.4.0
-pkgrel=1
-pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
+pkgrel=2
+pkgdesc="Sieve implementation for Dovecot"
 arch=('i686' 'x86_64')
 url="http://pigeonhole.dovecot.org/"
 license=('LGPL')
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index 3b0bca75c..8c5a5dfec 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 182667 2013-04-12 14:07:12Z andyrtr $
+# $Id: PKGBUILD 186040 2013-05-20 18:16:41Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc') 
-_amalgamationver=3071602
+_amalgamationver=3071700
 _docver=${_amalgamationver}
 #_docver=3071601
-pkgver=3.7.16.2
+pkgver=3.7.17
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64')
@@ -19,8 +19,8 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with
 	http://www.sqlite.org/2013/sqlite-doc-${_docver}.zip
 	license.txt)
 options=('!libtool' '!emptydirs')
-sha1sums=('85bf857cf86f34831d55d7ba97606dba581b8d62'
-          '998df3d9ada4a4a8a048bcf20613d1d02be77731'
+sha1sums=('e31958e56b1d7bef9433b1ff2e875c8c290d37f4'
+          '6b533b0a9a21eb2c2d1c9f278b8defbeb5a432a7'
           'f34f6daa4ab3073d74e774aad21d66878cf26853')
 
 build() {
diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD
index bb25037ab..c6f12a215 100644
--- a/extra/vde2/PKGBUILD
+++ b/extra/vde2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169040 2012-10-17 10:21:21Z allan $
+# $Id: PKGBUILD 185995 2013-05-20 07:12:08Z tpowa $
 # Contributor: Sergej Pupykin
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=vde2
 pkgver=2.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
 url="http://sourceforge.net/projects/vde/"
 license=("GPL" "LGPL" "CUSTOM")
@@ -15,24 +15,20 @@ source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2
         dhcpd.conf.sample
         iptables.rules.sample
         vde-config.sample
-        vde-connection.sample
-        vde.conf
-        vde.rc)
+        vde-connection.sample)
 install=vde2.install
 options=(!libtool !makeflags)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \
              --enable-experimental
   make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver 
-  make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install
-  install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde
-  install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde
+  make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc sbindir=$pkgdir/usr/bin libexecdir=$pkgdir/usr/lib/vde2 install
   install -D -m 644 ../vde-config.sample $pkgdir/etc/vde/vde-config.sample
   install -D -m 644 ../vde-connection.sample $pkgdir/etc/vde/vde-connection.sample
   install -D -m 644 ../dhcpd.conf.sample $pkgdir/usr/share/vde2/dhcpd.conf.sample
@@ -40,11 +36,8 @@ package() {
   # install slirp license
   install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde
 }
-
 md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628'
          '7d9bc56d2e561d849e915000d1c0f269'
          'a920123fc620bcedbccb703a8d1bdc55'
          'cb8ace28e8efd4dad128be4be71b3b07'
-         '63033c33565e2030541c5e05e9d9b063'
-         'a22730f051f4840da4a3162a88ff8156'
-         '6c7dc01bc2f039f0ff1682ee70d3d1da')
+         '63033c33565e2030541c5e05e9d9b063')
diff --git a/extra/vde2/vde.conf b/extra/vde2/vde.conf
deleted file mode 100644
index bc61dceda..000000000
--- a/extra/vde2/vde.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set options for a vde daemon script
-#
-# Array for your vde config files, eg.: "internal-net external-net"
-# You need a config file in /etc/vde/ with the same name.
-# Sample config file provided: /etc/vde/vde-config.sample
-VDE_CONFIG="" 
-
-# Array for your dpipe connections, eg.: "connect-switches"
-# You need a config file in /etc/vde/ with the same name.
-# Sample config file provided: /etc/vde/vde-connection.sample
-VDE_CONNECTION=""
-\ No newline at end of file
diff --git a/extra/vde2/vde.rc b/extra/vde2/vde.rc
deleted file mode 100755
index b368f9955..000000000
--- a/extra/vde2/vde.rc
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/vde
-
-case "$1" in
-  start)
-    # bring up all defined profiles
-    for i in $VDE_CONFIG; do
-      [ -e /etc/vde/$i ] && . /etc/vde/$i
-      stat_busy "Starting vde_switch $i"
-      # get options from profile
-      [ -n "$VDE_NUMPORTS" ] && OPTIONS="-n $VDE_NUMPORTS"
-      [ "$VDE_HUB" = "yes" ] && OPTIONS="$OPTIONS -x"
-      [ "$VDE_FSTP" = "yes" ] && OPTIONS="$OPTIONS -F"
-      [ -n "$VDE_MAC" ] && OPTIONS="$OPTIONS --macaddr $VDE_MAC"
-      [ -n "$VDE_PRIORITY" ] && OPTIONS="$OPTIONS --priority $VDE_PRIORITY"
-      [ -n "$VDE_HASH" ] && OPTIONS="$OPTIONS --hashsize $VDE_HASH"
-      [ -n "$VDE_SOCK" ] && OPTIONS="$OPTIONS -s $VDE_SOCK"
-      [ -n "$VDE_SOCK_MODE" ] && OPTIONS="$OPTIONS -m $VDE_SOCK_MODE"
-      [ -n "$VDE_SOCK_GROUP" ] && OPTIONS="$OPTIONS -g $VDE_SOCK_GROUP"
-      [ -n "$VDE_MANAGEMENT_SOCK" ] && OPTIONS="$OPTIONS -M $VDE_MANAGEMENT_SOCK"
-      [ -n "$VDE_MANAGEMENT_SOCK_MODE" ] && OPTIONS="$OPTIONS --mgmtmode $VDE_MANAGEMENT_SOCK_MODE"
-      [ -n "$VDE_TAP" ] && OPTIONS="$OPTIONS -t $VDE_TAP"
-      [ -n "$VDE_OPTIONS" ] && OPTIONS="$OPTIONS $VDE_OPTIONS"
-      vde_switch $OPTIONS -p /var/run/vde-$i.pid -daemon &>/dev/null
-      [ -n "$VDE_SOCK" -a -n "$VDE_SOCK_GROUP" ] && chgrp "$VDE_SOCK_GROUP" "$VDE_SOCK"
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-      if [ "$SLIRP" = "yes" ]; then
-        stat_busy "Starting slirpvde for $i"
-        [ "$SLIRP_DHCP" = "yes" ] && SP_OPTIONS="-D"
-        [ -n "$SLIRP_NETWORK" ] && SP_OPTIONS="$SP_OPTIONS -n $SLIRP_NETWORK"
-        [ -n "$SLIRP_OPTIONS" ] && SP_OPTIONS="$SP_OPTIONS $SLIRP_OPTIONS"
-        [ -n "$VDE_SOCK" ] && SP_OPTIONS="$SP_OPTIONS -s $VDE_SOCK"
-        [ -n "$VDE_SOCK_MODE" ] && SP_OPTIONS="$SP_OPTIONS -m $VDE_SOCK_MODE"
-        [ -n "$VDE_SOCK_GROUP" ] && SP_OPTIONS="$SP_OPTIONS -g $VDE_SOCK_GROUP"
-        slirpvde $SP_OPTIONS -p /var/run/slirpvde-$i.pid -daemon &>/dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-        unset OPTIONS
-        unset SP_OPTIONS
-      fi
-    done
-    for i in $VDE_CONNECTION; do
-      # connect specified vde_switches
-      if [ "$(grep ^vde_plug /etc/vde/$i)" ]; then
-        stat_busy "Connecting VDE switches $i together..."
-        while read j; do
-          switch="$(echo $j | grep ^vde_plug)"
-          [ -n "$switch" ] && (dpipe $switch &)
-        done </etc/vde/$i
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-      fi
-    done
-    add_daemon vde
-    ;;
-  stop)
-    # kill vde_plug if switches are connected
-    [ -n "$VDE_CONNECTION" ] && killall vde_plug >/dev/null 2>&1
-    for i in $VDE_CONFIG; do
-      [ -e /etc/vde/$i ] && . /etc/vde/$i
-      if [ "$SLIRP" = "yes" ]; then
-        stat_busy "Stopping slirpvde for $i"
-        kill $(cat /var/run/slirpvde-$i.pid) &> /dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-        rm /var/run/slirpvde-$i.pid &> /dev/null
-      fi
-      stat_busy "Stopping vde_switch $i"
-      kill $(cat /var/run/vde-$i.pid) &> /dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-      rm /var/run/vde-$i.pid &> /dev/null
-      stat_busy "Removing $i vde sockets"
-      rm -rf $VDE_SOCK $VDE_MANAGEMENT_SOCK
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-    done
-      unset OPTIONS
-      unset SP_OPTIONS
-      [ -e /var/run/vde/gmon.out ] && rm /var/run/vde/gmon.out
-      rm_daemon vde 
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-    *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/vde2/vde2.install b/extra/vde2/vde2.install
index 74e1710ff..bf538e01f 100644
--- a/extra/vde2/vde2.install
+++ b/extra/vde2/vde2.install
@@ -1,5 +1,4 @@
 post_install() {
-  echo "Change /etc/conf.d/vde to your needs."
   echo "vde config files should be placed in /etc/vde, sample files are provided."
   echo "iptables and dhcpd sample files have been installed to '/usr/share/vde2'."
   echo "Merge those examples, if needed to the according config files."
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index 762abed7c..3c5178ea5 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180587 2013-03-23 23:09:44Z td123 $
+# $Id: PKGBUILD 186008 2013-05-20 11:47:11Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
-pkgver=0.4.0
-pkgrel=3
+pkgver=0.4.1
+pkgrel=1
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64')
 url="http://www.weechat.org/"
@@ -13,18 +13,12 @@ depends=('gnutls' 'curl' 'libgcrypt')
 makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl>=8.6.0' 'ruby' 'aspell' 'guile')
 optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile')
 options=('!libtool')
-source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2"
-        'ruby-2.0.0-crash-fix.diff')
-md5sums=('b2e10ca1e3a72142fcc8d58c7c774b1b'
-         '8bafb0ec603af018e2d66155640685b4')
+source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('071d6f1cd21c892cae126af21095c43f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # fix: https://bugs.archlinux.org/task/34342
-  # original commit: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=commit;h=4fdbb83a079f24a742633fd4d02084911580c19c
-  patch -Np1 -i ${srcdir}/ruby-2.0.0-crash-fix.diff
-
   mkdir build
   cd build
   cmake .. -DPREFIX=/usr \
diff --git a/extra/weechat/ruby-2.0.0-crash-fix.diff b/extra/weechat/ruby-2.0.0-crash-fix.diff
deleted file mode 100644
index bfc816ade..000000000
--- a/extra/weechat/ruby-2.0.0-crash-fix.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=blobdiff_plain;f=src%2Fplugins%2Fruby%2Fweechat-ruby-api.c;h=101caec961829de03f8097edc63f497eab99aaa3;hp=bbc2fbcbe3c5290a8a975c4676a85a8c7e0998b7;hb=4fdbb83a079f24a742633fd4d02084911580c19c;hpb=55e58811b3df451db4f95b1035a39f5659788989
-
-diff --git a/src/plugins/ruby/weechat-ruby-api.c b/src/plugins/ruby/weechat-ruby-api.c
-index bbc2fbc..101caec 100644
---- a/src/plugins/ruby/weechat-ruby-api.c
-+++ b/src/plugins/ruby/weechat-ruby-api.c
-@@ -1333,28 +1333,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file,
-                                     VALUE description, VALUE string_values,
-                                     VALUE min, VALUE max, VALUE default_value,
-                                     VALUE value, VALUE null_value_allowed,
--                                    VALUE function_check_value,
--                                    VALUE data_check_value,
--                                    VALUE function_change,
--                                    VALUE data_change,
--                                    VALUE function_delete,
--                                    VALUE data_delete)
-+                                    VALUE callbacks)
- {
-     char *c_config_file, *c_section, *c_name, *c_type, *c_description;
-     char *c_string_values, *c_default_value, *c_value;
-     char *c_function_check_value, *c_data_check_value, *c_function_change;
-     char *c_data_change, *c_function_delete, *c_data_delete, *result;
-     int c_min, c_max, c_null_value_allowed;
--    VALUE return_value;
-+    VALUE function_check_value, data_check_value, function_change, data_change;
-+    VALUE function_delete, data_delete, return_value;
- 
-     API_FUNC(1, "config_new_option", API_RETURN_EMPTY);
-     if (NIL_P (config_file) || NIL_P (section) || NIL_P (name) || NIL_P (type)
-         || NIL_P (description) || NIL_P (string_values) || NIL_P (min)
-         || NIL_P (max) || NIL_P (default_value) || NIL_P (value)
--        || NIL_P (null_value_allowed) || NIL_P (function_check_value)
--        || NIL_P (data_check_value) || NIL_P (function_change)
--        || NIL_P (data_change) || NIL_P (function_delete)
--        || NIL_P (data_delete))
-+        || NIL_P (null_value_allowed) || NIL_P (callbacks))
-         API_WRONG_ARGS(API_RETURN_EMPTY);
- 
-     Check_Type (config_file, T_STRING);
-@@ -1368,12 +1361,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file,
-     Check_Type (default_value, T_STRING);
-     Check_Type (value, T_STRING);
-     Check_Type (null_value_allowed, T_FIXNUM);
--    Check_Type (function_check_value, T_STRING);
--    Check_Type (data_check_value, T_STRING);
--    Check_Type (function_change, T_STRING);
--    Check_Type (data_change, T_STRING);
--    Check_Type (function_delete, T_STRING);
--    Check_Type (data_delete, T_STRING);
-+    Check_Type (callbacks, T_ARRAY);
-+
-+    /*
-+     * due to a Ruby limitation (15 arguments max by function), we receive the
-+     * the callbacks in an array of 6 strings (3 callbacks + 3 data)
-+     */
-+    if (RARRAY_LEN(callbacks) != 6)
-+        API_WRONG_ARGS(API_RETURN_EMPTY);
-+
-+    function_check_value = rb_ary_entry (callbacks, 0);
-+    data_check_value = rb_ary_entry (callbacks, 1);
-+    function_change = rb_ary_entry (callbacks, 2);
-+    data_change = rb_ary_entry (callbacks, 3);
-+    function_delete = rb_ary_entry (callbacks, 4);
-+    data_delete = rb_ary_entry (callbacks, 5);
- 
-     c_config_file = StringValuePtr (config_file);
-     c_section = StringValuePtr (section);
-@@ -5915,7 +5917,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat)
-     API_DEF_FUNC(config_new, 3);
-     API_DEF_FUNC(config_new_section, 14);
-     API_DEF_FUNC(config_search_section, 2);
--    API_DEF_FUNC(config_new_option, 17);
-+    API_DEF_FUNC(config_new_option, 12);
-     API_DEF_FUNC(config_search_option, 3);
-     API_DEF_FUNC(config_string_to_boolean, 1);
-     API_DEF_FUNC(config_option_reset, 2);
diff --git a/extra/wireshark/01_patch-automake-1.13.diff b/extra/wireshark/01_patch-automake-1.13.diff
deleted file mode 100644
index cf03fa060..000000000
--- a/extra/wireshark/01_patch-automake-1.13.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.init	2013-02-02 22:11:27.140322526 +0100
-+++ configure.in	2013-02-02 22:11:42.863854681 +0100
-@@ -1960,7 +1960,7 @@
- sinclude(asn1/Custom.m4) dnl
- ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_OUTPUT(
-   Makefile
-   doxygen.cfg
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 23a305116..6692971ec 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 182116 2013-04-07 20:47:05Z guillaume $
+# $Id: PKGBUILD 186024 2013-05-20 14:35:40Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.8.6
-pkgrel=2
+pkgver=1.8.7
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
@@ -12,17 +12,13 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
 url='http://www.wireshark.org/'
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
-        01_patch-automake-1.13.diff
         02_enable-version.diff)
-sha256sums=('2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea'
-            '388a9cf4c924c32a0f7ee8ffeaae060cdbf0c712bcc0032d5dfaa5717b217b80'
+sha256sums=('5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842'
             'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8202
-  patch -p0 < ${srcdir}/01_patch-automake-1.13.diff
   patch -p0 < ${srcdir}/02_enable-version.diff
 
   ./autogen.sh
diff --git a/extra/wireshark/wireshark.install b/extra/wireshark/wireshark.install
index 69adcc4bc..001bd0c58 100644
--- a/extra/wireshark/wireshark.install
+++ b/extra/wireshark/wireshark.install
@@ -1,14 +1,14 @@
 post_install() {
     /usr/bin/getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
 
-    /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+    /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
     echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
 }
 
 post_upgrade() {
     /usr/bin/getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
-    
-    /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+
+    /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
 }
 
 post_remove() {
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD
index 92b719de6..064bd2c71 100644
--- a/extra/x2goserver/PKGBUILD
+++ b/extra/x2goserver/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185846 2013-05-19 15:18:38Z andyrtr $
+# $Id: PKGBUILD 186036 2013-05-20 18:09:21Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
@@ -8,7 +8,7 @@
 
 pkgname=x2goserver
 pkgver=4.0.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Open source terminal server"
 arch=('i686' 'x86_64')
 url="http://www.x2go.org/"
@@ -19,13 +19,20 @@ makedepends=('man2html')
 options=('emptydirs')
 install=x2goserver.install
 backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
-source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service)
+source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        x2goserver.service
+        revert.patch)
 md5sums=('6b8cecfdd31a8877203f50d3666c265f'
-         'f76081c01e40b6206895d194dc949707')
+         'f76081c01e40b6206895d194dc949707'
+         'c487c31e7c0aa9a73323313007497764')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-#return 1
+
+  # revert an upstream commit that breaks sessions showing up
+  # http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=011d14ae076ba6fec96cd1e019c4f82444ab0f9f
+  patch -Rp1 -i ${srcdir}/revert.patch
+
   # -r option does not exist in Arch linux
   # (However, html man pages do not get installed anyway...)
   for Makefile in $(find . -type f -name Makefile); do
@@ -49,9 +56,8 @@ package() {
   install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
   
   # X2go homedir + printing spool dir
-  #install -dm 755 $pkgdir/var/lib/x2go
   install -dm 770 $pkgdir/var/lib/x2go
-  install -dm 755 $pkgdir/var/spool/x2go
+  install -dm 770 $pkgdir/var/spool/x2go
   
   # load fuse module at system start
   install -dm755 $pkgdir/lib/modules-load.d
diff --git a/extra/x2goserver/revert.patch b/extra/x2goserver/revert.patch
new file mode 100644
index 000000000..023bbd18c
--- /dev/null
+++ b/extra/x2goserver/revert.patch
@@ -0,0 +1,152 @@
+From 011d14ae076ba6fec96cd1e019c4f82444ab0f9f Mon Sep 17 00:00:00 2001
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Sun, 19 May 2013 00:41:32 +0200
+Subject: [PATCH] Security fix for setgid wrapper x2gosqlitewrapper.c.
+ Hard-code path to x2gosqlitewrapper.pl during build via
+ defining a macro in the Makefile. Thanks to Richard
+ Weinberger for spotting this!!!
+
+---
+ Makefile                       |    2 +-
+ debian/changelog               |    3 +++
+ debian/rules                   |    4 +--
+ x2goserver/Makefile            |    4 +--
+ x2goserver/x2gosqlitewrapper.c |   54 +++-------------------------------------
+ 5 files changed, 12 insertions(+), 55 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3be40f9..588084f 100755
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@ RM_FILE=rm -f
+ RM_DIR=rmdir -p --ignore-fail-on-non-empty
+ 
+ DESTDIR=
+-PREFIX=/usr/local
++PREFIX ?= /usr/local
+ ETCDIR=/etc/x2go
+ LIBDIR=$(PREFIX)/lib/x2go
+ SHAREDIR=$(PREFIX)/share/x2go
+diff --git a/debian/changelog b/debian/changelog
+index 470a502..2cf2dde 100644
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -12,6 +12,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
+   * New upstream version (4.0.0.2):
+     - Use make_path from File::Path in x2godbadmin to create user directory if
+       not present. (Fixes: #200).
++    - Security fix for setgid wrapper x2gosqlitewrapper.c. Hard-code path to
++      x2gosqlitewrapper.pl during build via defining a macro in the Makefile.
++      Thanks to Richard Weinberger for spotting this!!!
+   /debian/control:
+     + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes:
+       #163).
+diff --git a/debian/rules b/debian/rules
+index b32e08d..5bb94b2 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -1,10 +1,10 @@
+ #!/usr/bin/make -f
+ 
+ %:
+-	dh $@
++	PREFIX=/usr dh $@
+ 
+ override_dh_auto_install:
+-	make -f Makefile build-arch
++	PREFIX=/usr make -f Makefile build-arch
+ 
+ override_dh_auto_clean:
+ 	rm -fv x2gosqlitewrapper
+diff --git a/x2goserver/Makefile b/x2goserver/Makefile
+index 4287478..e9d56e6 100755
+--- a/x2goserver/Makefile
++++ b/x2goserver/Makefile
+@@ -15,7 +15,7 @@ RM_FILE=rm -f
+ RM_DIR=rmdir -p --ignore-fail-on-non-empty
+ 
+ DESTDIR=
+-PREFIX=/usr/local
++PREFIX ?= /usr/local
+ ETCDIR=/etc/x2go
+ BINDIR=$(PREFIX)/bin
+ SBINDIR=$(PREFIX)/sbin
+@@ -41,7 +41,7 @@ build: build-arch build-indep
+ build-arch: build_setgidwrappers
+ 
+ build_setgidwrappers:
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c
+ 
+ build-indep: build_man2html
+ 
+diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c
+index a134efc..ad95eff 100644
+--- a/x2goserver/x2gosqlitewrapper.c
++++ b/x2goserver/x2gosqlitewrapper.c
+@@ -21,58 +21,12 @@
+  * 
+  */
+ 
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <unistd.h>
+-#include <libgen.h>
+-#include <errno.h>
+-
+ int main( int argc, char *argv[] ) {
+-	char * x2gosqlitewrapper = NULL;
+-	size_t path_max;
+-	
+-/*
+-	The following snippet is taken from the realpath manpage
+-*/
+-#ifdef PATH_MAX
+-	path_max = PATH_MAX;
+-#else
+-	path_max = pathconf (".", _PC_PATH_MAX);
+-	if (path_max <= 0){
+-		path_max = 4096;
+-	}
+-#endif
+-	{
+-		// allocate dynamic buffer in stack: this needs C99 or gnu??
+-		char buffer[path_max];
+-		ssize_t rvrl;
+-		int rvap;
+-
+-		// resolve link of /proc/self/exe to find out where we are
+-		rvrl = readlink("/proc/self/exe", buffer, path_max);
+-		if(rvrl == -1){
+-			perror("readlink(\"/proc/self/exe\",buffer,path_max)");
+-			exit(EXIT_FAILURE);
+-		}
+-		if(rvrl >= path_max){
+-			fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max);
+-			exit(EXIT_FAILURE);
+-		}
+-
+-		// derive the full path of x2gosqlitewrapper.pl from path of this binary
+-		rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl");
+-		if(rvap == -1){
+-			fprintf(stderr, "Failed to allocate memory calling asprintf\n");
+-			exit(EXIT_FAILURE);
+-		}
+-
+-		// execute the script, running with user-rights of this binary 
+-		execv(x2gosqlitewrapper, argv);
+ 
+-	}
++	char x2gosqlitewrapper[] = TRUSTED_BINARY;
+ 
+-	// ...fail
+-	fprintf(stderr, "Failed to execute %s: %s\n", x2gosqlitewrapper, strerror(errno));
+-	return EXIT_FAILURE;
++	argv[0] = "x2gosqlitewrapper.pl";
++	// execute the script, running with user-rights of this binary
++	execv(x2gosqlitewrapper, argv);
+ 
+ }
+-- 
+1.7.9.5
+
diff --git a/extra/x2goserver/x2goserver.install b/extra/x2goserver/x2goserver.install
index cac06dac8..223eaac62 100644
--- a/extra/x2goserver/x2goserver.install
+++ b/extra/x2goserver/x2goserver.install
@@ -39,7 +39,7 @@ post_install() {
   # fix permissions - see INSTALL file
   chown -R x2goprint:x2goprint /var/spool/x2go
   chmod 0770 /var/spool/x2go
-  
+    
   chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper
   chmod 2755 /usr/lib/x2go/x2gosqlitewrapper
   
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index a1e90b3b6..f86e71660 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 183701 2013-04-27 10:47:26Z tpowa $
+# $Id: PKGBUILD 185985 2013-05-20 06:09:54Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.8
-pkgver=${_basekernel}.11
+_basekernel=3.9
+pkgver=${_basekernel}.3
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         # the main kernel config files
         'config'
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
         'boot-logo.patch'
         'change-default-console-loglevel.patch')
-md5sums=('5c7787be882c343e41fb49136ff60aec'
-         'c0ccd5624a61eaae1a00a349e90b5a26'
-         '6294513cfa9830d48ad1915ff7053a98'
+md5sums=('120df29f88622dabf7015a22c7cc8e25'
+         '4ddd90d45cc8a4e663ef1e984e731232'
+         'c4e0f6ed7f166b401dd522b8594efd81'
          'f302c931bd85309da9d9792b4cc96467'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c')
@@ -35,7 +35,7 @@ prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1"
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
   # Add freedo as boot logo
@@ -288,7 +288,7 @@ _package-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
+  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
 }
 
 pkgname=("${pkgbase}" "${pkgbase}-headers")
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config
index 11b5bb531..87cf2bc63 100644
--- a/kernels/linux-libre-pae/config
+++ b/kernels/linux-libre-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.8.5-1 Kernel Configuration
+# Linux/x86 3.9.3-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -41,14 +41,12 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
 #
-CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION="-LIBRE-PAE"
@@ -120,6 +118,7 @@ CONFIG_TASK_IO_ACCOUNTING=y
 #
 CONFIG_TREE_PREEMPT_RCU=y
 CONFIG_PREEMPT_RCU=y
+CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_FANOUT=32
 CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
@@ -216,14 +215,18 @@ CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
+CONFIG_KPROBES_ON_FTRACE=y
 CONFIG_UPROBES=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_KRETPROBES=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
@@ -248,8 +251,9 @@ CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_GENERIC_SIGALTSTACK=y
 CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
 
 #
 # GCOV-based kernel profiling
@@ -322,6 +326,8 @@ CONFIG_SMP=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_BIGSMP is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
+# CONFIG_X86_GOLDFISH is not set
+# CONFIG_X86_INTEL_LPSS is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_X86_32_IRIS=m
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
@@ -404,6 +410,9 @@ CONFIG_MICROCODE=m
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_MICROCODE_INTEL_LIB=y
+CONFIG_MICROCODE_INTEL_EARLY=y
+CONFIG_MICROCODE_EARLY=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 # CONFIG_NOHIGHMEM is not set
@@ -425,6 +434,7 @@ CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_BALLOON_COMPACTION=y
@@ -527,9 +537,9 @@ CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
+CONFIG_ACPI_PCI_SLOT=y
 CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
@@ -570,6 +580,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 #
 # x86 CPU frequency scaling drivers
 #
+CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ_CPB=y
@@ -816,6 +827,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
@@ -888,9 +900,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 # Xtables matches
 #
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
@@ -988,7 +1002,6 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -1065,7 +1078,7 @@ CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 
 #
-# DCCP CCIDs Configuration (EXPERIMENTAL)
+# DCCP CCIDs Configuration
 #
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
@@ -1101,8 +1114,10 @@ CONFIG_L2TP_V3=y
 CONFIG_L2TP_IP=m
 CONFIG_L2TP_ETH=m
 CONFIG_STP=m
+CONFIG_MRP=m
 CONFIG_BRIDGE=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_TAG_DSA=y
@@ -1110,6 +1125,7 @@ CONFIG_NET_DSA_TAG_EDSA=y
 CONFIG_NET_DSA_TAG_TRAILER=y
 CONFIG_VLAN_8021Q=m
 # CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q_MVRP=y
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
 CONFIG_LLC2=m
@@ -1126,7 +1142,6 @@ CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP_DECAP=y
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_WAN_ROUTER is not set
 CONFIG_PHONET=m
 CONFIG_IEEE802154=m
 CONFIG_IEEE802154_6LOWPAN=m
@@ -1195,6 +1210,8 @@ CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
@@ -1381,6 +1398,8 @@ CONFIG_NFC_HCI=m
 #
 CONFIG_NFC_PN533=m
 CONFIG_NFC_WILINK=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_MICROREAD=m
 
 #
 # Device Drivers
@@ -1397,6 +1416,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
@@ -1419,6 +1439,7 @@ CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_CMDLINE_PARTS=m
 CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_AR7_PARTS=m
 
@@ -1582,7 +1603,6 @@ CONFIG_ISAPNP=y
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_CPQ_DA=m
@@ -1611,6 +1631,7 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
 
 #
 # Misc devices
@@ -1626,6 +1647,7 @@ CONFIG_SGI_IOC4=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
+# CONFIG_ATMEL_SSC is not set
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_CS5535_MFGPT=m
 CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
@@ -1647,6 +1669,7 @@ CONFIG_BMP085_I2C=m
 # CONFIG_BMP085_SPI is not set
 # CONFIG_PCH_PHUB is not set
 CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
 
@@ -1674,6 +1697,8 @@ CONFIG_SENSORS_LIS3_I2C=m
 #
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=y
+CONFIG_VMWARE_VMCI=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1769,6 +1794,7 @@ CONFIG_SCSI_MPT3SAS=m
 CONFIG_SCSI_MPT3SAS_MAX_SGE=128
 CONFIG_SCSI_MPT3SAS_LOGGING=y
 CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_FLASHPOINT is not set
@@ -1851,6 +1877,7 @@ CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
 CONFIG_SATA_PMP=y
 
 #
@@ -1956,7 +1983,6 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-# CONFIG_MULTICORE_RAID456 is not set
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
@@ -1968,6 +1994,9 @@ CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_CLEANER=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -2094,7 +2123,6 @@ CONFIG_NET_DSA_MV88E6123_61_65=m
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
 CONFIG_EL3=m
 CONFIG_3C515=m
 CONFIG_PCMCIA_3C574=m
@@ -2110,7 +2138,6 @@ CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_LANCE=m
 CONFIG_PCNET32=m
-CONFIG_DEPCA=m
 CONFIG_PCMCIA_NMCLAN=m
 CONFIG_NI65=m
 CONFIG_NET_VENDOR_ATHEROS=y
@@ -2130,6 +2157,7 @@ CONFIG_BNX2=m
 CONFIG_CNIC=m
 CONFIG_TIGON3=m
 CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_CALXEDA_XGMAC=m
@@ -2146,7 +2174,6 @@ CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 CONFIG_DNET=m
 CONFIG_NET_VENDOR_DEC=y
-CONFIG_EWRK3=m
 CONFIG_NET_TULIP=y
 CONFIG_DE2104X=m
 CONFIG_DE2104X_DSL=0
@@ -2160,8 +2187,6 @@ CONFIG_DM9102=m
 CONFIG_ULI526X=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DE600=m
-CONFIG_DE620=m
 CONFIG_DL2K=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
@@ -2172,9 +2197,7 @@ CONFIG_S2IO=m
 CONFIG_VXGE=m
 # CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_AT1700=m
 CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_ETH16I=m
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_INTEL=y
@@ -2182,6 +2205,7 @@ CONFIG_E100=m
 CONFIG_E1000=m
 CONFIG_E1000E=m
 CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
 CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
@@ -2190,14 +2214,6 @@ CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBEVF=m
 CONFIG_NET_VENDOR_I825XX=y
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_APRICOT=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_LP486E=m
-CONFIG_NI52=m
-CONFIG_ZNET=m
 CONFIG_IP1000=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
@@ -2226,12 +2242,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_8390=y
-CONFIG_EL2=m
-CONFIG_AC3200=m
 CONFIG_PCMCIA_AXNET=m
-CONFIG_E2100=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
 CONFIG_NE2000=m
 CONFIG_NE2K_PCI=m
 CONFIG_PCMCIA_PCNET=m
@@ -2250,7 +2261,6 @@ CONFIG_QLA3XXX=m
 CONFIG_QLCNIC=m
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
-CONFIG_NET_VENDOR_RACAL=y
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_ATP=m
 CONFIG_8139CP=m
@@ -2263,7 +2273,6 @@ CONFIG_R8169=m
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_SEEQ8005=m
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_SC92031=m
 CONFIG_NET_VENDOR_SIS=y
@@ -2365,6 +2374,7 @@ CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_EEM=m
 CONFIG_USB_NET_CDC_NCM=m
@@ -2497,6 +2507,7 @@ CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
 
 #
 # Debugging Options
@@ -2551,6 +2562,7 @@ CONFIG_RT2800USB_RT35XX=y
 CONFIG_RT2800USB_RT53XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_MMIO=m
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
@@ -2558,13 +2570,13 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTLWIFI=m
+# CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192DE=m
 CONFIG_RTL8723AE=m
 CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-# CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
 CONFIG_WL_TI=y
 CONFIG_WL1251=m
@@ -2575,7 +2587,7 @@ CONFIG_WL18XX=m
 CONFIG_WLCORE=m
 # CONFIG_WLCORE_SPI is not set
 CONFIG_WLCORE_SDIO=m
-CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
@@ -2794,6 +2806,7 @@ CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
 CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
@@ -2803,6 +2816,7 @@ CONFIG_MOUSE_PS2_OLPC=y
 CONFIG_MOUSE_SERIAL=y
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
 CONFIG_MOUSE_INPORT=m
 # CONFIG_MOUSE_ATIXL is not set
 CONFIG_MOUSE_LOGIBM=m
@@ -2972,6 +2986,7 @@ CONFIG_GAMEPORT_FM801=m
 #
 # Character devices
 #
+CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
@@ -3003,9 +3018,11 @@ CONFIG_TRACE_SINK=m
 # Serial drivers
 #
 CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=32
@@ -3034,6 +3051,8 @@ CONFIG_SERIAL_PCH_UART=m
 CONFIG_SERIAL_XILINX_PS_UART=m
 CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -3079,6 +3098,7 @@ CONFIG_TCG_TIS_I2C_INFINEON=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
+CONFIG_TCG_ST33_I2C=m
 CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
 CONFIG_I2C=m
@@ -3106,6 +3126,7 @@ CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
 CONFIG_I2C_I801=m
 CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
 CONFIG_I2C_PIIX4=m
 CONFIG_I2C_NFORCE2=m
 CONFIG_I2C_NFORCE2_S4985=m
@@ -3208,6 +3229,7 @@ CONFIG_PTP_1588_CLOCK=m
 CONFIG_DP83640_PHY=m
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
 CONFIG_GPIOLIB=y
 CONFIG_OF_GPIO=y
 CONFIG_GPIO_ACPI=y
@@ -3223,6 +3245,7 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_SCH=m
 CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_LYNXPOINT is not set
 
 #
 # I2C GPIO expanders:
@@ -3287,6 +3310,7 @@ CONFIG_BATTERY_OLPC=m
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_AVS=y
@@ -3365,6 +3389,7 @@ CONFIG_SENSORS_MAX197=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_PC87360=m
@@ -3399,6 +3424,7 @@ CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 # CONFIG_SENSORS_ADS7871 is not set
 CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP102=m
@@ -3431,10 +3457,12 @@ CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-CONFIG_FAIR_SHARE=y
-CONFIG_STEP_WISE=y
-# CONFIG_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
 # CONFIG_CPU_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+CONFIG_INTEL_POWERCLAMP=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3443,6 +3471,7 @@ CONFIG_WATCHDOG_CORE=y
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
@@ -3603,8 +3632,10 @@ CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_MEMOPS=m
 CONFIG_VIDEOBUF2_DMA_CONTIG=m
 CONFIG_VIDEOBUF2_VMALLOC=m
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
 CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
 
@@ -3705,7 +3736,6 @@ CONFIG_USB_SN9C102=m
 #
 # Analog TV USB devices
 #
-CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_PVRUSB2_DVB=y
@@ -3719,6 +3749,8 @@ CONFIG_VIDEO_STK1160_AC97=y
 #
 # Analog/digital TV USB devices
 #
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_RC=y
 CONFIG_VIDEO_CX231XX_ALSA=m
@@ -3835,7 +3867,6 @@ CONFIG_VIDEO_SAA7164=m
 #
 # Media digital TV PCI Adapters
 #
-CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_AV7110=m
 CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_BUDGET_CORE=m
@@ -3856,6 +3887,7 @@ CONFIG_DVB_DDBRIDGE=m
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
 # CONFIG_V4L_TEST_DRIVERS is not set
 
 #
@@ -3879,6 +3911,7 @@ CONFIG_RADIO_SHARK2=m
 CONFIG_I2C_SI4713=m
 CONFIG_RADIO_SI4713=m
 CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
 CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_SAA7706H=m
 CONFIG_RADIO_TEF6862=m
@@ -3900,18 +3933,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
 #
 # common driver options
 #
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
 CONFIG_DVB_B2C2_FLEXCOP=m
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 
 #
 # Media ancillary drivers (tuners, sensors, i2c, frontends)
 #
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_VIDEO_IR_I2C=m
 
 #
@@ -3953,11 +3987,6 @@ CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_CX25840=m
 
 #
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
@@ -4057,6 +4086,7 @@ CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
 CONFIG_DVB_MB86A16=m
 CONFIG_DVB_TDA10071=m
@@ -4168,20 +4198,21 @@ CONFIG_DRM_USB=m
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_TTM=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
+# CONFIG_DRM_RADEON_UMS is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_MGA=m
@@ -4197,9 +4228,11 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
 CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_STUB_POULSBO=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_OF_DISPLAY_TIMING is not set
+# CONFIG_OF_VIDEOMODE is not set
+CONFIG_HDMI=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=m
@@ -4268,6 +4301,7 @@ CONFIG_FB_VOODOO1=m
 # CONFIG_FB_SM501 is not set
 # CONFIG_FB_SMSCUFX is not set
 CONFIG_FB_UDL=m
+# CONFIG_FB_GOLDFISH is not set
 CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
@@ -4286,6 +4320,8 @@ CONFIG_LCD_PLATFORM=m
 # CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_LM3533=m
@@ -4462,6 +4498,7 @@ CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
@@ -4478,6 +4515,7 @@ CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y
 CONFIG_SND_HDA_CODEC_CA0132=y
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_GENERIC=y
@@ -4595,6 +4633,7 @@ CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
 CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEELSERIES=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
@@ -4603,6 +4642,7 @@ CONFIG_HID_SMARTJOYPLUS=m
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TIVO=m
 CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
@@ -4793,6 +4833,7 @@ CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_OPTICON=m
 CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_XSENS_MT=m
 CONFIG_USB_SERIAL_ZIO=m
 CONFIG_USB_SERIAL_ZTE=m
 CONFIG_USB_SERIAL_SSU100=m
@@ -4824,10 +4865,13 @@ CONFIG_USB_TEST=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
 
 #
 # USB Physical Layer drivers
 #
+# CONFIG_OMAP_USB3 is not set
+# CONFIG_OMAP_CONTROL_USB is not set
 CONFIG_USB_ISP1301=m
 CONFIG_USB_RCAR_PHY=m
 CONFIG_USB_ATM=m
@@ -4859,6 +4903,8 @@ CONFIG_USB_GOKU=m
 CONFIG_USB_EG20T=m
 CONFIG_USB_DUMMY_HCD=m
 CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
 # CONFIG_GADGET_UAC1 is not set
@@ -4871,7 +4917,7 @@ CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_FUNCTIONFS_ETH=y
 CONFIG_USB_FUNCTIONFS_RNDIS=y
 CONFIG_USB_FUNCTIONFS_GENERIC=y
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_GADGET_TARGET=m
 CONFIG_USB_G_SERIAL=m
 CONFIG_USB_MIDI_GADGET=m
@@ -4955,12 +5001,14 @@ CONFIG_LEDS_PCA9532=m
 # CONFIG_LEDS_PCA9532_GPIO is not set
 # CONFIG_LEDS_GPIO is not set
 CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP55XX_COMMON=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_PCA9633=m
 # CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_PWM is not set
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
@@ -5014,6 +5062,7 @@ CONFIG_EDAC_I7300=m
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 # CONFIG_RTC_DEBUG is not set
 
@@ -5063,6 +5112,7 @@ CONFIG_RTC_DRV_RV3029C2=m
 # CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_DS3234 is not set
 # CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
 
 #
 # Platform RTC drivers
@@ -5088,6 +5138,11 @@ CONFIG_RTC_DRV_PCF50633=m
 #
 CONFIG_RTC_DRV_MC13XXX=m
 CONFIG_RTC_DRV_SNVS=m
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -5096,9 +5151,12 @@ CONFIG_DMADEVICES=y
 #
 CONFIG_INTEL_MID_DMAC=m
 CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC=m
+# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
 CONFIG_TIMB_DMA=m
 CONFIG_PCH_DMA=m
 CONFIG_DMA_ENGINE=y
+CONFIG_DMA_OF=y
 
 #
 # DMA Clients
@@ -5208,6 +5266,7 @@ CONFIG_COMEDI_MULTIQ3=m
 CONFIG_COMEDI_POC=m
 CONFIG_COMEDI_PCI_DRIVERS=y
 CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
 CONFIG_COMEDI_ADDI_APCI_035=m
 CONFIG_COMEDI_ADDI_APCI_1032=m
 CONFIG_COMEDI_ADDI_APCI_1500=m
@@ -5300,7 +5359,6 @@ CONFIG_RTS5139=m
 # CONFIG_TRANZPORT is not set
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DUMP_PCM is not set
 # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
 CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_VT6655=m
@@ -5308,7 +5366,6 @@ CONFIG_VT6656=m
 CONFIG_DX_SEP=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
-# CONFIG_ZCACHE is not set
 CONFIG_ZSMALLOC=y
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
@@ -5384,18 +5441,18 @@ CONFIG_WIMAX_GDM72XX_USB=y
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIMAX_GDM72XX_USB_PM=y
 CONFIG_CSR_WIFI=m
-CONFIG_ZCACHE2=y
 CONFIG_NET_VENDOR_SILICOM=y
 CONFIG_SBYPASS=m
 CONFIG_BPCTL=m
 CONFIG_CED1401=m
 CONFIG_DGRP=m
-CONFIG_SB105X=m
 CONFIG_FIREWIRE_SERIAL=m
+CONFIG_ZCACHE=y
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_ASUS_LAPTOP=m
+CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
@@ -5448,6 +5505,7 @@ CONFIG_CLKSRC_I8253=y
 CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+# CONFIG_MAILBOX is not set
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_OF_IOMMU=y
@@ -5457,13 +5515,13 @@ CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 
 #
-# Remoteproc drivers (EXPERIMENTAL)
+# Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
 CONFIG_STE_MODEM_RPROC=m
 
 #
-# Rpmsg drivers (EXPERIMENTAL)
+# Rpmsg drivers
 #
 CONFIG_VIRT_DRIVERS=y
 # CONFIG_PM_DEVFREQ is not set
@@ -5473,11 +5531,11 @@ CONFIG_EXTCON=m
 # Extcon Device Drivers
 #
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_ARIZONA=m
 CONFIG_MEMORY=y
 # CONFIG_IIO is not set
 # CONFIG_VME_BUS is not set
 CONFIG_PWM=y
+CONFIG_IRQCHIP=y
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
@@ -5548,7 +5606,7 @@ CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y 
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
@@ -5613,6 +5671,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
 CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m
@@ -5672,7 +5731,7 @@ CONFIG_NFS_V2=m
 CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
+CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_BLOCK=m
@@ -5681,6 +5740,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
@@ -5694,8 +5754,9 @@ CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DEBUG is not set
+CONFIG_SUNRPC_DEBUG=y
 CONFIG_CEPH_FS=m
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
@@ -5824,8 +5885,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
-# CONFIG_PROVE_RCU_DELAY is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
@@ -5847,6 +5906,12 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
@@ -5869,6 +5934,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
@@ -5876,7 +5942,6 @@ CONFIG_TRACER_MAX_TRACE=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
-CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING=y
@@ -5889,6 +5954,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_PREEMPT_TRACER is not set
 CONFIG_SCHED_TRACER=y
 CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
@@ -5898,6 +5964,7 @@ CONFIG_KPROBE_EVENT=y
 CONFIG_UPROBE_EVENT=y
 CONFIG_PROBE_EVENTS=y
 CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
@@ -6045,6 +6112,8 @@ CONFIG_CRYPTO_VMAC=m
 #
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
 CONFIG_CRYPTO_GHASH=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
@@ -6200,3 +6269,4 @@ CONFIG_CORDIC=m
 CONFIG_DDR=y
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install
index 76fa87eb8..fcd021bd7 100644
--- a/kernels/linux-libre-pae/linux-libre-pae.install
+++ b/kernels/linux-libre-pae/linux-libre-pae.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-pae
-KERNEL_VERSION=3.8.11-1-LIBRE-PAE
+KERNEL_VERSION=3.9.3-1-LIBRE-PAE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 2d2ba5338..4392f493f 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 183701 2013-04-27 10:47:26Z tpowa $
+# $Id: PKGBUILD 185985 2013-05-20 06:09:54Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.8
-pkgver=${_basekernel}.11
+_basekernel=3.9
+pkgver=${_basekernel}.3
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         # the main kernel config files
         'config'
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
         'boot-logo.patch'
         'change-default-console-loglevel.patch')
-md5sums=('5c7787be882c343e41fb49136ff60aec'
-         'c0ccd5624a61eaae1a00a349e90b5a26'
-         '2708b6f03f827e2c94ecbd050df4286d'
+md5sums=('120df29f88622dabf7015a22c7cc8e25'
+         '4ddd90d45cc8a4e663ef1e984e731232'
+         '625f76c5e67c57c1fa35b74cf4a15d5e'
          'b7c2805bb287a644c0a303bf7721e534'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c')
@@ -35,7 +35,7 @@ prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1"
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
   # Add freedo as boot logo
@@ -288,7 +288,7 @@ _package-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
+  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
 }
 
 pkgname=("${pkgbase}" "${pkgbase}-headers")
diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config
index 3464a1814..a933be16e 100644
--- a/kernels/linux-libre-xen/config
+++ b/kernels/linux-libre-xen/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.8.5-1 Kernel Configuration
+# Linux/x86 3.9.3-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -41,14 +41,12 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
 #
-CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION="-LIBRE-XEN"
@@ -120,6 +118,7 @@ CONFIG_TASK_IO_ACCOUNTING=y
 #
 CONFIG_TREE_PREEMPT_RCU=y
 CONFIG_PREEMPT_RCU=y
+CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_FANOUT=32
 CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
@@ -216,14 +215,18 @@ CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
+CONFIG_KPROBES_ON_FTRACE=y
 CONFIG_UPROBES=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_KRETPROBES=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
@@ -248,8 +251,9 @@ CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_GENERIC_SIGALTSTACK=y
 CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
 
 #
 # GCOV-based kernel profiling
@@ -322,6 +326,8 @@ CONFIG_SMP=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_BIGSMP is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
+# CONFIG_X86_GOLDFISH is not set
+# CONFIG_X86_INTEL_LPSS is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_X86_32_IRIS=m
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
@@ -409,6 +415,9 @@ CONFIG_MICROCODE=m
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_MICROCODE_INTEL_LIB=y
+CONFIG_MICROCODE_INTEL_EARLY=y
+CONFIG_MICROCODE_EARLY=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 # CONFIG_NOHIGHMEM is not set
@@ -430,6 +439,7 @@ CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_BALLOON_COMPACTION=y
@@ -532,9 +542,9 @@ CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
+CONFIG_ACPI_PCI_SLOT=y
 CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
@@ -575,6 +585,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 #
 # x86 CPU frequency scaling drivers
 #
+CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ_CPB=y
@@ -823,6 +834,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
@@ -895,9 +907,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 # Xtables matches
 #
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
@@ -995,7 +1009,6 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -1072,7 +1085,7 @@ CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 
 #
-# DCCP CCIDs Configuration (EXPERIMENTAL)
+# DCCP CCIDs Configuration
 #
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
@@ -1108,8 +1121,10 @@ CONFIG_L2TP_V3=y
 CONFIG_L2TP_IP=m
 CONFIG_L2TP_ETH=m
 CONFIG_STP=m
+CONFIG_MRP=m
 CONFIG_BRIDGE=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_TAG_DSA=y
@@ -1117,6 +1132,7 @@ CONFIG_NET_DSA_TAG_EDSA=y
 CONFIG_NET_DSA_TAG_TRAILER=y
 CONFIG_VLAN_8021Q=m
 # CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q_MVRP=y
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
 CONFIG_LLC2=m
@@ -1133,7 +1149,6 @@ CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP_DECAP=y
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_WAN_ROUTER is not set
 CONFIG_PHONET=m
 CONFIG_IEEE802154=m
 CONFIG_IEEE802154_6LOWPAN=m
@@ -1202,6 +1217,8 @@ CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
@@ -1388,6 +1405,8 @@ CONFIG_NFC_HCI=m
 #
 CONFIG_NFC_PN533=m
 CONFIG_NFC_WILINK=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_MICROREAD=m
 
 #
 # Device Drivers
@@ -1404,6 +1423,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
@@ -1426,6 +1446,7 @@ CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_CMDLINE_PARTS=m
 CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_AR7_PARTS=m
 
@@ -1589,7 +1610,6 @@ CONFIG_ISAPNP=y
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_CPQ_DA=m
@@ -1620,6 +1640,7 @@ CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
 
 #
 # Misc devices
@@ -1635,6 +1656,7 @@ CONFIG_SGI_IOC4=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
+# CONFIG_ATMEL_SSC is not set
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_CS5535_MFGPT=m
 CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
@@ -1656,6 +1678,7 @@ CONFIG_BMP085_I2C=m
 # CONFIG_BMP085_SPI is not set
 # CONFIG_PCH_PHUB is not set
 CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
 
@@ -1683,6 +1706,8 @@ CONFIG_SENSORS_LIS3_I2C=m
 #
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=y
+CONFIG_VMWARE_VMCI=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1778,6 +1803,7 @@ CONFIG_SCSI_MPT3SAS=m
 CONFIG_SCSI_MPT3SAS_MAX_SGE=128
 CONFIG_SCSI_MPT3SAS_LOGGING=y
 CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_FLASHPOINT is not set
@@ -1860,6 +1886,7 @@ CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
 CONFIG_SATA_PMP=y
 
 #
@@ -1965,7 +1992,6 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-# CONFIG_MULTICORE_RAID456 is not set
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
@@ -1977,6 +2003,9 @@ CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_CLEANER=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -2102,7 +2131,6 @@ CONFIG_NET_DSA_MV88E6123_61_65=m
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
 CONFIG_EL3=m
 CONFIG_3C515=m
 CONFIG_PCMCIA_3C574=m
@@ -2118,7 +2146,6 @@ CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_LANCE=m
 CONFIG_PCNET32=m
-CONFIG_DEPCA=m
 CONFIG_PCMCIA_NMCLAN=m
 CONFIG_NI65=m
 CONFIG_NET_VENDOR_ATHEROS=y
@@ -2138,6 +2165,7 @@ CONFIG_BNX2=m
 CONFIG_CNIC=m
 CONFIG_TIGON3=m
 CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_CALXEDA_XGMAC=m
@@ -2154,7 +2182,6 @@ CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 CONFIG_DNET=m
 CONFIG_NET_VENDOR_DEC=y
-CONFIG_EWRK3=m
 CONFIG_NET_TULIP=y
 CONFIG_DE2104X=m
 CONFIG_DE2104X_DSL=0
@@ -2168,8 +2195,6 @@ CONFIG_DM9102=m
 CONFIG_ULI526X=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DE600=m
-CONFIG_DE620=m
 CONFIG_DL2K=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
@@ -2180,9 +2205,7 @@ CONFIG_S2IO=m
 CONFIG_VXGE=m
 # CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_AT1700=m
 CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_ETH16I=m
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_INTEL=y
@@ -2190,6 +2213,7 @@ CONFIG_E100=m
 CONFIG_E1000=m
 CONFIG_E1000E=m
 CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
 CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
@@ -2198,14 +2222,6 @@ CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBEVF=m
 CONFIG_NET_VENDOR_I825XX=y
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_APRICOT=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_LP486E=m
-CONFIG_NI52=m
-CONFIG_ZNET=m
 CONFIG_IP1000=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
@@ -2234,12 +2250,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_8390=y
-CONFIG_EL2=m
-CONFIG_AC3200=m
 CONFIG_PCMCIA_AXNET=m
-CONFIG_E2100=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
 CONFIG_NE2000=m
 CONFIG_NE2K_PCI=m
 CONFIG_PCMCIA_PCNET=m
@@ -2258,7 +2269,6 @@ CONFIG_QLA3XXX=m
 CONFIG_QLCNIC=m
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
-CONFIG_NET_VENDOR_RACAL=y
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_ATP=m
 CONFIG_8139CP=m
@@ -2271,7 +2281,6 @@ CONFIG_R8169=m
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_SEEQ8005=m
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_SC92031=m
 CONFIG_NET_VENDOR_SIS=y
@@ -2373,6 +2382,7 @@ CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_EEM=m
 CONFIG_USB_NET_CDC_NCM=m
@@ -2505,6 +2515,7 @@ CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
 
 #
 # Debugging Options
@@ -2559,6 +2570,7 @@ CONFIG_RT2800USB_RT35XX=y
 CONFIG_RT2800USB_RT53XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_MMIO=m
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
@@ -2566,13 +2578,13 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTLWIFI=m
+# CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192DE=m
 CONFIG_RTL8723AE=m
 CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-# CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
 CONFIG_WL_TI=y
 CONFIG_WL1251=m
@@ -2583,7 +2595,7 @@ CONFIG_WL18XX=m
 CONFIG_WLCORE=m
 # CONFIG_WLCORE_SPI is not set
 CONFIG_WLCORE_SDIO=m
-CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
@@ -2804,6 +2816,7 @@ CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
 CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
@@ -2813,6 +2826,7 @@ CONFIG_MOUSE_PS2_OLPC=y
 CONFIG_MOUSE_SERIAL=y
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
 CONFIG_MOUSE_INPORT=m
 # CONFIG_MOUSE_ATIXL is not set
 CONFIG_MOUSE_LOGIBM=m
@@ -2983,6 +2997,7 @@ CONFIG_GAMEPORT_FM801=m
 #
 # Character devices
 #
+CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
@@ -3014,9 +3029,11 @@ CONFIG_TRACE_SINK=m
 # Serial drivers
 #
 CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=32
@@ -3045,6 +3062,8 @@ CONFIG_SERIAL_PCH_UART=m
 CONFIG_SERIAL_XILINX_PS_UART=m
 CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -3092,6 +3111,7 @@ CONFIG_TCG_TIS_I2C_INFINEON=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
+CONFIG_TCG_ST33_I2C=m
 CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
 CONFIG_I2C=m
@@ -3119,6 +3139,7 @@ CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
 CONFIG_I2C_I801=m
 CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
 CONFIG_I2C_PIIX4=m
 CONFIG_I2C_NFORCE2=m
 CONFIG_I2C_NFORCE2_S4985=m
@@ -3221,6 +3242,7 @@ CONFIG_PTP_1588_CLOCK=m
 CONFIG_DP83640_PHY=m
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
 CONFIG_GPIOLIB=y
 CONFIG_OF_GPIO=y
 CONFIG_GPIO_ACPI=y
@@ -3236,6 +3258,7 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_SCH=m
 CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_LYNXPOINT is not set
 
 #
 # I2C GPIO expanders:
@@ -3300,6 +3323,7 @@ CONFIG_BATTERY_OLPC=m
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_AVS=y
@@ -3378,6 +3402,7 @@ CONFIG_SENSORS_MAX197=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_PC87360=m
@@ -3412,6 +3437,7 @@ CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 # CONFIG_SENSORS_ADS7871 is not set
 CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP102=m
@@ -3444,10 +3470,12 @@ CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-CONFIG_FAIR_SHARE=y
-CONFIG_STEP_WISE=y
-# CONFIG_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
 # CONFIG_CPU_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+CONFIG_INTEL_POWERCLAMP=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3456,6 +3484,7 @@ CONFIG_WATCHDOG_CORE=y
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
@@ -3617,8 +3646,10 @@ CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_MEMOPS=m
 CONFIG_VIDEOBUF2_DMA_CONTIG=m
 CONFIG_VIDEOBUF2_VMALLOC=m
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
 CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
 
@@ -3719,7 +3750,6 @@ CONFIG_USB_SN9C102=m
 #
 # Analog TV USB devices
 #
-CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_PVRUSB2_DVB=y
@@ -3733,6 +3763,8 @@ CONFIG_VIDEO_STK1160_AC97=y
 #
 # Analog/digital TV USB devices
 #
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_RC=y
 CONFIG_VIDEO_CX231XX_ALSA=m
@@ -3849,7 +3881,6 @@ CONFIG_VIDEO_SAA7164=m
 #
 # Media digital TV PCI Adapters
 #
-CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_AV7110=m
 CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_BUDGET_CORE=m
@@ -3870,6 +3901,7 @@ CONFIG_DVB_DDBRIDGE=m
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
 # CONFIG_V4L_TEST_DRIVERS is not set
 
 #
@@ -3893,6 +3925,7 @@ CONFIG_RADIO_SHARK2=m
 CONFIG_I2C_SI4713=m
 CONFIG_RADIO_SI4713=m
 CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
 CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_SAA7706H=m
 CONFIG_RADIO_TEF6862=m
@@ -3914,18 +3947,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
 #
 # common driver options
 #
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
 CONFIG_DVB_B2C2_FLEXCOP=m
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 
 #
 # Media ancillary drivers (tuners, sensors, i2c, frontends)
 #
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_VIDEO_IR_I2C=m
 
 #
@@ -3967,11 +4001,6 @@ CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_CX25840=m
 
 #
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
@@ -4071,6 +4100,7 @@ CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
 CONFIG_DVB_MB86A16=m
 CONFIG_DVB_TDA10071=m
@@ -4182,20 +4212,22 @@ CONFIG_DRM_USB=m
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_TTM=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
+# CONFIG_DRM_RADEON_UMS is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_MGA=m
@@ -4211,9 +4243,11 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
 CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_STUB_POULSBO=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_OF_DISPLAY_TIMING is not set
+# CONFIG_OF_VIDEOMODE is not set
+CONFIG_HDMI=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=m
@@ -4282,6 +4316,7 @@ CONFIG_FB_VOODOO1=m
 # CONFIG_FB_SM501 is not set
 # CONFIG_FB_SMSCUFX is not set
 CONFIG_FB_UDL=m
+# CONFIG_FB_GOLDFISH is not set
 CONFIG_FB_VIRTUAL=m
 CONFIG_XEN_FBDEV_FRONTEND=m
 # CONFIG_FB_METRONOME is not set
@@ -4301,6 +4336,8 @@ CONFIG_LCD_PLATFORM=m
 # CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_LM3533=m
@@ -4477,6 +4514,7 @@ CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
@@ -4493,6 +4531,7 @@ CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y
 CONFIG_SND_HDA_CODEC_CA0132=y
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_GENERIC=y
@@ -4610,6 +4649,7 @@ CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
 CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEELSERIES=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
@@ -4618,6 +4658,7 @@ CONFIG_HID_SMARTJOYPLUS=m
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TIVO=m
 CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
@@ -4808,6 +4849,7 @@ CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_OPTICON=m
 CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_XSENS_MT=m
 CONFIG_USB_SERIAL_ZIO=m
 CONFIG_USB_SERIAL_ZTE=m
 CONFIG_USB_SERIAL_SSU100=m
@@ -4839,10 +4881,13 @@ CONFIG_USB_TEST=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
 
 #
 # USB Physical Layer drivers
 #
+# CONFIG_OMAP_USB3 is not set
+# CONFIG_OMAP_CONTROL_USB is not set
 CONFIG_USB_ISP1301=m
 CONFIG_USB_RCAR_PHY=m
 CONFIG_USB_ATM=m
@@ -4874,6 +4919,8 @@ CONFIG_USB_GOKU=m
 CONFIG_USB_EG20T=m
 CONFIG_USB_DUMMY_HCD=m
 CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
 # CONFIG_GADGET_UAC1 is not set
@@ -4886,9 +4933,10 @@ CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_FUNCTIONFS_ETH=y
 CONFIG_USB_FUNCTIONFS_RNDIS=y
 CONFIG_USB_FUNCTIONFS_GENERIC=y
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_GADGET_TARGET=m
 CONFIG_USB_G_SERIAL=m
+CONFIG_USB_G_SERIAL=m
 CONFIG_USB_MIDI_GADGET=m
 CONFIG_USB_G_PRINTER=m
 # CONFIG_USB_CDC_COMPOSITE is not set
@@ -4970,12 +5018,14 @@ CONFIG_LEDS_PCA9532=m
 # CONFIG_LEDS_PCA9532_GPIO is not set
 # CONFIG_LEDS_GPIO is not set
 CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP55XX_COMMON=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_PCA9633=m
 # CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_PWM is not set
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
@@ -5029,6 +5079,7 @@ CONFIG_EDAC_I7300=m
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 # CONFIG_RTC_DEBUG is not set
 
@@ -5078,6 +5129,7 @@ CONFIG_RTC_DRV_RV3029C2=m
 # CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_DS3234 is not set
 # CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
 
 #
 # Platform RTC drivers
@@ -5103,6 +5155,11 @@ CONFIG_RTC_DRV_PCF50633=m
 #
 CONFIG_RTC_DRV_MC13XXX=m
 CONFIG_RTC_DRV_SNVS=m
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -5111,9 +5168,12 @@ CONFIG_DMADEVICES=y
 #
 CONFIG_INTEL_MID_DMAC=m
 CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC=m
+# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
 CONFIG_TIMB_DMA=m
 CONFIG_PCH_DMA=m
 CONFIG_DMA_ENGINE=y
+CONFIG_DMA_OF=y
 
 #
 # DMA Clients
@@ -5246,6 +5306,7 @@ CONFIG_COMEDI_MULTIQ3=m
 CONFIG_COMEDI_POC=m
 CONFIG_COMEDI_PCI_DRIVERS=y
 CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
 CONFIG_COMEDI_ADDI_APCI_035=m
 CONFIG_COMEDI_ADDI_APCI_1032=m
 CONFIG_COMEDI_ADDI_APCI_1500=m
@@ -5338,7 +5399,6 @@ CONFIG_RTS5139=m
 # CONFIG_TRANZPORT is not set
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DUMP_PCM is not set
 # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
 CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_VT6655=m
@@ -5346,7 +5406,6 @@ CONFIG_VT6656=m
 CONFIG_DX_SEP=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
-# CONFIG_ZCACHE is not set
 CONFIG_ZSMALLOC=y
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
@@ -5422,18 +5481,18 @@ CONFIG_WIMAX_GDM72XX_USB=y
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIMAX_GDM72XX_USB_PM=y
 CONFIG_CSR_WIFI=m
-CONFIG_ZCACHE2=y
 CONFIG_NET_VENDOR_SILICOM=y
 CONFIG_SBYPASS=m
 CONFIG_BPCTL=m
 CONFIG_CED1401=m
 CONFIG_DGRP=m
-CONFIG_SB105X=m
 CONFIG_FIREWIRE_SERIAL=m
+CONFIG_ZCACHE=y
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_ASUS_LAPTOP=m
+CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
@@ -5486,6 +5545,7 @@ CONFIG_CLKSRC_I8253=y
 CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+# CONFIG_MAILBOX is not set
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_OF_IOMMU=y
@@ -5495,13 +5555,13 @@ CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 
 #
-# Remoteproc drivers (EXPERIMENTAL)
+# Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
 CONFIG_STE_MODEM_RPROC=m
 
 #
-# Rpmsg drivers (EXPERIMENTAL)
+# Rpmsg drivers
 #
 CONFIG_VIRT_DRIVERS=y
 # CONFIG_PM_DEVFREQ is not set
@@ -5511,11 +5571,11 @@ CONFIG_EXTCON=m
 # Extcon Device Drivers
 #
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_ARIZONA=m
 CONFIG_MEMORY=y
 # CONFIG_IIO is not set
 # CONFIG_VME_BUS is not set
 CONFIG_PWM=y
+CONFIG_IRQCHIP=y
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
@@ -5586,7 +5646,7 @@ CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y 
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
@@ -5651,6 +5711,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
 CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m
@@ -5710,7 +5771,7 @@ CONFIG_NFS_V2=m
 CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
+CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_BLOCK=m
@@ -5719,6 +5780,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
@@ -5732,8 +5794,9 @@ CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DEBUG is not set
+CONFIG_SUNRPC_DEBUG=y
 CONFIG_CEPH_FS=m
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
@@ -5862,8 +5925,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
-# CONFIG_PROVE_RCU_DELAY is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
@@ -5885,6 +5946,12 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
@@ -5907,6 +5974,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
@@ -5914,7 +5982,6 @@ CONFIG_TRACER_MAX_TRACE=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
-CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING=y
@@ -5927,6 +5994,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_PREEMPT_TRACER is not set
 CONFIG_SCHED_TRACER=y
 CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
@@ -5936,6 +6004,7 @@ CONFIG_KPROBE_EVENT=y
 CONFIG_UPROBE_EVENT=y
 CONFIG_PROBE_EVENTS=y
 CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
@@ -6083,6 +6152,8 @@ CONFIG_CRYPTO_VMAC=m
 #
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
 CONFIG_CRYPTO_GHASH=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
@@ -6238,3 +6309,4 @@ CONFIG_CORDIC=m
 CONFIG_DDR=y
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install
index dbbd5e8fd..f59400336 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux-libre-xen.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-xen
-KERNEL_VERSION=3.8.11-1-LIBRE-XEN
+KERNEL_VERSION=3.9.3-1-LIBRE-XEN
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 7d5c1e691..d9c2c7481 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -14,7 +14,7 @@ pkgname=($(for lang in ${_langpacks[@]}
 pkgrel=1
 pkgdesc="Language packs for Debian Icedove."
 arch=('any')
-url="http://packages.debian.org/experimental/icedove"
+url="http://packages.debian.org/sid/icedove"
 license=('MPL' 'GPL')
 depends=("icedove-libre>=$pkgver")
 makedepends=('unzip' 'zip')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index d76893934..8473cadd8 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer : Márcio Silva <coadde@lavabit.com>
 # Maintainer : André Silva <emulatorman@lavabit.com>
 
-# We're getting this from Debian Experimental
+# We're getting this from Debian Sid
 _debname=icedove
 _debver=17.0.5
 _debrel=2
@@ -15,9 +15,9 @@ pkgrel=1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
-url="http://packages.debian.org/experimental/${_pkgname}"
+url="http://packages.debian.org/sid/${_pkgname}"
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-virtualenv' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
 conflicts=('thunderbird')
@@ -88,6 +88,9 @@ prepare() {
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+
+  # Fix virtualenv path
+  sed -i 's|/usr/share/pyshared/virtualenv.py|/usr/lib/python2.7/site-packages/virtualenv.py|' mozilla/configure
 }
 
 build() {
@@ -120,5 +123,5 @@ package() {
   ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins"
 
   # We don't want the development stuff
-  rm -r "${pkgdir}"/usr/{include,lib/$_pkgname-devel,share/idl}
+  rm -r "${pkgdir}"/usr/{include,lib/${_pkgname}-devel,share/idl}
 }
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 3eb6b36b4..3c3d957a4 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -37,7 +37,7 @@ do
     source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
 done
 
-_path="/usr/lib/iceweasel/extensions"
+_path="/usr/lib/iceweasel/browser/extensions/"
 
 build() {
   cd "${srcdir}"
@@ -162,14 +162,4 @@ md5sums=('e88728730ecf9f0f145de5f70e362b15'
          '98c7ed17e8fbe4478032a31ad2c2aa07'
          'a7c33685d88af8a90a14c874538fa53a'
          '9b43e2e557c82a20509f34a54cc42e0f'
-         '84e12ebfd749a04adc5b3ace348a06f1'
-         '7f11378288e629d63cb04649a234cf1c'
-         '1af944e12101d8a279bda6ebf665a767'
-         'd3a7e1dd8186bfcefe973d77214ec9c0'
-         '7a12ccf5eee1144bfb61984f811faf66'
-         '67407c724be7d200a06912c83a3404d8'
-         'f3c7e564aa585251d8c908e666ce9f64'
-         'ace03ba25a56488ddbf38a656daf6c93'
-         '4612b54bc7712d99823515799abf41d9'
-         '3eb4be0b553933b0babc582444ecaa6c'
-         'ad78e4e0757bc0d8d956b06b3bae8c17')
+         '84e12ebfd749a04adc5b3ace348a06f1')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 253572553..eebf10e57 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=3
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -50,16 +50,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel-install-dir.patch
         vendor.js
         shared-libs.patch
+        replace-urls.txt
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
 md5sums=('0a7c51bb494463c327af918bae6c4ee4'
          'c17121a4ffd40f463e16d7828445d96e'
          'e1e903ca91997f18b428c54ef604f27d'
          '383e8e2a97a8b13fe56d153adb6878b6'
-         '98a433139ffcbf6b3018f18dcaacdb4c'
+         '2930f3bffe0d7a6b9845f8c006821bc2'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '0c26941504d3f2abed759221e9bb5de1'
          '52e52f840a49eb1d14be1c0065b03a93'
+         'a8fc4658d45b6bf9350023e5c3f34e56'
          '85e67561e0e491cd538ce018dfc2d948')
 
 prepare() {
@@ -84,6 +86,17 @@ prepare() {
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
   patch -Np1 -i "$srcdir/shared-libs.patch"
 
+  # Replace common URLs
+  sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
+    if [[ -n $moz_url ]]; then
+      printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url"
+      grep -Erl "${moz_url}" \
+        --exclude='*.'{patch,orig,rej} \
+        --exclude-dir={.pc,test,tests,testing} \
+        | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
+    fi
+  done
+
   # Patch anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
 
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 0588fa632..3bb39d215 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,41 +1,6 @@
 diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
 --- mozilla-release.orig/browser/app/profile/firefox.js	2013-05-11 16:19:20.000000000 -0300
 +++ mozilla-release/browser/app/profile/firefox.js	2013-05-18 13:47:28.091097903 -0300
-@@ -37,11 +37,11 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
-+pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain");
-+pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain");
- 
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -64,7 +64,7 @@
- pref("extensions.autoDisableScopes", 3);
- 
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "https://trisquel.info/browser-plain");
- 
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -601,7 +601,7 @@
- pref("accessibility.typeaheadfind.flashBar", 1);
- 
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
- 
- // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
- pref("plugins.hide_infobar_for_missing_plugin", false);
 @@ -1203,12 +1203,6 @@
  // (This is intentionally on the high side; see bug 746055.)
  pref("image.mem.max_decoded_image_kb", 256000);
@@ -51,13 +16,13 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
  pref("social.toast-notifications.enabled", true);
 diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
 --- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2013-05-11 16:19:20.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-05-16 23:09:05.295723370 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-05-20 17:49:18.467307120 -0300
 @@ -3,69 +3,41 @@
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
  const SEARCH_ENGINES = {
 -  "Google": {
-+  "DuckDuckGo": {
++  "DuckDuckGo HTML": {
      image: "data:image/png;base64," +
 -           "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
 -           "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
@@ -156,17 +121,15 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
    }
  };
  
-@@ -75,8 +47,8 @@
+@@ -75,7 +47,7 @@
  //   * add an entry here in the proper ordering (based on spans)
  // The <a/> part of the snippet will be linked to the corresponding url.
  const DEFAULT_SNIPPETS_URLS = [
 -  "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
--, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
 +  "http://packages.debian.org/experimental/iceweasel"
-+, "https://trisquel.info/browser-plain"
+ , "https://www.gnu.org/software/gnuzilla/addons.html"
  ];
  
- const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
 @@ -139,10 +111,6 @@
    if (searchEngineInfo.image) {
      let logoElt = document.getElementById("searchEngineLogo");
diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt
index 5f8c88e9e..fc13e32fb 100644
--- a/libre/iceweasel-libre/replace-urls.txt
+++ b/libre/iceweasel-libre/replace-urls.txt
@@ -2,24 +2,24 @@
 # These are whitespace-separated EREs, comments are lines starting with '#'
 
 https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)?   https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://trisquel.info/browser-plain
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://gnuzilla.gnu.org/plugins/
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html#themes
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://www.gnu.org/software/gnuzilla/addons.html"
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://www.gnu.org/software/gnuzilla/addons.html
 
-https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://trisquel.info/browser-plain
+https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
 
-https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/?(\?[^"']*)?  https://trisquel.info/browser-plain
+https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/
 
-https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%
+https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             https://gnuzilla.gnu.org/plugins/PluginFinderService.php
 #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
 #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
 
-"https?://addons\.mozilla\.org/" "https://trisquel.info/browser-plain"
+"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html"
 
 # hack: these aren't URLs, per se
-(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1trisquel.info/browser-plain
+(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 4c1daea62..b3176ccbb 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.9.2
+_kernver=3.9.3
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
 _version=v3.9-rc4
 _pkgver=3.9-rc4-2-su
 pkgver=3.9rc4.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 6e2796cff..3c8924131 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.78
+_kernver=3.0.79
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _version=v3.9-rc4
 _pkgver=3.9-rc4-2-su
 pkgver=3.9rc4.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index efd3cd3c8..2dcd13686 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185334 2013-05-13 12:44:58Z tpowa $
+# $Id: PKGBUILD 185987 2013-05-20 06:38:28Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,7 +7,7 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=78
+_sublevel=79
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.78 # nearly always the same as pkgver
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('f30a562307b6f71204370fcd33756466'
-         'd4c068f9b6fb431f606220ec8e707fa1'
+         '4ddd90d45cc8a4e663ef1e984e731232'
          'fe0e9b4415b82f306fc1b63eb9a742a4'
          '69a689019ea0b6ed46b387907f14bc8a'
          'c072b17032e80debc6a8626299245d46'
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index b4c66216e..8bf93b71e 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.78-1-LIBRE-LTS
+KERNEL_VERSION=3.0.79-1-LIBRE-LTS
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index cf56e1f37..e5f7a6bc1 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185176 2013-05-11 19:40:40Z thomas $
+# $Id: PKGBUILD 185985 2013-05-20 06:09:54Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.9
-_sublevel=2
+_sublevel=3
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'change-default-console-loglevel.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('120df29f88622dabf7015a22c7cc8e25'
-         '1a5e653d2c281cccef9b44340a94a866'
-         '9684934c48eb2c7bb7179b7e5b2c245f'
-         'd9ff747f6c2bd3a6e4a94a2abc4af9ca'
+         '4ddd90d45cc8a4e663ef1e984e731232'
+         '9de4af59b9c560df524b525afa117328'
+         'f350294046f6a74ac1d2748ac6326723'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
-         '2cc468726d0b215d45cbd28be6dee198')
+         '4e229083e416b258e0957299971d7859')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index ed48ff54b..62baa74b7 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.9.0 Kernel Configuration
+# Linux/x86 3.9.3-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -87,7 +87,6 @@ CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y
 CONFIG_KTIME_SCALAR=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -1874,7 +1873,7 @@ CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
-CONFIG_SATA_ZPODD=y 
+CONFIG_SATA_ZPODD=y
 CONFIG_SATA_PMP=y
 
 #
@@ -5048,6 +5047,9 @@ CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I7300=m
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 # CONFIG_RTC_DEBUG is not set
 
 #
@@ -5432,7 +5434,6 @@ CONFIG_CED1401=m
 CONFIG_DGRP=m
 CONFIG_FIREWIRE_SERIAL=m
 CONFIG_ZCACHE=y
-CONFIG_RAMSTER=y
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5725,6 +5726,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
@@ -5738,6 +5740,7 @@ CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_CEPH_FS=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index faee36762..0a16459f0 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.9.0-2 Kernel Configuration
+# Linux/x86 3.9.3-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -89,7 +89,6 @@ CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -4862,6 +4861,9 @@ CONFIG_EDAC_I7300=m
 CONFIG_EDAC_SBRIDGE=m
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 # CONFIG_RTC_DEBUG is not set
 
 #
@@ -5514,6 +5516,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
@@ -5527,8 +5530,9 @@ CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SUNRPC_DEBUG=y 
+CONFIG_SUNRPC_DEBUG=y
 CONFIG_CEPH_FS=m
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index f849635c1..a595bb180 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.9.2-1-LIBRE
+KERNEL_VERSION=3.9.3-1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/parabola-xdg-menu/PKGBUILD b/libre/parabola-xdg-menu/PKGBUILD
index 68615937c..e601bcb41 100644
--- a/libre/parabola-xdg-menu/PKGBUILD
+++ b/libre/parabola-xdg-menu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: PKGBUILD 91138 2013-05-20 09:52:33Z spupykin $
 # Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
 # Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=parabola-xdg-menu
-pkgver=0.7.5.5
+pkgver=0.7.6.1
 pkgrel=1
 pkgdesc="automatic generate WM menu from xdg files (Parabola rebranded)"
 arch=('any')
@@ -18,9 +18,9 @@ source=("http://archlinux-stuff.googlecode.com/files/arch-xdg-menu-$pkgver.tar.g
 replaces=('archlinux-xdg-menu')
 conflicts=('archlinux-xdg-menu')
 provides=("archlinux-xdg-menu=$pkgver")
-md5sums=('dd139571e537bbe0190eca53eabb8fd2')
+md5sums=('faa2077140c3d5bacc1de974a9eb3384')
 
-build() {
+package() {
   cd $srcdir
 
     # Rebranding Archlinux to Parabola 
@@ -42,7 +42,7 @@ build() {
 
   install -D -m 0755 xdg_menu $pkgdir/usr/bin/xdg_menu
   install -D -m 0755 xdg_menu_su $pkgdir/usr/bin/xdg_menu_su
-  install -D -m 0755 update-menus $pkgdir/usr/sbin/update-menus
+  install -D -m 0755 update-menus $pkgdir/usr/bin/update-menus
   install -D -m 0644 update-menus.conf $pkgdir/etc/update-menus.conf
   mkdir -p $pkgdir/usr/share/desktop-directories/
   cp parabola-desktop-directories/* $pkgdir/usr/share/desktop-directories/
diff --git a/pcr/bamf2/PKGBUILD b/pcr/bamf2/PKGBUILD
new file mode 100644
index 000000000..681d3da7e
--- /dev/null
+++ b/pcr/bamf2/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Ivan de Jesús Pompa García <ivan.pompa@gmx.com>
+# Contributors: niQo ???
+
+pkgname=bamf2
+_dname=bamf
+pkgver=0.2.126
+pkgrel=2
+pkgdesc="Removes the headache of applications matching into a simple DBus daemon and c wrapper library, 0.2 branch"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/bamf"
+license=('GPL')
+depends=('dbus-glib' 'libwnck3' 'libgtop')
+makedepends=('libwnck' 'vala')
+optdepends=('gtk2: GTK+ 2 library')
+options=(!libtool)
+source=(http://launchpad.net/${_dname}/0.2/${pkgver}/+download/${_dname}-${pkgver}.tar.gz)
+md5sums=('709735137e4b028bb94f9e106bb9ac6e')
+
+conflicts=('bamf')
+provides=('bamf')
+
+build() {
+  cd "$srcdir/${_dname}-${pkgver}"
+
+  # Disable building tests
+  sed -i '/tests/ d' Makefile.in
+
+  sed -i -e 's/--c-include/--include/' lib/libbamf/Makefile.in
+  export CFLAGS="$CFLAGS -Wno-deprecated-declarations -Wno-unused-local-typedefs"
+
+  [[ -d build-gtk3 ]] || mkdir build-gtk3
+  pushd build-gtk3
+  ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${_dname} \
+              --disable-static
+  make
+  popd
+
+  [[ -d build-gtk2 ]] || mkdir build-gtk2
+  pushd build-gtk2
+  ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${_dname} \
+              --disable-static --with-gtk=2
+  make -C lib/libbamf
+  popd
+}
+
+package() {
+  cd "$srcdir/${_dname}-${pkgver}/build-gtk3"
+  make DESTDIR="${pkgdir}/" install
+
+  cd "$srcdir/${_dname}-${pkgver}/build-gtk2"
+  make -C lib/libbamf DESTDIR="${pkgdir}" install
+}
diff --git a/pcr/frame/PKGBUILD b/pcr/frame/PKGBUILD
new file mode 100644
index 000000000..b67d776ac
--- /dev/null
+++ b/pcr/frame/PKGBUILD
@@ -0,0 +1,32 @@
+# Contributor: Nicolas Quiénot < niQo at aur >
+
+pkgname=frame
+pkgver=2.5.0
+pkgrel=1
+pkgdesc="Frame handles the buildup and synchronization of a set of simultaneous touches."
+arch=(i686 x86_64)
+url="https://launchpad.net/frame"
+license=(GPL)
+depends=('libxi' 'gcc-libs')
+makedepends=('xorg-server-devel' 'asciidoc')
+provides=('utouch-frame')
+conflicts=('utouch-frame')
+replaces=('utouch-frame')
+options=('!libtool')
+source=(http://launchpad.net/$pkgname/trunk/v$pkgver/+download/$pkgname-$pkgver.tar.gz)
+
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
+
+md5sums=('02baa941091c5d198cd1623b3ad36e68')
diff --git a/pcr/geis/PKGBUILD b/pcr/geis/PKGBUILD
new file mode 100644
index 000000000..629cb9d12
--- /dev/null
+++ b/pcr/geis/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Nicolas Quiénot <niQo @ AUR >
+# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+
+pkgname=geis
+pkgver=2.2.15
+pkgrel=3
+pkgdesc="Implementation of the GEIS (Gesture Engine Interface and Support) interface."
+arch=('i686' 'x86_64')
+url="https://launchpad.net/geis"
+license=('GPL' 'LGPL')
+depends=('grail' 'dbus' 'python-gobject')
+makedepends=('xorg-server-devel')
+provides=('utouch-geis')
+conflicts=('utouch-geis')
+replaces=('utouch-geis')
+options=('!emptydirs' '!libtool')
+source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ## add -Wno-format in CFLAGS see FS#34658
+  CFLAGS="$CFLAGS -Wno-format" ./configure --prefix=/usr --disable-static
+  make 
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="${pkgdir}/" install
+}
+
+md5sums=('94c8a08497f5fc22061fb0573ca1e220')
diff --git a/pcr/ginn/PKGBUILD b/pcr/ginn/PKGBUILD
new file mode 100644
index 000000000..013fc8642
--- /dev/null
+++ b/pcr/ginn/PKGBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Nicolas Quiénot <niQo @ aur>
+
+pkgname=ginn
+pkgver=0.2.6
+pkgrel=2
+pkgdesc="A deamon with jinn-like wish-granting capabilities"
+url="http://launchpad.net/ginn"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('geis' 'bamf2' 'libxtst' 'libwnck')
+source=(http://launchpad.net/ginn/0.x/${pkgver}/+download/ginn-${pkgver}.tar.gz)
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr
+  make || return 1
+  make DESTDIR=${pkgdir} install || return 1
+}
+
+md5sums=('008854147f0809877b3e7ccf5af5337f')
diff --git a/pcr/grail/PKGBUILD b/pcr/grail/PKGBUILD
new file mode 100644
index 000000000..c76d2214f
--- /dev/null
+++ b/pcr/grail/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Nicolas Quiénot <niQo @ aur>
+# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+# Contributor: thn81 <root@scrat>
+
+pkgname=grail
+pkgver=3.1.0
+pkgrel=1
+pkgdesc="Gesture Recognition And Instantiation Library"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/grail"
+license=('GPL')
+depends=('frame>=2.5.0' 'libxi')
+makedepends=('inputproto')
+conflicts=('utouch-grail')
+replaces=('utouch-grail')
+options=('!libtool')
+source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Static library needed for tests
+  ./configure --prefix=/usr # --disable-static
+  MAKEFLAGS="-j1"
+  make ${MAKEFLAGS}
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}/" install
+}
+
+md5sums=('f0f8c56430ee3717778dec6452201c33')
diff --git a/pcr/jalv/PKGBUILD b/pcr/jalv/PKGBUILD
new file mode 100644
index 000000000..6100c5902
--- /dev/null
+++ b/pcr/jalv/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=jalv
+pkgver=1.4.0
+pkgrel=1
+pkgdesc="Run an LV2 plugin as a JACK application"
+arch=('i686')
+url="http://drobilla.net/software/$pkgname/"
+license=('custom:ISC')
+depends=('lilv' 'suil')
+makedepends=('python2' 'qt4' 'gtk2' 'gtk3' 'gtkmm')
+optdepends=('qt4: Qt 4.x frontend'
+            'gtk2: Gtk+ 2.x frontend'
+            'gtk3: Gtk+ 3.x frontend'
+            'gtkmm: Gtk++ 2.x frontend')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
+md5sums=('23297b15cb541e0b3c5c05a2fdd9bcca')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  python2 waf configure --prefix=/usr
+  python2 waf
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 waf install --destdir="$pkgdir"
+
+  # license
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/pcr/mda-lv2/PKGBUILD b/pcr/mda-lv2/PKGBUILD
new file mode 100644
index 000000000..500a656a5
--- /dev/null
+++ b/pcr/mda-lv2/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=mda-lv2
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="An LV2 port of the MDA plugins by Paul Kellett"
+arch=('i686')
+url="http://drobilla.net/2012/04/21/mda-lv2-1-0-0/"
+license=('GPL3')
+depends=('lv2')
+makedepends=('python2')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
+md5sums=('843ac4eade386034562917e95905e5d8')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 ./waf configure --prefix=/usr
+  python2 ./waf
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  DESTDIR="$pkgdir" python2 ./waf install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/nicotine/PKGBUILD b/pcr/nicotine/PKGBUILD
new file mode 100644
index 000000000..b0bd552b4
--- /dev/null
+++ b/pcr/nicotine/PKGBUILD
@@ -0,0 +1,43 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=nicotine
+pkgver=1.2.16
+pkgrel=1
+pkgdesc="Soulseek music-sharing client, written in python"
+arch=('i686')
+url='http://sourceforge.net/projects/nicotine-plus/'
+license=('GPL')
+depends=('pygtk' 'mutagen' 'python2-sexy')
+makedepends=('setconf')
+optdepends=('python2-geoip: to enable Geographical blocker')
+source=("http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2")
+sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d')
+
+prepare() {
+  cd "$srcdir/${pkgname}+-$pkgver"
+
+  # Fix for FS#22476
+  setconf files/nicotine.desktop Icon nicotine-plus-32px
+
+  # Python fix
+  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
+    -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
+} 
+
+build() {
+  cd "$srcdir/${pkgname}+-$pkgver/trayicon"
+
+  python2 autogen.py
+  make 
+}
+
+package() {
+  cd "$srcdir/${pkgname}+-$pkgver"
+
+  python2 setup.py install --root="$pkgdir"
+  cd trayicon
+  make DESTDIR="$pkgdir" install 
+  ln -s nicotine.py "$pkgdir/usr/bin/nicotine"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/python2-sexy/PKGBUILD b/pcr/python2-sexy/PKGBUILD
new file mode 100644
index 000000000..81c4e453e
--- /dev/null
+++ b/pcr/python2-sexy/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=python2-sexy
+pkgver=0.1.9
+pkgrel=1
+pkgdesc="Python bindings for libsexy"
+arch=('i686')
+url='http://chipx86.com/wiki/Libsexy'
+license=('LGPL')
+depends=('libsexy' 'pygtk')
+options=(!libtool)
+source=(http://releases.chipx86.com/libsexy/sexy-python/sexy-python-$pkgver.tar.gz)
+sha256sums=('2d8d257bbfa498a89792e0405ed8cf70396648b3df3c8e32cdc3dcc9bb666f15')
+sha512sums=('e735f06efce302e10b89cfd3d6c641d523cd29517792ccaa4d022d7be6f6a350fff180f1c94d255ccbc82891cac7346520dfed2a88d828fbd7e891aa56396530')
+
+build() {
+    cd sexy-python-$pkgver/
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    make -C sexy-python-$pkgver DESTDIR="$pkgdir" install
+}
author	root <root@rshg054.dnsready.net>	2013-05-21 00:28:39 -0700
committer	root <root@rshg054.dnsready.net>	2013-05-21 00:28:39 -0700
commit	e3f225daecfd5cfea4af1a4e8ac4b6c46c7ec363 (patch)
tree	b3e36d93c34b5b08544b1698462c06fdb99560b8
parent	383955a81810f344e11b1472bd4c5069fa77020c (diff)